Changeset 1810 for trunk/src

Timestamp:

Nov 22, 1999, 9:33:25 PM (26 years ago)

Author:

sandervl

Message:

EB's fixes + removal of GetIconInfo hack

Location:

trunk/src/user32

Files:

• static.cpp (modified) (2 diffs)
• winicon.cpp (modified) (2 diffs)
• wsprintf.cpp (modified) (3 diffs)

trunk/src/user32/static.cpp

@@ -1 @@
-/* $Id: static.cpp,v 1.11 1999-11-21 17:07:51 cbratschi Exp $ */
+/* $Id: static.cpp,v 1.12 1999-11-22 20:33:24 sandervl Exp $ */
 /*
  * Static control
@@ -109 +109 @@
     DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
 
+    if (infoPtr == NULL)
+      return 0;
+
     if ((dwStyle & SS_TYPEMASK) != SS_BITMAP) return 0;
 

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.4 1999-11-14 23:29:25 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.5 1999-11-22 20:33:25 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -199 +199 @@
     dprintf(("USER32: GetIconInfo %x", hIcon));
     rc = O32_GetIconInfo(hIcon, pIconInfo);
-#if 1
+#if 0
     if(rc && pIconInfo->hbmColor) 
     {

trunk/src/user32/wsprintf.cpp

@@ -1 @@
-/* $Id: wsprintf.cpp,v 1.1 1999-11-04 18:35:41 phaller Exp $ */
+/* $Id: wsprintf.cpp,v 1.2 1999-11-22 20:33:25 sandervl Exp $ */
 
 /*
@@ -318 +318 @@
     WPRINTF_DATA argData;
 
-    while (*spec && (maxlen > 1))
+    while (spec && *spec && (maxlen > 1))
     {
         if (*spec != '%') { *p++ = *spec++; maxlen--; continue; }
@@ -396 +396 @@
     CHAR number[20];
 
-    while (*spec && (maxlen > 1))
+    while (spec && *spec && (maxlen > 1))
     {
         if (*spec != '%') { *p++ = *spec++; maxlen--; continue; }