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

Hans Leidekker : bcrypt: Call key_destroy() instead of BCryptDestroyKey().
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 9176251af425ba494c0334c5659aa47941ee7c85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9176251af425ba494c0334c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 21 09:50:07 2022 +0100 bcrypt: Call key_destroy() instead of BCryptDestroyKey(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fe16f9269c9..ab9cf67923d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1324,6 +1324,22 @@ static NTSTATUS key_symmetric_decrypt( struct key *key, UCHAR *input, ULONG inpu return status; } +static void key_destroy( struct key *key ) +{ + if (key_is_symmetric( key )) + { + UNIX_CALL( key_symmetric_destroy, key ); + free( key->u.s.vector ); + free( key->u.s.secret ); + DeleteCriticalSection( &key->u.s.cs ); + } + else + UNIX_CALL( key_asymmetric_destroy, key ); + + key->hdr.magic = 0; + free( key ); +} + static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, ULONG input_len ) { @@ -1403,7 +1419,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP params.len = input_len; if ((status = UNIX_CALL( key_import_ecc, &params ))) { - BCryptDestroyKey( key ); + key_destroy( key ); return status; } @@ -1438,7 +1454,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP params.len = input_len; if ((status = UNIX_CALL( key_import_rsa, &params ))) { - BCryptDestroyKey( key ); + key_destroy( key ); return status; } @@ -1489,7 +1505,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP params.len = input_len; if ((status = UNIX_CALL( key_import_dsa_capi, &params ))) { - BCryptDestroyKey( key ); + key_destroy( key ); return status; } @@ -1724,24 +1740,6 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) return STATUS_SUCCESS; } -static void key_destroy( struct key *key ) -{ - if (key_is_symmetric( key )) - { - UNIX_CALL( key_symmetric_destroy, key ); - free( key->u.s.vector ); - free( key->u.s.secret ); - DeleteCriticalSection( &key->u.s.cs ); - } - else - { - UNIX_CALL( key_asymmetric_destroy, key ); - free( key->u.a.pubkey ); - } - key->hdr.magic = 0; - free( key ); -} - NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE *handle_copy, UCHAR *object, ULONG object_len, ULONG flags ) {

1 0

Hans Leidekker : bcrypt: Stop passing a dummy public key to gnutls_privkey_import_dsa_raw().
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 777cbf06d2e8db298313982b7823acbc40dc05db URL: https://source.winehq.org/git/wine.git/?a=commit;h=777cbf06d2e8db298313982b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 21 09:50:11 2022 +0100 bcrypt: Stop passing a dummy public key to gnutls_privkey_import_dsa_raw(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 6a55c84efef..884f4b1d37e 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1145,8 +1145,7 @@ static NTSTATUS key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len ) BLOBHEADER *hdr = (BLOBHEADER *)buf; DSSPUBKEY *pubkey; gnutls_privkey_t handle; - gnutls_datum_t p, q, g, y, x; - unsigned char dummy[128]; + gnutls_datum_t p, q, g, x; unsigned char *data, p_data[128], q_data[20], g_data[128], x_data[20]; int i, ret, size; @@ -1185,12 +1184,7 @@ static NTSTATUS key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len ) for (i = 0; i < x.size; i++) x.data[i] = data[x.size - i - 1]; data += x.size; - WARN( "using dummy public key\n" ); - memset( dummy, 1, sizeof(dummy) ); - y.data = dummy; - y.size = min( p.size, sizeof(dummy) ); - - if ((ret = pgnutls_privkey_import_dsa_raw( handle, &p, &q, &g, &y, &x ))) + if ((ret = pgnutls_privkey_import_dsa_raw( handle, &p, &q, &g, NULL, &x ))) { pgnutls_perror( ret ); pgnutls_privkey_deinit( handle );

1 0

Eric Pouech : winedbg: Get rid of dbg_W2A helper.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 9fa624583e07d1427579640ff09f813ce2129add URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fa624583e07d1427579640f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 17:25:36 2022 +0100 winedbg: Get rid of dbg_W2A helper. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 1 - programs/winedbg/gdbproxy.c | 8 ++++---- programs/winedbg/stack.c | 5 ++--- programs/winedbg/tgt_active.c | 4 ++-- programs/winedbg/tgt_minidump.c | 4 ++-- programs/winedbg/winedbg.c | 22 ---------------------- 6 files changed, 10 insertions(+), 34 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index b7dcde201d8..1ae2dce4689 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -501,7 +501,6 @@ extern BOOL types_is_integral_type(const struct dbg_lvalue*); extern BOOL types_is_float_type(const struct dbg_lvalue*); /* winedbg.c */ -extern const char* dbg_W2A(const WCHAR* buffer, unsigned len); #ifdef __GNUC__ extern int WINAPIV dbg_printf(const char* format, ...) __attribute__((format (printf,1,2))); #else diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 0268a288481..a63748c6ebe 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -538,9 +538,9 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load QueryFullProcessImageNameW( gdbctx->process->handle, 0, u.buffer, &size ); dbg_set_process_name(gdbctx->process, u.buffer); - fprintf(stderr, "%04lx:%04lx: create process '%s'/%p @%p (%lu<%lu>)\n", + fprintf(stderr, "%04lx:%04lx: create process '%ls'/%p @%p (%lu<%lu>)\n", de->dwProcessId, de->dwThreadId, - dbg_W2A(u.buffer, -1), + u.buffer, de->u.CreateProcessInfo.lpImageName, de->u.CreateProcessInfo.lpStartAddress, de->u.CreateProcessInfo.dwDebugInfoFileOffset, @@ -564,9 +564,9 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load case LOAD_DLL_DEBUG_EVENT: fetch_module_name( de->u.LoadDll.lpImageName, de->u.LoadDll.lpBaseOfDll, u.buffer, ARRAY_SIZE(u.buffer) ); - fprintf(stderr, "%04lx:%04lx: loads DLL %s @%p (%lu<%lu>)\n", + fprintf(stderr, "%04lx:%04lx: loads DLL %ls @%p (%lu<%lu>)\n", de->dwProcessId, de->dwThreadId, - dbg_W2A(u.buffer, -1), + u.buffer, de->u.LoadDll.lpBaseOfDll, de->u.LoadDll.dwDebugInfoFileOffset, de->u.LoadDll.nDebugInfoSize); diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 5d3504f1057..294694cf85c 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -407,9 +407,8 @@ static void backtrace_all(void) dbg_active_wait_for_first_exception(); } - dbg_printf("\nBacktracing for thread %04lx in process %04lx (%s):\n", - entry.th32ThreadID, dbg_curr_pid, - dbg_W2A(dbg_curr_process->imageName, -1)); + dbg_printf("\nBacktracing for thread %04lx in process %04lx (%ls):\n", + entry.th32ThreadID, dbg_curr_pid, dbg_curr_process->imageName); backtrace_tid(dbg_curr_process, entry.th32ThreadID); } while (Thread32Next(snapshot, &entry)); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 2caa62206d6..c17a6f38290 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -484,8 +484,8 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) break_set_xpoints(TRUE); if (DBG_IVAR(BreakOnDllLoad)) { - dbg_printf("Stopping on DLL %s loading at %p\n", - dbg_W2A(u.buffer, -1), de->u.LoadDll.lpBaseOfDll); + dbg_printf("Stopping on DLL %ls loading at %p\n", + u.buffer, de->u.LoadDll.lpBaseOfDll); if (dbg_fetch_context()) cont = 0; } break; diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 6a947cbc2db..5fa615bcd45 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -307,8 +307,8 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) str = "???"; break; } - dbg_printf(" %s was running on #%d %s CPU%s", - dbg_W2A(exec_name, -1), msi->u.s.NumberOfProcessors, str, + dbg_printf(" %ls was running on #%d %s CPU%s", + exec_name, msi->u.s.NumberOfProcessors, str, msi->u.s.NumberOfProcessors < 2 ? "" : "s"); switch (msi->MajorVersion) { diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index dc6355be4cd..d11b68ec432 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -113,28 +113,6 @@ static void dbg_outputA(const char* buffer, int len) } } -const char* dbg_W2A(const WCHAR* buffer, unsigned len) -{ - static unsigned ansilen; - static char* ansi; - unsigned newlen; - - newlen = WideCharToMultiByte(CP_ACP, 0, buffer, len, NULL, 0, NULL, NULL); - if (newlen > ansilen) - { - static char* newansi; - if (ansi) - newansi = HeapReAlloc(GetProcessHeap(), 0, ansi, newlen); - else - newansi = HeapAlloc(GetProcessHeap(), 0, newlen); - if (!newansi) return NULL; - ansilen = newlen; - ansi = newansi; - } - WideCharToMultiByte(CP_ACP, 0, buffer, len, ansi, newlen, NULL, NULL); - return ansi; -} - int WINAPIV dbg_printf(const char* format, ...) { static char buf[4*1024];

1 0

Jinoh Kang : riched20: Set REOBJECT's cp correctly in IRichEditOle::GetObject.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 194ba06c403fd72fbfb95048385c9ca4838af169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=194ba06c403fd72fbfb95048… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 21 04:38:42 2022 +0900 riched20: Set REOBJECT's cp correctly in IRichEditOle::GetObject. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52705 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 1 + dlls/riched20/tests/richole.c | 41 +++++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 74a25a96830..a23f4c82730 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1320,6 +1320,7 @@ IRichEditOle_fnGetObject(IRichEditOle *iface, LONG iob, } } ME_CopyReObject(lpreobject, &reobj->obj, dwFlags); + lpreobject->cp = run_char_ofs( reobj->run, 0 ); return S_OK; } diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 08c1ce8ced4..24284a24484 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3214,9 +3214,9 @@ static void fill_reobject_struct(REOBJECT *reobj, LONG cp, LPOLEOBJECT poleobj, reobj->dwUser = user; } -#define CHECK_REOBJECT_STRUCT(reole,index,flags,cp,poleobj,pstg,polesite,user) \ - _check_reobject_struct(reole, index, flags, cp, poleobj, pstg, polesite, user, __LINE__) -static void _check_reobject_struct(IRichEditOle *reole, LONG index, DWORD flags, LONG cp, +#define CHECK_REOBJECT_STRUCT(reole,index,flags,cp,cp_check,poleobj,pstg,polesite,user) \ + _check_reobject_struct(reole, index, flags, cp, cp_check, poleobj, pstg, polesite, user, __LINE__) +static void _check_reobject_struct(IRichEditOle *reole, LONG index, DWORD flags, LONG cp, LONG cp_check, LPOLEOBJECT poleobj, LPSTORAGE pstg, LPOLECLIENTSITE polesite, DWORD user, int line) { REOBJECT reobj; @@ -3226,6 +3226,7 @@ static void _check_reobject_struct(IRichEditOle *reole, LONG index, DWORD flags, reobj.cp = cp; hr = IRichEditOle_GetObject(reole, index, &reobj, flags); ok(hr == S_OK, "IRichEditOle_GetObject failed: %#lx.\n", hr); + ok_(__FILE__,line)(reobj.cp == cp_check, "expected cp = %ld, got %ld.\n", cp_check, reobj.cp); ok_(__FILE__,line)(reobj.poleobj == poleobj, "got wrong object interface.\n"); ok_(__FILE__,line)(reobj.pstg == pstg, "got wrong storage interface.\n"); ok_(__FILE__,line)(reobj.polesite == polesite, "got wrong site interface.\n"); @@ -3294,9 +3295,9 @@ static void test_InsertObject(void) ok(count == 3, "got wrong object count: %ld\n", count); /* tests below show that order of rebject (from 0 to 2) is: reo1,reo3,reo2 */ - CHECK_REOBJECT_STRUCT(reole, 0, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1); - CHECK_REOBJECT_STRUCT(reole, 1, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo3.polesite, 3); - CHECK_REOBJECT_STRUCT(reole, 2, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo2.polesite, 2); + CHECK_REOBJECT_STRUCT(reole, 0, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); + CHECK_REOBJECT_STRUCT(reole, 1, REO_GETOBJ_ALL_INTERFACES, 0, 1, NULL, NULL, reo3.polesite, 3); + CHECK_REOBJECT_STRUCT(reole, 2, REO_GETOBJ_ALL_INTERFACES, 0, 2, NULL, NULL, reo2.polesite, 2); hr = IRichEditOle_GetObject(reole, 2, NULL, REO_GETOBJ_ALL_INTERFACES); ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08lx\n", hr); @@ -3305,8 +3306,8 @@ static void test_InsertObject(void) hr = IRichEditOle_GetObject(reole, 2, &received_reo, REO_GETOBJ_ALL_INTERFACES); ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08lx\n", hr); - CHECK_REOBJECT_STRUCT(reole, 2, REO_GETOBJ_PSTG, 0, NULL, NULL, NULL, 2); - CHECK_REOBJECT_STRUCT(reole, 2, REO_GETOBJ_POLESITE, 0, NULL, NULL, reo2.polesite, 2); + CHECK_REOBJECT_STRUCT(reole, 2, REO_GETOBJ_PSTG, 0, 2, NULL, NULL, NULL, 2); + CHECK_REOBJECT_STRUCT(reole, 2, REO_GETOBJ_POLESITE, 0, 2, NULL, NULL, reo2.polesite, 2); hr = IRichEditOle_GetObject(reole, 3, &received_reo, REO_GETOBJ_POLESITE); ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08lx\n", hr); @@ -3327,9 +3328,9 @@ static void test_InsertObject(void) ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08lx\n", hr); ok(received_reo.polesite == NULL, "Got wrong site interface.\n"); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo3.polesite, 3); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 2, NULL, NULL, reo2.polesite, 2); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 1, 1, NULL, NULL, reo3.polesite, 3); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 2, 2, NULL, NULL, reo2.polesite, 2); received_reo.cbStruct = sizeof(received_reo); received_reo.polesite = (IOleClientSite *)0xdeadbeef; @@ -3341,25 +3342,25 @@ static void test_InsertObject(void) ok(received_reo.dwUser == 4, "Got wrong user-defined value: %ld.\n", received_reo.dwUser); SendMessageA(hwnd, EM_SETSEL, 0, 1); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); SendMessageA(hwnd, EM_SETSEL, 1, 2); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo3.polesite, 3); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, 1, NULL, NULL, reo3.polesite, 3); SendMessageA(hwnd, EM_SETSEL, 2, 3); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo2.polesite, 2); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, 2, NULL, NULL, reo2.polesite, 2); SendMessageA(hwnd, EM_SETSEL, 0, 2); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); SendMessageA(hwnd, EM_SETSEL, 1, 3); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo3.polesite, 3); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, 1, NULL, NULL, reo3.polesite, 3); SendMessageA(hwnd, EM_SETSEL, 2, 0); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); SendMessageA(hwnd, EM_SETSEL, 0, 6); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); SendMessageA(hwnd, EM_SETSEL, 4, 5); received_reo.cbStruct = sizeof(received_reo); @@ -3380,14 +3381,14 @@ static void test_InsertObject(void) SendMessageW(hwnd, EM_SETSEL, 3, 4); result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); ok(result == SEL_OBJECT, "Got selection type: %lx.\n", result); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo1.polesite, 1); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, 3, NULL, NULL, reo1.polesite, 1); SendMessageW(hwnd, EM_SETSEL, 2, 4); result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); ok(result == (SEL_TEXT | SEL_OBJECT), "Got selection type: %lx.\n", result); SendMessageW(hwnd, EM_SETSEL, 5, 6); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo2.polesite, 2); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, 5, NULL, NULL, reo2.polesite, 2); expected_string = L"abc\xfffc""d\xfffc""efg"; gettextex.cb = sizeof(buffer);

1 0

Rémi Bernon : dinput/tests: Add more debug traces to the HID driver.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 4c336655c9f6c8690807192b1a5ea83a6e36bdef URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c336655c9f6c8690807192b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 21 09:54:11 2022 +0100 dinput/tests: Add more debug traces to the HID driver. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/driver_hid.c | 27 +++++++++++---- dlls/dinput/tests/driver_hid.h | 75 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/tests/driver_hid.c b/dlls/dinput/tests/driver_hid.c index 99aa9bd688c..e4101853833 100644 --- a/dlls/dinput/tests/driver_hid.c +++ b/dlls/dinput/tests/driver_hid.c @@ -411,11 +411,12 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); HID_DEVICE_EXTENSION *ext = device->DeviceExtension; struct hid_device *impl = ext->MiniDeviceExtension; + ULONG code = stack->MinorFunction; KIRQL irql; - if (winetest_debug > 1) trace( "pnp %#x\n", stack->MinorFunction ); + if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_pnp(code) ); - switch (stack->MinorFunction) + switch (code) { case IRP_MN_START_DEVICE: ++got_start_device; @@ -502,7 +503,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) KIRQL irql; LONG index; - if (winetest_debug > 1) trace( "ioctl %#lx\n", code ); + if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_ioctl(code) ); ok( got_start_device, "expected IRP_MN_START_DEVICE before any ioctls\n" ); @@ -725,6 +726,8 @@ static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; KIRQL irql; + if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_ioctl(code) ); + switch (code) { case IOCTL_WINETEST_HID_SET_EXPECT: @@ -752,27 +755,32 @@ static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) return hidclass_driver_ioctl( device, irp ); } -static NTSTATUS WINAPI driver_add_device( DRIVER_OBJECT *driver, DEVICE_OBJECT *fdo ) +static NTSTATUS WINAPI driver_add_device( DRIVER_OBJECT *driver, DEVICE_OBJECT *device ) { - HID_DEVICE_EXTENSION *ext = fdo->DeviceExtension; + HID_DEVICE_EXTENSION *ext = device->DeviceExtension; NTSTATUS ret; + if (winetest_debug > 1) trace( "%s: driver %p, device %p\n", __func__, driver, device ); + /* We should be given the FDO, not the PDO. */ ok( !!ext->PhysicalDeviceObject, "expected non-NULL pdo\n" ); ok( ext->NextDeviceObject == ext->PhysicalDeviceObject, "got pdo %p, next %p\n", ext->PhysicalDeviceObject, ext->NextDeviceObject ); todo_wine - ok( ext->NextDeviceObject->AttachedDevice == fdo, "wrong attached device\n" ); + ok( ext->NextDeviceObject->AttachedDevice == device, "wrong attached device\n" ); ret = IoRegisterDeviceInterface( ext->PhysicalDeviceObject, &control_class, NULL, &control_symlink ); ok( !ret, "got %#lx\n", ret ); - fdo->Flags &= ~DO_DEVICE_INITIALIZING; + if (winetest_debug > 1) trace( "Created HID FDO %p for Bus PDO %p\n", device, ext->PhysicalDeviceObject ); + + device->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; } static NTSTATUS WINAPI driver_create( DEVICE_OBJECT *device, IRP *irp ) { + if (winetest_debug > 1) trace( "%s: device %p\n", __func__, device ); ok( 0, "unexpected call\n" ); irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest( irp, IO_NO_INCREMENT ); @@ -781,6 +789,7 @@ static NTSTATUS WINAPI driver_create( DEVICE_OBJECT *device, IRP *irp ) static NTSTATUS WINAPI driver_close( DEVICE_OBJECT *device, IRP *irp ) { + if (winetest_debug > 1) trace( "%s: device %p\n", __func__, device ); ok( 0, "unexpected call\n" ); irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest( irp, IO_NO_INCREMENT ); @@ -789,6 +798,7 @@ static NTSTATUS WINAPI driver_close( DEVICE_OBJECT *device, IRP *irp ) static void WINAPI driver_unload( DRIVER_OBJECT *driver ) { + if (winetest_debug > 1) trace( "%s: driver %p\n", __func__, driver ); input_queue_cleanup( &input_queue ); expect_queue_cleanup( &expect_queue ); winetest_cleanup(); @@ -812,6 +822,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) DWORD size; if ((ret = winetest_init())) return ret; + if (winetest_debug > 1) trace( "%s: driver %p\n", __func__, driver ); InitializeObjectAttributes( &attr, registry, 0, NULL, NULL ); ret = ZwOpenKey( &hkey, KEY_ALL_ACCESS, &attr ); @@ -833,6 +844,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) ok( !ret, "ZwQueryValueKey returned %#lx\n", ret ); memcpy( &polled, buffer + info_size, size - info_size ); params.DevicesArePolled = polled; + /* polled mode calls this in a state where printing anything locks the system up */ + if (polled) winetest_debug = 0; RtlInitUnicodeString( &name_str, L"Descriptor" ); size = info_size + sizeof(report_descriptor_buf); diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h index 089d12b70fc..80073a6ae3f 100644 --- a/dlls/dinput/tests/driver_hid.h +++ b/dlls/dinput/tests/driver_hid.h @@ -31,9 +31,11 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winioctl.h" #include "winternl.h" #include "ddk/wdm.h" +#include "ddk/hidclass.h" DEFINE_GUID(control_class,0xdeadbeef,0x29ef,0x4538,0xa5,0xfd,0xb6,0x95,0x73,0xa3,0x62,0xc0); @@ -65,6 +67,79 @@ struct winetest_shared_data LONG todo_failures; }; +static inline const char *debugstr_pnp( ULONG code ) +{ + switch (code) + { + case IRP_MN_START_DEVICE: return "IRP_MN_START_DEVICE"; + case IRP_MN_QUERY_REMOVE_DEVICE: return "IRP_MN_QUERY_REMOVE_DEVICE"; + case IRP_MN_REMOVE_DEVICE: return "IRP_MN_REMOVE_DEVICE"; + case IRP_MN_CANCEL_REMOVE_DEVICE: return "IRP_MN_CANCEL_REMOVE_DEVICE"; + case IRP_MN_STOP_DEVICE: return "IRP_MN_STOP_DEVICE"; + case IRP_MN_QUERY_STOP_DEVICE: return "IRP_MN_QUERY_STOP_DEVICE"; + case IRP_MN_CANCEL_STOP_DEVICE: return "IRP_MN_CANCEL_STOP_DEVICE"; + case IRP_MN_QUERY_DEVICE_RELATIONS: return "IRP_MN_QUERY_DEVICE_RELATIONS"; + case IRP_MN_QUERY_INTERFACE: return "IRP_MN_QUERY_INTERFACE"; + case IRP_MN_QUERY_CAPABILITIES: return "IRP_MN_QUERY_CAPABILITIES"; + case IRP_MN_QUERY_RESOURCES: return "IRP_MN_QUERY_RESOURCES"; + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: return "IRP_MN_QUERY_RESOURCE_REQUIREMENTS"; + case IRP_MN_QUERY_DEVICE_TEXT: return "IRP_MN_QUERY_DEVICE_TEXT"; + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: return "IRP_MN_FILTER_RESOURCE_REQUIREMENTS"; + case IRP_MN_READ_CONFIG: return "IRP_MN_READ_CONFIG"; + case IRP_MN_WRITE_CONFIG: return "IRP_MN_WRITE_CONFIG"; + case IRP_MN_EJECT: return "IRP_MN_EJECT"; + case IRP_MN_SET_LOCK: return "IRP_MN_SET_LOCK"; + case IRP_MN_QUERY_ID: return "IRP_MN_QUERY_ID"; + case IRP_MN_QUERY_PNP_DEVICE_STATE: return "IRP_MN_QUERY_PNP_DEVICE_STATE"; + case IRP_MN_QUERY_BUS_INFORMATION: return "IRP_MN_QUERY_BUS_INFORMATION"; + case IRP_MN_DEVICE_USAGE_NOTIFICATION: return "IRP_MN_DEVICE_USAGE_NOTIFICATION"; + case IRP_MN_SURPRISE_REMOVAL: return "IRP_MN_SURPRISE_REMOVAL"; + case IRP_MN_QUERY_LEGACY_BUS_INFORMATION: return "IRP_MN_QUERY_LEGACY_BUS_INFORMATION"; + default: return "unknown"; + } +} + +static inline const char *debugstr_ioctl( ULONG code ) +{ + switch (code) + { + case HID_CTL_CODE(0): return "IOCTL_HID_GET_DEVICE_DESCRIPTOR"; + case HID_CTL_CODE(1): return "IOCTL_HID_GET_REPORT_DESCRIPTOR"; + case HID_CTL_CODE(2): return "IOCTL_HID_READ_REPORT"; + case HID_CTL_CODE(3): return "IOCTL_HID_WRITE_REPORT"; + case HID_CTL_CODE(4): return "IOCTL_HID_GET_STRING"; + case HID_CTL_CODE(7): return "IOCTL_HID_ACTIVATE_DEVICE"; + case HID_CTL_CODE(8): return "IOCTL_HID_DEACTIVATE_DEVICE"; + case HID_CTL_CODE(9): return "IOCTL_HID_GET_DEVICE_ATTRIBUTES"; + case HID_CTL_CODE(10): return "IOCTL_HID_SEND_IDLE_NOTIFICATION_REQUEST"; + case HID_OUT_CTL_CODE(102): return "IOCTL_GET_PHYSICAL_DESCRIPTOR"; + case HID_CTL_CODE(101): return "IOCTL_HID_FLUSH_QUEUE"; + case HID_CTL_CODE(100): return "IOCTL_HID_GET_COLLECTION_DESCRIPTOR"; + case HID_BUFFER_CTL_CODE(106): return "IOCTL_HID_GET_COLLECTION_INFORMATION"; + case HID_OUT_CTL_CODE(100): return "IOCTL_HID_GET_FEATURE"; + case HID_OUT_CTL_CODE(103): return "IOCTL_HID_GET_HARDWARE_ID"; + case HID_OUT_CTL_CODE(120): return "IOCTL_HID_GET_INDEXED_STRING"; + case HID_OUT_CTL_CODE(104): return "IOCTL_HID_GET_INPUT_REPORT"; + case HID_OUT_CTL_CODE(110): return "IOCTL_HID_GET_MANUFACTURER_STRING"; + case HID_BUFFER_CTL_CODE(104): return "IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS"; + case HID_BUFFER_CTL_CODE(102): return "IOCTL_HID_GET_POLL_FREQUENCY_MSEC"; + case HID_OUT_CTL_CODE(111): return "IOCTL_HID_GET_PRODUCT_STRING"; + case HID_OUT_CTL_CODE(112): return "IOCTL_HID_GET_SERIALNUMBER_STRING"; + case HID_IN_CTL_CODE(100): return "IOCTL_HID_SET_FEATURE"; + case HID_BUFFER_CTL_CODE(105): return "IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS"; + case HID_IN_CTL_CODE(101): return "IOCTL_HID_SET_OUTPUT_REPORT"; + case HID_BUFFER_CTL_CODE(103): return "IOCTL_HID_SET_POLL_FREQUENCY_MSEC"; + case HID_BUFFER_CTL_CODE(100): return "IOCTL_HID_GET_DRIVER_CONFIG"; + case HID_BUFFER_CTL_CODE(101): return "IOCTL_HID_SET_DRIVER_CONFIG"; + case HID_OUT_CTL_CODE(121): return "IOCTL_HID_GET_MS_GENRE_DESCRIPTOR"; + case IOCTL_WINETEST_HID_SET_EXPECT: return "IOCTL_WINETEST_HID_SET_EXPECT"; + case IOCTL_WINETEST_HID_WAIT_EXPECT: return "IOCTL_WINETEST_HID_WAIT_EXPECT"; + case IOCTL_WINETEST_HID_SEND_INPUT: return "IOCTL_WINETEST_HID_SEND_INPUT"; + case IOCTL_WINETEST_HID_SET_CONTEXT: return "IOCTL_WINETEST_HID_SET_CONTEXT"; + default: return "unknown"; + } +} + #ifndef __WINE_WINE_TEST_H #if !defined( __WINE_USE_MSVCRT ) || defined( __MINGW32__ )

1 0

Rémi Bernon : dinput/tests: Rename HID driver identifiers and files.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: f6d2495c508108177770a1d34813bd4d504505de URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6d2495c508108177770a1d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 21 09:54:12 2022 +0100 dinput/tests: Rename HID driver identifiers and files. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 8 ++--- dlls/dinput/tests/dinput_test.h | 4 +-- dlls/dinput/tests/{driver_hid.c => driver.c} | 0 dlls/dinput/tests/{driver_hid.spec => driver.spec} | 0 dlls/dinput/tests/force_feedback.c | 4 +-- dlls/dinput/tests/hid.c | 38 ++++++++++++++-------- dlls/dinput/tests/hotplug.c | 4 +-- dlls/dinput/tests/joystick8.c | 10 +++--- 8 files changed, 40 insertions(+), 28 deletions(-) diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index 5ba0e5be4d7..c1b887f8dcb 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -1,15 +1,15 @@ TESTDLL = dinput.dll IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm -driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass -driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver_IMPORTS = winecrt0 ntoskrnl hal hidclass +driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ device.c \ device8.c \ dinput.c \ - driver_hid.c \ - driver_hid.spec \ + driver.c \ + driver.spec \ force_feedback.c \ hid.c \ hotplug.c \ diff --git a/dlls/dinput/tests/dinput_test.h b/dlls/dinput/tests/dinput_test.h index 97eed949a36..c0027c07094 100644 --- a/dlls/dinput/tests/dinput_test.h +++ b/dlls/dinput/tests/dinput_test.h @@ -52,8 +52,8 @@ extern const WCHAR expect_path_end[]; extern HINSTANCE instance; extern BOOL localized; /* object names get translated */ -BOOL pnp_driver_start( const WCHAR *resource ); -void pnp_driver_stop(void); +BOOL hid_device_start(void); +void hid_device_stop(void); void cleanup_registry_keys(void); diff --git a/dlls/dinput/tests/driver_hid.c b/dlls/dinput/tests/driver.c similarity index 100% rename from dlls/dinput/tests/driver_hid.c rename to dlls/dinput/tests/driver.c diff --git a/dlls/dinput/tests/driver_hid.spec b/dlls/dinput/tests/driver.spec similarity index 100% rename from dlls/dinput/tests/driver_hid.spec rename to dlls/dinput/tests/driver.spec diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index ce460147f9d..ca3f6293304 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -2999,7 +2999,7 @@ static BOOL test_force_feedback_joystick( DWORD version ) CloseHandle( file ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); winetest_pop_context(); @@ -4317,7 +4317,7 @@ static void test_device_managed_effect(void) CloseHandle( file ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); winetest_pop_context(); diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 83635146324..b5683b18850 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -415,8 +415,9 @@ static void unload_driver( SC_HANDLE service ) CloseServiceHandle( service ); } -void pnp_driver_stop(void) +static void pnp_driver_stop(void) { + const WCHAR *service_name = L"winetest"; SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; WCHAR path[MAX_PATH], dest[MAX_PATH], *filepart; SC_HANDLE manager, service; @@ -453,7 +454,7 @@ void pnp_driver_stop(void) manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ); ok( !!manager, "failed to open service manager, error %lu\n", GetLastError() ); - service = OpenServiceW( manager, L"winetest", SERVICE_STOP | DELETE ); + service = OpenServiceW( manager, service_name, SERVICE_STOP | DELETE ); if (service) unload_driver( service ); else ok( GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "got error %lu\n", GetLastError() ); @@ -488,11 +489,12 @@ void pnp_driver_stop(void) ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %lu\n", GetLastError() ); } -BOOL pnp_driver_start( const WCHAR *resource ) +static BOOL pnp_driver_start(void) { static const WCHAR hardware_id[] = L"test_hardware_id\0"; SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; WCHAR path[MAX_PATH], filename[MAX_PATH]; + const WCHAR *service_name = L"winetest"; SC_HANDLE manager, service; const CERT_CONTEXT *cert; int old_mute_threshold; @@ -504,7 +506,7 @@ BOOL pnp_driver_start( const WCHAR *resource ) old_mute_threshold = winetest_mute_threshold; winetest_mute_threshold = 1; - load_resource( resource, filename ); + load_resource( L"driver.dll", filename ); ret = MoveFileExW( filename, L"winetest.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING ); ok( ret, "failed to move file, error %lu\n", GetLastError() ); @@ -570,7 +572,7 @@ BOOL pnp_driver_start( const WCHAR *resource ) manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ); ok( !!manager, "failed to open service manager, error %lu\n", GetLastError() ); - service = OpenServiceW( manager, L"winetest", SERVICE_START ); + service = OpenServiceW( manager, service_name, SERVICE_START ); ok( !!service, "failed to open service, error %lu\n", GetLastError() ); ret = StartServiceW( service, 0, NULL ); @@ -590,6 +592,16 @@ BOOL pnp_driver_start( const WCHAR *resource ) return ret || GetLastError() == ERROR_SERVICE_ALREADY_RUNNING; } +void hid_device_stop(void) +{ + pnp_driver_stop(); +} + +BOOL hid_device_start(void) +{ + return pnp_driver_start(); +} + #define check_hidp_caps( a, b ) check_hidp_caps_( __LINE__, a, b ) static inline void check_hidp_caps_( int line, HIDP_CAPS *caps, const HIDP_CAPS *exp ) { @@ -2809,9 +2821,9 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); ok( !status, "RegSetValueExW returned %#lx\n", status ); - if (pnp_driver_start( L"driver_hid.dll" )) test_hid_device( report_id, polled, &caps ); + if (hid_device_start()) test_hid_device( report_id, polled, &caps ); + hid_device_stop(); - pnp_driver_stop(); SetCurrentDirectoryW( cwd ); } @@ -3169,7 +3181,7 @@ static void test_hidp_kdr(void) status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); ok( !status, "RegSetValueExW returned %#lx\n", status ); - if (!pnp_driver_start( L"driver_hid.dll" )) goto done; + if (!hid_device_start()) goto done; set = SetupDiGetClassDevsW( &GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); ok( set != INVALID_HANDLE_VALUE, "failed to get device list, error %#lx\n", GetLastError() ); @@ -3286,7 +3298,7 @@ static void test_hidp_kdr(void) CloseHandle( file ); done: - pnp_driver_stop(); + hid_device_stop(); SetCurrentDirectoryW( cwd ); } @@ -3360,7 +3372,7 @@ BOOL dinput_driver_start_( const char *file, int line, const BYTE *desc_buf, ULO status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); ok_(file, line)( !status, "RegSetValueExW returned %#lx\n", status ); - return pnp_driver_start( L"driver_hid.dll" ); + return hid_device_start(); } BOOL dinput_test_init_( const char *file, int line ) @@ -3395,7 +3407,7 @@ BOOL dinput_test_init_( const char *file, int line ) FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL ); ok( okfile != INVALID_HANDLE_VALUE, "failed to create file, error %lu\n", GetLastError() ); - subtest( "driver_hid" ); + subtest( "driver" ); return TRUE; } @@ -3555,9 +3567,9 @@ DWORD WINAPI dinput_test_device_thread( void *stop_event ) status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); ok( !status, "RegSetValueExW returned %#lx\n", status ); - pnp_driver_start( L"driver_hid.dll" ); + hid_device_start(); WaitForSingleObject( stop_event, INFINITE ); - pnp_driver_stop(); + hid_device_stop(); SetCurrentDirectoryW( cwd ); diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 3580964e187..e212f874be3 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -185,7 +185,7 @@ static BOOL test_input_lost( DWORD version ) ok( hr == DI_OK, "GetDeviceData returned %#lx\n", hr ); ok( count == 0, "got %lu expected 0\n", count ); - pnp_driver_stop(); + hid_device_stop(); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#lx\n", hr ); @@ -218,7 +218,7 @@ static BOOL test_input_lost( DWORD version ) ok( ref == 0, "Release returned %ld\n", ref ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index c4cfceeee3e..ca7cc9a1a32 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -2084,7 +2084,7 @@ static void test_simple_joystick( DWORD version ) CloseHandle( file ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); winetest_pop_context(); @@ -2616,7 +2616,7 @@ static BOOL test_device_types( DWORD version ) ok( ref == 0, "Release returned %ld\n", ref ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); winetest_pop_context(); @@ -2842,7 +2842,7 @@ static void test_driving_wheel_axes(void) ok( ref == 0, "Release returned %ld\n", ref ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); winetest_pop_context(); @@ -3200,7 +3200,7 @@ static BOOL test_winmm_joystick(void) CloseHandle( file ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); @@ -3395,7 +3395,7 @@ static void test_windows_gaming_input(void) IRawGameControllerStatics_Release( controller_statics ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); }

1 0

Eric Pouech : winedbg: Use Unicode APIs for process/thread enumeration.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: fd886c726d4cd6feaa556a5f7dee259cac52daf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd886c726d4cd6feaa556a5f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 17:25:30 2022 +0100 winedbg: Use Unicode APIs for process/thread enumeration. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 2b8e377e6f4..bb933aeb455 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -565,7 +565,7 @@ void info_win32_processes(void) } } -static BOOL get_process_name(DWORD pid, PROCESSENTRY32* entry) +static BOOL get_process_name(DWORD pid, PROCESSENTRY32W* entry) { BOOL ret = FALSE; HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); @@ -573,9 +573,9 @@ static BOOL get_process_name(DWORD pid, PROCESSENTRY32* entry) if (snap != INVALID_HANDLE_VALUE) { entry->dwSize = sizeof(*entry); - if (Process32First(snap, entry)) + if (Process32FirstW(snap, entry)) while (!(ret = (entry->th32ProcessID == pid)) && - Process32Next(snap, entry)); + Process32NextW(snap, entry)); CloseHandle(snap); } return ret; @@ -607,18 +607,18 @@ void info_win32_threads(void) */ if (entry.th32OwnerProcessID != lastProcessId) { - PROCESSENTRY32 pcs_entry; - const char* exename; + PROCESSENTRY32W pcs_entry; + const WCHAR* exename; p = dbg_get_process(entry.th32OwnerProcessID); if (p) - exename = dbg_W2A(p->imageName, -1); + exename = p->imageName; else if (get_process_name(entry.th32OwnerProcessID, &pcs_entry)) exename = pcs_entry.szExeFile; else - exename = ""; + exename = L""; - dbg_printf("%08lx%s %s\n", + dbg_printf("%08lx%s %ls\n", entry.th32OwnerProcessID, p ? " (D)" : "", exename); lastProcessId = entry.th32OwnerProcessID; }

1 0

Jinoh Kang : riched20: Add back-reference to outer ME_Run from struct re_object.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 05796c4e2a4acb91e6035c536b4d0e1f7e16896d URL: https://source.winehq.org/git/wine.git/?a=commit;h=05796c4e2a4acb91e6035c53… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 21 04:37:55 2022 +0900 riched20: Add back-reference to outer ME_Run from struct re_object. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 5 +++-- dlls/riched20/editstr.h | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 6d32776e3d2..c8658098e18 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -442,7 +442,7 @@ BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars) nChars, FALSE); } -static struct re_object* create_re_object(const REOBJECT *reo) +static struct re_object* create_re_object(const REOBJECT *reo, ME_Run *run) { struct re_object *reobj = heap_alloc(sizeof(*reobj)); @@ -452,6 +452,7 @@ static struct re_object* create_re_object(const REOBJECT *reo) return NULL; } ME_CopyReObject(&reobj->obj, reo, REO_GETOBJ_ALL_INTERFACES); + reobj->run = run; return reobj; } @@ -477,7 +478,7 @@ void editor_insert_oleobj(ME_TextEditor *editor, const REOBJECT *reo) run = run_insert( editor, cursor, style, &space, 1, MERF_GRAPHICS ); - run->reobj = create_re_object( reo ); + run->reobj = create_re_object( reo, run ); prev = run; while ((prev = run_prev_all_paras( prev ))) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 889795de189..3b166234f23 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -147,11 +147,13 @@ typedef enum { /******************************** structures *************************/ struct tagME_DisplayItem; +struct tagME_Run; struct re_object { struct list entry; REOBJECT obj; + struct tagME_Run *run; /* ptr to the reobj's run */ }; typedef struct tagME_Run

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in om.c.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: c1f1bf79f08ca4e60eb2ec6a2542e47f0f72decd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1f1bf79f08ca4e60eb2ec6a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 19 10:14:52 2022 +0100 ntdll/tests: Enable compilation with long types in om.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 789 +++++++++++++++++++++++++------------------------- 1 file changed, 395 insertions(+), 394 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1f1bf79f08ca4e60eb2…

1 0

Hans Leidekker : bcrypt: Pass the algorithm ID to key_asymmetric_create().
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: f3d4df60ff4afbf1983387a098ae96830384f53a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3d4df60ff4afbf1983387a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 21 09:50:06 2022 +0100 bcrypt: Pass the algorithm ID to key_asymmetric_create(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 5df4da009a4..fe16f9269c9 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -968,7 +968,7 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return status; } -static NTSTATUS key_asymmetric_create( struct key **ret_key, struct algorithm *alg, ULONG bitlen, +static NTSTATUS key_asymmetric_create( struct key **ret_key, enum alg_id alg_id, ULONG bitlen, const UCHAR *pubkey, ULONG pubkey_len ) { struct key *key; @@ -981,7 +981,7 @@ static NTSTATUS key_asymmetric_create( struct key **ret_key, struct algorithm *a if (!(key = calloc( 1, sizeof(*key) ))) return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; - key->alg_id = alg->id; + key->alg_id = alg_id; key->u.a.bitlen = bitlen; key->u.a.pubkey_len = pubkey_len; @@ -1366,7 +1366,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_INVALID_PARAMETER; size = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; - return key_asymmetric_create( (struct key **)ret_key, alg, key_size * 8, (BYTE *)ecc_blob, size ); + return key_asymmetric_create( (struct key **)ret_key, alg->id, key_size * 8, (BYTE *)ecc_blob, size ); } else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB )) { @@ -1396,7 +1396,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_INVALID_PARAMETER; size = sizeof(*ecc_blob) + key_size * 2; - if ((status = key_asymmetric_create( &key, alg, key_size * 8, NULL, size ))) return status; + if ((status = key_asymmetric_create( &key, alg->id, key_size * 8, NULL, size ))) return status; params.key = key; params.buf = input; @@ -1420,7 +1420,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; if (size != input_len) return NTE_BAD_DATA; - return key_asymmetric_create( (struct key **)ret_key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ); + return key_asymmetric_create( (struct key **)ret_key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ); } else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB )) { @@ -1431,7 +1431,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP rsa_blob->Magic != BCRYPT_RSAFULLPRIVATE_MAGIC)) return STATUS_NOT_SUPPORTED; size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; - if ((status = key_asymmetric_create( &key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) + if ((status = key_asymmetric_create( &key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) return status; params.key = key; params.buf = input; @@ -1454,7 +1454,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; size = sizeof(*dsa_blob) + dsa_blob->cbKey * 3; - return key_asymmetric_create( (struct key **)ret_key, alg, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ); + return key_asymmetric_create( (struct key **)ret_key, alg->id, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ); } else if (!wcscmp( type, LEGACY_DSA_V2_PRIVATE_BLOB )) { @@ -1482,7 +1482,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_INVALID_PARAMETER; size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); - if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, NULL, size ))) return status; + if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, NULL, size ))) return status; params.key = key; params.buf = input; @@ -1517,7 +1517,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); if (input_len < size) return STATUS_INVALID_PARAMETER; - if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, (BYTE *)hdr, size ))) return status; + if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, (BYTE *)hdr, size ))) return status; key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; *ret_key = key; @@ -1629,7 +1629,7 @@ NTSTATUS WINAPI BCryptGenerateKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_H return STATUS_NOT_SUPPORTED; } - if (!(status = key_asymmetric_create( &key, alg, key_len, NULL, size ))) *handle = key; + if (!(status = key_asymmetric_create( &key, alg->id, key_len, NULL, size ))) *handle = key; return status; }

1 0