wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Zebediah Figura : quartz/tests: Add tests for IVMRFilterConfig on the VMR7.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 0efaac5108140f4c08619097324344bca6621af2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0efaac5108140f4c08619097… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:23 2019 -0500 quartz/tests: Add tests for IVMRFilterConfig on the VMR7. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/vmr7.c | 140 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 902e57e..ce59b73 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ mpegsplit.c \ systemclock.c \ videorenderer.c \ + vmr7.c \ waveparser.c diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c new file mode 100644 index 0000000..b420991 --- /dev/null +++ b/dlls/quartz/tests/vmr7.c @@ -0,0 +1,140 @@ +/* + * Video Mixing Renderer 7 unit tests + * + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "dshow.h" +#include "d3d9.h" +#include "vmr9.h" +#include "wine/test.h" + +static void test_filter_config(void) +{ + IVMRFilterConfig *config; + DWORD count, mode; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Renderless); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(mode == VMRMode_Renderless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetNumberOfStreams(config, &count); + todo_wine ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_SetNumberOfStreams(config, 3); + if (hr != VFW_E_DDRAW_CAPS_NOT_SUITABLE) + { + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetNumberOfStreams(config, &count); + todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + } + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); + + /* Despite MSDN, you can still change the rendering mode after setting the + * stream count. */ + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_GetNumberOfStreams(config, &count); + todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + } + } + else + skip("Mixing mode is not supported.\n"); + + ref = IVMRFilterConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +START_TEST(vmr7) +{ + CoInitialize(NULL); + + test_filter_config(); + + CoUninitialize(); +}

1 0

Zebediah Figura : quartz/tests: Link to strmiids and uuid.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 90114c4adf514788f39f645aaf0a33b1b10e23e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90114c4adf514788f39f645a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:22 2019 -0500 quartz/tests: Link to strmiids and uuid. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/filtermapper.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index f4c56c1..902e57e 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = quartz.dll -IMPORTS = oleaut32 ole32 advapi32 user32 msvfw32 +IMPORTS = advapi32 msvfw32 ole32 oleaut32 strmiids user32 uuid C_SRCS = \ acmwrapper.c \ diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 2f82ce0..fc4fa95 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -22,14 +22,11 @@ #include "wine/test.h" #include "winbase.h" -#include "initguid.h" #include "dshow.h" #include "winternl.h" - +#include "initguid.h" #include "wine/fil_data.h" -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); - /* Helper function, checks if filter with given name was enumerated. */ static BOOL enum_find_filter(const WCHAR *wszFilterName, IEnumMoniker *pEnum) {

1 0

Zebediah Figura : quartz/tests: Add some tests for video renderer media types.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 3f5ab4c06c21a6afcb20f0fe2485f6abbcd563e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f5ab4c06c21a6afcb20f0fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:21 2019 -0500 quartz/tests: Add some tests for video renderer media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 69 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c7f0df4..c7053e5 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -269,6 +269,74 @@ todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_media_types(void) +{ + IBaseFilter *filter = create_video_renderer(); + AM_MEDIA_TYPE *mt, req_mt = {{0}}; + VIDEOINFOHEADER vih = + { + {0}, {0}, 0, 0, 0, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 0, BI_RGB} + }; + IEnumMediaTypes *enummt; + unsigned int i; + HRESULT hr; + ULONG ref; + IPin *pin; + + static const GUID *subtype_tests[] = + { + &MEDIASUBTYPE_RGB8, + &MEDIASUBTYPE_RGB565, + &MEDIASUBTYPE_RGB24, + &MEDIASUBTYPE_RGB32, + }; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + req_mt.majortype = MEDIATYPE_Video; + req_mt.formattype = FORMAT_VideoInfo; + req_mt.cbFormat = sizeof(VIDEOINFOHEADER); + req_mt.pbFormat = (BYTE *)&vih; + + for (i = 0; i < ARRAY_SIZE(subtype_tests); ++i) + { + req_mt.subtype = *subtype_tests[i]; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_OK, "Got hr %#x for subtype %s.\n", hr, wine_dbgstr_guid(subtype_tests[i])); + } + + req_mt.subtype = MEDIASUBTYPE_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.subtype = MEDIASUBTYPE_RGB24; + + req_mt.majortype = MEDIATYPE_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.majortype = MEDIATYPE_Video; + + req_mt.formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + req_mt.formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -333,6 +401,7 @@ START_TEST(videorenderer) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); test_basefilter(); CoUninitialize();

1 0

Alistair Leslie-Hughes : uianimation: Add DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer stubs.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 10c51972e99f3a97b7e40ac28ec9c5cd55240c38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10c51972e99f3a97b7e40ac2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 1 23:37:19 2019 +0000 uianimation: Add DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer stubs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/main.c | 40 +++++++++++++++++++++++++++++++++++++++ dlls/uianimation/uianimation.spec | 8 ++++---- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index 0fa9bfb..92d594f 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -23,6 +23,8 @@ #include "windef.h" #include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" #include "uianimation.h" @@ -30,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(uianimation); +static HINSTANCE hinstance; + BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) { TRACE("(%p %d %p)\n", dll, reason, reserved); @@ -39,8 +43,44 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + hinstance = dll; DisableThreadLibraryCalls( dll ); break; } return TRUE; } + +/****************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) +{ + FIXME( "(%s %s %p)\n", debugstr_guid( clsid ), debugstr_guid( iid ), obj ); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +/****************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow( void ) +{ + TRACE( "()\n" ); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer( void ) +{ + return __wine_register_resources( hinstance ); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer( void ) +{ + return __wine_unregister_resources( hinstance ); +} diff --git a/dlls/uianimation/uianimation.spec b/dlls/uianimation/uianimation.spec index a43b12d..b16365d 100644 --- a/dlls/uianimation/uianimation.spec +++ b/dlls/uianimation/uianimation.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow() -@ stub DllGetClassObject(ptr ptr ptr) -@ stub DllRegisterServer() -@ stub DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Zebediah Figura : rpcrt4: Properly handle complex arrays in the typelib marshaller.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 3fd7a32a015923a5e153343cdc7b1d26ffb81c4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fd7a32a015923a5e153343c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 17:38:25 2019 -0500 rpcrt4: Properly handle complex arrays in the typelib marshaller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 52 ++++++++++++++++++++++++------------------ dlls/rpcrt4/ndr_typelib.c | 33 +++++++++++++++++++-------- 2 files changed, 53 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 4f84442..ac0969b 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1481,21 +1481,21 @@ static HRESULT WINAPI Widget_variant_array(IWidget *iface, VARIANT in[2], VARIAN { ok(V_VT(&in[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&in[0])); ok(V_I4(&in[0]) == 1, "Got wrong value %d.\n", V_I4(&in[0])); - ok(V_VT(&in[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&in[1])); - ok(V_I4(&in[1]) == 2, "Got wrong value %d.\n", V_I4(&in[1])); + ok(V_VT(&in[1]) == (VT_BYREF|VT_I4), "Got wrong type %u.\n", V_VT(&in[1])); + ok(*V_I4REF(&in[1]) == 2, "Got wrong value %d.\n", *V_I4REF(&in[1])); ok(V_VT(&out[0]) == VT_EMPTY, "Got wrong type %u.\n", V_VT(&out[0])); ok(V_VT(&out[1]) == VT_EMPTY, "Got wrong type %u.\n", V_VT(&out[1])); ok(V_VT(&in_out[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&in_out[0])); ok(V_I4(&in_out[0]) == 5, "Got wrong type %u.\n", V_VT(&in_out[0])); - ok(V_VT(&in_out[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&in_out[1])); - ok(V_I4(&in_out[1]) == 6, "Got wrong type %u.\n", V_VT(&in_out[1])); + ok(V_VT(&in_out[1]) == VT_BSTR, "Got wrong type %u.\n", V_VT(&in_out[1])); + ok(!lstrcmpW(V_BSTR(&in_out[1]), test_bstr1), "Got wrong value %s.\n", wine_dbgstr_w(V_BSTR(&in[1]))); - V_VT(&in[0]) = VT_I1; V_I1(&in[0]) = 7; - V_VT(&in[1]) = VT_I1; V_I1(&in[1]) = 8; - V_VT(&out[0]) = VT_I1; V_I1(&out[0]) = 9; - V_VT(&out[1]) = VT_I1; V_I1(&out[1]) = 10; - V_VT(&in_out[0]) = VT_I1; V_I1(&in_out[0]) = 11; - V_VT(&in_out[1]) = VT_I1; V_I1(&in_out[1]) = 12; + V_VT(&in[0]) = VT_I1; V_I1(&in[0]) = 7; + V_VT(&in[1]) = VT_I1; V_I1(&in[1]) = 8; + V_VT(&out[0]) = VT_I1; V_I1(&out[0]) = 9; + V_VT(&out[1]) = VT_BSTR; V_BSTR(&out[1]) = SysAllocString(test_bstr2); + V_VT(&in_out[0]) = VT_I1; V_I1(&in_out[0]) = 11; + V_VT(&in_out[1]) = VT_UNKNOWN; V_UNKNOWN(&in_out[1]) = (IUnknown *)create_disp_obj(); return S_OK; } @@ -2581,9 +2581,11 @@ static void test_marshal_struct(IWidget *widget, IDispatch *disp) static void test_marshal_array(IWidget *widget, IDispatch *disp) { VARIANT var_in[2], var_out[2], var_in_out[2]; + ISomethingFromDispatch *proxy_sfd; array_t in, out, in_out; MYSTRUCT struct_in[2]; HRESULT hr; + int i = 2; memcpy(in, test_array1, sizeof(array_t)); memcpy(out, test_array2, sizeof(array_t)); @@ -2594,26 +2596,32 @@ static void test_marshal_array(IWidget *widget, IDispatch *disp) ok(!memcmp(&out, &test_array5, sizeof(array_t)), "Arrays didn't match.\n"); ok(!memcmp(&in_out, &test_array6, sizeof(array_t)), "Arrays didn't match.\n"); - V_VT(&var_in[0]) = VT_I4; V_I4(&var_in[0]) = 1; - V_VT(&var_in[1]) = VT_I4; V_I4(&var_in[1]) = 2; - V_VT(&var_out[0]) = VT_I4; V_I4(&var_out[0]) = 3; - V_VT(&var_out[1]) = VT_I4; V_I4(&var_out[1]) = 4; - V_VT(&var_in_out[0]) = VT_I4; V_I4(&var_in_out[0]) = 5; - V_VT(&var_in_out[1]) = VT_I4; V_I4(&var_in_out[1]) = 6; + V_VT(&var_in[0]) = VT_I4; V_I4(&var_in[0]) = 1; + V_VT(&var_in[1]) = VT_BYREF|VT_I4; V_I4REF(&var_in[1]) = &i; + V_VT(&var_out[0]) = VT_I4; V_I4(&var_out[0]) = 3; + V_VT(&var_out[1]) = VT_I4; V_I4(&var_out[1]) = 4; + V_VT(&var_in_out[0]) = VT_I4; V_I4(&var_in_out[0]) = 5; + V_VT(&var_in_out[1]) = VT_BSTR; V_BSTR(&var_in_out[1]) = SysAllocString(test_bstr1); hr = IWidget_variant_array(widget, var_in, var_out, var_in_out); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(V_VT(&var_in[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&var_in[0])); ok(V_I4(&var_in[0]) == 1, "Got wrong value %d.\n", V_I4(&var_in[0])); - ok(V_VT(&var_in[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&var_in[1])); - ok(V_I4(&var_in[1]) == 2, "Got wrong value %d.\n", V_I4(&var_in[1])); + ok(V_VT(&var_in[1]) == (VT_BYREF|VT_I4), "Got wrong type %u.\n", V_VT(&var_in[1])); + ok(V_I4REF(&var_in[1]) == &i, "Got wrong value %p.\n", V_I4REF(&var_in[1])); + ok(i == 2, "Got wrong value %d.\n", i); ok(V_VT(&var_out[0]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_out[0])); ok(V_I1(&var_out[0]) == 9, "Got wrong value %u.\n", V_VT(&var_out[0])); - ok(V_VT(&var_out[1]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_out[1])); - ok(V_I1(&var_out[1]) == 10, "Got wrong value %u.\n", V_VT(&var_out[1])); + ok(V_VT(&var_out[1]) == VT_BSTR, "Got wrong type %u.\n", V_VT(&var_out[1])); + ok(!lstrcmpW(V_BSTR(&var_out[1]), test_bstr2), "Got wrong value %s.\n", wine_dbgstr_w(V_BSTR(&var_out[1]))); ok(V_VT(&var_in_out[0]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_in_out[0])); ok(V_I1(&var_in_out[0]) == 11, "Got wrong value %u.\n", V_VT(&var_in_out[0])); - ok(V_VT(&var_in_out[1]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_in_out[1])); - ok(V_I1(&var_in_out[1]) == 12, "Got wrong value %u.\n", V_VT(&var_in_out[1])); + ok(V_VT(&var_in_out[1]) == VT_UNKNOWN, "Got wrong type %u.\n", V_VT(&var_in_out[1])); + hr = IUnknown_QueryInterface(V_UNKNOWN(&var_in_out[1]), &IID_ISomethingFromDispatch, (void **)&proxy_sfd); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ISomethingFromDispatch_anotherfn(proxy_sfd); + ok(hr == 0x01234567, "Got hr %#x.\n", hr); + ISomethingFromDispatch_Release(proxy_sfd); + release_iface(V_UNKNOWN(&var_in_out[1])); memcpy(&struct_in[0], &test_mystruct1, sizeof(MYSTRUCT)); memcpy(&struct_in[1], &test_mystruct2, sizeof(MYSTRUCT)); diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 5a4de51..5c48010 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -326,9 +326,13 @@ static unsigned char get_struct_fc(ITypeInfo *typeinfo, TYPEATTR *attr) static unsigned char get_array_fc(ITypeInfo *typeinfo, TYPEDESC *desc) { - if (get_basetype(typeinfo, desc)) + switch (desc->vt) + { + case VT_CY: return FC_LGFARRAY; - else if (desc->vt == VT_USERDEFINED) + case VT_CARRAY: + return get_array_fc(typeinfo, &desc->lpadesc->tdescElem); + case VT_USERDEFINED: { ITypeInfo *refinfo; TYPEATTR *attr; @@ -351,8 +355,9 @@ static unsigned char get_array_fc(ITypeInfo *typeinfo, TYPEDESC *desc) return fc; } - else - return FC_BOGUS_ARRAY; + default: + return get_basetype(typeinfo, desc) ? FC_LGFARRAY : FC_BOGUS_ARRAY; + } } static BOOL type_is_non_iface_pointer(ITypeInfo *typeinfo, TYPEDESC *desc) @@ -616,14 +621,11 @@ static size_t write_array_tfs(ITypeInfo *typeinfo, unsigned char *str, size_t *len, ARRAYDESC *desc) { unsigned char fc = get_array_fc(typeinfo, &desc->tdescElem); - ULONG size = type_memsize(typeinfo, &desc->tdescElem); unsigned char basetype; size_t ref = 0, off; + ULONG size = 1; USHORT i; - if (fc != FC_LGFARRAY) - FIXME("complex arrays not implemented\n"); - if (!(basetype = get_basetype(typeinfo, &desc->tdescElem))) ref = write_type_tfs(typeinfo, str, len, &desc->tdescElem, FALSE, FALSE); @@ -633,9 +635,20 @@ static size_t write_array_tfs(ITypeInfo *typeinfo, unsigned char *str, off = *len; - WRITE_CHAR(str, *len, FC_LGFARRAY); + WRITE_CHAR(str, *len, fc); WRITE_CHAR(str, *len, 0); - WRITE_INT (str, *len, size); + if (fc == FC_BOGUS_ARRAY) + { + WRITE_SHORT(str, *len, size); + WRITE_INT(str, *len, 0xffffffff); /* conformance */ + WRITE_INT(str, *len, 0xffffffff); /* variance */ + } + else + { + size *= type_memsize(typeinfo, &desc->tdescElem); + WRITE_INT(str, *len, size); + } + if (basetype) WRITE_CHAR(str, *len, basetype); else

1 0

Józef Kucia : vkd3d: Enable VK_EXT_descriptor_indexing.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: vkd3d Branch: master Commit: a1ec97ca2aaba36650870f847bf08781aeed6723 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a1ec97ca2aaba36650870f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:56 2019 +0200 vkd3d: Enable VK_EXT_descriptor_indexing. This extension brings dynamic indexing for all descriptor types and the update after bind feature. VK_KHR_maintenance3 is required by VK_EXT_descriptor_indexing. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 164 ++++++++++++++++++++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 2 + libs/vkd3d/vulkan_procs.h | 3 + 3 files changed, 168 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a1ec97ca2aaba366508…

1 0

Józef Kucia : tests: Use vkd3d_optional_device_extensions_info.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: vkd3d Branch: master Commit: 0eb2817c226b2694ff1a07aba136a8664de8f47b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0eb2817c226b2694ff1a07a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:55 2019 +0200 tests: Use vkd3d_optional_device_extensions_info. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12_crosstest.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 723659e..2103caf 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -455,29 +455,30 @@ static VkPhysicalDevice select_physical_device(struct vkd3d_instance *instance) static HRESULT create_vkd3d_device(struct vkd3d_instance *instance, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { - struct vkd3d_device_create_info device_create_info; - VkPhysicalDevice vk_physical_device; - static const char * const device_extensions[] = { VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME, }; + static const struct vkd3d_optional_device_extensions_info optional_extensions = + { + .type = VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO, + .extensions = device_extensions, + .extension_count = ARRAY_SIZE(device_extensions), + }; + + struct vkd3d_device_create_info device_create_info; + VkPhysicalDevice vk_physical_device; if (!(vk_physical_device = select_physical_device(instance))) return E_INVALIDARG; memset(&device_create_info, 0, sizeof(device_create_info)); device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_create_info.next = &optional_extensions; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance = instance; device_create_info.vk_physical_device = vk_physical_device; - if (check_device_extension(vk_physical_device, VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) - { - device_create_info.device_extensions = device_extensions; - device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); - } - return vkd3d_create_device(&device_create_info, iid, device); }

1 0

Józef Kucia : test: Test root CBV descriptor with big buffer.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: vkd3d Branch: master Commit: e88d6f4f2a7ad1b7d7b3b8ed9f5ab02c8b5ab018 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e88d6f4f2a7ad1b7d7b3b8e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:54 2019 +0200 test: Test root CBV descriptor with big buffer. This test is for commit 22330b541446b62f10ef7d03dff709318420757a. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9a17a71..00005c4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10477,6 +10477,7 @@ static void test_immediate_constant_buffer(void) 0x0010000a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0090902a, 0x0010000a, 0x00000000, 0x0100003e, }; + static const unsigned int MAX_CB_SIZE = D3D12_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT * sizeof(struct vec4); static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; static struct vec4 expected_result[] = { @@ -10501,7 +10502,7 @@ static void test_immediate_constant_buffer(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps, NULL); - cb = create_upload_buffer(context.device, sizeof(index), NULL); + cb = create_upload_buffer(context.device, 2 * MAX_CB_SIZE, NULL); for (i = 0; i < ARRAY_SIZE(expected_result); ++i) {

1 0

Józef Kucia : tests: Add test for updating descriptor tables after changing root signature.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: vkd3d Branch: master Commit: ba1766fe307750a630e7241e2a9c2afc3bf21f69 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ba1766fe307750a630e7241… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:53 2019 +0200 tests: Add test for updating descriptor tables after changing root signature. This test is for commit 74fbfee61101901666069f1f7e868e0205266c10. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ba1766fe307750a630e…

1 0

Józef Kucia : vkd3d: Avoid copying empty ranges in d3d12_device_CopyDescriptors().
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: vkd3d Branch: master Commit: 91e88a820e708804614203c834e0acac8a62c4d5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=91e88a820e708804614203c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:52 2019 +0200 vkd3d: Avoid copying empty ranges in d3d12_device_CopyDescriptors(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 34 ++++++++++++++++------------------ libs/vkd3d/resource.c | 2 ++ tests/d3d12.c | 34 ++++++++++++++++++++++++++++++---- 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8676434..9b18bc9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2306,29 +2306,27 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, } dst_range_idx = dst_idx = 0; - dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[0]); - dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[0] : 1; - for (src_range_idx = 0; src_range_idx < src_descriptor_range_count; ++src_range_idx) + src_range_idx = src_idx = 0; + while (dst_range_idx < dst_descriptor_range_count && src_range_idx < src_descriptor_range_count) { - src = d3d12_desc_from_cpu_handle(src_descriptor_range_offsets[src_range_idx]); + dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; src_range_size = src_descriptor_range_sizes ? src_descriptor_range_sizes[src_range_idx] : 1; - for (src_idx = 0; src_idx < src_range_size; ++src_idx) - { - if (dst_idx >= dst_range_size) - { - dst_idx = 0; - ++dst_range_idx; - if (dst_range_idx >= dst_descriptor_range_count) - return; - - dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[dst_range_idx]); - dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; - } + dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[dst_range_idx]); + src = d3d12_desc_from_cpu_handle(src_descriptor_range_offsets[src_range_idx]); - d3d12_desc_copy(dst++, src++, device); + while (dst_idx < dst_range_size && src_idx < src_range_size) + d3d12_desc_copy(&dst[dst_idx++], &src[src_idx++], device); - ++dst_idx; + if (dst_idx >= dst_range_size) + { + ++dst_range_idx; + dst_idx = 0; + } + if (src_idx >= src_range_size) + { + ++src_range_idx; + src_idx = 0; } } } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a6c22fd..8485585 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1600,6 +1600,8 @@ static void d3d12_desc_destroy(struct d3d12_desc *descriptor, void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device) { + assert(dst != src); + d3d12_desc_destroy(dst, device); *dst = *src; diff --git a/tests/d3d12.c b/tests/d3d12.c index a9255b3..79bca28 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15168,12 +15168,16 @@ static void test_copy_descriptors(void) dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 9); dst_range_sizes[0] = 4; - dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 13); - dst_range_sizes[1] = 3; + dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 9); + dst_range_sizes[1] = 0; + dst_handles[2] = get_cpu_descriptor_handle(&context, heap, 13); + dst_range_sizes[2] = 3; + dst_handles[3] = get_cpu_descriptor_handle(&context, heap, 13); + dst_range_sizes[3] = 0; src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 10); - src_range_sizes[0] = 7; + src_range_sizes[0] = 8; /* t0-t6 */ - ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes, + ID3D12Device_CopyDescriptors(device, 4, dst_handles, dst_range_sizes, 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); /* copy 1 uninitialized descriptor (19) */ @@ -15195,6 +15199,28 @@ static void test_copy_descriptors(void) get_cpu_descriptor_handle(&context, cpu_heap, 22), D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + /* range sizes equal to 0 */ + dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[0] = 0; + dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[1] = 0; + src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[0] = 1; + src_handles[1] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[1] = 4; + ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes, + 2, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[0] = 4; + dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[1] = 4; + src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[0] = 0; + src_handles[1] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[1] = 0; + ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes, + 2, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); heaps[0] = sampler_heap; heaps[1] = heap; ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps);

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
81
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 April 2019