From b792d0c50b16b6d2cabedc7168de3bfcdd2c6ec5 Mon Sep 17 00:00:00 2001 From: gabest11 Date: Thu, 4 Jun 2009 00:15:05 +0000 Subject: [PATCH] GSdx: escape/resume fix git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1314 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/GSdx/GSTextureFX10.cpp | 3 ++- plugins/GSdx/GSWnd.cpp | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/GSdx/GSTextureFX10.cpp b/plugins/GSdx/GSTextureFX10.cpp index dd223a508e..48cf096cf7 100644 --- a/plugins/GSdx/GSTextureFX10.cpp +++ b/plugins/GSdx/GSTextureFX10.cpp @@ -263,7 +263,8 @@ void GSTextureFX10::UpdatePS(PSSelector sel, const PSConstantBuffer* cb, PSSampl m_dev->PSSetShader((*i).second, m_ps_cb); - ID3D10SamplerState* ss0=NULL, *ss1=NULL; + ID3D10SamplerState* ss0 = NULL; + ID3D10SamplerState* ss1 = NULL; if(sel.tfx != 4) { diff --git a/plugins/GSdx/GSWnd.cpp b/plugins/GSdx/GSWnd.cpp index aa9226c5f5..3f148dbc6b 100644 --- a/plugins/GSdx/GSWnd.cpp +++ b/plugins/GSdx/GSWnd.cpp @@ -105,9 +105,12 @@ bool GSWnd::Create(const string& title) wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); wc.lpszClassName = "GSWnd"; - if(!RegisterClass(&wc)) + if(!GetClassInfo(wc.hInstance, wc.lpszClassName, &wc)) { - return false; + if(!RegisterClass(&wc)) + { + return false; + } } DWORD style = WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW | WS_BORDER;