September 2018 - Wine-devel

[PATCH] crypt32/base64: Fix certificate request header and trailer in CryptBinaryToStringW() output.
by Nikolay Sivov 25 Sep '18

25 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/crypt32/base64.c | 4 +- dlls/crypt32/tests/base64.c | 226 +++++++++++++++++++++++++----------- 2 files changed, 159 insertions(+), 71 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 2ba8055961..bc30779098 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -53,10 +53,10 @@ static const WCHAR CERT_TRAILER_START_W[] = { '-','-','-','-','-','E','N','D',' ',0 }; static const WCHAR CERT_REQUEST_HEADER_W[] = { '-','-','-','-','-','B','E','G','I','N',' ','N','E','W',' ','C','E','R','T', -'I','F','I','C','A','T','E','R','E','Q','U','E','S','T','-','-','-','-','-',0 }; +'I','F','I','C','A','T','E',' ','R','E','Q','U','E','S','T','-','-','-','-','-',0 }; static const WCHAR CERT_REQUEST_TRAILER_W[] = { '-','-','-','-','-','E','N','D',' ','N','E','W',' ','C','E','R','T','I','F', -'I','C','A','T','E','R','E','Q','U','E','S','T','-','-','-','-','-',0 }; +'I','C','A','T','E',' ','R','E','Q','U','E','S','T','-','-','-','-','-',0 }; static const WCHAR X509_HEADER_W[] = { '-','-','-','-','-','B','E','G','I','N',' ','X','5','0','9',' ','C','R','L', '-','-','-','-','-',0 }; diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 633e6d1775..7bc1ec7d0e 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -20,11 +20,10 @@ */ #include <stdio.h> #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winerror.h> +#include <windows.h> #include <wincrypt.h> +#include "wine/heap.h" #include "wine/test.h" #define CERT_HEADER "-----BEGIN CERTIFICATE-----\r\n" @@ -81,6 +80,19 @@ static const struct BinTests testsNoCR[] = { "SElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0NTY3ODkwAA==\n" }, }; +static WCHAR *strdupAtoW(const char *str) +{ + WCHAR *ret = NULL; + DWORD len; + + if (!str) return ret; + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len * sizeof(WCHAR)); + if (ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, DWORD format, const char *expected, const char *header, const char *trailer) { @@ -117,93 +129,169 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, } } -static void testBinaryToStringA(void) +static void encode_compare_base64_W(const BYTE *toEncode, DWORD toEncodeLen, DWORD format, + const WCHAR *expected, const char *header, const char *trailer) +{ + WCHAR *headerW, *trailerW; + DWORD strLen = 0, strLen2; + const WCHAR *ptr; + WCHAR *strW; + BOOL ret; + + ret = CryptBinaryToStringW(toEncode, toEncodeLen, format, NULL, &strLen); + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + + strLen2 = strLen; + strW = heap_alloc(strLen * sizeof(WCHAR)); + ret = CryptBinaryToStringW(toEncode, toEncodeLen, format, strW, &strLen2); + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + ok(strLen2 == strLen - 1, "Expected length %d, got %d\n", strLen - 1, strLen); + + headerW = strdupAtoW(header); + trailerW = strdupAtoW(trailer); + + ptr = strW; + if (headerW) + { + ok(!memcmp(headerW, ptr, lstrlenW(headerW)), "Expected header %s, got %s.\n", wine_dbgstr_w(headerW), + wine_dbgstr_w(ptr)); + ptr += lstrlenW(headerW); + } + ok(!memcmp(expected, ptr, lstrlenW(expected)), "Expected %s, got %s.\n", wine_dbgstr_w(expected), + wine_dbgstr_w(ptr)); + ptr += lstrlenW(expected); + if (trailerW) + ok(!memcmp(trailerW, ptr, lstrlenW(trailerW)), "Expected trailer %s, got %s.\n", wine_dbgstr_w(trailerW), + wine_dbgstr_w(ptr)); + + heap_free(strW); + heap_free(headerW); + heap_free(trailerW); +} + +static void test_CryptBinaryToString(void) { + DWORD strLen, strLen2, i; BOOL ret; - DWORD strLen = 0, i; ret = CryptBinaryToStringA(NULL, 0, 0, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + strLen = 123; ret = CryptBinaryToStringA(NULL, 0, 0, NULL, &strLen); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(strLen == 123, "Unexpected length.\n"); + + if (0) + ret = CryptBinaryToStringW(NULL, 0, 0, NULL, NULL); + + strLen = 123; + ret = CryptBinaryToStringW(NULL, 0, 0, NULL, &strLen); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected error %d\n", GetLastError()); + ok(strLen == 123, "Unexpected length.\n"); + for (i = 0; i < ARRAY_SIZE(tests); i++) { - DWORD strLen = 0; + WCHAR *strW, *encodedW; LPSTR str = NULL; BOOL ret; - ret = CryptBinaryToStringA(tests[i].toEncode, tests[i].toEncodeLen, - CRYPT_STRING_BINARY, NULL, &strLen); + strLen = 0; + ret = CryptBinaryToStringA(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BINARY, NULL, &strLen); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - str = HeapAlloc(GetProcessHeap(), 0, strLen); - if (str) - { - DWORD strLen2 = strLen; - - ret = CryptBinaryToStringA(tests[i].toEncode, tests[i].toEncodeLen, - CRYPT_STRING_BINARY, str, &strLen2); - ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - ok(strLen == strLen2, "Expected length %d, got %d\n", strLen, - strLen2); - ok(!memcmp(str, tests[i].toEncode, tests[i].toEncodeLen), - "Unexpected value\n"); - HeapFree(GetProcessHeap(), 0, str); - } - encodeAndCompareBase64_A(tests[i].toEncode, tests[i].toEncodeLen, - CRYPT_STRING_BASE64, tests[i].base64, NULL, NULL); - encodeAndCompareBase64_A(tests[i].toEncode, tests[i].toEncodeLen, - CRYPT_STRING_BASE64HEADER, tests[i].base64, CERT_HEADER, - CERT_TRAILER); - encodeAndCompareBase64_A(tests[i].toEncode, tests[i].toEncodeLen, - CRYPT_STRING_BASE64REQUESTHEADER, tests[i].base64, - CERT_REQUEST_HEADER, CERT_REQUEST_TRAILER); - encodeAndCompareBase64_A(tests[i].toEncode, tests[i].toEncodeLen, - CRYPT_STRING_BASE64X509CRLHEADER, tests[i].base64, X509_HEADER, - X509_TRAILER); + ok(strLen == tests[i].toEncodeLen, "Unexpected required length %u.\n", strLen); + + strLen2 = strLen; + str = heap_alloc(strLen); + ret = CryptBinaryToStringA(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BINARY, str, &strLen2); + ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); + ok(strLen == strLen2, "Expected length %u, got %u\n", strLen, strLen2); + ok(!memcmp(str, tests[i].toEncode, tests[i].toEncodeLen), "Unexpected value\n"); + heap_free(str); + + strLen = 0; + ret = CryptBinaryToStringW(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BINARY, NULL, &strLen); + todo_wine { + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + ok(strLen == tests[i].toEncodeLen, "Unexpected required length %u.\n", strLen); } + strLen2 = strLen; + strW = heap_alloc(strLen); + ret = CryptBinaryToStringW(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BINARY, strW, &strLen2); + todo_wine + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + ok(strLen == strLen2, "Expected length %u, got %u\n", strLen, strLen2); + todo_wine + ok(!memcmp(strW, tests[i].toEncode, tests[i].toEncodeLen), "Unexpected value\n"); + heap_free(strW); + + encodeAndCompareBase64_A(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BASE64, + tests[i].base64, NULL, NULL); + encodeAndCompareBase64_A(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BASE64HEADER, + tests[i].base64, CERT_HEADER, CERT_TRAILER); + encodeAndCompareBase64_A(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BASE64REQUESTHEADER, + tests[i].base64, CERT_REQUEST_HEADER, CERT_REQUEST_TRAILER); + encodeAndCompareBase64_A(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BASE64X509CRLHEADER, + tests[i].base64, X509_HEADER, X509_TRAILER); + + encodedW = strdupAtoW(tests[i].base64); + + encode_compare_base64_W(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BASE64, encodedW, NULL, NULL); + encode_compare_base64_W(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BASE64HEADER, encodedW, + CERT_HEADER, CERT_TRAILER); + encode_compare_base64_W(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BASE64REQUESTHEADER, + encodedW, CERT_REQUEST_HEADER, CERT_REQUEST_TRAILER); + encode_compare_base64_W(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BASE64X509CRLHEADER, encodedW, + X509_HEADER, X509_TRAILER); + + heap_free(encodedW); + } + for (i = 0; i < ARRAY_SIZE(testsNoCR); i++) { - DWORD strLen = 0; LPSTR str = NULL; + WCHAR *encodedW; BOOL ret; - ret = CryptBinaryToStringA(testsNoCR[i].toEncode, - testsNoCR[i].toEncodeLen, CRYPT_STRING_BINARY | CRYPT_STRING_NOCR, - NULL, &strLen); + ret = CryptBinaryToStringA(testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen, + CRYPT_STRING_BINARY | CRYPT_STRING_NOCR, NULL, &strLen); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - str = HeapAlloc(GetProcessHeap(), 0, strLen); - if (str) - { - DWORD strLen2 = strLen; - - ret = CryptBinaryToStringA(testsNoCR[i].toEncode, - testsNoCR[i].toEncodeLen, CRYPT_STRING_BINARY | CRYPT_STRING_NOCR, - str, &strLen2); - ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - ok(strLen == strLen2, "Expected length %d, got %d\n", strLen, - strLen2); - ok(!memcmp(str, testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen), - "Unexpected value\n"); - HeapFree(GetProcessHeap(), 0, str); - } - encodeAndCompareBase64_A(testsNoCR[i].toEncode, - testsNoCR[i].toEncodeLen, CRYPT_STRING_BASE64 | CRYPT_STRING_NOCR, - testsNoCR[i].base64, NULL, NULL); - encodeAndCompareBase64_A(testsNoCR[i].toEncode, - testsNoCR[i].toEncodeLen, - CRYPT_STRING_BASE64HEADER | CRYPT_STRING_NOCR, testsNoCR[i].base64, - CERT_HEADER_NOCR, CERT_TRAILER_NOCR); - encodeAndCompareBase64_A(testsNoCR[i].toEncode, - testsNoCR[i].toEncodeLen, - CRYPT_STRING_BASE64REQUESTHEADER | CRYPT_STRING_NOCR, - testsNoCR[i].base64, CERT_REQUEST_HEADER_NOCR, - CERT_REQUEST_TRAILER_NOCR); - encodeAndCompareBase64_A(testsNoCR[i].toEncode, - testsNoCR[i].toEncodeLen, - CRYPT_STRING_BASE64X509CRLHEADER | CRYPT_STRING_NOCR, - testsNoCR[i].base64, X509_HEADER_NOCR, X509_TRAILER_NOCR); + + strLen2 = strLen; + str = heap_alloc(strLen); + ret = CryptBinaryToStringA(testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen, + CRYPT_STRING_BINARY | CRYPT_STRING_NOCR, str, &strLen2); + ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); + ok(strLen == strLen2, "Expected length %d, got %d\n", strLen, strLen2); + ok(!memcmp(str, testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen), "Unexpected value\n"); + heap_free(str); + + encodeAndCompareBase64_A(testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen, CRYPT_STRING_BASE64 | CRYPT_STRING_NOCR, + testsNoCR[i].base64, NULL, NULL); + encodeAndCompareBase64_A(testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen, + CRYPT_STRING_BASE64HEADER | CRYPT_STRING_NOCR, testsNoCR[i].base64, CERT_HEADER_NOCR, CERT_TRAILER_NOCR); + encodeAndCompareBase64_A(testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen, + CRYPT_STRING_BASE64REQUESTHEADER | CRYPT_STRING_NOCR, testsNoCR[i].base64, CERT_REQUEST_HEADER_NOCR, + CERT_REQUEST_TRAILER_NOCR); + encodeAndCompareBase64_A(testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen, + CRYPT_STRING_BASE64X509CRLHEADER | CRYPT_STRING_NOCR, testsNoCR[i].base64, X509_HEADER_NOCR, X509_TRAILER_NOCR); + + encodedW = strdupAtoW(testsNoCR[i].base64); + + encode_compare_base64_W(testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen, + CRYPT_STRING_BASE64 | CRYPT_STRING_NOCR, encodedW, NULL, NULL); + encode_compare_base64_W(testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen, + CRYPT_STRING_BASE64HEADER | CRYPT_STRING_NOCR, encodedW, CERT_HEADER_NOCR, CERT_TRAILER_NOCR); + encode_compare_base64_W(testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen, + CRYPT_STRING_BASE64REQUESTHEADER | CRYPT_STRING_NOCR, encodedW, CERT_REQUEST_HEADER_NOCR, + CERT_REQUEST_TRAILER_NOCR); + encode_compare_base64_W(testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen, + CRYPT_STRING_BASE64X509CRLHEADER | CRYPT_STRING_NOCR, encodedW, + X509_HEADER_NOCR, X509_TRAILER_NOCR); + + heap_free(encodedW); } } @@ -545,6 +633,6 @@ static void testStringToBinaryA(void) START_TEST(base64) { - testBinaryToStringA(); + test_CryptBinaryToString(); testStringToBinaryA(); } -- 2.19.0

1 0

[PATCH] quartz: Don't round a <1sec difference to 0 in WAVEParserImpl_seek
by Alex Henrie 25 Sep '18

25 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34302 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- For some reason, the game sets the audio stream position to a negative value, then seeks to 0. If Wine decides that it doesn't actually need to do the seek operation, it then reads garbage data from the negative offset. Unfortunately, there is still another bug with the audio in this game: Wine keeps reading past the end of the audio stream, causing a crash at the end of the audio clip. --- dlls/quartz/waveparser.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index fa9cd45d27..995e43196d 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -211,10 +211,9 @@ static HRESULT WINAPI WAVEParserImpl_seek(IMediaSeeking *iface) return E_INVALIDARG; } - if (curpos/1000000 == newpos/1000000) + if (curpos == newpos) { - TRACE("Requesting position %s same as current position %s\n", - wine_dbgstr_longlong(newpos), wine_dbgstr_longlong(curpos)); + TRACE("Requesting position %s same as current position\n", wine_dbgstr_longlong(newpos)); return S_OK; } -- 2.19.0

2 1

[PATCH 1/4] msvcrt: Do not put cmd.exe special environment variables into the environ
by Jason Edmeades 25 Sep '18

25 Sep '18

All the special environment variables from the command shell which track directory use are stripped out from the C runtime environ/wenviron. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45320 --- Note this cannot be tested by the test suites because it only gets triggered for C applications launched from the command shell - if you launch them from explorer on windows for example, they are not set either. I've attached a comprehensive set of tests onto the bug as an attachment, which tests the interaction of these special variables, the current directory and the C runtime vs the command shell. The way I have chosen to implement this leaves the special variables content in the allocated memory, allowing the memcpy of the environment strings, but does not put a pointer to that data in the char** array of strings. An alternative implementation would copy in string by string and skip them, but I have chosen to leave that unless something is broken because of it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45320 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> --- dlls/msvcrt/data.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 06e16a865e..f08d9b1683 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -73,7 +73,8 @@ char ** msvcrt_SnapshotOfEnvironmentA(char **blk) for (ptr = environ_strings; *ptr; ptr += strlen(ptr) + 1) { - count++; + /* Don't count environment variables starting with '=' which are command shell specific */ + if (*ptr != '=') count++; len += strlen(ptr) + 1; } if (blk) @@ -88,7 +89,8 @@ char ** msvcrt_SnapshotOfEnvironmentA(char **blk) memcpy(&blk[count],environ_strings,len); for (ptr = (char*) &blk[count]; *ptr; ptr += strlen(ptr) + 1) { - blk[i++] = ptr; + /* Skip special environment strings set by the command shell */ + if (*ptr != '=') blk[i++] = ptr; } } blk[i] = NULL; @@ -105,7 +107,8 @@ MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **wblk) for (wptr = wenviron_strings; *wptr; wptr += strlenW(wptr) + 1) { - count++; + /* Don't count environment variables starting with '=' which are command shell specific */ + if (*wptr != '=') count++; len += strlenW(wptr) + 1; } if (wblk) @@ -119,7 +122,8 @@ MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **wblk) memcpy(&wblk[count],wenviron_strings,len * sizeof(MSVCRT_wchar_t)); for (wptr = (MSVCRT_wchar_t*)&wblk[count]; *wptr; wptr += strlenW(wptr) + 1) { - wblk[i++] = wptr; + /* Skip special environment strings set by the command shell */ + if (*wptr != '=') wblk[i++] = wptr; } } wblk[i] = NULL; -- 2.17.1

3 5

[PATCH 1/2] wineboot: Create user profile registry key
by Alex Henrie 25 Sep '18

25 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=15670 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/wineboot/wineboot.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 075b4c8b08..043cc64ab6 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -81,6 +81,7 @@ #include <shobjidl.h> #include <shlwapi.h> #include <shellapi.h> +#include <sddl.h> #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(wineboot); @@ -422,6 +423,31 @@ static void create_volatile_environment_registry_key(void) RegCloseKey( hkey ); } +/* create a profile key for the current user */ +static void create_user_profile_registry_key(void) +{ + WCHAR profile_key_path[512] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'P','r','o','f','i','l','e','L','i','s','t','\\',0}; + HANDLE token; + char buffer[512]; + WCHAR *sid_str; + HKEY profile_key; + + OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + GetTokenInformation(token, TokenUser, buffer, sizeof(buffer), NULL); + ConvertSidToStringSidW(((TOKEN_USER *)buffer)->User.Sid, &sid_str); + strcatW(profile_key_path, sid_str); + LocalFree(sid_str); + + RegCreateKeyExW(HKEY_LOCAL_MACHINE, profile_key_path, 0, NULL, 0, KEY_WRITE, NULL, &profile_key, NULL); + + RegCloseKey(profile_key); + CloseHandle(token); +} + /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini. * Returns FALSE if there was an error, or otherwise if all is ok. */ @@ -1247,6 +1273,7 @@ int main( int argc, char *argv[] ) if (init || update) update_wineprefix( update ); create_volatile_environment_registry_key(); + create_user_profile_registry_key(); ProcessRunKeys( HKEY_LOCAL_MACHINE, RunOnceW, TRUE, TRUE ); -- 2.19.0

2 2

[PATCH] testbot: Let VM scripts identify the last part of a patchset.
by Francois Gouget 25 Sep '18

25 Sep '18

For patchsets (and subsets thereof) the Engine calls GetPatchImpacts() at least once with only the last part. This allows it to know exactly what the last part modifies and thus what needs to be retested. However the VM scripts only have the full patchset so they don't know what the last part is. Thus they are forced to rerun every test touched by the full patchset. So the TestBot now adds a marker before the last part, allowing GetPatchImpacts() to identify it. Note that it does not use '---' as that marker may or may not be present depending on how the patch was formatted for emailing (and can be ambiguous too). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 76 +++++++++++++++------ testbot/lib/WineTestBot/Patches.pm | 5 +- testbot/lib/WineTestBot/PendingPatchSets.pm | 5 ++ 3 files changed, 60 insertions(+), 26 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index b7307e527..f03cc40bb 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -31,7 +31,8 @@ the Wine builds. =cut use Exporter 'import'; -our @EXPORT = qw(GetPatchImpacts UpdateWineData GetBuildTimeout); +our @EXPORT = qw(GetPatchImpacts LastPartSeparator UpdateWineData + GetBuildTimeout); use List::Util qw(min max); @@ -150,6 +151,11 @@ my $IgnoredPathsRe = join('|', 'tools/winemaker/', ); +sub LastPartSeparator() +{ + return "===== TestBot: Last patchset part =====\n"; +} + sub _CreateTestInfo($$$) { my ($Impacts, $Root, $Dir) = @_; @@ -261,9 +267,9 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpacts($;$) +sub GetPatchImpacts($) { - my ($PatchFileName, $PastImpacts) = @_; + my ($PatchFileName) = @_; my $fh; return undef if (!open($fh, "<", $PatchFileName)); @@ -281,25 +287,7 @@ sub GetPatchImpacts($;$) }; _LoadWineFiles(); - if ($PastImpacts) - { - # Update the list of Wine files so we correctly recognize patchset parts - # that modify new Wine files. - my $WineFiles = $PastImpacts->{WineFiles} || $_WineFiles; - map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$WineFiles}; - map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$PastImpacts->{NewFiles}}; - map { delete $Impacts->{WineFiles}->{$_} } keys %{$PastImpacts->{DeletedFiles}}; - - foreach my $PastInfo (values %{$PastImpacts->{Tests}}) - { - foreach my $File (keys %{$PastInfo->{Files}}) - { - _HandleFile($Impacts, "$PastInfo->{Path}/$File", - $PastInfo->{Files}->{$File} eq "rm" ? "rm" : 0); - } - } - } - + my $PastImpacts; my ($Path, $Change); while (my $Line = <$fh>) { @@ -332,6 +320,50 @@ sub GetPatchImpacts($;$) $Path = undef; $Change = ""; } + elsif ($Line eq LastPartSeparator()) + { + # All the diffs so far belongs to previous parts of this patchset. + # But: + # - Only the last part must be taken into account to determine if a + # rebuild and testing is needed. + # - Yet if a rebuild is needed the previous parts' patches will impact + # the scope of the rebuild so that information must be preserved. + # So save current impacts in $PastImpacts and reset the current state. + $PastImpacts = {}; + + # Build a copy of the Wine files list reflecting the current situation. + $Impacts->{WineFiles} = { %$_WineFiles } if (!$Impacts->{WineFiles}); + map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$Impacts->{NewFiles}}; + map { delete $Impacts->{WineFiles}->{$_} } keys %{$Impacts->{DeletedFiles}}; + $Impacts->{NewFiles} = {}; + $Impacts->{DeletedFiles} = {}; + + # The modules impacted by previous parts will still need to be built, + # but only if the last part justifies a build. So make a backup. + $PastImpacts->{BuildModules} = $Impacts->{BuildModules}; + $Impacts->{BuildModules} = {}; + + # Also backup the build-related fields. + foreach my $Field ("Autoconf", "MakeMakefiles", + "PatchedRoot", "PatchedModules", "PatchedTests") + { + $PastImpacts->{$Field} = $Impacts->{$Field}; + $Impacts->{$Field} = undef; + } + + # Reset the status of all test unit files to not modified. + foreach my $TestInfo (values %{$Impacts->{Tests}}) + { + foreach my $File (keys %{$TestInfo->{Files}}) + { + if ($TestInfo->{Files}->{$File} ne "rm") + { + $TestInfo->{Files}->{$File} = 0; + } + } + } + $Impacts->{ModuleUnitCount} = $Impacts->{TestUnitCount} = 0; + } else { $Path = undef; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 038754365..469fedcdc 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -132,10 +132,7 @@ sub Submit($$$) { my ($self, $PatchFileName, $IsSet) = @_; - my $PastImpacts; - $PastImpacts = GetPatchImpacts($PatchFileName) if ($IsSet); - my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, $PastImpacts); - + my $Impacts = GetPatchImpacts($PatchFileName); if (!$Impacts->{PatchedRoot} and !$Impacts->{PatchedModules} and !$Impacts->{PatchedTests}) { diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 3ac8c5350..286b39314 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -42,6 +42,7 @@ use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); use WineTestBot::Config; +use WineTestBot::PatchUtils; use WineTestBot::Utils; @@ -116,6 +117,10 @@ sub SubmitSubset($$$) last; } + if ($PartNo == $MaxPart and $PartNo > 1) + { + print $CombinedFile LastPartSeparator(); + } if (open(my $PartFile, "<" , "$DataDir/patches/" . $Part->Patch->Id)) { print $CombinedFile $_ for (<$PartFile>); -- 2.19.0

1 0

[PATCH v2] quartz/filtergraph: Improve HRESULT propagation from IFilterGraph2_Connect().
by Zebediah Figura 24 Sep '18

24 Sep '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 11 +++++-- dlls/quartz/tests/filtergraph.c | 67 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0468cb5..c8e3c08 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1181,7 +1181,11 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, /* Try direct connection first */ hr = IPin_Connect(ppinOut, ppinIn, NULL); - if (SUCCEEDED(hr)) + + /* If direct connection succeeded, we should propagate that return value. + * If it returned VFW_E_NOT_CONNECTED or VFW_E_NO_AUDIO_HARDWARE, then don't + * even bother trying intermediate filters, since they won't succeed. */ + if (SUCCEEDED(hr) || hr == VFW_E_NOT_CONNECTED || hr == VFW_E_NO_AUDIO_HARDWARE) goto out; TRACE("Direct connection failed, trying to render using extra filters\n"); @@ -1379,6 +1383,9 @@ error: } } + if (FAILED(hr)) + hr = VFW_E_CANNOT_CONNECT; + IEnumMoniker_Release(pEnumMoniker); out: @@ -1391,7 +1398,7 @@ out: --This->recursioncount; LeaveCriticalSection(&This->cs); TRACE("--> %08x\n", hr); - return SUCCEEDED(hr) ? S_OK : hr; + return hr; } /* Render all output pins of the given filter. Helper for FilterGraph2_Render(). */ diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6c8b9fa..5693c86 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -609,7 +609,6 @@ static void test_render_run(const WCHAR *file) ok(!refs, "Graph has %u references\n", refs); hr = test_graph_builder_connect_file(filename); -todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "got %#x\n", hr); } else @@ -776,6 +775,8 @@ struct testpin unsigned int type_count, enum_idx; AM_MEDIA_TYPE *request_mt, *accept_mt; + HRESULT Connect_hr; + HRESULT EnumMediaTypes_hr; HRESULT QueryInternalConnections_hr; }; @@ -964,6 +965,9 @@ static HRESULT WINAPI testpin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **out) struct testpin *pin = impl_from_IPin(iface); if (winetest_debug > 1) trace("%p->EnumMediaTypes()\n", pin); + if (FAILED(pin->EnumMediaTypes_hr)) + return pin->EnumMediaTypes_hr; + *out = &pin->IEnumMediaTypes_iface; IEnumMediaTypes_AddRef(*out); pin->enum_idx = 0; @@ -1063,6 +1067,8 @@ static void testpin_init(struct testpin *pin, const IPinVtbl *vtbl, PIN_DIRECTIO pin->IEnumMediaTypes_iface.lpVtbl = &testenummt_vtbl; pin->ref = 1; pin->dir = dir; + pin->Connect_hr = S_OK; + pin->EnumMediaTypes_hr = S_OK; pin->QueryInternalConnections_hr = E_NOTIMPL; } @@ -1077,12 +1083,16 @@ static HRESULT WINAPI testsource_Connect(IPin *iface, IPin *peer, const AM_MEDIA HRESULT hr; if (winetest_debug > 1) trace("%p->Connect(%p)\n", pin, peer); + if (FAILED(pin->Connect_hr)) + return pin->Connect_hr; + ok(!mt, "Got media type %p.\n", mt); if (SUCCEEDED(hr = IPin_ReceiveConnection(peer, &pin->IPin_iface, pin->request_mt))) { pin->peer = peer; IPin_AddRef(peer); + return pin->Connect_hr; } return hr; } @@ -1711,12 +1721,50 @@ static void test_graph_builder_connect(void) IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + for (source_pin.Connect_hr = 0x00040200; source_pin.Connect_hr <= 0x000402ff; + ++source_pin.Connect_hr) + { + hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); + ok(hr == source_pin.Connect_hr, "Got hr %#x for Connect() hr %#x.\n", + hr, source_pin.Connect_hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + IFilterGraph2_Disconnect(graph, source_pin.peer); + IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + } + source_pin.Connect_hr = S_OK; + sink_pin.accept_mt = &sink_type; hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + for (source_pin.Connect_hr = 0x80040200; source_pin.Connect_hr <= 0x800402ff; + ++source_pin.Connect_hr) + { + hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); + if (source_pin.Connect_hr == VFW_E_NOT_CONNECTED + || source_pin.Connect_hr == VFW_E_NO_AUDIO_HARDWARE) + ok(hr == source_pin.Connect_hr, "Got hr %#x for Connect() hr %#x.\n", + hr, source_pin.Connect_hr); + else + ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x for Connect() hr %#x.\n", + hr, source_pin.Connect_hr); + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + } + source_pin.Connect_hr = S_OK; + + for (source_pin.EnumMediaTypes_hr = 0x80040200; source_pin.EnumMediaTypes_hr <= 0x800402ff; + ++source_pin.EnumMediaTypes_hr) + { + hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); + ok(hr == source_pin.EnumMediaTypes_hr, "Got hr %#x for EnumMediaTypes() hr %#x.\n", + hr, source_pin.EnumMediaTypes_hr); + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + } + source_pin.EnumMediaTypes_hr = S_OK; + /* Test usage of intermediate filters. Similarly to Render(), filters are * simply tried in enumeration order. */ @@ -1740,6 +1788,20 @@ todo_wine IFilterGraph2_Disconnect(graph, sink_pin.peer); IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + for (source_pin.Connect_hr = 0x00040200; source_pin.Connect_hr <= 0x000402ff; + ++source_pin.Connect_hr) + { + hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x for Connect() hr %#x.\n", hr, source_pin.Connect_hr); + ok(source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + IFilterGraph2_Disconnect(graph, source_pin.peer); + IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + IFilterGraph2_Disconnect(graph, sink_pin.peer); + IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + } + source_pin.Connect_hr = S_OK; + IFilterGraph2_RemoveFilter(graph, &parser1.IBaseFilter_iface); IFilterGraph2_AddFilter(graph, &parser1.IBaseFilter_iface, NULL); @@ -1805,7 +1867,6 @@ todo_wine parser1_pins[1].name[0] = '~'; hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); -- 2.7.4

1 0

[PATCH 5/5] wined3d: Store the wined3d creation flags for NO3D adapters as well.
by Henri Verbeet 24 Sep '18

24 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index abe81deb337..f7ef5c018fd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2463,7 +2463,14 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = wined3d_adapter_no3d_create_context, }; -static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) +static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) +{ + struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; + + d3d_info->wined3d_creation_flags = wined3d_creation_flags; +} + +static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) { static const struct wined3d_gpu_description gpu_description = { @@ -2485,6 +2492,8 @@ static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) adapter->shader_backend = &none_shader_backend; adapter->adapter_ops = &wined3d_adapter_no3d_ops; + wined3d_adapter_no3d_init_d3d_info(adapter, wined3d_creation_flags); + return TRUE; } @@ -2510,7 +2519,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o adapter->formats = NULL; if (wined3d_creation_flags & WINED3D_NO3D) - return wined3d_adapter_no3d_init(adapter); + return wined3d_adapter_no3d_init(adapter, wined3d_creation_flags); return wined3d_adapter_gl_init(adapter, wined3d_creation_flags); } -- 2.11.0

1 0

[PATCH 4/5] ddraw: Reject creating DDSCAPS_VIDEOMEMORY surfaces with DDRAW_NO3D.
by Henri Verbeet 24 Sep '18

24 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/surface.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cf09f9c1416..c51db7661ab 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6122,8 +6122,9 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) usage = WINED3DUSAGE_RENDERTARGET; - if (SUCCEEDED(hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, - WINED3D_DEVICE_TYPE_HAL, mode.format_id, usage, WINED3D_RTYPE_TEXTURE_2D, wined3d_desc.format))) + if (!(ddraw->flags & DDRAW_NO3D) && SUCCEEDED(hr = wined3d_check_device_format(ddraw->wined3d, + WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, + usage, WINED3D_RTYPE_TEXTURE_2D, wined3d_desc.format))) desc->ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; else desc->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; @@ -6257,6 +6258,13 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_NOCOLORKEYHW; } + if ((ddraw->flags & DDRAW_NO3D) && (desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + WARN("Video memory surfaces not supported without 3D support.\n"); + heap_free(texture); + return DDERR_NODIRECTDRAWHW; + } + if (desc->ddsCaps.dwCaps & (DDSCAPS_OVERLAY)) wined3d_desc.usage |= WINED3DUSAGE_OVERLAY; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Do not report WINEDDSCAPS_VIDEOMEMORY for WINED3D_NO3D adapters.
by Henri Verbeet 24 Sep '18

24 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 925a5bc9eb8..abe81deb337 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2389,24 +2389,24 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->ddraw_caps.ssb_color_key_caps = ckey_caps; caps->ddraw_caps.ssb_fx_caps = fx_caps; - caps->ddraw_caps.dds_caps = WINEDDSCAPS_ALPHA | - WINEDDSCAPS_BACKBUFFER | - WINEDDSCAPS_FLIP | - WINEDDSCAPS_FRONTBUFFER | - WINEDDSCAPS_OFFSCREENPLAIN | - WINEDDSCAPS_PALETTE | - WINEDDSCAPS_PRIMARYSURFACE | - WINEDDSCAPS_SYSTEMMEMORY | - WINEDDSCAPS_VIDEOMEMORY | - WINEDDSCAPS_VISIBLE; + caps->ddraw_caps.dds_caps = WINEDDSCAPS_ALPHA + | WINEDDSCAPS_BACKBUFFER + | WINEDDSCAPS_FLIP + | WINEDDSCAPS_FRONTBUFFER + | WINEDDSCAPS_OFFSCREENPLAIN + | WINEDDSCAPS_PALETTE + | WINEDDSCAPS_PRIMARYSURFACE + | WINEDDSCAPS_SYSTEMMEMORY + | WINEDDSCAPS_VISIBLE; if (!(wined3d->flags & WINED3D_NO3D)) { - caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE | - WINEDDSCAPS_MIPMAP | - WINEDDSCAPS_TEXTURE | - WINEDDSCAPS_ZBUFFER; - caps->ddraw_caps.caps |= WINEDDCAPS_3D; + caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE + | WINEDDSCAPS_MIPMAP + | WINEDDSCAPS_TEXTURE + | WINEDDSCAPS_VIDEOMEMORY + | WINEDDSCAPS_ZBUFFER; + caps->ddraw_caps.caps |= WINEDDCAPS_3D; } caps->shader_double_precision = d3d_info->shader_double_precision; -- 2.11.0

1 0

[PATCH 2/5] ddraw: Do not report IID_IDirect3DHALDevice in ddraw_find_device() with DDRAW_NO3D.
by Henri Verbeet 24 Sep '18

24 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 56a74cb3285..e9e06ee486f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4069,6 +4069,12 @@ static HRESULT ddraw_find_device(struct ddraw *ddraw, const D3DFINDDEVICESEARCH TRACE("Trying to match GUID %s.\n", debugstr_guid(&fds->guid)); + if ((ddraw->flags & DDRAW_NO3D) && IsEqualGUID(&fds->guid, &IID_IDirect3DHALDevice)) + { + WARN("HAL device not available without 3D support.\n"); + return DDERR_NOTFOUND; + } + for (i = 0; i < guid_count; ++i) { if (IsEqualGUID(guids[i], &fds->guid)) -- 2.11.0

1 0