November 2011 - Wine-Commits

Jacek Caban : mshtml: Reinitialize list entry in detach_plugin_host.
by Alexandre Julliard Nov. 17, 2011

Nov. 17, 2011

Module: wine Branch: master Commit: c7cb5b8fad61aee8f12d72366f55e28d2ae38405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7cb5b8fad61aee8f12d72366… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 17 13:54:52 2011 +0100 mshtml: Reinitialize list entry in detach_plugin_host. --- dlls/mshtml/pluginhost.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index af0943b..9309310 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -1281,6 +1281,7 @@ void detach_plugin_host(PluginHost *host) } list_remove(&host->entry); + list_init(&host->entry); host->doc = NULL; }

1 0

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

Nov. 17, 2011

Module: wine Branch: master Commit: 54bcda10e560b193b2add0428b30456bdc8c34a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54bcda10e560b193b2add0428… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:54:54 2011 +0100 wined3d: Delete the static critical sections when unloading the dll. --- dlls/wined3d/wined3d_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0533595..1b7e493 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -382,6 +382,8 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) HeapFree(GetProcessHeap(), 0, wined3d_settings.logo); UnregisterClassA(WINED3D_OPENGL_WINDOW_CLASS_NAME, hInstDLL); + DeleteCriticalSection(&wined3d_wndproc_cs); + DeleteCriticalSection(&wined3d_cs); return TRUE; }

1 0

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

Nov. 17, 2011

Module: wine Branch: master Commit: 7454791643e366e2ece52d5c9b81069343e6df8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7454791643e366e2ece52d5c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 09:55:26 2011 +0100 winspool.drv: Delete the static critical section when unloading the dll. --- dlls/winspool.drv/wspool.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c index 54f921d..1f25129 100644 --- a/dlls/winspool.drv/wspool.c +++ b/dlls/winspool.drv/wspool.c @@ -114,6 +114,7 @@ static void unload_backend(void) backend = NULL; FreeLibrary(hlocalspl); LeaveCriticalSection(&backend_cs); + DeleteCriticalSection(&backend_cs); }

1 0

Jacek Caban : mshtml: Added tests of handling ActiveX objects without IQuickActivate interface implemented .
by Alexandre Julliard Nov. 17, 2011

Nov. 17, 2011

Module: wine Branch: master Commit: 3cf749a6bf13468370417f9d953b11bcf2dbd2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf749a6bf13468370417f9d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 17 13:55:07 2011 +0100 mshtml: Added tests of handling ActiveX objects without IQuickActivate interface implemented. --- dlls/mshtml/tests/activex.c | 133 ++++++++++++++++++++++++++++++------------ 1 files changed, 95 insertions(+), 38 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index c056e8b..d9e9c1f 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -83,10 +83,19 @@ DEFINE_EXPECT(SetObjectRects); DEFINE_EXPECT(InPlaceDeactivate); DEFINE_EXPECT(UIDeactivate); DEFINE_EXPECT(QueryService_TestActiveX); +DEFINE_EXPECT(GetMiscStatus); +DEFINE_EXPECT(SetAdvise); +DEFINE_EXPECT(GetViewStatus); #define DISPID_SCRIPTPROP 1000 +enum { + TEST_FLASH, + TEST_NOQUICKACT +}; + static HWND container_hwnd, plugin_hwnd; +static int plugin_behavior; #define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7f6680746}" @@ -703,8 +712,13 @@ static HRESULT WINAPI ViewObjectEx_Unfreeze(IViewObjectEx *iface, DWORD dwFreeze static HRESULT WINAPI ViewObjectEx_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(SetAdvise); + + ok(aspects == DVASPECT_CONTENT, "aspects = %x\n", aspects); + ok(!advf, "advf = %x\n", advf); + ok(pAdvSink != NULL, "pAdvSink = NULL\n"); + + return S_OK; } static HRESULT WINAPI ViewObjectEx_GetAdvise(IViewObjectEx *iface, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink) @@ -727,8 +741,10 @@ static HRESULT WINAPI ViewObjectEx_GetRect(IViewObjectEx *iface, DWORD dwAspect, static HRESULT WINAPI ViewObjectEx_GetViewStatus(IViewObjectEx *iface, DWORD *pdwStatus) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(GetViewStatus); + + *pdwStatus = VIEWSTATUS_OPAQUE|VIEWSTATUS_SOLIDBKGND; + return S_OK; } static HRESULT WINAPI ViewObjectEx_QueryHitPoint(IViewObjectEx *iface, DWORD dwAspect, LPCRECT pRectBounds, POINT ptlLoc, @@ -795,7 +811,10 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite } CHECK_EXPECT(SetClientSite); - return E_NOTIMPL; + + IOleClientSite_AddRef(pClientSite); + client_site = pClientSite; + return S_OK; } static HRESULT WINAPI OleObject_GetClientSite(IOleObject *iface, IOleClientSite **ppClientSite) @@ -981,8 +1000,12 @@ static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **pp static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(GetMiscStatus); + ok(dwAspect == DVASPECT_CONTENT, "dwAspect = %d\n", dwAspect); + ok(pdwStatus != NULL, "pdwStatus == NULL\n"); + *pdwStatus = OLEMISC_SETCLIENTSITEFIRST|OLEMISC_ACTIVATEWHENVISIBLE + |OLEMISC_INSIDEOUT|OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE; + return S_OK; } static HRESULT WINAPI OleObject_SetColorScheme(IOleObject *iface, LOGPALETTE *pLogpal) @@ -1124,42 +1147,26 @@ static HRESULT ax_qi(REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleControl)) { *ppv = &OleControl; - return S_OK; - } - - if(IsEqualGUID(riid, &IID_IQuickActivate)) { - *ppv = &QuickActivate; - return S_OK; - } - - if(IsEqualGUID(riid, &IID_IPersistPropertyBag)) { - *ppv = &PersistPropertyBag; - return S_OK; - } - - if(IsEqualGUID(riid, &IID_IDispatch)) { + }else if(IsEqualGUID(riid, &IID_IQuickActivate)) { + *ppv = plugin_behavior == TEST_NOQUICKACT ? NULL : &QuickActivate; + }else if(IsEqualGUID(riid, &IID_IPersistPropertyBag)) { + *ppv = plugin_behavior == TEST_NOQUICKACT ? NULL : &PersistPropertyBag; + }else if(IsEqualGUID(riid, &IID_IDispatch)) { *ppv = &Dispatch; - return S_OK; - } - - if(IsEqualGUID(riid, &IID_IViewObject) || IsEqualGUID(riid, &IID_IViewObject2) || IsEqualGUID(riid, &IID_IViewObjectEx)) { + }else if(IsEqualGUID(riid, &IID_IViewObject) || IsEqualGUID(riid, &IID_IViewObject2) + || IsEqualGUID(riid, &IID_IViewObjectEx)) { *ppv = &ViewObjectEx; - return S_OK; - } - - if(IsEqualGUID(riid, &IID_IOleObject)) { + }else if(IsEqualGUID(riid, &IID_IOleObject)) { *ppv = &OleObject; - return S_OK; - } - - if(IsEqualGUID(riid, &IID_IOleWindow) || IsEqualGUID(riid, &IID_IOleInPlaceObject) + }else if(IsEqualGUID(riid, &IID_IOleWindow) || IsEqualGUID(riid, &IID_IOleInPlaceObject) || IsEqualGUID(&IID_IOleInPlaceObjectWindowless, riid)) { *ppv = &OleInPlaceObjectWindowless; - return S_OK; + }else { + trace("QI %s\n", debugstr_guid(riid)); + *ppv = NULL; } - *ppv = NULL; - return E_NOINTERFACE; + return *ppv ? S_OK : E_NOINTERFACE; } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) @@ -1949,10 +1956,12 @@ static void release_doc(IHTMLDocument2 *doc) } } -static void test_object_ax(void) +static void test_flash_ax(void) { IHTMLDocument2 *doc; + plugin_behavior = TEST_FLASH; + /* * We pump messages until both document is loaded and plugin instance is created. * Pumping until document is loaded should be enough, but Gecko loads plugins @@ -2009,6 +2018,51 @@ static void test_object_ax(void) CHECK_CALLED(SetClientSite_NULL); } +static void test_noquickact_ax(void) +{ + IHTMLDocument2 *doc; + + plugin_behavior = TEST_NOQUICKACT; + + SET_EXPECT(CreateInstance); + SET_EXPECT(FreezeEvents_TRUE); + SET_EXPECT(GetMiscStatus); + SET_EXPECT(SetClientSite); + SET_EXPECT(SetAdvise); + SET_EXPECT(GetViewStatus); + SET_EXPECT(FreezeEvents_FALSE); + SET_EXPECT(Invoke_READYSTATE); + SET_EXPECT(SetExtent); + SET_EXPECT(GetExtent); + SET_EXPECT(DoVerb); + + doc = create_doc(object_ax_str, &called_CreateInstance); + + CHECK_CALLED(CreateInstance); + todo_wine CHECK_CALLED(FreezeEvents_TRUE); + CHECK_CALLED(GetMiscStatus); + CHECK_CALLED(SetClientSite); + CHECK_CALLED(SetAdvise); + CHECK_CALLED(GetViewStatus); + todo_wine CHECK_CALLED(FreezeEvents_FALSE); + CHECK_CALLED(Invoke_READYSTATE); + todo_wine CHECK_CALLED(SetExtent); + todo_wine CHECK_CALLED(GetExtent); + CHECK_CALLED(DoVerb); + + /* Set in DoVerb */ + CHECK_CALLED(InPlaceObject_GetWindow); + CHECK_CALLED(SetObjectRects); + + SET_EXPECT(InPlaceDeactivate); + SET_EXPECT(Close); + SET_EXPECT(SetClientSite_NULL); + release_doc(doc); + CHECK_CALLED(InPlaceDeactivate); + CHECK_CALLED(Close); + CHECK_CALLED(SetClientSite_NULL); +} + static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { return DefWindowProc(hwnd, msg, wParam, lParam); @@ -2121,7 +2175,10 @@ START_TEST(activex) ShowWindow(container_hwnd, SW_SHOW); if(register_activex()) { - test_object_ax(); + trace("Testing emulated flash embedding...\n"); + test_flash_ax(); + trace("Testing plugin without IQuickActivate iface...\n"); + test_noquickact_ax(); init_registry(FALSE); }else { skip("Could not register ActiveX\n");

1 0

Jacek Caban : mshtml: Fixed remaining IE9 failures.
by Alexandre Julliard Nov. 17, 2011

Nov. 17, 2011

Module: wine Branch: master Commit: 1f197f75f66124d15daf15cdf0f5fd83f4ba0ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f197f75f66124d15daf15cdf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 17 16:06:31 2011 +0100 mshtml: Fixed remaining IE9 failures. --- dlls/mshtml/tests/htmldoc.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 12717fe..5a8e9ff 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1290,7 +1290,7 @@ static void continue_binding(IBindStatusCallback *callback) SET_EXPECT(GetBindResult); hres = IBindStatusCallback_OnStopBinding(callback, S_OK, NULL); ok(hres == S_OK, "OnStopBinding failed: %08x\n", hres); - SET_CALLED(GetBindResult); /* IE7 */ + CLEAR_CALLED(GetBindResult); /* IE7 */ IBindStatusCallback_Release(callback); } @@ -2792,6 +2792,10 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return E_NOTIMPL; + case 143: /* TODO */ + case 144: /* TODO */ + return E_NOTIMPL; + default: ok(0, "unexpected command %d\n", nCmdID); return E_FAIL; @@ -2886,6 +2890,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(pvaIn == NULL, "pvaIn != NULL\n"); ok(pvaOut != NULL, "pvaOut == NULL\n"); return E_NOTIMPL; + case 109: /* TODO */ + return E_NOTIMPL; default: ok(0, "unexpected cmd %d of CGID_Explorer\n", nCmdID); } @@ -3667,7 +3673,6 @@ static HRESULT browserservice_qi(REFIID riid, void **ppv) } *ppv = NULL; - trace("BrowserService QI %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -4732,7 +4737,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Invoke_AMBIENT_USERAGENT); CLEAR_CALLED(Invoke_AMBIENT_PALETTE); /* not called on IE9 */ - CHECK_CALLED(GetOptionKeyPath); + CLEAR_CALLED(GetOptionKeyPath); /* not called on some IE9 */ CHECK_CALLED(GetOverrideKeyPath); CHECK_CALLED(GetWindow); CHECK_CALLED(Exec_DOCCANNAVIGATE); @@ -4752,7 +4757,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) SET_CALLED(Exec_ShellDocView_84); if(mon == &Moniker) CHECK_CALLED(BindToStorage); - SET_CALLED(SetActiveObject); /* FIXME */ + CLEAR_CALLED(SetActiveObject); /* FIXME */ if(set_clientsite) { CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -4826,7 +4831,7 @@ static void test_download(DWORD flags) SET_EXPECT(Frame_EnableModeless_TRUE); /* IE7 */ SET_EXPECT(EnableModeless_FALSE); /* IE7 */ SET_EXPECT(Frame_EnableModeless_FALSE); /* IE7 */ - if(nav_url && !is_js) + if((nav_url && !is_js) || (flags & (DWL_CSS|DWL_HTTP))) SET_EXPECT(Exec_ShellDocView_37); if(flags & DWL_HTTP) { SET_EXPECT(OnChanged_1012); @@ -4909,6 +4914,8 @@ static void test_download(DWORD flags) SET_CALLED(Frame_EnableModeless_FALSE); /* IE7 */ if(nav_url && !is_js) todo_wine CHECK_CALLED(Exec_ShellDocView_37); + else if(flags & (DWL_CSS|DWL_HTTP)) + CLEAR_CALLED(Exec_ShellDocView_37); /* Called by IE9 */ if(flags & DWL_HTTP) { todo_wine CHECK_CALLED(OnChanged_1012); todo_wine CHECK_CALLED(Exec_HTTPEQUIV); @@ -5656,8 +5663,10 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) else ok(!clientsite, "clientsite != NULL\n"); + SET_EXPECT(GetOverrideKeyPath); hres = IOleObject_SetClientSite(oleobj, NULL); ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + CLEAR_CALLED(GetOverrideKeyPath); /* IE9 sometimes calls it */ set_clientsite = FALSE; } @@ -5692,6 +5701,7 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) SET_EXPECT(Invoke_AMBIENT_SILENT); SET_EXPECT(Invoke_AMBIENT_USERAGENT); SET_EXPECT(Invoke_AMBIENT_PALETTE); + SET_EXPECT(GetOverrideKeyPath); SET_EXPECT(GetTravelLog); hres = IOleObject_SetClientSite(oleobj, &ClientSite); @@ -5700,7 +5710,7 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) if(expect_uihandler_iface) CHECK_CALLED(GetHostInfo); if(flags & CLIENTSITE_EXPECTPATH) { - CHECK_CALLED(GetOptionKeyPath); + CLEAR_CALLED(GetOptionKeyPath); /* not called on some IE9 */ CHECK_CALLED(GetOverrideKeyPath); } CHECK_CALLED(GetWindow); @@ -5715,6 +5725,7 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_USERAGENT); CLEAR_CALLED(Invoke_AMBIENT_PALETTE); /* not called on IE9 */ + CLEAR_CALLED(GetOverrideKeyPath); /* Called by IE9 */ todo_wine CHECK_CALLED(GetTravelLog); set_clientsite = TRUE; @@ -5922,6 +5933,7 @@ static void test_InPlaceDeactivate(IHTMLDocument2 *doc, BOOL expect_call) return; if(expect_call) { + SET_EXPECT(SetStatusText); SET_EXPECT(OnFocus_FALSE); if(ipsex) SET_EXPECT(OnInPlaceDeactivateEx); @@ -5931,6 +5943,7 @@ static void test_InPlaceDeactivate(IHTMLDocument2 *doc, BOOL expect_call) hres = IOleInPlaceObjectWindowless_InPlaceDeactivate(windowlessobj); ok(hres == S_OK, "InPlaceDeactivate failed: %08x\n", hres); if(expect_call) { + CLEAR_CALLED(SetStatusText); /* Called by IE9 */ CHECK_CALLED(OnFocus_FALSE); if(ipsex) CHECK_CALLED(OnInPlaceDeactivateEx); @@ -6867,7 +6880,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Invoke_AMBIENT_USERAGENT); CLEAR_CALLED(Invoke_AMBIENT_PALETTE); /* not called on IE9 */ - CHECK_CALLED(GetOptionKeyPath); + CLEAR_CALLED(GetOptionKeyPath); /* not called on some IE9 */ CHECK_CALLED(GetOverrideKeyPath); CHECK_CALLED(GetWindow); CHECK_CALLED(Exec_DOCCANNAVIGATE); @@ -6945,6 +6958,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) ok(inplacesite != NULL, "inplacesite = NULL\n"); IOleInPlaceSite_Release(inplacesite); + SET_EXPECT(SetStatusText); SET_EXPECT(OnFocus_FALSE); if(use_ipsex) SET_EXPECT(OnInPlaceDeactivateEx); @@ -6953,6 +6967,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) test_CloseView(); + CLEAR_CALLED(SetStatusText); /* Called by IE9 */ CHECK_CALLED(OnFocus_FALSE); if(use_ipsex) CHECK_CALLED(OnInPlaceDeactivateEx);

1 0

Alexandre Julliard : gdi32: Don't mark a local variable static.
by Alexandre Julliard Nov. 17, 2011

Nov. 17, 2011

Module: wine Branch: master Commit: ffaf0c496652e3b340842da17f249a81b2716f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffaf0c496652e3b340842da17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 13:07:47 2011 +0100 gdi32: Don't mark a local variable static. --- dlls/gdi32/dibdrv/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index be78e1a..0e55af1 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -129,7 +129,7 @@ static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHME int i; RECT rect, clipped_rect; POINT src_origin; - static dib_info glyph_dib; + dib_info glyph_dib; glyph_dib.bit_count = 8; glyph_dib.width = metrics->gmBlackBoxX;

1 0

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

Nov. 17, 2011

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: 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 Nov. 17, 2011

Nov. 17, 2011

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 Nov. 17, 2011

Nov. 17, 2011

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

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

Nov. 17, 2011

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