March 2022 - Wine-commits - list.winehq.org

Eric Pouech : prntvpt/tests: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 2a64ee2aac9c1df6ec4891c758301b2cdbf34839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a64ee2aac9c1df6ec4891c7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 08:21:51 2022 +0100 prntvpt/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/tests/Makefile.in | 1 - dlls/prntvpt/tests/prntvpt.c | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/prntvpt/tests/Makefile.in b/dlls/prntvpt/tests/Makefile.in index 659a25a064c..692a134d016 100644 --- a/dlls/prntvpt/tests/Makefile.in +++ b/dlls/prntvpt/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = prntvpt.dll IMPORTS = prntvpt winspool ole32 diff --git a/dlls/prntvpt/tests/prntvpt.c b/dlls/prntvpt/tests/prntvpt.c index 55b6f3fdef1..8d955cd866b 100644 --- a/dlls/prntvpt/tests/prntvpt.c +++ b/dlls/prntvpt/tests/prntvpt.c @@ -55,27 +55,27 @@ static void test_PTOpenProvider(void) struct hprov_data data; hr = PTOpenProvider(default_name, 1, &hprov); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); data.hprov = hprov; hthread = CreateThread(NULL, 0, CloseProvider_proc, &data, 0, &tid); WaitForSingleObject(hthread, INFINITE); CloseHandle(hthread); - ok(data.hr == E_HANDLE || data.hr == E_INVALIDARG /* XP */ || broken(data.hr == S_OK) /* Win8 */, "got %#x\n", data.hr); + ok(data.hr == E_HANDLE || data.hr == E_INVALIDARG /* XP */ || broken(data.hr == S_OK) /* Win8 */, "got %#lx\n", data.hr); if (data.hr != S_OK) { hr = PTCloseProvider(hprov); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); } hr = PTOpenProvider(default_name, 0, &hprov); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); for (i = 2; i < 20; i++) { hr = PTOpenProvider(default_name, i, &hprov); - ok(hr == 0x80040001 || hr == E_INVALIDARG /* Wine */, "%u: got %#x\n", i, hr); + ok(hr == 0x80040001 || hr == E_INVALIDARG /* Wine */, "%lu: got %#lx\n", i, hr); } } @@ -88,40 +88,40 @@ static void test_PTOpenProviderEx(void) struct hprov_data data; hr = PTOpenProviderEx(default_name, 1, 1, &hprov, NULL); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); ver = 0xdeadbeef; hr = PTOpenProviderEx(default_name, 1, 1, &hprov, &ver); - ok(hr == S_OK, "got %#x\n", hr); - ok(ver == 1, "got %#x\n", ver); + ok(hr == S_OK, "got %#lx\n", hr); + ok(ver == 1, "got %#lx\n", ver); data.hprov = hprov; hthread = CreateThread(NULL, 0, CloseProvider_proc, &data, 0, &tid); WaitForSingleObject(hthread, INFINITE); CloseHandle(hthread); - ok(data.hr == E_HANDLE || data.hr == E_INVALIDARG /* XP */ || broken(data.hr == S_OK) /* Win8 */, "got %#x\n", data.hr); + ok(data.hr == E_HANDLE || data.hr == E_INVALIDARG /* XP */ || broken(data.hr == S_OK) /* Win8 */, "got %#lx\n", data.hr); if (data.hr != S_OK) { hr = PTCloseProvider(hprov); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); } for (i = 1; i < 20; i++) { hr = PTOpenProviderEx(default_name, 0, i, &hprov, &ver); - ok(hr == E_INVALIDARG, "%u: got %#x\n", i, hr); + ok(hr == E_INVALIDARG, "%lu: got %#lx\n", i, hr); ver = 0xdeadbeef; hr = PTOpenProviderEx(default_name, 1, i, &hprov, &ver); - ok(hr == S_OK, "%u: got %#x\n", i, hr); - ok(ver == 1, "%u: got %#x\n", i, ver); + ok(hr == S_OK, "%lu: got %#lx\n", i, hr); + ok(ver == 1, "%lu: got %#lx\n", i, ver); PTCloseProvider(hprov); ver = 0xdeadbeef; hr = PTOpenProviderEx(default_name, i, i, &hprov, &ver); - ok(hr == S_OK, "%u: got %#x\n", i, hr); - ok(ver == 1, "%u: got %#x\n", i, ver); + ok(hr == S_OK, "%lu: got %#lx\n", i, hr); + ok(ver == 1, "%lu: got %#lx\n", i, ver); PTCloseProvider(hprov); } }

1 0

Eric Pouech : propsys/tests: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: c1c393595d43bd95390d3ddf86dcbc46bc4f52ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1c393595d43bd95390d3ddf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 08:21:57 2022 +0100 propsys/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/Makefile.in | 1 - dlls/propsys/tests/propsys.c | 388 ++++++++++++++++++++--------------------- 2 files changed, 194 insertions(+), 195 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1c393595d43bd95390d…

1 0

Eric Pouech : psapi/tests: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: b01199d6c15903ee3ca2678dfd798009fb41ed0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b01199d6c15903ee3ca2678d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 08:22:03 2022 +0100 psapi/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/Makefile.in | 1 - dlls/psapi/tests/psapi_main.c | 258 +++++++++++++++++++++--------------------- 2 files changed, 129 insertions(+), 130 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b01199d6c15903ee3ca2…

1 0

Eric Pouech : pstorec/tests: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 9c02d53ca73eafbf2821832d4a28d29f711484b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c02d53ca73eafbf2821832d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 08:22:09 2022 +0100 pstorec/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pstorec/tests/Makefile.in | 1 - dlls/pstorec/tests/pstorec.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/pstorec/tests/Makefile.in b/dlls/pstorec/tests/Makefile.in index eb6c02a5291..2287f0f4c70 100644 --- a/dlls/pstorec/tests/Makefile.in +++ b/dlls/pstorec/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = pstorec.dll C_SRCS = \ diff --git a/dlls/pstorec/tests/pstorec.c b/dlls/pstorec/tests/pstorec.c index bc30b193d72..9716ecd63a0 100644 --- a/dlls/pstorec/tests/pstorec.c +++ b/dlls/pstorec/tests/pstorec.c @@ -49,14 +49,14 @@ static void test_PStoreCreateInstance(void) win_skip("PStoreCreateInstance is not implemented on this system\n"); return; } - ok(hr == S_OK, "Unexpected return value %#x.\n", hr); + ok(hr == S_OK, "Unexpected return value %#lx.\n", hr); hr = IPStore_QueryInterface(store, &IID_IUnknown, (void **)&unk); - ok(hr == S_OK, "Unexpected return value %#x.\n", hr); + ok(hr == S_OK, "Unexpected return value %#lx.\n", hr); IUnknown_Release(unk); hr = IPStore_QueryInterface(store, &IID_IPStore, (void **)&unk); - ok(hr == S_OK, "Unexpected return value %#x.\n", hr); + ok(hr == S_OK, "Unexpected return value %#lx.\n", hr); IUnknown_Release(unk); IPStore_Release(store);

1 0

Eric Pouech : qmgr/tests: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 7eab62d36e9ef43ddab1ddded2c180a88c61eef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eab62d36e9ef43ddab1ddde… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 08:22:45 2022 +0100 qmgr/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/tests/Makefile.in | 1 - dlls/qmgr/tests/enum_files.c | 32 +++++------ dlls/qmgr/tests/enum_jobs.c | 34 ++++++------ dlls/qmgr/tests/file.c | 6 +- dlls/qmgr/tests/job.c | 128 +++++++++++++++++++++---------------------- dlls/qmgr/tests/qmgr.c | 20 +++---- 6 files changed, 110 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7eab62d36e9ef43ddab1…

1 0

Eric Pouech : qwave/tests: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 49241114bd053c2ba31aced4fa9b4533c3ef152f URL: https://source.winehq.org/git/wine.git/?a=commit;h=49241114bd053c2ba31aced4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 08:23:38 2022 +0100 qwave/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qwave/tests/Makefile.in | 1 - dlls/qwave/tests/qos.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/qwave/tests/Makefile.in b/dlls/qwave/tests/Makefile.in index 999c26f693f..713909ba191 100644 --- a/dlls/qwave/tests/Makefile.in +++ b/dlls/qwave/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = qwave.dll IMPORTS = qwave diff --git a/dlls/qwave/tests/qos.c b/dlls/qwave/tests/qos.c index 10a32f7495b..7e8fddf64c4 100644 --- a/dlls/qwave/tests/qos.c +++ b/dlls/qwave/tests/qos.c @@ -30,19 +30,19 @@ static void test_QOSCreateHandle(void) SetLastError(0xdeadbeef); ret = QOSCreateHandle(NULL, NULL); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ret = QOSCreateHandle(&ver, NULL); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ver.MajorVersion = 0; ver.MinorVersion = 0; ret = QOSCreateHandle(&ver, &h); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); ver.MajorVersion = 1; ver.MinorVersion = 0; @@ -54,14 +54,14 @@ static void test_QOSCreateHandle(void) ver.MinorVersion = 5; ret = QOSCreateHandle(&ver, &h); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ver.MajorVersion = 2; ver.MinorVersion = 0; ret = QOSCreateHandle(&ver, &h); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); } START_TEST(qos)

1 0

Huw Davies : win32u: Remove no longer used macro.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: c7b93aa3dacc18eae2a66f3252eb63d3c794a5ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7b93aa3dacc18eae2a66f32… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 3 09:49:01 2022 +0000 win32u: Remove no longer used macro. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/ntgdi_private.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index 7f35707c4f2..29f1240a7b7 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -89,10 +89,6 @@ typedef struct tagDC RECT bounds; /* Current bounding rect */ } DC; -/* Certain functions will do no further processing if the driver returns this. - Used by mfdrv for example. */ -#define GDI_NO_MORE_WORK 2 - /* Rounds a floating point number to integer. The world-to-viewport * transformation process is done in floating point internally. This function * is then used to round these coordinates to integer values.

1 0

Matteo Bruni : win32u: Use GDI_ROUND() in a few more places.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 3d700e8ccc03adf375d6ce6734aed29364d2d78e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d700e8ccc03adf375d6ce67… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 00:22:12 2022 -0600 win32u: Use GDI_ROUND() in a few more places. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/mapping.c | 52 +++++++++++++++++++++++++-------------------------- dlls/win32u/region.c | 4 ++-- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/win32u/mapping.c b/dlls/win32u/mapping.c index 6e7c42fe7cc..ecdbf457202 100644 --- a/dlls/win32u/mapping.c +++ b/dlls/win32u/mapping.c @@ -98,13 +98,13 @@ static void MAPPING_FixIsotropic( DC * dc ) if (xdim > ydim) { INT mincx = (dc->attr->vport_ext.cx >= 0) ? 1 : -1; - dc->attr->vport_ext.cx = floor(dc->attr->vport_ext.cx * ydim / xdim + 0.5); + dc->attr->vport_ext.cx = GDI_ROUND( dc->attr->vport_ext.cx * ydim / xdim ); if (!dc->attr->vport_ext.cx) dc->attr->vport_ext.cx = mincx; } else { INT mincy = (dc->attr->vport_ext.cy >= 0) ? 1 : -1; - dc->attr->vport_ext.cy = floor(dc->attr->vport_ext.cy * xdim / ydim + 0.5); + dc->attr->vport_ext.cy = GDI_ROUND( dc->attr->vport_ext.cy * xdim / ydim ); if (!dc->attr->vport_ext.cy) dc->attr->vport_ext.cy = mincy; } } @@ -190,12 +190,12 @@ BOOL dp_to_lp( DC *dc, POINT *points, INT count ) { double x = points->x; double y = points->y; - points->x = floor( x * dc->xformVport2World.eM11 + - y * dc->xformVport2World.eM21 + - dc->xformVport2World.eDx + 0.5 ); - points->y = floor( x * dc->xformVport2World.eM12 + - y * dc->xformVport2World.eM22 + - dc->xformVport2World.eDy + 0.5 ); + points->x = GDI_ROUND( x * dc->xformVport2World.eM11 + + y * dc->xformVport2World.eM21 + + dc->xformVport2World.eDx ); + points->y = GDI_ROUND( x * dc->xformVport2World.eM12 + + y * dc->xformVport2World.eM22 + + dc->xformVport2World.eDy ); points++; } } @@ -221,12 +221,12 @@ BOOL WINAPI NtGdiTransformPoints( HDC hdc, const POINT *points_in, POINT *points { double x = points_in[i].x; double y = points_in[i].y; - points_out[i].x = floor( x * dc->xformWorld2Vport.eM11 + - y * dc->xformWorld2Vport.eM21 + - dc->xformWorld2Vport.eDx + 0.5 ); - points_out[i].y = floor( x * dc->xformWorld2Vport.eM12 + - y * dc->xformWorld2Vport.eM22 + - dc->xformWorld2Vport.eDy + 0.5 ); + points_out[i].x = GDI_ROUND( x * dc->xformWorld2Vport.eM11 + + y * dc->xformWorld2Vport.eM21 + + dc->xformWorld2Vport.eDx ); + points_out[i].y = GDI_ROUND( x * dc->xformWorld2Vport.eM12 + + y * dc->xformWorld2Vport.eM22 + + dc->xformWorld2Vport.eDy ); } ret = TRUE; break; @@ -237,12 +237,12 @@ BOOL WINAPI NtGdiTransformPoints( HDC hdc, const POINT *points_in, POINT *points { double x = points_in[i].x; double y = points_in[i].y; - points_out[i].x = floor( x * dc->xformVport2World.eM11 + - y * dc->xformVport2World.eM21 + - dc->xformVport2World.eDx + 0.5 ); - points_out[i].y = floor( x * dc->xformVport2World.eM12 + - y * dc->xformVport2World.eM22 + - dc->xformVport2World.eDy + 0.5 ); + points_out[i].x = GDI_ROUND( x * dc->xformVport2World.eM11 + + y * dc->xformVport2World.eM21 + + dc->xformVport2World.eDx ); + points_out[i].y = GDI_ROUND( x * dc->xformVport2World.eM12 + + y * dc->xformVport2World.eM22 + + dc->xformVport2World.eDy ); } ret = TRUE; break; @@ -268,12 +268,12 @@ void lp_to_dp( DC *dc, POINT *points, INT count ) { double x = points->x; double y = points->y; - points->x = floor( x * dc->xformWorld2Vport.eM11 + - y * dc->xformWorld2Vport.eM21 + - dc->xformWorld2Vport.eDx + 0.5 ); - points->y = floor( x * dc->xformWorld2Vport.eM12 + - y * dc->xformWorld2Vport.eM22 + - dc->xformWorld2Vport.eDy + 0.5 ); + points->x = GDI_ROUND( x * dc->xformWorld2Vport.eM11 + + y * dc->xformWorld2Vport.eM21 + + dc->xformWorld2Vport.eDx ); + points->y = GDI_ROUND( x * dc->xformWorld2Vport.eM12 + + y * dc->xformWorld2Vport.eM22 + + dc->xformWorld2Vport.eDy ); points++; } } diff --git a/dlls/win32u/region.c b/dlls/win32u/region.c index 17eae861cbf..e524dd66f34 100644 --- a/dlls/win32u/region.c +++ b/dlls/win32u/region.c @@ -866,8 +866,8 @@ static void translate( POINT *pt, UINT count, const XFORM *xform ) { double x = pt->x; double y = pt->y; - pt->x = floor( x * xform->eM11 + y * xform->eM21 + xform->eDx + 0.5 ); - pt->y = floor( x * xform->eM12 + y * xform->eM22 + xform->eDy + 0.5 ); + pt->x = GDI_ROUND( x * xform->eM11 + y * xform->eM21 + xform->eDx ); + pt->y = GDI_ROUND( x * xform->eM12 + y * xform->eM22 + xform->eDy ); pt++; } }

1 0

Zebediah Figura : d3d10/tests: Add tests for Direct3D 10 shader reflection interfaces.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: a27dfbe759fdafa6f29d9faadcd5a04d70221b04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a27dfbe759fdafa6f29d9faa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 3 14:24:03 2022 +0100 d3d10/tests: Add tests for Direct3D 10 shader reflection interfaces. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 9c8247790c5..bd9179779e9 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -53,7 +53,6 @@ static DWORD shader_creator[] = { 0x39207265, 0x2e39322e, 0x2e323539, 0x31313133, 0xababab00, }; -#if D3D_COMPILER_VERSION /* * fxc.exe /E VS /Tvs_4_0 /Fx */ @@ -81,6 +80,7 @@ static DWORD test_reflection_blob[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; +#if D3D_COMPILER_VERSION static void test_reflection_references(void) { ID3D11ShaderReflection *ref11, *ref11_test; @@ -212,6 +212,31 @@ static void test_reflection_interfaces(void) count = ref11->lpVtbl->Release(ref11); ok(!count, "Got unexpected ref count %lu.\n", count); } +#else +static void test_d3d10_interfaces(void) +{ + ID3D10ShaderReflection *ref10; + IUnknown *unk; + HRESULT hr; + + hr = D3D10ReflectShader(test_reflection_blob, sizeof(test_reflection_blob), &ref10); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = ref10->lpVtbl->QueryInterface(ref10, &IID_ID3D10ShaderReflection, (void **)&unk); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + IUnknown_Release(unk); + + hr = ref10->lpVtbl->QueryInterface(ref10, &IID_ID3D10ShaderReflection1, (void **)&unk); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); + + hr = ref10->lpVtbl->QueryInterface(ref10, &IID_ID3D11ShaderReflection, (void **)&unk); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); + + hr = ref10->lpVtbl->QueryInterface(ref10, &IID_ID3D12ShaderReflection, (void **)&unk); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); + + ref10->lpVtbl->Release(ref10); +} #endif /* @@ -2125,6 +2150,8 @@ START_TEST(reflection) #if D3D_COMPILER_VERSION test_reflection_references(); test_reflection_interfaces(); +#else + test_d3d10_interfaces(); #endif test_reflection_desc_vs(); test_reflection_desc_ps();

1 0

Zebediah Figura : d3d10_1/tests: Add shader reflection tests.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 70754188101d2b07c3e85c2e7d955a7ab1e42314 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70754188101d2b07c3e85c2e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 3 14:24:04 2022 +0100 d3d10_1/tests: Add shader reflection tests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/Makefile.in | 5 ++++- dlls/d3d10_1/tests/d3d10_1.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10_1/tests/Makefile.in b/dlls/d3d10_1/tests/Makefile.in index 256bb407d41..9f36f4db76d 100644 --- a/dlls/d3d10_1/tests/Makefile.in +++ b/dlls/d3d10_1/tests/Makefile.in @@ -1,5 +1,8 @@ TESTDLL = d3d10_1.dll IMPORTS = d3d10_1 user32 +EXTRADEFS = -DD3D_COMPILER_VERSION=0 +PARENTSRC = ../../d3dcompiler_43/tests C_SRCS = \ - d3d10_1.c + d3d10_1.c \ + reflection.c diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 33abd919a03..3218b21b2f0 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -18,6 +18,7 @@ */ #define COBJMACROS +#include "d3d10_1.h" #include "initguid.h" #include "d3d11_1.h" #include "wine/test.h"

1 0