Changeset 21916 for trunk/src/user32/win32dlg.cpp

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• src/user32/win32dlg.cpp (modified) (9 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/src/user32/win32dlg.cpp

@@ -17 +17 @@
 #include <string.h>
 #include <misc.h>
-#include <win32dlg.h>
-#include <win\winproc.h>
+#include "win32dlg.h"
+#include <win/winproc.h>
 #include "oslibmsg.h"
 #include "oslibwin.h"
@@ -202 +202 @@
 
     //Mask away WS_CAPTION style for dialogs with DS_CONTROL style
-    //(necessary for OFN_ENABLETEMPLATE file open dialogs) 
+    //(necessary for OFN_ENABLETEMPLATE file open dialogs)
     //(verified this behaviour in NT4, SP6)
     if (dlgInfo.style & DS_CONTROL)     cs.style &= ~(WS_CAPTION);
@@ -229 +229 @@
     if (hMenu) DestroyMenu( hMenu );
 
-    WINPROC_FreeProc(Win32DlgProc, WIN_PROC_WINDOW);
+    WINPROC_FreeProc((HWINDOWPROC)Win32DlgProc, WIN_PROC_WINDOW);
 }
 //******************************************************************************
@@ -265 +265 @@
 
         HWND hwndPreInitFocus = GetFocus();
-        if(SendMessageA(getWindowHandle(), WM_INITDIALOG, (WPARAM)hwndFocus, param)) 
+        if(SendMessageA(getWindowHandle(), WM_INITDIALOG, (WPARAM)hwndFocus, param))
         {
             //SvL: Experiments in NT4 show that dialogs that are children don't
             //     receive focus. Not sure if this is always true. (couldn't
             //     find any remarks about this in the SDK docs)
-            if(!(getStyle() & WS_CHILD)) 
+            if(!(getStyle() & WS_CHILD))
             {
                 /* check where the focus is again,
@@ -285 +285 @@
             //     receive focus. Not sure if this is always true. (couldn't
             //     find any remarks about this in the SDK docs)
-            if(!(getStyle() & WS_CHILD)) 
+            if(!(getStyle() & WS_CHILD))
             {
                 /* If the dlgproc has returned FALSE (indicating handling of keyboard focus)
@@ -379 +379 @@
                        HOOK_CallHooksA( WH_MSGFILTER, MSGF_DIALOGBOX, 0,
                                           (LPARAM) pmsg ));
-                       
+
                 HeapFree( GetProcessHeap(), 0, pmsg );
                 if (ret)
@@ -1163 +1163 @@
 
     /* unblock dialog loop */
-    PostMessageA(hwnd, WM_NULL, 0, 0); 
+    PostMessageA(hwnd, WM_NULL, 0, 0);
     return TRUE;
 }
@@ -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;

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk