March 2020 - Wine-Commits - list.winehq.org

Francois Gouget : advapi32/tests: On Windows 7 GetServiceKeyName() fails for all localized display names.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 417814afcbfc6b9daf3a7053a900bc80e0127fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=417814afcbfc6b9daf3a7053… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 22 18:59:20 2020 +0100 advapi32/tests: On Windows 7 GetServiceKeyName() fails for all localized display names. It's not just the service display names that contain a smart quote that Windows 7 fails to handle, it's all localized names. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 43d9738627..4bf9f4c34b 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -720,17 +720,6 @@ static void test_get_displayname(void) CloseServiceHandle(scm_handle); } -static int is_printable_ascii_str(const char *s) -{ - while (*s) - { - if (*s < 32 || *s >= 127) - return 0; - s++; - } - return 1; -} - static void test_get_servicekeyname(void) { SC_HANDLE scm_handle, svc_handle; @@ -872,10 +861,10 @@ static void test_get_servicekeyname(void) servicesize = 0; ret = GetServiceKeyNameA(scm_handle, displayname, NULL, &servicesize); ok(!ret, "Expected failure\n"); - if (!is_printable_ascii_str(displayname) && + if (strcmp(displayname, "Print Spooler") != 0 && GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST) { - win_skip("GetServiceKeyName() does not support non-ASCII display names: %s\n", displayname); /* Windows 7 */ + win_skip("GetServiceKeyName() does not support localized display names: %s\n", displayname); /* Windows 7 */ CloseServiceHandle(scm_handle); return; /* All the tests that follow will fail too */ }

1 0

Alexandre Julliard : server: Use byte length in dump_strW() for consistency.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 78846662ec718f8e80f3a5b5bb6edf539c792dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=78846662ec718f8e80f3a5b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 21 11:36:33 2020 +0100 server: Use byte length in dump_strW() for consistency. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/atom.c | 2 +- server/object.c | 2 +- server/registry.c | 8 ++++---- server/symlink.c | 2 +- server/trace.c | 9 ++++----- server/unicode.c | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/server/atom.c b/server/atom.c index 35db8e3e91..cd1508322c 100644 --- a/server/atom.c +++ b/server/atom.c @@ -188,7 +188,7 @@ static void atom_table_dump( struct object *obj, int verbose ) if (!entry) continue; fprintf( stderr, " %04x: ref=%d pinned=%c hash=%d \"", entry->atom, entry->count, entry->pinned ? 'Y' : 'N', entry->hash ); - dump_strW( entry->str, entry->len / sizeof(WCHAR), stderr, "\"\""); + dump_strW( entry->str, entry->len, stderr, "\"\""); fprintf( stderr, "\"\n" ); } } diff --git a/server/object.c b/server/object.c index aeb30684a8..94a48c909b 100644 --- a/server/object.c +++ b/server/object.c @@ -373,7 +373,7 @@ static void dump_name( struct object *obj ) if (!name) return; if (name->parent) dump_name( name->parent ); fputs( "\\\\", stderr ); - dump_strW( name->name, name->len / sizeof(WCHAR), stderr, "[]" ); + dump_strW( name->name, name->len, stderr, "[]" ); } /* dump the name of an object to stderr */ diff --git a/server/registry.c b/server/registry.c index 964e2ebd58..bb65bb4818 100644 --- a/server/registry.c +++ b/server/registry.c @@ -198,7 +198,7 @@ static void dump_path( const struct key *key, const struct key *base, FILE *f ) dump_path( key->parent, base, f ); fprintf( f, "\\\\" ); } - dump_strW( key->name, key->namelen / sizeof(WCHAR), f, "[]" ); + dump_strW( key->name, key->namelen, f, "[]" ); } /* dump a value to a text file */ @@ -210,7 +210,7 @@ static void dump_value( const struct key_value *value, FILE *f ) if (value->namelen) { fputc( '\"', f ); - count = 1 + dump_strW( value->name, value->namelen / sizeof(WCHAR), f, "\"\"" ); + count = 1 + dump_strW( value->name, value->namelen, f, "\"\"" ); count += fprintf( f, "\"=" ); } else count = fprintf( f, "@=" ); @@ -226,7 +226,7 @@ static void dump_value( const struct key_value *value, FILE *f ) if (((WCHAR *)value->data)[value->len / sizeof(WCHAR) - 1]) break; if (value->type != REG_SZ) fprintf( f, "str(%x):", value->type ); fputc( '\"', f ); - dump_strW( (WCHAR *)value->data, value->len / sizeof(WCHAR), f, "\"\"" ); + dump_strW( (WCHAR *)value->data, value->len, f, "\"\"" ); fprintf( f, "\"\n" ); return; @@ -272,7 +272,7 @@ static void save_subkeys( const struct key *key, const struct key *base, FILE *f if (key->class) { fprintf( f, "#class=\"" ); - dump_strW( key->class, key->classlen / sizeof(WCHAR), f, "\"\"" ); + dump_strW( key->class, key->classlen, f, "\"\"" ); fprintf( f, "\"\n" ); } if (key->flags & KEY_SYMLINK) fputs( "#link\n", f ); diff --git a/server/symlink.c b/server/symlink.c index bc75ee9a7e..e5ee09f015 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -81,7 +81,7 @@ static void symlink_dump( struct object *obj, int verbose ) assert( obj->ops == &symlink_ops ); fputs( "Symlink target=\"", stderr ); - dump_strW( symlink->target, symlink->len / sizeof(WCHAR), stderr, "\"\"" ); + dump_strW( symlink->target, symlink->len, stderr, "\"\"" ); fputs( "\"\n", stderr ); } diff --git a/server/trace.c b/server/trace.c index 95db31b4cb..b60422c448 100644 --- a/server/trace.c +++ b/server/trace.c @@ -105,7 +105,7 @@ static void dump_rectangle( const char *prefix, const rectangle_t *rect ) static void dump_char_info( const char *prefix, const char_info_t *info ) { fprintf( stderr, "%s{'", prefix ); - dump_strW( &info->ch, 1, stderr, "\'\'" ); + dump_strW( &info->ch, sizeof(info->ch), stderr, "\'\'" ); fprintf( stderr, "',%04x}", info->attr ); } @@ -544,7 +544,7 @@ static void dump_varargs_string( const char *prefix, data_size_t size ) static void dump_varargs_unicode_str( const char *prefix, data_size_t size ) { fprintf( stderr, "%sL\"", prefix ); - dump_strW( cur_data, size / sizeof(WCHAR), stderr, "\"\"" ); + dump_strW( cur_data, size, stderr, "\"\"" ); fputc( '\"', stderr ); remove_data( size ); } @@ -824,9 +824,8 @@ static data_size_t dump_inline_unicode_string( const char *prefix, data_size_t p fputs( prefix, stderr ); if (pos >= total_size) return pos; if (len > total_size - pos) len = total_size - pos; - len /= sizeof(WCHAR); dump_strW( (const WCHAR *)cur_data + pos/sizeof(WCHAR), len, stderr, "\"\"" ); - return pos + len * sizeof(WCHAR); + return pos + (len / sizeof(WCHAR)) * sizeof(WCHAR); } static void dump_varargs_startup_info( const char *prefix, data_size_t size ) @@ -1133,7 +1132,7 @@ static void dump_varargs_object_attributes( const char *prefix, data_size_t size dump_inline_security_descriptor( ",sd=", (const struct security_descriptor *)(objattr + 1), objattr->sd_len ); str = (const WCHAR *)objattr + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); fprintf( stderr, ",name=L\"" ); - dump_strW( str, objattr->name_len / sizeof(WCHAR), stderr, "\"\"" ); + dump_strW( str, objattr->name_len, stderr, "\"\"" ); fputc( '\"', stderr ); remove_data( (sizeof(*objattr) + (objattr->sd_len & ~1) + (objattr->name_len & ~1) + 3) & ~3 ); } diff --git a/server/unicode.c b/server/unicode.c index 3be1f55fe1..02233e22cf 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -156,7 +156,7 @@ int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] char *pos = buffer; int count = 0; - for (; len; str++, len--) + for (len /= sizeof(WCHAR); len; str++, len--) { if (pos > buffer + sizeof(buffer) - 8) {

1 0

Zebediah Figura : ntdll: Fix the overflow check in read_changes_apc().
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: cd2e053237bc0dfb3e9ddc074426b3eefb124389 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd2e053237bc0dfb3e9ddc07… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 22 19:11:29 2020 -0500 ntdll: Fix the overflow check in read_changes_apc(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5175e9d5ce..5b60c887e2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1768,16 +1768,17 @@ static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS st while (size && left >= sizeof(*pfni)) { + DWORD len = (left - offsetof(FILE_NOTIFY_INFORMATION, FileName)) / sizeof(WCHAR); + /* convert to an NT style path */ for (i = 0; i < event->len; i++) if (event->name[i] == '/') event->name[i] = '\\'; pfni->Action = event->action; - pfni->FileNameLength = ntdll_umbstowcs( event->name, event->len, pfni->FileName, - (left - offsetof(FILE_NOTIFY_INFORMATION, FileName)) / sizeof(WCHAR)); + pfni->FileNameLength = ntdll_umbstowcs( event->name, event->len, pfni->FileName, len ); last_entry_offset = &pfni->NextEntryOffset; - if (pfni->FileNameLength == -1 || pfni->FileNameLength == -2) break; + if (pfni->FileNameLength == len) break; i = offsetof(FILE_NOTIFY_INFORMATION, FileName[pfni->FileNameLength]); pfni->FileNameLength *= sizeof(WCHAR);

1 0

Francois Gouget : advapi32/tests: The Everyone group name is sometimes translated.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: ad9fb96e5bc818c5cac3dded6af038a1b6c202d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad9fb96e5bc818c5cac3dded… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 22 18:59:32 2020 +0100 advapi32/tests: The Everyone group name is sometimes translated. This depends on SystemPreferredUILanguages, which does not always match the language really used by the Windows interface (UserDefaultUILanguage). Also the group name is not translated in all languages. So just check the name that LsaLookupSids() returns in a few known languages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 57ec8994eb..f2e10671a4 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -37,6 +37,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); + static void test_lsa(void) { NTSTATUS status; @@ -332,6 +334,7 @@ static void check_unicode_string_(int line, const LSA_UNICODE_STRING *string, co static void test_LsaLookupSids(void) { + WCHAR langW[32]; char user_buffer[64]; LSA_OBJECT_ATTRIBUTES attrs = {.Length = sizeof(attrs)}; TOKEN_USER *user = (TOKEN_USER *)user_buffer; @@ -341,7 +344,7 @@ static void test_LsaLookupSids(void) LSA_HANDLE policy; NTSTATUS status; HANDLE token; - DWORD size; + DWORD num, size; BOOL ret; PSID sid; @@ -387,7 +390,21 @@ static void test_LsaLookupSids(void) ok(names[0].Use == SidTypeWellKnownGroup, "got type %u\n", names[0].Use); ok(!names[0].DomainIndex, "got index %u\n", names[0].DomainIndex); - check_unicode_string(&names[0].Name, L"Everyone"); + + /* The group name gets translated... but not in all locales */ + size = ARRAY_SIZE(langW); + if (!pGetSystemPreferredUILanguages || + !pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &num, langW, &size)) + langW[0] = 0; + if (wcscmp(langW, L"0409") == 0 || wcscmp(langW, L"0411") == 0) + /* English and Japanese */ + check_unicode_string(&names[0].Name, L"Everyone"); + else if (wcscmp(langW, L"0407") == 0) /* German */ + check_unicode_string(&names[0].Name, L"Jeder"); + else if (wcscmp(langW, L"040C") == 0) /* French */ + check_unicode_string(&names[0].Name, L"Tout le monde"); + else + trace("<Everyone-group>.Name=%s\n", debugstr_w(names[0].Name.Buffer)); LsaFreeMemory(names); LsaFreeMemory(list); @@ -448,6 +465,9 @@ static void test_LsaLookupPrivilegeName(void) START_TEST(lsa) { + HMODULE hkernel32 = GetModuleHandleA("kernel32"); + pGetSystemPreferredUILanguages = (void*)GetProcAddress(hkernel32, "GetSystemPreferredUILanguages"); + test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids();

1 0

Zebediah Figura : include: Fix the definition of USBD_STATUS_CANCELED.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: b50e79414e1444212d56dcc612aad0fb0e429b04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b50e79414e1444212d56dcc6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 21 22:59:11 2020 -0500 include: Fix the definition of USBD_STATUS_CANCELED. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/usb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/usb.h b/include/ddk/usb.h index 0cda6a4e43..0e4c83055b 100644 --- a/include/ddk/usb.h +++ b/include/ddk/usb.h @@ -87,7 +87,6 @@ typedef PVOID USBD_INTERFACE_HANDLE; #define USBD_STATUS_ERROR ((USBD_STATUS)0x80000000) #define USBD_STATUS_HALTED ((USBD_STATUS)0xC0000000) -#define USBD_STATUS_CANCELED ((USBD_STATUS)0x00010000) #define USBD_STATUS_CANCELING ((USBD_STATUS)0x00020000) #define USBD_STATUS_CRC ((USBD_STATUS)0xC0000001) #define USBD_STATUS_BTSTUFF ((USBD_STATUS)0xC0000002) @@ -131,6 +130,7 @@ typedef PVOID USBD_INTERFACE_HANDLE; #define USBD_STATUS_TIMEOUT ((USBD_STATUS)0xC0006000) #define USBD_STATUS_DEVICE_GONE ((USBD_STATUS)0xC0007000) #define USBD_STATUS_STATUS_NOT_MAPPED ((USBD_STATUS)0xC0008000) +#define USBD_STATUS_CANCELED ((USBD_STATUS)0xC0010000) #define USBD_STATUS_ISO_NOT_ACCESSED_BY_HW ((USBD_STATUS)0xC0020000) #define USBD_STATUS_ISO_TD_ERROR ((USBD_STATUS)0xC0030000) #define USBD_STATUS_ISO_NA_LATE_USBPORT ((USBD_STATUS)0xC0040000)

1 0

Damjan Jovanovic : shell32/tests: Tmpdir shouldn't end with a backslash.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 971e7e22e069b8421fbd738798bd9fee79efe771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=971e7e22e069b8421fbd7387… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Mar 22 13:46:12 2020 +0200 shell32/tests: Tmpdir shouldn't end with a backslash. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index f6f384bbe0..6d099587d7 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2690,16 +2690,15 @@ static void init_test(void) /* Older versions (win 2k) fail tests if there is a space in the path. */ if (dllver.dwMajorVersion <= 5) - strcpy(filename, "c:\\"); + strcpy(tmpdir, "c:\\"); else - GetTempPathA(sizeof(filename), filename); + GetTempPathA(sizeof(tmpdir), tmpdir); /* In case of a failure it is necessary to show the path that was passed to * ShellExecute(). That means the paths must not be randomized so as not to * prevent the TestBot from detecting new failures. */ - strcpy(tmpdir, filename); - strcat(tmpdir, "\\wtShlexecDir"); + strcat(tmpdir, "wtShlexecDir"); GetLongPathNameA(tmpdir, tmpdir, sizeof(tmpdir)); DeleteFileA( tmpdir ); rc = CreateDirectoryA( tmpdir, NULL );

1 0

Damjan Jovanovic : shell32/tests: Test shlexec argv[0], and same-named executables in a different directory.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: fe83877cb320c688130c9599838485f40580adf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe83877cb320c688130c9599… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Mar 22 13:46:15 2020 +0200 shell32/tests: Test shlexec argv[0], and same-named executables in a different directory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8439 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 6d099587d7..0b3d0cb18e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2828,6 +2828,7 @@ static void test_directory(void) NULL, "test2.exe", params, NULL, NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); + todo_wine okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); SetCurrentDirectoryA(curdir); @@ -2841,6 +2842,7 @@ static void test_directory(void) NULL, "test2.exe", params, tmpdir, NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); + todo_wine okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); @@ -2853,6 +2855,7 @@ static void test_directory(void) NULL, "test2.exe", params, "%TMPDIR%", NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); + todo_wine okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); @@ -2861,6 +2864,18 @@ static void test_directory(void) rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, NULL, "test2.exe", params, dirpath, NULL); okShell(rc == SE_ERR_FNF, "returned %lu\n", rc); + + /* Same-named executable in different directory */ + snprintf(path, ARRAY_SIZE(path), "%s%s", tmpdir, strrchr(argv0, '\\')); + CopyFileA(argv0, path, FALSE); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, strrchr(argv0, '\\') + 1, params, tmpdir, NULL); + okShell(rc > 32, "returned %lu\n", rc); + okChildInt("argcA", 4); + todo_wine okChildString("argvA0", path); + okChildString("argvA3", "Exec"); + todo_wine okChildPath("longPath", path); + DeleteFileA(path); } START_TEST(shlexec)

1 0

Zebediah Figura : quartz/tests: Disable some tests that fail intermittently.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 1f201f1165787f4505be129e4db316c4e69761b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f201f1165787f4505be129e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 21 16:35:21 2020 -0500 quartz/tests: Disable some tests that fail intermittently. The value of these tests is not worth having to repeatedly relax timings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 58 ++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f8b80dd23b..ba8271f829 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3152,9 +3152,10 @@ static void test_filter_state(void) hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); - ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, - "Expected time near %s, got %s.\n", - wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); @@ -3228,9 +3229,10 @@ static void test_filter_state(void) hr = IMediaFilter_Run(filter, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); - ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, - "Expected time near %s, got %s.\n", - wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); @@ -3242,9 +3244,10 @@ static void test_filter_state(void) hr = IMediaFilter_Run(filter, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); - ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, - "Expected time near %s, got %s.\n", - wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); @@ -3257,9 +3260,10 @@ static void test_filter_state(void) hr = IMediaFilter_Run(filter, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); - ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, - "Expected time near %s, got %s.\n", - wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); @@ -3996,13 +4000,15 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1234 * 10000) < 40 * 10000, - "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(time - 1234 * 10000) < 40 * 10000, + "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1234 * 10000) < 40 * 10000, - "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(current)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(current - 1234 * 10000) < 40 * 10000, + "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 9000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); /* This remains true even if NoFlush is specified. */ @@ -4017,13 +4023,15 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1334 * 10000) < 80 * 10000, - "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(time - 1334 * 10000) < 80 * 10000, + "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1334 * 10000) < 80 * 10000, - "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(current - 1334 * 10000) < 80 * 10000, + "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); hr = IMediaControl_Pause(control); @@ -4035,13 +4043,15 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1334 * 10000) < 80 * 10000, - "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(time - 1334 * 10000) < 80 * 10000, + "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1334 * 10000) < 80 * 10000, - "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(current - 1334 * 10000) < 80 * 10000, + "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); hr = IMediaControl_Stop(control);

1 0

Zebediah Figura : quartz/tests: Fix test failures when we can't create a 3D device.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: e417befc153e77a575f0092e46a06fd8288078ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e417befc153e77a575f0092e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 21 16:35:20 2020 -0500 quartz/tests: Fix test failures when we can't create a 3D device. It turns out my prior assumption was incorrect. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 1194fd8d17..3e9fccedf1 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2376,11 +2376,14 @@ static IDirect3DDevice9 *create_device(HWND window) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - /* We can expect this to succeed, or we couldn't have created the VMR. */ hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - ok(hr == D3D_OK, "Failed to create a 3D device, hr %#x.\n", hr); IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("Failed to create a 3D device, hr %#x.\n", hr); + return NULL; + } return device; } @@ -2418,7 +2421,8 @@ static void test_allocate_surface_helper(void) AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); - device = create_device(window); + if (!(device = create_device(window))) + goto out; hr = IVMRSurfaceAllocatorNotify9_SetD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY)); if (hr == E_NOINTERFACE) @@ -2784,7 +2788,8 @@ static void test_renderless_formats(void) AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); - device = create_device(window); + if (!(device = create_device(window))) + goto out; hr = IVMRSurfaceAllocatorNotify9_SetD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY)); if (hr == E_NOINTERFACE)

1 0

Serge Gautherie : tests: Remove now useless forced _WIN32_WINNT defines.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: be3cda6ec0856d143d4737ee9306844569b76e15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be3cda6ec0856d143d4737ee… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Mar 21 04:48:50 2020 +0100 tests: Remove now useless forced _WIN32_WINNT defines. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/subclass.c | 2 -- dlls/kernel32/tests/file.c | 3 --- dlls/kernel32/tests/sync.c | 1 - dlls/kernel32/tests/thread.c | 3 --- dlls/kernel32/tests/timer.c | 2 -- dlls/kernel32/tests/version.c | 3 --- dlls/psapi/tests/psapi_main.c | 3 --- dlls/user32/tests/broadcast.c | 2 -- dlls/user32/tests/class.c | 3 --- dlls/user32/tests/menu.c | 2 -- dlls/user32/tests/win.c | 3 --- 11 files changed, 27 deletions(-) diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index fc778d6711..b2b47319b1 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0501 /* For SetWindowSubclass/etc */ - #include <assert.h> #include <stdarg.h> diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 785bd60c23..90338f52d1 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -20,9 +20,6 @@ * */ -/* ReplaceFile requires Windows 2000 or newer */ -#define _WIN32_WINNT 0x0500 - #include <stdarg.h> #include <stdlib.h> #include <time.h> diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 40cad1c4c5..d05a038a58 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x500 #include <stdarg.h> #include <stdlib.h> #include <stdio.h> diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 3b9a407e73..b14fea30d1 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Define _WIN32_WINNT to get SetThreadIdealProcessor on Windows */ -#define _WIN32_WINNT 0x0600 - #include <assert.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/kernel32/tests/timer.c b/dlls/kernel32/tests/timer.c index bcc800c494..d2a6138c97 100644 --- a/dlls/kernel32/tests/timer.c +++ b/dlls/kernel32/tests/timer.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0501 - #include "wine/test.h" #include "winbase.h" diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 5fdc961542..861b870b56 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Needed for PRODUCT_* defines and GetProductInfo() */ -#define _WIN32_WINNT 0x0600 - #include "wine/test.h" #include "winbase.h" #include "winternl.h" diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 0ea1b1f6f1..da7524dd60 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* 0x0600 makes PROCESS_ALL_ACCESS not compatible with pre-Vista versions */ -#define _WIN32_WINNT 0x0500 - #include <stdarg.h> #include "ntstatus.h" diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 1a216955bb..f80d455cba 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0501 - #include <stdarg.h> #include <stdio.h> diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 606a29a257..94dd8105a5 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* To get CS_DROPSHADOW with the MSVC headers */ -#define _WIN32_WINNT 0x0501 - #include <stdlib.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 1ca4141957..cc0a9e6d9f 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0501 - #include <stdarg.h> #include <stdio.h> #include <string.h> diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 56072bebf7..25d643f54a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* To get ICON_SMALL2 with the MSVC headers */ -#define _WIN32_WINNT 0x0501 - #include <assert.h> #include <limits.h> #include <stdlib.h>

1 0