September 2021 - Wine-Devel

[PATCH 1/6] winexinput.sys: Return native product strings on some devices.
by Rémi Bernon Sept. 13, 2021

Sept. 13, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winexinput.sys/main.c | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 3832c97ef26..667ce867269 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -32,6 +32,7 @@ #include "ddk/wdm.h" #include "ddk/hidport.h" #include "ddk/hidpddi.h" +#include "ddk/hidtypes.h" #include "wine/asm.h" #include "wine/debug.h" @@ -314,17 +315,76 @@ static NTSTATUS try_complete_pending_read(DEVICE_OBJECT *device, IRP *irp) return IoCallDriver(fdo->bus_device, xinput_irp); } +struct device_strings +{ + const WCHAR *id; + const WCHAR *product; +}; + +static const struct device_strings device_strings[] = +{ + { .id = L"VID_045E&PID_028E&IG_00", .product = L"Controller (XBOX 360 For Windows)" }, + { .id = L"VID_045E&PID_028F&IG_00", .product = L"Controller (XBOX 360 For Windows)" }, + { .id = L"VID_045E&PID_02D1&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02DD&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02E3&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02EA&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02FD&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_0719&IG_00", .product = L"Controller (XBOX 360 For Windows)" }, +}; + +static const WCHAR *find_product_string(const WCHAR *device_id) +{ + const WCHAR *match_id = wcsrchr(device_id, '\\') + 1; + DWORD i; + + for (i = 0; i < ARRAY_SIZE(device_strings); ++i) + if (!wcsicmp(device_strings[i].id, match_id)) + return device_strings[i].product; + + return NULL; +} + static NTSTATUS WINAPI gamepad_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); ULONG output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); + struct device *impl = impl_from_DEVICE_OBJECT(device); + const WCHAR *str = NULL; TRACE("device %p, irp %p, code %#x, bus_device %p.\n", device, irp, code, fdo->bus_device); switch (code) { + case IOCTL_HID_GET_STRING: + switch ((ULONG_PTR)stack->Parameters.DeviceIoControl.Type3InputBuffer) + { + case HID_STRING_ID_IPRODUCT: + str = find_product_string(impl->device_id); + break; + } + + if (!str) + { + IoSkipCurrentIrpStackLocation(irp); + return IoCallDriver(fdo->bus_device, irp); + } + + irp->IoStatus.Information = (wcslen(str) + 1) * sizeof(WCHAR); + if (output_len < irp->IoStatus.Information) + { + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_BUFFER_TOO_SMALL; + } + + wcscpy(irp->UserBuffer, str); + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + case IOCTL_HID_GET_DEVICE_DESCRIPTOR: { HID_DESCRIPTOR *descriptor = (HID_DESCRIPTOR *)irp->UserBuffer; -- 2.33.0

1 5

[PATCH] msi: Don't leak the file handle on error in cabinet_close_file_info().
by Hans Leidekker Sept. 13, 2021

Sept. 13, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/media.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index cc4648481ba..af6e83b893e 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -507,16 +507,23 @@ static INT_PTR cabinet_close_file_info(FDINOTIFICATIONTYPE fdint, data->mi->is_continuous = FALSE; if (!DosDateTimeToFileTime(pfdin->date, pfdin->time, &ft)) + { + CloseHandle(handle); return -1; + } if (!LocalFileTimeToFileTime(&ft, &ftLocal)) + { + CloseHandle(handle); return -1; + } if (!SetFileTime(handle, &ftLocal, 0, &ftLocal)) + { + CloseHandle(handle); return -1; + } CloseHandle(handle); - - data->cb(data->package, data->curfile, MSICABEXTRACT_FILEEXTRACTED, NULL, NULL, - data->user); + data->cb(data->package, data->curfile, MSICABEXTRACT_FILEEXTRACTED, NULL, NULL, data->user); msi_free(data->curfile); data->curfile = NULL; -- 2.30.2

1 0

[PATCH 1/4] winexinput.sys: Register known XBox controllers hardware ids.
by Rémi Bernon Sept. 13, 2021

Sept. 13, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- * Send the patches separately from the others, they should not conflict * Force the &MI_00 suffix on all gamepad devices where we cannot figure the correct interface number (SDL and IOHID bus). dlls/winexinput.sys/winexinput.inf | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winexinput.sys/winexinput.inf b/dlls/winexinput.sys/winexinput.inf index 2f388c190ca..a2b74863c63 100644 --- a/dlls/winexinput.sys/winexinput.inf +++ b/dlls/winexinput.sys/winexinput.inf @@ -8,6 +8,19 @@ Wine=mfg_section [mfg_section] Wine XInput compatible device=device_section,WINEBUS\WINE_COMP_XINPUT +Xbox Controller=device_section,WINEBUS\VID_045E&PID_0202&MI_00 +Xbox Controller S=device_section,WINEBUS\VID_045E&PID_0285&MI_00 +Xbox Controller S=device_section,WINEBUS\VID_045E&PID_0289&MI_00 +Xbox360 Controller=device_section,WINEBUS\VID_045E&PID_028E&MI_00 +Xbox360 Wireless Controller=device_section,WINEBUS\VID_045E&PID_028F&MI_00 +Xbox One Controller=device_section,WINEBUS\VID_045E&PID_02D1&MI_00 +Xbox One Controller (Covert Forces/Firmware 2015)=device_section,WINEBUS\VID_045E&PID_02DD&MI_00 +Xbox One X Controller=device_section,WINEBUS\VID_045E&PID_02E0&MI_00 +Xbox One Elite Controller=device_section,WINEBUS\VID_045E&PID_02E3&MI_00 +Wireless XBox Controller Dongle=device_section,WINEBUS\VID_045E&PID_02E6&MI_00 +Xbox One S Controller=device_section,WINEBUS\VID_045E&PID_02EA&MI_00 +Xbox One S Controller (Firmware 2017)=device_section,WINEBUS\VID_045E&PID_02FD&MI_00 +Xbox 360 Wireless Adapter=device_section,WINEBUS\VID_045E&PID_0719&MI_00 [device_section.Services] AddService = xinput,0x2,svc_section -- 2.33.0

1 4

[PATCH 1/8] dinput8/tests: Fix inverted winetest_win_skip condition.
by Rémi Bernon Sept. 13, 2021

Sept. 13, 2021

And change skipped test message. It's not really useful and it will fail the tests if the main test summary doesn't match the number of skipped messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- In order for the skipped tests to be counted correctly we would need a new winetest_add_skipped helper in wine/test.h and that would cause all tests to be rebuilt. This is simpler and I don't think driver skipped test count matter so much. It could also be added later. dlls/dinput8/tests/driver_hid.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput8/tests/driver_hid.h index 8fad343157d..42d12a0cf27 100644 --- a/dlls/dinput8/tests/driver_hid.h +++ b/dlls/dinput8/tests/driver_hid.h @@ -326,7 +326,7 @@ static inline void winetest_vskip( const char *msg, __ms_va_list args ) { if (winetest_add_line() < winetest_mute_threshold) { - winetest_print_context( "Tests skipped: " ); + winetest_print_context( "Driver tests skipped: " ); kvprintf( msg, args ); InterlockedIncrement( &skipped ); } @@ -347,7 +347,7 @@ static inline void WINAPIV winetest_win_skip( const char *msg, ... ) { __ms_va_list args; __ms_va_start( args, msg ); - if (running_under_wine) winetest_vskip( msg, args ); + if (!running_under_wine) winetest_vskip( msg, args ); else winetest_vok( 0, msg, args ); __ms_va_end( args ); } -- 2.33.0

1 7

[PATCH v2] d2d1: Fix the stack overflow error caused by d2d_cdt_triangulate().
by Changsheng Chen Sept. 13, 2021

Sept. 13, 2021

1 0

[v2 PATCH] rpcrt4/tests: Always run tests that don't require special permissions.
by Nikolay Sivov Sept. 13, 2021

Sept. 13, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fix tests on Wine dlls/rpcrt4/tests/rpc.c | 105 +++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 44 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 8ae63a140e7..413a715e16d 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -78,35 +78,49 @@ static BOOL Uuid_Comparison_Grid[11][11] = { { TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE } }; -static void UuidConversionAndComparison(void) { +static void test_UuidEqual(void) +{ + UUID Uuid1, Uuid2, *PUuid1, *PUuid2; + RPC_STATUS status; + int i1, i2; + + /* Uuid Equality */ + for (i1 = 0; i1 < 11; i1++) + { + for (i2 = 0; i2 < 11; i2++) + { + if (i1 < 10) + { + Uuid1 = Uuid_Table[i1]; + PUuid1 = &Uuid1; + } + else + PUuid1 = NULL; + + if (i2 < 10) + { + Uuid2 = Uuid_Table[i2]; + PUuid2 = &Uuid2; + } + else + PUuid2 = NULL; + ok(UuidEqual(PUuid1, PUuid2, &status) == Uuid_Comparison_Grid[i1][i2], "UUID Equality\n" ); + } + } +} + +static void test_UuidFromString(void) +{ CHAR strx[100], x; LPSTR str = strx; WCHAR wstrx[100], wx; LPWSTR wstr = wstrx; - UUID Uuid1, Uuid2, *PUuid1, *PUuid2; + UUID Uuid1, Uuid2; RPC_STATUS rslt; int i1,i2; - /* Uuid Equality */ - for (i1 = 0; i1 < 11; i1++) - for (i2 = 0; i2 < 11; i2++) { - if (i1 < 10) { - Uuid1 = Uuid_Table[i1]; - PUuid1 = &Uuid1; - } else { - PUuid1 = NULL; - } - if (i2 < 10) { - Uuid2 = Uuid_Table[i2]; - PUuid2 = &Uuid2; - } else { - PUuid2 = NULL; - } - ok( (UuidEqual(PUuid1, PUuid2, &rslt) == Uuid_Comparison_Grid[i1][i2]), "UUID Equality\n" ); - } - /* Uuid to String to Uuid (char) */ for (i1 = 0; i1 < 10; i1++) { Uuid1 = Uuid_Table[i1]; @@ -141,7 +155,7 @@ static void UuidConversionAndComparison(void) { } } -static void TestDceErrorInqText (void) +static void test_DceErrorInqTextA(void) { char bufferInvalid [1024]; char buffer [1024]; /* The required size is not documented but would @@ -649,17 +663,10 @@ static void test_RpcStringBindingParseA(void) ok(options == NULL, "options was %p instead of NULL\n", options); } -static void test_RpcExceptionFilter(const char *func_name) +static void test_RpcExceptionFilter(void) { + int retval, retval2; ULONG exception; - int retval; - int (WINAPI *pRpcExceptionFilter)(ULONG) = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), func_name); - - if (!pRpcExceptionFilter) - { - win_skip("%s not exported\n", func_name); - return; - } for (exception = 0; exception < STATUS_REG_NAT_CONSUMPTION; exception++) { @@ -668,7 +675,8 @@ static void test_RpcExceptionFilter(const char *func_name) if (exception == 0x40000005) exception = 0x80000000; if (exception == 0x80000005) exception = 0xc0000000; - retval = pRpcExceptionFilter(exception); + retval = RpcExceptionFilter(exception); + retval2 = I_RpcExceptionFilter(exception); switch (exception) { case STATUS_DATATYPE_MISALIGNMENT: @@ -679,17 +687,25 @@ static void test_RpcExceptionFilter(const char *func_name) case STATUS_INSTRUCTION_MISALIGNMENT: case STATUS_STACK_OVERFLOW: case STATUS_POSSIBLE_DEADLOCK: - ok(retval == EXCEPTION_CONTINUE_SEARCH, "%s(0x%x) should have returned %d instead of %d\n", - func_name, exception, EXCEPTION_CONTINUE_SEARCH, retval); + ok(retval == EXCEPTION_CONTINUE_SEARCH, "RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_CONTINUE_SEARCH, retval); + ok(retval2 == EXCEPTION_CONTINUE_SEARCH, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_CONTINUE_SEARCH, retval); break; case STATUS_GUARD_PAGE_VIOLATION: case STATUS_IN_PAGE_ERROR: case STATUS_HANDLE_NOT_CLOSABLE: - trace("%s(0x%x) returned %d\n", func_name, exception, retval); + todo_wine + { + ok(!retval, "Unexpected return value %d.\n", retval); + ok(!retval2, "Unexpected return value %d.\n", retval2); + } break; default: - ok(retval == EXCEPTION_EXECUTE_HANDLER, "%s(0x%x) should have returned %d instead of %d\n", - func_name, exception, EXCEPTION_EXECUTE_HANDLER, retval); + ok(retval == EXCEPTION_EXECUTE_HANDLER, "RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_EXECUTE_HANDLER, retval); + ok(retval2 == EXCEPTION_EXECUTE_HANDLER, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_EXECUTE_HANDLER, retval); } } } @@ -1235,22 +1251,23 @@ START_TEST( rpc ) static unsigned char np_address[] = "."; BOOL firewall_enabled = is_firewall_enabled(); + test_UuidEqual(); + test_UuidFromString(); + test_UuidCreate(); + test_UuidCreateSequential(); + test_DceErrorInqTextA(); + test_I_RpcMapWin32Status(); + test_RpcStringBindingParseA(); + test_RpcExceptionFilter(); + if (firewall_enabled && !is_process_elevated()) { skip("no privileges, skipping tests to avoid firewall dialog\n"); return; } - UuidConversionAndComparison(); - TestDceErrorInqText(); test_towers(); - test_I_RpcMapWin32Status(); - test_RpcStringBindingParseA(); - test_RpcExceptionFilter("I_RpcExceptionFilter"); - test_RpcExceptionFilter("RpcExceptionFilter"); test_RpcStringBindingFromBinding(); - test_UuidCreate(); - test_UuidCreateSequential(); test_RpcBindingFree(); test_RpcIfInqId(); test_RpcServerInqDefaultPrincName(); -- 2.33.0

1 0

[PATCH] rpcrt4/tests: Always run tests that don't require special permissions.
by Nikolay Sivov Sept. 13, 2021

Sept. 13, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/rpcrt4/tests/rpc.c | 102 +++++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 44 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 8ae63a140e7..11c3bf51d79 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -78,35 +78,49 @@ static BOOL Uuid_Comparison_Grid[11][11] = { { TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE } }; -static void UuidConversionAndComparison(void) { +static void test_UuidEqual(void) +{ + UUID Uuid1, Uuid2, *PUuid1, *PUuid2; + RPC_STATUS status; + int i1, i2; + + /* Uuid Equality */ + for (i1 = 0; i1 < 11; i1++) + { + for (i2 = 0; i2 < 11; i2++) + { + if (i1 < 10) + { + Uuid1 = Uuid_Table[i1]; + PUuid1 = &Uuid1; + } + else + PUuid1 = NULL; + + if (i2 < 10) + { + Uuid2 = Uuid_Table[i2]; + PUuid2 = &Uuid2; + } + else + PUuid2 = NULL; + ok(UuidEqual(PUuid1, PUuid2, &status) == Uuid_Comparison_Grid[i1][i2], "UUID Equality\n" ); + } + } +} + +static void test_UuidFromString(void) +{ CHAR strx[100], x; LPSTR str = strx; WCHAR wstrx[100], wx; LPWSTR wstr = wstrx; - UUID Uuid1, Uuid2, *PUuid1, *PUuid2; + UUID Uuid1, Uuid2; RPC_STATUS rslt; int i1,i2; - /* Uuid Equality */ - for (i1 = 0; i1 < 11; i1++) - for (i2 = 0; i2 < 11; i2++) { - if (i1 < 10) { - Uuid1 = Uuid_Table[i1]; - PUuid1 = &Uuid1; - } else { - PUuid1 = NULL; - } - if (i2 < 10) { - Uuid2 = Uuid_Table[i2]; - PUuid2 = &Uuid2; - } else { - PUuid2 = NULL; - } - ok( (UuidEqual(PUuid1, PUuid2, &rslt) == Uuid_Comparison_Grid[i1][i2]), "UUID Equality\n" ); - } - /* Uuid to String to Uuid (char) */ for (i1 = 0; i1 < 10; i1++) { Uuid1 = Uuid_Table[i1]; @@ -141,7 +155,7 @@ static void UuidConversionAndComparison(void) { } } -static void TestDceErrorInqText (void) +static void test_DceErrorInqTextA(void) { char bufferInvalid [1024]; char buffer [1024]; /* The required size is not documented but would @@ -649,17 +663,10 @@ static void test_RpcStringBindingParseA(void) ok(options == NULL, "options was %p instead of NULL\n", options); } -static void test_RpcExceptionFilter(const char *func_name) +static void test_RpcExceptionFilter(void) { + int retval, retval2; ULONG exception; - int retval; - int (WINAPI *pRpcExceptionFilter)(ULONG) = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), func_name); - - if (!pRpcExceptionFilter) - { - win_skip("%s not exported\n", func_name); - return; - } for (exception = 0; exception < STATUS_REG_NAT_CONSUMPTION; exception++) { @@ -668,7 +675,8 @@ static void test_RpcExceptionFilter(const char *func_name) if (exception == 0x40000005) exception = 0x80000000; if (exception == 0x80000005) exception = 0xc0000000; - retval = pRpcExceptionFilter(exception); + retval = RpcExceptionFilter(exception); + retval2 = I_RpcExceptionFilter(exception); switch (exception) { case STATUS_DATATYPE_MISALIGNMENT: @@ -679,17 +687,22 @@ static void test_RpcExceptionFilter(const char *func_name) case STATUS_INSTRUCTION_MISALIGNMENT: case STATUS_STACK_OVERFLOW: case STATUS_POSSIBLE_DEADLOCK: - ok(retval == EXCEPTION_CONTINUE_SEARCH, "%s(0x%x) should have returned %d instead of %d\n", - func_name, exception, EXCEPTION_CONTINUE_SEARCH, retval); + ok(retval == EXCEPTION_CONTINUE_SEARCH, "RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_CONTINUE_SEARCH, retval); + ok(retval2 == EXCEPTION_CONTINUE_SEARCH, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_CONTINUE_SEARCH, retval); break; case STATUS_GUARD_PAGE_VIOLATION: case STATUS_IN_PAGE_ERROR: case STATUS_HANDLE_NOT_CLOSABLE: - trace("%s(0x%x) returned %d\n", func_name, exception, retval); + ok(!retval, "Unexpected return value %d.\n", retval); + ok(!retval2, "Unexpected return value %d.\n", retval2); break; default: - ok(retval == EXCEPTION_EXECUTE_HANDLER, "%s(0x%x) should have returned %d instead of %d\n", - func_name, exception, EXCEPTION_EXECUTE_HANDLER, retval); + ok(retval == EXCEPTION_EXECUTE_HANDLER, "RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_EXECUTE_HANDLER, retval); + ok(retval2 == EXCEPTION_EXECUTE_HANDLER, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_EXECUTE_HANDLER, retval); } } } @@ -1235,22 +1248,23 @@ START_TEST( rpc ) static unsigned char np_address[] = "."; BOOL firewall_enabled = is_firewall_enabled(); + test_UuidEqual(); + test_UuidFromString(); + test_UuidCreate(); + test_UuidCreateSequential(); + test_DceErrorInqTextA(); + test_I_RpcMapWin32Status(); + test_RpcStringBindingParseA(); + test_RpcExceptionFilter(); + if (firewall_enabled && !is_process_elevated()) { skip("no privileges, skipping tests to avoid firewall dialog\n"); return; } - UuidConversionAndComparison(); - TestDceErrorInqText(); test_towers(); - test_I_RpcMapWin32Status(); - test_RpcStringBindingParseA(); - test_RpcExceptionFilter("I_RpcExceptionFilter"); - test_RpcExceptionFilter("RpcExceptionFilter"); test_RpcStringBindingFromBinding(); - test_UuidCreate(); - test_UuidCreateSequential(); test_RpcBindingFree(); test_RpcIfInqId(); test_RpcServerInqDefaultPrincName(); -- 2.33.0

2 1

[PATCH 1/3] ole32: Use access mask from bind context in file moniker's BindToStorage().
by Nikolay Sivov Sept. 13, 2021

Sept. 13, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Access mask used originally is invalid to begin with. dlls/ole32/filemoniker.c | 46 +++++++++++++++---------------- dlls/ole32/tests/moniker.c | 55 +++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index d8c401c8978..d7c2a5a5ea7 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -583,41 +583,37 @@ FileMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft */ static HRESULT WINAPI FileMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, - REFIID riid, VOID** ppvObject) + REFIID riid, void **object) { - LPOLESTR filePath=0; - IStorage *pstg=0; - HRESULT res; - - TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvObject); - - if (pmkToLeft==NULL){ + FileMonikerImpl *moniker = impl_from_IMoniker(iface); + BIND_OPTS bind_opts; + HRESULT hr; - if (IsEqualIID(&IID_IStorage, riid)){ + TRACE("(%p,%p,%p,%s,%p)\n", iface, pbc, pmkToLeft, debugstr_guid(riid), object); - /* get the file name */ - IMoniker_GetDisplayName(iface,pbc,pmkToLeft,&filePath); - - res=StgOpenStorage(filePath,NULL,STGM_READWRITE|STGM_SHARE_DENY_WRITE,NULL,0,&pstg); + if (!pbc) + return E_INVALIDARG; - if (SUCCEEDED(res)) - *ppvObject=pstg; + bind_opts.cbStruct = sizeof(bind_opts); + hr = IBindCtx_GetBindOptions(pbc, &bind_opts); + if (FAILED(hr)) + return hr; - CoTaskMemFree(filePath); + if (!pmkToLeft) + { + if (IsEqualIID(&IID_IStorage, riid)) + { + return StgOpenStorage(moniker->filePathName, NULL, bind_opts.grfMode, NULL, 0, (IStorage **)object); } + else if ((IsEqualIID(&IID_IStream, riid)) || (IsEqualIID(&IID_ILockBytes, riid))) + return E_FAIL; else - if ( (IsEqualIID(&IID_IStream, riid)) || (IsEqualIID(&IID_ILockBytes, riid)) ) - return E_FAIL; - else - return E_NOINTERFACE; + return E_NOINTERFACE; } - else { - FIXME("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvObject); + FIXME("(%p,%p,%p,%s,%p)\n", iface, pbc, pmkToLeft, debugstr_guid(riid), object); - return E_NOTIMPL; - } - return res; + return E_NOTIMPL; } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 6be75f75c28..8d9c0678436 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1980,7 +1980,13 @@ static void test_file_monikers(void) */ {0x20ac, 0x2020, 0x100, 0x101, 0x102, 0x103, 0x104, 0x105, 0x106, 0x107, 0x108, 0x109, 0x10a, 0x10b, 0x10c, 0}, }; - + WCHAR filename[MAX_PATH], path[MAX_PATH]; + BIND_OPTS bind_opts; + IMoniker *moniker; + IStorage *storage; + IBindCtx *bindctx; + STATSTG statstg; + HRESULT hr; int i; trace("ACP is %u\n", GetACP()); @@ -2004,6 +2010,53 @@ static void test_file_monikers(void) test_file_moniker(wszFile[i]); } } + + /* BindToStorage() */ + GetTempPathW(MAX_PATH, path); + GetTempFileNameW(path, L"stg", 1, filename); + + hr = StgCreateStorageEx(filename, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, STGFMT_STORAGE, + 0, NULL, NULL, &IID_IStorage, (void **)&storage); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IStorage_Release(storage); + + hr = CreateFileMoniker(filename, &moniker); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IStorage, (void **)&storage); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IStorage, (void **)&storage); + ok(hr == STG_E_INVALIDFLAG, "Unexpected hr %#x.\n", hr); + + bind_opts.cbStruct = sizeof(bind_opts); + bind_opts.grfMode = STGM_READWRITE | STGM_SHARE_DENY_WRITE; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IStorage, (void **)&storage); + ok(hr == STG_E_INVALIDFLAG, "Unexpected hr %#x.\n", hr); + + bind_opts.grfMode = STGM_READ | STGM_SHARE_DENY_WRITE; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IStorage, (void **)&storage); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + memset(&statstg, 0, sizeof(statstg)); + hr = IStorage_Stat(storage, &statstg, STATFLAG_NONAME); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(statstg.grfMode == (STGM_READ | STGM_SHARE_DENY_WRITE), "Unexpected mode %#x.\n", statstg.grfMode); + + IStorage_Release(storage); + IBindCtx_Release(bindctx); + IMoniker_Release(moniker); + + DeleteFileW(filename); } static void test_item_moniker(void) -- 2.33.0

1 2

[PATCH v2 1/5] nsiproxy: Return the IOSB status from nsi_ioctl().
by Zebediah Figura Sept. 13, 2021

Sept. 13, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index c4db45dfad2..80a025acfc9 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -159,6 +159,7 @@ static void nsiproxy_get_parameter( IRP *irp ) static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + NTSTATUS status; TRACE( "ioctl %x insize %u outsize %u\n", irpsp->Parameters.DeviceIoControl.IoControlCode, @@ -185,8 +186,9 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) break; } + status = irp->IoStatus.u.Status; IoCompleteRequest( irp, IO_NO_INCREMENT ); - return STATUS_SUCCESS; + return status; } static int add_device( DRIVER_OBJECT *driver ) -- 2.33.0

2 5

[PATCH v4 1/2] oleacc: Check proper GUI thread for window focus.
by Connor McAdams Sept. 12, 2021

Sept. 12, 2021

From: Connor McAdams <conmanx360(a)gmail.com> Check for window focus against the current foreground window's thread GUI data rather than the currently executing thread's GUI data. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- -v4: Switch from checking the GUI thread data of the HWND we're checking to the foreground window's GUI thread data. dlls/oleacc/client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 3b33be55a21..0c2215fe62e 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -227,6 +227,7 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState) { Client *This = impl_from_Client(iface); + GUITHREADINFO info; LONG style; TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); @@ -244,7 +245,9 @@ static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VAR V_I4(pvarState) |= STATE_SYSTEM_UNAVAILABLE; else if(IsWindow(This->hwnd)) V_I4(pvarState) |= STATE_SYSTEM_FOCUSABLE; - if(GetFocus() == This->hwnd) + + info.cbSize = sizeof(info); + if(GetGUIThreadInfo(0, &info) && info.hwndFocus == This->hwnd) V_I4(pvarState) |= STATE_SYSTEM_FOCUSED; if(!(style & WS_VISIBLE)) V_I4(pvarState) |= STATE_SYSTEM_INVISIBLE; -- 2.25.1

1 1