November 2011 - Wine-Commits

Aric Stewart : usp10: Windows 7 defines a Tibetan numeric script but never uses it.
by Alexandre Julliard Nov. 17, 2011

Nov. 17, 2011

Module: wine Branch: master Commit: 92f706cd74e0877687384426a295a86049f66000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92f706cd74e0877687384426a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Nov 17 09:39:51 2011 -0700 usp10: Windows 7 defines a Tibetan numeric script but never uses it. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 589711d..05282a2 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -103,7 +103,7 @@ static const scriptRange scriptRanges[] = { /* Lao: U+0E80–U+0EFF */ { Script_Lao, 0xe80, 0xeff, Script_Lao_Numeric, 0}, /* Tibetan: U+0F00–U+0FFF */ - { Script_Tibetan, 0xf00, 0xfff, Script_Tibetan_Numeric, 0}, + { Script_Tibetan, 0xf00, 0xfff, 0, 0}, /* Georgian: U+10A0–U+10FF */ { Script_Georgian, 0x10a0, 0x10ff, 0, 0}, /* Vedic Extensions: U+1CD0-U+1CFF */

1 0

Thomas Faber : mshtml: Fix MSVC build in htmllocation.c.
by Alexandre Julliard Nov. 17, 2011

Nov. 17, 2011

Module: wine Branch: master Commit: 8ab355ab723a81da4fe02e380296f85122aac4a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab355ab723a81da4fe02e380… Author: Thomas Faber <thfabba(a)gmx.de> Date: Thu Nov 17 12:50:11 2011 +0100 mshtml: Fix MSVC build in htmllocation.c. --- dlls/mshtml/htmllocation.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 9c90edc..cf591d7 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -293,10 +293,10 @@ static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p) FIXME("Unexpected blank protocol\n"); return E_NOTIMPL; }else { - WCHAR buf[url.dwSchemeLength + 1]; + WCHAR *buf; + buf = *p = SysAllocStringLen(NULL, url.dwSchemeLength + 1); memcpy(buf, url.lpszScheme, url.dwSchemeLength * sizeof(WCHAR)); buf[url.dwSchemeLength] = ':'; - *p = SysAllocStringLen(buf, url.dwSchemeLength + 1); } if(!*p) return E_OUTOFMEMORY; @@ -334,13 +334,13 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) if(url.nPort) { /* <hostname>:<port> */ const WCHAR format[] = {'%','u',0}; - DWORD len = url.dwHostNameLength + 1 + 5 + 1; - WCHAR buf[len]; + DWORD len = url.dwHostNameLength + 1 + 5; + WCHAR *buf; + buf = *p = SysAllocStringLen(NULL, len); memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); buf[url.dwHostNameLength] = ':'; snprintfW(buf + url.dwHostNameLength + 1, 6, format, url.nPort); - *p = SysAllocString(buf); }else *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength);

1 0

Francois Gouget : winhttp: Delete the static critical sections when unloading the dll.
by Alexandre Julliard Nov. 17, 2011

Nov. 17, 2011

Module: wine Branch: master Commit: 57c123365aee916de597bea461054379bebc3930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c123365aee916de597bea46… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:55:18 2011 +0100 winhttp: Delete the static critical sections when unloading the dll. --- dlls/winhttp/net.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 4d2df07..60cb652 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -579,6 +579,10 @@ void netconn_unload( void ) } HeapFree( GetProcessHeap(), 0, ssl_locks ); } + DeleteCriticalSection(&init_ssl_cs); +#endif +#ifndef HAVE_GETADDRINFO + DeleteCriticalSection(&cs_gethostbyname); #endif }

1 0

Francois Gouget : rpcrt4: Delete the static critical sections when unloading the dll.
by Alexandre Julliard Nov. 17, 2011

Nov. 17, 2011

Module: wine Branch: master Commit: 92ff5f354873cb845f79d950a9877e5c4c02b8aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ff5f354873cb845f79d950a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:53:51 2011 +0100 rpcrt4: Delete the static critical sections when unloading the dll. --- dlls/rpcrt4/rpc_server.c | 3 +++ dlls/rpcrt4/rpcrt4_main.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 558fbd8..9121280 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1078,6 +1078,8 @@ void RPCRT4_destroy_all_protseqs(void) destroy_serverprotoseq(cps); } LeaveCriticalSection(&server_cs); + DeleteCriticalSection(&server_cs); + DeleteCriticalSection(&listen_cs); } /*********************************************************************** @@ -1321,6 +1323,7 @@ void RPCRT4_ServerFreeAllRegisteredAuthInfo(void) HeapFree(GetProcessHeap(), 0, auth_info); } LeaveCriticalSection(&server_auth_info_cs); + DeleteCriticalSection(&server_auth_info_cs); } /*********************************************************************** diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 5976948..53f3bbd 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -140,6 +140,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_DETACH: RPCRT4_destroy_all_protseqs(); RPCRT4_ServerFreeAllRegisteredAuthInfo(); + DeleteCriticalSection(&uuid_cs); + DeleteCriticalSection(&threaddata_cs); break; }

1 0

Francois Gouget : user32: Delete the static critical section when unloading the dll.
by Alexandre Julliard Nov. 17, 2011

Nov. 17, 2011

Module: wine Branch: master Commit: 1b1433a152194174020694e03e56deb83aee0c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1433a152194174020694e03… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:54:45 2011 +0100 user32: Delete the static critical section when unloading the dll. --- dlls/user32/user_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 2c2b256..a42efb0 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -336,6 +336,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) break; case DLL_PROCESS_DETACH: USER_unload_driver(); + DeleteCriticalSection(&user_section); break; } return ret;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DVECTOR typedef.
by Alexandre Julliard Nov. 17, 2011

Nov. 17, 2011

Module: wine Branch: master Commit: a7c9c793cf0a58b3b8c7ebdbb086d14fb8aba223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c9c793cf0a58b3b8c7ebdbb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 16 20:08:07 2011 +0100 wined3d: Get rid of the WINED3DVECTOR typedef. --- include/wine/wined3d.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3cf3ec0..5e0423b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1525,12 +1525,12 @@ struct wined3d_color float a; }; -typedef struct _WINED3DVECTOR +struct wined3d_vec3 { float x; float y; float z; -} WINED3DVECTOR; +}; typedef struct _WINED3DMATRIX { @@ -1553,8 +1553,8 @@ typedef struct _WINED3DLIGHT struct wined3d_color Diffuse; struct wined3d_color Specular; struct wined3d_color Ambient; - WINED3DVECTOR Position; - WINED3DVECTOR Direction; + struct wined3d_vec3 Position; + struct wined3d_vec3 Direction; float Range; float Falloff; float Attenuation0;

1 0

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

Nov. 17, 2011

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 : msvideo: Delete the static critical section when unloading the dll.
by Alexandre Julliard Nov. 17, 2011

Nov. 17, 2011

Module: wine Branch: master Commit: 94091b9bd137eff9f8dc1dc73260cde5ba84d4c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94091b9bd137eff9f8dc1dc73… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:52:50 2011 +0100 msvideo: Delete the static critical section when unloading the dll. --- dlls/msvideo.dll16/msvideo16.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index 93724c9..b729ccc 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -967,6 +967,7 @@ BOOL WINAPI VIDEO_LibMain(DWORD fdwReason, HINSTANCE hinstDLL, WORD ds, case DLL_PROCESS_ATTACH: break; case DLL_PROCESS_DETACH: + DeleteCriticalSection(&msvideo_cs); break; case DLL_THREAD_ATTACH: case DLL_THREAD_DETACH:

1 0

Francois Gouget : msxml3: Delete the dispex static critical section when unloading the dll.
by Alexandre Julliard Nov. 17, 2011

Nov. 17, 2011

Module: wine Branch: master Commit: a3e2c68f986308997e764f0c383441531c61949a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e2c68f986308997e764f0c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:53:01 2011 +0100 msxml3: Delete the dispex static critical section when unloading the dll. --- dlls/msxml3/dispex.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 3789134..6c74173 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -45,6 +45,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); +static CRITICAL_SECTION cs_dispex_static_data; +static CRITICAL_SECTION_DEBUG cs_dispex_static_data_dbg = +{ + 0, 0, &cs_dispex_static_data, + { &cs_dispex_static_data_dbg.ProcessLocksList, &cs_dispex_static_data_dbg.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": dispex_static_data") } +}; +static CRITICAL_SECTION cs_dispex_static_data = { &cs_dispex_static_data_dbg, -1, 0, 0, 0, 0 }; + + enum lib_version_t { LibXml = 0, @@ -206,6 +216,8 @@ void release_typelib(void) for(i=0; i < sizeof(typelib)/sizeof(*typelib); i++) if(typelib[i]) ITypeLib_Release(typelib[i]); + + DeleteCriticalSection(&cs_dispex_static_data); } static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, DISPID id, ITypeInfo *dti) @@ -301,16 +313,6 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) return data; } -static CRITICAL_SECTION cs_dispex_static_data; -static CRITICAL_SECTION_DEBUG cs_dispex_static_data_dbg = -{ - 0, 0, &cs_dispex_static_data, - { &cs_dispex_static_data_dbg.ProcessLocksList, &cs_dispex_static_data_dbg.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": dispex_static_data") } -}; -static CRITICAL_SECTION cs_dispex_static_data = { &cs_dispex_static_data_dbg, -1, 0, 0, 0, 0 }; - - static dispex_data_t *get_dispex_data(DispatchEx *This) { if(This->data->data)

1 0

Francois Gouget : urlmon: Delete the static critical section when unloading the dll.
by Alexandre Julliard Nov. 17, 2011

Nov. 17, 2011

Module: wine Branch: master Commit: 7b1d68563454dc4fcd3de89137f4fcb496ee31c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1d68563454dc4fcd3de8913… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:54:13 2011 +0100 urlmon: Delete the static critical section when unloading the dll. --- dlls/urlmon/urlmon_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 0911127..cfd0918 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -154,6 +154,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) case DLL_PROCESS_DETACH: process_detach(); + DeleteCriticalSection(&tls_cs); break; case DLL_THREAD_DETACH:

1 0