December 2009 - Wine-commits

Jacek Caban : mshtml: Use JScript for JavaScript in res: protocol documents .
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 4e6e90896635bd4e82a828fcf870da4727c3f17a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e6e90896635bd4e82a828fcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 22:51:04 2009 +0100 mshtml: Use JScript for JavaScript in res: protocol documents. --- dlls/mshtml/persist.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index eaff9dd..e6a54ac 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -50,9 +50,11 @@ static BOOL use_gecko_script(LPCWSTR url) { static const WCHAR fileW[] = {'f','i','l','e',':'}; static const WCHAR aboutW[] = {'a','b','o','u','t',':'}; + static const WCHAR resW[] = {'r','e','s',':'}; return strncmpiW(fileW, url, sizeof(fileW)/sizeof(WCHAR)) - && strncmpiW(aboutW, url, sizeof(aboutW)/sizeof(WCHAR)); + && strncmpiW(aboutW, url, sizeof(aboutW)/sizeof(WCHAR)) + && strncmpiW(resW, url, sizeof(resW)/sizeof(WCHAR)); } void set_current_mon(HTMLWindow *This, IMoniker *mon)

1 0

Jacek Caban : mshtml: Added JavaScript tests architecture and simple tests.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 3bacd7603d2cdedf5c9ac2b2d085368d390e87ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bacd7603d2cdedf5c9ac2b2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 22:51:50 2009 +0100 mshtml: Added JavaScript tests architecture and simple tests. --- dlls/mshtml/tests/Makefile.in | 2 + dlls/mshtml/tests/jstest.html | 20 ++ dlls/mshtml/tests/rsrc.rc | 20 ++ dlls/mshtml/tests/script.c | 735 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 759 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bacd7603d2cdedf5c9ac…

1 0

Jacek Caban : urlmon: Report BINDSTATUS_CONNECTING to download callback.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: abf7022c7861f2f3de670b7b33caa41037e681ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf7022c7861f2f3de670b7b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 22:57:28 2009 +0100 urlmon: Report BINDSTATUS_CONNECTING to download callback. --- dlls/urlmon/download.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/download.c b/dlls/urlmon/download.c index d81dffa..ebcb9c9 100644 --- a/dlls/urlmon/download.c +++ b/dlls/urlmon/download.c @@ -140,6 +140,7 @@ static HRESULT WINAPI DownloadBSC_OnProgress(IBindStatusCallback *iface, ULONG u debugstr_w(szStatusText)); switch(ulStatusCode) { + case BINDSTATUS_CONNECTING: case BINDSTATUS_BEGINDOWNLOADDATA: case BINDSTATUS_DOWNLOADINGDATA: case BINDSTATUS_ENDDOWNLOADDATA: @@ -153,8 +154,7 @@ static HRESULT WINAPI DownloadBSC_OnProgress(IBindStatusCallback *iface, ULONG u This->cache_file = heap_strdupW(szStatusText); break; - case BINDSTATUS_FINDINGRESOURCE: - case BINDSTATUS_CONNECTING: + case BINDSTATUS_FINDINGRESOURCE: /* FIXME */ break; default:

1 0

Henri Verbeet : d3d9/tests: A volume really isn't a resource, despite having all the methods.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: f262cf7603b5b5362cef32e28c2f36934e5d835b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f262cf7603b5b5362cef32e28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 21 23:17:23 2009 +0100 d3d9/tests: A volume really isn't a resource, despite having all the methods. --- dlls/d3d9/tests/volume.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/volume.c b/dlls/d3d9/tests/volume.c index 38ea501..b313713 100644 --- a/dlls/d3d9/tests/volume.c +++ b/dlls/d3d9/tests/volume.c @@ -121,6 +121,29 @@ cleanup: if (volume_ptr) IDirect3DVolume9_Release(volume_ptr); } +static void test_volume_resource(IDirect3DDevice9 *device) +{ + IDirect3DVolumeTexture9 *texture; + IDirect3DResource9 *resource; + IDirect3DVolume9 *volume; + HRESULT hr; + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 128, 128, 128, 1, 0, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture, 0); + ok(SUCCEEDED(hr), "CreateVolumeTexture failed, hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture9_GetVolumeLevel(texture, 0, &volume); + ok(SUCCEEDED(hr), "GetVolumeLevel failed, hr %#x.\n", hr); + + IDirect3DVolumeTexture9_Release(texture); + + hr = IDirect3DVolume9_QueryInterface(volume, &IID_IDirect3DResource9, (void **)&resource); + ok(hr == E_NOINTERFACE, "QueryInterface returned %#x, expected %#x.\n", hr, E_NOINTERFACE); + + IDirect3DVolume9_Release(volume); +} + + START_TEST(volume) { HMODULE d3d9_handle; @@ -146,6 +169,7 @@ START_TEST(volume) } test_volume_get_container(device_ptr); + test_volume_resource(device_ptr); refcount = IDirect3DDevice9_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Henri Verbeet : wined3d: Volumes are resources in wined3d.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 3f77683174a739129925a4a7877802d578b47c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f77683174a739129925a4a78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 21 23:17:24 2009 +0100 wined3d: Volumes are resources in wined3d. --- dlls/wined3d/volume.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 7f65f2a..8e19ee9 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -97,18 +97,23 @@ void volume_add_dirty_box(IWineD3DVolume *iface, const WINED3DBOX *dirty_box) /* ******************************************* IWineD3DVolume IUnknown parts follow ******************************************* */ -static HRESULT WINAPI IWineD3DVolumeImpl_QueryInterface(IWineD3DVolume *iface, REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI IWineD3DVolumeImpl_QueryInterface(IWineD3DVolume *iface, REFIID riid, void **object) { - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IWineD3DBase) - || IsEqualGUID(riid, &IID_IWineD3DVolume)){ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_IWineD3DVolume) + || IsEqualGUID(riid, &IID_IWineD3DResource) + || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *object = iface; return S_OK; } - *ppobj = NULL; + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; return E_NOINTERFACE; }

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

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: 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: 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

Jacek Caban : wininet: Don't use INTERNET_SetLastError in HttpSendRequestA.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: e1958a67d681ec6b9f9fea48d50200b1ec52cee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1958a67d681ec6b9f9fea48d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 13:58:18 2009 +0100 wininet: Don't use INTERNET_SetLastError in HttpSendRequestA. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index aa5a449..882c89b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3770,7 +3770,7 @@ BOOL WINAPI HttpEndRequestA(HINTERNET hRequest, if (lpBuffersOut) { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }

1 0