January 2022 - Wine-Commits

Connor McAdams : secur32: Fix trace in schannel pull_adapter function.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 85cb1ff91ed4d48559c5500e2ccb0b15801edc05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85cb1ff91ed4d48559c5500e… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jan 27 10:20:51 2022 -0500 secur32: Fix trace in schannel pull_adapter function. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 3f947870a73..b7ffa1822b5 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -372,7 +372,7 @@ static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t SIZE_T len = buff_len; char *b; - TRACE("Push %lu bytes\n", len); + TRACE("Pull %lu bytes\n", len); b = get_buffer(t, &t->in, &len); if (!b) @@ -382,7 +382,7 @@ static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t } memcpy(buff, b, len); t->in.offset += len; - TRACE("Wrote %lu bytes\n", len); + TRACE("Read %lu bytes\n", len); return len; }

1 0

Fabian Maurer : msscript/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: b8ac2441ed6e1228ea66335d9e3e73ecf69b64f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8ac2441ed6e1228ea66335d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:09 2022 +0100 msscript/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 756c21d887b..897bcec3262 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1453,10 +1453,10 @@ static void test_Language(void) CHECK_CALLED(QI_IActiveScriptParse); CHECK_CALLED(InitNew); hr = IScriptControl_get_Language(sc, &str); - todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - ok(!lstrcmpW(L"testscript", str), "%s\n", wine_dbgstr_w(str)); + if (hr == S_OK) + ok(!lstrcmpW(L"testscript", str), "%s\n", wine_dbgstr_w(str)); SysFreeString(str); IActiveScriptSite_Release(site); @@ -2437,7 +2437,7 @@ static void _check_error(IScriptControl *sc, LONG exp_num, BOOL todo, int line) error_num = 0xdeadbeef; hr = IScriptError_get_Number(script_err, &error_num); ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); -todo_wine_if(todo == TRUE) + todo_wine_if(todo == TRUE) ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", error_num, exp_num); IScriptError_Release(script_err);

1 0

Fabian Maurer : kernel32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: d37028ae54d3f5c5211ea41d86ef5a7766826c1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d37028ae54d3f5c5211ea41d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:01 2022 +0100 kernel32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 8 ++++---- dlls/kernel32/tests/file.c | 6 +++--- dlls/kernel32/tests/loader.c | 6 +++--- dlls/kernel32/tests/locale.c | 2 +- dlls/kernel32/tests/mailslot.c | 2 +- dlls/kernel32/tests/sync.c | 6 +++--- dlls/kernel32/tests/thread.c | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index e103dfdcf2b..c26eb08f306 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2668,7 +2668,7 @@ todo_wine { SetLastError(0xdeadbeef); handle = CreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); -todo_wine + todo_wine ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX || broken(GetLastError() == ERROR_NOT_ENOUGH_MEMORY) /* XP, win2k3 */, "got error %d\n", GetLastError()); @@ -2770,7 +2770,7 @@ static void test_ZombifyActCtx(void) SetLastError(0xdeadbeef); ret = ZombifyActCtx(NULL); -todo_wine + todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); handle = create_manifest("test.manifest", testdep_manifest3, __LINE__); @@ -2800,7 +2800,7 @@ todo_wine ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); ret = ZombifyActCtx(handle); -todo_wine + todo_wine ok(ret, "got %d\n", ret); memset(&basicinfo, 0xff, sizeof(basicinfo)); @@ -2822,7 +2822,7 @@ todo_wine /* one more time */ ret = ZombifyActCtx(handle); -todo_wine + todo_wine ok(ret, "got %d\n", ret); ret = DeactivateActCtx(0, cookie); diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 60fe532adc2..f8e49491a7d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5313,12 +5313,12 @@ static void test_SetFileInformationByHandle(void) /* test FileDispositionInfo, additional details already covered by ntdll tests */ SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileDispositionInfo, &dispinfo, 0); -todo_wine + todo_wine ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "got %d, error %d\n", ret, GetLastError()); SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileBasicInfo, &basicinfo, 0); -todo_wine + todo_wine ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "got %d, error %d\n", ret, GetLastError()); memset(&basicinfo, 0, sizeof(basicinfo)); @@ -5409,7 +5409,7 @@ static void test_SetFileRenameInfo(void) fri->FileNameLength = wcslen(tempFileTo1) * sizeof(WCHAR); memcpy(fri->FileName, tempFileTo1, fri->FileNameLength + sizeof(WCHAR)); ret = pSetFileInformationByHandle(file, FileRenameInfo, fri, size); -todo_wine + todo_wine ok(!ret && GetLastError() == ERROR_ACCESS_DENIED, "FileRenameInfo unexpected result %d\n", GetLastError()); CloseHandle(file); diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index f990d632f73..6b5099ea612 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2442,7 +2442,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) * doesn't call the DLL entry point on process detach either. */ HeapLock(GetProcessHeap()); -todo_wine + todo_wine ok(0, "dll_entry_point: process should already deadlock\n"); break; } @@ -3308,7 +3308,7 @@ static void test_ExitProcess(void) ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); ret = WaitForSingleObject(pi.hProcess, 5000); -todo_wine + todo_wine ok(ret == WAIT_TIMEOUT || broken(ret == WAIT_OBJECT_0) /* XP */, "child process should fail to terminate\n"); if (ret != WAIT_OBJECT_0) { @@ -3318,7 +3318,7 @@ todo_wine ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); -todo_wine + todo_wine ok(ret == 201 || broken(ret == 1) /* XP */, "expected exit code 201, got %u\n", ret); if (*child_failures) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2d327b7130c..8f48b89334c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5519,7 +5519,7 @@ static void test_GetThreadPreferredUILanguages(void) ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine + todo_wine ok(size == size_id || size == size_id - 1 /* before win10 1809 */, "expected %u, got %u\n", size_id, size); HeapFree(GetProcessHeap(), 0, buf); diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index 9da960fba81..7e488566dbb 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -88,7 +88,7 @@ static int mailslot_test(void) SetLastError(0xdeadbeef); ret = ReadFile(hSlot, buffer, 0, &count, NULL); ok(!ret, "ReadFile should fail\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError()); ok(count == 0, "expected 0, got %u\n", count); diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 827f4c53aa0..a6ee90b81f3 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -202,9 +202,9 @@ static void test_mutex(void) SetLastError(0xdeadbeef); hOpened = OpenMutexA(0, FALSE, "WineTestMutex"); -todo_wine + todo_wine ok(hOpened == NULL, "OpenMutex succeeded\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -249,7 +249,7 @@ todo_wine } } -todo_wine + todo_wine ok( failed == 0x0de0fffe, "open succeeded when it shouldn't: %x\n", failed); SetLastError(0xdeadbeef); diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index e9fd90b1889..6ccf7af85f8 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -2338,7 +2338,7 @@ static void test_thread_info(void) break; case ThreadIsIoPending: -todo_wine + todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break;

1 0

Alexandre Julliard : makefiles: Disable printf format warnings for non-PE msvcrt modules.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 26a3472b340f01288b3fa4b98a4e8f363b62b135 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26a3472b340f01288b3fa4b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 18:47:25 2022 +0100 makefiles: Disable printf format warnings for non-PE msvcrt modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 28 ++++++++++++++++++++++++++++ configure.ac | 3 ++- tools/makedep.c | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 7760e43b8e9..bcefc8e3247 100755 --- a/configure +++ b/configure @@ -19467,6 +19467,34 @@ printf "%s\n" "$ac_cv_cflags__fshort_wchar" >&6; } if test "x$ac_cv_cflags__fshort_wchar" = xyes then : MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar" +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5 +printf %s "checking whether the compiler supports -Wno-format... " >&6; } +if test ${ac_cv_cflags__Wno_format+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wno-format" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_cflags__Wno_format=yes +else $as_nop + ac_cv_cflags__Wno_format=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_format" >&5 +printf "%s\n" "$ac_cv_cflags__Wno_format" >&6; } +if test "x$ac_cv_cflags__Wno_format" = xyes +then : + MSVCRTFLAGS="$MSVCRTFLAGS -Wno-format" fi ;; esac diff --git a/configure.ac b/configure.ac index 181047ef0d8..0aad012060e 100644 --- a/configure.ac +++ b/configure.ac @@ -1880,7 +1880,8 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= WINE_TRY_CFLAGS([-Wl,-delayload,autoconftest.dll],[AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])]) ;; *) MSVCRTFLAGS="-D_WIN32" WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) - WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; + WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) + WINE_TRY_CFLAGS([-Wno-format],[MSVCRTFLAGS="$MSVCRTFLAGS -Wno-format"]) ;; esac case $host_cpu in diff --git a/tools/makedep.c b/tools/makedep.c index 5dc0a97fdb3..4172720fbf0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3027,6 +3027,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s$(CC) -c -o $@ %s", cmd_prefix( "CC" ), source->filename ); output_filenames( defines ); + output_filenames( make->extlib ? extra_cflags_extlib : extra_cflags ); if (make->sharedlib || (source->file->flags & FLAG_C_UNIX)) { output_filenames( unix_dllflags ); @@ -3038,7 +3039,6 @@ static void output_source_default( struct makefile *make, struct incl_file *sour if (!*dll_ext && make->module && is_crt_module( make->module )) output_filename( "-fno-builtin" ); } - output_filenames( make->extlib ? extra_cflags_extlib : extra_cflags ); output_filenames( cpp_flags ); output_filename( "$(CFLAGS)" ); output( "\n" );

1 0

Fabian Maurer : dxva2/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: ab76f35595c6e531f630a966483901d7d38d02b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab76f35595c6e531f630a966… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:15:56 2022 +0100 dxva2/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/tests/dxva2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 5de39fe1360..d94299f0c78 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -356,7 +356,7 @@ static void test_device_manager(void) count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); - todo_wine_if(rt_formats[i] == MAKEFOURCC('A','Y','U','V')) + todo_wine_if(rt_formats[i] == MAKEFOURCC('A','Y','U','V')) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (FAILED(hr)) continue; ok(count > 0, "Unexpected device count.\n");

1 0

Fabian Maurer : oleaut32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 4a611ef59bfa05022a019588e8ba24d45e26f6d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a611ef59bfa05022a019588… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:18:04 2022 +0100 oleaut32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olefont.c | 4 ++-- dlls/oleaut32/tests/olepicture.c | 22 +++++++++++----------- dlls/oleaut32/tests/safearray.c | 4 ++-- dlls/oleaut32/tests/tmarshal.c | 26 +++++++++++++------------- dlls/oleaut32/tests/typelib.c | 4 ++-- dlls/oleaut32/tests/usrmarshal.c | 8 ++++---- dlls/oleaut32/vartype.c | 6 +++--- 7 files changed, 37 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a611ef59bfa05022a01…

1 0

Fabian Maurer : ole32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 812944ec175245386e3af24af86ca8ad7c5c0cc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=812944ec175245386e3af24a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:18:03 2022 +0100 ole32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 4 +- dlls/ole32/tests/defaulthandler.c | 8 ++-- dlls/ole32/tests/marshal.c | 2 +- dlls/ole32/tests/moniker.c | 88 +++++++++++++++++++-------------------- dlls/ole32/tests/ole2.c | 12 +++--- dlls/ole32/tests/ole_server.c | 4 +- dlls/ole32/tests/stg_prop.c | 10 ++--- dlls/ole32/tests/usrmarshal.c | 4 +- 8 files changed, 66 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=812944ec175245386e3a…

1 0

Fabian Maurer : ntoskrnl/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 56412c1145f3a30504b5c56be4a63655b063a1b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56412c1145f3a30504b5c56b… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:15 2022 +0100 ntoskrnl/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 8cb97507ab5..0364fecab1d 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -280,7 +280,7 @@ static void test_mdl_map(void) MmProbeAndLockPages(mdl, KernelMode, IoReadAccess); addr = MmMapLockedPagesSpecifyCache(mdl, KernelMode, MmCached, NULL, FALSE, NormalPagePriority); -todo_wine + todo_wine ok(addr != NULL, "MmMapLockedPagesSpecifyCache failed\n"); MmUnmapLockedPages(addr, mdl);

1 0

Fabian Maurer : ntdll/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 0ea07db6ae34ae0431ab7975fc73926c19251de1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ea07db6ae34ae0431ab7975… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:14 2022 +0100 ntdll/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 38 +++++++++++++++++++------------------- dlls/ntdll/tests/info.c | 2 +- dlls/ntdll/tests/reg.c | 6 +++--- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 19ae5f2ac21..760e2ff167e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1113,7 +1113,7 @@ static void test_file_io_completion(void) U(iosb).Status = 0xdeadbeef; res = pNtSetInformationFile( server, &iosb, &fci, sizeof(fci), FileCompletionInformation ); ok( res == STATUS_INVALID_PARAMETER, "NtSetInformationFile failed: %#x\n", res ); -todo_wine + todo_wine ok( U(iosb).Status == 0xdeadbeef, "wrong status %#x\n", U(iosb).Status ); CloseHandle( client ); CloseHandle( server ); @@ -3020,20 +3020,20 @@ static void test_file_disposition_information(void) res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); res = nt_get_file_attrs( buffer, &fdi2 ); -todo_wine + todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted file */ handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); -todo_wine + todo_wine ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -if (handle3 != INVALID_HANDLE_VALUE) - CloseHandle( handle3 ); -todo_wine + if (handle3 != INVALID_HANDLE_VALUE) + CloseHandle( handle3 ); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); /* can't open the deleted file (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, 0, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -3153,12 +3153,12 @@ todo_wine fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "File shouldn't have been deleted\n" ); res = nt_get_file_attrs( buffer, &fdi2 ); -todo_wine + todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted file */ handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -3202,13 +3202,13 @@ todo_wine fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); res = nt_get_file_attrs( buffer, &fdi2 ); -todo_wine + todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted directory */ handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); -todo_wine + todo_wine ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); if (handle2 != INVALID_HANDLE_VALUE) CloseHandle( handle2 ); CloseHandle( handle ); @@ -3227,20 +3227,20 @@ todo_wine res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation ); ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); res = nt_get_file_attrs( buffer, &fdi2 ); -todo_wine + todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted directory */ handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); -todo_wine + todo_wine ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -if (handle3 != INVALID_HANDLE_VALUE) - CloseHandle( handle3 ); -todo_wine + if (handle3 != INVALID_HANDLE_VALUE) + CloseHandle( handle3 ); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); /* can't open the deleted directory (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle2 ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -4231,7 +4231,7 @@ static void test_NtCreateFile(void) /* FIXME: leave only 'else' case below once Wine is fixed */ if (ret != td[i].attrib_out) { - todo_wine + todo_wine ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret); SetFileAttributesW(path, td[i].attrib_out); } diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5bcccd8a322..e9d42127c3e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2251,7 +2251,7 @@ static void test_query_process_image_file_name(void) buffer = heap_alloc(ReturnLength); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, buffer, ReturnLength, &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); -todo_wine + todo_wine ok(!memcmp(buffer->Buffer, deviceW, sizeof(deviceW)), "Expected image name to begin with \\Device\\, got %s\n", wine_dbgstr_wn(buffer->Buffer, buffer->Length / sizeof(WCHAR))); diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 91b752ac069..bd8d531edf0 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -374,9 +374,9 @@ static void test_NtOpenKey(void) attr.Length = sizeof(attr); key = (HANDLE)0xdeadbeef; status = pNtOpenKey(&key, 0, &attr); -todo_wine + todo_wine ok(status == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED, got: 0x%08x\n", status); -todo_wine + todo_wine ok(!key, "key = %p\n", key); if (status == STATUS_SUCCESS) NtClose(key); @@ -386,7 +386,7 @@ todo_wine key = (HANDLE)0xdeadbeef; status = pNtOpenKey(&key, KEY_READ, &attr); todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey Failed: 0x%08x\n", status); -todo_wine + todo_wine ok(!key, "key = %p\n", key); pRtlFreeUnicodeString( &str );

1 0

Fabian Maurer : evr/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 892007d2e4852368d0f09dd9610a88a85dde5ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=892007d2e4852368d0f09dd9… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:15:57 2022 +0100 evr/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 046a7e4db59..acbb2b1869a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -645,15 +645,15 @@ static void test_default_mixer(void) ok(color == 0x121212, "Unexpected color %#x.\n", color); hr = IMFVideoProcessor_GetFilteringRange(processor, DXVA2_DetailFilterChromaLevel, &range); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetFilteringValue(processor, DXVA2_DetailFilterChromaLevel, &dxva_value); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); IMFVideoProcessor_Release(processor); @@ -1284,11 +1284,11 @@ static void test_default_mixer_type_negotiation(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetVideoProcessorMode(processor, &guid); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetVideoProcessorCaps(processor, (GUID *)&DXVA2_VideoProcSoftwareDevice, &caps); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); @@ -1300,7 +1300,7 @@ todo_wine IMFMediaType_Release(media_type); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); @@ -1313,11 +1313,11 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetVideoProcessorMode(processor, &guid); -todo_wine + todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) CoTaskMemFree(guids); @@ -2263,21 +2263,21 @@ static void test_presenter_quality_control(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, NULL); -todo_wine + todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, &mode); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, NULL); -todo_wine + todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, &level); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ok(level == MF_QUALITY_NORMAL, "Unexpected level %d.\n", level);

1 0