Changeset 311 for trunk/src

Timestamp:

Jul 15, 1999, 8:54:55 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

Location:

trunk/src/user32/new

Files:

• win32class.cpp (modified) (4 diffs)
• windowclass.cpp (modified) (5 diffs)

trunk/src/user32/new/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.3 1999-07-14 21:05:58 cbratschi Exp $ */
+/* $Id: win32class.cpp,v 1.4 1999-07-15 18:54:55 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -54 +54 @@
         classAtom       = (DWORD)wndclass->lpszClassName;
   }
+  menuNameA = 0;
+  menuNameW = 0;
+  setMenuName((LPSTR)wndclass->lpszMenuName);
+
   this->isUnicode       = isUnicode;
 
@@ -66 +70 @@
   dprintf(("USER32:  wndclass->hbrBackground %X\n", wndclass->hbrBackground));
   if(HIWORD(wndclass->lpszClassName))
-       dprintf(("USER32:  wndclass->lpszClassName %s\n", wndclass->lpszClassName));
+       dprintf(("USER32:  wndclass->lpszClassName %s\n", classNameA));
   else dprintf(("USER32:  wndclass->lpszClassName %X\n", wndclass->lpszClassName));
 
   if(HIWORD(wndclass->lpszMenuName)) {//convert string name identifier to numeric id
-       dprintf(("USER32:  lpszMenuName %s\n", wndclass->lpszMenuName));
-  }
-  else dprintf(("USER32:  wndclass->lpszMenuName %X\n", wndclass->lpszMenuName));
+       dprintf(("USER32:  lpszMenuName %s\n", menuNameA));
+  }
+  else dprintf(("USER32:  wndclass->lpszMenuName %X\n", menuNameA));
 
   nrExtraClassWords     = wndclass->cbClsExtra;
@@ -80 +84 @@
   hIcon                 = wndclass->hIcon;
   hInstance             = wndclass->hInstance;
-
-  menuNameA = 0;
-  menuNameW = 0;
-  setMenuName((LPSTR)wndclass->lpszMenuName);
 
   windowStyle           = wndclass->style;

trunk/src/user32/new/windowclass.cpp

@@ -1 @@
-/* $Id: windowclass.cpp,v 1.3 1999-07-15 08:18:11 sandervl Exp $ */
+/* $Id: windowclass.cpp,v 1.4 1999-07-15 18:54:55 sandervl Exp $ */
 /*
  * Win32 Window Class Code for OS/2
@@ -75 +75 @@
     wclass.cbSize = sizeof(wclass);
     memcpy(&wclass.style, lpwc, sizeof(WNDCLASSA));
-    if(wclass.lpszMenuName && (HIWORD(wclass.lpszMenuName) != 0)) {
-        wclass.lpszMenuName = UnicodeToAsciiString((LPWSTR)lpwc->lpszMenuName);
-    }
-    if(wclass.lpszClassName && (HIWORD(wclass.lpszClassName) != 0)) {
-        wclass.lpszClassName = UnicodeToAsciiString((LPWSTR)lpwc->lpszClassName);
-    }
+
     winclass = new Win32WndClass((WNDCLASSEXA *)&wclass, TRUE);
     if(winclass == NULL) {
@@ -88 +83 @@
     rc = winclass->getAtom();
 
-    if(lpwc->lpszMenuName && (HIWORD(lpwc->lpszMenuName) != 0)) {
-        FreeAsciiString((char *)wclass.lpszMenuName);
-    }
-    if(lpwc->lpszClassName && (HIWORD(lpwc->lpszClassName) !=0)) {
-        FreeAsciiString((char *)wclass.lpszClassName);
-    }
     return(rc);
 }
@@ -106 +95 @@
     dprintf(("RegisterClassExW\n"));
     memcpy(&wclass, lpwc, sizeof(WNDCLASSEXA));
-    if(wclass.lpszMenuName && (HIWORD(wclass.lpszMenuName) != 0)) {
-        wclass.lpszMenuName = UnicodeToAsciiString((LPWSTR)lpwc->lpszMenuName);
-    }
-    if(wclass.lpszClassName && (HIWORD(wclass.lpszClassName) != 0)) {
-        wclass.lpszClassName = UnicodeToAsciiString((LPWSTR)lpwc->lpszClassName);
-    }
 
     winclass = new Win32WndClass((WNDCLASSEXA *)&wclass, TRUE);
@@ -120 +103 @@
     rc = winclass->getAtom();
 
-    if(lpwc->lpszMenuName && (HIWORD(lpwc->lpszMenuName) != 0)) {
-        FreeAsciiString((char *)wclass.lpszMenuName);
-    }
-    if(lpwc->lpszClassName && (HIWORD(lpwc->lpszClassName) != 0)) {
-        FreeAsciiString((char *)wclass.lpszClassName);
-    }
     return(rc);
 }