ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPU2: windows support!

This commit is contained in:
GovanifY 2020-09-26 01:55:07 +02:00 committed by refractionpcsx2
parent 1727c863fe
commit 7ec2eb050b
7 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2/SPU2/Windows/Config.cpp
View File

@ -435,9 +435,10 @@ void configure()
{ {
INT_PTR ret; INT_PTR ret;
ReadSettings(); ReadSettings();
ret = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_CONFIG), GetActiveWindow(), (DLGPROC)ConfigProc, 1); ret = DialogBoxParam(NULL, MAKEINTRESOURCE(IDD_CONFIG), GetActiveWindow(), (DLGPROC)ConfigProc, 1);
if (ret == -1) if (ret == -1)
{ {
DWORD dw = GetLastError();
MessageBox(GetActiveWindow(), L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); MessageBox(GetActiveWindow(), L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND);
return; return;
} }

2
pcsx2/SPU2/Windows/ConfigDebug.cpp
View File

@ -263,7 +263,7 @@ namespace DebugConfig
void OpenDialog() 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) if (ret == -1)
{ {
MessageBox(GetActiveWindow(), L"Error Opening the debug configuration dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); MessageBox(GetActiveWindow(), L"Error Opening the debug configuration dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND);

2
pcsx2/SPU2/Windows/ConfigSoundtouch.cpp
View File

@ -128,7 +128,7 @@ BOOL CALLBACK SoundtouchCfg::DialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPA
void SoundtouchCfg::OpenDialog(HWND hWnd) void SoundtouchCfg::OpenDialog(HWND hWnd)
{ {
INT_PTR ret; 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) if (ret == -1)
{ {
MessageBox(GetActiveWindow(), L"Error Opening the Soundtouch advanced dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); MessageBox(GetActiveWindow(), L"Error Opening the Soundtouch advanced dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND);

2
pcsx2/SPU2/Windows/SndOut_DSound.cpp
View File

@ -411,7 +411,7 @@ public:
virtual void Configure(uptr parent) virtual void Configure(uptr parent)
{ {
INT_PTR ret; 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) if (ret == -1)
{ {
MessageBox((HWND)parent, L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); MessageBox((HWND)parent, L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND);

2
pcsx2/SPU2/Windows/SndOut_waveOut.cpp
View File

@ -279,7 +279,7 @@ public:
virtual void Configure(uptr parent) virtual void Configure(uptr parent)
{ {
INT_PTR ret; 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) if (ret == -1)
{ {
MessageBox((HWND)parent, L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); MessageBox((HWND)parent, L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND);

4
pcsx2/SPU2/spu2.cpp
View File

@ -44,8 +44,6 @@ static u32 pClocks = 0;
u32* cyclePtr = NULL; u32* cyclePtr = NULL;
u32 lClocks = 0; u32 lClocks = 0;
//static bool cpu_detected = false; //static bool cpu_detected = false;
static bool CheckSSE() static bool CheckSSE()
@ -351,7 +349,7 @@ s32 SPU2open(void* pDsp)
{ {
if (debugDialogOpen == 0) 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); ShowWindow(hDebugDialog, SW_SHOWNORMAL);
debugDialogOpen = 1; debugDialogOpen = 1;
} }

5
pcsx2/windows/VCprojects/pcsx2.vcxproj
View File

@ -65,7 +65,12 @@
</ClCompile> </ClCompile>
<Link> <Link>
<LargeAddressAware>Yes</LargeAddressAware> <LargeAddressAware>Yes</LargeAddressAware>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>