Changeset 7765 for trunk/src

Timestamp:

Jan 12, 2002, 3:09:54 PM (24 years ago)

Author:

sandervl

Message:

CreateFakeWindowEx changes + added DestroyFakeWindow

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• oslibwin.cpp (modified) (2 diffs)
• oslibwin.h (modified) (3 diffs)
• win32wbase.cpp (modified) (6 diffs)
• win32wbase.h (modified) (2 diffs)
• window.cpp (modified) (2 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.68 2002-01-12 09:55:51 sandervl Exp $
+; $Id: USER32.DEF,v 1.69 2002-01-12 14:09:30 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -698 +698 @@
 
     _CreateFakeWindowEx@8                                        @2028 NONAME
+    _DestroyFakeWindow@4                                         @2035 NONAME
     _checkOrigin@4                                               @2029 NONAME
 

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.111 2001-12-22 12:12:06 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.112 2002-01-12 14:09:30 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -357 +357 @@
 {
   return WinDestroyWindow(hwnd);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL  OSLibWinQueryWindowClientRect(HWND hwndOS2, PRECT pRect)
+{
+ BOOL     rc;
+ RECTLOS2 rectl;
+
+  rc = WinQueryWindowRect(hwndOS2, (PRECTL)&rectl);
+  if(rc) {
+        pRect->left   = 0;
+        pRect->right  = rectl.xRight - rectl.xLeft;
+        pRect->top    = 0;
+        pRect->bottom = rectl.yTop - rectl.yBottom;
+  }
+  else  memset(pRect, 0, sizeof(RECT));
+  return rc;
 }
 //******************************************************************************

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.62 2001-11-30 13:53:50 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.63 2002-01-12 14:09:31 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -74 +74 @@
 HWND OSLibWinWindowFromID(HWND hwndParent,ULONG id);
 BOOL OSLibWinSetFocus(HWND hwndDeskTop,HWND hwndNewFocus, BOOL activate);
-ULONG OSLibGetWindowHeight(HWND hwnd); //for point transformation
 
 extern ULONG ScreenHeight, ScreenWidth;
@@ -239 +238 @@
 #define RELATIVE_TO_SCREEN 1
 BOOL  OSLibWinQueryWindowRect(Win32BaseWindow *window, PRECT pRect, int RelativeTo = RELATIVE_TO_WINDOW);
+ULONG OSLibGetWindowHeight(HWND hwnd); //for point transformation
+
+BOOL  OSLibWinQueryWindowClientRect(HWND hwnd, PRECT pRect);
+
 BOOL  OSLibWinCalcFrameRect(HWND hwnd, RECT *pRect, BOOL fClient);
 BOOL  OSLibGetMinMaxInfo(HWND hwndFrame, MINMAXINFO *pMinMax);

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.310 2002-01-12 09:55:51 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.311 2002-01-12 14:09:31 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -111 +111 @@
                      : GenericObject(&windows, &critsect), ChildWindow(&critsect)
 {
-  Init();
+    Init();
 }
 //******************************************************************************
@@ -143 +143 @@
     dwOldStyle = dwStyle;
     dwExStyle  = 0;
+
+    //We pretend this window has no parent and won't change size
+    //(dangerous assumption!!)
+    OSLibWinQueryWindowClientRect(OS2Hwnd, &rectClient);
+    rectWindow = rectClient;
+
+    fFakeWindow = TRUE;
 }
 //******************************************************************************
@@ -149 +156 @@
                      : GenericObject(&windows, &critsect), ChildWindow(&critsect)
 {
-  Init();
-  this->isUnicode = isUnicode;
-  CreateWindowExA(lpCreateStructA, classAtom);
+    Init();
+    this->isUnicode = isUnicode;
+    CreateWindowExA(lpCreateStructA, classAtom);
 }
 //******************************************************************************
@@ -171 +178 @@
   fVisibleRegionChanged = FALSE;
   fEraseBkgndFlag  = TRUE;
+  fFakeWindow      = FALSE;
 
   state            = STATE_INIT;
@@ -315 +323 @@
     if(owner && !fDestroyAll) {
         RELEASE_WNDOBJ(owner);
-    }
-    if(windowClass) {
-        RELEASE_CLASSOBJ(windowClass);
     }
 }

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.137 2002-01-12 09:55:52 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.138 2002-01-12 14:09:31 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -429 +429 @@
                  fMinMaxChange:1,        //set when switching between min/max/restored state
                  fVisibleRegionChanged:1, //set when visible region has changed -> erase background must be sent during next BeginPaint
-                 fEraseBkgndFlag:1;
+                 fEraseBkgndFlag:1,
+                 fFakeWindow:1;
 
         ULONG   state;

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.114 2002-01-12 09:55:52 sandervl Exp $ */
+/* $Id: window.cpp,v 1.115 2002-01-12 14:09:32 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -281 +281 @@
     RELEASE_WNDOBJ(window);
     return hwnd;
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION1(BOOL, DestroyFakeWindow,
+              HWND, hwnd)
+{
+  Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("DestroyFakeWindow, window %x not found", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
+    }
+    delete window;
+    return TRUE;
 }
 //******************************************************************************