diff --git a/common/include/Utilities/TraceLog.h b/common/include/Utilities/TraceLog.h index 0426b02b13..5884100cf8 100644 --- a/common/include/Utilities/TraceLog.h +++ b/common/include/Utilities/TraceLog.h @@ -77,7 +77,7 @@ public: bool Enabled; protected: - BaseTraceLogSource() {} + BaseTraceLogSource() : m_Descriptor(NULL), Enabled(false) {} public: TraceLog_ImplementBaseAPI(BaseTraceLogSource) diff --git a/pcsx2/CDVD/InputIsoFile.cpp b/pcsx2/CDVD/InputIsoFile.cpp index ca0b3dd010..e0012db3bc 100644 --- a/pcsx2/CDVD/InputIsoFile.cpp +++ b/pcsx2/CDVD/InputIsoFile.cpp @@ -179,7 +179,10 @@ void InputIsoFile::_init() m_read_inprogress = false; m_read_count = 0; + ReadUnit = 0; + m_current_lsn = -1; m_read_lsn = -1; + m_reader = NULL; } // Tests the specified filename to see if it is a supported ISO type. This function typically diff --git a/pcsx2/CDVD/IsoFileFormats.h b/pcsx2/CDVD/IsoFileFormats.h index c390fb510a..d528afdbe9 100644 --- a/pcsx2/CDVD/IsoFileFormats.h +++ b/pcsx2/CDVD/IsoFileFormats.h @@ -48,7 +48,6 @@ protected: AsyncFileReader* m_reader; s32 m_current_lsn; - uint m_current_count; isoType m_type; u32 m_flags; diff --git a/pcsx2/DebugTools/Debug.h b/pcsx2/DebugTools/Debug.h index 9e9e4b0fdb..a55c0080ac 100644 --- a/pcsx2/DebugTools/Debug.h +++ b/pcsx2/DebugTools/Debug.h @@ -65,9 +65,6 @@ struct SysTraceLogDescriptor // logging volume). class SysTraceLog : public TextFileTraceLog { -public: - const char* PrePrefix; - public: TraceLog_ImplementBaseAPI(SysTraceLog) @@ -77,12 +74,6 @@ public: void DoWrite( const char *fmt ) const; - SysTraceLog& SetPrefix( const char* name ) - { - PrePrefix = name; - return *this; - } - }; class SysTraceLog_EE : public SysTraceLog diff --git a/pcsx2/DebugTools/DisassemblyManager.h b/pcsx2/DebugTools/DisassemblyManager.h index 068e105311..9058b9f5f0 100644 --- a/pcsx2/DebugTools/DisassemblyManager.h +++ b/pcsx2/DebugTools/DisassemblyManager.h @@ -206,7 +206,7 @@ public: private: DisassemblyEntry* getEntry(u32 address); std::map entries; - DebugInterface* cpu; + DebugInterface* cpu = NULL; static int maxParamChars; }; diff --git a/pcsx2/gui/MainFrame.h b/pcsx2/gui/MainFrame.h index 71d75da5a2..b8417d1d1a 100644 --- a/pcsx2/gui/MainFrame.h +++ b/pcsx2/gui/MainFrame.h @@ -47,22 +47,12 @@ protected: // A list of menu items belonging to this plugin's menu. MenuItemAddonList m_PluginMenuItems; - // Base index for inserting items, usually points to the position - // after the heading entry and separator. - int m_InsertIndexBase; - - // Current index for inserting menu items; increments with each item - // added by a plugin. - int m_InsertIndexCur; - public: PluginsEnum_t PluginId; - wxMenu& MyMenu; + wxMenu& MyMenu; public: - PerPluginMenuInfo() : MyMenu( *new wxMenu() ) - { - } + PerPluginMenuInfo() : MyMenu(*new wxMenu()), PluginId (PluginId_Count) {} virtual ~PerPluginMenuInfo() throw(); @@ -226,4 +216,4 @@ protected: friend class Pcsx2App; }; -extern int GetPluginMenuId_Settings( PluginsEnum_t pid ); \ No newline at end of file +extern int GetPluginMenuId_Settings( PluginsEnum_t pid ); diff --git a/pcsx2/gui/MemoryCardFolder.cpp b/pcsx2/gui/MemoryCardFolder.cpp index f9acb749d0..2f6885af4e 100644 --- a/pcsx2/gui/MemoryCardFolder.cpp +++ b/pcsx2/gui/MemoryCardFolder.cpp @@ -29,6 +29,9 @@ bool RemoveDirectory( const wxString& dirname ); FolderMemoryCard::FolderMemoryCard() { m_slot = 0; m_isEnabled = false; + m_performFileWrites = false; + m_framesUntilFlush = 0; + m_timeLastWritten = 0; } void FolderMemoryCard::InitializeInternalData() { diff --git a/pcsx2/gui/Panels/LogOptionsPanels.h b/pcsx2/gui/Panels/LogOptionsPanels.h index 967d6fc2d4..b7d51f4ef8 100644 --- a/pcsx2/gui/Panels/LogOptionsPanels.h +++ b/pcsx2/gui/Panels/LogOptionsPanels.h @@ -28,8 +28,8 @@ namespace Panels wxStaticBoxSizer* m_miscGroup; public: - BaseCpuLogOptionsPanel( wxWindow* parent, const wxString& title, wxOrientation orient=wxVERTICAL ) - : CheckedStaticBox( parent, orient, title ) {} + BaseCpuLogOptionsPanel(wxWindow* parent, const wxString& title, wxOrientation orient = wxVERTICAL) + : CheckedStaticBox(parent, orient, title), m_miscGroup(NULL){} virtual wxStaticBoxSizer* GetMiscGroup() const { return m_miscGroup; } virtual CheckedStaticBox* GetStaticBox( const wxString& subgroup ) const=0; diff --git a/pcsx2/gui/Panels/MemoryCardListPanel.cpp b/pcsx2/gui/Panels/MemoryCardListPanel.cpp index d9371ff7f4..fdf11893f7 100644 --- a/pcsx2/gui/Panels/MemoryCardListPanel.cpp +++ b/pcsx2/gui/Panels/MemoryCardListPanel.cpp @@ -190,6 +190,8 @@ Panels::BaseMcdListPanel::BaseMcdListPanel( wxWindow* parent ) ); m_listview = NULL; + s_leftside_buttons = NULL; + s_rightside_buttons = NULL; m_btn_Refresh = new wxButton( this, wxID_ANY, _("Refresh list") ); diff --git a/pcsx2/gui/Panels/MemoryCardPanels.h b/pcsx2/gui/Panels/MemoryCardPanels.h index f484d2cf0f..6b4ad36623 100644 --- a/pcsx2/gui/Panels/MemoryCardPanels.h +++ b/pcsx2/gui/Panels/MemoryCardPanels.h @@ -62,11 +62,14 @@ struct McdSlotItem McdSlotItem() { - Slot = -1; + Slot = -1; + SizeInMB = 0; + Type = MemoryCard_None; IsPSX = false; IsPresent = false; IsEnabled = false; + IsFormatted = false; } }; diff --git a/pcsx2/gui/Panels/PluginSelectorPanel.cpp b/pcsx2/gui/Panels/PluginSelectorPanel.cpp index ec1d4118e7..99e3f433fe 100644 --- a/pcsx2/gui/Panels/PluginSelectorPanel.cpp +++ b/pcsx2/gui/Panels/PluginSelectorPanel.cpp @@ -227,7 +227,7 @@ protected: IMPLEMENT_DYNAMIC_CLASS(ApplyPluginsDialog, WaitForTaskDialog) ApplyPluginsDialog::ApplyPluginsDialog( BaseApplicableConfigPanel* panel ) - : WaitForTaskDialog( _("Applying settings...") ) +: WaitForTaskDialog(_("Applying settings...")), m_panel(NULL) { GetSysExecutorThread().PostEvent( new SysExecEvent_ApplyPlugins( this, m_sync ) ); } diff --git a/plugins/GSdx/GSState.cpp b/plugins/GSdx/GSState.cpp index c64c544052..aa3d438bb9 100644 --- a/plugins/GSdx/GSState.cpp +++ b/plugins/GSdx/GSState.cpp @@ -2982,6 +2982,7 @@ bool GSState::IsMipMapActive() GSState::GSTransferBuffer::GSTransferBuffer() { x = y = 0; + overflow = false; start = end = total = 0; buff = (uint8*)_aligned_malloc(1024 * 1024 * 4, 32); } diff --git a/plugins/spu2-x/src/SndOut_Portaudio.cpp b/plugins/spu2-x/src/SndOut_Portaudio.cpp index 8afa70a886..e42c77f7db 100644 --- a/plugins/spu2-x/src/SndOut_Portaudio.cpp +++ b/plugins/spu2-x/src/SndOut_Portaudio.cpp @@ -110,11 +110,18 @@ public: Portaudio() { - m_ApiId=-1; m_SuggestedLatencyMinimal = true; + m_UseHardware = false; + m_WasapiExclusiveMode = false; + started = false; + stream = NULL; + ActualPaCallback = NULL; + m_ApiId=-1; m_SuggestedLatencyMS = 20; - actualUsedChannels = 0; + writtenSoFar = 0; + writtenLastTime = 0; + availableLastTime = 0; } s32 Init()