Changeset 21808 for branches/gcc-kmk/src/user32/win32wbase.cpp

Timestamp:

Nov 14, 2011, 11:03:47 PM (14 years ago)

Author:

dmik

Message:

Port USER32.DLL (continued).

File:

• branches/gcc-kmk/src/user32/win32wbase.cpp (modified) (8 diffs)

branches/gcc-kmk/src/user32/win32wbase.cpp

@@ -64 +64 @@
 #include <wprocess.h>
 #include <win/hook.h>
-#include <menu.h>
+#include "menu.h"
 #define INCL_TIMERWIN32
 #include "timer.h"
@@ -79 +79 @@
 void PrintWindowStyle(DWORD dwStyle, DWORD dwExStyle);
 
-static fDestroyAll = FALSE;
+static BOOL fDestroyAll = FALSE;
 //For quick lookup of current process id
 static ULONG currentProcessId = -1;
@@ -308 +308 @@
 {
     dprintf2(("IsWindowUnicode %x %d", getWindowHandle(), WINPROC_GetProcType(getWindowProc()) == WIN_PROC_32W));
-    return (WINPROC_GetProcType(getWindowProc()) == WIN_PROC_32W);
+    return (WINPROC_GetProcType((HWINDOWPROC)getWindowProc()) == WIN_PROC_32W);
 }
 //******************************************************************************
@@ -461 +461 @@
     }
 
-    WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII), WINPROC_GetProcType(windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII)), WIN_PROC_WINDOW);
+    WINPROC_SetProc((HWINDOWPROC *)&win32wndproc,
+                    windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII),
+                    WINPROC_GetProcType((HWINDOWPROC)windowClass->getWindowProc((isUnicode) ? WNDPROC_UNICODE : WNDPROC_ASCII)),
+                    WIN_PROC_WINDOW);
     hInstance  = cs->hInstance;
     dwStyle    = cs->style & ~WS_VISIBLE;
@@ -3860 +3863 @@
                     type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
                 }
-                oldval = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
+                oldval = (LONG)WINPROC_GetProc((HWINDOWPROC)win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
                 dprintf(("SetWindowLong%c GWL_WNDPROC %x old %x new wndproc %x", (fUnicode) ? 'W' : 'A', getWindowHandle(), oldval, value));
                 WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, (WNDPROC)value, type, WIN_PROC_WINDOW);
@@ -3916 +3919 @@
         break;
     case GWL_WNDPROC:
-        value = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
+        value = (LONG)WINPROC_GetProc((HWINDOWPROC)win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
         break;
     case GWL_HINSTANCE:
@@ -4115 +4118 @@
 {
     lock(&critsect);
-    for(int i=0;i<MAX_OPENDCS;i++) {
+    int i;
+    for(i=0;i<MAX_OPENDCS;i++) {
         if(hdcWindow[i] == 0) {
             hdcWindow[i] = hdc;
@@ -4154 +4158 @@
     }
     lock(&critsect);
-    for(int i=0;i<MAX_OPENDCS;i++) {
+    int i;
+    for(i=0;i<MAX_OPENDCS;i++) {
         if(hdcWindow[i] == hdc) {
             hdcWindow[i] = 0;