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

Timestamp:

Oct 28, 1999, 2:01:12 PM (26 years ago)

Author:

sandervl

Message:

misc changes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.62 1999-10-23 23:04:38 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.63 1999-10-28 12:00:34 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -35 +35 @@
 #include "syscolor.h"
 #include "win32wndhandle.h"
-#include "heapshared.h"
 #include "dc.h"
 #include "pmframe.h"
@@ -508 +507 @@
   DWORD dwOSWinStyle, dwOSFrameStyle;
 
-  OSLibWinConvertStyle(cs->style, &cs->dwExStyle, &dwOSWinStyle, &dwOSFrameStyle, &borderWidth, &borderHeight);
-  dwExStyle = cs->dwExStyle;
+  OSLibWinConvertStyle(dwStyle, &dwExStyle, &dwOSWinStyle, &dwOSFrameStyle, &borderWidth, &borderHeight);
 
   rectWindow.left   = cs->x;
@@ -576 +574 @@
   }
   if(OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_MAGIC, WIN32PM_MAGIC) == FALSE) {
-        dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2Hwnd));
-        SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
-        return FALSE;
-  }
-  //SvL: Need to store the shared memory base, or else other apps can map it into their memory space
-  if(OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_SHAREDMEM, HeapGetSharedMemBase()) == FALSE) {
         dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2Hwnd));
         SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
@@ -594 +586 @@
     }
     if(OSLibWinSetWindowULong(OS2HwndFrame, OFFSET_WIN32PM_MAGIC, WIN32PM_MAGIC) == FALSE) {
-            dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2HwndFrame));
-            SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
-            return FALSE;
-    }
-    //SvL: Need to store the shared memory base, or else other apps can map it into their memory space
-    if(OSLibWinSetWindowULong(OS2HwndFrame, OFFSET_WIN32PM_SHAREDMEM, HeapGetSharedMemBase()) == FALSE) {
             dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2HwndFrame));
             SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
@@ -2314 +2300 @@
 
             if(wnd) {
-                LPVOID sharedmembase = (LPVOID)OSLibWinGetWindowULong(hwnd, OFFSET_WIN32PM_SHAREDMEM);
-
-                if(OSLibDosGetSharedMem(sharedmembase, MAX_HEAPSIZE, OSLIB_PAG_READ) != 0) {
-                    dprintf(("OSLibDosGetSharedMem returned error for %x", wnd));
-                    break;
-                }
                 if(wnd->getWindowClass()->hasClassName(lpszClass, fUnicode) &&
                    (!lpszWindow || wnd->hasWindowName(lpszWindow, fUnicode)))