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

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

@@ -17 +17 @@
 #include <string.h>
 #include <misc.h>
-#include <win32dlg.h>
+#include "win32dlg.h"
 #include <win/winproc.h>
 #include "oslibmsg.h"
@@ -229 +229 @@
     if (hMenu) DestroyMenu( hMenu );
 
-    WINPROC_FreeProc(Win32DlgProc, WIN_PROC_WINDOW);
+    WINPROC_FreeProc((HWINDOWPROC)Win32DlgProc, WIN_PROC_WINDOW);
 }
 //******************************************************************************
@@ -1185 +1185 @@
             type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
         }
-        oldval = (LONG)WINPROC_GetProc(Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
+        oldval = (LONG)WINPROC_GetProc((HWINDOWPROC)Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
         WINPROC_SetProc((HWINDOWPROC *)&Win32DlgProc, (WNDPROC)value, type, WIN_PROC_WINDOW);
         return oldval;
@@ -1209 +1209 @@
     {
     case DWL_DLGPROC:
-        return (ULONG)WINPROC_GetProc(Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
+        return (ULONG)WINPROC_GetProc((HWINDOWPROC)Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
     case DWL_MSGRESULT:
         return msgResult;