[jimtabor] 23408: - User32 Dialog.c Synced closer to wine source.

Author: jimtabor
Date: Wed Aug  2 00:51:43 2006
New Revision: 23408

URL: http://svn.reactos.org/svn/reactos?rev=23408&view=rev
Log:
- User32 Dialog.c Synced closer to wine source.

Modified:
    branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/dialog.c

Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/dialog.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win...
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/dialog.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/dialog.c Wed Aug  2 00:51:43 2006
@@ -875,7 +875,7 @@
         infoPtr->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE );
        if (!IsWindow( infoPtr->hwndFocus )) return;
     }
-    DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus );
+    SetFocus( infoPtr->hwndFocus );

/* This used to set infoPtr->hwndFocus to NULL for no apparent reason,
        sometimes losing focus when receiving WM_SETFOCUS messages. */
@@ -1004,7 +1004,7 @@
             return 1;
         }
         case WM_NCDESTROY:
-            if ((dlgInfo = GETDLGINFO(hwnd)))
+            if ((dlgInfo = (DIALOGINFO *)SetWindowLongPtrW( hwnd, DWLP_ROS_DIALOGINFO, 0 )))
             {
                 /* Free dialog heap (if created) */
                 /*if (dlgInfo->hDialogHeap)
@@ -1067,8 +1067,8 @@
                 if (hwndFocus)
                 {
                     /* always make combo box hide its listbox control */
-                    if (!SendMessageA( hwndFocus, CB_SHOWDROPDOWN, FALSE, 0 ))
-                        SendMessageA( GetParent(hwndFocus), CB_SHOWDROPDOWN, FALSE, 0 );
+                    if (!SendMessageW( hwndFocus, CB_SHOWDROPDOWN, FALSE, 0 ))
+                        SendMessageW( GetParent(hwndFocus), CB_SHOWDROPDOWN, FALSE, 0 );
                 }
             }
             return DefWindowProcA( hwnd, msg, wParam, lParam );
@@ -1080,9 +1080,6 @@
             PostMessageA( hwnd, WM_COMMAND, MAKEWPARAM(IDCANCEL, BN_CLICKED),
                             (LPARAM)GetDlgItem( hwnd, IDCANCEL ) );
             return 0;
-
-        case WM_NOTIFYFORMAT:
-             return DefWindowProcA( hwnd, msg, wParam, lParam );
     }
     return 0;
 }