- wine-devel - winehq.org

[PATCH] testbot/LibvirtTool: Provide a more complete domain state description.
by Francois Gouget 12 Sep '19

12 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LibvirtDomain.pm | 110 ++++++++++++++++++++++- 1 file changed, 107 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 0ae7aaed3..d6c07408c 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -44,6 +44,110 @@ my $HackVirtURI = 1; my %_Hypervisors; my %_Domains; + +# +# Domain state description +# + +my %_StateNameReasons = ( + Sys::Virt::Domain::STATE_NOSTATE => ["no state", + { + Sys::Virt::Domain::STATE_NOSTATE_UNKNOWN => "unknown", + }], + Sys::Virt::Domain::STATE_RUNNING => ["running", + { + Sys::Virt::Domain::STATE_RUNNING_BOOTED => "booted", + Sys::Virt::Domain::STATE_RUNNING_FROM_SNAPSHOT => "snapshot", + Sys::Virt::Domain::STATE_RUNNING_MIGRATED => "migrated", + Sys::Virt::Domain::STATE_RUNNING_MIGRATION_CANCELED => "migration canceled", + Sys::Virt::Domain::STATE_RUNNING_RESTORED => "restored", + Sys::Virt::Domain::STATE_RUNNING_SAVE_CANCELED => "save canceled", + Sys::Virt::Domain::STATE_RUNNING_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_RUNNING_UNPAUSED => "unpaused", + Sys::Virt::Domain::STATE_RUNNING_WAKEUP => "wakeup", + Sys::Virt::Domain::STATE_RUNNING_CRASHED => "crashed", + Sys::Virt::Domain::STATE_RUNNING_POSTCOPY => "postcopy", + }], + Sys::Virt::Domain::STATE_BLOCKED => ["blocked", + { + Sys::Virt::Domain::STATE_BLOCKED_UNKNOWN => "unknown", + }], + Sys::Virt::Domain::STATE_PAUSED => ["paused", + { + Sys::Virt::Domain::STATE_PAUSED_DUMP => "dump", + Sys::Virt::Domain::STATE_PAUSED_FROM_SNAPSHOT => "from snapshot", + Sys::Virt::Domain::STATE_PAUSED_IOERROR => "ioerror", + Sys::Virt::Domain::STATE_PAUSED_MIGRATION => "migration", + Sys::Virt::Domain::STATE_PAUSED_SAVE => "save", + Sys::Virt::Domain::STATE_PAUSED_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_PAUSED_USER => "user", + Sys::Virt::Domain::STATE_PAUSED_WATCHDOG => "watchdog", + Sys::Virt::Domain::STATE_PAUSED_SHUTTING_DOWN => "shutting down", + Sys::Virt::Domain::STATE_PAUSED_SNAPSHOT => "snapshot", + Sys::Virt::Domain::STATE_PAUSED_CRASHED => "crashed", + Sys::Virt::Domain::STATE_PAUSED_STARTING_UP => "starting up", + Sys::Virt::Domain::STATE_PAUSED_POSTCOPY => "postcopy", + Sys::Virt::Domain::STATE_PAUSED_POSTCOPY_FAILED => "postcopy failed", + }], + Sys::Virt::Domain::STATE_SHUTDOWN => ["shutdown", + { + Sys::Virt::Domain::STATE_SHUTDOWN_UNKNOWN => "unknown", + }], + Sys::Virt::Domain::STATE_SHUTOFF => ["shutoff", + { + Sys::Virt::Domain::STATE_SHUTOFF_CRASHED => "crashed", + Sys::Virt::Domain::STATE_SHUTOFF_DESTROYED => "destroyed", + Sys::Virt::Domain::STATE_SHUTOFF_FAILED => "failed", + Sys::Virt::Domain::STATE_SHUTOFF_FROM_SNAPSHOT => "from snapshot", + Sys::Virt::Domain::STATE_SHUTOFF_MIGRATED => "migrated", + Sys::Virt::Domain::STATE_SHUTOFF_SAVED => "saved", + Sys::Virt::Domain::STATE_SHUTOFF_SHUTDOWN => "shutdown", + Sys::Virt::Domain::STATE_SHUTOFF_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_SHUTOFF_DAEMON => "daemon", + }], + Sys::Virt::Domain::STATE_CRASHED => ["crashed", + { + Sys::Virt::Domain::STATE_CRASHED_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_CRASHED_PANICKED => "panicked", + }], + Sys::Virt::Domain::STATE_PMSUSPENDED => ["pmsuspended", + { + Sys::Virt::Domain::STATE_PMSUSPENDED_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_PMSUSPENDED_DISK_UNKNOWN => "disk unknown", + }], +); + +=pod +=over 12 + +=item C<_GetStateDescription()> + +Provides a description of the domain state for diagnostics. + +=back +=cut + +sub _GetStateDescription($$) +{ + my ($State, $Reason) = @_; + + my $StateInfo = $_StateNameReasons{$State}; + my ($StateName, $ReasonName); + if ($StateInfo) + { + $StateName = $StateInfo->[0]; + $ReasonName = $StateInfo->[1]->{$Reason}; + } + + return join(":", $StateName || sprintf("%d", $State), + $ReasonName || sprintf("%d", $Reason)); +} + + +# +# LibvirtDomain class +# + sub new($$) { my ($class, $VM) = @_; @@ -292,8 +396,8 @@ sub PowerOff($) # destroy() sets $@->code to Sys::Virt::Error::ERR_OPERATION_INVALID (55) # if the domain was already off. But this could happen for other reasons so # just check the domain state. - my ($State, $_Reason); - eval { ($State, $_Reason) = $Domain->get_state() }; + my ($State, $Reason); + eval { ($State, $Reason) = $Domain->get_state() }; if ($@) { # Only return the initial error @@ -304,7 +408,7 @@ sub PowerOff($) # This is what we wanted so ignore past errors return undef; } - return $self->_Reset($self->{VM}->Name ." is not off (". _GetStateName($State) ."): $ErrMessage"); + return $self->_Reset($self->{VM}->Name ." is not off (". _GetStateDescription($State, $Reason) ."): $ErrMessage"); } my %_StreamData; -- 2.20.1

1 0

[PATCH] testbot/CheckForWinetestUpdate: Document the task types.
by Francois Gouget 12 Sep '19

12 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 95cb13d8e..590226cde 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -65,8 +65,11 @@ my %WineTestUrls = ( "exe64" => "http://test.winehq.org/builds/winetest64-latest.exe" ); -my %TaskTypes = (build => 1, base32 => 1, winetest32 => 1, all64 => 1, - wine => 1); +my %TaskTypes = (build => "Update and rebuild Wine on the build VMs.", + base32 => "Run WineTest on the 32 bit Windows VMs with the 'base' role.", + winetest32 => "Run WineTest on the 32 bit Windows VMs with the 'winetest' role.", + all64 => "Run WineTest on the all the 64 bit Windows VMs.", + wine => "Update, rebuild and run WineTest on the Wine VMs."); my $Debug; @@ -441,7 +444,11 @@ if (defined $Usage) { print "Usage: $Name0 [--debug] [--log-only] [--help] [--create] [TASKTYPE] ...\n"; print "\n"; - print "Where TASKTYPE is one of: ", join(" ", sort keys %TaskTypes), "\n"; + print "Where TASKTYPE is one of:\n"; + foreach my $TaskType (sort keys %TaskTypes) + { + printf(" %-15s %s\n", $TaskType, $TaskTypes{$TaskType}); + } exit $Usage; } -- 2.20.1

1 0

[PATCH 2/2] advpack/tests: Increase length of 'path' by 13.
by Isira Seneviratne 12 Sep '19

12 Sep '19

4 8

[PATCH v3 2/2] ntdll: Implement RtlUnicodeToUTF8N.
by Dmitry Timoshkov 12 Sep '19

12 Sep '19

v2: replace a macro-driven test block by a more manageble test loop. v3: add special case for dstlen == 0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtlstr.c | 33 +++++++++++++++++++++++++++ dlls/ntdll/tests/rtlstr.c | 48 ++++++++++++++++++++++++++------------- include/winternl.h | 1 + 4 files changed, 67 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 98a423adfb..5a6f4e4ed4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -980,6 +980,7 @@ @ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) @ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) @ stdcall RtlUnicodeToOemN(ptr long ptr ptr long) +@ stdcall RtlUnicodeToUTF8N(ptr long ptr ptr long) @ stdcall RtlUniform(ptr) # @ stub RtlUnlockBootStatusData @ stdcall RtlUnlockHeap(long) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 6b60d36a1c..977f57a907 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -908,6 +908,39 @@ NTSTATUS WINAPI RtlUnicodeToOemN( LPSTR dst, DWORD dstlen, LPDWORD reslen, } +/************************************************************************** + * RtlUnicodeToUTF8N (NTDLL.@) + * + * Converts a Unicode string to a UTF-8 string. + * + * RETURNS + * NTSTATUS code + */ +NTSTATUS WINAPI RtlUnicodeToUTF8N( LPSTR dst, DWORD dstlen, LPDWORD reslen, + LPCWSTR src, DWORD srclen) +{ + int ret; + + if (!src) return STATUS_INVALID_PARAMETER_4; + if (!reslen) return STATUS_INVALID_PARAMETER; + if (dst && (srclen & 1)) return STATUS_INVALID_PARAMETER_5; + + if (!dstlen && dst) + { + char c; + dst = &c; + ret = wine_utf8_wcstombs( 0, src, srclen / sizeof(WCHAR), dst, 1 ); + if (ret > 0) ret--; + } + else + ret = wine_utf8_wcstombs( 0, src, srclen / sizeof(WCHAR), dst, dstlen ); + if (reslen) + *reslen = (ret >= 0) ? ret : dstlen; /* overflow -> we filled up to dstlen */ + if (ret < 0) return STATUS_BUFFER_TOO_SMALL; + return STATUS_SUCCESS; +} + + /* CASE CONVERSIONS */ diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index c2c82516cc..4583ddeb4b 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -2055,8 +2055,8 @@ static void utf8_expect_(const unsigned char *out_string, ULONG buflen, ULONG ou status = pRtlUnicodeToUTF8N( out_string ? buffer : NULL, buflen, &bytes_out, in_string, in_bytes); - ok_(__FILE__, line)(status == expect_status, "status = 0x%x\n", status); - ok_(__FILE__, line)(bytes_out == out_bytes, "bytes_out = %u\n", bytes_out); + ok_(__FILE__, line)(status == expect_status, "status 0x%x, expected 0x%x\n", status, expect_status); + ok_(__FILE__, line)(bytes_out == out_bytes, "bytes_out = %u, expected %u\n", bytes_out, out_bytes); if (out_string) { for (i = 0; i < bytes_out; i++) @@ -2082,6 +2082,7 @@ static void test_RtlUnicodeToUTF8N(void) const WCHAR empty_string[] = { 0 }; const WCHAR test_string[] = { 'A',0,'a','b','c','d','e','f','g',0 }; const WCHAR special_string[] = { 'X',0x80,0xd800,0 }; + const ULONG special_string_len[] = { 0, 1, 1, 3, 3, 3, 6, 7 }; const unsigned char special_expected[] = { 'X',0xc2,0x80,0xef,0xbf,0xbd,0 }; unsigned int input_len; const unsigned int test_count = ARRAY_SIZE(unicode_to_utf8); @@ -2151,25 +2152,33 @@ static void test_RtlUnicodeToUTF8N(void) length_expect(0, 0, STATUS_SUCCESS); length_expect(1, 1, STATUS_SUCCESS); length_expect(2, 3, STATUS_SUCCESS); +todo_wine +{ length_expect(3, 6, STATUS_SOME_NOT_MAPPED); length_expect(4, 7, STATUS_SOME_NOT_MAPPED); +} #undef length_expect - /* output truncation */ -#define truncate_expect(buflen, out_bytes, expect_status) \ - utf8_expect_(special_expected, buflen, out_bytes, \ - special_string, sizeof(special_string), \ - expect_status, __LINE__) + for (i = 0; i <= 6; i++) + { + memset(buffer, 0x55, sizeof(buffer)); + bytes_out = 0xdeadbeef; + status = pRtlUnicodeToUTF8N(buffer, i, &bytes_out, special_string, sizeof(special_string)); +todo_wine_if (i == 4 || i == 5 || i == 6) + ok(status == STATUS_BUFFER_TOO_SMALL, "%d: status = 0x%x\n", i, status); +todo_wine_if (bytes_out != special_string_len[i]) + ok(bytes_out == special_string_len[i], "%d: expected %u, got %u\n", i, special_string_len[i], bytes_out); +todo_wine_if (i == 6) + ok(memcmp(buffer, special_expected, special_string_len[i]) == 0, "%d: bad conversion\n", i); + } - truncate_expect(0, 0, STATUS_BUFFER_TOO_SMALL); - truncate_expect(1, 1, STATUS_BUFFER_TOO_SMALL); - truncate_expect(2, 1, STATUS_BUFFER_TOO_SMALL); - truncate_expect(3, 3, STATUS_BUFFER_TOO_SMALL); - truncate_expect(4, 3, STATUS_BUFFER_TOO_SMALL); - truncate_expect(5, 3, STATUS_BUFFER_TOO_SMALL); - truncate_expect(6, 6, STATUS_BUFFER_TOO_SMALL); - truncate_expect(7, 7, STATUS_SOME_NOT_MAPPED); -#undef truncate_expect + status = pRtlUnicodeToUTF8N(buffer, 7, &bytes_out, special_string, sizeof(special_string)); +todo_wine + ok(status == STATUS_SOME_NOT_MAPPED, "status = 0x%x\n", status); +todo_wine + ok(bytes_out == special_string_len[7], "expected %u, got %u\n", special_string_len[7], bytes_out); +todo_wine + ok(memcmp(buffer, special_expected, 7) == 0, "bad conversion\n"); /* conversion behavior with varying input length */ for (input_len = 0; input_len <= sizeof(test_string); input_len++) { @@ -2216,15 +2225,19 @@ static void test_RtlUnicodeToUTF8N(void) status = pRtlUnicodeToUTF8N( buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, lstrlenW(unicode_to_utf8[i].unicode) * sizeof(WCHAR)); +todo_wine_if(unicode_to_utf8[i].status == STATUS_SOME_NOT_MAPPED) ok(status == unicode_to_utf8[i].status, "(test %d): status is 0x%x, expected 0x%x\n", i, status, unicode_to_utf8[i].status); +todo_wine_if(i == 9 || i == 10 || i == 11) +{ ok(bytes_out == strlen(unicode_to_utf8[i].expected), "(test %d): bytes_out is %u, expected %u\n", i, bytes_out, lstrlenA(unicode_to_utf8[i].expected)); ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", i, bytes_out, buffer, unicode_to_utf8[i].expected); +} ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); @@ -2234,6 +2247,8 @@ static void test_RtlUnicodeToUTF8N(void) status = pRtlUnicodeToUTF8N( buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, (lstrlenW(unicode_to_utf8[i].unicode) + 1) * sizeof(WCHAR)); +todo_wine_if(i == 9 || i == 10 || i == 11) +{ ok(status == unicode_to_utf8[i].status, "(test %d): status is 0x%x, expected 0x%x\n", i, status, unicode_to_utf8[i].status); @@ -2243,6 +2258,7 @@ static void test_RtlUnicodeToUTF8N(void) ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", i, bytes_out, buffer, unicode_to_utf8[i].expected); +} ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); } diff --git a/include/winternl.h b/include/winternl.h index 3f2e07b7e2..4d58aebe21 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2863,6 +2863,7 @@ NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToOemString(POEM_STRING,PCUNICODE_STRI NTSYSAPI NTSTATUS WINAPI RtlUnicodeToMultiByteN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToMultiByteSize(PULONG,PCWSTR,ULONG); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); +NTSYSAPI NTSTATUS WINAPI RtlUnicodeToUTF8N(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI ULONG WINAPI RtlUniform(PULONG); NTSYSAPI BOOLEAN WINAPI RtlUnlockHeap(HANDLE); NTSYSAPI void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID); -- 2.20.1

1 0

[PATCH v3 1/2] ntdll/tests: Fix compilation with PSDK compiler.
by Dmitry Timoshkov 12 Sep '19

12 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/rtlstr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 8b948fa82a..c2c82516cc 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1970,7 +1970,7 @@ static void test_RtlHashUnicodeString(void) status = pRtlHashUnicodeString(NULL, FALSE, HASH_STRING_ALGORITHM_X65599, &hash); ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); - RtlInitUnicodeString(&str, strW); + pRtlInitUnicodeString(&str, strW); status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_X65599, NULL); ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); @@ -1988,7 +1988,7 @@ static void test_RtlHashUnicodeString(void) ptr = hash_test; while (*ptr->str) { - RtlInitUnicodeString(&str, ptr->str); + pRtlInitUnicodeString(&str, ptr->str); hash = 0; status = pRtlHashUnicodeString(&str, ptr->case_insensitive, HASH_STRING_ALGORITHM_X65599, &hash); ok(status == STATUS_SUCCESS, "got status 0x%08x for %s\n", status, wine_dbgstr_w(ptr->str)); -- 2.20.1

1 0

[PATCH] wininet/tests: InternetQueryOption should return a valid value for username/password when using cached credentials
by Alistair Leslie-Hughes 12 Sep '19

12 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/tests/http.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a4521a94a4..80d2aad9f4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4425,6 +4425,7 @@ static void test_basic_auth_credentials_reuse(int port) HINTERNET ses, con, req; DWORD status, size; BOOL ret; + char buffer[0x40]; ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); ok( ses != NULL, "InternetOpenA failed\n" ); @@ -4439,6 +4440,20 @@ static void test_basic_auth_credentials_reuse(int port) ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "user"), "got %s\n", buffer); + ok(size == 4, "got %u\n", size); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); + ok(size == 3, "got %u\n", size); + status = 0xdeadbeef; size = sizeof(status); ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); @@ -4462,6 +4477,20 @@ static void test_basic_auth_credentials_reuse(int port) ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "user"), "got %s\n", buffer); + todo_wine ok(size == 4, "got %u\n", size); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); + todo_wine ok(size == 3, "got %u\n", size); + status = 0xdeadbeef; size = sizeof(status); ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); -- 2.17.1

2 2

[PATCH] winetest: Add support for WineTest's subtests.
by Francois Gouget 12 Sep '19

12 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index e5b2815fb..1bbd78ef2 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -2,6 +2,7 @@ # # Copyright (C) 2004 Ferenc Wagner # Copyright (C) 2008 Alexandre Julliard +# Copyright (C) 2017, 2019 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -442,8 +443,9 @@ while ($line = <IN> || "") # Parse the tests output # -my ($dll, $unit, $source, $rev, $result) = ("", "", ""); +my ($dll, $unit, $units_re, $source, $rev, $result) = ("", "", "", ""); my $unitsize = 0; +my %units; my ($failures, $todo, $skipped) = (0, 0, 0); my ($s_failures, $s_todo, $s_skipped, $s_total) = (0, 0, 0, 0); my (%pids, $rc, $summary, $broken); @@ -455,9 +457,9 @@ sub get_source_link($$) my $source_link = defined $_unit ? "$_unit.c" : $source ne "-" ? $source : "$dll:$unit"; $source_link .= ":$_lnum" if (defined $_lnum); - if (defined $_unit and $_unit ne $unit) + if (defined $_unit and !$units{$_unit}) { - # If the line is not for the current test unit we'll let its + # If the line is not for a current test unit we'll let its # developer hash it out with the polluter ;-) $broken = 1; } @@ -481,7 +483,7 @@ sub add_test_line($$) sub check_unit($$) { my ($l_unit, $l_type) = @_; - if ($l_unit ne $unit) + if (!$units{$l_unit}) { add_test_line("end", "Misplaced $l_type message\n"); $extra_failures++; @@ -576,7 +578,8 @@ sub close_test_unit($) mydie "too many failed test units (>$maxfailedtests at $dll:$unit)"; } - $dll = $unit = ""; + $dll = $unit = $units_re = ""; + %units = (); $unitsize = 0; $failures = $todo = $skipped = 0; $s_failures = $s_todo = $s_skipped = $s_total = 0; @@ -599,6 +602,8 @@ while ($line = <IN>) { close_test_unit(0) if ($dll ne ""); ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, $l_source, $l_rev); + %units = ($unit => 1); + $units_re = join("|", keys %units); $testbox = create_test_unit_box(); if ($l_type eq "skipped") @@ -609,40 +614,56 @@ while ($line = <IN>) { $rc = 0; } } + elsif ($line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)\r?$/) + { + my ($l_unit, $l_subunit) = ($1, $2); + if ($units{$l_unit}) + { + $units{$l_subunit} = 1; + $units_re = join("|", keys %units); + } + else + { + add_test_line("end", "Misplaced $l_subunit subtest\n"); + $extra_failures++; + } + } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("failed", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); + check_unit($l_unit, "failure"); $failures++; } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test marked todo: .*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (Test marked todo: .*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (Test marked todo: .*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("todo", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); + check_unit($l_unit, "todo"); $todo++; } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Tests skipped: .*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (Tests skipped: .*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (Tests skipped: .*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("skipped", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); # Don't complain and don't count misplaced skips - $skipped++ if ($l_unit eq $unit); + $skipped++ if ($units{$l_unit}); } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (.*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (.*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (.*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("trace", escapeHTML($pollution) . @@ -651,10 +672,10 @@ while ($line = <IN>) { } elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or ($unit ne "" and - $line =~ /(?:([0-9a-f]+):)?($unit): unhandled exception [0-9a-fA-F]{8} at /)) + $line =~ /(?:([0-9a-f]+):)?($units_re): unhandled exception [0-9a-fA-F]{8} at /)) { my ($l_pid, $l_unit) = ($1, $2); - if ($l_unit eq $unit) + if ($units{$l_unit}) { # This also replaces a test summary line. $pids{$l_pid || 0} = 1; @@ -706,6 +727,9 @@ while ($line = <IN>) { # Then switch to the new one, warning it's missing a start line, # and that its results may be inconsistent. ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-"); + %units = ($unit => 1); + $units_re = join("|", keys %units); + $testbox = create_test_unit_box(); add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)"); $extra_failures++; -- 2.20.1

1 0

[PATCH] testbot: Add support for WineTest's subtests.
by Francois Gouget 12 Sep '19

12 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3dca2e442..21f7dd054 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -183,6 +183,8 @@ sub _NewCurrentUnit($$) # complain about misplaced skips. Dll => $Dll, Unit => $Unit, + Units => {$Unit => 1}, + UnitsRE => $Unit, UnitSize => 0, LineFailures => 0, LineTodos => 0, @@ -209,7 +211,7 @@ sub _CheckUnit($$$$) { my ($Parser, $Cur, $Unit, $Type) = @_; - if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "") + if ($Cur->{Units}->{$Unit} or $Cur->{Unit} eq "") { $Parser->{IsWineTest} = 1; } @@ -337,28 +339,41 @@ sub ParseWineTestReport($$$) # Recognize skipped messages in case we need to skip tests in the VMs $Cur->{Rc} = 0 if ($Type eq "skipped"); } + elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)\r?$/) + { + my ($Unit, $SubUnit) = ($1, $2); + if ($Cur->{Units}->{$Unit}) + { + $Cur->{Units}->{$SubUnit} = 1; + $Cur->{UnitsRE} = join("|", keys %{$Cur->{Units}}); + } + else + { + _AddError($Parser, "Misplaced $SubUnit subtest\n"); + } + } elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): / or ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{Unit})\.c:\d+: Test (?:failed|succeeded inside todo block): /)) + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /)) { _CheckUnit($Parser, $Cur, $1, "failure"); $Cur->{LineFailures}++; } elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test marked todo: / or ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{Unit})\.c:\d+: Test marked todo: /)) + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test marked todo: /)) { _CheckUnit($Parser, $Cur, $1, "todo"); $Cur->{LineTodos}++; } elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Tests skipped: / or ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{Unit})\.c:\d+: Tests skipped: /)) + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Tests skipped: /)) { my $Unit = $1; # Don't complain and don't count misplaced skips. Only complain if they # are misreported (see _CloseTestUnit). - if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "") + if ($Cur->{Units}->{$Unit} or $Cur->{Unit} eq "") { $Cur->{LineSkips}++; } @@ -374,11 +389,11 @@ sub ParseWineTestReport($$$) } elsif ($Line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or ($Cur->{Unit} ne "" and - $Line =~ /(?:([0-9a-f]+):)?($Cur->{Unit}): unhandled exception [0-9a-fA-F]{8} at /)) + $Line =~ /(?:([0-9a-f]+):)?($Cur->{UnitsRE}): unhandled exception [0-9a-fA-F]{8} at /)) { my ($Pid, $Unit) = ($1, $2); - if ($Unit eq $Cur->{Unit}) + if ($Cur->{Units}->{$Unit}) { # This also replaces a test summary line. $Cur->{Pids}->{$Pid || 0} = 1; -- 2.20.1

1 0

[PATCH] testbot/reporttest: Add coverage for subtests.
by Francois Gouget 12 Sep '19

12 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/reporttest/report.template | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 2d074f9ae..00b6c2b35 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -557,7 +557,17 @@ comctl32:tooltips start dlls/comctl32/tests/toolbar.c - ----- Expected assessement: crashed comctl32:tooltips done (3221225477) in 0s -stub comctl32:trackbar +comctl32:trackbar start dlls/comctl32/tests/trackbar.c - +----- A unit test with a subtest +trackbar.c:496: Subtest driver +driver.c:40: Test failed: Something wrong +driver.c:41: Test succeeded inside todo block: Something right! +driver.c:42: Test marked todo: Hello Wine! +driver.c:43: Tests skipped: Another time +----- Expected assessement: 2 failures, 1 todo, 1 skip +07b1:trackbar: 3 tests executed (1 marked as todo, 2 failures), 1 skipped. +comctl32:trackbar:07b1 done (2) in 0s + stub comctl32:treeview stub comctl32:updown stub comdlg32:filedlg -- 2.20.1

1 0

[PATCH 1/3] libs/port: Make wine_utf8_wcstombs compute the resulting length on NULL input.
by Dmitry Timoshkov 12 Sep '19

12 Sep '19

For compatibility with RtlUnicodeToUTF8N. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- libs/port/utf8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/port/utf8.c b/libs/port/utf8.c index f47561e4bf..6dddd815c9 100644 --- a/libs/port/utf8.c +++ b/libs/port/utf8.c @@ -99,7 +99,7 @@ int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int { int len; - if (!dstlen) return get_length_wcs_utf8( flags, src, srclen ); + if (!dst) return get_length_wcs_utf8( flags, src, srclen ); for (len = dstlen; srclen; srclen--, src++) { -- 2.20.1

2 1

[PATCH 1/5] d3drm: Explicitly set initial viewport projection type.
by Jeff Smith 12 Sep '19

12 Sep '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/d3drm/tests/d3drm.c | 21 +++++++++++++++++++++ dlls/d3drm/viewport.c | 8 ++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0f9f9cd6ed..e826e595d8 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1733,6 +1733,7 @@ static void test_Viewport(void) RECT rc; DWORD data, ref1, ref2, ref3, ref4; DWORD initial_ref1, initial_ref2, initial_ref3, device_ref, frame_ref, frame_ref2, viewport_ref; + D3DRMPROJECTIONTYPE ptype; window = create_window(); GetClientRect(window, &rc); @@ -2150,6 +2151,8 @@ static void test_Viewport(void) ok(front == -1.0f, "Got unexpected front %.8e\n", front); back = IDirect3DRMViewport_GetBack(viewport); ok(back == -1.0f, "Got unexpected back %.8e\n", back); + ptype = IDirect3DRMViewport_GetProjection(viewport); + ok(ptype == -1, "Got unexpected projection type %u.\n", ptype); hr = IDirect3DRMViewport_SetCamera(viewport, frame); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); @@ -2161,6 +2164,8 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport_SetBack(viewport, 100.0f); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_PERSPECTIVE); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); /* Test all failures together */ hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom); @@ -2236,6 +2241,8 @@ static void test_Viewport(void) ok(front == 1.0f, "Got unexpected front %.8e.\n", front); back = IDirect3DRMViewport_GetBack(viewport); ok(back == 100.0f, "Got unexpected back %.8e.\n", back); + ptype = IDirect3DRMViewport_GetProjection(viewport); + ok(ptype == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %u.\n", ptype); hr = IDirect3DRMViewport_SetField(viewport, 1.0f); ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); @@ -2266,6 +2273,10 @@ static void test_Viewport(void) ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); back = IDirect3DRMViewport_GetBack(viewport); ok(back == 200.0f, "Got unexpected back %.8e.\n", back); + hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_ORTHOGRAPHIC); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + ptype = IDirect3DRMViewport_GetProjection(viewport); + ok(ptype == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %u.\n", ptype); hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -2333,6 +2344,8 @@ static void test_Viewport(void) ok(front == -1.0f, "Got unexpected front %.8e\n", front); back = IDirect3DRMViewport2_GetBack(viewport2); ok(back == -1.0f, "Got unexpected back %.8e\n", back); + ptype = IDirect3DRMViewport2_GetProjection(viewport2); + ok(ptype == -1, "Got unexpected projection type %u.\n", ptype); hr = IDirect3DRMViewport2_SetCamera(viewport2, frame3); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); @@ -2344,6 +2357,8 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport2_SetBack(viewport2, 100.0f); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_PERSPECTIVE); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -2412,6 +2427,8 @@ static void test_Viewport(void) ok(front == 1.0f, "Got unexpected front %.8e.\n", front); back = IDirect3DRMViewport2_GetBack(viewport2); ok(back == 100.0f, "Got unexpected back %.8e.\n", back); + ptype = IDirect3DRMViewport2_GetProjection(viewport2); + ok(ptype == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %u.\n", ptype); hr = IDirect3DRMViewport2_SetField(viewport2, 1.0f); ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); @@ -2442,6 +2459,10 @@ static void test_Viewport(void) ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); back = IDirect3DRMViewport2_GetBack(viewport2); ok(back == 200.0f, "Got unexpected back %.8e.\n", back); + hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_ORTHOGRAPHIC); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + ptype = IDirect3DRMViewport2_GetProjection(viewport2); + ok(ptype == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %u.\n", ptype); hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 8e959d5f37..da6b38b110 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -376,6 +376,8 @@ static HRESULT WINAPI d3drm_viewport2_Init(IDirect3DRMViewport2 *iface, IDirect3 viewport->clip.front = 1.0f; viewport->clip.back = 100.0f; + viewport->projection = D3DRMPROJECT_PERSPECTIVE; + cleanup: if (FAILED(hr)) @@ -613,6 +615,9 @@ static HRESULT WINAPI d3drm_viewport2_SetProjection(IDirect3DRMViewport2 *iface, TRACE("iface %p, type %#x.\n", iface, type); + if (!viewport->d3d_viewport) + return D3DRMERR_BADOBJECT; + viewport->projection = type; return D3DRM_OK; @@ -975,6 +980,9 @@ static D3DRMPROJECTIONTYPE WINAPI d3drm_viewport2_GetProjection(IDirect3DRMViewp TRACE("iface %p.\n", iface); + if (!viewport->d3d_viewport) + return (D3DRMPROJECTIONTYPE)(-1); + return viewport->projection; } -- 2.21.0

1 4

[PATCH v2 3/3] ntdll: Implement RtlUnicodeToUTF8N.
by Dmitry Timoshkov 12 Sep '19

12 Sep '19

v2: replace a macro-driven test block by a more manageable test loop. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtlstr.c | 25 +++++++++++++++++++++++ dlls/ntdll/tests/rtlstr.c | 42 ++++++++++++++++++++++++++------------- include/winternl.h | 1 + 4 files changed, 55 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 98a423adfb..5a6f4e4ed4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -980,6 +980,7 @@ @ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) @ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) @ stdcall RtlUnicodeToOemN(ptr long ptr ptr long) +@ stdcall RtlUnicodeToUTF8N(ptr long ptr ptr long) @ stdcall RtlUniform(ptr) # @ stub RtlUnlockBootStatusData @ stdcall RtlUnlockHeap(long) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 6b60d36a1c..7ca10aa579 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -908,6 +908,31 @@ NTSTATUS WINAPI RtlUnicodeToOemN( LPSTR dst, DWORD dstlen, LPDWORD reslen, } +/************************************************************************** + * RtlUnicodeToUTF8N (NTDLL.@) + * + * Converts a Unicode string to a UTF-8 string. + * + * RETURNS + * NTSTATUS code + */ +NTSTATUS WINAPI RtlUnicodeToUTF8N( LPSTR dst, DWORD dstlen, LPDWORD reslen, + LPCWSTR src, DWORD srclen) +{ + int ret; + + if (!src) return STATUS_INVALID_PARAMETER_4; + if (!reslen) return STATUS_INVALID_PARAMETER; + if (dst && (srclen & 1)) return STATUS_INVALID_PARAMETER_5; + + ret = wine_utf8_wcstombs( 0, src, srclen / sizeof(WCHAR), dst, dstlen ); + if (reslen) + *reslen = (ret >= 0) ? ret : dstlen; /* overflow -> we filled up to dstlen */ + if (ret < 0) return STATUS_BUFFER_TOO_SMALL; + return STATUS_SUCCESS; +} + + /* CASE CONVERSIONS */ diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index c2c82516cc..b577c0bb63 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -2082,6 +2082,7 @@ static void test_RtlUnicodeToUTF8N(void) const WCHAR empty_string[] = { 0 }; const WCHAR test_string[] = { 'A',0,'a','b','c','d','e','f','g',0 }; const WCHAR special_string[] = { 'X',0x80,0xd800,0 }; + const ULONG special_string_len[] = { 0, 1, 1, 3, 3, 3, 6, 7 }; const unsigned char special_expected[] = { 'X',0xc2,0x80,0xef,0xbf,0xbd,0 }; unsigned int input_len; const unsigned int test_count = ARRAY_SIZE(unicode_to_utf8); @@ -2151,25 +2152,31 @@ static void test_RtlUnicodeToUTF8N(void) length_expect(0, 0, STATUS_SUCCESS); length_expect(1, 1, STATUS_SUCCESS); length_expect(2, 3, STATUS_SUCCESS); +todo_wine +{ length_expect(3, 6, STATUS_SOME_NOT_MAPPED); length_expect(4, 7, STATUS_SOME_NOT_MAPPED); +} #undef length_expect - /* output truncation */ -#define truncate_expect(buflen, out_bytes, expect_status) \ - utf8_expect_(special_expected, buflen, out_bytes, \ - special_string, sizeof(special_string), \ - expect_status, __LINE__) + for (i = 0; i <= 6; i++) + { + memset(buffer, 0x55, sizeof(buffer)); + bytes_out = 0xdeadbeef; + status = pRtlUnicodeToUTF8N(buffer, i, &bytes_out, special_string, sizeof(special_string)); +todo_wine_if (i == 4 || i == 5 || i == 6) + ok(status == STATUS_BUFFER_TOO_SMALL, "%d: status = 0x%x\n", i, status); +todo_wine_if (bytes_out != special_string_len[i]) + ok(bytes_out == special_string_len[i], "%d: expected %u, got %u\n", i, special_string_len[i], bytes_out); +todo_wine_if (i == 6) + ok(memcmp(buffer, special_expected, special_string_len[i]) == 0, "%d: bad conversion\n", i); + } - truncate_expect(0, 0, STATUS_BUFFER_TOO_SMALL); - truncate_expect(1, 1, STATUS_BUFFER_TOO_SMALL); - truncate_expect(2, 1, STATUS_BUFFER_TOO_SMALL); - truncate_expect(3, 3, STATUS_BUFFER_TOO_SMALL); - truncate_expect(4, 3, STATUS_BUFFER_TOO_SMALL); - truncate_expect(5, 3, STATUS_BUFFER_TOO_SMALL); - truncate_expect(6, 6, STATUS_BUFFER_TOO_SMALL); - truncate_expect(7, 7, STATUS_SOME_NOT_MAPPED); -#undef truncate_expect + status = pRtlUnicodeToUTF8N(buffer, 7, &bytes_out, special_string, sizeof(special_string)); +todo_wine + ok(status == STATUS_SOME_NOT_MAPPED, "status = 0x%x\n", status); +todo_wine + ok(memcmp(buffer, special_expected, 7) == 0, "bad conversion\n"); /* conversion behavior with varying input length */ for (input_len = 0; input_len <= sizeof(test_string); input_len++) { @@ -2216,15 +2223,19 @@ static void test_RtlUnicodeToUTF8N(void) status = pRtlUnicodeToUTF8N( buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, lstrlenW(unicode_to_utf8[i].unicode) * sizeof(WCHAR)); +todo_wine_if(unicode_to_utf8[i].status == STATUS_SOME_NOT_MAPPED) ok(status == unicode_to_utf8[i].status, "(test %d): status is 0x%x, expected 0x%x\n", i, status, unicode_to_utf8[i].status); +todo_wine_if(i == 9 || i == 10 || i == 11) +{ ok(bytes_out == strlen(unicode_to_utf8[i].expected), "(test %d): bytes_out is %u, expected %u\n", i, bytes_out, lstrlenA(unicode_to_utf8[i].expected)); ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", i, bytes_out, buffer, unicode_to_utf8[i].expected); +} ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); @@ -2234,6 +2245,8 @@ static void test_RtlUnicodeToUTF8N(void) status = pRtlUnicodeToUTF8N( buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, (lstrlenW(unicode_to_utf8[i].unicode) + 1) * sizeof(WCHAR)); +todo_wine_if(i == 9 || i == 10 || i == 11) +{ ok(status == unicode_to_utf8[i].status, "(test %d): status is 0x%x, expected 0x%x\n", i, status, unicode_to_utf8[i].status); @@ -2243,6 +2256,7 @@ static void test_RtlUnicodeToUTF8N(void) ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", i, bytes_out, buffer, unicode_to_utf8[i].expected); +} ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); } diff --git a/include/winternl.h b/include/winternl.h index 3f2e07b7e2..4d58aebe21 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2863,6 +2863,7 @@ NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToOemString(POEM_STRING,PCUNICODE_STRI NTSYSAPI NTSTATUS WINAPI RtlUnicodeToMultiByteN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToMultiByteSize(PULONG,PCWSTR,ULONG); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); +NTSYSAPI NTSTATUS WINAPI RtlUnicodeToUTF8N(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI ULONG WINAPI RtlUniform(PULONG); NTSYSAPI BOOLEAN WINAPI RtlUnlockHeap(HANDLE); NTSYSAPI void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID); -- 2.20.1

1 0

[PATCH 2/3] ntdll/tests: Fix compilation with PSDK compiler.
by Dmitry Timoshkov 12 Sep '19

12 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/rtlstr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 8b948fa82a..c2c82516cc 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1970,7 +1970,7 @@ static void test_RtlHashUnicodeString(void) status = pRtlHashUnicodeString(NULL, FALSE, HASH_STRING_ALGORITHM_X65599, &hash); ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); - RtlInitUnicodeString(&str, strW); + pRtlInitUnicodeString(&str, strW); status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_X65599, NULL); ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); @@ -1988,7 +1988,7 @@ static void test_RtlHashUnicodeString(void) ptr = hash_test; while (*ptr->str) { - RtlInitUnicodeString(&str, ptr->str); + pRtlInitUnicodeString(&str, ptr->str); hash = 0; status = pRtlHashUnicodeString(&str, ptr->case_insensitive, HASH_STRING_ALGORITHM_X65599, &hash); ok(status == STATUS_SUCCESS, "got status 0x%08x for %s\n", status, wine_dbgstr_w(ptr->str)); -- 2.20.1

1 0

[PATCH] gdi32: Handle HeapAlloc failure in SetEnhMetaFileBits (scan-build)
by Alex Henrie 12 Sep '19

12 Sep '19

And use the more efficient memcpy function since the buffers can't overlap. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/gdi32/enhmetafile.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index a3360c269a..fde9109d1b 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -480,7 +480,9 @@ HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT bufsize, const BYTE *buf) { ENHMETAHEADER *emh = HeapAlloc( GetProcessHeap(), 0, bufsize ); HENHMETAFILE hmf; - memmove(emh, buf, bufsize); + if (!emh) + return NULL; + memcpy(emh, buf, bufsize); hmf = EMF_Create_HENHMETAFILE( emh, bufsize, FALSE ); if (!hmf) HeapFree( GetProcessHeap(), 0, emh ); -- 2.23.0

2 1

[PATCH] wininet: Fix integer division by zero in FTP_SendData (scan-build)
by Alex Henrie 12 Sep '19

12 Sep '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wininet/ftp.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index f2a88b741e..24ad5f228b 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -3315,18 +3315,13 @@ static BOOL FTP_SendData(ftp_session_t *lpwfs, INT nDataSocket, HANDLE hFile) /* Do some computation to display the status. */ time(&e_long_time); nSeconds = e_long_time - s_long_time; - if( nSeconds / 60 > 0 ) - { - TRACE( "%d bytes of %d bytes (%d%%) in %d min %d sec estimated remaining time %d sec\n", - nTotalSent, fi.nFileSizeLow, nTotalSent*100/fi.nFileSizeLow, nSeconds / 60, - nSeconds % 60, (fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent ); - } - else - { - TRACE( "%d bytes of %d bytes (%d%%) in %d sec estimated remaining time %d sec\n", - nTotalSent, fi.nFileSizeLow, nTotalSent*100/fi.nFileSizeLow, nSeconds, - (fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent); - } + TRACE("%d bytes of %d bytes (%d%%) in", nTotalSent, fi.nFileSizeLow, nTotalSent*100/fi.nFileSizeLow); + if (nSeconds / 60 > 0) + TRACE(" %d min", nSeconds / 60); + TRACE(" %d sec", nSeconds % 60); + if (nTotalSent) + TRACE(" estimated remaining time %d sec", (fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent); + TRACE("\n"); } while (nRC != -1); TRACE("file transfer complete!\n"); -- 2.23.0

2 1

[PATCH] winex11: Factor out array access in ConvertAttribWGLtoGLX (scan-build)
by Alex Henrie 12 Sep '19

12 Sep '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winex11.drv/opengl.c | 41 ++++++++------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ee28a1d790..df843f5725 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -751,7 +751,7 @@ static const char *debugstr_fbconfig( GLXFBConfig fbconfig ) static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_pbuffer* pbuf) { int nAttribs = 0; unsigned cur = 0; - int pop; + int attr, pop; int drawattrib = 0; int nvfloatattrib = GLX_DONT_CARE; int pixelattrib = GLX_DONT_CARE; @@ -759,62 +759,53 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ /* The list of WGL attributes is allowed to be NULL. We don't return here for NULL * because we need to do fixups for GLX_DRAWABLE_TYPE/GLX_RENDER_TYPE/GLX_FLOAT_COMPONENTS_NV. */ while (iWGLAttr && 0 != iWGLAttr[cur]) { - TRACE("pAttr[%d] = %x\n", cur, iWGLAttr[cur]); + attr = iWGLAttr[cur]; + TRACE("pAttr[%d] = %x\n", cur, attr); + pop = iWGLAttr[++cur]; - switch (iWGLAttr[cur]) { + switch (attr) { case WGL_AUX_BUFFERS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_AUX_BUFFERS, pop); TRACE("pAttr[%d] = GLX_AUX_BUFFERS: %d\n", cur, pop); break; case WGL_COLOR_BITS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_BUFFER_SIZE, pop); TRACE("pAttr[%d] = GLX_BUFFER_SIZE: %d\n", cur, pop); break; case WGL_BLUE_BITS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_BLUE_SIZE, pop); TRACE("pAttr[%d] = GLX_BLUE_SIZE: %d\n", cur, pop); break; case WGL_RED_BITS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_RED_SIZE, pop); TRACE("pAttr[%d] = GLX_RED_SIZE: %d\n", cur, pop); break; case WGL_GREEN_BITS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_GREEN_SIZE, pop); TRACE("pAttr[%d] = GLX_GREEN_SIZE: %d\n", cur, pop); break; case WGL_ALPHA_BITS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_ALPHA_SIZE, pop); TRACE("pAttr[%d] = GLX_ALPHA_SIZE: %d\n", cur, pop); break; case WGL_DEPTH_BITS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_DEPTH_SIZE, pop); TRACE("pAttr[%d] = GLX_DEPTH_SIZE: %d\n", cur, pop); break; case WGL_STENCIL_BITS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_STENCIL_SIZE, pop); TRACE("pAttr[%d] = GLX_STENCIL_SIZE: %d\n", cur, pop); break; case WGL_DOUBLE_BUFFER_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_DOUBLEBUFFER, pop); TRACE("pAttr[%d] = GLX_DOUBLEBUFFER: %d\n", cur, pop); break; case WGL_STEREO_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_STEREO, pop); TRACE("pAttr[%d] = GLX_STEREO: %d\n", cur, pop); break; case WGL_PIXEL_TYPE_ARB: - pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_PIXEL_TYPE_ARB: %d\n", cur, pop); switch (pop) { case WGL_TYPE_COLORINDEX_ARB: pixelattrib = GLX_COLOR_INDEX_BIT; break ; @@ -824,24 +815,20 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: pixelattrib = GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT; break ; default: ERR("unexpected PixelType(%x)\n", pop); - pop = 0; } break; case WGL_SUPPORT_GDI_ARB: /* This flag is set in a pixel format */ - pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_SUPPORT_GDI_ARB: %d\n", cur, pop); break; case WGL_DRAW_TO_BITMAP_ARB: /* This flag is set in a pixel format */ - pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_DRAW_TO_BITMAP_ARB: %d\n", cur, pop); break; case WGL_DRAW_TO_WINDOW_ARB: - pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_DRAW_TO_WINDOW_ARB: %d\n", cur, pop); /* GLX_DRAWABLE_TYPE flags need to be OR'd together. See below. */ if (pop) { @@ -850,7 +837,6 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ break; case WGL_DRAW_TO_PBUFFER_ARB: - pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_DRAW_TO_PBUFFER_ARB: %d\n", cur, pop); /* GLX_DRAWABLE_TYPE flags need to be OR'd together. See below. */ if (pop) { @@ -860,18 +846,15 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ case WGL_ACCELERATION_ARB: /* This flag is set in a pixel format */ - pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_ACCELERATION_ARB: %d\n", cur, pop); break; case WGL_SUPPORT_OPENGL_ARB: - pop = iWGLAttr[++cur]; /** nothing to do, if we are here, supposing support Accelerated OpenGL */ TRACE("pAttr[%d] = WGL_SUPPORT_OPENGL_ARB: %d\n", cur, pop); break; case WGL_SWAP_METHOD_ARB: - pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_SWAP_METHOD_ARB: %#x\n", cur, pop); if (has_swap_method) { @@ -899,19 +882,16 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ break; case WGL_PBUFFER_LARGEST_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_LARGEST_PBUFFER, pop); TRACE("pAttr[%d] = GLX_LARGEST_PBUFFER: %x\n", cur, pop); break; case WGL_SAMPLE_BUFFERS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_SAMPLE_BUFFERS_ARB, pop); TRACE("pAttr[%d] = GLX_SAMPLE_BUFFERS_ARB: %x\n", cur, pop); break; case WGL_SAMPLES_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_SAMPLES_ARB, pop); TRACE("pAttr[%d] = GLX_SAMPLES_ARB: %x\n", cur, pop); break; @@ -919,8 +899,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ case WGL_TEXTURE_FORMAT_ARB: case WGL_TEXTURE_TARGET_ARB: case WGL_MIPMAP_TEXTURE_ARB: - TRACE("WGL_render_texture Attributes: %x as %x\n", iWGLAttr[cur], iWGLAttr[cur + 1]); - pop = iWGLAttr[++cur]; + TRACE("WGL_render_texture Attributes: %x as %x\n", iWGLAttr[cur - 1], iWGLAttr[cur]); if (NULL == pbuf) { ERR("trying to use GLX_Pbuffer Attributes without Pbuffer (was %x)\n", iWGLAttr[cur]); } @@ -934,7 +913,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ } break ; case WGL_FLOAT_COMPONENTS_NV: - nvfloatattrib = iWGLAttr[++cur]; + nvfloatattrib = pop; TRACE("pAttr[%d] = WGL_FLOAT_COMPONENTS_NV: %x\n", cur, nvfloatattrib); break ; case WGL_BIND_TO_TEXTURE_DEPTH_NV: @@ -944,26 +923,22 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV: case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV: case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV: - pop = iWGLAttr[++cur]; /** cannot be converted, see direct handling on * - wglGetPixelFormatAttribivARB * TODO: wglChoosePixelFormat */ break ; case WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT, pop); TRACE("pAttr[%d] = GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT: %x\n", cur, pop); break ; case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT, pop); TRACE("pAttr[%d] = GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT: %x\n", cur, pop); break ; default: - FIXME("unsupported %x WGL Attribute\n", iWGLAttr[cur]); - cur++; + FIXME("unsupported %x WGL Attribute\n", iWGLAttr[cur-1]); break; } ++cur; -- 2.23.0

1 0

[PATCH] ntdll: Ensure that performance information is initialized (scan-build)
by Alex Henrie 12 Sep '19

12 Sep '19

And comment this code out on non-Linux systems which don't have /proc. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/nt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 06f8f39b16..efc4c8adcf 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2415,13 +2415,16 @@ NTSTATUS WINAPI NtQuerySystemInformation( { SYSTEM_PERFORMANCE_INFORMATION spi; static BOOL fixme_written = FALSE; +#ifdef linux FILE *fp; +#endif memset(&spi, 0 , sizeof(spi)); len = sizeof(spi); spi.Reserved3 = 0x7fffffff; /* Available paged pool memory? */ +#ifdef linux if ((fp = fopen("/proc/uptime", "r"))) { double uptime, idle_time; @@ -2439,7 +2442,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( if ((fp = fopen("/proc/meminfo", "r"))) { - unsigned long long totalram, freeram, totalswap, freeswap; + unsigned long long totalram = 0, freeram = 0, totalswap = 0, freeswap = 0; char line[64]; while (fgets(line, sizeof(line), fp)) { @@ -2467,6 +2470,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( spi.TotalCommittedPages = (totalram + totalswap - freeram - freeswap) / page_size; spi.TotalCommitLimit = (totalram + totalswap) / page_size; } +#endif if (Length >= len) { -- 2.23.0

1 0

[PATCH] winedbg: Fix dependence on undefined left-shift behavior (scan-build)
by Alex Henrie 12 Sep '19

12 Sep '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/winedbg/be_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 136229fbd6..2346bc4d1f 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -640,7 +640,7 @@ static BOOL be_x86_64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned si if (!memory_read_value(lvalue, size, ret)) return FALSE; /* propagate sign information */ - if (is_signed && size < 16 && (*ret >> (size * 8 - 1)) != 0) + if (is_signed && size < sizeof(*ret) && (*ret >> (size * 8 - 1)) != 0) { ULONGLONG neg = -1; *ret |= neg << (size * 8); -- 2.23.0

1 0

[PATCH] server: Fix use after free in add_committed_range (scan-build)
by Alex Henrie 12 Sep '19

12 Sep '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- server/mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/mapping.c b/server/mapping.c index 0728fdc14f..6990a1913d 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -404,7 +404,7 @@ static void add_committed_range( struct memory_view *view, file_pos_t start, fil struct range *new_ptr = realloc( committed->ranges, new_size * sizeof(*new_ptr) ); if (!new_ptr) return; committed->max = new_size; - committed->ranges = new_ptr; + ranges = committed->ranges = new_ptr; } memmove( &ranges[i + 1], &ranges[i], (committed->count - i) * sizeof(*ranges) ); ranges[i].start = start; -- 2.23.0

1 0

[PATCH v2 0/8] Resend with corrected sechost tests
by Micah N Gorrell 12 Sep '19

12 Sep '19

v2 skips the I_ScRegisterDeviceNotification on versions of windows where that interface does not exist. Micah N Gorrell (8): advapi32: Replace usage of internal SERV_ functions with exported functions advapi32: Replace SERV_dup() with strdupAW() advapi32: Move RPC interfaces from advapi32 into sechost sechost: Implement I_ScRegisterDeviceNotification() ntoskrnl.exe: Implement sending of device notifications user32: Implement RegisterDeviceNotification() user32/tests: Add test for RegisterDeviceNotification() sechost/tests: Add test for I_ScRegisterDeviceNotification() configure.ac | 2 + dlls/advapi32/Makefile.in | 5 +- dlls/advapi32/advapi32.spec | 92 ++++---- dlls/advapi32/advapi32_misc.h | 4 - dlls/advapi32/eventlog.c | 12 +- dlls/advapi32/security.c | 54 +++-- dlls/ntoskrnl.exe/Makefile.in | 4 +- dlls/ntoskrnl.exe/ntoskrnl_private.h | 5 + dlls/ntoskrnl.exe/pnp.c | 1 + dlls/ntoskrnl.exe/rpc.c | 182 ++++++++++++++++ dlls/{advapi32 => ntoskrnl.exe}/svcctl.idl | 0 dlls/sechost/Makefile.in | 8 + dlls/sechost/sechost.spec | 48 +++++ dlls/{advapi32 => sechost}/service.c | 239 ++++++++++++++++----- dlls/sechost/svcctl.idl | 3 + dlls/sechost/tests/Makefile.in | 5 + dlls/sechost/tests/devnotify.c | 102 +++++++++ dlls/user32/Makefile.in | 2 +- dlls/user32/misc.c | 73 ++++++- dlls/user32/tests/input.c | 70 +++++- include/wine/svcctl.idl | 20 ++ include/winsvc.h | 14 ++ include/winuser.h | 4 +- programs/services/rpc.c | 169 ++++++++++++++- 24 files changed, 976 insertions(+), 142 deletions(-) create mode 100644 dlls/ntoskrnl.exe/rpc.c rename dlls/{advapi32 => ntoskrnl.exe}/svcctl.idl (100%) create mode 100644 dlls/sechost/Makefile.in create mode 100644 dlls/sechost/sechost.spec rename dlls/{advapi32 => sechost}/service.c (93%) create mode 100644 dlls/sechost/svcctl.idl create mode 100644 dlls/sechost/tests/Makefile.in create mode 100644 dlls/sechost/tests/devnotify.c -- 2.23.0

3 17

[PATCH] user32: Fail if an invalid window handle is passed to GetMessage().
by Zebediah Figura 12 Sep '19

12 Sep '19

Fixes a hang when closing Windows Media Player 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/message.c | 8 +++++++- dlls/user32/tests/msg.c | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 860ceefc38d..b0ab5be902b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3836,6 +3836,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT HANDLE server_queue = get_server_queue_handle(); unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE; /* Always selected */ + if (hwnd && !IsWindow( hwnd )) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return -1; + } + USER_CheckNotLock(); check_for_driver_events( 0 ); @@ -3866,7 +3872,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT BOOL WINAPI DECLSPEC_HOTPATCH GetMessageA( MSG *msg, HWND hwnd, UINT first, UINT last ) { if (get_pending_wmchar( msg, first, last, TRUE )) return TRUE; - GetMessageW( msg, hwnd, first, last ); + if (GetMessageW( msg, hwnd, first, last ) == -1) return -1; map_wparam_WtoA( msg, TRUE ); return (msg->message != WM_QUIT); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 91d3fcc4846..aa5b89d15ec 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17692,6 +17692,17 @@ static void test_SendMessage_pump(void) DestroyWindow(hwnd); } +static void test_invalid_window(void) +{ + MSG msg; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = GetMessageA(&msg, (HWND)0xdeadbeef, 0, 0); + ok(ret == -1, "wrong ret %d\n", ret); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError()); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -17817,6 +17828,7 @@ START_TEST(msg) test_notify_message(); test_SetActiveWindow(); test_restore_messages(); + test_invalid_window(); if (!pTrackMouseEvent) win_skip("TrackMouseEvent is not available\n"); -- 2.23.0

3 3

[PATCH] ntdll: Implement RtlUnicodeToUTF8N.
by Dmitry Timoshkov 11 Sep '19

11 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtlstr.c | 25 +++++++++++++++++++++++++ dlls/ntdll/tests/rtlstr.c | 13 +++++++++++++ include/winternl.h | 1 + 4 files changed, 40 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 98a423adfb..5a6f4e4ed4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -980,6 +980,7 @@ @ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) @ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) @ stdcall RtlUnicodeToOemN(ptr long ptr ptr long) +@ stdcall RtlUnicodeToUTF8N(ptr long ptr ptr long) @ stdcall RtlUniform(ptr) # @ stub RtlUnlockBootStatusData @ stdcall RtlUnlockHeap(long) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 6b60d36a1c..7ca10aa579 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -908,6 +908,31 @@ NTSTATUS WINAPI RtlUnicodeToOemN( LPSTR dst, DWORD dstlen, LPDWORD reslen, } +/************************************************************************** + * RtlUnicodeToUTF8N (NTDLL.@) + * + * Converts a Unicode string to a UTF-8 string. + * + * RETURNS + * NTSTATUS code + */ +NTSTATUS WINAPI RtlUnicodeToUTF8N( LPSTR dst, DWORD dstlen, LPDWORD reslen, + LPCWSTR src, DWORD srclen) +{ + int ret; + + if (!src) return STATUS_INVALID_PARAMETER_4; + if (!reslen) return STATUS_INVALID_PARAMETER; + if (dst && (srclen & 1)) return STATUS_INVALID_PARAMETER_5; + + ret = wine_utf8_wcstombs( 0, src, srclen / sizeof(WCHAR), dst, dstlen ); + if (reslen) + *reslen = (ret >= 0) ? ret : dstlen; /* overflow -> we filled up to dstlen */ + if (ret < 0) return STATUS_BUFFER_TOO_SMALL; + return STATUS_SUCCESS; +} + + /* CASE CONVERSIONS */ diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 8b948fa82a..78b2a314d5 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -2151,10 +2151,15 @@ static void test_RtlUnicodeToUTF8N(void) length_expect(0, 0, STATUS_SUCCESS); length_expect(1, 1, STATUS_SUCCESS); length_expect(2, 3, STATUS_SUCCESS); +todo_wine +{ length_expect(3, 6, STATUS_SOME_NOT_MAPPED); length_expect(4, 7, STATUS_SOME_NOT_MAPPED); +} #undef length_expect +if (winetest_interactive) /* FIXME: special cases cause too much failures */ +{ /* output truncation */ #define truncate_expect(buflen, out_bytes, expect_status) \ utf8_expect_(special_expected, buflen, out_bytes, \ @@ -2170,6 +2175,7 @@ static void test_RtlUnicodeToUTF8N(void) truncate_expect(6, 6, STATUS_BUFFER_TOO_SMALL); truncate_expect(7, 7, STATUS_SOME_NOT_MAPPED); #undef truncate_expect +} /* conversion behavior with varying input length */ for (input_len = 0; input_len <= sizeof(test_string); input_len++) { @@ -2216,15 +2222,19 @@ static void test_RtlUnicodeToUTF8N(void) status = pRtlUnicodeToUTF8N( buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, lstrlenW(unicode_to_utf8[i].unicode) * sizeof(WCHAR)); +todo_wine_if(unicode_to_utf8[i].status == STATUS_SOME_NOT_MAPPED) ok(status == unicode_to_utf8[i].status, "(test %d): status is 0x%x, expected 0x%x\n", i, status, unicode_to_utf8[i].status); +todo_wine_if(i == 9 || i == 10 || i == 11) +{ ok(bytes_out == strlen(unicode_to_utf8[i].expected), "(test %d): bytes_out is %u, expected %u\n", i, bytes_out, lstrlenA(unicode_to_utf8[i].expected)); ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", i, bytes_out, buffer, unicode_to_utf8[i].expected); +} ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); @@ -2234,6 +2244,8 @@ static void test_RtlUnicodeToUTF8N(void) status = pRtlUnicodeToUTF8N( buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, (lstrlenW(unicode_to_utf8[i].unicode) + 1) * sizeof(WCHAR)); +todo_wine_if(i == 9 || i == 10 || i == 11) +{ ok(status == unicode_to_utf8[i].status, "(test %d): status is 0x%x, expected 0x%x\n", i, status, unicode_to_utf8[i].status); @@ -2243,6 +2255,7 @@ static void test_RtlUnicodeToUTF8N(void) ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", i, bytes_out, buffer, unicode_to_utf8[i].expected); +} ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); } diff --git a/include/winternl.h b/include/winternl.h index 3f2e07b7e2..4d58aebe21 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2863,6 +2863,7 @@ NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToOemString(POEM_STRING,PCUNICODE_STRI NTSYSAPI NTSTATUS WINAPI RtlUnicodeToMultiByteN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToMultiByteSize(PULONG,PCWSTR,ULONG); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); +NTSYSAPI NTSTATUS WINAPI RtlUnicodeToUTF8N(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI ULONG WINAPI RtlUniform(PULONG); NTSYSAPI BOOLEAN WINAPI RtlUnlockHeap(HANDLE); NTSYSAPI void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID); -- 2.20.1

2 3

[RFC PATCH 0/8] Listening to keyboard in background, RawInput and DInput
by Rémi Bernon 11 Sep '19

11 Sep '19

Hi all, I'm sending out this as follow-up of my previous e-mail [1] about dinput and background input processing, hopefully to get some comments and to discuss about the idea and the implementation. The patch series also depends on some additional dinput8 patches I already sent to the mailing list, to implement dinput8 devices on top of raw input, but I think they can be independent. There's a few points I believe that may be of concern, the main one being a privacy issue. Allowing Wine applications to listen to input while in background would allow keyloggers to work in Wine. One could argue though that this implementation does not use any priviledged method for that, and that Xlib allows any application to listen to raw input events in background. I guess there may be some ways to get an exclusive device access, to prevent other apps to get the events but I didn't investigate this part. Also, this is currently only used for Wine dinput8 implementation, so we could also add some internal mechanism to enforce only Wine dinput8 to be able to access these events. [1] https://www.winehq.org/pipermail/wine-devel/2019-August/149941.html -- Rémi Bernon <rbernon(a)codeweavers.com> Derek Lesho (1): user32: Add support for RIDEV_NOLEGACY flag. Rémi Bernon (7): server: Add send_hardware_message flags to hint raw input translation. user32: Add __wine_send_input flags to hint raw input translation. server: Implement raw mouse/keyboard input message broadcast. user32: Add support for RIDEV_INPUTSINK flag. winex11.drv: Listen to XInput2 master devices only. winex11.drv: Listen to RawMotion and RawButton* events in the desktop thread. winex11.drv: Listen to RawKey* events in the desktop thread. dlls/user32/input.c | 4 +- dlls/user32/rawinput.c | 9 ++- dlls/user32/tests/rawinput.c | 2 - dlls/user32/user32.spec | 2 +- dlls/wineandroid.drv/keyboard.c | 2 +- dlls/wineandroid.drv/window.c | 4 +- dlls/winemac.drv/ime.c | 4 +- dlls/winemac.drv/keyboard.c | 2 +- dlls/winemac.drv/mouse.c | 2 +- dlls/winex11.drv/event.c | 42 +--------- dlls/winex11.drv/keyboard.c | 42 +++++++++- dlls/winex11.drv/mouse.c | 131 +++++++++++++++++++------------- dlls/winex11.drv/x11drv.h | 7 +- dlls/winex11.drv/x11drv_main.c | 5 ++ include/winuser.h | 2 +- server/protocol.def | 3 + server/queue.c | 106 +++++++++++++++++++++----- 17 files changed, 236 insertions(+), 133 deletions(-) -- 2.23.0

3 17

[PATCH] include: Pick up the ms_hook_prologue attribute for Clang, too.
by Chip Davis 11 Sep '19

11 Sep '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- include/winnt.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 67d33f0d78fc..9c4174f310d6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -163,7 +163,11 @@ extern "C" { # define DECLSPEC_HIDDEN #endif -#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6))) && (defined(__i386__) || defined(__x86_64__)) +#ifndef __has_attribute +# define __has_attribute(x) 0 +#endif + +#if ((defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)))) || __has_attribute(ms_hook_prologue)) && (defined(__i386__) || defined(__x86_64__)) #define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__)) #else #define DECLSPEC_HOTPATCH -- 2.21.0

1 0

[PATCH] testbot/VMs: Make sure only one process uses a VM at a time.
by Francois Gouget 11 Sep '19

11 Sep '19

The TestBot should already be respecting that rule. But starting a process to operate on a VM always goes through VM::Run() so enforce this rule by checking that the VM's ChildPid field is not already set before starting a new process. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 78e066fe9..2bf350435 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -154,6 +154,7 @@ use WineTestBot::LibvirtDomain; use WineTestBot::Missions; use WineTestBot::RecordGroups; use WineTestBot::TestAgent; +use WineTestBot::Utils; sub _initialize($$) @@ -374,9 +375,16 @@ sub OnSaved($) sub Run($$$$$$) { my ($self, $NewStatus, $Args, $ChildTimeout, $ChildSetup, $SetupData) = @_; - my $Tool = basename($Args->[0]); + if (defined $self->ChildPid) + { + my $ErrMessage = "Cannot run ". ShArgv2Cmd(@$Args) ." because the ". $self->ChildPid ." process is already using the ". $self->Name ." VM"; + require WineTestBot::Log; + WineTestBot::Log::LogMsg("$ErrMessage\n"); + return $ErrMessage; + } + # There are two $VM->ChildPid race conditions to avoid: # - Between the child process and new calls to ScheduleJobs(). # We cannot leave setting ChildPid to the child process because then it -- 2.20.1

1 0

[PATCH] dwrite: Prefer Windows platform names regardless of record order.
by Akihiro Sagawa 11 Sep '19

11 Sep '19

Otherwise localized family name of IPA font isn't available in DirectWrite. While Wine enumerates localized name in GDI. N.B. IPA font family (e.g. IPA Mincho) is a bit tricky. It has Japanese (Kanji) name for Japanese Windows, though it has English (ASCII) name for Japanese Macintosh. And due to record order, Wine's DirectWrite chooses Macintosh one. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dwrite/opentype.c | 52 ++++++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 33 deletions(-)

2 1

[PATCH] winebus.sys: Don't WARN about backends we didn't build
by Andrew Eikum 11 Sep '19

11 Sep '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- Warning about IOHID missing on Linux is definitely uninteresting, and I don't see any value in warning about the other backends either. dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 5 ++++- dlls/winebus.sys/bus_udev.c | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 7933374007e..cda77e3011f 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -409,6 +409,7 @@ NTSTATUS iohid_driver_init(void) return STATUS_UNSUCCESSFUL; } + TRACE("Initialization successful\n"); return STATUS_SUCCESS; } @@ -429,7 +430,6 @@ void iohid_driver_unload( void ) NTSTATUS iohid_driver_init(void) { - WARN("IOHID Support not compiled into Wine.\n"); return STATUS_NOT_IMPLEMENTED; } diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index d24e21cff83..d3a1a19eeba 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -1145,9 +1145,13 @@ NTSTATUS sdl_driver_init(void) map_controllers = check_bus_option(&controller_mode, 1); if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) + { + WARN("CreateEvent failed\n"); return STATUS_UNSUCCESSFUL; + } if (!(events[1] = CreateThread(NULL, 0, deviceloop_thread, events[0], 0, NULL))) { + WARN("CreateThread failed\n"); CloseHandle(events[0]); return STATUS_UNSUCCESSFUL; } @@ -1171,7 +1175,6 @@ sym_not_found: NTSTATUS sdl_driver_init(void) { - WARN("compiled without SDL support\n"); return STATUS_NOT_IMPLEMENTED; } diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index d9311a9b030..20841b09ae0 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1529,7 +1529,6 @@ error: NTSTATUS udev_driver_init(void) { - WARN("Wine was compiled without UDEV support\n"); return STATUS_NOT_IMPLEMENTED; } -- 2.23.0

1 0

[PATCH] user32/tests: Fix some msg test failures.
by Zhiyi Zhang 11 Sep '19

11 Sep '19

These test failures sometimes happen on some TestBots. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/msg.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a5bc1c5518..73beb4d771 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -567,6 +567,7 @@ static const struct message WmShowRestoreMaxOverlappedSeq[] = { { WM_GETTITLEBARINFOEX, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, + { WM_SYNCPAINT, sent|optional }, { 0 } }; /* ShowWindow(SW_RESTORE) for a not visible minimized overlapped window */ @@ -837,6 +838,7 @@ static const struct message WmShowMaxPopupSeq[] = { { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOSIZE }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|defwinproc|optional }, { 0 } }; /* CreateWindow(WS_VISIBLE) for popup window */ @@ -3477,6 +3479,7 @@ static const struct message WmMaximizeMDIchildInvisibleSeq2[] = { { WM_MDIACTIVATE, sent|defwinproc|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ + { WM_SIZE, sent|defwinproc|optional }, { 0 } }; /* WM_MDIMAXIMIZE for an MDI child window with invisible parent */ @@ -13613,6 +13616,8 @@ static const struct message WmCreateDialogParamSeq_3[] = { { WM_QUERYNEWPALETTE, sent|parent|optional }, /* TODO: this message should not be sent */ { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_ACTIVATEAPP, sent|parent|wparam, 1 }, { WM_NCACTIVATE, sent|parent }, { WM_ACTIVATE, sent|parent|wparam, 1 }, @@ -16541,16 +16546,16 @@ static void test_hotkey(void) SetLastError(0xdeadbeef); ret = UnregisterHotKey(NULL, 0); - ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED || broken(GetLastError() == 0xdeadbeef), - "unexpected error %d\n", GetLastError()); - if (ret == TRUE) { skip("hotkeys not supported\n"); return; } + ok(ret == FALSE, "expected FALSE, got %i\n", ret); + ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); + test_window = CreateWindowExA(0, "HotkeyWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); -- 2.23.0

2 1

[PATCH 2/2] gdi32/tests: Add CreateDC tests.
by Zhiyi Zhang 11 Sep '19

11 Sep '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/dc.c | 64 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 3e23ce4020..014b9a1100 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -545,6 +545,69 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale SetBoundsRect( ref_dc, NULL, DCB_RESET | DCB_DISABLE ); } +static void test_CreateDC(void) +{ + static const WCHAR invalid_nameW[] = {'a','b','c','d','1','2','3','4',0}; + static const WCHAR displayW[] = {'d','i','s','p','l','a','y',0}; + DISPLAY_DEVICEW display_device = {sizeof(display_device)}; + WCHAR adapter_name[CCHDEVICENAME]; + DWORD i, j; + HDC hdc; + + hdc = CreateDCW( NULL, NULL, NULL, NULL ); + ok( !hdc, "CreateDC succeeded\n" ); + + hdc = CreateDCW( NULL, displayW, NULL, NULL ); + todo_wine ok( !hdc, "CreateDC succeeded\n" ); + + hdc = CreateDCW( displayW, NULL, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + hdc = CreateDCW( displayW, invalid_nameW, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + for (i = 0; EnumDisplayDevicesW( NULL, i, &display_device, 0 ); ++i) + { + if (!(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + { + hdc = CreateDCW( display_device.DeviceName, NULL, NULL, NULL ); + todo_wine ok( !hdc, "CreateDC succeeded\n" ); + + hdc = CreateDCW( NULL, display_device.DeviceName, NULL, NULL ); + todo_wine ok( !hdc, "CreateDC succeeded\n" ); + continue; + } + + hdc = CreateDCW( display_device.DeviceName, NULL, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed %s\n", wine_dbgstr_w( display_device.DeviceName ) ); + DeleteDC( hdc ); + + hdc = CreateDCW( NULL, display_device.DeviceName, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + hdc = CreateDCW( display_device.DeviceName, display_device.DeviceName, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + hdc = CreateDCW( display_device.DeviceName, invalid_nameW, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + lstrcpyW( adapter_name, display_device.DeviceName ); + for (j = 0; EnumDisplayDevicesW( adapter_name, j, &display_device, 0 ); ++j) + { + hdc = CreateDCW( display_device.DeviceName, NULL, NULL, NULL ); + ok( !hdc, "CreateDC succeeded\n" ); + + hdc = CreateDCW( NULL, display_device.DeviceName, NULL, NULL ); + ok( !hdc, "CreateDC succeeded\n" ); + } + } +} + static void test_CreateCompatibleDC(void) { BOOL bRet; @@ -1495,6 +1558,7 @@ START_TEST(dc) test_savedc(); test_savedc_2(); test_GdiConvertToDevmodeW(); + test_CreateDC(); test_CreateCompatibleDC(); test_DC_bitmap(); test_DeleteDC(); -- 2.23.0

1 0

[PATCH] ntdll: Wake one waiter in RtlWakeAddressSingle in futex path.
by Daniel Lehman 11 Sep '19

11 Sep '19

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/ntdll/sync.c | 10 ++++----- dlls/ntdll/tests/om.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 35b89df52e..88fb979b2c 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2416,7 +2416,7 @@ static inline NTSTATUS fast_wait_addr( const void *addr, const void *cmp, SIZE_T return STATUS_SUCCESS; } -static inline NTSTATUS fast_wake_addr( const void *addr ) +static inline NTSTATUS fast_wake_addr( const void *addr, int waiters ) { int *futex; @@ -2427,7 +2427,7 @@ static inline NTSTATUS fast_wake_addr( const void *addr ) interlocked_xchg_add( futex, 1 ); - futex_wake( futex, INT_MAX ); + futex_wake( futex, waiters ); return STATUS_SUCCESS; } #else @@ -2437,7 +2437,7 @@ static inline NTSTATUS fast_wait_addr( const void *addr, const void *cmp, SIZE_T return STATUS_NOT_IMPLEMENTED; } -static inline NTSTATUS fast_wake_addr( const void *addr ) +static inline NTSTATUS fast_wake_addr( const void *addr, int waiters ) { return STATUS_NOT_IMPLEMENTED; } @@ -2518,7 +2518,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size */ void WINAPI RtlWakeAddressAll( const void *addr ) { - if (fast_wake_addr( addr ) != STATUS_NOT_IMPLEMENTED) + if (fast_wake_addr( addr, INT_MAX ) != STATUS_NOT_IMPLEMENTED) return; RtlEnterCriticalSection( &addr_section ); @@ -2531,7 +2531,7 @@ void WINAPI RtlWakeAddressAll( const void *addr ) */ void WINAPI RtlWakeAddressSingle( const void *addr ) { - if (fast_wake_addr( addr ) != STATUS_NOT_IMPLEMENTED) + if (fast_wake_addr( addr, 1 ) != STATUS_NOT_IMPLEMENTED) return; RtlEnterCriticalSection( &addr_section ); diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c17b6ffa8d..8fbcc89718 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2148,6 +2148,53 @@ static void test_wait_on_address(void) ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); } +static LONG wake_single_addr; +DWORD WINAPI wake_single_thread(void *arg) +{ + LONG value; + NTSTATUS status; + + value = 0; + status = pRtlWaitOnAddress(&wake_single_addr, &value, sizeof(value), NULL); + ok(status == STATUS_SUCCESS, "got %x\n", status); + return 0; +} + +static void test_wake_single(void) +{ + HANDLE threads[16]; + DWORD ret, nthreads; + int i; + + if (!pRtlWaitOnAddress) + { + win_skip("RtlWaitOnAddress not supported, skipping test\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(threads); i++) + threads[i] = CreateThread(NULL, 0, wake_single_thread, NULL, 0, NULL); + + Sleep(1000); /* wait for threads to enter RtlWaitOnAddress */ + + wake_single_addr = 1; + nthreads = ARRAY_SIZE(threads); + while (nthreads) + { + pRtlWakeAddressSingle(&wake_single_addr); + ret = WaitForMultipleObjects(nthreads, threads, FALSE, 2000); + ok(ret < WAIT_OBJECT_0 + nthreads, "got %u\n", ret); + CloseHandle(threads[ret]); + memmove(&threads[ret], &threads[ret+1], (nthreads - ret - 1) * sizeof(threads[0])); + if (--nthreads) + { + /* make sure other threads are still waiting */ + ret = WaitForMultipleObjects(nthreads, threads, FALSE, 0); + ok(ret == WAIT_TIMEOUT, "got %u\n", ret); + } + } +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2221,4 +2268,5 @@ START_TEST(om) test_keyed_events(); test_null_device(); test_wait_on_address(); + test_wake_single(); } -- 2.17.1

2 2

[PATCH] include: Correct DSFX_I3DL2REVERB_ROOM_MIN value.
by Alistair Leslie-Hughes 11 Sep '19

11 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dsound.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dsound.h b/include/dsound.h index 74b4bcdb4a..b4a2509e89 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -491,7 +491,7 @@ typedef struct _DSFXI3DL2Reverb #define DSFX_I3DL2REVERB_REVERBDELAY_MAX 0.1f #define DSFX_I3DL2REVERB_REVERBDELAY_DEFAULT 0.011f #define DSFX_I3DL2REVERB_ROOM_DEFAULT (-1000) -#define DSFX_I3DL2REVERB_ROOM_MIN 10000 +#define DSFX_I3DL2REVERB_ROOM_MIN (-10000) #define DSFX_I3DL2REVERB_ROOM_MAX 0 #define DSFX_I3DL2REVERB_ROOMHF_MIN (-10000) #define DSFX_I3DL2REVERB_ROOMHF_MAX 0 -- 2.17.1

1 0

[PATCH 1/8] advapi32: Replace usage of internal SERV_ functions with exported functions
by Micah N Gorrell 10 Sep '19

10 Sep '19

This is in preparation for moving the services RPC functions into sechost. Signed-off-by: Micah N Gorrell <mgorrell(a)codeweavers.com> --- dlls/advapi32/advapi32_misc.h | 3 --- dlls/advapi32/security.c | 32 +++++++++++++++++++++++++------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 4ced1e8a64..77b56420ba 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -32,9 +32,6 @@ BOOL ADVAPI_GetComputerSid(PSID sid) DECLSPEC_HIDDEN; BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; WCHAR *SERV_dup(const char *str) DECLSPEC_HIDDEN; -DWORD SERV_OpenSCManagerW(LPCWSTR, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; -DWORD SERV_OpenServiceW(SC_HANDLE, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; -NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; /* memory allocation functions */ diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a7707f15d3..74eda93282 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -416,15 +416,19 @@ static inline DWORD get_security_file( LPCWSTR full_file_name, DWORD access, HAN static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access, HANDLE *service ) { SC_HANDLE manager = 0; - DWORD err; - err = SERV_OpenSCManagerW( NULL, NULL, access, (SC_HANDLE *)&manager ); - if (err == ERROR_SUCCESS) + manager = OpenSCManagerW( NULL, NULL, access ); + if (manager) { - err = SERV_OpenServiceW( manager, full_service_name, access, (SC_HANDLE *)service ); + *service = OpenServiceW( manager, full_service_name, access); CloseServiceHandle( manager ); + + if (*service) + { + return ERROR_SUCCESS; + } } - return err; + return GetLastError(); } /* helper function for SE_REGISTRY_KEY objects in [Get|Set]NamedSecurityInfo */ @@ -1804,7 +1808,14 @@ DWORD WINAPI GetSecurityInfo( switch (ObjectType) { case SE_SERVICE: - status = SERV_QueryServiceObjectSecurity(hObject, SecurityInfo, NULL, 0, &n1); + if (QueryServiceObjectSecurity(hObject, SecurityInfo, NULL, 0, &n1)) + { + status = STATUS_SUCCESS; + } + else + { + status = RtlGetLastNtStatus(); + } break; default: status = NtQuerySecurityObject(hObject, SecurityInfo, NULL, 0, &n1); @@ -1820,7 +1831,14 @@ DWORD WINAPI GetSecurityInfo( switch (ObjectType) { case SE_SERVICE: - status = SERV_QueryServiceObjectSecurity(hObject, SecurityInfo, sd, n1, &n2); + if (QueryServiceObjectSecurity(hObject, SecurityInfo, sd, n1, &n2)) + { + status = STATUS_SUCCESS; + } + else + { + status = RtlGetLastNtStatus(); + } break; default: status = NtQuerySecurityObject(hObject, SecurityInfo, sd, n1, &n2); -- 2.23.0

2 11

[PATCH] configure.ac: Solaris linker and compiler flags
by Evgeny Litvinenko 10 Sep '19

10 Sep '19

Signed-off-by: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> --- configure.ac | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/configure.ac b/configure.ac index b39b6b2c90..aec9c135bf 100644 --- a/configure.ac +++ b/configure.ac @@ -940,6 +940,60 @@ case $host_os in fi ;; + solaris*) + DLLFLAGS="$DLLFLAGS -fPIC" + LDDLLFLAGS="-shared -fPIC" + + WINE_TRY_CFLAGS([-fPIC -Wl,-pie], [LDEXECFLAGS="-Wl,-pie"]) + + AC_CACHE_CHECK([for linker flags to build shared library], ac_cv_c_dll_ld_opts, + [WINE_TRY_SHLIB_FLAGS([$LDDLLFLAGS -Wl,-G,-B,symbolic], + [ac_cv_c_dll_ld_opts="-Wl,-G,-B,symbolic"], + [WINE_TRY_SHLIB_FLAGS([$LDDLLFLAGS -Wl,-shared,-Bsymbolic], + [ac_cv_c_dll_ld_opts="-Wl,-shared,-Bsymbolic"], + [ac_cv_c_dll_ld_opts=""])])]) + + AC_CACHE_CHECK([for linker flags to record a shared object name], ac_cv_c_dll_ld_soname, + [WINE_TRY_SHLIB_FLAGS([$LDDLLFLAGS -Wl,-soname,confest.so.1], + [ac_cv_c_dll_ld_soname="-Wl,-soname,libwine.so.$libwine_soversion"], + [WINE_TRY_SHLIB_FLAGS([$LDDLLFLAGS -Wl,-h,confest.so.1], + [ac_cv_c_dll_ld_soname="-Wl,-h,libwine.so.$libwine_soversion"], + [ac_cv_c_dll_ld_soname=""])])]) + + echo '{ global: *; };' >conftest.map + AC_CACHE_CHECK([for linker flags to use mapfile], ac_cv_c_dll_ld_map, + [WINE_TRY_SHLIB_FLAGS([$LDDLLFLAGS -Wl,--version-script=conftest.map], + [ac_cv_c_dll_ld_map="-Wl,--version-script=\$(srcdir)/wine.map"], + [WINE_TRY_SHLIB_FLAGS([$LDDLLFLAGS -Wl,-M,conftest.map], + [ac_cv_c_dll_ld_map="-Wl,-M,\$(srcdir)/wine.map"], + [ac_cv_c_dll_ld_map=""])])]) + rm -f conftest.map + + AC_SUBST(LIBWINE_LDFLAGS,"$LDDLLFLAGS $ac_cv_c_dll_ld_opts $ac_cv_c_dll_ld_soname $ac_cv_c_dll_ld_map") + + WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000" + + WINE_TRY_CFLAGS([-Wl,--export-dynamic], [WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) + + WINE_TRY_CFLAGS([-Wl,--rpath,\$ORIGIN/../lib], + [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" + LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"], + [WINE_TRY_CFLAGS([-Wl,-R,\$ORIGIN/../lib], + [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" + LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"])]) + + WINE_TRY_CFLAGS([-Wl,--enable-new-dtags], + [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"]) + + WINE_TRY_CFLAGS([-Wl,-z,max-page-size=0x1000], + [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) + + AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version") + AC_SUBST(LIBWINE_DEPENDS,"wine.map") + TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version libs/wine/libwine.so.$libwine_soversion" + TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.so" + ;; + *) case $host_cpu in *i[[3456789]]86*) -- 2.23.0

2 2

Build wine-4.15 on OpenIndiana (Solaris): Undefined symbols in dlls/msvcrt/libmsvcrt.a
by Evgeny Litvinenko 10 Sep '19

10 Sep '19

Hi all. I get the following errors when build wine on OpenIndiana (full log attached) ../../tools/winegcc/winegcc -o acledit.dll.so -B../../tools/winebuild -shared -fPIC \ -fasynchronous-unwind-tables -shared \ /home/src/oi-userland/components/runtime/wine/wine-4.15/dlls/acledit/acledit.spec -mno-cygwin \ main.o -lsocket -lnsl -m32 Undefined first referenced symbol in file __wine$func$msvcrt$1016$ftell ../../dlls/msvcrt/libmsvcrt.a(msvcrt.fnrAK8.o) __wine$func$msvcrt$1024$getenv ../../dlls/msvcrt/libmsvcrt.a(msvcrt.L9RCyU.o) __wine$func$msvcrt$1060$localtime ../../dlls/msvcrt/libmsvcrt.a(msvcrt.JYRNHL.o) __wine$func$msvcrt$1019$fwrite ../../dlls/msvcrt/libmsvcrt.a(msvcrt.sHMkOc.o) I suppose the libmsvcrt.a is built incorrectly - it misses the needed functions. When I run ../../tools/winebuild/winebuild --save-temps -w --implib -o libmsvcrt.a --export \ /home/src/oi-userland/components/runtime/wine/wine-4.15/dlls/msvcrt/msvcrt.spec iob.o mathf.o \ onexit.o in dlls/msvcrt/ I get the assembler code with the simbol "__wine$func$msvcrt$1016$ftell" - see attached libmsvcrt.iJQgve.s Should I place implementation of these functions (ftell(), getenv(), etc) to dlls/msvcrt/ (like the file dlls/msvcrt/mathf.c) or should I call them from libc (what is the correct way to call libc's funcs)? Or may be the problem is in another place? thanks, evgeny

1 0

[PATCH 1/5] server: Add support for additional fields in set_console_output_info.
by Gijs Vermeulen 10 Sep '19

10 Sep '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- programs/wineconsole/wineconsole.c | 4 ++++ server/console.c | 14 ++++++++++++++ server/protocol.def | 4 ++++ 3 files changed, 22 insertions(+) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 439099c37a..98bd32fda8 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -458,6 +458,10 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf req->max_height = (r.bottom - r.top - GetSystemMetrics(SM_CYCAPTION)) / cfg->cell_height; req->font_width = cfg->cell_width; req->font_height = cfg->cell_height; + req->font_weight = cfg->font_weight; + req->font_pitch_family = FIXED_PITCH | FF_DONTCARE; + req->face_namelen = lstrlenW(cfg->face_name) * sizeof(WCHAR); + wine_server_add_data( req, cfg->face_name, req->face_namelen ); wine_server_call( req ); } SERVER_END_REQ; diff --git a/server/console.c b/server/console.c index 7d1fc5d268..e93dec2501 100644 --- a/server/console.c +++ b/server/console.c @@ -131,6 +131,9 @@ struct font_info { short int width; short int height; + short int weight; + short int pitch_family; + WCHAR *face_name; }; struct screen_buffer @@ -433,6 +436,9 @@ static struct screen_buffer *create_console_output( struct console_input *consol screen_buffer->data = NULL; screen_buffer->font.width = 0; screen_buffer->font.height = 0; + screen_buffer->font.weight = 400; + screen_buffer->font.pitch_family = 1; + screen_buffer->font.face_name = NULL; memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) ); list_add_head( &screen_buffer_list, &screen_buffer->entry ); @@ -1041,8 +1047,16 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, } if (req->mask & SET_CONSOLE_OUTPUT_INFO_FONT) { + data_size_t total; screen_buffer->font.width = req->font_width; screen_buffer->font.height = req->font_height; + screen_buffer->font.weight = req->font_weight; + screen_buffer->font.pitch_family = req->font_pitch_family; + if (screen_buffer->font.face_name) free(screen_buffer->font.face_name); + total = min( req->face_namelen, get_req_data_size() ); + screen_buffer->font.face_name = mem_alloc( total + sizeof(WCHAR) ); + memcpy( screen_buffer->font.face_name, get_req_data(), total ); + screen_buffer->font.face_name[total/sizeof(WCHAR)] = 0; } if (req->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE) { diff --git a/server/protocol.def b/server/protocol.def index 6af0ae0cff..6030a0152c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1634,6 +1634,10 @@ struct console_renderer_event short int max_height; short int font_width; /* font size (width x height) */ short int font_height; + short int font_weight; /* font weight */ + short int font_pitch_family; /* font pitch & family */ + data_size_t face_namelen; /* length of face name in bytes */ + VARARG(face_name,unicode_str,face_namelen); /* font face name */ VARARG(colors,uints); /* color table */ @END #define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x0001 -- 2.23.0

4 11

[PATCH 1/2] user32/tests: Add RegisterRawInputDevices parameter validation tests.
by Rémi Bernon 10 Sep '19

10 Sep '19

--- dlls/user32/tests/Makefile.in | 1 + dlls/user32/tests/rawinput.c | 104 ++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 dlls/user32/tests/rawinput.c diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 7149dc824ea..26bc3b2bc6d 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -17,6 +17,7 @@ C_SRCS = \ menu.c \ monitor.c \ msg.c \ + rawinput.c \ resource.c \ scroll.c \ static.c \ diff --git a/dlls/user32/tests/rawinput.c b/dlls/user32/tests/rawinput.c new file mode 100644 index 00000000000..4aa2a162f42 --- /dev/null +++ b/dlls/user32/tests/rawinput.c @@ -0,0 +1,104 @@ +/* Unit test suite for rawinput. + * + * Copyright 2019 Remi Bernon 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 + */ + +#include <stdarg.h> +#include <stdio.h> + +#define STRICT +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#include "wine/test.h" + +static void test_RegisterRawInputDevices(void) +{ + HWND hwnd; + RAWINPUTDEVICE raw_devices[1]; + BOOL res; + + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x05; + + hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowExA failed\n"); + + + res = RegisterRawInputDevices(NULL, 0, 0); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + + + raw_devices[0].dwFlags = 0; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + + /* RIDEV_REMOVE requires hwndTarget == NULL */ + raw_devices[0].dwFlags = RIDEV_REMOVE; + raw_devices[0].hwndTarget = hwnd; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + todo_wine + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + + /* RIDEV_INPUTSINK requires hwndTarget != NULL */ + raw_devices[0].dwFlags = RIDEV_INPUTSINK; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + todo_wine + ok(res == FALSE, "RegisterRawInputDevices failed\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + raw_devices[0].hwndTarget = hwnd; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + DestroyWindow(hwnd); +} + +START_TEST(rawinput) +{ + test_RegisterRawInputDevices(); +} -- 2.23.0

2 4

A tragic loss
by Jeremy White 10 Sep '19

10 Sep '19

I am deeply saddened to report that our friend and colleague, Józef Kucia, died last month at the age of 28. Józef first contributed to Wine in March of 2012, showing remarkable skill with Wine’s D3D technology. He became a key contributor to Wine, submitting over 2,500 patches. He also contributed to other open source projects including Mesa and Debian. Józef founded and led the vkd3d project and provided insight and guidance to the Vulkan working group. While technically brilliant, Józef was a man of few words. He carried a quiet kindness, but it could be difficult to draw him out. One topic that would get Józef talking was his love for caving. Similar in spirit to mountain climbing, caving is a sport of discovery and exploration. Groups of explorers seek to uncover and map new cave systems while enjoying the startling beauty of the underground world. Caving is a physically and psychologically demanding sport, requiring the ability to maneuver in very tight spaces, often in absolute darkness. A group of us at CodeWeavers had the good fortune of sharing in Józef's love for caving in conversation and on a trip to a local climbing wall last year. In his quiet way, Józef impressed us all with his skill and grace. It was clear from his talents and his joy in conversation that caving was a passion for Józef. This August, Józef took an extended vacation to the Tatra mountains to explore the longest and deepest cave in Poland, Wielka Sniezna ("Great Snowy Cave"). While exploring, he and another member of his group of six became separated by an unexpected flow of water. Despite an extensive rescue operation, Józef and his companion died. Words cannot express the sorrow and heartbreak we feel. All of us at CodeWeavers extend our heartfelt condolences to Józef's family, friends, loved ones, and everyone else who grieves his passing. We take some solace from knowing that Józef died doing something he loved, with full understanding of the risks involved. We admire the courage and ambition he displayed in pursuing his passion. While his life ended far too soon, it was a life well and fully lived. There will be Holy Mass for Józef at 2 PM in Św. Mikołaja Cathedral in Bielsko-Biała on September 11. Jeremy

4 3

[PATCH 5/7] wbemprox: Implement Win32_DiskDriveToDiskPartition.
by Hans Leidekker 10 Sep '19

10 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 135 +++++++++++++++++++++++++++++++----- dlls/wbemprox/tests/query.c | 5 +- 2 files changed, 121 insertions(+), 19 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 93d842708f..105a2d3ec2 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -68,6 +68,8 @@ static const WCHAR class_directoryW[] = {'W','i','n','3','2','_','D','i','r','e','c','t','o','r','y',0}; static const WCHAR class_diskdriveW[] = {'W','i','n','3','2','_','D','i','s','k','D','r','i','v','e',0}; +static const WCHAR class_diskdrivetodiskpartitionW[] = + {'W','i','n','3','2','_','D','i','s','k','D','r','i','v','e','T','o','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; static const WCHAR class_diskpartitionW[] = {'W','i','n','3','2','_','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; static const WCHAR class_ip4routetableW[] = @@ -510,6 +512,11 @@ static const struct column col_diskdrive[] = { prop_serialnumberW, CIM_STRING }, { prop_sizeW, CIM_UINT64 } }; +static const struct column col_diskdrivetodiskpartition[] = +{ + { prop_antecedentW, CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_dependentW, CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY } +}; static const struct column col_diskpartition[] = { { prop_bootableW, CIM_BOOLEAN }, @@ -943,6 +950,11 @@ struct record_diskdrive const WCHAR *serialnumber; UINT64 size; }; +struct record_diskdrivetodiskpartition +{ + const WCHAR *antecedent; + const WCHAR *dependent; +}; struct record_diskpartition { int bootable; @@ -2436,6 +2448,110 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * return status; } +struct association +{ + WCHAR *ref; + WCHAR *ref2; +}; + +static void free_assocations( struct association *assoc, UINT count ) +{ + UINT i; + if (!assoc) return; + for (i = 0; i < count; i++) + { + heap_free( assoc[i].ref ); + heap_free( assoc[i].ref2 ); + } + heap_free( assoc ); +} + +static struct association *get_diskdrivetodiskpartition_pairs( UINT *count ) +{ + static const WCHAR pathW[] = + {'_','_','P','A','T','H',0}; + static const WCHAR selectW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'D','i','s','k','D','r','i','v','e',0}; + static const WCHAR select2W[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'D','i','s','k','P','a','r','t','i','t','i','o','n',0}; + struct association *ret = NULL; + struct query *query, *query2 = NULL; + VARIANT val; + HRESULT hr; + UINT i; + + if (!(query = create_query())) return NULL; + if ((hr = parse_query( selectW, &query->view, &query->mem )) != S_OK) goto done; + if ((hr = execute_view( query->view )) != S_OK) goto done; + + if (!(query2 = create_query())) return FALSE; + if ((hr = parse_query( select2W, &query2->view, &query2->mem )) != S_OK) goto done; + if ((hr = execute_view( query2->view )) != S_OK) goto done; + + if (!(ret = heap_alloc_zero( query->view->count * sizeof(*ret) ))) goto done; + + for (i = 0; i < query->view->count; i++) + { + if ((hr = get_propval( query->view, i, pathW, &val, NULL, NULL )) != S_OK) goto done; + if (!(ret[i].ref = heap_strdupW( V_BSTR(&val) ))) goto done; + VariantClear( &val ); + + if ((hr = get_propval( query2->view, i, pathW, &val, NULL, NULL )) != S_OK) goto done; + if (!(ret[i].ref2 = heap_strdupW( V_BSTR(&val) ))) goto done; + VariantClear( &val ); + } + + *count = query->view->count; + +done: + if (!ret) free_assocations( ret, query->view->count ); + free_query( query ); + free_query( query2 ); + return ret; +} + +static enum fill_status fill_diskdrivetodiskpartition( struct table *table, const struct expr *cond ) +{ + struct record_diskdrivetodiskpartition *rec; + UINT i, row = 0, offset = 0, count = 0; + enum fill_status status = FILL_STATUS_UNFILTERED; + struct association *assoc; + + if (!(assoc = get_diskdrivetodiskpartition_pairs( &count ))) return FILL_STATUS_FAILED; + if (!count) + { + free_assocations( assoc, count ); + return FILL_STATUS_UNFILTERED; + } + if (!resize_table( table, count, sizeof(*rec) )) + { + free_assocations( assoc, count ); + return FILL_STATUS_FAILED; + } + + for (i = 0; i < count; i++) + { + rec = (struct record_diskdrivetodiskpartition *)(table->data + offset); + rec->antecedent = assoc[i].ref; + rec->dependent = assoc[i].ref2; + if (!match_row( table, row, cond, &status )) + { + free_row_values( table, row ); + continue; + } + offset += sizeof(*rec); + row++; + } + + heap_free( assoc ); + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + static WCHAR *get_filesystem( const WCHAR *root ) { static const WCHAR ntfsW[] = {'N','T','F','S',0}; @@ -2615,24 +2731,6 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr return status; } -struct association -{ - WCHAR *ref; - WCHAR *ref2; -}; - -static void free_assocations( struct association *assoc, UINT count ) -{ - UINT i; - if (!assoc) return; - for (i = 0; i < count; i++) - { - heap_free( assoc[i].ref ); - heap_free( assoc[i].ref2 ); - } - heap_free( assoc ); -} - static struct association *get_logicaldisktopartition_pairs( UINT *count ) { static const WCHAR pathW[] = @@ -4179,6 +4277,7 @@ static struct table builtin_classes[] = { class_desktopmonitorW, C(col_desktopmonitor), 0, 0, NULL, fill_desktopmonitor }, { class_directoryW, C(col_directory), 0, 0, NULL, fill_directory }, { class_diskdriveW, C(col_diskdrive), 0, 0, NULL, fill_diskdrive }, + { class_diskdrivetodiskpartitionW, C(col_diskdrivetodiskpartition), 0, 0, NULL, fill_diskdrivetodiskpartition }, { class_diskpartitionW, C(col_diskpartition), 0, 0, NULL, fill_diskpartition }, { class_ip4routetableW, C(col_ip4routetable), 0, 0, NULL, fill_ip4routetable }, { class_logicaldiskW, C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 6edb0d0f09..23641fc0d3 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -126,8 +126,11 @@ static void test_select( IWbemServices *services ) static const WCHAR query14[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; + static const WCHAR query15[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'D','i','s','k','D','r','i','v','e','T','o','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10, - query11, query12, query13, query14 }; + query11, query12, query13, query14, query15 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW ); -- 2.20.1

2 1

[PATCH v2] mmdevapi: Convert channel layouts to Windows compatible layouts
by Andrew Eikum 10 Sep '19

10 Sep '19

Fixes sound in Touhou Luna Nights with some surround sound configurations. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Check max channels on OSS, too. dlls/winealsa.drv/mmdevdrv.c | 16 +++ dlls/winecoreaudio.drv/mmdevdrv.c | 197 ++++++++++++++++++++++++++---- dlls/wineoss.drv/mmdevdrv.c | 16 +++ dlls/winepulse.drv/mmdevdrv.c | 97 ++++++++++++++- 4 files changed, 296 insertions(+), 30 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 91aef4788d8..4f1270b33c8 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1831,6 +1831,22 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, else fmt->Format.nChannels = max_channels; + if(fmt->Format.nChannels > 1 && (fmt->Format.nChannels & 0x1)){ + /* For most hardware on Windows, users must choose a configuration with an even + * number of channels (stereo, quad, 5.1, 7.1). Users can then disable + * channels, but those channels are still reported to applications from + * GetMixFormat! Some applications behave badly if given an odd number of + * channels (e.g. 2.1). */ + + if(fmt->Format.nChannels < max_channels) + fmt->Format.nChannels += 1; + else + /* We could "fake" more channels and downmix the emulated channels, + * but at that point you really ought to tweak your ALSA setup or + * just use PulseAudio. */ + WARN("Some Windows applications behave badly with an odd number of channels (%u)!\n", fmt->Format.nChannels); + } + fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); if((err = snd_pcm_hw_params_get_rate_max(This->hw_params, &max_rate, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 2f4683af976..be2b5e7e1e9 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1736,6 +1736,122 @@ unsupported: return AUDCLNT_E_UNSUPPORTED_FORMAT; } +static DWORD ca_channel_layout_to_channel_mask(const AudioChannelLayout *layout) +{ + int i; + DWORD mask = 0; + + for (i = 0; i < layout->mNumberChannelDescriptions; ++i) { + switch (layout->mChannelDescriptions[i].mChannelLabel) { + default: FIXME("Unhandled channel 0x%x\n", layout->mChannelDescriptions[i].mChannelLabel); break; + case kAudioChannelLabel_Left: mask |= SPEAKER_FRONT_LEFT; break; + case kAudioChannelLabel_Mono: + case kAudioChannelLabel_Center: mask |= SPEAKER_FRONT_CENTER; break; + case kAudioChannelLabel_Right: mask |= SPEAKER_FRONT_RIGHT; break; + case kAudioChannelLabel_LeftSurround: mask |= SPEAKER_BACK_LEFT; break; + case kAudioChannelLabel_CenterSurround: mask |= SPEAKER_BACK_CENTER; break; + case kAudioChannelLabel_RightSurround: mask |= SPEAKER_BACK_RIGHT; break; + case kAudioChannelLabel_LFEScreen: mask |= SPEAKER_LOW_FREQUENCY; break; + case kAudioChannelLabel_LeftSurroundDirect: mask |= SPEAKER_SIDE_LEFT; break; + case kAudioChannelLabel_RightSurroundDirect: mask |= SPEAKER_SIDE_RIGHT; break; + case kAudioChannelLabel_TopCenterSurround: mask |= SPEAKER_TOP_CENTER; break; + case kAudioChannelLabel_VerticalHeightLeft: mask |= SPEAKER_TOP_FRONT_LEFT; break; + case kAudioChannelLabel_VerticalHeightCenter: mask |= SPEAKER_TOP_FRONT_CENTER; break; + case kAudioChannelLabel_VerticalHeightRight: mask |= SPEAKER_TOP_FRONT_RIGHT; break; + case kAudioChannelLabel_TopBackLeft: mask |= SPEAKER_TOP_BACK_LEFT; break; + case kAudioChannelLabel_TopBackCenter: mask |= SPEAKER_TOP_BACK_CENTER; break; + case kAudioChannelLabel_TopBackRight: mask |= SPEAKER_TOP_BACK_RIGHT; break; + case kAudioChannelLabel_LeftCenter: mask |= SPEAKER_FRONT_LEFT_OF_CENTER; break; + case kAudioChannelLabel_RightCenter: mask |= SPEAKER_FRONT_RIGHT_OF_CENTER; break; + } + } + + return mask; +} + +/* For most hardware on Windows, users must choose a configuration with an even + * number of channels (stereo, quad, 5.1, 7.1). Users can then disable + * channels, but those channels are still reported to applications from + * GetMixFormat! Some applications behave badly if given an odd number of + * channels (e.g. 2.1). Here, we find the nearest configuration that Windows + * would report for a given channel layout. */ +static void convert_channel_layout(const AudioChannelLayout *ca_layout, WAVEFORMATEXTENSIBLE *fmt) +{ + DWORD ca_mask = ca_channel_layout_to_channel_mask(ca_layout); + + TRACE("Got channel mask for CA: 0x%x\n", ca_mask); + + if (ca_layout->mNumberChannelDescriptions == 1) + { + fmt->Format.nChannels = 1; + fmt->dwChannelMask = ca_mask; + return; + } + + /* compare against known configurations and find smallest configuration + * which is a superset of the given speakers */ + + if (ca_layout->mNumberChannelDescriptions <= 2 && + (ca_mask & ~KSAUDIO_SPEAKER_STEREO) == 0) + { + fmt->Format.nChannels = 2; + fmt->dwChannelMask = KSAUDIO_SPEAKER_STEREO; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 4 && + (ca_mask & ~KSAUDIO_SPEAKER_QUAD) == 0) + { + fmt->Format.nChannels = 4; + fmt->dwChannelMask = KSAUDIO_SPEAKER_QUAD; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 4 && + (ca_mask & ~KSAUDIO_SPEAKER_SURROUND) == 0) + { + fmt->Format.nChannels = 4; + fmt->dwChannelMask = KSAUDIO_SPEAKER_SURROUND; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 6 && + (ca_mask & ~KSAUDIO_SPEAKER_5POINT1) == 0) + { + fmt->Format.nChannels = 6; + fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 6 && + (ca_mask & ~KSAUDIO_SPEAKER_5POINT1_SURROUND) == 0) + { + fmt->Format.nChannels = 6; + fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1_SURROUND; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 8 && + (ca_mask & ~KSAUDIO_SPEAKER_7POINT1) == 0) + { + fmt->Format.nChannels = 8; + fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 8 && + (ca_mask & ~KSAUDIO_SPEAKER_7POINT1_SURROUND) == 0) + { + fmt->Format.nChannels = 8; + fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1_SURROUND; + return; + } + + /* oddball format, report truthfully */ + fmt->Format.nChannels = ca_layout->mNumberChannelDescriptions; + fmt->dwChannelMask = ca_mask; +} + static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, WAVEFORMATEX **pwfx) { @@ -1745,6 +1861,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, UInt32 size; Float64 rate; AudioBufferList *buffers; + AudioChannelLayout *layout; AudioObjectPropertyAddress addr; int i; @@ -1762,38 +1879,70 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, addr.mScope = This->scope; addr.mElement = 0; - addr.mSelector = kAudioDevicePropertyStreamConfiguration; + addr.mSelector = kAudioDevicePropertyPreferredChannelLayout; sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, &size); - if(sc != noErr){ - CoTaskMemFree(fmt); - WARN("Unable to get size for _StreamConfiguration property: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } + if(sc == noErr){ + layout = HeapAlloc(GetProcessHeap(), 0, size); + + sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, layout); + if(sc == noErr){ + TRACE("Got channel layout: {tag: 0x%x, bitmap: 0x%x, num_descs: %u}\n", + layout->mChannelLayoutTag, layout->mChannelBitmap, layout->mNumberChannelDescriptions); - buffers = HeapAlloc(GetProcessHeap(), 0, size); - if(!buffers){ - CoTaskMemFree(fmt); - return E_OUTOFMEMORY; + if(layout->mChannelLayoutTag == kAudioChannelLayoutTag_UseChannelDescriptions){ + convert_channel_layout(layout, fmt); + }else{ + WARN("Haven't implemented support for this layout tag: 0x%x, guessing at layout\n", layout->mChannelLayoutTag); + fmt->Format.nChannels = 0; + } + }else{ + TRACE("Unable to get _PreferredChannelLayout property: %x, guessing at layout\n", (int)sc); + fmt->Format.nChannels = 0; + } + + HeapFree(GetProcessHeap(), 0, layout); + }else{ + TRACE("Unable to get size for _PreferredChannelLayout property: %x, guessing at layout\n", (int)sc); + fmt->Format.nChannels = 0; } - sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, - &size, buffers); - if(sc != noErr){ - CoTaskMemFree(fmt); + if(fmt->Format.nChannels == 0){ + addr.mScope = This->scope; + addr.mElement = 0; + addr.mSelector = kAudioDevicePropertyStreamConfiguration; + + sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, &size); + if(sc != noErr){ + CoTaskMemFree(fmt); + WARN("Unable to get size for _StreamConfiguration property: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + + buffers = HeapAlloc(GetProcessHeap(), 0, size); + if(!buffers){ + CoTaskMemFree(fmt); + return E_OUTOFMEMORY; + } + + sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, + &size, buffers); + if(sc != noErr){ + CoTaskMemFree(fmt); + HeapFree(GetProcessHeap(), 0, buffers); + WARN("Unable to get _StreamConfiguration property: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + + fmt->Format.nChannels = 0; + for(i = 0; i < buffers->mNumberBuffers; ++i) + fmt->Format.nChannels += buffers->mBuffers[i].mNumberChannels; + HeapFree(GetProcessHeap(), 0, buffers); - WARN("Unable to get _StreamConfiguration property: %x\n", (int)sc); - return osstatus_to_hresult(sc); + + fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); } - fmt->Format.nChannels = 0; - for(i = 0; i < buffers->mNumberBuffers; ++i) - fmt->Format.nChannels += buffers->mBuffers[i].mNumberChannels; - - HeapFree(GetProcessHeap(), 0, buffers); - - fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); - addr.mSelector = kAudioDevicePropertyNominalSampleRate; size = sizeof(Float64); sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, &rate); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index afa018ab0f9..dca40ecd771 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1334,6 +1334,22 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(fmt->Format.nChannels == 0 || fmt->Format.nChannels > 8) fmt->Format.nChannels = 2; + /* For most hardware on Windows, users must choose a configuration with an even + * number of channels (stereo, quad, 5.1, 7.1). Users can then disable + * channels, but those channels are still reported to applications from + * GetMixFormat! Some applications behave badly if given an odd number of + * channels (e.g. 2.1). */ + if(fmt->Format.nChannels > 1 && (fmt->Format.nChannels & 0x1)) + { + if(fmt->Format.nChannels < This->ai.max_channels) + fmt->Format.nChannels += 1; + else + /* We could "fake" more channels and downmix the emulated channels, + * but at that point you really ought to tweak your OSS setup or + * just use PulseAudio. */ + WARN("Some Windows applications behave badly with an odd number of channels (%u)!\n", fmt->Format.nChannels); + } + if(This->ai.max_rate == 0) fmt->Format.nSamplesPerSec = 44100; else diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 01f0d1b64c2..1c647c73d62 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -341,11 +341,12 @@ static const enum pa_channel_position pulse_pos_from_wfx[] = { PA_CHANNEL_POSITION_TOP_REAR_RIGHT }; -static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) { +static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) +{ int i; DWORD mask = 0; - for (i = 0; i < map->channels; ++i) + for (i = 0; i < map->channels; ++i) { switch (map->map[i]) { default: FIXME("Unhandled channel %s\n", pa_channel_position_to_string(map->map[i])); break; case PA_CHANNEL_POSITION_FRONT_LEFT: mask |= SPEAKER_FRONT_LEFT; break; @@ -367,11 +368,95 @@ static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) { case PA_CHANNEL_POSITION_TOP_REAR_RIGHT: mask |= SPEAKER_TOP_BACK_RIGHT; break; case PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER: mask |= SPEAKER_FRONT_LEFT_OF_CENTER; break; case PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER: mask |= SPEAKER_FRONT_RIGHT_OF_CENTER; break; + } } return mask; } +/* For most hardware on Windows, users must choose a configuration with an even + * number of channels (stereo, quad, 5.1, 7.1). Users can then disable + * channels, but those channels are still reported to applications from + * GetMixFormat! Some applications behave badly if given an odd number of + * channels (e.g. 2.1). Here, we find the nearest configuration that Windows + * would report for a given channel layout. */ +static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIBLE *fmt) +{ + DWORD pa_mask = pulse_channel_map_to_channel_mask(pa_map); + + TRACE("got mask for PA: 0x%x\n", pa_mask); + + if (pa_map->channels == 1) + { + fmt->Format.nChannels = 1; + fmt->dwChannelMask = pa_mask; + return; + } + + /* compare against known configurations and find smallest configuration + * which is a superset of the given speakers */ + + if (pa_map->channels <= 2 && + (pa_mask & ~KSAUDIO_SPEAKER_STEREO) == 0) + { + fmt->Format.nChannels = 2; + fmt->dwChannelMask = KSAUDIO_SPEAKER_STEREO; + return; + } + + if (pa_map->channels <= 4 && + (pa_mask & ~KSAUDIO_SPEAKER_QUAD) == 0) + { + fmt->Format.nChannels = 4; + fmt->dwChannelMask = KSAUDIO_SPEAKER_QUAD; + return; + } + + if (pa_map->channels <= 4 && + (pa_mask & ~KSAUDIO_SPEAKER_SURROUND) == 0) + { + fmt->Format.nChannels = 4; + fmt->dwChannelMask = KSAUDIO_SPEAKER_SURROUND; + return; + } + + if (pa_map->channels <= 6 && + (pa_mask & ~KSAUDIO_SPEAKER_5POINT1) == 0) + { + fmt->Format.nChannels = 6; + fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1; + return; + } + + if (pa_map->channels <= 6 && + (pa_mask & ~KSAUDIO_SPEAKER_5POINT1_SURROUND) == 0) + { + fmt->Format.nChannels = 6; + fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1_SURROUND; + return; + } + + if (pa_map->channels <= 8 && + (pa_mask & ~KSAUDIO_SPEAKER_7POINT1) == 0) + { + fmt->Format.nChannels = 8; + fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1; + return; + } + + if (pa_map->channels <= 8 && + (pa_mask & ~KSAUDIO_SPEAKER_7POINT1_SURROUND) == 0) + { + fmt->Format.nChannels = 8; + fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1_SURROUND; + return; + } + + /* oddball format, report truthfully */ + fmt->Format.nChannels = pa_map->channels; + fmt->dwChannelMask = pa_mask; +} + static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { WAVEFORMATEX *wfx = &fmt->Format; pa_stream *stream; @@ -433,10 +518,12 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { wfx->wFormatTag = WAVE_FORMAT_EXTENSIBLE; wfx->cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); - wfx->nChannels = ss.channels; + + convert_channel_map(&map, fmt); + wfx->wBitsPerSample = 8 * pa_sample_size_of_format(ss.format); wfx->nSamplesPerSec = ss.rate; - wfx->nBlockAlign = pa_frame_size(&ss); + wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample / 8; wfx->nAvgBytesPerSec = wfx->nSamplesPerSec * wfx->nBlockAlign; if (ss.format != PA_SAMPLE_S24_32LE) fmt->Samples.wValidBitsPerSample = wfx->wBitsPerSample; @@ -446,8 +533,6 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; else fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - - fmt->dwChannelMask = pulse_channel_map_to_channel_mask(&map); } static HRESULT pulse_connect(void) -- 2.23.0

1 1

[PATCH 4/7] wbemprox: Implement Win32_LogicalDiskToPartition.
by Hans Leidekker 10 Sep '19

10 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 123 ++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 5 +- 2 files changed, 127 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 299a2edc71..93d842708f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -76,6 +76,8 @@ static const WCHAR class_logicaldiskW[] = {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_logicaldisk2W[] = {'C','I','M','_','L','o','g','i','c','a','l','D','i','s','k',0}; +static const WCHAR class_logicaldisktopartitionW[] = + {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; static const WCHAR class_networkadapterW[] = {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; static const WCHAR class_networkadapterconfigW[] = @@ -129,6 +131,8 @@ static const WCHAR prop_adaptertypeidW[] = {'A','d','a','p','t','e','r','T','y','p','e','I','D',0}; static const WCHAR prop_addresswidthW[] = {'A','d','d','r','e','s','s','W','i','d','t','h',0}; +static const WCHAR prop_antecedentW[] = + {'A','n','t','e','c','e','d','e','n','t',0}; static const WCHAR prop_architectureW[] = {'A','r','c','h','i','t','e','c','t','u','r','e',0}; static const WCHAR prop_attributesW[] = @@ -183,6 +187,8 @@ static const WCHAR prop_defaultipgatewayW[] = {'D','e','f','a','u','l','t','I','P','G','a','t','e','w','a','y',0}; static const WCHAR prop_defaultvalueW[] = {'D','e','f','a','u','l','t','V','a','l','u','e',0}; +static const WCHAR prop_dependentW[] = + {'D','e','p','e','n','d','e','n','t',0}; static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR prop_destinationW[] = @@ -533,6 +539,11 @@ static const struct column col_logicaldisk[] = { prop_volumenameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_volumeserialnumberW, CIM_STRING|COL_FLAG_DYNAMIC } }; +static const struct column col_logicaldisktopartition[] = +{ + { prop_antecedentW, CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_dependentW, CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY } +}; static const struct column col_networkadapter[] = { { prop_adaptertypeW, CIM_STRING }, @@ -961,6 +972,11 @@ struct record_logicaldisk const WCHAR *volumename; const WCHAR *volumeserialnumber; }; +struct record_logicaldisktopartition +{ + const WCHAR *antecedent; + const WCHAR *dependent; +}; struct record_networkadapter { const WCHAR *adaptertype; @@ -2599,6 +2615,112 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr return status; } +struct association +{ + WCHAR *ref; + WCHAR *ref2; +}; + +static void free_assocations( struct association *assoc, UINT count ) +{ + UINT i; + if (!assoc) return; + for (i = 0; i < count; i++) + { + heap_free( assoc[i].ref ); + heap_free( assoc[i].ref2 ); + } + heap_free( assoc ); +} + +static struct association *get_logicaldisktopartition_pairs( UINT *count ) +{ + static const WCHAR pathW[] = + {'_','_','P','A','T','H',0}; + static const WCHAR selectW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'D','i','s','k','P','a','r','t','i','t','i','o','n',0}; + static const WCHAR select2W[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k',' ','W','H','E','R','E',' ', + 'D','r','i','v','e','T','y','p','e','=','2',' ','O','R',' ','D','r','i','v','e','T','y','p','e','=','3',0}; + struct association *ret = NULL; + struct query *query, *query2 = NULL; + VARIANT val; + HRESULT hr; + UINT i; + + if (!(query = create_query())) return NULL; + if ((hr = parse_query( selectW, &query->view, &query->mem )) != S_OK) goto done; + if ((hr = execute_view( query->view )) != S_OK) goto done; + + if (!(query2 = create_query())) return FALSE; + if ((hr = parse_query( select2W, &query2->view, &query2->mem )) != S_OK) goto done; + if ((hr = execute_view( query2->view )) != S_OK) goto done; + + if (!(ret = heap_alloc_zero( query->view->count * sizeof(*ret) ))) goto done; + + /* assume fixed and removable disks are enumerated in the same order as partitions */ + for (i = 0; i < query->view->count; i++) + { + if ((hr = get_propval( query->view, i, pathW, &val, NULL, NULL )) != S_OK) goto done; + if (!(ret[i].ref = heap_strdupW( V_BSTR(&val) ))) goto done; + VariantClear( &val ); + + if ((hr = get_propval( query2->view, i, pathW, &val, NULL, NULL )) != S_OK) goto done; + if (!(ret[i].ref2 = heap_strdupW( V_BSTR(&val) ))) goto done; + VariantClear( &val ); + } + + *count = query->view->count; + +done: + if (!ret) free_assocations( ret, query->view->count ); + free_query( query ); + free_query( query2 ); + return ret; +} + +static enum fill_status fill_logicaldisktopartition( struct table *table, const struct expr *cond ) +{ + struct record_logicaldisktopartition *rec; + UINT i, row = 0, offset = 0, count = 0; + enum fill_status status = FILL_STATUS_UNFILTERED; + struct association *assoc; + + if (!(assoc = get_logicaldisktopartition_pairs( &count ))) return FILL_STATUS_FAILED; + if (!count) + { + free_assocations( assoc, count ); + return FILL_STATUS_UNFILTERED; + } + if (!resize_table( table, count, sizeof(*rec) )) + { + free_assocations( assoc, count ); + return FILL_STATUS_FAILED; + } + + for (i = 0; i < count; i++) + { + rec = (struct record_logicaldisktopartition *)(table->data + offset); + rec->antecedent = assoc[i].ref; + rec->dependent = assoc[i].ref2; + if (!match_row( table, row, cond, &status )) + { + free_row_values( table, row ); + continue; + } + offset += sizeof(*rec); + row++; + } + + heap_free( assoc ); + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + static UINT16 get_connection_status( IF_OPER_STATUS status ) { switch (status) @@ -4061,6 +4183,7 @@ static struct table builtin_classes[] = { class_ip4routetableW, C(col_ip4routetable), 0, 0, NULL, fill_ip4routetable }, { class_logicaldiskW, C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, { class_logicaldisk2W, C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, + { class_logicaldisktopartitionW, C(col_logicaldisktopartition), 0, 0, NULL, fill_logicaldisktopartition }, { class_networkadapterW, C(col_networkadapter), 0, 0, NULL, fill_networkadapter }, { class_networkadapterconfigW, C(col_networkadapterconfig), 0, 0, NULL, fill_networkadapterconfig }, { class_osW, C(col_os), 0, 0, NULL, fill_os }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index b180cfc92f..6edb0d0f09 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -123,8 +123,11 @@ static void test_select( IWbemServices *services ) static const WCHAR query13[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S', ' ','W','H','E','R','E',' ','N','U','L','L',' ','=',' ','N','A','M','E', 0}; + static const WCHAR query14[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10, - query11, query12, query13 }; + query11, query12, query13, query14 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW ); -- 2.20.1

2 1

[PATCH] mmdevapi: Avoid reporting odd numbers of channels
by Andrew Eikum 10 Sep '19

10 Sep '19

Fixes sound in Touhou Luna Nights with some surround sound configurations. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 16 +++ dlls/winecoreaudio.drv/mmdevdrv.c | 197 ++++++++++++++++++++++++++---- dlls/wineoss.drv/mmdevdrv.c | 8 ++ dlls/winepulse.drv/mmdevdrv.c | 97 ++++++++++++++- 4 files changed, 288 insertions(+), 30 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 91aef4788d8..4f1270b33c8 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1831,6 +1831,22 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, else fmt->Format.nChannels = max_channels; + if(fmt->Format.nChannels > 1 && (fmt->Format.nChannels & 0x1)){ + /* For most hardware on Windows, users must choose a configuration with an even + * number of channels (stereo, quad, 5.1, 7.1). Users can then disable + * channels, but those channels are still reported to applications from + * GetMixFormat! Some applications behave badly if given an odd number of + * channels (e.g. 2.1). */ + + if(fmt->Format.nChannels < max_channels) + fmt->Format.nChannels += 1; + else + /* We could "fake" more channels and downmix the emulated channels, + * but at that point you really ought to tweak your ALSA setup or + * just use PulseAudio. */ + WARN("Some Windows applications behave badly with an odd number of channels (%u)!\n", fmt->Format.nChannels); + } + fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); if((err = snd_pcm_hw_params_get_rate_max(This->hw_params, &max_rate, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 2f4683af976..be2b5e7e1e9 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1736,6 +1736,122 @@ unsupported: return AUDCLNT_E_UNSUPPORTED_FORMAT; } +static DWORD ca_channel_layout_to_channel_mask(const AudioChannelLayout *layout) +{ + int i; + DWORD mask = 0; + + for (i = 0; i < layout->mNumberChannelDescriptions; ++i) { + switch (layout->mChannelDescriptions[i].mChannelLabel) { + default: FIXME("Unhandled channel 0x%x\n", layout->mChannelDescriptions[i].mChannelLabel); break; + case kAudioChannelLabel_Left: mask |= SPEAKER_FRONT_LEFT; break; + case kAudioChannelLabel_Mono: + case kAudioChannelLabel_Center: mask |= SPEAKER_FRONT_CENTER; break; + case kAudioChannelLabel_Right: mask |= SPEAKER_FRONT_RIGHT; break; + case kAudioChannelLabel_LeftSurround: mask |= SPEAKER_BACK_LEFT; break; + case kAudioChannelLabel_CenterSurround: mask |= SPEAKER_BACK_CENTER; break; + case kAudioChannelLabel_RightSurround: mask |= SPEAKER_BACK_RIGHT; break; + case kAudioChannelLabel_LFEScreen: mask |= SPEAKER_LOW_FREQUENCY; break; + case kAudioChannelLabel_LeftSurroundDirect: mask |= SPEAKER_SIDE_LEFT; break; + case kAudioChannelLabel_RightSurroundDirect: mask |= SPEAKER_SIDE_RIGHT; break; + case kAudioChannelLabel_TopCenterSurround: mask |= SPEAKER_TOP_CENTER; break; + case kAudioChannelLabel_VerticalHeightLeft: mask |= SPEAKER_TOP_FRONT_LEFT; break; + case kAudioChannelLabel_VerticalHeightCenter: mask |= SPEAKER_TOP_FRONT_CENTER; break; + case kAudioChannelLabel_VerticalHeightRight: mask |= SPEAKER_TOP_FRONT_RIGHT; break; + case kAudioChannelLabel_TopBackLeft: mask |= SPEAKER_TOP_BACK_LEFT; break; + case kAudioChannelLabel_TopBackCenter: mask |= SPEAKER_TOP_BACK_CENTER; break; + case kAudioChannelLabel_TopBackRight: mask |= SPEAKER_TOP_BACK_RIGHT; break; + case kAudioChannelLabel_LeftCenter: mask |= SPEAKER_FRONT_LEFT_OF_CENTER; break; + case kAudioChannelLabel_RightCenter: mask |= SPEAKER_FRONT_RIGHT_OF_CENTER; break; + } + } + + return mask; +} + +/* For most hardware on Windows, users must choose a configuration with an even + * number of channels (stereo, quad, 5.1, 7.1). Users can then disable + * channels, but those channels are still reported to applications from + * GetMixFormat! Some applications behave badly if given an odd number of + * channels (e.g. 2.1). Here, we find the nearest configuration that Windows + * would report for a given channel layout. */ +static void convert_channel_layout(const AudioChannelLayout *ca_layout, WAVEFORMATEXTENSIBLE *fmt) +{ + DWORD ca_mask = ca_channel_layout_to_channel_mask(ca_layout); + + TRACE("Got channel mask for CA: 0x%x\n", ca_mask); + + if (ca_layout->mNumberChannelDescriptions == 1) + { + fmt->Format.nChannels = 1; + fmt->dwChannelMask = ca_mask; + return; + } + + /* compare against known configurations and find smallest configuration + * which is a superset of the given speakers */ + + if (ca_layout->mNumberChannelDescriptions <= 2 && + (ca_mask & ~KSAUDIO_SPEAKER_STEREO) == 0) + { + fmt->Format.nChannels = 2; + fmt->dwChannelMask = KSAUDIO_SPEAKER_STEREO; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 4 && + (ca_mask & ~KSAUDIO_SPEAKER_QUAD) == 0) + { + fmt->Format.nChannels = 4; + fmt->dwChannelMask = KSAUDIO_SPEAKER_QUAD; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 4 && + (ca_mask & ~KSAUDIO_SPEAKER_SURROUND) == 0) + { + fmt->Format.nChannels = 4; + fmt->dwChannelMask = KSAUDIO_SPEAKER_SURROUND; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 6 && + (ca_mask & ~KSAUDIO_SPEAKER_5POINT1) == 0) + { + fmt->Format.nChannels = 6; + fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 6 && + (ca_mask & ~KSAUDIO_SPEAKER_5POINT1_SURROUND) == 0) + { + fmt->Format.nChannels = 6; + fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1_SURROUND; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 8 && + (ca_mask & ~KSAUDIO_SPEAKER_7POINT1) == 0) + { + fmt->Format.nChannels = 8; + fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 8 && + (ca_mask & ~KSAUDIO_SPEAKER_7POINT1_SURROUND) == 0) + { + fmt->Format.nChannels = 8; + fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1_SURROUND; + return; + } + + /* oddball format, report truthfully */ + fmt->Format.nChannels = ca_layout->mNumberChannelDescriptions; + fmt->dwChannelMask = ca_mask; +} + static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, WAVEFORMATEX **pwfx) { @@ -1745,6 +1861,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, UInt32 size; Float64 rate; AudioBufferList *buffers; + AudioChannelLayout *layout; AudioObjectPropertyAddress addr; int i; @@ -1762,38 +1879,70 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, addr.mScope = This->scope; addr.mElement = 0; - addr.mSelector = kAudioDevicePropertyStreamConfiguration; + addr.mSelector = kAudioDevicePropertyPreferredChannelLayout; sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, &size); - if(sc != noErr){ - CoTaskMemFree(fmt); - WARN("Unable to get size for _StreamConfiguration property: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } + if(sc == noErr){ + layout = HeapAlloc(GetProcessHeap(), 0, size); + + sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, layout); + if(sc == noErr){ + TRACE("Got channel layout: {tag: 0x%x, bitmap: 0x%x, num_descs: %u}\n", + layout->mChannelLayoutTag, layout->mChannelBitmap, layout->mNumberChannelDescriptions); - buffers = HeapAlloc(GetProcessHeap(), 0, size); - if(!buffers){ - CoTaskMemFree(fmt); - return E_OUTOFMEMORY; + if(layout->mChannelLayoutTag == kAudioChannelLayoutTag_UseChannelDescriptions){ + convert_channel_layout(layout, fmt); + }else{ + WARN("Haven't implemented support for this layout tag: 0x%x, guessing at layout\n", layout->mChannelLayoutTag); + fmt->Format.nChannels = 0; + } + }else{ + TRACE("Unable to get _PreferredChannelLayout property: %x, guessing at layout\n", (int)sc); + fmt->Format.nChannels = 0; + } + + HeapFree(GetProcessHeap(), 0, layout); + }else{ + TRACE("Unable to get size for _PreferredChannelLayout property: %x, guessing at layout\n", (int)sc); + fmt->Format.nChannels = 0; } - sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, - &size, buffers); - if(sc != noErr){ - CoTaskMemFree(fmt); + if(fmt->Format.nChannels == 0){ + addr.mScope = This->scope; + addr.mElement = 0; + addr.mSelector = kAudioDevicePropertyStreamConfiguration; + + sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, &size); + if(sc != noErr){ + CoTaskMemFree(fmt); + WARN("Unable to get size for _StreamConfiguration property: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + + buffers = HeapAlloc(GetProcessHeap(), 0, size); + if(!buffers){ + CoTaskMemFree(fmt); + return E_OUTOFMEMORY; + } + + sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, + &size, buffers); + if(sc != noErr){ + CoTaskMemFree(fmt); + HeapFree(GetProcessHeap(), 0, buffers); + WARN("Unable to get _StreamConfiguration property: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + + fmt->Format.nChannels = 0; + for(i = 0; i < buffers->mNumberBuffers; ++i) + fmt->Format.nChannels += buffers->mBuffers[i].mNumberChannels; + HeapFree(GetProcessHeap(), 0, buffers); - WARN("Unable to get _StreamConfiguration property: %x\n", (int)sc); - return osstatus_to_hresult(sc); + + fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); } - fmt->Format.nChannels = 0; - for(i = 0; i < buffers->mNumberBuffers; ++i) - fmt->Format.nChannels += buffers->mBuffers[i].mNumberChannels; - - HeapFree(GetProcessHeap(), 0, buffers); - - fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); - addr.mSelector = kAudioDevicePropertyNominalSampleRate; size = sizeof(Float64); sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, &rate); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index afa018ab0f9..81887827d2a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1334,6 +1334,14 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(fmt->Format.nChannels == 0 || fmt->Format.nChannels > 8) fmt->Format.nChannels = 2; + /* For most hardware on Windows, users must choose a configuration with an even + * number of channels (stereo, quad, 5.1, 7.1). Users can then disable + * channels, but those channels are still reported to applications from + * GetMixFormat! Some applications behave badly if given an odd number of + * channels (e.g. 2.1). */ + if(fmt->Format.nChannels > 1 && (fmt->Format.nChannels & 0x1)) + fmt->Format.nChannels += 1; + if(This->ai.max_rate == 0) fmt->Format.nSamplesPerSec = 44100; else diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 01f0d1b64c2..1c647c73d62 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -341,11 +341,12 @@ static const enum pa_channel_position pulse_pos_from_wfx[] = { PA_CHANNEL_POSITION_TOP_REAR_RIGHT }; -static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) { +static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) +{ int i; DWORD mask = 0; - for (i = 0; i < map->channels; ++i) + for (i = 0; i < map->channels; ++i) { switch (map->map[i]) { default: FIXME("Unhandled channel %s\n", pa_channel_position_to_string(map->map[i])); break; case PA_CHANNEL_POSITION_FRONT_LEFT: mask |= SPEAKER_FRONT_LEFT; break; @@ -367,11 +368,95 @@ static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) { case PA_CHANNEL_POSITION_TOP_REAR_RIGHT: mask |= SPEAKER_TOP_BACK_RIGHT; break; case PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER: mask |= SPEAKER_FRONT_LEFT_OF_CENTER; break; case PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER: mask |= SPEAKER_FRONT_RIGHT_OF_CENTER; break; + } } return mask; } +/* For most hardware on Windows, users must choose a configuration with an even + * number of channels (stereo, quad, 5.1, 7.1). Users can then disable + * channels, but those channels are still reported to applications from + * GetMixFormat! Some applications behave badly if given an odd number of + * channels (e.g. 2.1). Here, we find the nearest configuration that Windows + * would report for a given channel layout. */ +static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIBLE *fmt) +{ + DWORD pa_mask = pulse_channel_map_to_channel_mask(pa_map); + + TRACE("got mask for PA: 0x%x\n", pa_mask); + + if (pa_map->channels == 1) + { + fmt->Format.nChannels = 1; + fmt->dwChannelMask = pa_mask; + return; + } + + /* compare against known configurations and find smallest configuration + * which is a superset of the given speakers */ + + if (pa_map->channels <= 2 && + (pa_mask & ~KSAUDIO_SPEAKER_STEREO) == 0) + { + fmt->Format.nChannels = 2; + fmt->dwChannelMask = KSAUDIO_SPEAKER_STEREO; + return; + } + + if (pa_map->channels <= 4 && + (pa_mask & ~KSAUDIO_SPEAKER_QUAD) == 0) + { + fmt->Format.nChannels = 4; + fmt->dwChannelMask = KSAUDIO_SPEAKER_QUAD; + return; + } + + if (pa_map->channels <= 4 && + (pa_mask & ~KSAUDIO_SPEAKER_SURROUND) == 0) + { + fmt->Format.nChannels = 4; + fmt->dwChannelMask = KSAUDIO_SPEAKER_SURROUND; + return; + } + + if (pa_map->channels <= 6 && + (pa_mask & ~KSAUDIO_SPEAKER_5POINT1) == 0) + { + fmt->Format.nChannels = 6; + fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1; + return; + } + + if (pa_map->channels <= 6 && + (pa_mask & ~KSAUDIO_SPEAKER_5POINT1_SURROUND) == 0) + { + fmt->Format.nChannels = 6; + fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1_SURROUND; + return; + } + + if (pa_map->channels <= 8 && + (pa_mask & ~KSAUDIO_SPEAKER_7POINT1) == 0) + { + fmt->Format.nChannels = 8; + fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1; + return; + } + + if (pa_map->channels <= 8 && + (pa_mask & ~KSAUDIO_SPEAKER_7POINT1_SURROUND) == 0) + { + fmt->Format.nChannels = 8; + fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1_SURROUND; + return; + } + + /* oddball format, report truthfully */ + fmt->Format.nChannels = pa_map->channels; + fmt->dwChannelMask = pa_mask; +} + static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { WAVEFORMATEX *wfx = &fmt->Format; pa_stream *stream; @@ -433,10 +518,12 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { wfx->wFormatTag = WAVE_FORMAT_EXTENSIBLE; wfx->cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); - wfx->nChannels = ss.channels; + + convert_channel_map(&map, fmt); + wfx->wBitsPerSample = 8 * pa_sample_size_of_format(ss.format); wfx->nSamplesPerSec = ss.rate; - wfx->nBlockAlign = pa_frame_size(&ss); + wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample / 8; wfx->nAvgBytesPerSec = wfx->nSamplesPerSec * wfx->nBlockAlign; if (ss.format != PA_SAMPLE_S24_32LE) fmt->Samples.wValidBitsPerSample = wfx->wBitsPerSample; @@ -446,8 +533,6 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; else fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - - fmt->dwChannelMask = pulse_channel_map_to_channel_mask(&map); } static HRESULT pulse_connect(void) -- 2.23.0

1 0

[PATCH 7/7] wbemprox: Add support for evaluating ASSOCIATORS OF queries.
by Hans Leidekker 10 Sep '19

10 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 40 ++- dlls/wbemprox/class.c | 36 ++- dlls/wbemprox/query.c | 509 ++++++++++++++++++++++++------- dlls/wbemprox/services.c | 21 +- dlls/wbemprox/wbemprox_private.h | 36 ++- dlls/wbemprox/wql.y | 10 +- 6 files changed, 496 insertions(+), 156 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index de793f3f7e..8bb5be0aac 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -50,6 +50,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); +static const WCHAR class_associatorsW[] = + {'_','_','A','S','S','O','C','I','A','T','O','R','S',0}; static const WCHAR class_baseboardW[] = {'W','i','n','3','2','_','B','a','s','e','B','o','a','r','d',0}; static const WCHAR class_biosW[] = @@ -137,6 +139,10 @@ static const WCHAR prop_antecedentW[] = {'A','n','t','e','c','e','d','e','n','t',0}; static const WCHAR prop_architectureW[] = {'A','r','c','h','i','t','e','c','t','u','r','e',0}; +static const WCHAR prop_assocclassW[] = + {'A','s','s','o','c','C','l','a','s','s',0}; +static const WCHAR prop_associatorW[] = + {'A','s','s','o','c','i','a','t','o','r',0}; static const WCHAR prop_attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; static const WCHAR prop_availabilityW[] = @@ -433,6 +439,12 @@ static const WCHAR prop_workingsetsizeW[] = {'W','o','r','k','i','n','g','S','e','t','S','i','z','e',0}; /* column definitions must be kept in sync with record structures below */ +static const struct column col_associator[] = +{ + { prop_assocclassW, CIM_STRING }, + { prop_classW, CIM_STRING }, + { prop_associatorW, CIM_STRING } +}; static const struct column col_baseboard[] = { { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -871,6 +883,12 @@ static const WCHAR videocontroller_statusW[] = {'O','K',0}; #include "pshpack1.h" +struct record_associator +{ + const WCHAR *assocclass; + const WCHAR *class; + const WCHAR *associator; +}; struct record_baseboard { const WCHAR *manufacturer; @@ -1214,6 +1232,11 @@ struct record_videocontroller }; #include "poppack.h" +static const struct record_associator data_associator[] = +{ + { class_diskdrivetodiskpartitionW, class_diskpartitionW, class_diskdriveW }, + { class_logicaldisktopartitionW, class_logicaldiskW, class_diskpartitionW }, +}; static const struct record_param data_param[] = { { class_processW, method_getownerW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, @@ -2489,9 +2512,9 @@ static struct association *get_diskdrivetodiskpartition_pairs( UINT *count ) if ((hr = parse_query( select2W, &query2->view, &query2->mem )) != S_OK) goto done; if ((hr = execute_view( query2->view )) != S_OK) goto done; - if (!(ret = heap_alloc_zero( query->view->count * sizeof(*ret) ))) goto done; + if (!(ret = heap_alloc_zero( query->view->result_count * sizeof(*ret) ))) goto done; - for (i = 0; i < query->view->count; i++) + for (i = 0; i < query->view->result_count; i++) { if ((hr = get_propval( query->view, i, pathW, &val, NULL, NULL )) != S_OK) goto done; if (!(ret[i].ref = heap_strdupW( V_BSTR(&val) ))) goto done; @@ -2502,10 +2525,10 @@ static struct association *get_diskdrivetodiskpartition_pairs( UINT *count ) VariantClear( &val ); } - *count = query->view->count; + *count = query->view->result_count; done: - if (!ret) free_assocations( ret, query->view->count ); + if (!ret) free_assocations( ret, query->view->result_count ); free_query( query ); free_query( query2 ); return ret; @@ -2754,10 +2777,10 @@ static struct association *get_logicaldisktopartition_pairs( UINT *count ) if ((hr = parse_query( select2W, &query2->view, &query2->mem )) != S_OK) goto done; if ((hr = execute_view( query2->view )) != S_OK) goto done; - if (!(ret = heap_alloc_zero( query->view->count * sizeof(*ret) ))) goto done; + if (!(ret = heap_alloc_zero( query->view->result_count * sizeof(*ret) ))) goto done; /* assume fixed and removable disks are enumerated in the same order as partitions */ - for (i = 0; i < query->view->count; i++) + for (i = 0; i < query->view->result_count; i++) { if ((hr = get_propval( query->view, i, pathW, &val, NULL, NULL )) != S_OK) goto done; if (!(ret[i].ref = heap_strdupW( V_BSTR(&val) ))) goto done; @@ -2768,10 +2791,10 @@ static struct association *get_logicaldisktopartition_pairs( UINT *count ) VariantClear( &val ); } - *count = query->view->count; + *count = query->view->result_count; done: - if (!ret) free_assocations( ret, query->view->count ); + if (!ret) free_assocations( ret, query->view->result_count ); free_query( query ); free_query( query2 ); return ret; @@ -4266,6 +4289,7 @@ done: #define D(d) sizeof(d)/sizeof(d[0]), 0, (BYTE *)d static struct table builtin_classes[] = { + { class_associatorsW, C(col_associator), D(data_associator) }, { class_baseboardW, C(col_baseboard), 0, 0, NULL, fill_baseboard }, { class_biosW, C(col_bios), 0, 0, NULL, fill_bios }, { class_cdromdriveW, C(col_cdromdrive), 0, 0, NULL, fill_cdromdrive }, diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index d0522787a2..5f8dcea10d 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -113,6 +113,7 @@ static HRESULT WINAPI enum_class_object_Next( { struct enum_class_object *ec = impl_from_IEnumWbemClassObject( iface ); struct view *view = ec->query->view; + struct table *table; static int once = 0; HRESULT hr; @@ -123,14 +124,15 @@ static HRESULT WINAPI enum_class_object_Next( if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n"); *puReturned = 0; - if (ec->index >= view->count) return WBEM_S_FALSE; + if (ec->index >= view->result_count) return WBEM_S_FALSE; - hr = create_class_object( view->table->name, iface, ec->index, NULL, apObjects ); + table = get_view_table( view, ec->index ); + hr = create_class_object( table->name, iface, ec->index, NULL, apObjects ); if (hr != S_OK) return hr; ec->index++; *puReturned = 1; - if (ec->index == view->count && uCount > 1) return WBEM_S_FALSE; + if (ec->index == view->result_count && uCount > 1) return WBEM_S_FALSE; if (uCount > 1) return WBEM_S_TIMEDOUT; return WBEM_S_NO_ERROR; } @@ -168,11 +170,11 @@ static HRESULT WINAPI enum_class_object_Skip( if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n"); - if (!view->count) return WBEM_S_FALSE; + if (!view->result_count) return WBEM_S_FALSE; - if (nCount > view->count - ec->index) + if (nCount > view->result_count - ec->index) { - ec->index = view->count - 1; + ec->index = view->result_count - 1; return WBEM_S_FALSE; } ec->index += nCount; @@ -491,7 +493,7 @@ static HRESULT WINAPI class_object_GetNames( if (wszQualifierName || pQualifierVal) FIXME("qualifier not supported\n"); - return get_properties( ec->query->view, lFlags, pNames ); + return get_properties( ec->query->view, co->index, lFlags, pNames ); } static HRESULT WINAPI class_object_BeginEnumeration( @@ -519,17 +521,18 @@ static HRESULT WINAPI class_object_Next( struct class_object *obj = impl_from_IWbemClassObject( iface ); struct enum_class_object *iter = impl_from_IEnumWbemClassObject( obj->iter ); struct view *view = iter->query->view; + struct table *table = get_view_table( view, obj->index ); BSTR prop; HRESULT hr; UINT i; TRACE("%p, %08x, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor); - for (i = obj->index_property; i < view->table->num_cols; i++) + for (i = obj->index_property; i < table->num_cols; i++) { - if (is_method( view->table, i )) continue; - if (!is_selected_prop( view, view->table->columns[i].name )) continue; - if (!(prop = SysAllocString( view->table->columns[i].name ))) return E_OUTOFMEMORY; + if (is_method( table, i )) continue; + if (!is_result_prop( view, table->columns[i].name )) continue; + if (!(prop = SysAllocString( table->columns[i].name ))) return E_OUTOFMEMORY; if ((hr = get_propval( view, obj->index, prop, pVal, pType, plFlavor )) != S_OK) { SysFreeString( prop ); @@ -612,15 +615,16 @@ static BSTR get_object_text( const struct view *view, UINT index ) static const WCHAR fmtW[] = {'\n','i','n','s','t','a','n','c','e',' ','o','f',' ','%','s','\n','{','%','s','\n','}',';',0}; UINT len, len_body, row = view->result[index]; + struct table *table = get_view_table( view, index ); BSTR ret, body; len = ARRAY_SIZE( fmtW ); - len += lstrlenW( view->table->name ); - if (!(body = get_body_text( view->table, row, &len_body ))) return NULL; + len += lstrlenW( table->name ); + if (!(body = get_body_text( table, row, &len_body ))) return NULL; len += len_body; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; - swprintf( ret, len, fmtW, view->table->name, body ); + swprintf( ret, len, fmtW, table->name, body ); SysFreeString( body ); return ret; } @@ -660,12 +664,12 @@ static HRESULT WINAPI class_object_SpawnInstance( { struct class_object *co = impl_from_IWbemClassObject( iface ); struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); - struct view *view = ec->query->view; + struct table *table = get_view_table( ec->query->view, co->index ); struct record *record; TRACE("%p, %08x, %p\n", iface, lFlags, ppNewInstance); - if (!(record = create_record( view->table ))) return E_OUTOFMEMORY; + if (!(record = create_record( table ))) return E_OUTOFMEMORY; return create_class_object( co->name, NULL, 0, record, ppNewInstance ); } diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 7b194fbabf..b311fdaf2d 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -29,25 +29,56 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); -HRESULT create_view( const WCHAR *path, const struct keyword *keywordlist, const WCHAR *class, +static HRESULT append_table( struct view *view, struct table *table ) +{ + struct table **tmp; + if (!(tmp = heap_realloc( view->table, (view->table_count + 1) * sizeof(*tmp) ))) return E_OUTOFMEMORY; + view->table = tmp; + view->table[view->table_count++] = table; + return S_OK; +} + +HRESULT create_view( enum view_type type, const WCHAR *path, const struct keyword *keywordlist, const WCHAR *class, const struct property *proplist, const struct expr *cond, struct view **ret ) { struct view *view = heap_alloc_zero( sizeof(*view) ); if (!view) return E_OUTOFMEMORY; - view->path = path; - view->keywordlist = keywordlist; - view->proplist = proplist; - view->table = grab_table( class ); - view->cond = cond; + + switch (type) + { + case VIEW_TYPE_ASSOCIATORS: + view->path = path; + view->keywordlist = keywordlist; + break; + + case VIEW_TYPE_SELECT: + { + struct table *table = grab_table( class ); + HRESULT hr; + + if (table && (hr = append_table( view, table )) != S_OK) return hr; + view->proplist = proplist; + view->cond = cond; + break; + } + default: + ERR( "unhandled type %u\n", type ); + heap_free( view ); + return E_INVALIDARG; + } + + view->type = type; *ret = view; return S_OK; } void destroy_view( struct view *view ) { + ULONG i; if (!view) return; - if (view->table) release_table( view->table ); + for (i = 0; i < view->table_count; i++) release_table( view->table[i] ); + heap_free( view->table ); heap_free( view->result ); heap_free( view ); } @@ -440,24 +471,242 @@ HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, return WBEM_E_INVALID_QUERY; } -HRESULT execute_view( struct view *view ) +static WCHAR *build_assoc_query( const WCHAR *class, UINT class_len ) +{ + static const WCHAR fmtW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','_','_','A','S','S','O','C','I','A','T','O','R','S', + ' ','W','H','E','R','E',' ','C','l','a','s','s','=','\'','%','s','\'',0}; + UINT len = class_len + ARRAY_SIZE(fmtW); + WCHAR *ret; + + if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + swprintf( ret, len, fmtW, class ); + return ret; +} + +static HRESULT create_assoc_enum( const WCHAR *class, UINT class_len, IEnumWbemClassObject **iter ) +{ + WCHAR *query; + HRESULT hr; + + if (!(query = build_assoc_query( class, class_len ))) return E_OUTOFMEMORY; + hr = exec_query( query, iter ); + heap_free( query ); + return hr; +} + +static WCHAR *build_antecedent_query( const WCHAR *assocclass, const WCHAR *dependent ) +{ + static const WCHAR fmtW[] = + {'S','E','L','E','C','T',' ','A','n','t','e','c','e','d','e','n','t',' ','F','R','O','M',' ','%','s',' ', + 'W','H','E','R','E',' ','D','e','p','e','n','d','e','n','t','=','\'','%','s','\'',0}; + UINT len = lstrlenW(assocclass) + lstrlenW(dependent) + ARRAY_SIZE(fmtW); + WCHAR *ret; + + if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + swprintf( ret, len, fmtW, assocclass, dependent ); + return ret; +} + +static BSTR build_servername(void) +{ + WCHAR server[MAX_COMPUTERNAME_LENGTH + 1], *p; + DWORD len = ARRAY_SIZE( server ); + + if (!(GetComputerNameW( server, &len ))) return NULL; + for (p = server; *p; p++) *p = towupper( *p ); + return SysAllocString( server ); +} + +static BSTR build_namespace(void) +{ + static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; + return SysAllocString( cimv2W ); +} + +static WCHAR *build_canonical_path( const WCHAR *relpath ) +{ + static const WCHAR fmtW[] = {'\\','\\','%','s','\\','%','s',':',0}; + BSTR server, namespace; + WCHAR *ret; + UINT len, i; + + if (!(server = build_servername())) return NULL; + if (!(namespace = build_namespace())) + { + SysFreeString( server ); + return NULL; + } + + len = ARRAY_SIZE( fmtW ) + SysStringLen( server ) + SysStringLen( namespace ) + lstrlenW( relpath ); + if ((ret = heap_alloc( len * sizeof(WCHAR ) ))) + { + len = swprintf( ret, len, fmtW, server, namespace ); + for (i = 0; i < lstrlenW( relpath ); i ++) + { + if (relpath[i] == '\'') ret[len++] = '"'; + else ret[len++] = relpath[i]; + } + ret[len] = 0; + } + + SysFreeString( server ); + SysFreeString( namespace ); + return ret; +} + +static HRESULT get_antecedent( const WCHAR *assocclass, const WCHAR *dependent, BSTR *ret ) +{ + static const WCHAR antecedentW[] = {'A','n','t','e','c','e','d','e','n','t',0}; + WCHAR *fullpath, *str; + IEnumWbemClassObject *iter = NULL; + IWbemClassObject *obj; + HRESULT hr = E_OUTOFMEMORY; + ULONG count; + VARIANT var; + + if (!(fullpath = build_canonical_path( dependent ))) return E_OUTOFMEMORY; + if (!(str = build_antecedent_query( assocclass, fullpath ))) goto done; + if ((hr = exec_query( str, &iter )) != S_OK) goto done; + + IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, &obj, &count ); + if (!count) + { + *ret = NULL; + goto done; + } + + hr = IWbemClassObject_Get( obj, antecedentW, 0, &var, NULL, NULL ); + IWbemClassObject_Release( obj ); + if (hr != S_OK) goto done; + *ret = V_BSTR( &var ); + +done: + if (iter) IEnumWbemClassObject_Release( iter ); + heap_free( str ); + heap_free( fullpath ); + return hr; +} + +static HRESULT do_query( const WCHAR *str, struct query **ret_query ) +{ + struct query *query; + HRESULT hr; + + if (!(query = create_query())) return E_OUTOFMEMORY; + if ((hr = parse_query( str, &query->view, &query->mem )) != S_OK || (hr = execute_view( query->view )) != S_OK) + { + release_query( query ); + return hr; + } + *ret_query = query; + return S_OK; +} + +static HRESULT get_antecedent_table( const WCHAR *assocclass, const WCHAR *dependent, struct table **table ) +{ + BSTR antecedent = NULL; + struct path *path = NULL; + WCHAR *str = NULL; + struct query *query = NULL; + HRESULT hr; + + if ((hr = get_antecedent( assocclass, dependent, &antecedent )) != S_OK) return hr; + if (!antecedent) + { + *table = NULL; + return S_OK; + } + if ((hr = parse_path( antecedent, &path )) != S_OK) goto done; + if (!(str = query_from_path( path ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + + if ((hr = do_query( str, &query )) != S_OK) goto done; + if (query->view->table_count) *table = addref_table( query->view->table[0] ); + else *table = NULL; + +done: + if (query) release_query( query ); + free_path( path ); + SysFreeString( antecedent ); + return hr; +} + +static HRESULT exec_assoc_view( struct view *view ) +{ + static const WCHAR assocclassW[] = {'A','s','s','o','c','C','l','a','s','s',0}; + IEnumWbemClassObject *iter = NULL; + struct path *path; + HRESULT hr; + + if (view->keywordlist) FIXME( "ignoring keywords\n" ); + if ((hr = parse_path( view->path, &path )) != S_OK) return hr; + + if ((hr = create_assoc_enum( path->class, path->class_len, &iter )) != S_OK) goto done; + for (;;) + { + ULONG count; + IWbemClassObject *obj; + struct table *table; + VARIANT var; + + IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, &obj, &count ); + if (!count) break; + + if ((hr = IWbemClassObject_Get( obj, assocclassW, 0, &var, NULL, NULL )) != S_OK) + { + IWbemClassObject_Release( obj ); + goto done; + } + IWbemClassObject_Release( obj ); + + hr = get_antecedent_table( V_BSTR(&var), view->path, &table ); + VariantClear( &var ); + if (hr != S_OK) goto done; + + if (table && (hr = append_table( view, table )) != S_OK) + { + release_table( table ); + goto done; + } + } + + if (view->table_count) + { + if (!(view->result = heap_alloc_zero( view->table_count * sizeof(UINT) ))) hr = E_OUTOFMEMORY; + else view->result_count = view->table_count; + } + +done: + if (iter) IEnumWbemClassObject_Release( iter ); + free_path( path ); + return hr; +} + +static HRESULT exec_select_view( struct view *view ) { UINT i, j = 0, len; enum fill_status status = FILL_STATUS_UNFILTERED; + struct table *table; - if (!view->table) return S_OK; - if (view->table->fill) + if (!view->table_count) return S_OK; + + table = view->table[0]; + if (table->fill) { - clear_table( view->table ); - status = view->table->fill( view->table, view->cond ); + clear_table( table ); + status = table->fill( table, view->cond ); } if (status == FILL_STATUS_FAILED) return WBEM_E_FAILED; - if (!view->table->num_rows) return S_OK; + if (!table->num_rows) return S_OK; - len = min( view->table->num_rows, 16 ); + len = min( table->num_rows, 16 ); if (!(view->result = heap_alloc( len * sizeof(UINT) ))) return E_OUTOFMEMORY; - for (i = 0; i < view->table->num_rows; i++) + for (i = 0; i < table->num_rows; i++) { HRESULT hr; LONGLONG val = 0; @@ -471,13 +720,30 @@ HRESULT execute_view( struct view *view ) view->result = tmp; } if (status == FILL_STATUS_FILTERED) val = 1; - else if ((hr = eval_cond( view->table, i, view->cond, &val, &type )) != S_OK) return hr; + else if ((hr = eval_cond( table, i, view->cond, &val, &type )) != S_OK) return hr; if (val) view->result[j++] = i; } - view->count = j; + + view->result_count = j; return S_OK; } +HRESULT execute_view( struct view *view ) +{ + switch (view->type) + { + case VIEW_TYPE_ASSOCIATORS: + return exec_assoc_view( view ); + + case VIEW_TYPE_SELECT: + return exec_select_view( view ); + + default: + ERR( "unhandled type %u\n", view->type ); + return E_INVALIDARG; + } +} + struct query *create_query(void) { struct query *query; @@ -527,10 +793,9 @@ done: return hr; } -BOOL is_selected_prop( const struct view *view, const WCHAR *name ) +BOOL is_result_prop( const struct view *view, const WCHAR *name ) { const struct property *prop = view->proplist; - if (!prop) return TRUE; while (prop) { @@ -545,47 +810,21 @@ static BOOL is_system_prop( const WCHAR *name ) return (name[0] == '_' && name[1] == '_'); } -static BSTR build_servername( const struct view *view ) -{ - WCHAR server[MAX_COMPUTERNAME_LENGTH + 1], *p; - DWORD len = ARRAY_SIZE( server ); - - if (view->proplist) return NULL; - - if (!(GetComputerNameW( server, &len ))) return NULL; - for (p = server; *p; p++) *p = towupper( *p ); - return SysAllocString( server ); -} - -static BSTR build_classname( const struct view *view ) -{ - return SysAllocString( view->table->name ); -} - -static BSTR build_namespace( const struct view *view ) -{ - static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; - - if (view->proplist) return NULL; - return SysAllocString( cimv2W ); -} - -static BSTR build_proplist( const struct view *view, UINT index, UINT count, UINT *len ) +static BSTR build_proplist( const struct table *table, UINT row, UINT count, UINT *len ) { static const WCHAR fmtW[] = {'%','s','=','%','s',0}; - UINT i, j, offset, row = view->result[index]; + UINT i, j, offset; BSTR *values, ret = NULL; if (!(values = heap_alloc( count * sizeof(BSTR) ))) return NULL; *len = j = 0; - for (i = 0; i < view->table->num_cols; i++) + for (i = 0; i < table->num_cols; i++) { - if (view->table->columns[i].type & COL_FLAG_KEY) + if (table->columns[i].type & COL_FLAG_KEY) { - const WCHAR *name = view->table->columns[i].name; - - values[j] = get_value_bstr( view->table, row, i ); + const WCHAR *name = table->columns[i].name; + values[j] = get_value_bstr( table, row, i ); *len += lstrlenW( fmtW ) + lstrlenW( name ) + lstrlenW( values[j] ); j++; } @@ -593,12 +832,11 @@ static BSTR build_proplist( const struct view *view, UINT index, UINT count, UIN if ((ret = SysAllocStringLen( NULL, *len ))) { offset = j = 0; - for (i = 0; i < view->table->num_cols; i++) + for (i = 0; i < table->num_cols; i++) { - if (view->table->columns[i].type & COL_FLAG_KEY) + if (table->columns[i].type & COL_FLAG_KEY) { - const WCHAR *name = view->table->columns[i].name; - + const WCHAR *name = table->columns[i].name; offset += swprintf( ret + offset, *len - offset, fmtW, name, values[j] ); if (j < count - 1) ret[offset++] = ','; j++; @@ -610,28 +848,30 @@ static BSTR build_proplist( const struct view *view, UINT index, UINT count, UIN return ret; } -static UINT count_key_columns( const struct view *view ) +static UINT count_key_columns( const struct table *table ) { UINT i, num_keys = 0; - for (i = 0; i < view->table->num_cols; i++) + for (i = 0; i < table->num_cols; i++) { - if (view->table->columns[i].type & COL_FLAG_KEY) num_keys++; + if (table->columns[i].type & COL_FLAG_KEY) num_keys++; } return num_keys; } -static BSTR build_relpath( const struct view *view, UINT index, const WCHAR *name ) +static BSTR build_relpath( const struct view *view, UINT table_index, UINT result_index, const WCHAR *name ) { static const WCHAR fmtW[] = {'%','s','.','%','s',0}; BSTR class, proplist, ret = NULL; + struct table *table = view->table[table_index]; + UINT row = view->result[result_index]; UINT num_keys, len; if (view->proplist) return NULL; - if (!(class = build_classname( view ))) return NULL; - if (!(num_keys = count_key_columns( view ))) return class; - if (!(proplist = build_proplist( view, index, num_keys, &len ))) goto done; + if (!(class = SysAllocString( view->table[table_index]->name ))) return NULL; + if (!(num_keys = count_key_columns( table ))) return class; + if (!(proplist = build_proplist( table, row, num_keys, &len ))) goto done; len += lstrlenW( fmtW ) + SysStringLen( class ); if (!(ret = SysAllocStringLen( NULL, len ))) goto done; @@ -643,7 +883,7 @@ done: return ret; } -static BSTR build_path( const struct view *view, UINT index, const WCHAR *name ) +static BSTR build_path( const struct view *view, UINT table_index, UINT result_index, const WCHAR *name ) { static const WCHAR fmtW[] = {'\\','\\','%','s','\\','%','s',':','%','s',0}; BSTR server, namespace = NULL, relpath = NULL, ret = NULL; @@ -651,9 +891,9 @@ static BSTR build_path( const struct view *view, UINT index, const WCHAR *name ) if (view->proplist) return NULL; - if (!(server = build_servername( view ))) return NULL; - if (!(namespace = build_namespace( view ))) goto done; - if (!(relpath = build_relpath( view, index, name ))) goto done; + if (!(server = build_servername())) return NULL; + if (!(namespace = build_namespace())) goto done; + if (!(relpath = build_relpath( view, table_index, result_index, name ))) goto done; len = lstrlenW( fmtW ) + SysStringLen( server ) + SysStringLen( namespace ) + SysStringLen( relpath ); if (!(ret = SysAllocStringLen( NULL, len ))) goto done; @@ -671,30 +911,30 @@ BOOL is_method( const struct table *table, UINT column ) return table->columns[column].type & COL_FLAG_METHOD; } -static UINT count_properties( const struct view *view ) +static UINT count_properties( const struct table *table ) { UINT i, num_props = 0; - for (i = 0; i < view->table->num_cols; i++) + for (i = 0; i < table->num_cols; i++) { - if (!is_method( view->table, i)) num_props++; + if (!is_method( table, i )) num_props++; } return num_props; } -static UINT count_selected_properties( const struct view *view ) +static UINT count_result_properties( const struct view *view, UINT table_index ) { const struct property *prop = view->proplist; UINT count; - if (!prop) return count_properties( view ); + if (!prop) return count_properties( view->table[table_index] ); count = 1; while ((prop = prop->next)) count++; return count; } -static HRESULT get_system_propval( const struct view *view, UINT index, const WCHAR *name, +static HRESULT get_system_propval( const struct view *view, UINT table_index, UINT result_index, const WCHAR *name, VARIANT *ret, CIMTYPE *type, LONG *flavor ) { static const WCHAR classW[] = {'_','_','C','L','A','S','S',0}; @@ -712,7 +952,7 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC if (ret) { V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = build_classname( view ); + V_BSTR( ret ) = SysAllocString( view->table[table_index]->name ); } if (type) *type = CIM_STRING; return S_OK; @@ -732,7 +972,7 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC if (ret) { V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = build_namespace( view ); + V_BSTR( ret ) = view->proplist ? NULL : build_namespace(); } if (type) *type = CIM_STRING; return S_OK; @@ -742,7 +982,7 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC if (ret) { V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = build_path( view, index, name ); + V_BSTR( ret ) = build_path( view, table_index, result_index, name ); } if (type) *type = CIM_STRING; return S_OK; @@ -752,7 +992,7 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC if (ret) { V_VT( ret ) = VT_I4; - V_I4( ret ) = count_selected_properties( view ); + V_I4( ret ) = count_result_properties( view, table_index ); } if (type) *type = CIM_SINT32; return S_OK; @@ -762,7 +1002,7 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC if (ret) { V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = build_relpath( view, index, name ); + V_BSTR( ret ) = build_relpath( view, table_index, result_index, name ); } if (type) *type = CIM_STRING; return S_OK; @@ -772,7 +1012,7 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC if (ret) { V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = build_servername( view ); + V_BSTR( ret ) = view->proplist ? NULL : build_servername(); } if (type) *type = CIM_STRING; return S_OK; @@ -871,6 +1111,9 @@ void set_variant( VARTYPE type, LONGLONG val, void *val_ptr, VARIANT *ret ) break; case VT_NULL: break; + case VT_R4: + V_R4( ret ) = *(FLOAT *)&val; + break; default: ERR("unhandled variant type %u\n", type); return; @@ -878,34 +1121,74 @@ void set_variant( VARTYPE type, LONGLONG val, void *val_ptr, VARIANT *ret ) V_VT( ret ) = type; } -HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VARIANT *ret, - CIMTYPE *type, LONG *flavor ) +static HRESULT map_view_index( const struct view *view, UINT index, UINT *table_index, UINT *result_index ) +{ + switch (view->type) + { + case VIEW_TYPE_SELECT: + *table_index = 0; + *result_index = index; + break; + + case VIEW_TYPE_ASSOCIATORS: + *table_index = *result_index = index; + break; + + default: + ERR( "unhandled view type %u\n", view->type ); + return WBEM_E_FAILED; + } + return S_OK; +} + +struct table *get_view_table( const struct view *view, UINT index ) +{ + switch (view->type) + { + case VIEW_TYPE_SELECT: + return view->table[0]; + + case VIEW_TYPE_ASSOCIATORS: + return view->table[index]; + + default: + ERR( "unhandled view type %u\n", view->type ); + return NULL; + } +} + +HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VARIANT *ret, CIMTYPE *type, + LONG *flavor ) { HRESULT hr; - UINT column, row; + UINT column, row, table_index, result_index; + struct table *table; VARTYPE vartype; void *val_ptr = NULL; LONGLONG val; - if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type, flavor ); - if (!view->count || !is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; + if ((hr = map_view_index( view, index, &table_index, &result_index )) != S_OK) return hr; - hr = get_column_index( view->table, name, &column ); - if (hr != S_OK || is_method( view->table, column )) return WBEM_E_NOT_FOUND; + if (is_system_prop( name )) return get_system_propval( view, table_index, result_index, name, ret, type, flavor ); + if (!view->result_count || !is_result_prop( view, name )) return WBEM_E_NOT_FOUND; - row = view->result[index]; - hr = get_value( view->table, row, column, &val ); + table = view->table[table_index]; + hr = get_column_index( table, name, &column ); + if (hr != S_OK || is_method( table, column )) return WBEM_E_NOT_FOUND; + + row = view->result[result_index]; + hr = get_value( table, row, column, &val ); if (hr != S_OK) return hr; - if (type) *type = view->table->columns[column].type & COL_TYPE_MASK; + if (type) *type = table->columns[column].type & COL_TYPE_MASK; if (flavor) *flavor = 0; if (!ret) return S_OK; - vartype = view->table->columns[column].vartype; - if (view->table->columns[column].type & CIM_FLAG_ARRAY) + vartype = table->columns[column].vartype; + if (table->columns[column].type & CIM_FLAG_ARRAY) { - CIMTYPE basetype = view->table->columns[column].type & CIM_TYPE_MASK; + CIMTYPE basetype = table->columns[column].type & CIM_TYPE_MASK; val_ptr = to_safearray( (const struct array *)(INT_PTR)val, basetype ); if (!val_ptr) vartype = VT_NULL; @@ -914,7 +1197,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR return S_OK; } - switch (view->table->columns[column].type & COL_TYPE_MASK) + switch (table->columns[column].type & COL_TYPE_MASK) { case CIM_BOOLEAN: if (!vartype) vartype = VT_BOOL; @@ -950,14 +1233,17 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR break; case CIM_SINT64: vartype = VT_BSTR; - val_ptr = get_value_bstr( view->table, row, column ); + val_ptr = get_value_bstr( table, row, column ); break; case CIM_UINT64: vartype = VT_BSTR; - val_ptr = get_value_bstr( view->table, row, column ); + val_ptr = get_value_bstr( table, row, column ); + break; + case CIM_REAL32: + if (!vartype) vartype = VT_R4; break; default: - ERR("unhandled column type %u\n", view->table->columns[column].type); + ERR("unhandled column type %u\n", table->columns[column].type); return WBEM_E_FAILED; } @@ -1087,45 +1373,56 @@ HRESULT to_longlong( VARIANT *var, LONGLONG *val, CIMTYPE *type ) HRESULT put_propval( const struct view *view, UINT index, const WCHAR *name, VARIANT *var, CIMTYPE type ) { HRESULT hr; - UINT column, row = view->result[index]; + UINT row, column, table_index, result_index; + struct table *table; LONGLONG val; - hr = get_column_index( view->table, name, &column ); + if ((hr = map_view_index( view, index, &table_index, &result_index )) != S_OK) return hr; + + table = view->table[table_index]; + hr = get_column_index( table, name, &column ); if (hr != S_OK) { FIXME("no support for creating new properties\n"); return WBEM_E_FAILED; } - if (is_method( view->table, column ) || !(view->table->columns[column].type & COL_FLAG_DYNAMIC)) + if (is_method( table, column ) || !(table->columns[column].type & COL_FLAG_DYNAMIC)) return WBEM_E_FAILED; hr = to_longlong( var, &val, &type ); if (hr != S_OK) return hr; - return set_value( view->table, row, column, val, type ); + row = view->result[result_index]; + return set_value( table, row, column, val, type ); } -HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) +HRESULT get_properties( const struct view *view, UINT index, LONG flags, SAFEARRAY **props ) { SAFEARRAY *sa; BSTR str; - UINT i, num_props = count_selected_properties( view ); + UINT i, table_index, result_index, num_props; + struct table *table; + HRESULT hr; LONG j; + if ((hr = map_view_index( view, index, &table_index, &result_index )) != S_OK) return hr; + + num_props = count_result_properties( view, table_index ); if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, num_props ))) return E_OUTOFMEMORY; - for (i = 0, j = 0; i < view->table->num_cols; i++) + table = view->table[table_index]; + for (i = 0, j = 0; i < table->num_cols; i++) { BOOL is_system; - if (is_method( view->table, i )) continue; - if (!is_selected_prop( view, view->table->columns[i].name )) continue; + if (is_method( table, i )) continue; + if (!is_result_prop( view, table->columns[i].name )) continue; - is_system = is_system_prop( view->table->columns[i].name ); + is_system = is_system_prop( table->columns[i].name ); if ((flags & WBEM_FLAG_NONSYSTEM_ONLY) && is_system) continue; else if ((flags & WBEM_FLAG_SYSTEM_ONLY) && !is_system) continue; - str = SysAllocString( view->table->columns[i].name ); + str = SysAllocString( table->columns[i].name ); if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) { SysFreeString( str ); diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 0af02a4a1d..e1cd2466e4 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -320,15 +320,7 @@ static HRESULT WINAPI wbem_services_QueryObjectSink( return WBEM_E_FAILED; } -struct path -{ - WCHAR *class; - UINT class_len; - WCHAR *filter; - UINT filter_len; -}; - -static HRESULT parse_path( const WCHAR *str, struct path **ret ) +HRESULT parse_path( const WCHAR *str, struct path **ret ) { struct path *path; const WCHAR *p = str, *q; @@ -397,14 +389,15 @@ static HRESULT parse_path( const WCHAR *str, struct path **ret ) return S_OK; } -static void free_path( struct path *path ) +void free_path( struct path *path ) { + if (!path) return; heap_free( path->class ); heap_free( path->filter ); heap_free( path ); } -static WCHAR *query_from_path( const struct path *path ) +WCHAR *query_from_path( const struct path *path ) { static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','%','s',' ', @@ -819,6 +812,7 @@ static HRESULT WINAPI wbem_services_ExecMethod( struct path *path; WCHAR *str; class_method *func; + struct table *table; HRESULT hr; TRACE("%p, %s, %s, %08x, %p, %p, %p, %p\n", iface, debugstr_w(strObjectPath), @@ -846,10 +840,11 @@ static HRESULT WINAPI wbem_services_ExecMethod( hr = EnumWbemClassObject_create( query, (void **)&result ); if (hr != S_OK) goto done; - hr = create_class_object( query->view->table->name, result, 0, NULL, &obj ); + table = get_view_table( query->view, 0 ); + hr = create_class_object( table->name, result, 0, NULL, &obj ); if (hr != S_OK) goto done; - hr = get_method( query->view->table, strMethodName, &func ); + hr = get_method( table, strMethodName, &func ); if (hr != S_OK) goto done; hr = func( obj, pInParams, ppOutParams ); diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index c1b1ae8679..7e61cf5ead 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -155,15 +155,23 @@ struct keyword const struct keyword *next; }; +enum view_type +{ + VIEW_TYPE_SELECT, + VIEW_TYPE_ASSOCIATORS, +}; + struct view { + enum view_type type; const WCHAR *path; /* ASSOCIATORS OF query */ const struct keyword *keywordlist; - const struct property *proplist; - struct table *table; + const struct property *proplist; /* SELECT query */ const struct expr *cond; + UINT table_count; + struct table **table; + UINT result_count; UINT *result; - UINT count; }; struct query @@ -173,16 +181,29 @@ struct query struct list mem; }; +struct path +{ + WCHAR *class; + UINT class_len; + WCHAR *filter; + UINT filter_len; +}; + +HRESULT parse_path( const WCHAR *, struct path ** ) DECLSPEC_HIDDEN; +void free_path( struct path * ) DECLSPEC_HIDDEN; +WCHAR *query_from_path( const struct path * ) DECLSPEC_HIDDEN; + struct query *create_query(void) DECLSPEC_HIDDEN; void free_query( struct query * ) DECLSPEC_HIDDEN; struct query *addref_query( struct query * ) DECLSPEC_HIDDEN; void release_query( struct query *query ) DECLSPEC_HIDDEN; HRESULT exec_query( const WCHAR *, IEnumWbemClassObject ** ) DECLSPEC_HIDDEN; HRESULT parse_query( const WCHAR *, struct view **, struct list * ) DECLSPEC_HIDDEN; -HRESULT create_view( const WCHAR *, const struct keyword *, const WCHAR *, const struct property *, +HRESULT create_view( enum view_type, const WCHAR *, const struct keyword *, const WCHAR *, const struct property *, const struct expr *, struct view ** ) DECLSPEC_HIDDEN; void destroy_view( struct view * ) DECLSPEC_HIDDEN; HRESULT execute_view( struct view * ) DECLSPEC_HIDDEN; +struct table *get_view_table( const struct view *, UINT ) DECLSPEC_HIDDEN; void init_table_list( void ) DECLSPEC_HIDDEN; struct table *grab_table( const WCHAR * ) DECLSPEC_HIDDEN; struct table *addref_table( struct table * ) DECLSPEC_HIDDEN; @@ -202,15 +223,14 @@ BSTR get_value_bstr( const struct table *, UINT, UINT ) DECLSPEC_HIDDEN; HRESULT set_value( const struct table *, UINT, UINT, LONGLONG, CIMTYPE ) DECLSPEC_HIDDEN; BOOL is_method( const struct table *, UINT ) DECLSPEC_HIDDEN; HRESULT get_method( const struct table *, const WCHAR *, class_method ** ) DECLSPEC_HIDDEN; -HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, - CIMTYPE *, LONG * ) DECLSPEC_HIDDEN; +HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYPE *, LONG * ) DECLSPEC_HIDDEN; HRESULT put_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYPE ) DECLSPEC_HIDDEN; HRESULT to_longlong( VARIANT *, LONGLONG *, CIMTYPE * ) DECLSPEC_HIDDEN; SAFEARRAY *to_safearray( const struct array *, CIMTYPE ) DECLSPEC_HIDDEN; VARTYPE to_vartype( CIMTYPE ) DECLSPEC_HIDDEN; void destroy_array( struct array *, CIMTYPE ) DECLSPEC_HIDDEN; -BOOL is_selected_prop( const struct view *, const WCHAR * ) DECLSPEC_HIDDEN; -HRESULT get_properties( const struct view *, LONG, SAFEARRAY ** ) DECLSPEC_HIDDEN; +BOOL is_result_prop( const struct view *, const WCHAR * ) DECLSPEC_HIDDEN; +HRESULT get_properties( const struct view *, UINT, LONG, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; BSTR get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; void set_variant( VARTYPE, LONGLONG, void *, VARIANT * ) DECLSPEC_HIDDEN; diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 99279149ae..12f4cb5104 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -289,7 +289,7 @@ associatorsof: struct parser *parser = ctx; struct view *view; - hr = create_view( $3, NULL, NULL, NULL, NULL, &view ); + hr = create_view( VIEW_TYPE_ASSOCIATORS, $3, NULL, NULL, NULL, NULL, &view ); if (hr != S_OK) YYABORT; @@ -301,7 +301,7 @@ associatorsof: struct parser *parser = ctx; struct view *view; - hr = create_view( $3, $5, NULL, NULL, NULL, &view ); + hr = create_view( VIEW_TYPE_ASSOCIATORS, $3, $5, NULL, NULL, NULL, &view ); if (hr != S_OK) YYABORT; @@ -316,7 +316,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( NULL, NULL, $3, NULL, NULL, &view ); + hr = create_view( VIEW_TYPE_SELECT, NULL, NULL, $3, NULL, NULL, &view ); if (hr != S_OK) YYABORT; @@ -328,7 +328,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( NULL, NULL, $4, $2, NULL, &view ); + hr = create_view( VIEW_TYPE_SELECT, NULL, NULL, $4, $2, NULL, &view ); if (hr != S_OK) YYABORT; @@ -340,7 +340,7 @@ select: struct parser *parser = ctx; struct view *view; - hr = create_view( NULL, NULL, $4, $2, $6, &view ); + hr = create_view( VIEW_TYPE_SELECT, NULL, NULL, $4, $2, $6, &view ); if (hr != S_OK) YYABORT; -- 2.20.1

1 0

[PATCH 6/7] wbemprox: Fix index in fill_diskdrive and fill_diskpartition.
by Hans Leidekker 10 Sep '19

10 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 105a2d3ec2..de793f3f7e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2424,7 +2424,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * rec = (struct record_diskdrive *)(table->data + offset); swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, index ); rec->device_id = heap_strdupW( device_id ); - rec->index = index; + rec->index = index++; rec->interfacetype = diskdrive_interfacetypeW; rec->manufacturer = diskdrive_manufacturerW; rec->mediatype = (type == DRIVE_FIXED) ? diskdrive_mediatype_fixedW : diskdrive_mediatype_removableW; @@ -2439,7 +2439,6 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * continue; } offset += sizeof(*rec); - index++; row++; } } @@ -2591,7 +2590,7 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex rec->bootpartition = (i == 2) ? -1 : 0; swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, index ); rec->device_id = heap_strdupW( device_id ); - rec->diskindex = index; + rec->diskindex = index++; rec->index = 0; rec->pnpdevice_id = heap_strdupW( device_id ); get_freespace( root, &size ); @@ -2605,7 +2604,6 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex } offset += sizeof(*rec); row++; - index++; } } TRACE("created %u rows\n", row); -- 2.20.1

1 0

[PATCH 3/7] wbemprox: Perform a case insensitive match on path components.
by Hans Leidekker 10 Sep '19

10 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/services.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index be35c95ec0..0af02a4a1d 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -338,8 +338,7 @@ static HRESULT parse_path( const WCHAR *str, struct path **ret ) if (*p == '\\') { - static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2'}; - + static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; WCHAR server[MAX_COMPUTERNAME_LENGTH+1]; DWORD server_len = ARRAY_SIZE(server); @@ -352,8 +351,7 @@ static HRESULT parse_path( const WCHAR *str, struct path **ret ) if (!*p) return WBEM_E_INVALID_OBJECT_PATH; len = p - q; - if (!GetComputerNameW( server, &server_len ) || server_len != len - || memcmp( q, server, server_len * sizeof(WCHAR) )) + if (!GetComputerNameW( server, &server_len ) || server_len != len || wcsnicmp( q, server, server_len )) return WBEM_E_NOT_SUPPORTED; q = ++p; @@ -361,7 +359,7 @@ static HRESULT parse_path( const WCHAR *str, struct path **ret ) if (!*p) return WBEM_E_INVALID_OBJECT_PATH; len = p - q; - if (len != ARRAY_SIZE(cimv2W) || memcmp( q, cimv2W, sizeof(cimv2W) )) + if (len != ARRAY_SIZE(cimv2W) - 1 || wcsnicmp( q, cimv2W, ARRAY_SIZE(cimv2W) - 1 )) return WBEM_E_INVALID_NAMESPACE; p++; } -- 2.20.1

1 0

[PATCH 2/7] wbemprox: Support evaluating CIM_REFERENCE expressions.
by Hans Leidekker 10 Sep '19

10 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/query.c | 45 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index e00f067e9e..7b194fbabf 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -165,6 +165,35 @@ static HRESULT eval_boolcmp( UINT op, LONGLONG lval, LONGLONG rval, UINT ltype, return S_OK; } +static inline BOOL is_refcmp( const struct complex_expr *expr, UINT ltype, UINT rtype ) +{ + if (ltype == CIM_REFERENCE && expr->left->type == EXPR_PROPVAL && expr->right->type == EXPR_SVAL) return TRUE; + else if (rtype == CIM_REFERENCE && expr->right->type == EXPR_PROPVAL && expr->left->type == EXPR_SVAL) return TRUE; + return FALSE; +} + +static HRESULT eval_refcmp( UINT op, const WCHAR *lstr, const WCHAR *rstr, LONGLONG *val ) +{ + if (!lstr || !rstr) + { + *val = 0; + return S_OK; + } + switch (op) + { + case OP_EQ: + *val = !wcsicmp( lstr, rstr ); + break; + case OP_NE: + *val = wcsicmp( lstr, rstr ); + break; + default: + ERR("unhandled operator %u\n", op); + return WBEM_E_INVALID_QUERY; + } + return S_OK; +} + static UINT resolve_type( UINT left, UINT right ) { switch (left) @@ -200,6 +229,10 @@ static UINT resolve_type( UINT left, UINT right ) if (right == CIM_BOOLEAN) return CIM_BOOLEAN; break; + case CIM_REFERENCE: + if (right == CIM_REFERENCE) return CIM_REFERENCE; + break; + default: break; } @@ -254,9 +287,6 @@ static HRESULT eval_binary( const struct table *table, UINT row, const struct co *type = resolve_type( ltype, rtype ); - if (is_boolcmp( expr, ltype, rtype )) - return eval_boolcmp( expr->op, lval, rval, ltype, rtype, val ); - if (is_strcmp( expr, ltype, rtype )) { const WCHAR *lstr, *rstr; @@ -270,6 +300,15 @@ static HRESULT eval_binary( const struct table *table, UINT row, const struct co return eval_strcmp( expr->op, lstr, rstr, val ); } + if (is_boolcmp( expr, ltype, rtype )) + { + return eval_boolcmp( expr->op, lval, rval, ltype, rtype, val ); + } + if (is_refcmp( expr, ltype, rtype )) + { + return eval_refcmp( expr->op, (const WCHAR *)(INT_PTR)lval, (const WCHAR *)(INT_PTR)rval, val ); + } + switch (expr->op) { case OP_EQ: -- 2.20.1

1 0

[PATCH 1/7] wbemprox: Strip curly brackets from path strings.
by Hans Leidekker 10 Sep '19

10 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/wql.y | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index a0a9c7b802..99279149ae 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -103,6 +103,12 @@ static WCHAR *get_path( struct parser *parser, const struct string *str ) int len = str->len; WCHAR *ret; + if (p[0] == '{' && p[len - 1] == '}') + { + p++; + len -= 2; + } + if (!(ret = alloc_mem( parser, (len + 1) * sizeof(WCHAR) ))) return NULL; memcpy( ret, p, len * sizeof(WCHAR) ); ret[len] = 0; -- 2.20.1

1 0

[PATCH] objbase.h: Fix StringFromIID declaration.
by Jacek Caban 10 Sep '19

10 Sep '19

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/objbase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/4] testbot/Engine: Make sure not to schedule jobs on VMs undergoing maintenance!
by Francois Gouget 10 Sep '19

10 Sep '19

After a series of revert failures the scheduler would put the VM in maintenance mode but still put it in the list of VMs that can be reverted to run a new task. Now such VMs are put in the busy list so no task is scheduled on them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 3ce90895..1b42ea9a 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -274,15 +274,22 @@ sub _CheckAndClassifyVMs() { my $Errors = ($VM->Errors || 0) + 1; $VM->Errors($Errors); - $NewStatus = "maintenance" if ($Errors >= $MaxVMErrors); + if ($Errors >= $MaxVMErrors) + { + $NewStatus = "maintenance"; + $Sched->{busyvms}->{$VMKey} = 1; + } } $VM->Status($NewStatus); $VM->KillChild(); $VM->Save(); $VM->RecordResult($Sched->{records}, "boterror stuck process"); - $Sched->{lambvms}->{$VMKey} = 1; - $Host->{dirty}++; - $Host->{active}++; + if ($NewStatus eq "dirty") + { + $Sched->{lambvms}->{$VMKey} = 1; + $Host->{dirty}++; + $Host->{active}++; + } } elsif ($VM->Status =~ /^(?:dirty|running|reverting)$/) { -- 2.20.1

1 3

[PATCH] testbot/TestAgent: Give up early connecting to invalid hostnames / ports.
by Francois Gouget 10 Sep '19

10 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index ca81283d..a4a2f490 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -905,6 +905,11 @@ sub _Connect($) if (!$self->{fd}) { alarm(0); + if ($!{EINVAL}) + { + $self->_SetError($FATAL, "The '$self->{agenthost}' hostname or the '$self->{agentport}' port is invalid."); + die "socket"; + } $self->_SetError($FATAL, $!); return; # out of eval } @@ -930,12 +935,16 @@ sub _Connect($) $self->{rpc} = $OldRPC; return 1; } + if ($@) { - $self->_SetError($FATAL, "Timed out in $Step while connecting to $self->{connection}"); + if ($@ eq "timeout") + { + $self->_SetError($FATAL, "Timed out in $Step while connecting to $self->{connection}"); + } + last; } - # Ideally we should probably check the error and not retry if it is likely - # permanent, like a hostname that does not resolve. + my $Remaining = $Attempt * $self->{cinterval} - (time() - $Start); sleep($Remaining) if ($Remaining > 0); } -- 2.20.1

1 0

[PATCH v2] http.sys: Initialize address structure before use. (Coverity)
by Alistair Leslie-Hughes 10 Sep '19

10 Sep '19

CID 1453504 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/http.sys/http.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index b5d5a219dc..02320d487f 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1053,6 +1053,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) TRACE("host %s, context %s.\n", debugstr_a(params->url), wine_dbgstr_longlong(params->context)); + memset( &addr, 0, sizeof(addr) ); if (!strncmp(params->url, "https://", 8)) { FIXME("HTTPS is not implemented.\n"); -- 2.17.1

2 2

[PATCH] dsound: Report when a DMO object has tailing data.
by Alistair Leslie-Hughes 10 Sep '19

10 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/mixer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 05ca99b5df..53b5f9f576 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -443,8 +443,9 @@ static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames) for (i = 0; i < dsb->num_filters; i++) { if (dsb->filters[i].inplace) { hr = IMediaObjectInPlace_Process(dsb->filters[i].inplace, size_bytes, (BYTE*)dsb->device->tmp_buffer, 0, DMO_INPLACE_NORMAL); - - if (FAILED(hr)) + if(hr == S_FALSE) + FIXME("Processing of tailing data currently not implemented.\n"); + else if (FAILED(hr)) WARN("IMediaObjectInPlace_Process failed for filter %u\n", i); } else WARN("filter %u has no inplace object - unsupported\n", i); -- 2.17.1

2 2

WineHQ Server Maintenance and Upgrades (9-9)
by Jeremy Newman 10 Sep '19

10 Sep '19

FYI: We will be performing upgrades and maintenance to the WineHQ.org server on Sept 9th starting at 19:00 CDT (Sept 10th 00:00 UTC). We expect that the server will be offline for 3 to 4 hours. All WineHQ websites and services will be offline during this time. This includes (www.winehq.org, appdb.winehq.org, forums.winehq.org, wiki.winehq.org, source.winehq.org, testbot.winehq.org). Git and mailing lists will also be offline. I will post a reply to this message when services have resumed. -N

1 2

[PATCH 1/2] winegstreamer: Don't activate our source pad immediately after connecting.
by Zebediah Figura 10 Sep '19

10 Sep '19

There's not any reason to do this here; this should be handled with state change transitions. Since the pipeline is in the ready state, the only effect this will have is push_data() trying to run and failing since the decodebin sink pad isn't active. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 61e75b09234..727ffff8a6f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -66,7 +66,7 @@ typedef struct GSTImpl { GstBus *bus; guint64 start, nextofs, nextpullofs, stop; ALLOCATOR_PROPERTIES props; - HANDLE no_more_pads_event, push_event; + HANDLE no_more_pads_event; HANDLE push_thread; } GSTImpl; @@ -507,10 +507,6 @@ static DWORD CALLBACK push_data(LPVOID iface) else maxlen = This->stop; - TRACE("Waiting..\n"); - - WaitForSingleObject(This->push_event, INFINITE); - TRACE("Starting..\n"); for (;;) { REFERENCE_TIME tStart, tStop; @@ -1155,10 +1151,6 @@ static HRESULT GST_Connect(GSTImpl *This, IPin *pConnectPin, ALLOCATOR_PROPERTIE This->initial = FALSE; - /* don't set active during test-play, as we don't want to push/pull data - * from the source yet */ - gst_pad_set_active(This->my_src, 1); - This->nextofs = This->nextpullofs = 0; return S_OK; } @@ -1185,7 +1177,6 @@ static void gstdemux_destroy(struct strmbase_filter *iface) HRESULT hr; CloseHandle(filter->no_more_pads_event); - CloseHandle(filter->push_event); /* Don't need to clean up output pins, disconnecting input pin will do that */ if (filter->sink.pConnectedTo) @@ -1246,7 +1237,6 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) This->ppPins = NULL; This->push_thread = NULL; This->no_more_pads_event = CreateEventW(NULL, 0, 0, NULL); - This->push_event = CreateEventW(NULL, 0, 0, NULL); This->bus = NULL; This->sink.dir = PINDIR_INPUT; @@ -1864,7 +1854,6 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, filter->reader = NULL; filter->alloc = NULL; - ResetEvent(filter->push_event); if (SUCCEEDED(hr)) hr = IPin_QueryInterface(pReceivePin, &IID_IAsyncReader, (LPVOID *)&filter->reader); if (SUCCEEDED(hr)) @@ -1887,7 +1876,6 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, filter->sink.pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin); hr = IMemAllocator_Commit(filter->alloc); - SetEvent(filter->push_event); } else { GST_RemoveOutputPins(filter); if (filter->reader) -- 2.23.0

1 1

Call for WineConf 2019 presentations
by Aric Stewart 10 Sep '19

10 Sep '19

Hello, Again this year I am helping coordinate the talks and presentations! I hope that people find it helpful and useful! Last work worked out well enough that I am sticking to the same rough format. I think it worked for most other people as well! If you would like to give a presentation! Please e-mail wineconf(a)winehq.org or me directly! I will keep the Wiki updated with presentations and scheduling as we get it worked out. When you propose your talk if you have a preference toward a time slot and Saturday or Sunday please express that. General Guidelines: * Please provide an estimate of how long your talk will be. We are shooting for approximate 40 minute slots with between 15-20 minutes of talk and with likely an equal amount of question and discussion time afterward. Generally shorter talks are not an issue, however longer talks will need to be discussed and will be considered based on the rest of the schedule. * Topics should obviously be of interest to the other attendees, i.e., the broader Wine community, but note that that doesn't imply the talk has to be about Wine itself * If you have a preferred time and date for your talk please indicate that to me when you submit your talk. We will try to make it work as best we can. Here are the rough proposed slots, They will be changed and modified as required by the addenda as it gets fleshed out. Understand that even with this shift toward a scheduled day we will not disrupt productive conversation to fit to the schedule. The schedule will warp and flow as required to facilitate the talk, not force the talks to conform to it. This does mean if you are planing to try to attend a given talk you will likely want to arrive a bit early and understand if when you arrive the schedule is either behind or ahead of plan. Daily Slots: 09:00 - 09:40 slot 1 09:45 - 10:25 slot 2 10:30 - 11:00 break 11:00 - 11:40 slot 3 12:00 - 13:00 lunch break 13:00 - 13:40 slot 4 13:45 - 14:25 slot 5 14:30 - 15:00 break 15:00 - 15:40 slot 6 15:45 - 16:25 slot 7 16:25 - 17:00 Overflow time / small group discussion / short presentations We will track proposed presentations on the WineConf Wiki: https://wiki.winehq.org/WineConf2019 Likely we will have open time at the conference which we will propose presentations and fill at the time. We have never had a problem finding things we all want to talk about. thanks! -aric

3 4

Automate adding new Windows languages
by Francois Gouget 09 Sep '19

09 Sep '19

Does anyone know how to automate adding new languages to Windows 10? I have a script that can automate switching the locale settings of a TestBot VM. It can even automatically create the live snapshots that the TestBot needs [1]. But before it can do its magic it needs the requested locale to be installed. Now I'd like it to be able to automate installing the required locale too, particularly on Windows 10. When I did it manually I noticed that Windows 10 asked me a bunch of customization questions on reboot. Those would obviously have to be skipped too. Note that in this scenarion Windows is already installed and running. So the 'Windows unattended install' tools may or may not be useful. [1] https://source.winehq.org/git/tools.git/blob/HEAD:/testbot/scripts/SetWinLo… -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Sufficently advanced incompetence is indistinguishable from malice.

1 1

[PATCH v3 resend 4/4] winex11.drv: Implement X11DRV_D3DKMTCheckVidPnExclusiveOwnership.
by Zhiyi Zhang 09 Sep '19

09 Sep '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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 0f256d4ce2..4e5cc3ec99 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); } @@ -5491,13 +5490,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 8933c011aa..e8ab22a50f 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; +} -- 2.23.0

2 1

[PATCH v3 resend 3/4] winex11.drv: Implement X11DRV_D3DKMTSetVidPnSourceOwner.
by Zhiyi Zhang 09 Sep '19

09 Sep '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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 d4e476facb..8933c011aa 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; +} -- 2.23.0

2 1

[PATCH v3 resend 2/4] gdi32: Add D3DKMTSetVidPnSourceOwner and D3DKMTCheckVidPnExclusiveOwnership stubs.
by Zhiyi Zhang 09 Sep '19

09 Sep '19

D3DKMTSetVidPnSourceOwner needs to be implemented in the graphics drivers because we need to maintain the VidPN source ownership information list in the graphics drivers. For example, the graphics drivers need to release the exclusive ownership when a new window is moved to a monitor which has been taken exclusive ownership. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 4 +- dlls/d3d11/d3d11.spec | 3 +- dlls/gdi32/dibdrv/dc.c | 4 ++ dlls/gdi32/driver.c | 52 +++++++++++++++++++ dlls/gdi32/enhmfdrv/dc.c | 2 + dlls/gdi32/enhmfdrv/init.c | 2 + dlls/gdi32/freetype.c | 2 + dlls/gdi32/gdi32.spec | 2 + dlls/gdi32/mfdrv/init.c | 2 + dlls/gdi32/path.c | 2 + dlls/wineandroid.drv/init.c | 2 + dlls/winemac.drv/gdi.c | 2 + dlls/wineps.drv/init.c | 2 + dlls/winex11.drv/init.c | 2 + dlls/winex11.drv/xrender.c | 2 + include/ddk/d3dkmthk.h | 2 + include/wine/gdi_driver.h | 6 ++- 17 files changed, 89 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index a28fc5cfc5..d2fcc8fe45 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -5,7 +5,7 @@ @ stub D3DKMTCheckMonitorPowerState @ stub D3DKMTCheckOcclusion @ stub D3DKMTCheckSharedResourceAccess -@ stub D3DKMTCheckVidPnExclusiveOwnership +@ stdcall D3DKMTCheckVidPnExclusiveOwnership(ptr) gdi32.D3DKMTCheckVidPnExclusiveOwnership @ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTConfigureSharedResource @ stub D3DKMTCreateAllocation @@ -82,7 +82,7 @@ @ stub D3DKMTSetProcessSchedulingPriorityClass @ stub D3DKMTSetQueuedLimit @ stub D3DKMTSetStereoEnabled -@ stub D3DKMTSetVidPnSourceOwner +@ stdcall D3DKMTSetVidPnSourceOwner(ptr) gdi32.D3DKMTSetVidPnSourceOwner @ stub D3DKMTShareObjects @ stub D3DKMTSharedPrimaryLockNotification @ stub D3DKMTSharedPrimaryUnLockNotification diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 01bc8bfebc..383ed6aa9c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -5,6 +5,7 @@ @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr) @ stdcall D3D11On12CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) +@ stdcall D3DKMTCheckVidPnExclusiveOwnership(ptr) gdi32.D3DKMTCheckVidPnExclusiveOwnership @ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext @@ -35,7 +36,7 @@ @ stub D3DKMTSetDisplayMode @ stub D3DKMTSetDisplayPrivateDriverFormat @ stub D3DKMTSetGammaRamp -@ stub D3DKMTSetVidPnSourceOwner +@ stdcall D3DKMTSetVidPnSourceOwner(ptr) gdi32.D3DKMTSetVidPnSourceOwner @ stub D3DKMTSignalSynchronizationObject @ stub D3DKMTUnlock @ stub D3DKMTWaitForSynchronizationObject diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index fb1683e8f1..f818aa0228 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -520,6 +520,8 @@ const struct gdi_dc_funcs dib_driver = dibdrv_StrokePath, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ + NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTSetVidPnSourceOwner */ dibdrv_wine_get_wgl_driver, /* wine_get_wgl_driver */ NULL, /* wine_get_vulkan_driver */ GDI_PRIORITY_DIB_DRV /* priority */ @@ -1143,6 +1145,8 @@ static const struct gdi_dc_funcs window_driver = NULL, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ + NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTSetVidPnSourceOwner */ windrv_wine_get_wgl_driver, /* wine_get_wgl_driver */ NULL, /* wine_get_vulkan_driver */ GDI_PRIORITY_DIB_DRV + 10 /* priority */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index eaf1cf7788..d84584da86 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -753,6 +753,16 @@ static BOOL CDECL nulldrv_UnrealizePalette( HPALETTE palette ) return FALSE; } +static NTSTATUS CDECL nulldrv_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) +{ + return STATUS_PROCEDURE_NOT_FOUND; +} + +static NTSTATUS CDECL nulldrv_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) +{ + return STATUS_PROCEDURE_NOT_FOUND; +} + static struct opengl_funcs * CDECL nulldrv_wine_get_wgl_driver( PHYSDEV dev, UINT version ) { return (void *)-1; @@ -892,6 +902,8 @@ const struct gdi_dc_funcs null_driver = nulldrv_StrokePath, /* pStrokePath */ nulldrv_UnrealizePalette, /* pUnrealizePalette */ nulldrv_WidenPath, /* pWidenPath */ + nulldrv_D3DKMTCheckVidPnExclusiveOwnership, /* pD3DKMTCheckVidPnExclusiveOwnership */ + nulldrv_D3DKMTSetVidPnSourceOwner, /* pD3DKMTSetVidPnSourceOwner */ nulldrv_wine_get_wgl_driver, /* wine_get_wgl_driver */ nulldrv_wine_get_vulkan_driver, /* wine_get_vulkan_driver */ @@ -1422,6 +1434,7 @@ NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) { NTSTATUS status = STATUS_INVALID_PARAMETER; + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc; struct d3dkmt_device *device; TRACE("(%p)\n", desc); @@ -1434,6 +1447,9 @@ NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) { if (device->handle == desc->hDevice) { + memset( &set_owner_desc, 0, sizeof(set_owner_desc) ); + set_owner_desc.hDevice = desc->hDevice; + D3DKMTSetVidPnSourceOwner( &set_owner_desc ); list_remove( &device->entry ); heap_free( device ); status = STATUS_SUCCESS; @@ -1453,3 +1469,39 @@ NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats) FIXME("(%p): stub\n", stats); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTSetVidPnSourceOwner [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) +{ + TRACE("(%p)\n", desc); + + if (!get_display_driver()->pD3DKMTSetVidPnSourceOwner) + return STATUS_PROCEDURE_NOT_FOUND; + + if (!desc || !desc->hDevice || (desc->VidPnSourceCount && (!desc->pType || !desc->pVidPnSourceId))) + return STATUS_INVALID_PARAMETER; + + /* Store the VidPN source ownership info in the graphics driver because + * the graphics driver needs to change ownership sometimes. For example, + * when a new window is moved to a VidPN source with an exclusive owner, + * such an exclusive owner will be released before showing the new window */ + return get_display_driver()->pD3DKMTSetVidPnSourceOwner( desc ); +} + +/****************************************************************************** + * D3DKMTCheckVidPnExclusiveOwnership [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) +{ + TRACE("(%p)\n", desc); + + if (!get_display_driver()->pD3DKMTCheckVidPnExclusiveOwnership) + return STATUS_PROCEDURE_NOT_FOUND; + + if (!desc || !desc->hAdapter) + return STATUS_INVALID_PARAMETER; + + return get_display_driver()->pD3DKMTCheckVidPnExclusiveOwnership( desc ); +} diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 18047b399c..804fef18f9 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -950,6 +950,8 @@ static const struct gdi_dc_funcs emfpath_driver = NULL, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ + NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTSetVidPnSourceOwner */ NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_vulkan_driver */ GDI_PRIORITY_PATH_DRV + 1 /* priority */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 177b186057..4ff85fa5b3 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -163,6 +163,8 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_StrokePath, /* pStrokePath */ NULL, /* pUnrealizePalette */ EMFDRV_WidenPath, /* pWidenPath */ + NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTSetVidPnSourceOwner */ NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_vulkan_driver */ GDI_PRIORITY_GRAPHICS_DRV /* priority */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e3cff25b76..14807e1d14 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -9236,6 +9236,8 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ + NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTSetVidPnSourceOwner */ NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_vulkan_driver */ GDI_PRIORITY_FONT_DRV /* priority */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index cc5d2c21a3..4e08e3494c 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,7 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) +@ stdcall D3DKMTCheckVidPnExclusiveOwnership(ptr) @ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTCreateDevice(ptr) @@ -89,6 +90,7 @@ @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall D3DKMTQueryStatistics(ptr) +@ stdcall D3DKMTSetVidPnSourceOwner(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) @ stdcall DeleteDC(long) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 5307310213..2a215b7090 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -226,6 +226,8 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_StrokePath, /* pStrokePath */ NULL, /* pUnrealizePalette */ MFDRV_WidenPath, /* pWidenPath */ + NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTSetVidPnSourceOwner */ NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_vulkan_driver */ GDI_PRIORITY_GRAPHICS_DRV /* priority */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index d2d9ac90a9..7d51388a4e 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2248,6 +2248,8 @@ const struct gdi_dc_funcs path_driver = NULL, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ + NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTSetVidPnSourceOwner */ NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_vulkan_driver */ GDI_PRIORITY_PATH_DRV /* priority */ diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 10059928e5..97cdb515d5 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -411,6 +411,8 @@ static const struct gdi_dc_funcs android_drv_funcs = NULL, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ + NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTSetVidPnSourceOwner */ ANDROID_wine_get_wgl_driver, /* wine_get_wgl_driver */ NULL, /* wine_get_vulkan_driver */ GDI_PRIORITY_GRAPHICS_DRV /* priority */ diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index b4d3e73d17..8073a875df 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -390,6 +390,8 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ + NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTSetVidPnSourceOwner */ macdrv_wine_get_wgl_driver, /* wine_get_wgl_driver */ macdrv_wine_get_vulkan_driver, /* wine_get_vulkan_driver */ GDI_PRIORITY_GRAPHICS_DRV /* priority */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 3ffdab956a..5c96986bb9 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -904,6 +904,8 @@ static const struct gdi_dc_funcs psdrv_funcs = PSDRV_StrokePath, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ + NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTSetVidPnSourceOwner */ NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_vulkan_driver */ GDI_PRIORITY_GRAPHICS_DRV /* priority */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 28c81a2638..0040dbb430 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -471,6 +471,8 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_StrokePath, /* pStrokePath */ X11DRV_UnrealizePalette, /* pUnrealizePalette */ NULL, /* pWidenPath */ + NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* 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/xrender.c b/dlls/winex11.drv/xrender.c index 311ecb58b7..8bb7d56a77 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2284,6 +2284,8 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ + NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTSetVidPnSourceOwner */ NULL, /* wine_get_wgl_driver */ NULL, /* wine_get_vulkan_driver */ GDI_PRIORITY_GRAPHICS_DRV + 10 /* priority */ diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index ea4df3a9e0..6d6a1d68cd 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -602,6 +602,7 @@ extern "C" { #endif /* __cplusplus */ +NTSTATUS WINAPI D3DKMTCheckVidPnExclusiveOwnership(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc); NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); @@ -609,6 +610,7 @@ NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats); +NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner(const D3DKMT_SETVIDPNSOURCEOWNER *desc); #ifdef __cplusplus } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 53881b5932..971618e19a 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -21,6 +21,8 @@ #ifndef __WINE_WINE_GDI_DRIVER_H #define __WINE_WINE_GDI_DRIVER_H +#include "winternl.h" +#include "ddk/d3dkmthk.h" #include "wine/list.h" struct gdi_dc_funcs; @@ -192,6 +194,8 @@ struct gdi_dc_funcs BOOL (CDECL *pStrokePath)(PHYSDEV); BOOL (CDECL *pUnrealizePalette)(HPALETTE); BOOL (CDECL *pWidenPath)(PHYSDEV); + NTSTATUS (CDECL *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); + NTSTATUS (CDECL *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); struct opengl_funcs * (CDECL *wine_get_wgl_driver)(PHYSDEV,UINT); const struct vulkan_funcs * (CDECL *wine_get_vulkan_driver)(PHYSDEV,UINT); @@ -200,7 +204,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 50 +#define WINE_GDI_DRIVER_VERSION 51 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ -- 2.23.0

2 1

[PATCH v3 resend 1/4] gdi32: Support multiple monitors in D3DKMTOpenAdapterFromGdiDisplayName.
by Zhiyi Zhang 09 Sep '19

09 Sep '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/driver.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index fc0839f51d..eaf1cf7788 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -55,7 +55,6 @@ struct graphics_driver struct d3dkmt_adapter { D3DKMT_HANDLE handle; /* Kernel mode graphics adapter handle */ - INT ordinal; /* Graphics adapter ordinal */ struct list entry; /* List entry */ }; @@ -1339,21 +1338,20 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) */ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) { - static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static const WCHAR displayW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; static D3DKMT_HANDLE handle_start = 0; struct d3dkmt_adapter *adapter; + WCHAR *end; + int id; TRACE("(%p) semi-stub\n", desc); - if (!desc) + if (!desc || strncmpiW( desc->DeviceName, displayW, ARRAY_SIZE(displayW) )) return STATUS_UNSUCCESSFUL; - /* FIXME: Support multiple monitors */ - if (lstrcmpiW( desc->DeviceName, display1W )) - { - FIXME("%s is unsupported\n", wine_dbgstr_w( desc->DeviceName )); + id = strtolW( desc->DeviceName + ARRAY_SIZE(displayW), &end, 10 ) - 1; + if (*end) return STATUS_UNSUCCESSFUL; - } adapter = heap_alloc( sizeof( *adapter ) ); if (!adapter) @@ -1362,7 +1360,6 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI EnterCriticalSection( &driver_section ); /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ adapter->handle = ++handle_start; - adapter->ordinal = 0; list_add_tail( &d3dkmt_adapters, &adapter->entry ); LeaveCriticalSection( &driver_section ); @@ -1370,7 +1367,7 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI /* FIXME: Support AdapterLuid */ desc->AdapterLuid.LowPart = 0; desc->AdapterLuid.HighPart = 0; - desc->VidPnSourceId = 0; + desc->VidPnSourceId = id; return STATUS_SUCCESS; } -- 2.23.0

2 1

[PATCH v4 0/6] winex11.drv: Fix several cursor and focus issues
by Rémi Bernon 09 Sep '19

09 Sep '19

Resending these here after iterating a bit in background for further discussion. I squashed a fix from Zhiyi Zhang <zzhang(a)codeweavers.com> in PATCH 3/6. Rémi Bernon (6): winex11.drv: Do not react to keyboard grab focus events winex11.drv: Only grab or warp the cursor when keyboard isn't grabbed winex11.drv: Retry last ClipCursor when grab is released winex11.drv: Do not set clipping_cursor when clip window map state changes winex11.drv: Explicitly call XUngrabPointer when clipping is released winex11.drv: Only call XWarpPointer if we can get exclusive pointer grab dlls/winex11.drv/event.c | 47 +++++++++++++++++++++++++++++++++--- dlls/winex11.drv/mouse.c | 50 +++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 2 ++ 3 files changed, 96 insertions(+), 3 deletions(-) -- 2.23.0.rc1

3 14

[PATCH 6/6] localspl/tests: Add support for monitors providing the MONITOR2 interface.
by Dmitry Timoshkov 09 Sep '19

09 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/tests/localmon.c | 190 +++++++++++++++++++++++++++++---- 1 file changed, 168 insertions(+), 22 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 8655aa0d1e..a612cc0ffe 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -2,6 +2,7 @@ * Unit test suite for localspl API functions: local print monitor * * Copyright 2006-2007 Detlef Riekenberg + * Copyright 2019 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,24 +38,35 @@ static HMODULE hdll; static HMODULE hlocalmon; +static HANDLE hmon; static LPMONITOREX (WINAPI *pInitializePrintMonitor)(LPWSTR); +static LPMONITOR2 (WINAPI *pInitializePrintMonitor2)(PMONITORINIT, LPHANDLE); static LPMONITOREX pm; +static LPMONITOR2 pm2; static BOOL (WINAPI *pEnumPorts)(LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); +static BOOL (WINAPI *pEnumPorts2)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); static BOOL (WINAPI *pOpenPort)(LPWSTR, PHANDLE); +static BOOL (WINAPI *pOpenPort2)(HANDLE, LPWSTR, PHANDLE); static BOOL (WINAPI *pOpenPortEx)(LPWSTR, LPWSTR, PHANDLE, struct _MONITOR *); +static BOOL (WINAPI *pOpenPortEx2)(HANDLE, HANDLE, LPWSTR, LPWSTR, PHANDLE, struct _MONITOR2 *); static BOOL (WINAPI *pStartDocPort)(HANDLE, LPWSTR, DWORD, DWORD, LPBYTE); static BOOL (WINAPI *pWritePort)(HANDLE hPort, LPBYTE, DWORD, LPDWORD); static BOOL (WINAPI *pReadPort)(HANDLE hPort, LPBYTE, DWORD, LPDWORD); static BOOL (WINAPI *pEndDocPort)(HANDLE); static BOOL (WINAPI *pClosePort)(HANDLE); static BOOL (WINAPI *pAddPort)(LPWSTR, HWND, LPWSTR); +static BOOL (WINAPI *pAddPort2)(HANDLE, LPWSTR, HWND, LPWSTR); static BOOL (WINAPI *pAddPortEx)(LPWSTR, DWORD, LPBYTE, LPWSTR); +static BOOL (WINAPI *pAddPortEx2)(HANDLE, LPWSTR, DWORD, LPBYTE, LPWSTR); static BOOL (WINAPI *pConfigurePort)(LPWSTR, HWND, LPWSTR); +static BOOL (WINAPI *pConfigurePort2)(HANDLE, LPWSTR, HWND, LPWSTR); static BOOL (WINAPI *pDeletePort)(LPWSTR, HWND, LPWSTR); +static BOOL (WINAPI *pDeletePort2)(HANDLE, LPWSTR, HWND, LPWSTR); static BOOL (WINAPI *pGetPrinterDataFromPort)(HANDLE, DWORD, LPWSTR, LPWSTR, DWORD, LPWSTR, DWORD, LPDWORD); static BOOL (WINAPI *pSetPortTimeOuts)(HANDLE, LPCOMMTIMEOUTS, DWORD); -static BOOL (WINAPI *pXcvOpenPort)(LPCWSTR, ACCESS_MASK, PHANDLE phXcv); +static BOOL (WINAPI *pXcvOpenPort)(LPCWSTR, ACCESS_MASK, PHANDLE); +static BOOL (WINAPI *pXcvOpenPort2)(HANDLE, LPCWSTR, ACCESS_MASK, PHANDLE); static DWORD (WINAPI *pXcvDataPort)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD); static BOOL (WINAPI *pXcvClosePort)(HANDLE); @@ -127,6 +139,91 @@ static WCHAR have_file[PORTNAME_MAXSIZE]; /* ########################### */ +static LONG WINAPI CreateKey(HANDLE hcKey, LPCWSTR pszSubKey, DWORD dwOptions, + REGSAM samDesired, PSECURITY_ATTRIBUTES pSecurityAttributes, + PHANDLE phckResult, PDWORD pdwDisposition, HANDLE hSpooler) +{ + ok(0, "should not be called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI OpenKey(HANDLE hcKey, LPCWSTR pszSubKey, REGSAM samDesired, + PHANDLE phkResult, HANDLE hSpooler) +{ + ok(0, "should not be called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI CloseKey(HANDLE hcKey, HANDLE hSpooler) +{ + ok(0, "should not be called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI DeleteKey(HANDLE hcKey, LPCWSTR pszSubKey, HANDLE hSpooler) +{ + ok(0, "should not be called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI EnumKey(HANDLE hcKey, DWORD dwIndex, LPWSTR pszName, + PDWORD pcchName, PFILETIME pftLastWriteTime, HANDLE hSpooler) +{ + ok(0, "should not be called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI QueryInfoKey(HANDLE hcKey, PDWORD pcSubKeys, PDWORD pcbKey, + PDWORD pcValues, PDWORD pcbValue, PDWORD pcbData, + PDWORD pcbSecurityDescriptor, PFILETIME pftLastWriteTime, + HANDLE hSpooler) +{ + ok(0, "should not be called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI SetValue(HANDLE hcKey, LPCWSTR pszValue, DWORD dwType, + const BYTE* pData, DWORD cbData, HANDLE hSpooler) +{ + ok(0, "should not be called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI DeleteValue(HANDLE hcKey, LPCWSTR pszValue, HANDLE hSpooler) +{ + ok(0, "should not be called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI EnumValue(HANDLE hcKey, DWORD dwIndex, LPWSTR pszValue, + PDWORD pcbValue, PDWORD pType, PBYTE pData, PDWORD pcbData, + HANDLE hSpooler) +{ + ok(0, "should not be called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI QueryValue(HANDLE hcKey, LPCWSTR pszValue, PDWORD pType, + PBYTE pData, PDWORD pcbData, HANDLE hSpooler) +{ + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static MONITORREG monreg = +{ + sizeof(MONITORREG), + CreateKey, + OpenKey, + CloseKey, + DeleteKey, + EnumKey, + QueryInfoKey, + SetValue, + DeleteValue, + EnumValue, + QueryValue +}; + static DWORD delete_port(LPWSTR portname) { DWORD res; @@ -605,6 +702,8 @@ static void test_InitializePrintMonitor(void) { LPMONITOREX res; + if (!pInitializePrintMonitor) return; + SetLastError(0xdeadbeef); res = pInitializePrintMonitor(NULL); /* The Parameter was unchecked before w2k */ @@ -618,14 +717,32 @@ static void test_InitializePrintMonitor(void) "returned %p with %u\n (expected '!= NULL' or: NULL with " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); - /* Every call with a non-empty string returns the same Pointer */ SetLastError(0xdeadbeef); res = pInitializePrintMonitor(Monitors_LocalPortW); ok( res == pm, "returned %p with %u (expected %p)\n", res, GetLastError(), pm); + ok(res->dwMonitorSize == sizeof(MONITOR), "wrong dwMonitorSize %u\n", res->dwMonitorSize); } +static void test_InitializePrintMonitor2(void) +{ + MONITORINIT init; + MONITOR2 *monitor2; + HANDLE hmon; + + if (!pInitializePrintMonitor2) return; + + memset(&init, 0, sizeof(init)); + init.cbSize = sizeof(init); + init.hckRegistryRoot = 0; + init.pMonitorReg = &monreg; + init.bLocal = TRUE; + + monitor2 = pInitializePrintMonitor2(&init, &hmon); + ok(monitor2 != NULL, "InitializePrintMonitor2 error %u\n", GetLastError()); + ok(monitor2->cbSize >= FIELD_OFFSET(MONITOR2, pfnSendRecvBidiDataFromPort), "wrong cbSize %u\n", monitor2->cbSize); +} /* ########################### */ @@ -1349,11 +1466,12 @@ static void test_XcvOpenPort(void) /* ########################### */ #define GET_MONITOR_FUNC(name) \ - if(numentries > 0) { \ - numentries--; \ - p##name = pm->Monitor.pfn##name ; \ - } + if (pm) p##name = pm->Monitor.pfn##name; \ + else if (pm2) p##name = pm2->pfn##name; +#define GET_MONITOR_FUNC2(name) \ + if (pm) p##name = pm->Monitor.pfn##name; \ + else if (pm2) p##name##2 = pm2->pfn##name; START_TEST(localmon) { @@ -1376,6 +1494,7 @@ START_TEST(localmon) ok(res != 0, "with %u\n", GetLastError()); pInitializePrintMonitor = (void *) GetProcAddress(hdll, "InitializePrintMonitor"); + pInitializePrintMonitor2 = (void *) GetProcAddress(hdll, "InitializePrintMonitor2"); if (!pInitializePrintMonitor) { /* The Monitor for "Local Ports" was in a separate dll before w2k */ @@ -1384,34 +1503,60 @@ START_TEST(localmon) pInitializePrintMonitor = (void *) GetProcAddress(hlocalmon, "InitializePrintMonitor"); } } - if (!pInitializePrintMonitor) return; + if (!pInitializePrintMonitor && !pInitializePrintMonitor2) { + skip("InitializePrintMonitor or InitializePrintMonitor2 not found\n"); + return; + } /* Native localmon.dll / localspl.dll need a valid Port-Entry in: a) since xp: HKLM\Software\Microsoft\Windows NT\CurrentVersion\Ports b) up to w2k: Section "Ports" in win.ini or InitializePrintMonitor fails. */ - pm = pInitializePrintMonitor(Monitors_LocalPortW); - if (pm) { - numentries = (pm->dwMonitorSize ) / sizeof(VOID *); - /* NT4: 14, since w2k: 17 */ - ok( numentries == 14 || numentries == 17, - "dwMonitorSize (%d) => %d Functions\n", pm->dwMonitorSize, numentries); - - GET_MONITOR_FUNC(EnumPorts); - GET_MONITOR_FUNC(OpenPort); - GET_MONITOR_FUNC(OpenPortEx); + if (pInitializePrintMonitor) + pm = pInitializePrintMonitor(Monitors_LocalPortW); + else if (pInitializePrintMonitor2) { + MONITORINIT init; + + memset(&init, 0, sizeof(init)); + init.cbSize = sizeof(init); + init.hckRegistryRoot = 0; + init.pMonitorReg = &monreg; + init.bLocal = TRUE; + + pm2 = pInitializePrintMonitor2(&init, &hmon); + ok(pm2 != NULL, "InitializePrintMonitor2 error %u\n", GetLastError()); + ok(pm2->cbSize >= FIELD_OFFSET(MONITOR2, pfnSendRecvBidiDataFromPort), "wrong cbSize %u\n", pm2->cbSize); + } + + if (pm || pm2) { + if (pm) { + ok(pm->dwMonitorSize == sizeof(MONITOR), "wrong dwMonitorSize %u\n", pm->dwMonitorSize); + numentries = (pm->dwMonitorSize ) / sizeof(VOID *); + /* NT4: 14, since w2k: 17 */ + ok( numentries == 14 || numentries == 17, + "dwMonitorSize (%u) => %u Functions\n", pm->dwMonitorSize, numentries); + } + else if (pm2) { + numentries = (pm2->cbSize ) / sizeof(VOID *); + ok( numentries >= 20, + "cbSize (%u) => %u Functions\n", pm2->cbSize, numentries); + } + + GET_MONITOR_FUNC2(EnumPorts); + GET_MONITOR_FUNC2(OpenPort); + GET_MONITOR_FUNC2(OpenPortEx); GET_MONITOR_FUNC(StartDocPort); GET_MONITOR_FUNC(WritePort); GET_MONITOR_FUNC(ReadPort); GET_MONITOR_FUNC(EndDocPort); GET_MONITOR_FUNC(ClosePort); - GET_MONITOR_FUNC(AddPort); - GET_MONITOR_FUNC(AddPortEx); - GET_MONITOR_FUNC(ConfigurePort); - GET_MONITOR_FUNC(DeletePort); + GET_MONITOR_FUNC2(AddPort); + GET_MONITOR_FUNC2(AddPortEx); + GET_MONITOR_FUNC2(ConfigurePort); + GET_MONITOR_FUNC2(DeletePort); GET_MONITOR_FUNC(GetPrinterDataFromPort); GET_MONITOR_FUNC(SetPortTimeOuts); - GET_MONITOR_FUNC(XcvOpenPort); + GET_MONITOR_FUNC2(XcvOpenPort); GET_MONITOR_FUNC(XcvDataPort); GET_MONITOR_FUNC(XcvClosePort); @@ -1427,6 +1572,7 @@ START_TEST(localmon) } test_InitializePrintMonitor(); + test_InitializePrintMonitor2(); find_installed_ports(); -- 2.20.1

2 1

[PATCH 5/6] localspl: Add MONITORREG stub callbacks for InitializePrintMonitor2.
by Dmitry Timoshkov 09 Sep '19

09 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 87 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 866a0748ff..326313d8f0 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -369,6 +369,92 @@ static void monitor_unloadall(void) LeaveCriticalSection(&monitor_handles_cs); } +static LONG WINAPI CreateKey(HANDLE hcKey, LPCWSTR pszSubKey, DWORD dwOptions, + REGSAM samDesired, PSECURITY_ATTRIBUTES pSecurityAttributes, + PHANDLE phckResult, PDWORD pdwDisposition, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI OpenKey(HANDLE hcKey, LPCWSTR pszSubKey, REGSAM samDesired, + PHANDLE phkResult, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI CloseKey(HANDLE hcKey, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI DeleteKey(HANDLE hcKey, LPCWSTR pszSubKey, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI EnumKey(HANDLE hcKey, DWORD dwIndex, LPWSTR pszName, + PDWORD pcchName, PFILETIME pftLastWriteTime, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI QueryInfoKey(HANDLE hcKey, PDWORD pcSubKeys, PDWORD pcbKey, + PDWORD pcValues, PDWORD pcbValue, PDWORD pcbData, + PDWORD pcbSecurityDescriptor, PFILETIME pftLastWriteTime, + HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI SetValue(HANDLE hcKey, LPCWSTR pszValue, DWORD dwType, + const BYTE* pData, DWORD cbData, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI DeleteValue(HANDLE hcKey, LPCWSTR pszValue, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI EnumValue(HANDLE hcKey, DWORD dwIndex, LPWSTR pszValue, + PDWORD pcbValue, PDWORD pType, PBYTE pData, PDWORD pcbData, + HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI QueryValue(HANDLE hcKey, LPCWSTR pszValue, PDWORD pType, + PBYTE pData, PDWORD pcbData, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static MONITORREG monreg = +{ + sizeof(MONITORREG), + CreateKey, + OpenKey, + CloseKey, + DeleteKey, + EnumKey, + QueryInfoKey, + SetValue, + DeleteValue, + EnumValue, + QueryValue +}; + /****************************************************************** * monitor_load [internal] * @@ -491,6 +577,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) memset(&init, 0, sizeof(init)); init.cbSize = sizeof(init); init.hckRegistryRoot = hroot; + init.pMonitorReg = &monreg; init.bLocal = TRUE; monitor2 = pInitializePrintMonitor2(&init, &hmon); -- 2.20.1

2 1

[PATCH 4/6] winsplp.h: Fix MONITORINIT definition.
by Dmitry Timoshkov 09 Sep '19

09 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/ddk/winsplp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/winsplp.h b/include/ddk/winsplp.h index 3776ba685f..162f6738bb 100644 --- a/include/ddk/winsplp.h +++ b/include/ddk/winsplp.h @@ -155,6 +155,7 @@ typedef struct _MONITORINIT { HANDLE hckRegistryRoot; PMONITORREG pMonitorReg; BOOL bLocal; + LPCWSTR pszServerName; } MONITORINIT, *PMONITORINIT; typedef struct _MONITORUI { -- 2.20.1

2 1

[PATCH 3/6] localspl: Fix MONITOR2 callback prototypes.
by Dmitry Timoshkov 09 Sep '19

09 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 106 +++++++++++++++++++++++++++++++++++---- include/ddk/winsplp.h | 17 ++++--- 2 files changed, 105 insertions(+), 18 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 7a12751f17..866a0748ff 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -66,6 +66,13 @@ typedef struct { LPWSTR dllname; PMONITORUI monitorUI; MONITOR2 monitor; + BOOL (WINAPI *old_EnumPorts)(LPWSTR,DWORD,LPBYTE,DWORD,LPDWORD,LPDWORD); + BOOL (WINAPI *old_OpenPort)(LPWSTR,PHANDLE); + BOOL (WINAPI *old_OpenPortEx)(LPWSTR,LPWSTR,PHANDLE,struct _MONITOR *); + BOOL (WINAPI *old_AddPort)(LPWSTR,HWND,LPWSTR); + BOOL (WINAPI *old_AddPortEx)(LPWSTR,DWORD,LPBYTE,LPWSTR); + BOOL (WINAPI *old_ConfigurePort)(LPWSTR,HWND,LPWSTR); + BOOL (WINAPI *old_DeletePort)(LPWSTR,HWND,LPWSTR); BOOL (WINAPI *old_XcvOpenPort)(LPCWSTR,ACCESS_MASK,PHANDLE); HANDLE hmon; HMODULE hdll; @@ -507,7 +514,23 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize + sizeof(void *), sizeof(pm->monitor))); /* MONITOREX.dwMonitorSize doesn't include the size field, while MONITOR2.cbSize does */ pm->monitor.cbSize += sizeof(void *); + + pm->old_EnumPorts = pmonitorEx->Monitor.pfnEnumPorts; + pm->old_OpenPort = pmonitorEx->Monitor.pfnOpenPort; + pm->old_OpenPortEx = pmonitorEx->Monitor.pfnOpenPortEx; + pm->old_AddPort = pmonitorEx->Monitor.pfnAddPort; + pm->old_AddPortEx = pmonitorEx->Monitor.pfnAddPortEx; + pm->old_ConfigurePort = pmonitorEx->Monitor.pfnConfigurePort; + pm->old_DeletePort = pmonitorEx->Monitor.pfnDeletePort; pm->old_XcvOpenPort = pmonitorEx->Monitor.pfnXcvOpenPort; + + pm->monitor.pfnEnumPorts = NULL; + pm->monitor.pfnOpenPort = NULL; + pm->monitor.pfnOpenPortEx = NULL; + pm->monitor.pfnAddPort = NULL; + pm->monitor.pfnAddPortEx = NULL; + pm->monitor.pfnConfigurePort = NULL; + pm->monitor.pfnDeletePort = NULL; pm->monitor.pfnXcvOpenPort = NULL; } } @@ -921,6 +944,19 @@ static DWORD get_local_printprocessors(LPWSTR regpathW, LPBYTE pPPInfo, DWORD cb return needed; } +static BOOL wrap_EnumPorts(monitor_t *pm, LPWSTR name, DWORD level, LPBYTE buffer, + DWORD size, LPDWORD needed, LPDWORD returned) +{ + if (pm->monitor.pfnEnumPorts) + return pm->monitor.pfnEnumPorts(pm->hmon, name, level, buffer, size, needed, returned); + + if (pm->old_EnumPorts) + return pm->old_EnumPorts(name, level, buffer, size, needed, returned); + + WARN("EnumPorts is not implemented by monitor\n"); + return FALSE; +} + /****************************************************************** * enumerate the local Ports from all loaded monitors (internal) * @@ -957,16 +993,16 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf LIST_FOR_EACH_ENTRY(pm, &monitor_handles, monitor_t, entry) { - if (pm->monitor.pfnEnumPorts) { + if (pm->monitor.pfnEnumPorts || pm->old_EnumPorts) { pi_needed = 0; pi_returned = 0; - res = pm->monitor.pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); + res = wrap_EnumPorts(pm, NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { /* Do not use heap_realloc (we do not need the old data in the buffer) */ heap_free(pi_buffer); pi_buffer = heap_alloc(pi_needed); pi_allocated = (pi_buffer) ? pi_needed : 0; - res = pm->monitor.pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); + res = wrap_EnumPorts(pm, NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); } TRACE("(%s) got %d with %d (need %d byte for %d entries)\n", debugstr_w(pm->name), res, GetLastError(), pi_needed, pi_returned); @@ -1576,6 +1612,18 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) return (res); } +static BOOL wrap_AddPort(monitor_t *pm, LPWSTR name, HWND hwnd, LPWSTR monitor_name) +{ + if (pm->monitor.pfnAddPort) + return pm->monitor.pfnAddPort(pm->hmon, name, hwnd, monitor_name); + + if (pm->old_AddPort) + return pm->old_AddPort(name, hwnd, monitor_name); + + WARN("AddPort is not implemented by monitor\n"); + return FALSE; +} + /****************************************************************************** * fpAddPort [exported through PRINTPROVIDOR] * @@ -1614,8 +1662,8 @@ static BOOL WINAPI fpAddPort(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) } pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor.pfnAddPort) { - res = pm->monitor.pfnAddPort(pName, hWnd, pMonitorName); + if (pm && (pm->monitor.pfnAddPort || pm->old_AddPort)) { + res = wrap_AddPort(pm, pName, hWnd, pMonitorName); TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); } else @@ -1642,6 +1690,18 @@ static BOOL WINAPI fpAddPort(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) return res; } +static BOOL wrap_AddPortEx(monitor_t *pm, LPWSTR name, DWORD level, LPBYTE buffer, LPWSTR monitor_name) +{ + if (pm->monitor.pfnAddPortEx) + return pm->monitor.pfnAddPortEx(pm->hmon, name, level, buffer, monitor_name); + + if (pm->old_AddPortEx) + return pm->old_AddPortEx(name, level, buffer, monitor_name); + + WARN("AddPortEx is not implemented by monitor\n"); + return FALSE; +} + /****************************************************************************** * fpAddPortEx [exported through PRINTPROVIDOR] * @@ -1691,9 +1751,9 @@ static BOOL WINAPI fpAddPortEx(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR /* load the Monitor */ pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor.pfnAddPortEx) + if (pm && (pm->monitor.pfnAddPortEx || pm->old_AddPortEx)) { - res = pm->monitor.pfnAddPortEx(pName, level, pBuffer, pMonitorName); + res = wrap_AddPortEx(pm, pName, level, pBuffer, pMonitorName); TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); } else @@ -1768,6 +1828,18 @@ static BOOL WINAPI fpClosePrinter(HANDLE hPrinter) return FALSE; } +static BOOL wrap_ConfigurePort(monitor_t *pm, LPWSTR name, HWND hwnd, LPWSTR port_name) +{ + if (pm->monitor.pfnConfigurePort) + return pm->monitor.pfnConfigurePort(pm->hmon, name, hwnd, port_name); + + if (pm->old_ConfigurePort) + return pm->old_ConfigurePort(name, hwnd, port_name); + + WARN("ConfigurePort is not implemented by monitor\n"); + return FALSE; +} + /****************************************************************************** * fpConfigurePort [exported through PRINTPROVIDOR] * @@ -1806,11 +1878,11 @@ static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) } pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor.pfnConfigurePort) + if (pm && (pm->monitor.pfnConfigurePort || pm->old_ConfigurePort)) { TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); - res = pm->monitor.pfnConfigurePort(pName, hWnd, pPortName); + res = wrap_ConfigurePort(pm, pName, hWnd, pPortName); TRACE("got %d with %u\n", res, GetLastError()); } else @@ -1912,6 +1984,18 @@ static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMo return FALSE; } +static BOOL wrap_DeletePort(monitor_t *pm, LPWSTR name, HWND hwnd, LPWSTR port_name) +{ + if (pm->monitor.pfnDeletePort) + return pm->monitor.pfnDeletePort(pm->hmon, name, hwnd, port_name); + + if (pm->old_ConfigurePort) + return pm->old_DeletePort(name, hwnd, port_name); + + WARN("DeletePort is not implemented by monitor\n"); + return FALSE; +} + /***************************************************************************** * fpDeletePort [exported through PRINTPROVIDOR] * @@ -1950,11 +2034,11 @@ static BOOL WINAPI fpDeletePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) } pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor.pfnDeletePort) + if (pm && (pm->monitor.pfnDeletePort || pm->old_DeletePort)) { TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); - res = pm->monitor.pfnDeletePort(pName, hWnd, pPortName); + res = wrap_DeletePort(pm, pName, hWnd, pPortName); TRACE("got %d with %u\n", res, GetLastError()); } else diff --git a/include/ddk/winsplp.h b/include/ddk/winsplp.h index c532be901f..3776ba685f 100644 --- a/include/ddk/winsplp.h +++ b/include/ddk/winsplp.h @@ -80,10 +80,11 @@ typedef struct _MONITOR { typedef struct _MONITOR2 { DWORD cbSize; - BOOL (WINAPI *pfnEnumPorts)(LPWSTR pName, DWORD Level, LPBYTE pPorts, + BOOL (WINAPI *pfnEnumPorts)(HANDLE hMonitor, LPWSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); - BOOL (WINAPI *pfnOpenPort)(LPWSTR pName, PHANDLE pHandle); - BOOL (WINAPI *pfnOpenPortEx)(LPWSTR pPortName, LPWSTR pPrinterName, + BOOL (WINAPI *pfnOpenPort)(HANDLE hMonitor, LPWSTR pName, PHANDLE pHandle); + BOOL (WINAPI *pfnOpenPortEx)(HANDLE hMonitor, HANDLE hMonitorPort, + LPWSTR pPortName, LPWSTR pPrinterName, PHANDLE pHandle, struct _MONITOR2 *pMonitor2); BOOL (WINAPI *pfnStartDocPort)(HANDLE hPort, LPWSTR pPrinterName, DWORD JobId, DWORD Level, LPBYTE pDocInfo); @@ -93,11 +94,11 @@ typedef struct _MONITOR2 { LPDWORD pcbRead); BOOL (WINAPI *pfnEndDocPort)(HANDLE hPort); BOOL (WINAPI *pfnClosePort)(HANDLE hPort); - BOOL (WINAPI *pfnAddPort)(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName); - BOOL (WINAPI *pfnAddPortEx)(LPWSTR pName, DWORD Level, LPBYTE lpBuffer, + BOOL (WINAPI *pfnAddPort)(HANDLE hMonitor, LPWSTR pName, HWND hWnd, LPWSTR pMonitorName); + BOOL (WINAPI *pfnAddPortEx)(HANDLE hMonitor, LPWSTR pName, DWORD Level, LPBYTE lpBuffer, LPWSTR lpMonitorName); - BOOL (WINAPI *pfnConfigurePort)(LPWSTR pName, HWND hWnd, LPWSTR pPortName); - BOOL (WINAPI *pfnDeletePort)(LPWSTR pName, HWND hWnd, LPWSTR pPortName); + BOOL (WINAPI *pfnConfigurePort)(HANDLE hMonitor, LPWSTR pName, HWND hWnd, LPWSTR pPortName); + BOOL (WINAPI *pfnDeletePort)(HANDLE hMonitor, LPWSTR pName, HWND hWnd, LPWSTR pPortName); BOOL (WINAPI *pfnGetPrinterDataFromPort)(HANDLE hPort, DWORD ControlID, LPWSTR pValueName, LPWSTR lpInBuffer, DWORD cbInBuffer, LPWSTR lpOutBuffer, DWORD cbOutBuffer, LPDWORD lpcbReturned); @@ -114,6 +115,8 @@ typedef struct _MONITOR2 { DWORD (WINAPI *pfnSendRecvBidiDataFromPort)(HANDLE hPort, DWORD dwAccessBit, LPCWSTR pAction, PBIDI_REQUEST_CONTAINER pReqData, PBIDI_RESPONSE_CONTAINER *ppResData); + DWORD (WINAPI *pfnNotifyUsedPorts)(HANDLE, DWORD, PCWSTR *); + DWORD (WINAPI *pfnNotifyUnusedPorts)(HANDLE, DWORD, PCWSTR *); } MONITOR2, *LPMONITOR2, *PMONITOR2; typedef struct _MONITOREX { -- 2.20.1

2 1

[PATCH 2/6] localspl: Fix MONITOR2.cbSize calculation when converting from MONITOREX.
by Dmitry Timoshkov 09 Sep '19

09 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/localmon.c | 2 +- dlls/localspl/provider.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 6937e050cd..e634a33253 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -777,7 +777,7 @@ LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot) { static MONITOREX mymonitorex = { - sizeof(MONITOREX) - sizeof(DWORD), + sizeof(MONITOR), { localmon_EnumPortsW, localmon_OpenPortW, diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4627284f12..7a12751f17 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -504,7 +504,9 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (pmonitorEx) { /* Layout of MONITOREX and MONITOR2 mostly matches */ - memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize + sizeof(DWORD), sizeof(pm->monitor))); + memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize + sizeof(void *), sizeof(pm->monitor))); + /* MONITOREX.dwMonitorSize doesn't include the size field, while MONITOR2.cbSize does */ + pm->monitor.cbSize += sizeof(void *); pm->old_XcvOpenPort = pmonitorEx->Monitor.pfnXcvOpenPort; pm->monitor.pfnXcvOpenPort = NULL; } -- 2.20.1

2 1

[PATCH 1/6] localspl: Use the monitor handle returned by InitializePrintMonitor2.
by Dmitry Timoshkov 09 Sep '19

09 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index def3215824..4627284f12 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -67,6 +67,7 @@ typedef struct { PMONITORUI monitorUI; MONITOR2 monitor; BOOL (WINAPI *old_XcvOpenPort)(LPCWSTR,ACCESS_MASK,PHANDLE); + HANDLE hmon; HMODULE hdll; DWORD refcount; } monitor_t; @@ -329,7 +330,7 @@ static void monitor_unload(monitor_t * pm) list_remove(&pm->entry); if (pm->monitor.pfnShutdown) - pm->monitor.pfnShutdown(0); + pm->monitor.pfnShutdown(pm->hmon); FreeLibrary(pm->hdll); heap_free(pm->name); @@ -489,7 +490,10 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) TRACE("%p: MONITOR2 from %s,InitializePrintMonitor2(%s)\n", monitor2, debugstr_w(driver), debugstr_w(regroot)); if (monitor2) + { memcpy(&pm->monitor, monitor2, min(monitor2->cbSize, sizeof(pm->monitor))); + pm->hmon = hmon; + } } else if (pInitializePrintMonitor && regroot) { MONITOREX *pmonitorEx; @@ -596,7 +600,7 @@ static monitor_t * monitor_loadui(monitor_t * pm) /* query the userinterface-dllname from the Portmonitor */ /* building (",XcvMonitor %s",pm->name) not needed yet */ if (pm->monitor.pfnXcvOpenPort) - res = pm->monitor.pfnXcvOpenPort(0, emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + res = pm->monitor.pfnXcvOpenPort(pm->hmon, emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); else if (pm->old_XcvOpenPort) res = pm->old_XcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); TRACE("got %u with %p\n", res, hXcv); @@ -1245,7 +1249,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) if (printer->pm) { if (printer->pm->monitor.pfnXcvOpenPort) - printer->pm->monitor.pfnXcvOpenPort(0, &printername[len], + printer->pm->monitor.pfnXcvOpenPort(printer->pm->hmon, &printername[len], pDefault ? pDefault->DesiredAccess : 0, &printer->hXcv); else if (printer->pm->old_XcvOpenPort) -- 2.20.1

2 1

[PATCH v2] vbscript/tests: Test lack of newline parsing before End statements.
by Gabriel Ivăncescu 09 Sep '19

09 Sep '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Supersedes 169498. Please apply after 169497 for the test results. They are clean, see https://testbot.winehq.org/JobDetails.pl?Key=56309 dlls/vbscript/tests/lang.vbs | 28 ++++++++++++++++++ dlls/vbscript/tests/run.c | 57 ++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 6b45865..5d9fb80 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1429,4 +1429,32 @@ sub test_dotIdentifiers end sub call test_dotIdentifiers +' Test End statements not required to be preceeded by a newline or separator +Sub EndTestSub + x = 1 End Sub + +Sub EndTestSubWithCall + x = 1 + Call ok(x = 1, "x = " & x)End Sub +Call EndTestSubWithCall() + +Function EndTestFunc(x) + Call ok(x > 0, "x = " & x)End Function +EndTestFunc(1) + +Class EndTestClassWithStorageId + Public x End Class + +Class EndTestClassWithDim + Dim x End Class + +Class EndTestClassWithFunc + Function test(ByVal x) + x = 0 End Function End Class + +Class EndTestClassWithProperty + Public x + Public default Property Get defprop + defprop = x End Property End Class + reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 15a8f10..f10a42b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2077,6 +2077,62 @@ static void test_gc(void) IActiveScriptParse_Release(parser); } +static void test_parse_errors(void) +{ + static const char *invalid_scripts[] = + { + /* If...End If */ + "If 0 > 1 Then\n" + " x = 0 End If\n", + + /* While...End While */ + "While False\n" + " x = 0 End While\n", + + /* While...Wend */ + "While False\n" + " x = 0 Wend\n", + + /* Do While...Loop */ + "Do While False\n" + " x = 0 Loop\n", + + /* Do Until...Loop */ + "Do Until True\n" + " x = 0 Loop\n", + + /* Do...Loop While */ + "Do\n" + " x = 0 Loop While False\n", + + /* Do...Loop Until */ + "Do\n" + " x = 0 Loop Until True\n", + + /* Select...End Select */ + "x = False\n" + "Select Case 42\n" + " Case 0\n" + " Call ok(False, \"unexpected case\")\n" + " Case 42\n" + " x = True End Select\n" + "Call ok(x, \"wrong case\")\n", + + /* Class...End Class (empty) */ + "Class C End Class" + }; + HRESULT hres; + UINT i; + + for (i = 0; i < ARRAY_SIZE(invalid_scripts); i++) + { + SET_EXPECT(OnScriptError); + hres = parse_script_ar(invalid_scripts[i]); + ok(FAILED(hres), "[%u] script did not fail\n", i); + todo_wine CHECK_CALLED(OnScriptError); + } +} + static void test_msgbox(void) { HRESULT hres; @@ -2500,6 +2556,7 @@ static void run_tests(void) test_procedures(); test_gc(); test_msgbox(); + test_parse_errors(); test_parse_context(); } -- 2.21.0

3 2

[PATCH] ddrawex: Tweak the createDD() name to make CodeSpell happy.
by Francois Gouget 09 Sep '19

09 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Duplicating the trailing 'd' seems to be a common typo so CodeSpell complains about 'createdd'. Since this is about DirectDraw this spelling warning is easy to avoid and may even make the function name more obvious to someone reading the code for the first time. So I propose to rename it to createDDraw() to stay in spirit. dlls/ddrawex/tests/ddrawex.c | 4 ++-- dlls/ddrawex/tests/surface.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddrawex/tests/ddrawex.c b/dlls/ddrawex/tests/ddrawex.c index 7134a0478cd..60d84fe991b 100644 --- a/dlls/ddrawex/tests/ddrawex.c +++ b/dlls/ddrawex/tests/ddrawex.c @@ -27,7 +27,7 @@ static IDirectDrawFactory *factory; static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); -static IDirectDraw *createDD(void) +static IDirectDraw *createDDraw(void) { HRESULT hr; IDirectDraw *dd; @@ -46,7 +46,7 @@ static ULONG get_ref(IUnknown *o) static void RefCountTest(void) { - IDirectDraw *dd1 = createDD(); + IDirectDraw *dd1 = createDDraw(); IDirectDraw2 *dd2; IDirectDraw3 *dd3; IDirectDraw4 *dd4; diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index c6c02a83583..3081cfe2514 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -29,7 +29,7 @@ static IDirectDrawFactory *factory; static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); -static IDirectDraw *createDD(void) +static IDirectDraw *createDDraw(void) { HRESULT hr; IDirectDraw *dd; @@ -74,7 +74,7 @@ static void GetDCTest_main(DDSURFACEDESC *ddsd, DDSURFACEDESC2 *ddsd2, void (*te IDirectDrawSurface2 *surf3; IDirectDrawSurface4 *surf4; HRESULT hr; - IDirectDraw *dd1 = createDD(); + IDirectDraw *dd1 = createDDraw(); IDirectDraw2 *dd2; IDirectDraw3 *dd3; IDirectDraw4 *dd4; @@ -156,7 +156,7 @@ static void GetDCTest(void) static void CapsTest(void) { DDSURFACEDESC ddsd; - IDirectDraw *dd1 = createDD(); + IDirectDraw *dd1 = createDDraw(); IDirectDrawSurface *surf; HRESULT hr; @@ -247,7 +247,7 @@ static void test_surface_from_dc3(void) HRESULT hr; HDC dc; - dd1 = createDD(); + dd1 = createDDraw(); hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw3, (void **)&dd3); ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed, hr %#x.\n", hr); IDirectDraw_Release(dd1); @@ -314,7 +314,7 @@ static void test_surface_from_dc4(void) HRESULT hr; HDC dc; - dd1 = createDD(); + dd1 = createDDraw(); hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **)&dd4); if (hr == E_NOINTERFACE) { win_skip("DirectDraw4 is not supported\n"); -- 2.20.1

3 2

[PATCH] ddraw/tests: Spelling fixes in ok() messages.
by Francois Gouget 09 Sep '19

09 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index cc228028e17..a23e76e1f71 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2745,7 +2745,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); expect_messages = exclusive_focus_restore_messages; @@ -2758,7 +2758,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width - && devmode.dmPelsHeight == param.ddraw_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 595157b486f..2156bd58498 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2856,7 +2856,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); expect_messages = exclusive_focus_restore_messages; @@ -2869,7 +2869,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width - && devmode.dmPelsHeight == param.ddraw_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 567a8f38c01..fdcf6dff879 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3010,7 +3010,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); expect_messages = exclusive_focus_restore_messages; @@ -3023,7 +3023,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width - && devmode.dmPelsHeight == param.ddraw_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 116e34a1768..279263fe37b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2684,7 +2684,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); expect_messages = exclusive_focus_restore_messages; @@ -2697,7 +2697,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width - && devmode.dmPelsHeight == param.ddraw_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); -- 2.20.1

3 2

[PATCH] dxgi: Add IDXGIDevice3 stub.
by Andrey Gusev 09 Sep '19

09 Sep '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/dxgi/device.c | 8 ++++++++ include/wine/winedxgi.idl | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 5500452653..4b23155754 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -42,6 +42,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa || IsEqualGUID(riid, &IID_IDXGIDevice) || IsEqualGUID(riid, &IID_IDXGIDevice1) || IsEqualGUID(riid, &IID_IDXGIDevice2) + || IsEqualGUID(riid, &IID_IDXGIDevice3) || IsEqualGUID(riid, &IID_IWineDXGIDevice)) { IUnknown_AddRef(iface); @@ -321,6 +322,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_EnqueueSetEvent(IWineDXGIDevice *if return E_NOTIMPL; } +static void STDMETHODCALLTYPE dxgi_device_Trim(IWineDXGIDevice *iface) +{ + FIXME("iface %p stub!\n", iface); +} + /* IWineDXGIDevice methods */ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, @@ -376,6 +382,8 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = dxgi_device_OfferResources, dxgi_device_ReclaimResources, dxgi_device_EnqueueSetEvent, + /* IDXGIDevice3 methods */ + dxgi_device_Trim, /* IWineDXGIDevice methods */ dxgi_device_create_surface, }; diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 610b7c0485..070ac2fdda 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -42,7 +42,7 @@ interface IWineDXGISwapChainFactory : IUnknown local, uuid(3e1ff30b-c951-48c3-b010-0fb49f3dca71) ] -interface IWineDXGIDevice : IDXGIDevice2 +interface IWineDXGIDevice : IDXGIDevice3 { HRESULT create_surface( [in] struct wined3d_texture *wined3d_texture, -- 2.21.0

3 2

[PATCH] Include: Add DSFX_I3DL2REVERB defines
by Alistair Leslie-Hughes 09 Sep '19

09 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dsound.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index 44bfccf2ad..2f65e194cb 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -460,6 +460,46 @@ typedef struct _DSFXI3DL2Reverb FLOAT flHFReference; } DSFXI3DL2Reverb, *LPDSFXI3DL2Reverb; +#define DSFX_I3DL2REVERB_DECAYTIME_DEFAULT 1.49f +#define DSFX_I3DL2REVERB_DECAYTIME_MIN 0.1f +#define DSFX_I3DL2REVERB_DECAYTIME_MAX 20.0f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_DEFAULT 0.83f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_MIN 0.1f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_MAX 2.0f +#define DSFX_I3DL2REVERB_DENSITY_DEFAULT 100.0f +#define DSFX_I3DL2REVERB_DENSITY_MIN 0.0f +#define DSFX_I3DL2REVERB_DENSITY_MAX 100.0f +#define DSFX_I3DL2REVERB_DIFFUSION_DEFAULT 100.0f +#define DSFX_I3DL2REVERB_DIFFUSION_MIN 0.0f +#define DSFX_I3DL2REVERB_DIFFUSION_MAX 100.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_DEFAULT 5000.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_MIN 20.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_MAX 20000.0f +#define DSFX_I3DL2REVERB_QUALITY_DEFAULT 2 +#define DSFX_I3DL2REVERB_QUALITY_MIN 0 +#define DSFX_I3DL2REVERB_QUALITY_MAX 3 +#define DSFX_I3DL2REVERB_REFLECTIONS_DEFAULT -2602 +#define DSFX_I3DL2REVERB_REFLECTIONS_MIN -10000 +#define DSFX_I3DL2REVERB_REFLECTIONS_MAX 1000 +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_DEFAULT 0.007f +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MIN 0.0f +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MAX 0.3f +#define DSFX_I3DL2REVERB_REVERB_MIN -10000 +#define DSFX_I3DL2REVERB_REVERB_MAX 2000 +#define DSFX_I3DL2REVERB_REVERB_DEFAULT 200 +#define DSFX_I3DL2REVERB_REVERBDELAY_MIN 0.0f +#define DSFX_I3DL2REVERB_REVERBDELAY_MAX 0.1f +#define DSFX_I3DL2REVERB_REVERBDELAY_DEFAULT 0.011f +#define DSFX_I3DL2REVERB_ROOM_DEFAULT -1000 +#define DSFX_I3DL2REVERB_ROOM_MIN 10000 +#define DSFX_I3DL2REVERB_ROOM_MAX 0 +#define DSFX_I3DL2REVERB_ROOMHF_MIN -10000 +#define DSFX_I3DL2REVERB_ROOMHF_MAX 0 +#define DSFX_I3DL2REVERB_ROOMHF_DEFAULT -100 +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MIN 0.0f +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MAX 10.0f +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_DEFAULT 0.0f + typedef const DSFXI3DL2Reverb *LPCDSFXI3DL2Reverb; #define DSCCAPS_EMULDRIVER DSCAPS_EMULDRIVER -- 2.17.1

1 0

[PATCH 1/5] winegstreamer: Get rid of the unused "gstpool" field from GSTOutPin.
by Zebediah Figura 08 Sep '19

08 Sep '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index bf8f1de9e23..ef11ed69962 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -82,7 +82,6 @@ struct GSTOutPin { GstPad *flip_sink, *flip_src; GstPad *their_src; GstPad *my_sink; - GstBufferPool *gstpool; BOOL isaud, isvid; AM_MEDIA_TYPE * pmt; HANDLE caps_event; @@ -1769,8 +1768,6 @@ static void free_source_pin(GSTOutPin *pin) CloseHandle(pin->caps_event); DeleteMediaType(pin->pmt); gst_segment_free(pin->segment); - if (pin->gstpool) - gst_object_unref(pin->gstpool); strmbase_source_cleanup(&pin->pin); heap_free(pin); -- 2.23.0

1 4

[PATCH] iphlpapi: fixed size to MBtoWC
by Marcus Meissner 08 Sep '19

08 Sep '19

Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/iphlpapi/tests/iphlpapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d4b1100af6..1b0bc9383a 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2331,7 +2331,7 @@ static void test_ParseNetworkString(void) for (i = 0; i < ARRAY_SIZE(ipv4_address_tests); i++) { MultiByteToWideChar(CP_ACP, 0, ipv4_address_tests[i].str, sizeof(ipv4_address_tests[i].str), - wstr, sizeof(wstr)); + wstr, ARRAY_SIZE(wstr)); memset(&info, 0x99, sizeof(info)); port = 0x9999; prefix_len = 0x99; @@ -2357,7 +2357,7 @@ static void test_ParseNetworkString(void) for (i = 0; i < ARRAY_SIZE(ipv4_service_tests); i++) { MultiByteToWideChar(CP_ACP, 0, ipv4_service_tests[i].str, sizeof(ipv4_service_tests[i].str), - wstr, sizeof(wstr)); + wstr, ARRAY_SIZE(wstr)); memset(&info, 0x99, sizeof(info)); port = 0x9999; prefix_len = 0x99; -- 2.23.0

1 0

[PATCH] dwrite: Silence a compiler warning in test_fontsetbuilder.
by Gerald Pfeifer 08 Sep '19

08 Sep '19

GCC 10 alphas (and probably before that) issue font.c: In function ‘test_fontsetbuilder’: font.c:9149:21: warning: ‘ivalue’ may be used uninitialized in this function [-Wmaybe-uninitialized] 9149 | wsprintfW(buffW, fmtW, ivalue); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ in dlls/dwrite/tests/font.c. The structure of our code is switch ... { case 1: ivalue =... ; break; case 2: ivalue =... ; break; default: ; } switch ... { case 1: case 2: do something with ivalue; default: ; } so this looks like a false positive, however one that appears rather involved for compilers to handle. Hence, best to pragmatically silence this by initializing ivalue in the default case? Gerald --- dlls/dwrite/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 309c0a2b08..3b6c2dc3c2 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9126,7 +9126,7 @@ todo_wine ivalue = IDWriteFont3_GetStyle(font); break; default: - ; + ivalue = 0; } switch (id) -- 2.22.0

1 0

[PATCH] po: Update Norwegian translation.
by Kim Malmo 08 Sep '19

08 Sep '19

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 72 ++++++----------------------------------------------- 1 file changed, 7 insertions(+), 65 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 0b6284a5d0..2e345fcb38 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -172,7 +172,7 @@ msgid "" "href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine fant ikke wine-mono-pakken, som er nødvendig for at .NET programmer " +"Wine fant ikke wine-mono pakken, som er nødvendig for at .NET programmer " "skal fungere ordentlig. Wine kan laste ned og installere denne pakken for " "deg.\n" "\n" @@ -7333,10 +7333,8 @@ msgid "Stream descriptor is not selected.\n" msgstr "Enheten er ikke koblet til.\n" #: mferror.mc:697 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "Indeksen mangler.\n" +msgstr "Kilde mangler.\n" #: mferror.mc:704 msgid "Topology loader does not support sink activates.\n" @@ -11161,10 +11159,6 @@ msgid "" msgstr "Tidsformatet til \"song pointer\" og SMPTE kan ikke brukes sammen." #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -11185,10 +11179,6 @@ msgid "An error occurred with the specified port." msgstr "En feil oppstod med den oppgitte porten." #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." @@ -15339,7 +15329,7 @@ msgstr "Vanlig metafil-framviser" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metafiler (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -15510,16 +15500,12 @@ msgid "Drive configuration" msgstr "Oppsett av stasjoner" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." msgstr "" -"Klarte ikke koble til monteringsbehandleren; diskstasjonene kan derfor ikke " -"redigeres." +"Klarte ikke koble til monteringsbehandleren; stasjonsoppsettet kan derfor " +"ikke redigeres." #: winecfg.rc:236 msgid "A&dd..." @@ -15804,12 +15790,6 @@ msgid "System drive" msgstr "Systemstasjon" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -16888,10 +16868,8 @@ msgid "Text documents (*.txt)" msgstr "Tekstdokument (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Unicode-tekstdokument (*.txt)" +msgstr "Unicode-tekstdokumenter (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)" @@ -17093,42 +17071,6 @@ msgid "D" msgstr "K" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -17192,7 +17134,7 @@ msgstr "" "[/A] Bare kopier filer som er markert som arkiv.\n" "[/M] Bare kopier filer som er markert som arkiv; fjern denne\n" "\tmerkingen etterpå.\n" -"[/K] Kopier filegenskaper, uten denne blir ikke egenskapene preservert.\n" +"[/K] Kopier filegenskaper; uten denne blir ikke egenskapene preservert.\n" "[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n" "\t\tden oppgitte datoen. Hvis ingen dato oppgis kopieres det bare hvis\n" "\t\tmålet er eldre enn kilden.\n" -- 2.17.1

1 0

[PATCH] winemac.drv: Avoid an unneeded lstrlenW() call.
by Francois Gouget 08 Sep '19

08 Sep '19

Note that since tiptext is a buffer it cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winemac.drv/systray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index a2c32b238fe..75bca5e3d51 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -123,7 +123,7 @@ static BOOL modify_icon(struct tray_icon *icon, NOTIFYICONDATAW *nid) if (icon->image) update_image = TRUE; - if (lstrlenW(icon->tiptext)) + if (*icon->tiptext) update_tooltip = TRUE; } else -- 2.20.1

2 1

[PATCH] dinput8/tests: A spelling fix in a comment.
by Francois Gouget 08 Sep '19

08 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dinput8/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 0bf6936812f..f3e7b542355 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -109,7 +109,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); - /* Check for buffer owerflow */ + /* Check for buffer overflow */ for (i = 0; i < 17; i++) if (event_type == INPUT_KEYBOARD) { -- 2.20.1

2 1

[PATCH 1/2] testbot/WineReconfig: Use the PE TestLauncher executable.
by Francois Gouget 08 Sep '19

08 Sep '19

Wine VMs now should have MinGW to compile Wine so they can use it to produce the PE TestLauncher executable as well. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is the bit that was missing for the '--build' patch that did not apply. testbot/bin/build/WineReconfig.pl | 13 +------------ testbot/bin/build/WineTest.pl | 2 +- testbot/lib/Build/Utils.pm | 10 +++++++++- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 9f0544e3..ff0c11c8 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -71,18 +71,6 @@ sub BuildWine($$$$;$) return !1; } - # Compile TestLauncher - my $Bits = ($Build =~ /64/) ? "64" : "32"; - $WithWine ||= "."; - system("cd '$DataDir/wine-$Build' && set -x && ". - "gcc -m$Bits -c -o TestLauncher.o ../../src/TestLauncher/TestLauncher.c -fPIC -Iinclude -I../wine/include && ". - "'$WithWine/tools/winegcc/winegcc' -B'$WithWine/tools/winebuild' --sysroot=. -m$Bits -o TestLauncher.exe.so TestLauncher.o"); - if ($? != 0) - { - LogMsg "The $Build TestLauncher build failed\n"; - return !1; - } - return 1; } @@ -266,6 +254,7 @@ if ($DataDir =~ /'/) # exit(1) if (!BuildNativeTestAgentd()); +exit(1) if (!BuildTestLauncher()); exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptAddOns and !UpdateAddOns()); exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm)); diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index a3997361..4b9a4b99 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -197,7 +197,7 @@ sub TestExe($$$) } # Run the test executable - RunWine($Mission, "TestLauncher.exe.so", + RunWine($Mission, GetTestLauncher($Mission), "-t 120 ". ShArgv2Cmd($FileName, @$Args) ." >'$DataDir/$BaseName.report'"); diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index d31db820..02253922 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -29,7 +29,7 @@ use Exporter 'import'; our @EXPORT = qw(GetToolName InfoMsg LogMsg Error GitPull ApplyPatch GetCPUCount BuildNativeTestAgentd BuildWindowsTestAgentd - BuildTestLauncher UpdateAddOns + GetTestLauncher BuildTestLauncher UpdateAddOns SetupWineEnvironment RunWine CreateWinePrefix); use Digest::SHA; @@ -219,6 +219,14 @@ sub BuildWindowsTestAgentd() return 1; } +sub GetTestLauncher($) +{ + my ($Mission) = @_; + + my $Bits = ($Mission->{Build} =~ /64/) ? "64" : "32"; + return "$::RootDir/src/TestLauncher/TestLauncher$Bits.exe"; +} + sub BuildTestLauncher() { InfoMsg "\nRebuilding TestLauncher\n"; -- 2.20.1

1 1

[PATCH] testbot/TestAgent: Don't wait for the ssh process if there is none.
by Francois Gouget 08 Sep '19

08 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index e6b0e0f6..ca81283d 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -129,7 +129,7 @@ sub Disconnect($) # This may close the SSH channel ($self->{fd}) as a side-effect, # which will avoid undue delays. $self->{ssh} = undef; - waitpid($self->{sshpid}, 0); + waitpid($self->{sshpid}, 0) if ($self->{sshpid}); $self->{sshpid} = undef; } if ($self->{fd}) -- 2.20.1

1 0

[PATCH] testbot/TestAgent: Remove a redundant $Step declaration in _Connect().
by Francois Gouget 08 Sep '19

08 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index a0a5efee..e6b0e0f6 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -857,7 +857,6 @@ sub _Connect($) my $OldRPC = $self->{rpc}; $self->{rpc} = ($self->{rpc} ? "$self->{rpc}/" : "") ."connect"; - my $Step; my $Start = time(); foreach my $Attempt (1..$self->{cattempts}) { -- 2.20.1

1 0

[PATCH 1/3] advapi32/tests: Change sprintf to PathCombineA to avoid GCC warnings
by Alex Henrie 07 Sep '19

07 Sep '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/advapi32/tests/Makefile.in | 2 +- dlls/advapi32/tests/service.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in index 12583e59f5..83c9c1d91c 100644 --- a/dlls/advapi32/tests/Makefile.in +++ b/dlls/advapi32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = advapi32.dll -IMPORTS = ole32 advapi32 +IMPORTS = ole32 advapi32 shlwapi C_SRCS = \ cred.c \ diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 9dad710490..0059b4ae40 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -29,6 +29,7 @@ #include "winnls.h" #include "lmcons.h" #include "aclapi.h" +#include "shlwapi.h" #include "wine/test.h" @@ -212,9 +213,9 @@ static void test_create_delete_svc(void) GetUserNameA(username, &user_size); /* Get the domainname to cater for that situation */ if (GetEnvironmentVariableA("USERDOMAIN", domain, MAX_PATH)) - sprintf(account, "%s\\%s", domain, username); + PathCombineA(account, domain, username); else - sprintf(account, ".\\%s", username); + PathCombineA(account, ".", username); /* All NULL */ SetLastError(0xdeadbeef); -- 2.23.0

2 3

[PATCH] hidclass.sys: Fix some memory leaks on error path (Coverity).
by Sven Baars 07 Sep '19

07 Sep '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/hidclass.sys/pnp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 5db9c476a2..1c130e8dd8 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -123,6 +123,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Minidriver AddDevice failed (%x)\n",status); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -133,6 +134,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Minidriver failed to get Attributes(%x)\n",status); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -147,6 +149,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Cannot get Device Descriptor(%x)\n",status); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } for (i = 0; i < descriptor.bNumDescriptors; i++) @@ -157,6 +160,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("No Report Descriptor found in reply\n"); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -168,6 +172,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ERR("Cannot get Report Descriptor(%x)\n",status); HID_DeleteDevice(device); HeapFree(GetProcessHeap(), 0, reportDescriptor); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -178,6 +183,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Cannot parse Report Descriptor\n"); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return STATUS_NOT_SUPPORTED; } -- 2.17.1

1 0

[PATCH] wineqtdecoder: Add missing header
by Alistair Leslie-Hughes 07 Sep '19

07 Sep '19

Fixes MacOS build issue. [21:37:16] "_heap_alloc_zero", referenced from: [21:37:16] _QT_AddPin in qtsplitter.o [21:37:16] "_heap_free", referenced from: [21:37:16] _QT_RemoveOutputPins in qtsplitter.o Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wineqtdecoder/qtsplitter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 61ebeab2387..5fe58cd7598 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -118,6 +118,7 @@ #include "winuser.h" #include "dshow.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wine/debug.h" #include "wine/strmbase.h" -- 2.23.0.rc1

1 0

[PATCH] wininet: Support large downloads.
by Daniel Lehman 07 Sep '19

07 Sep '19

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/wininet/http.c | 25 ++++++++++++++----------- dlls/wininet/internet.h | 6 +++--- dlls/wininet/tests/http.c | 20 ++++++++++++++++++++ 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fccbb02f17..ad01420d45 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -52,7 +52,6 @@ #include "winternl.h" #define NO_SHLWAPI_STREAM #define NO_SHLWAPI_REG -#define NO_SHLWAPI_STRFCNS #define NO_SHLWAPI_GDI #include "shlwapi.h" #include "sspi.h" @@ -2442,7 +2441,7 @@ static void create_cache_entry(http_request_t *req) return; } - b = CreateUrlCacheEntryW(url, req->contentLength == ~0u ? 0 : req->contentLength, NULL, file_name, 0); + b = CreateUrlCacheEntryW(url, req->contentLength == ~0 ? 0 : req->contentLength, NULL, file_name, 0); if(!b) { WARN("Could not create cache entry: %08x\n", GetLastError()); return; @@ -2646,7 +2645,7 @@ static DWORD netconn_drain_content(data_stream_t *stream, http_request_t *req, B int len, res; size_t size; - if(netconn_stream->content_length == ~0u) + if(netconn_stream->content_length == ~0) return WSAEISCONN; while(netconn_stream->content_read < netconn_stream->content_length) { @@ -2752,7 +2751,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, TRACE("reading %u byte chunk\n", chunked_stream->chunk_size); chunked_stream->buf_size++; chunked_stream->buf_pos--; - if(req->contentLength == ~0u) req->contentLength = chunked_stream->chunk_size; + if(req->contentLength == ~0) req->contentLength = chunked_stream->chunk_size; else req->contentLength += chunked_stream->chunk_size; chunked_stream->state = CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_SIZE; } @@ -2874,6 +2873,7 @@ static DWORD set_content_length(http_request_t *request) { static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; static const WCHAR headW[] = {'H','E','A','D',0}; + WCHAR contentLength[32]; WCHAR encoding[20]; DWORD size; @@ -2882,10 +2882,13 @@ static DWORD set_content_length(http_request_t *request) return ERROR_SUCCESS; } - size = sizeof(request->contentLength); - if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, - &request->contentLength, &size, NULL) != ERROR_SUCCESS) - request->contentLength = ~0u; + size = sizeof(contentLength); + if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_CONTENT_LENGTH, + contentLength, &size, NULL) != ERROR_SUCCESS || + !StrToInt64ExW(contentLength, STIF_DEFAULT, (LONGLONG*)&request->contentLength)) { + request->contentLength = ~0; + } + request->netconn_stream.content_length = request->contentLength; request->netconn_stream.content_read = request->read_size; @@ -2911,7 +2914,7 @@ static DWORD set_content_length(http_request_t *request) } request->data_stream = &chunked_stream->data_stream; - request->contentLength = ~0u; + request->contentLength = ~0; } if(request->hdr.decoding) { @@ -3301,7 +3304,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->hdr.dwFlags = dwFlags; request->hdr.dwContext = dwContext; request->hdr.decoding = session->hdr.decoding; - request->contentLength = ~0u; + request->contentLength = ~0; request->netconn_stream.data_stream.vtbl = &netconn_stream_vtbl; request->data_stream = &request->netconn_stream.data_stream; @@ -4925,7 +4928,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, loop_next = FALSE; if(redirected) { - request->contentLength = ~0u; + request->contentLength = ~0; request->bytesToWrite = 0; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index f712fb6b64..40e51bec32 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -335,8 +335,8 @@ typedef struct { typedef struct { data_stream_t data_stream; - DWORD content_length; - DWORD content_read; + ULONGLONG content_length; + ULONGLONG content_read; } netconn_stream_t; #define READ_BUFFER_SIZE 8192 @@ -372,7 +372,7 @@ typedef struct struct HttpAuthInfo *proxyAuthInfo; CRITICAL_SECTION read_section; /* section to protect the following fields */ - DWORD contentLength; /* total number of bytes to be read */ + ULONGLONG contentLength; /* total number of bytes to be read */ BOOL read_gzip; /* are we reading in gzip mode? */ DWORD read_pos; /* current read position in read_buf */ DWORD read_size; /* valid data size in read_buf */ diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fcbd95b837..a4521a94a4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5545,7 +5545,9 @@ static void test_large_content(int port) }; test_request_t req; DWORD sizelen, len; + DWORD read_size; DWORD64 len64; + char buf[16]; BOOL ret; size_t i; @@ -5594,6 +5596,24 @@ static void test_large_content(int port) ok(len64 == ~0, "len64 %x%08x\n", (DWORD)(len64 >> 32), (DWORD)len64); close_request(&req); + + /* test internal use of HttpQueryInfo on large size */ + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Content-Length: 4294967296\r\n" + "\r\n" + "xx"); + read_expect_async(req.request, buf, 4, &read_size, "xx"); + send_response_and_wait("yy1234567890", FALSE, buf, &read_size, "xxyy", 4, 0, 2); + read_expect_sync_data(req.request, buf, 10, "1234567890"); + + SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); + SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); + close_async_handle(req.session, 2); + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + close_connection(); } static void test_http_connection(void) -- 2.17.1

2 1

[PATCH] ntdll/tests: Adjust timing on RtlWaitOnAddress tests.
by Daniel Lehman 07 Sep '19

07 Sep '19

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- my win10 laptop gets between 94 and 96. looks like it also randomly happens on official tests: http://test.winehq.org/data/765815729fc4af2472e60551364e3b29dccfbcff/win8_c… http://test.winehq.org/data/765815729fc4af2472e60551364e3b29dccfbcff/win8_c… --- dlls/ntdll/tests/om.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index b232138387..5abfcb0f11 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2115,7 +2115,7 @@ static void test_wait_on_address(void) status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); ticks = GetTickCount() - ticks; ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 100 && ticks <= 1000, "got %u\n", ticks); + ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks); ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); @@ -2130,7 +2130,7 @@ static void test_wait_on_address(void) status = pRtlWaitOnAddress(&address, &compare, size, &timeout); ticks = GetTickCount() - ticks; ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 100 && ticks <= 1000, "got %u\n", ticks); + ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks); status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); ok(!status, "got 0x%08x\n", status); -- 2.17.1

1 0

[PATCH] winex11.drv: Fix a memory leak (Coverity).
by Sven Baars 06 Sep '19

06 Sep '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/winex11.drv/clipboard.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index a37530fdbf..c51954f1bf 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1849,13 +1849,12 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_size != size || memcmp( last_data, data, size )); - if (!changed) + if (!changed || !OpenClipboard( clipboard_hwnd )) { HeapFree( GetProcessHeap(), 0, data ); return FALSE; } - if (!OpenClipboard( clipboard_hwnd )) return FALSE; TRACE( "selection changed, importing\n" ); EmptyClipboard(); is_clipboard_owner = TRUE; -- 2.17.1

1 0

[PATCH] services: Use threadpool timers for services delay loading.
by Jacek Caban 06 Sep '19

06 Sep '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47675 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/services/services.c | 39 +++++++++++++++++------------------- 1 file changed, 18 insertions(+), 21 deletions(-)

1 0

[PATCH] quartz/tests: Fix a memory leak (Valgrind).
by Sven Baars 06 Sep '19

06 Sep '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/quartz/tests/filesource.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 18a9bf1499..37f8dd97cd 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -460,6 +460,7 @@ static void test_file_source_filter(void) hr = IPin_QueryAccept(pin, pmt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); + CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); ok(hr == S_FALSE, "Got hr %#x.\n", hr); -- 2.17.1

1 1

[PATCH] d3d10: Avoid casts from COM object to interface
by Michael Stefaniuc 06 Sep '19

06 Sep '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d10/effect.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2390eeeb8d..439833485d 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2716,14 +2716,14 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon if (index >= This->local_buffer_count) { WARN("Invalid index specified\n"); - return (ID3D10EffectConstantBuffer *)&null_local_buffer; + return (ID3D10EffectConstantBuffer *)&null_local_buffer.ID3D10EffectVariable_iface; } l = &This->local_buffers[index]; TRACE("Returning buffer %p, %s.\n", l, debugstr_a(l->name)); - return (ID3D10EffectConstantBuffer *)l; + return (ID3D10EffectConstantBuffer *)&l->ID3D10EffectVariable_iface; } static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetConstantBufferByName(ID3D10Effect *iface, @@ -2741,13 +2741,13 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon if (l->name && !strcmp(l->name, name)) { TRACE("Returning buffer %p.\n", l); - return (ID3D10EffectConstantBuffer *)l; + return (ID3D10EffectConstantBuffer *)&l->ID3D10EffectVariable_iface; } } WARN("Invalid name specified\n"); - return (ID3D10EffectConstantBuffer *)&null_local_buffer; + return (ID3D10EffectConstantBuffer *)&null_local_buffer.ID3D10EffectVariable_iface; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByIndex(ID3D10Effect *iface, UINT index) @@ -3529,7 +3529,7 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_variab TRACE("iface %p\n", iface); - return (ID3D10EffectConstantBuffer *)This->buffer; + return (ID3D10EffectConstantBuffer *)&This->buffer->ID3D10EffectVariable_iface; } static struct ID3D10EffectScalarVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsScalar( -- 2.20.1

2 1

[PATCH 1/2] vbscript/parser: Handle lack of newlines before certain End statements.
by Gabriel Ivăncescu 06 Sep '19

06 Sep '19

In the Windows vbscript parser, some End statements don't require a newline preceeding them. The game Ymir actually depends on this. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/parser.y | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 11a8f9d..d4f5eb3 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -122,7 +122,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %token <integer> tInt %token <dbl> tDouble -%type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt +%type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt BodyStatements IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression @@ -155,6 +155,11 @@ SourceElements | SourceElements StatementNl { source_add_statement(ctx, $2); } | SourceElements ClassDeclaration { source_add_class(ctx, $2); } +BodyStatements + : /* empty */ { $$ = NULL; } + | Statement { $$ = $1; } + | StatementNl BodyStatements { $$ = link_statements($1, $2); } + StatementsNl_opt : /* empty */ { $$ = NULL; } | StatementsNl { $$ = $1; } @@ -399,25 +404,30 @@ ClassDeclaration ClassBody : /* empty */ { $$ = new_class_decl(ctx); } + | FunctionDecl { $$ = add_class_function(ctx, new_class_decl(ctx), $1); CHECK_ERROR; } | FunctionDecl StSep ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } /* FIXME: We should use DimDecl here to support arrays, but that conflicts with PropertyDecl. */ + | Storage tIdentifier { dim_decl_t *dim_decl = new_dim_decl(ctx, $2, FALSE, NULL); CHECK_ERROR; + $$ = add_dim_prop(ctx, new_class_decl(ctx), dim_decl, $1); CHECK_ERROR; } | Storage tIdentifier StSep ClassBody { dim_decl_t *dim_decl = new_dim_decl(ctx, $2, FALSE, NULL); CHECK_ERROR; $$ = add_dim_prop(ctx, $4, dim_decl, $1); CHECK_ERROR; } + | tDIM DimDecl { $$ = add_dim_prop(ctx, new_class_decl(ctx), $2, 0); CHECK_ERROR; } | tDIM DimDecl StSep ClassBody { $$ = add_dim_prop(ctx, $4, $2, 0); CHECK_ERROR; } + | PropertyDecl { $$ = add_class_function(ctx, new_class_decl(ctx), $1); CHECK_ERROR; } | PropertyDecl StSep ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } PropertyDecl - : Storage_opt tPROPERTY tGET tIdentifier ArgumentsDecl_opt StSep StatementsNl_opt tEND tPROPERTY + : Storage_opt tPROPERTY tGET tIdentifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET tIdentifier '(' ArgumentDecl ')' StSep StatementsNl_opt tEND tPROPERTY + | Storage_opt tPROPERTY tLET tIdentifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } - | Storage_opt tPROPERTY tSET tIdentifier '(' ArgumentDecl ')' StSep StatementsNl_opt tEND tPROPERTY + | Storage_opt tPROPERTY tSET tIdentifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl - : Storage_opt tSUB Identifier ArgumentsDecl_opt StSep StatementsNl_opt tEND tSUB + : Storage_opt tSUB Identifier ArgumentsDecl_opt StSep BodyStatements tEND tSUB { $$ = new_function_decl(ctx, $3, FUNC_SUB, $1, $4, $6); CHECK_ERROR; } - | Storage_opt tFUNCTION Identifier ArgumentsDecl_opt StSep StatementsNl_opt tEND tFUNCTION + | Storage_opt tFUNCTION Identifier ArgumentsDecl_opt StSep BodyStatements tEND tFUNCTION { $$ = new_function_decl(ctx, $3, FUNC_FUNCTION, $1, $4, $6); CHECK_ERROR; } Storage_opt -- 2.21.0

2 4

[PATCH] http.sys: Use the SOCKET type for Windows sockets.
by Zebediah Figura 06 Sep '19

06 Sep '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/http.sys/http.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index b2400a26b7c..fd30e43dfc7 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -209,7 +209,7 @@ struct connection { struct list entry; /* in "connections" below */ - int socket; + SOCKET socket; char *buffer; unsigned int len, size; @@ -246,18 +246,18 @@ struct request_queue LIST_ENTRY irp_queue; HTTP_URL_CONTEXT context; char *url; - int socket; + SOCKET socket; }; static struct list request_queues = LIST_INIT(request_queues); -static void accept_connection(int socket) +static void accept_connection(SOCKET socket) { struct connection *conn; ULONG true = 1; - int peer; + SOCKET peer; - if ((peer = accept(socket, NULL, NULL)) == -1) + if ((peer = accept(socket, NULL, NULL)) == INVALID_SOCKET) return; if (!(conn = heap_alloc_zero(sizeof(*conn)))) @@ -1046,10 +1046,11 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) const struct http_add_url_params *params = irp->AssociatedIrp.SystemBuffer; struct sockaddr_in addr; struct connection *conn; + unsigned int count = 0; char *url, *endptr; - int s, count = 0; ULONG true = 1; const char *p; + SOCKET s; TRACE("host %s, context %s.\n", debugstr_a(params->url), wine_dbgstr_longlong(params->context)); @@ -1089,7 +1090,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) return STATUS_NOT_IMPLEMENTED; } - if ((s = socket(AF_INET, SOCK_STREAM, 0)) == -1) + if ((s = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) { ERR("Failed to create socket, error %u.\n", WSAGetLastError()); LeaveCriticalSection(&http_cs); -- 2.22.0

1 0

[PATCH v2] mfmediaengine: Merge media_engine_attributes into media_engine struct.
by Jactry Zeng 06 Sep '19

06 Sep '19

Superseded patch 169479. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 91 ++++++++---------- dlls/mfmediaengine/tests/mfmediaengine.c | 117 ++++++++--------------- 2 files changed, 83 insertions(+), 125 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 9e33b973d4..050743e7e3 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -48,27 +48,22 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) enum media_engine_mode { - MEDIA_ENGINE_INVIAL, + MEDIA_ENGINE_INVALID, MEDIA_ENGINE_AUDIO_MODE, MEDIA_ENGINE_RENDERING_MODE, MEDIA_ENGINE_FRAME_SERVER_MODE, }; -struct media_engine_attributes -{ - IMFMediaEngineNotify *callback; - HWND playback_hwnd; - DXGI_FORMAT output_format; - IMFDXGIDeviceManager *dxgi_manager; - enum media_engine_mode mode; -}; - struct media_engine { IMFMediaEngine IMFMediaEngine_iface; LONG refcount; DWORD flags; - struct media_engine_attributes attributes; + IMFMediaEngineNotify *callback; + UINT64 playback_hwnd; + DXGI_FORMAT output_format; + IMFDXGIDeviceManager *dxgi_manager; + enum media_engine_mode mode; }; static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *iface) @@ -103,12 +98,13 @@ static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface) return refcount; } -static void free_media_engine_attributes(struct media_engine_attributes engine_attr) +static void free_media_engine(struct media_engine *engine) { - if (engine_attr.callback) - IMFMediaEngineNotify_Release(engine_attr.callback); - if (engine_attr.dxgi_manager) - IMFDXGIDeviceManager_Release(engine_attr.dxgi_manager); + if (engine->callback) + IMFMediaEngineNotify_Release(engine->callback); + if (engine->dxgi_manager) + IMFDXGIDeviceManager_Release(engine->dxgi_manager); + heap_free(engine); } static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) @@ -119,10 +115,7 @@ static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) TRACE("(%p) ref=%u.\n", iface, refcount); if (!refcount) - { - free_media_engine_attributes(engine->attributes); - HeapFree(GetProcessHeap(), 0, engine); - } + free_media_engine(engine); return refcount; } @@ -222,7 +215,7 @@ static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return 0; + return 0.0; } static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngine *iface, double time) @@ -236,28 +229,28 @@ static double WINAPI media_engine_GetStartTime(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return 0; + return 0.0; } static double WINAPI media_engine_GetDuration(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return 0; + return 0.0; } static BOOL WINAPI media_engine_IsPaused(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return 0; + return FALSE; } static double WINAPI media_engine_GetDefaultPlaybackRate(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return 0; + return 0.0; } static HRESULT WINAPI media_engine_SetDefaultPlaybackRate(IMFMediaEngine *iface, double rate) @@ -271,7 +264,7 @@ static double WINAPI media_engine_GetPlaybackRate(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return 0; + return 0.0; } static HRESULT WINAPI media_engine_SetPlaybackRate(IMFMediaEngine *iface, double rate) @@ -299,14 +292,14 @@ static BOOL WINAPI media_engine_IsEnded(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return E_NOTIMPL; + return FALSE; } static HRESULT WINAPI media_engine_SetAutoPlay(IMFMediaEngine *iface, BOOL autoplay) @@ -362,7 +355,7 @@ static double WINAPI media_engine_GetVolume(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return 0; + return 0.0; } static HRESULT WINAPI media_engine_SetVolume(IMFMediaEngine *iface, double volume) @@ -497,57 +490,57 @@ static ULONG WINAPI media_engine_factory_Release(IMFMediaEngineClassFactory *ifa return 1; } -static void init_media_engine_attributes(IMFAttributes *attributes, struct media_engine_attributes *engine_attr) +static HRESULT init_media_engine(IMFAttributes *attributes, struct media_engine *engine) { HRESULT hr; - memset(engine_attr, 0, sizeof(*engine_attr)); hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, - (void **)&engine_attr->callback); + (void **)&engine->callback); if (FAILED(hr)) - return; + return MF_E_ATTRIBUTENOTFOUND; - IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, (UINT64 *)&engine_attr->playback_hwnd); + IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, &engine->playback_hwnd); IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_DXGI_MANAGER, &IID_IMFDXGIDeviceManager, - (void **)&engine_attr->dxgi_manager); - hr = IMFAttributes_GetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, &engine_attr->output_format); - if (engine_attr->playback_hwnd) /* FIXME: handle MF_MEDIA_ENGINE_PLAYBACK_VISUAL */ - engine_attr->mode = MEDIA_ENGINE_RENDERING_MODE; + (void **)&engine->dxgi_manager); + hr = IMFAttributes_GetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, &engine->output_format); + if (engine->playback_hwnd) /* FIXME: handle MF_MEDIA_ENGINE_PLAYBACK_VISUAL */ + engine->mode = MEDIA_ENGINE_RENDERING_MODE; else { if (SUCCEEDED(hr)) - engine_attr->mode = MEDIA_ENGINE_FRAME_SERVER_MODE; + engine->mode = MEDIA_ENGINE_FRAME_SERVER_MODE; else - engine_attr->mode = MEDIA_ENGINE_AUDIO_MODE; + engine->mode = MEDIA_ENGINE_AUDIO_MODE; } + + return S_OK; } static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFactory *iface, DWORD flags, IMFAttributes *attributes, IMFMediaEngine **engine) { - struct media_engine_attributes engine_attr; struct media_engine *object; + HRESULT hr; - FIXME("(%p, %#x, %p, %p): semi-stub.\n", iface, flags, attributes, engine); + TRACE("(%p, %#x, %p, %p).\n", iface, flags, attributes, engine); if (!attributes || !engine) return E_POINTER; - init_media_engine_attributes(attributes, &engine_attr); - if (!engine_attr.mode) - return MF_E_ATTRIBUTENOTFOUND; - object = heap_alloc_zero(sizeof(*object)); if (!object) - { - free_media_engine_attributes(engine_attr); return E_OUTOFMEMORY; + + hr = init_media_engine(attributes, object); + if (FAILED(hr)) + { + free_media_engine(object); + return hr; } object->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; object->refcount = 1; object->flags = flags; - object->attributes = engine_attr; *engine = &object->IMFMediaEngine_iface; diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index a264d0d033..2bbc79fb6c 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -105,7 +105,13 @@ static IMFMediaEngineNotifyVtbl media_engine_notify_vtbl = static void test_factory(void) { + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *notify = &notify_impl.IMFMediaEngineNotify_iface; IMFMediaEngineClassFactory *factory, *factory2; + IMFDXGIDeviceManager *manager; + IMFMediaEngine *media_engine; + IMFAttributes *attributes; + UINT token; HRESULT hr; CoInitialize(NULL); @@ -120,84 +126,43 @@ static void test_factory(void) ok(hr == CLASS_E_NOAGGREGATION || broken(hr == REGDB_E_CLASSNOTREG) /* pre-win8 */, "Unexpected hr %#x.\n", hr); - if (factory) + if (!factory) { - struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; - IMFMediaEngineNotify *notify = &notify_impl.IMFMediaEngineNotify_iface; - IMFMediaEngine *media_engine, *media_engine2; - IMFDXGIDeviceManager *manager; - IMFAttributes *attributes; - UINT token; - - hr = pMFCreateDXGIDeviceManager(&token, &manager); - ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); - hr = MFCreateAttributes(&attributes, 3); - ok(hr == S_OK, "MFCreateAttributes failed: %#x.\n", hr); - - if (0) - { - /* Crashed on Windows 8 */ - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - NULL, &media_engine); - ok(hr == E_POINTER, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); - - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - NULL, NULL); - ok(hr == E_POINTER, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); - } - - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); - - hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_OPM_HWND, NULL); - ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); - - hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)notify); - ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine); - ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* pre win10v1809 */, - "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); - if (SUCCEEDED(hr)) - IMFMediaEngine_Release(media_engine); - - EXPECT_REF(factory, 1); - hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); - ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: %#x.\n", hr); - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine); - ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); - if (0) - { - /* Different version of Windows has different reference count behaviour, and I didn't - see their logics. So skipping these tests on Windows. */ - EXPECT_REF(media_engine, 1); - EXPECT_REF(factory, 1); - } - - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine2); - ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); - if (0) - { - EXPECT_REF(media_engine, 1); - EXPECT_REF(media_engine2, 1); - EXPECT_REF(factory, 1); - } - - IMFMediaEngine_Release(media_engine); - IMFMediaEngine_Release(media_engine2); - IMFAttributes_DeleteAllItems(attributes); - IMFAttributes_Release(attributes); - IMFDXGIDeviceManager_Release(manager); - IMFMediaEngineClassFactory_Release(factory); - } - else win_skip("Not IMFMediaEngineClassFactory support.\n"); + CoUninitialize(); + return; + } + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + hr = MFCreateAttributes(&attributes, 3); + ok(hr == S_OK, "MFCreateAttributes failed: %#x.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_OPM_HWND, NULL); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + IMFAttributes_DeleteAllItems(attributes); + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)notify); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); + ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: %#x.\n", hr); + EXPECT_REF(factory, 1); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); + EXPECT_REF(factory, 1); + + IMFMediaEngine_Release(media_engine); + IMFAttributes_Release(attributes); + IMFDXGIDeviceManager_Release(manager); + IMFMediaEngineClassFactory_Release(factory); CoUninitialize(); } -- 2.23.0.rc1

2 1

[PATCH v4 3/3] localspl: Unload monitor in DeleteMonitor.
by Dmitry Timoshkov 06 Sep '19

06 Sep '19

Some print monitors are very sensitive to loads/unloads being done in a quick succession like AddMonitor() does, and that even leads to crashes because the monitor I have here creates a thread on load and when the thread starts - the monitor dll is already unloaded. A solution to this is moving the monitor unloading to DeleteMonitor. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 54bd959673..def3215824 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1560,10 +1560,7 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) res = FALSE; } else - { - monitor_unload(pm); SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ - } } RegCloseKey(hentry); @@ -1857,6 +1854,7 @@ static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) { + monitor_t *pm; HKEY hroot = NULL; LONG lres; @@ -1877,6 +1875,18 @@ static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMo return FALSE; } + /* Unload the monitor if it's loaded */ + EnterCriticalSection(&monitor_handles_cs); + LIST_FOR_EACH_ENTRY(pm, &monitor_handles, monitor_t, entry) + { + if (pm->name && !lstrcmpW(pMonitorName, pm->name)) + { + monitor_unload(pm); + break; + } + } + LeaveCriticalSection(&monitor_handles_cs); + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { ERR("unable to create key %s\n", debugstr_w(monitorsW)); return FALSE; -- 2.20.1

2 1

[PATCH v4 2/3] localspl: Add support for monitors providing the MONITOR2 interface.
by Dmitry Timoshkov 06 Sep '19

06 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 137 +++++++++++++++++++++++---------------- 1 file changed, 82 insertions(+), 55 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 29c54332b4..54bd959673 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -65,10 +65,10 @@ typedef struct { LPWSTR name; LPWSTR dllname; PMONITORUI monitorUI; - LPMONITOR monitor; + MONITOR2 monitor; + BOOL (WINAPI *old_XcvOpenPort)(LPCWSTR,ACCESS_MASK,PHANDLE); HMODULE hdll; DWORD refcount; - DWORD dwMonitorSize; } monitor_t; typedef struct { @@ -327,6 +327,10 @@ static void monitor_unload(monitor_t * pm) if (pm->refcount == 0) { list_remove(&pm->entry); + + if (pm->monitor.pfnShutdown) + pm->monitor.pfnShutdown(0); + FreeLibrary(pm->hdll); heap_free(pm->name); heap_free(pm->dllname); @@ -352,7 +356,7 @@ static void monitor_unloadall(void) LIST_FOR_EACH_ENTRY_SAFE(pm, next, &monitor_handles, monitor_t, entry) { /* skip monitorui dlls */ - if (pm->monitor) monitor_unload(pm); + if (pm->monitor.cbSize) monitor_unload(pm); } LeaveCriticalSection(&monitor_handles_cs); } @@ -378,6 +382,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) monitor_t * cursor; LPWSTR regroot = NULL; LPWSTR driver = dllname; + HKEY hroot = 0; TRACE("(%s, %s)\n", debugstr_w(name), debugstr_w(dllname)); /* Is the Monitor already loaded? */ @@ -402,7 +407,6 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (pm->name == NULL) { /* Load the monitor */ - LPMONITOREX pmonitorEx; DWORD len; if (name) { @@ -413,19 +417,19 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (regroot) { lstrcpyW(regroot, monitorsW); lstrcatW(regroot, name); - /* Get the Driver from the Registry */ - if (driver == NULL) { - HKEY hroot; - DWORD namesize; - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, regroot, &hroot) == ERROR_SUCCESS) { + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, regroot, &hroot) == ERROR_SUCCESS) { + /* Get the Driver from the Registry */ + if (driver == NULL) { + DWORD namesize; if (RegQueryValueExW(hroot, driverW, NULL, NULL, NULL, &namesize) == ERROR_SUCCESS) { driver = heap_alloc(namesize); RegQueryValueExW(hroot, driverW, NULL, NULL, (LPBYTE) driver, &namesize) ; } - RegCloseKey(hroot); } } + else + WARN("%s not found\n", debugstr_w(regroot)); } pm->name = strdupW(name); @@ -471,26 +475,38 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) } } - if (pInitializePrintMonitor && regroot) { + if (pInitializePrintMonitor2 && hroot) { + MONITORINIT init; + MONITOR2 *monitor2; + HANDLE hmon; + + memset(&init, 0, sizeof(init)); + init.cbSize = sizeof(init); + init.hckRegistryRoot = hroot; + init.bLocal = TRUE; + + monitor2 = pInitializePrintMonitor2(&init, &hmon); + TRACE("%p: MONITOR2 from %s,InitializePrintMonitor2(%s)\n", + monitor2, debugstr_w(driver), debugstr_w(regroot)); + if (monitor2) + memcpy(&pm->monitor, monitor2, min(monitor2->cbSize, sizeof(pm->monitor))); + } + else if (pInitializePrintMonitor && regroot) { + MONITOREX *pmonitorEx; + pmonitorEx = pInitializePrintMonitor(regroot); TRACE("%p: LPMONITOREX from %s,InitializePrintMonitor(%s)\n", pmonitorEx, debugstr_w(driver), debugstr_w(regroot)); - - if (pmonitorEx) { - pm->dwMonitorSize = pmonitorEx->dwMonitorSize; - pm->monitor = &(pmonitorEx->Monitor); + if (pmonitorEx) + { + /* Layout of MONITOREX and MONITOR2 mostly matches */ + memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize + sizeof(DWORD), sizeof(pm->monitor))); + pm->old_XcvOpenPort = pmonitorEx->Monitor.pfnXcvOpenPort; + pm->monitor.pfnXcvOpenPort = NULL; } } - if (pm->monitor) { - TRACE("0x%08x: dwMonitorSize (%d)\n", pm->dwMonitorSize, pm->dwMonitorSize); - - } - - if (!pm->monitor && regroot) { - if (pInitializePrintMonitor2 != NULL) { - FIXME("%s,InitializePrintMonitor2 not implemented\n", debugstr_w(driver)); - } + if (!pm->monitor.cbSize && regroot) { if (pInitializeMonitorEx != NULL) { FIXME("%s,InitializeMonitorEx not implemented\n", debugstr_w(driver)); } @@ -498,7 +514,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) FIXME("%s,InitializeMonitor not implemented\n", debugstr_w(driver)); } } - if (!pm->monitor && !pm->monitorUI) { + if (!pm->monitor.cbSize && !pm->monitorUI) { monitor_unload(pm); SetLastError(ERROR_PROC_NOT_FOUND); pm = NULL; @@ -511,6 +527,7 @@ cleanup: } LeaveCriticalSection(&monitor_handles_cs); if (driver != dllname) heap_free(driver); + if (hroot) RegCloseKey(hroot); heap_free(regroot); TRACE("=> %p\n", pm); return pm; @@ -563,7 +580,7 @@ static monitor_t * monitor_loadui(monitor_t * pm) WCHAR buffer[MAX_PATH]; HANDLE hXcv; DWORD len; - DWORD res; + DWORD res = 0; if (pm == NULL) return NULL; TRACE("(%p) => dllname: %s\n", pm, debugstr_w(pm->dllname)); @@ -577,16 +594,17 @@ static monitor_t * monitor_loadui(monitor_t * pm) } /* query the userinterface-dllname from the Portmonitor */ - if ((pm->monitor) && (pm->monitor->pfnXcvDataPort)) { - /* building (",XcvMonitor %s",pm->name) not needed yet */ - res = pm->monitor->pfnXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); - TRACE("got %u with %p\n", res, hXcv); - if (res) { - res = pm->monitor->pfnXcvDataPort(hXcv, monitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); - TRACE("got %u with %s\n", res, debugstr_w(buffer)); - if (res == ERROR_SUCCESS) pui = monitor_load(NULL, buffer); - pm->monitor->pfnXcvClosePort(hXcv); - } + /* building (",XcvMonitor %s",pm->name) not needed yet */ + if (pm->monitor.pfnXcvOpenPort) + res = pm->monitor.pfnXcvOpenPort(0, emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + else if (pm->old_XcvOpenPort) + res = pm->old_XcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + TRACE("got %u with %p\n", res, hXcv); + if (res) { + res = pm->monitor.pfnXcvDataPort(hXcv, monitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); + TRACE("got %u with %s\n", res, debugstr_w(buffer)); + if (res == ERROR_SUCCESS) pui = monitor_load(NULL, buffer); + pm->monitor.pfnXcvClosePort(hXcv); } return pui; } @@ -921,7 +939,6 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf DWORD numentries; DWORD entrysize; - TRACE("(%d, %p, %d, %p)\n", level, pPorts, cbBuf, lpreturned); entrysize = (level == 1) ? sizeof(PORT_INFO_1W) : sizeof(PORT_INFO_2W); @@ -934,16 +951,16 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf LIST_FOR_EACH_ENTRY(pm, &monitor_handles, monitor_t, entry) { - if ((pm->monitor) && (pm->monitor->pfnEnumPorts)) { + if (pm->monitor.pfnEnumPorts) { pi_needed = 0; pi_returned = 0; - res = pm->monitor->pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); + res = pm->monitor.pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { /* Do not use heap_realloc (we do not need the old data in the buffer) */ heap_free(pi_buffer); pi_buffer = heap_alloc(pi_needed); pi_allocated = (pi_buffer) ? pi_needed : 0; - res = pm->monitor->pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); + res = pm->monitor.pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); } TRACE("(%s) got %d with %d (need %d byte for %d entries)\n", debugstr_w(pm->name), res, GetLastError(), pi_needed, pi_returned); @@ -1144,7 +1161,10 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname) static VOID printer_free(printer_t * printer) { if (printer->hXcv) - printer->pm->monitor->pfnXcvClosePort(printer->hXcv); + { + if (printer->pm->monitor.pfnXcvClosePort) + printer->pm->monitor.pfnXcvClosePort(printer->hXcv); + } monitor_unload(printer->pm); @@ -1224,11 +1244,14 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) } if (printer->pm) { - if ((printer->pm->monitor) && (printer->pm->monitor->pfnXcvOpenPort)) { - printer->pm->monitor->pfnXcvOpenPort(&printername[len], - pDefault ? pDefault->DesiredAccess : 0, - &printer->hXcv); - } + if (printer->pm->monitor.pfnXcvOpenPort) + printer->pm->monitor.pfnXcvOpenPort(0, &printername[len], + pDefault ? pDefault->DesiredAccess : 0, + &printer->hXcv); + else if (printer->pm->old_XcvOpenPort) + printer->pm->old_XcvOpenPort(&printername[len], + pDefault ? pDefault->DesiredAccess : 0, + &printer->hXcv); if (printer->hXcv == NULL) { printer_free(printer); SetLastError(ERROR_INVALID_PARAMETER); @@ -1588,8 +1611,8 @@ static BOOL WINAPI fpAddPort(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) } pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor && pm->monitor->pfnAddPort) { - res = pm->monitor->pfnAddPort(pName, hWnd, pMonitorName); + if (pm && pm->monitor.pfnAddPort) { + res = pm->monitor.pfnAddPort(pName, hWnd, pMonitorName); TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); } else @@ -1665,8 +1688,9 @@ static BOOL WINAPI fpAddPortEx(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR /* load the Monitor */ pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor && pm->monitor->pfnAddPortEx) { - res = pm->monitor->pfnAddPortEx(pName, level, pBuffer, pMonitorName); + if (pm && pm->monitor.pfnAddPortEx) + { + res = pm->monitor.pfnAddPortEx(pName, level, pBuffer, pMonitorName); TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); } else @@ -1779,10 +1803,11 @@ static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) } pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor && pm->monitor->pfnConfigurePort) { + if (pm && pm->monitor.pfnConfigurePort) + { TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); - res = pm->monitor->pfnConfigurePort(pName, hWnd, pPortName); + res = pm->monitor.pfnConfigurePort(pName, hWnd, pPortName); TRACE("got %d with %u\n", res, GetLastError()); } else @@ -1909,10 +1934,11 @@ static BOOL WINAPI fpDeletePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) } pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor && pm->monitor->pfnDeletePort) { + if (pm && pm->monitor.pfnDeletePort) + { TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); - res = pm->monitor->pfnDeletePort(pName, hWnd, pPortName); + res = pm->monitor.pfnDeletePort(pName, hWnd, pPortName); TRACE("got %d with %u\n", res, GetLastError()); } else @@ -2339,7 +2365,8 @@ static BOOL WINAPI fpXcvData(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, *pcbOutputNeeded = 0; - *pdwStatus = printer->pm->monitor->pfnXcvDataPort(printer->hXcv, pszDataName, + if (printer->pm->monitor.pfnXcvDataPort) + *pdwStatus = printer->pm->monitor.pfnXcvDataPort(printer->hXcv, pszDataName, pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); return TRUE; -- 2.20.1

2 1

[PATCH v4 1/3] localspl: AddMonitor should create registry entry for a monitor before initializing it.
by Dmitry Timoshkov 06 Sep '19

06 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index ccd19811cf..29c54332b4 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1499,14 +1499,6 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) return FALSE; } - /* Load and initialize the monitor. SetLastError() is called on failure */ - if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) { - return FALSE; - } - monitor_unload(pm); - - SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ - if (RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { ERR("unable to create key %s\n", debugstr_w(monitorsW)); return FALSE; @@ -1537,7 +1529,20 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) len = (lstrlenW(mi2w->pDLLName) +1) * sizeof(WCHAR); res = (RegSetValueExW(hentry, driverW, 0, REG_SZ, (LPBYTE) mi2w->pDLLName, len) == ERROR_SUCCESS); + + /* Load and initialize the monitor. SetLastError() is called on failure */ + if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) + { + RegDeleteKeyW(hroot, mi2w->pName); + res = FALSE; + } + else + { + monitor_unload(pm); + SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ + } } + RegCloseKey(hentry); } -- 2.20.1

2 1

[PATCH] http.sys: Initialize address structure before use. (Coverity)
by Alistair Leslie-Hughes 06 Sep '19

06 Sep '19

CID 1453504 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/http.sys/http.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index b5d5a219dc..6f56cc6555 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1097,6 +1097,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) return STATUS_UNSUCCESSFUL; } + memset( &addr, 0, sizeof(addr) ); addr.sin_family = AF_INET; addr.sin_addr.S_un.S_addr = INADDR_ANY; if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) -- 2.17.1

2 1

[PATCH] http.sys: Allocate enough memory including the NULL. (Coverity)
by Alistair Leslie-Hughes 06 Sep '19

06 Sep '19

CID 1453492 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/http.sys/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index b2400a26b7..b5d5a219dc 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1064,7 +1064,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) if (!(addr.sin_port = htons(strtol(strchr(params->url + 7, ':') + 1, &endptr, 10))) || *endptr != '/') return STATUS_INVALID_PARAMETER; - if (!(url = heap_alloc(strlen(params->url)))) + if (!(url = heap_alloc(strlen(params->url)+1))) return STATUS_NO_MEMORY; strcpy(url, params->url); -- 2.17.1

1 0

[PATCH] httpapi/tests: Assign to correct type (Coverity)
by Alistair Leslie-Hughes 06 Sep '19

06 Sep '19

CID 1453495 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/httpapi/tests/httpapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index ff5884d72a..5da7101417 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -74,7 +74,7 @@ static const char simple_req[] = "User-Agent: WINE\r\n" "\r\n"; -static int create_client_socket(void) +static SOCKET create_client_socket(void) { struct sockaddr_in sockaddr = { @@ -82,7 +82,7 @@ static int create_client_socket(void) .sin_port = htons(50000), .sin_addr.S_un.S_addr = inet_addr("127.0.0.1"), }; - int s = socket(AF_INET, SOCK_STREAM, 0), ret; + SOCKET s = socket(AF_INET, SOCK_STREAM, 0), ret; ret = connect(s, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); ok(!ret, "Failed to connect socket, error %u.\n", GetLastError()); return s; -- 2.17.1

1 0

[PATCH] kernelbase: Check for NULL buffer in PeekNamedPipe().
by Andrey Gusev 06 Sep '19

06 Sep '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/kernelbase/sync.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 31df6c7be8..bc35ff7c2a 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -1224,6 +1224,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekNamedPipe( HANDLE pipe, LPVOID out_buffer, DWO IO_STATUS_BLOCK io; NTSTATUS status; + if (!buffer) return FALSE; + if (size && !(buffer = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data[size] )))) { -- 2.21.0

2 1

[PATCH 1/5] wineqtdecoder: Use strmbase_source_init().
by Zebediah Figura 06 Sep '19

06 Sep '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Not compile-tested. dlls/wineqtdecoder/qtsplitter.c | 48 +++++++++++++-------------------- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index e7597e16ca8..3931452e525 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -790,10 +790,8 @@ static void free_source_pin(QTOutPin *pin) LeaveCriticalSection(pin->pin.pin.pCritSec); DeleteMediaType(pin->pmt); - FreeMediaType(&pin->pin.pin.mtCurrent); - if (pin->pin.pAllocator) - IMemAllocator_Release(pin->pin.pAllocator); - CoTaskMemFree(pin); + strmbase_source_cleanup(&pin->pin); + heap_free(pin); } /* @@ -1446,38 +1444,28 @@ static const OutputQueueFuncTable output_OutputQueueFuncTable = { OutputQueueImpl_ThreadProc }; -static HRESULT QT_AddPin(QTSplitter *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt, BOOL video) +static HRESULT QT_AddPin(QTSplitter *filter, const PIN_INFO *pin_info, + const AM_MEDIA_TYPE *mt, BOOL video) { - HRESULT hr; - IPin **target; + QTOutPin *pin; + + if (!(pin = heap_alloc_zero(sizeof(*pin)))) + return E_OUTOFMEMORY; if (video) - target = (IPin**)&This->pVideo_Pin; + filter->pVideo_Pin = pin; else - target = (IPin**)&This->pAudio_Pin; - - if (*target != NULL) - { - FIXME("We already have a %s pin\n",(video)?"video":"audio"); - return E_FAIL; - } + filter->pAudio_Pin = pin; - hr = BaseOutputPin_Construct(&QT_OutputPin_Vtbl, sizeof(QTOutPin), piOutput, &output_BaseOutputFuncTable, &This->filter.csFilter, (IPin**)target); - if (SUCCEEDED(hr)) - { - QTOutPin *pin = (QTOutPin*)*target; - pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); - CopyMediaType(pin->pmt, amt); - pin->pin.pin.pinInfo.pFilter = (LPVOID)This; - pin->IQualityControl_iface.lpVtbl = &QTOutPin_QualityControl_Vtbl; - - BaseFilterImpl_IncrementPinVersion(&This->filter); + strmbase_source_init(&pin->pin, &QT_OutputPin_Vtbl, piOutput, + &output_BaseOutputFuncTable, &filter->filter.csFilter); + pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + CopyMediaType(pin->pmt, mt); + pin->IQualityControl_iface.lpVtbl = &QTOutPin_QualityControl_Vtbl; + BaseFilterImpl_IncrementPinVersion(&filter->filter); - hr = OutputQueue_Construct(&pin->pin, TRUE, TRUE, 5, FALSE, THREAD_PRIORITY_NORMAL, &output_OutputQueueFuncTable, &pin->queue); - } - else - ERR("Failed with error %x\n", hr); - return hr; + return OutputQueue_Construct(&pin->pin, TRUE, TRUE, 5, FALSE, + THREAD_PRIORITY_NORMAL, &output_OutputQueueFuncTable, &pin->queue); } static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface) -- 2.22.0

1 4

[PATCH v3 2/4] localspl: AddMonitor should create registry entry for a monitor before initializing it.
by Dmitry Timoshkov 05 Sep '19

05 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index ccd19811cf..8e5e3428d5 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1499,12 +1499,6 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) return FALSE; } - /* Load and initialize the monitor. SetLastError() is called on failure */ - if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) { - return FALSE; - } - monitor_unload(pm); - SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ if (RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { @@ -1538,7 +1532,17 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) res = (RegSetValueExW(hentry, driverW, 0, REG_SZ, (LPBYTE) mi2w->pDLLName, len) == ERROR_SUCCESS); } + + /* Load and initialize the monitor. SetLastError() is called on failure */ + if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) + res = FALSE; + + monitor_unload(pm); + RegCloseKey(hentry); + + if (!res) + RegDeleteKeyW(hroot, mi2w->pName); } RegCloseKey(hroot); -- 2.20.1

3 2

[PATCH] aclocal.m4: fix macro
by Evgeny Litvinenko 05 Sep '19

05 Sep '19

Signed-off-by: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> --- With this fix it is possible to nest the WINE_TRY_SHLIB_FLAGS macro. Example: WINE_TRY_SHLIB_FLAGS([first set of flags], [ac_cv_c_dll_flags="first set of flags"], [WINE_TRY_SHLIB_FLAGS([second set of flags], [ac_cv_c_dll_flags="second set of flags"], [ac_cv_c_dll_flags="third set of flags"])]) aclocal.m4 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index ed0c3a8317..194b3a9d93 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -178,10 +178,14 @@ dnl dnl Usage: WINE_TRY_SHLIB_FLAGS(flags,[action-if-yes,[action-if-no]]) dnl AC_DEFUN([WINE_TRY_SHLIB_FLAGS], -[ac_wine_try_cflags_saved=$CFLAGS +[AS_VAR_PUSHDEF([ac_var], ac_cv_cflags_[[$1]])dnl +ac_wine_try_cflags_saved=$CFLAGS CFLAGS="$CFLAGS $1" -AC_LINK_IFELSE([AC_LANG_SOURCE([void myfunc() {}])],[$2],[$3]) -CFLAGS=$ac_wine_try_cflags_saved]) +AC_LINK_IFELSE([AC_LANG_SOURCE([[void myfunc() {}]])], + [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)]) +CFLAGS=$ac_wine_try_cflags_saved +AS_VAR_IF([ac_var],[yes], [$2], [$3])dnl +AS_VAR_POPDEF([ac_var])]) dnl **** Check whether we need to define a symbol on the compiler command line **** dnl -- 2.23.0

1 0

[PATCH] aclocal.m4: fix a macro
by Evgeny Litvinenko 05 Sep '19

05 Sep '19

With this fix it is possible to nest the WINE_TRY_SHLIB_FLAGS macro. Example: WINE_TRY_SHLIB_FLAGS([first set of flags], [ac_cv_c_dll_flags="first set of flags"], [WINE_TRY_SHLIB_FLAGS([second set of flags], [ac_cv_c_dll_flags="second set of flags"], [ac_cv_c_dll_flags="third set of flags"])]) --- aclocal.m4 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index ed0c3a8317..194b3a9d93 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -178,10 +178,14 @@ dnl dnl Usage: WINE_TRY_SHLIB_FLAGS(flags,[action-if-yes,[action-if-no]]) dnl AC_DEFUN([WINE_TRY_SHLIB_FLAGS], -[ac_wine_try_cflags_saved=$CFLAGS +[AS_VAR_PUSHDEF([ac_var], ac_cv_cflags_[[$1]])dnl +ac_wine_try_cflags_saved=$CFLAGS CFLAGS="$CFLAGS $1" -AC_LINK_IFELSE([AC_LANG_SOURCE([void myfunc() {}])],[$2],[$3]) -CFLAGS=$ac_wine_try_cflags_saved]) +AC_LINK_IFELSE([AC_LANG_SOURCE([[void myfunc() {}]])], + [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)]) +CFLAGS=$ac_wine_try_cflags_saved +AS_VAR_IF([ac_var],[yes], [$2], [$3])dnl +AS_VAR_POPDEF([ac_var])]) dnl **** Check whether we need to define a symbol on the compiler command line **** dnl -- 2.23.0

2 3

[PATCH v3 1/3] wininet: Return error from HttpQueryInfo if number argument is invalid.
by Daniel Lehman 05 Sep '19

05 Sep '19

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v3: - more tests - check errno v2: - just use strtoulW with overflow check - make this patch first since it's really 0003 that needs it --- dlls/wininet/http.c | 22 +++++++++-- dlls/wininet/tests/http.c | 82 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 538fc2bf6b..3230749d40 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -42,6 +42,7 @@ #include <stdio.h> #include <time.h> #include <assert.h> +#include <errno.h> #include "windef.h" #include "winbase.h" @@ -3724,9 +3725,24 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, /* coalesce value to requested type */ if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER && lpBuffer) { - *(int *)lpBuffer = atoiW(lphttpHdr->lpszValue); - TRACE(" returning number: %d\n", *(int *)lpBuffer); - } + unsigned long value; + + if (*lpdwBufferLength != sizeof(DWORD)) + { + LeaveCriticalSection( &request->headers_section ); + return ERROR_HTTP_INVALID_HEADER; + } + + value = strtoulW( lphttpHdr->lpszValue, NULL, 10 ); + if (value > UINT_MAX || (value == ULONG_MAX && errno == ERANGE)) + { + LeaveCriticalSection( &request->headers_section ); + return ERROR_HTTP_INVALID_HEADER; + } + + *(DWORD *)lpBuffer = value; + TRACE(" returning number: %u\n", *(DWORD *)lpBuffer); + } else if (dwInfoLevel & HTTP_QUERY_FLAG_SYSTEMTIME && lpBuffer) { time_t tmpTime; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index cb96abe612..fcbd95b837 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -2061,6 +2062,12 @@ static const char okmsg2[] = "Set-Cookie: two\r\n" "\r\n"; +static DWORD64 content_length; +static const char largemsg[] = +"HTTP/1.1 200 OK\r\n" +"Content-Length: %I64u\r\n" +"\r\n"; + static const char notokmsg[] = "HTTP/1.1 400 Bad Request\r\n" "Server: winetest\r\n" @@ -2455,6 +2462,12 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, okmsg, sizeof(okmsg)-1, 0); } + if (strstr(buffer, "HEAD /test_large_content")) + { + char msg[sizeof(largemsg) + 16]; + sprintf(msg, largemsg, content_length); + send(c, msg, strlen(msg), 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -5515,6 +5528,74 @@ static void test_remove_dot_segments(int port) close_request(&req); } +struct large_test +{ + DWORD64 content_length; + BOOL ret; +}; + +static void test_large_content(int port) +{ + struct large_test tests[] = { + { 0, TRUE }, + { UINT_MAX-1, TRUE }, + { UINT_MAX, TRUE }, + { (DWORD64)UINT_MAX+1, FALSE }, + { ~0, FALSE }, + }; + test_request_t req; + DWORD sizelen, len; + DWORD64 len64; + BOOL ret; + size_t i; + + open_simple_request(&req, "localhost", port, "HEAD", "/test_large_content"); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + content_length = tests[i].content_length; + ret = HttpSendRequestA(req.request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + + len = ~0; + sizelen = sizeof(len); + SetLastError(0xdeadbeef); + ret = HttpQueryInfoA(req.request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, + &len, &sizelen, 0); + if (tests[i].ret) + { + ok(ret, "HttpQueryInfo should have succeeded\n"); + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* xp, 2k8, vista */ + "expected ERROR_SUCCESS, got %x\n", GetLastError()); + ok(len == (DWORD)tests[i].content_length, "expected %u, got %u\n", + (DWORD)tests[i].content_length, len); + } + else + { + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_INVALID_HEADER, + "expected ERROR_HTTP_INVALID_HEADER, got %x\n", GetLastError()); + ok(len == ~0, "expected ~0, got %u\n", len); + } + ok(sizelen == sizeof(DWORD), "sizelen %u\n", sizelen); + } + + /* test argument size */ + len64 = ~0; + sizelen = sizeof(len64); + SetLastError(0xdeadbeef); + ret = HttpQueryInfoA(req.request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, + &len64, &len, 0); + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_INVALID_HEADER, + "expected ERROR_HTTP_INVALID_HEADER, got %x\n", GetLastError()); + ok(sizelen == sizeof(DWORD64), "sizelen %u\n", sizelen); + ok(len64 == ~0, "len64 %x%08x\n", (DWORD)(len64 >> 32), (DWORD)len64); + + close_request(&req); +} + static void test_http_connection(void) { struct server_info si; @@ -5573,6 +5654,7 @@ static void test_http_connection(void) test_redirect(si.port); test_persistent_connection(si.port); test_remove_dot_segments(si.port); + test_large_content(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit"); -- 2.17.1

3 6

[PATCH] dsound: Trace each Special Effect as it's processed.
by Alistair Leslie-Hughes 05 Sep '19

05 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/buffer.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index e76d113e63..003a518c5f 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -695,6 +695,23 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetFrequency(IDirectSoundBuffer8 *i return DS_OK; } +static const char* dump_DSFX_guid(const DSEFFECTDESC *desc) +{ + #define FE(guid) if (IsEqualGUID(&guid, &desc->guidDSFXClass)) return #guid; + FE(GUID_DSFX_STANDARD_GARGLE) + FE(GUID_DSFX_STANDARD_CHORUS) + FE(GUID_DSFX_STANDARD_FLANGER) + FE(GUID_DSFX_STANDARD_ECHO) + FE(GUID_DSFX_STANDARD_DISTORTION) + FE(GUID_DSFX_STANDARD_COMPRESSOR) + FE(GUID_DSFX_STANDARD_PARAMEQ) + FE(GUID_DSFX_STANDARD_I3DL2REVERB) + FE(GUID_DSFX_WAVES_REVERB) + #undef FE + + return debugstr_guid(&desc->guidDSFXClass); +} + static HRESULT WINAPI IDirectSoundBufferImpl_SetFX(IDirectSoundBuffer8 *iface, DWORD dwEffectsCount, LPDSEFFECTDESC pDSFXDesc, DWORD *pdwResultCodes) { @@ -767,6 +784,8 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFX(IDirectSoundBuffer8 *iface, D dmt.pbFormat = (BYTE*)&wfx; for (u = 0; u < dwEffectsCount; u++) { + TRACE("%d: 0x%08x, %s\n", u, pDSFXDesc[u].dwFlags, dump_DSFX_guid(&pDSFXDesc[u])); + hr2 = CoCreateInstance(&pDSFXDesc[u].guidDSFXClass, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (LPVOID*)&filters[u].obj); if (SUCCEEDED(hr2)) { -- 2.17.1

2 1

[PATCH v4 1/2] kernel32/path: Allow renaming a file/directory to a different capitalization of itself
by Gabriel Ivăncescu 05 Sep '19

05 Sep '19

Renaming a file or directory from e.g. foobar to FooBar (or any other caps-only change) should work and capitalize it, like on Windows, instead of being a no-op. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/path.c | 66 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index b93add9..e55c305 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1136,6 +1136,16 @@ static BOOL is_same_file(HANDLE h1, HANDLE h2) return ret; } +static ULONG get_handle_attr(HANDLE handle) +{ + FILE_BASIC_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileBasicInformation); + return status != STATUS_SUCCESS ? 0 : info.FileAttributes; +} + /************************************************************************** * CopyFileW (KERNEL32.@) */ @@ -1317,6 +1327,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NTSTATUS status; HANDLE source_handle = 0, dest_handle = 0; ANSI_STRING source_unix, dest_unix; + BOOL same_file = FALSE; DWORD options; TRACE("(%s,%s,%p,%p,%04x)\n", @@ -1369,18 +1380,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT; + options = FILE_SYNCHRONOUS_IO_NONALERT; if (flag & MOVEFILE_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, options ); if (status == STATUS_SUCCESS) /* destination exists */ { - if (!(flag & MOVEFILE_REPLACE_EXISTING)) + ULONG attrib = 0; + + if (!(flag & MOVEFILE_REPLACE_EXISTING) || + ((attrib = get_handle_attr(dest_handle)) & FILE_ATTRIBUTE_DIRECTORY)) { - if (!is_same_file( source_handle, dest_handle )) + if (!(same_file = is_same_file( source_handle, dest_handle ))) { - SetLastError( ERROR_ALREADY_EXISTS ); + SetLastError( (attrib & FILE_ATTRIBUTE_DIRECTORY) + ? ERROR_ACCESS_DENIED : ERROR_ALREADY_EXISTS ); RtlFreeUnicodeString( &nt_name ); goto error; } @@ -1390,6 +1405,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_ACCESS_DENIED ); goto error; } + else same_file = is_same_file( source_handle, dest_handle ); NtClose( dest_handle ); dest_handle = NULL; @@ -1402,13 +1418,53 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } status = wine_nt_to_unix_file_name( &nt_name, &dest_unix, FILE_OPEN_IF, FALSE ); - RtlFreeUnicodeString( &nt_name ); if (status != STATUS_SUCCESS && status != STATUS_NO_SUCH_FILE) { + RtlFreeUnicodeString( &nt_name ); SetLastError( RtlNtStatusToDosError(status) ); goto error; } + /* When it's renaming to the same file, preserve the case sensitivity of the last + component, so that renaming a\b\c\foobar to a\b\c\Foobar works correctly like + on Windows, but note that due to hard links the paths must be exactly identical */ + if (same_file && source_unix.Length == dest_unix.Length && + !memcmp(source_unix.Buffer, dest_unix.Buffer, dest_unix.Length)) + { + size_t nt_filename_len, pathlen; + const WCHAR *nt_filename; + BOOL used_default; + char *tmp; + INT num; + + nt_filename = memrchrW(nt_name.Buffer, '\\', nt_name.Length / sizeof(WCHAR)) + 1; + nt_filename_len = nt_name.Buffer + nt_name.Length / sizeof(WCHAR) - nt_filename; + + /* Build it from path + filename (the latter converted from nt_name) */ + num = WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + NULL, 0, NULL, &used_default); + if (num > 0 && !used_default) + { + for (pathlen = dest_unix.Length; --pathlen > 0;) + if (dest_unix.Buffer[pathlen] == '/') { pathlen++; break; } + + tmp = dest_unix.Buffer; + if (dest_unix.MaximumLength < pathlen + num + 1) + tmp = RtlReAllocateHeap(GetProcessHeap(), 0, tmp, pathlen + num + 1); + if (tmp) + { + dest_unix.Buffer = tmp; + dest_unix.Length = pathlen + num; + dest_unix.MaximumLength = dest_unix.Length + 1; + dest_unix.Buffer[dest_unix.Length] = '\0'; + + WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + dest_unix.Buffer + pathlen, num, NULL, NULL); + } + } + } + RtlFreeUnicodeString( &nt_name ); + /* now perform the rename */ if (rename( source_unix.Buffer, dest_unix.Buffer ) == -1) -- 2.21.0

2 3

[PATCH v3 4/4] localspl: Unload monitor in DeleteMonitor.
by Dmitry Timoshkov 05 Sep '19

05 Sep '19

Some print monitors are very sensitive to loads/unloads being done in a quick succession like AddMonitor() does, and that even leads to crashes because the monitor I have here creates a thread on load and when the thread starts - the monitor dll is already unloaded. A solution to this is moving the monitor unloading to DeleteMonitor. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 0e602ff701..3da71525d1 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1560,8 +1560,6 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) res = FALSE; - monitor_unload(pm); - RegCloseKey(hentry); if (!res) @@ -1862,6 +1860,7 @@ static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) { + monitor_t *pm; HKEY hroot = NULL; LONG lres; @@ -1882,6 +1881,18 @@ static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMo return FALSE; } + /* Unload the monitor if it's loaded */ + EnterCriticalSection(&monitor_handles_cs); + LIST_FOR_EACH_ENTRY(pm, &monitor_handles, monitor_t, entry) + { + if (pm->name && !lstrcmpW(pMonitorName, pm->name)) + { + monitor_unload(pm); + break; + } + } + LeaveCriticalSection(&monitor_handles_cs); + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { ERR("unable to create key %s\n", debugstr_w(monitorsW)); return FALSE; -- 2.20.1

2 1

[PATCH v3 3/4] localspl: Add support for monitors providing the MONITOR2 interface.
by Dmitry Timoshkov 05 Sep '19

05 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 145 ++++++++++++++++++++++++--------------- 1 file changed, 90 insertions(+), 55 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 8e5e3428d5..0e602ff701 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -65,10 +65,10 @@ typedef struct { LPWSTR name; LPWSTR dllname; PMONITORUI monitorUI; - LPMONITOR monitor; + MONITOR2 monitor; + BOOL (WINAPI *old_XcvOpenPort)(LPCWSTR,ACCESS_MASK,PHANDLE); HMODULE hdll; DWORD refcount; - DWORD dwMonitorSize; } monitor_t; typedef struct { @@ -327,6 +327,10 @@ static void monitor_unload(monitor_t * pm) if (pm->refcount == 0) { list_remove(&pm->entry); + + if (pm->monitor.pfnShutdown) + pm->monitor.pfnShutdown(0); + FreeLibrary(pm->hdll); heap_free(pm->name); heap_free(pm->dllname); @@ -352,7 +356,7 @@ static void monitor_unloadall(void) LIST_FOR_EACH_ENTRY_SAFE(pm, next, &monitor_handles, monitor_t, entry) { /* skip monitorui dlls */ - if (pm->monitor) monitor_unload(pm); + if (pm->monitor.cbSize) monitor_unload(pm); } LeaveCriticalSection(&monitor_handles_cs); } @@ -378,6 +382,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) monitor_t * cursor; LPWSTR regroot = NULL; LPWSTR driver = dllname; + HKEY hroot = 0; TRACE("(%s, %s)\n", debugstr_w(name), debugstr_w(dllname)); /* Is the Monitor already loaded? */ @@ -402,7 +407,6 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (pm->name == NULL) { /* Load the monitor */ - LPMONITOREX pmonitorEx; DWORD len; if (name) { @@ -413,19 +417,19 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (regroot) { lstrcpyW(regroot, monitorsW); lstrcatW(regroot, name); - /* Get the Driver from the Registry */ - if (driver == NULL) { - HKEY hroot; - DWORD namesize; - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, regroot, &hroot) == ERROR_SUCCESS) { + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, regroot, &hroot) == ERROR_SUCCESS) { + /* Get the Driver from the Registry */ + if (driver == NULL) { + DWORD namesize; if (RegQueryValueExW(hroot, driverW, NULL, NULL, NULL, &namesize) == ERROR_SUCCESS) { driver = heap_alloc(namesize); RegQueryValueExW(hroot, driverW, NULL, NULL, (LPBYTE) driver, &namesize) ; } - RegCloseKey(hroot); } } + else + WARN("%s not found\n", debugstr_w(regroot)); } pm->name = strdupW(name); @@ -471,26 +475,38 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) } } - if (pInitializePrintMonitor && regroot) { + if (pInitializePrintMonitor2 && hroot) { + MONITORINIT init; + MONITOR2 *monitor2; + HANDLE hmon; + + memset(&init, 0, sizeof(init)); + init.cbSize = sizeof(init); + init.hckRegistryRoot = hroot; + init.bLocal = TRUE; + + monitor2 = pInitializePrintMonitor2(&init, &hmon); + TRACE("%p: MONITOR2 from %s,InitializePrintMonitor2(%s)\n", + monitor2, debugstr_w(driver), debugstr_w(regroot)); + if (monitor2) + memcpy(&pm->monitor, monitor2, min(monitor2->cbSize, sizeof(pm->monitor))); + } + else if (pInitializePrintMonitor && regroot) { + MONITOREX *pmonitorEx; + pmonitorEx = pInitializePrintMonitor(regroot); TRACE("%p: LPMONITOREX from %s,InitializePrintMonitor(%s)\n", pmonitorEx, debugstr_w(driver), debugstr_w(regroot)); - - if (pmonitorEx) { - pm->dwMonitorSize = pmonitorEx->dwMonitorSize; - pm->monitor = &(pmonitorEx->Monitor); + if (pmonitorEx) + { + /* Layout of MONITOREX and MONITOR2 mostly matches */ + memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize, sizeof(pm->monitor))); + pm->old_XcvOpenPort = pmonitorEx->Monitor.pfnXcvOpenPort; + pm->monitor.pfnXcvOpenPort = NULL; } } - if (pm->monitor) { - TRACE("0x%08x: dwMonitorSize (%d)\n", pm->dwMonitorSize, pm->dwMonitorSize); - - } - - if (!pm->monitor && regroot) { - if (pInitializePrintMonitor2 != NULL) { - FIXME("%s,InitializePrintMonitor2 not implemented\n", debugstr_w(driver)); - } + if (!pm->monitor.cbSize && regroot) { if (pInitializeMonitorEx != NULL) { FIXME("%s,InitializeMonitorEx not implemented\n", debugstr_w(driver)); } @@ -498,7 +514,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) FIXME("%s,InitializeMonitor not implemented\n", debugstr_w(driver)); } } - if (!pm->monitor && !pm->monitorUI) { + if (!pm->monitor.cbSize && !pm->monitorUI) { monitor_unload(pm); SetLastError(ERROR_PROC_NOT_FOUND); pm = NULL; @@ -511,6 +527,7 @@ cleanup: } LeaveCriticalSection(&monitor_handles_cs); if (driver != dllname) heap_free(driver); + if (hroot) RegCloseKey(hroot); heap_free(regroot); TRACE("=> %p\n", pm); return pm; @@ -563,7 +580,7 @@ static monitor_t * monitor_loadui(monitor_t * pm) WCHAR buffer[MAX_PATH]; HANDLE hXcv; DWORD len; - DWORD res; + DWORD res = 0; if (pm == NULL) return NULL; TRACE("(%p) => dllname: %s\n", pm, debugstr_w(pm->dllname)); @@ -577,16 +594,17 @@ static monitor_t * monitor_loadui(monitor_t * pm) } /* query the userinterface-dllname from the Portmonitor */ - if ((pm->monitor) && (pm->monitor->pfnXcvDataPort)) { - /* building (",XcvMonitor %s",pm->name) not needed yet */ - res = pm->monitor->pfnXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); - TRACE("got %u with %p\n", res, hXcv); - if (res) { - res = pm->monitor->pfnXcvDataPort(hXcv, monitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); - TRACE("got %u with %s\n", res, debugstr_w(buffer)); - if (res == ERROR_SUCCESS) pui = monitor_load(NULL, buffer); - pm->monitor->pfnXcvClosePort(hXcv); - } + /* building (",XcvMonitor %s",pm->name) not needed yet */ + if (pm->monitor.pfnXcvOpenPort) + res = pm->monitor.pfnXcvOpenPort(0, emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + else if (pm->old_XcvOpenPort) + res = pm->old_XcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + TRACE("got %u with %p\n", res, hXcv); + if (res) { + res = pm->monitor.pfnXcvDataPort(hXcv, monitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); + TRACE("got %u with %s\n", res, debugstr_w(buffer)); + if (res == ERROR_SUCCESS) pui = monitor_load(NULL, buffer); + pm->monitor.pfnXcvClosePort(hXcv); } return pui; } @@ -921,7 +939,6 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf DWORD numentries; DWORD entrysize; - TRACE("(%d, %p, %d, %p)\n", level, pPorts, cbBuf, lpreturned); entrysize = (level == 1) ? sizeof(PORT_INFO_1W) : sizeof(PORT_INFO_2W); @@ -934,16 +951,16 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf LIST_FOR_EACH_ENTRY(pm, &monitor_handles, monitor_t, entry) { - if ((pm->monitor) && (pm->monitor->pfnEnumPorts)) { + if (pm->monitor.pfnEnumPorts) { pi_needed = 0; pi_returned = 0; - res = pm->monitor->pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); + res = pm->monitor.pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { /* Do not use heap_realloc (we do not need the old data in the buffer) */ heap_free(pi_buffer); pi_buffer = heap_alloc(pi_needed); pi_allocated = (pi_buffer) ? pi_needed : 0; - res = pm->monitor->pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); + res = pm->monitor.pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); } TRACE("(%s) got %d with %d (need %d byte for %d entries)\n", debugstr_w(pm->name), res, GetLastError(), pi_needed, pi_returned); @@ -1144,7 +1161,10 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname) static VOID printer_free(printer_t * printer) { if (printer->hXcv) - printer->pm->monitor->pfnXcvClosePort(printer->hXcv); + { + if (printer->pm->monitor.pfnXcvClosePort) + printer->pm->monitor.pfnXcvClosePort(printer->hXcv); + } monitor_unload(printer->pm); @@ -1224,11 +1244,14 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) } if (printer->pm) { - if ((printer->pm->monitor) && (printer->pm->monitor->pfnXcvOpenPort)) { - printer->pm->monitor->pfnXcvOpenPort(&printername[len], - pDefault ? pDefault->DesiredAccess : 0, - &printer->hXcv); - } + if (printer->pm->monitor.pfnXcvOpenPort) + printer->pm->monitor.pfnXcvOpenPort(0, &printername[len], + pDefault ? pDefault->DesiredAccess : 0, + &printer->hXcv); + else if (printer->pm->old_XcvOpenPort) + printer->pm->old_XcvOpenPort(&printername[len], + pDefault ? pDefault->DesiredAccess : 0, + &printer->hXcv); if (printer->hXcv == NULL) { printer_free(printer); SetLastError(ERROR_INVALID_PARAMETER); @@ -1587,8 +1610,10 @@ static BOOL WINAPI fpAddPort(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) } pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor && pm->monitor->pfnAddPort) { - res = pm->monitor->pfnAddPort(pName, hWnd, pMonitorName); + if (!pm) return FALSE; + + if (pm->monitor.pfnAddPort) { + res = pm->monitor.pfnAddPort(pName, hWnd, pMonitorName); TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); } else @@ -1664,8 +1689,11 @@ static BOOL WINAPI fpAddPortEx(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR /* load the Monitor */ pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor && pm->monitor->pfnAddPortEx) { - res = pm->monitor->pfnAddPortEx(pName, level, pBuffer, pMonitorName); + if (!pm) return FALSE; + + if (pm->monitor.pfnAddPortEx) + { + res = pm->monitor.pfnAddPortEx(pName, level, pBuffer, pMonitorName); TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); } else @@ -1778,10 +1806,13 @@ static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) } pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor && pm->monitor->pfnConfigurePort) { + if (!pm) return FALSE; + + if (pm->monitor.pfnConfigurePort) + { TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); - res = pm->monitor->pfnConfigurePort(pName, hWnd, pPortName); + res = pm->monitor.pfnConfigurePort(pName, hWnd, pPortName); TRACE("got %d with %u\n", res, GetLastError()); } else @@ -1908,10 +1939,13 @@ static BOOL WINAPI fpDeletePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) } pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor && pm->monitor->pfnDeletePort) { + if (!pm) return FALSE; + + if (pm->monitor.pfnDeletePort) + { TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); - res = pm->monitor->pfnDeletePort(pName, hWnd, pPortName); + res = pm->monitor.pfnDeletePort(pName, hWnd, pPortName); TRACE("got %d with %u\n", res, GetLastError()); } else @@ -2338,7 +2372,8 @@ static BOOL WINAPI fpXcvData(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, *pcbOutputNeeded = 0; - *pdwStatus = printer->pm->monitor->pfnXcvDataPort(printer->hXcv, pszDataName, + if (printer->pm->monitor.pfnXcvDataPort) + *pdwStatus = printer->pm->monitor.pfnXcvDataPort(printer->hXcv, pszDataName, pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); return TRUE; -- 2.20.1

2 1

[PATCH v3 1/4] localspl: Remove useless NULL checks from AddMonitor trace.
by Dmitry Timoshkov 05 Sep '19

05 Sep '19

AddMonitor dereferences pMonitors later without any checks. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index cb31b194ae..ccd19811cf 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1475,9 +1475,7 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) mi2w = (LPMONITOR_INFO_2W) pMonitors; TRACE("(%s, %d, %p): %s %s %s\n", debugstr_w(pName), Level, pMonitors, - debugstr_w(mi2w ? mi2w->pName : NULL), - debugstr_w(mi2w ? mi2w->pEnvironment : NULL), - debugstr_w(mi2w ? mi2w->pDLLName : NULL)); + debugstr_w(mi2w->pName), debugstr_w(mi2w->pEnvironment), debugstr_w(mi2w->pDLLName)); if (copy_servername_from_name(pName, NULL)) { FIXME("server %s not supported\n", debugstr_w(pName)); -- 2.20.1

2 1

[PATCH v2 3/4] localspl: Add support for monitors providing the MONITOR2 interface.
by Dmitry Timoshkov 05 Sep '19

05 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 144 ++++++++++++++++++++++++++------------- 1 file changed, 96 insertions(+), 48 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 8e5e3428d5..44cf38e571 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -65,10 +65,11 @@ typedef struct { LPWSTR name; LPWSTR dllname; PMONITORUI monitorUI; - LPMONITOR monitor; + MONITOR2 monitor; + BOOL (WINAPI *old_XcvOpenPort)(LPCWSTR,ACCESS_MASK,PHANDLE); + DWORD (WINAPI *old_XcvDataPort)(HANDLE,LPCWSTR,PBYTE,DWORD,PBYTE,DWORD,PDWORD); HMODULE hdll; DWORD refcount; - DWORD dwMonitorSize; } monitor_t; typedef struct { @@ -327,6 +328,10 @@ static void monitor_unload(monitor_t * pm) if (pm->refcount == 0) { list_remove(&pm->entry); + + if (pm->monitor.pfnShutdown) + pm->monitor.pfnShutdown(0); + FreeLibrary(pm->hdll); heap_free(pm->name); heap_free(pm->dllname); @@ -352,7 +357,7 @@ static void monitor_unloadall(void) LIST_FOR_EACH_ENTRY_SAFE(pm, next, &monitor_handles, monitor_t, entry) { /* skip monitorui dlls */ - if (pm->monitor) monitor_unload(pm); + if (pm->monitor.cbSize) monitor_unload(pm); } LeaveCriticalSection(&monitor_handles_cs); } @@ -378,6 +383,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) monitor_t * cursor; LPWSTR regroot = NULL; LPWSTR driver = dllname; + HKEY hroot = 0; TRACE("(%s, %s)\n", debugstr_w(name), debugstr_w(dllname)); /* Is the Monitor already loaded? */ @@ -402,7 +408,6 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (pm->name == NULL) { /* Load the monitor */ - LPMONITOREX pmonitorEx; DWORD len; if (name) { @@ -413,19 +418,19 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (regroot) { lstrcpyW(regroot, monitorsW); lstrcatW(regroot, name); - /* Get the Driver from the Registry */ - if (driver == NULL) { - HKEY hroot; - DWORD namesize; - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, regroot, &hroot) == ERROR_SUCCESS) { + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, regroot, &hroot) == ERROR_SUCCESS) { + /* Get the Driver from the Registry */ + if (driver == NULL) { + DWORD namesize; if (RegQueryValueExW(hroot, driverW, NULL, NULL, NULL, &namesize) == ERROR_SUCCESS) { driver = heap_alloc(namesize); RegQueryValueExW(hroot, driverW, NULL, NULL, (LPBYTE) driver, &namesize) ; } - RegCloseKey(hroot); } } + else + WARN("%s not found\n", debugstr_w(regroot)); } pm->name = strdupW(name); @@ -471,26 +476,40 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) } } - if (pInitializePrintMonitor && regroot) { + if (pInitializePrintMonitor2 && hroot) { + MONITORINIT init; + MONITOR2 *monitor2; + HANDLE hmon; + + memset(&init, 0, sizeof(init)); + init.cbSize = sizeof(init); + init.hckRegistryRoot = hroot; + init.bLocal = TRUE; + + monitor2 = pInitializePrintMonitor2(&init, &hmon); + TRACE("%p: MONITOR2 from %s,InitializePrintMonitor2(%s)\n", + monitor2, debugstr_w(driver), debugstr_w(regroot)); + if (monitor2) + memcpy(&pm->monitor, monitor2, min(monitor2->cbSize, sizeof(pm->monitor))); + } + else if (pInitializePrintMonitor && regroot) { + MONITOREX *pmonitorEx; + pmonitorEx = pInitializePrintMonitor(regroot); TRACE("%p: LPMONITOREX from %s,InitializePrintMonitor(%s)\n", pmonitorEx, debugstr_w(driver), debugstr_w(regroot)); - - if (pmonitorEx) { - pm->dwMonitorSize = pmonitorEx->dwMonitorSize; - pm->monitor = &(pmonitorEx->Monitor); + if (pmonitorEx) + { + /* Layout of MONITOREX and MONITOR2 mostly matches */ + memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize, sizeof(pm->monitor))); + pm->old_XcvOpenPort = pmonitorEx->Monitor.pfnXcvOpenPort; + pm->old_XcvDataPort = pmonitorEx->Monitor.pfnXcvDataPort; + pm->monitor.pfnXcvOpenPort = NULL; + pm->monitor.pfnXcvDataPort = NULL; } } - if (pm->monitor) { - TRACE("0x%08x: dwMonitorSize (%d)\n", pm->dwMonitorSize, pm->dwMonitorSize); - - } - - if (!pm->monitor && regroot) { - if (pInitializePrintMonitor2 != NULL) { - FIXME("%s,InitializePrintMonitor2 not implemented\n", debugstr_w(driver)); - } + if (!pm->monitor.cbSize && regroot) { if (pInitializeMonitorEx != NULL) { FIXME("%s,InitializeMonitorEx not implemented\n", debugstr_w(driver)); } @@ -498,7 +517,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) FIXME("%s,InitializeMonitor not implemented\n", debugstr_w(driver)); } } - if (!pm->monitor && !pm->monitorUI) { + if (!pm->monitor.cbSize && !pm->monitorUI) { monitor_unload(pm); SetLastError(ERROR_PROC_NOT_FOUND); pm = NULL; @@ -511,6 +530,7 @@ cleanup: } LeaveCriticalSection(&monitor_handles_cs); if (driver != dllname) heap_free(driver); + if (hroot) RegCloseKey(hroot); heap_free(regroot); TRACE("=> %p\n", pm); return pm; @@ -577,15 +597,26 @@ static monitor_t * monitor_loadui(monitor_t * pm) } /* query the userinterface-dllname from the Portmonitor */ - if ((pm->monitor) && (pm->monitor->pfnXcvDataPort)) { + if (pm->monitor.pfnXcvDataPort) { + res = pm->monitor.pfnXcvOpenPort(0, emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + TRACE("got %u with %p\n", res, hXcv); + if (res) { + res = pm->monitor.pfnXcvDataPort(hXcv, monitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); + TRACE("got %u with %s\n", res, debugstr_w(buffer)); + if (res == ERROR_SUCCESS) pui = monitor_load(NULL, buffer); + pm->monitor.pfnXcvClosePort(hXcv); + } + return pui; + } + else if (pm->old_XcvDataPort) { /* building (",XcvMonitor %s",pm->name) not needed yet */ - res = pm->monitor->pfnXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + res = pm->old_XcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); TRACE("got %u with %p\n", res, hXcv); if (res) { - res = pm->monitor->pfnXcvDataPort(hXcv, monitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); + res = pm->monitor.pfnXcvDataPort(hXcv, monitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); TRACE("got %u with %s\n", res, debugstr_w(buffer)); if (res == ERROR_SUCCESS) pui = monitor_load(NULL, buffer); - pm->monitor->pfnXcvClosePort(hXcv); + pm->monitor.pfnXcvClosePort(hXcv); } } return pui; @@ -921,7 +952,6 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf DWORD numentries; DWORD entrysize; - TRACE("(%d, %p, %d, %p)\n", level, pPorts, cbBuf, lpreturned); entrysize = (level == 1) ? sizeof(PORT_INFO_1W) : sizeof(PORT_INFO_2W); @@ -934,16 +964,16 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf LIST_FOR_EACH_ENTRY(pm, &monitor_handles, monitor_t, entry) { - if ((pm->monitor) && (pm->monitor->pfnEnumPorts)) { + if (pm->monitor.pfnEnumPorts) { pi_needed = 0; pi_returned = 0; - res = pm->monitor->pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); + res = pm->monitor.pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { /* Do not use heap_realloc (we do not need the old data in the buffer) */ heap_free(pi_buffer); pi_buffer = heap_alloc(pi_needed); pi_allocated = (pi_buffer) ? pi_needed : 0; - res = pm->monitor->pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); + res = pm->monitor.pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); } TRACE("(%s) got %d with %d (need %d byte for %d entries)\n", debugstr_w(pm->name), res, GetLastError(), pi_needed, pi_returned); @@ -1144,7 +1174,10 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname) static VOID printer_free(printer_t * printer) { if (printer->hXcv) - printer->pm->monitor->pfnXcvClosePort(printer->hXcv); + { + if (printer->pm->monitor.pfnXcvClosePort) + printer->pm->monitor.pfnXcvClosePort(printer->hXcv); + } monitor_unload(printer->pm); @@ -1224,11 +1257,14 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) } if (printer->pm) { - if ((printer->pm->monitor) && (printer->pm->monitor->pfnXcvOpenPort)) { - printer->pm->monitor->pfnXcvOpenPort(&printername[len], - pDefault ? pDefault->DesiredAccess : 0, - &printer->hXcv); - } + if (printer->pm->monitor.pfnXcvOpenPort) + printer->pm->monitor.pfnXcvOpenPort(0, &printername[len], + pDefault ? pDefault->DesiredAccess : 0, + &printer->hXcv); + else if (printer->pm->old_XcvOpenPort) + printer->pm->old_XcvOpenPort(&printername[len], + pDefault ? pDefault->DesiredAccess : 0, + &printer->hXcv); if (printer->hXcv == NULL) { printer_free(printer); SetLastError(ERROR_INVALID_PARAMETER); @@ -1587,8 +1623,10 @@ static BOOL WINAPI fpAddPort(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) } pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor && pm->monitor->pfnAddPort) { - res = pm->monitor->pfnAddPort(pName, hWnd, pMonitorName); + if (!pm) return FALSE; + + if (pm->monitor.pfnAddPort) { + res = pm->monitor.pfnAddPort(pName, hWnd, pMonitorName); TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); } else @@ -1664,8 +1702,11 @@ static BOOL WINAPI fpAddPortEx(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR /* load the Monitor */ pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor && pm->monitor->pfnAddPortEx) { - res = pm->monitor->pfnAddPortEx(pName, level, pBuffer, pMonitorName); + if (!pm) return FALSE; + + if (pm->monitor.pfnAddPortEx) + { + res = pm->monitor.pfnAddPortEx(pName, level, pBuffer, pMonitorName); TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); } else @@ -1778,10 +1819,13 @@ static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) } pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor && pm->monitor->pfnConfigurePort) { + if (!pm) return FALSE; + + if (pm->monitor.pfnConfigurePort) + { TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); - res = pm->monitor->pfnConfigurePort(pName, hWnd, pPortName); + res = pm->monitor.pfnConfigurePort(pName, hWnd, pPortName); TRACE("got %d with %u\n", res, GetLastError()); } else @@ -1908,10 +1952,13 @@ static BOOL WINAPI fpDeletePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) } pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor && pm->monitor->pfnDeletePort) { + if (!pm) return FALSE; + + if (pm->monitor.pfnDeletePort) + { TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); - res = pm->monitor->pfnDeletePort(pName, hWnd, pPortName); + res = pm->monitor.pfnDeletePort(pName, hWnd, pPortName); TRACE("got %d with %u\n", res, GetLastError()); } else @@ -2338,7 +2385,8 @@ static BOOL WINAPI fpXcvData(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, *pcbOutputNeeded = 0; - *pdwStatus = printer->pm->monitor->pfnXcvDataPort(printer->hXcv, pszDataName, + if (printer->pm->monitor.pfnXcvDataPort) + *pdwStatus = printer->pm->monitor.pfnXcvDataPort(printer->hXcv, pszDataName, pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); return TRUE; -- 2.20.1

2 2

[PATCH v2 4/4] localspl: Unload monitor in DeleteMonitor.
by Dmitry Timoshkov 05 Sep '19

05 Sep '19

Some print monitors are very sensitive to loads/unloads being done in a quick succession like AddMonitor() does, and that even leads to crashes because the monitor I have here creates a thread on load and when the thread starts - the monitor dll is already unloaded. A solution to this is moving the monitor unloading to DeleteMonitor. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 44cf38e571..2df4663899 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1573,8 +1573,6 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) res = FALSE; - monitor_unload(pm); - RegCloseKey(hentry); if (!res) @@ -1875,6 +1873,7 @@ static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) { + monitor_t *pm; HKEY hroot = NULL; LONG lres; @@ -1895,6 +1894,18 @@ static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMo return FALSE; } + /* Unload the monitor if it's loaded */ + EnterCriticalSection(&monitor_handles_cs); + LIST_FOR_EACH_ENTRY(pm, &monitor_handles, monitor_t, entry) + { + if (pm->name && !lstrcmpW(pMonitorName, pm->name)) + { + monitor_unload(pm); + break; + } + } + LeaveCriticalSection(&monitor_handles_cs); + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { ERR("unable to create key %s\n", debugstr_w(monitorsW)); return FALSE; -- 2.20.1

1 0

[PATCH v2 2/4] localspl: AddMonitor should create registry entry for a monitor before initializing it.
by Dmitry Timoshkov 05 Sep '19

05 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index ccd19811cf..8e5e3428d5 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1499,12 +1499,6 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) return FALSE; } - /* Load and initialize the monitor. SetLastError() is called on failure */ - if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) { - return FALSE; - } - monitor_unload(pm); - SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ if (RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { @@ -1538,7 +1532,17 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) res = (RegSetValueExW(hentry, driverW, 0, REG_SZ, (LPBYTE) mi2w->pDLLName, len) == ERROR_SUCCESS); } + + /* Load and initialize the monitor. SetLastError() is called on failure */ + if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) + res = FALSE; + + monitor_unload(pm); + RegCloseKey(hentry); + + if (!res) + RegDeleteKeyW(hroot, mi2w->pName); } RegCloseKey(hroot); -- 2.20.1

1 0

[PATCH v2 1/4] localspl: Remove useless NULL checks from AddMonitor trace.
by Dmitry Timoshkov 05 Sep '19

05 Sep '19

AddMonitor dereferences pMonitors later without any checks. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index cb31b194ae..ccd19811cf 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1475,9 +1475,7 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) mi2w = (LPMONITOR_INFO_2W) pMonitors; TRACE("(%s, %d, %p): %s %s %s\n", debugstr_w(pName), Level, pMonitors, - debugstr_w(mi2w ? mi2w->pName : NULL), - debugstr_w(mi2w ? mi2w->pEnvironment : NULL), - debugstr_w(mi2w ? mi2w->pDLLName : NULL)); + debugstr_w(mi2w->pName), debugstr_w(mi2w->pEnvironment), debugstr_w(mi2w->pDLLName)); if (copy_servername_from_name(pName, NULL)) { FIXME("server %s not supported\n", debugstr_w(pName)); -- 2.20.1

1 0

[PATCH] mfmediaengine: Merge media_engine_attributes into media_engine struct.
by Jactry Zeng 05 Sep '19

05 Sep '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 86 ++++++++--------- dlls/mfmediaengine/tests/mfmediaengine.c | 117 ++++++++--------------- 2 files changed, 79 insertions(+), 124 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 9e33b973d4..25ed4dbeae 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -48,27 +48,22 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) enum media_engine_mode { - MEDIA_ENGINE_INVIAL, + MEDIA_ENGINE_INVALID, MEDIA_ENGINE_AUDIO_MODE, MEDIA_ENGINE_RENDERING_MODE, MEDIA_ENGINE_FRAME_SERVER_MODE, }; -struct media_engine_attributes -{ - IMFMediaEngineNotify *callback; - HWND playback_hwnd; - DXGI_FORMAT output_format; - IMFDXGIDeviceManager *dxgi_manager; - enum media_engine_mode mode; -}; - struct media_engine { IMFMediaEngine IMFMediaEngine_iface; LONG refcount; DWORD flags; - struct media_engine_attributes attributes; + IMFMediaEngineNotify *callback; + UINT64 playback_hwnd; + DXGI_FORMAT output_format; + IMFDXGIDeviceManager *dxgi_manager; + enum media_engine_mode mode; }; static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *iface) @@ -103,12 +98,13 @@ static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface) return refcount; } -static void free_media_engine_attributes(struct media_engine_attributes engine_attr) +static void free_media_engine(struct media_engine *engine) { - if (engine_attr.callback) - IMFMediaEngineNotify_Release(engine_attr.callback); - if (engine_attr.dxgi_manager) - IMFDXGIDeviceManager_Release(engine_attr.dxgi_manager); + if (engine->callback) + IMFMediaEngineNotify_Release(engine->callback); + if (engine->dxgi_manager) + IMFDXGIDeviceManager_Release(engine->dxgi_manager); + heap_free(engine); } static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) @@ -119,10 +115,7 @@ static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) TRACE("(%p) ref=%u.\n", iface, refcount); if (!refcount) - { - free_media_engine_attributes(engine->attributes); - HeapFree(GetProcessHeap(), 0, engine); - } + free_media_engine(engine); return refcount; } @@ -222,7 +215,7 @@ static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return 0; + return 0.0; } static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngine *iface, double time) @@ -236,28 +229,28 @@ static double WINAPI media_engine_GetStartTime(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return 0; + return 0.0; } static double WINAPI media_engine_GetDuration(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return 0; + return 0.0; } static BOOL WINAPI media_engine_IsPaused(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return 0; + return FALSE; } static double WINAPI media_engine_GetDefaultPlaybackRate(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return 0; + return 0.0; } static HRESULT WINAPI media_engine_SetDefaultPlaybackRate(IMFMediaEngine *iface, double rate) @@ -271,7 +264,7 @@ static double WINAPI media_engine_GetPlaybackRate(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return 0; + return 0.0; } static HRESULT WINAPI media_engine_SetPlaybackRate(IMFMediaEngine *iface, double rate) @@ -299,14 +292,14 @@ static BOOL WINAPI media_engine_IsEnded(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return E_NOTIMPL; + return FALSE; } static HRESULT WINAPI media_engine_SetAutoPlay(IMFMediaEngine *iface, BOOL autoplay) @@ -362,7 +355,7 @@ static double WINAPI media_engine_GetVolume(IMFMediaEngine *iface) { FIXME("(%p): stub.\n", iface); - return 0; + return 0.0; } static HRESULT WINAPI media_engine_SetVolume(IMFMediaEngine *iface, double volume) @@ -497,57 +490,54 @@ static ULONG WINAPI media_engine_factory_Release(IMFMediaEngineClassFactory *ifa return 1; } -static void init_media_engine_attributes(IMFAttributes *attributes, struct media_engine_attributes *engine_attr) +static void init_media_engine(IMFAttributes *attributes, struct media_engine *engine) { HRESULT hr; - memset(engine_attr, 0, sizeof(*engine_attr)); hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, - (void **)&engine_attr->callback); + (void **)&engine->callback); if (FAILED(hr)) return; - IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, (UINT64 *)&engine_attr->playback_hwnd); + IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, &engine->playback_hwnd); IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_DXGI_MANAGER, &IID_IMFDXGIDeviceManager, - (void **)&engine_attr->dxgi_manager); - hr = IMFAttributes_GetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, &engine_attr->output_format); - if (engine_attr->playback_hwnd) /* FIXME: handle MF_MEDIA_ENGINE_PLAYBACK_VISUAL */ - engine_attr->mode = MEDIA_ENGINE_RENDERING_MODE; + (void **)&engine->dxgi_manager); + hr = IMFAttributes_GetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, &engine->output_format); + if (engine->playback_hwnd) /* FIXME: handle MF_MEDIA_ENGINE_PLAYBACK_VISUAL */ + engine->mode = MEDIA_ENGINE_RENDERING_MODE; else { if (SUCCEEDED(hr)) - engine_attr->mode = MEDIA_ENGINE_FRAME_SERVER_MODE; + engine->mode = MEDIA_ENGINE_FRAME_SERVER_MODE; else - engine_attr->mode = MEDIA_ENGINE_AUDIO_MODE; + engine->mode = MEDIA_ENGINE_AUDIO_MODE; } } static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFactory *iface, DWORD flags, IMFAttributes *attributes, IMFMediaEngine **engine) { - struct media_engine_attributes engine_attr; struct media_engine *object; - FIXME("(%p, %#x, %p, %p): semi-stub.\n", iface, flags, attributes, engine); + TRACE("(%p, %#x, %p, %p).\n", iface, flags, attributes, engine); if (!attributes || !engine) return E_POINTER; - init_media_engine_attributes(attributes, &engine_attr); - if (!engine_attr.mode) - return MF_E_ATTRIBUTENOTFOUND; - object = heap_alloc_zero(sizeof(*object)); if (!object) - { - free_media_engine_attributes(engine_attr); return E_OUTOFMEMORY; + + init_media_engine(attributes, object); + if (!object->mode) + { + free_media_engine(object); + return MF_E_ATTRIBUTENOTFOUND; } object->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; object->refcount = 1; object->flags = flags; - object->attributes = engine_attr; *engine = &object->IMFMediaEngine_iface; diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index a264d0d033..2bbc79fb6c 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -105,7 +105,13 @@ static IMFMediaEngineNotifyVtbl media_engine_notify_vtbl = static void test_factory(void) { + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *notify = &notify_impl.IMFMediaEngineNotify_iface; IMFMediaEngineClassFactory *factory, *factory2; + IMFDXGIDeviceManager *manager; + IMFMediaEngine *media_engine; + IMFAttributes *attributes; + UINT token; HRESULT hr; CoInitialize(NULL); @@ -120,84 +126,43 @@ static void test_factory(void) ok(hr == CLASS_E_NOAGGREGATION || broken(hr == REGDB_E_CLASSNOTREG) /* pre-win8 */, "Unexpected hr %#x.\n", hr); - if (factory) + if (!factory) { - struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; - IMFMediaEngineNotify *notify = &notify_impl.IMFMediaEngineNotify_iface; - IMFMediaEngine *media_engine, *media_engine2; - IMFDXGIDeviceManager *manager; - IMFAttributes *attributes; - UINT token; - - hr = pMFCreateDXGIDeviceManager(&token, &manager); - ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); - hr = MFCreateAttributes(&attributes, 3); - ok(hr == S_OK, "MFCreateAttributes failed: %#x.\n", hr); - - if (0) - { - /* Crashed on Windows 8 */ - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - NULL, &media_engine); - ok(hr == E_POINTER, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); - - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - NULL, NULL); - ok(hr == E_POINTER, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); - } - - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); - - hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_OPM_HWND, NULL); - ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); - - hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)notify); - ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine); - ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* pre win10v1809 */, - "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); - if (SUCCEEDED(hr)) - IMFMediaEngine_Release(media_engine); - - EXPECT_REF(factory, 1); - hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); - ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: %#x.\n", hr); - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine); - ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); - if (0) - { - /* Different version of Windows has different reference count behaviour, and I didn't - see their logics. So skipping these tests on Windows. */ - EXPECT_REF(media_engine, 1); - EXPECT_REF(factory, 1); - } - - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine2); - ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); - if (0) - { - EXPECT_REF(media_engine, 1); - EXPECT_REF(media_engine2, 1); - EXPECT_REF(factory, 1); - } - - IMFMediaEngine_Release(media_engine); - IMFMediaEngine_Release(media_engine2); - IMFAttributes_DeleteAllItems(attributes); - IMFAttributes_Release(attributes); - IMFDXGIDeviceManager_Release(manager); - IMFMediaEngineClassFactory_Release(factory); - } - else win_skip("Not IMFMediaEngineClassFactory support.\n"); + CoUninitialize(); + return; + } + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + hr = MFCreateAttributes(&attributes, 3); + ok(hr == S_OK, "MFCreateAttributes failed: %#x.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_OPM_HWND, NULL); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + IMFAttributes_DeleteAllItems(attributes); + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)notify); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); + ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: %#x.\n", hr); + EXPECT_REF(factory, 1); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); + EXPECT_REF(factory, 1); + + IMFMediaEngine_Release(media_engine); + IMFAttributes_Release(attributes); + IMFDXGIDeviceManager_Release(manager); + IMFMediaEngineClassFactory_Release(factory); CoUninitialize(); } -- 2.23.0.rc1

2 1

[PATCH] wineps.drv: Remove duplicate condition in PSDRV_SelectFont().
by Andrey Gusev 05 Sep '19

05 Sep '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/wineps.drv/font.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index d6e330159c..88c2777f87 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -75,9 +75,7 @@ HFONT CDECL PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) strcpy(FaceName, "Symbol"); break; } - } - if(FaceName[0] == '\0') { switch(lf.lfPitchAndFamily & 0x0f) { case VARIABLE_PITCH: strcpy(FaceName, "Times"); -- 2.21.0

2 1

[PATCH] wbemprox: Return NULL on error (Coverity)
by Alistair Leslie-Hughes 05 Sep '19

05 Sep '19

CID 1453501 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index bbc96bf1ab..299a2edc71 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3886,7 +3886,7 @@ static struct array *get_systemenclosure_chassistypes( const char *buf, UINT len if (!(types = heap_alloc( sizeof(*types) ))) { heap_free( ret ); - goto done; + return NULL; } types[0] = chassis->type & ~0x80; -- 2.17.1

2 1

[PATCH] wininet: Include limits.h to define UINT_MAX and ULONG_MAX.
by Huw Davies 05 Sep '19

05 Sep '19

Fixes build error on macOS introduced by commit 968201424d92a2117d91ba0253f30a9c67018e7e Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wininet/http.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 065a8b74e7..fccbb02f17 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -43,6 +43,7 @@ #include <time.h> #include <assert.h> #include <errno.h> +#include <limits.h> #include "windef.h" #include "winbase.h" -- 2.18.0

1 0

[PATCH v2 3/4] include: Add ip2string.h
by Alex Henrie 05 Sep '19

05 Sep '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Add include guard, extern "C", and WINELIB_NAME_AW --- include/ip2string.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 include/ip2string.h diff --git a/include/ip2string.h b/include/ip2string.h new file mode 100644 index 0000000000..6c96c8d76d --- /dev/null +++ b/include/ip2string.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2019 Alex Henrie + * + * 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_IP2STRING_H +#define __WINE_IP2STRING_H + +#ifdef __cplusplus +extern "C" { +#endif + +NTSTATUS WINAPI RtlIpv4StringToAddressA(const char *str, BOOLEAN strict, const char **terminator, IN_ADDR *address); +NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const WCHAR **terminator, IN_ADDR *address); +#define RtlIpv4StringToAddress WINELIB_NAME_AW(RtlIpv4StringToAddress) +NTSTATUS WINAPI RtlIpv4StringToAddressExA(const char *str, BOOLEAN strict, IN_ADDR *address, USHORT *port); +NTSTATUS WINAPI RtlIpv4StringToAddressExW(const WCHAR *str, BOOLEAN strict, IN_ADDR *address, USHORT *port); +#define RtlIpv4StringToAddressEx WINELIB_NAME_AW(RtlIpv4StringToAddressEx) + +#ifdef __cplusplus +} +#endif + +#endif -- 2.23.0

1 0

[PATCH 1/4] include: Add structures and constants needed for ParseNetworkString
by Alex Henrie 05 Sep '19

05 Sep '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- The Windows header only defines NET_ADDRESS_FORMAT and NET_ADDRESS_INFO if windns.h is included before iphlpapi.h. --- include/iphlpapi.h | 47 ++++++++++++++++++++++++++++++++++++++++++++++ include/windns.h | 1 + 2 files changed, 48 insertions(+) diff --git a/include/iphlpapi.h b/include/iphlpapi.h index f52387a1ca..a087d7fd69 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -26,6 +26,26 @@ extern "C" { #include <ipexport.h> #include <iptypes.h> +#define NET_STRING_IPV4_ADDRESS 0x00000001 +#define NET_STRING_IPV4_SERVICE 0x00000002 +#define NET_STRING_IPV4_NETWORK 0x00000004 +#define NET_STRING_IPV6_ADDRESS 0x00000008 +#define NET_STRING_IPV6_ADDRESS_NO_SCOPE 0x00000010 +#define NET_STRING_IPV6_SERVICE 0x00000020 +#define NET_STRING_IPV6_SERVICE_NO_SCOPE 0x00000040 +#define NET_STRING_IPV6_NETWORK 0x00000080 +#define NET_STRING_NAMED_ADDRESS 0x00000100 +#define NET_STRING_NAMED_SERVICE 0x00000200 +#define NET_STRING_IP_ADDRESS (NET_STRING_IPV4_ADDRESS|NET_STRING_IPV6_ADDRESS) +#define NET_STRING_IP_ADDRESS_NO_SCOPE (NET_STRING_IPV4_ADDRESS|NET_STRING_IPV6_ADDRESS_NO_SCOPE) +#define NET_STRING_IP_SERVICE (NET_STRING_IPV4_SERVICE|NET_STRING_IPV6_SERVICE) +#define NET_STRING_IP_SERVICE_NO_SCOPE (NET_STRING_IPV4_SERVICE|NET_STRING_IPV6_SERVICE_NO_SCOPE) +#define NET_STRING_IP_NETWORK (NET_STRING_IPV4_NETWORK|NET_STRING_IPV6_NETWORK) +#define NET_STRING_ANY_ADDRESS (NET_STRING_NAMED_ADDRESS|NET_STRING_IP_ADDRESS) +#define NET_STRING_ANY_ADDRESS_NO_SCOPE (NET_STRING_NAMED_ADDRESS|NET_STRING_IP_ADDRESS_NO_SCOPE) +#define NET_STRING_ANY_SERVICE (NET_STRING_NAMED_SERVICE|NET_STRING_IP_SERVICE) +#define NET_STRING_ANY_SERVICE_NO_SCOPE (NET_STRING_NAMED_SERVICE|NET_STRING_IP_SERVICE_NO_SCOPE) + DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, ULONG ulAf, TCP_TABLE_CLASS TableClass, ULONG Reserved); @@ -162,6 +182,33 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack(VOID **ppTcpTable, BOOL bOrder, H DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags); +#ifdef __WINE_WINDNS_H + +typedef enum NET_ADDRESS_FORMAT_ { + NET_ADDRESS_FORMAT_UNSPECIFIED, + NET_ADDRESS_DNS_NAME, + NET_ADDRESS_IPV4, + NET_ADDRESS_IPV6, +} NET_ADDRESS_FORMAT; + +typedef struct NET_ADDRESS_INFO_ +{ + NET_ADDRESS_FORMAT Format; + union + { + struct + { + WCHAR Address[DNS_MAX_NAME_BUFFER_LENGTH]; + WCHAR Port[6]; + } NamedAddress; + SOCKADDR_IN Ipv4Address; + SOCKADDR_IN6 Ipv6Address; + SOCKADDR IpAddress; + } DUMMYUNIONNAME; +} NET_ADDRESS_INFO, *PNET_ADDRESS_INFO; + +#endif /* __WINE_WINDNS_H */ + #ifdef __cplusplus } #endif diff --git a/include/windns.h b/include/windns.h index d9a4b9adb0..9a31fac604 100644 --- a/include/windns.h +++ b/include/windns.h @@ -177,6 +177,7 @@ typedef struct #define DNS_ADDRESS_STRING_LENGTH IP6_ADDRESS_STRING_LENGTH #define IP4_ADDRESS_STRING_BUFFER_LENGTH IP4_ADDRESS_STRING_LENGTH #define IP6_ADDRESS_STRING_BUFFER_LENGTH IP6_ADDRESS_STRING_LENGTH +#define DNS_MAX_NAME_BUFFER_LENGTH 256 typedef struct _IP4_ARRAY { -- 2.23.0

1 3

[PATCH v2] po: Update Sinhala translation.
by Isira Seneviratne 05 Sep '19

05 Sep '19

1 0

[PATCH 1/2] winevdm: Increase length of 'buf' to 308.
by Isira Seneviratne 05 Sep '19

05 Sep '19

1 0

[PATCH resend] user32: Send a WM_ACTIVATE message after restoring a minimized window.
by Zhiyi Zhang 05 Sep '19

05 Sep '19

The message sequences in tests clearly show that there is a WM_ACTIVATE message at the end of ShowWindow() call for restoring a minimized window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47507 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/msg.c | 167 ++++++++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 9 ++- 2 files changed, 175 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a5bc1c5518..f8342306c6 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -890,6 +890,91 @@ static const struct message WmShowVisMaxPopupSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; +/* ShowWindow(hwnd, SW_RESTORE) to an active minimized window */ +static const struct message WmShowRestoreActiveMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent }, + /* Note this WM_ACTIVATE message even if the window is already active */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; +/* ShowWindow(hwnd, SW_SHOWNOACTIVATE) to an active minimized window */ +static const struct message WmShowNoActivateActiveMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + /* Following optional messages are present on XP */ + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|optional }, + /* Note this WM_ACTIVATE message even if the window is already active and with flag SW_SHOWNOACTIVATE */ + { WM_ACTIVATE, sent|wparam|lparam|optional, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; +/* ShowWindow(hwnd, SW_RESTORE) to a minimized child window. Here are messages received by the parent */ +static const struct message WmShowRestoreMinimizedChildSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_NCCALCSIZE, sent }, + { WM_CHILDACTIVATE, sent }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent|optional }, + { WM_SETFOCUS, sent }, + { WM_PAINT, sent }, + { WM_PAINT, sent }, + { WM_NCPAINT, sent|beginpaint }, + { WM_ERASEBKGND, sent|beginpaint }, + { 0 } +}; /* CreateWindow (for a child popup window, not initially visible) */ static const struct message WmCreateChildPopupSeq[] = { { HCBT_CREATEWND, hook }, @@ -4770,6 +4855,47 @@ static void test_showwindow(void) ok_sequence(WmShowVisMaxPopupSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", FALSE); DestroyWindow(hwnd); flush_sequence(); + + /* Test 5: + * 1. Restoring a minimized active window. + */ + hwnd = CreateWindowA("TestWindowClass", "parent", WS_VISIBLE | WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Failed to create window\n"); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreActiveMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_RESTORE):active minimized overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_SHOWNOACTIVATE); + flush_events(); + ok_sequence(WmShowNoActivateActiveMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_SHOWNOACTIVATE):active minimized overlapped", TRUE); + + hchild = CreateWindowA("TestWindowClass", "child", WS_VISIBLE | WS_CHILD, 0, 0, 100, 100, hwnd, 0, 0, 0); + ok(hchild != NULL, "Failed to create child window\n"); + ShowWindow(hchild, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hchild, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreMinimizedChildSeq, "ShowWindow(hwnd, SW_RESTORE): minimized child", FALSE); + DestroyWindow(hchild); + + DestroyWindow(hwnd); + flush_sequence(); } static void test_sys_menu(void) @@ -15385,6 +15511,39 @@ static const struct message WmRestoreMinimizedOverlappedSeq[] = { 0 } }; +/* DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0) to an active minimized window */ +static const struct message WmRestoreActiveMinimizedOverlappedSeq[] = +{ + { HCBT_SYSCOMMAND, hook|wparam|lparam, SC_RESTORE, 0 }, + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent }, + /* Note this WM_ACTIVATE messages even if the window is already active */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -15446,7 +15605,15 @@ static void test_defwinproc(void) DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); flush_events(); ok_sequence(WmRestoreMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); flush_sequence(); + DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); + flush_events(); + ok_sequence(WmRestoreActiveMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):active minimized overlapped", TRUE); GetCursorPos(&pos); GetWindowRect(hwnd, &rect); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index bbbab60fbe..6c1cd1a037 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1182,7 +1182,14 @@ static BOOL show_window( HWND hwnd, INT cmd ) else WIN_ReleasePtr( wndPtr ); /* if previous state was minimized Windows sets focus to the window */ - if (style & WS_MINIMIZE) SetFocus( hwnd ); + if (style & WS_MINIMIZE) + { + SetFocus( hwnd ); + /* Send a WM_ACTIVATE message for a visible top level window, even if the window is already active */ + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!(style & (WS_CHILD | WS_MINIMIZE)) && (style & WS_VISIBLE) && !(swp & SWP_NOACTIVATE)) + SendMessageW( hwnd, WM_ACTIVATE, WA_ACTIVE, 0 ); + } done: SetThreadDpiAwarenessContext( context ); -- 2.23.0.rc1

3 3

[PATCH 1/5] amstream: Get rid of the AudioMediaStreamImpl typedef.
by Zebediah Figura 05 Sep '19

05 Sep '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/amstream/audiostream.c | 69 +++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index bae4d5fae2b..683ab7d3c66 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -168,10 +168,11 @@ struct AudioMediaStreamImpl; typedef struct { BaseInputPin pin; - struct AudioMediaStreamImpl *parent; + struct audio_stream *parent; } AudioMediaStreamInputPin; -typedef struct AudioMediaStreamImpl { +struct audio_stream +{ IAMMediaStream IAMMediaStream_iface; IAudioMediaStream IAudioMediaStream_iface; LONG ref; @@ -180,18 +181,18 @@ typedef struct AudioMediaStreamImpl { STREAM_TYPE stream_type; AudioMediaStreamInputPin *input_pin; CRITICAL_SECTION critical_section; -} AudioMediaStreamImpl; +}; -static inline AudioMediaStreamImpl *impl_from_AudioMediaStream_IAMMediaStream(IAMMediaStream *iface) +static inline struct audio_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) { - return CONTAINING_RECORD(iface, AudioMediaStreamImpl, IAMMediaStream_iface); + return CONTAINING_RECORD(iface, struct audio_stream, IAMMediaStream_iface); } /*** IUnknown methods ***/ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_QueryInterface(IAMMediaStream *iface, REFIID riid, void **ret_iface) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ret_iface); @@ -228,7 +229,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_QueryInterface(IAMMedi static ULONG WINAPI AudioMediaStreamImpl_IAMMediaStream_AddRef(IAMMediaStream *iface) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); @@ -238,7 +239,7 @@ static ULONG WINAPI AudioMediaStreamImpl_IAMMediaStream_AddRef(IAMMediaStream *i static ULONG WINAPI AudioMediaStreamImpl_IAMMediaStream_Release(IAMMediaStream *iface) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); @@ -257,7 +258,7 @@ static ULONG WINAPI AudioMediaStreamImpl_IAMMediaStream_Release(IAMMediaStream * static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, IMultiMediaStream** multi_media_stream) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); @@ -273,7 +274,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IA static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface, MSPID *purpose_id, STREAM_TYPE *type) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); TRACE("(%p/%p)->(%p,%p)\n", This, iface, purpose_id, type); @@ -288,7 +289,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMedi static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SetSameFormat(IAMMediaStream *iface, IMediaStream *pStreamThatHasDesiredFormat, DWORD flags) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%p,%x) stub!\n", This, iface, pStreamThatHasDesiredFormat, flags); @@ -298,7 +299,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SetSameFormat(IAMMedia static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_AllocateSample(IAMMediaStream *iface, DWORD flags, IStreamSample **sample) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%x,%p) stub!\n", This, iface, flags, sample); @@ -308,7 +309,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_AllocateSample(IAMMedi static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_CreateSharedSample(IAMMediaStream *iface, IStreamSample *existing_sample, DWORD flags, IStreamSample **sample) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, existing_sample, flags, sample); @@ -317,7 +318,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_CreateSharedSample(IAM static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SendEndOfStream(IAMMediaStream *iface, DWORD flags) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%x) stub!\n", This, iface, flags); @@ -328,7 +329,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SendEndOfStream(IAMMed static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_Initialize(IAMMediaStream *iface, IUnknown *source_object, DWORD flags, REFMSPID purpose_id, const STREAM_TYPE stream_type) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%p,%x,%p,%u) stub!\n", This, iface, source_object, flags, purpose_id, stream_type); @@ -337,7 +338,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_Initialize(IAMMediaStr static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SetState(IAMMediaStream *iface, FILTER_STATE state) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%u) stub!\n", This, iface, state); @@ -346,7 +347,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_SetState(IAMMediaStrea static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinAMMultiMediaStream(IAMMediaStream *iface, IAMMultiMediaStream *am_multi_media_stream) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%p) stub!\n", This, iface, am_multi_media_stream); @@ -355,7 +356,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinAMMultiMediaStream static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMediaStreamFilter *media_stream_filter) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); TRACE("(%p/%p)->(%p)\n", This, iface, media_stream_filter); @@ -366,7 +367,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinFilter(IAMMediaStr static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *filtergraph) { - AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); + struct audio_stream *This = impl_from_IAMMediaStream(iface); FIXME("(%p/%p)->(%p) stub!\n", This, iface, filtergraph); @@ -394,30 +395,30 @@ static const struct IAMMediaStreamVtbl AudioMediaStreamImpl_IAMMediaStream_Vtbl AudioMediaStreamImpl_IAMMediaStream_JoinFilterGraph }; -static inline AudioMediaStreamImpl *impl_from_IAudioMediaStream(IAudioMediaStream *iface) +static inline struct audio_stream *impl_from_IAudioMediaStream(IAudioMediaStream *iface) { - return CONTAINING_RECORD(iface, AudioMediaStreamImpl, IAudioMediaStream_iface); + return CONTAINING_RECORD(iface, struct audio_stream, IAudioMediaStream_iface); } /*** IUnknown methods ***/ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_QueryInterface(IAudioMediaStream *iface, REFIID riid, void **ret_iface) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ret_iface); return IAMMediaStream_QueryInterface(&This->IAMMediaStream_iface, riid, ret_iface); } static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_AddRef(IAudioMediaStream *iface) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); TRACE("(%p/%p)\n", iface, This); return IAMMediaStream_AddRef(&This->IAMMediaStream_iface); } static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_Release(IAudioMediaStream *iface) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); TRACE("(%p/%p)\n", iface, This); return IAMMediaStream_Release(&This->IAMMediaStream_iface); } @@ -426,7 +427,7 @@ static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_Release(IAudioMediaSt static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream(IAudioMediaStream *iface, IMultiMediaStream **multi_media_stream) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); TRACE("(%p/%p)->(%p)\n", iface, This, multi_media_stream); @@ -442,7 +443,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetInformation(IAudioMediaStream *iface, MSPID *purpose_id, STREAM_TYPE *type) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); TRACE("(%p/%p)->(%p,%p)\n", iface, This, purpose_id, type); @@ -457,7 +458,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetInformation(IAud static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_SetSameFormat(IAudioMediaStream *iface, IMediaStream *stream_format, DWORD flags) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); FIXME("(%p/%p)->(%p,%x) stub!\n", iface, This, stream_format, flags); @@ -467,7 +468,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_SetSameFormat(IAudi static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_AllocateSample(IAudioMediaStream *iface, DWORD flags, IStreamSample **sample) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); FIXME("(%p/%p)->(%x,%p) stub!\n", iface, This, flags, sample); @@ -477,7 +478,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_AllocateSample(IAud static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_CreateSharedSample(IAudioMediaStream *iface, IStreamSample *existing_sample, DWORD flags, IStreamSample **sample) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); FIXME("(%p/%p)->(%p,%x,%p) stub!\n", iface, This, existing_sample, flags, sample); @@ -487,7 +488,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_CreateSharedSample( static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_SendEndOfStream(IAudioMediaStream *iface, DWORD flags) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); FIXME("(%p/%p)->(%x) stub!\n", iface, This, flags); @@ -497,7 +498,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_SendEndOfStream(IAu /*** IAudioMediaStream methods ***/ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetFormat(IAudioMediaStream *iface, WAVEFORMATEX *wave_format_current) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format_current); @@ -510,7 +511,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetFormat(IAudioMed static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_SetFormat(IAudioMediaStream *iface, const WAVEFORMATEX *wave_format) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format); @@ -520,7 +521,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_SetFormat(IAudioMed static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_CreateSample(IAudioMediaStream *iface, IAudioData *audio_data, DWORD flags, IAudioStreamSample **sample) { - AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *This = impl_from_IAudioMediaStream(iface); TRACE("(%p/%p)->(%p,%u,%p)\n", iface, This, audio_data, flags, sample); @@ -796,7 +797,7 @@ static const BaseInputPinFuncTable AudioMediaStreamInputPin_FuncTable = HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) { - AudioMediaStreamImpl *object; + struct audio_stream *object; PIN_INFO pin_info; HRESULT hr; -- 2.22.0

1 4

[PATCH] hhctrl.ocx: Simplify extracting the help filename. (Coverity)
by Alistair Leslie-Hughes 05 Sep '19

05 Sep '19

CID 1453500 CID 1453489 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/hhctrl.ocx/hhctrl.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 6a98ae4f2e..bd7dfa4230 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -100,7 +100,6 @@ static const char *command_to_string(UINT command) static BOOL resolve_filename(const WCHAR *env_filename, WCHAR *fullname, DWORD buflen, WCHAR **index, WCHAR **window) { const WCHAR *extra; - WCHAR chm_file[MAX_PATH]; static const WCHAR helpW[] = {'\\','h','e','l','p','\\',0}; static const WCHAR delimW[] = {':',':',0}; @@ -128,9 +127,7 @@ static BOOL resolve_filename(const WCHAR *env_filename, WCHAR *fullname, DWORD b extra = wcsstr(filename, delim2W); if (extra) { - memcpy(chm_file, filename, (extra-filename)*sizeof(WCHAR)); - chm_file[extra-filename] = 0; - filename = chm_file; + filename[extra-filename] = 0; if (window) *window = strdupW(extra+1); } @@ -138,10 +135,7 @@ static BOOL resolve_filename(const WCHAR *env_filename, WCHAR *fullname, DWORD b extra = wcsstr(filename, delimW); if (extra) { - if (filename != chm_file) - memcpy(chm_file, filename, (extra-filename)*sizeof(WCHAR)); - chm_file[extra-filename] = 0; - filename = chm_file; + filename[extra-filename] = 0; if (index) *index = strdupW(extra+2); } -- 2.17.1

1 0

[PATCH] d3dx9_36/tests: Spelling fixes in ok() messages.
by Francois Gouget 04 Sep '19

04 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3dx9_36/tests/shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index b67ffb209c4..e6326bc4119 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1491,7 +1491,7 @@ static void test_setting_constants(void) ok(refcnt == 0, "The Direct3D device reference count was %u, should be 0\n", refcnt); refcnt = IDirect3D9_Release(d3d); - ok(refcnt == 0, "The Direct3D object referenct count was %u, should be 0\n", refcnt); + ok(refcnt == 0, "The Direct3D object reference count was %u, should be 0\n", refcnt); if (wnd) DestroyWindow(wnd); } @@ -6170,7 +6170,7 @@ static void test_registerset(void) ok(count == 0, "The Direct3D device reference count was %u, should be 0\n", count); count = IDirect3D9_Release(d3d); - ok(count == 0, "The Direct3D object referenct count was %u, should be 0\n", count); + ok(count == 0, "The Direct3D object reference count was %u, should be 0\n", count); if (wnd) DestroyWindow(wnd); } @@ -6407,7 +6407,7 @@ static void test_registerset_defaults(void) ok(count == 0, "The Direct3D device reference count was %u, should be 0\n", count); count = IDirect3D9_Release(d3d); - ok(count == 0, "The Direct3D object referenct count was %u, should be 0\n", count); + ok(count == 0, "The Direct3D object reference count was %u, should be 0\n", count); if (wnd) DestroyWindow(wnd); } -- 2.20.1

2 1

[PATCH 2/2] ucrtbase: Add strtoumax and _strtoumax_l.
by Akihiro Sagawa 04 Sep '19

04 Sep '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

2 1

[PATCH 1/2] ucrtbase: Add strtoimax and _strtoimax_l.
by Akihiro Sagawa 04 Sep '19

04 Sep '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

2 1

[PATCH] d3d10/tests: Spelling fixes in ok() messages.
by Francois Gouget 04 Sep '19

04 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3d10/tests/device.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index d5ba0c18182..c712d400257 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -90,33 +90,33 @@ static void test_stateblock_mask(void) ok(result.VS == 0x66, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0x33, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskDifference(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, &result); ok(SUCCEEDED(hr), "D3D10StateBlockMaskIntersect failed, hr %#x.\n", hr); ok(result.VS == 0x11, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0x88, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskIntersect(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, &result); ok(SUCCEEDED(hr), "D3D10StateBlockMaskUnion failed, hr %#x.\n", hr); ok(result.VS == 0x77, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0xbb, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskUnion(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); memset(&result, 0xff, sizeof(result)); hr = D3D10StateBlockMaskDisableAll(&result); @@ -124,7 +124,7 @@ static void test_stateblock_mask(void) ok(!result.VS, "Got unexpected result.VS %#x.\n", result.VS); ok(!result.Predication, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskDisableAll(NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); memset(&result, 0, sizeof(result)); hr = D3D10StateBlockMaskEnableAll(&result); @@ -132,28 +132,28 @@ static void test_stateblock_mask(void) ok(result.VS == 0xff, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0xff, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskEnableAll(NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); result.VS = 0xff; hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 1); ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); ok(result.VS == 0xfe, "Got unexpected result.VS %#x.\n", result.VS); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 4); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 1, 1); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskDisableCapture(NULL, D3D10_DST_VS, 0, 1); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); result.VS = 0; hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 0, 1); ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableCapture failed, hr %#x.\n", hr); ok(result.VS == 0x01, "Got unexpected result.VS %#x.\n", result.VS); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 0, 4); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 1, 1); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskEnableCapture(NULL, D3D10_DST_VS, 0, 1); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(capture_test); ++i) { memset(&result, 0xff, sizeof(result)); @@ -162,7 +162,7 @@ static void test_stateblock_mask(void) ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); ok(!memcmp(result.VSShaderResources, capture_test[i].expected_disable, 5), - "Got unexpect result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", + "Got unexpected result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", result.VSShaderResources[0], result.VSShaderResources[1], result.VSShaderResources[2], result.VSShaderResources[3], result.VSShaderResources[4], i); @@ -173,7 +173,7 @@ static void test_stateblock_mask(void) ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableCapture failed, hr %#x.\n", hr); ok(!memcmp(result.VSShaderResources, capture_test[i].expected_enable, 5), - "Got unexpect result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", + "Got unexpected result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", result.VSShaderResources[0], result.VSShaderResources[1], result.VSShaderResources[2], result.VSShaderResources[3], result.VSShaderResources[4], i); -- 2.20.1

2 1

[PATCH] d3d9/tests: Spelling fixes in ok() messages and a comment.
by Francois Gouget 04 Sep '19

04 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3d9/tests/d3d9ex.c | 8 ++++---- dlls/d3d9/tests/device.c | 8 ++++---- dlls/d3d9/tests/visual.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 354a51d85a1..2639d20332b 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2986,7 +2986,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); /* In d3d9ex the device and focus windows have to be minimized and restored, @@ -3015,7 +3015,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == d3d_width - && devmode.dmPelsHeight == d3d_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == d3d_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = reset_device(device, &device_desc); @@ -3039,8 +3039,8 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); - ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpect width %u.\n", devmode.dmPelsWidth); - ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect height %u.\n", devmode.dmPelsHeight); + ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpected width %u.\n", devmode.dmPelsWidth); + ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected height %u.\n", devmode.dmPelsHeight); /* SW_SHOWMINNOACTIVE is needed to make FVWM happy. SW_SHOWNOACTIVATE is needed to make windows * send SIZE_RESTORED after ShowWindow(SW_SHOWMINNOACTIVE). */ diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f05aded3815..1e8133b0c8e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4015,7 +4015,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); /* This is needed on native with D3DCREATE_NOWINDOWCHANGES, and it needs to be @@ -4050,7 +4050,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = reset_device(device, &device_desc); @@ -4074,8 +4074,8 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); - ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpect width %u.\n", devmode.dmPelsWidth); - ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect height %u.\n", devmode.dmPelsHeight); + ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpected width %u.\n", devmode.dmPelsWidth); + ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected height %u.\n", devmode.dmPelsHeight); /* SW_SHOWMINNOACTIVE is needed to make FVWM happy. SW_SHOWNOACTIVATE is needed to make windows * send SIZE_RESTORED after ShowWindow(SW_SHOWMINNOACTIVE). */ diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 990702883a4..121b50f42af 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14139,7 +14139,7 @@ static void sincos_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_Present returned %#x.\n", hr); - /* TODO: Find a way to properly validate the lines. Precicion issues make this a kinda nasty task */ + /* TODO: Find a way to properly validate the lines. Precision issues make this a kinda nasty task */ IDirect3DVertexShader9_Release(sin_shader); IDirect3DVertexShader9_Release(cos_shader); -- 2.20.1

3 2

[PATCH] d3d8/tests: Spelling fixes in ok() messages.
by Francois Gouget 04 Sep '19

04 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3d8/tests/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 1e7b9888b62..819c1cd9443 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2987,7 +2987,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); /* I have to minimize and restore the focus window, otherwise native d3d8 fails @@ -3011,7 +3011,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = reset_device(device, &device_desc); @@ -3035,8 +3035,8 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); - ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpect width %u.\n", devmode.dmPelsWidth); - ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect height %u.\n", devmode.dmPelsHeight); + ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpected width %u.\n", devmode.dmPelsWidth); + ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected height %u.\n", devmode.dmPelsHeight); /* SW_SHOWMINNOACTIVE is needed to make FVWM happy. SW_SHOWNOACTIVATE is needed to make windows * send SIZE_RESTORED after ShowWindow(SW_SHOWMINNOACTIVE). */ -- 2.20.1

3 2

[PATCH 1/2] kernel32/locale: Set whether we used the default char when using Unix codepage.
by Gabriel Ivăncescu 04 Sep '19

04 Sep '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index b546cb0..2698b3d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2726,6 +2726,7 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, { ret = wine_cp_wcstombs( unix_cptable, flags, src, srclen, dst, dstlen, defchar, used ? &used_tmp : NULL ); + if (used) *used = used_tmp; break; } /* fall through */ -- 2.21.0

2 3

Possible WideCharToMultiByte CP_UNIXCP bug
by Gabriel Ivăncescu 04 Sep '19

04 Sep '19

Hi, In the course of investigating why patch 169366 fails on test VMs with locales, I found out a possible bug or quirk in Wine's implementation of CP_UNIXCP. Since this code page is not found on Windows, I cannot know what is "correct" behavior here. So, WideCharToMultiByte(CP_UNIXCP, ...) with a locale doesn't seem to use CP_UTF8, but instead uses unix_cptable. The problem seems to be in the fact that the 'used' parameter is *never* set in this case. It passes 'used ? &used_tmp : NULL' and then breaks out of the switch -- and the 'if (used) *used = used_tmp;' statement only applies in the default case of the switch. So I'm basically using an uninitialized variable. Is this intended, or a bug? What should I do then for patch 169365? Should I simply use CP_UTF8 or ignore the 'used' parameter? Or perhaps fix this bug and set the 'used' parameter properly for CP_UNIXCP in the implementation of WideCharToMultiByte? Is there a reason it is even using used_tmp in the first place? Thanks, Gabriel

2 2

[PATCH resend] winex11.drv: Try harder to grab pointer.
by Zhiyi Zhang 04 Sep '19

04 Sep '19

Some window managers temporarily grab the pointer during window transition. We need to wait a while for window manager to release its grab, otherwise XGrabPointer may fail with AlreadyGrabbed, causing cursor clipping to fail. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index f737a306a5..7501959369 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -378,9 +378,13 @@ static BOOL grab_clipping_window( const RECT *clip ) { static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; struct x11drv_thread_data *data = x11drv_thread_data(); + static DWORD timeout = 5000; + static DWORD step = 100; + DWORD time = 0; Window clip_window; HWND msg_hwnd = 0; POINT pos; + INT ret; if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) return TRUE; /* don't clip in the desktop process */ @@ -416,13 +420,24 @@ static BOOL grab_clipping_window( const RECT *clip ) clip->right < clip_rect.right || clip->bottom < clip_rect.bottom) data->warp_serial = NextRequest( data->display ); - if (!XGrabPointer( data->display, clip_window, False, - PointerMotionMask | ButtonPressMask | ButtonReleaseMask, - GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) + /* Some windows managers temporarily grab the pointer during window transition. Retry grabbing. */ + do + { + ret = XGrabPointer( data->display, clip_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime ); + if (ret == AlreadyGrabbed || ret == GrabFrozen) + { + time += step; + Sleep(step); + } + } while ((ret == AlreadyGrabbed || ret == GrabFrozen) && time < timeout); + + if (ret == GrabSuccess) clipping_cursor = TRUE; if (!clipping_cursor) { + ERR("Failed to grab pointer\n"); disable_xinput2(); DestroyWindow( msg_hwnd ); return FALSE; -- 2.23.0.rc1

2 2

[PATCH] testbot: Switch to the zstd compression algorithm in BackupVM.
by Francois Gouget 04 Sep '19

04 Sep '19

This requires borgbackup >= 1.1.4 (e.g. from Debian 10). The compression drops a few percentage points compared to the previous lzma settings but this makes restoration much faster. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/BackupVM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/scripts/BackupVM b/testbot/scripts/BackupVM index d7e54839..124e222d 100755 --- a/testbot/scripts/BackupVM +++ b/testbot/scripts/BackupVM @@ -318,7 +318,7 @@ if [ -n "$opt_borg" ] then borg_opts="" [ -n "$opt_verbose" ] && borg_opts="$borg_opts --verbose" - dry_run $nice borg create --progress --stats -C lzma,9 \ + dry_run $nice borg create --progress --stats -C zstd,22 \ "$opt_borg::$backup" $all_paths rc_borg=$? if [ $rc_borg -ne 0 ] -- 2.20.1

1 0

[PATCH 1/2] testbot: Centralize the $PATH cleanup.
by Francois Gouget 04 Sep '19

04 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 1 - testbot/bin/Janitor.pl | 2 -- testbot/bin/LibvirtTool.pl | 2 -- testbot/bin/WineRunBuild.pl | 2 -- testbot/bin/WineRunReconfig.pl | 2 -- testbot/bin/WineRunTask.pl | 2 -- testbot/bin/WineRunWineTest.pl | 2 -- testbot/bin/WineSendLog.pl | 2 -- testbot/lib/WineTestBot/Config.pm | 2 ++ testbot/lib/WineTestBot/VMs.pm | 1 - testbot/scripts/CheckWineTestBot.pl | 2 -- 11 files changed, 2 insertions(+), 18 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 9ffdf968..81d3afc6 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -741,7 +741,6 @@ sub main() exit 1; } - $ENV{PATH} = "/usr/bin:/bin"; $SIG{CHLD} = \&REAPER; $WineTestBot::Engine::Notify::RunningInEngine = 1; diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index e7662852..537a0dc4 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -76,8 +76,6 @@ sub Error(@) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - # Grab the command line options my ($Usage, $DryRun); while (@ARGV) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index a078fcbd..4000c147 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -87,8 +87,6 @@ EOF # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - # Grab the command line options my ($Usage, $Action, $VMKey); while (@ARGV) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index b1349f0d..fdcf770b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -72,8 +72,6 @@ sub Error(@) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index dcf36f8a..44919fa6 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -73,8 +73,6 @@ sub Error(@) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index e6112fd8..6a718494 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -103,8 +103,6 @@ sub TakeScreenshot($$) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index a74877a8..74b974ae 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -102,8 +102,6 @@ sub TakeScreenshot($$) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 28644fb8..721122ed 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -406,8 +406,6 @@ EOF # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index d6267dee..b72968c0 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -71,6 +71,8 @@ $BinDir = "$::RootDir/bin"; # Sanitize the environment for system() & co delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; # from perlsec +$ENV{PATH} = "/usr/bin:/bin"; + # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 67705474..5d738e2a 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -447,7 +447,6 @@ sub Run($$$$$$) WineTestBot::Log::LogMsg("Starting child: @$Args\n"); $ChildSetup->($VM, $SetupData); - $ENV{PATH} = "/usr/bin:/bin"; exec(@$Args) or WineTestBot::Log::LogMsg("Unable to exec $Tool: $!\n"); diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index 0af2550c..3ca4fde9 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -38,8 +38,6 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Engine::Notify; -$ENV{PATH} = "/usr/bin:/bin"; - my $rc = 0; if (! PingEngine()) { -- 2.20.1

1 1

[PATCH v3] dsound/tests: Add effect parameters tests.
by Alistair Leslie-Hughes 04 Sep '19

04 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/tests/dsound8.c | 316 ++++++++++++++++++++++++++++++++++++ 1 file changed, 316 insertions(+) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index fabd8a037e1..6ed32abbcb5 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1375,6 +1375,321 @@ static void test_effects(void) while (IDirectSound8_Release(dso)); } +static void test_echo_parameters(IDirectSoundBuffer8 *secondary8) +{ + HRESULT rc; + IDirectSoundFXEcho *echo; + + rc = IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_ECHO, 0, &IID_IDirectSoundFXEcho, (void**)&echo); + ok(rc == DS_OK, "GetObjectInPath failed: %08x\n", rc); + if (rc == DS_OK) + { + DSFXEcho params; + + rc = IDirectSoundFXEcho_GetAllParameters(echo, &params); + todo_wine ok(rc == DS_OK, "Failed: %08x\n", rc); + if (rc == DS_OK ) + { + ok(params.fWetDryMix == 50.0f, "got %f\n", params.fWetDryMix); + ok(params.fFeedback == 50.0f, "got %f\n", params.fFeedback); + ok(params.fLeftDelay == 500.0f,"got %f\n", params.fLeftDelay); + ok(params.fRightDelay == 500.0f,"got %f\n", params.fRightDelay); + ok(params.lPanDelay == 0, "got %d\n", params.lPanDelay); + } + + IDirectSoundFXEcho_Release(echo); + } +} + +static void test_gargle_parameters(IDirectSoundBuffer8 *secondary8) +{ + HRESULT rc; + IDirectSoundFXGargle *gargle; + + rc = IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_GARGLE, 0, &IID_IDirectSoundFXGargle, (void**)&gargle); + todo_wine ok(rc == DS_OK, "GetObjectInPath failed: %08x\n", rc); + if (rc == DS_OK) + { + DSFXGargle params; + + rc = IDirectSoundFXGargle_GetAllParameters(gargle, &params); + todo_wine ok(rc == DS_OK, "Failed: %08x\n", rc); + if (rc == DS_OK) + { + ok(params.dwRateHz == 20, "got %d\n", params.dwRateHz); + ok(params.dwWaveShape == DSFXGARGLE_WAVE_TRIANGLE, "got %d\n", params.dwWaveShape); + } + + IDirectSoundFXGargle_Release(gargle); + } +} + +static void test_chorus_parameters(IDirectSoundBuffer8 *secondary8) +{ + HRESULT rc; + IDirectSoundFXChorus *chorus; + + rc = IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_CHORUS, 0, &IID_IDirectSoundFXChorus,(void**)&chorus); + todo_wine ok(rc == DS_OK, "GetObjectInPath failed: %08x\n", rc); + if (rc == DS_OK) + { + DSFXChorus params; + + rc = IDirectSoundFXChorus_GetAllParameters(chorus, &params); + todo_wine ok(rc == DS_OK, "Failed: %08x\n", rc); + if (rc == DS_OK) + { + ok(params.fWetDryMix == 50.0f, "got %f\n", params.fWetDryMix); + ok(params.fDepth == 10.0f, "got %f\n", params.fDepth); + ok(params.fFeedback == 25.0f, "got %f\n", params.fFeedback); + ok(params.fFrequency == 1.1f, "got %f\n", params.fFrequency); + ok(params.lWaveform == DSFXCHORUS_WAVE_SIN, "got %d\n", params.lWaveform); + ok(params.fDelay == 16.0f, "got %f\n", params.fDelay); + ok(params.lPhase == 3, "got %d\n", params.lPhase); + } + + IDirectSoundFXChorus_Release(chorus); + } +} + +static void test_flanger_parameters(IDirectSoundBuffer8 *secondary8) +{ + HRESULT rc; + IDirectSoundFXFlanger *flanger; + + rc = IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_FLANGER, 0, &IID_IDirectSoundFXFlanger,(void**)&flanger); + todo_wine ok(rc == DS_OK, "GetObjectInPath failed: %08x\n", rc); + if (rc == DS_OK) + { + DSFXFlanger params; + + rc = IDirectSoundFXFlanger_GetAllParameters(flanger, &params); + todo_wine ok(rc == DS_OK, "Failed: %08x\n", rc); + if (rc == DS_OK) + { + ok(params.fWetDryMix == 50.0f, "got %f\n", params.fWetDryMix); + ok(params.fDepth == 100.0f, "got %f\n", params.fDepth); + ok(params.fFeedback == -50.0f, "got %f\n", params.fFeedback); + ok(params.fFrequency == 0.25f, "got %f\n", params.fFrequency); + ok(params.lWaveform == DSFXFLANGER_WAVE_SIN, "got %d\n", params.lWaveform); + ok(params.fDelay == 2.0f, "got %f\n", params.fDelay); + ok(params.lPhase == 2, "got %d\n", params.lPhase); + } + + IDirectSoundFXFlanger_Release(flanger); + } +} + +static void test_distortion_parameters(IDirectSoundBuffer8 *secondary8) +{ + HRESULT rc; + IDirectSoundFXDistortion *distortion; + + rc = IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_DISTORTION, 0, &IID_IDirectSoundFXDistortion,(void**)&distortion); + todo_wine ok(rc == DS_OK, "GetObjectInPath failed: %08x\n", rc); + if (rc == DS_OK) + { + DSFXDistortion params; + + rc = IDirectSoundFXDistortion_GetAllParameters(distortion, &params); + todo_wine ok(rc == DS_OK, "Failed: %08x\n", rc); + if (rc == DS_OK) + { + ok(params.fGain == -18.0f, "got %f\n", params.fGain); + ok(params.fEdge == 15.0f, "got %f\n", params.fEdge); + ok(params.fPostEQCenterFrequency == 2400.0f, "got %f\n", params.fPostEQCenterFrequency); + ok(params.fPostEQBandwidth == 2400.0f, "got %f\n", params.fPostEQBandwidth); + ok(params.fPreLowpassCutoff == 3675.0f, "got %f\n", params.fPreLowpassCutoff); + } + + IDirectSoundFXDistortion_Release(distortion); + } +} + +static void test_compressor_parameters(IDirectSoundBuffer8 *secondary8) +{ + HRESULT rc; + IDirectSoundFXCompressor *compressor; + + rc = IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_COMPRESSOR, 0, &IID_IDirectSoundFXCompressor,(void**)&compressor); + todo_wine ok(rc == DS_OK, "GetObjectInPath failed: %08x\n", rc); + if (rc == DS_OK) + { + DSFXCompressor params; + + rc = IDirectSoundFXCompressor_GetAllParameters(compressor, &params); + todo_wine ok(rc == DS_OK, "Failed: %08x\n", rc); + if (rc == DS_OK) + { + ok(params.fGain == 0.0f, "got %f\n", params.fGain); + ok(params.fAttack == 10.0f, "got %f\n", params.fAttack); + ok(params.fThreshold == -20.0f, "got %f\n", params.fThreshold); + ok(params.fRatio == 3.0f, "got %f\n", params.fRatio); + ok(params.fPredelay == 4.0f, "got %f\n", params.fPredelay); + } + + IDirectSoundFXCompressor_Release(compressor); + } +} + +static void test_parameq_parameters(IDirectSoundBuffer8 *secondary8) +{ + HRESULT rc; + IDirectSoundFXParamEq *parameq; + + rc = IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_PARAMEQ, 0, &IID_IDirectSoundFXParamEq,(void**)&parameq); + todo_wine ok(rc == DS_OK, "GetObjectInPath failed: %08x\n", rc); + if (rc == DS_OK) + { + DSFXParamEq params; + + rc = IDirectSoundFXParamEq_GetAllParameters(parameq, &params); + todo_wine ok(rc == DS_OK, "Failed: %08x\n", rc); + if (rc == DS_OK) + { + ok(params.fCenter == 3675.0f, "got %f\n", params.fCenter); + ok(params.fBandwidth == 12.0f, "got %f\n", params.fBandwidth); + ok(params.fGain == 0.0f, "got %f\n", params.fGain); + } + + IDirectSoundFXParamEq_Release(parameq); + } +} + +static void test_reverb_parameters(IDirectSoundBuffer8 *secondary8) +{ + HRESULT rc; + IDirectSoundFXI3DL2Reverb *reverb; + + rc = IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IDirectSoundFXI3DL2Reverb, (void**)&reverb); + todo_wine ok(rc == DS_OK, "GetObjectInPath failed: %08x\n", rc); + if (rc == DS_OK) + { + DSFXI3DL2Reverb params; + + rc = IDirectSoundFXI3DL2Reverb_GetAllParameters(reverb, &params); + todo_wine ok(rc == DS_OK, "Failed: %08x\n", rc); + if (rc == DS_OK) + { + ok(params.lRoom == -1000, "got %d\n", params.lRoom); + ok(params.flRoomRolloffFactor == 0.0f, "got %f\n", params.flRoomRolloffFactor); + ok(params.flDecayTime == 1.49f, "got %f\n", params.flDecayTime); + ok(params.flDecayHFRatio == 0.83f, "got %f\n", params.flDecayHFRatio); + ok(params.lReflections == -2602, "got %d\n", params.lReflections); + ok(params.lReverb == 200, "got %d\n", params.lReverb); + ok(params.flReverbDelay == 0.011f, "got %f\n", params.flReverbDelay); + ok(params.flDiffusion == 100.0f, "got %f\n", params.flDiffusion); + ok(params.flDensity == 100.0f, "got %f\n", params.flDensity); + ok(params.flHFReference == 5000.0f, "got %f\n", params.flHFReference); + } + + IDirectSoundFXI3DL2Reverb_Release(reverb); + } +} + +static void test_effects_parameters(void) +{ + HRESULT rc; + IDirectSound8 *dso; + IDirectSoundBuffer *primary, *secondary = NULL; + IDirectSoundBuffer8 *secondary8 = NULL; + DSBUFFERDESC bufdesc; + WAVEFORMATEX wfx; + DSEFFECTDESC effects[8]; + DWORD resultcodes[8]; + + /* Create a DirectSound8 object */ + rc = pDirectSoundCreate8(NULL, &dso, NULL); + ok(rc == DS_OK || rc == DSERR_NODRIVER, "DirectSoundCreate8() failed: %08x\n", rc); + if (rc != DS_OK) + return; + + rc = IDirectSound8_SetCooperativeLevel(dso, get_hwnd(), DSSCL_PRIORITY); + ok(rc == DS_OK, "IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + if (rc != DS_OK) + goto cleanup; + + primary = NULL; + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_PRIMARYBUFFER; + rc = IDirectSound8_CreateSoundBuffer(dso, &bufdesc, &primary, NULL); + ok((rc == DS_OK && primary != NULL), "Failed to create a primary buffer: %08x\n", rc); + if (rc != DS_OK) + goto cleanup; + + init_format(&wfx, WAVE_FORMAT_PCM, 11025, 8, 1); + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwBufferBytes = align(wfx.nAvgBytesPerSec * BUFFER_LEN / 1000, wfx.nBlockAlign); + bufdesc.lpwfxFormat=&wfx; + + ZeroMemory(effects, sizeof(effects)); + effects[0].dwSize=sizeof(effects[0]); + effects[0].guidDSFXClass=GUID_DSFX_STANDARD_ECHO; + effects[1].dwSize=sizeof(effects[0]); + effects[1].guidDSFXClass=GUID_DSFX_STANDARD_GARGLE; + effects[2].dwSize=sizeof(effects[0]); + effects[2].guidDSFXClass=GUID_DSFX_STANDARD_CHORUS; + effects[3].dwSize=sizeof(effects[0]); + effects[3].guidDSFXClass=GUID_DSFX_STANDARD_FLANGER; + effects[4].dwSize=sizeof(effects[0]); + effects[4].guidDSFXClass=GUID_DSFX_STANDARD_DISTORTION; + effects[5].dwSize=sizeof(effects[0]); + effects[5].guidDSFXClass=GUID_DSFX_STANDARD_COMPRESSOR; + effects[6].dwSize=sizeof(effects[0]); + effects[6].guidDSFXClass=GUID_DSFX_STANDARD_PARAMEQ; + effects[7].dwSize=sizeof(effects[0]); + effects[7].guidDSFXClass=GUID_DSFX_STANDARD_I3DL2REVERB; + + bufdesc.dwFlags = DSBCAPS_CTRLFX; + rc = IDirectSound8_CreateSoundBuffer(dso, &bufdesc, &secondary, NULL); + ok(rc == DS_OK && secondary != NULL, "Failed to create a secondary buffer: %08x\n",rc); + if (rc != DS_OK || !secondary) + goto cleanup; + + rc = IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSoundBuffer8, (void**)&secondary8); + ok(rc == DS_OK, "Failed: %08x\n", rc); + if (rc != DS_OK) + goto cleanup; + + rc = IDirectSoundBuffer8_SetFX(secondary8, ARRAY_SIZE(effects), effects, resultcodes); + ok(rc == DS_OK || rc == REGDB_E_CLASSNOTREG || rc == DSERR_CONTROLUNAVAIL, "Failed: %08x\n", rc); + if (rc != DS_OK) + goto cleanup; + + ok (resultcodes[0] == DSFXR_LOCSOFTWARE || resultcodes[0] == DSFXR_LOCHARDWARE, "Result: %08x\n", resultcodes[0]); + test_echo_parameters(secondary8); + + ok (resultcodes[1] == DSFXR_LOCSOFTWARE || resultcodes[1] == DSFXR_LOCHARDWARE, "Result: %08x\n", resultcodes[1]); + test_gargle_parameters(secondary8); + + ok (resultcodes[2] == DSFXR_LOCSOFTWARE || resultcodes[2] == DSFXR_LOCHARDWARE, "Result: %08x\n", resultcodes[2]); + test_chorus_parameters(secondary8); + + ok (resultcodes[3] == DSFXR_LOCSOFTWARE || resultcodes[3] == DSFXR_LOCHARDWARE, "Result: %08x\n", resultcodes[3]); + test_flanger_parameters(secondary8); + + ok (resultcodes[4] == DSFXR_LOCSOFTWARE || resultcodes[4] == DSFXR_LOCHARDWARE, "Result: %08x\n", resultcodes[4]); + test_distortion_parameters(secondary8); + + ok (resultcodes[5] == DSFXR_LOCSOFTWARE || resultcodes[5] == DSFXR_LOCHARDWARE, "Result: %08x\n", resultcodes[5]); + test_compressor_parameters(secondary8); + + ok (resultcodes[6] == DSFXR_LOCSOFTWARE || resultcodes[6] == DSFXR_LOCHARDWARE, "Result: %08x\n", resultcodes[6]); + test_parameq_parameters(secondary8); + + ok (resultcodes[7] == DSFXR_LOCSOFTWARE || resultcodes[7] == DSFXR_LOCHARDWARE, "Result: %08x\n", resultcodes[7]); + test_reverb_parameters(secondary8); + +cleanup: + if (secondary8) + IDirectSoundBuffer8_Release(secondary8); + if (primary) + IDirectSoundBuffer_Release(primary); + IDirectSound8_Release(dso); +} + START_TEST(dsound8) { HMODULE hDsound; @@ -1397,6 +1712,7 @@ START_TEST(dsound8) test_hw_buffers(); test_first_device(); test_effects(); + test_effects_parameters(); } else skip("DirectSoundCreate8 missing - skipping all tests\n"); -- 2.23.0.rc1

2 1

[PATCH 3/4] localspl: Add support for monitors providing the MONITOR2 interface.
by Dmitry Timoshkov 04 Sep '19

04 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 149 +++++++++++++++++++++++++++++---------- 1 file changed, 111 insertions(+), 38 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 8e5e3428d5..2b3f9bac6e 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -66,9 +66,9 @@ typedef struct { LPWSTR dllname; PMONITORUI monitorUI; LPMONITOR monitor; + LPMONITOR2 monitor2; HMODULE hdll; DWORD refcount; - DWORD dwMonitorSize; } monitor_t; typedef struct { @@ -327,6 +327,10 @@ static void monitor_unload(monitor_t * pm) if (pm->refcount == 0) { list_remove(&pm->entry); + + if (pm->monitor2 && pm->monitor2->pfnShutdown) + pm->monitor2->pfnShutdown(0); + FreeLibrary(pm->hdll); heap_free(pm->name); heap_free(pm->dllname); @@ -378,6 +382,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) monitor_t * cursor; LPWSTR regroot = NULL; LPWSTR driver = dllname; + HKEY hroot = 0; TRACE("(%s, %s)\n", debugstr_w(name), debugstr_w(dllname)); /* Is the Monitor already loaded? */ @@ -402,7 +407,6 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (pm->name == NULL) { /* Load the monitor */ - LPMONITOREX pmonitorEx; DWORD len; if (name) { @@ -413,19 +417,19 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (regroot) { lstrcpyW(regroot, monitorsW); lstrcatW(regroot, name); - /* Get the Driver from the Registry */ - if (driver == NULL) { - HKEY hroot; - DWORD namesize; - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, regroot, &hroot) == ERROR_SUCCESS) { + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, regroot, &hroot) == ERROR_SUCCESS) { + /* Get the Driver from the Registry */ + if (driver == NULL) { + DWORD namesize; if (RegQueryValueExW(hroot, driverW, NULL, NULL, NULL, &namesize) == ERROR_SUCCESS) { driver = heap_alloc(namesize); RegQueryValueExW(hroot, driverW, NULL, NULL, (LPBYTE) driver, &namesize) ; } - RegCloseKey(hroot); } } + else + WARN("%s not found\n", debugstr_w(regroot)); } pm->name = strdupW(name); @@ -471,26 +475,30 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) } } - if (pInitializePrintMonitor && regroot) { - pmonitorEx = pInitializePrintMonitor(regroot); - TRACE("%p: LPMONITOREX from %s,InitializePrintMonitor(%s)\n", - pmonitorEx, debugstr_w(driver), debugstr_w(regroot)); + if (pInitializePrintMonitor2 && hroot) { + MONITORINIT init; + HANDLE hmon; - if (pmonitorEx) { - pm->dwMonitorSize = pmonitorEx->dwMonitorSize; - pm->monitor = &(pmonitorEx->Monitor); - } - } + memset(&init, 0, sizeof(init)); + init.cbSize = sizeof(init); + init.hckRegistryRoot = hroot; + init.bLocal = TRUE; - if (pm->monitor) { - TRACE("0x%08x: dwMonitorSize (%d)\n", pm->dwMonitorSize, pm->dwMonitorSize); + pm->monitor2 = pInitializePrintMonitor2(&init, &hmon); + TRACE("%p: MONITOR2 from %s,InitializePrintMonitor2(%s)\n", + pm->monitor2, debugstr_w(driver), debugstr_w(regroot)); + } + else if (pInitializePrintMonitor && regroot) { + MONITOREX *pmonitorEx; + pmonitorEx = pInitializePrintMonitor(regroot); + TRACE("%p: LPMONITOREX from %s,InitializePrintMonitor(%s)\n", + pm->monitor, debugstr_w(driver), debugstr_w(regroot)); + if (pmonitorEx) + pm->monitor = &pmonitorEx->Monitor; } - if (!pm->monitor && regroot) { - if (pInitializePrintMonitor2 != NULL) { - FIXME("%s,InitializePrintMonitor2 not implemented\n", debugstr_w(driver)); - } + if (!pm->monitor && !pm->monitor2 && regroot) { if (pInitializeMonitorEx != NULL) { FIXME("%s,InitializeMonitorEx not implemented\n", debugstr_w(driver)); } @@ -498,7 +506,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) FIXME("%s,InitializeMonitor not implemented\n", debugstr_w(driver)); } } - if (!pm->monitor && !pm->monitorUI) { + if (!pm->monitor && !pm->monitor2 && !pm->monitorUI) { monitor_unload(pm); SetLastError(ERROR_PROC_NOT_FOUND); pm = NULL; @@ -511,6 +519,7 @@ cleanup: } LeaveCriticalSection(&monitor_handles_cs); if (driver != dllname) heap_free(driver); + if (hroot) RegCloseKey(hroot); heap_free(regroot); TRACE("=> %p\n", pm); return pm; @@ -577,6 +586,18 @@ static monitor_t * monitor_loadui(monitor_t * pm) } /* query the userinterface-dllname from the Portmonitor */ + if (pm->monitor2 && pm->monitor2->pfnXcvDataPort) { + res = pm->monitor2->pfnXcvOpenPort(0, emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + TRACE("got %u with %p\n", res, hXcv); + if (res) { + res = pm->monitor2->pfnXcvDataPort(hXcv, monitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); + TRACE("got %u with %s\n", res, debugstr_w(buffer)); + if (res == ERROR_SUCCESS) pui = monitor_load(NULL, buffer); + pm->monitor2->pfnXcvClosePort(hXcv); + } + return pui; + } + if ((pm->monitor) && (pm->monitor->pfnXcvDataPort)) { /* building (",XcvMonitor %s",pm->name) not needed yet */ res = pm->monitor->pfnXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); @@ -921,7 +942,6 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf DWORD numentries; DWORD entrysize; - TRACE("(%d, %p, %d, %p)\n", level, pPorts, cbBuf, lpreturned); entrysize = (level == 1) ? sizeof(PORT_INFO_1W) : sizeof(PORT_INFO_2W); @@ -934,16 +954,23 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf LIST_FOR_EACH_ENTRY(pm, &monitor_handles, monitor_t, entry) { - if ((pm->monitor) && (pm->monitor->pfnEnumPorts)) { + BOOL (WINAPI *pEnumPorts)(LPWSTR,DWORD,LPBYTE,DWORD,LPDWORD,LPDWORD) = NULL; + + if (pm->monitor2) + pEnumPorts = pm->monitor2->pfnEnumPorts; + else if (pm->monitor) + pEnumPorts = pm->monitor->pfnEnumPorts; + + if (pEnumPorts) { pi_needed = 0; pi_returned = 0; - res = pm->monitor->pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); + res = pEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { /* Do not use heap_realloc (we do not need the old data in the buffer) */ heap_free(pi_buffer); pi_buffer = heap_alloc(pi_needed); pi_allocated = (pi_buffer) ? pi_needed : 0; - res = pm->monitor->pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); + res = pEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); } TRACE("(%s) got %d with %d (need %d byte for %d entries)\n", debugstr_w(pm->name), res, GetLastError(), pi_needed, pi_returned); @@ -1144,7 +1171,12 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname) static VOID printer_free(printer_t * printer) { if (printer->hXcv) - printer->pm->monitor->pfnXcvClosePort(printer->hXcv); + { + if (printer->pm->monitor2) + printer->pm->monitor2->pfnXcvClosePort(printer->hXcv); + else if (printer->pm->monitor) + printer->pm->monitor->pfnXcvClosePort(printer->hXcv); + } monitor_unload(printer->pm); @@ -1224,11 +1256,14 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) } if (printer->pm) { - if ((printer->pm->monitor) && (printer->pm->monitor->pfnXcvOpenPort)) { + if (printer->pm->monitor2 && printer->pm->monitor2->pfnXcvOpenPort) + printer->pm->monitor2->pfnXcvOpenPort(0, &printername[len], + pDefault ? pDefault->DesiredAccess : 0, + &printer->hXcv); + else if (printer->pm->monitor && printer->pm->monitor->pfnXcvOpenPort) printer->pm->monitor->pfnXcvOpenPort(&printername[len], - pDefault ? pDefault->DesiredAccess : 0, - &printer->hXcv); - } + pDefault ? pDefault->DesiredAccess : 0, + &printer->hXcv); if (printer->hXcv == NULL) { printer_free(printer); SetLastError(ERROR_INVALID_PARAMETER); @@ -1587,7 +1622,13 @@ static BOOL WINAPI fpAddPort(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) } pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor && pm->monitor->pfnAddPort) { + if (!pm) return FALSE; + + if (pm->monitor2 && pm->monitor2->pfnAddPort) { + res = pm->monitor2->pfnAddPort(pName, hWnd, pMonitorName); + TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); + } + else if (pm->monitor && pm->monitor->pfnAddPort) { res = pm->monitor->pfnAddPort(pName, hWnd, pMonitorName); TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); } @@ -1664,7 +1705,15 @@ static BOOL WINAPI fpAddPortEx(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR /* load the Monitor */ pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor && pm->monitor->pfnAddPortEx) { + if (!pm) return FALSE; + + if (pm->monitor2 && pm->monitor2->pfnAddPortEx) + { + res = pm->monitor2->pfnAddPortEx(pName, level, pBuffer, pMonitorName); + TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); + } + else if (pm->monitor && pm->monitor->pfnAddPortEx) + { res = pm->monitor->pfnAddPortEx(pName, level, pBuffer, pMonitorName); TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); } @@ -1778,7 +1827,17 @@ static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) } pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor && pm->monitor->pfnConfigurePort) { + if (!pm) return FALSE; + + if (pm->monitor2 && pm->monitor2->pfnConfigurePort) + { + TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), + debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); + res = pm->monitor2->pfnConfigurePort(pName, hWnd, pPortName); + TRACE("got %d with %u\n", res, GetLastError()); + } + else if (pm->monitor && pm->monitor->pfnConfigurePort) + { TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); res = pm->monitor->pfnConfigurePort(pName, hWnd, pPortName); @@ -1908,7 +1967,17 @@ static BOOL WINAPI fpDeletePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) } pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor && pm->monitor->pfnDeletePort) { + if (!pm) return FALSE; + + if (pm->monitor2 && pm->monitor2->pfnDeletePort) + { + TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), + debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); + res = pm->monitor2->pfnDeletePort(pName, hWnd, pPortName); + TRACE("got %d with %u\n", res, GetLastError()); + } + else if (pm->monitor && pm->monitor->pfnDeletePort) + { TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); res = pm->monitor->pfnDeletePort(pName, hWnd, pPortName); @@ -2338,7 +2407,11 @@ static BOOL WINAPI fpXcvData(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, *pcbOutputNeeded = 0; - *pdwStatus = printer->pm->monitor->pfnXcvDataPort(printer->hXcv, pszDataName, + if (printer->pm->monitor2) + *pdwStatus = printer->pm->monitor2->pfnXcvDataPort(printer->hXcv, pszDataName, + pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); + else if (printer->pm->monitor) + *pdwStatus = printer->pm->monitor->pfnXcvDataPort(printer->hXcv, pszDataName, pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); return TRUE; -- 2.20.1

2 6

[PATCH v2 7/7] ntdll: Call send_debug_event from debug handler on x86_64.
by Jacek Caban 04 Sep '19

04 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 2 +- dlls/ntdll/signal_x86_64.c | 41 +++++++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 11 deletions(-)

2 1

[PATCH v2 6/7] ntdll: Remove no loner needed func argument from setup_raise_exception.
by Jacek Caban 04 Sep '19

04 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

1 0

[PATCH v2 5/7] ntdll: Call virtual_handle_fault from signal handler on x86_64.
by Jacek Caban 04 Sep '19

04 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-)

1 0

[PATCH v2 4/7] ntdll: Handle interrupt exceptions in signal handler on x86_64.
by Jacek Caban 04 Sep '19

04 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)

1 0

[PATCH v2 3/7] ntdll: Handle single step exception in setup_raise_exception on x86_64.
by Jacek Caban 04 Sep '19

04 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 50 +++++++++++++++----------------------- 1 file changed, 19 insertions(+), 31 deletions(-)

1 0

[PATCH v2 2/7] ntdll: Factor out setup_raise_exception.
by Jacek Caban 04 Sep '19

04 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 62 +++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 21 deletions(-)

1 0

[PATCH v2 1/7] ntdll: Move setup_exception implementation.
by Jacek Caban 04 Sep '19

04 Sep '19

To simplify next patches. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 234 ++++++++++++++++++------------------- 1 file changed, 117 insertions(+), 117 deletions(-)

1 0

[PATCH 2/7] ntdll: Factor out setup_raise_exception.
by Jacek Caban 04 Sep '19

04 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 75 +++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 29 deletions(-)

2 4

[website] German translation for release 4.15
by Julian Rüger 04 Sep '19

04 Sep '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 4.0.2
by Julian Rüger 04 Sep '19

04 Sep '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 4.14
by Julian Rüger 04 Sep '19

04 Sep '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation of WineConf announcement
by Julian Rüger 04 Sep '19

04 Sep '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] mfmediaengine: Add IMFMediaEngine stub.
by Jactry Zeng 04 Sep '19

04 Sep '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 482 ++++++++++++++++++++++- dlls/mfmediaengine/tests/Makefile.in | 2 +- dlls/mfmediaengine/tests/mfmediaengine.c | 152 +++++++ include/mfmediaengine.idl | 51 +++ 4 files changed, 684 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 4bca0fe0ba..9e33b973d4 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -24,8 +24,11 @@ #include "winbase.h" #include "mfmediaengine.h" +#include "mferror.h" +#include "dxgi.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -43,6 +46,432 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } +enum media_engine_mode +{ + MEDIA_ENGINE_INVIAL, + MEDIA_ENGINE_AUDIO_MODE, + MEDIA_ENGINE_RENDERING_MODE, + MEDIA_ENGINE_FRAME_SERVER_MODE, +}; + +struct media_engine_attributes +{ + IMFMediaEngineNotify *callback; + HWND playback_hwnd; + DXGI_FORMAT output_format; + IMFDXGIDeviceManager *dxgi_manager; + enum media_engine_mode mode; +}; + +struct media_engine +{ + IMFMediaEngine IMFMediaEngine_iface; + LONG refcount; + DWORD flags; + struct media_engine_attributes attributes; +}; + +static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *iface) +{ + return CONTAINING_RECORD(iface, struct media_engine, IMFMediaEngine_iface); +} + +static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj) +{ + TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaEngine) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaEngine_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface) +{ + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + ULONG refcount = InterlockedIncrement(&engine->refcount); + + TRACE("(%p) ref=%u.\n", iface, refcount); + + return refcount; +} + +static void free_media_engine_attributes(struct media_engine_attributes engine_attr) +{ + if (engine_attr.callback) + IMFMediaEngineNotify_Release(engine_attr.callback); + if (engine_attr.dxgi_manager) + IMFDXGIDeviceManager_Release(engine_attr.dxgi_manager); +} + +static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) +{ + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + ULONG refcount = InterlockedDecrement(&engine->refcount); + + TRACE("(%p) ref=%u.\n", iface, refcount); + + if (!refcount) + { + free_media_engine_attributes(engine->attributes); + HeapFree(GetProcessHeap(), 0, engine); + } + + return refcount; +} + +static HRESULT WINAPI media_engine_GetError(IMFMediaEngine *iface, IMFMediaError **error) +{ + FIXME("(%p, %p): stub.\n", iface, error); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetErrorCode(IMFMediaEngine *iface, MF_MEDIA_ENGINE_ERR error) +{ + FIXME("(%p, %d): stub.\n", iface, error); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetSourceElements(IMFMediaEngine *iface, IMFMediaEngineSrcElements *elements) +{ + FIXME("(%p, %p): stub.\n", iface, elements); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) +{ + FIXME("(%p, %s): stub.\n", iface, debugstr_w(url)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetCurrentSource(IMFMediaEngine *iface, BSTR *url) +{ + FIXME("(%p, %p): stub.\n", iface, url); + + return E_NOTIMPL; +} + +static USHORT WINAPI media_engine_GetNetworkState(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static MF_MEDIA_ENGINE_PRELOAD WINAPI media_engine_GetPreload(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return MF_MEDIA_ENGINE_PRELOAD_NONE; +} + +static HRESULT WINAPI media_engine_SetPreload(IMFMediaEngine *iface, MF_MEDIA_ENGINE_PRELOAD preload) +{ + FIXME("(%p, %d): stub.\n", iface, preload); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngine *iface, IMFMediaTimeRange **buffered) +{ + FIXME("(%p, %p): stub.\n", iface, buffered); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Load(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_CanPlayType(IMFMediaEngine *iface, BSTR type, MF_MEDIA_ENGINE_CANPLAY *answer) +{ + FIXME("(%p, %s, %p): stub.\n", iface, debugstr_w(type), answer); + + return E_NOTIMPL; +} + +static USHORT WINAPI media_engine_GetReadyState(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static BOOL WINAPI media_engine_IsSeeking(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngine *iface, double time) +{ + FIXME("(%p, %f): stub.\n", iface, time); + + return E_NOTIMPL; +} + +static double WINAPI media_engine_GetStartTime(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static double WINAPI media_engine_GetDuration(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static BOOL WINAPI media_engine_IsPaused(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static double WINAPI media_engine_GetDefaultPlaybackRate(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetDefaultPlaybackRate(IMFMediaEngine *iface, double rate) +{ + FIXME("(%p, %f): stub.\n", iface, rate); + + return E_NOTIMPL; +} + +static double WINAPI media_engine_GetPlaybackRate(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetPlaybackRate(IMFMediaEngine *iface, double rate) +{ + FIXME("(%p, %f): stub.\n", iface, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetPlayed(IMFMediaEngine *iface, IMFMediaTimeRange **played) +{ + FIXME("(%p, %p): stub.\n", iface, played); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetSeekable(IMFMediaEngine *iface, IMFMediaTimeRange **seekable) +{ + FIXME("(%p, %p): stub.\n", iface, seekable); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_IsEnded(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetAutoPlay(IMFMediaEngine *iface, BOOL autoplay) +{ + FIXME("(%p, %d): stub.\n", iface, autoplay); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_GetLoop(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngine *iface, BOOL loop) +{ + FIXME("(%p, %d): stub.\n", iface, loop); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_GetMuted(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static HRESULT WINAPI media_engine_SetMuted(IMFMediaEngine *iface, BOOL muted) +{ + FIXME("(%p, %d): stub.\n", iface, muted); + + return E_NOTIMPL; +} + +static double WINAPI media_engine_GetVolume(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetVolume(IMFMediaEngine *iface, double volume) +{ + FIXME("(%p, %f): stub.\n", iface, volume); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_HasVideo(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static BOOL WINAPI media_engine_HasAudio(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) +{ + FIXME("(%p, %p, %p): stub.\n", iface, cx, cy); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetVideoAspectRatio(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) +{ + FIXME("(%p, %p, %p): stub.\n", iface, cx, cy); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_TransferVideoFrame(IMFMediaEngine *iface, IUnknown *surface, + const MFVideoNormalizedRect *src, + const RECT *dst, const MFARGB *color) +{ + FIXME("(%p, %p, %p, %p, %p): stub.\n", iface, surface, src, dst, color); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_OnVideoStreamTick(IMFMediaEngine *iface, LONGLONG *time) +{ + FIXME("(%p, %p): stub.\n", iface, time); + + return E_NOTIMPL; +} + +static const IMFMediaEngineVtbl media_engine_vtbl = +{ + media_engine_QueryInterface, + media_engine_AddRef, + media_engine_Release, + media_engine_GetError, + media_engine_SetErrorCode, + media_engine_SetSourceElements, + media_engine_SetSource, + media_engine_GetCurrentSource, + media_engine_GetNetworkState, + media_engine_GetPreload, + media_engine_SetPreload, + media_engine_GetBuffered, + media_engine_Load, + media_engine_CanPlayType, + media_engine_GetReadyState, + media_engine_IsSeeking, + media_engine_GetCurrentTime, + media_engine_SetCurrentTime, + media_engine_GetStartTime, + media_engine_GetDuration, + media_engine_IsPaused, + media_engine_GetDefaultPlaybackRate, + media_engine_SetDefaultPlaybackRate, + media_engine_GetPlaybackRate, + media_engine_SetPlaybackRate, + media_engine_GetPlayed, + media_engine_GetSeekable, + media_engine_IsEnded, + media_engine_GetAutoPlay, + media_engine_SetAutoPlay, + media_engine_GetLoop, + media_engine_SetLoop, + media_engine_Play, + media_engine_Pause, + media_engine_GetMuted, + media_engine_SetMuted, + media_engine_GetVolume, + media_engine_SetVolume, + media_engine_HasVideo, + media_engine_HasAudio, + media_engine_GetNativeVideoSize, + media_engine_GetVideoAspectRatio, + media_engine_Shutdown, + media_engine_TransferVideoFrame, + media_engine_OnVideoStreamTick, +}; + static HRESULT WINAPI media_engine_factory_QueryInterface(IMFMediaEngineClassFactory *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFMediaEngineClassFactory) || @@ -68,12 +497,61 @@ static ULONG WINAPI media_engine_factory_Release(IMFMediaEngineClassFactory *ifa return 1; } +static void init_media_engine_attributes(IMFAttributes *attributes, struct media_engine_attributes *engine_attr) +{ + HRESULT hr; + + memset(engine_attr, 0, sizeof(*engine_attr)); + hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, + (void **)&engine_attr->callback); + if (FAILED(hr)) + return; + + IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, (UINT64 *)&engine_attr->playback_hwnd); + IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_DXGI_MANAGER, &IID_IMFDXGIDeviceManager, + (void **)&engine_attr->dxgi_manager); + hr = IMFAttributes_GetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, &engine_attr->output_format); + if (engine_attr->playback_hwnd) /* FIXME: handle MF_MEDIA_ENGINE_PLAYBACK_VISUAL */ + engine_attr->mode = MEDIA_ENGINE_RENDERING_MODE; + else + { + if (SUCCEEDED(hr)) + engine_attr->mode = MEDIA_ENGINE_FRAME_SERVER_MODE; + else + engine_attr->mode = MEDIA_ENGINE_AUDIO_MODE; + } +} + static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFactory *iface, DWORD flags, IMFAttributes *attributes, IMFMediaEngine **engine) { - FIXME("(%p, %#x, %p, %p): stub.\n", iface, flags, attributes, engine); + struct media_engine_attributes engine_attr; + struct media_engine *object; - return E_NOTIMPL; + FIXME("(%p, %#x, %p, %p): semi-stub.\n", iface, flags, attributes, engine); + + if (!attributes || !engine) + return E_POINTER; + + init_media_engine_attributes(attributes, &engine_attr); + if (!engine_attr.mode) + return MF_E_ATTRIBUTENOTFOUND; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + { + free_media_engine_attributes(engine_attr); + return E_OUTOFMEMORY; + } + + object->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; + object->refcount = 1; + object->flags = flags; + object->attributes = engine_attr; + + *engine = &object->IMFMediaEngine_iface; + + return S_OK; } static HRESULT WINAPI media_engine_factory_CreateTimeRange(IMFMediaEngineClassFactory *iface, diff --git a/dlls/mfmediaengine/tests/Makefile.in b/dlls/mfmediaengine/tests/Makefile.in index 3f2bb5a094..d508db9f6f 100644 --- a/dlls/mfmediaengine/tests/Makefile.in +++ b/dlls/mfmediaengine/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfmediaengine.dll -IMPORTS = ole32 mfplat mfmediaengine mfuuid +IMPORTS = ole32 mfplat mfmediaengine mfuuid uuid C_SRCS = \ mfmediaengine.c diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index c7fc89f2b1..a264d0d033 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -24,11 +24,85 @@ #include "winbase.h" #include "mfapi.h" +#include "mfidl.h" #include "mfmediaengine.h" +#include "mferror.h" +#include "dxgi.h" +#include "initguid.h" #include "wine/heap.h" #include "wine/test.h" +static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); + +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); +} + +static void init_functions(void) +{ + HMODULE mod = GetModuleHandleA("mfplat.dll"); + +#define X(f) p##f = (void*)GetProcAddress(mod, #f) + X(MFCreateDXGIDeviceManager); +#undef X +} + +struct media_engine_notify +{ + IMFMediaEngineNotify IMFMediaEngineNotify_iface; + LONG refcount; +}; + +static inline struct media_engine_notify *impl_from_IMFMediaEngineNotify(IMFMediaEngineNotify *iface) +{ + return CONTAINING_RECORD(iface, struct media_engine_notify, IMFMediaEngineNotify_iface); +} + +static HRESULT WINAPI media_engine_notify_QueryInterface(IMFMediaEngineNotify *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFMediaEngineNotify) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaEngineNotify_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI media_engine_notify_AddRef(IMFMediaEngineNotify *iface) +{ + struct media_engine_notify *notify = impl_from_IMFMediaEngineNotify(iface); + return InterlockedIncrement(&notify->refcount); +} + +static ULONG WINAPI media_engine_notify_Release(IMFMediaEngineNotify *iface) +{ + struct media_engine_notify *notify = impl_from_IMFMediaEngineNotify(iface); + return InterlockedDecrement(&notify->refcount); +} + +static HRESULT WINAPI media_engine_notify_EventNotify(IMFMediaEngineNotify *iface, DWORD event, DWORD_PTR param1, DWORD param2) +{ + return S_OK; +} + +static IMFMediaEngineNotifyVtbl media_engine_notify_vtbl = +{ + media_engine_notify_QueryInterface, + media_engine_notify_AddRef, + media_engine_notify_Release, + media_engine_notify_EventNotify, +}; + static void test_factory(void) { IMFMediaEngineClassFactory *factory, *factory2; @@ -47,7 +121,83 @@ static void test_factory(void) "Unexpected hr %#x.\n", hr); if (factory) + { + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *notify = &notify_impl.IMFMediaEngineNotify_iface; + IMFMediaEngine *media_engine, *media_engine2; + IMFDXGIDeviceManager *manager; + IMFAttributes *attributes; + UINT token; + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + hr = MFCreateAttributes(&attributes, 3); + ok(hr == S_OK, "MFCreateAttributes failed: %#x.\n", hr); + + if (0) + { + /* Crashed on Windows 8 */ + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + NULL, &media_engine); + ok(hr == E_POINTER, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + NULL, NULL); + ok(hr == E_POINTER, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + } + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_OPM_HWND, NULL); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)notify); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* pre win10v1809 */, + "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + if (SUCCEEDED(hr)) + IMFMediaEngine_Release(media_engine); + + EXPECT_REF(factory, 1); + hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); + ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); + if (0) + { + /* Different version of Windows has different reference count behaviour, and I didn't + see their logics. So skipping these tests on Windows. */ + EXPECT_REF(media_engine, 1); + EXPECT_REF(factory, 1); + } + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine2); + ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); + if (0) + { + EXPECT_REF(media_engine, 1); + EXPECT_REF(media_engine2, 1); + EXPECT_REF(factory, 1); + } + + IMFMediaEngine_Release(media_engine); + IMFMediaEngine_Release(media_engine2); + IMFAttributes_DeleteAllItems(attributes); + IMFAttributes_Release(attributes); + IMFDXGIDeviceManager_Release(manager); IMFMediaEngineClassFactory_Release(factory); + } + else + win_skip("Not IMFMediaEngineClassFactory support.\n"); CoUninitialize(); } @@ -56,6 +206,8 @@ START_TEST(mfmediaengine) { HRESULT hr; + init_functions(); + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "MFStartup failed: %#x.\n", hr); diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index 940cacc9c1..556d2fba2b 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -20,6 +20,36 @@ import "mfidl.idl"; cpp_quote("EXTERN_GUID(CLSID_MFMediaEngineClassFactory, 0xb44392da, 0x499b, 0x446b, 0xa4, 0xcb, 0x00, 0x5f, 0xea, 0xd0, 0xe6, 0xd5);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_AUDIO_CATEGORY, 0xc8d4c51d, 0x350e, 0x41f2, 0xba, 0x46, 0xfa, 0xeb, 0xbb, 0x08, 0x57, 0xf6);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_AUDIO_ENDPOINT_ROLE, 0xd2cb93d1, 0x116a, 0x44f2, 0x93, 0x85, 0xf7, 0xd0, 0xfd, 0xa2, 0xfb, 0x46);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE, 0x4e0212e2, 0xe18f, 0x41e1, 0x95, 0xe5, 0xc0, 0xe7, 0xe9, 0x23, 0x5b, 0xc3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE9, 0x052c2d39, 0x40c0, 0x4188, 0xab, 0x86, 0xf8, 0x28, 0x27, 0x3b, 0x75, 0x22);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE10, 0x11a47afd, 0x6589, 0x4124, 0xb3, 0x12, 0x61, 0x58, 0xec, 0x51, 0x7f, 0xc3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE11, 0x1cf1315f, 0xce3f, 0x4035, 0x93, 0x91, 0x16, 0x14, 0x2f, 0x77, 0x51, 0x89);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE_EDGE, 0xa6f3e465, 0x3aca, 0x442c, 0xa3, 0xf0, 0xad, 0x6d, 0xda, 0xd8, 0x39, 0xae);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CALLBACK, 0xc60381b8, 0x83a4, 0x41f8, 0xa3, 0xd0, 0xde, 0x05, 0x07, 0x68, 0x49, 0xa9);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COMPATIBILITY_MODE, 0x3ef26ad4, 0xdc54, 0x45de, 0xb9, 0xaf, 0x76, 0xc8, 0xc6, 0x6b, 0xfa, 0x8e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COMPATIBILITY_MODE_WIN10, 0x5b25e089, 0x6ca7, 0x4139, 0xa2, 0xcb, 0xfc, 0xaa, 0xb3, 0x95, 0x52, 0xa3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COMPATIBILITY_MODE_WWA_EDGE, 0x15b29098, 0x9f01, 0x4e4d, 0xb6, 0x5a, 0xc0, 0x6c, 0x6c, 0x89, 0xda, 0x2a);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CONTENT_PROTECTION_FLAGS, 0xe0350223, 0x5aaf, 0x4d76, 0xa7, 0xc3, 0x06, 0xde, 0x70, 0x89, 0x4d, 0xb4);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CONTENT_PROTECTION_MANAGER, 0xfdd6dfaa, 0xbd85, 0x4af3, 0x9e, 0x0f, 0xa0, 0x1d, 0x53, 0x9d, 0x87, 0x6a);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CONTINUE_ON_CODEC_ERROR, 0xdbcdb7f9, 0x48e4, 0x4295, 0xb7, 0x0d, 0xd5, 0x18, 0x23, 0x4e, 0xeb, 0x38);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COREWINDOW, 0xfccae4dc, 0x0b7f, 0x41c2, 0x9f, 0x96, 0x46, 0x59, 0x94, 0x8a, 0xcd, 0xdc);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_DXGI_MANAGER, 0x065702da, 0x1094, 0x486d, 0x86, 0x17, 0xee, 0x7c, 0xc4, 0xee, 0x46, 0x48);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_EME_CALLBACK, 0x494553a7, 0xa481, 0x4cb7, 0xbe, 0xc5, 0x38, 0x09, 0x03, 0x51, 0x37, 0x31);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_EXTENSION, 0x3109fd46, 0x060d, 0x4b62, 0x8d, 0xcf, 0xfa, 0xff, 0x81, 0x13, 0x18, 0xd2);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_MEDIA_PLAYER_MODE, 0x3ddd8d45, 0x5aa1, 0x4112, 0x82, 0xe5, 0x36, 0xf6, 0xa2, 0x19, 0x7e, 0x6e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_NEEDKEY_CALLBACK, 0x7ea80843, 0xb6e4, 0x432c, 0x8e, 0xa4, 0x78, 0x48, 0xff, 0xe4, 0x22, 0x0e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_OPM_HWND, 0xa0be8ee7, 0x0572, 0x4f2c, 0xa8, 0x01, 0x2a, 0x15, 0x1b, 0xd3, 0xe7, 0x26);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_PLAYBACK_HWND, 0xd988879b, 0x67c9, 0x4d92, 0xba, 0xa7, 0x6e, 0xad, 0xd4, 0x46, 0x03, 0x9d);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_PLAYBACK_VISUAL, 0x6debd26f, 0x6ab9, 0x4d7e, 0xb0, 0xee, 0xc6, 0x1a, 0x73, 0xff, 0xad, 0x15);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_SOURCE_RESOLVER_CONFIG_STORE, 0x0ac0c497, 0xb3c4, 0x48c9, 0x9c, 0xde, 0xbb, 0x8c, 0xa2, 0x44, 0x2c, 0xa3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_STREAM_CONTAINS_ALPHA_CHANNEL, 0x5cbfaf44, 0xd2b2, 0x4cfb, 0x80, 0xa7, 0xd4, 0x29, 0xc7, 0x4c, 0x78, 0x9d);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_SYNCHRONOUS_CLOSE, 0xc3c2e12f, 0x7e0e, 0x4e43, 0xb9, 0x1c, 0xdc, 0x99, 0x2c, 0xcd, 0xfa, 0x5e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_TELEMETRY_APPLICATION_ID, 0x1e7b273b, 0xa7e4, 0x402a, 0x8f, 0x51, 0xc4, 0x8e, 0x88, 0xa2, 0xca, 0xbc);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_TRACK_ID, 0x65bea312, 0x4043, 0x4815, 0x8e, 0xab, 0x44, 0xdc, 0xe2, 0xef, 0x8f, 0x2a);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, 0x5066893c, 0x8cf9, 0x42bc, 0x8b, 0x8a, 0x47, 0x22, 0x12, 0xe5, 0x27, 0x26);") + typedef enum MF_MEDIA_ENGINE_ERR { MF_MEDIA_ENGINE_ERR_NOERROR, @@ -54,6 +84,16 @@ typedef struct MFVideoNormalizedRect float bottom; } MFVideoNormalizedRect; +typedef enum MF_MEDIA_ENGINE_CREATEFLAGS +{ + MF_MEDIA_ENGINE_AUDIOONLY = 0x1, + MF_MEDIA_ENGINE_WAITFORSTABLE_STATE = 0x2, + MF_MEDIA_ENGINE_FORCEMUTE = 0x4, + MF_MEDIA_ENGINE_REAL_TIME_MODE = 0x8, + MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS = 0x10, + MF_MEDIA_ENGINE_CREATEFLAGS_MASK = 0x1f +} MF_MEDIA_ENGINE_CREATEFLAGS; + [ object, uuid(fc0e10d2-ab2a-4501-a951-06bb1075184c), @@ -166,3 +206,14 @@ interface IMFMediaEngineClassFactory : IUnknown HRESULT CreateTimeRange([out] IMFMediaTimeRange **range); HRESULT CreateError([out] IMFMediaError **error); } + +[ + object, + uuid(fee7c112-e776-42b5-9bbf-0048524e2bd5), + local, + pointer_default(unique) +] +interface IMFMediaEngineNotify : IUnknown +{ + HRESULT EventNotify([in] DWORD event, [in] DWORD_PTR param1, [in] DWORD param2); +} -- 2.23.0.rc1

4 4

[website] German translation for release 4.13
by Julian Rüger 04 Sep '19

04 Sep '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 2/4] localspl: AddMonitor should create registry entry for a monitor before initializing it.
by Dmitry Timoshkov 04 Sep '19

04 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index ccd19811cf..8e5e3428d5 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1499,12 +1499,6 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) return FALSE; } - /* Load and initialize the monitor. SetLastError() is called on failure */ - if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) { - return FALSE; - } - monitor_unload(pm); - SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ if (RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { @@ -1538,7 +1532,17 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) res = (RegSetValueExW(hentry, driverW, 0, REG_SZ, (LPBYTE) mi2w->pDLLName, len) == ERROR_SUCCESS); } + + /* Load and initialize the monitor. SetLastError() is called on failure */ + if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) + res = FALSE; + + monitor_unload(pm); + RegCloseKey(hentry); + + if (!res) + RegDeleteKeyW(hroot, mi2w->pName); } RegCloseKey(hroot); -- 2.20.1

2 1

[PATCH 1/4] localspl: Remove useless NULL checks from AddMonitor trace.
by Dmitry Timoshkov 04 Sep '19

04 Sep '19

AddMonitor dereferences pMonitors later without any checks. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index cb31b194ae..ccd19811cf 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1475,9 +1475,7 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) mi2w = (LPMONITOR_INFO_2W) pMonitors; TRACE("(%s, %d, %p): %s %s %s\n", debugstr_w(pName), Level, pMonitors, - debugstr_w(mi2w ? mi2w->pName : NULL), - debugstr_w(mi2w ? mi2w->pEnvironment : NULL), - debugstr_w(mi2w ? mi2w->pDLLName : NULL)); + debugstr_w(mi2w->pName), debugstr_w(mi2w->pEnvironment), debugstr_w(mi2w->pDLLName)); if (copy_servername_from_name(pName, NULL)) { FIXME("server %s not supported\n", debugstr_w(pName)); -- 2.20.1

2 1

[PATCH 1/5] amstream: Reimplement IMemInputPin locally for the DirectDraw stream.
by Zebediah Figura 04 Sep '19

04 Sep '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/amstream/ddrawstream.c | 102 ++++++++++++++++++++++++++++++++- dlls/amstream/tests/amstream.c | 1 + 2 files changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index abff80ab80a..88fadaf2f73 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -40,13 +40,17 @@ struct ddraw_stream { IAMMediaStream IAMMediaStream_iface; IDirectDrawMediaStream IDirectDrawMediaStream_iface; + IMemInputPin IMemInputPin_iface; LONG ref; + IMultiMediaStream* parent; MSPID purpose_id; STREAM_TYPE stream_type; IDirectDraw7 *ddraw; DirectDrawMediaStreamInputPin *input_pin; CRITICAL_SECTION critical_section; + + IMemAllocator *allocator; }; static inline struct ddraw_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) @@ -85,7 +89,7 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_QueryInterface(IA else if (IsEqualGUID(riid, &IID_IMemInputPin)) { IAMMediaStream_AddRef(iface); - *ret_iface = &This->input_pin->pin.IMemInputPin_iface; + *ret_iface = &This->IMemInputPin_iface; return S_OK; } @@ -725,6 +729,101 @@ static const BaseInputPinFuncTable DirectDrawMediaStreamInputPin_FuncTable = DirectDrawMediaStreamInputPin_Receive, }; +static inline struct ddraw_stream *impl_from_IMemInputPin(IMemInputPin *iface) +{ + return CONTAINING_RECORD(iface, struct ddraw_stream, IMemInputPin_iface); +} + +static HRESULT WINAPI ddraw_meminput_QueryInterface(IMemInputPin *iface, REFIID iid, void **out) +{ + struct ddraw_stream *stream = impl_from_IMemInputPin(iface); + return IAMMediaStream_QueryInterface(&stream->IAMMediaStream_iface, iid, out); +} + +static ULONG WINAPI ddraw_meminput_AddRef(IMemInputPin *iface) +{ + struct ddraw_stream *stream = impl_from_IMemInputPin(iface); + return IAMMediaStream_AddRef(&stream->IAMMediaStream_iface); +} + +static ULONG WINAPI ddraw_meminput_Release(IMemInputPin *iface) +{ + struct ddraw_stream *stream = impl_from_IMemInputPin(iface); + return IAMMediaStream_Release(&stream->IAMMediaStream_iface); +} + +static HRESULT WINAPI ddraw_meminput_GetAllocator(IMemInputPin *iface, IMemAllocator **allocator) +{ + struct ddraw_stream *stream = impl_from_IMemInputPin(iface); + + TRACE("stream %p, allocator %p.\n", stream, allocator); + + if (stream->allocator) + { + IMemAllocator_AddRef(*allocator = stream->allocator); + return S_OK; + } + + *allocator = NULL; + return VFW_E_NO_ALLOCATOR; +} + +static HRESULT WINAPI ddraw_meminput_NotifyAllocator(IMemInputPin *iface, IMemAllocator *allocator, BOOL readonly) +{ + struct ddraw_stream *stream = impl_from_IMemInputPin(iface); + + TRACE("stream %p, allocator %p, readonly %d.\n", stream, allocator, readonly); + + if (!allocator) + return E_POINTER; + + if (allocator) + IMemAllocator_AddRef(allocator); + if (stream->allocator) + IMemAllocator_Release(stream->allocator); + stream->allocator = allocator; + + return S_OK; +} + +static HRESULT WINAPI ddraw_meminput_GetAllocatorRequirements(IMemInputPin *iface, ALLOCATOR_PROPERTIES *props) +{ + TRACE("iface %p, props %p.\n", iface, props); + return E_NOTIMPL; +} + +static HRESULT WINAPI ddraw_meminput_Receive(IMemInputPin *iface, IMediaSample *sample) +{ + FIXME("iface %p, sample %p, stub!\n", iface, sample); + return E_NOTIMPL; +} + +static HRESULT WINAPI ddraw_meminput_ReceiveMultiple(IMemInputPin *iface, + IMediaSample **samples, LONG count, LONG *processed) +{ + FIXME("iface %p, samples %p, count %u, processed %p, stub!\n", iface, samples, count, processed); + return E_NOTIMPL; +} + +static HRESULT WINAPI ddraw_meminput_ReceiveCanBlock(IMemInputPin *iface) +{ + TRACE("iface %p.\n", iface); + return S_OK; +} + +static const IMemInputPinVtbl ddraw_meminput_vtbl = +{ + ddraw_meminput_QueryInterface, + ddraw_meminput_AddRef, + ddraw_meminput_Release, + ddraw_meminput_GetAllocator, + ddraw_meminput_NotifyAllocator, + ddraw_meminput_GetAllocatorRequirements, + ddraw_meminput_Receive, + ddraw_meminput_ReceiveMultiple, + ddraw_meminput_ReceiveCanBlock, +}; + HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) { @@ -740,6 +839,7 @@ HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object->IAMMediaStream_iface.lpVtbl = &DirectDrawMediaStreamImpl_IAMMediaStream_Vtbl; object->IDirectDrawMediaStream_iface.lpVtbl = &DirectDrawMediaStreamImpl_IDirectDrawMediaStream_Vtbl; + object->IMemInputPin_iface.lpVtbl = &ddraw_meminput_vtbl; object->ref = 1; InitializeCriticalSection(&object->critical_section); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c224d00ca30..9176622ab04 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -189,6 +189,7 @@ static void test_interfaces(void) check_interface(stream, &IID_IAMMediaStream, TRUE); check_interface(stream, &IID_IDirectDrawMediaStream, TRUE); check_interface(stream, &IID_IMediaStream, TRUE); + check_interface(stream, &IID_IMemInputPin, TRUE); check_interface(stream, &IID_IPin, TRUE); check_interface(stream, &IID_IUnknown, TRUE); -- 2.22.0

1 4

[PATCH] comctl32/tests: Tweak an ok() message to avoid a spelling error.
by Francois Gouget 04 Sep '19

04 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/comctl32/tests/treeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 8ba7f543de5..56b6c6adbe1 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1364,7 +1364,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, visibleItem = (HTREEITEM)SendMessageA(pHdr->hwndFrom, TVM_GETNEXTITEM, TVGN_NEXTVISIBLE, (LPARAM)visibleItem); *(HTREEITEM*)&rect = visibleItem; - ok(visibleItem != NULL, "There must be a visible item after the first visisble item.\n"); + ok(visibleItem != NULL, "There must be a visible item after the first one.\n"); ok(SendMessageA(pHdr->hwndFrom, TVM_GETITEMRECT, TRUE, (LPARAM)&rect), "Failed to get rect for second visible item.\n"); } -- 2.20.1

1 0

[PATCH] kernel32/tests: Avoid unneeded strlen*() calls.
by Francois Gouget 04 Sep '19

04 Sep '19

Note that neither the subdir nor the p pointer can be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/path.c | 2 +- dlls/kernel32/tests/volume.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index f15cc09ee5e..60cd26dd603 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -130,7 +130,7 @@ static void test_ValidPathA(const CHAR *curdir, const CHAR *subdir, const CHAR * ok(! HAS_TRAIL_SLASH_A(curdirshort), "%s: GetShortPathNameA should not have a trailing \\\n",errstr); /* build relative and absolute paths from inputs */ - if(lstrlenA(subdir)) { + if(*subdir) { sprintf(subpath,"%s\\%s",subdir,filename); } else { lstrcpyA(subpath,filename); diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 21a2b313e56..348ce1a76c5 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -83,7 +83,7 @@ static void test_query_dos_deviceA(void) if (ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { p = buffer; for (;;) { - if (!strlen(p)) break; + if (!*p) break; ret2 = QueryDosDeviceA( p, buffer2, sizeof(buffer2) ); ok(ret2, "QueryDosDeviceA failed to return current mapping for %s, last error %u\n", p, GetLastError()); p += strlen(p) + 1; -- 2.20.1

1 0

[PATCH] ntoskrnl.exe: Add -norelay flag for _vsnprintf
by Andrew Eikum 03 Sep '19

03 Sep '19

Fixes traces from services when relay logging. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c46891d88c8..955bd00be7f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1457,7 +1457,7 @@ @ cdecl _strrev(str) @ cdecl _strset(str long) @ cdecl _strupr(str) -@ cdecl _vsnprintf(ptr long str ptr) +@ cdecl -norelay _vsnprintf(ptr long str ptr) @ cdecl _vsnwprintf(ptr long wstr ptr) @ cdecl _wcsicmp(wstr wstr) @ cdecl _wcslwr(wstr) -- 2.23.0

2 1

[PATCH resend v3 1/2] kernel32/path: Allow renaming a file/directory to a different capitalization of itself
by Gabriel Ivăncescu 03 Sep '19

03 Sep '19

Renaming a file or directory from e.g. foobar to FooBar (or any other caps-only change) should work and capitalize it, like on Windows, instead of being a no-op. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/path.c | 73 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index b93add9..d108df5 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1136,6 +1136,16 @@ static BOOL is_same_file(HANDLE h1, HANDLE h2) return ret; } +static ULONG get_handle_attr(HANDLE handle) +{ + FILE_BASIC_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileBasicInformation); + return status != STATUS_SUCCESS ? 0 : info.FileAttributes; +} + /************************************************************************** * CopyFileW (KERNEL32.@) */ @@ -1317,6 +1327,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NTSTATUS status; HANDLE source_handle = 0, dest_handle = 0; ANSI_STRING source_unix, dest_unix; + BOOL same_file = FALSE; DWORD options; TRACE("(%s,%s,%p,%p,%04x)\n", @@ -1369,18 +1380,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT; + options = FILE_SYNCHRONOUS_IO_NONALERT; if (flag & MOVEFILE_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, options ); if (status == STATUS_SUCCESS) /* destination exists */ { - if (!(flag & MOVEFILE_REPLACE_EXISTING)) + ULONG attrib = 0; + + if (!(flag & MOVEFILE_REPLACE_EXISTING) || + ((attrib = get_handle_attr(dest_handle)) & FILE_ATTRIBUTE_DIRECTORY)) { - if (!is_same_file( source_handle, dest_handle )) + if (!(same_file = is_same_file( source_handle, dest_handle ))) { - SetLastError( ERROR_ALREADY_EXISTS ); + SetLastError( (attrib & FILE_ATTRIBUTE_DIRECTORY) + ? ERROR_ACCESS_DENIED : ERROR_ALREADY_EXISTS ); RtlFreeUnicodeString( &nt_name ); goto error; } @@ -1390,6 +1405,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_ACCESS_DENIED ); goto error; } + else same_file = is_same_file( source_handle, dest_handle ); NtClose( dest_handle ); dest_handle = NULL; @@ -1402,13 +1418,60 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } status = wine_nt_to_unix_file_name( &nt_name, &dest_unix, FILE_OPEN_IF, FALSE ); - RtlFreeUnicodeString( &nt_name ); if (status != STATUS_SUCCESS && status != STATUS_NO_SUCH_FILE) { + RtlFreeUnicodeString( &nt_name ); SetLastError( RtlNtStatusToDosError(status) ); goto error; } + /* When it's renaming to the same file, preserve the case sensitivity of the last + component, so that renaming a\b\c\foobar to a\b\c\Foobar works correctly like + on Windows, but note that due to hard links the paths must be exactly identical */ + if (same_file && source_unix.Length == dest_unix.Length && + !memcmp(source_unix.Buffer, dest_unix.Buffer, dest_unix.Length)) + { + size_t nt_filename_len, pathlen; + const WCHAR *nt_filename; + BOOL used_default; + char *tmp; + INT num; + + nt_filename = memrchrW(nt_name.Buffer, '\\', nt_name.Length / sizeof(WCHAR)) + 1; + nt_filename_len = nt_name.Length / sizeof(WCHAR) - (nt_filename - nt_name.Buffer); + + /* Build it from path + filename (the latter converted from nt_name) */ + num = WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + NULL, 0, NULL, &used_default); + if (!num && GetLastError() == ERROR_INVALID_PARAMETER) + { + num = WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + NULL, 0, NULL, NULL); + used_default = FALSE; + } + + if (!used_default && num > 0) + { + for (pathlen = dest_unix.Length; --pathlen > 0;) + if (dest_unix.Buffer[pathlen] == '/') { pathlen++; break; } + + tmp = dest_unix.Buffer; + if (dest_unix.MaximumLength < pathlen + num + 1) + tmp = RtlReAllocateHeap(GetProcessHeap(), 0, tmp, pathlen + num + 1); + if (tmp) + { + dest_unix.Buffer = tmp; + dest_unix.Length = pathlen + num; + dest_unix.MaximumLength = dest_unix.Length + 1; + dest_unix.Buffer[dest_unix.Length] = '\0'; + + WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + dest_unix.Buffer + pathlen, num, NULL, NULL); + } + } + } + RtlFreeUnicodeString( &nt_name ); + /* now perform the rename */ if (rename( source_unix.Buffer, dest_unix.Buffer ) == -1) -- 2.21.0

2 3

[PATCH] mfmediaengine: Add IMFMediaEngine stub.
by Jactry Zeng 03 Sep '19

03 Sep '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 482 ++++++++++++++++++++++- dlls/mfmediaengine/tests/Makefile.in | 2 +- dlls/mfmediaengine/tests/mfmediaengine.c | 152 +++++++ include/mfmediaengine.idl | 51 +++ 4 files changed, 684 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 4bca0fe0ba..9e33b973d4 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -24,8 +24,11 @@ #include "winbase.h" #include "mfmediaengine.h" +#include "mferror.h" +#include "dxgi.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -43,6 +46,432 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } +enum media_engine_mode +{ + MEDIA_ENGINE_INVIAL, + MEDIA_ENGINE_AUDIO_MODE, + MEDIA_ENGINE_RENDERING_MODE, + MEDIA_ENGINE_FRAME_SERVER_MODE, +}; + +struct media_engine_attributes +{ + IMFMediaEngineNotify *callback; + HWND playback_hwnd; + DXGI_FORMAT output_format; + IMFDXGIDeviceManager *dxgi_manager; + enum media_engine_mode mode; +}; + +struct media_engine +{ + IMFMediaEngine IMFMediaEngine_iface; + LONG refcount; + DWORD flags; + struct media_engine_attributes attributes; +}; + +static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *iface) +{ + return CONTAINING_RECORD(iface, struct media_engine, IMFMediaEngine_iface); +} + +static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj) +{ + TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaEngine) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaEngine_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface) +{ + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + ULONG refcount = InterlockedIncrement(&engine->refcount); + + TRACE("(%p) ref=%u.\n", iface, refcount); + + return refcount; +} + +static void free_media_engine_attributes(struct media_engine_attributes engine_attr) +{ + if (engine_attr.callback) + IMFMediaEngineNotify_Release(engine_attr.callback); + if (engine_attr.dxgi_manager) + IMFDXGIDeviceManager_Release(engine_attr.dxgi_manager); +} + +static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) +{ + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + ULONG refcount = InterlockedDecrement(&engine->refcount); + + TRACE("(%p) ref=%u.\n", iface, refcount); + + if (!refcount) + { + free_media_engine_attributes(engine->attributes); + HeapFree(GetProcessHeap(), 0, engine); + } + + return refcount; +} + +static HRESULT WINAPI media_engine_GetError(IMFMediaEngine *iface, IMFMediaError **error) +{ + FIXME("(%p, %p): stub.\n", iface, error); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetErrorCode(IMFMediaEngine *iface, MF_MEDIA_ENGINE_ERR error) +{ + FIXME("(%p, %d): stub.\n", iface, error); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetSourceElements(IMFMediaEngine *iface, IMFMediaEngineSrcElements *elements) +{ + FIXME("(%p, %p): stub.\n", iface, elements); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) +{ + FIXME("(%p, %s): stub.\n", iface, debugstr_w(url)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetCurrentSource(IMFMediaEngine *iface, BSTR *url) +{ + FIXME("(%p, %p): stub.\n", iface, url); + + return E_NOTIMPL; +} + +static USHORT WINAPI media_engine_GetNetworkState(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static MF_MEDIA_ENGINE_PRELOAD WINAPI media_engine_GetPreload(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return MF_MEDIA_ENGINE_PRELOAD_NONE; +} + +static HRESULT WINAPI media_engine_SetPreload(IMFMediaEngine *iface, MF_MEDIA_ENGINE_PRELOAD preload) +{ + FIXME("(%p, %d): stub.\n", iface, preload); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngine *iface, IMFMediaTimeRange **buffered) +{ + FIXME("(%p, %p): stub.\n", iface, buffered); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Load(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_CanPlayType(IMFMediaEngine *iface, BSTR type, MF_MEDIA_ENGINE_CANPLAY *answer) +{ + FIXME("(%p, %s, %p): stub.\n", iface, debugstr_w(type), answer); + + return E_NOTIMPL; +} + +static USHORT WINAPI media_engine_GetReadyState(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static BOOL WINAPI media_engine_IsSeeking(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngine *iface, double time) +{ + FIXME("(%p, %f): stub.\n", iface, time); + + return E_NOTIMPL; +} + +static double WINAPI media_engine_GetStartTime(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static double WINAPI media_engine_GetDuration(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static BOOL WINAPI media_engine_IsPaused(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static double WINAPI media_engine_GetDefaultPlaybackRate(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetDefaultPlaybackRate(IMFMediaEngine *iface, double rate) +{ + FIXME("(%p, %f): stub.\n", iface, rate); + + return E_NOTIMPL; +} + +static double WINAPI media_engine_GetPlaybackRate(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetPlaybackRate(IMFMediaEngine *iface, double rate) +{ + FIXME("(%p, %f): stub.\n", iface, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetPlayed(IMFMediaEngine *iface, IMFMediaTimeRange **played) +{ + FIXME("(%p, %p): stub.\n", iface, played); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetSeekable(IMFMediaEngine *iface, IMFMediaTimeRange **seekable) +{ + FIXME("(%p, %p): stub.\n", iface, seekable); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_IsEnded(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetAutoPlay(IMFMediaEngine *iface, BOOL autoplay) +{ + FIXME("(%p, %d): stub.\n", iface, autoplay); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_GetLoop(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngine *iface, BOOL loop) +{ + FIXME("(%p, %d): stub.\n", iface, loop); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_GetMuted(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static HRESULT WINAPI media_engine_SetMuted(IMFMediaEngine *iface, BOOL muted) +{ + FIXME("(%p, %d): stub.\n", iface, muted); + + return E_NOTIMPL; +} + +static double WINAPI media_engine_GetVolume(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return 0; +} + +static HRESULT WINAPI media_engine_SetVolume(IMFMediaEngine *iface, double volume) +{ + FIXME("(%p, %f): stub.\n", iface, volume); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_HasVideo(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static BOOL WINAPI media_engine_HasAudio(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return FALSE; +} + +static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) +{ + FIXME("(%p, %p, %p): stub.\n", iface, cx, cy); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetVideoAspectRatio(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) +{ + FIXME("(%p, %p, %p): stub.\n", iface, cx, cy); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_TransferVideoFrame(IMFMediaEngine *iface, IUnknown *surface, + const MFVideoNormalizedRect *src, + const RECT *dst, const MFARGB *color) +{ + FIXME("(%p, %p, %p, %p, %p): stub.\n", iface, surface, src, dst, color); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_OnVideoStreamTick(IMFMediaEngine *iface, LONGLONG *time) +{ + FIXME("(%p, %p): stub.\n", iface, time); + + return E_NOTIMPL; +} + +static const IMFMediaEngineVtbl media_engine_vtbl = +{ + media_engine_QueryInterface, + media_engine_AddRef, + media_engine_Release, + media_engine_GetError, + media_engine_SetErrorCode, + media_engine_SetSourceElements, + media_engine_SetSource, + media_engine_GetCurrentSource, + media_engine_GetNetworkState, + media_engine_GetPreload, + media_engine_SetPreload, + media_engine_GetBuffered, + media_engine_Load, + media_engine_CanPlayType, + media_engine_GetReadyState, + media_engine_IsSeeking, + media_engine_GetCurrentTime, + media_engine_SetCurrentTime, + media_engine_GetStartTime, + media_engine_GetDuration, + media_engine_IsPaused, + media_engine_GetDefaultPlaybackRate, + media_engine_SetDefaultPlaybackRate, + media_engine_GetPlaybackRate, + media_engine_SetPlaybackRate, + media_engine_GetPlayed, + media_engine_GetSeekable, + media_engine_IsEnded, + media_engine_GetAutoPlay, + media_engine_SetAutoPlay, + media_engine_GetLoop, + media_engine_SetLoop, + media_engine_Play, + media_engine_Pause, + media_engine_GetMuted, + media_engine_SetMuted, + media_engine_GetVolume, + media_engine_SetVolume, + media_engine_HasVideo, + media_engine_HasAudio, + media_engine_GetNativeVideoSize, + media_engine_GetVideoAspectRatio, + media_engine_Shutdown, + media_engine_TransferVideoFrame, + media_engine_OnVideoStreamTick, +}; + static HRESULT WINAPI media_engine_factory_QueryInterface(IMFMediaEngineClassFactory *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFMediaEngineClassFactory) || @@ -68,12 +497,61 @@ static ULONG WINAPI media_engine_factory_Release(IMFMediaEngineClassFactory *ifa return 1; } +static void init_media_engine_attributes(IMFAttributes *attributes, struct media_engine_attributes *engine_attr) +{ + HRESULT hr; + + memset(engine_attr, 0, sizeof(*engine_attr)); + hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, + (void **)&engine_attr->callback); + if (FAILED(hr)) + return; + + IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, (UINT64 *)&engine_attr->playback_hwnd); + IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_DXGI_MANAGER, &IID_IMFDXGIDeviceManager, + (void **)&engine_attr->dxgi_manager); + hr = IMFAttributes_GetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, &engine_attr->output_format); + if (engine_attr->playback_hwnd) /* FIXME: handle MF_MEDIA_ENGINE_PLAYBACK_VISUAL */ + engine_attr->mode = MEDIA_ENGINE_RENDERING_MODE; + else + { + if (SUCCEEDED(hr)) + engine_attr->mode = MEDIA_ENGINE_FRAME_SERVER_MODE; + else + engine_attr->mode = MEDIA_ENGINE_AUDIO_MODE; + } +} + static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFactory *iface, DWORD flags, IMFAttributes *attributes, IMFMediaEngine **engine) { - FIXME("(%p, %#x, %p, %p): stub.\n", iface, flags, attributes, engine); + struct media_engine_attributes engine_attr; + struct media_engine *object; - return E_NOTIMPL; + FIXME("(%p, %#x, %p, %p): semi-stub.\n", iface, flags, attributes, engine); + + if (!attributes || !engine) + return E_POINTER; + + init_media_engine_attributes(attributes, &engine_attr); + if (!engine_attr.mode) + return MF_E_ATTRIBUTENOTFOUND; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + { + free_media_engine_attributes(engine_attr); + return E_OUTOFMEMORY; + } + + object->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; + object->refcount = 1; + object->flags = flags; + object->attributes = engine_attr; + + *engine = &object->IMFMediaEngine_iface; + + return S_OK; } static HRESULT WINAPI media_engine_factory_CreateTimeRange(IMFMediaEngineClassFactory *iface, diff --git a/dlls/mfmediaengine/tests/Makefile.in b/dlls/mfmediaengine/tests/Makefile.in index 3f2bb5a094..d508db9f6f 100644 --- a/dlls/mfmediaengine/tests/Makefile.in +++ b/dlls/mfmediaengine/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfmediaengine.dll -IMPORTS = ole32 mfplat mfmediaengine mfuuid +IMPORTS = ole32 mfplat mfmediaengine mfuuid uuid C_SRCS = \ mfmediaengine.c diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index c7fc89f2b1..a264d0d033 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -24,11 +24,85 @@ #include "winbase.h" #include "mfapi.h" +#include "mfidl.h" #include "mfmediaengine.h" +#include "mferror.h" +#include "dxgi.h" +#include "initguid.h" #include "wine/heap.h" #include "wine/test.h" +static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); + +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); +} + +static void init_functions(void) +{ + HMODULE mod = GetModuleHandleA("mfplat.dll"); + +#define X(f) p##f = (void*)GetProcAddress(mod, #f) + X(MFCreateDXGIDeviceManager); +#undef X +} + +struct media_engine_notify +{ + IMFMediaEngineNotify IMFMediaEngineNotify_iface; + LONG refcount; +}; + +static inline struct media_engine_notify *impl_from_IMFMediaEngineNotify(IMFMediaEngineNotify *iface) +{ + return CONTAINING_RECORD(iface, struct media_engine_notify, IMFMediaEngineNotify_iface); +} + +static HRESULT WINAPI media_engine_notify_QueryInterface(IMFMediaEngineNotify *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFMediaEngineNotify) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaEngineNotify_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI media_engine_notify_AddRef(IMFMediaEngineNotify *iface) +{ + struct media_engine_notify *notify = impl_from_IMFMediaEngineNotify(iface); + return InterlockedIncrement(&notify->refcount); +} + +static ULONG WINAPI media_engine_notify_Release(IMFMediaEngineNotify *iface) +{ + struct media_engine_notify *notify = impl_from_IMFMediaEngineNotify(iface); + return InterlockedDecrement(&notify->refcount); +} + +static HRESULT WINAPI media_engine_notify_EventNotify(IMFMediaEngineNotify *iface, DWORD event, DWORD_PTR param1, DWORD param2) +{ + return S_OK; +} + +static IMFMediaEngineNotifyVtbl media_engine_notify_vtbl = +{ + media_engine_notify_QueryInterface, + media_engine_notify_AddRef, + media_engine_notify_Release, + media_engine_notify_EventNotify, +}; + static void test_factory(void) { IMFMediaEngineClassFactory *factory, *factory2; @@ -47,7 +121,83 @@ static void test_factory(void) "Unexpected hr %#x.\n", hr); if (factory) + { + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *notify = &notify_impl.IMFMediaEngineNotify_iface; + IMFMediaEngine *media_engine, *media_engine2; + IMFDXGIDeviceManager *manager; + IMFAttributes *attributes; + UINT token; + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + hr = MFCreateAttributes(&attributes, 3); + ok(hr == S_OK, "MFCreateAttributes failed: %#x.\n", hr); + + if (0) + { + /* Crashed on Windows 8 */ + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + NULL, &media_engine); + ok(hr == E_POINTER, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + NULL, NULL); + ok(hr == E_POINTER, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + } + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_OPM_HWND, NULL); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)notify); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* pre win10v1809 */, + "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + if (SUCCEEDED(hr)) + IMFMediaEngine_Release(media_engine); + + EXPECT_REF(factory, 1); + hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); + ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine); + ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); + if (0) + { + /* Different version of Windows has different reference count behaviour, and I didn't + see their logics. So skipping these tests on Windows. */ + EXPECT_REF(media_engine, 1); + EXPECT_REF(factory, 1); + } + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, + attributes, &media_engine2); + ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); + if (0) + { + EXPECT_REF(media_engine, 1); + EXPECT_REF(media_engine2, 1); + EXPECT_REF(factory, 1); + } + + IMFMediaEngine_Release(media_engine); + IMFMediaEngine_Release(media_engine2); + IMFAttributes_DeleteAllItems(attributes); + IMFAttributes_Release(attributes); + IMFDXGIDeviceManager_Release(manager); IMFMediaEngineClassFactory_Release(factory); + } + else + win_skip("Not IMFMediaEngineClassFactory support.\n"); CoUninitialize(); } @@ -56,6 +206,8 @@ START_TEST(mfmediaengine) { HRESULT hr; + init_functions(); + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "MFStartup failed: %#x.\n", hr); diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index 940cacc9c1..556d2fba2b 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -20,6 +20,36 @@ import "mfidl.idl"; cpp_quote("EXTERN_GUID(CLSID_MFMediaEngineClassFactory, 0xb44392da, 0x499b, 0x446b, 0xa4, 0xcb, 0x00, 0x5f, 0xea, 0xd0, 0xe6, 0xd5);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_AUDIO_CATEGORY, 0xc8d4c51d, 0x350e, 0x41f2, 0xba, 0x46, 0xfa, 0xeb, 0xbb, 0x08, 0x57, 0xf6);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_AUDIO_ENDPOINT_ROLE, 0xd2cb93d1, 0x116a, 0x44f2, 0x93, 0x85, 0xf7, 0xd0, 0xfd, 0xa2, 0xfb, 0x46);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE, 0x4e0212e2, 0xe18f, 0x41e1, 0x95, 0xe5, 0xc0, 0xe7, 0xe9, 0x23, 0x5b, 0xc3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE9, 0x052c2d39, 0x40c0, 0x4188, 0xab, 0x86, 0xf8, 0x28, 0x27, 0x3b, 0x75, 0x22);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE10, 0x11a47afd, 0x6589, 0x4124, 0xb3, 0x12, 0x61, 0x58, 0xec, 0x51, 0x7f, 0xc3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE11, 0x1cf1315f, 0xce3f, 0x4035, 0x93, 0x91, 0x16, 0x14, 0x2f, 0x77, 0x51, 0x89);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE_EDGE, 0xa6f3e465, 0x3aca, 0x442c, 0xa3, 0xf0, 0xad, 0x6d, 0xda, 0xd8, 0x39, 0xae);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CALLBACK, 0xc60381b8, 0x83a4, 0x41f8, 0xa3, 0xd0, 0xde, 0x05, 0x07, 0x68, 0x49, 0xa9);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COMPATIBILITY_MODE, 0x3ef26ad4, 0xdc54, 0x45de, 0xb9, 0xaf, 0x76, 0xc8, 0xc6, 0x6b, 0xfa, 0x8e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COMPATIBILITY_MODE_WIN10, 0x5b25e089, 0x6ca7, 0x4139, 0xa2, 0xcb, 0xfc, 0xaa, 0xb3, 0x95, 0x52, 0xa3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COMPATIBILITY_MODE_WWA_EDGE, 0x15b29098, 0x9f01, 0x4e4d, 0xb6, 0x5a, 0xc0, 0x6c, 0x6c, 0x89, 0xda, 0x2a);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CONTENT_PROTECTION_FLAGS, 0xe0350223, 0x5aaf, 0x4d76, 0xa7, 0xc3, 0x06, 0xde, 0x70, 0x89, 0x4d, 0xb4);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CONTENT_PROTECTION_MANAGER, 0xfdd6dfaa, 0xbd85, 0x4af3, 0x9e, 0x0f, 0xa0, 0x1d, 0x53, 0x9d, 0x87, 0x6a);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_CONTINUE_ON_CODEC_ERROR, 0xdbcdb7f9, 0x48e4, 0x4295, 0xb7, 0x0d, 0xd5, 0x18, 0x23, 0x4e, 0xeb, 0x38);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_COREWINDOW, 0xfccae4dc, 0x0b7f, 0x41c2, 0x9f, 0x96, 0x46, 0x59, 0x94, 0x8a, 0xcd, 0xdc);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_DXGI_MANAGER, 0x065702da, 0x1094, 0x486d, 0x86, 0x17, 0xee, 0x7c, 0xc4, 0xee, 0x46, 0x48);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_EME_CALLBACK, 0x494553a7, 0xa481, 0x4cb7, 0xbe, 0xc5, 0x38, 0x09, 0x03, 0x51, 0x37, 0x31);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_EXTENSION, 0x3109fd46, 0x060d, 0x4b62, 0x8d, 0xcf, 0xfa, 0xff, 0x81, 0x13, 0x18, 0xd2);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_MEDIA_PLAYER_MODE, 0x3ddd8d45, 0x5aa1, 0x4112, 0x82, 0xe5, 0x36, 0xf6, 0xa2, 0x19, 0x7e, 0x6e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_NEEDKEY_CALLBACK, 0x7ea80843, 0xb6e4, 0x432c, 0x8e, 0xa4, 0x78, 0x48, 0xff, 0xe4, 0x22, 0x0e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_OPM_HWND, 0xa0be8ee7, 0x0572, 0x4f2c, 0xa8, 0x01, 0x2a, 0x15, 0x1b, 0xd3, 0xe7, 0x26);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_PLAYBACK_HWND, 0xd988879b, 0x67c9, 0x4d92, 0xba, 0xa7, 0x6e, 0xad, 0xd4, 0x46, 0x03, 0x9d);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_PLAYBACK_VISUAL, 0x6debd26f, 0x6ab9, 0x4d7e, 0xb0, 0xee, 0xc6, 0x1a, 0x73, 0xff, 0xad, 0x15);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_SOURCE_RESOLVER_CONFIG_STORE, 0x0ac0c497, 0xb3c4, 0x48c9, 0x9c, 0xde, 0xbb, 0x8c, 0xa2, 0x44, 0x2c, 0xa3);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_STREAM_CONTAINS_ALPHA_CHANNEL, 0x5cbfaf44, 0xd2b2, 0x4cfb, 0x80, 0xa7, 0xd4, 0x29, 0xc7, 0x4c, 0x78, 0x9d);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_SYNCHRONOUS_CLOSE, 0xc3c2e12f, 0x7e0e, 0x4e43, 0xb9, 0x1c, 0xdc, 0x99, 0x2c, 0xcd, 0xfa, 0x5e);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_TELEMETRY_APPLICATION_ID, 0x1e7b273b, 0xa7e4, 0x402a, 0x8f, 0x51, 0xc4, 0x8e, 0x88, 0xa2, 0xca, 0xbc);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_TRACK_ID, 0x65bea312, 0x4043, 0x4815, 0x8e, 0xab, 0x44, 0xdc, 0xe2, 0xef, 0x8f, 0x2a);") +cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, 0x5066893c, 0x8cf9, 0x42bc, 0x8b, 0x8a, 0x47, 0x22, 0x12, 0xe5, 0x27, 0x26);") + typedef enum MF_MEDIA_ENGINE_ERR { MF_MEDIA_ENGINE_ERR_NOERROR, @@ -54,6 +84,16 @@ typedef struct MFVideoNormalizedRect float bottom; } MFVideoNormalizedRect; +typedef enum MF_MEDIA_ENGINE_CREATEFLAGS +{ + MF_MEDIA_ENGINE_AUDIOONLY = 0x1, + MF_MEDIA_ENGINE_WAITFORSTABLE_STATE = 0x2, + MF_MEDIA_ENGINE_FORCEMUTE = 0x4, + MF_MEDIA_ENGINE_REAL_TIME_MODE = 0x8, + MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS = 0x10, + MF_MEDIA_ENGINE_CREATEFLAGS_MASK = 0x1f +} MF_MEDIA_ENGINE_CREATEFLAGS; + [ object, uuid(fc0e10d2-ab2a-4501-a951-06bb1075184c), @@ -166,3 +206,14 @@ interface IMFMediaEngineClassFactory : IUnknown HRESULT CreateTimeRange([out] IMFMediaTimeRange **range); HRESULT CreateError([out] IMFMediaError **error); } + +[ + object, + uuid(fee7c112-e776-42b5-9bbf-0048524e2bd5), + local, + pointer_default(unique) +] +interface IMFMediaEngineNotify : IUnknown +{ + HRESULT EventNotify([in] DWORD event, [in] DWORD_PTR param1, [in] DWORD param2); +} -- 2.23.0.rc1

1 0

[PATCH v2] dsound/tests: Add effect parameters tests.
by Alistair Leslie-Hughes 03 Sep '19

03 Sep '19

v2: Corrected ok message for GetAllParameters call. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/tests/dsound8.c | 322 ++++++++++++++++++++++++++++++++++++ 1 file changed, 322 insertions(+) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index fabd8a037e..0b967fe8d8 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1375,6 +1375,327 @@ static void test_effects(void) while (IDirectSound8_Release(dso)); } +static void test_echo_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXEcho *echo; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_ECHO, 0, &IID_IDirectSoundFXEcho,(void**)&echo); + ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXEcho params; + + rc = IDirectSoundFXEcho_GetAllParameters(echo, &params); + todo_wine ok(rc==DS_OK,"Failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.fWetDryMix == 50.0f, "got %f\n", params.fWetDryMix); + ok(params.fFeedback == 50.0f, "got %f\n", params.fFeedback); + ok(params.fLeftDelay == 500.0f,"got %f\n", params.fLeftDelay); + ok(params.fRightDelay == 500.0f,"got %f\n", params.fRightDelay); + ok(params.lPanDelay == 0, "got %d\n", params.lPanDelay); + } + + IDirectSoundFXEcho_Release(echo); + } +} + +static void test_gargle_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXGargle *gargle; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_GARGLE, 0, &IID_IDirectSoundFXGargle,(void**)&gargle); + todo_wine ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXGargle params; + + rc = IDirectSoundFXGargle_GetAllParameters(gargle, &params); + todo_wine ok(rc==DS_OK,"Failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.dwRateHz == 20, "got %d\n", params.dwRateHz); + ok(params.dwWaveShape == DSFXGARGLE_WAVE_TRIANGLE, "got %d\n", params.dwWaveShape); + } + + IDirectSoundFXGargle_Release(gargle); + } +} + +static void test_chorus_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXChorus *chorus; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_CHORUS, 0, &IID_IDirectSoundFXChorus,(void**)&chorus); + todo_wine ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXChorus params; + + rc = IDirectSoundFXChorus_GetAllParameters(chorus, &params); + todo_wine ok(rc==DS_OK,"Failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.fWetDryMix == 50.0f, "got %f\n", params.fWetDryMix); + ok(params.fDepth == 10.0f, "got %f\n", params.fDepth); + ok(params.fFeedback == 25.0f, "got %f\n", params.fFeedback); + ok(params.fFrequency == 1.1f, "got %f\n", params.fFrequency); + ok(params.lWaveform == DSFXCHORUS_WAVE_SIN, "got %d\n", params.lWaveform); + ok(params.fDelay == 16.0f, "got %f\n", params.fDelay); + ok(params.lPhase == 3, "got %d\n", params.lPhase); + } + + IDirectSoundFXChorus_Release(chorus); + } +} + +static void test_flanger_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXFlanger *flanger; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_FLANGER, 0, &IID_IDirectSoundFXFlanger,(void**)&flanger); + todo_wine ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXFlanger params; + + rc = IDirectSoundFXFlanger_GetAllParameters(flanger, &params); + todo_wine ok(rc==DS_OK,"Failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.fWetDryMix == 50.0f, "got %f\n", params.fWetDryMix); + ok(params.fDepth == 100.0f, "got %f\n", params.fDepth); + ok(params.fFeedback == -50.0f, "got %f\n", params.fFeedback); + ok(params.fFrequency == 0.25f, "got %f\n", params.fFrequency); + ok(params.lWaveform == DSFXFLANGER_WAVE_SIN, "got %d\n", params.lWaveform); + ok(params.fDelay == 2.0f, "got %f\n", params.fDelay); + ok(params.lPhase == 2, "got %d\n", params.lPhase); + } + + IDirectSoundFXFlanger_Release(flanger); + } +} + +static void test_distortion_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXDistortion *distortion; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_DISTORTION, 0, &IID_IDirectSoundFXDistortion,(void**)&distortion); + todo_wine ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXDistortion params; + + rc = IDirectSoundFXDistortion_GetAllParameters(distortion, &params); + todo_wine ok(rc==DS_OK,"Failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.fGain == -18.0f, "got %f\n", params.fGain); + ok(params.fEdge == 15.0f, "got %f\n", params.fEdge); + ok(params.fPostEQCenterFrequency == 2400.0f, "got %f\n", params.fPostEQCenterFrequency); + ok(params.fPostEQBandwidth == 2400.0f, "got %f\n", params.fPostEQBandwidth); + ok(params.fPreLowpassCutoff == 3675.0f, "got %f\n", params.fPreLowpassCutoff); + } + + IDirectSoundFXDistortion_Release(distortion); + } +} + +static void test_compressor_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXCompressor *compressor; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_COMPRESSOR, 0, &IID_IDirectSoundFXCompressor,(void**)&compressor); + todo_wine ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXCompressor params; + + rc = IDirectSoundFXCompressor_GetAllParameters(compressor, &params); + todo_wine ok(rc==DS_OK,"Failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.fGain == 0.0f, "got %f\n", params.fGain); + ok(params.fAttack == 10.0f, "got %f\n", params.fAttack); + ok(params.fThreshold == -20.0f, "got %f\n", params.fThreshold); + ok(params.fRatio == 3.0f, "got %f\n", params.fRatio); + ok(params.fPredelay == 4.0f, "got %f\n", params.fPredelay); + } + + IDirectSoundFXCompressor_Release(compressor); + } +} + +static void test_parameq_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXParamEq *parameq; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_PARAMEQ, 0, &IID_IDirectSoundFXParamEq,(void**)&parameq); + todo_wine ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXParamEq params; + + rc = IDirectSoundFXParamEq_GetAllParameters(parameq, &params); + todo_wine ok(rc==DS_OK,"Failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.fCenter == 3675.0f, "got %f\n", params.fCenter); + ok(params.fBandwidth == 12.0f, "got %f\n", params.fBandwidth); + ok(params.fGain == 0.0f, "got %f\n", params.fGain); + } + + IDirectSoundFXParamEq_Release(parameq); + } +} + +static void test_reverb_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXI3DL2Reverb *reverb; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IDirectSoundFXI3DL2Reverb,(void**)&reverb); + todo_wine ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXI3DL2Reverb params; + + rc = IDirectSoundFXI3DL2Reverb_GetAllParameters(reverb, &params); + todo_wine ok(rc==DS_OK,"Failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.lRoom == -1000, "got %d\n", params.lRoom); + ok(params.flRoomRolloffFactor == 0.0f, "got %f\n", params.flRoomRolloffFactor); + ok(params.flDecayTime == 1.49f, "got %f\n", params.flDecayTime); + ok(params.flDecayHFRatio == 0.83f, "got %f\n", params.flDecayHFRatio); + ok(params.lReflections == -2602, "got %d\n", params.lReflections); + ok(params.lReverb == 200, "got %d\n", params.lReverb); + ok(params.flReverbDelay == 0.011f, "got %f\n", params.flReverbDelay); + ok(params.flDiffusion == 100.0f, "got %f\n", params.flDiffusion); + ok(params.flDensity == 100.0f, "got %f\n", params.flDensity); + ok(params.flHFReference == 5000.0f, "got %f\n", params.flHFReference); + } + + IDirectSoundFXI3DL2Reverb_Release(reverb); + } +} + +static void test_effects_parameters(void) +{ + HRESULT rc; + LPDIRECTSOUND8 dso; + LPDIRECTSOUNDBUFFER primary, secondary = NULL; + LPDIRECTSOUNDBUFFER8 secondary8 = NULL; + DSBUFFERDESC bufdesc; + WAVEFORMATEX wfx; + DSEFFECTDESC effects[8]; + DWORD resultcodes[8]; + + /* Create a DirectSound8 object */ + rc=pDirectSoundCreate8(NULL,&dso,NULL); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n",rc); + + if (rc!=DS_OK) + return; + + rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + if (rc!=DS_OK) + { + IDirectSound8_Release(dso); + return; + } + + primary=NULL; + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize=sizeof(bufdesc); + bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); + ok((rc==DS_OK && primary!=NULL), "Failed to create a primary buffer: " "%08x\n",rc); + if (rc!=DS_OK) + goto cleanup; + + init_format(&wfx,WAVE_FORMAT_PCM,11025,8,1); + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize=sizeof(bufdesc); + bufdesc.dwFlags=0; + bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, + wfx.nBlockAlign); + bufdesc.lpwfxFormat=&wfx; + + ZeroMemory(effects, sizeof(effects)); + effects[0].dwSize=sizeof(effects[0]); + effects[0].guidDSFXClass=GUID_DSFX_STANDARD_ECHO; + effects[1].dwSize=sizeof(effects[0]); + effects[1].guidDSFXClass=GUID_DSFX_STANDARD_GARGLE; + effects[2].dwSize=sizeof(effects[0]); + effects[2].guidDSFXClass=GUID_DSFX_STANDARD_CHORUS; + effects[3].dwSize=sizeof(effects[0]); + effects[3].guidDSFXClass=GUID_DSFX_STANDARD_FLANGER; + effects[4].dwSize=sizeof(effects[0]); + effects[4].guidDSFXClass=GUID_DSFX_STANDARD_DISTORTION; + effects[5].dwSize=sizeof(effects[0]); + effects[5].guidDSFXClass=GUID_DSFX_STANDARD_COMPRESSOR; + effects[6].dwSize=sizeof(effects[0]); + effects[6].guidDSFXClass=GUID_DSFX_STANDARD_PARAMEQ; + effects[7].dwSize=sizeof(effects[0]); + effects[7].guidDSFXClass=GUID_DSFX_STANDARD_I3DL2REVERB; + + bufdesc.dwFlags=DSBCAPS_CTRLFX; + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + ok(rc==DS_OK && secondary!=NULL, "Failed to create a secondary buffer: %08x\n",rc); + if (rc!=DS_OK || !secondary) + goto cleanup; + + rc=IDirectSoundBuffer_QueryInterface(secondary,&IID_IDirectSoundBuffer8,(LPVOID*)&secondary8); + ok(rc==DS_OK,"IDirectSoundBuffer_QueryInterface(IID_IDirectSoundBuffer8) failed: %08x\n", rc); + if (rc!=DS_OK) + goto cleanup; + + rc=IDirectSoundBuffer8_SetFX(secondary8, ARRAY_SIZE(effects), effects, resultcodes); + ok(rc==DS_OK || rc==REGDB_E_CLASSNOTREG || rc==DSERR_CONTROLUNAVAIL,"SetFX failed: %08x\n", rc); + if (rc!=DS_OK) + goto cleanup; + + if (resultcodes[0] == DSFXR_LOCSOFTWARE || resultcodes[0] == DSFXR_LOCHARDWARE) + test_echo_parameters(secondary8); + + if (resultcodes[1] == DSFXR_LOCSOFTWARE || resultcodes[1] == DSFXR_LOCHARDWARE) + test_gargle_parameters(secondary8); + + if (resultcodes[2] == DSFXR_LOCSOFTWARE || resultcodes[2] == DSFXR_LOCHARDWARE) + test_chorus_parameters(secondary8); + + if (resultcodes[3] == DSFXR_LOCSOFTWARE || resultcodes[3] == DSFXR_LOCHARDWARE) + test_flanger_parameters(secondary8); + + if (resultcodes[4] == DSFXR_LOCSOFTWARE || resultcodes[4] == DSFXR_LOCHARDWARE) + test_distortion_parameters(secondary8); + + if (resultcodes[5] == DSFXR_LOCSOFTWARE || resultcodes[5] == DSFXR_LOCHARDWARE) + test_compressor_parameters(secondary8); + + if (resultcodes[6] == DSFXR_LOCSOFTWARE || resultcodes[6] == DSFXR_LOCHARDWARE) + test_parameq_parameters(secondary8); + + if (resultcodes[7] == DSFXR_LOCSOFTWARE || resultcodes[7] == DSFXR_LOCHARDWARE) + test_reverb_parameters(secondary8); + +cleanup: + if(secondary8) + IDirectSoundBuffer8_Release(secondary8); + if(primary) + IDirectSoundBuffer_Release(primary); + IDirectSound8_Release(dso); +} + START_TEST(dsound8) { HMODULE hDsound; @@ -1397,6 +1718,7 @@ START_TEST(dsound8) test_hw_buffers(); test_first_device(); test_effects(); + test_effects_parameters(); } else skip("DirectSoundCreate8 missing - skipping all tests\n"); -- 2.17.1

2 1

[PATCH 7/7] ntdll: Call send_debug_event from debug handler on x86_64.
by Jacek Caban 03 Sep '19

03 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 2 +- dlls/ntdll/signal_x86_64.c | 31 +++++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 5 deletions(-)

2 1

[PATCH 6/7] ntdll: Remove no loner needed func argument from setup_raise_exception.
by Jacek Caban 03 Sep '19

03 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

1 0

[PATCH 5/7] ntdll: Call virtual_handle_fault from signal handler on x86_64.
by Jacek Caban 03 Sep '19

03 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-)

1 0

[PATCH 4/7] ntdll: Handle interrupt exceptions in signal handler on x86_64.
by Jacek Caban 03 Sep '19

03 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)

1 0

[PATCH 3/7] ntdll: Handle single step exception in setup_raise_exception on x86_64.
by Jacek Caban 03 Sep '19

03 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 50 +++++++++++++++----------------------- 1 file changed, 19 insertions(+), 31 deletions(-)

1 0

[PATCH 1/7] ntdll: Move setup_exception implementation.
by Jacek Caban 03 Sep '19

03 Sep '19

To simplify next patches. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 234 ++++++++++++++++++------------------- 1 file changed, 117 insertions(+), 117 deletions(-)

1 0

[PATCH] wininet/tests: Fix memory leaks.
by Andrey Gusev 03 Sep '19

03 Sep '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/wininet/tests/internet.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 7889e40ea8..03760b6f34 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1256,6 +1256,8 @@ static void test_Option_PerConnectionOption(void) ret = InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, &size); ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); + + HeapFree(GetProcessHeap(), 0, list.pOptions); orig_settings = list.pOptions; /* set the global IE proxy server */ @@ -1384,6 +1386,8 @@ static void test_Option_PerConnectionOptionA(void) ret = InternetQueryOptionA(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, &size); ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); + + HeapFree(GetProcessHeap(), 0, list.pOptions); orig_settings = list.pOptions; /* set the global IE proxy server */ -- 2.21.0

2 1

[PATCH] wbemdisp: Handle NULL signatures in init_members.
by Piotr Caban 03 Sep '19

03 Sep '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47709 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

2 1

[PATCH v2] winemac.drv: Fix build with older macOS SDKs.
by Zhiyi Zhang 03 Sep '19

03 Sep '19

macOS SDKs older than 10.11 doesn't support Metal. macOS 10.11 and 10.12 SDK support Metal but don't support registryID in MTLDevice protocol. Recommend using 10.13+ SDK. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 169291. Fix build with macOS 10.11 and 10.12 SDKs as well. configure.ac | 12 ++++++++++++ dlls/winemac.drv/cocoa_display.m | 5 ++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d0af7ef4a1..a9e1da886d 100644 --- a/configure.ac +++ b/configure.ac @@ -859,6 +859,18 @@ case $host_os in AC_SUBST(METAL_LIBS,"-framework Metal -framework QuartzCore") fi + dnl Check for MTLDevice registryID property + if test "$ac_cv_header_Metal_Metal_h" = "yes" + then + AC_MSG_CHECKING([whether MTLDevice protocol supports registryID property]) + AC_LANG_PUSH([Objective C]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <Metal/Metal.h>]], [[id<MTLDevice> device; device.registryID;]])], + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_MTLDEVICE_REGISTRYID, 1, [Define if MTLDevice protocol has registryID property.])], + [AC_MSG_RESULT(no)]) + AC_LANG_POP([Objective C]) + fi + dnl Enable Mac driver on Mac OS X 10.6 or later if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes" then diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 3863557d96..9d95eee99a 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -21,7 +21,7 @@ #include "config.h" #import <AppKit/AppKit.h> -#ifdef HAVE_METAL_METAL_H +#ifdef HAVE_MTLDEVICE_REGISTRYID #import <Metal/Metal.h> #endif #include "macdrv_cocoa.h" @@ -234,7 +234,7 @@ static int macdrv_get_gpu_info_from_entry(struct macdrv_gpu* gpu, io_registry_en return ret; } -#ifdef HAVE_METAL_METAL_H +#ifdef HAVE_MTLDEVICE_REGISTRYID /*********************************************************************** * macdrv_get_gpu_info_from_registry_id @@ -337,7 +337,6 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) { - TRACE("Metal support not compiled in\n"); return -1; } -- 2.15.2 (Apple Git-101.1)

2 1

[PATCH] testbot/SetWinLocale: Don't delete the Windows commands in debug mode.
by Francois Gouget 03 Sep '19

03 Sep '19

This makes it possible to analyze or re-run them manually. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/SetWinLocale | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale index a6015635..76f2edbf 100755 --- a/testbot/scripts/SetWinLocale +++ b/testbot/scripts/SetWinLocale @@ -807,8 +807,15 @@ if (!$DryRun) FatalError("could not run intl.cpl: ", $TA->GetLastError(), "\n"); } - $TA->Rm("script.bat"); - $TA->Rm("locales.xml"); + if ($Debug) + { + print STDERR "Not deleting script.bat and locales.xml\n"; + } + else + { + $TA->Rm("script.bat"); + $TA->Rm("locales.xml"); + } } if ($OptReboot) -- 2.20.1

1 0

[PATCH] testbot/WineReconfig: Only build testagentd and TestLauncher if given --build.
by Francois Gouget 03 Sep '19

03 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/WineReconfig.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 4bd939aa..6d7f3b41 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -252,8 +252,8 @@ if ($DataDir =~ /'/) # Run the builds and/or tests # -exit(1) if (!BuildNativeTestAgentd()); -exit(1) if (!BuildTestLauncher()); +exit(1) if ($OptBuild and !BuildNativeTestAgentd()); +exit(1) if ($OptBuild and !BuildTestLauncher()); exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptAddOns and !UpdateAddOns()); exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm)); -- 2.20.1

1 0

[PATCH] testbot/TestLauncher: Fix a couple of GNU make dependencies.
by Francois Gouget 03 Sep '19

03 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/TestLauncher/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index 6b41e018..b040353d 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -9,7 +9,7 @@ CROSSZIPEXE = upx-ucl all: TestLauncher32.exe TestLauncher64.exe TestLauncher32.exe: TestLauncher.c - $(CROSSCC32) -Wall -o $@ $< + $(CROSSCC32) -Wall -o $@ TestLauncher.c $(CROSSSTRIP32) $@ if which $(CROSSZIPEXE); \ then \ @@ -17,7 +17,7 @@ TestLauncher32.exe: TestLauncher.c fi TestLauncher64.exe: TestLauncher.c - $(CROSSCC64) -Wall -o $@ $< + $(CROSSCC64) -Wall -o $@ TestLauncher.c $(CROSSSTRIP64) $@ if which $(CROSSZIPEXE); \ then \ -- 2.20.1

1 0

[PATCH] testbot/testagentd: Fix a couple of GNU make dependencies.
by Francois Gouget 03 Sep '19

03 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/testagentd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 4f16f9c6..b2f9e82a 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -9,7 +9,7 @@ windows: TestAgentd.exe $(builddir)/testagentd: testagentd.o platform_unix.o - $(CC) -o $@ $^ + $(CC) -o $@ testagentd.o platform_unix.o strip $@ .c.o: @@ -17,7 +17,7 @@ $(builddir)/testagentd: testagentd.o platform_unix.o TestAgentd.exe: testagentd.obj platform_windows.obj - $(CROSSCC32) -o $@ $^ -lws2_32 + $(CROSSCC32) -o $@ testagentd.obj platform_windows.obj -lws2_32 $(CROSSSTRIP32) $@ .SUFFIXES: .obj -- 2.20.1

1 0

[PATCH 1/4] amstream/tests: Add more tests for media types.
by Zebediah Figura 03 Sep '19

03 Sep '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/amstream/tests/amstream.c | 175 ++++++++++++++++++++++++++++----- 1 file changed, 151 insertions(+), 24 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 000bb40537f..75862e70910 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1039,34 +1039,10 @@ static void test_media_streams(void) ok(nb_pins == expected_nb_pins, "Number of pins is %u instead of %u\n", nb_pins, expected_nb_pins); for (i = 0; i < min(nb_pins, expected_nb_pins); i++) { - IEnumMediaTypes* enum_media_types; - AM_MEDIA_TYPE* media_types[10]; - ULONG nb_media_types; IPin* pin; - PIN_INFO info; - WCHAR id[40]; - - /* Pin name is "I{guid MSPID_PrimaryVideo or MSPID_PrimaryAudio}" */ - id[0] = 'I'; - StringFromGUID2(i ? &MSPID_PrimaryAudio : &MSPID_PrimaryVideo, id + 1, 39); hr = IPin_ConnectedTo(pins[i], &pin); ok(hr == VFW_E_NOT_CONNECTED, "IPin_ConnectedTo returned: %x\n", hr); - hr = IPin_QueryPinInfo(pins[i], &info); - ok(hr == S_OK, "IPin_QueryPinInfo returned: %x\n", hr); - IBaseFilter_Release(info.pFilter); - ok(info.dir == PINDIR_INPUT, "Pin direction is %u instead of %u\n", info.dir, PINDIR_INPUT); - ok(!lstrcmpW(info.achName, id), "Pin name is %s instead of %s\n", wine_dbgstr_w(info.achName), wine_dbgstr_w(id)); - hr = IPin_EnumMediaTypes(pins[i], &enum_media_types); - ok(hr == S_OK, "IPin_EnumMediaTypes returned: %x\n", hr); - hr = IEnumMediaTypes_Next(enum_media_types, ARRAY_SIZE(media_types), media_types, &nb_media_types); - ok(SUCCEEDED(hr), "IEnumMediaTypes_Next returned: %x\n", hr); - ok(nb_media_types > 0, "nb_media_types should be >0\n"); - IEnumMediaTypes_Release(enum_media_types); - hr = IMediaStream_QueryInterface(i ? audio_stream : video_stream, &IID_IPin, (void **)&pin); - ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); - ok(pin == pins[i], "Pin is %p instead of %p\n", pins[i], pin); - IPin_Release(pin); IPin_Release(pins[i]); } IEnumPins_Release(enum_pins); @@ -1780,6 +1756,156 @@ static void test_enum_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_media_types(void) +{ + static const VIDEOINFOHEADER req_vih = {}; + static const WAVEFORMATEX expect_wfx = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 1, + .nSamplesPerSec = 11025, + .nAvgBytesPerSec = 11025 * 2, + .nBlockAlign = 2, + .wBitsPerSample = 16, + .cbSize = 0, + }; + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IEnumMediaTypes *enummt; + IMediaStream *stream; + AM_MEDIA_TYPE *pmt; + ULONG ref, count; + unsigned int i; + HRESULT hr; + IPin *pin; + + static const GUID *rejected_subtypes[] = + { + &MEDIASUBTYPE_RGB1, + &MEDIASUBTYPE_RGB4, + &MEDIASUBTYPE_RGB565, + &MEDIASUBTYPE_RGB555, + &MEDIASUBTYPE_RGB24, + &MEDIASUBTYPE_RGB32, + &MEDIASUBTYPE_ARGB32, + &MEDIASUBTYPE_ARGB1555, + &MEDIASUBTYPE_ARGB4444, + &GUID_NULL, + }; + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video), "Got major type %s\n", + wine_dbgstr_guid(&pmt->majortype)); + todo_wine ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB8), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + todo_wine ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + todo_wine ok(pmt->lSampleSize == 10000, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &GUID_NULL), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + pmt->formattype = FORMAT_VideoInfo; + pmt->cbFormat = sizeof(VIDEOINFOHEADER); + pmt->pbFormat = (BYTE *)&req_vih; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = FALSE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = MEDIATYPE_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Audio; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Stream; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Video; + + for (i = 0; i < ARRAY_SIZE(rejected_subtypes); ++i) + { + pmt->subtype = *rejected_subtypes[i]; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x for subtype %s.\n", + hr, wine_dbgstr_guid(rejected_subtypes[i])); + } + + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + IMediaStream_Release(stream); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + ok(count == 1, "Got count %u.\n", count); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s\n", + wine_dbgstr_guid(&pmt->majortype)); + todo_wine ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + todo_wine ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + todo_wine ok(pmt->lSampleSize == 2, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", pmt->cbFormat); + ok(!memcmp(pmt->pbFormat, &expect_wfx, sizeof(WAVEFORMATEX)), "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + } + + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + IMediaStream_Release(stream); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_IDirectDrawStreamSample(void) { DDSURFACEDESC desc = { sizeof(desc) }; @@ -2158,6 +2284,7 @@ START_TEST(amstream) test_pin_info(); test_initialize(); test_enum_media_types(); + test_media_types(); test_IDirectDrawStreamSample(); file = CreateFileW(filenameW, 0, 0, NULL, OPEN_EXISTING, 0, NULL); -- 2.22.0

1 3

[PATCH] wininet/tests: Remove LPVOID argument.
by Andrey Gusev 02 Sep '19

02 Sep '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6db33e4033..cb96abe612 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5524,7 +5524,7 @@ static void test_http_connection(void) si.hEvent = CreateEventW(NULL, 0, 0, NULL); si.port = 7531; - hThread = CreateThread(NULL, 0, server_thread, (LPVOID) &si, 0, &id); + hThread = CreateThread(NULL, 0, server_thread, &si, 0, &id); ok( hThread != NULL, "create thread failed\n"); r = WaitForSingleObject(si.hEvent, 10000); -- 2.21.0

2 1

[PATCH] quartz: Don't cast from COM object to interface
by Michael Stefaniuc 02 Sep '19

02 Sep '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- The second cast should go too but that requires exposing struct QualityControlImpl in include/wine/strmbase.h . dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 6451f85b5a..3478f95f51 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -394,7 +394,7 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(BaseRenderer *iface, IMediaSam q.Proportion = 1000; q.Late = jitter; q.TimeStamp = tStart; - IQualityControl_Notify((IQualityControl *)This->renderer.qcimpl, (IBaseFilter*)This, q); + IQualityControl_Notify((IQualityControl *)This->renderer.qcimpl, &This->renderer.filter.IBaseFilter_iface, q); } return hr; } -- 2.20.1

2 1

[PATCH 5/5 v2] msvcrt: Match broken multi-byte character with everything in _mbsspn.
by Piotr Caban 02 Sep '19

02 Sep '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/mbcs.c | 3 +++ dlls/msvcrt/tests/string.c | 3 +++ dlls/ucrtbase/tests/string.c | 41 ++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+)

1 0

[PATCH 4/5 v2] msvcrt: Reimplement _mbsspnp using _mbsspn.
by Piotr Caban 02 Sep '19

02 Sep '19

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47693 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/mbcs.c | 47 ++++++++++++-------------------------- dlls/msvcrt/tests/string.c | 4 ++-- 2 files changed, 17 insertions(+), 34 deletions(-)

1 0

[PATCH 3/5 v2] msvcrt: Fix _mbsspn implementation.
by Piotr Caban 02 Sep '19

02 Sep '19

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/mbcs.c | 24 ++++++++---------------- dlls/msvcrt/tests/string.c | 4 ++-- 2 files changed, 10 insertions(+), 18 deletions(-)

1 0

[PATCH 2/5 v2] msvcrt/tests: Add more tests for _mbsspn and _mbsspnp.
by Piotr Caban 02 Sep '19

02 Sep '19

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)

1 0

[PATCH 1/5 v2] msvcrt/tests: Restore the multibyte codepage after the tests.
by Piotr Caban 02 Sep '19

02 Sep '19

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> N.B. _setmbcp() doesn't return the previous codepage. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - use _ismbblead instead of _mbsnextc in patch 3 - add patch 5 that makes the behavior identical on broken input dlls/msvcrt/tests/string.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)

1 0

[PATCH] winhttp/tests: Remove LPVOID arguments.
by Andrey Gusev 02 Sep '19

02 Sep '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/winhttp/tests/notification.c | 2 +- dlls/winhttp/tests/winhttp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 510d9e7a3e..e2bbb714fe 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1023,7 +1023,7 @@ START_TEST (notification) si.event = CreateEventW( NULL, 0, 0, NULL ); si.port = 7533; - thread = CreateThread( NULL, 0, server_thread, (LPVOID)&si, 0, NULL ); + thread = CreateThread( NULL, 0, server_thread, &si, 0, NULL ); ok(thread != NULL, "failed to create thread %u\n", GetLastError()); server_socket_available = CreateEventW( NULL, 0, 0, NULL ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index eb7c7b54f8..b005514dfa 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4842,7 +4842,7 @@ START_TEST (winhttp) si.event = CreateEventW(NULL, 0, 0, NULL); si.port = 7532; - thread = CreateThread(NULL, 0, server_thread, (LPVOID)&si, 0, NULL); + thread = CreateThread(NULL, 0, server_thread, &si, 0, NULL); ok(thread != NULL, "failed to create thread %u\n", GetLastError()); ret = WaitForSingleObject(si.event, 10000); -- 2.21.0

2 1

[PATCH] strmbase: Don't cast from COM object to interface
by Michael Stefaniuc 02 Sep '19

02 Sep '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/strmbase/transform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index e03874b7d6..fdecc8d0d1 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -351,9 +351,9 @@ HRESULT strmbase_transform_create(LONG filter_size, IUnknown *outer, const CLSID return E_FAIL; } -HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *sender, Quality qm) +HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *filter, IBaseFilter *sender, Quality qm) { - return QualityControlImpl_Notify((IQualityControl*)iface->qcimpl, sender, qm); + return QualityControlImpl_Notify(&filter->qcimpl->IQualityControl_iface, sender, qm); } static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) -- 2.20.1

1 0

[PATCH] rpcrt4: Return an exception code from NdrAsyncClientCall.
by Dmitry Timoshkov 02 Sep '19

02 Sep '19

Otherwise the caller may decide to wait for the call termination which will never happen. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/rpcrt4/ndr_stubless.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index de58a9f22b..90537515ea 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1773,6 +1773,7 @@ static void do_ndr_async_client_call( const MIDL_STUB_DESC *pStubDesc, PFORMAT_S LONG_PTR CDECL DECLSPEC_HIDDEN ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, void **stack_top ) { + LONG_PTR ret = 0; const NDR_PROC_HEADER *pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0]; TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); @@ -1786,14 +1787,15 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, __EXCEPT_ALL { FIXME("exception %x during ndr_async_client_call()\n", GetExceptionCode()); + ret = GetExceptionCode(); } __ENDTRY } else do_ndr_async_client_call( pStubDesc, pFormat, stack_top); - TRACE("returning 0\n"); - return 0; + TRACE("returning %ld\n", ret); + return ret; } RPC_STATUS NdrpCompleteAsyncClientCall(RPC_ASYNC_STATE *pAsync, void *Reply) -- 2.20.1

1 0

[PATCH] dnsapi: Add DnsGetCacheDataTable stub
by Rémi Bernon 02 Sep '19

02 Sep '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40606 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dnsapi/dnsapi.spec | 2 +- dlls/dnsapi/main.c | 10 +++++++ dlls/dnsapi/tests/Makefile.in | 1 + dlls/dnsapi/tests/cache.c | 49 +++++++++++++++++++++++++++++++++++ include/windns.h | 10 +++++++ 5 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 dlls/dnsapi/tests/cache.c diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index de0ed1d2b94..0d50c56ec68 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -40,7 +40,7 @@ @ stub DnsFreeNetworkInformation @ stub DnsFreeSearchInformation @ stub DnsGetBufferLengthForStringCopy -@ stub DnsGetCacheDataTable +@ stdcall DnsGetCacheDataTable(ptr) @ stub DnsGetDnsServerList @ stub DnsGetDomainName @ stub DnsGetHostName_A diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 6cb3b493b77..4ab294c7c07 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -111,6 +111,16 @@ BOOL WINAPI DnsFlushResolverCacheEntry_W( PCWSTR entry ) return TRUE; } +/****************************************************************************** + * DnsGetCacheDataTable [DNSAPI.@] + * + */ +BOOL WINAPI DnsGetCacheDataTable( PDNS_CACHE_ENTRY* entry ) +{ + FIXME( "(%p) stub\n", entry ); + return FALSE; +} + /****************************************************************************** * DnsReleaseContextHandle [DNSAPI.@] * diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in index 20412e82111..14c8f30fd1f 100644 --- a/dlls/dnsapi/tests/Makefile.in +++ b/dlls/dnsapi/tests/Makefile.in @@ -2,5 +2,6 @@ TESTDLL = dnsapi.dll IMPORTS = dnsapi C_SRCS = \ + cache.c \ name.c \ record.c diff --git a/dlls/dnsapi/tests/cache.c b/dlls/dnsapi/tests/cache.c new file mode 100644 index 00000000000..cb41b9aa289 --- /dev/null +++ b/dlls/dnsapi/tests/cache.c @@ -0,0 +1,49 @@ +/* + * Tests for dns cache functions + * + * Copyright 2019 Remi Bernon 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 + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "windns.h" + +#include "wine/test.h" + +static void test_DnsGetCacheDataTable( void ) +{ + BOOL ret; + PDNS_CACHE_ENTRY entry = NULL; + + ret = DnsGetCacheDataTable( NULL ); + ok( !ret, "DnsGetCacheDataTable succeeded\n" ); + + ret = DnsGetCacheDataTable( &entry ); + todo_wine + ok( ret, "DnsGetCacheDataTable failed\n" ); + todo_wine + ok( entry != NULL, "DnsGetCacheDataTable returned NULL\n" ); +} + +START_TEST(cache) +{ + test_DnsGetCacheDataTable(); +} diff --git a/include/windns.h b/include/windns.h index d9a4b9adb07..0bdbd9a5378 100644 --- a/include/windns.h +++ b/include/windns.h @@ -697,6 +697,15 @@ typedef struct _DNS_QUERY_CANCEL char Reserved[32]; } DNS_QUERY_CANCEL, *PDNS_QUERY_CANCEL; +typedef struct _DNS_CACHE_ENTRY +{ + struct _DNS_CACHE_ENTRY* Next; + const WCHAR *Name; + WORD Type; + WORD DataLength; + ULONG Flags; +} DNS_CACHE_ENTRY, *PDNS_CACHE_ENTRY; + DNS_STATUS WINAPI DnsAcquireContextHandle_A(DWORD,PVOID,PHANDLE); DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,PHANDLE); #define DnsAcquireContextHandle WINELIB_NAME_AW(DnsAcquireContextHandle_) @@ -734,6 +743,7 @@ DNS_STATUS WINAPI DnsValidateName_UTF8(PCSTR,DNS_NAME_FORMAT); #define DnsValidateName WINELIB_NAME_AW(DnsValidateName_) BOOL WINAPI DnsWriteQuestionToBuffer_W(PDNS_MESSAGE_BUFFER,PDWORD,PCWSTR,WORD,WORD,BOOL); BOOL WINAPI DnsWriteQuestionToBuffer_UTF8(PDNS_MESSAGE_BUFFER,PDWORD,PCSTR,WORD,WORD,BOOL); +BOOL WINAPI DnsGetCacheDataTable(PDNS_CACHE_ENTRY*); #ifdef __cplusplus } -- 2.23.0.rc1

3 5

[PATCH] dsound/tests: Add effect parameters tests.
by Alistair Leslie-Hughes 02 Sep '19

02 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/tests/dsound8.c | 322 ++++++++++++++++++++++++++++++++++++ 1 file changed, 322 insertions(+) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index fabd8a037e..779529731b 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1375,6 +1375,327 @@ static void test_effects(void) while (IDirectSound8_Release(dso)); } +static void test_echo_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXEcho *echo; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_ECHO, 0, &IID_IDirectSoundFXEcho,(void**)&echo); + ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXEcho params; + + rc = IDirectSoundFXEcho_GetAllParameters(echo, &params); + todo_wine ok(rc==DS_OK,"SetFX failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.fWetDryMix == 50.0f, "got %f\n", params.fWetDryMix); + ok(params.fFeedback == 50.0f, "got %f\n", params.fFeedback); + ok(params.fLeftDelay == 500.0f,"got %f\n", params.fLeftDelay); + ok(params.fRightDelay == 500.0f,"got %f\n", params.fRightDelay); + ok(params.lPanDelay == 0, "got %d\n", params.lPanDelay); + } + + IDirectSoundFXEcho_Release(echo); + } +} + +static void test_gargle_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXGargle *gargle; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_GARGLE, 0, &IID_IDirectSoundFXGargle,(void**)&gargle); + todo_wine ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXGargle params; + + rc = IDirectSoundFXGargle_GetAllParameters(gargle, &params); + todo_wine ok(rc==DS_OK,"SetFX failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.dwRateHz == 20, "got %d\n", params.dwRateHz); + ok(params.dwWaveShape == DSFXGARGLE_WAVE_TRIANGLE, "got %d\n", params.dwWaveShape); + } + + IDirectSoundFXGargle_Release(gargle); + } +} + +static void test_chorus_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXChorus *chorus; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_CHORUS, 0, &IID_IDirectSoundFXChorus,(void**)&chorus); + todo_wine ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXChorus params; + + rc = IDirectSoundFXChorus_GetAllParameters(chorus, &params); + todo_wine ok(rc==DS_OK,"SetFX failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.fWetDryMix == 50.0f, "got %f\n", params.fWetDryMix); + ok(params.fDepth == 10.0f, "got %f\n", params.fDepth); + ok(params.fFeedback == 25.0f, "got %f\n", params.fFeedback); + ok(params.fFrequency == 1.1f, "got %f\n", params.fFrequency); + ok(params.lWaveform == DSFXCHORUS_WAVE_SIN, "got %d\n", params.lWaveform); + ok(params.fDelay == 16.0f, "got %f\n", params.fDelay); + ok(params.lPhase == 3, "got %d\n", params.lPhase); + } + + IDirectSoundFXChorus_Release(chorus); + } +} + +static void test_flanger_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXFlanger *flanger; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_FLANGER, 0, &IID_IDirectSoundFXFlanger,(void**)&flanger); + todo_wine ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXFlanger params; + + rc = IDirectSoundFXFlanger_GetAllParameters(flanger, &params); + todo_wine ok(rc==DS_OK,"SetFX failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.fWetDryMix == 50.0f, "got %f\n", params.fWetDryMix); + ok(params.fDepth == 100.0f, "got %f\n", params.fDepth); + ok(params.fFeedback == -50.0f, "got %f\n", params.fFeedback); + ok(params.fFrequency == 0.25f, "got %f\n", params.fFrequency); + ok(params.lWaveform == DSFXFLANGER_WAVE_SIN, "got %d\n", params.lWaveform); + ok(params.fDelay == 2.0f, "got %f\n", params.fDelay); + ok(params.lPhase == 2, "got %d\n", params.lPhase); + } + + IDirectSoundFXFlanger_Release(flanger); + } +} + +static void test_distortion_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXDistortion *distortion; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_DISTORTION, 0, &IID_IDirectSoundFXDistortion,(void**)&distortion); + todo_wine ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXDistortion params; + + rc = IDirectSoundFXDistortion_GetAllParameters(distortion, &params); + todo_wine ok(rc==DS_OK,"SetFX failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.fGain == -18.0f, "got %f\n", params.fGain); + ok(params.fEdge == 15.0f, "got %f\n", params.fEdge); + ok(params.fPostEQCenterFrequency == 2400.0f, "got %f\n", params.fPostEQCenterFrequency); + ok(params.fPostEQBandwidth == 2400.0f, "got %f\n", params.fPostEQBandwidth); + ok(params.fPreLowpassCutoff == 3675.0f, "got %f\n", params.fPreLowpassCutoff); + } + + IDirectSoundFXDistortion_Release(distortion); + } +} + +static void test_compressor_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXCompressor *compressor; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_COMPRESSOR, 0, &IID_IDirectSoundFXCompressor,(void**)&compressor); + todo_wine ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXCompressor params; + + rc = IDirectSoundFXCompressor_GetAllParameters(compressor, &params); + todo_wine ok(rc==DS_OK,"SetFX failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.fGain == 0.0f, "got %f\n", params.fGain); + ok(params.fAttack == 10.0f, "got %f\n", params.fAttack); + ok(params.fThreshold == -20.0f, "got %f\n", params.fThreshold); + ok(params.fRatio == 3.0f, "got %f\n", params.fRatio); + ok(params.fPredelay == 4.0f, "got %f\n", params.fPredelay); + } + + IDirectSoundFXCompressor_Release(compressor); + } +} + +static void test_parameq_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXParamEq *parameq; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_PARAMEQ, 0, &IID_IDirectSoundFXParamEq,(void**)&parameq); + todo_wine ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXParamEq params; + + rc = IDirectSoundFXParamEq_GetAllParameters(parameq, &params); + todo_wine ok(rc==DS_OK,"SetFX failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.fCenter == 3675.0f, "got %f\n", params.fCenter); + ok(params.fBandwidth == 12.0f, "got %f\n", params.fBandwidth); + ok(params.fGain == 0.0f, "got %f\n", params.fGain); + } + + IDirectSoundFXParamEq_Release(parameq); + } +} + +static void test_reverb_parameters(LPDIRECTSOUNDBUFFER8 secondary8) +{ + HRESULT rc; + IDirectSoundFXI3DL2Reverb *reverb; + + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IDirectSoundFXI3DL2Reverb,(void**)&reverb); + todo_wine ok(rc==DS_OK,"GetObjectInPath failed: %08x\n", rc); + if (rc==DS_OK) + { + DSFXI3DL2Reverb params; + + rc = IDirectSoundFXI3DL2Reverb_GetAllParameters(reverb, &params); + todo_wine ok(rc==DS_OK,"SetFX failed: %08x\n", rc); + if (rc==DS_OK) + { + ok(params.lRoom == -1000, "got %d\n", params.lRoom); + ok(params.flRoomRolloffFactor == 0.0f, "got %f\n", params.flRoomRolloffFactor); + ok(params.flDecayTime == 1.49f, "got %f\n", params.flDecayTime); + ok(params.flDecayHFRatio == 0.83f, "got %f\n", params.flDecayHFRatio); + ok(params.lReflections == -2602, "got %d\n", params.lReflections); + ok(params.lReverb == 200, "got %d\n", params.lReverb); + ok(params.flReverbDelay == 0.011f, "got %f\n", params.flReverbDelay); + ok(params.flDiffusion == 100.0f, "got %f\n", params.flDiffusion); + ok(params.flDensity == 100.0f, "got %f\n", params.flDensity); + ok(params.flHFReference == 5000.0f, "got %f\n", params.flHFReference); + } + + IDirectSoundFXI3DL2Reverb_Release(reverb); + } +} + +static void test_effects_parameters(void) +{ + HRESULT rc; + LPDIRECTSOUND8 dso; + LPDIRECTSOUNDBUFFER primary, secondary = NULL; + LPDIRECTSOUNDBUFFER8 secondary8 = NULL; + DSBUFFERDESC bufdesc; + WAVEFORMATEX wfx; + DSEFFECTDESC effects[8]; + DWORD resultcodes[8]; + + /* Create a DirectSound8 object */ + rc=pDirectSoundCreate8(NULL,&dso,NULL); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n",rc); + + if (rc!=DS_OK) + return; + + rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + if (rc!=DS_OK) + { + IDirectSound8_Release(dso); + return; + } + + primary=NULL; + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize=sizeof(bufdesc); + bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); + ok((rc==DS_OK && primary!=NULL), "Failed to create a primary buffer: " "%08x\n",rc); + if (rc!=DS_OK) + goto cleanup; + + init_format(&wfx,WAVE_FORMAT_PCM,11025,8,1); + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize=sizeof(bufdesc); + bufdesc.dwFlags=0; + bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, + wfx.nBlockAlign); + bufdesc.lpwfxFormat=&wfx; + + ZeroMemory(effects, sizeof(effects)); + effects[0].dwSize=sizeof(effects[0]); + effects[0].guidDSFXClass=GUID_DSFX_STANDARD_ECHO; + effects[1].dwSize=sizeof(effects[0]); + effects[1].guidDSFXClass=GUID_DSFX_STANDARD_GARGLE; + effects[2].dwSize=sizeof(effects[0]); + effects[2].guidDSFXClass=GUID_DSFX_STANDARD_CHORUS; + effects[3].dwSize=sizeof(effects[0]); + effects[3].guidDSFXClass=GUID_DSFX_STANDARD_FLANGER; + effects[4].dwSize=sizeof(effects[0]); + effects[4].guidDSFXClass=GUID_DSFX_STANDARD_DISTORTION; + effects[5].dwSize=sizeof(effects[0]); + effects[5].guidDSFXClass=GUID_DSFX_STANDARD_COMPRESSOR; + effects[6].dwSize=sizeof(effects[0]); + effects[6].guidDSFXClass=GUID_DSFX_STANDARD_PARAMEQ; + effects[7].dwSize=sizeof(effects[0]); + effects[7].guidDSFXClass=GUID_DSFX_STANDARD_I3DL2REVERB; + + bufdesc.dwFlags=DSBCAPS_CTRLFX; + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + ok(rc==DS_OK && secondary!=NULL, "Failed to create a secondary buffer: %08x\n",rc); + if (rc!=DS_OK || !secondary) + goto cleanup; + + rc=IDirectSoundBuffer_QueryInterface(secondary,&IID_IDirectSoundBuffer8,(LPVOID*)&secondary8); + ok(rc==DS_OK,"IDirectSoundBuffer_QueryInterface(IID_IDirectSoundBuffer8) failed: %08x\n", rc); + if (rc!=DS_OK) + goto cleanup; + + rc=IDirectSoundBuffer8_SetFX(secondary8, ARRAY_SIZE(effects), effects, resultcodes); + ok(rc==DS_OK || rc==REGDB_E_CLASSNOTREG || rc==DSERR_CONTROLUNAVAIL,"SetFX failed: %08x\n", rc); + if (rc!=DS_OK) + goto cleanup; + + if (resultcodes[0] == DSFXR_LOCSOFTWARE || resultcodes[0] == DSFXR_LOCHARDWARE) + test_echo_parameters(secondary8); + + if (resultcodes[1] == DSFXR_LOCSOFTWARE || resultcodes[1] == DSFXR_LOCHARDWARE) + test_gargle_parameters(secondary8); + + if (resultcodes[2] == DSFXR_LOCSOFTWARE || resultcodes[2] == DSFXR_LOCHARDWARE) + test_chorus_parameters(secondary8); + + if (resultcodes[3] == DSFXR_LOCSOFTWARE || resultcodes[3] == DSFXR_LOCHARDWARE) + test_flanger_parameters(secondary8); + + if (resultcodes[4] == DSFXR_LOCSOFTWARE || resultcodes[4] == DSFXR_LOCHARDWARE) + test_distortion_parameters(secondary8); + + if (resultcodes[5] == DSFXR_LOCSOFTWARE || resultcodes[5] == DSFXR_LOCHARDWARE) + test_compressor_parameters(secondary8); + + if (resultcodes[6] == DSFXR_LOCSOFTWARE || resultcodes[6] == DSFXR_LOCHARDWARE) + test_parameq_parameters(secondary8); + + if (resultcodes[7] == DSFXR_LOCSOFTWARE || resultcodes[7] == DSFXR_LOCHARDWARE) + test_reverb_parameters(secondary8); + +cleanup: + if(secondary8) + IDirectSoundBuffer8_Release(secondary8); + if(primary) + IDirectSoundBuffer_Release(primary); + IDirectSound8_Release(dso); +} + START_TEST(dsound8) { HMODULE hDsound; @@ -1397,6 +1718,7 @@ START_TEST(dsound8) test_hw_buffers(); test_first_device(); test_effects(); + test_effects_parameters(); } else skip("DirectSoundCreate8 missing - skipping all tests\n"); -- 2.17.1

1 0

[PATCH v3 1/4] powrprof/tests: Test NtPowerInformation() with SystemExecutionState.
by Chip Davis 02 Sep '19

02 Sep '19

Test interaction between SetThreadExecutionState(), PowerSetRequest(), and this parameter. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Test that, when a thread terminates, its execution state is cleaned up. v3: Fix warnings. configure.ac | 1 + dlls/powrprof/tests/Makefile.in | 4 + dlls/powrprof/tests/powrprof.c | 219 ++++++++++++++++++++++++++++++++ include/powrprof.h | 5 + 4 files changed, 229 insertions(+) create mode 100644 dlls/powrprof/tests/Makefile.in create mode 100644 dlls/powrprof/tests/powrprof.c diff --git a/configure.ac b/configure.ac index f45c078674c2..b277642e316f 100644 --- a/configure.ac +++ b/configure.ac @@ -3616,6 +3616,7 @@ WINE_CONFIG_MAKEFILE(dlls/pdh/tests) WINE_CONFIG_MAKEFILE(dlls/photometadatahandler) WINE_CONFIG_MAKEFILE(dlls/pidgen) WINE_CONFIG_MAKEFILE(dlls/powrprof) +WINE_CONFIG_MAKEFILE(dlls/powrprof/tests) WINE_CONFIG_MAKEFILE(dlls/printui) WINE_CONFIG_MAKEFILE(dlls/prntvpt) WINE_CONFIG_MAKEFILE(dlls/propsys) diff --git a/dlls/powrprof/tests/Makefile.in b/dlls/powrprof/tests/Makefile.in new file mode 100644 index 000000000000..87aa06be5026 --- /dev/null +++ b/dlls/powrprof/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = powrprof.dll +IMPORTS = powrprof + +C_SRCS = powrprof.c diff --git a/dlls/powrprof/tests/powrprof.c b/dlls/powrprof/tests/powrprof.c new file mode 100644 index 000000000000..42c70f699f3d --- /dev/null +++ b/dlls/powrprof/tests/powrprof.c @@ -0,0 +1,219 @@ +/* + * Copyright 2019 Chip Davis 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 + * + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "powrprof.h" + +#include "wine/test.h" + +HANDLE (WINAPI *pPowerCreateRequest)(REASON_CONTEXT *); +BOOL (WINAPI *pPowerSetRequest)(HANDLE, POWER_REQUEST_TYPE); +BOOL (WINAPI *pPowerClearRequest)(HANDLE, POWER_REQUEST_TYPE); + +static void test_system_execution_state(void) +{ + EXECUTION_STATE es, old_es; + NTSTATUS status; + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + + old_es = SetThreadExecutionState(ES_SYSTEM_REQUIRED); + todo_wine ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + + old_es = es; + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == old_es, "unexpected execution state 0x%08x vs 0x%08x\n", es, old_es); + + old_es = SetThreadExecutionState(ES_CONTINUOUS | ES_DISPLAY_REQUIRED); + todo_wine ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_DISPLAY_REQUIRED, "unexpected execution state 0x%08x\n", es); + + old_es = SetThreadExecutionState(ES_CONTINUOUS); + ok(old_es == (ES_CONTINUOUS|ES_DISPLAY_REQUIRED), "unexpected execution state 0x%08x\n", old_es); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + + old_es = SetThreadExecutionState(ES_DISPLAY_REQUIRED); + ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + + old_es = es; + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == old_es, "unexpected execution state 0x%08x vs 0x%08x\n", es, old_es); +} + +static HANDLE events[2]; + +static DWORD CALLBACK execution_state_thread(LPVOID param) +{ + EXECUTION_STATE old_es; + + SetThreadExecutionState(ES_SYSTEM_REQUIRED); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + old_es = SetThreadExecutionState(ES_DISPLAY_REQUIRED); + ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + old_es = SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED); + ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + old_es = SetThreadExecutionState(ES_CONTINUOUS | ES_DISPLAY_REQUIRED); + ok(old_es == (ES_CONTINUOUS|ES_SYSTEM_REQUIRED), "unexpected execution state 0x%08x\n", old_es); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + return 0; +} + +static void test_system_execution_state_other_thread(void) +{ + HANDLE thread; + EXECUTION_STATE base_es, es; + NTSTATUS status; + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &base_es, sizeof(base_es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + trace("base execution state = 0x%08x\n", base_es); + + events[0] = CreateEventW(NULL, FALSE, FALSE, NULL); + events[1] = CreateEventW(NULL, FALSE, FALSE, NULL); + thread = CreateThread(NULL, 0, execution_state_thread, NULL, 0, NULL); + ok(thread != NULL, "Failed to create thread, err %u\n", GetLastError()); + + WaitForSingleObject(events[0], INFINITE); + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == base_es, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], events[0], INFINITE, FALSE); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == base_es, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], events[0], INFINITE, FALSE); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_SYSTEM_REQUIRED, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + todo_wine ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], events[0], INFINITE, FALSE); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_DISPLAY_REQUIRED, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + todo_wine ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], thread, INFINITE, FALSE); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == base_es, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + todo_wine ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + + CloseHandle(thread); + CloseHandle(events[0]); + CloseHandle(events[1]); +} + +static void test_system_execution_state_power_request(void) +{ + HANDLE req; + REASON_CONTEXT reason; + BOOL ret; + NTSTATUS status; + EXECUTION_STATE base_es, es; + static WCHAR reasonW[] = {'W', 'i', 'n', 'e', ' ', 't', 'e', 's', 't', 0}; + + if (!pPowerCreateRequest) + { + win_skip("Power request objects unavailable\n"); + return; + } + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &base_es, sizeof(base_es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + trace("base execution state = 0x%08x\n", base_es); + + reason.Version = 0; + reason.Flags = POWER_REQUEST_CONTEXT_SIMPLE_STRING; + reason.Reason.SimpleReasonString = reasonW; + req = pPowerCreateRequest(&reason); + todo_wine ok(req != INVALID_HANDLE_VALUE, "err %u\n", GetLastError()); + + ret = pPowerSetRequest(req, PowerRequestSystemRequired); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_SYSTEM_REQUIRED, "unexpected execution state 0x%08x\n", es); + + ret = pPowerClearRequest(req, PowerRequestSystemRequired); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(!(es & ES_SYSTEM_REQUIRED) || (base_es & ES_SYSTEM_REQUIRED), "unexpected execution state 0x%08x\n", es); + + ret = pPowerSetRequest(req, PowerRequestDisplayRequired); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_DISPLAY_REQUIRED, "unexpected execution state 0x%08x\n", es); + + ret = CloseHandle(req); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(!(es & ES_DISPLAY_REQUIRED) || (base_es & ES_DISPLAY_REQUIRED), "unexpected execution state 0x%08x\n", es); +} + +START_TEST(powrprof) +{ + HMODULE hkernel32; + + hkernel32 = GetModuleHandleA("kernel32.dll"); + pPowerCreateRequest = (void *)GetProcAddress(hkernel32, "PowerCreateRequest"); + pPowerSetRequest = (void *)GetProcAddress(hkernel32, "PowerSetRequest"); + pPowerClearRequest = (void *)GetProcAddress(hkernel32, "PowerClearRequest"); + + test_system_execution_state(); + test_system_execution_state_other_thread(); + test_system_execution_state_power_request(); +} diff --git a/include/powrprof.h b/include/powrprof.h index 318188e465e5..421d9d4fc763 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -146,6 +146,11 @@ extern "C" { typedef BOOLEAN (CALLBACK* PWRSCHEMESENUMPROC)(UINT, DWORD, LPWSTR, DWORD, LPWSTR, PPOWER_POLICY, LPARAM); +#ifndef WINE_NTSTATUS_DECLARED +#define WINE_NTSTATUS_DECLARED +typedef LONG NTSTATUS; +#endif + NTSTATUS WINAPI CallNtPowerInformation(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); BOOLEAN WINAPI CanUserWritePwrScheme(VOID); BOOLEAN WINAPI DeletePwrScheme(UINT); -- 2.21.0

1 0

[PATCH v2 resend 1/4] powrprof/tests: Test NtPowerInformation() with SystemExecutionState.
by Chip Davis 02 Sep '19

02 Sep '19

Test interaction between SetThreadExecutionState(), PowerSetRequest(), and this parameter. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Test that, when a thread terminates, its execution state is cleaned up. configure.ac | 1 + dlls/powrprof/tests/Makefile.in | 4 + dlls/powrprof/tests/powrprof.c | 219 ++++++++++++++++++++++++++++++++ include/powrprof.h | 5 + 4 files changed, 229 insertions(+) create mode 100644 dlls/powrprof/tests/Makefile.in create mode 100644 dlls/powrprof/tests/powrprof.c diff --git a/configure.ac b/configure.ac index f45c078674c2..b277642e316f 100644 --- a/configure.ac +++ b/configure.ac @@ -3616,6 +3616,7 @@ WINE_CONFIG_MAKEFILE(dlls/pdh/tests) WINE_CONFIG_MAKEFILE(dlls/photometadatahandler) WINE_CONFIG_MAKEFILE(dlls/pidgen) WINE_CONFIG_MAKEFILE(dlls/powrprof) +WINE_CONFIG_MAKEFILE(dlls/powrprof/tests) WINE_CONFIG_MAKEFILE(dlls/printui) WINE_CONFIG_MAKEFILE(dlls/prntvpt) WINE_CONFIG_MAKEFILE(dlls/propsys) diff --git a/dlls/powrprof/tests/Makefile.in b/dlls/powrprof/tests/Makefile.in new file mode 100644 index 000000000000..87aa06be5026 --- /dev/null +++ b/dlls/powrprof/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = powrprof.dll +IMPORTS = powrprof + +C_SRCS = powrprof.c diff --git a/dlls/powrprof/tests/powrprof.c b/dlls/powrprof/tests/powrprof.c new file mode 100644 index 000000000000..d744895cc484 --- /dev/null +++ b/dlls/powrprof/tests/powrprof.c @@ -0,0 +1,219 @@ +/* + * Copyright 2019 Chip Davis 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 + * + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "powrprof.h" + +#include "wine/test.h" + +HANDLE (WINAPI *pPowerCreateRequest)(REASON_CONTEXT *); +BOOL (WINAPI *pPowerSetRequest)(HANDLE, POWER_REQUEST_TYPE); +BOOL (WINAPI *pPowerClearRequest)(HANDLE, POWER_REQUEST_TYPE); + +static void test_system_execution_state(void) +{ + EXECUTION_STATE es, old_es; + NTSTATUS status; + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + + old_es = SetThreadExecutionState(ES_SYSTEM_REQUIRED); + todo_wine ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + + old_es = es; + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == old_es, "unexpected execution state 0x%08x vs 0x%08x\n", es, old_es); + + old_es = SetThreadExecutionState(ES_CONTINUOUS | ES_DISPLAY_REQUIRED); + todo_wine ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_DISPLAY_REQUIRED, "unexpected execution state 0x%08x\n", es); + + old_es = SetThreadExecutionState(ES_CONTINUOUS); + ok(old_es == (ES_CONTINUOUS|ES_DISPLAY_REQUIRED), "unexpected execution state 0x%08x\n", old_es); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + + old_es = SetThreadExecutionState(ES_DISPLAY_REQUIRED); + ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + + old_es = es; + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == old_es, "unexpected execution state 0x%08x vs 0x%08x\n", es, old_es); +} + +static HANDLE events[2]; + +static DWORD CALLBACK execution_state_thread(LPVOID param) +{ + EXECUTION_STATE old_es; + + SetThreadExecutionState(ES_SYSTEM_REQUIRED); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + old_es = SetThreadExecutionState(ES_DISPLAY_REQUIRED); + ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + old_es = SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED); + ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + old_es = SetThreadExecutionState(ES_CONTINUOUS | ES_DISPLAY_REQUIRED); + ok(old_es == (ES_CONTINUOUS|ES_SYSTEM_REQUIRED), "unexpected execution state 0x%08x\n", old_es); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + return 0; +} + +static void test_system_execution_state_other_thread(void) +{ + HANDLE thread; + EXECUTION_STATE base_es, es; + NTSTATUS status; + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &base_es, sizeof(base_es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + trace("base execution state = 0x%08x\n", base_es); + + events[0] = CreateEventW(NULL, FALSE, FALSE, NULL); + events[1] = CreateEventW(NULL, FALSE, FALSE, NULL); + thread = CreateThread(NULL, 0, execution_state_thread, NULL, 0, NULL); + ok(thread != NULL, "Failed to create thread, err %u\n", GetLastError()); + + WaitForSingleObject(events[0], INFINITE); + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == base_es, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], events[0], INFINITE, FALSE); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == base_es, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], events[0], INFINITE, FALSE); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_SYSTEM_REQUIRED, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + todo_wine ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], events[0], INFINITE, FALSE); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_DISPLAY_REQUIRED, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + todo_wine ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], thread, INFINITE, FALSE); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == base_es, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + todo_wine ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + + CloseHandle(thread); + CloseHandle(events[0]); + CloseHandle(events[1]); +} + +static void test_system_execution_state_power_request() +{ + HANDLE req; + REASON_CONTEXT reason; + BOOL ret; + NTSTATUS status; + EXECUTION_STATE base_es, es; + static const WCHAR reasonW[] = {'W', 'i', 'n', 'e', ' ', 't', 'e', 's', 't', 0}; + + if (!pPowerCreateRequest) + { + win_skip("Power request objects unavailable\n"); + return; + } + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &base_es, sizeof(base_es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + trace("base execution state = 0x%08x\n", base_es); + + reason.Version = 0; + reason.Flags = POWER_REQUEST_CONTEXT_SIMPLE_STRING; + reason.Reason.SimpleReasonString = reasonW; + req = pPowerCreateRequest(&reason); + todo_wine ok(req != INVALID_HANDLE_VALUE, "err %u\n", GetLastError()); + + ret = pPowerSetRequest(req, PowerRequestSystemRequired); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_SYSTEM_REQUIRED, "unexpected execution state 0x%08x\n", es); + + ret = pPowerClearRequest(req, PowerRequestSystemRequired); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(!(es & ES_SYSTEM_REQUIRED) || (base_es & ES_SYSTEM_REQUIRED), "unexpected execution state 0x%08x\n", es); + + ret = pPowerSetRequest(req, PowerRequestDisplayRequired); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_DISPLAY_REQUIRED, "unexpected execution state 0x%08x\n", es); + + ret = CloseHandle(req); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = CallNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(!(es & ES_DISPLAY_REQUIRED) || (base_es & ES_DISPLAY_REQUIRED), "unexpected execution state 0x%08x\n", es); +} + +START_TEST(powrprof) +{ + HMODULE hkernel32; + + hkernel32 = GetModuleHandleA("kernel32.dll"); + pPowerCreateRequest = (void *)GetProcAddress(hkernel32, "PowerCreateRequest"); + pPowerSetRequest = (void *)GetProcAddress(hkernel32, "PowerSetRequest"); + pPowerClearRequest = (void *)GetProcAddress(hkernel32, "PowerClearRequest"); + + test_system_execution_state(); + test_system_execution_state_other_thread(); + test_system_execution_state_power_request(); +} diff --git a/include/powrprof.h b/include/powrprof.h index 318188e465e5..421d9d4fc763 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -146,6 +146,11 @@ extern "C" { typedef BOOLEAN (CALLBACK* PWRSCHEMESENUMPROC)(UINT, DWORD, LPWSTR, DWORD, LPWSTR, PPOWER_POLICY, LPARAM); +#ifndef WINE_NTSTATUS_DECLARED +#define WINE_NTSTATUS_DECLARED +typedef LONG NTSTATUS; +#endif + NTSTATUS WINAPI CallNtPowerInformation(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); BOOLEAN WINAPI CanUserWritePwrScheme(VOID); BOOLEAN WINAPI DeletePwrScheme(UINT); -- 2.21.0

1 3

[PATCH] cabinet: A spelling fix in a variable / field name.
by Francois Gouget 02 Sep '19

02 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/cabinet/fci.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index 03fbf4676bd..df103225bd5 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -174,7 +174,7 @@ typedef struct FCI_Int cab_UWORD cFolders; cab_UWORD cFiles; cab_ULONG cDataBlocks; - cab_ULONG cbFileRemainer; /* uncompressed, yet to be written data */ + cab_ULONG cbFileRemainder; /* uncompressed, yet to be written data */ /* of spanned file of a spanning folder of a spanning cabinet */ struct temp_file data; BOOL fNewPrevious; @@ -839,7 +839,7 @@ static BOOL add_data_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG * static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG payload ) { cab_ULONG sizeOfFiles = 0, sizeOfFilesPrev; - cab_ULONG cbFileRemainer = 0; + cab_ULONG cbFileRemainder = 0; struct file *file, *next; LIST_FOR_EACH_ENTRY_SAFE( file, next, &fci->files_list, struct file, entry ) @@ -852,10 +852,10 @@ static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG sizeOfFilesPrev = sizeOfFiles; /* set complete size of all processed files */ - if (file->folder == cffileCONTINUED_FROM_PREV && fci->cbFileRemainer != 0) + if (file->folder == cffileCONTINUED_FROM_PREV && fci->cbFileRemainder != 0) { - sizeOfFiles += fci->cbFileRemainer; - fci->cbFileRemainer = 0; + sizeOfFiles += fci->cbFileRemainder; + fci->cbFileRemainder = 0; } else sizeOfFiles += file->size; @@ -888,7 +888,7 @@ static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG { /* The size of the uncompressed, data of a spanning file in a */ /* spanning data */ - cbFileRemainer = sizeOfFiles - payload; + cbFileRemainder = sizeOfFiles - payload; } file->folder = cffileCONTINUED_FROM_PREV; } @@ -899,7 +899,7 @@ static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG fci->files_size -= size; } } - fci->cbFileRemainer = cbFileRemainer; + fci->cbFileRemainder = cbFileRemainder; return TRUE; } -- 2.20.1

1 0

[PATCH] widl: Fix a variable name in a comment.
by Francois Gouget 02 Sep '19

02 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/widl/typelib_struct.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typelib_struct.h b/tools/widl/typelib_struct.h index 0d9f8ebd53c..58dd95ec3bd 100644 --- a/tools/widl/typelib_struct.h +++ b/tools/widl/typelib_struct.h @@ -327,7 +327,7 @@ typedef struct { } SLTG_BlkEntry; /* The order of the blocks in the file is given by starting at Block - entry firt_blk and stepping through using the next pointer */ + entry first_blk and stepping through using the next pointer */ /* These then get followed by this magic */ typedef struct { -- 2.20.1

1 0

[PATCH] advapi32/tests: Spelling tweaks in ok() messages.
by Francois Gouget 02 Sep '19

02 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/advapi32/tests/crypt_lmhash.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index a6e812e54a9..4c96e5b7629 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -287,18 +287,18 @@ static void test_SystemFunction004(void) r = pSystemFunction002(out.Buffer, key.Buffer, output); ok(r == STATUS_SUCCESS, "function failed\n"); - ok(((unsigned int*)output)[0] == in.Length, "crypted length wrong\n"); - ok(((unsigned int*)output)[1] == 1, "crypted value wrong\n"); + ok(((unsigned int*)output)[0] == in.Length, "encrypted length wrong\n"); + ok(((unsigned int*)output)[1] == 1, "encrypted value wrong\n"); memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer+8, key.Buffer, output); ok(r == STATUS_SUCCESS, "function failed\n"); - ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); + ok(!memcmp(output, inbuf, sizeof output), "encrypted data wrong\n"); memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer+16, key.Buffer, output); ok(r == STATUS_SUCCESS, "function failed\n"); - ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); + ok(!memcmp(output, inbuf, sizeof output), "encrypted data wrong\n"); } static void test_SystemFunction005(void) -- 2.20.1

1 0

[PATCH] advapi32/tests: Spelling fixes in a couple of comments.
by Francois Gouget 02 Sep '19

02 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/advapi32/tests/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 6b199bc4d35..675426d4a97 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3933,7 +3933,7 @@ static void test_RegLoadMUIString(void) ret = GetSystemDirectoryA(sysdir, ARRAY_SIZE(sysdir)); ok(ret > 0, "GetSystemDirectoryA failed\n"); - /* change the current direcoty to system32 */ + /* change the current directory to system32 */ GetCurrentDirectoryW(ARRAY_SIZE(curdirW), curdirW); SetCurrentDirectoryW(sysdirW); @@ -3982,7 +3982,7 @@ static void test_RegLoadMUIString(void) ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, NULL); ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); - /* change the current direcoty to other than system32 directory */ + /* change the current directory to other than system32 directory */ SetCurrentDirectoryA("\\"); size = 0xdeadbeef; -- 2.20.1

1 0

[PATCH] comctl32: Typo and spelling fixes in comments.
by Francois Gouget 02 Sep '19

02 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/comctl32/commctrl.c | 2 +- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/syslink.c | 2 +- dlls/comctl32/tests/imagelist.c | 2 +- dlls/comctl32/toolbar.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 82ed38ebe52..ac53a2cf0fa 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -671,7 +671,7 @@ CreateUpDownControl (DWORD style, INT x, INT y, INT cx, INT cy, * * NOTES * This function is just a dummy - all the controls are registered at - * the DLL initialization time. See InitCommonContolsEx for details. + * the DLL initialization time. See InitCommonControlsEx for details. */ VOID WINAPI diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 9e91a2f9487..05ae3a61c0e 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -237,7 +237,7 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy * *'dddddd' is handled as 'dddd' plus 'dd'. * *unrecognized formats are strings (here given the type DT_STRING; * start of the string is encoded in lower bits of DT_STRING. - * Therefore, 'string' ends finally up as '<show seconds>tring'. + * Therefore, 'string' ends up as '<show seconds>tring'. * */ static void diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index f113bb2d1f1..8c667a192b3 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2135,7 +2135,7 @@ REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) } else { - /* Place the band in the prexisting row the mouse is hovering over */ + /* Place the band in the preexisting row the mouse is hovering over */ iRowBegin = first_visible(infoPtr); while(iRowBegin < infoPtr->uNumBands) { diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 7b9cccfc989..b2d36826d2a 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -951,7 +951,7 @@ static LRESULT SYSLINK_SetText (SYSLINK_INFO *infoPtr, LPCWSTR Text) /*********************************************************************** * SYSLINK_SetFocusLink - * Updates the focus status bits and focusses the specified link. + * Updates the focus status bits and focuses the specified link. * If no document item is specified, the focus bit will be removed from all links. * Returns the previous focused item. */ diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 0e62ab9e0c8..daa1715e7ee 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2164,7 +2164,7 @@ static void test_color_table(UINT ilc) rgb[2].rgbBlue = 0xff; check_color_table("remove all, add 8", hdc, himl, ilc, rgb, default_table); - /* remove all, add 4. Color table remains the same since it's inplicitly + /* remove all, add 4. Color table remains the same since it's implicitly been set by the previous _Add */ ret = pImageList_Remove(himl, -1); ok(ret, "got %d\n", ret); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 4e4fd757b16..ceab5328bc7 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5691,7 +5691,7 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (nButton == infoPtr->nButtonDrag) { - /* if the button is moved sightly left and we have a + /* if the button is moved slightly left and we have a * separator there then remove it */ if (pt.x < (btnPtr->rect.left + (btnPtr->rect.right - btnPtr->rect.left)/2)) { -- 2.20.1

1 0

[PATCH] makefiles: Avoid rpath=$ORIGIN/... on NetBSD.
by Francois Gouget 02 Sep '19

02 Sep '19

On NetBSD using $ORIGIN in an rpath does not work when running the executable from a symbolic link located in another directory. This is probably because $ORIGIN is set from /proc/self/exe which contains the paths of the symbolic link instead of that of the executable, resulting in the rpath pointing to the wrong location. For Wine this means running './wine notepad' from a 64 bit build does not work because libwine.so.1 is not found. So avoid $ORIGIN on NetBSD and instead use the full path to the build directory. At least this will work until the build directory is moved around. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I don't really like this patch but it gets things going. I consider it to be a NetBSD bug and ideally they would fix it. But then we need some solution in the interim. Also the NetBSD developers seem to dislike the $ORIGIN feature so I'm not sure that will happen. https://mail-index.netbsd.org/tech-pkg/2013/11/15/msg012248.html configure.ac | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 581189b2156..2a535ca90eb 100644 --- a/configure.ac +++ b/configure.ac @@ -958,11 +958,21 @@ case $host_os in WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000" WINE_TRY_CFLAGS([-Wl,--rpath,\$ORIGIN/../lib], - [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" - LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"], + [rpath_opt="-Wl,--rpath"], [WINE_TRY_CFLAGS([-Wl,-R,\$ORIGIN/../lib], - [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" - LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"])]) + [rpath_opt="-Wl,-R"])]) + if test -n "$rpath_opt" + then + LDRPATH_INSTALL="$rpath_opt,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" + case $host_os in + netbsd) + LDRPATH_LOCAL="$rpath_opt,$ac_pwd/libs/wine" + ;; + *) + LDRPATH_LOCAL="$rpath_opt,\\\$\$ORIGIN/\$(top_builddir)/libs/wine" + ;; + esac + fi WINE_TRY_CFLAGS([-Wl,--enable-new-dtags], [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"]) -- 2.20.1

1 0

[PATCH] libwine: Fully dereference the /proc/self/exe symbolic link.
by Francois Gouget 02 Sep '19

02 Sep '19

Linux will do it for us but not NetBSD. That is, if foo is an executable that prints the path /proc/self/exe points to, on Linux one gets: $ ./foo /tmp/foo $ ln -s foo bar $ ln -s bar babar $ /tmp/babar /tmp/foo But on NetBSD one gets instead: $ ./foo /tmp/./foo $ ln -s foo bar $ ln -s bar babar $ /tmp/babar /tmp/babar Fully dereferencing /proc/self/exe is necessary to be able to run both 32 and 64 bit executables from the build tree. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Using realpath() simplifies the code quite a bit and letting it allocate the memory itself seems to be part of POSIX.1-2008. But let me know if this self-allocating feature should be avoided or if realpath() should be avoided altogether (though note we're already using it in a couple of places). libs/wine/config.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index ab5e3816dc5..f4fda02bf95 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -164,33 +164,16 @@ static char *get_runtime_libdir(void) /* read a symlink and return its directory */ static char *symlink_dirname( const char *name ) { - char *p, *buffer, *absdir = NULL; - int ret, size; + char *p, *fullpath = NULL; - for (size = 256; ; size *= 2) + fullpath = realpath( name, NULL ); + if (fullpath) { - if (!(buffer = malloc( size ))) return NULL; - if ((ret = readlink( name, buffer, size )) == -1) break; - if (ret != size) - { - buffer[ret] = 0; - if (!(p = strrchr( buffer, '/' ))) break; - if (p == buffer) p++; - *p = 0; - if (buffer[0] == '/') return buffer; - /* make it absolute */ - absdir = xmalloc( strlen(name) + strlen(buffer) + 1 ); - strcpy( absdir, name ); - if (!(p = strrchr( absdir, '/' ))) break; - strcpy( p + 1, buffer ); - free( buffer ); - return absdir; - } - free( buffer ); + p = strrchr( fullpath, '/' ); + if (p == fullpath) p++; + if (p) *p = 0; } - free( buffer ); - free( absdir ); - return NULL; + return fullpath; } /* return the directory that contains the main exe at run-time */ -- 2.20.1

1 0

[PATCH] libwine: Like Linux, NetBSD has /proc/self/exe.
by Francois Gouget 02 Sep '19

02 Sep '19

It also has /proc/curproc/exe but there does not seem to be a reason to prefer it over /proc/self/exe. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- libs/wine/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 3c9110b3b80..ab5e3816dc5 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -61,7 +61,7 @@ static void fatal_error( const char *err, ... ) __attribute__((noreturn,format( static void fatal_perror( const char *err, ... ) __attribute__((noreturn,format(printf,1,2))); #endif -#if defined(__linux__) || defined(__FreeBSD_kernel__ ) +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) static const char exe_link[] = "/proc/self/exe"; #elif defined (__FreeBSD__) || defined(__DragonFly__) static const char exe_link[] = "/proc/curproc/file"; -- 2.20.1

1 0

[PATCH] libwine: Only link libi386 with the libraries that need it.
by Francois Gouget 02 Sep '19

02 Sep '19

In particular it does not make sense to link executables and dlls built with MinGW with it. From: Naveen Narayanan <zerous(a)nocebo.space> Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> --- configure.ac | 2 +- libs/wine/Makefile.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d0af7ef4a1a..581189b2156 100644 --- a/configure.ac +++ b/configure.ac @@ -409,7 +409,7 @@ WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false], dnl **** Check for some libraries **** dnl Check for -li386 for NetBSD and OpenBSD -AC_CHECK_LIB(i386,i386_set_ldt) +AC_CHECK_LIB(i386,i386_set_ldt,[AC_SUBST(I386_LIBS, "-li386")]) AC_SUBST(OPENGL_LIBS,"") diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 789d09a2185..f7dd34b058d 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,4 +1,5 @@ -EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) +EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS) + C_SRCS = \ config.c \ -- 2.20.1

1 0

[PATCH 1/5] amstream: Use shorter method names for the multimedia stream.
by Zebediah Figura 02 Sep '19

02 Sep '19

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/amstream/amstream_private.h | 2 +- dlls/amstream/main.c | 4 +- dlls/amstream/multimedia.c | 95 +++++++++++++++++--------------- 3 files changed, 55 insertions(+), 46 deletions(-) diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index e44a9de7495..105ddb13f5c 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -34,7 +34,7 @@ #include "amstream.h" #include "wine/heap.h" -HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT multimedia_stream_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT filter_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index b6705945a85..c718f42448c 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -73,8 +73,8 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { - { &CLSID_AMMultiMediaStream, AM_create }, - { &CLSID_AMDirectDrawStream, AM_create }, + { &CLSID_AMMultiMediaStream, multimedia_stream_create }, + { &CLSID_AMDirectDrawStream, multimedia_stream_create }, { &CLSID_AMAudioData, AMAudioData_create }, { &CLSID_MediaStreamFilter, filter_create } }; diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 47753512810..7f0fb34d266 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -50,9 +50,9 @@ static inline struct multimedia_stream *impl_from_IAMMultiMediaStream(IAMMultiMe return CONTAINING_RECORD(iface, struct multimedia_stream, IAMMultiMediaStream_iface); } -static const struct IAMMultiMediaStreamVtbl AM_Vtbl; +static const struct IAMMultiMediaStreamVtbl multimedia_stream_vtbl; -HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT multimedia_stream_create(IUnknown *pUnkOuter, LPVOID *ppObj) { struct multimedia_stream *object; HRESULT hr; @@ -65,7 +65,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl; + object->IAMMultiMediaStream_iface.lpVtbl = &multimedia_stream_vtbl; object->ref = 1; if (FAILED(hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, @@ -82,7 +82,8 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) } /*** IUnknown methods ***/ -static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream* iface, REFIID riid, void** ppvObject) +static HRESULT WINAPI multimedia_stream_QueryInterface(IAMMultiMediaStream *iface, + REFIID riid, void **ppvObject) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -102,7 +103,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream return E_NOINTERFACE; } -static ULONG WINAPI IAMMultiMediaStreamImpl_AddRef(IAMMultiMediaStream* iface) +static ULONG WINAPI multimedia_stream_AddRef(IAMMultiMediaStream *iface) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -111,7 +112,7 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_AddRef(IAMMultiMediaStream* iface) return InterlockedIncrement(&This->ref); } -static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) +static ULONG WINAPI multimedia_stream_Release(IAMMultiMediaStream *iface) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -140,7 +141,8 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) } /*** IMultiMediaStream methods ***/ -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetInformation(IAMMultiMediaStream* iface, DWORD* pdwFlags, STREAM_TYPE* pStreamType) +static HRESULT WINAPI multimedia_stream_GetInformation(IAMMultiMediaStream *iface, + DWORD *pdwFlags, STREAM_TYPE *pStreamType) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -149,7 +151,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetInformation(IAMMultiMediaStream return E_NOTIMPL; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream* iface, REFMSPID idPurpose, IMediaStream** ppMediaStream) +static HRESULT WINAPI multimedia_stream_GetMediaStream(IAMMultiMediaStream *iface, + REFMSPID idPurpose, IMediaStream **ppMediaStream) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); MSPID PurposeId; @@ -171,7 +174,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream return MS_E_NOSTREAM; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_EnumMediaStreams(IAMMultiMediaStream* iface, LONG Index, IMediaStream** ppMediaStream) +static HRESULT WINAPI multimedia_stream_EnumMediaStreams(IAMMultiMediaStream *iface, + LONG Index, IMediaStream **ppMediaStream) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -180,7 +184,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_EnumMediaStreams(IAMMultiMediaStre return E_NOTIMPL; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetState(IAMMultiMediaStream* iface, STREAM_STATE* pCurrentState) +static HRESULT WINAPI multimedia_stream_GetState(IAMMultiMediaStream *iface, STREAM_STATE *pCurrentState) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -189,7 +193,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetState(IAMMultiMediaStream* ifac return E_NOTIMPL; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_SetState(IAMMultiMediaStream* iface, STREAM_STATE new_state) +static HRESULT WINAPI multimedia_stream_SetState(IAMMultiMediaStream *iface, STREAM_STATE new_state) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); HRESULT hr = E_INVALIDARG; @@ -204,7 +208,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_SetState(IAMMultiMediaStream* ifac return hr; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetTime(IAMMultiMediaStream* iface, STREAM_TIME* pCurrentTime) +static HRESULT WINAPI multimedia_stream_GetTime(IAMMultiMediaStream *iface, STREAM_TIME *pCurrentTime) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -213,7 +217,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetTime(IAMMultiMediaStream* iface return E_NOTIMPL; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetDuration(IAMMultiMediaStream* iface, STREAM_TIME* pDuration) +static HRESULT WINAPI multimedia_stream_GetDuration(IAMMultiMediaStream *iface, STREAM_TIME *pDuration) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -222,7 +226,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetDuration(IAMMultiMediaStream* i return E_NOTIMPL; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_Seek(IAMMultiMediaStream* iface, STREAM_TIME seek_time) +static HRESULT WINAPI multimedia_stream_Seek(IAMMultiMediaStream *iface, STREAM_TIME seek_time) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -231,7 +235,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Seek(IAMMultiMediaStream* iface, S return IMediaSeeking_SetPositions(This->media_seeking, &seek_time, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetEndOfStream(IAMMultiMediaStream* iface, HANDLE* phEOS) +static HRESULT WINAPI multimedia_stream_GetEndOfStream(IAMMultiMediaStream *iface, HANDLE *phEOS) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -241,7 +245,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetEndOfStream(IAMMultiMediaStream } /*** IAMMultiMediaStream methods ***/ -static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* iface, STREAM_TYPE StreamType, DWORD dwFlags, IGraphBuilder* pFilterGraph) +static HRESULT WINAPI multimedia_stream_Initialize(IAMMultiMediaStream *iface, + STREAM_TYPE StreamType, DWORD dwFlags, IGraphBuilder *pFilterGraph) { static const WCHAR filternameW[] = {'M','e','d','i','a','S','t','r','e','a','m','F','i','l','t','e','r',0}; struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -296,7 +301,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if return hr; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream* iface, IGraphBuilder** ppGraphBuilder) +static HRESULT WINAPI multimedia_stream_GetFilterGraph(IAMMultiMediaStream *iface, + IGraphBuilder **ppGraphBuilder) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -313,7 +319,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream return S_OK; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream *iface, IMediaStreamFilter **filter) +static HRESULT WINAPI multimedia_stream_GetFilter(IAMMultiMediaStream *iface, + IMediaStreamFilter **filter) { struct multimedia_stream *mmstream = impl_from_IAMMultiMediaStream(iface); @@ -327,8 +334,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream *ifa return S_OK; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream* iface, IUnknown* stream_object, const MSPID* PurposeId, - DWORD dwFlags, IMediaStream** ppNewStream) +static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *iface, + IUnknown *stream_object, const MSPID *PurposeId, DWORD dwFlags, IMediaStream **ppNewStream) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); HRESULT hr; @@ -395,7 +402,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream return hr; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* iface, LPCWSTR filename, DWORD flags) +static HRESULT WINAPI multimedia_stream_OpenFile(IAMMultiMediaStream *iface, + const WCHAR *filename, DWORD flags) { static const WCHAR sourceW[] = {'S','o','u','r','c','e',0}; struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -440,7 +448,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac return ret; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenMoniker(IAMMultiMediaStream* iface, IBindCtx* pCtx, IMoniker* pMoniker, DWORD dwFlags) +static HRESULT WINAPI multimedia_stream_OpenMoniker(IAMMultiMediaStream *iface, + IBindCtx *pCtx, IMoniker *pMoniker, DWORD dwFlags) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -449,7 +458,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenMoniker(IAMMultiMediaStream* i return E_NOTIMPL; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface, DWORD dwFlags) +static HRESULT WINAPI multimedia_stream_Render(IAMMultiMediaStream *iface, DWORD dwFlags) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -461,25 +470,25 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface, return IGraphBuilder_Render(This->pFilterGraph, This->ipin); } -static const IAMMultiMediaStreamVtbl AM_Vtbl = +static const IAMMultiMediaStreamVtbl multimedia_stream_vtbl = { - IAMMultiMediaStreamImpl_QueryInterface, - IAMMultiMediaStreamImpl_AddRef, - IAMMultiMediaStreamImpl_Release, - IAMMultiMediaStreamImpl_GetInformation, - IAMMultiMediaStreamImpl_GetMediaStream, - IAMMultiMediaStreamImpl_EnumMediaStreams, - IAMMultiMediaStreamImpl_GetState, - IAMMultiMediaStreamImpl_SetState, - IAMMultiMediaStreamImpl_GetTime, - IAMMultiMediaStreamImpl_GetDuration, - IAMMultiMediaStreamImpl_Seek, - IAMMultiMediaStreamImpl_GetEndOfStream, - IAMMultiMediaStreamImpl_Initialize, - IAMMultiMediaStreamImpl_GetFilterGraph, - IAMMultiMediaStreamImpl_GetFilter, - IAMMultiMediaStreamImpl_AddMediaStream, - IAMMultiMediaStreamImpl_OpenFile, - IAMMultiMediaStreamImpl_OpenMoniker, - IAMMultiMediaStreamImpl_Render + multimedia_stream_QueryInterface, + multimedia_stream_AddRef, + multimedia_stream_Release, + multimedia_stream_GetInformation, + multimedia_stream_GetMediaStream, + multimedia_stream_EnumMediaStreams, + multimedia_stream_GetState, + multimedia_stream_SetState, + multimedia_stream_GetTime, + multimedia_stream_GetDuration, + multimedia_stream_Seek, + multimedia_stream_GetEndOfStream, + multimedia_stream_Initialize, + multimedia_stream_GetFilterGraph, + multimedia_stream_GetFilter, + multimedia_stream_AddMediaStream, + multimedia_stream_OpenFile, + multimedia_stream_OpenMoniker, + multimedia_stream_Render }; -- 2.22.0

1 4

[PATCH] dsound: Trace all DSBCAPS values.
by Alistair Leslie-Hughes 01 Sep '19

01 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/dsound.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 2fbb3ce40d..f3030d6834 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -105,10 +105,12 @@ static void _dump_DSBCAPS(DWORD xmask) { FE(DSBCAPS_CTRLPAN) FE(DSBCAPS_CTRLVOLUME) FE(DSBCAPS_CTRLPOSITIONNOTIFY) + FE(DSBCAPS_CTRLFX) FE(DSBCAPS_STICKYFOCUS) FE(DSBCAPS_GLOBALFOCUS) FE(DSBCAPS_GETCURRENTPOSITION2) FE(DSBCAPS_MUTE3DATMAXDISTANCE) + FE(DSBCAPS_LOCDEFER) #undef FE }; unsigned int i; -- 2.17.1

1 0

Wine staging 4.15 release
by Alistair Leslie-Hughes 01 Sep '19

01 Sep '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.15 (819 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * dbgeng: Support interfaces IDebugClient2-4. * dbgeng: Support IDebugClient5-7 interfaces. * ntdll/tests: Add more tests for RtlIpv4StringToAddress. * ntdll: Fix a bug when exception handling triggers stack guard page. * ntdll: Trigger stack overflow exception earlier on x86_64. * wuauserv: Add dummy service. Added: * cryptext: Implement CryptExtOpenCER. * [33498] - Implement framework for installing and running native PnP drivers. Updated: * uxtheme-GTK_Theming * ddraw-Texture_Wrong_Caps * directmanipulation-new-dll * kernel32-SetProcessDEPPolicy * ntdll-RtlIpv4StringToAddress Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

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-devel