Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-09-27 09:55:43 +00:00
Code Issues Projects Releases Wiki Activity

Reverted this part of r934:

Browse Source 
. Moved DIMouse::DirectInputInit() from WM_CREATE to main init-loop (just before msg-pump)
This commit is contained in:
tomch 2013-04-21 21:31:12 +00:00
parent 28b52edf68
commit f293e4ee1f
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AppleWin/source/Applewin.cpp
View File

@ -999,12 +999,6 @@ int APIENTRY WinMain(HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
tfe_init();
LogFileOutput("Main: tfe_init()\n");
if (g_Slot4 == CT_MouseInterface) // TODO: Check all slots for MouseInterface card
{
DIMouse::DirectInputInit(g_hFrameWindow);
LogFileOutput("Main: DIMouse::DirectInputInit()\n");
}
Snapshot_Startup(); // Do this after everything has been init'ed
LogFileOutput("Main: Snapshot_Startup()\n");

9
AppleWin/source/Frame.cpp
View File

@ -750,8 +750,8 @@ LRESULT CALLBACK FrameWndProc (
DSInit();
LogFileOutput("WM_CREATE: DSInit()\n");
// DIMouse::DirectInputInit(window);
// LogFileOutput("WM_CREATE: DIMouse::DirectInputInit()\n");
DIMouse::DirectInputInit(window);
LogFileOutput("WM_CREATE: DIMouse::DirectInputInit()\n");
MB_Initialize();
LogFileOutput("WM_CREATE: MB_Initialize()\n");
@ -1130,8 +1130,9 @@ LRESULT CALLBACK FrameWndProc (
break;
case WM_MOUSEMOVE: {
int x = LOWORD(lparam);
int y = HIWORD(lparam);
// MSDN: "WM_MOUSEMOVE message" : Do not use the LOWORD or HIWORD macros to extract the x- and y- coordinates...
int x = GET_X_LPARAM(lparam);
int y = GET_Y_LPARAM(lparam);
int newover = (((x >= buttonx) &&
(x <= buttonx+BUTTONCX) &&
(y >= buttony) &&