August 2012 - Wine-commits - list.winehq.org

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_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_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 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

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

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

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

Alexandre Julliard : msvcr100: Add the 64-bit variants of the C++ exported names.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 98fe3f1d817366b6f27595d0398fba99e7a8b1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=98fe3f1d817366b6f27595d03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 19:32:59 2012 +0200 msvcr100: Add the 64-bit variants of the C++ exported names. --- dlls/msvcr100/msvcr100.spec | 545 +++++++++++++++++++++++++++++-------------- 1 files changed, 364 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98fe3f1d817366b6f2759…

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetBool.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: d2bbbc712e47a77dc062c73c4ebc30cb4888a0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2bbbc712e47a77dc062c73c4… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:17 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetBool. --- dlls/d3dx9_36/shader.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 728bff2..350b83a 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -857,7 +857,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstant return NULL; } -static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, const void *data, +static HRESULT set_scalar_array(ID3DXConstantTable *iface, IDirect3DDevice9 *device, D3DXHANDLE constant, const void *data, UINT count, D3DXPARAMETER_TYPE type) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); @@ -876,7 +876,7 @@ static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 devi switch (desc.RegisterSet) { case D3DXRS_FLOAT4: - for (i = 0; i < count && i < desc.RegisterCount; i++) + for (i = 0; i < min(count, desc.RegisterCount); i++) { /* We need the for loop since each IDirect3DDevice9_Set*ShaderConstantF expects a float4 */ switch(type) @@ -887,8 +887,11 @@ static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 devi case D3DXPT_INT: row[0] = (float)((int *)data)[i]; break; + case D3DXPT_BOOL: + row[0] = ((BOOL *)data)[i] ? 1.0f : 0.0f; + break; default: - FIXME("Unhandled type passed to set_float_array\n"); + FIXME("Unhandled type %#x\n", type); return D3DERR_INVALIDCALL; } set_float_shader_constant(This, device, desc.RegisterIndex + i, row, 1); @@ -940,9 +943,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetBool(ID3DXConstantTable *iface, { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %d): stub\n", This, device, constant, b); + TRACE("(%p)->(%p, %p, %d)\n", This, device, constant, b); - return E_NOTIMPL; + return set_scalar_array(iface, device, constant, &b, 1, D3DXPT_BOOL); } static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -961,7 +964,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(ID3DXConstantTable *iface, L TRACE("(%p)->(%p, %p, %d)\n", This, device, constant, n); - return ID3DXConstantTable_SetIntArray(iface, device, constant, &n, 1); + return set_scalar_array(iface, device, constant, &n, 1, D3DXPT_INT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -971,7 +974,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable *ifa TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, n, count); - return set_float_array(iface, device, constant, n, count, D3DXPT_INT); + return set_scalar_array(iface, device, constant, n, count, D3DXPT_INT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -981,7 +984,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable *iface, TRACE("(%p)->(%p, %p, %f)\n", This, device, constant, f); - return ID3DXConstantTable_SetFloatArray(iface, device, constant, &f, 1); + return set_scalar_array(iface, device, constant, &f, 1, D3DXPT_FLOAT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -991,7 +994,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable *i TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, f, count); - return set_float_array(iface, device, constant, f, count, D3DXPT_FLOAT); + return set_scalar_array(iface, device, constant, f, count, D3DXPT_FLOAT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device,

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetBoolArray.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: fbba743484a00bc55e74e35c2081e23acdbdd9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbba743484a00bc55e74e35c2… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:18 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetBoolArray. --- dlls/d3dx9_36/shader.c | 4 ++-- dlls/d3dx9_36/tests/shader.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 350b83a..800622c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -953,9 +953,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(ID3DXConstantTable *if { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, b, count); + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, b, count); - return E_NOTIMPL; + return set_scalar_array(iface, device, constant, b, count, D3DXPT_BOOL); } static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, INT n) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index bdccb96..91001be 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -621,6 +621,7 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device) static const D3DXVECTOR4 fvecarray[2] = { {0.745f, 0.997f, 0.353f, 0.237f}, {0.060f, 0.455f, 0.333f, 0.983f}}; + static BOOL barray[4] = {FALSE, 100, TRUE, TRUE}; ID3DXConstantTable *ctable; @@ -672,6 +673,9 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device) res = ID3DXConstantTable_SetMatrixArray(ctable, device, "fmtxarray", fmtxarray, 2); ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixArray failed: got 0x%08x\n", res); + res = ID3DXConstantTable_SetBoolArray(ctable, device, "barray", barray, 2); + ok(res == D3D_OK, "ID3DXConstantTable_SetBoolArray failed: got 0x%08x\n", res); + /* Read back constants */ IDirect3DDevice9_GetVertexShaderConstantF(device, 8, out, 4); ok(out[0] == farray[0] && out[4] == farray[1] && out[8] == farray[2] && out[12] == farray[3], @@ -686,6 +690,13 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device) fvecarray[0].x, fvecarray[0].y, fvecarray[0].z, fvecarray[0].w, fvecarray[1].x, fvecarray[1].y, fvecarray[1].z, fvecarray[1].w); + IDirect3DDevice9_GetVertexShaderConstantF(device, 14, out, 2); + ok(out[0] == 0.0f && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f + && out[4] == 1.0f && out[5] == 0.0f && out[6] == 0.0f && out[7] == 0.0f, + "The variable barray was not set correctly, out={%f, %f %f, %f; %f, %f, %f, %f}, should be {%f, %f, %f, %f; %f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], out[4], out[5], out[6], out[7], + 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f); + IDirect3DDevice9_GetVertexShaderConstantF(device, 0, out, 8); /* Just check a few elements in each matrix to make sure fmtxarray was set row-major */ ok(out[0] == S(U(fmtxarray[0]))._11 && out[1] == S(U(fmtxarray[0]))._12 && out[2] == S(U(fmtxarray[0]))._13 && out[3] == S(U(fmtxarray[0]))._14,

1 0