Changeset 1490 for trunk/src/user32

Timestamp:

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

Author:

sandervl

Message:

misc changes

Location:

trunk/src/user32

Files:

• Makefile (modified) (5 diffs)
• gen_object.h (modified) (4 diffs)
• initterm.cpp (modified) (4 diffs)
• pmframe.cpp (modified) (2 diffs)
• win32class.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (6 diffs)
• win32wbase.h (modified) (2 diffs)
• win32wbasepos.cpp (modified) (3 diffs)
• win32wmdichild.cpp (modified) (2 diffs)
• win32wmdiclient.cpp (modified) (2 diffs)
• win32wnd.cpp (modified) (3 diffs)

trunk/src/user32/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.37 1999-10-26 11:14:51 sandervl Exp $
+# $Id: Makefile,v 1.38 1999-10-28 12:00:33 sandervl Exp $
 
 #
@@ -25 +25 @@
 
 OBJS =  user32.obj loadres.obj \
-        dde.obj heapshared.obj win32wndhandle.obj \
+        dde.obj win32wndhandle.obj \
         icon.obj hook.obj hooks.obj winmenu.obj \
         defwndproc.obj syscolor.obj char.obj initterm.obj \
@@ -91 +91 @@
 defwndproc.obj: defwndproc.cpp syscolor.h win32wmdiclient.h win32wbase.h win32wnd.h win32dlg.h
 hooks.obj: hooks.cpp hooks.h
-initterm.obj: initterm.cpp $(PDWIN32_INCLUDE)\spy.h pmwindow.h heapshared.h initterm.h
+initterm.obj: initterm.cpp $(PDWIN32_INCLUDE)\spy.h pmwindow.h initterm.h
 uitools.obj: uitools.cpp win32wbase.h
 unknown.obj: unknown.cpp
@@ -121 +121 @@
 pmwindow.obj:   pmwindow.cpp win32class.h win32wbase.h win32dlg.h pmwindow.h win32wndchild.h $(PDWIN32_INCLUDE)\wprocess.h oslibgdi.h oslibwin.h dc.h
 pmframe.obj: pmframe.cpp win32class.h win32wbase.h pmframe.h win32wndchild.h
-win32class.obj: win32class.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h
-win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h pmframe.h win32wdesktop.h
-win32wbasepos.obj: win32wbasepos.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h pmframe.h win32wdesktop.h
-win32wnd.obj:   win32wnd.cpp win32class.h win32wbase.h win32wnd.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h oslibmenu.h
-win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h oslibmsg.h controls.h
+win32class.obj: win32class.cpp win32class.h win32wbase.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h
+win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h pmframe.h win32wdesktop.h
+win32wbasepos.obj: win32wbasepos.cpp win32class.h win32wbase.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h pmframe.h win32wdesktop.h
+win32wnd.obj:   win32wnd.cpp win32class.h win32wbase.h win32wnd.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h oslibmenu.h
+win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h $(PDWIN32_INCLUDE)\heapshared.h oslibwin.h win32wndchild.h oslibmsg.h controls.h
 win32wndchild.obj: win32wndchild.cpp win32wndchild.h gen_object.h
 win32wmdiclient.obj: win32wmdiclient.cpp win32wbase.h win32wmdiclient.h win32wmdichild.h gen_object.h
 win32wmdichild.obj: win32wmdichild.cpp win32wbase.h win32wmdiclient.h win32wmdichild.h gen_object.h
 win32wdesktop.obj: win32wdesktop.cpp win32wbase.h win32wdesktop.h gen_object.h
-gen_object.obj: gen_object.cpp gen_object.h heapshared.h
+gen_object.obj: gen_object.cpp gen_object.h $(PDWIN32_INCLUDE)\heapshared.h
 oslibwin.obj:   oslibwin.cpp oslibwin.h oslibutil.h oslibgdi.h $(PDWIN32_INCLUDE)\winconst.h
 oslibutil.obj:  oslibutil.cpp oslibutil.h $(PDWIN32_INCLUDE)\wprocess.h oslibmsg.h
@@ -145 +145 @@
 dib.obj:        dib.cpp dib.h
 
-heapshared.obj: heapshared.cpp heapshared.h
-
 clean:
         $(RM) *.obj *.lib *.dll *.map *.pch *.res

trunk/src/user32/gen_object.h

@@ -1 @@
-/* $Id: gen_object.h,v 1.1 1999-09-15 23:18:50 sandervl Exp $ */
+/* $Id: gen_object.h,v 1.2 1999-10-28 12:00:33 sandervl Exp $ */
 /*
  * Generic Object Class for OS/2
@@ -9 +9 @@
 #define __GEN_OBJECT_H__
 
-#include "heapshared.h"
+#include <heapshared.h>
 
 #define OBJTYPE_WINDOW          0
@@ -43 +43 @@
         void *operator new(size_t size, const char *filename, size_t lineno)
         {
-                return _umalloc(sharedHeap, size);
+                return _smalloc(size);
         }
         void operator delete(void *location, const char *filename, size_t lineno)
@@ -52 +52 @@
         void *operator new(size_t size)
         {
-                return _umalloc(sharedHeap, size);
+                return _smalloc(size);
         }
         void operator delete(void *location)

trunk/src/user32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.13 1999-10-23 23:04:34 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.14 1999-10-28 12:00:34 sandervl Exp $ */
 
 /*
@@ -38 +38 @@
 #include <spy.h>
 #include "pmwindow.h"
-#include "heapshared.h"
 #include "win32wdesktop.h"
 #include "syscolor.h"
@@ -108 +107 @@
          InitSpyQueue();
 
-         if(InitializeSharedHeap() == FALSE)
-                return 0UL;
-
          //SvL: Init win32 PM classes
          if(InitPM() == FALSE) {
@@ -151 +147 @@
    DestroyDesktopWindow();
    UnregisterSystemClasses();
-   DestroySharedHeap();
    _ctordtorTerm();
    dprintf(("user32 exit done\n"));

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.11 1999-10-23 23:04:36 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.12 1999-10-28 12:00:34 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -377 +377 @@
 
 PosChangedEnd:
+        RestoreOS2TIB();
         return rc;
     }

trunk/src/user32/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.3 1999-10-24 22:56:09 sandervl Exp $ */
+/* $Id: win32class.cpp,v 1.4 1999-10-28 12:00:34 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -123 +123 @@
 Win32WndClass::~Win32WndClass()
 {
-  if(classNameA && (windowStyle & CS_GLOBALCLASS)) {
+  //SvL: Don't delete global classes
+  if(classNameA && !(windowStyle & CS_GLOBALCLASS)) {
         GlobalDeleteAtom(classAtom);
   }

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)))

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.34 1999-10-23 23:04:39 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.35 1999-10-28 12:00:35 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -28 +28 @@
 #define OFFSET_WIN32WNDPTR        0
 #define OFFSET_WIN32PM_MAGIC      4
-#define OFFSET_WIN32PM_SHAREDMEM  8
-#define NROF_WIN32WNDBYTES        12
+#define NROF_WIN32WNDBYTES        8
 
 #define WIN32PM_MAGIC           0x12345678

trunk/src/user32/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.5 1999-10-21 12:19:29 sandervl Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.6 1999-10-28 12:00:35 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -24 +24 @@
 #include <assert.h>
 #include <misc.h>
-#include <heapstring.h>
 #include <win32wbase.h>
 #include <winres.h>
@@ -38 +37 @@
 #include "syscolor.h"
 #include "win32wndhandle.h"
-#include "heapshared.h"
 #include "dc.h"
 #include "pmframe.h"

trunk/src/user32/win32wmdichild.cpp

@@ -1 @@
-/* $Id: win32wmdichild.cpp,v 1.7 1999-10-24 22:56:10 sandervl Exp $ */
+/* $Id: win32wmdichild.cpp,v 1.8 1999-10-28 12:00:36 sandervl Exp $ */
 /*
  * Win32 MDI Child Window Class for OS/2
@@ -39 +39 @@
 #include "syscolor.h"
 #include "win32wndhandle.h"
-#include "heapshared.h"
 
 

trunk/src/user32/win32wmdiclient.cpp

@@ -1 @@
-/* $Id: win32wmdiclient.cpp,v 1.10 1999-10-24 22:56:10 sandervl Exp $ */
+/* $Id: win32wmdiclient.cpp,v 1.11 1999-10-28 12:00:36 sandervl Exp $ */
 /*
  * Win32 MDI Client Window Class for OS/2
@@ -35 +35 @@
 #include "syscolor.h"
 #include "win32wndhandle.h"
-#include "heapshared.h"
 
 

trunk/src/user32/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.1 1999-09-15 23:19:01 sandervl Exp $ */
+/* $Id: win32wnd.cpp,v 1.2 1999-10-28 12:00:37 sandervl Exp $ */
 /*
  * Win32 Window Class for OS/2
@@ -21 +21 @@
 #include <assert.h>
 #include <misc.h>
+#include <win32wnd.h>
 #include <heapstring.h>
-#include <win32wnd.h>
 #include <spy.h>
 #include "wndmsg.h"
@@ -34 +34 @@
 #include "syscolor.h"
 #include "win32wndhandle.h"
-#include "heapshared.h"