Changeset 4686 for trunk/src

Timestamp:

Nov 24, 2000, 11:30:36 AM (25 years ago)

Author:

sandervl

Message:

Dialog message fixes

Location:

trunk/src/user32

Files:

• win32dlg.cpp (modified) (8 diffs)
• win32dlg.h (modified) (2 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.53 2000-10-06 15:15:00 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.54 2000-11-24 10:30:36 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -49 +49 @@
     idResult     = 0;
     dialogFlags  = 0;
+    fDialogInit  = FALSE;
     memset(&dlgInfo, 0, sizeof(dlgInfo));
 
@@ -76 +77 @@
     if (dlgInfo.style & DS_SETFONT)
     {
-          /* The font height must be negative as it is a point size */
-          /* and must be converted to pixels first */
-          /* (see CreateFont() documentation in the Windows SDK).   */
-        HDC dc = GetDC(0);
-        int pixels = dlgInfo.pointSize * GetDeviceCaps(dc , LOGPIXELSY)/72;
-        ReleaseDC(0, dc);
+        /* The font height must be negative as it is a point size */
+        /* and must be converted to pixels first */
+        /* (see CreateFont() documentation in the Windows SDK).   */
+        HDC dc = GetDC(0);
+        int pixels = dlgInfo.pointSize * GetDeviceCaps(dc , LOGPIXELSY)/72;
+        ReleaseDC(0, dc);
 
         hUserFont = CreateFontW(-pixels, 0, 0, 0,
@@ -238 +239 @@
         dprintf(("dlg ctor: GetNextDlgTabItem returned %x, capture hwnd = %x", hwndFocus, GetCapture()));
 
-        HWND hwndPreInitFocus = GetFocus();
+        fDialogInit = TRUE; //WM_NCCALCSIZE can now be sent to dialog procedure
+
+        HWND hwndPreInitFocus = GetFocus();
         if(SendInternalMessageA(WM_INITDIALOG, (WPARAM)hwndFocus, param)) {
-                SetFocus(hwndFocus);
-        }
-        else
-        {
-                /* If the dlgproc has returned FALSE (indicating handling of keyboard focus)
-                   but the focus has not changed, set the focus where we expect it. */
-                if ( (getStyle() & WS_VISIBLE) && ( GetFocus() == hwndPreInitFocus ) )
-                        SetFocus( hwndFocus );
-        }
+            SetFocus(hwndFocus);
+        }
+        else
+        {
+            /* If the dlgproc has returned FALSE (indicating handling of keyboard focus)
+               but the focus has not changed, set the focus where we expect it. */
+                if ( (getStyle() & WS_VISIBLE) && ( GetFocus() == hwndPreInitFocus ) )
+                    SetFocus( hwndFocus );
+        }
 
         if (dlgInfo.style & WS_VISIBLE && !(getStyle() & WS_VISIBLE))
@@ -255 +258 @@
             UpdateWindow( getWindowHandle() );
         }
-        SetLastError(0);
+        SetLastError(ERROR_SUCCESS);
         dprintf(("********* DIALOG CREATED ************"));
         return TRUE;
@@ -858 +861 @@
     msgResult = 0;
 
+    //Dialogs never receive these messages
+    if (Msg == WM_CREATE || Msg == WM_NCCREATE) {
+        return (LRESULT)1;
+    }
+    //Never send a WM_NCCALCSIZE to a dialog before it has received it's WM_INITDIALOG message
+    //(causes problems for sysinf32.exe)
+    if(!fDialogInit && Msg == WM_NCCALCSIZE) {
+        return DefWindowProcA(Msg, wParam, lParam );
+    }
+
     if (Win32DlgProc) {      /* Call dialog procedure */
         result = Win32DlgProc(getWindowHandle(), Msg, wParam, lParam);
@@ -902 +915 @@
     msgResult = 0;
 
+    //Dialogs never receive these messages
+    if (Msg == WM_CREATE || Msg == WM_NCCREATE) {
+        return (LRESULT)1;
+    }
+    //Never send a WM_NCCALCSIZE to a dialog before it has received it's WM_INITDIALOG message
+    //(causes problems for sysinf32.exe)
+    if(!fDialogInit && Msg == WM_NCCALCSIZE) {
+        return DefWindowProcW(Msg, wParam, lParam );
+    }
+
     if (Win32DlgProc) {      /* Call dialog procedure */
         result = Win32DlgProc(getWindowHandle(), Msg, wParam, lParam);
@@ -1069 +1092 @@
     case DWL_DLGPROC:
     {
-        //Note: Type of SetWindowLong determines new window proc type
+    //Note: Type of SetWindowLong determines new window proc type
         //      UNLESS the new window proc has already been registered
         //      (use the old type in that case)
         //      (VERIFIED in NT 4, SP6)
         WINDOWPROCTYPE type = WINPROC_GetProcType((HWINDOWPROC)value);
-        if(type == WIN_PROC_INVALID) {
-                type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
-        }
+    if(type == WIN_PROC_INVALID) {
+        type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
+    }
         oldval = (LONG)WINPROC_GetProc(Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
         WINPROC_SetProc((HWINDOWPROC *)&Win32DlgProc, (WNDPROC)value, type, WIN_PROC_WINDOW);

trunk/src/user32/win32dlg.h

@@ -1 @@
-/* $Id: win32dlg.h,v 1.11 2000-06-07 14:51:30 sandervl Exp $ */
+/* $Id: win32dlg.h,v 1.12 2000-11-24 10:30:36 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -75 +75 @@
 virtual  ULONG  MsgCreate(HWND hwndOS2);
 
-virtual  LONG   SetWindowLongA(int index, ULONG value, BOOL fUnicode = FALSE);
-virtual  ULONG  GetWindowLongA(int index, BOOL fUnicode = FALSE);
+virtual  LONG   SetWindowLongA(int index, ULONG value, BOOL fUnicode = FALSE);
+virtual  ULONG  GetWindowLongA(int index, BOOL fUnicode = FALSE);
 
-static   ULONG  GetDialogBaseUnits()  { return MAKELONG(xBaseUnit, yBaseUnit); };
+static   ULONG  GetDialogBaseUnits()  { return MAKELONG(xBaseUnit, yBaseUnit); };
 
-           INT  doDialogBox();
+       INT  doDialogBox();
 
 protected:
-        BOOL    DIALOG_Init(void);
-        BOOL    getCharSizeFromDC( HDC hDC, HFONT hFont, SIZE * pSize );
-        BOOL    getCharSize( HFONT hFont, SIZE * pSize);
-        LPCSTR  parseTemplate( LPCSTR dlgtemplate, DLG_TEMPLATE *result);
+    BOOL    DIALOG_Init(void);
+    BOOL    getCharSizeFromDC( HDC hDC, HFONT hFont, SIZE * pSize );
+    BOOL    getCharSize( HFONT hFont, SIZE * pSize);
+    LPCSTR  parseTemplate( LPCSTR dlgtemplate, DLG_TEMPLATE *result);
         WORD   *getControl(const WORD *p, DLG_CONTROL_INFO *info, BOOL dialogEx);
-        BOOL    createControls(LPCSTR dlgtemplate, HINSTANCE hInst);
-        
-        LRESULT DefDlg_Proc(UINT msg, WPARAM wParam, LPARAM lParam);
+    BOOL    createControls(LPCSTR dlgtemplate, HINSTANCE hInst);
+
+    LRESULT DefDlg_Proc(UINT msg, WPARAM wParam, LPARAM lParam);
         LRESULT DefDlg_Epilog(UINT msg, BOOL fResult);
 
-        BOOL    setDefButton(HWND hwndNew );
-        HWND    findDefButton();
-        BOOL    saveFocus();
-        BOOL    restoreFocus();
-        void    setFocus(HWND hwndCtrl );
+    BOOL    setDefButton(HWND hwndNew );
+    HWND    findDefButton();
+    BOOL    saveFocus();
+    BOOL    restoreFocus();
+    void    setFocus(HWND hwndCtrl );
 
-        // values normally contained in the standard dialog words
-      DLGPROC   Win32DlgProc;   //DWL_WNDPROC
-        ULONG   msgResult;      //DWL_MSGRESULT
-        ULONG   userDlgData;    //DWL_USER
+    // values normally contained in the standard dialog words
+    DLGPROC Win32DlgProc;   //DWL_WNDPROC
+    ULONG   msgResult;  //DWL_MSGRESULT
+    ULONG   userDlgData;    //DWL_USER
 
    DLG_TEMPLATE dlgInfo;
-        WORD    xUnit;
-        WORD    yUnit;
-        HWND    hwndFocus;
-        HFONT   hUserFont;
-        HMENU   hMenu;
-        DWORD   idResult;
-        DWORD   dialogFlags;
+    WORD    xUnit;
+    WORD    yUnit;
+    HWND    hwndFocus;
+    HFONT   hUserFont;
+    HMENU   hMenu;
+    DWORD   idResult;
+    DWORD   dialogFlags;
+    BOOL    fDialogInit;
 
-        DWORD   tmpParam;       //set in ctor, used in MsgCreate method
-        LPSTR   tmpDlgTemplate; //set in ctor, used in MsgCreate method
+    DWORD   tmpParam;       //set in ctor, used in MsgCreate method
+    LPSTR   tmpDlgTemplate; //set in ctor, used in MsgCreate method
+
 private:
  static BOOL    fInitialized;