February 2014 - Wine-Commits

Michael Stefaniuc : qedit: Use the generic IEnumPin implementation for SampleGrabber.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 59ed2131ac60efc550177bc83f8eef222802d670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ed2131ac60efc550177bc83… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 20 21:30:48 2014 +0100 qedit: Use the generic IEnumPin implementation for SampleGrabber. --- dlls/qedit/samplegrabber.c | 205 +++++++------------------------------------- 1 file changed, 33 insertions(+), 172 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 81eb9ec..537e22c 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -37,163 +37,8 @@ static const WCHAR vendor_name[] = { 'W', 'i', 'n', 'e', 0 }; static const WCHAR pin_in_name[] = { 'I', 'n', 0 }; static const WCHAR pin_out_name[] = { 'O', 'u', 't', 0 }; -static IEnumPins *pinsenum_create(IBaseFilter *filter, IPin **pins, ULONG pinCount); static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype); -/* Fixed pins enumerator, holds filter referenced */ -typedef struct _PE_Impl { - IEnumPins pe; - IBaseFilter *filter; - LONG refCount; - ULONG numPins; - ULONG index; - IPin *pins[1]; -} PE_Impl; - - -/* IEnumPins interface implementation */ - -/* IUnknown */ -static ULONG WINAPI -Fixed_IEnumPins_AddRef(IEnumPins *iface) -{ - PE_Impl *This = (PE_Impl *)iface; - ULONG refCount = InterlockedIncrement(&This->refCount); - TRACE("(%p) new ref = %u\n", This, refCount); - return refCount; -} - -/* IUnknown */ -static ULONG WINAPI -Fixed_IEnumPins_Release(IEnumPins *iface) -{ - PE_Impl *This = (PE_Impl *)iface; - ULONG refCount = InterlockedDecrement(&This->refCount); - TRACE("(%p) new ref = %u\n", This, refCount); - if (refCount == 0) - { - IBaseFilter_Release(This->filter); - CoTaskMemFree(This); - return 0; - } - return refCount; -} - -/* IUnknown */ -static HRESULT WINAPI Fixed_IEnumPins_QueryInterface(IEnumPins *iface, REFIID riid, - void **ret_iface) -{ - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ret_iface); - - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IEnumPins)) { - IEnumPins_AddRef(iface); - *ret_iface = iface; - return S_OK; - } - *ret_iface = NULL; - WARN("(%p, %s, %p): not found\n", iface, debugstr_guid(riid), ret_iface); - return E_NOINTERFACE; -} - -/* IEnumPins */ -static HRESULT WINAPI -Fixed_IEnumPins_Next(IEnumPins *iface, ULONG nPins, IPin **pins, ULONG *fetched) -{ - PE_Impl *This = (PE_Impl *)iface; - ULONG count = 0; - TRACE("(%p)->(%u, %p, %p) index = %u\n", This, nPins, pins, fetched, This->index); - if (!nPins) - return E_INVALIDARG; - if (!pins || ((nPins != 1) && !fetched)) - return E_POINTER; - while ((count < nPins) && (This->index < This->numPins)) { - IPin *pin = This->pins[This->index++]; - IPin_AddRef(pin); - pins[count++] = pin; - } - if (fetched) - *fetched = count; - return (count == nPins) ? S_OK : S_FALSE; -} - -/* IEnumPins */ -static HRESULT WINAPI -Fixed_IEnumPins_Skip(IEnumPins *iface, ULONG nPins) -{ - PE_Impl *This = (PE_Impl *)iface; - TRACE("(%p)->(%u) index = %u\n", This, nPins, This->index); - nPins += This->index; - if (nPins >= This->numPins) { - This->index = This->numPins; - return S_FALSE; - } - This->index = nPins; - return S_OK; -} - -/* IEnumPins */ -static HRESULT WINAPI -Fixed_IEnumPins_Reset(IEnumPins *iface) -{ - PE_Impl *This = (PE_Impl *)iface; - TRACE("(%p)->() index = %u\n", This, This->index); - This->index = 0; - return S_OK; -} - -/* IEnumPins */ -static HRESULT WINAPI -Fixed_IEnumPins_Clone(IEnumPins *iface, IEnumPins **pins) -{ - PE_Impl *This = (PE_Impl *)iface; - TRACE("(%p)->(%p) index = %u\n", This, pins, This->index); - if (!pins) - return E_POINTER; - *pins = pinsenum_create(This->filter, This->pins, This->numPins); - if (!*pins) - return E_OUTOFMEMORY; - ((PE_Impl *)*pins)->index = This->index; - return S_OK; -} - - -/* Virtual tables and constructor */ - -static const IEnumPinsVtbl IEnumPins_VTable = -{ - Fixed_IEnumPins_QueryInterface, - Fixed_IEnumPins_AddRef, - Fixed_IEnumPins_Release, - Fixed_IEnumPins_Next, - Fixed_IEnumPins_Skip, - Fixed_IEnumPins_Reset, - Fixed_IEnumPins_Clone, -}; - -static IEnumPins *pinsenum_create(IBaseFilter *filter, IPin **pins, ULONG pinCount) -{ - PE_Impl *obj; - ULONG len = offsetof(PE_Impl, pins[pinCount]); - ULONG i; - - obj = CoTaskMemAlloc(len); - if (!obj) - return NULL; - - ZeroMemory(obj, len); - obj->pe.lpVtbl = &IEnumPins_VTable; - obj->refCount = 1; - obj->filter = filter; - obj->numPins = pinCount; - obj->index = 0; - for (i = 0; i < pinCount; i++) - obj->pins[i] = pins[i]; - IBaseFilter_AddRef(filter); - - return &obj->pe; -} - - /* Single media type enumerator */ typedef struct _ME_Impl { IEnumMediaTypes me; @@ -398,6 +243,11 @@ static inline SG_Impl *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, SG_Impl, IUnknown_inner); } +static inline SG_Impl *impl_from_BaseFilter(BaseFilter *iface) +{ + return CONTAINING_RECORD(iface, SG_Impl, filter); +} + static inline SG_Impl *impl_from_IBaseFilter(IBaseFilter *iface) { return CONTAINING_RECORD(iface, SG_Impl, filter.IBaseFilter_iface); @@ -496,6 +346,32 @@ static const IUnknownVtbl samplegrabber_vtbl = SampleGrabber_Release, }; +static IPin *WINAPI SampleGrabber_GetPin(BaseFilter *iface, int pos) +{ + SG_Impl *This = impl_from_BaseFilter(iface); + IPin *pin; + + if (pos == 0) + pin = &This->pin_in.IPin_iface; + else if (pos == 1) + pin = &This->pin_out.IPin_iface; + else + return NULL; + + IPin_AddRef(pin); + return pin; +} + +static LONG WINAPI SampleGrabber_GetPinCount(BaseFilter *iface) +{ + return 2; +} + +static const BaseFilterFuncTable basefunc_vtbl = { + SampleGrabber_GetPin, + SampleGrabber_GetPinCount +}; + /* Helper that buffers data and/or calls installed sample callbacks */ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample) { @@ -614,21 +490,6 @@ SampleGrabber_IBaseFilter_Run(IBaseFilter *iface, REFERENCE_TIME tStart) /* IBaseFilter */ static HRESULT WINAPI -SampleGrabber_IBaseFilter_EnumPins(IBaseFilter *iface, IEnumPins **pins) -{ - SG_Impl *This = impl_from_IBaseFilter(iface); - IPin *pin[2]; - TRACE("(%p)->(%p)\n", This, pins); - if (!pins) - return E_POINTER; - pin[0] = &This->pin_in.IPin_iface; - pin[1] = &This->pin_out.IPin_iface; - *pins = pinsenum_create(iface, pin, 2); - return *pins ? S_OK : E_OUTOFMEMORY; -} - -/* IBaseFilter */ -static HRESULT WINAPI SampleGrabber_IBaseFilter_FindPin(IBaseFilter *iface, LPCWSTR id, IPin **pin) { SG_Impl *This = impl_from_IBaseFilter(iface); @@ -1316,7 +1177,7 @@ static const IBaseFilterVtbl IBaseFilter_VTable = BaseFilterImpl_GetState, BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, - SampleGrabber_IBaseFilter_EnumPins, + BaseFilterImpl_EnumPins, SampleGrabber_IBaseFilter_FindPin, BaseFilterImpl_QueryFilterInfo, SampleGrabber_IBaseFilter_JoinFilterGraph, @@ -1410,7 +1271,7 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) ZeroMemory(obj, sizeof(SG_Impl)); BaseFilter_Init(&obj->filter, &IBaseFilter_VTable, &CLSID_SampleGrabber, - (DWORD_PTR)(__FILE__ ": SG_Impl.csFilter"), NULL); + (DWORD_PTR)(__FILE__ ": SG_Impl.csFilter"), &basefunc_vtbl); obj->IUnknown_inner.lpVtbl = &samplegrabber_vtbl; obj->ISampleGrabber_iface.lpVtbl = &ISampleGrabber_VTable; obj->IMemInputPin_iface.lpVtbl = &IMemInputPin_VTable;

1 0

Frédéric Delanoy : French translation for release 1.7.13
by Jeremy Newman Feb. 20, 2014

Feb. 20, 2014

Module: website Branch: master Commit: a6c146aeee5445512d3c14546c46eeb881049923 URL: http://source.winehq.org/git/website.git/?a=commit;h=a6c146aeee5445512d3c14… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 20 21:48:35 2014 +0100 French translation for release 1.7.13 --- news/fr/2014022001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2014022001.xml b/news/fr/2014022001.xml new file mode 100644 index 0000000..b481eed --- /dev/null +++ b/news/fr/2014022001.xml @@ -0,0 +1,16 @@ +<news> +<date>20 février 2014</date> +<title>Sortie de Wine 1.7.13</title> +<body> + La version de développement 1.7.13 de Wine est disponible. + <a href="{$root}/announce/1.7.13">Nouveautés</a> de cette version : +<ul> + <li>Améliorations dans le planificateur de tâches.</li> + <li>Interfaces Direct3D 10 supplémentaires.</li> + <li>Squelettes de fonctions additionnels dans Windows Media Player.</li> + <li>Génération de code ARM améliorée.</li> + <li>Meilleur compte rendu de la taille mémoire sous Mac OS X.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.13.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.13
by Jeremy Newman Feb. 20, 2014

Feb. 20, 2014

Module: website Branch: master Commit: 0054caefcaeac533ce6a8f3b5e986ea81800e3a4 URL: http://source.winehq.org/git/website.git/?a=commit;h=0054caefcaeac533ce6a8f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Feb 20 21:25:12 2014 +0200 Ukrainian translation for release 1.7.13 --- news/uk/2014022001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/uk/2014022001.xml b/news/uk/2014022001.xml new file mode 100644 index 0000000..2b173fb --- /dev/null +++ b/news/uk/2014022001.xml @@ -0,0 +1,17 @@ +<news> +<date>20 лютого 2014</date> +<title>Випущено Wine 1.7.13</title> +<body> + Розробницький реліз Wine 1.7.13 наразі доступний. + <a href="{$root}/announce/1.7.13">Що нового</a> в цьому релізі: +<ul> + <li>Збільшено підтримку планувальника завдань.</li> + <li>Декілька інтерфейсів Direct3D 10.</li> + <li>Більше заглушок Windows Media Player.</li> + <li>Поліпшення кодогенерації ARM.</li> + <li>Краща звітність обсягу пам'яті на Mac OS X.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.13.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.13
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: website Branch: master Commit: f15163ccdf20623679e6303f5c20924b611887c2 URL: http://source.winehq.org/git/website.git/?a=commit;h=f15163ccdf20623679e630… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 20 19:35:11 2014 +0100 Wine release 1.7.13 --- news/en/2014022001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2014022001.xml b/news/en/2014022001.xml new file mode 100644 index 0000000..1757f27 --- /dev/null +++ b/news/en/2014022001.xml @@ -0,0 +1,17 @@ +<news> +<date>February 20, 2014</date> +<title>Wine 1.7.13 Released</title> +<body> + The Wine development release 1.7.13 is now available. + <a href="{$root}/announce/1.7.13">What's new</a> in this release: +<ul> + <li>More Task Scheduler support.</li> + <li>A few more Direct3D 10 interfaces.</li> + <li>More Windows Media Player stubs.</li> + <li>ARM code generation improvements.</li> + <li>Better memory size reporting on Mac OS X.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.13.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.7.13.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: 36565aa8b38bcc1c5854a3eafad9f8944cae303c URL: http://source.winehq.org/git/wine.git/?a=commit;h=36565aa8b38bcc1c5854a3eaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 20 19:27:43 2014 +0100 Release 1.7.13. --- ANNOUNCE | 836 +++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 379 insertions(+), 478 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36565aa8b38bcc1c5854a…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: a693cf50b0bd4ec18d024cb6760dcd07fdf99cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a693cf50b0bd4ec18d024cb67… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Feb 20 18:16:27 2014 +0200 po: Update Finnish translation. --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index 77c387d..cc3e358 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6578,10 +6578,8 @@ msgid "The username could not be found.\n" msgstr "Käyttäjänimeä ei löytynyt.\n" #: winerror.mc:3741 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "Sivustoa ei ole.\n" +msgstr "Tätä verkkoyhteyttä ei ole.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Tag wine-1.7.13 : Alexandre Julliard : Release 1.7.13
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: refs/tags/wine-1.7.13 Tag: 02106f44569bd0ecd345ae1f5bbc20190eb7c104 URL: http://source.winehq.org/git/wine.git/?a=tag;h=02106f44569bd0ecd345ae1f5bbc… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 20 19:27:43 2014 +0100 Release 1.7.13

1 0

Jacek Caban : wmp/tests: Fixed tests on old WMP versions.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: 89c5cefb2539bd27ca77d6ab447dd848579c8b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c5cefb2539bd27ca77d6ab4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 16:01:33 2014 +0100 wmp/tests: Fixed tests on old WMP versions. --- dlls/wmp/tests/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index fba35e5..61cfcb9 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -692,7 +692,7 @@ static void test_wmp(void) client_site = (void*)0xdeadbeef; hres = IOleObject_GetClientSite(oleobj, &client_site); - ok(hres == E_FAIL, "GetClientSite failed: %08x\n", hres); + ok(hres == E_FAIL || broken(hres == S_OK), "GetClientSite failed: %08x\n", hres); ok(!client_site, "client_site = %p\n", client_site); ref = IOleObject_Release(oleobj);

1 0

Huw Davies : user32: If the listbox loses focus while holding capture, release it by essentially simulating a button up event.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: fb298aed049ed9a002a7a2451ae964f77eaacd59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb298aed049ed9a002a7a2451… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 20 11:35:18 2014 +0000 user32: If the listbox loses focus while holding capture, release it by essentially simulating a button up event. --- dlls/user32/listbox.c | 1 + dlls/user32/tests/listbox.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 5a78dda..c282d5d 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2995,6 +2995,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam SEND_NOTIFICATION( descr, LBN_SETFOCUS ); return 0; case WM_KILLFOCUS: + LISTBOX_HandleLButtonUp( descr ); /* Release capture if we have it */ descr->in_focus = FALSE; descr->wheel_remain = 0; if ((descr->focus_item != -1) && descr->caret_on) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index fdc190d..8e3fbcd 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -234,6 +234,8 @@ static void check_item_height(void) DestroyWindow (hLB); } +static int got_selchange; + static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -267,6 +269,10 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA break; } + case WM_COMMAND: + if (HIWORD( wparam ) == LBN_SELCHANGE) got_selchange++; + break; + default: break; } @@ -1588,6 +1594,29 @@ todo_wine DestroyWindow(parent); } +static void test_missing_lbuttonup( void ) +{ + HWND listbox, parent, capture; + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | WS_VISIBLE, parent); + + /* Send button down without a corresponding button up */ + SendMessageA(listbox, WM_LBUTTONDOWN, 0, MAKELPARAM(10,10)); + capture = GetCapture(); + ok(capture == listbox, "got %p expected %p\n", capture, listbox); + + /* Capture is released and LBN_SELCHANGE sent during WM_KILLFOCUS */ + got_selchange = 0; + SetFocus(NULL); + capture = GetCapture(); + ok(capture == NULL, "got %p\n", capture); + ok(got_selchange, "got %d\n", got_selchange); + + DestroyWindow(listbox); + DestroyWindow(parent); +} + START_TEST(listbox) { const struct listbox_test SS = @@ -1668,4 +1697,5 @@ START_TEST(listbox) test_listbox_dlgdir(); test_set_count(); test_GetListBoxInfo(); + test_missing_lbuttonup(); }

1 0

Matteo Bruni : d3dx9/tests: Add a test for constant tables in FX20 shaders.
by Alexandre Julliard Feb. 20, 2014

Feb. 20, 2014

Module: wine Branch: master Commit: b74fc45b8137ae1338a772d2fe5598edabd1b1de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74fc45b8137ae1338a772d2f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 18 22:17:02 2014 +0100 d3dx9/tests: Add a test for constant tables in FX20 shaders. --- dlls/d3dx9_36/tests/shader.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 4406cd1..363dd4e 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -279,6 +279,25 @@ static const D3DXCONSTANT_DESC ctab_samplers_expected[] = { {"sampler2", D3DXRS_SAMPLER, 3, 1, D3DXPC_OBJECT, D3DXPT_SAMPLER3D, 1, 1, 1, 0, 4, NULL}, {"notsampler", D3DXRS_FLOAT4, 2, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16, NULL}}; +static const DWORD fx_shader_with_ctab[] = +{ + 0x46580200, /* FX20 */ + 0x002efffe, FCC_CTAB, /* CTAB comment */ + 0x0000001c, 0x000000a4, 0xfffe0300, 0x00000003, 0x0000001c, 0x20008100, /* Header */ + 0x0000009c, + 0x00000058, 0x00070002, 0x00000001, 0x00000064, 0x00000000, /* Constant 1 desc */ + 0x00000074, 0x00000002, 0x00000004, 0x00000080, 0x00000000, /* Constant 2 desc */ + 0x00000090, 0x00040002, 0x00000003, 0x00000080, 0x00000000, /* Constant 3 desc */ + 0x736e6f43, 0x746e6174, 0xabab0031, /* Constant 1 name string */ + 0x00030001, 0x00040001, 0x00000001, 0x00000000, /* Constant 1 type desc */ + 0x736e6f43, 0x746e6174, 0xabab0032, /* Constant 2 name string */ + 0x00030003, 0x00040004, 0x00000001, 0x00000000, /* Constant 2 & 3 type desc */ + 0x736e6f43, 0x746e6174, 0xabab0033, /* Constant 3 name string */ + 0x335f7376, 0xab00305f, /* Target name string */ + 0x656e6957, 0x6f727020, 0x7463656a, 0xababab00, /* Creator name string */ + 0x0000ffff /* END */ +}; + static void test_get_shader_size(void) { UINT shader_size, expected; @@ -421,6 +440,14 @@ static void test_get_shader_constant_table_ex(void) "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); if (constant_table) ID3DXConstantTable_Release(constant_table); + hr = D3DXGetShaderConstantTableEx(simple_fx, 0, &constant_table); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); + ok(!constant_table, "D3DXGetShaderConstantTableEx() returned a non-NULL constant table.\n"); + + hr = D3DXGetShaderConstantTableEx(simple_tx, 0, &constant_table); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); + ok(!constant_table, "D3DXGetShaderConstantTableEx() returned a non-NULL constant table.\n"); + hr = D3DXGetShaderConstantTableEx(shader_with_ctab, 0, &constant_table); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); ok(constant_table != NULL, "D3DXGetShaderConstantTableEx() failed, got NULL\n"); @@ -534,6 +561,10 @@ static void test_get_shader_constant_table_ex(void) ID3DXConstantTable_Release(constant_table); } + + hr = D3DXGetShaderConstantTableEx(fx_shader_with_ctab, 0, &constant_table); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); + ok(!constant_table, "D3DXGetShaderConstantTableEx() returned a non-NULL constant table.\n"); } static void test_constant_table(const char *test_name, const DWORD *ctable_fn,

1 0