Alexandre Julliard : user32: Don' t cache 16-bit instance resources on the 32-bit side.
Alexandre Julliard
julliard at winehq.org
Wed Dec 23 10:04:10 CST 2009
Module: wine
Branch: master
Commit: 2919c49d7ffbef6d1bf26727b0f425f4b4a46711
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2919c49d7ffbef6d1bf26727b0f425f4b4a46711
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Dec 23 14:26:51 2009 +0100
user32: Don't cache 16-bit instance resources on the 32-bit side.
---
dlls/user32/cursoricon.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c
index 2b2151a..188500a 100644
--- a/dlls/user32/cursoricon.c
+++ b/dlls/user32/cursoricon.c
@@ -1177,10 +1177,8 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name,
if (!hInstance) hInstance = user32_module; /* Load OEM cursor/icon */
- /* Normalize hInstance (must be uniquely represented for icon cache) */
-
- if (!HIWORD( hInstance ))
- hInstance = HINSTANCE_32(GetExePtr( HINSTANCE_16(hInstance) ));
+ /* don't cache 16-bit instances (FIXME: should never get 16-bit instances in the first place) */
+ if (!HIWORD( hInstance )) loadflags &= ~LR_SHARED;
/* Get directory resource ID */
More information about the wine-cvs
mailing list