March 2020 - Wine-devel - list.winehq.org

[PATCH] wineconsole: Don't allow resizing while computing positions.
by Roman Pišl 14 Mar '20

14 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48747 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- programs/wineconsole/user.c | 5 +++++ programs/wineconsole/winecon_user.h | 1 + 2 files changed, 6 insertions(+) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index de3f4ae98c..05bb924518 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -216,6 +216,8 @@ static void WCUSER_ComputePositions(struct inner_data* data) RECT r; int dx, dy; + PRIVATE(data)->computing_pos = TRUE; + /* compute window size from desired client size */ r.left = r.top = 0; r.right = data->curcfg.win_width * data->curcfg.cell_width; @@ -256,6 +258,8 @@ static void WCUSER_ComputePositions(struct inner_data* data) SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE); WCUSER_ShapeCursor(data, data->curcfg.cursor_size, data->curcfg.cursor_visible, TRUE); WCUSER_PosCursor(data); + + PRIVATE(data)->computing_pos = FALSE; } /****************************************************************** @@ -1328,6 +1332,7 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM WCUSER_SetMenuDetails(data, GetSystemMenu(data->hWnd, FALSE)); break; case WM_SIZE: + if (PRIVATE(data)->computing_pos) break; WINECON_ResizeWithContainer(data, LOWORD(lParam) / data->curcfg.cell_width, HIWORD(lParam) / data->curcfg.cell_height); break; diff --git a/programs/wineconsole/winecon_user.h b/programs/wineconsole/winecon_user.h index bd026ef771..fbc7d144c2 100644 --- a/programs/wineconsole/winecon_user.h +++ b/programs/wineconsole/winecon_user.h @@ -38,6 +38,7 @@ struct inner_data_user { BOOL has_selection; /* an area is being selected (selectPt[12] are edges of the rect) */ COORD selectPt1; /* start (and end) point of a mouse selection */ COORD selectPt2; + BOOL computing_pos; /* barrier to avoid resizing while computing positions */ }; #define PRIVATE(data) ((struct inner_data_user*)((data)->private)) -- 2.20.1

2 1

[RFC PATCH 1/2] winevulkan: Generate and install JSON manifest and registry entry used by official Vulkan loader.
by Brendan Shanks 14 Mar '20

14 Mar '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- This patch has make_vulkan generate a 'loader/winevulkan.json.in' manifest file, it gets processed to 'loader/winevulkan.json', then installed by wine.inf to c:\windows\system32. - winevulkan.json doesn't need any pre-processing, but '.in' was the only way I found to have it built/installed. Is there a better way? - Is 'loader' the best place to generate the file? I feel like 'dlls/winevulkan' would be preferable, but that puts the file in a different place relative to wine.inf when running from the build tree or installed. configure.ac | 1 + dlls/winevulkan/make_vulkan | 13 +++++++++++++ loader/Makefile.in | 3 ++- loader/wine.inf.in | 32 ++++++++++++++++++++++---------- loader/winevulkan.json.in | 7 +++++++ 5 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 loader/winevulkan.json.in diff --git a/configure.ac b/configure.ac index 7c3c6d2b67..5135a60a62 100644 --- a/configure.ac +++ b/configure.ac @@ -4099,6 +4099,7 @@ fonts \ loader/wine.inf \ loader/winebus.inf \ loader/winehid.inf \ +loader/winevulkan.json \ nls \ programs/msidb/msidb \ programs/msiexec/msiexec \ diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3593410041..66543dceaf 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -71,6 +71,7 @@ WINE_VK_VERSION = (1, 1) WINE_VULKAN_H = "../../include/wine/vulkan.h" WINE_VULKAN_DRIVER_H = "../../include/wine/vulkan_driver.h" WINE_VULKAN_LOADER_SPEC = "../vulkan-1/vulkan-1.spec" +WINE_VULKAN_JSON = "../../loader/winevulkan.json.in" WINE_VULKAN_SPEC = "winevulkan.spec" WINE_VULKAN_THUNKS_C = "vulkan_thunks.c" WINE_VULKAN_THUNKS_H = "vulkan_thunks.h" @@ -3000,6 +3001,15 @@ def download_vk_xml(filename): if not os.path.isfile(filename): urllib.request.urlretrieve(url, filename) +def generate_vulkan_json(f): + f.write("{\n") + f.write(" \"file_format_version\": \"1.0.0\",\n") + f.write(" \"ICD\": {\n") + f.write(" \"library_path\": \"winevulkan.dll\",\n") + f.write(" \"api_version\": \"{0}\"\n".format(VK_XML_VERSION)) + f.write(" }\n") + f.write("}\n") + def main(): parser = argparse.ArgumentParser() parser.add_argument("-v", "--verbose", action="count", default=0, help="increase output verbosity") @@ -3031,6 +3041,9 @@ def main(): with open(WINE_VULKAN_THUNKS_C, "w") as f: generator.generate_thunks_c(f, "wine_") + with open(WINE_VULKAN_JSON, "w") as f: + generate_vulkan_json(f) + with open(WINE_VULKAN_SPEC, "w") as f: generator.generate_vulkan_spec(f) diff --git a/loader/Makefile.in b/loader/Makefile.in index f9b2fa9293..f3638fa4e0 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -10,7 +10,8 @@ SOURCES = \ wine.pl.UTF-8.man.in \ wine_info.plist.in \ winebus.inf.in \ - winehid.inf.in + winehid.inf.in \ + winevulkan.json.in PROGRAMS = $(WINELOADER_PROGRAMS) INSTALL_LIB = $(WINELOADER_PROGRAMS) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 8267ef34dc..3ae4273671 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles +CopyFiles=InfFiles,NlsFiles,VulkanFiles AddReg=\ Classes,\ ContentIndex,\ @@ -48,13 +48,14 @@ AddReg=\ SessionMgr,\ Tapi,\ Timezones,\ - LicenseInformation + LicenseInformation,\ + Vulkan [DefaultInstall.NT] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles +CopyFiles=InfFiles,NlsFiles,VulkanFiles AddReg=\ Classes,\ ContentIndex,\ @@ -73,14 +74,15 @@ AddReg=\ Tapi,\ Timezones,\ VersionInfo,\ - LicenseInformation + LicenseInformation,\ + Vulkan [DefaultInstall.ntamd64] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles +CopyFiles=InfFiles,NlsFiles,VulkanFiles AddReg=\ Classes,\ ContentIndex,\ @@ -100,14 +102,15 @@ AddReg=\ Tapi,\ Timezones,\ VersionInfo.ntamd64,\ - LicenseInformation + LicenseInformation,\ + Vulkan [DefaultInstall.ntarm64] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles +CopyFiles=InfFiles,NlsFiles,VulkanFiles AddReg=\ Classes,\ ContentIndex,\ @@ -127,12 +130,13 @@ AddReg=\ Tapi,\ Timezones,\ VersionInfo.ntamd64,\ - LicenseInformation + LicenseInformation,\ + Vulkan [Wow64Install] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDllsWow64 -CopyFiles=NlsFiles +CopyFiles=NlsFiles,VulkanFiles AddReg=\ CurrentVersion,\ CurrentVersionWow64,\ @@ -142,7 +146,8 @@ AddReg=\ Misc,\ Tapi,\ VersionInfo.ntamd64,\ - LicenseInformation + LicenseInformation,\ + Vulkan [Wow64Install.ntarm64] WineFakeDlls=FakeDllsWin32 @@ -3888,6 +3893,9 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 +[Vulkan] +HKLM,Software\Khronos\Vulkan\Drivers,"%11%\winevulkan.json",0x10001,0 + [InfFiles] winebus.inf winehid.inf @@ -3965,9 +3973,13 @@ normnfd.nls normnfkc.nls normnfkd.nls +[VulkanFiles] +winevulkan.json + [WineSourceDirs] NlsFiles=nls [DestinationDirs] InfFiles = 17 NlsFiles = 11 +VulkanFiles = 11 diff --git a/loader/winevulkan.json.in b/loader/winevulkan.json.in new file mode 100644 index 0000000000..be1b278ddb --- /dev/null +++ b/loader/winevulkan.json.in @@ -0,0 +1,7 @@ +{ + "file_format_version": "1.0.0", + "ICD": { + "library_path": "winevulkan.dll", + "api_version": "1.1.130" + } +} -- 2.24.1

4 5

[PATCH 2/3] shell32/tests: Remove now useless forced 0x0501 API versions.
by Serge Gautherie 14 Mar '20

14 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/shell32/tests/shlexec.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 030ab54..1455b46 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -30,11 +30,6 @@ * we could check */ -/* Needed to get SEE_MASK_NOZONECHECKS with the PSDK */ -#define NTDDI_WINXPSP1 0x05010100 -#define NTDDI_VERSION NTDDI_WINXPSP1 -#define _WIN32_WINNT 0x0501 - #include <stdio.h> #include <assert.h> -- 2.10.0.windows.1

2 3

[PATCH] wineqtdecoder: Fix compilation.
by Zebediah Figura 14 Mar '20

14 Mar '20

Partially written by Alistair Leslie-Hughes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wineqtdecoder/qtvdecoder.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index eaaf30acdb..41b29786cc 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -128,8 +128,6 @@ #include "qtprivate.h" #include "wineqtdecoder_classes.h" -extern CLSID CLSID_QTVDecoder; - WINE_DEFAULT_DEBUG_CHANNEL(qtdecoder); typedef struct QTVDecoderImpl @@ -137,6 +135,8 @@ typedef struct QTVDecoderImpl struct strmbase_filter filter; CRITICAL_SECTION stream_cs; + AM_MEDIA_TYPE mt; + struct strmbase_source source; IUnknown *seeking; @@ -266,7 +266,7 @@ error: This->decodeHR = hr; } -static HRESULT WINAPI video_decoder_Receive(struct strmbase_sink *iface, IMediaSample *pSample) +static HRESULT WINAPI video_decoder_sink_Receive(struct strmbase_sink *iface, IMediaSample *pSample) { QTVDecoderImpl *This = impl_from_strmbase_filter(iface->pin.filter); HRESULT hr; @@ -504,7 +504,7 @@ static HRESULT video_decoder_source_get_media_type(struct strmbase_pin *iface, return S_OK; } -static HRESULT WINAPI video_decoder_DecideBufferSize(struct strmbase_source *iface, +static HRESULT WINAPI video_decoder_source_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { QTVDecoderImpl *This = impl_from_strmbase_filter(iface->pin.filter); @@ -590,7 +590,7 @@ static HRESULT video_decoder_init_stream(struct strmbase_filter *iface) static HRESULT video_decoder_cleanup_stream(struct strmbase_filter *iface) { - QTVDecoderImpl* This = impl_from_TransformFilter(pTransformFilter); + QTVDecoderImpl* This = impl_from_strmbase_filter(iface); if (This->decompressionSession) ICMDecompressionSessionRelease(This->decompressionSession); @@ -611,6 +611,7 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) { QTVDecoderImpl *object; HRESULT hr; + ISeekingPassThru *passthrough; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -640,6 +641,6 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) ISeekingPassThru_Release(passthrough); TRACE("Created video decoder %p.\n", object); - *out = &object->tf.filter.IUnknown_inner; + *out = &object->filter.IUnknown_inner; return S_OK; } -- 2.25.1

1 0

[PATCH] wineconsole: Don't activate window when computing positions.
by Roman Pišl 14 Mar '20

14 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48740 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- programs/wineconsole/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 212c65cee4..de3f4ae98c 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -253,7 +253,7 @@ static void WCUSER_ComputePositions(struct inner_data* data) } SetWindowPos(data->hWnd, 0, 0, 0, r.right - r.left + dx, r.bottom - r.top + dy, - SWP_NOMOVE|SWP_NOZORDER); + SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE); WCUSER_ShapeCursor(data, data->curcfg.cursor_size, data->curcfg.cursor_visible, TRUE); WCUSER_PosCursor(data); } -- 2.20.1

1 0

[PATCH 3/3] include: Remove comment about now old NTDDI_VERSION.
by Serge Gautherie 14 Mar '20

14 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- include/mssip.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/mssip.h b/include/mssip.h index c14f02d..ee225f1 100644 --- a/include/mssip.h +++ b/include/mssip.h @@ -157,7 +157,6 @@ typedef struct SIP_ADD_NEWPROVIDER_ WCHAR *pwszIsFunctionNameFmt2; - /* NTDDI_VERSION >= NTDDI_WIN8 */ WCHAR *pwszGetCapFuncName; } SIP_ADD_NEWPROVIDER, *PSIP_ADD_NEWPROVIDER; #include <poppack.h> -- 2.10.0.windows.1

1 0

[PATCH 1/3] rpcrt4/tests: Remove now useless forced 0x0500 API versions.
by Serge Gautherie 14 Mar '20

14 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/rpcrt4/tests/ndr_marshall.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index e4a4c6a..b206c37 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0500 -#define NTDDI_WIN2K 0x05000000 -#define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */ #define COBJMACROS #include <stdarg.h> -- 2.10.0.windows.1

1 0

Wine staging 5.4 release
by Alistair Leslie-Hughes 14 Mar '20

14 Mar '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.4 (855 patches are applied to wine vanilla) We would recommand to use the FAudio 20.02 or greater to ensure the best results. * Drakensang Demo requires 20.02 to run. * BlazBlue: Calamity Trigger missing interface is fixed but will require the next version of FAudio 20.04 to avoid a crash. * Bully Scholarship is reported to need the Large Address Aware patch to work. (not a staging patch) Upstreamed (Either directly from staging or fixed with a similar patch). * server: Fix crash when a device driver segfaults during an open file request. * d3dx9_36: Implement ID3DXFontImpl_DrawText. * d3dx9_36: Fix horizontal centering in ID3DXFont_DrawText. * d3dx9_36: Support NULL terminated strings in ID3DXFont_DrawText. * d3dx9_36: ID3DXFont_DrawText calc_rect can be null. * ntdll: Export RtlGetNativeSystemInformation() function. Added: * [48596] tasklist: Add basic functionality. * [38615] xactengine: DSA: Drakensang Demo fails on IXACTEngine::Initialize * [31476] xactengine: Support Bully Scholarship Edition requires xactengine 3.1 interface. * [48684] xactengine: BlazBlue: Calamity Trigger requires xactengine 3.3 interface. * [41045] xactengine: Captain Morgane requires xactengine 3.4 interface. * [41030] xactengine: Pac-Man Museum requires xactengine 3.7 interface. * [48389] ntdll: Detroit: Become Human has poor performance (use of unaligned futexes for condition variables on Linux) Updated: * ntdll-RtlIpv4StringToAddress * wined3d-SWVP-shaders Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/5] ucrtbase/tests: Use more functions directly.
by Jacek Caban 13 Mar '20

13 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 122 +++++++++++++------------------------ 1 file changed, 44 insertions(+), 78 deletions(-)

3 3

[PATCH v2 1/5] d3dcompiler/tests: Add some tests for d3d9 constant tables.
by Matteo Bruni 13 Mar '20

13 Mar '20

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Initialize ps_code to avoid the usual warning with default CFLAGS. Also fix a test failure with struct fields DefaultValue. dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 113 ++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 7f391833f39..b16f6e34548 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -730,6 +730,118 @@ static void test_array_dimensions(void) release_test_context(&test_context); } +static void check_constant_desc(const char *prefix, const D3DXCONSTANT_DESC *desc, + const D3DXCONSTANT_DESC *expect, BOOL nonzero_defaultvalue) +{ + ok(!strcmp(desc->Name, expect->Name), "%s: got Name %s.\n", prefix, debugstr_a(desc->Name)); + ok(desc->RegisterSet == expect->RegisterSet, "%s: got RegisterSet %#x.\n", prefix, desc->RegisterSet); + ok(desc->RegisterCount == expect->RegisterCount, "%s: got RegisterCount %u.\n", prefix, desc->RegisterCount); + ok(desc->Class == expect->Class, "%s: got Class %#x.\n", prefix, desc->Class); + ok(desc->Type == expect->Type, "%s: got Type %#x.\n", prefix, desc->Type); + ok(desc->Rows == expect->Rows, "%s: got Rows %u.\n", prefix, desc->Rows); + ok(desc->Columns == expect->Columns, "%s: got Columns %u.\n", prefix, desc->Columns); + ok(desc->Elements == expect->Elements, "%s: got Elements %u.\n", prefix, desc->Elements); + ok(desc->StructMembers == expect->StructMembers, "%s: got StructMembers %u.\n", prefix, desc->StructMembers); + ok(desc->Bytes == expect->Bytes, "%s: got Bytes %u.\n", prefix, desc->Bytes); + ok(!!desc->DefaultValue == nonzero_defaultvalue, "%s: got DefaultValue %p.\n", prefix, desc->DefaultValue); +} + +static void test_constant_table(void) +{ + static const char *source = + "uniform float4 a;\n" + "uniform float b;\n" + "uniform float unused;\n" + "uniform float3x1 c;\n" + "uniform row_major float3x1 d;\n" + "uniform uint e;\n" + "uniform struct\n" + "{\n" + " float2x2 a;\n" + " float b;\n" + " float c;\n" + "} f;\n" + "uniform float g[5];\n" + "float4 main(uniform float4 h) : COLOR\n" + "{\n" + " return a + b + c._31 + d._31 + f.c + g[e] + h;\n" + "}"; + + D3DXCONSTANTTABLE_DESC table_desc; + ID3DXConstantTable *constants; + ID3D10Blob *ps_code = NULL; + D3DXHANDLE handle, field; + D3DXCONSTANT_DESC desc; + unsigned int i, j; + HRESULT hr; + UINT count; + + static const D3DXCONSTANT_DESC expect_constants[] = + { + {"$h", D3DXRS_FLOAT4, 0, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16}, + {"a", D3DXRS_FLOAT4, 0, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16}, + {"b", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, + {"c", D3DXRS_FLOAT4, 0, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, + {"d", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, + {"e", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 1, 0, 4}, + {"f", D3DXRS_FLOAT4, 0, 4, D3DXPC_STRUCT, D3DXPT_VOID, 1, 6, 1, 3, 24}, + {"g", D3DXRS_FLOAT4, 0, 5, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 5, 0, 20}, + }; + + static const D3DXCONSTANT_DESC expect_fields[] = + { + {"a", D3DXRS_FLOAT4, 0, 2, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 2, 2, 1, 0, 16}, + {"b", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, + {"c", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, + }; + + todo_wine ps_code = compile_shader(source, "ps_2_0"); + if (!ps_code) + return; + + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + + hr = ID3DXConstantTable_GetDesc(constants, &table_desc); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(table_desc.Version == D3DPS_VERSION(2, 0), "Got Version %#x.\n", table_desc.Version); + ok(table_desc.Constants == 8, "Got %u constants.\n", table_desc.Constants); + + for (i = 0; i < table_desc.Constants; ++i) + { + char prefix[30]; + + handle = ID3DXConstantTable_GetConstant(constants, NULL, i); + ok(!!handle, "Failed to get constant.\n"); + memset(&desc, 0xcc, sizeof(desc)); + count = 1; + hr = ID3DXConstantTable_GetConstantDesc(constants, handle, &desc, &count); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + sprintf(prefix, "Test %u", i); + check_constant_desc(prefix, &desc, &expect_constants[i], FALSE); + + if (!strcmp(desc.Name, "f")) + { + for (j = 0; j < ARRAY_SIZE(expect_fields); ++j) + { + field = ID3DXConstantTable_GetConstant(constants, handle, j); + ok(!!field, "Failed to get constant.\n"); + memset(&desc, 0xcc, sizeof(desc)); + count = 1; + hr = ID3DXConstantTable_GetConstantDesc(constants, field, &desc, &count); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + sprintf(prefix, "Test %u, %u", i, j); + check_constant_desc(prefix, &desc, &expect_fields[j], !!j); + } + } + } + + ID3DXConstantTable_Release(constants); + ID3D10Blob_Release(ps_code); +} + static void test_fail(void) { static const char *tests[] = @@ -874,5 +986,6 @@ START_TEST(hlsl_d3d9) test_comma(); test_return(); test_array_dimensions(); + test_constant_table(); test_fail(); } -- 2.24.1

1 4