From 68fb2f6899a02c6e85144cb9be862c46be73c0cb Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Tue, 21 Oct 2014 19:14:47 +0000 Subject: [PATCH] [I_KNEW_IT] - InterlockedDecrement(JeromesBuildFailures) svn path=/trunk/; revision=64878 --- reactos/win32ss/user/ntuser/class.c | 2 +- reactos/win32ss/user/ntuser/defwnd.c | 7 ++++++- reactos/win32ss/user/ntuser/windc.c | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/reactos/win32ss/user/ntuser/class.c b/reactos/win32ss/user/ntuser/class.c index dfe3e9c2110..dd95752e04f 100644 --- a/reactos/win32ss/user/ntuser/class.c +++ b/reactos/win32ss/user/ntuser/class.c @@ -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"); diff --git a/reactos/win32ss/user/ntuser/defwnd.c b/reactos/win32ss/user/ntuser/defwnd.c index 4ca3b2da0a1..c9b0799e17f 100644 --- a/reactos/win32ss/user/ntuser/defwnd.c +++ b/reactos/win32ss/user/ntuser/defwnd.c @@ -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)) { diff --git a/reactos/win32ss/user/ntuser/windc.c b/reactos/win32ss/user/ntuser/windc.c index 316fe334f4d..e3f8d8bb8f6 100644 --- a/reactos/win32ss/user/ntuser/windc.c +++ b/reactos/win32ss/user/ntuser/windc.c @@ -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; } -- 2.17.1