September 2020 - Wine-Commits

Ziqing Hui : windowscodecs/tests: Add tests for calling WriteSource() without calling SetSize() prior to it.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: 0ceb07b75bedcf073e8995efc22cbe38fac4e137 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ceb07b75bedcf073e8995ef… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Sep 9 14:14:19 2020 +0800 windowscodecs/tests: Add tests for calling WriteSource() without calling SetSize() prior to it. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 48 ++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 7936c5e653..852f677482 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1241,9 +1241,9 @@ todo_wine IWICComponentFactory_Release(factory); } -static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* clsid_encoder, +static void test_multi_encoder_impl(const struct bitmap_data **srcs, const CLSID* clsid_encoder, const struct bitmap_data **dsts, const CLSID *clsid_decoder, WICRect *rc, - const struct setting *settings, const char *name, IWICPalette *palette) + const struct setting *settings, const char *name, IWICPalette *palette, BOOL set_size) { const GUID *container_format = NULL; HRESULT hr; @@ -1385,49 +1385,53 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls (IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)), "SetPixelFormat changed the format to %s (%s)\n", wine_dbgstr_guid(&pixelformat), name); - hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); - ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); + if (set_size) + { + hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); + ok(hr == S_OK, "SetSize failed, hr=%x\n", hr); + } if (IsEqualGUID(clsid_encoder, &CLSID_WICPngEncoder)) test_set_frame_palette(frameencode); if (palette) { - WICColor colors[256]; - hr = IWICBitmapFrameEncode_SetPalette(frameencode, palette); ok(SUCCEEDED(hr), "SetPalette failed, hr=%x (%s)\n", hr, name); - - /* trash the assigned palette */ - memset(colors, 0, sizeof(colors)); - hr = IWICPalette_InitializeCustom(palette, colors, 256); - ok(hr == S_OK, "InitializeCustom error %#x\n", hr); } hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, rc); + todo_wine_if(!set_size) { if (rc && (rc->Width <= 0 || rc->Height <= 0)) { /* WriteSource fails but WriteSource_Proxy succeeds. */ ok(hr == E_INVALIDARG, "WriteSource should fail, hr=%x (%s)\n", hr, name); hr = IWICBitmapFrameEncode_WriteSource_Proxy(frameencode, &src_obj->IWICBitmapSource_iface, rc); - ok(SUCCEEDED(hr), "WriteSource_Proxy failed, %dx%d, hr=%x (%s)\n", rc->Width, rc->Height, hr, name); + if (!set_size && rc->Width < 0) + ok(hr == WINCODEC_ERR_SOURCERECTDOESNOTMATCHDIMENSIONS, + "WriteSource_Proxy(%dx%d) got unexpected hr %x (%s)\n", rc->Width, rc->Height, hr, name); + else + ok(hr == S_OK, "WriteSource_Proxy failed, %dx%d, hr=%x (%s)\n", rc->Width, rc->Height, hr, name); } else { if (rc) ok(SUCCEEDED(hr), "WriteSource(%dx%d) failed, hr=%x (%s)\n", rc->Width, rc->Height, hr, name); else - ok(hr == S_OK || - (FAILED(hr) && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2) /* XP */ || - (FAILED(hr) && IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2) /* XP */ || - broken(hr == E_INVALIDARG && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && IsEqualGUID(srcs[i]->format, &GUID_WICPixelFormatBlackWhite)) /* XP */, - "WriteSource(NULL) failed, hr=%x (%s)\n", hr, name); + todo_wine_if((IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2) || + (IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2)) + ok(hr == S_OK, "WriteSource(NULL) failed, hr=%x (%s)\n", hr, name); + + } } if (SUCCEEDED(hr)) { hr = IWICBitmapFrameEncode_Commit(frameencode); - ok(SUCCEEDED(hr), "Commit failed, hr=%x (%s)\n", hr, name); + if (!set_size && rc && rc->Height < 0) + ok(hr == WINCODEC_ERR_UNEXPECTEDSIZE, "Commit got unexpected hr %x (%s)\n", hr, name); + else + ok(hr == S_OK, "Commit failed, hr=%x (%s)\n", hr, name); } IWICBitmapFrameEncode_Release(frameencode); @@ -1602,6 +1606,14 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls } } +static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* clsid_encoder, + const struct bitmap_data **dsts, const CLSID *clsid_decoder, WICRect *rc, + const struct setting *settings, const char *name, IWICPalette *palette) +{ + test_multi_encoder_impl(srcs, clsid_encoder, dsts, clsid_decoder, rc, settings, name, palette, TRUE); + test_multi_encoder_impl(srcs, clsid_encoder, dsts, clsid_decoder, rc, settings, name, palette, FALSE); +} + static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encoder, const struct bitmap_data *dst, const CLSID *clsid_decoder, const char *name) {

1 0

Nikolay Sivov : evr/mixer: Add another set of attributes.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: 23a879ec0ed12454f26e597247c73739ad1f8bbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=23a879ec0ed12454f26e5972… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 9 12:48:27 2020 +0300 evr/mixer: Add another set of attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 355 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 25 +++- 2 files changed, 377 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=23a879ec0ed12454f26e…

1 0

Zebediah Figura : mssign32: Use public SPC_* flag definitions.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: 44ace8cd30d4268480e8b7643702370bbae0f985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44ace8cd30d4268480e8b764… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 8 19:30:15 2020 -0500 mssign32: Use public SPC_* flag definitions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mssign32/mssign32_private.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/mssign32/mssign32_private.h b/dlls/mssign32/mssign32_private.h index a4e5d360a7..bcbaa65d85 100644 --- a/dlls/mssign32/mssign32_private.h +++ b/dlls/mssign32/mssign32_private.h @@ -19,12 +19,7 @@ #include "windef.h" #include "winbase.h" #include "wincrypt.h" - -#define SPC_EXC_PE_PAGE_HASHES_FLAG 0x10 -#define SPC_INC_PE_IMPORT_ADDR_TABLE_FLAG 0x20 -#define SPC_INC_PE_DEBUG_INFO_FLAG 0x40 -#define SPC_INC_PE_RESOURCES_FLAG 0x80 -#define SPC_INC_PE_PAGE_HASHES_FLAG 0x100 +#include "mssip.h" #define SIGNER_CERT_SPC_FILE 1 #define SIGNER_CERT_STORE 2

1 0

Ziqing Hui : d3dx10/tests: Add tests for D3DX10GetImageInfoFromFileW().
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: b341009993a863b8d74d0a979d85cbb4cf79ec35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b341009993a863b8d74d0a97… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Sep 8 22:41:51 2020 +0200 d3dx10/tests: Add tests for D3DX10GetImageInfoFromFileW(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index f1d3328487..640e83fcd0 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1357,7 +1357,9 @@ static void test_D3DX10CreateAsyncResourceLoader(void) static void test_get_image_info(void) { + static const WCHAR test_filename[] = L"image.data"; D3DX10_IMAGE_INFO image_info; + WCHAR path[MAX_PATH]; unsigned int i; DWORD dword; HRESULT hr; @@ -1381,6 +1383,27 @@ static void test_get_image_info(void) check_image_info(&image_info, i, __LINE__); } + todo_wine { + hr = D3DX10GetImageInfoFromFileW(NULL, NULL, &image_info, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10GetImageInfoFromFileW(L"deadbeaf", NULL, &image_info, NULL); + ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + create_file(test_filename, test_image[i].data, test_image[i].size, path); + hr = D3DX10GetImageInfoFromFileW(path, NULL, &image_info, NULL); + delete_file(test_filename); + + todo_wine + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr != S_OK) + continue; + + check_image_info(&image_info, i, __LINE__); + } + CoUninitialize(); }

1 0

Ziqing Hui : d3dx10: Add D3DX10GetImageInfoFromResource{A, W}() stub implementation.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: 94edc0b3f1c5aba038d4db71c078a0c174c2591e URL: https://source.winehq.org/git/wine.git/?a=commit;h=94edc0b3f1c5aba038d4db71… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Sep 4 09:31:16 2020 +0800 d3dx10: Add D3DX10GetImageInfoFromResource{A, W}() stub implementation. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 4 ++-- dlls/d3dx10_43/d3dx10_43_main.c | 18 ++++++++++++++++++ include/d3dx10tex.h | 6 ++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 0ce059dc5e..a00b3402a5 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -52,8 +52,8 @@ @ stdcall D3DX10GetImageInfoFromFileA(str ptr ptr ptr) @ stdcall D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr) @ stdcall D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr) -@ stub D3DX10GetImageInfoFromResourceA(long str ptr ptr ptr) -@ stub D3DX10GetImageInfoFromResourceW(long wstr ptr ptr ptr) +@ stdcall D3DX10GetImageInfoFromResourceA(long str ptr ptr ptr) +@ stdcall D3DX10GetImageInfoFromResourceW(long wstr ptr ptr ptr) @ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr) @ stub D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index aa5c961d0e..32d69ff8af 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -313,6 +313,24 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP return E_NOTIMPL; } +HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resource, ID3DX10ThreadPump *pump, + D3DX10_IMAGE_INFO *info, HRESULT *result) +{ + FIXME("module %p, resource %s, pump %p, info %p, result %p\n", + module, debugstr_a(resource), pump, info, result); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump, + D3DX10_IMAGE_INFO *info, HRESULT *result) +{ + FIXME("module %p, resource %s, pump %p, info %p, result %p\n", + module, debugstr_w(resource), pump, info, result); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *img_info, HRESULT *hresult) { diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index 6efd6b0734..0f92fd38e6 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -147,6 +147,12 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP HRESULT *result); #define D3DX10GetImageInfoFromFile WINELIB_NAME_AW(D3DX10GetImageInfoFromFile) +HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resource, ID3DX10ThreadPump *pump, + D3DX10_IMAGE_INFO *info, HRESULT *result); +HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump, + D3DX10_IMAGE_INFO *info, HRESULT *result); +#define D3DX10GetImageInfoFromResource WINELIB_NAME_AW(D3DX10GetImageInfoFromResource) + HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *img_info, HRESULT *hresult);

1 0

Paul Gofman : d3dcompiler: Set range id to bind point for sm < 5.1.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: e7a499f8eff0d1aa329c754948f07c5f645ed465 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7a499f8eff0d1aa329c7549… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 2 22:28:47 2020 +0300 d3dcompiler: Set range id to bind point for sm < 5.1. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 3b45161510..3c4a94f8e5 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1544,7 +1544,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c else { desc->Space = 0; - desc->uID = 0; + desc->uID = desc->BindPoint; } } }

1 0

Paul Gofman : d3dcompiler/tests: Add test for reflection interfaces.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: 97c472523799772378b742b4d554f4a003b77a14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97c472523799772378b742b4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 2 22:28:45 2020 +0300 d3dcompiler/tests: Add test for reflection interfaces. Signed-off-by: Paul Gofman <pgofman(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 | 61 ++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index dee88776fa..1fc02d82bb 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -157,6 +157,66 @@ static void test_reflection_references(void) } #endif +#if D3D_COMPILER_VERSION +static void test_reflection_interfaces(void) +{ + ID3D12ShaderReflection *ref12 = NULL; + ID3D11ShaderReflection *ref11; + HRESULT hr, expected_hr; + IUnknown *iface, *iunk; + ULONG count; + + expected_hr = D3D_COMPILER_VERSION < 46 ? E_NOINTERFACE : D3D_COMPILER_VERSION == 46 ? E_INVALIDARG : S_OK; + hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D12ShaderReflection, (void **)&ref12); + /* Broken with older d3dcompiler_47. */ + ok(hr == expected_hr || broken(expected_hr == S_OK && hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + + if (hr != S_OK) + return; + + hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ref12->lpVtbl->QueryInterface(ref12, &IID_ID3D11ShaderReflection, (void **)&iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(iface == (void *)ref12, "Got unexpected interfaces %p, %p.\n", iface, ref12); + hr = iface->lpVtbl->QueryInterface(iface, &IID_IUnknown, (void **)&iunk); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(iface == iunk, "Got unexpected iface %p.\n", iface); + iface->lpVtbl->Release(iunk); + iface->lpVtbl->Release(iface); + + hr = ref12->lpVtbl->QueryInterface(ref12, &IID_IUnknown, (void **)&iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(iface == (IUnknown *)ref12, "Got unexpected iface %p.\n", iface); + iface->lpVtbl->Release(iface); + + hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D12ShaderReflection, (void **)&iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(iface == (void *)ref11, "Got unexpected interfaces %p, %p.\n", iface, ref11); + hr = iface->lpVtbl->QueryInterface(iface, &IID_IUnknown, (void **)&iunk); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(iface == iunk, "Got unexpected iface %p.\n", iface); + iface->lpVtbl->Release(iunk); + iface->lpVtbl->Release(iface); + + hr = ref11->lpVtbl->QueryInterface(ref11, &IID_IUnknown, (void **)&iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(iface == (IUnknown *)ref11, "Got unexpected iface %p.\n", iface); + iface->lpVtbl->Release(iface); + + hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection, (void **)&iface); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + hr = ref12->lpVtbl->QueryInterface(ref12, &IID_ID3D10ShaderReflection, (void **)&iface); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + + count = ref12->lpVtbl->Release(ref12); + ok(!count, "Got unexpected ref count %u.\n", count); + count = ref11->lpVtbl->Release(ref11); + ok(!count, "Got unexpected ref count %u.\n", count); +} +#endif + /* * fxc.exe /E VS /Tvs_4_1 /Fx */ @@ -1802,6 +1862,7 @@ START_TEST(reflection) #if D3D_COMPILER_VERSION test_reflection_references(); + test_reflection_interfaces(); #endif test_reflection_desc_vs(); test_reflection_desc_ps();

1 0

Brendan Shanks : winevulkan: Change make_vulkan interpreter to '/usr/bin/env python3'.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: de68f33daeb5f926ffa3eed3fdc6e8ff4defcf8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=de68f33daeb5f926ffa3eed3… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Sep 8 10:42:29 2020 -0700 winevulkan: Change make_vulkan interpreter to '/usr/bin/env python3'. Fixes running on macOS and BSDs where Python 3 isn't installed in /usr/bin. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b7a4252fd2..5261c35360 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Wine Vulkan generator # # Copyright 2017-2018 Roderick Colenbrander

1 0

Zebediah Figura : include: Add a couple more SIP indirect data flags.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: 34440fe7184a8ec837fec9e75479ccff2c3d7538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34440fe7184a8ec837fec9e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 8 19:30:14 2020 -0500 include: Add a couple more SIP indirect data flags. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mssip.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/mssip.h b/include/mssip.h index ee225f1cbe..d002f96123 100644 --- a/include/mssip.h +++ b/include/mssip.h @@ -32,9 +32,11 @@ typedef CRYPT_HASH_BLOB CRYPT_DIGEST_DATA; #define MSSIP_FLAGS_PROHIBIT_RESIZE_ON_CREATE 0x00010000 #define MSSIP_FLAGS_USE_CATALOG 0x00020000 -#define SPC_INC_PE_RESOURCES_FLAG 0x80 -#define SPC_INC_PE_DEBUG_INFO_FLAG 0x40 -#define SPC_INC_PE_IMPORT_ADDR_TABLE_FLAG 0x20 +#define SPC_EXC_PE_PAGE_HASHES_FLAG 0x010 +#define SPC_INC_PE_IMPORT_ADDR_TABLE_FLAG 0x020 +#define SPC_INC_PE_DEBUG_INFO_FLAG 0x040 +#define SPC_INC_PE_RESOURCES_FLAG 0x080 +#define SPC_INC_PE_PAGE_HASHES_FLAG 0x100 #define MSSIP_ADDINFO_NONE 0 #define MSSIP_ADDINFO_FLAT 1

1 0

Paul Gofman : d3dcompiler: Support ID3D12ShaderReflection interface in D3DReflect().
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: 602e0485275aee4574cb32c7bca15c753cfd304e URL: https://source.winehq.org/git/wine.git/?a=commit;h=602e0485275aee4574cb32c7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 2 22:28:44 2020 +0300 d3dcompiler: Support ID3D12ShaderReflection interface in D3DReflect(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index a081b20d68..3b45161510 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -93,6 +93,13 @@ struct d3dcompiler_shader_reflection_constant_buffer struct d3dcompiler_shader_reflection_variable *variables; }; +enum D3DCOMPILER_REFLECTION_VERSION +{ + D3DCOMPILER_REFLECTION_VERSION_D3D10, + D3DCOMPILER_REFLECTION_VERSION_D3D11, + D3DCOMPILER_REFLECTION_VERSION_D3D12, +}; + /* ID3D11ShaderReflection */ struct d3dcompiler_shader_reflection { @@ -100,6 +107,8 @@ struct d3dcompiler_shader_reflection ID3D10ShaderReflection ID3D10ShaderReflection_iface; LONG refcount; + enum D3DCOMPILER_REFLECTION_VERSION interface_version; + DWORD target; char *creator; UINT flags; @@ -332,7 +341,8 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_ID3D11ShaderReflection) - || IsEqualGUID(riid, &IID_IUnknown)) + || IsEqualGUID(riid, &IID_IUnknown) + || (D3D_COMPILER_VERSION >= 47 && IsEqualGUID(riid, &IID_ID3D12ShaderReflection))) { IUnknown_AddRef(iface); *object = iface; @@ -486,7 +496,9 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin return E_INVALIDARG; } - memcpy(desc, &reflection->bound_resources[index], sizeof(*desc)); + memcpy(desc, &reflection->bound_resources[index], + reflection->interface_version == D3DCOMPILER_REFLECTION_VERSION_D3D12 + ? sizeof(D3D12_SHADER_INPUT_BIND_DESC) : sizeof(D3D11_SHADER_INPUT_BIND_DESC)); return S_OK; } @@ -583,7 +595,7 @@ static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_sha static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDescByName( ID3D11ShaderReflection *iface, const char *name, D3D11_SHADER_INPUT_BIND_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); unsigned int i; TRACE("iface %p, name %s, desc %p\n", iface, debugstr_a(name), desc); @@ -594,14 +606,15 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin return E_INVALIDARG; } - for (i = 0; i < This->bound_resource_count; ++i) + for (i = 0; i < reflection->bound_resource_count; ++i) { - D3D12_SHADER_INPUT_BIND_DESC *d = &This->bound_resources[i]; + D3D12_SHADER_INPUT_BIND_DESC *d = &reflection->bound_resources[i]; if (!strcmp(d->Name, name)) { TRACE("Returning D3D11_SHADER_INPUT_BIND_DESC %p.\n", d); - memcpy(desc, d, sizeof(*desc)); + memcpy(desc, d, reflection->interface_version == D3DCOMPILER_REFLECTION_VERSION_D3D12 + ? sizeof(D3D12_SHADER_INPUT_BIND_DESC) : sizeof(D3D11_SHADER_INPUT_BIND_DESC)); return S_OK; } } @@ -2308,6 +2321,7 @@ HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10Shad } object->ID3D10ShaderReflection_iface.lpVtbl = &d3d10_shader_reflection_vtbl; + object->interface_version = D3DCOMPILER_REFLECTION_VERSION_D3D10; object->refcount = 1; hr = d3dcompiler_shader_reflection_init(object, data, data_size); @@ -2350,7 +2364,8 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void #endif } - if (!IsEqualGUID(riid, &IID_ID3D11ShaderReflection)) + if (!IsEqualGUID(riid, &IID_ID3D11ShaderReflection) + && (D3D_COMPILER_VERSION < 47 || !IsEqualGUID(riid, &IID_ID3D12ShaderReflection))) { WARN("Wrong riid %s, accept only %s!\n", debugstr_guid(riid), debugstr_guid(&IID_ID3D11ShaderReflection)); #if D3D_COMPILER_VERSION >= 46 @@ -2366,6 +2381,8 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void object->ID3D11ShaderReflection_iface.lpVtbl = &d3dcompiler_shader_reflection_vtbl; object->refcount = 1; + object->interface_version = IsEqualGUID(riid, &IID_ID3D12ShaderReflection) + ? D3DCOMPILER_REFLECTION_VERSION_D3D12 : D3DCOMPILER_REFLECTION_VERSION_D3D11; hr = d3dcompiler_shader_reflection_init(object, data, data_size); if (FAILED(hr))

1 0