Changeset 21808 for branches/gcc-kmk/src/user32/win32class.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/win32class.cpp (modified) (6 diffs)

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

@@ -32 +32 @@
 #include <assert.h>
 #include <misc.h>
-#include <win32class.h>
-#include <win32wnd.h>
+#include "win32class.h"
+#include "win32wnd.h"
 #include <win/winproc.h>
 #include <unicode.h>
@@ -40 +40 @@
 #include "dbglocal.h"
 
-static fDestroyAll = FALSE;
+static BOOL fDestroyAll = FALSE;
 
 //******************************************************************************
@@ -169 +169 @@
 
   if(pfnWindowProcA)
-      WINPROC_FreeProc(pfnWindowProcA, WIN_PROC_CLASS);
+      WINPROC_FreeProc((HWINDOWPROC)pfnWindowProcA, WIN_PROC_CLASS);
   if(pfnWindowProcW)
-      WINPROC_FreeProc(pfnWindowProcW, WIN_PROC_CLASS);
+      WINPROC_FreeProc((HWINDOWPROC)pfnWindowProcW, WIN_PROC_CLASS);
 
   if(userClassBytes)    free(userClassBytes);
@@ -457 +457 @@
                         pfnWindowProc = pfnWindowProcW;
                 }
-                return (ULONG) WINPROC_GetProc(pfnWindowProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
+                return (ULONG) WINPROC_GetProc((HWINDOWPROC)pfnWindowProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
         }
         case GCW_ATOM: //TODO: does this really happen in windows?
@@ -556 +556 @@
                         proc = &pfnWindowProcW;
                 }
-                rc = (LONG)WINPROC_GetProc(*proc, type );
+                rc = (LONG)WINPROC_GetProc((HWINDOWPROC)*proc, type );
                 WINPROC_SetProc((HWINDOWPROC *)proc, (WNDPROC)lNewVal, type, WIN_PROC_CLASS);
 
@@ -564 +564 @@
                     if (proc == &pfnWindowProcA)
                     {
-                        WINPROC_FreeProc( pfnWindowProcW, WIN_PROC_CLASS );
+                        WINPROC_FreeProc( (HWINDOWPROC)pfnWindowProcW, WIN_PROC_CLASS );
                         pfnWindowProcW = 0;
                     }
                     else
                     {
-                        WINPROC_FreeProc( pfnWindowProcA, WIN_PROC_CLASS );
+                        WINPROC_FreeProc( (HWINDOWPROC)pfnWindowProcA, WIN_PROC_CLASS );
                         pfnWindowProcA = 0;
                     }