Changeset 5406 for trunk/src/user32

Timestamp:

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

Author:

sandervl

Message:

syscolor change + iconsm creation in RegisterClassA/W

Location:

trunk/src/user32

Files:

• syscolor.cpp (modified) (2 diffs)
• user32.cpp (modified) (2 diffs)
• window.cpp (modified) (6 diffs)
• windowclass.cpp (modified) (5 diffs)

trunk/src/user32/syscolor.cpp

@@ -1 @@
-/* $Id: syscolor.cpp,v 1.25 2000-12-30 13:27:55 sandervl Exp $ */
+/* $Id: syscolor.cpp,v 1.26 2001-03-30 22:08:19 sandervl Exp $ */
 
 /*
@@ -53 +53 @@
   RGB(198,195,198), //COLOR_ACTIVEBORDER
   RGB(198,195,198), //COLOR_INACTIVEBORDER
-  RGB(198,195,198), //COLOR_APPWORKSPACE
+  RGB(128,128,128), //COLOR_APPWORKSPACE
   RGB(0,0,128),     //COLOR_HIGHLIGHT
   RGB(255,255,255), //COLOR_HIGHLIGHTTEXT

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.94 2001-03-27 16:17:52 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.95 2001-03-30 22:08:19 sandervl Exp $ */
 
 /*
@@ -1526 +1526 @@
 BOOL WIN32API InvertRect( HDC hDC, const RECT * lprc)
 {
-    dprintf(("USER32: InvertRect %x", hDC));
+    if(lprc) {
+         dprintf(("USER32: InvertRect %x (%d,%d)(%d,%d)", hDC, lprc->left, lprc->top, lprc->right, lprc->bottom));
+    }
+    else dprintf(("USER32: InvertRect %x NULL", hDC));
     return O32_InvertRect(hDC,lprc);
 }

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.90 2001-03-30 11:14:36 sandervl Exp $ */
+/* $Id: window.cpp,v 1.91 2001-03-30 22:08:20 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -155 +155 @@
            dprintf(("CreateWindowEx32W: bad class name %04x",LOWORD(className)));
        else
-           dprintf(("CreateWindowEx32W: bad class name '%x'", className));
+           dprintf(("CreateWindowEx32W: bad class name '%ls'", className));
 
        SetLastError(ERROR_INVALID_PARAMETER);
@@ -290 +290 @@
     }
 
-    dprintf(("USER32:  CreateMDIWindowW\n"));
     cs.szClass        = lpszClassName;
     cs.szTitle        = lpszWindowName;
@@ -300 +299 @@
     cs.style          = dwStyle;
     cs.lParam         = lParam;
+
+    if(HIWORD(lpszClassName)) {
+         dprintf(("CreateMDIWindowW: class %ls parent %x (%d,%d) (%d,%d), %x %x lParam=%x", lpszClassName, hwndParent, x, y, nWidth, nHeight, dwStyle, lParam));
+    }
+    else dprintf(("CreateMDIWindowW: class %d parent %x (%d,%d) (%d,%d), %x %x lParam=%x", lpszClassName, hwndParent, x, y, nWidth, nHeight, dwStyle, lParam));
 
     return window->SendMessageW(WM_MDICREATE, 0, (LPARAM)&cs);
@@ -839 +843 @@
 #ifdef DEBUG
     int rc = window->GetWindowTextW(lpsz, cch);
-    if(rc) {
-        LPSTR astring = UnicodeToAsciiString(lpsz);
-        dprintf(("GetWindowTextW %x %s", hwnd, lpsz));
-        free(astring);
-    }
-    else dprintf(("GetWindowTextW %x returned %d", hwnd, rc));
+    dprintf(("GetWindowTextW %x %ls", hwnd, lpsz));
     return rc;
 #else
@@ -877 +876 @@
         return 0;
     }
-#ifdef DEBUG
-    LPSTR astring = UnicodeToAsciiString(lpsz);
-    dprintf(("SetWindowTextW %x %s", hwnd, astring));
-    free(astring);
-#endif
+    dprintf(("SetWindowTextW %x %ls", hwnd, lpsz));
     return window->SetWindowTextW((LPWSTR)lpsz);
 }

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