commit bfb4a23aa98d1b4c5f17360c03118ac274a75a2a
author Alexandre Julliard <julliard@winehq.org> Mon Aug 06 18:05:47 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Aug 06 18:05:47 2001 +0000
tree 129d9f6f70c36d5426729c3e52538e1413ae1286
parent 4de0df77cff066e60673b98a487820b6a075045b

Replaced MSG_InternalGetMessage calls by equivalent exported APIs.

windows/dialog.c

diff --git a/windows/dialog.c b/windows/dialog.c
index 449b016..e76ab26 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -25,7 +25,6 @@
 #include "heap.h"
 #include "win.h"
 #include "user.h"
-#include "message.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(dialog);
@@ -1053,13 +1052,25 @@
     if (!(dlgInfo->flags & DF_END)) /* was EndDialog called in WM_INITDIALOG ? */
     {
         ShowWindow( hwnd, SW_SHOW );
-        while (MSG_InternalGetMessage(&msg, hwnd, ownerMsg, 0, 0, MSGF_DIALOGBOX,
-                                      PM_REMOVE, !(wndPtr->dwStyle & DS_NOIDLEMSG), NULL ))
+        for (;;)
         {
-            if (!(dlgInfo->flags & DF_END) && (!IsDialogMessageA( hwnd, &msg)))
+            if (!(wndPtr->dwStyle & DS_NOIDLEMSG))
+            {
+                if (!PeekMessageW( &msg, 0, 0, 0, PM_REMOVE ))
+                {
+                    /* No message present -> send ENTERIDLE and wait */
+                    SendMessageW( ownerMsg, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd );
+                    if (!GetMessageW( &msg, 0, 0, 0 )) break;
+                }
+            }
+            else if (!GetMessageW( &msg, 0, 0, 0 )) break;
+
+            if (CallMsgFilterW( &msg, MSGF_DIALOGBOX )) continue;
+
+            if (!(dlgInfo->flags & DF_END) && !IsDialogMessageW( hwnd, &msg))
             {
                 TranslateMessage( &msg );
-                DispatchMessageA( &msg );
+                DispatchMessageW( &msg );
             }
             if (dlgInfo->flags & DF_END) break;
         }
@@ -1460,7 +1471,7 @@
 
         case VK_RETURN:
             {
-                DWORD dw = SendMessage16( hwndDlg, DM_GETDEFID, 0, 0 );
+                DWORD dw = SendMessageW( hwndDlg, DM_GETDEFID, 0, 0 );
                 if (HIWORD(dw) == DC_HASDEFID)
                 {
                     SendMessageA( hwndDlg, WM_COMMAND,