Changeset 311 for trunk/src/user32/new/windowclass.cpp
- Timestamp:
- Jul 15, 1999, 8:54:55 PM (26 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/user32/new/windowclass.cpp
r307 r311 1 /* $Id: windowclass.cpp,v 1. 3 1999-07-15 08:18:11sandervl Exp $ */1 /* $Id: windowclass.cpp,v 1.4 1999-07-15 18:54:55 sandervl Exp $ */ 2 2 /* 3 3 * Win32 Window Class Code for OS/2 … … 75 75 wclass.cbSize = sizeof(wclass); 76 76 memcpy(&wclass.style, lpwc, sizeof(WNDCLASSA)); 77 if(wclass.lpszMenuName && (HIWORD(wclass.lpszMenuName) != 0)) { 78 wclass.lpszMenuName = UnicodeToAsciiString((LPWSTR)lpwc->lpszMenuName); 79 } 80 if(wclass.lpszClassName && (HIWORD(wclass.lpszClassName) != 0)) { 81 wclass.lpszClassName = UnicodeToAsciiString((LPWSTR)lpwc->lpszClassName); 82 } 77 83 78 winclass = new Win32WndClass((WNDCLASSEXA *)&wclass, TRUE); 84 79 if(winclass == NULL) { … … 88 83 rc = winclass->getAtom(); 89 84 90 if(lpwc->lpszMenuName && (HIWORD(lpwc->lpszMenuName) != 0)) {91 FreeAsciiString((char *)wclass.lpszMenuName);92 }93 if(lpwc->lpszClassName && (HIWORD(lpwc->lpszClassName) !=0)) {94 FreeAsciiString((char *)wclass.lpszClassName);95 }96 85 return(rc); 97 86 } … … 106 95 dprintf(("RegisterClassExW\n")); 107 96 memcpy(&wclass, lpwc, sizeof(WNDCLASSEXA)); 108 if(wclass.lpszMenuName && (HIWORD(wclass.lpszMenuName) != 0)) {109 wclass.lpszMenuName = UnicodeToAsciiString((LPWSTR)lpwc->lpszMenuName);110 }111 if(wclass.lpszClassName && (HIWORD(wclass.lpszClassName) != 0)) {112 wclass.lpszClassName = UnicodeToAsciiString((LPWSTR)lpwc->lpszClassName);113 }114 97 115 98 winclass = new Win32WndClass((WNDCLASSEXA *)&wclass, TRUE); … … 120 103 rc = winclass->getAtom(); 121 104 122 if(lpwc->lpszMenuName && (HIWORD(lpwc->lpszMenuName) != 0)) {123 FreeAsciiString((char *)wclass.lpszMenuName);124 }125 if(lpwc->lpszClassName && (HIWORD(lpwc->lpszClassName) != 0)) {126 FreeAsciiString((char *)wclass.lpszClassName);127 }128 105 return(rc); 129 106 }
Note:
See TracChangeset
for help on using the changeset viewer.