diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 40396611..9c25bb45 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -5031,7 +5031,7 @@ GUIGUIAboutText6b db ' TEUF',0 GUIGUIAboutText6c db ' PAGEFAULT',0 GUIGUIAboutText6d db ' THEODDONE33',0 %ifdef __WIN32__ -GUIGUIAboutText7 db 'WIN PORT V0.99',0 +GUIGUIAboutText7 db 'WIN PORT V1.00',0 %elifdef __LINUX__ GUIGUIAboutText7 db 'LINUX PORT V0.19',0 %endif diff --git a/zsnes/src/win/winlink.cpp b/zsnes/src/win/winlink.cpp index c8e0970d..65fb2b7b 100644 --- a/zsnes/src/win/winlink.cpp +++ b/zsnes/src/win/winlink.cpp @@ -36,10 +36,6 @@ extern "C" { DWORD WindowWidth = 256; DWORD WindowHeight = 224; -void ReleaseDirectDraw(); -void ReleaseDirectSound(); -void ReleaseDirectInput(); - DWORD FullScreen = 0; DWORD Moving= 0; @@ -141,6 +137,10 @@ DWORD MouseButton; _int64 start, end, freq, update_ticks_pc, start2, end2, update_ticks_pc2; +void ReleaseDirectDraw(); +void ReleaseDirectSound(); +void ReleaseDirectInput(); + extern "C" { void drawscreenwin(void); @@ -432,7 +432,7 @@ LRESULT CALLBACK Main_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) break; case WM_KEYUP: // sent when user releases a key if (wParam==16) - shiftpr=false; + shiftpr=false; break; case WM_MOUSEMOVE: if(MouseInput) MouseInput->Acquire(); @@ -488,16 +488,16 @@ int RegisterWinClass(void) WNDCLASS wcl; - wcl.style = CS_OWNDC | CS_HREDRAW | CS_VREDRAW | CS_NOCLOSE ; - wcl.cbClsExtra = 0; - wcl.cbWndExtra = 0; - wcl.hIcon = LoadIcon(NULL,IDI_APPLICATION); - wcl.hCursor = NULL; - wcl.hInstance = hInst; - wcl.lpfnWndProc = (WNDPROC)Main_Proc; - wcl.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); - wcl.lpszMenuName = NULL; - wcl.lpszClassName = "ZSNESWIN"; + wcl.style = CS_OWNDC | CS_HREDRAW | CS_VREDRAW | CS_NOCLOSE ; + wcl.cbClsExtra = 0; + wcl.cbWndExtra = 0; + wcl.hIcon = LoadIcon(NULL,IDI_APPLICATION); + wcl.hCursor = NULL; + wcl.hInstance = hInst; + wcl.lpfnWndProc = (WNDPROC)Main_Proc; + wcl.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); + wcl.lpszMenuName = NULL; + wcl.lpszClassName = "ZSNESWIN"; if (RegisterClass(&wcl) == 0) return FALSE; @@ -847,13 +847,12 @@ BOOL FAR PASCAL InitJoystickInput(LPCDIDEVICEINSTANCE pdinst, LPVOID pvRef) dipdw.diph.dwObj = DIJOFS_SLIDER(1); JoystickInput[CurrentJoy]->SetProperty(DIPROP_DEADZONE, &dipdw.diph); - - dipdw.diph.dwSize = sizeof(DIPROPDWORD); dipdw.diph.dwHeaderSize = sizeof(dipdw.diph); dipdw.diph.dwHow = DIPH_DEVICE; dipdw.dwData = DIPROPAXISMODE_ABS; dipdw.diph.dwObj = 0; + JoystickInput[CurrentJoy]->SetProperty(DIPROP_AXISMODE, &dipdw.diph); CurrentJoy+=1;