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

win32: properly pass unicode chars to DXErr replacement

This commit is contained in:
OV2 2016-11-04 00:08:03 +01:00
parent 892aace5f6
commit b478002bfe
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
win32/CD3DCG.cpp
View File

@ -383,7 +383,7 @@ bool CD3DCG::LoadShader(const TCHAR *shaderFile)
hr = pDevice->CreateVertexBuffer(sizeof(VERTEX)*4,D3DUSAGE_WRITEONLY,0,D3DPOOL_MANAGED,&pass.vertexBuffer,NULL); hr = pDevice->CreateVertexBuffer(sizeof(VERTEX)*4,D3DUSAGE_WRITEONLY,0,D3DPOOL_MANAGED,&pass.vertexBuffer,NULL);
if(FAILED(hr)) { if(FAILED(hr)) {
pass.vertexBuffer = NULL; pass.vertexBuffer = NULL;
DXTRACE_ERR_MSGBOX(TEXT("Error creating vertex buffer"), hr); DXTRACE_ERR_MSGBOX(L"Error creating vertex buffer", hr);
return false; return false;
} }
@ -449,7 +449,7 @@ void CD3DCG::ensureTextureSize(LPDIRECT3DTEXTURE9 &tex, D3DXVECTOR2 &texSize,
texSize = wantedSize; texSize = wantedSize;
if(FAILED(hr)) { if(FAILED(hr)) {
DXTRACE_ERR_MSGBOX(TEXT("Error while creating texture"), hr); DXTRACE_ERR_MSGBOX(L"Error while creating texture", hr);
return; return;
} }
} }
@ -860,7 +860,7 @@ void CD3DCG::setupVertexDeclaration(shaderPass &pass)
LPDIRECT3DVERTEXDECLARATION9 vertexDeclaration; LPDIRECT3DVERTEXDECLARATION9 vertexDeclaration;
HRESULT hr = pDevice->CreateVertexDeclaration(vElems,&vertexDeclaration); HRESULT hr = pDevice->CreateVertexDeclaration(vElems,&vertexDeclaration);
if(FAILED(hr)) { if(FAILED(hr)) {
DXTRACE_ERR_MSGBOX(TEXT("Error creating vertex declaration"), hr); DXTRACE_ERR_MSGBOX(L"Error creating vertex declaration", hr);
} }
if(pass.vertexDeclaration) if(pass.vertexDeclaration)
pass.vertexDeclaration->Release(); pass.vertexDeclaration->Release();

20
win32/CDirect3D.cpp
View File

@ -272,7 +272,7 @@ bool CDirect3D::Initialize(HWND hWnd)
pD3D = Direct3DCreate9(D3D_SDK_VERSION); pD3D = Direct3DCreate9(D3D_SDK_VERSION);
if(pD3D == NULL) { if(pD3D == NULL) {
DXTRACE_ERR_MSGBOX(TEXT("Error creating initial D3D9 object"), 0); DXTRACE_ERR_MSGBOX(L"Error creating initial D3D9 object", 0);
return false; return false;
} }
@ -290,19 +290,19 @@ bool CDirect3D::Initialize(HWND hWnd)
&dPresentParams, &dPresentParams,
&pDevice); &pDevice);
if(FAILED(hr)) { if(FAILED(hr)) {
DXTRACE_ERR_MSGBOX(TEXT("Error creating D3D9 device"), hr); DXTRACE_ERR_MSGBOX(L"Error creating D3D9 device", hr);
return false; return false;
} }
hr = pDevice->CreateVertexBuffer(sizeof(vertexStream),D3DUSAGE_WRITEONLY,0,D3DPOOL_MANAGED,&vertexBuffer,NULL); hr = pDevice->CreateVertexBuffer(sizeof(vertexStream),D3DUSAGE_WRITEONLY,0,D3DPOOL_MANAGED,&vertexBuffer,NULL);
if(FAILED(hr)) { if(FAILED(hr)) {
DXTRACE_ERR_MSGBOX(TEXT("Error creating vertex buffer"), hr); DXTRACE_ERR_MSGBOX(L"Error creating vertex buffer", hr);
return false; return false;
} }
hr = pDevice->CreateVertexDeclaration(vertexElems,&vertexDeclaration); hr = pDevice->CreateVertexDeclaration(vertexElems,&vertexDeclaration);
if(FAILED(hr)) { if(FAILED(hr)) {
DXTRACE_ERR_MSGBOX(TEXT("Error creating vertex declaration"), hr); DXTRACE_ERR_MSGBOX(L"Error creating vertex declaration", hr);
return false; return false;
} }
@ -312,7 +312,7 @@ bool CDirect3D::Initialize(HWND hWnd)
cgContext = cgCreateContext(); cgContext = cgCreateContext();
hr = cgD3D9SetDevice(pDevice); hr = cgD3D9SetDevice(pDevice);
if(FAILED(hr)) { if(FAILED(hr)) {
DXTRACE_ERR_MSGBOX(TEXT("Error setting cg device"), hr); DXTRACE_ERR_MSGBOX(L"Error setting cg device", hr);
} }
cgShader = new CD3DCG(cgContext,pDevice); cgShader = new CD3DCG(cgContext,pDevice);
} }
@ -650,14 +650,14 @@ void CDirect3D::Render(SSurface Src)
ResetDevice(); ResetDevice();
return; return;
default: default:
DXTRACE_ERR_MSGBOX( TEXT("Internal driver error"), hr); DXTRACE_ERR_MSGBOX( L"Internal driver error", hr);
return; return;
} }
} }
//BlankTexture(drawSurface); //BlankTexture(drawSurface);
if(FAILED(hr = drawSurface->LockRect(0, &lr, NULL, 0))) { if(FAILED(hr = drawSurface->LockRect(0, &lr, NULL, 0))) {
DXTRACE_ERR_MSGBOX( TEXT("Unable to lock texture"), hr); DXTRACE_ERR_MSGBOX( L"Unable to lock texture", hr);
return; return;
} else { } else {
Dst.Surface = (unsigned char *)lr.pBits; Dst.Surface = (unsigned char *)lr.pBits;
@ -757,7 +757,7 @@ void CDirect3D::CreateDrawSurface()
NULL ); NULL );
if(FAILED(hr)) { if(FAILED(hr)) {
DXTRACE_ERR_MSGBOX(TEXT("Error while creating texture"), hr); DXTRACE_ERR_MSGBOX(L"Error while creating texture", hr);
return; return;
} }
} }
@ -787,7 +787,7 @@ bool CDirect3D::BlankTexture(LPDIRECT3DTEXTURE9 texture)
HRESULT hr; HRESULT hr;
if(FAILED(hr = texture->LockRect(0, &lr, NULL, 0))) { if(FAILED(hr = texture->LockRect(0, &lr, NULL, 0))) {
DXTRACE_ERR_MSGBOX( TEXT("Unable to lock texture"), hr); DXTRACE_ERR_MSGBOX( L"Unable to lock texture", hr);
return false; return false;
} else { } else {
memset(lr.pBits, 0, lr.Pitch * quadTextureSize); memset(lr.pBits, 0, lr.Pitch * quadTextureSize);
@ -938,7 +938,7 @@ bool CDirect3D::ResetDevice()
} }
if(FAILED(hr = pDevice->Reset(&dPresentParams))) { if(FAILED(hr = pDevice->Reset(&dPresentParams))) {
DXTRACE_ERR(TEXT("Unable to reset device"), hr); DXTRACE_ERR(L"Unable to reset device", hr);
return false; return false;
} }

6
win32/CXAudio2.cpp
View File

@ -234,7 +234,7 @@ bool CXAudio2::InitXAudio2(void)
HRESULT hr; HRESULT hr;
if ( FAILED(hr = XAudio2Create( &pXAudio2, 0 , XAUDIO2_DEFAULT_PROCESSOR ) ) ) { if ( FAILED(hr = XAudio2Create( &pXAudio2, 0 , XAUDIO2_DEFAULT_PROCESSOR ) ) ) {
DXTRACE_ERR_MSGBOX(TEXT("Unable to create XAudio2 object."),hr); DXTRACE_ERR_MSGBOX(L"Unable to create XAudio2 object.",hr);
MessageBox (GUI.hWnd, TEXT("\ MessageBox (GUI.hWnd, TEXT("\
Unable to initialize XAudio2. You will not be able to hear any\n\ Unable to initialize XAudio2. You will not be able to hear any\n\
sound effects or music while playing.\n\n\ sound effects or music while playing.\n\n\
@ -257,7 +257,7 @@ bool CXAudio2::InitVoices(void)
HRESULT hr; HRESULT hr;
if ( FAILED(hr = pXAudio2->CreateMasteringVoice( &pMasterVoice, (Settings.Stereo?2:1), if ( FAILED(hr = pXAudio2->CreateMasteringVoice( &pMasterVoice, (Settings.Stereo?2:1),
Settings.SoundPlaybackRate, 0, 0 , NULL ) ) ) { Settings.SoundPlaybackRate, 0, 0 , NULL ) ) ) {
DXTRACE_ERR_MSGBOX(TEXT("Unable to create mastering voice."),hr); DXTRACE_ERR_MSGBOX(L"Unable to create mastering voice.",hr);
return false; return false;
} }
@ -272,7 +272,7 @@ bool CXAudio2::InitVoices(void)
if( FAILED(hr = pXAudio2->CreateSourceVoice(&pSourceVoice, (WAVEFORMATEX*)&wfx, if( FAILED(hr = pXAudio2->CreateSourceVoice(&pSourceVoice, (WAVEFORMATEX*)&wfx,
XAUDIO2_VOICE_NOSRC , XAUDIO2_DEFAULT_FREQ_RATIO, this, NULL, NULL ) ) ) { XAUDIO2_VOICE_NOSRC , XAUDIO2_DEFAULT_FREQ_RATIO, this, NULL, NULL ) ) ) {
DXTRACE_ERR_MSGBOX(TEXT("Unable to create source voice."),hr); DXTRACE_ERR_MSGBOX(L"Unable to create source voice.",hr);
return false; return false;
} }