wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Andrew Eikum : xinput: Consolidate new device setup.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: 5417c3bfa4e667902835117dc78b9ea629e7bc3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5417c3bfa4e667902835117d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 22 15:00:34 2019 -0500 xinput: Consolidate new device setup. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 477d5304ca..5baf3b2b53 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -171,19 +171,34 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_ return TRUE; } -static void build_private(struct hid_platform_private *private, PHIDP_PREPARSED_DATA ppd, HIDP_CAPS *caps, HANDLE device, WCHAR *path) +static BOOL init_controller(xinput_controller *controller, PHIDP_PREPARSED_DATA ppd, HIDP_CAPS *caps, HANDLE device, WCHAR *device_path) { size_t size; + struct hid_platform_private *private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct hid_platform_private)); + + if (!VerifyGamepad(ppd, &controller->caps, private, caps)) + { + HeapFree(GetProcessHeap(), 0, private); + return FALSE; + } + + TRACE("Found gamepad %s\n", debugstr_w(device_path)); + private->ppd = ppd; private->device = device; private->report_length = caps->InputReportByteLength + 1; private->current_report = 0; private->reports[0] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); private->reports[1] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); - size = (lstrlenW(path) + 1) * sizeof(WCHAR); + size = (lstrlenW(device_path) + 1) * sizeof(WCHAR); private->device_path = HeapAlloc(GetProcessHeap(), 0, size); - memcpy(private->device_path, path, size); + memcpy(private->device_path, device_path, size); private->enabled = TRUE; + + controller->platform_private = private; + controller->connected = TRUE; + + return TRUE; } void HID_find_gamepads(xinput_controller *devices) @@ -263,19 +278,10 @@ void HID_find_gamepads(xinput_controller *devices) Caps.Usage == HID_USAGE_GENERIC_JOYSTICK || Caps.Usage == 0x8 /* Multi-axis Controller */)) { - struct hid_platform_private *private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct hid_platform_private)); - if (VerifyGamepad(ppd, &devices[open_device_idx].caps, private, &Caps)) - { - TRACE("Found gamepad %i %s\n", open_device_idx, debugstr_w(data->DevicePath)); - build_private(private, ppd, &Caps, device, data->DevicePath); - devices[open_device_idx].platform_private = private; - devices[open_device_idx].connected = TRUE; - } - else + if(!init_controller(&devices[open_device_idx], ppd, &Caps, device, data->DevicePath)) { CloseHandle(device); HidD_FreePreparsedData(ppd); - HeapFree(GetProcessHeap(), 0, private); } } else

1 0

Andrew Eikum : xinput: Make device hotplugging thread-safe.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: 4d3db6d2d743ea8fc61ed122f27baeddf30ee2ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d3db6d2d743ea8fc61ed122… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 22 15:00:26 2019 -0500 xinput: Make device hotplugging thread-safe. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 239 ++++++++++++++++++++-------------------- dlls/xinput1_3/xinput_main.c | 95 ++++++++++++++-- dlls/xinput1_3/xinput_private.h | 7 +- 3 files changed, 210 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d3db6d2d743ea8fc61e…

1 0

Vijay Kiran Kamuju : setupapi/tests: Remove win_9x checks.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: c59e9d302b79527f4a99be71d1346f56737dc3f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c59e9d302b79527f4a99be71… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Oct 22 17:17:41 2019 +0200 setupapi/tests: Remove win_9x checks. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/diskspace.c | 112 ++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 63 deletions(-) diff --git a/dlls/setupapi/tests/diskspace.c b/dlls/setupapi/tests/diskspace.c index 4e87ea905e..dab6705eee 100644 --- a/dlls/setupapi/tests/diskspace.c +++ b/dlls/setupapi/tests/diskspace.c @@ -29,8 +29,6 @@ #include "wine/test.h" -static BOOL is_win9x; - static void test_SetupCreateDiskSpaceListA(void) { HDSKSPC ret; @@ -152,34 +150,29 @@ static void test_SetupDuplicateDiskSpaceListA(void) { HDSKSPC handle, duplicate; - if (is_win9x) - win_skip("SetupDuplicateDiskSpaceListA crashes with NULL disk space handle on Win9x\n"); - else - { - SetLastError(0xdeadbeef); - duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0, 0); - ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - duplicate = SetupDuplicateDiskSpaceListA(NULL, (void *)0xdeadbeef, 0, 0); - ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0, 0); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", GetLastError()); - SetLastError(0xdeadbeef); - duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0xdeadbeef, 0); - ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListA(NULL, (void *)0xdeadbeef, 0, 0); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - SetLastError(0xdeadbeef); - duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0, ~0U); - ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - } + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0xdeadbeef, 0); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0, ~0U); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); handle = SetupCreateDiskSpaceListA(NULL, 0, 0); ok(handle != NULL, @@ -306,42 +299,37 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) HDSKSPC handle; LONGLONG space; - if (is_win9x) - win_skip("SetupQuerySpaceRequiredOnDriveA crashes with NULL disk space handle on Win9x\n"); - else - { - SetLastError(0xdeadbeef); - ret = SetupQuerySpaceRequiredOnDriveA(NULL, NULL, NULL, NULL, 0); - ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupQuerySpaceRequiredOnDriveA(NULL, NULL, NULL, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - space = 0xdeadbeef; - ret = SetupQuerySpaceRequiredOnDriveA(NULL, NULL, &space, NULL, 0); - ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); - ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + space = 0xdeadbeef; + ret = SetupQuerySpaceRequiredOnDriveA(NULL, NULL, &space, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); + ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = SetupQuerySpaceRequiredOnDriveA(NULL, "", NULL, NULL, 0); - ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupQuerySpaceRequiredOnDriveA(NULL, "", NULL, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - space = 0xdeadbeef; - ret = SetupQuerySpaceRequiredOnDriveA(NULL, "", &space, NULL, 0); - ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); - ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", - GetLastError()); - } + SetLastError(0xdeadbeef); + space = 0xdeadbeef; + ret = SetupQuerySpaceRequiredOnDriveA(NULL, "", &space, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); + ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", + GetLastError()); handle = SetupCreateDiskSpaceListA(NULL, 0, 0); ok(handle != NULL, @@ -474,8 +462,6 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) START_TEST(diskspace) { - is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) && - GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; test_SetupCreateDiskSpaceListA(); test_SetupCreateDiskSpaceListW(); test_SetupDuplicateDiskSpaceListA();

1 0

Erich E. Hoover : msvcrt: Fix fscanf return when EOF is immediately after an end of line.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: 0a89a699135802b083d142130d3b0ef618485478 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a89a699135802b083d14213… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Oct 16 16:09:16 2019 -0600 msvcrt: Fix fscanf return when EOF is immediately after an end of line. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 14 +++++++++++++ dlls/msvcrt/scanf.h | 10 +++++++++ dlls/msvcrt/tests/scanf.c | 50 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 73 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 0ba1f1a7b1..050699e485 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -135,6 +135,7 @@ static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); static size_t (__cdecl *p___strncnt)(const char *str, size_t count); +static int (__cdecl *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); /* make sure we use the correct errno */ #undef errno @@ -405,6 +406,7 @@ static BOOL init(void) SET(p__memicmp_l, "_memicmp_l"); SET(p__vsnwprintf, "_vsnwprintf"); SET(p___strncnt, "__strncnt"); + SET(p_swscanf, "swscanf"); if (sizeof(void *) == 8) { @@ -1925,6 +1927,17 @@ static void test___strncnt(void) } } +static void test_swscanf(void) +{ + + wchar_t buffer[100]; + int ret; + + /* check WEOF */ + ret = p_swscanf(L" \t\n\n", L"%s", buffer); + ok( ret == (short)WEOF, "ret = %d\n", ret ); +} + START_TEST(msvcr90) { if(!init()) @@ -1963,4 +1976,5 @@ START_TEST(msvcr90) test__fpieee_flt(); #endif test___strncnt(); + test_swscanf(); } diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 1058a7a911..e2f216110d 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -487,6 +487,10 @@ _FUNCTION_ { nch = _GETC_(file); if (width>0) width--; } + /* if we have reached the EOF and output nothing then report EOF */ + if (nch==_EOF_ && rd==0 && st==0) { + return _EOF_RET; + } /* terminate */ if (st && !suppress) *sptr = 0; } @@ -517,6 +521,12 @@ _FUNCTION_ { nch = _GETC_(file); if (width>0) width--; } +#if _MSVCR_VER >= 80 + /* if we have reached the EOF and output nothing then report EOF */ + if (nch==_EOF_ && rd==0 && st==0) { + return _EOF_RET; + } +#endif /* terminate */ if (st && !suppress) *sptr = 0; } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 6d38e438c8..5db9d43935 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -22,6 +22,41 @@ #include "wine/test.h" +static void test_fscanf( void ) +{ + static const char file_name[] = "fscanf.tst"; + static const char contents[] = + "line1\n" + "line2 " + ; + char buf[1024]; + FILE *fp; + int ret; + + fp = fopen(file_name, "wb"); + ok(fp != NULL, "fp = %p\n", fp); + if(!fp) { + skip("failed to create temporary test file\n"); + return; + } + + ret = fprintf(fp, contents); + fclose(fp); + + fp = fopen(file_name, "rb"); + ret = fscanf(fp, "%s", buf); + ok(ret == 1, "ret = %d\n", ret); + ok(strcmp(buf, "line1") == 0, "buf = %s\n", buf); + ret = fscanf(fp, "%s", buf); + ok(ret == 1, "ret = %d\n", ret); + ok(strcmp(buf, "line2") == 0, "buf = %s\n", buf); + ret = fscanf(fp, "%s", buf); + ok(ret == EOF, "ret = %d\n", ret); + fclose(fp); + + unlink(file_name); +} + static void test_sscanf( void ) { /* use function pointers to bypass gcc builtin */ @@ -48,6 +83,14 @@ static void test_sscanf( void ) ret = p_sscanf(buffer, "%d", &result); ok( ret == EOF,"sscanf returns %x instead of %x\n", ret, EOF ); + ret = p_sscanf(" \t\n\n", "%s", buffer); + ok( ret == EOF, "ret = %d\n", ret ); + + buffer1[0] = 'a'; + ret = p_sscanf("test\n", "%s%c", buffer, buffer1); + ok( ret == 2, "ret = %d\n", ret ); + ok( buffer1[0] == '\n', "buffer1[0] = %d\n", buffer1[0] ); + /* check %p */ ok( p_sscanf("000000000046F170", "%p", &ptr) == 1, "sscanf failed\n" ); ok( ptr == (void *)0x46F170,"sscanf reads %p instead of %x\n", ptr, 0x46F170 ); @@ -313,7 +356,7 @@ static void test_sscanf_s(void) static void test_swscanf( void ) { - wchar_t buffer[100]; + wchar_t buffer[100], results[100]; int result, ret; static const WCHAR formatd[] = {'%','d',0}; const WCHAR format2[] = {'a',0x1234,'%',0x1234,'%','c',0}; @@ -328,6 +371,10 @@ static void test_swscanf( void ) ok( ret == (short)WEOF || broken(ret == 0), "swscanf returns %x instead of %x\n", ret, WEOF ); + ret = swscanf(L" \t\n\n", L"%s", results); + /* sscanf returns EOF under this case, but swscanf does not return WEOF */ + ok( ret == 0, "ret = %d\n", ret ); + buffer[0] = 'a'; buffer[1] = 0x1234; buffer[2] = 0x1234; @@ -372,6 +419,7 @@ static void test_swscanf_s(void) START_TEST(scanf) { + test_fscanf(); test_sscanf(); test_sscanf_s(); test_swscanf();

1 0

Louis Lenders : include: Add restrictederrorinfo.idl.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: a619828053b9d9bd25f03c4ca338c965f06a95bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a619828053b9d9bd25f03c4c… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Oct 22 02:54:31 2019 +0000 include: Add restrictederrorinfo.idl. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/restrictederrorinfo.idl | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index d4676f0fdd..c31fb50d74 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -549,6 +549,7 @@ SOURCES = \ reason.h \ regstr.h \ restartmanager.h \ + restrictederrorinfo.idl \ richedit.h \ richole.idl \ rmxfguid.h \ diff --git a/include/restrictederrorinfo.idl b/include/restrictederrorinfo.idl new file mode 100644 index 0000000000..e444256a04 --- /dev/null +++ b/include/restrictederrorinfo.idl @@ -0,0 +1,35 @@ +/* + * Copyright 2019 Louis Lenders + * + * 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 + */ + +import "oaidl.idl"; + +[ + object, + uuid(82ba7092-4c88-427d-a7bc-16dd93feb67e), + pointer_default(unique) +] +interface IRestrictedErrorInfo : IUnknown +{ + HRESULT GetErrorDetails ( + [out] BSTR *desc, + [out] HRESULT *error, + [out] BSTR *restricted_desc, + [out] BSTR *sid); + + HRESULT GetReference ([out] BSTR *reference); +}

1 0

Jacek Caban : vbscript: Implement RegExp.Replace.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: 7639a850c93ec95f6edc262aaaa4251331f9315b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7639a850c93ec95f6edc262a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 22 15:54:20 2019 +0200 vbscript: Implement RegExp.Replace. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/regexp.vbs | 35 +++++++- dlls/vbscript/vbregexp.c | 177 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 206 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/tests/regexp.vbs b/dlls/vbscript/tests/regexp.vbs index 834be2101c..6569b98956 100644 --- a/dlls/vbscript/tests/regexp.vbs +++ b/dlls/vbscript/tests/regexp.vbs @@ -18,7 +18,7 @@ Option Explicit -Dim x, matches, match, submatch +Dim x, matches, match, submatch, r Set x = CreateObject("vbscript.regexp") Call ok(getVT(x.Pattern) = "VT_BSTR", "getVT(RegExp.Pattern) = " & getVT(x.Pattern)) @@ -191,4 +191,37 @@ Call ok(match.Value = "", "match.Value = " & match.Value) matches = x.test("test") Call ok(matches = true, "matches = " & matches) +dim test_global + +sub test_replace(pattern, string, rep, exp) + dim x, re + set re = new regexp + re.pattern = pattern + re.global = test_global + x = re.replace(string, rep) + call ok(x = exp, "replace returned " & x & " expected " & exp) +end sub + +test_global = true +test_replace "xxx", "xxxx", "y", "yx" +test_replace "\[([^\[]+)\]", "- [test] -", "success", "- success -" +test_replace "\[([^\[]+)\]", "[test] [test]", "aa", "aa aa" +test_replace "(\&(\d))", "abc &1 123", "$'", "abc 123 123" +test_replace "(\&(\d))", "abc &1 123", "$`", "abc abc 123" +test_replace "(\&(\d))", "abc &1 123", "$3", "abc $3 123" +test_replace "\[([^\[]+)\]", "- [test] -", true, "- -1 -" +test_replace "\[([^\[]+)\]", "- [test] -", 6, "- 6 -" +test_replace "(\$(\d))", "$1,$2", "$$1-$1$2", "$1-$11,$1-$22" +test_replace "b", "abc", "x$&z", "axbzc" + +test_global = false +test_replace "\[([^\[]+)\]", "[test] [test]", "aa", "aa [test]" + +set r = new regexp +x = r.replace("xxx", "y") +call ok(x = "yxxx", "x = " & x) +r.global = true +x = r.replace("xxx", "y") +call ok(x = "yxyxyxy", "x = " & x) + Call reportSuccess() diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 3400e81066..4edf9dcbfe 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -19,6 +19,7 @@ #include "vbscript.h" #include "regexp.h" #include "vbsregexp55.h" +#include "wchar.h" #include "wine/debug.h" @@ -1432,13 +1433,179 @@ static HRESULT WINAPI RegExp2_Test(IRegExp2 *iface, BSTR sourceString, VARIANT_B return hres; } -static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR sourceString, - VARIANT replaceVar, BSTR *pDestString) +typedef struct { + WCHAR *buf; + DWORD size; + DWORD len; +} strbuf_t; + +static BOOL strbuf_ensure_size(strbuf_t *buf, unsigned len) +{ + WCHAR *new_buf; + DWORD new_size; + + if(len <= buf->size) + return TRUE; + + new_size = buf->size ? buf->size<<1 : 16; + if(new_size < len) + new_size = len; + if(buf->buf) + new_buf = heap_realloc(buf->buf, new_size*sizeof(WCHAR)); + else + new_buf = heap_alloc(new_size*sizeof(WCHAR)); + if(!new_buf) + return FALSE; + + buf->buf = new_buf; + buf->size = new_size; + return TRUE; +} + +static HRESULT strbuf_append(strbuf_t *buf, const WCHAR *str, DWORD len) +{ + if(!len) + return S_OK; + + if(!strbuf_ensure_size(buf, buf->len+len)) + return E_OUTOFMEMORY; + + memcpy(buf->buf+buf->len, str, len*sizeof(WCHAR)); + buf->len += len; + return S_OK; +} + +static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT replaceVar, BSTR *ret) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(sourceString), - debugstr_variant(&replaceVar), pDestString); - return E_NOTIMPL; + const WCHAR *cp, *prev_cp = NULL, *ptr, *prev_ptr; + size_t match_len = 0, source_len, replace_len; + strbuf_t buf = { NULL, 0, 0 }; + match_state_t *state = NULL; + heap_pool_t *mark; + VARIANT strv; + BSTR replace; + HRESULT hres; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(source), debugstr_variant(&replaceVar), ret); + + if(This->pattern) { + if(!This->regexp) { + This->regexp = regexp_new(NULL, &This->pool, This->pattern, + lstrlenW(This->pattern), This->flags, FALSE); + if(!This->regexp) + return E_OUTOFMEMORY; + }else { + hres = regexp_set_flags(&This->regexp, NULL, &This->pool, This->flags); + if(FAILED(hres)) + return hres; + } + } + + V_VT(&strv) = VT_EMPTY; + hres = VariantChangeType(&strv, &replaceVar, 0, VT_BSTR); + if(FAILED(hres)) + return hres; + replace = V_BSTR(&strv); + replace_len = SysStringLen(replace); + source_len = SysStringLen(source); + + mark = heap_pool_mark(&This->pool); + cp = source; + if(This->regexp && !(state = alloc_match_state(This->regexp, &This->pool, cp))) + hres = E_OUTOFMEMORY; + + while(SUCCEEDED(hres)) { + if(This->regexp) { + prev_cp = cp; + hres = regexp_execute(This->regexp, NULL, &This->pool, source, source_len, state); + if(hres != S_OK) break; + cp = state->cp; + match_len = state->match_len; + }else if(prev_cp) { + if(cp == source + source_len) + break; + prev_cp = cp++; + }else { + prev_cp = cp; + } + + hres = strbuf_append(&buf, prev_cp, cp - prev_cp - match_len); + if(FAILED(hres)) + break; + + prev_ptr = replace; + while((ptr = wmemchr(prev_ptr, '$', replace + replace_len - prev_ptr))) { + hres = strbuf_append(&buf, prev_ptr, ptr - prev_ptr); + if(FAILED(hres)) + break; + + switch(ptr[1]) { + case '$': + hres = strbuf_append(&buf, ptr, 1); + prev_ptr = ptr + 2; + break; + case '&': + hres = strbuf_append(&buf, cp - match_len, match_len); + prev_ptr = ptr + 2; + break; + case '`': + hres = strbuf_append(&buf, source, cp - source - match_len); + prev_ptr = ptr + 2; + break; + case '\'': + hres = strbuf_append(&buf, cp, source + source_len - cp); + prev_ptr = ptr + 2; + break; + default: { + DWORD idx; + + if(!iswdigit(ptr[1])) { + hres = strbuf_append(&buf, ptr, 1); + prev_ptr = ptr + 1; + break; + } + + idx = ptr[1] - '0'; + if(iswdigit(ptr[2]) && idx * 10 + (ptr[2] - '0') <= state->paren_count) { + idx = idx * 10 + (ptr[2] - '0'); + prev_ptr = ptr + 3; + }else if(idx && idx <= state->paren_count) { + prev_ptr = ptr + 2; + }else { + hres = strbuf_append(&buf, ptr, 1); + prev_ptr = ptr + 1; + break; + } + + if(state->parens[idx - 1].index != -1) + hres = strbuf_append(&buf, source + state->parens[idx - 1].index, + state->parens[idx - 1].length); + break; + } + } + if(FAILED(hres)) + break; + } + if(SUCCEEDED(hres)) + hres = strbuf_append(&buf, prev_ptr, replace + replace_len - prev_ptr); + if(FAILED(hres)) + break; + + if(!(This->flags & REG_GLOB)) + break; + } + + if(SUCCEEDED(hres)) { + hres = strbuf_append(&buf, cp, source + source_len - cp); + if(SUCCEEDED(hres) && !(*ret = SysAllocStringLen(buf.buf, buf.len))) + hres = E_OUTOFMEMORY; + } + + heap_pool_clear(mark); + heap_free(buf.buf); + SysFreeString(replace); + return hres; } static const IRegExp2Vtbl RegExp2Vtbl = {

1 0

Jacek Caban : vbscript: Implement String function.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: ea5dbc13292102993f0d6e0e27b265b4449be5ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea5dbc13292102993f0d6e0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 22 15:54:13 2019 +0200 vbscript: Implement String function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 34 +++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 28 ++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 364ff0c02c..0de1559592 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -24,6 +24,7 @@ #include "mshtmhst.h" #include "objsafe.h" +#include "wchar.h" #include "wine/debug.h" @@ -1543,10 +1544,37 @@ static HRESULT Global_Space(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return S_OK; } -static HRESULT Global_String(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_String(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + WCHAR ch; + int cnt; + HRESULT hres; + + TRACE("%s %s\n", debugstr_variant(args), debugstr_variant(args + 1)); + + hres = to_int(args, &cnt); + if(FAILED(hres)) + return hres; + if(cnt < 0) + return E_INVALIDARG; + + if(V_VT(args + 1) != VT_BSTR) { + FIXME("Unsupported argument %s\n", debugstr_variant(args+1)); + return E_NOTIMPL; + } + if(!SysStringLen(V_BSTR(args + 1))) + return E_INVALIDARG; + ch = V_BSTR(args + 1)[0]; + + if(res) { + BSTR str = SysAllocStringLen(NULL, cnt); + if(!str) + return E_OUTOFMEMORY; + wmemset(str, ch, cnt); + V_VT(res) = VT_BSTR; + V_BSTR(res) = str; + } + return S_OK; } static HRESULT Global_InStr(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 49dd4959f7..5c9e219d60 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -548,6 +548,34 @@ Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") Call ok(Space("1") = " ", "Space(""1"") = " & Space("1") & """") +sub test_string(cnt, char, exp) + call ok(String(cnt, char) = exp, "String(" & cnt & ", """ & char & """ = """ & _ + String(cnt, char) & """ expected """ & exp & """") +end sub + +test_string 3, "x", "xxx" +test_string 3, "xy", "xxx" +test_string 1, "z", "z" +test_string 0, "z", "" +test_string "3", "xy", "xxx" +test_string 3, Chr(3), Chr(3)&Chr(3)&Chr(3) + +call ok(getVT(String(0, "z")) = "VT_BSTR", "getVT(String(0,z)) = " & getVT(String(0, "z"))) + +sub test_string_error() + on error resume next + dim x + x = String(-2, "x") + call ok(err.number = 5, "err.number = " & err.number) + err.clear + x = String(3, "") + call ok(err.number = 5, "err.number = " & err.number) + err.clear + x = String(0, "") + call ok(err.number = 5, "err.number = " & err.number) +end sub +call test_string_error + Sub TestStrReverse(str, ex) Call ok(StrReverse(str) = ex, "StrReverse(" & str & ") = " & StrReverse(str)) End Sub

1 0

Jacek Caban : include: Avoid macro redefinition when wchar.h is included after stdint.h.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: bd7132e3123c54c4dc338e9de158da3615fc0c0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd7132e3123c54c4dc338e9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 22 15:54:08 2019 +0200 include: Avoid macro redefinition when wchar.h is included after stdint.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/wchar.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 7761f5a7b2..7f8141a453 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -26,8 +26,10 @@ extern "C" { #endif #endif -#define WCHAR_MIN 0 -#define WCHAR_MAX ((wchar_t)-1) +#ifndef WCHAR_MIN /* also in stdint.h */ +#define WCHAR_MIN 0U +#define WCHAR_MAX 0xffffU +#endif #ifndef DECLSPEC_ALIGN # if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS)

1 0

Zhiyi Zhang : winex11.drv: Implement X11DRV_D3DKMTCheckVidPnExclusiveOwnership.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: 644d00d540f059e526c34fbeab867fd6078eebec URL: https://source.winehq.org/git/wine.git/?a=commit;h=644d00d540f059e526c34fbe… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 22 16:39:16 2019 +0800 winex11.drv: Implement X11DRV_D3DKMTCheckVidPnExclusiveOwnership. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 10 +++++++--- dlls/gdi32/tests/driver.c | 2 +- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 25 +++++++++++++++++++++++++ 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 7a1baa828f..a7517c8b0a 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -737,7 +737,6 @@ static IDXGIAdapter *get_adapter_(unsigned int line, IUnknown *device, BOOL is_d hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory4, (void **)&factory4); ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIFactory4_EnumAdapterByLuid(factory4, luid, &IID_IDXGIAdapter, (void **)&adapter); - ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); IDXGIFactory4_Release(factory4); IDXGIFactory_Release(factory); } @@ -5512,13 +5511,18 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) if (!pD3DKMTCheckVidPnExclusiveOwnership || pD3DKMTCheckVidPnExclusiveOwnership(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); + win_skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); return; } get_factory(device, is_d3d12, &factory); adapter = get_adapter(device, is_d3d12); - ok(!!adapter, "Failed to get adapter.\n"); + if (!adapter) + { + skip("Failed to get adapter on Direct3D %d.\n", is_d3d12 ? 12 : 10); + IDXGIFactory_Release(factory); + return; + } hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); IDXGIAdapter_Release(adapter); diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 2ea43e3025..ed83a72813 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -376,7 +376,7 @@ static void test_D3DKMTCheckVidPnExclusiveOwnership(void) if (!pD3DKMTCheckVidPnExclusiveOwnership || pD3DKMTCheckVidPnExclusiveOwnership(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); + win_skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); return; } diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index a833b3c208..d070c0f117 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -471,7 +471,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_StrokePath, /* pStrokePath */ X11DRV_UnrealizePalette, /* pUnrealizePalette */ NULL, /* pWidenPath */ - NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + X11DRV_D3DKMTCheckVidPnExclusiveOwnership, /* pD3DKMTCheckVidPnExclusiveOwnership */ X11DRV_D3DKMTSetVidPnSourceOwner, /* pD3DKMTSetVidPnSourceOwner */ X11DRV_wine_get_wgl_driver, /* wine_get_wgl_driver */ X11DRV_wine_get_vulkan_driver, /* wine_get_vulkan_driver */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8930690f45..e5e9dfc9f7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -149,6 +149,7 @@ extern BOOL CDECL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern NTSTATUS CDECL X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern INT CDECL X11DRV_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW proc, LPARAM lparam ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index ac5ba66324..4f611f5faa 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -877,3 +877,28 @@ done: LeaveCriticalSection( &x11drv_section ); return status; } + +/********************************************************************** + * X11DRV_D3DKMTCheckVidPnExclusiveOwnership + */ +NTSTATUS CDECL X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) +{ + struct d3dkmt_vidpn_source *source; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hAdapter) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &x11drv_section ); + LIST_FOR_EACH_ENTRY( source, &d3dkmt_vidpn_sources, struct d3dkmt_vidpn_source, entry ) + { + if (source->id == desc->VidPnSourceId && source->type == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE) + { + LeaveCriticalSection( &x11drv_section ); + return STATUS_GRAPHICS_PRESENT_OCCLUDED; + } + } + LeaveCriticalSection( &x11drv_section ); + return STATUS_SUCCESS; +}

1 0

Zhiyi Zhang : winex11.drv: Implement X11DRV_D3DKMTSetVidPnSourceOwner.
by Alexandre Julliard 22 Oct '19

22 Oct '19

Module: wine Branch: master Commit: e08dd25f32a0f6ccf7b20b34c42db7822b017606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e08dd25f32a0f6ccf7b20b34… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 22 16:39:06 2019 +0800 winex11.drv: Implement X11DRV_D3DKMTSetVidPnSourceOwner. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 2 +- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 138 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 141 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index b5f6f75a83..2ea43e3025 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -600,7 +600,7 @@ static void test_D3DKMTSetVidPnSourceOwner(void) if (!pD3DKMTSetVidPnSourceOwner || pD3DKMTSetVidPnSourceOwner(&set_owner_desc) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); + win_skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); return; } diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 0040dbb430..a833b3c208 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -472,7 +472,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_UnrealizePalette, /* pUnrealizePalette */ NULL, /* pWidenPath */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ - NULL, /* pD3DKMTSetVidPnSourceOwner */ + X11DRV_D3DKMTSetVidPnSourceOwner, /* pD3DKMTSetVidPnSourceOwner */ X11DRV_wine_get_wgl_driver, /* wine_get_wgl_driver */ X11DRV_wine_get_vulkan_driver, /* wine_get_vulkan_driver */ GDI_PRIORITY_GRAPHICS_DRV /* priority */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 135faa8989..8930690f45 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -149,6 +149,7 @@ extern BOOL CDECL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern NTSTATUS CDECL X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern INT CDECL X11DRV_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW proc, LPARAM lparam ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 21807af3f1..ac5ba66324 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -42,6 +42,8 @@ #include <X11/extensions/Xrender.h> #endif +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -52,6 +54,8 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "wine/library.h" +#include "wine/list.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); WINE_DECLARE_DEBUG_CHANNEL(synchronous); @@ -96,6 +100,25 @@ static int (*old_error_handler)( Display *, XErrorEvent * ); static BOOL use_xim = TRUE; static char input_style[20]; +static CRITICAL_SECTION x11drv_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &x11drv_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": x11drv_section") } +}; +static CRITICAL_SECTION x11drv_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + +struct d3dkmt_vidpn_source +{ + D3DKMT_VIDPNSOURCEOWNER_TYPE type; /* VidPN source owner type */ + D3DDDI_VIDEO_PRESENT_SOURCE_ID id; /* VidPN present source id */ + D3DKMT_HANDLE device; /* Kernel mode device context */ + struct list entry; /* List entry */ +}; + +static struct list d3dkmt_vidpn_sources = LIST_INIT( d3dkmt_vidpn_sources ); /* VidPN source information list */ + #define IS_OPTION_TRUE(ch) \ ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') #define IS_OPTION_FALSE(ch) \ @@ -739,3 +762,118 @@ BOOL CDECL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_p } return FALSE; /* let user32 handle it */ } + +/********************************************************************** + * X11DRV_D3DKMTSetVidPnSourceOwner + */ +NTSTATUS CDECL X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) +{ + struct d3dkmt_vidpn_source *source, *source2; + NTSTATUS status = STATUS_SUCCESS; + BOOL found; + UINT i; + + TRACE("(%p)\n", desc); + + EnterCriticalSection( &x11drv_section ); + + /* Check parameters */ + for (i = 0; i < desc->VidPnSourceCount; ++i) + { + LIST_FOR_EACH_ENTRY( source, &d3dkmt_vidpn_sources, struct d3dkmt_vidpn_source, entry ) + { + if (source->id == desc->pVidPnSourceId[i]) + { + /* Same device */ + if (source->device == desc->hDevice) + { + if ((source->type == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE + && (desc->pType[i] == D3DKMT_VIDPNSOURCEOWNER_SHARED + || desc->pType[i] == D3DKMT_VIDPNSOURCEOWNER_EMULATED)) + || (source->type == D3DKMT_VIDPNSOURCEOWNER_EMULATED + && desc->pType[i] == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE)) + { + status = STATUS_INVALID_PARAMETER; + goto done; + } + } + /* Different devices */ + else + { + if ((source->type == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE + || source->type == D3DKMT_VIDPNSOURCEOWNER_EMULATED) + && (desc->pType[i] == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE + || desc->pType[i] == D3DKMT_VIDPNSOURCEOWNER_EMULATED)) + { + status = STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE; + goto done; + } + } + } + } + + /* On Windows, it seems that all video present sources are owned by DMM clients, so any attempt to set + * D3DKMT_VIDPNSOURCEOWNER_SHARED come back STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE */ + if (desc->pType[i] == D3DKMT_VIDPNSOURCEOWNER_SHARED) + { + status = STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE; + goto done; + } + + /* FIXME: D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVEGDI unsupported */ + if (desc->pType[i] == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVEGDI || desc->pType[i] > D3DKMT_VIDPNSOURCEOWNER_EMULATED) + { + status = STATUS_INVALID_PARAMETER; + goto done; + } + } + + /* Remove owner */ + if (!desc->VidPnSourceCount && !desc->pType && !desc->pVidPnSourceId) + { + LIST_FOR_EACH_ENTRY_SAFE( source, source2, &d3dkmt_vidpn_sources, struct d3dkmt_vidpn_source, entry ) + { + if (source->device == desc->hDevice) + { + list_remove( &source->entry ); + heap_free( source ); + } + } + goto done; + } + + /* Add owner */ + for (i = 0; i < desc->VidPnSourceCount; ++i) + { + found = FALSE; + LIST_FOR_EACH_ENTRY( source, &d3dkmt_vidpn_sources, struct d3dkmt_vidpn_source, entry ) + { + if (source->device == desc->hDevice && source->id == desc->pVidPnSourceId[i]) + { + found = TRUE; + break; + } + } + + if (found) + source->type = desc->pType[i]; + else + { + source = heap_alloc( sizeof( *source ) ); + if (!source) + { + status = STATUS_NO_MEMORY; + goto done; + } + + source->id = desc->pVidPnSourceId[i]; + source->type = desc->pType[i]; + source->device = desc->hDevice; + list_add_tail( &d3dkmt_vidpn_sources, &source->entry ); + } + } + +done: + LeaveCriticalSection( &x11drv_section ); + return status; +}

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2019