[I_KNEW_IT]
authorJérôme Gardou <jerome.gardou@reactos.org>
Tue, 21 Oct 2014 19:14:47 +0000 (19:14 +0000)
committerJérôme Gardou <jerome.gardou@reactos.org>
Tue, 21 Oct 2014 19:14:47 +0000 (19:14 +0000)
 - InterlockedDecrement(JeromesBuildFailures)

svn path=/trunk/; revision=64878

reactos/win32ss/user/ntuser/class.c
reactos/win32ss/user/ntuser/defwnd.c
reactos/win32ss/user/ntuser/windc.c

index dfe3e9c..dd95752 100644 (file)
@@ -1765,7 +1765,7 @@ IntClassDestroyIcon(HANDLE hCurIcon)
         return FALSE;
     }
     /* Note: IntDestroyCurIconObject will remove our reference for us! */
-    Ret = IntDestroyCurIconObject(CurIcon, TRUE);
+    Ret = IntDestroyCurIconObject(CurIcon, GetW32ProcessInfo());
     if (!Ret)
     {
        ERR("hCurIcon was not Destroyed!\n");
index 4ca3b2d..c9b0799 100644 (file)
@@ -1052,7 +1052,7 @@ IntDefWindowProc(
                  x = (ClientRect.right - ClientRect.left - UserGetSystemMetrics(SM_CXICON)) / 2;
                  y = (ClientRect.bottom - ClientRect.top - UserGetSystemMetrics(SM_CYICON)) / 2;
                  UserDrawIconEx( hDC, x, y, pIcon, 0, 0, 0, 0, DI_NORMAL | DI_COMPAT | DI_DEFAULTSIZE );
-                 UserDereferenceObject(pIcon)
+                 UserDereferenceObject(pIcon);
              }
 #endif
              IntEndPaint(Wnd, &Ps);
@@ -1161,10 +1161,15 @@ PCURICON_OBJECT FASTCALL NC_IconForWindow( PWND pWnd )
 
    hIcon = UserGetProp(pWnd, gpsi->atomIconSmProp);
    if (!hIcon) hIcon = UserGetProp(pWnd, gpsi->atomIconProp);
+#ifdef NEW_CURSORICON
    if (!hIcon && pWnd->pcls->spicnSm)
        return pWnd->pcls->spicnSm;
    if (!hIcon && pWnd->pcls->spicn)
        return pWnd->pcls->spicn;
+#else
+   if (!hIcon) hIcon = pWnd->pcls->hIconSm;
+   if (!hIcon) hIcon = pWnd->pcls->hIcon;
+#endif
 
    if (!hIcon && (pWnd->style & DS_MODALFRAME))
    {
index 316fe33..e3f8d8b 100644 (file)
@@ -403,7 +403,11 @@ UserGetDCEx(PWND Wnd OPTIONAL, HANDLE ClipRegion, ULONG Flags)
             Flags |= DCX_CLIPCHILDREN;
          }
          /* If minized with icon in the set, we are forced to be cheap! */
+#ifdef NEW_CURSORICON
          if (Wnd->style & WS_MINIMIZE && Wnd->pcls->spicn)
+#else
+         if (Wnd->style & WS_MINIMIZE && Wnd->pcls->hIcon)
+#endif
          {
             Flags |= DCX_CACHE;
          }