September 2020 - Wine-commits

Ziqing Hui : d3dx10/tests: Introduce create_file() and delete_file().
by Alexandre Julliard 09 Sep '20

09 Sep '20

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

Ziqing Hui : d3dx10/tests: Introduce check_image_info().
by Alexandre Julliard 09 Sep '20

09 Sep '20

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/tests: Add tests for D3DX10GetImageInfoFromFileW().
by Alexandre Julliard 09 Sep '20

09 Sep '20

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

Brendan Shanks : winevulkan: Change make_vulkan interpreter to '/usr/bin/env python3'.
by Alexandre Julliard 09 Sep '20

09 Sep '20

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 more setupapi error codes.
by Alexandre Julliard 09 Sep '20

09 Sep '20

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

Zebediah Figura : include: Add a couple more SIP indirect data flags.
by Alexandre Julliard 09 Sep '20

09 Sep '20

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

Zebediah Figura : mssign32: Use public SPC_* flag definitions.
by Alexandre Julliard 09 Sep '20

09 Sep '20

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

Arkadiusz Hiler : msvcirt: Implement a part of fstream.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: a8266a9ba20e4495c396f32cdb122b85fb77b465 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8266a9ba20e4495c396f32c… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Sep 8 12:06:04 2020 +0300 msvcirt: Implement a part of fstream. This patch make it possible to play Tron 2.0. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 36 +++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 22 ++++++------- dlls/msvcirt/tests/msvcirt.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 22 ++++++------- dlls/msvcrt40/msvcrt40.spec | 22 ++++++------- 5 files changed, 143 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a8266a9ba20e4495c396…

1 0

Jeff Smith : qcap/tests: Test effect of setting stream format on media type enumeration.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 7f86a153f18c4bbac74f6a1353db4dd819cf0b20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f86a153f18c4bbac74f6a13… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Sep 8 11:15:08 2020 -0500 qcap/tests: Test effect of setting stream format on media type enumeration. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/videocapture.c | 61 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 326601a398..8bda036e1d 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -23,6 +23,12 @@ #include "wine/test.h" #include "wine/strmbase.h" +static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) +{ + return !memcmp(a, b, offsetof(AM_MEDIA_TYPE, pbFormat)) + && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -78,11 +84,11 @@ static void test_media_types(IPin *pin) static void test_stream_config(IPin *pin) { VIDEOINFOHEADER *video_info, *video_info2; + LONG depth, compression, count, size, i; + IEnumMediaTypes *enum_media_types; AM_MEDIA_TYPE *format, *format2; - VIDEO_STREAM_CONFIG_CAPS vscc; IAMStreamConfig *stream_config; - LONG depth, compression; - LONG count, size; + VIDEO_STREAM_CONFIG_CAPS vscc; HRESULT hr; hr = IPin_QueryInterface(pin, &IID_IAMStreamConfig, (void **)&stream_config); @@ -96,6 +102,16 @@ static void test_stream_config(IPin *pin) hr = IAMStreamConfig_SetFormat(stream_config, format); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* After setting the format, a single media type is enumerated. + * This persists until the filter is released. */ + IPin_EnumMediaTypes(pin, &enum_media_types); + hr = IEnumMediaTypes_Next(enum_media_types, 1, &format2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + DeleteMediaType(format2); + hr = IEnumMediaTypes_Next(enum_media_types, 1, &format2, NULL); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + IEnumMediaTypes_Release(enum_media_types); + format->majortype = MEDIATYPE_Audio; hr = IAMStreamConfig_SetFormat(stream_config, format); ok(hr == E_FAIL, "Got hr %#x.\n", hr); @@ -162,14 +178,37 @@ static void test_stream_config(IPin *pin) hr = IAMStreamConfig_GetStreamCaps(stream_config, 100000, &format, (BYTE *)&vscc); ok(hr == S_FALSE, "Got hr %#x.\n", hr); - hr = IAMStreamConfig_GetStreamCaps(stream_config, 0, &format, (BYTE *)&vscc); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(IsEqualGUID(&format->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", - debugstr_guid(&MEDIATYPE_Video)); - ok(IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo) - || IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo2), "Got wrong guid: %s.\n", - debugstr_guid(&vscc.guid)); - FreeMediaType(format); + for (i = 0; i < count; ++i) + { + hr = IAMStreamConfig_GetStreamCaps(stream_config, i, &format, (BYTE *)&vscc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&format->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", + debugstr_guid(&MEDIATYPE_Video)); + ok(IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo) + || IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo2), "Got wrong guid: %s.\n", + debugstr_guid(&vscc.guid)); + + hr = IAMStreamConfig_SetFormat(stream_config, format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetFormat(stream_config, &format2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(format, format2), "Media types didn't match.\n"); + DeleteMediaType(format2); + + hr = IPin_EnumMediaTypes(pin, &enum_media_types); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumMediaTypes_Next(enum_media_types, 1, &format2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine_if (!compare_media_types(format, format2)) + ok(compare_media_types(format, format2), "Media types didn't match.\n"); + + DeleteMediaType(format2); + IEnumMediaTypes_Release(enum_media_types); + + DeleteMediaType(format); + } IAMStreamConfig_Release(stream_config); }

1 0

Jeff Smith : qcap: Calculate image size and pitch when setting format.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 3757956e8fcec56fe536068770c45dd2894646c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3757956e8fcec56fe5360687… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Sep 8 11:15:09 2020 -0500 qcap: Calculate image size and pitch when setting format. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index d8c5e168e1..94fe6b7dd0 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -96,6 +96,8 @@ struct v4l_device struct caps *caps; LONG caps_count; + int image_size, image_pitch; + struct strmbase_source *pin; int fd, mmap; @@ -194,6 +196,8 @@ static BOOL set_caps(struct v4l_device *device, const struct caps *caps) } device->current_caps = caps; + device->image_size = width * height * caps->video_info.bmiHeader.biBitCount / 8; + device->image_pitch = width * caps->video_info.bmiHeader.biBitCount / 8; return TRUE; } @@ -304,15 +308,11 @@ static HRESULT v4l_device_set_prop(struct video_capture_device *iface, static void reverse_image(struct v4l_device *device, LPBYTE output, const BYTE *input) { int inoffset, outoffset, pitch; - UINT width, height, depth; - width = device->current_caps->video_info.bmiHeader.biWidth; - height = device->current_caps->video_info.bmiHeader.biHeight; - depth = device->current_caps->video_info.bmiHeader.biBitCount / 8; /* the whole image needs to be reversed, because the dibs are messed up in windows */ - outoffset = width * height * depth; - pitch = width * depth; + outoffset = device->image_size; + pitch = device->image_pitch; inoffset = 0; while (outoffset > 0) { @@ -330,14 +330,8 @@ static DWORD WINAPI ReadThread(void *arg) HRESULT hr; IMediaSample *pSample = NULL; unsigned char *pTarget, *image_data; - unsigned int image_size; - UINT width, height, depth; - - width = device->current_caps->video_info.bmiHeader.biWidth; - height = device->current_caps->video_info.bmiHeader.biHeight; - depth = device->current_caps->video_info.bmiHeader.biBitCount / 8; - image_size = width * height * depth; - if (!(image_data = heap_alloc(image_size))) + + if (!(image_data = heap_alloc(device->image_size))) { ERR("Failed to allocate memory.\n"); return 0; @@ -363,15 +357,14 @@ static DWORD WINAPI ReadThread(void *arg) { int len; - len = width * height * depth; - IMediaSample_SetActualDataLength(pSample, len); + IMediaSample_SetActualDataLength(pSample, device->image_size); len = IMediaSample_GetActualDataLength(pSample); TRACE("Data length: %d KB\n", len / 1024); IMediaSample_GetPointer(pSample, &pTarget); - while (video_read(device->fd, image_data, image_size) == -1) + while (video_read(device->fd, image_data, device->image_size) == -1) { if (errno != EAGAIN) { @@ -403,8 +396,7 @@ static void v4l_device_init_stream(struct video_capture_device *iface) HRESULT hr; req_props.cBuffers = 3; - req_props.cbBuffer = device->current_caps->video_info.bmiHeader.biWidth * device->current_caps->video_info.bmiHeader.biHeight; - req_props.cbBuffer = (req_props.cbBuffer * device->current_caps->video_info.bmiHeader.biBitCount) / 8; + req_props.cbBuffer = device->image_size; req_props.cbAlign = 1; req_props.cbPrefix = 0;

1 0