wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

Alexandre Julliard : msvcrt: Add a number of floating point functions for 64-bit.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: f80d443f5c7231196efba788e443b862167f4fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80d443f5c7231196efba788e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 18:03:27 2012 +0200 msvcrt: Add a number of floating point functions for 64-bit. --- dlls/msvcr100/msvcr100.spec | 29 ++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 10 ++++---- dlls/msvcrt/math.c | 57 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 12 ++++---- 4 files changed, 97 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f80d443f5c7231196efba…

1 0

Austin English : kernel32: Implement IsValidLocaleName (with tests).
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 5dfc2a34eac326bcab6990693eb1935306f86a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dfc2a34eac326bcab6990693… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jul 26 20:00:24 2012 -0700 kernel32: Implement IsValidLocaleName (with tests). --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 15 +++++++++++++++ dlls/kernel32/tests/locale.c | 27 +++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b8c6a3c..736fbde 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -779,6 +779,7 @@ @ stdcall IsValidCodePage(long) @ stdcall IsValidLanguageGroup(long long) @ stdcall IsValidLocale(long long) +@ stdcall IsValidLocaleName(wstr) # @ stub IsValidUILanguage @ stdcall IsWow64Process(ptr ptr) @ stdcall K32EmptyWorkingSet(long) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 3867d8d..29e38c9 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2210,6 +2210,21 @@ BOOL WINAPI IsValidLocale( LCID lcid, DWORD flags ) (LPCWSTR)LOCALE_ILANGUAGE, LANGIDFROMLCID(lcid)) != 0; } +/****************************************************************************** + * IsValidLocaleName (KERNEL32.@) + */ +BOOL WINAPI IsValidLocaleName( LPCWSTR locale ) +{ + struct locale_name locale_name; + + /* string parsing */ + parse_locale_name( locale, &locale_name ); + + TRACE( "found lcid %x for %s, matches %d\n", + locale_name.lcid, debugstr_w(locale), locale_name.matches ); + + return locale_name.matches > 0; +} static BOOL CALLBACK enum_lang_proc_a( HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LONG_PTR lParam ) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 397b30e..a2a33fa 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -86,6 +86,7 @@ static INT (WINAPI *pIdnToNameprepUnicode)(DWORD, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pIdnToAscii)(DWORD, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pIdnToUnicode)(DWORD, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pGetLocaleInfoEx)(LPCWSTR, LCTYPE, LPWSTR, INT); +static BOOL (WINAPI *pIsValidLocaleName)(LPCWSTR); static void InitFunctionPointers(void) { @@ -104,6 +105,7 @@ static void InitFunctionPointers(void) pIdnToAscii = (void*)GetProcAddress(hKernel32, "IdnToAscii"); pIdnToUnicode = (void*)GetProcAddress(hKernel32, "IdnToUnicode"); pGetLocaleInfoEx = (void*)GetProcAddress(hKernel32, "GetLocaleInfoEx"); + pIsValidLocaleName = (void*)GetProcAddress(hKernel32, "IsValidLocaleName"); } #define eq(received, expected, label, type) \ @@ -3435,6 +3437,30 @@ todo_wine } } +static void test_IsValidLocaleName(void) +{ + static const WCHAR enW[] = {'e','n',0}; + static const WCHAR enusW[] = {'e','n','-','U','S',0}; + static const WCHAR zzW[] = {'z','z',0}; + static const WCHAR zzzzW[] = {'z','z','-','Z','Z',0}; + BOOL ret; + + if (!pIsValidLocaleName) + { + win_skip("IsValidLocaleName not supported\n"); + return; + } + + ret = pIsValidLocaleName(enW); + ok(ret, "IsValidLocaleName failed\n"); + ret = pIsValidLocaleName(enusW); + ok(ret, "IsValidLocaleName failed\n"); + ret = pIsValidLocaleName(zzW); + ok(!ret, "IsValidLocaleName should have failed\n"); + ret = pIsValidLocaleName(zzzzW); + ok(!ret, "IsValidLocaleName should have failed\n"); +} + START_TEST(locale) { InitFunctionPointers(); @@ -3468,6 +3494,7 @@ START_TEST(locale) test_IdnToNameprepUnicode(); test_IdnToAscii(); test_IdnToUnicode(); + test_IsValidLocaleName(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: e9c368c9e72994a84c307ab94afcd83b97ff2d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9c368c9e72994a84c307ab94… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Aug 16 15:58:24 2012 +0200 po: Update German translation. --- po/de.po | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/po/de.po b/po/de.po index 5e5dc94..d08aa96 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-03 01:38+0200\n" +"PO-Revision-Date: 2012-08-15 20:07+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -2913,7 +2913,7 @@ msgstr "Der private Schlüssel sollte Passwortgeschützt sein." #: cryptui.rc:171 msgid "The passwords do not match." -msgstr "Die Passwörter sind unterschiedlich." +msgstr "Die Passwörter stimmen nicht überein." #: cryptui.rc:172 msgid "Note: The private key for this certificate could not be opened." @@ -2935,11 +2935,11 @@ msgstr "DirectSound: %s" #: devenum.rc:34 msgid "Default WaveOut Device" -msgstr "Standard WaveOut - Gerät" +msgstr "Standard WaveOut-Gerät" #: devenum.rc:35 msgid "Default MidiOut Device" -msgstr "Standard MidiOut - Gerät" +msgstr "Standard MidiOut-Gerät" #: dinput.rc:40 msgid "Configure Devices" @@ -2947,7 +2947,7 @@ msgstr "Geräte konfigurieren" #: dinput.rc:45 msgid "Reset" -msgstr "Rücksetzen" +msgstr "Reset" #: dinput.rc:48 msgid "Player" @@ -2967,7 +2967,7 @@ msgstr "Zuordnung" #: dinput.rc:53 msgid "Show Assigned First" -msgstr "Zeige Zugewiesene zuerst" +msgstr "Zugewiesene zuerst anzeigen" #: dinput.rc:34 msgid "Action" @@ -3462,16 +3462,17 @@ msgid "Test Force Feedback" msgstr "Force Feedback testen" #: joy.rc:63 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "Verfügbare Formate" +msgstr "Verfügbare Effekte" #: joy.rc:65 msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" +"Drücken Sie eine beliebige Taste am Controller, um den gewählten Effekt zu " +"aktivieren. Die Richtung des Effekts kann mit der Controller-Achse geändert " +"werden." #: joy.rc:28 msgid "Game Controllers"

1 0

Jacek Caban : mshtml: Added more IHTMLObjectElement tests.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: e4492f75695591a2301de6ea56317dfe0686905f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4492f75695591a2301de6ea5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:43:19 2012 +0200 mshtml: Added more IHTMLObjectElement tests. --- dlls/mshtml/tests/activex.c | 55 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 02b9d01..ebd2057 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -90,6 +90,7 @@ DEFINE_EXPECT(QI_ITestActiveX); DEFINE_EXPECT(wrapped_AddRef); DEFINE_EXPECT(wrapped_Release); DEFINE_EXPECT(wrapped_func); +DEFINE_EXPECT(OnAmbientPropertyChange_UNKNOWN); #define DISPID_SCRIPTPROP 1000 @@ -305,8 +306,15 @@ static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *mMsg) static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispID) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + switch(dispID) { + case DISPID_UNKNOWN: + CHECK_EXPECT(OnAmbientPropertyChange_UNKNOWN); + break; + default: + ok(0, "unexpected call %d\n", dispID); + } + + return S_OK; } static HRESULT WINAPI OleControl_FreezeEvents(IOleControl *iface, BOOL bFreeze) @@ -1389,6 +1397,7 @@ static void test_object_elem(IHTMLDocument2 *doc) IDispatchEx *dispex; IHTMLElement *elem; IDispatch *disp; + VARIANT v; BSTR str; HRESULT hres; @@ -1420,6 +1429,48 @@ static void test_object_elem(IHTMLDocument2 *doc) test_iface_wrapping(objelem); + hres = IHTMLObjectElement_get_width(objelem, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(width) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "300"), "V_BSTR(width) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLObjectElement_get_height(objelem, &v); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(height) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "200"), "V_BSTR(height) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_I4; + V_I4(&v) = 400; + SET_EXPECT(OnAmbientPropertyChange_UNKNOWN); + SET_EXPECT(Invoke_ENABLED); + hres = IHTMLObjectElement_put_width(objelem, v); + ok(hres == S_OK, "put_width failed: %08x\n", hres); + CHECK_CALLED(OnAmbientPropertyChange_UNKNOWN); + CHECK_CALLED(Invoke_ENABLED); + + hres = IHTMLObjectElement_get_width(objelem, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(width) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "400"), "V_BSTR(width) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_I4; + V_I4(&v) = 250; + SET_EXPECT(OnAmbientPropertyChange_UNKNOWN); + SET_EXPECT(Invoke_ENABLED); + hres = IHTMLObjectElement_put_height(objelem, v); + ok(hres == S_OK, "put_height failed: %08x\n", hres); + CHECK_CALLED(OnAmbientPropertyChange_UNKNOWN); + CHECK_CALLED(Invoke_ENABLED); + + hres = IHTMLObjectElement_get_height(objelem, &v); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(height) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "250"), "V_BSTR(height) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IHTMLObjectElement_Release(objelem); }

1 0

Jacek Caban : mshtml: Added IHTMLObjectElement::get_height implementation.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 7c54aa9fe731d8da0444c54ce8854ace1ccb4ee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c54aa9fe731d8da0444c54ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:43:03 2012 +0200 mshtml: Added IHTMLObjectElement::get_height implementation. --- dlls/mshtml/htmlobject.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 420b4d5..741011a 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -337,8 +337,28 @@ static HRESULT WINAPI HTMLObjectElement_put_height(IHTMLObjectElement *iface, VA static HRESULT WINAPI HTMLObjectElement_get_height(IHTMLObjectElement *iface, VARIANT *p) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString height_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&height_str, NULL); + nsres = nsIDOMHTMLObjectElement_GetHeight(This->nsobject, &height_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *height; + + nsAString_GetData(&height_str, &height); + V_VT(p) = VT_BSTR; + V_BSTR(p) = SysAllocString(height); + hres = V_BSTR(p) ? S_OK : E_OUTOFMEMORY; + }else { + ERR("GetHeight failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&height_str); + return hres; } static HRESULT WINAPI HTMLObjectElement_get_readyState(IHTMLObjectElement *iface, LONG *p)

1 0

Jacek Caban : mshtml: Added IHTMLObjectElement::put_height implementation.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 935ec95a588924087a12f22687da5cee2ecad950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935ec95a588924087a12f2268… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:42:48 2012 +0200 mshtml: Added IHTMLObjectElement::put_height implementation. --- dlls/mshtml/htmlobject.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 6859749..420b4d5 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -305,8 +305,33 @@ static HRESULT WINAPI HTMLObjectElement_get_width(IHTMLObjectElement *iface, VAR static HRESULT WINAPI HTMLObjectElement_put_height(IHTMLObjectElement *iface, VARIANT v) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString height_str; + PRUnichar buf[12]; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + switch(V_VT(&v)) { + case VT_I4: { + static const WCHAR formatW[] = {'%','d',0}; + sprintfW(buf, formatW, V_I4(&v)); + break; + } + default: + FIXME("unimplemented for arg %s\n", debugstr_variant(&v)); + return E_NOTIMPL; + } + + nsAString_InitDepend(&height_str, buf); + nsres = nsIDOMHTMLObjectElement_SetHeight(This->nsobject, &height_str); + nsAString_Finish(&height_str); + if(NS_FAILED(nsres)) { + FIXME("SetHeight failed: %08x\n", nsres); + return E_FAIL; + } + + notif_container_change(&This->plugin_container, DISPID_UNKNOWN); + return S_OK; } static HRESULT WINAPI HTMLObjectElement_get_height(IHTMLObjectElement *iface, VARIANT *p)

1 0

Jacek Caban : mshtml: Added IHTMLObjectElement::get_width implementation.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 500985bc19a23d29c845460bffb32d75645e9bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=500985bc19a23d29c845460bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:42:20 2012 +0200 mshtml: Added IHTMLObjectElement::get_width implementation. --- dlls/mshtml/htmlobject.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 6c21814..6859749 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -278,8 +278,28 @@ static HRESULT WINAPI HTMLObjectElement_put_width(IHTMLObjectElement *iface, VAR static HRESULT WINAPI HTMLObjectElement_get_width(IHTMLObjectElement *iface, VARIANT *p) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString width_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&width_str, NULL); + nsres = nsIDOMHTMLObjectElement_GetWidth(This->nsobject, &width_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *width; + + nsAString_GetData(&width_str, &width); + V_VT(p) = VT_BSTR; + V_BSTR(p) = SysAllocString(width); + hres = V_BSTR(p) ? S_OK : E_OUTOFMEMORY; + }else { + ERR("GetWidth failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&width_str); + return hres; } static HRESULT WINAPI HTMLObjectElement_put_height(IHTMLObjectElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLObjectElement::put_width implementation.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: d98225fff9d083792c4c324f714bd4b17a7dedd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d98225fff9d083792c4c324f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:42:32 2012 +0200 mshtml: Added IHTMLObjectElement::put_width implementation. --- dlls/mshtml/htmlobject.c | 29 +++++++++++++++++++++++++++-- dlls/mshtml/pluginhost.c | 17 +++++++++++++++++ dlls/mshtml/pluginhost.h | 1 + 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 0755463..6c21814 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -246,8 +246,33 @@ static HRESULT WINAPI HTMLObjectElement_get_form(IHTMLObjectElement *iface, IHTM static HRESULT WINAPI HTMLObjectElement_put_width(IHTMLObjectElement *iface, VARIANT v) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString width_str; + PRUnichar buf[12]; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + switch(V_VT(&v)) { + case VT_I4: { + static const WCHAR formatW[] = {'%','d',0}; + sprintfW(buf, formatW, V_I4(&v)); + break; + } + default: + FIXME("unimplemented for arg %s\n", debugstr_variant(&v)); + return E_NOTIMPL; + } + + nsAString_InitDepend(&width_str, buf); + nsres = nsIDOMHTMLObjectElement_SetWidth(This->nsobject, &width_str); + nsAString_Finish(&width_str); + if(NS_FAILED(nsres)) { + FIXME("SetWidth failed: %08x\n", nsres); + return E_FAIL; + } + + notif_container_change(&This->plugin_container, DISPID_UNKNOWN); + return S_OK; } static HRESULT WINAPI HTMLObjectElement_get_width(IHTMLObjectElement *iface, VARIANT *p) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 8fb0bfb..ee7773f 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -352,6 +352,23 @@ static void notif_enabled(PluginHost *plugin_host) } } +void notif_container_change(HTMLPluginContainer *plugin_container, DISPID dispid) +{ + IOleControl *ole_control; + HRESULT hres; + + if(!plugin_container->plugin_host || !plugin_container->plugin_host->plugin_unk) + return; + + notif_enabled(plugin_container->plugin_host); + + hres = IUnknown_QueryInterface(plugin_container->plugin_host->plugin_unk, &IID_IOleControl, (void**)&ole_control); + if(SUCCEEDED(hres)) { + IOleControl_OnAmbientPropertyChange(ole_control, dispid); + IOleControl_Release(ole_control); + } +} + HRESULT get_plugin_disp(HTMLPluginContainer *plugin_container, IDispatch **ret) { PluginHost *host; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index e3acf61..d776885 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -70,3 +70,4 @@ HRESULT create_ip_frame(IOleInPlaceFrame**) DECLSPEC_HIDDEN; HRESULT get_plugin_disp(HTMLPluginContainer*,IDispatch**) DECLSPEC_HIDDEN; HRESULT get_plugin_dispid(HTMLPluginContainer*,WCHAR*,DISPID*) DECLSPEC_HIDDEN; HRESULT invoke_plugin_prop(HTMLPluginContainer*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*) DECLSPEC_HIDDEN; +void notif_container_change(HTMLPluginContainer*,DISPID);

1 0

Jacek Caban : mshtml: Moved Invoke(DISPID_ENABLED) invocation to separated function.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 31201da6fa4c5cea25dc9e2355ec0ceaee7a2aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=31201da6fa4c5cea25dc9e235… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:42:06 2012 +0200 mshtml: Moved Invoke(DISPID_ENABLED) invocation to separated function. --- dlls/mshtml/pluginhost.c | 43 ++++++++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index e24131b..8fb0bfb 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -329,6 +329,29 @@ void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) IOleInPlaceObject_SetObjectRects(host->ip_object, &host->rect, &host->rect); } +static void notif_enabled(PluginHost *plugin_host) +{ + DISPPARAMS args = {NULL, NULL, 0, 0}; + IDispatch *disp; + ULONG err = 0; + VARIANT res; + HRESULT hres; + + hres = IUnknown_QueryInterface(plugin_host->plugin_unk, &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) { + FIXME("Could not get IDispatch iface: %08x\n", hres); + return; + } + + V_VT(&res) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_ENABLED, &IID_NULL, 0/*FIXME*/, DISPATCH_PROPERTYGET, &args, &res, NULL, &err); + IDispatch_Release(disp); + if(SUCCEEDED(hres)) { + FIXME("Got enabled %s\n", debugstr_variant(&res)); + VariantClear(&res); + } +} + HRESULT get_plugin_disp(HTMLPluginContainer *plugin_container, IDispatch **ret) { PluginHost *host; @@ -849,11 +872,6 @@ static HRESULT WINAPI PHInPlaceSite_OnInPlaceActivate(IOleInPlaceSiteEx *iface) static HRESULT WINAPI PHInPlaceSite_OnUIActivate(IOleInPlaceSiteEx *iface) { PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); - DISPPARAMS args = {NULL, NULL, 0, 0}; - IDispatch *disp; - ULONG err = 0; - VARIANT res; - HRESULT hres; TRACE("(%p)\n", This); @@ -864,20 +882,7 @@ static HRESULT WINAPI PHInPlaceSite_OnUIActivate(IOleInPlaceSiteEx *iface) This->ui_active = TRUE; - hres = IUnknown_QueryInterface(This->plugin_unk, &IID_IDispatch, (void**)&disp); - if(FAILED(hres)) { - FIXME("Could not get IDispatch iface: %08x\n", hres); - return hres; - } - - V_VT(&res) = VT_EMPTY; - hres = IDispatch_Invoke(disp, DISPID_ENABLED, &IID_NULL, 0/*FIXME*/, DISPATCH_PROPERTYGET, &args, &res, NULL, &err); - IDispatch_Release(disp); - if(SUCCEEDED(hres)) { - FIXME("Got enabled %s\n", debugstr_variant(&res)); - VariantClear(&res); - } - + notif_enabled(This); return S_OK; }

1 0

Aric Stewart : usp10: Implement MarkToMark Attachment Positioning Subtable.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: af318c5fd096fba047e6a2984ee330d295c05979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af318c5fd096fba047e6a2984… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 16 08:03:58 2012 -0500 usp10: Implement MarkToMark Attachment Positioning Subtable. --- dlls/usp10/opentype.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 05ac53f..fe4bde4 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -391,6 +391,24 @@ typedef struct { } GPOS_MarkArray; typedef struct { + WORD PosFormat; + WORD Mark1Coverage; + WORD Mark2Coverage; + WORD ClassCount; + WORD Mark1Array; + WORD Mark2Array; +} GPOS_MarkMarkPosFormat1; + +typedef struct { + WORD Mark2Anchor[1]; +} GPOS_Mark2Record; + +typedef struct { + WORD Mark2Count; + GPOS_Mark2Record Mark2Record[1]; +} GPOS_Mark2Array; + +typedef struct { WORD SequenceIndex; WORD LookupListIndex; } GPOS_PosLookupRecord; @@ -1292,6 +1310,71 @@ static VOID GPOS_apply_MarkToBase(const OT_LookupTable *look, const WORD *glyphs } } +static VOID GPOS_apply_MarkToMark(const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, LPPOINT pt) +{ + int j; + + TRACE("MarkToMark Attachment Positioning Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + int offset; + const GPOS_MarkMarkPosFormat1 *mmpf1; + offset = GET_BE_WORD(look->SubTable[j]); + mmpf1 = (const GPOS_MarkMarkPosFormat1*)((const BYTE*)look+offset); + if (GET_BE_WORD(mmpf1->PosFormat) == 1) + { + int offset = GET_BE_WORD(mmpf1->Mark1Coverage); + int mark_index; + mark_index = GSUB_is_glyph_covered((const BYTE*)mmpf1+offset, glyphs[glyph_index]); + if (mark_index != -1) + { + int mark2_index; + offset = GET_BE_WORD(mmpf1->Mark2Coverage); + mark2_index = GSUB_is_glyph_covered((const BYTE*)mmpf1+offset, glyphs[glyph_index - write_dir]); + if (mark2_index != -1) + { + const GPOS_MarkArray *ma; + const GPOS_MarkRecord *mr; + const GPOS_Mark2Array *m2a; + const GPOS_Mark2Record *m2r; + int mark_class; + int class_count = GET_BE_WORD(mmpf1->ClassCount); + int mark2record_size; + POINT mark2_pt; + POINT mark_pt; + TRACE("Mark %x(%i) and Mark2 %x(%i)\n",glyphs[glyph_index], mark_index, glyphs[glyph_index - write_dir], mark2_index); + offset = GET_BE_WORD(mmpf1->Mark1Array); + ma = (const GPOS_MarkArray*)((const BYTE*)mmpf1 + offset); + if (mark_index > GET_BE_WORD(ma->MarkCount)) + { + ERR("Mark index exeeded mark count\n"); + return; + } + mr = &ma->MarkRecord[mark_index]; + mark_class = GET_BE_WORD(mr->Class); + TRACE("Mark Class %i total classes %i\n",mark_class,class_count); + offset = GET_BE_WORD(mmpf1->Mark2Array); + m2a = (const GPOS_Mark2Array*)((const BYTE*)mmpf1 + offset); + mark2record_size = class_count * sizeof(WORD); + m2r = (const GPOS_Mark2Record*)((const BYTE*)m2a + sizeof(WORD) + (mark2record_size * mark2_index)); + offset = GET_BE_WORD(m2r->Mark2Anchor[mark_class]); + GPOS_get_anchor_values((const BYTE*)m2a + offset, &mark2_pt, ppem); + offset = GET_BE_WORD(mr->MarkAnchor); + GPOS_get_anchor_values((const BYTE*)ma + offset, &mark_pt, ppem); + TRACE("Offset on mark2 is %i,%i design units\n",mark2_pt.x,mark2_pt.y); + TRACE("Offset on mark is %i,%i design units\n",mark_pt.x, mark_pt.y); + pt->x += mark2_pt.x - mark_pt.x; + pt->y += mark2_pt.y - mark_pt.y; + TRACE("Resulting cumulative offset is %i,%i design units\n",pt->x,pt->y); + } + } + } + else + FIXME("Unhandled Mark To Mark Format %i\n",GET_BE_WORD(mmpf1->PosFormat)); + } +} + static INT GPOS_apply_ChainContextPos(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, INT* piAdvance, const OT_LookupList *lookup, const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, GOFFSET *pGoffset) { int j; @@ -1460,6 +1543,19 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, I } break; } + case 6: + { + double devX, devY; + POINT desU = {0,0}; + GPOS_apply_MarkToMark(look, glyphs, glyph_index, write_dir, glyph_count, ppem, &desU); + if (desU.x || desU.y) + { + GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); + pGoffset[glyph_index].du += round(devX) + pGoffset[glyph_index-1].du; + pGoffset[glyph_index].dv += round(devY) + pGoffset[glyph_index-1].dv; + } + break; + } case 8: { return GPOS_apply_ChainContextPos(lpotm, lplogfont, piAdvance, lookup, look, glyphs, glyph_index, write_dir, glyph_count, ppem, pGoffset);

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2012