Changeset 724 for trunk/src/user32/new/win32class.cpp

Timestamp:

Aug 28, 1999, 4:09:58 PM (26 years ago)

Author:

sandervl

Message:

Use shared memory for class & window objects

File:

• trunk/src/user32/new/win32class.cpp (modified) (5 diffs)

trunk/src/user32/new/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.7 1999-08-24 09:20:30 sandervl Exp $ */
+/* $Id: win32class.cpp,v 1.8 1999-08-28 14:09:30 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -28 +28 @@
                 INT len = lstrlenW((LPWSTR)wndclass->lpszClassName)+1;
 
-                classNameA = (PCHAR)malloc(len);
-                classNameW = (WCHAR *)malloc(len*sizeof(WCHAR));
+                classNameA = (PCHAR)_smalloc(len);
+                classNameW = (WCHAR *)_smalloc(len*sizeof(WCHAR));
         }
         else {
                 INT len = strlen(wndclass->lpszClassName)+1;
 
-                classNameA = (PCHAR)malloc(len);
-                classNameW = (WCHAR *)malloc(len*sizeof(WCHAR));
+                classNameA = (PCHAR)_smalloc(len);
+                classNameW = (WCHAR *)_smalloc(len*sizeof(WCHAR));
         }
         if(classNameA == NULL || classNameW == NULL) {
@@ -90 +90 @@
   //User data class words/longs
   if(nrExtraClassWords) {
-        userClassLong = (ULONG *)malloc(nrExtraClassWords);
+        userClassLong = (ULONG *)_smalloc(nrExtraClassWords);
         if(userClassLong == NULL) {
                 dprintf(("Win32Class ctr: userClassLong == NULL!"));
@@ -115 +115 @@
         free(menuNameW);
   }
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32WndClass::hasClassName(LPSTR classname, BOOL fUnicode)
+{
+  if(HIWORD(classname) == 0) {
+        return classAtom == (DWORD)classname;
+  }
+  if(fUnicode) {
+        return (lstrcmpW(classNameW, (LPWSTR)classname) == 0);
+  }
+  else  return (strcmp(classNameA, classname) == 0);
 }
 //******************************************************************************
@@ -238 +250 @@
   if(HIWORD(newMenuName)) {
         if(isUnicode) {
-                menuNameA = (PCHAR)malloc(lstrlenW((LPWSTR)newMenuName)+1);
-                menuNameW = (WCHAR *)malloc((lstrlenW((LPWSTR)newMenuName)+1)*sizeof(WCHAR));
-        }
-        else {
-                menuNameA = (PCHAR)malloc(strlen(newMenuName)+1);
-                menuNameW = (WCHAR *)malloc((strlen(newMenuName)+1)*sizeof(WCHAR));
+                menuNameA = (PCHAR)_smalloc(lstrlenW((LPWSTR)newMenuName)+1);
+                menuNameW = (WCHAR *)_smalloc((lstrlenW((LPWSTR)newMenuName)+1)*sizeof(WCHAR));
+        }
+        else {
+                menuNameA = (PCHAR)_smalloc(strlen(newMenuName)+1);
+                menuNameW = (WCHAR *)_smalloc((strlen(newMenuName)+1)*sizeof(WCHAR));
         }
         if(menuNameA == NULL || menuNameW == NULL) {