Changeset 7762 for trunk/src

Timestamp:

Jan 12, 2002, 10:58:36 AM (24 years ago)

Author:

sandervl

Message:

CreateFakeWindowEx change

Location:

trunk/src/user32

Files:

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

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.67 2001-09-30 22:24:40 sandervl Exp $
+; $Id: USER32.DEF,v 1.68 2002-01-12 09:55:51 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -697 +697 @@
     _IsSystemPen@4                                               @2027 NONAME
 
-    _CreateFakeWindowEx@4                                        @2028 NONAME
+    _CreateFakeWindowEx@8                                        @2028 NONAME
     _checkOrigin@4                                               @2029 NONAME
 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.309 2002-01-07 11:18:10 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.310 2002-01-12 09:55:51 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
  *
- * Copyright 1998-2001 Sander van Leeuwen (sandervl@xs4all.nl)
+ * Copyright 1998-2002 Sander van Leeuwen (sandervl@xs4all.nl)
  * Copyright 1999      Daniela Engert (dani@ngrt.de)
  * Copyright 1999-2000 Christoph Bratschi (cbratschi@datacomm.ch)
@@ -115 +115 @@
 //******************************************************************************
 //******************************************************************************
-Win32BaseWindow::Win32BaseWindow(HWND hwndOS2, ULONG reserved)
+Win32BaseWindow::Win32BaseWindow(HWND hwndOS2, ATOM classAtom)
                      : GenericObject(&windows, &critsect), ChildWindow(&critsect)
 {
-  Init();
-  OS2Hwnd = hwndOS2;
+    Init();
+    OS2Hwnd = OS2HwndFrame = hwndOS2;
+
+    /* Find the window class */
+    windowClass = Win32WndClass::FindClass(NULL, (LPSTR)classAtom);
+    if (!windowClass)
+    {
+        char buffer[32];
+        GlobalGetAtomNameA( classAtom, buffer, sizeof(buffer) );
+        dprintf(("Bad class '%s'", buffer ));
+        DebugInt3();
+    }
+
+    //Allocate window words
+    nrUserWindowBytes = windowClass->getExtraWndBytes();
+    if(nrUserWindowBytes) {
+        userWindowBytes = (char *)_smalloc(nrUserWindowBytes);
+        memset(userWindowBytes, 0, nrUserWindowBytes);
+    }
+
+    WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, windowClass->getWindowProc(), WINPROC_GetProcType(windowClass->getWindowProc()), WIN_PROC_WINDOW);
+    hInstance  = NULL;
+    dwStyle    = WS_VISIBLE;
+    dwOldStyle = dwStyle;
+    dwExStyle  = 0;
 }
 //******************************************************************************

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.136 2002-01-07 11:18:11 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.137 2002-01-12 09:55:52 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -136 +136 @@
                 Win32BaseWindow();
                 Win32BaseWindow(CREATESTRUCTA *lpCreateStructA, ATOM classAtom, BOOL isUnicode);
-                Win32BaseWindow(HWND hwndOS2, ULONG reserved);
+                Win32BaseWindow(HWND hwndOS2, ATOM classAtom);
 
 virtual        ~Win32BaseWindow();

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.113 2001-10-28 15:24:16 sandervl Exp $ */
+/* $Id: window.cpp,v 1.114 2002-01-12 09:55:52 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -263 +263 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(HWND, CreateFakeWindowEx,
-              HWND, hwndOS2)
+ODINFUNCTION2(HWND, CreateFakeWindowEx,
+              HWND, hwndOS2, ATOM, classAtom)
 {
  Win32BaseWindow *window;
 
-    window = new Win32BaseWindow(hwndOS2, 0);
+    window = new Win32BaseWindow(hwndOS2, classAtom);
     if(window == NULL)
     {