diff --git a/SourceX/miniwin/misc_msg.cpp b/SourceX/miniwin/misc_msg.cpp index 769c716e8..8130dab33 100644 --- a/SourceX/miniwin/misc_msg.cpp +++ b/SourceX/miniwin/misc_msg.cpp @@ -275,7 +275,7 @@ WINBOOL PeekMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilter case SDL_AUDIODEVICEADDED: case SDL_AUDIODEVICEREMOVED: case SDL_TEXTEDITING: - break; + return false_avail(); case SDL_TEXTINPUT: case SDL_WINDOWEVENT: if (e.window.event == SDL_WINDOWEVENT_CLOSE) { @@ -355,9 +355,11 @@ WINBOOL TranslateMessage(const MSG *lpMsg) } } +#ifdef _DEBUG if (key >= 32) { DUMMY_PRINT("char: %c", key); } +#endif // XXX: This does not add extended info to lParam PostMessageA(lpMsg->hwnd, DVL_WM_CHAR, key, 0); @@ -369,6 +371,7 @@ WINBOOL TranslateMessage(const MSG *lpMsg) SHORT GetAsyncKeyState(int vKey) { +#ifndef USE_SDL1 const Uint8 *state = SDL_GetKeyboardState(NULL); if (vKey == DVL_VK_SHIFT) { if (state[SDL_SCANCODE_LSHIFT] || state[SDL_SCANCODE_RSHIFT]) { @@ -378,6 +381,7 @@ SHORT GetAsyncKeyState(int vKey) if (vKey == DVL_VK_MENU && state[SDL_SCANCODE_M]) { return 0x8000; } +#endif return 0; } @@ -394,8 +398,6 @@ LRESULT DispatchMessageA(const MSG *lpMsg) WINBOOL PostMessageA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - DUMMY(); - assert(hWnd == 0); MSG msg; diff --git a/SourceX/storm/storm_net.cpp b/SourceX/storm/storm_net.cpp index d6f2f6ac1..821dcc887 100644 --- a/SourceX/storm/storm_net.cpp +++ b/SourceX/storm/storm_net.cpp @@ -60,7 +60,6 @@ BOOL SNetRegisterEventHandler(int evtype, SEVTHANDLER func) BOOL SNetDestroy() { - DUMMY(); return true; }