January 2022 - Wine-Devel - list.winehq.org

Re: Arbitrary DOS device name

by Daniel Kucera

On 2022-01-27 20:52, Daniel Kucera wrote: > > Despite these problems, the libusb seems to work correctly in the > driver and I can query it's version: > It probably won't be that easy. After some more calls, it is failing: 002a:trace:hantek:DriverEntry Using libusb v1.0.24.11584 tem32\winedevice.exe: ../../libusb/os/threads_posix.h:46: usbi_mutex_lock: Assertion `pthread_mutex_lock(mutex) == 0' failed. wine: Assertion failed at address 00007FDB2BA96808 (thread 002a), starting debugger... 002d:fixme:dbghelp:elf_search_auxv can't find symbol in module 002d:fixme:dbghelp:elf_search_auxv can't find symbol in module 002d:fixme:dbghelp:elf_search_auxv can't find symbol in module 002d:fixme:dbghelp:elf_search_auxv can't find symbol in module 002d:fixme:dbghelp:elf_search_auxv can't find symbol in module 002d:fixme:dbghelp:elf_search_auxv can't find symbol in module 002d:fixme:dbghelp:elf_search_auxv can't find symbol in module 002d:fixme:dbghelp:elf_search_auxv can't find symbol in module 002d:fixme:dbghelp:elf_search_auxv can't find symbol in module 002d:fixme:dbghelp:elf_search_auxv can't find symbol in module 002d:fixme:dbghelp:elf_search_auxv can't find symbol in module 000f:err:service:process_send_command service protocol error - failed to read pipe r = 0 count = 0! 000f:fixme:service:scmdatabase_autostart_services Auto-start service L"Hantek" failed to start: 1053 Is there any native wine usb api I can call?

Jan. 27, 2022

Re: Arbitrary DOS device name

by danman＠danman.eu

On 2022-01-27 20:54, Zebediah Figura (she/her) wrote: > > I assume that you tried to install the original Windows driver in Wine > and that it didn't work for some reason or another, right? Correct. > > I might take a look and see if I can figure out what's going wrong; > hardware devices and Windows drivers are an interest of mine. Sure, if you are interested.

Jan. 27, 2022

Re: Arbitrary DOS device name

by Zebediah Figura (she/her)

On 1/24/22 04:13, Daniel Kucera wrote: > To add some context here, the software is for controlling USB > osclloscope from Hantek: > http://hantek.com/uploadpic/hantek/files/20210731/Hantek-6000_Ver2.2.7_D202… > > It installs a driver which creates mentioned "DOS device" and > communicates through it using ioctl. > I am reversing the driver and I'll create a Linux char device to handle > those ioctl calls and talk to the USB device using libusb. I assume that you tried to install the original Windows driver in Wine and that it didn't work for some reason or another, right? I might take a look and see if I can figure out what's going wrong; hardware devices and Windows drivers are an interest of mine.

Jan. 27, 2022

Re: Arbitrary DOS device name

by Daniel Kucera

On 2022-01-27 14:13, Daniel Kucera wrote: > > Now just the implementation... :) > Okay, so I have moved a bit further. I can receive those ioctls in my driver which is great. 002b:trace:hantek:hantek_ioctl ioctl 222059 insize 10 outsize 10 002b:trace:hantek:hantek_ioctl indata "\x00\x02\x00\xf7\xea\xf8\x00\x00\x00\x00" Now I am trying to write the usb part, so I tried to use libusb but there are two problems: 1. When I include libusb.h in my source file: #include <libusb-1.0/libusb.h> I am getting following when running ./configure --enable-win64 : dlls/hantek.sys/main.c:31: error: system header libusb-1.0/libusb.h cannot be used with msvcrt so I have done this to allow the configure to proceed but it is dirty: if (!strcmp( pFile->name, "stdarg.h" )) return NULL; fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n", pFile->included_by->file->name, pFile->included_line, pFile->name ); - exit(1); + //exit(1); What is the proper way to fix this? 2. configure is generating broken Makefile: hantek.sys.so hantek.sys.fake: hantek.sys.spec main.o ../../dlls/ntoskrnl.exe/libntoskrnl.def \ ../../dlls/msvcrt/libmsvcrt.a ../../dlls/winecrt0/libwinecrt0.a \ ../../dlls/kernel32/libkernel32.def ../../dlls/ntdll/libntdll.def ../../tools/winebuild/winebuild \ ../../tools/winegcc/winegcc ../../tools/winegcc/winegcc -o $@ --wine-objdir ../.. -m64 -fPIC -fasynchronous-unwind-tables \ -shared hantek.sys.spec -mno-cygwin -Wl,--subsystem,native main.o -lntoskrnl -lusb-1 $(LDFLAGS) note the -lusb-1 while in Makefile.in I have specified: IMPORTS = ntoskrnl usb-1.0 I also tried 'usb-1.0' and usb-1\.0 but none of them works. How to fix this one? I am now manually editing the generated Makefile to -lusb-1.0 Despite these problems, the libusb seems to work correctly in the driver and I can query it's version: $ WINEDEBUG=trace+hantek wine Scope.exe 002a:trace:hantek:DriverEntry Using libusb v1.0.24.11584 002a:trace:hantek:DriverEntry (000000000011FCB0, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Hantek") hantek 002a:trace:hantek:DriverEntry create device hantek (L"\\Device\\d6CDE-0") dos device (L"\\DosDevices\\d6CDE-0") wine: Read access denied for device L"\\??\\Z:\\", FS volume label and serial are not available. wine: Read access denied for device L"\\??\\Z:\\", FS volume label and serial are not available. wine: Read access denied for device L"\\??\\Z:\\", FS volume label and serial are not available. wine: Read access denied for device L"\\??\\Z:\\", FS volume label and serial are not available. 002b:trace:hantek:hantek_ioctl ioctl 222059 insize 10 outsize 10 002b:trace:hantek:hantek_ioctl indata "\x00\x02\x00\xf7\xea\xf8\x00\x00\x00\x00" Thank you in advance. Daniel.

Jan. 27, 2022

Re: [RFC PATCH v2 2/5] server: Add a new server request "notify_async_direct_result."

by Jinoh Kang

On 1/28/22 04:13, Jinoh Kang wrote: > On 1/28/22 04:05, Jinoh Kang wrote: >> + >> +/* Notify direct completion of async and close the wait handle */ >> +DECL_HANDLER(notify_async_direct_result) >> +{ >> + struct async *async = (struct async *)get_handle_obj( current->process, req->handle, 0, &async_ops ); >> + >> + if (!async) return; >> + >> + if (async->iosb && async->unknown_status && !async->pending && async->terminated) >> + { >> + /* Reactivate async. We call async_reselect() later. */ >> + async->terminated = 0; >> + >> + /* Set result for async_handoff(). */ >> + set_error( req->status ); >> + async->iosb->result = req->information; >> + >> + /* The async_handoff() call prior to the current server request was >> + * effectively a no-op since async->unknown_status is 1. Calling it >> + * again with async->unknown_status = 0 will do the remaining steps. >> + */ >> + async->unknown_status = 0; >> + async_handoff( async, NULL, 0 ); >> + >> + if (get_error() == STATUS_PENDING) >> + { >> + async_reselect( async ); >> + } >> + else if (NT_ERROR( get_error() )) >> + { >> + /* synchronous I/O failure: don't invoke callbacks, only dequeue it. */ >> + async_dequeue( async ); > > Note: we can't use async_set_result() here. async_handoff() leaves async->terminated as 0, and async_set_result() has "assert( async->terminated )". > > Thus, reusing async_set_result() here requires either: > > 1. Setting async->pending to 0 so that async_handoff() will call async_terminate(). > This is obviously incorrect since unwanted IOCP packets and APCs will fire on synchronous failure. > > 2. Not using async_handoff(). We have to copy a lot of code (particulary setting pending and direct_result flags) out of async_handoff() to do this. Maybe just merge both branches (error/success) and force async_terminate() before calling async_set_result()? > >> + } >> + else >> + { >> + /* I/O completed successfully. The client has already set the IOSB, >> + * so we can skip waiting on wait_handle and do async_set_result() >> + * directly. >> + * >> + * If !async->direct_result, an APC_ASYNC_IO has been fired. >> + * async_set_result() will be called when the APC returns. >> + */ >> + if (async->direct_result) >> + { >> + async_set_result( &async->obj, async->iosb->status, async->iosb->result ); >> + async->direct_result = 0; >> + } >> + >> + /* close wait handle here to avoid extra server round trip */ >> + if (async->wait_handle) >> + { >> + close_handle( async->thread->process, async->wait_handle ); >> + async->wait_handle = 0; >> + } >> + } >> + >> + /* The wait handle is preserved only when the status is STATUS_PENDING >> + * and async->blocking is set (i.e. we're going to block on it). */ >> + reply->handle = async->wait_handle; >> + } >> + else set_error( STATUS_ACCESS_DENIED ); >> + >> + release_object( &async->obj ); >> +} >> diff --git a/server/protocol.def b/server/protocol.def >> index 02e73047f9b..2c3b8dbc619 100644 >> --- a/server/protocol.def >> +++ b/server/protocol.def >> @@ -2163,6 +2163,16 @@ enum message_type >> @END >> >> >> +/* Notify direct completion of async and close the wait handle */ >> +(a)REQ(notify_async_direct_result) >> + obj_handle_t handle; /* wait handle */ >> + unsigned int status; /* completion status */ >> + apc_param_t information; /* IO_STATUS_BLOCK Information */ >> +(a)REPLY >> + obj_handle_t handle; /* wait handle, or NULL if closed */ >> +(a)END >> + >> + >> /* Perform a read on a file object */ >> @REQ(read) >> async_data_t async; /* async I/O parameters */ >> > > -- Sincerely, Jinoh Kang

Jan. 27, 2022

[PATCH 24/24] opcservices/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/opcservices/tests/opcservices.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index cd683b0a206..59cd3b5df30 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -635,7 +635,7 @@ static void test_rel_part_uri(void) hr = IOpcPartUri_GetRawUri(rel_uri, &str); ok(SUCCEEDED(hr), "Failed to get rel uri, hr %#x.\n", hr); - todo_wine_if(i == 3 || i == 4 || i == 8 || i == 9) + todo_wine_if(i == 3 || i == 4 || i == 8 || i == 9) ok(!lstrcmpW(str, rel_uriW), "%u: unexpected rel uri %s, expected %s.\n", i, wine_dbgstr_w(str), wine_dbgstr_w(rel_uriW)); SysFreeString(str); @@ -1136,7 +1136,7 @@ static void test_combine_uri(void) hr = IOpcPartUri_GetRawUri(combined_uri, &str); ok(SUCCEEDED(hr), "%u: failed to get raw uri, hr %#x.\n", i, hr); - todo_wine_if(i == 2 || i == 3) + todo_wine_if(i == 2 || i == 3) ok(!lstrcmpW(str, combinedW), "%u: unexpected uri %s.\n", i, wine_dbgstr_w(str)); SysFreeString(str); @@ -1190,7 +1190,7 @@ static void test_create_part_uri(void) hr = IOpcPartUri_GetRawUri(part_uri, &str); ok(SUCCEEDED(hr), "Failed to get raw uri, hr %#x.\n", hr); - todo_wine_if(i == 1 || i == 2 || i == 4) + todo_wine_if(i == 1 || i == 2 || i == 4) ok(!lstrcmpW(str, rawW), "%u: unexpected raw uri %s.\n", i, wine_dbgstr_w(str)); SysFreeString(str); @@ -1200,7 +1200,7 @@ static void test_create_part_uri(void) ret = FALSE; hr = IOpcPartUri_IsEqual(part_uri, uri, &ret); ok(SUCCEEDED(hr), "IsEqual failed, hr %#x.\n", hr); - todo_wine_if(i == 1 || i == 2 || i == 4) + todo_wine_if(i == 1 || i == 2 || i == 4) ok(!!ret, "%u: unexpected result %d.\n", i, ret); IOpcPartUri_Release(part_uri); -- 2.35.0

Jan. 27, 2022

[PATCH 23/24] oledb32/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/oledb32/tests/convert.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 8ec64d40ae5..0d888e834e3 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -358,7 +358,7 @@ static void test_converttoi1(void) dst_len = dst = 0x12; *(int *)src = 0x4321cafe; hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_I1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -492,7 +492,7 @@ todo_wine hr = IDataConvert_DataConvert(convert, DBTYPE_UI1, DBTYPE_I1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); -todo_wine + todo_wine ok(broken(dst_len == sizeof(dst)) || dst_len == 0x12 /* W2K+ */, "got %ld\n", dst_len); ok(dst == 0x12, "got %08x\n", dst); @@ -507,7 +507,7 @@ todo_wine dst_len = dst = 0x12; *(DWORD*)src = 0xabcd1234; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_I1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -516,7 +516,7 @@ todo_wine dst_len = dst = 0x12; *(DWORD*)src = 0x12abcd; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_I1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -602,7 +602,7 @@ todo_wine dst_len = dst = 0x12; *(DWORD*)src = 0xabcd1234; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -611,7 +611,7 @@ todo_wine dst_len = dst = 0x12; *(DWORD*)src = 0x12abcd; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -669,7 +669,7 @@ static void test_converttoi2(void) dst_len = dst = 0x1234; *(int *)src = 0x4321cafe; hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -811,14 +811,14 @@ todo_wine hr = IDataConvert_DataConvert(convert, DBTYPE_UI2, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); -todo_wine + todo_wine ok(broken(dst_len == sizeof(dst)) || dst_len == 0x1234 /* W2K+ */, "got %ld\n", dst_len); ok(dst == 0x1234, "got %08x\n", dst); dst_len = dst = 0x1234; *(DWORD*)src = 0xabcd1234; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -827,7 +827,7 @@ todo_wine dst_len = dst = 0x1234; *(DWORD*)src = 0x1234abcd; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -914,7 +914,7 @@ todo_wine dst_len = dst = 0x1234; *(DWORD*)src = 0xabcd1234; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -923,7 +923,7 @@ todo_wine dst_len = dst = 0x1234; *(DWORD*)src = 0x1234abcd; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -1132,7 +1132,7 @@ static void test_converttoi4(void) hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); -todo_wine + todo_wine ok(broken(dst_len == sizeof(i4)) || dst_len == 0x1234 /* W2K+ */, "got %ld\n", dst_len); ok(i4 == 0x12345678, "got %08x\n", i4); @@ -2817,9 +2817,9 @@ static void test_converttoui4(void) dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_UI4, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); -todo_wine + todo_wine ok(dst_status == DBSTATUS_E_SIGNMISMATCH, "got %08x\n", dst_status); -todo_wine + todo_wine ok(broken(dst_len == sizeof(dst)) || dst_len == 0x1234 /* W2K+ */, "got %ld\n", dst_len); ok(dst == 0x12345678, "got %08x\n", dst); @@ -3056,9 +3056,9 @@ static void test_converttoui8(void) dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_UI8, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); -todo_wine + todo_wine ok(dst_status == DBSTATUS_E_SIGNMISMATCH, "got %08x\n", dst_status); -todo_wine + todo_wine ok(dst_len == 0x1234, "got %ld\n", dst_len); ok(dst.QuadPart == 0xcc, "got %d\n", (int)dst.QuadPart); -- 2.35.0

Jan. 27, 2022

[PATCH 22/24] oleaut32/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- 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 --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index c14d3d9435d..d7ae64d81e3 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -1140,12 +1140,12 @@ static void test_hfont_lifetime(void) EXPECT_HR(hr, S_OK); hr = IFont_get_hFont(font2, &first_hfont); EXPECT_HR(hr, S_OK); -todo_wine + todo_wine ok(hfont == first_hfont, "fonts differ\n"); hr = IFont_ReleaseHfont(font, hfont); EXPECT_HR(hr, S_OK); hr = IFont_ReleaseHfont(font, hfont); -todo_wine + todo_wine EXPECT_HR(hr, S_OK); hr = IFont_ReleaseHfont(font, hfont); EXPECT_HR(hr, S_FALSE); diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 6a5f7ee0428..4d8d0ec24c5 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1178,18 +1178,18 @@ static void test_load_save_bmp(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine + todo_wine ok(size == 66, "expected 66, got %d\n", size); mem = GlobalLock(hmem); -todo_wine + todo_wine ok(!memcmp(&mem[0], "BM", 2), "got wrong bmp header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); -todo_wine + todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); -todo_wine + todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1253,18 +1253,18 @@ static void test_load_save_icon(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine + todo_wine ok(size == 766, "expected 766, got %d\n", size); mem = GlobalLock(hmem); -todo_wine + todo_wine ok(mem[0] == 0x00010000, "got wrong icon header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); -todo_wine + todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); -todo_wine + todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1282,7 +1282,7 @@ todo_wine mem = GlobalLock(hmem); ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04x\n", mem[0]); -todo_wine + todo_wine ok(mem[1] == 766, "expected stream size 766, got %u\n", mem[1]); ok(mem[2] == 0x00010000, "got wrong icon header %04x\n", mem[2]); @@ -1330,13 +1330,13 @@ static void test_load_save_empty_picture(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine + todo_wine ok(size == -1, "expected -1, got %d\n", size); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine + todo_wine ok(size == -1, "expected -1, got %d\n", size); hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index af64211036a..a5ddeb82d88 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1996,9 +1996,9 @@ static void test_SafeArrayDestroyData (void) ok(sa->pvData != NULL, "got %p\n", sa->pvData); hres = SafeArrayDestroyData(sa); ok(hres == S_OK, "got 0x%08x\n", hres); -todo_wine + todo_wine ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures); -todo_wine + todo_wine ok(sa->pvData == NULL || broken(sa->pvData != NULL), "got %p\n", sa->pvData); /* There was a bug on windows, especially visible on 64bit systems, probably double-free or similar issue. */ diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 1e75a93ebce..80ed7bed525 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -2329,7 +2329,7 @@ static void test_marshal_iface(IWidget *widget, IDispatch *disp) V_VT(&arg[0]) = VT_UNKNOWN|VT_BYREF; V_UNKNOWNREF(&arg[0]) = &proxy_unk2; hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_OUT, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); if (hr == S_OK) { hr = IUnknown_QueryInterface(proxy_unk2, &IID_ISomethingFromDispatch, (void **)&proxy_sfd); @@ -2346,7 +2346,7 @@ if (hr == S_OK) { proxy_disp = NULL; hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_OUT, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!proxy_unk, "Got unexpected proxy %p.\n", proxy_unk); ok(!proxy_disp, "Got unexpected proxy %p.\n", proxy_disp); @@ -2363,7 +2363,7 @@ todo_wine V_VT(&arg[0]) = VT_UNKNOWN|VT_BYREF; V_UNKNOWNREF(&arg[0]) = &unk_in_out; hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_PTR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); ok(unk_in == (IUnknown *)sfd1, "[in] parameter should not have changed.\n"); ok(!unk_out, "[out] parameter should have been cleared.\n"); @@ -2380,7 +2380,7 @@ todo_wine IUnknown_AddRef(unk_in_out); hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_PTR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); if (hr == S_OK) { @@ -2401,14 +2401,14 @@ if (hr == S_OK) { release_iface(unk_in_out); } release_iface(sfd1); -todo_wine + todo_wine release_iface(sfd3); testmode = 2; unk_in = unk_out = unk_in_out = NULL; hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_PTR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!unk_out, "[out] parameter should not have been set.\n"); @@ -2814,7 +2814,7 @@ static void test_marshal_coclass(IWidget *widget, IDispatch *disp) V_VT(&arg[0]) = VT_UNKNOWN|VT_BYREF; V_UNKNOWNREF(&arg[0]) = &unk_in_out; hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS_PTR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); ok(unk_in == (IUnknown *)&class1->ICoclass1_iface, "[in] parameter should not have changed.\n"); ok(!unk_out, "[out] parameter should have been cleared.\n"); @@ -2831,7 +2831,7 @@ todo_wine IUnknown_AddRef(unk_in_out); hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS_PTR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); if (hr == S_OK) { @@ -2852,14 +2852,14 @@ if (hr == S_OK) { release_iface(unk_in_out); } release_iface(&class1->ICoclass1_iface); -todo_wine + todo_wine release_iface(&class3->ICoclass1_iface); testmode = 2; unk_in = unk_out = unk_in_out = NULL; hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS_PTR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!unk_out, "[out] parameter should not have been set.\n"); @@ -2880,12 +2880,12 @@ if (hr == S_OK) { IUnknown_AddRef(unk_in_out); hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS_PTR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); -todo_wine + todo_wine ok(!unk_in_out, "[in, out] parameter should have been cleared.\n"); -todo_wine + todo_wine release_iface(&class3->ICoclass1_iface); } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ed830f44a94..ebbc4e6f804 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2933,7 +2933,7 @@ static void test_CreateTypeLib(SYSKIND sys) { EXPECT_REF(dual, 2); hres = ITypeInfo_GetRefTypeInfo(dual, -2, &ti); ok(hres == S_OK, "got %08x\n", hres); -todo_wine + todo_wine EXPECT_REF(dual, 3); hres = ITypeInfo_GetTypeAttr(ti, &typeattr); @@ -2958,7 +2958,7 @@ todo_wine { EXPECT_REF(dual, 4); } ITypeInfo_AddRef(ti_2); -todo_wine + todo_wine EXPECT_REF(dual, 5); ITypeInfo_Release(ti_2); diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 0e7c2cacb4b..bb458dec309 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -568,7 +568,7 @@ static void test_marshal_LPSAFEARRAY(void) next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); ok((next - buffer) <= size, "Marshaled %u bytes, expected at most %u\n", (ULONG) (next - buffer), size); check_safearray(buffer, lpsa); -todo_wine + todo_wine ok(heap_unknown[0]->refs == 3, "Unexpected refcount %d\n", heap_unknown[0]->refs); lpsa2 = NULL; @@ -1612,7 +1612,7 @@ static void test_marshal_VARIANT(void) stubMsg.BufferEnd = stubMsg.Buffer + stubMsg.BufferLength; memset(buffer, 0xcc, stubMsg.BufferLength); next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v); -todo_wine + todo_wine ok(heap_unknown->refs == 2, "got refcount %d\n", heap_unknown->refs); wirev = (DWORD*)buffer; wirev = check_variant_header(wirev, &v, next - buffer); @@ -1630,7 +1630,7 @@ todo_wine V_UNKNOWN(&v3) = &heap_unknown->IUnknown_iface; IUnknown_AddRef(V_UNKNOWN(&v3)); stubMsg.Buffer = buffer; -todo_wine + todo_wine ok(heap_unknown->refs == 3, "got refcount %d\n", heap_unknown->refs); next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v3); ok(V_VT(&v) == V_VT(&v3), "got vt %d expect %d\n", V_VT(&v), V_VT(&v3)); @@ -1679,7 +1679,7 @@ todo_wine memset(buffer, 0xcc, stubMsg.BufferLength); ok(heap_unknown->refs == 1, "got refcount %d\n", heap_unknown->refs); next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v); -todo_wine + todo_wine ok(heap_unknown->refs == 2, "got refcount %d\n", heap_unknown->refs); wirev = (DWORD*)buffer; wirev = check_variant_header(wirev, &v, next - buffer); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 0c6249d48db..916a4858607 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -149,15 +149,15 @@ static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, /* Compiler cast where input cannot be negative */ #define NEGTST(dest, src, func) RETTYP _##func(src in, dest* out) { \ - if (in < 0) return DISP_E_OVERFLOW; *out = in; return S_OK; } + if (in < 0) { return DISP_E_OVERFLOW; } *out = in; return S_OK; } /* Compiler cast where input cannot be > some number */ #define POSTST(dest, src, func, tst) RETTYP _##func(src in, dest* out) { \ - if (in > (dest)tst) return DISP_E_OVERFLOW; *out = in; return S_OK; } + if (in > (dest)tst) { return DISP_E_OVERFLOW; } *out = in; return S_OK; } /* Compiler cast where input cannot be < some number or >= some other number */ #define BOTHTST(dest, src, func, lo, hi) RETTYP _##func(src in, dest* out) { \ - if (in < (dest)lo || in > hi) return DISP_E_OVERFLOW; *out = in; return S_OK; } + if (in < (dest)lo || in > hi) { return DISP_E_OVERFLOW; } *out = in; return S_OK; } /* I1 */ POSTST(signed char, BYTE, VarI1FromUI1, I1_MAX) -- 2.35.0

Jan. 27, 2022

[PATCH 21/24] ole32/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- 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 --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 1d46a5b9c13..94dcafbe8ff 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3817,7 +3817,7 @@ static void test_CoGetInstanceFromFile(void) mqi[0].pItf = NULL; mqi[0].hr = E_NOTIMPL; hr = CoGetInstanceFromFile(NULL, NULL, NULL, CLSCTX_INPROC_SERVER, STGM_READ, (OLECHAR*)filenameW, 1, mqi); -todo_wine + todo_wine ok(hr == MK_E_CANTOPENFILE, "got 0x%08x\n", hr); ok(mqi[0].pItf == NULL, "got %p\n", mqi[0].pItf); ok(mqi[0].hr == E_NOINTERFACE, "got 0x%08x\n", mqi[0].hr); @@ -4186,7 +4186,7 @@ static void test_CoCreateInstanceFromApp(void) hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER | CLSCTX_APPCONTAINER, NULL, &IID_IClassFactory, (void **)&unk); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c index 60bc29c08dd..83851102ef2 100644 --- a/dlls/ole32/tests/defaulthandler.c +++ b/dlls/ole32/tests/defaulthandler.c @@ -286,7 +286,7 @@ static void test_default_handler_run(void) SET_EXPECT(CF_QueryInterface_ClassFactory); SET_EXPECT(CF_CreateInstance); hres = IRunnableObject_Run(ro, NULL); -todo_wine + todo_wine ok(hres == S_OK, "Run failed: %x\n", hres); CHECK_CALLED(CF_QueryInterface_ClassFactory); CHECK_CALLED(CF_CreateInstance); @@ -296,11 +296,11 @@ todo_wine SET_EXPECT(CF_CreateInstance); hres = CoCreateInstance(&test_server_clsid, NULL, CLSCTX_LOCAL_SERVER, &IID_IOleObject, (void**)&oleobj); -todo_wine + todo_wine ok(hres == REGDB_E_CLASSNOTREG, "expected REGDB_E_CLASSNOTREG, got %x\n", hres); -todo_wine + todo_wine CHECK_NOT_CALLED(CF_QueryInterface_ClassFactory); -todo_wine + todo_wine CHECK_NOT_CALLED(CF_CreateInstance); SET_EXPECT(CF_QueryInterface_IMarshal); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e05ed937df2..a1cd3dccb15 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1344,7 +1344,7 @@ static void test_marshal_channel_buffer(void) SET_EXPECT(Disconnect); IUnknown_Release(proxy); -todo_wine + todo_wine CHECK_CALLED(Disconnect); hr = CoRevokeClassObject(registration_key); diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index d2c83c173ba..b5eb5f2ffb4 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -96,7 +96,7 @@ static void _test_moniker_type(IMoniker *moniker, DWORD type, BOOL todo, int lin hr = IMoniker_IsSystemMoniker(moniker, &type2); ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine_if(todo) + todo_wine_if(todo) ok_(__FILE__, line)(type2 == type, "Unexpected moniker type %d.\n", type2); } @@ -1029,7 +1029,7 @@ static void test_ROT(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); IMoniker_Release(pMoniker); @@ -1245,7 +1245,7 @@ static void test_MkParseDisplayName(void) eaten = 0xdeadbeef; pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszNonExistentProgId, &eaten, &pmk); -todo_wine + todo_wine ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr); ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); @@ -1255,7 +1255,7 @@ todo_wine eaten = 0xdeadbeef; pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszDisplayNameClsid, &eaten, &pmk); -todo_wine + todo_wine ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr); ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); @@ -1331,7 +1331,7 @@ todo_wine eaten = 0xdeadbeef; pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszDisplayNameProgIdFail, &eaten, &pmk); -todo_wine + todo_wine ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr); ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); @@ -1783,7 +1783,7 @@ static void test_moniker( hr = IMoniker_GetSizeMax(moniker, &max_size); ok(hr == S_OK, "Failed to get max size, hr %#x.\n", hr); -todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE) + todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE) ok(expected_max_size == max_size.u.LowPart, "%s: unexpected max size %u.\n", testname, max_size.u.LowPart); hr = IMoniker_Save(moniker, stream, TRUE); @@ -1926,7 +1926,7 @@ static void test_class_moniker(void) { eaten = 0xdeadbeef; hr = MkParseDisplayName(bindctx, tests[i].name, &eaten, &moniker); - todo_wine_if(i == 5) + todo_wine_if(i == 5) ok(hr == tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); ok(eaten == tests[i].eaten, "%u: unexpected eaten length %u, expected %u.\n", i, eaten, tests[i].eaten); if (SUCCEEDED(hr)) @@ -2101,7 +2101,7 @@ static void test_class_moniker(void) ok(!enummoniker, "Unexpected pointer.\n"); hr = IMoniker_Enum(moniker, FALSE, NULL); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); IBindCtx_Release(bindctx); @@ -2223,7 +2223,7 @@ static void test_file_moniker(WCHAR* path) ok(!enummoniker, "Unexpected pointer.\n"); hr = IMoniker_Enum(moniker1, FALSE, NULL); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); IBindCtx_Release(bind_ctx); @@ -2312,7 +2312,7 @@ static void test_file_monikers(void) ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); check_interface(moniker, &IID_IMoniker, TRUE); -todo_wine + todo_wine check_interface(moniker, &IID_IPersist, FALSE); check_interface(moniker, &IID_IPersistStream, TRUE); check_interface(moniker, &CLSID_FileMoniker, TRUE); @@ -2707,7 +2707,7 @@ static void test_item_moniker(void) ok(!enummoniker, "Unexpected pointer.\n"); hr = IMoniker_Enum(moniker, FALSE, NULL); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, NULL); @@ -2872,7 +2872,7 @@ static void test_anti_moniker(void) ok_ole_success(hr, CreateAntiMoniker); check_interface(moniker, &IID_IMoniker, TRUE); -todo_wine + todo_wine check_interface(moniker, &IID_IPersist, FALSE); check_interface(moniker, &IID_IPersistStream, TRUE); check_interface(moniker, &CLSID_AntiMoniker, TRUE); @@ -3037,7 +3037,7 @@ todo_wine ok(!enummoniker, "Unexpected pointer.\n"); hr = IMoniker_Enum(moniker, FALSE, NULL); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); /* CommonPrefixWith() */ @@ -3225,7 +3225,7 @@ static void test_generic_composite_moniker(void) ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); check_interface(moniker, &IID_IMoniker, TRUE); -todo_wine + todo_wine check_interface(moniker, &IID_IPersist, FALSE); check_interface(moniker, &IID_IPersistStream, TRUE); check_interface(moniker, &IID_IROTData, TRUE); @@ -3237,7 +3237,7 @@ todo_wine /* Generic composite is special, as it does not addref in this case. */ hr = IMoniker_QueryInterface(moniker, &CLSID_CompositeMoniker, (void **)&unknown); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); @@ -3338,14 +3338,14 @@ todo_wine cookie = 0; hr = IRunningObjectTable_Register(rot, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)moniker4, moniker4, &cookie); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_BindToObject(moniker3, bindctx, moniker2, &IID_IMoniker, (void **)&unknown); ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); hr = IRunningObjectTable_Revoke(rot, cookie); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMoniker_Release(moniker3); @@ -3480,7 +3480,7 @@ todo_wine IMoniker_Release(moniker3); hr = IMoniker_CommonPrefixWith(moniker2, moniker, &moniker3); -todo_wine + todo_wine ok(hr == MK_S_ME, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { @@ -3843,7 +3843,7 @@ static void test_pointer_moniker(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); check_interface(moniker, &IID_IMoniker, TRUE); -todo_wine + todo_wine check_interface(moniker, &IID_IPersist, FALSE); check_interface(moniker, &IID_IPersistStream, TRUE); check_interface(moniker, &CLSID_PointerMoniker, TRUE); @@ -4135,7 +4135,7 @@ static void test_objref_moniker(void) hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&moniker2); ok(hr == S_OK, "Failed to unmarshal, hr %#x\n", hr); hr = IMoniker_IsEqual(moniker, moniker2); -todo_wine + todo_wine ok(hr == S_OK, "Expected equal moniker, hr %#x\n", hr); IMoniker_Release(moniker2); @@ -4151,7 +4151,7 @@ todo_wine ok(hr == S_OK, "CreateBindCtx failed: 0x%08x\n", hr); hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); -todo_wine + todo_wine ok(hr == S_OK, "IMoniker_GetDisplayName failed: 0x%08x\n", hr); IBindCtx_Release(bindctx); @@ -4170,7 +4170,7 @@ todo_wine ok(hr == S_OK, "CreateStreamOnHGlobal failed: 0x%08x\n", hr); hr = IMoniker_Save(moniker, stream, TRUE); -todo_wine + todo_wine ok(hr == S_OK, "IMoniker_Save failed: 0x%08x\n", hr); IStream_Release(stream); @@ -4184,7 +4184,7 @@ todo_wine TEST_MONIKER_TYPE(moniker, MKSYS_OBJREFMONIKER); hr = IMoniker_Inverse(moniker, &inverse); -todo_wine + todo_wine ok(hr == S_OK, "Failed to get inverse, hr %#x\n", hr); if (hr == S_OK) { @@ -4197,38 +4197,38 @@ if (hr == S_OK) /* IsRunning test */ hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "IMoniker_IsRunning should return S_OK, not 0x%08x\n", hr); hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); ok(hr == MK_E_UNAVAILABLE, "IMoniker_GetTimeOfLastChange should return MK_E_UNAVAILABLE, not 0x%08x\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); -todo_wine + todo_wine ok(hr == S_OK, "IMoniker_BindToObject failed: 0x%08x\n", hr); -if (hr == S_OK) - IUnknown_Release(unknown); + if (hr == S_OK) + IUnknown_Release(unknown); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); -todo_wine + todo_wine ok(hr == S_OK, "IMoniker_BindToObject failed: 0x%08x\n", hr); -if (hr == S_OK) - IUnknown_Release(unknown); + if (hr == S_OK) + IUnknown_Release(unknown); IMoniker_Release(moniker); -todo_wine + todo_wine ok(factory.refcount > 1, "Unexpected factory refcount %u\n", factory.refcount); hr = CreateObjrefMoniker(NULL, &moniker); ok(hr == S_OK, "CreateObjrefMoniker failed, hr %#x\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); -todo_wine + todo_wine ok(hr == E_UNEXPECTED, "IMoniker_BindToObject should have returned E_UNEXPECTED instead of 0x%08x\n", hr); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); -todo_wine + todo_wine ok(hr == E_UNEXPECTED, "IMoniker_BindToStorage should have returned E_UNEXPECTED instead of 0x%08x\n", hr); IBindCtx_Release(bindctx); @@ -4254,23 +4254,23 @@ todo_wine ok(hr == S_OK, "CreateObjrefMoniker failed: hr %#x\n", hr); hr = IMoniker_IsEqual(moniker, NULL); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x\n", hr); hr = IMoniker_IsEqual(moniker, moniker2); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x\n", hr); hr = IMoniker_CommonPrefixWith(moniker, moniker2, NULL); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x\n", hr); hr = IMoniker_CommonPrefixWith(moniker, NULL, &prefix); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x\n", hr); hr = IMoniker_CommonPrefixWith(moniker, moniker2, &prefix); -todo_wine + todo_wine ok(hr == MK_S_US, "Unexpected hr %#x\n", hr); if (hr == S_OK) { @@ -4284,11 +4284,11 @@ if (hr == S_OK) ok(hr == S_OK, "Failed to create moniker, hr %#x\n", hr); hr = IMoniker_IsEqual(moniker, moniker2); -todo_wine + todo_wine ok(hr == S_FALSE, "Unexpected hr %#x\n", hr); hr = IMoniker_CommonPrefixWith(moniker, moniker2, &prefix); -todo_wine + todo_wine ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x\n", hr); IMoniker_Release(moniker2); @@ -4298,16 +4298,16 @@ todo_wine /* P + A -> () */ anti = create_antimoniker(1); hr = IMoniker_ComposeWith(moniker, anti, TRUE, &moniker2); -todo_wine + todo_wine ok(hr == S_OK, "Failed to compose, hr %#x\n", hr); -if (hr == S_OK) - ok(!moniker2, "Unexpected pointer\n"); + if (hr == S_OK) + ok(!moniker2, "Unexpected pointer\n"); IMoniker_Release(anti); /* P + A2 -> A */ anti = create_antimoniker(2); hr = IMoniker_ComposeWith(moniker, anti, TRUE, &moniker2); -todo_wine + todo_wine ok(hr == S_OK, "Failed to compose, hr %#x\n", hr); if (hr == S_OK) { diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 42e377f8a63..69d8a0c0e93 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -3209,7 +3209,7 @@ static HRESULT WINAPI Storage_CreateStream(IStorage *iface, LPCOLESTR pwcsName, } else { -todo_wine + todo_wine ok(0, "unexpected stream name %s\n", wine_dbgstr_w(pwcsName)); #if 0 /* FIXME: return NULL once Wine is fixed */ *ppstm = NULL; @@ -3677,11 +3677,11 @@ static void test_data_cache_save(void) hr = IPersistStorage_Save(stg, &Storage, FALSE); ok(hr == S_OK, "unexpected %#x\n", hr); CHECK_CALLED(Storage_CreateStream_OlePres); -todo_wine + todo_wine CHECK_CALLED(Storage_OpenStream_OlePres); -todo_wine + todo_wine CHECK_CALLED(Storage_OpenStream_Ole); -todo_wine + todo_wine CHECK_CALLED(Storage_DestroyElement); IStream_Release(olepres_stream); @@ -4456,10 +4456,10 @@ static void test_data_cache_contents(void) enumerated_streams = matched_streams = -1; check_storage_contents(doc2, test_data[i].out, &enumerated_streams, &matched_streams); -todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_1 || test_data[i].in == &stg_def_2)) + todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_1 || test_data[i].in == &stg_def_2)) ok(enumerated_streams == matched_streams, "%d out: enumerated %d != matched %d\n", i, enumerated_streams, matched_streams); -todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_4 || test_data[i].in == &stg_def_5 + todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_4 || test_data[i].in == &stg_def_5 || test_data[i].in == &stg_def_6)) ok(enumerated_streams == test_data[i].out->stream_count, "%d: saved streams %d != def streams %d\n", i, enumerated_streams, test_data[i].out->stream_count); diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index b0bf01d96e8..a5e0a334491 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -472,11 +472,11 @@ START_TEST(ole_server) trace("call OleRun\n"); hr = OleRun(unknown); trace("ret OleRun\n"); -todo_wine + todo_wine ok(hr == S_OK, "OleRun error %#x\n", hr); ret = IRunnableObject_IsRunning(runobj); -todo_wine + todo_wine ok(ret == 1, "expected 1, got %d\n", ret); trace("call IRunnableObject_Release\n"); diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index ea58e8bda3e..967a1788333 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -650,7 +650,7 @@ static void test_propertyset_storage_enum(void) hr = IPropertyStorage_Stat(prop_storage, &psstg); ok(hr == S_OK, "Failed to get prop storage stats, hr %#x.\n", hr); -todo_wine + todo_wine ok(IsEqualCLSID(&psstg.clsid, &IID_IUnknown), "Unexpected storage clsid %s.\n", wine_dbgstr_guid(&psstg.clsid)); hr = IPropertySetStorage_Enum(ps_storage, NULL); @@ -671,7 +671,7 @@ todo_wine memset(&ftime, 0, sizeof(ftime)); ftime.dwLowDateTime = 1; hr = IPropertyStorage_SetTimes(prop_storage, NULL, NULL, &ftime); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set storage times, hr %#x.\n", hr); hr = IEnumSTATPROPSETSTG_Reset(ps_enum); @@ -703,10 +703,10 @@ todo_wine hr = IEnumSTATPROPSETSTG_Reset(ps_enum); ok(hr == S_OK, "Failed to reset enumerator, hr %#x.\n", hr); hr = IEnumSTATPROPSETSTG_Skip(ps_enum, 2); -todo_wine + todo_wine ok(hr == S_FALSE, "Failed to skip, hr %#x.\n", hr); hr = IEnumSTATPROPSETSTG_Next(ps_enum, 1, &psstg, &fetched); -todo_wine + todo_wine ok(hr == S_FALSE, "Failed to get enum item, hr %#x.\n", hr); hr = IEnumSTATPROPSETSTG_Reset(ps_enum); @@ -714,7 +714,7 @@ todo_wine hr = IEnumSTATPROPSETSTG_Skip(ps_enum, 1); ok(hr == S_OK, "Failed to skip, hr %#x.\n", hr); hr = IEnumSTATPROPSETSTG_Next(ps_enum, 1, &psstg, &fetched); -todo_wine + todo_wine ok(hr == S_FALSE, "Failed to get enum item, hr %#x.\n", hr); hr = IEnumSTATPROPSETSTG_Reset(ps_enum); diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index bbe7fb5da7f..fa281abbaaf 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -720,7 +720,7 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx, BOOL client, IStream_Seek(stm, zero, STREAM_SEEK_CUR, &pos); marshal_size = pos.u.LowPart; marshal_data = GlobalLock(h); -todo_wine + todo_wine ok(Test_Unknown.refs == 2, "got %d\n", Test_Unknown.refs); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, umcb_ctx); @@ -729,7 +729,7 @@ todo_wine buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); -todo_wine + todo_wine ok(Test_Unknown.refs == 2, "got %d\n", Test_Unknown.refs); wireip = buffer; -- 2.35.0

Jan. 27, 2022

[PATCH 20/24] ntoskrnl/tests: Avoid "misleading indentation" warnings.

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- 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); -- 2.35.0

Jan. 27, 2022