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

Merge pull request #669 from turtleli/spu2-x-fix-dsound-guid 

spu2-x: windows: Fix incorrect sscanf, remove unnecessary unicode to ascii conversion
This commit is contained in:
ramapcsx2 2015-07-25 13:17:37 +02:00
parent 94443afbfc 25b9b24f77
commit 107a96c1bc
3 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/spu2-x/src/Windows/Dialogs.h
View File

@ -40,7 +40,7 @@ namespace SoundtouchCfg
} }
extern int SendDialogMsg( HWND hwnd, int dlgId, UINT code, WPARAM wParam, LPARAM lParam); extern int SendDialogMsg( HWND hwnd, int dlgId, UINT code, WPARAM wParam, LPARAM lParam);
extern HRESULT GUIDFromString( const char *str, LPGUID guid ); extern HRESULT GUIDFromString( const wchar_t *str, LPGUID guid );
extern void AssignSliderValue( HWND idcwnd, HWND hwndDisplay, int value ); extern void AssignSliderValue( HWND idcwnd, HWND hwndDisplay, int value );
extern void AssignSliderValue( HWND hWnd, int idc, int editbox, int value ); extern void AssignSliderValue( HWND hWnd, int idc, int editbox, int value );

10
plugins/spu2-x/src/Windows/SndOut_DSound.cpp
View File

@ -117,11 +117,7 @@ public:
if( m_Device.empty() ) if( m_Device.empty() )
throw std::runtime_error( "screw it" ); throw std::runtime_error( "screw it" );
// Convert from unicode to ANSI: if ((FAILED(GUIDFromString(m_Device, &cGuid))) ||
char guid[256];
sprintf_s( guid, "%S", m_Device.c_str() );
if( (FAILED(GUIDFromString( guid, &cGuid ))) ||
FAILED( DirectSoundCreate8(&cGuid,&dsound,NULL) ) ) FAILED( DirectSoundCreate8(&cGuid,&dsound,NULL) ) )
throw std::runtime_error( "try again?" ); throw std::runtime_error( "try again?" );
} }
@ -286,9 +282,7 @@ private:
{ {
wchar_t temp[128]; wchar_t temp[128];
char temp2[192]; haveGuid = !FAILED(GUIDFromString(m_Device, &DevGuid));
sprintf_s( temp2, "%S", m_Device.c_str() );
haveGuid = ! FAILED(GUIDFromString(temp2,&DevGuid));
SendMessage(GetDlgItem(hWnd,IDC_DS_DEVICE),CB_RESETCONTENT,0,0); SendMessage(GetDlgItem(hWnd,IDC_DS_DEVICE),CB_RESETCONTENT,0,0);
ndevs=0; ndevs=0;

47
plugins/spu2-x/src/Windows/UIHelpers.cpp
View File

@ -23,32 +23,43 @@ int SendDialogMsg( HWND hwnd, int dlgId, UINT code, WPARAM wParam, LPARAM lParam
return SendMessage( GetDlgItem(hwnd,dlgId), code, wParam, lParam ); return SendMessage( GetDlgItem(hwnd,dlgId), code, wParam, lParam );
} }
HRESULT GUIDFromString(const char *str, LPGUID guid) HRESULT GUIDFromString(const wchar_t *str, LPGUID guid)
{ {
// "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}" // "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}"
struct T{ // this is a hack because for some reason sscanf writes too much :/ // VS2015 supports the hh format specifier (finally). VS2013 doesn't though,
GUID g; // so this will do for now.
int k; // << not used but still needed as of January 6th, 2011 u32 guid_u32;
} t; u16 guid_u16[2];
u16 guid_u8[8];
int r = sscanf_s(str,"{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", int r = swscanf_s(str,L"{%08x-%04hx-%04hx-%02hx%02hx-%02hx%02hx%02hx%02hx%02hx%02hx}",
&t.g.Data1, &guid_u32,
&t.g.Data2, &guid_u16[0],
&t.g.Data3, &guid_u16[1],
&t.g.Data4[0], &guid_u8[0],
&t.g.Data4[1], &guid_u8[1],
&t.g.Data4[2], &guid_u8[2],
&t.g.Data4[3], &guid_u8[3],
&t.g.Data4[4], &guid_u8[4],
&t.g.Data4[5], &guid_u8[5],
&t.g.Data4[6], &guid_u8[6],
&t.g.Data4[7] &guid_u8[7]
); );
if(r!=11) return -1; if(r!=11) return -1;
*guid = t.g; guid->Data1 = guid_u32;
guid->Data2 = guid_u16[0];
guid->Data3 = guid_u16[1];
guid->Data4[0] = (u8)guid_u8[0];
guid->Data4[1] = (u8)guid_u8[1];
guid->Data4[2] = (u8)guid_u8[2];
guid->Data4[3] = (u8)guid_u8[3];
guid->Data4[4] = (u8)guid_u8[4];
guid->Data4[5] = (u8)guid_u8[5];
guid->Data4[6] = (u8)guid_u8[6];
guid->Data4[7] = (u8)guid_u8[7];
return 0; return 0;
} }