Changeset 5406 for trunk/src/user32/windowclass.cpp

Timestamp:

Mar 31, 2001, 12:08:20 AM (24 years ago)

Author:

sandervl

Message:

syscolor change + iconsm creation in RegisterClassA/W

File:

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

trunk/src/user32/windowclass.cpp

@@ -1 @@
-/* $Id: windowclass.cpp,v 1.16 2001-02-22 10:37:31 sandervl Exp $ */
+/* $Id: windowclass.cpp,v 1.17 2001-03-30 22:08:20 sandervl Exp $ */
 /*
  * Win32 Window Class Code for OS/2
@@ -51 +51 @@
     memcpy(&wc.style, lpWndClass, sizeof(WNDCLASSA));
     wc.hIconSm = 0;
+ 
+    //TODO: not destroyed when class is unregistered (neither does Wine, but that might be a bug)
+    int iSmIconWidth  = GetSystemMetrics(SM_CXSMICON);
+    int iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
+
+    wc.hIconSm = CopyImage(wc.hIcon, IMAGE_ICON, iSmIconWidth, iSmIconHeight,
+                           LR_COPYFROMRESOURCE);
 
     if(Win32WndClass::FindClass(wc.hInstance, (LPSTR)wc.lpszClassName)) {
@@ -103 +110 @@
  Win32WndClass *winclass;
 
-    dprintf(("RegisterClassW\n"));
     //CB: size new in ex structure
     wc.cbSize = sizeof(wc);
     memcpy(&wc.style, lpwc, sizeof(WNDCLASSA));
-    wc.hIconSm = 0;
+
+    //TODO: not destroyed when class is unregistered (neither does Wine, but that might be a bug)
+    int iSmIconWidth  = GetSystemMetrics(SM_CXSMICON);
+    int iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
+
+    wc.hIconSm = CopyImage(wc.hIcon, IMAGE_ICON, iSmIconWidth, iSmIconHeight,
+                           LR_COPYFROMRESOURCE);
 
     if(Win32WndClass::FindClass(wc.hInstance, (LPWSTR)wc.lpszClassName)) {
-        dprintf(("RegisterClassW %x %x already exists", wc.hInstance, wc.lpszClassName));
+        if(HIWORD(wc.lpszClassName)) {
+                dprintf(("RegisterClassW %x %ls already exists", wc.hInstance, wc.lpszClassName));
+        }
+        else    dprintf(("RegisterClassW %x %x already exists", wc.hInstance, wc.lpszClassName));
         SetLastError(ERROR_CLASS_ALREADY_EXISTS);
         return 0;
@@ -138 +153 @@
 
     if(Win32WndClass::FindClass(wc.hInstance, (LPWSTR)wc.lpszClassName)) {
-        dprintf(("RegisterClassW %x %x already exists", wc.hInstance, wc.lpszClassName));
+        if(HIWORD(wc.lpszClassName)) {
+                dprintf(("RegisterClassExW %x %ls already exists", wc.hInstance, wc.lpszClassName));
+        }
+        else    dprintf(("RegisterClassExW %x %x already exists", wc.hInstance, wc.lpszClassName));
         SetLastError(ERROR_CLASS_ALREADY_EXISTS);
         return 0;
@@ -306 +324 @@
  char          *astring = NULL;
 
-  dprintf(("USER32: GetClassInfoExW\n"));
+  if(HIWORD(lpszClass)) {
+       dprintf(("USER32:GetClassInfoExW (%08xh,%ls,%08x)",
+                 hInstance, lpszClass, lpwcx));
+  }
+  else dprintf(("USER32:GetClassInfoExW (%08xh,%x,%08x)",
+                 hInstance, lpszClass, lpwcx));
 
   if(HIWORD(lpszClass) != 0) {