November 2011 - Wine-commits

Aric Stewart : usp10: Keep the levels array in more cases.
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: 2c8fb3aba19cf82679abc5dde0fa3bcb31486760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8fb3aba19cf82679abc5dde… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Nov 17 09:40:16 2011 -0700 usp10: Keep the levels array in more cases. --- 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 05282a2..844f53c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -851,7 +851,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int for (i = 0; i < cInChars; i++) if (levels[i]!=levels[0]) break; - if (i >= cInChars && !odd(baselevel)) + if (i >= cInChars && !odd(baselevel) && !odd(psState->uBidiLevel)) { heap_free(levels); levels = NULL;

1 0

Aric Stewart : usp10: If leading with a strong character use its bidi level for our intial LayoutRTL .
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: 41db79a8555b2fc2c826ef4dd041c01b6efdd1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41db79a8555b2fc2c826ef4dd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Nov 17 09:40:54 2011 -0700 usp10: If leading with a strong character use its bidi level for our intial LayoutRTL. --- dlls/usp10/usp10.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 844f53c..1f18294 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -949,7 +949,10 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int if (levels) { - layoutRTL = (psState->uBidiLevel || odd(levels[cnt]))?1:0; + if (strength[cnt] == BIDI_STRONG) + layoutRTL = (odd(levels[cnt]))?1:0; + else + layoutRTL = (psState->uBidiLevel || odd(levels[cnt]))?1:0; pItems[index].a.fRTL = odd(levels[cnt]); pItems[index].a.fLayoutRTL = layoutRTL; pItems[index].a.s.uBidiLevel = levels[cnt];

1 0

Aric Stewart : usp10: When converting common indic items use the main indic script not the Numeric or currency script , even if that was the most recent.
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: 105704534dc7eb0def882e6a4f1f3b3730681ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=105704534dc7eb0def882e6a4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Nov 17 09:41:33 2011 -0700 usp10: When converting common indic items use the main indic script not the Numeric or currency script, even if that was the most recent. --- dlls/usp10/usp10.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 1f18294..535441f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -777,6 +777,35 @@ static inline BOOL is_indic(WORD script) return (script >= Script_Devanagari && script <= Script_Malayalam_Numeric); } +static inline WORD base_indic(WORD script) +{ + switch (script) + { + case Script_Devanagari: + case Script_Devanagari_Numeric: return Script_Devanagari; + case Script_Bengali: + case Script_Bengali_Numeric: + case Script_Bengali_Currency: return Script_Bengali; + case Script_Gurmukhi: + case Script_Gurmukhi_Numeric: return Script_Gurmukhi; + case Script_Gujarati: + case Script_Gujarati_Numeric: + case Script_Gujarati_Currency: return Script_Gujarati; + case Script_Oriya: + case Script_Oriya_Numeric: return Script_Oriya; + case Script_Tamil: + case Script_Tamil_Numeric: return Script_Tamil; + case Script_Telugu: + case Script_Telugu_Numeric: return Script_Telugu; + case Script_Kannada: + case Script_Kannada_Numeric: return Script_Kannada; + case Script_Malayalam: + case Script_Malayalam_Numeric: return Script_Malayalam; + default: + return -1; + }; +} + /*********************************************************************** * ScriptItemizeOpenType (USP10.@) * @@ -834,7 +863,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int if ((pwcInChars[i] == 0x964 || pwcInChars[i] ==0x965) && last_indic > 0) scripts[i] = last_indic; else if (is_indic(scripts[i])) - last_indic = scripts[i]; + last_indic = base_indic(scripts[i]); } if (psState && psControl)

1 0

Piotr Caban : msvcp90: Forward basic_string<short> to basic_string<wchar_t> .
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: 4217d8e62ed84c810ba49c34faca8f7d3e7fbcaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4217d8e62ed84c810ba49c34f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 17 12:21:43 2011 +0100 msvcp90: Forward basic_string<short> to basic_string<wchar_t>. --- dlls/msvcp90/msvcp90.spec | 608 ++++++++++++++++++++++---------------------- dlls/msvcp90/string.c | 311 +++++++++++++++++++++++- 2 files changed, 612 insertions(+), 307 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4217d8e62ed84c810ba49…

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: d351e02321e740c5cdf7fa9e08989c6083a1b21a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d351e02321e740c5cdf7fa9e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 17 12:22:09 2011 +0100 msvcp: Sync spec files. --- dlls/msvcp60/msvcp60.spec | 432 ++++++++++++++++++------------------ dlls/msvcp70/msvcp70.spec | 362 +++++++++++++++--------------- dlls/msvcp71/msvcp71.spec | 484 ++++++++++++++++++++-------------------- dlls/msvcp80/msvcp80.spec | 556 ++++++++++++++++++++++---------------------- 4 files changed, 917 insertions(+), 917 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d351e02321e740c5cdf7f…

1 0

Francois Gouget : mshtml: Delete the dispex and gecko static critical sections when unloading the dll .
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: 113df19d6a23a0bf0f2c5744d8c818f84c0d6a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=113df19d6a23a0bf0f2c5744d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:52:21 2011 +0100 mshtml: Delete the dispex and gecko static critical sections when unloading the dll. --- dlls/mshtml/dispex.c | 21 +++++++++++---------- dlls/mshtml/nsembed.c | 2 ++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 75b3f87..8a0ac44 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -31,6 +31,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +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 const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; typedef struct { @@ -155,6 +165,7 @@ void release_typelib(void) ITypeInfo_Release(typeinfos[i]); ITypeLib_Release(typelib); + DeleteCriticalSection(&cs_dispex_static_data); } HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) @@ -320,16 +331,6 @@ HRESULT get_dispids(tid_t tid, DWORD *ret_size, DISPID **ret) return S_OK; } -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) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 12c6c15..6874459 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -905,6 +905,8 @@ void close_gecko(void) /* Gecko doesn't really support being unloaded */ /* if (hXPCOM) FreeLibrary(hXPCOM); */ + + DeleteCriticalSection(&cs_load_gecko); } BOOL is_gecko_path(const char *path)

1 0

Francois Gouget : msi: Delete the handle static critical sections when unloading the dll.
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: 7238a788051a85b7d9ae881c069903c58044d98c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7238a788051a85b7d9ae881c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:52:38 2011 +0100 msi: Delete the handle static critical sections when unloading the dll. --- dlls/msi/handle.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/handle.c b/dlls/msi/handle.c index 8d43775..80c6873 100644 --- a/dlls/msi/handle.c +++ b/dlls/msi/handle.c @@ -71,6 +71,8 @@ void msi_free_handle_table(void) msi_free( msihandletable ); msihandletable = NULL; msihandletable_size = 0; + DeleteCriticalSection(&MSI_handle_cs); + DeleteCriticalSection(&MSI_object_cs); } static MSIHANDLE alloc_handle_table_entry(void)

1 0

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

17 Nov '11

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 17 Nov '11

17 Nov '11

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 : ole32: Delete the compobj and rpc static critical sections when unloading the dll .
by Alexandre Julliard 17 Nov '11

17 Nov '11

Module: wine Branch: master Commit: ed03674bc30e9a4d01c3b921ca4032a4711dd3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed03674bc30e9a4d01c3b921c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:53:19 2011 +0100 ole32: Delete the compobj and rpc static critical sections when unloading the dll. --- dlls/ole32/compobj.c | 3 +++ dlls/ole32/rpc.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 28e5da1..4579f0a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -308,6 +308,7 @@ static void COMPOBJ_DllList_Free(void) HeapFree(GetProcessHeap(), 0, entry); } LeaveCriticalSection(&csOpenDllList); + DeleteCriticalSection(&csOpenDllList); } /****************************************************************************** @@ -4286,6 +4287,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) COMPOBJ_UninitProcess(); RPC_UnregisterAllChannelHooks(); COMPOBJ_DllList_Free(); + DeleteCriticalSection(&csRegisteredClassList); + DeleteCriticalSection(&csApartment); break; case DLL_THREAD_DETACH: diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 35971e0..c336743 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -453,6 +453,8 @@ void RPC_UnregisterAllChannelHooks(void) LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &channel_hooks, struct channel_hook_entry, entry) HeapFree(GetProcessHeap(), 0, cursor); LeaveCriticalSection(&csChannelHook); + DeleteCriticalSection(&csChannelHook); + DeleteCriticalSection(&csRegIf); } /* RPC Channel Buffer Functions */

1 0