December 2018 - Wine-commits

Józef Kucia : tests: Move some helpers to d3d12_crosstest.h.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: vkd3d Branch: master Commit: 55587f30b77ae85ed97f3b94faeccdd6a8497260 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=55587f30b77ae85ed97f3b9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:56:00 2018 +0100 tests: Move some helpers to d3d12_crosstest.h. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 256 ------------------------------------------------ tests/d3d12_crosstest.h | 256 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 256 insertions(+), 256 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=55587f30b77ae85ed97…

1 0

Józef Kucia : tests: Move invalid usage tests to separate unit.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: vkd3d Branch: master Commit: 03eba4b0ad9d10ec19c3d53db67f11291859b96a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=03eba4b0ad9d10ec19c3d53… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:56:01 2018 +0100 tests: Move invalid usage tests to separate unit. Ideally, tests should not produce Vulkan validation errors. Move tests which explicitly test invalid usage of D3D12 and are expected to produce validation errors to a separate file. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 3 +- tests/d3d12.c | 133 --------------------------------- tests/d3d12_invalid_usage.c | 178 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 180 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=03eba4b0ad9d10ec19c…

1 0

Józef Kucia : tests: Introduce parse_args() helper function.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: vkd3d Branch: master Commit: 96f9b1b7717a07337b5f2c00a7c9fe2322e90b6d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=96f9b1b7717a07337b5f2c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:56:02 2018 +0100 tests: Introduce parse_args() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 21 +-------------------- tests/d3d12_crosstest.h | 23 +++++++++++++++++++++++ tests/d3d12_invalid_usage.c | 21 +-------------------- 3 files changed, 25 insertions(+), 40 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3123018..aee2ccc 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21809,26 +21809,7 @@ static void test_primitive_restart(void) START_TEST(d3d12) { - bool enable_debug_layer = false; - ID3D12Debug *debug; - unsigned int i; - - for (i = 1; i < argc; ++i) - { - if (!strcmp(argv[i], "--validate")) - enable_debug_layer = true; - else if (!strcmp(argv[i], "--warp")) - use_warp_device = true; - else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) - use_adapter_idx = atoi(argv[++i]); - } - - if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) - { - ID3D12Debug_EnableDebugLayer(debug); - ID3D12Debug_Release(debug); - } - + parse_args(argc, argv); print_adapter_info(); run_test(test_create_device); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index ddba9fe..8f522e8 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -316,4 +316,27 @@ static ID3D12Device *create_device(void) return SUCCEEDED(hr) ? device : NULL; } +static void parse_args(int argc, char **argv) +{ + bool enable_debug_layer = false; + ID3D12Debug *debug; + unsigned int i; + + for (i = 1; i < argc; ++i) + { + if (!strcmp(argv[i], "--validate")) + enable_debug_layer = true; + else if (!strcmp(argv[i], "--warp")) + use_warp_device = true; + else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) + use_adapter_idx = atoi(argv[++i]); + } + + if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) + { + ID3D12Debug_EnableDebugLayer(debug); + ID3D12Debug_Release(debug); + } +} + #endif /* __VKD3D_D3D12_CROSSTEST_H */ diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index ce354b8..4093542 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -152,26 +152,7 @@ static void test_invalid_texture_resource_barriers(void) START_TEST(d3d12_invalid_usage) { - bool enable_debug_layer = false; - ID3D12Debug *debug; - unsigned int i; - - for (i = 1; i < argc; ++i) - { - if (!strcmp(argv[i], "--validate")) - enable_debug_layer = true; - else if (!strcmp(argv[i], "--warp")) - use_warp_device = true; - else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) - use_adapter_idx = atoi(argv[++i]); - } - - if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) - { - ID3D12Debug_EnableDebugLayer(debug); - ID3D12Debug_Release(debug); - } - + parse_args(argc, argv); print_adapter_info(); run_test(test_invalid_texture_resource_barriers);

1 0

Józef Kucia : tests: Introduce enable_d3d12_debug_layer() helper function.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: vkd3d Branch: master Commit: e62e1dadb5fdbb821d198620cded9e8d17136d8b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e62e1dadb5fdbb821d19862… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:56:03 2018 +0100 tests: Introduce enable_d3d12_debug_layer() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 1 + tests/d3d12_crosstest.h | 17 +++++++++++++---- tests/d3d12_invalid_usage.c | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index aee2ccc..1598910 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21810,6 +21810,7 @@ static void test_primitive_restart(void) START_TEST(d3d12) { parse_args(argc, argv); + enable_d3d12_debug_layer(argc, argv); print_adapter_info(); run_test(test_create_device); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 8f522e8..ececd78 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -318,6 +318,19 @@ static ID3D12Device *create_device(void) static void parse_args(int argc, char **argv) { + unsigned int i; + + for (i = 1; i < argc; ++i) + { + if (!strcmp(argv[i], "--warp")) + use_warp_device = true; + else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) + use_adapter_idx = atoi(argv[++i]); + } +} + +static void enable_d3d12_debug_layer(int argc, char **argv) +{ bool enable_debug_layer = false; ID3D12Debug *debug; unsigned int i; @@ -326,10 +339,6 @@ static void parse_args(int argc, char **argv) { if (!strcmp(argv[i], "--validate")) enable_debug_layer = true; - else if (!strcmp(argv[i], "--warp")) - use_warp_device = true; - else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) - use_adapter_idx = atoi(argv[++i]); } if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index 4093542..5f764eb 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -153,6 +153,7 @@ static void test_invalid_texture_resource_barriers(void) START_TEST(d3d12_invalid_usage) { parse_args(argc, argv); + enable_d3d12_debug_layer(argc, argv); print_adapter_info(); run_test(test_invalid_texture_resource_barriers);

1 0

Dmitry Timoshkov : crypt32: Use sizeof(WCHAR) instead of 2.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: f4845059b634ffd3fc96169c06a1e7ebb0ff133c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4845059b634ffd3fc96169c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 3 18:13:47 2018 +0300 crypt32: Use sizeof(WCHAR) instead of 2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 06d456a..e70940a 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1550,7 +1550,7 @@ static BOOL CRYPT_AsnDecodeNameValueInternal(const BYTE *pbEncoded, case ASN_UTF8STRING: valueType = CERT_RDN_UTF8_STRING; bytesNeeded += MultiByteToWideChar(CP_UTF8, 0, - (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * 2; + (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * sizeof(WCHAR); break; default: SetLastError(CRYPT_E_ASN1_BADTAG);

1 0

Dmitry Timoshkov : crypt32: Pass type and flags in correct order to the find() helper.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: ee883ff6596b5315da60b55e7eeb865a9cbb42a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee883ff6596b5315da60b55e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 3 18:14:08 2018 +0300 crypt32: Pass type and flags in correct order to the find() helper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2d7ef42..e591c4d 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1811,7 +1811,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, } if (find) - ret = find(hCertStore, dwFlags, dwType, pvPara, pPrevCertContext); + ret = find(hCertStore, dwType, dwFlags, pvPara, pPrevCertContext); else if (compare) ret = cert_compare_certs_in_store(hCertStore, pPrevCertContext, compare, dwType, dwFlags, pvPara);

1 0

Alex Henrie : shdocvw: Make constants 'wszCLSID' and 'wszInitPropertyBag' static.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 8d4bfa751d1380fb6f929739173adbf39954a1f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d4bfa751d1380fb6f929739… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:05:13 2018 -0700 shdocvw: Make constants 'wszCLSID' and 'wszInitPropertyBag' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/shlinstobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index 9c3232c..6f6786b 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -361,8 +361,8 @@ HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, REFIID riid, WCHAR wszInstanceKey[] = { 'C','L','S','I','D','\\','{','0','0','0','0','0','0','0','0','-', '0','0','0','0','-','0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0', '0','0','0','0','}','\\','I','n','s','t','a','n','c','e', 0 }; - const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; - const WCHAR wszInitPropertyBag[] = + static const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; + static const WCHAR wszInitPropertyBag[] = { 'I','n','i','t','P','r','o','p','e','r','t','y','B','a','g',0 }; WCHAR wszCLSIDInstance[CHARS_IN_GUID]; CLSID clsidInstance;

1 0

Alex Henrie : vbscript: Make constant 'html_delimiterW' static.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 36f25a4b8a9f0f80815f4c9d9305369f2e03f46b URL: https://source.winehq.org/git/wine.git/?a=commit;h=36f25a4b8a9f0f80815f4c9d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:05:47 2018 -0700 vbscript: Make constant 'html_delimiterW' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index e8ecf4d..0201099 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -969,7 +969,7 @@ void *parser_alloc(parser_ctx_t *ctx, size_t size) HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter) { - const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; + static const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; ctx->code = ctx->ptr = code; ctx->end = ctx->code + strlenW(ctx->code);

1 0

Alex Henrie : winex11.drv: Make several constants static.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: b43204bc4a7496ce0d232745ce9fe93054702152 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b43204bc4a7496ce0d232745… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:07:56 2018 -0700 winex11.drv: Make several constants static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 7a9a3a7..61730ce 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -485,9 +485,9 @@ static void disable_system_cursors(void) */ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) { - const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; - const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; - const WCHAR SZ_NON_PLUGINPLAY[] = {'n','o','n','-','p','l','u','g','i','n','p','l','a','y',0}; + static const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; + static const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; + static const WCHAR SZ_NON_PLUGINPLAY[] = {'n','o','n','-','p','l','u','g','i','n','p','l','a','y',0}; struct x11drv_thread_data *data = x11drv_init_thread_data(); int num_devices;

1 0

Alex Henrie : winex11.drv: Correct spelling of "plug-n-play".
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 3f69b7ecc8ae9e2f0574ca0dacff191b79c11f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f69b7ecc8ae9e2f0574ca0d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:07:57 2018 -0700 winex11.drv: Correct spelling of "plug-n-play". Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 61730ce..48fcb22 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -487,7 +487,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) { static const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; static const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; - static const WCHAR SZ_NON_PLUGINPLAY[] = {'n','o','n','-','p','l','u','g','i','n','p','l','a','y',0}; + static const WCHAR SZ_NON_PLUG_N_PLAY[] = {'n','o','n','-','p','l','u','g','-','n','-','p','l','a','y',0}; struct x11drv_thread_data *data = x11drv_init_thread_data(); int num_devices; @@ -549,7 +549,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysDevice.PKTDATA = PK_CONTEXT | PK_STATUS | PK_SERIAL_NUMBER| PK_TIME | PK_CURSOR | PK_BUTTONS | PK_X | PK_Y | PK_NORMAL_PRESSURE | PK_ORIENTATION; - strcpyW(gSysDevice.PNPID, SZ_NON_PLUGINPLAY); + strcpyW(gSysDevice.PNPID, SZ_NON_PLUG_N_PLAY); devices = pXListInputDevices(data->display, &num_devices); if (!devices)

1 0