wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Roderick Colenbrander : winex11: Fix a null pointer crash when XRender isn' t around.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 48db6abae1108c81144180ebc8902921bada015b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48db6abae1108c81144180ebc… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Dec 21 16:45:13 2009 +0100 winex11: Fix a null pointer crash when XRender isn't around. --- dlls/winex11.drv/xrender.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 1f5e512..214be7b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2093,7 +2093,8 @@ void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, physDev->brush.pixmap = XCreatePixmap(gdi_display, root_window, width, height, depth); /* Use XCopyArea when the physBitmap and brush.pixmap have the same format. */ - if(physBitmap->pixmap_depth == 1 || src_format->format == dst_format->format) + if( (physBitmap->pixmap_depth == 1) || (!X11DRV_XRender_Installed && physDev->depth == physBitmap->pixmap_depth) || + (src_format->format == dst_format->format) ) { XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, get_bitmap_gc(physBitmap->pixmap_depth), 0, 0, width, height, 0, 0 );

1 0

Alexandre Julliard : user32: Avoid including winuser16.h in 32-bit files.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: ce05f498437a591faa94958f32ea95ee7276e784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce05f498437a591faa94958f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 12:50:07 2009 +0100 user32: Avoid including winuser16.h in 32-bit files. --- dlls/user32/defwnd.c | 3 ++- dlls/user32/desktop.c | 1 - dlls/user32/dialog.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 39e27b3..ae104e2 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -33,7 +33,6 @@ #include "user_private.h" #include "controls.h" #include "wine/unicode.h" -#include "wine/winuser16.h" #include "wine/server.h" #include "wine/exception.h" #include "wine/debug.h" @@ -44,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); #define KEYDATA_ALT 0x2000 #define KEYDATA_PREVSTATE 0x4000 +#define DRAG_FILE 0x454C4946 + static short iF10Key = 0; static short iMenuSysKey = 0; static const WCHAR imm32W[] = { 'i','m','m','3','2','\0' }; diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index df4ac70..ea9bded 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -31,7 +31,6 @@ #include "winbase.h" #include "wingdi.h" #include "controls.h" -#include "wine/winuser16.h" static HBRUSH hbrushPattern; static HBITMAP hbitmapWallPaper; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index a7040ea..021955b 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -34,7 +34,6 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "wine/winuser16.h" #include "wine/unicode.h" #include "controls.h" #include "win.h" @@ -566,7 +565,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, size.cx = rect.right - rect.left; size.cy = rect.bottom - rect.top; - if (template.x == CW_USEDEFAULT16) + if (template.x == (SHORT)0x8000 /*CW_USEDEFAULT16*/) { pos.x = pos.y = CW_USEDEFAULT; }

1 0

Alexandre Julliard : user32: Reimplement MapWindowPoints16 and move it to wnd16.c.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: df3e5a87627d74daf0a3bef7060d1e6e44016f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3e5a87627d74daf0a3bef70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 12:45:54 2009 +0100 user32: Reimplement MapWindowPoints16 and move it to wnd16.c. --- dlls/user32/winpos.c | 18 ------------------ dlls/user32/wnd16.c | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 915cb59..65e9389 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -507,24 +507,6 @@ static void WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, POINT *offset ) /******************************************************************* - * MapWindowPoints (USER.258) - */ -void WINAPI MapWindowPoints16( HWND16 hwndFrom, HWND16 hwndTo, - LPPOINT16 lppt, UINT16 count ) -{ - POINT offset; - - WINPOS_GetWinOffset( WIN_Handle32(hwndFrom), WIN_Handle32(hwndTo), &offset ); - while (count--) - { - lppt->x += offset.x; - lppt->y += offset.y; - lppt++; - } -} - - -/******************************************************************* * MapWindowPoints (USER32.@) */ INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count ) diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index 6968683..dfcd71f 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -1260,6 +1260,30 @@ HWND16 WINAPI GetOpenClipboardWindow16(void) } +/******************************************************************* + * MapWindowPoints (USER.258) + */ +void WINAPI MapWindowPoints16( HWND16 hwndFrom, HWND16 hwndTo, LPPOINT16 lppt, UINT16 count ) +{ + POINT buffer[8], *ppt = buffer; + UINT i; + + if (count > 8) ppt = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*ppt) ); + for (i = 0; i < count; i++) + { + ppt[i].x = lppt[i].x; + ppt[i].y = lppt[i].y; + } + MapWindowPoints( WIN_Handle32(hwndFrom), WIN_Handle32(hwndTo), ppt, count ); + for (i = 0; i < count; i++) + { + lppt[i].x = ppt[i].x; + lppt[i].y = ppt[i].y; + } + if (ppt != buffer) HeapFree( GetProcessHeap(), 0, ppt ); +} + + /************************************************************************** * BeginDeferWindowPos (USER.259) */

1 0

Alexandre Julliard : user32: Move DestroyIcon32 implementation to user16.c.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 1d1f8e2a2c861567cf9785c8a6a1a61037ea23d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1f8e2a2c861567cf9785c8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 13:48:19 2009 +0100 user32: Move DestroyIcon32 implementation to user16.c. --- dlls/user32/cursoricon.c | 57 +++++++++------------------------------------- dlls/user32/user16.c | 40 +++++++++++++++++++++++++++++++- dlls/user32/user32.spec | 5 ---- 3 files changed, 50 insertions(+), 52 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 118b8b6..1320523 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -84,10 +84,6 @@ typedef struct #include "poppack.h" -#define CID_RESOURCE 0x0001 -#define CID_WIN32 0x0004 -#define CID_NONSHARED 0x0008 - static RECT CURSOR_ClipRect; /* Cursor clipping rect */ static HDC screen_dc; @@ -1470,52 +1466,16 @@ HICON WINAPI CopyIcon( HICON hIcon ) } -/********************************************************************** - * DestroyIcon32 (USER.610) - * - * This routine is actually exported from Win95 USER under the name - * DestroyIcon32 ... The behaviour implemented here should mimic - * the Win95 one exactly, especially the return values, which - * depend on the setting of various flags. - */ -WORD WINAPI DestroyIcon32( HGLOBAL16 handle, UINT16 flags ) -{ - WORD retv; - - TRACE_(icon)("(%04x, %04x)\n", handle, flags ); - - /* Check whether destroying active cursor */ - - if ( get_user_thread_info()->cursor == HICON_32(handle) ) - { - WARN_(cursor)("Destroying active cursor!\n" ); - return FALSE; - } - - /* Try shared cursor/icon first */ - - if ( !(flags & CID_NONSHARED) ) - { - INT count = CURSORICON_DelSharedIcon(HICON_32(handle)); - - if ( count != -1 ) - return (flags & CID_WIN32)? TRUE : (count == 0); - - /* FIXME: OEM cursors/icons should be recognized */ - } - - /* Now assume non-shared cursor/icon */ - - retv = GlobalFree16( handle ); - return (flags & CID_RESOURCE)? retv : TRUE; -} - /*********************************************************************** * DestroyIcon (USER32.@) */ BOOL WINAPI DestroyIcon( HICON hIcon ) { - return DestroyIcon32(HICON_16(hIcon), CID_WIN32); + TRACE_(icon)("%p\n", hIcon ); + + if (CURSORICON_DelSharedIcon( hIcon ) == -1) + GlobalFree16( HICON_16(hIcon) ); + return TRUE; } @@ -1524,7 +1484,12 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) */ BOOL WINAPI DestroyCursor( HCURSOR hCursor ) { - return DestroyIcon32(HCURSOR_16(hCursor), CID_WIN32); + if (get_user_thread_info()->cursor == hCursor) + { + WARN_(cursor)("Destroying active cursor!\n" ); + return FALSE; + } + return DestroyIcon( hCursor ); } /*********************************************************************** diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index 4daaafd..6305945 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -55,7 +55,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(user); #define USUD_LOCALHEAP 0x0004 #define USUD_FIRSTCLASS 0x0005 -WORD WINAPI DestroyIcon32(HGLOBAL16, UINT16); +#define CID_RESOURCE 0x0001 +#define CID_WIN32 0x0004 +#define CID_NONSHARED 0x0008 WORD USER_HeapSel = 0; /* USER heap selector */ @@ -2854,6 +2856,42 @@ DWORD WINAPI FormatMessage16( #undef ADD_TO_T +/********************************************************************** + * DestroyIcon32 (USER.610) + * + * This routine is actually exported from Win95 USER under the name + * DestroyIcon32 ... The behaviour implemented here should mimic + * the Win95 one exactly, especially the return values, which + * depend on the setting of various flags. + */ +WORD WINAPI DestroyIcon32( HGLOBAL16 handle, UINT16 flags ) +{ + WORD retv; + + /* Check whether destroying active cursor */ + + if (GetCursor16() == handle) + { + WARN("Destroying active cursor!\n" ); + return FALSE; + } + + /* Try shared cursor/icon first */ + + if (!(flags & CID_NONSHARED)) + { + INT count = release_shared_icon( handle ); + if (count != -1) + return (flags & CID_WIN32) ? TRUE : (count == 0); + } + + /* Now assume non-shared cursor/icon */ + + retv = GlobalFree16( handle ); + return (flags & CID_RESOURCE)? retv : TRUE; +} + + /*********************************************************************** * ChangeDisplaySettings (USER.620) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 4492e58..7f87a20 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -772,11 +772,6 @@ @ stdcall wvsprintfW(ptr wstr ptr) ################################################################ -# Wine extensions: Win16 functions that are needed by other dlls -# -@ stdcall DestroyIcon32(long long) - -################################################################ # Wine dll separation hacks, these will go away, don't use them # @ cdecl HOOK_CallHooks(long long long long long)

1 0

Alexandre Julliard : kernel32: Load the DestroyIcon32 function from 16-bit user.exe.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: ff04a5e8302858c9c79ad4543a8a99700dd1185a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff04a5e8302858c9c79ad4543… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 13:48:03 2009 +0100 kernel32: Load the DestroyIcon32 function from 16-bit user.exe. --- dlls/kernel32/resource16.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/resource16.c b/dlls/kernel32/resource16.c index 5d745f8..3292990 100644 --- a/dlls/kernel32/resource16.c +++ b/dlls/kernel32/resource16.c @@ -1105,15 +1105,13 @@ DWORD WINAPI SizeofResource16( HMODULE16 hModule, HRSRC16 hRsrc ) } -typedef WORD (WINAPI *pDestroyIcon32Proc)( HGLOBAL16 handle, UINT16 flags ); - /********************************************************************** * FreeResource (KERNEL.63) */ BOOL16 WINAPI FreeResource16( HGLOBAL16 handle ) { - pDestroyIcon32Proc proc; - HMODULE user; + FARPROC16 proc; + HMODULE16 user; NE_MODULE *pModule = NE_GetPtr( FarGetOwner16( handle ) ); TRACE("(%04x)\n", handle ); @@ -1149,9 +1147,17 @@ BOOL16 WINAPI FreeResource16( HGLOBAL16 handle ) /* If this failed, call USER.DestroyIcon32; this will check whether it is a shared cursor/icon; if not it will call GlobalFree16() */ - user = GetModuleHandleA( "user32.dll" ); - if (user && (proc = (pDestroyIcon32Proc)GetProcAddress( user, "DestroyIcon32" ))) - return proc( handle, 1 /*CID_RESOURCE*/ ); + user = GetModuleHandle16( "user" ); + if (user && (proc = GetProcAddress16( user, "DestroyIcon32" ))) + { + WORD args[2]; + DWORD result; + + args[1] = handle; + args[0] = 1; /* CID_RESOURCE */ + WOWCallback16Ex( (SEGPTR)proc, WCB16_PASCAL, sizeof(args), args, &result ); + return LOWORD(result); + } else return GlobalFree16( handle ); }

1 0

Alexandre Julliard : user32: Move freeing of a 16-bit module' s classes to wnd16.c.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 0fbe20a254bd947813480b348230a6f3d6bc97a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fbe20a254bd947813480b348… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 12:33:26 2009 +0100 user32: Move freeing of a 16-bit module's classes to wnd16.c. --- dlls/user32/class.c | 32 -------------------------- dlls/user32/controls.h | 2 +- dlls/user32/user16.c | 5 ++- dlls/user32/wnd16.c | 59 ++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 59 insertions(+), 39 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index f7e0f25..36315b0 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -255,38 +255,6 @@ static void CLASS_FreeClass( CLASS *classPtr ) /*********************************************************************** - * CLASS_FreeModuleClasses - */ -void CLASS_FreeModuleClasses( HMODULE16 hModule ) -{ - struct list *ptr, *next; - - TRACE("0x%08x\n", hModule); - - USER_Lock(); - for (ptr = list_head( &class_list ); ptr; ptr = next) - { - CLASS *class = LIST_ENTRY( ptr, CLASS, entry ); - next = list_next( &class_list, ptr ); - if (class->hInstance == HINSTANCE_32(hModule)) - { - BOOL ret; - - SERVER_START_REQ( destroy_class ) - { - req->atom = class->atomName; - req->instance = wine_server_client_ptr( class->hInstance ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - if (ret) CLASS_FreeClass( class ); - } - } - USER_Unlock(); -} - - -/*********************************************************************** * CLASS_FindClass * * Return a pointer to the class. diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 956c32e..c3fd4ec 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -126,6 +126,7 @@ extern LRESULT StaticWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDE /* 16-bit support */ extern HWND create_window16(CREATESTRUCTW*,LPCWSTR,HINSTANCE,UINT) DECLSPEC_HIDDEN; +extern void free_module_classes(HINSTANCE16) DECLSPEC_HIDDEN; extern void register_wow_handlers(void) DECLSPEC_HIDDEN; extern void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, struct wow_handlers32 *orig ); @@ -138,7 +139,6 @@ extern void CLASS_RegisterBuiltinClasses(void) DECLSPEC_HIDDEN; extern WNDPROC get_class_winproc( struct tagCLASS *class ) DECLSPEC_HIDDEN; extern struct dce *get_class_dce( struct tagCLASS *class ) DECLSPEC_HIDDEN; extern struct dce *set_class_dce( struct tagCLASS *class, struct dce *dce ) DECLSPEC_HIDDEN; -extern void CLASS_FreeModuleClasses( HMODULE16 hModule ) DECLSPEC_HIDDEN; /* defwnd proc */ extern HBRUSH DEFWND_ControlColor( HDC hDC, UINT ctlType ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index c6fd3d7..4daaafd 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -1527,9 +1527,10 @@ void WINAPI SignalProc16( HANDLE16 hModule, UINT16 code, { if (code == USIG16_DLL_UNLOAD) { + hModule = GetExePtr(hModule); /* HOOK_FreeModuleHooks( hModule ); */ - CLASS_FreeModuleClasses( hModule ); - free_module_icons( GetExePtr(hModule) ); + free_module_classes( hModule ); + free_module_icons( hModule ); } } diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index ad99e6d..6968683 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -23,6 +23,7 @@ #include "win.h" #include "controls.h" #include "user_private.h" +#include "wine/list.h" #include "wine/server.h" /* size of buffer needed to store an atom string */ @@ -34,6 +35,15 @@ static HWND16 hwndSysModal; +struct class_entry +{ + struct list entry; + ATOM atom; + HINSTANCE16 inst; +}; + +static struct list class_list = LIST_INIT( class_list ); + struct wnd_enum_info { WNDENUMPROC16 proc; @@ -62,6 +72,19 @@ static inline HWND full_insert_after_hwnd( HWND16 hwnd ) return ret; } +void free_module_classes( HINSTANCE16 inst ) +{ + struct class_entry *class, *next; + + LIST_FOR_EACH_ENTRY_SAFE( class, next, &class_list, struct class_entry, entry ) + { + if (class->inst != inst) continue; + list_remove( &class->entry ); + UnregisterClassA( (LPCSTR)MAKEINTATOM(class->atom), HINSTANCE_32(class->inst) ); + HeapFree( GetProcessHeap(), 0, class ); + } +} + /************************************************************************** * MessageBox (USER.1) */ @@ -1532,22 +1555,34 @@ BOOL16 WINAPI SetWindowPlacement16( HWND16 hwnd, const WINDOWPLACEMENT16 *wp16 ) */ ATOM WINAPI RegisterClassEx16( const WNDCLASSEX16 *wc ) { + struct class_entry *class; WNDCLASSEXA wc32; + HINSTANCE16 inst; + ATOM atom; + + inst = GetExePtr( wc->hInstance ); + if (!inst) inst = GetModuleHandle16( NULL ); wc32.cbSize = sizeof(wc32); wc32.style = wc->style; wc32.lpfnWndProc = WINPROC_AllocProc16( wc->lpfnWndProc ); wc32.cbClsExtra = wc->cbClsExtra; wc32.cbWndExtra = wc->cbWndExtra; - wc32.hInstance = HINSTANCE_32(GetExePtr(wc->hInstance)); - if (!wc32.hInstance) wc32.hInstance = HINSTANCE_32(GetModuleHandle16(NULL)); + wc32.hInstance = HINSTANCE_32(inst); wc32.hIcon = HICON_32(wc->hIcon); wc32.hCursor = HCURSOR_32(wc->hCursor); wc32.hbrBackground = HBRUSH_32(wc->hbrBackground); wc32.lpszMenuName = MapSL(wc->lpszMenuName); wc32.lpszClassName = MapSL(wc->lpszClassName); wc32.hIconSm = HICON_32(wc->hIconSm); - return RegisterClassExA( &wc32 ); + atom = RegisterClassExA( &wc32 ); + if ((class = HeapAlloc( GetProcessHeap(), 0, sizeof(*class) ))) + { + class->atom = atom; + class->inst = inst; + list_add_tail( &class_list, &class->entry ); + } + return atom; } @@ -1617,8 +1652,24 @@ INT16 WINAPI GetPriorityClipboardFormat16( UINT16 *list, INT16 count ) */ BOOL16 WINAPI UnregisterClass16( LPCSTR className, HINSTANCE16 hInstance ) { + ATOM atom; + if (hInstance == GetModuleHandle16("user")) hInstance = 0; - return UnregisterClassA( className, HINSTANCE_32(GetExePtr( hInstance )) ); + else hInstance = GetExePtr( hInstance ); + + if ((atom = GlobalFindAtomA( className ))) + { + struct class_entry *class; + LIST_FOR_EACH_ENTRY( class, &class_list, struct class_entry, entry ) + { + if (class->inst != hInstance) continue; + if (class->atom != atom) continue; + list_remove( &class->entry ); + HeapFree( GetProcessHeap(), 0, class ); + break; + } + } + return UnregisterClassA( className, HINSTANCE_32(hInstance) ); }

1 0

Alexandre Julliard : user32: Move freeing of a 16-bit module' s icons to user16.c.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: e3bcc11bebd24fbd804c8cf16eba7d587e2f850a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3bcc11bebd24fbd804c8cf16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 18:24:17 2009 +0100 user32: Move freeing of a 16-bit module's icons to user16.c. --- dlls/user32/cursoricon.c | 27 --------------------------- dlls/user32/user16.c | 15 ++++++++++++++- dlls/user32/user_private.h | 1 - 3 files changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0473315..118b8b6 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -447,33 +447,6 @@ static INT CURSORICON_DelSharedIcon( HICON hIcon ) } /********************************************************************** - * CURSORICON_FreeModuleIcons - */ -void CURSORICON_FreeModuleIcons( HMODULE16 hMod16 ) -{ - ICONCACHE **ptr = &IconAnchor; - HMODULE hModule = HMODULE_32(GetExePtr( hMod16 )); - - EnterCriticalSection( &IconCrst ); - - while ( *ptr ) - { - if ( (*ptr)->hModule == hModule ) - { - ICONCACHE *freePtr = *ptr; - *ptr = freePtr->next; - - GlobalFree16(HICON_16(freePtr->hIcon)); - HeapFree( GetProcessHeap(), 0, freePtr ); - continue; - } - ptr = &(*ptr)->next; - } - - LeaveCriticalSection( &IconCrst ); -} - -/********************************************************************** * get_icon_size */ BOOL get_icon_size( HICON handle, SIZE *size ) diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index 0957ba2..c6fd3d7 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -303,6 +303,19 @@ static int release_shared_icon( HICON16 icon ) return -1; } +static void free_module_icons( HINSTANCE16 inst ) +{ + struct cache_entry *cache, *next; + + LIST_FOR_EACH_ENTRY_SAFE( cache, next, &icon_cache, struct cache_entry, entry ) + { + if (cache->inst != inst) continue; + list_remove( &cache->entry ); + GlobalFree16( cache->icon ); + HeapFree( GetProcessHeap(), 0, cache ); + } +} + /********************************************************************** * InitApp (USER.5) @@ -1516,7 +1529,7 @@ void WINAPI SignalProc16( HANDLE16 hModule, UINT16 code, { /* HOOK_FreeModuleHooks( hModule ); */ CLASS_FreeModuleClasses( hModule ); - CURSORICON_FreeModuleIcons( hModule ); + free_module_icons( GetExePtr(hModule) ); } } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index fc92f25..41379f0 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -326,7 +326,6 @@ typedef struct #include "poppack.h" -extern void CURSORICON_FreeModuleIcons( HMODULE16 hModule ) DECLSPEC_HIDDEN; extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; /* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */

1 0

Alexandre Julliard : user32: Reimplement loading of 16-bit cursors and icons using 16-bit resource functions .
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: d5b270eaddc9d3de249e410b98ce6fe5d177ccc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b270eaddc9d3de249e410b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 17:38:44 2009 +0100 user32: Reimplement loading of 16-bit cursors and icons using 16-bit resource functions. --- dlls/user32/user16.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 129 insertions(+), 8 deletions(-) diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index b338720..0957ba2 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -33,6 +33,7 @@ #include "user_private.h" #include "win.h" #include "controls.h" +#include "wine/list.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(user); @@ -248,6 +249,62 @@ static INT parse_format( LPCSTR format, WPRINTF_FORMAT *res ) /********************************************************************** + * Management of the 16-bit cursor/icon cache + */ + +struct cache_entry +{ + struct list entry; + HINSTANCE16 inst; + HRSRC16 rsrc; + HRSRC16 group; + HICON16 icon; + INT count; +}; + +static struct list icon_cache = LIST_INIT( icon_cache ); + +static void add_shared_icon( HINSTANCE16 inst, HRSRC16 rsrc, HRSRC16 group, HICON16 icon ) +{ + struct cache_entry *cache = HeapAlloc( GetProcessHeap(), 0, sizeof(*cache) ); + + if (!cache) return; + cache->inst = inst; + cache->rsrc = rsrc; + cache->group = group; + cache->icon = icon; + cache->count = 1; + list_add_tail( &icon_cache, &cache->entry ); +} + +static HICON16 find_shared_icon( HINSTANCE16 inst, HRSRC16 rsrc ) +{ + struct cache_entry *cache; + + LIST_FOR_EACH_ENTRY( cache, &icon_cache, struct cache_entry, entry ) + { + if (cache->inst != inst || cache->rsrc != rsrc) continue; + cache->count++; + return cache->icon; + } + return 0; +} + +static int release_shared_icon( HICON16 icon ) +{ + struct cache_entry *cache; + + LIST_FOR_EACH_ENTRY( cache, &icon_cache, struct cache_entry, entry ) + { + if (cache->icon != icon) continue; + if (!cache->count) return 0; + return --cache->count; + } + return -1; +} + + +/********************************************************************** * InitApp (USER.5) */ INT16 WINAPI InitApp16( HINSTANCE16 hInstance ) @@ -755,7 +812,7 @@ BOOL16 WINAPI WinHelp16( HWND16 hWnd, LPCSTR lpHelpFile, UINT16 wCommand, */ HCURSOR16 WINAPI LoadCursor16(HINSTANCE16 hInstance, LPCSTR name) { - return HCURSOR_16(LoadCursorA(HINSTANCE_32(hInstance), name)); + return LoadImage16( hInstance, name, IMAGE_CURSOR, 0, 0, LR_SHARED | LR_DEFAULTSIZE ); } @@ -764,7 +821,7 @@ HCURSOR16 WINAPI LoadCursor16(HINSTANCE16 hInstance, LPCSTR name) */ HICON16 WINAPI LoadIcon16(HINSTANCE16 hInstance, LPCSTR name) { - return HICON_16(LoadIconA(HINSTANCE_32(hInstance), name)); + return LoadImage16( hInstance, name, IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE ); } /********************************************************************** @@ -1685,11 +1742,67 @@ DWORD WINAPI GetMenuContextHelpId16( HMENU16 hMenu ) * LoadImage (USER.389) * */ -HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, - INT16 desiredx, INT16 desiredy, UINT16 loadflags) +HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 cx, INT16 cy, UINT16 flags) { - return HANDLE_16(LoadImageA(HINSTANCE_32(hinst), name, type, desiredx, - desiredy, loadflags)); + if (!hinst || (flags & LR_LOADFROMFILE)) + return HICON_16( LoadImageA( 0, name, type, cx, cy, flags )); + + hinst = GetExePtr( hinst ); + + if (flags & LR_DEFAULTSIZE) + { + if (type == IMAGE_ICON) + { + if (!cx) cx = GetSystemMetrics(SM_CXICON); + if (!cy) cy = GetSystemMetrics(SM_CYICON); + } + else if (type == IMAGE_CURSOR) + { + if (!cx) cx = GetSystemMetrics(SM_CXCURSOR); + if (!cy) cy = GetSystemMetrics(SM_CYCURSOR); + } + } + + switch (type) + { + case IMAGE_BITMAP: + return HBITMAP_16( LoadImageA( HINSTANCE_32(hinst), name, type, cx, cy, flags )); + + case IMAGE_ICON: + case IMAGE_CURSOR: + { + HANDLE16 handle; + HICON16 hIcon = 0; + HRSRC16 hRsrc, hGroupRsrc; + BYTE *dir, *bits; + INT id = 0; + + if (!(hRsrc = FindResource16( hinst, name, + (LPCSTR)(type == IMAGE_ICON ? RT_GROUP_ICON : RT_GROUP_CURSOR )))) + return 0; + hGroupRsrc = hRsrc; + + if (!(handle = LoadResource16( hinst, hRsrc ))) return 0; + if ((dir = LockResource16( handle ))) id = LookupIconIdFromDirectory( dir, type == IMAGE_ICON ); + FreeResource16( handle ); + if (!id) return 0; + + if (!(hRsrc = FindResource16( hinst, MAKEINTRESOURCEA(id), + (LPCSTR)(type == IMAGE_ICON ? RT_ICON : RT_CURSOR) ))) return 0; + + if ((flags & LR_SHARED) && (hIcon = find_shared_icon( hinst, hRsrc ) ) != 0) return hIcon; + + if (!(handle = LoadResource16( hinst, hRsrc ))) return 0; + bits = LockResource16( handle ); + hIcon = CreateIconFromResourceEx16( bits, 0, type == IMAGE_ICON, 0x00030000, cx, cy, flags ); + FreeResource16( handle ); + + if (hIcon && (flags & LR_SHARED)) add_shared_icon( hinst, hRsrc, hGroupRsrc, hIcon ); + return hIcon; + } + default: + return 0; + } } /****************************************************************************** @@ -2199,7 +2312,15 @@ HICON16 WINAPI LoadIconHandler16( HGLOBAL16 hResource, BOOL16 bNew ) */ BOOL16 WINAPI DestroyIcon16(HICON16 hIcon) { - return DestroyIcon32(hIcon, 0); + int count; + + TRACE("%04x\n", hIcon ); + + count = release_shared_icon( hIcon ); + if (count != -1) return !count; + /* assume non-shared */ + GlobalFree16( hIcon ); + return TRUE; } /*********************************************************************** @@ -2207,7 +2328,7 @@ BOOL16 WINAPI DestroyIcon16(HICON16 hIcon) */ BOOL16 WINAPI DestroyCursor16(HCURSOR16 hCursor) { - return DestroyIcon32(hCursor, 0); + return DestroyIcon16( hCursor ); }

1 0

Alexandre Julliard : user32: Always return the actual pointer instead of a winproc handle in WINPROC_GetProc16 .
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 5a35c490a186d3760840a72af89cd6aafd926f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a35c490a186d3760840a72af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 19:48:12 2009 +0100 user32: Always return the actual pointer instead of a winproc handle in WINPROC_GetProc16. --- dlls/user32/msg16.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index b1cc938..0866875 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -163,7 +163,8 @@ static WNDPROC16 alloc_win16_thunk( WNDPROC handle ) WINPROC_THUNK *thunk; UINT index = LOWORD( handle ); - if (index >= MAX_WINPROCS32) return (WNDPROC16)handle; /* already a 16-bit proc */ + if (index >= MAX_WINPROCS32) /* already a 16-bit proc */ + return winproc16_array[index - MAX_WINPROCS32]; if (!thunk_array) /* allocate the array and its selector */ {

1 0

Louis Lenders : mapistub: Add new stubbed dll mapistub.dll.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 13a9c037f4c5bc88be241a66e6dcc374ae39eae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a9c037f4c5bc88be241a66e… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Dec 17 17:41:18 2009 +0100 mapistub: Add new stubbed dll mapistub.dll. --- configure | 9 ++ configure.ac | 1 + dlls/mapistub/Makefile.in | 13 +++ dlls/mapistub/main.c | 48 +++++++++++ dlls/mapistub/mapistub.spec | 190 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 261 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13a9c037f4c5bc88be241…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009