November 2011 - Wine-commits

Dmitry Timoshkov : user32: Issue a warning when dialog control creation fails.
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: eb0576ba5904cd4faeb1775ee9e214ba78a257fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0576ba5904cd4faeb1775ee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 17 13:19:38 2011 +0800 user32: Issue a warning when dialog control creation fails. --- dlls/user32/dialog.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 7643241..aa159c7 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -317,6 +317,8 @@ static BOOL DIALOG_CreateControls32( HWND hwnd, LPCSTR template, const DLG_TEMPL } if (!hwndCtrl) { + WARN("control %s %s creation failed\n", debugstr_w(info.className), + debugstr_w(info.windowName)); if (dlgTemplate->style & DS_NOFAILCREATE) continue; return FALSE; }

1 0

Francois Gouget : ws2_32: Delete the static critical section when unloading the dll.
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: c9ae82da93fabfae44baf9e23d9a73ef8bb597a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ae82da93fabfae44baf9e23… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:52:09 2011 +0100 ws2_32: Delete the static critical section when unloading the dll. --- dlls/ws2_32/socket.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fe645c1..e345e87 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -866,6 +866,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) break; case DLL_PROCESS_DETACH: free_per_thread_data(); + DeleteCriticalSection(&csWSgetXXXbyYYY); num_startup = 0; break; case DLL_THREAD_DETACH:

1 0

Alexandre Julliard : comctl32: Avoid losing the color masks in CreateMappedBitmap.
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: d8241b8db67cde8f70e6bea3694686d84023ca6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8241b8db67cde8f70e6bea36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 16 20:26:30 2011 +0100 comctl32: Avoid losing the color masks in CreateMappedBitmap. --- dlls/comctl32/commctrl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 76ab3a1..c0d0043 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -796,7 +796,10 @@ CreateMappedBitmap (HINSTANCE hInstance, INT_PTR idBitmap, UINT wFlags, nColorTableSize = (1 << lpBitmap->biBitCount); else nColorTableSize = 0; - nSize = lpBitmap->biSize + nColorTableSize * sizeof(RGBQUAD); + nSize = lpBitmap->biSize; + if (nSize == sizeof(BITMAPINFOHEADER) && lpBitmap->biCompression == BI_BITFIELDS) + nSize += 3 * sizeof(DWORD); + nSize += nColorTableSize * sizeof(RGBQUAD); lpBitmapInfo = GlobalAlloc (GMEM_FIXED, nSize); if (lpBitmapInfo == NULL) return 0;

1 0

Jacek Caban : mshtml: Added support for ActiveX objects without IQuickActivate support.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: d4aacad9ea02ca3ff9ff204591197808123cf652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4aacad9ea02ca3ff9ff20459… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 16 19:12:40 2011 +0100 mshtml: Added support for ActiveX objects without IQuickActivate support. --- dlls/mshtml/pluginhost.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 8a1e6c0..af0943b 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -186,6 +186,7 @@ static void activate_plugin(PluginHost *host) IClientSecurity *client_security; IQuickActivate *quick_activate; IOleCommandTarget *cmdtrg; + IViewObjectEx *view_obj; IOleObject *ole_obj; IDispatchEx *dispex; IDispatch *disp; @@ -211,22 +212,57 @@ static void activate_plugin(PluginHost *host) QACONTAINER container = {sizeof(container)}; QACONTROL control = {sizeof(control)}; + TRACE("Using IQuickActivate\n"); + container.pClientSite = &host->IOleClientSite_iface; container.dwAmbientFlags = QACONTAINER_SUPPORTSMNEMONICS|QACONTAINER_MESSAGEREFLECT|QACONTAINER_USERMODE; container.pAdviseSink = &host->IAdviseSinkEx_iface; container.pPropertyNotifySink = &host->IPropertyNotifySink_iface; hres = IQuickActivate_QuickActivate(quick_activate, &container, &control); + IQuickActivate_Release(quick_activate); if(FAILED(hres)) FIXME("QuickActivate failed: %08x\n", hres); + + load_plugin(host); }else { - FIXME("No IQuickActivate\n"); - return; + DWORD status = 0; + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IOleObject, (void**)&ole_obj); + if(FAILED(hres)) { + FIXME("Plugin does not support IOleObject\n"); + return; + } + + hres = IOleObject_GetMiscStatus(ole_obj, DVASPECT_CONTENT, &status); + TRACE("GetMiscStatus returned %08x %x\n", hres, status); + + hres = IOleObject_SetClientSite(ole_obj, &host->IOleClientSite_iface); + IOleObject_Release(ole_obj); + if(FAILED(hres)) { + FIXME("SetClientSite failed: %08x\n", hres); + return; + } + + load_plugin(host); + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IViewObjectEx, (void**)&view_obj); + if(SUCCEEDED(hres)) { + DWORD view_status = 0; + + hres = IViewObjectEx_SetAdvise(view_obj, DVASPECT_CONTENT, 0, (IAdviseSink*)&host->IAdviseSinkEx_iface); + if(FAILED(hres)) + WARN("SetAdvise failed: %08x\n", hres); + + hres = IViewObjectEx_GetViewStatus(view_obj, &view_status); + IViewObjectEx_Release(view_obj); + TRACE("GetViewStatus returned %08x %x\n", hres, view_status); + } } - load_plugin(host); + update_readystate(host); - /* NOTE: Native QIs for IViewObjectEx, IActiveScript, an undocumented IID, IOleControl and IRunnableObject */ + /* NOTE: Native QIs for IActiveScript, an undocumented IID, IOleControl and IRunnableObject */ hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) {

1 0

Francois Gouget : wininet: Give a name to the critical sections, make them static and delete them when unloading the dll.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 17929b925ea93cdbe140b6a5a7b120589cf020fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=17929b925ea93cdbe140b6a5a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 16 16:29:44 2011 +0100 wininet: Give a name to the critical sections, make them static and delete them when unloading the dll. --- dlls/wininet/http.c | 2 ++ dlls/wininet/netconnection.c | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1847820..16f550c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1825,6 +1825,7 @@ static void HTTPREQ_Destroy(object_header_t *hdr) } heap_free(request->cacheFile); + request->read_section.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &request->read_section ); WININET_Release(&request->session->hdr); @@ -3047,6 +3048,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->data_stream = &request->netconn_stream.data_stream; InitializeCriticalSection( &request->read_section ); + request->read_section.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": http_request_t.read_section"); WININET_AddRef( &session->hdr ); request->session = session; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index dd887eb..bf93301 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -484,7 +484,10 @@ static DWORD init_openssl(void) return ERROR_OUTOFMEMORY; for(i = 0; i < num_ssl_locks; i++) + { InitializeCriticalSection(&ssl_locks[i]); + ssl_locks[i].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ssl_locks"); + } pCRYPTO_set_locking_callback(ssl_lock_callback); return ERROR_SUCCESS; @@ -578,7 +581,11 @@ void NETCON_unload(void) if (ssl_locks) { int i; - for (i = 0; i < num_ssl_locks; i++) DeleteCriticalSection(&ssl_locks[i]); + for (i = 0; i < num_ssl_locks; i++) + { + ssl_locks[i].DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&ssl_locks[i]); + } heap_free(ssl_locks); } #endif

1 0

Francois Gouget : credui: Delete the static critical section when unloading the dll.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 8ce78a7b3e5af41ca434c00b119947278fce3378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce78a7b3e5af41ca434c00b1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 16 16:30:18 2011 +0100 credui: Delete the static critical section when unloading the dll. --- dlls/credui/credui_main.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index dd55ac0..9d09b03 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -65,19 +65,21 @@ static CRITICAL_SECTION csPendingCredentials = { &critsect_debug, -1, 0, 0, 0, 0 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { + struct pending_credentials *entry, *cursor2; TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); - if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ - - if (fdwReason == DLL_PROCESS_ATTACH) + switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); hinstCredUI = hinstDLL; InitCommonControls(); - } - else if (fdwReason == DLL_PROCESS_DETACH) - { - struct pending_credentials *entry, *cursor2; + break; + + case DLL_PROCESS_DETACH: LIST_FOR_EACH_ENTRY_SAFE(entry, cursor2, &pending_credentials_list, struct pending_credentials, entry) { list_remove(&entry->entry); @@ -88,6 +90,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) HeapFree(GetProcessHeap(), 0, entry->pszPassword); HeapFree(GetProcessHeap(), 0, entry); } + DeleteCriticalSection(&csPendingCredentials); + break; } return TRUE;

1 0

Francois Gouget : dinput: Delete the static critical section when unloading the dll.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 4ed24cd5f5c336291ffe0ffb9a7e65f5e0de2303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed24cd5f5c336291ffe0ffb9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 16 16:31:26 2011 +0100 dinput: Delete the static critical section when unloading the dll. --- dlls/dinput/dinput_main.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 373b990..c121ae9 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -97,20 +97,6 @@ static const struct dinput_device *dinput_devices[] = static HINSTANCE DINPUT_instance = NULL; -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserv) -{ - switch(reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - DINPUT_instance = inst; - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} - static BOOL check_hook_thread(void); static CRITICAL_SECTION dinput_hook_crit; static struct list direct_input_list = LIST_INIT( direct_input_list ); @@ -1443,3 +1429,18 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface) LeaveCriticalSection(&dinput_hook_crit); } + +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserv) +{ + switch(reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + DINPUT_instance = inst; + break; + case DLL_PROCESS_DETACH: + DeleteCriticalSection(&dinput_hook_crit); + break; + } + return TRUE; +}

1 0

Francois Gouget : dxgi: Delete the static critical section when unloading the dll.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 903146bdcd0e400ddbfe4f3f0bb71cfcf5fe0c85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903146bdcd0e400ddbfe4f3f0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 16 16:31:35 2011 +0100 dxgi: Delete the static critical section when unloading the dll. --- dlls/dxgi/dxgi_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 36e3326..c9d6f2e 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -54,6 +54,7 @@ static void dxgi_main_cleanup(void) dxgi_main.d3d10core = NULL; LeaveCriticalSection(&dxgi_cs); + DeleteCriticalSection(&dxgi_cs); } BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)

1 0

Francois Gouget : mscms: Delete the static critical section when unloading the dll.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 3abbbb2556515d09e794edd0934ddbbde3b0ed18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3abbbb2556515d09e794edd09… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 16 16:33:11 2011 +0100 mscms: Delete the static critical section when unloading the dll. --- dlls/mscms/handle.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mscms/handle.c b/dlls/mscms/handle.c index 84f1d8b..1fec810 100644 --- a/dlls/mscms/handle.c +++ b/dlls/mscms/handle.c @@ -60,6 +60,8 @@ void free_handle_tables( void ) HeapFree( GetProcessHeap(), 0, transformtable ); transformtable = NULL; num_transform_handles = 0; + + DeleteCriticalSection( &MSCMS_handle_cs ); } struct profile *grab_profile( HPROFILE handle )

1 0

Francois Gouget : crypt32: Delete the oid and sip static critical sections when unloading the dll.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 10faa9997ea7ebd2d7ec096c7d3bfd1797dbdc11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10faa9997ea7ebd2d7ec096c7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 16 16:33:42 2011 +0100 crypt32: Delete the oid and sip static critical sections when unloading the dll. --- dlls/crypt32/oid.c | 2 ++ dlls/crypt32/sip.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index e5d61f5..932bba2 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -92,6 +92,7 @@ static void free_function_sets(void) DeleteCriticalSection(&setCursor->cs); CryptMemFree(setCursor); } + DeleteCriticalSection(&funcSetCS); } /* There is no free function associated with this; therefore, the sets are @@ -1461,6 +1462,7 @@ static void free_oid_info(void) list_remove(&info->entry); CryptMemFree(info); } + DeleteCriticalSection(&oidInfoCS); } /*********************************************************************** diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index d2f55f2..e43ebc7 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -616,6 +616,7 @@ void crypt_sip_free(void) FreeLibrary(prov->info.hSIP); CryptMemFree(prov); } + DeleteCriticalSection(&providers_cs); } /* Loads the SIP for pgSubject into the global cache. Returns FALSE if the

1 0