[ros-diffs] [gschneider] 42718: Apply changes from r42521 to DefWndProcW as well See issue #4791 for more details.

Author: gschneider
Date: Sun Aug 16 00:06:09 2009
New Revision: 42718

URL: http://svn.reactos.org/svn/reactos?rev=42718&view=rev
Log:
Apply changes from r42521 to DefWndProcW as well
See issue #4791 for more details.

Modified:
    trunk/reactos/dll/win32/user32/windows/defwnd.c

Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sun Aug 16 00:06:09 2009
@@ -2037,12 +2037,18 @@
     {
         case WM_NCCREATE:
         {
-            LPCREATESTRUCTW cs = (LPCREATESTRUCTW)lParam;
-            /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP)
-             * may have child window IDs instead of window name */
-
-            DefSetText(hWnd, cs->lpszName, FALSE);
-            Result = 1;
+            if (lParam)
+            {
+                LPCREATESTRUCTW cs = (LPCREATESTRUCTW)lParam;
+                /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP)
+                 * may have child window IDs instead of window name */
+
+                if (HIWORD(cs->lpszName))
+                {
+                    DefSetText(hWnd, cs->lpszName, FALSE);
+                }
+                Result = 1;
+            }
             break;
         }