From 7ec2eb050bb0ade24c6e7a2b7d930edb825cb157 Mon Sep 17 00:00:00 2001 From: GovanifY Date: Sat, 26 Sep 2020 01:55:07 +0200 Subject: [PATCH] SPU2: windows support! --- pcsx2/SPU2/Windows/Config.cpp | 3 ++- pcsx2/SPU2/Windows/ConfigDebug.cpp | 2 +- pcsx2/SPU2/Windows/ConfigSoundtouch.cpp | 2 +- pcsx2/SPU2/Windows/SndOut_DSound.cpp | 2 +- pcsx2/SPU2/Windows/SndOut_waveOut.cpp | 2 +- pcsx2/SPU2/spu2.cpp | 4 +--- pcsx2/windows/VCprojects/pcsx2.vcxproj | 5 +++++ 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pcsx2/SPU2/Windows/Config.cpp b/pcsx2/SPU2/Windows/Config.cpp index a89c55c1be..d4344f8474 100644 --- a/pcsx2/SPU2/Windows/Config.cpp +++ b/pcsx2/SPU2/Windows/Config.cpp @@ -435,9 +435,10 @@ void configure() { INT_PTR ret; ReadSettings(); - ret = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_CONFIG), GetActiveWindow(), (DLGPROC)ConfigProc, 1); + ret = DialogBoxParam(NULL, MAKEINTRESOURCE(IDD_CONFIG), GetActiveWindow(), (DLGPROC)ConfigProc, 1); if (ret == -1) { + DWORD dw = GetLastError(); MessageBox(GetActiveWindow(), L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); return; } diff --git a/pcsx2/SPU2/Windows/ConfigDebug.cpp b/pcsx2/SPU2/Windows/ConfigDebug.cpp index a2f334c325..09af42c884 100644 --- a/pcsx2/SPU2/Windows/ConfigDebug.cpp +++ b/pcsx2/SPU2/Windows/ConfigDebug.cpp @@ -263,7 +263,7 @@ namespace DebugConfig void OpenDialog() { - INT_PTR ret = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_CONFIG_DEBUG), GetActiveWindow(), (DLGPROC)DialogProc, 1); + INT_PTR ret = DialogBoxParam(NULL, MAKEINTRESOURCE(IDD_CONFIG_DEBUG), GetActiveWindow(), (DLGPROC)DialogProc, 1); if (ret == -1) { MessageBox(GetActiveWindow(), L"Error Opening the debug configuration dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); diff --git a/pcsx2/SPU2/Windows/ConfigSoundtouch.cpp b/pcsx2/SPU2/Windows/ConfigSoundtouch.cpp index 935f377e39..281fc0cc86 100644 --- a/pcsx2/SPU2/Windows/ConfigSoundtouch.cpp +++ b/pcsx2/SPU2/Windows/ConfigSoundtouch.cpp @@ -128,7 +128,7 @@ BOOL CALLBACK SoundtouchCfg::DialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPA void SoundtouchCfg::OpenDialog(HWND hWnd) { INT_PTR ret; - ret = DialogBox(hInstance, MAKEINTRESOURCE(IDD_CONFIG_SOUNDTOUCH), hWnd, (DLGPROC)DialogProc); + ret = DialogBox(NULL, MAKEINTRESOURCE(IDD_CONFIG_SOUNDTOUCH), hWnd, (DLGPROC)DialogProc); if (ret == -1) { MessageBox(GetActiveWindow(), L"Error Opening the Soundtouch advanced dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); diff --git a/pcsx2/SPU2/Windows/SndOut_DSound.cpp b/pcsx2/SPU2/Windows/SndOut_DSound.cpp index 470e44e738..dda758c679 100644 --- a/pcsx2/SPU2/Windows/SndOut_DSound.cpp +++ b/pcsx2/SPU2/Windows/SndOut_DSound.cpp @@ -411,7 +411,7 @@ public: virtual void Configure(uptr parent) { INT_PTR ret; - ret = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_DSOUND), (HWND)parent, (DLGPROC)ConfigProc, 1); + ret = DialogBoxParam(NULL, MAKEINTRESOURCE(IDD_DSOUND), (HWND)parent, (DLGPROC)ConfigProc, 1); if (ret == -1) { MessageBox((HWND)parent, L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); diff --git a/pcsx2/SPU2/Windows/SndOut_waveOut.cpp b/pcsx2/SPU2/Windows/SndOut_waveOut.cpp index 7b3814666e..7200cbb566 100644 --- a/pcsx2/SPU2/Windows/SndOut_waveOut.cpp +++ b/pcsx2/SPU2/Windows/SndOut_waveOut.cpp @@ -279,7 +279,7 @@ public: virtual void Configure(uptr parent) { INT_PTR ret; - ret = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_WAVEOUT), (HWND)parent, (DLGPROC)ConfigProc, 1); + ret = DialogBoxParam(NULL, MAKEINTRESOURCE(IDD_WAVEOUT), (HWND)parent, (DLGPROC)ConfigProc, 1); if (ret == -1) { MessageBox((HWND)parent, L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); diff --git a/pcsx2/SPU2/spu2.cpp b/pcsx2/SPU2/spu2.cpp index 11f8e04376..ce10e93b74 100644 --- a/pcsx2/SPU2/spu2.cpp +++ b/pcsx2/SPU2/spu2.cpp @@ -44,8 +44,6 @@ static u32 pClocks = 0; u32* cyclePtr = NULL; u32 lClocks = 0; - - //static bool cpu_detected = false; static bool CheckSSE() @@ -351,7 +349,7 @@ s32 SPU2open(void* pDsp) { if (debugDialogOpen == 0) { - hDebugDialog = CreateDialogParam(hInstance, MAKEINTRESOURCE(IDD_DEBUG), 0, DebugProc, 0); + hDebugDialog = CreateDialogParam(NULL, MAKEINTRESOURCE(IDD_DEBUG), 0, DebugProc, 0); ShowWindow(hDebugDialog, SW_SHOWNORMAL); debugDialogOpen = 1; } diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj index 6a770226a7..30841330b9 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj @@ -65,7 +65,12 @@ Yes + comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;dsound.lib;%(AdditionalDependencies) + comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;dsound.lib;%(AdditionalDependencies) comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;dsound.lib;%(AdditionalDependencies) + comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;dsound.lib;%(AdditionalDependencies) + comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;dsound.lib;%(AdditionalDependencies) + comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;dsound.lib;%(AdditionalDependencies)