September 2020 - Wine-Commits

Paul Gofman : d3dcompiler/tests: Test d3d12 interface in test_reflection_constant_buffer().
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: e92adb98be0a26e9f470f056145cc3c8330014dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e92adb98be0a26e9f470f056… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 8 22:41:45 2020 +0200 d3dcompiler/tests: Test d3d12 interface in test_reflection_constant_buffer(). 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 | 287 ++++++++++++++++++++++++--------- 1 file changed, 211 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e92adb98be0a26e9f470…

1 0

Ziqing Hui : d3dx10/tests: Introduce create_file() and delete_file().
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: ccf3964ba265a5c993f9ae202d702c04537485a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccf3964ba265a5c993f9ae20… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Sep 8 22:41:49 2020 +0200 d3dx10/tests: Introduce create_file() and delete_file(). 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 | 72 +++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 26 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index e39025a930..31e701409f 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -540,6 +540,8 @@ test_image[] = }, }; +static WCHAR temp_dir[MAX_PATH]; + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -556,6 +558,43 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } +static BOOL create_file(const WCHAR *filename, const void *data, unsigned int size, WCHAR *out_path) +{ + WCHAR path[MAX_PATH]; + DWORD written; + HANDLE file; + + if (!temp_dir[0]) + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + lstrcpyW(path, temp_dir); + lstrcatW(path, filename); + + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + if (WriteFile(file, data, size, &written, NULL)) + { + CloseHandle(file); + + if (out_path) + lstrcpyW(out_path, path); + return TRUE; + } + + CloseHandle(file); + return FALSE; +} + +static BOOL delete_file(const WCHAR *filename) +{ + WCHAR path[MAX_PATH]; + + lstrcpyW(path, temp_dir); + lstrcatW(path, filename); + return DeleteFileW(path); +} + static ID3D10Device *create_device(void) { ID3D10Device *device; @@ -1168,28 +1207,9 @@ static void test_D3DX10CreateAsyncMemoryLoader(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } -static void create_testfile(WCHAR *path, const void *data, int data_len) -{ - static const WCHAR test_filename[] = {'a','s','y','n','c','l','o','a','d','e','r','.','d','a','t','a',0}; - DWORD written; - HANDLE file; - BOOL ret; - - GetTempPathW(MAX_PATH, path); - lstrcatW(path, test_filename); - - file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "Test file creation failed, at %s, error %d.\n", wine_dbgstr_w(path), - GetLastError()); - - ret = WriteFile(file, data, data_len, &written, NULL); - ok(ret, "Write to test file failed.\n"); - - CloseHandle(file); -} - static void test_D3DX10CreateAsyncFileLoader(void) { + static const WCHAR test_filename[] = L"asyncloader.data"; static const char test_data1[] = "test data"; static const char test_data2[] = "more test data"; ID3DX10DataLoader *loader; @@ -1221,12 +1241,12 @@ static void test_D3DX10CreateAsyncFileLoader(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Test file sharing using dummy empty file. */ - create_testfile(path, test_data1, sizeof(test_data1)); + create_file(test_filename, test_data1, sizeof(test_data1), path); hr = D3DX10CreateAsyncFileLoaderW(path, &loader); ok(SUCCEEDED(hr), "Failed to create file loader, hr %#x.\n", hr); - ret = DeleteFileW(path); + ret = delete_file(test_filename); ok(ret, "DeleteFile() failed, ret %d, error %d.\n", ret, GetLastError()); /* File was removed before Load(). */ @@ -1234,7 +1254,7 @@ static void test_D3DX10CreateAsyncFileLoader(void) ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Load() returned unexpected result, hr %#x.\n", hr); /* Create it again. */ - create_testfile(path, test_data1, sizeof(test_data1)); + create_file(test_filename, test_data1, sizeof(test_data1), NULL); hr = ID3DX10DataLoader_Load(loader); ok(SUCCEEDED(hr), "Load() failed, hr %#x.\n", hr); @@ -1242,7 +1262,7 @@ static void test_D3DX10CreateAsyncFileLoader(void) hr = ID3DX10DataLoader_Load(loader); ok(SUCCEEDED(hr), "Load() failed, hr %#x.\n", hr); - ret = DeleteFileW(path); + ret = delete_file(test_filename); ok(ret, "DeleteFile() failed, ret %d, error %d.\n", ret, GetLastError()); /* Already loaded, file removed. */ @@ -1259,7 +1279,7 @@ static void test_D3DX10CreateAsyncFileLoader(void) ok(!memcmp(ptr, test_data1, size), "Got unexpected file data.\n"); /* Create it again, with different data. */ - create_testfile(path, test_data2, sizeof(test_data2)); + create_file(test_filename, test_data2, sizeof(test_data2), NULL); hr = ID3DX10DataLoader_Load(loader); ok(SUCCEEDED(hr), "Load() failed, hr %#x.\n", hr); @@ -1275,7 +1295,7 @@ static void test_D3DX10CreateAsyncFileLoader(void) hr = ID3DX10DataLoader_Destroy(loader); ok(SUCCEEDED(hr), "Destroy() failed, hr %#x.\n", hr); - ret = DeleteFileW(path); + ret = delete_file(test_filename); ok(ret, "DeleteFile() failed, ret %d, error %d.\n", ret, GetLastError()); }

1 0

Paul Gofman : d3dcompiler/tests: Test d3d12 interface in test_reflection_desc_vs().
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: e446aee65292e4ba6081fd0efca25712dab5b4aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e446aee65292e4ba6081fd0e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 2 22:28:46 2020 +0300 d3dcompiler/tests: Test d3d12 interface in test_reflection_desc_vs(). 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 | 140 ++++++++++++++++++++++----------- 1 file changed, 94 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e446aee65292e4ba6081…

1 0

Zebediah Figura : include: Add more setupapi error codes.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: adcac3678a854a0f574de5c860591105249dc8df URL: https://source.winehq.org/git/wine.git/?a=commit;h=adcac3678a854a0f574de5c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 8 19:30:13 2020 -0500 include: Add more setupapi error codes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/setupapi.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/setupapi.h b/include/setupapi.h index ac789ae215..e52dc253af 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1218,7 +1218,26 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_INF_SIGNER_INFO) #define ERROR_SET_SYSTEM_RESTORE_POINT (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x236) #define ERROR_INCORRECTLY_COPIED_INF (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x237) #define ERROR_SCE_DISABLED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x238) +#define ERROR_UNKNOWN_EXCEPTION (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x239) +#define ERROR_PNP_REGISTRY_ERROR (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x23A) +#define ERROR_REMOTE_REQUEST_UNSUPPORTED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x23B) +#define ERROR_NOT_AN_INSTALLED_OEM_INF (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x23C) +#define ERROR_INF_IN_USE_BY_DEVICES (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x23D) +#define ERROR_DI_FUNCTION_OBSOLETE (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x23E) +#define ERROR_NO_AUTHENTICODE_CATALOG (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x23F) +#define ERROR_AUTHENTICODE_DISALLOWED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x240) +#define ERROR_AUTHENTICODE_TRUSTED_PUBLISHER (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x241) +#define ERROR_AUTHENTICODE_TRUST_NOT_ESTABLISHED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x242) +#define ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x243) +#define ERROR_SIGNATURE_OSATTRIBUTE_MISMATCH (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x244) +#define ERROR_ONLY_VALIDATE_VIA_AUTHENTICODE (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x245) +#define ERROR_DEVICE_INSTALLER_NOT_READY (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x246) +#define ERROR_DRIVER_STORE_ADD_FAILED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x247) +#define ERROR_DEVICE_INSTALL_BLOCKED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x248) +#define ERROR_DRIVER_INSTALL_BLOCKED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x249) #define ERROR_WRONG_INF_TYPE (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x24A) +#define ERROR_FILE_HASH_NOT_IN_CATALOG (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x24B) +#define ERROR_DRIVER_STORE_DELETE_FAILED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x24C) #define ERROR_NO_DEFAULT_INTERFACE_DEVICE ERROR_NO_DEFAULT_DEVICE_INTERFACE #define ERROR_INTERFACE_DEVICE_ACTIVE ERROR_DEVICE_INTERFACE_ACTIVE #define ERROR_INTERFACE_DEVICE_REMOVED ERROR_DEVICE_INTERFACE_REMOVED

1 0

Ziqing Hui : d3dx10/tests: Introduce check_image_info().
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: 99aeb964f6f61242ee3eeef12caeb2d85373e90e URL: https://source.winehq.org/git/wine.git/?a=commit;h=99aeb964f6f61242ee3eeef1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Sep 8 22:41:50 2020 +0200 d3dx10/tests: Introduce check_image_info(). 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 | 60 +++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 31e701409f..f1d3328487 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -618,6 +618,37 @@ static ID3D10Device *create_device(void) return NULL; } +static void check_image_info(D3DX10_IMAGE_INFO *image_info, unsigned int i, unsigned int line) +{ + ok_(__FILE__, line)(image_info->Width == test_image[i].expected.Width, + "Test %u: Got unexpected Width %u, expected %u.\n", + i, image_info->Width, test_image[i].expected.Width); + ok_(__FILE__, line)(image_info->Height == test_image[i].expected.Height, + "Test %u: Got unexpected Height %u, expected %u.\n", + i, image_info->Height, test_image[i].expected.Height); + ok_(__FILE__, line)(image_info->Depth == test_image[i].expected.Depth, + "Test %u: Got unexpected Depth %u, expected %u.\n", + i, image_info->Depth, test_image[i].expected.Depth); + ok_(__FILE__, line)(image_info->ArraySize == test_image[i].expected.ArraySize, + "Test %u: Got unexpected ArraySize %u, expected %u.\n", + i, image_info->ArraySize, test_image[i].expected.ArraySize); + ok_(__FILE__, line)(image_info->MipLevels == test_image[i].expected.MipLevels, + "Test %u: Got unexpected MipLevels %u, expected %u.\n", + i, image_info->MipLevels, test_image[i].expected.MipLevels); + ok_(__FILE__, line)(image_info->MiscFlags == test_image[i].expected.MiscFlags, + "Test %u: Got unexpected MiscFlags %#x, expected %#x.\n", + i, image_info->MiscFlags, test_image[i].expected.MiscFlags); + ok_(__FILE__, line)(image_info->Format == test_image[i].expected.Format, + "Test %u: Got unexpected Format %#x, expected %#x.\n", + i, image_info->Format, test_image[i].expected.Format); + ok_(__FILE__, line)(image_info->ResourceDimension == test_image[i].expected.ResourceDimension, + "Test %u: Got unexpected ResourceDimension %u, expected %u.\n", + i, image_info->ResourceDimension, test_image[i].expected.ResourceDimension); + ok_(__FILE__, line)(image_info->ImageFileFormat == test_image[i].expected.ImageFileFormat, + "Test %u: Got unexpected ImageFileFormat %u, expected %u.\n", + i, image_info->ImageFileFormat, test_image[i].expected.ImageFileFormat); +} + static void test_D3DX10UnsetAllDeviceObjects(void) { static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = @@ -1347,34 +1378,7 @@ static void test_get_image_info(void) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (hr != S_OK) continue; - - ok(image_info.Width == test_image[i].expected.Width, - "Test %u: Got unexpected Width %u, expected %u.\n", - i, image_info.Width, test_image[i].expected.Width); - ok(image_info.Height == test_image[i].expected.Height, - "Test %u: Got unexpected Height %u, expected %u.\n", - i, image_info.Height, test_image[i].expected.Height); - ok(image_info.Depth == test_image[i].expected.Depth, - "Test %u: Got unexpected Depth %u, expected %u.\n", - i, image_info.Depth, test_image[i].expected.Depth); - ok(image_info.ArraySize == test_image[i].expected.ArraySize, - "Test %u: Got unexpected ArraySize %u, expected %u.\n", - i, image_info.ArraySize, test_image[i].expected.ArraySize); - ok(image_info.MipLevels == test_image[i].expected.MipLevels, - "Test %u: Got unexpected MipLevels %u, expected %u.\n", - i, image_info.MipLevels, test_image[i].expected.MipLevels); - ok(image_info.MiscFlags == test_image[i].expected.MiscFlags, - "Test %u: Got unexpected MiscFlags %#x, expected %#x.\n", - i, image_info.MiscFlags, test_image[i].expected.MiscFlags); - ok(image_info.Format == test_image[i].expected.Format, - "Test %u: Got unexpected Format %#x, expected %#x.\n", - i, image_info.Format, test_image[i].expected.Format); - ok(image_info.ResourceDimension == test_image[i].expected.ResourceDimension, - "Test %u: Got unexpected ResourceDimension %u, expected %u.\n", - i, image_info.ResourceDimension, test_image[i].expected.ResourceDimension); - ok(image_info.ImageFileFormat == test_image[i].expected.ImageFileFormat, - "Test %u: Got unexpected ImageFileFormat %u, expected %u.\n", - i, image_info.ImageFileFormat, test_image[i].expected.ImageFileFormat); + check_image_info(&image_info, i, __LINE__); } CoUninitialize();

1 0

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

Sept. 9, 2020

Module: wine Branch: master Commit: 4d0f38b86cc806691cafe447bde288040f8f27b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d0f38b86cc806691cafe447… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Sep 4 09:31:04 2020 +0800 d3dx10: Add D3DX10GetImageInfoFromFile{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 | 16 ++++++++++++++++ include/d3dx10tex.h | 8 ++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 36c7633d8e..0ce059dc5e 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -49,8 +49,8 @@ @ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr) @ stdcall D3DX10FilterTexture(ptr long long) @ stdcall D3DX10GetFeatureLevel1(ptr ptr) -@ stub D3DX10GetImageInfoFromFileA(str ptr ptr ptr) -@ stub D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr) +@ 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) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 005b234437..aa5c961d0e 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -297,6 +297,22 @@ HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **devi return ID3D10Device_QueryInterface(device, &IID_ID3D10Device1, (void **)device1); } +HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, + HRESULT *result) +{ + FIXME("src_file %s, pump %p, info %p, result %p\n", debugstr_a(src_file), pump, info, result); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, + HRESULT *result) +{ + FIXME("src_file %s, pump %p, info %p, result %p\n", debugstr_w(src_file), 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 98cb82c0c9..6efd6b0734 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -140,8 +140,16 @@ extern "C" { HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size, D3DX10_IMAGE_LOAD_INFO *loadinfo, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); HRESULT WINAPI D3DX10FilterTexture(ID3D10Resource *texture, UINT src_level, UINT filter); + +HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, + HRESULT *result); +HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, + HRESULT *result); +#define D3DX10GetImageInfoFromFile WINELIB_NAME_AW(D3DX10GetImageInfoFromFile) + HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *img_info, HRESULT *hresult); + HRESULT WINAPI D3DX10LoadTextureFromTexture(ID3D10Resource *src_texture, D3DX10_TEXTURE_LOAD_INFO *load_info, ID3D10Resource *dst_texture);

1 0

Paul Gofman : d3dcompiler: Fill texture fields in D3D11_SHADER_VARIABLE_DESC with default values.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: 56aeb4591b053b5d4ff26ecd698138f1c8f80d04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56aeb4591b053b5d4ff26ecd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 2 23:39:05 2020 +0300 d3dcompiler: Fill texture fields in D3D11_SHADER_VARIABLE_DESC with default values. 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 | 6 ++++++ dlls/d3dcompiler_43/tests/reflection.c | 13 +++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 3c4a94f8e5..10558283dd 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -857,6 +857,12 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetDesc( desc->uFlags = This->flags; desc->DefaultValue = This->default_value; + /* TODO test and set proper values for texture. */ + desc->StartTexture = 0xffffffff; + desc->TextureSize = 0; + desc->StartSampler = 0xffffffff; + desc->SamplerSize = 0; + return S_OK; } diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index c37a9709c2..f856aee43d 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1783,13 +1783,10 @@ static void test_reflection_constant_buffer(void) ok(vdesc.uFlags == pvdesc->uFlags, "Got unexpected uFlags %#x, i %u.\n", vdesc.uFlags, i); ok(vdesc.DefaultValue == pvdesc->DefaultValue, "Got unexpected DefaultValue %p, i %u.\n", vdesc.DefaultValue, i); - todo_wine_if(D3D_COMPILER_VERSION) - { - ok(vdesc.StartTexture == 0xffffffff, "Got unexpected StartTexture %#x, i %u.\n", vdesc.StartTexture, i); - ok(!vdesc.TextureSize, "Got unexpected TextureSize %u, i %u.\n", vdesc.TextureSize, i); - ok(vdesc.StartSampler == 0xffffffff, "Got unexpected StartSampler %u, i %u.\n", vdesc.StartSampler, i); - ok(!vdesc.SamplerSize, "Got unexpected SamplerSize %u, i %u.\n", vdesc.SamplerSize, i); - } + ok(vdesc.StartTexture == 0xffffffff, "Got unexpected StartTexture %#x, i %u.\n", vdesc.StartTexture, i); + ok(!vdesc.TextureSize, "Got unexpected TextureSize %u, i %u.\n", vdesc.TextureSize, i); + ok(vdesc.StartSampler == 0xffffffff, "Got unexpected StartSampler %u, i %u.\n", vdesc.StartSampler, i); + ok(!vdesc.SamplerSize, "Got unexpected SamplerSize %u, i %u.\n", vdesc.SamplerSize, i); if (ref12) { @@ -1798,7 +1795,7 @@ static void test_reflection_constant_buffer(void) hr = v12->lpVtbl->GetDesc(v12, &vdesc12); ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); ok(!strcmp(vdesc12.Name, pvdesc->Name), "Got unexpected name \"%s\", i %u", vdesc12.Name, i); - todo_wine ok(!memcmp(&vdesc12.StartOffset, &vdesc.StartOffset, + ok(!memcmp(&vdesc12.StartOffset, &vdesc.StartOffset, sizeof(vdesc) - offsetof(D3D11_SHADER_VARIABLE_DESC, StartOffset)), "D3D11 and D3D12 descs do not match.\n"); }

1 0

Nikolay Sivov : evr/mixer: Return initial mixing preferences.
by Alexandre Julliard Sept. 8, 2020

Sept. 8, 2020

Module: wine Branch: master Commit: 8827eb6a83348057293f89be535ccb74607db608 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8827eb6a83348057293f89be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 11:06:01 2020 +0300 evr/mixer: Return initial mixing preferences. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 24 ++++++++++++++++++++---- dlls/evr/tests/evr.c | 15 ++++++++++++++- include/evr.idl | 10 ++++++++++ 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 7e08beae35..c7dbf8ff97 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -73,6 +73,7 @@ struct video_mixer IDirect3DDeviceManager9 *device_manager; IMediaEventSink *event_sink; IMFAttributes *attributes; + unsigned int mixing_flags; CRITICAL_SECTION cs; }; @@ -1008,16 +1009,31 @@ static HRESULT WINAPI video_mixer_control_GetStreamOutputRect(IMFVideoMixerContr static HRESULT WINAPI video_mixer_control_SetMixingPrefs(IMFVideoMixerControl2 *iface, DWORD flags) { - FIXME("%p, %#x.\n", iface, flags); + struct video_mixer *mixer = impl_from_IMFVideoMixerControl2(iface); - return E_NOTIMPL; + TRACE("%p, %#x.\n", iface, flags); + + EnterCriticalSection(&mixer->cs); + mixer->mixing_flags = flags; + LeaveCriticalSection(&mixer->cs); + + return S_OK; } static HRESULT WINAPI video_mixer_control_GetMixingPrefs(IMFVideoMixerControl2 *iface, DWORD *flags) { - FIXME("%p, %p.\n", iface, flags); + struct video_mixer *mixer = impl_from_IMFVideoMixerControl2(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, flags); + + if (!flags) + return E_POINTER; + + EnterCriticalSection(&mixer->cs); + *flags = mixer->mixing_flags; + LeaveCriticalSection(&mixer->cs); + + return S_OK; } static const IMFVideoMixerControl2Vtbl video_mixer_control_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index ba97eba53d..92810b516a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -414,6 +414,7 @@ static void test_default_mixer(void) { DWORD input_min, input_max, output_min, output_max; IMFAttributes *attributes, *attributes2; + IMFVideoMixerControl2 *mixer_control2; MFT_OUTPUT_STREAM_INFO output_info; MFT_INPUT_STREAM_INFO input_info; DWORD input_count, output_count; @@ -424,12 +425,12 @@ static void test_default_mixer(void) IMFTransform *transform; DXVA2_ValueRange range; DXVA2_Fixed32 value; + DWORD flags, count; IMFGetService *gs; COLORREF color; unsigned int i; DWORD ids[16]; IUnknown *unk; - DWORD count; GUID *guids; HRESULT hr; IID iid; @@ -455,6 +456,18 @@ static void test_default_mixer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + if (SUCCEEDED(IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl2, (void **)&mixer_control2))) + { + hr = IMFVideoMixerControl2_GetMixingPrefs(mixer_control2, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMixerControl2_GetMixingPrefs(mixer_control2, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!flags, "Unexpected flags %#x.\n", flags); + + IMFVideoMixerControl2_Release(mixer_control2); + } + hr = IMFVideoProcessor_GetBackgroundColor(processor, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); diff --git a/include/evr.idl b/include/evr.idl index 6369a39b2f..77c46a075f 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -184,6 +184,16 @@ interface IMFVideoMixerControl : IUnknown ); } +typedef enum _MFVideoMixPrefs +{ + MFVideoMixPrefs_ForceHalfInterlace = 0x00000001, + MFVideoMixPrefs_AllowDropToHalfInterlace = 0x00000002, + MFVideoMixPrefs_AllowDropToBob = 0x00000004, + MFVideoMixPrefs_ForceBob = 0x00000008, + MFVideoMixPrefs_EnableRotation = 0x00000010, + MFVideoMixPrefs_Mask = 0x0000001f, +} MFVideoMixPrefs; + [ object, uuid(8459616d-966e-4930-b658-54fa7e5a16d3)

1 0

Jacek Caban : conhost: Use more standard hide cursor sequence.
by Alexandre Julliard Sept. 8, 2020

Sept. 8, 2020

Module: wine Branch: master Commit: e58ef508a935e69f26c614063346d4ba67667cbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=e58ef508a935e69f26c61406… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 19:35:37 2020 +0200 conhost: Use more standard hide cursor sequence. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- programs/conhost/tests/tty.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 087cbf9d0a..84a1c8ac7d 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -247,7 +247,7 @@ static void hide_tty_cursor( struct console *console ) { if (console->tty_cursor_visible) { - tty_write( console, "\x1b[25l", 5 ); + tty_write( console, "\x1b[?25l", 6 ); console->tty_cursor_visible = FALSE; } } diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 6b645aa873..6bcfa176f3 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -119,7 +119,7 @@ static BOOL skip_byte_(unsigned int line, char ch) static void expect_hide_cursor_(unsigned int line) { if (!console_output_count) fetch_console_output_(line); - ok_(__FILE__,line)(skip_sequence_(line, "\x1b[25l") || broken(skip_sequence_(line, "\x1b[?25l")), + ok_(__FILE__,line)(skip_sequence_(line, "\x1b[?25l") || broken(skip_sequence_(line, "\x1b[25l")), "expected hide cursor escape\n"); }

1 0

Nikolay Sivov : mf/evr: Create stream sinks for default mixer inputs.
by Alexandre Julliard Sept. 8, 2020

Sept. 8, 2020

Module: wine Branch: master Commit: 98fab7e0acd85e51c21d6549e5da34de49eae54e URL: https://source.winehq.org/git/wine.git/?a=commit;h=98fab7e0acd85e51c21d6549… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 11:05:58 2020 +0300 mf/evr: Create stream sinks for default mixer inputs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 15 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 93ad06b949..161c0d9b73 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -409,11 +409,35 @@ static HRESULT WINAPI video_renderer_sink_GetCharacteristics(IMFMediaSink *iface return S_OK; } +static HRESULT video_renderer_add_stream(struct video_renderer *renderer, unsigned int id, + IMFStreamSink **stream_sink) +{ + struct video_stream *stream; + HRESULT hr; + + if (!mf_array_reserve((void **)&renderer->streams, &renderer->stream_size, renderer->stream_count + 1, + sizeof(*renderer->streams))) + { + return E_OUTOFMEMORY; + } + + if (SUCCEEDED(hr = video_renderer_stream_create(renderer, id, &stream))) + { + if (stream_sink) + { + *stream_sink = &stream->IMFStreamSink_iface; + IMFStreamSink_AddRef(*stream_sink); + } + renderer->streams[renderer->stream_count++] = stream; + } + + return hr; +} + static HRESULT WINAPI video_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWORD id, IMFMediaType *media_type, IMFStreamSink **stream_sink) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); - struct video_stream *stream; HRESULT hr; TRACE("%p, %#x, %p, %p.\n", iface, id, media_type, stream_sink); @@ -425,20 +449,7 @@ static HRESULT WINAPI video_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWO hr = MF_E_SHUTDOWN; else if (SUCCEEDED(hr = IMFTransform_AddInputStreams(renderer->mixer, 1, &id))) { - if (mf_array_reserve((void **)&renderer->streams, &renderer->stream_size, renderer->stream_count + 1, - sizeof(*renderer->streams))) - { - if (SUCCEEDED(hr = video_renderer_stream_create(renderer, id, &stream))) - { - *stream_sink = &stream->IMFStreamSink_iface; - IMFStreamSink_AddRef(*stream_sink); - renderer->streams[renderer->stream_count++] = stream; - } - } - else - hr = E_OUTOFMEMORY; - - if (FAILED(hr)) + if (FAILED(hr = video_renderer_add_stream(renderer, id, stream_sink))) IMFTransform_DeleteInputStream(renderer->mixer, id); } @@ -1109,6 +1120,35 @@ static HRESULT video_renderer_create_mixer(struct video_renderer *renderer, IMFA IMFTopologyServiceLookupClient_Release(lookup_client); } + if (SUCCEEDED(hr)) + { + unsigned int input_count, output_count; + unsigned int *ids, *oids; + size_t i; + + /* Create stream sinks for inputs that mixer already has by default. */ + if (SUCCEEDED(IMFTransform_GetStreamCount(*out, &input_count, &output_count))) + { + ids = heap_calloc(input_count, sizeof(*ids)); + oids = heap_calloc(output_count, sizeof(*oids)); + + if (ids && oids) + { + if (SUCCEEDED(IMFTransform_GetStreamIDs(*out, input_count, ids, output_count, oids))) + { + for (i = 0; i < input_count; ++i) + { + video_renderer_add_stream(renderer, ids[i], NULL); + } + } + + } + + heap_free(ids); + heap_free(oids); + } + } + return hr; }

1 0