August 2018 - Wine-Devel - list.winehq.org

[PATCH] winedbg/gdbproxy: Silence some noisy debug messages.
by Zebediah Figura Aug. 18, 2018

Aug. 18, 2018

--- programs/winedbg/gdbproxy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 75654d3..512e011 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -434,7 +434,7 @@ static void handle_debug_event(struct gdb_context* gdbctx, DEBUG_EVENT* de) case EXCEPTION_DEBUG_EVENT: assert(dbg_curr_thread); - fprintf(stderr, "%08x:%08x: exception code=0x%08x\n", de->dwProcessId, + TRACE("%08x:%08x: exception code=0x%08x\n", de->dwProcessId, de->dwThreadId, de->u.Exception.ExceptionRecord.ExceptionCode); if (fetch_context(gdbctx, dbg_curr_thread->handle, &gdbctx->context)) @@ -1286,7 +1286,7 @@ static enum packet_return packet_read_register(struct gdb_context* gdbctx) reg = hex_to_int(gdbctx->in_packet, gdbctx->in_packet_len); if (reg >= gdbctx->process->be_cpu->gdb_num_regs) { - FIXME("Unhandled register %u\n", reg); + WARN("Unhandled register %u\n", reg); return packet_error; } if (dbg_curr_thread != gdbctx->other_thread && gdbctx->other_thread) @@ -1315,7 +1315,7 @@ static enum packet_return packet_write_register(struct gdb_context* gdbctx) reg = strtoul(gdbctx->in_packet, &ptr, 16); if (ptr == NULL || reg >= gdbctx->process->be_cpu->gdb_num_regs || *ptr++ != '=') { - FIXME("Unhandled register %s\n", + WARN("Unhandled register %s\n", debugstr_an(gdbctx->in_packet, gdbctx->in_packet_len)); /* FIXME: if just the reg is above cpu_num_regs, don't tell gdb * it wouldn't matter too much, and it fakes our support for all regs -- 2.7.4

1 0

[PATCH v2 1/7] ntoskrnl.exe: Implement IoSetDeviceInterfaceState().
by Zebediah Figura Aug. 17, 2018

Aug. 17, 2018

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 69 ++++++++++++++++++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 80e9b9e..f92dd58 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -43,7 +43,7 @@ #include "wine/unicode.h" #include "wine/server.h" #include "wine/debug.h" - +#include "wine/heap.h" #include "wine/rbtree.h" WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); @@ -1193,6 +1193,73 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) /*********************************************************************** + * IoSetDeviceInterfaceState (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable ) +{ + const WCHAR DeviceClassesW[] = {'\\','R','E','G','I','S','T','R','Y','\\', + 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'D','e','v','i','c','e','C','l','a','s','s','e','s','\\',0}; + const WCHAR controlW[] = {'C','o','n','t','r','o','l',0}; + const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; + const WCHAR slashW[] = {'\\',0}; + const WCHAR hashW[] = {'#',0}; + + size_t namelen = name->Length / sizeof(WCHAR); + HANDLE iface_key, control_key; + OBJECT_ATTRIBUTES attr = {0}; + WCHAR *path, *refstr, *p; + UNICODE_STRING string; + NTSTATUS ret; + size_t len; + + TRACE("(%s, %d)\n", debugstr_us(name), enable); + + refstr = memrchrW(name->Buffer + 4, '\\', namelen - 4); + + len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2; + + if (!(path = heap_alloc( len * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + + strcpyW( path, DeviceClassesW ); + lstrcpynW( path + strlenW( path ), (refstr ? refstr : name->Buffer + namelen) - 38, 39 ); + strcatW( path, slashW ); + p = path + strlenW( path ); + lstrcpynW( path + strlenW( path ), name->Buffer, (refstr ? (refstr - name->Buffer) : namelen) + 1 ); + p[0] = p[1] = p[3] = '#'; + strcatW( path, slashW ); + strcatW( path, hashW ); + if (refstr) + lstrcpynW( path + strlenW( path ), refstr, name->Buffer + namelen - refstr + 1 ); + + attr.Length = sizeof(attr); + attr.ObjectName = &string; + RtlInitUnicodeString( &string, path ); + ret = NtOpenKey( &iface_key, KEY_CREATE_SUB_KEY, &attr ); + if (!ret) + { + attr.RootDirectory = iface_key; + RtlInitUnicodeString( &string, controlW ); + ret = NtCreateKey( &control_key, KEY_SET_VALUE, &attr, 0, NULL, 0, NULL ); + if (!ret) + { + DWORD data = enable; + RtlInitUnicodeString( &string, linkedW ); + ret = NtSetValueKey( control_key, &string, 0, REG_DWORD, &data, sizeof(data) ); + NtClose( control_key ); + } + NtClose( iface_key ); + } + + heap_free( path ); + return ret; +} + + +/*********************************************************************** * IoGetDeviceInterfaces (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoGetDeviceInterfaces( const GUID *InterfaceClassGuid, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 662445a..71ac860 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -449,7 +449,7 @@ @ stub IoRequestDeviceEject @ stub IoReuseIrp @ stub IoSetCompletionRoutineEx -@ stub IoSetDeviceInterfaceState +@ stdcall IoSetDeviceInterfaceState(ptr long) @ stub IoSetDeviceToVerify @ stub IoSetFileOrigin @ stub IoSetHardErrorOrVerifyDevice diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5abe18b..39734de 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1405,6 +1405,7 @@ void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); void WINAPI IoReleaseCancelSpinLock(KIRQL); +NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING *name, BOOLEAN enable); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void); -- 2.7.4

2 9

[PATCH 1/7] ntoskrnl.exe: Implement IoSetDeviceInterfaceState().
by Zebediah Figura Aug. 17, 2018

Aug. 17, 2018

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 69 ++++++++++++++++++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 80e9b9e..f92dd58 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -43,7 +43,7 @@ #include "wine/unicode.h" #include "wine/server.h" #include "wine/debug.h" - +#include "wine/heap.h" #include "wine/rbtree.h" WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); @@ -1193,6 +1193,73 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) /*********************************************************************** + * IoSetDeviceInterfaceState (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable ) +{ + const WCHAR DeviceClassesW[] = {'\\','R','E','G','I','S','T','R','Y','\\', + 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'D','e','v','i','c','e','C','l','a','s','s','e','s','\\',0}; + const WCHAR controlW[] = {'C','o','n','t','r','o','l',0}; + const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; + const WCHAR slashW[] = {'\\',0}; + const WCHAR hashW[] = {'#',0}; + + size_t namelen = name->Length / sizeof(WCHAR); + HANDLE iface_key, control_key; + OBJECT_ATTRIBUTES attr = {0}; + WCHAR *path, *refstr, *p; + UNICODE_STRING string; + NTSTATUS ret; + size_t len; + + TRACE("(%s, %d)\n", debugstr_us(name), enable); + + refstr = memrchrW(name->Buffer + 4, '\\', namelen - 4); + + len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2; + + if (!(path = heap_alloc( len * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + + strcpyW( path, DeviceClassesW ); + lstrcpynW( path + strlenW( path ), (refstr ? refstr : name->Buffer + namelen) - 38, 39 ); + strcatW( path, slashW ); + p = path + strlenW( path ); + lstrcpynW( path + strlenW( path ), name->Buffer, (refstr ? (refstr - name->Buffer) : namelen) + 1 ); + p[0] = p[1] = p[3] = '#'; + strcatW( path, slashW ); + strcatW( path, hashW ); + if (refstr) + lstrcpynW( path + strlenW( path ), refstr, name->Buffer + namelen - refstr + 1 ); + + attr.Length = sizeof(attr); + attr.ObjectName = &string; + RtlInitUnicodeString( &string, path ); + ret = NtOpenKey( &iface_key, KEY_CREATE_SUB_KEY, &attr ); + if (!ret) + { + attr.RootDirectory = iface_key; + RtlInitUnicodeString( &string, controlW ); + ret = NtCreateKey( &control_key, KEY_SET_VALUE, &attr, 0, NULL, 0, NULL ); + if (!ret) + { + DWORD data = enable; + RtlInitUnicodeString( &string, linkedW ); + ret = NtSetValueKey( control_key, &string, 0, REG_DWORD, &data, sizeof(data) ); + NtClose( control_key ); + } + NtClose( iface_key ); + } + + heap_free( path ); + return ret; +} + + +/*********************************************************************** * IoGetDeviceInterfaces (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoGetDeviceInterfaces( const GUID *InterfaceClassGuid, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 662445a..71ac860 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -449,7 +449,7 @@ @ stub IoRequestDeviceEject @ stub IoReuseIrp @ stub IoSetCompletionRoutineEx -@ stub IoSetDeviceInterfaceState +@ stdcall IoSetDeviceInterfaceState(ptr long) @ stub IoSetDeviceToVerify @ stub IoSetFileOrigin @ stub IoSetHardErrorOrVerifyDevice diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5abe18b..39734de 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1405,6 +1405,7 @@ void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); void WINAPI IoReleaseCancelSpinLock(KIRQL); +NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING *name, BOOLEAN enable); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void); -- 2.7.4

3 10

[PATCH] winedbg: Restart as 64-bit before launching the child process.
by Zebediah Figura Aug. 17, 2018

Aug. 17, 2018

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/winedbg/winedbg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 0e45186..504138b 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -749,7 +749,10 @@ int main(int argc, char** argv) if (!argc) ds = start_ok; else if ((ds = dbg_active_attach(argc, argv)) == start_error_parse && (ds = minidump_reload(argc, argv)) == start_error_parse) + { + restart_if_wow64(); ds = dbg_active_launch(argc, argv); + } switch (ds) { case start_ok: break; @@ -757,8 +760,6 @@ int main(int argc, char** argv) case start_error_init: return -1; } - restart_if_wow64(); - dbg_start_interactive(hFile); return 0; -- 2.7.4

1 0

[PATCH 08/10] dinput/tests: Add DIK code tests for symbols and punctuations.
by Akihiro Sagawa Aug. 17, 2018

Aug. 17, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dinput/tests/keyboard.c | 50 ++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 13 deletions(-)

2 1

[PATCH 03/10] dinput/tests: Use GET_DIDEVICE_SUBTYPE macro in keyboard type tests.
by Akihiro Sagawa Aug. 17, 2018

Aug. 17, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dinput/tests/keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 4/4 v3] msvcrt/tests: Add tests for _strnicoll/_wcsnicoll.
by Piotr Caban Aug. 17, 2018

Aug. 17, 2018

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+)

1 0

[PATCH 3/4 v3] msvcrt: Don't read past end of string in _strnicoll/_wcsnicoll.
by Piotr Caban Aug. 17, 2018

Aug. 17, 2018

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 3 ++- dlls/msvcrt/wcs.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)

1 0

[PATCH 2/4 v3] msvcrt/tests: Add tests for _strncoll/_wcsncoll.
by Piotr Caban Aug. 17, 2018

Aug. 17, 2018

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+)

1 0

[PATCH 1/4 v3] msvcrt: Don't read past end of string in _strncoll/_wcsncoll.
by Piotr Caban Aug. 17, 2018

Aug. 17, 2018

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v3: - reorder patches to avoid invalid memory reads on wine - change tests skipping on setlocale failure - use MSVCRT_strnlen instead of strnlen - use MSVCRT_wcsnlen instead of adding strnlenW implementation dlls/msvcrt/string.c | 4 +++- dlls/msvcrt/wcs.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0