Changeset 1405 for trunk/src/user32/win32wbase.cpp

Timestamp:

Oct 22, 1999, 8:11:51 PM (26 years ago)

Author:

sandervl

Message:

Lots of changes/fixes

File:

• trunk/src/user32/win32wbase.cpp (modified) (9 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.58 1999-10-21 12:19:28 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.59 1999-10-22 18:11:48 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -137 +137 @@
   fNoSizeMsg       = FALSE;
   fIsDestroyed     = FALSE;
+  fCreated         = FALSE;
 
   windowNameA      = NULL;
@@ -558 +559 @@
  POINT maxPos;
  CREATESTRUCTA  *cs = tmpcs;  //pointer to CREATESTRUCT used in CreateWindowExA method
+ RECT rectWndTmp, rectClientTmp;
 
   OS2Hwnd      = hwndClient;
   OS2HwndFrame = hwndFrame;
-//  if(!isFrameWindow())
-//        OS2HwndFrame = hwndClient;
+
+  //make backup copy of rectangles (some calls below result in WM_WINDOWPOSCHANGED with weird values since we haven't
+  //set our window size just yet)
+  rectWndTmp   = rectWindow;
+  rectClientTmp = rectClient;
 
   fNoSizeMsg = TRUE;
@@ -621 +626 @@
   fakeWinBase.hwndThis     = OS2Hwnd;
   fakeWinBase.pWindowClass = windowClass;
-//  SetFakeOpen32();
 
   //Set icon from class
@@ -649 +653 @@
   if (isChild()) FrameSetBorderSize(this,TRUE);
 
+  //restore rectangles (some calls below result in WM_WINDOWPOSCHANGED with weird values since we haven't
+  //set our window size just yet)
+  rectWindow = rectWndTmp;
+  rectClient = rectClientTmp;
+
   /* Send the WM_CREATE message
    * Perhaps we shouldn't allow width/height changes as well.
@@ -672 +681 @@
   if(SendMessageA(WM_NCCREATE, 0, (LPARAM)cs) )
   {
+        fCreated = TRUE;
+
         SendNCCalcSize(FALSE, &rectWindow, NULL, NULL, 0, &rectClient );
 
@@ -1559 +1570 @@
             return result;
     }
+    case WM_NOTIFY:
+        return 0; //comctl32 controls expect this
 
     default:
+        if(Msg > WM_USER) {
+            return 0;
+        }
         return 1;
     }
@@ -1593 +1609 @@
  LRESULT rc;
  BOOL    fInternalMsgBackup = fInternalMsg;
+
+  //SvL: Some Wine controls send WM_COMMAND messages when they receive the focus -> apps don't like to
+  //     receive those before they get their WM_CREATE message
+  //NOTE: May need to refuse more messages
+  if(fCreated == FALSE && Msg == WM_COMMAND) {
+        dprintf(("SendMessageA BEFORE creation! %s for %x %x %x", GetMsgText(Msg), getWindowHandle(), wParam, lParam));
+        return 0;
+  }
 
   if(Msg != WM_GETDLGCODE && Msg != WM_ENTERIDLE) {//sent *very* often
@@ -1646 +1670 @@
  LRESULT rc;
  BOOL    fInternalMsgBackup = fInternalMsg;
+
+  //SvL: Some Wine controls send WM_COMMAND messages when they receive the focus -> apps don't like to
+  //     receive those before they get their WM_CREATE message
+  //NOTE: May need to refuse more messages
+  if(fCreated == FALSE && Msg == WM_COMMAND) {
+        dprintf(("SendMessageA BEFORE creation! %s for %x %x %x", GetMsgText(Msg), getWindowHandle(), wParam, lParam));
+        return 0;
+  }
 
   if(Msg != WM_GETDLGCODE && Msg != WM_ENTERIDLE) {//sent *very* often