July 2020 - Wine-commits - list.winehq.org

Henri Verbeet : vkd3d-compiler: Use getopt to parse command-line options.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: vkd3d Branch: master Commit: f658190794f02ce035ce12481c1c4135c9ac33d6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f658190794f02ce035ce124… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 18:31:13 2020 +0430 vkd3d-compiler: Use getopt to parse command-line options. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 61 ++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 03dc322..8fa4d4f 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -22,12 +22,18 @@ #include <stdlib.h> #include <sys/stat.h> #include <unistd.h> +#include <getopt.h> #include "vkd3d_common.h" #include "vkd3d_shader.h" #define MAX_COMPILE_OPTIONS 1 +enum +{ + OPTION_STRIP_DEBUG = CHAR_MAX + 1, +}; + static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) { struct stat st; @@ -86,23 +92,15 @@ static bool write_shader(const struct vkd3d_shader_code *shader, const char *fil return true; } -static const struct -{ - const char *name; - enum vkd3d_shader_compile_option_name compile_option; -} -compiler_options[] = -{ - {"--strip-debug", VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG}, -}; - static void print_usage(const char *program_name) { static const char usage[] = "[options...] file\n" "Options:\n" " -o <file> Write the output to <file>.\n" - " --strip-debug Strip debug information from the output.\n"; + " --strip-debug Strip debug information from the output.\n" + " -- Stop option processing. Any subsequent argument is\n" + " interpreted as a filename.\n"; fprintf(stderr, "Usage: %s %s", program_name, usage); } @@ -145,36 +143,41 @@ static void add_compile_option(struct options *options, static bool parse_command_line(int argc, char **argv, struct options *options) { - unsigned int i, j; + int option; - if (argc < 2) - return false; + static struct option long_options[] = + { + {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {NULL, 0, NULL, 0}, + }; memset(options, 0, sizeof(*options)); - for (i = 1; i < argc - 1; ++i) + for (;;) { - if (!strcmp(argv[i], "-o")) - { - if (i + 1 >= argc - 1) - return false; - options->output_filename = argv[++i]; - continue; - } + if ((option = getopt_long(argc, argv, "o:", long_options, NULL)) == -1) + break; - for (j = 0; j < ARRAY_SIZE(compiler_options); ++j) + switch (option) { - if (!strcmp(argv[i], compiler_options[j].name)) - { - add_compile_option(options, compiler_options[j].compile_option, 1); + case 'o': + options->output_filename = optarg; + break; + + case OPTION_STRIP_DEBUG: + add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, 1); break; - } + + default: + return false; } - if (j == ARRAY_SIZE(compiler_options)) - return false; } + if (optind >= argc) + return false; + options->filename = argv[argc - 1]; + return true; }

1 0

Henri Verbeet : vkd3d-compiler: Add an explicit --help option.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: vkd3d Branch: master Commit: 7df61873d089965f718bbc978c46dd6f4074044d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7df61873d089965f718bbc9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 18:31:14 2020 +0430 vkd3d-compiler: Add an explicit --help option. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 8fa4d4f..e975572 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -31,7 +31,8 @@ enum { - OPTION_STRIP_DEBUG = CHAR_MAX + 1, + OPTION_HELP = CHAR_MAX + 1, + OPTION_STRIP_DEBUG, }; static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) @@ -97,6 +98,7 @@ static void print_usage(const char *program_name) static const char usage[] = "[options...] file\n" "Options:\n" + " -h, --help Display this information and exit.\n" " -o <file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" " -- Stop option processing. Any subsequent argument is\n" @@ -109,6 +111,7 @@ struct options { const char *filename; const char *output_filename; + struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; }; @@ -147,6 +150,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) static struct option long_options[] = { + {"help", no_argument, NULL, OPTION_HELP}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, {NULL, 0, NULL, 0}, }; @@ -155,7 +159,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "o:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "ho:", long_options, NULL)) == -1) break; switch (option)

1 0

Henri Verbeet : vkd3d-compiler: Add a --version option.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: vkd3d Branch: master Commit: 4a094f5cba8e8c533ba822a71d8c617141da744d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4a094f5cba8e8c533ba822a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 18:31:15 2020 +0430 vkd3d-compiler: Add a --version option. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index e975572..1586b45 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -33,6 +33,7 @@ enum { OPTION_HELP = CHAR_MAX + 1, OPTION_STRIP_DEBUG, + OPTION_VERSION, }; static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) @@ -101,6 +102,7 @@ static void print_usage(const char *program_name) " -h, --help Display this information and exit.\n" " -o <file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" + " -V, --version Display version information and exit.\n" " -- Stop option processing. Any subsequent argument is\n" " interpreted as a filename.\n"; @@ -111,6 +113,7 @@ struct options { const char *filename; const char *output_filename; + bool print_version; struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; @@ -152,6 +155,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) { {"help", no_argument, NULL, OPTION_HELP}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {"version", no_argument, NULL, OPTION_VERSION}, {NULL, 0, NULL, 0}, }; @@ -159,7 +163,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "ho:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "ho:V", long_options, NULL)) == -1) break; switch (option) @@ -172,6 +176,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, 1); break; + case OPTION_VERSION: + case 'V': + options->print_version = true; + return true; + default: return false; } @@ -198,6 +207,12 @@ int main(int argc, char **argv) return 1; } + if (options.print_version) + { + fprintf(stdout, "vkd3d shader compiler version " PACKAGE_VERSION "\n"); + return 0; + } + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF;

1 0

Henri Verbeet : vkd3d-compiler: Add a long option to specify the output file.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: vkd3d Branch: master Commit: 7bcddce05c13396de1251ce2fa5f9ce19cf61368 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7bcddce05c13396de1251ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 18:31:16 2020 +0430 vkd3d-compiler: Add a long option to specify the output file. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 1586b45..da03df2 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -32,6 +32,7 @@ enum { OPTION_HELP = CHAR_MAX + 1, + OPTION_OUTPUT, OPTION_STRIP_DEBUG, OPTION_VERSION, }; @@ -100,7 +101,7 @@ static void print_usage(const char *program_name) "[options...] file\n" "Options:\n" " -h, --help Display this information and exit.\n" - " -o <file> Write the output to <file>.\n" + " -o, --output=<file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" " -- Stop option processing. Any subsequent argument is\n" @@ -153,10 +154,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) static struct option long_options[] = { - {"help", no_argument, NULL, OPTION_HELP}, - {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, - {"version", no_argument, NULL, OPTION_VERSION}, - {NULL, 0, NULL, 0}, + {"help", no_argument, NULL, OPTION_HELP}, + {"output", required_argument, NULL, OPTION_OUTPUT}, + {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {"version", no_argument, NULL, OPTION_VERSION}, + {NULL, 0, NULL, 0}, }; memset(options, 0, sizeof(*options)); @@ -168,6 +170,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) switch (option) { + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; break;

1 0

Owen Rudge : winetest: Add a script to test HTTP redirection limits.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: tools Branch: master Commit: 9d2c746f26516640189d68e3a59b70f44842364b URL: https://source.winehq.org/git/tools.git/?a=commit;h=9d2c746f26516640189d68e… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jun 29 22:44:04 2020 +0100 winetest: Add a script to test HTTP redirection limits. I've written patches to implement support for WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS in winhttp; this script will be required for the tests. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/tests/redirecttest.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/winetest/tests/redirecttest.php b/winetest/tests/redirecttest.php new file mode 100644 index 0000000..e9f8995 --- /dev/null +++ b/winetest/tests/redirecttest.php @@ -0,0 +1,17 @@ +<?php + +$id = (int)$_GET['id']; +$max = max(0, min(15, (int)$_GET['max'])); + +if ($id < 0) + $id = 0; + +if ($id < $max) +{ + $new_url = sprintf("%s://%s%s?id=%d&max=%d", $_SERVER['REQUEST_SCHEME'], $_SERVER['HTTP_HOST'], $_SERVER['SCRIPT_NAME'], $id + 1, $max); + Header("Location: " . $new_url); +} + +Header("Content-Type: text/plain"); +echo($id); +?>

1 0

Paul Gofman : ntdll/tests: Add test for x86_64 KiUserExceptionDispatcher().
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: 824f40596cfa68b41156e579a8003bd282abd114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=824f40596cfa68b41156e579… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 30 23:34:35 2020 +0300 ntdll/tests: Add test for x86_64 KiUserExceptionDispatcher(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 114 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 411439f180..95d25375f7 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2659,6 +2659,119 @@ static void test_wow64_context(void) pNtTerminateProcess(pi.hProcess, 0); } +static BYTE saved_KiUserExceptionDispatcher_bytes[12]; +static void *pKiUserExceptionDispatcher; +static BOOL hook_called; +static void *hook_KiUserExceptionDispatcher_rip; +static void *dbg_except_continue_handler_rip; +static void *hook_exception_address; + +static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) +{ + ok(hook_called, "Hook was not called.\n"); + got_exception = 1; + dbg_except_continue_handler_rip = (void *)context->Rip; + ++context->Rip; + return ExceptionContinueExecution; +} + +void WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) +{ + trace("rec %p, context %p.\n", rec, context); + trace("context->Rip %#lx, context->Rsp %#lx, ContextFlags %#lx.\n", sizeof(*context), + context->Rip, context->Rsp, context->ContextFlags); + + hook_called = TRUE; + /* Broken on Win2008, probably rec offset in stack is different. */ + ok(rec->ExceptionCode == 0x80000003 || broken(!rec->ExceptionCode), + "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); + + hook_KiUserExceptionDispatcher_rip = (void *)context->Rip; + hook_exception_address = rec->ExceptionAddress; + memcpy(pKiUserExceptionDispatcher, saved_KiUserExceptionDispatcher_bytes, sizeof(saved_KiUserExceptionDispatcher_bytes)); +} + +static void test_kiuserexceptiondispatcher(void) +{ + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + static const BYTE except_code[] = + { + 0xcc, /* int3 */ + 0xc3, /* ret */ + }; + static BYTE hook_trampoline[] = + { + 0x48, 0x89, 0xe2, /* mov %rsp,%rdx */ + 0x48, 0x8d, 0x8c, 0x24, 0xf0, 0x04, 0x00, 0x00, + /* lea 0x4f0(%rsp),%rcx */ + + 0xff, 0x14, 0x25, + /* offset: 14 bytes */ + 0x00, 0x00, 0x00, 0x00, /* callq *addr */ /* call hook implementation. */ + 0x48, 0x31, 0xc9, /* xor %rcx, %rcx */ + 0x48, 0x31, 0xd2, /* xor %rdx, %rdx */ + + 0xff, 0x24, 0x25, + /* offset: 27 bytes */ + 0x00, 0x00, 0x00, 0x00, /* jmpq *addr */ /* jump to original function. */ + }; + void *phook_KiUserExceptionDispatcher = hook_KiUserExceptionDispatcher; + DWORD old_protect1, old_protect2; + BYTE *ptr; + BOOL ret; + + pKiUserExceptionDispatcher = (void *)GetProcAddress(hntdll, "KiUserExceptionDispatcher"); + if (!pKiUserExceptionDispatcher) + { + win_skip("KiUserExceptionDispatcher is not available.\n"); + return; + } + + ok(((ULONG64)&phook_KiUserExceptionDispatcher & 0xffffffff) == ((ULONG64)&phook_KiUserExceptionDispatcher), + "Address is too long.\n"); + ok(((ULONG64)&pKiUserExceptionDispatcher & 0xffffffff) == ((ULONG64)&pKiUserExceptionDispatcher), + "Address is too long.\n"); + + *(unsigned int *)(hook_trampoline + 14) = (unsigned int)(ULONG_PTR)&phook_KiUserExceptionDispatcher; + *(unsigned int *)(hook_trampoline + 27) = (unsigned int)(ULONG_PTR)&pKiUserExceptionDispatcher; + + ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), PAGE_EXECUTE_READWRITE, &old_protect1); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + ret = VirtualProtect(pKiUserExceptionDispatcher, 5, PAGE_EXECUTE_READWRITE, &old_protect2); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + memcpy(saved_KiUserExceptionDispatcher_bytes, pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes)); + ptr = (BYTE *)pKiUserExceptionDispatcher; + /* mov hook_trampoline, %rax */ + *ptr++ = 0x48; + *ptr++ = 0xb8; + *(void **)ptr = hook_trampoline; + ptr += sizeof(ULONG64); + /* jmp *rax */ + *ptr++ = 0xff; + *ptr++ = 0xe0; + + got_exception = 0; + run_exception_test(dbg_except_continue_handler, NULL, except_code, ARRAY_SIZE(except_code), PAGE_EXECUTE_READ); + ok(got_exception, "Handler was not called.\n"); + ok(hook_called, "Hook was not called.\n"); + + ok(hook_exception_address == code_mem || broken(!hook_exception_address) /* Win2008 */, + "Got unexpected exception address %p, expected %p.\n", + hook_exception_address, code_mem); + todo_wine ok(hook_KiUserExceptionDispatcher_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", + hook_KiUserExceptionDispatcher_rip, code_mem); + ok(dbg_except_continue_handler_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", + dbg_except_continue_handler_rip, code_mem); + + ret = VirtualProtect(pKiUserExceptionDispatcher, 5, old_protect2, &old_protect2); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), old_protect1, &old_protect1); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); +} + #endif /* __x86_64__ */ #if defined(__i386__) || defined(__x86_64__) @@ -3638,6 +3751,7 @@ START_TEST(exception) test_suspend_thread(); test_suspend_process(); test_unload_trace(); + test_kiuserexceptiondispatcher(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind();

1 0

Brendan Shanks : include: Add d3dkmdt.h.
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: 1899830b02218b89bb1669c265bd04d6750347fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1899830b02218b89bb1669c2… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 29 21:55:19 2020 -0700 include: Add d3dkmdt.h. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3dkmdt.h | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 90fb873f20..56c5220daf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -119,6 +119,7 @@ SOURCES = \ d3dcommon.idl \ d3dcompiler.h \ d3dhal.h \ + d3dkmdt.h \ d3drm.h \ d3drmdef.h \ d3drmobj.h \ diff --git a/include/d3dkmdt.h b/include/d3dkmdt.h new file mode 100644 index 0000000000..f47688cf40 --- /dev/null +++ b/include/d3dkmdt.h @@ -0,0 +1,59 @@ +/* + * Copyright 2020 Brendan Shanks for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_D3DKMDT_H +#define __WINE_D3DKMDT_H + +typedef enum _D3DKMDT_VIDEO_SIGNAL_STANDARD +{ + D3DKMDT_VSS_UNINITIALIZED = 0, + D3DKMDT_VSS_VESA_DMT = 1, + D3DKMDT_VSS_VESA_GTF = 2, + D3DKMDT_VSS_VESA_CVT = 3, + D3DKMDT_VSS_IBM = 4, + D3DKMDT_VSS_APPLE = 5, + D3DKMDT_VSS_NTSC_M = 6, + D3DKMDT_VSS_NTSC_J = 7, + D3DKMDT_VSS_NTSC_443 = 8, + D3DKMDT_VSS_PAL_B = 9, + D3DKMDT_VSS_PAL_B1 = 10, + D3DKMDT_VSS_PAL_G = 11, + D3DKMDT_VSS_PAL_H = 12, + D3DKMDT_VSS_PAL_I = 13, + D3DKMDT_VSS_PAL_D = 14, + D3DKMDT_VSS_PAL_N = 15, + D3DKMDT_VSS_PAL_NC = 16, + D3DKMDT_VSS_SECAM_B = 17, + D3DKMDT_VSS_SECAM_D = 18, + D3DKMDT_VSS_SECAM_G = 19, + D3DKMDT_VSS_SECAM_H = 20, + D3DKMDT_VSS_SECAM_K = 21, + D3DKMDT_VSS_SECAM_K1 = 22, + D3DKMDT_VSS_SECAM_L = 23, + D3DKMDT_VSS_SECAM_L1 = 24, + D3DKMDT_VSS_EIA_861 = 25, + D3DKMDT_VSS_EIA_861A = 26, + D3DKMDT_VSS_EIA_861B = 27, + D3DKMDT_VSS_PAL_K = 28, + D3DKMDT_VSS_PAL_K1 = 29, + D3DKMDT_VSS_PAL_L = 30, + D3DKMDT_VSS_PAL_M = 31, + D3DKMDT_VSS_OTHER = 255 +} D3DKMDT_VIDEO_SIGNAL_STANDARD; + +#endif /* __WINE_D3DKMDT_H */

1 0

Brendan Shanks : user32: Implement GetDisplayConfigBufferSizes().
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: a94101672e1f98a364e0605bf8299474cf950821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a94101672e1f98a364e0605b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 29 21:55:21 2020 -0700 user32: Implement GetDisplayConfigBufferSizes(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 768aeb5d4f..402a8309eb 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4504,14 +4504,56 @@ BOOL WINAPI PhysicalToLogicalPoint( HWND hwnd, POINT *point ) */ LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info) { - FIXME("(0x%x %p %p): stub\n", flags, num_path_info, num_mode_info); + LONG ret = ERROR_GEN_FAILURE; + HANDLE mutex; + HDEVINFO devinfo; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + DWORD monitor_index = 0, state_flags, type; + + FIXME("(0x%x %p %p): semi-stub\n", flags, num_path_info, num_mode_info); if (!num_path_info || !num_mode_info) return ERROR_INVALID_PARAMETER; *num_path_info = 0; - *num_mode_info = 0; - return ERROR_NOT_SUPPORTED; + + if (flags != QDC_ALL_PATHS && + flags != QDC_ONLY_ACTIVE_PATHS && + flags != QDC_DATABASE_CURRENT) + return ERROR_INVALID_PARAMETER; + + if (flags != QDC_ONLY_ACTIVE_PATHS) + FIXME("only returning active paths\n"); + + wait_graphics_driver_ready(); + mutex = get_display_device_init_mutex(); + + /* Iterate through "targets"/monitors. + * Each target corresponds to a path, and each path references a source and a target mode. + */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT); + if (devinfo == INVALID_HANDLE_VALUE) + goto done; + + while (SetupDiEnumDeviceInfo(devinfo, monitor_index++, &device_data)) + { + /* Only count active monitors */ + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, + &type, (BYTE *)&state_flags, sizeof(state_flags), NULL, 0)) + goto done; + + if (state_flags & DISPLAY_DEVICE_ACTIVE) + (*num_path_info)++; + } + + *num_mode_info = *num_path_info * 2; + ret = ERROR_SUCCESS; + TRACE("returning %u path(s) %u mode(s)\n", *num_path_info, *num_mode_info); + +done: + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + return ret; } /***********************************************************************

1 0

Brendan Shanks : user32/tests: Test additional flag values with GetDisplayConfigBufferSizes().
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: 2e1c48f3517fa967ae9f9a0794c88e6d4e5e77f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e1c48f3517fa967ae9f9a07… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 29 21:55:22 2020 -0700 user32/tests: Test additional flag values with GetDisplayConfigBufferSizes(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index afde67cd03..3e711ce1ef 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1126,15 +1126,6 @@ static void test_GetDisplayConfigBufferSizes(void) ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); ok(modes == 100, "got %u\n", modes); - paths = modes = 0; - ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, &paths, &modes); - if (!ret) - ok(paths > 0 && modes > 0, "got %u, %u\n", paths, modes); - else - ok(ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); - - /* Invalid flags, non-zero invalid flags validation is version (or driver?) dependent, - it's unreliable to use in tests. */ ret = pGetDisplayConfigBufferSizes(0, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); @@ -1148,10 +1139,38 @@ static void test_GetDisplayConfigBufferSizes(void) ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); ok(modes == 100, "got %u\n", modes); + /* Flag validation on Windows is driver-dependent */ paths = modes = 100; ret = pGetDisplayConfigBufferSizes(0, &paths, &modes); ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); ok((modes == 0 || modes == 100) && paths == 0, "got %u, %u\n", modes, paths); + + paths = modes = 100; + ret = pGetDisplayConfigBufferSizes(0xFF, &paths, &modes); + ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + ok((modes == 0 || modes == 100) && paths == 0, "got %u, %u\n", modes, paths); + + /* Test success */ + paths = modes = 0; + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, &paths, &modes); + if (!ret) + ok(paths > 0 && modes > 0, "got %u, %u\n", paths, modes); + else + ok(ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + + paths = modes = 0; + ret = pGetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &paths, &modes); + if (!ret) + ok(paths > 0 && modes > 0, "got %u, %u\n", paths, modes); + else + ok(ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + + paths = modes = 0; + ret = pGetDisplayConfigBufferSizes(QDC_DATABASE_CURRENT, &paths, &modes); + if (!ret) + ok(paths > 0 && modes > 0, "got %u, %u\n", paths, modes); + else + ok(ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); } static BOOL CALLBACK test_EnumDisplayMonitors_normal_cb(HMONITOR monitor, HDC hdc, LPRECT rect,

1 0

Brendan Shanks : user32: Implement QueryDisplayConfig().
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: 5fba152eea0bd8b7a2553beea05370dc140ed740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fba152eea0bd8b7a2553bee… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 29 21:55:23 2020 -0700 user32: Implement QueryDisplayConfig(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 239 +++++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/monitor.c | 8 ++ 2 files changed, 244 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5fba152eea0bd8b7a255…

1 0