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

Hans Leidekker : bcrypt: Merge the various key import Unix calls into one.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 0c2408464cfea0d3e5b073c56ac0d264d1abe576 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c2408464cfea0d3e5b073c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 21 09:50:09 2022 +0100 bcrypt: Merge the various key import Unix calls into one. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 8 +-- dlls/bcrypt/bcrypt_main.c | 87 +++++++++++++++++++++------- dlls/bcrypt/gnutls.c | 132 +++++++++++++++++++----------------------- 3 files changed, 132 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c2408464cfea0d3e5b0…

1 0

Hans Leidekker : bcrypt: Store a public key handle instead of a blob.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: b352d353b41654ad2b94d46747c5d203acc417f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b352d353b41654ad2b94d467… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 21 09:50:10 2022 +0100 bcrypt: Store a public key handle instead of a blob. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 2 - dlls/bcrypt/bcrypt_main.c | 68 ++---- dlls/bcrypt/gnutls.c | 481 ++++++++++-------------------------------- 3 files changed, 125 insertions(+), 426 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b352d353b41654ad2b94…

1 0

Hans Leidekker : bcrypt: Stop passing a dummy public key to gnutls_privkey_import_dsa_raw().
by Alexandre Julliard 21 Mar '22

21 Mar '22

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

Austin English : winspool: Add GetSpoolFileHandle() stub.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: db6e5014dedb7edb80fee7f68badd3f228fc2f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db6e5014dedb7edb80fee7f6… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 21 09:48:14 2022 +0000 winspool: Add GetSpoolFileHandle() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52623 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 9 +++++++++ dlls/winspool.drv/winspool.drv.spec | 1 + include/winspool.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 52edd362622..a89abd0ced9 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8076,3 +8076,12 @@ DWORD WINAPI PerfCollect(LPWSTR query, LPVOID *data, LPDWORD size, LPDWORD obj_c *obj_count = 0; return ERROR_SUCCESS; } + +/***************************************************************************** + * GetSpoolFileHandle [WINSPOOL.@] + */ +HANDLE WINAPI GetSpoolFileHandle( HANDLE printer ) +{ + FIXME( "%p: stub\n", printer ); + return INVALID_HANDLE_VALUE; +} diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index 5d8a62d4695..d7bb49bd34b 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -144,6 +144,7 @@ @ stdcall GetPrinterDriverDirectoryW(wstr wstr long ptr long ptr) @ stdcall GetPrinterDriverW(long wstr long ptr long ptr) @ stdcall GetPrinterW(long long ptr long ptr) +@ stdcall GetSpoolFileHandle(ptr) @ stdcall IsValidDevmodeA(ptr long) @ stdcall IsValidDevmodeW(ptr long) @ stdcall OpenPrinterA(str ptr ptr) diff --git a/include/winspool.h b/include/winspool.h index 68619741f38..db8773ec418 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -1768,6 +1768,8 @@ BOOL WINAPI XcvDataW(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, BOOL WINAPI IsValidDevmodeA(PDEVMODEA pDevMode, SIZE_T size); BOOL WINAPI IsValidDevmodeW(PDEVMODEW pDevMode, SIZE_T size); +HANDLE WINAPI GetSpoolFileHandle(HANDLE printer); + #ifdef __cplusplus } /* extern "C" */ #endif

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in large_int.c
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: f7ea99419481adef8de8e41c59bc3022c00dc573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7ea99419481adef8de8e41c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 19 10:14:46 2022 +0100 ntdll/tests: Enable compilation with long types in large_int.c Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/large_int.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index 00316fe65e0..3ae18f7906a 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -20,6 +20,7 @@ * We use function pointers here as there is no import library for NTDLL on * windows. */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdlib.h> @@ -297,7 +298,7 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t #ifdef _WIN64 if (largeint2str->value >> 32 == 0xffffffff) /* this crashes on 64-bit Vista */ { - skip( "Value ffffffff%08x broken on 64-bit windows\n", (DWORD)largeint2str->value ); + skip( "Value ffffffff%08lx broken on 64-bit windows\n", (DWORD)largeint2str->value ); return; } #endif @@ -340,7 +341,7 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t } /* if */ } else { ok(result == largeint2str->result, - "(test %d): RtlInt64ToUnicodeString(0x%s, %d, [out]) has result %x, expected: %x\n", + "(test %d): RtlInt64ToUnicodeString(0x%s, %d, [out]) has result %lx, expected: %lx\n", test_num, wine_dbgstr_longlong(largeint2str->value), largeint2str->base, result, largeint2str->result); if (result == STATUS_SUCCESS) { ok(unicode_string.Buffer[unicode_string.Length/sizeof(WCHAR)] == '\0', @@ -349,7 +350,7 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t } /* if */ } /* if */ ok(memcmp(unicode_string.Buffer, expected_unicode_string.Buffer, LARGE_STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0, - "(test %d): RtlInt64ToUnicodeString(0x%x%08x, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): RtlInt64ToUnicodeString(0x%lx%08lx, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", test_num, (DWORD)(largeint2str->value >>32), (DWORD)largeint2str->value, largeint2str->base, ansi_str.Buffer, expected_ansi_str.Buffer); ok(unicode_string.Length == expected_unicode_string.Length, @@ -384,7 +385,7 @@ static void one_RtlLargeIntegerToChar_test(int test_num, const largeint2str_t *l #ifdef _WIN64 if (largeint2str->value >> 32 == 0xffffffff) /* this crashes on 64-bit Vista */ { - skip( "Value ffffffff%08x broken on 64-bit windows\n", (DWORD)largeint2str->value ); + skip( "Value ffffffff%08lx broken on 64-bit windows\n", (DWORD)largeint2str->value ); return; } #endif @@ -398,7 +399,7 @@ static void one_RtlLargeIntegerToChar_test(int test_num, const largeint2str_t *l result = pRtlLargeIntegerToChar(&value, largeint2str->base, largeint2str->MaximumLength, dest_str); } /* if */ ok(result == largeint2str->result, - "(test %d): RtlLargeIntegerToChar(0x%s, %d, %d, [out]) has result %x, expected: %x\n", + "(test %d): RtlLargeIntegerToChar(0x%s, %d, %d, [out]) has result %lx, expected: %lx\n", test_num, wine_dbgstr_longlong(largeint2str->value), largeint2str->base, largeint2str->MaximumLength, result, largeint2str->result); ok(memcmp(dest_str, largeint2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0, @@ -421,24 +422,24 @@ static void test_RtlLargeIntegerToChar(void) value = largeint2str[0].value; result = pRtlLargeIntegerToChar(&value, 20, largeint2str[0].MaximumLength, NULL); ok(result == STATUS_INVALID_PARAMETER, - "(test a): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n", + "(test a): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n", wine_dbgstr_longlong(largeint2str[0].value), 20, largeint2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER); result = pRtlLargeIntegerToChar(&value, 20, 0, NULL); ok(result == STATUS_INVALID_PARAMETER, - "(test b): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n", + "(test b): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n", wine_dbgstr_longlong(largeint2str[0].value), 20, largeint2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER); result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, 0, NULL); ok(result == STATUS_BUFFER_OVERFLOW, - "(test c): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n", + "(test c): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n", wine_dbgstr_longlong(largeint2str[0].value), largeint2str[0].base, 0, result, STATUS_BUFFER_OVERFLOW); result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, largeint2str[0].MaximumLength, NULL); ok(result == STATUS_ACCESS_VIOLATION, - "(test d): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n", + "(test d): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n", wine_dbgstr_longlong(largeint2str[0].value), largeint2str[0].base, largeint2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION); }

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in om.c.
by Alexandre Julliard 21 Mar '22

21 Mar '22

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

Eric Pouech : ntdll/tests: Enable compilation with long types in file.c.
by Alexandre Julliard 21 Mar '22

21 Mar '22

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

1 0

Eric Pouech : winedbg: Get rid of dbg_outputW helper.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 0046d6eccca704c80f95bfc2e74f39410c85d297 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0046d6eccca704c80f95bfc2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 17:25:24 2022 +0100 winedbg: Get rid of dbg_outputW 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/memory.c | 6 +----- programs/winedbg/winedbg.c | 7 ------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 0cc2f8b7a6c..b7dcde201d8 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 void dbg_outputW(const WCHAR* buffer, int len); 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))); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index faa5ac9ddcb..208526739e2 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -641,7 +641,6 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) { unsigned size; dbg_lgint_t res = types_extract_as_lgint(lvalue, &size, NULL); - WCHAR wch; switch (format) { @@ -658,10 +657,7 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) return; case 'u': - wch = (WCHAR)(res & 0xFFFF); - dbg_printf("%d = '", wch); - dbg_outputW(&wch, 1); - dbg_printf("'"); + dbg_printf("%d = '%lc'", (WCHAR)(res & 0xFFFF), (WCHAR)(res & 0xFFFF)); return; case 'i': diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 89fb265fc93..dc6355be4cd 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -135,13 +135,6 @@ const char* dbg_W2A(const WCHAR* buffer, unsigned len) return ansi; } -void dbg_outputW(const WCHAR* buffer, int len) -{ - const char* ansi = dbg_W2A(buffer, len); - if (ansi) dbg_outputA(ansi, strlen(ansi)); - /* FIXME: should CP_ACP be GetConsoleCP()? */ -} - int WINAPIV dbg_printf(const char* format, ...) { static char buf[4*1024];

1 0

Eric Pouech : winedbg: Use Unicode APIs for process/thread enumeration.
by Alexandre Julliard 21 Mar '22

21 Mar '22

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

Eric Pouech : winedbg: Get rid of dbg_W2A helper.
by Alexandre Julliard 21 Mar '22

21 Mar '22

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