diff --git a/plugins/spu2-x/src/SndOut_Portaudio.cpp b/plugins/spu2-x/src/SndOut_Portaudio.cpp index b70f0a1275..d9b572c3c3 100644 --- a/plugins/spu2-x/src/SndOut_Portaudio.cpp +++ b/plugins/spu2-x/src/SndOut_Portaudio.cpp @@ -380,8 +380,8 @@ private: SendMessage(GetDlgItem(hWnd,IDC_PA_DEVICE),CB_RESETCONTENT,0,0); SendMessageA(GetDlgItem(hWnd,IDC_PA_DEVICE),CB_ADDSTRING,0,(LPARAM)"Default Device"); SendMessage(GetDlgItem(hWnd,IDC_PA_DEVICE),CB_SETITEMDATA,0,0); - int idx=0; - int i=1,j=0; + int _idx=0; + int i=1; for(int j=0;jname) == m_Device) { - idx = i; + _idx = i; } i++; } } - SendMessage(GetDlgItem(hWnd,IDC_PA_DEVICE),CB_SETCURSEL,idx,0); + SendMessage(GetDlgItem(hWnd,IDC_PA_DEVICE),CB_SETCURSEL,_idx,0); } INIT_SLIDER( IDC_LATENCY, 10, 200, 10, 1, 1 ); diff --git a/plugins/spu2-x/src/Spu2replay.cpp b/plugins/spu2-x/src/Spu2replay.cpp index 381bb7b675..680924c850 100644 --- a/plugins/spu2-x/src/Spu2replay.cpp +++ b/plugins/spu2-x/src/Spu2replay.cpp @@ -188,7 +188,7 @@ u32 WaitSync( u32 TargetCycle ) u32 WaitTime = WaitCycles / IOPCiclesPerMS; if(WaitTime > 10) WaitTime = 10; - if(WaitTime = 0) + if(WaitTime == 0) WaitTime = 1; SleepEx(WaitTime, TRUE); diff --git a/plugins/spu2-x/src/Windows/Config.cpp b/plugins/spu2-x/src/Windows/Config.cpp index adbb213367..7dead26d57 100644 --- a/plugins/spu2-x/src/Windows/Config.cpp +++ b/plugins/spu2-x/src/Windows/Config.cpp @@ -108,7 +108,7 @@ void ReadSettings() if( mods[OutputModule] == NULL ) { // Unsupported or legacy module. - fprintf( stderr, "* SPU2-X: Unknown output module '%s' specified in configuration file.\n", omodid ); + fwprintf( stderr, L"* SPU2-X: Unknown output module '%s' specified in configuration file.\n", omodid ); fprintf( stderr, "* SPU2-X: Defaulting to DirectSound (%S).\n", DSoundOut->GetIdent() ); OutputModule = FindOutputModuleById( DSoundOut->GetIdent() ); } diff --git a/plugins/spu2-x/src/Windows/RealtimeDebugger.cpp b/plugins/spu2-x/src/Windows/RealtimeDebugger.cpp index 54b620b5a7..d1bf7aceda 100644 --- a/plugins/spu2-x/src/Windows/RealtimeDebugger.cpp +++ b/plugins/spu2-x/src/Windows/RealtimeDebugger.cpp @@ -190,7 +190,7 @@ void UpdateDebugDialog() TextOut(hdc,JX+4,JY+ 4,L"REVB",4); TextOut(hdc,JX+4,JY+18,L"IRQE",4); TextOut(hdc,JX+4,JY+32,L"ADMA",4); - swprintf_s(t,L"DMA%s",c==0 ? "4" : "7"); + swprintf_s(t,L"DMA%s",c==0 ? L"4" : L"7"); TextOut(hdc,JX+4,JY+46,t, 4); SetTextColor(hdc,RGB( 0,255, 0)); @@ -259,7 +259,6 @@ void UpdateDebugDialog() } if(cd.dmaFlag > 0) // So it shows x times this is called, since dmas are so fast { - static wchar_t t[256]; swprintf_s(t,L"size = %d",cd.lastsize); TextOut(hdc,JX+64,JY+46,t,wcslen(t));