June 2023 - Wine-Commits - list.winehq.org

Rémi Bernon : winex11: Make sure HIMC is opened before sending IME updates.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: f7e76184f1c5064604381cdfc3c30ef357955e52 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7e76184f1c5064604381cdfc3c30e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 30 13:16:39 2023 +0200 winex11: Make sure HIMC is opened before sending IME updates. --- dlls/winex11.drv/xim.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 1b063cfe886..209d63f0402 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -175,6 +175,7 @@ static int xic_preedit_start( XIC xic, XPointer user, XPointer arg ) if ((ime_comp_buf = realloc( ime_comp_buf, sizeof(WCHAR) ))) *ime_comp_buf = 0; else ERR( "Failed to allocate preedit buffer\n" ); + NtUserPostMessage( hwnd, WM_IME_NOTIFY, IMN_WINE_SET_OPEN_STATUS, TRUE ); post_ime_update( hwnd, 0, ime_comp_buf, NULL ); return -1; @@ -190,6 +191,7 @@ static int xic_preedit_done( XIC xic, XPointer user, XPointer arg ) ime_comp_buf = NULL; post_ime_update( hwnd, 0, NULL, NULL ); + NtUserPostMessage( hwnd, WM_IME_NOTIFY, IMN_WINE_SET_OPEN_STATUS, FALSE ); return 0; }

1 0

Rémi Bernon : imm32: Use offsets instead of lengths to decide on sending updates.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: e5646191723fa4b5e4cb38187e1611a58ebc8695 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5646191723fa4b5e4cb38187e1611… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 15 14:56:35 2023 +0200 imm32: Use offsets instead of lengths to decide on sending updates. The composition or result strings may be present, but with zero length. In which case we still want to send the messages, to indicate any change for instance whenever a character is deleted and strings become empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55055 --- dlls/imm32/ime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index b5c4fc5b2e1..0470f3b6d6c 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -559,7 +559,7 @@ UINT WINAPI ImeToAsciiEx( UINT vkey, UINT vsc, BYTE *state, TRANSMSGLIST *msgs, TRANSMSG status_msg = {.message = ime_set_composition_status( himc, !!compstr->dwCompStrOffset )}; if (status_msg.message) msgs->TransMsg[count++] = status_msg; - if (compstr->dwResultStrLen) + if (compstr->dwResultStrOffset) { const WCHAR *result = (WCHAR *)((BYTE *)compstr + compstr->dwResultStrOffset); TRANSMSG msg = {.message = WM_IME_COMPOSITION, .wParam = result[0], .lParam = GCS_RESULTSTR}; @@ -567,7 +567,7 @@ UINT WINAPI ImeToAsciiEx( UINT vkey, UINT vsc, BYTE *state, TRANSMSGLIST *msgs, msgs->TransMsg[count++] = msg; } - if (compstr->dwCompStrLen) + if (compstr->dwCompStrOffset) { const WCHAR *comp = (WCHAR *)((BYTE *)compstr + compstr->dwCompStrOffset); TRANSMSG msg = {.message = WM_IME_COMPOSITION, .wParam = comp[0], .lParam = GCS_COMPSTR | GCS_CURSORPOS | GCS_DELTASTART};

1 0

Rémi Bernon : winex11: Report empty preedit string when result string is committed.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: 97c0a52ae552ed856c0955e8badfe0ddf88be91d URL: https://gitlab.winehq.org/wine/wine/-/commit/97c0a52ae552ed856c0955e8badfe0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 13 07:14:33 2023 +0200 winex11: Report empty preedit string when result string is committed. Based on a patch from Byeong-Sik Jeon <bsjeon(a)hanmail.net>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55027 --- dlls/winex11.drv/xim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 1c3d2dd9875..1b063cfe886 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -140,7 +140,7 @@ void xim_set_result_string( HWND hwnd, const char *str, UINT count ) len = ntdll_umbstowcs( str, count, output, count ); output[len] = 0; - post_ime_update( hwnd, 0, ime_comp_buf, output ); + post_ime_update( hwnd, 0, NULL, output ); free( output ); }

1 0

Rémi Bernon : imm32/tests: Test how deleting a character can behave.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: d1f9aae59973aae89a228a3f16a28d41470fea96 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1f9aae59973aae89a228a3f16a28d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 20 09:53:02 2023 +0200 imm32/tests: Test how deleting a character can behave. --- dlls/imm32/tests/imm32.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 95f832b97e4..07caa054357 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -7213,6 +7213,20 @@ static void test_ga_na_da(void) /* These sequences have some additional WM_IME_NOTIFY messages with unknown wparam > IMN_PRIVATE */ struct ime_call complete_seq[] = { + /* G */ + {.hkl = default_hkl, .himc = 0/*himc*/, .func = MSG_TEST_WIN, .message = {.msg = WM_IME_STARTCOMPOSITION, .wparam = 0, .lparam = 0}}, + { + .hkl = default_hkl, .himc = 0/*himc*/, .func = MSG_TEST_WIN, .comp = L"\u3131", .result = L"", + .message = {.msg = WM_IME_COMPOSITION, .wparam = 0x3131, .lparam = GCS_COMPSTR|GCS_COMPATTR|CS_INSERTCHAR|CS_NOMOVECARET}, + }, + + { + .hkl = default_hkl, .himc = 0/*himc*/, .func = MSG_TEST_WIN, .comp = L"", .result = L"", + .message = {.msg = WM_IME_COMPOSITION, .wparam = 0x1b, .lparam = GCS_CURSORPOS|GCS_DELTASTART|GCS_COMPSTR|GCS_COMPATTR|GCS_COMPCLAUSE| + GCS_COMPREADSTR|GCS_COMPREADATTR|GCS_COMPREADCLAUSE}, + }, + {.hkl = default_hkl, .himc = 0/*himc*/, .func = MSG_TEST_WIN, .message = {.msg = WM_IME_ENDCOMPOSITION, .wparam = 0, .lparam = 0}}, + /* G */ {.hkl = default_hkl, .himc = 0/*himc*/, .func = MSG_TEST_WIN, .message = {.msg = WM_IME_STARTCOMPOSITION, .wparam = 0, .lparam = 0}}, { @@ -7377,6 +7391,14 @@ static void test_ga_na_da(void) flush_events(); keybd_event( 'R', 0x13, KEYEVENTF_KEYUP, 0 ); + keybd_event( VK_BACK, 0x0e, 0, 0 ); + flush_events(); + keybd_event( VK_BACK, 0x0e, KEYEVENTF_KEYUP, 0 ); + + keybd_event( 'R', 0x13, 0, 0 ); + flush_events(); + keybd_event( 'R', 0x13, KEYEVENTF_KEYUP, 0 ); + keybd_event( 'K', 0x25, 0, 0 ); flush_events(); keybd_event( 'K', 0x25, KEYEVENTF_KEYUP, 0 );

1 0

Eric Pouech : dbghelp: Create implementation basis for SymSrvGetFileIndex*().
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: 1f437ed89a3a3158b1a33b6e91dd80201a3f06fd URL: https://gitlab.winehq.org/wine/wine/-/commit/1f437ed89a3a3158b1a33b6e91dd80… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jun 20 17:01:18 2023 +0200 dbghelp: Create implementation basis for SymSrvGetFileIndex*(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp.spec | 6 ++-- dlls/dbghelp/path.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/symbol.c | 11 ------- 3 files changed, 81 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index fc2218f636b..9ef5922386e 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -176,11 +176,11 @@ @ stub SymSrvDeltaName @ stub SymSrvDeltaNameW @ stdcall SymSrvGetFileIndexInfo(str ptr long) -@ stub SymSrvGetFileIndexInfoW +@ stdcall SymSrvGetFileIndexInfoW(wstr ptr long) @ stub SymSrvGetFileIndexString @ stub SymSrvGetFileIndexStringW -@ stub SymSrvGetFileIndexes -@ stub SymSrvGetFileIndexesW +@ stdcall SymSrvGetFileIndexes(str ptr ptr ptr long) +@ stdcall SymSrvGetFileIndexesW(wstr ptr ptr ptr long) @ stub SymSrvGetSupplement @ stub SymSrvGetSupplementW @ stub SymSrvIsStore diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index fe1da8849eb..7c356e3a6ea 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -839,3 +839,81 @@ BOOL search_unix_path(const WCHAR *name, const WCHAR *path, BOOL (*match)(void*, heap_free(buf); return ret; } + +/****************************************************************** + * SymSrvGetFileIndexInfo (DBGHELP.@) + * + */ +BOOL WINAPI SymSrvGetFileIndexInfo(const char *file, SYMSRV_INDEX_INFO* info, DWORD flags) +{ + SYMSRV_INDEX_INFOW infoW; + WCHAR fileW[MAX_PATH]; + BOOL ret; + + TRACE("(%s, %p, 0x%08lx)\n", debugstr_a(file), info, flags); + + if (info->sizeofstruct < sizeof(*info)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, ARRAY_SIZE(fileW)); + infoW.sizeofstruct = sizeof(infoW); + ret = SymSrvGetFileIndexInfoW(fileW, &infoW, flags); + if (ret) + { + WideCharToMultiByte(CP_ACP, 0, infoW.file, -1, info->file, ARRAY_SIZE(info->file), NULL, NULL); + info->stripped = infoW.stripped; + info->timestamp = infoW.timestamp; + info->size = infoW.size; + WideCharToMultiByte(CP_ACP, 0, infoW.dbgfile, -1, info->dbgfile, ARRAY_SIZE(info->dbgfile), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, infoW.pdbfile, -1, info->pdbfile, ARRAY_SIZE(info->pdbfile), NULL, NULL); + info->guid = infoW.guid; + info->sig = infoW.sig; + info->age = infoW.age; + } + return ret; +} + +/****************************************************************** + * SymSrvGetFileIndexInfoW (DBGHELP.@) + * + */ +BOOL WINAPI SymSrvGetFileIndexInfoW(const WCHAR *file, SYMSRV_INDEX_INFOW* info, DWORD flags) +{ + FIXME("(%s, %p, 0x%08lx): stub!\n", debugstr_w(file), info, flags); + + if (info->sizeofstruct < sizeof(*info)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/****************************************************************** + * SymSrvGetFileIndexes (DBGHELP.@) + * + */ +BOOL WINAPI SymSrvGetFileIndexes(PCSTR file, GUID* guid, PDWORD pdw1, PDWORD pdw2, DWORD flags) +{ + WCHAR fileW[MAX_PATH]; + + TRACE("(%s, %p, %p, %p, 0x%08lx)\n", debugstr_a(file), guid, pdw1, pdw2, flags); + + MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, ARRAY_SIZE(fileW)); + return SymSrvGetFileIndexesW(fileW, guid, pdw1, pdw2, flags); +} + +/****************************************************************** + * SymSrvGetFileIndexesW (DBGHELP.@) + * + */ +BOOL WINAPI SymSrvGetFileIndexesW(PCWSTR file, GUID* guid, PDWORD pdw1, PDWORD pdw2, DWORD flags) +{ + FIXME("(%s, %p, %p, %p, 0x%08lx): stub!\n", debugstr_w(file), guid, pdw1, pdw2, flags); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 5579d79bf48..ad3c049e218 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2851,14 +2851,3 @@ BOOL WINAPI SymQueryInlineTrace(HANDLE hProcess, DWORD64 StartAddress, DWORD Sta } return TRUE; } - -/****************************************************************** - * SymSrvGetFileIndexInfo (DBGHELP.@) - * - */ -BOOL WINAPI SymSrvGetFileIndexInfo(const char *file, SYMSRV_INDEX_INFO* info, DWORD flags) -{ - FIXME("(%s, %p, 0x%08lx): stub!\n", debugstr_a(file), info, flags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -}

1 0

Eric Pouech : dbghelp/tests: Add tests for SymSrvGetIndexesInfo.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: 954f302f708b7aa619ff5c87018eb40e47a2fd03 URL: https://gitlab.winehq.org/wine/wine/-/commit/954f302f708b7aa619ff5c87018eb4… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 20 17:01:18 2023 +0200 dbghelp/tests: Add tests for SymSrvGetIndexesInfo. Tests on PE image (header part, no debug directory). Add infrastructure to generate PE image (derived from kernel32/tests/loader.c). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/Makefile.in | 3 +- dlls/dbghelp/tests/path.c | 366 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 368 insertions(+), 1 deletion(-)

1 0

Eric Pouech : dbghelp/tests: Add tests for SymSrvGetInfoIndexes.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: 4d32b2ee30af3ced7c010cb0de0b03f8a61be467 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d32b2ee30af3ced7c010cb0de0b03… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 20 17:01:18 2023 +0200 dbghelp/tests: Add tests for SymSrvGetInfoIndexes. Tests related to debug directories. Extending the PE image generator with debug directories. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/path.c | 124 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index 7d95e1e6641..1e76886a70e 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -32,6 +32,8 @@ static const IMAGE_DOS_HEADER dos_header = }; static const GUID null_guid; +static const GUID guid1 = {0x1234abcd, 0x3456, 0x5678, {0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0, 0x0a, 0x0b}}; +static const GUID guid2 = {0x1234abcd, 0x3456, 0x5678, {0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0, 0x0a, 0x0c}}; #define ALIGN(v, a) (((v - 1) / (a) + 1) * (a)) #define NUM_OF(x, a) (((x) + (a) - 1) / (a)) @@ -260,9 +262,94 @@ static struct debug_directory_blob* make_empty_blob(void) return blob; } +static struct debug_directory_blob* make_pdb_jg_blob(DWORD dd_timestamp, DWORD jg_timestamp, DWORD age, const char* name) +{ + struct debug_directory_blob* blob; + DWORD size; + + size = ALIGN(16 + strlen(name) + 1, 4); + blob = malloc(offsetof(struct debug_directory_blob, content[size])); + + blob->debug_directory.AddressOfRawData = 0; + blob->debug_directory.Characteristics = 0; + blob->debug_directory.MajorVersion = 0; + blob->debug_directory.MinorVersion = 0; + blob->debug_directory.PointerToRawData = 0; + blob->debug_directory.SizeOfData = size; + blob->debug_directory.TimeDateStamp = dd_timestamp; + blob->debug_directory.Type = IMAGE_DEBUG_TYPE_CODEVIEW; + + blob->content[0] = 'N'; /* signature */ + blob->content[1] = 'B'; + blob->content[2] = '1'; + blob->content[3] = '0'; + *(DWORD*)(blob->content + 4) = 0; /* file pos */ + *(DWORD*)(blob->content + 8) = jg_timestamp; /* timestamp */ + *(DWORD*)(blob->content + 12) = age; /* age */ + strcpy(blob->content + 16, name); /* name */ + + return blob; +} + +static struct debug_directory_blob* make_pdb_ds_blob(DWORD dd_timestamp, const GUID* guid, DWORD age, const char* name) +{ + struct debug_directory_blob* blob; + DWORD size; + + size = ALIGN(4 + sizeof(GUID) + 4 + strlen(name) + 1, 4); + blob = malloc(offsetof(struct debug_directory_blob, content[size])); + + blob->debug_directory.AddressOfRawData = 0; + blob->debug_directory.Characteristics = 0; + blob->debug_directory.MajorVersion = 0; + blob->debug_directory.MinorVersion = 0; + blob->debug_directory.PointerToRawData = 0; + blob->debug_directory.SizeOfData = size; + blob->debug_directory.TimeDateStamp = dd_timestamp; + blob->debug_directory.Type = IMAGE_DEBUG_TYPE_CODEVIEW; + + blob->content[0] = 'R'; /* signature */ + blob->content[1] = 'S'; + blob->content[2] = 'D'; + blob->content[3] = 'S'; + memcpy(blob->content + 4, guid, sizeof(*guid)); /* guid */ + *(DWORD*)(blob->content + 4 + sizeof(GUID)) = age; /* age */ + strcpy(blob->content + 4 + sizeof(GUID) + 4, name); /* name */ + + return blob; +} + +static struct debug_directory_blob* make_dbg_blob(DWORD dd_timestamp, const char* name) +{ + struct debug_directory_blob* blob; + DWORD size; + + size = ALIGN(sizeof(IMAGE_DEBUG_MISC) + strlen(name), 4); + blob = malloc(offsetof(struct debug_directory_blob, content[size])); + + blob->debug_directory.AddressOfRawData = 0; + blob->debug_directory.Characteristics = 0; + blob->debug_directory.MajorVersion = 0; + blob->debug_directory.MinorVersion = 0; + blob->debug_directory.PointerToRawData = 0; + blob->debug_directory.SizeOfData = size; + blob->debug_directory.TimeDateStamp = dd_timestamp; + blob->debug_directory.Type = IMAGE_DEBUG_TYPE_MISC; + + *(DWORD*)blob->content = IMAGE_DEBUG_MISC_EXENAME; /* DataType */ + *(DWORD*)(blob->content + 4) = size; /* Length */ + blob->content[8] = 0; /* Unicode */ + blob->content[9] = 0; /* Reserved */ + blob->content[10] = 0; /* Reserved */ + blob->content[11] = 0; /* Reserved */ + strcpy(blob->content + 12, name); /* Data */ + + return blob; +} + static void test_srvgetindexes(void) { - struct debug_directory_blob* blob_refs[1]; + struct debug_directory_blob* blob_refs[7]; struct debug_directory_blob* blob_used[4]; SYMSRV_INDEX_INFOW ssii; union nt_header hdr; @@ -286,15 +373,44 @@ static void test_srvgetindexes(void) indexes[] = { /* error cases */ - {0, {-1, -1, -1}, .in_error = TRUE}, +/* 0 */{0, {-1, -1, -1}, .in_error = TRUE}, {IMAGE_FILE_DEBUG_STRIPPED, { 0, -1, -1}, .in_error = TRUE}, + {IMAGE_FILE_DEBUG_STRIPPED, { 1, -1, -1}, .in_error = TRUE}, + {IMAGE_FILE_DEBUG_STRIPPED, { 2, -1, -1}, .in_error = TRUE}, {IMAGE_FILE_DEBUG_STRIPPED, {-1, -1, -1}, .in_error = TRUE}, /* not 100% logical ! */ /* success */ - {0, { 0, -1, -1}, 0, &null_guid, 0, L""}, - }; +/* 5 */{0, { 0, -1, -1}, 0, &null_guid, 0 }, + {0, { 1, -1, -1}, 123, &null_guid, 0xaaaabbbb, .pdb_name = L"pdbjg.pdb"}, + {0, { 2, -1, -1}, 124, &guid1, 0, .pdb_name = L"pdbds.pdb"}, + {IMAGE_FILE_DEBUG_STRIPPED, { 3, -1, -1}, 0, &null_guid, 0, .dbg_name = L".\\ascii.dbg"}, + {0, { 3, -1, -1}, 0, &null_guid, 0, }, + /* PDB (JS & DS) records are cumulated (age from JS & guid from DS) */ +/* 10 */{0, { 1, 2, -1}, 124, &guid1, 0xaaaabbbb, .pdb_name = L"pdbds.pdb"}, + {0, { 2, 1, -1}, 123, &guid1, 0xaaaabbbb, .pdb_name = L"pdbjg.pdb"}, + /* cumulative records of same type */ + {0, { 1, 4, -1}, 125, &null_guid, 0xaaaacccc, .pdb_name = L"pdbjg2.pdb"}, + {0, { 2, 5, -1}, 126, &guid2, 0, .pdb_name = L"pdbds2.pdb"}, + {0, { 3, 6, -1}, 0, &null_guid, 0, }, +/* 15 */{IMAGE_FILE_DEBUG_STRIPPED, { 3, 6, -1}, 0, &null_guid, 0, .dbg_name = L".\\ascii.dbg"}, + /* Mixing MISC with PDB (JG or DS) records */ + {IMAGE_FILE_DEBUG_STRIPPED, { 3, 1, -1}, 123, &null_guid, 0xaaaabbbb, .pdb_name = L"pdbjg.pdb", .dbg_name = L".\\ascii.dbg"}, + {0, { 3, 1, -1}, 123, &null_guid, 0xaaaabbbb, .pdb_name = L"pdbjg.pdb"}, + {IMAGE_FILE_DEBUG_STRIPPED, { 3, 2, -1}, 124, &guid1, 0, .pdb_name = L"pdbds.pdb", .dbg_name = L".\\ascii.dbg"}, + {0, { 3, 2, -1}, 124, &guid1, 0, .pdb_name = L"pdbds.pdb"}, +/* 20 */{IMAGE_FILE_DEBUG_STRIPPED, { 1, 3, -1}, 123, &null_guid, 0xaaaabbbb, .pdb_name = L"pdbjg.pdb", .dbg_name = L".\\ascii.dbg"}, + {0, { 1, 3, -1}, 123, &null_guid, 0xaaaabbbb, .pdb_name = L"pdbjg.pdb"}, + {IMAGE_FILE_DEBUG_STRIPPED, { 2, 3, -1}, 124, &guid1, 0, .pdb_name = L"pdbds.pdb", .dbg_name = L".\\ascii.dbg"}, + {0, { 2, 3, -1}, 124, &guid1, 0, .pdb_name = L"pdbds.pdb"}, + }; /* testing PE header with debug directory content */ blob_refs[0] = make_empty_blob(); + blob_refs[1] = make_pdb_jg_blob(0x67899876, 0xaaaabbbb, 123, "pdbjg.pdb"); + blob_refs[2] = make_pdb_ds_blob(0x67899877, &guid1, 124, "pdbds.pdb"); + blob_refs[3] = make_dbg_blob (0x67899878, ".\\ascii.dbg"); /* doesn't seem to be returned without path */ + blob_refs[4] = make_pdb_jg_blob(0x67899879, 0xaaaacccc, 125, "pdbjg2.pdb"); + blob_refs[5] = make_pdb_ds_blob(0x67899880, &guid2, 126, "pdbds2.pdb"); + blob_refs[6] = make_dbg_blob (0x67899801, ".\\ascii.dbg"); /* doesn't seem to be returned without path */ for (bitness = 32; bitness <= 64; bitness += 32) {

1 0

Eric Pouech : dbghelp: Implement SymSrvGetFileIndexInfo for PE modules.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: 5efe29edc0c72251b020e085f6a728eb2321b831 URL: https://gitlab.winehq.org/wine/wine/-/commit/5efe29edc0c72251b020e085f6a728… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jun 20 17:01:18 2023 +0200 dbghelp: Implement SymSrvGetFileIndexInfo for PE modules. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 5 ++++- dlls/dbghelp/msc.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/path.c | 33 ++++++++++++++++++++++++++++--- dlls/dbghelp/pe_module.c | 27 ++++++++++++++++++++++++++ dlls/dbghelp/tests/path.c | 3 +-- 5 files changed, 106 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 7ba10447771..f91e2784b15 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -759,10 +759,12 @@ extern WCHAR* get_wine_loader_name(struct process *pcs) __WINE_DEALLOC(Hea /* msc.c */ extern BOOL pe_load_debug_directory(const struct process* pcs, - struct module* module, + struct module* module, const BYTE* mapping, const IMAGE_SECTION_HEADER* sectp, DWORD nsect, const IMAGE_DEBUG_DIRECTORY* dbg, int nDbg) DECLSPEC_HIDDEN; +extern DWORD msc_get_file_indexinfo(void* image, const IMAGE_DEBUG_DIRECTORY* dbgdir, DWORD size, + SYMSRV_INDEX_INFOW* info) DECLSPEC_HIDDEN; extern BOOL pdb_fetch_file_info(const struct pdb_lookup* pdb_lookup, unsigned* matched) DECLSPEC_HIDDEN; struct pdb_cmd_pair { const char* name; @@ -793,6 +795,7 @@ extern struct module* extern BOOL pe_load_debug_info(const struct process* pcs, struct module* module) DECLSPEC_HIDDEN; extern const char* pe_map_directory(struct module* module, int dirno, DWORD* size) DECLSPEC_HIDDEN; +extern DWORD pe_get_file_indexinfo(void* image, DWORD size, SYMSRV_INDEX_INFOW* info) DECLSPEC_HIDDEN; /* source.c */ extern unsigned source_new(struct module* module, const char* basedir, const char* source) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index c6dca22883a..f6b681cb4ae 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -4465,3 +4465,47 @@ typedef struct _FPO_DATA __ENDTRY return ret; } + +DWORD msc_get_file_indexinfo(void* image, const IMAGE_DEBUG_DIRECTORY* debug_dir, DWORD num_dir, SYMSRV_INDEX_INFOW* info) +{ + DWORD i; + unsigned num_misc_records = 0; + + info->age = 0; + memset(&info->guid, 0, sizeof(info->guid)); + info->sig = 0; + info->dbgfile[0] = L'\0'; + info->pdbfile[0] = L'\0'; + + for (i = 0; i < num_dir; i++) + { + if (debug_dir[i].Type == IMAGE_DEBUG_TYPE_CODEVIEW) + { + const CODEVIEW_PDB_DATA* data = (const CODEVIEW_PDB_DATA*)((char*)image + debug_dir[i].PointerToRawData); + const OMFSignatureRSDS* rsds_data = (const OMFSignatureRSDS*)data; + if (!memcmp(data->Signature, "NB10", 4)) + { + info->age = data->age; + info->sig = data->timestamp; + MultiByteToWideChar(CP_ACP, 0, data->name, -1, info->pdbfile, ARRAY_SIZE(info->pdbfile)); + } + if (!memcmp(rsds_data->Signature, "RSDS", 4)) + { + info->age = rsds_data->age; + info->guid = rsds_data->guid; + MultiByteToWideChar(CP_ACP, 0, rsds_data->name, -1, info->pdbfile, ARRAY_SIZE(info->pdbfile)); + } + } + else if (debug_dir[i].Type == IMAGE_DEBUG_TYPE_MISC && info->stripped) + { + const IMAGE_DEBUG_MISC* misc = (const IMAGE_DEBUG_MISC*) + ((const char*)image + debug_dir[i].PointerToRawData); + if (misc->Unicode) + wcscpy(info->dbgfile, (WCHAR*)misc->Data); + else + MultiByteToWideChar(CP_ACP, 0, (const char*)misc->Data, -1, info->dbgfile, ARRAY_SIZE(info->dbgfile)); + num_misc_records++; + } + } + return info->stripped && !num_misc_records ? ERROR_BAD_EXE_FORMAT : ERROR_SUCCESS; +} diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 7c356e3a6ea..5c53e3f857d 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -881,15 +881,42 @@ BOOL WINAPI SymSrvGetFileIndexInfo(const char *file, SYMSRV_INDEX_INFO* info, DW */ BOOL WINAPI SymSrvGetFileIndexInfoW(const WCHAR *file, SYMSRV_INDEX_INFOW* info, DWORD flags) { - FIXME("(%s, %p, 0x%08lx): stub!\n", debugstr_w(file), info, flags); + HANDLE hFile, hMap = NULL; + void* image = NULL; + DWORD fsize, ret; + + TRACE("(%s, %p, 0x%08lx)\n", debugstr_w(file), info, flags); if (info->sizeofstruct < sizeof(*info)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if ((hFile = CreateFileW(file, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE && + ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != NULL) && + ((image = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) != NULL)) + { + /* must handle PE, or .dbg or .pdb files. So each helper will return: + * - ERROR_SUCCESS: if the file format is recognized and index info filled, + * - ERROR_BAD_FORMAT: if the file doesn't match the expected format, + * - any other error: if the file has expected format, but internal errors + */ + fsize = GetFileSize(hFile, NULL); + /* try PE module first */ + ret = pe_get_file_indexinfo(image, fsize, info); + /* handle (ret == ERROR_BAD_FORMAT) with .dbg and .pdb format */ + } + else ret = ERROR_FILE_NOT_FOUND; + + if (image) UnmapViewOfFile(image); + if (hMap) CloseHandle(hMap); + if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); + + if (ret == ERROR_SUCCESS) wcscpy(info->file, file_name(file)); /* overflow? */ + SetLastError(ret); + return ret == ERROR_SUCCESS; } /****************************************************************** diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 7aeb1cf8901..3364498e0c7 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -962,3 +962,30 @@ PVOID WINAPI ImageDirectoryEntryToData( PVOID base, BOOLEAN image, USHORT dir, P { return ImageDirectoryEntryToDataEx( base, image, dir, size, NULL ); } + +DWORD pe_get_file_indexinfo(void* image, DWORD size, SYMSRV_INDEX_INFOW* info) +{ + const IMAGE_NT_HEADERS* nthdr; + const IMAGE_DEBUG_DIRECTORY* dbg; + ULONG dirsize; + + if (!(nthdr = RtlImageNtHeader(image))) return ERROR_BAD_FORMAT; + + dbg = RtlImageDirectoryEntryToData(image, FALSE, IMAGE_DIRECTORY_ENTRY_DEBUG, &dirsize); + if (!dbg || dirsize < sizeof(dbg)) return ERROR_BAD_EXE_FORMAT; + + /* fill in information from NT header */ + info->timestamp = nthdr->FileHeader.TimeDateStamp; + info->stripped = (nthdr->FileHeader.Characteristics & IMAGE_FILE_DEBUG_STRIPPED) != 0; + if (nthdr->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + const IMAGE_NT_HEADERS64* nthdr64 = (const IMAGE_NT_HEADERS64*)nthdr; + info->size = nthdr64->OptionalHeader.SizeOfImage; + } + else if (nthdr->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + { + const IMAGE_NT_HEADERS32* nthdr32 = (const IMAGE_NT_HEADERS32*)nthdr; + info->size = nthdr32->OptionalHeader.SizeOfImage; + } + return msc_get_file_indexinfo(image, dbg, dirsize / sizeof(*dbg), info); +} diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index 1e76886a70e..7ba8ef52e0b 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -442,10 +442,9 @@ static void test_srvgetindexes(void) if (indexes[i].in_error) { ok(!ret, "SymSrvGetFileIndexInfo should have failed\n"); - todo_wine ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Mismatch in GetLastError: %lu\n", GetLastError()); } - else todo_wine + else { ok(ret, "SymSrvGetFileIndexInfo failed: %lu\n", GetLastError());

1 0

Eric Pouech : include/dbghelp.h: Added some missing definitions.
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: 20f6b540190988680f66da682ed4c747ab880ddb URL: https://gitlab.winehq.org/wine/wine/-/commit/20f6b540190988680f66da682ed4c7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jun 20 17:01:18 2023 +0200 include/dbghelp.h: Added some missing definitions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/dbghelp.h | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index 84fa7e10595..15e9f9d2d77 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -310,17 +310,19 @@ typedef struct _SOURCEFILEW PWSTR FileName; } SOURCEFILEW, *PSOURCEFILEW; -#define CBA_DEFERRED_SYMBOL_LOAD_START 0x00000001 -#define CBA_DEFERRED_SYMBOL_LOAD_COMPLETE 0x00000002 -#define CBA_DEFERRED_SYMBOL_LOAD_FAILURE 0x00000003 -#define CBA_SYMBOLS_UNLOADED 0x00000004 -#define CBA_DUPLICATE_SYMBOL 0x00000005 -#define CBA_READ_MEMORY 0x00000006 -#define CBA_DEFERRED_SYMBOL_LOAD_CANCEL 0x00000007 -#define CBA_SET_OPTIONS 0x00000008 -#define CBA_EVENT 0x00000010 -#define CBA_DEFERRED_SYMBOL_LOAD_PARTIAL 0x00000020 -#define CBA_DEBUG_INFO 0x10000000 +#define CBA_DEFERRED_SYMBOL_LOAD_START 0x00000001 +#define CBA_DEFERRED_SYMBOL_LOAD_COMPLETE 0x00000002 +#define CBA_DEFERRED_SYMBOL_LOAD_FAILURE 0x00000003 +#define CBA_SYMBOLS_UNLOADED 0x00000004 +#define CBA_DUPLICATE_SYMBOL 0x00000005 +#define CBA_READ_MEMORY 0x00000006 +#define CBA_DEFERRED_SYMBOL_LOAD_CANCEL 0x00000007 +#define CBA_SET_OPTIONS 0x00000008 +#define CBA_EVENT 0x00000010 +#define CBA_DEFERRED_SYMBOL_LOAD_PARTIAL 0x00000020 +#define CBA_DEBUG_INFO 0x10000000 +#define CBA_SRCSRV_INFO 0x20000000 +#define CBA_SRCSRV_EVENT 0x40000000 typedef struct _IMAGEHLP_CBA_READ_MEMORY { @@ -1115,9 +1117,13 @@ BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value); BOOL WINAPI SymSetParentWindow(HWND); -/************************* - * Version, global stuff * - *************************/ +/*************************** + * Symbol servers & stores * + ***************************/ +BOOL WINAPI SymSrvGetFileIndexes(PCSTR, GUID *, PDWORD, PDWORD, DWORD); +BOOL WINAPI SymSrvGetFileIndexesW(PCWSTR, GUID *, PDWORD, PDWORD, DWORD); +BOOL WINAPI SymSrvGetFileIndexInfo(PCSTR, PSYMSRV_INDEX_INFO, DWORD); +BOOL WINAPI SymSrvGetFileIndexInfoW(PCWSTR, PSYMSRV_INDEX_INFOW, DWORD); typedef BOOL (WINAPI* PSYMBOLSERVERPROC)(PCSTR, PCSTR, PVOID, DWORD, DWORD, PSTR); typedef BOOL (WINAPI* PSYMBOLSERVERPROCA)(PCSTR, PCSTR, PVOID, DWORD, DWORD, PSTR); @@ -1150,6 +1156,9 @@ typedef BOOL (WINAPI* PSYMBOLSERVERPINGPROCW)(PCWSTR); #define SSRVACTION_TRACE 1 #define SSRVACTION_QUERYCANCEL 2 #define SSRVACTION_EVENT 3 +#define SSRVACTION_EVENTW 4 +#define SSRVACTION_SIZE 5 +#define SSRVACTION_HTTPSTATUS 6 /* 32-bit functions */

1 0

Jinoh Kang : loader: Set the visibility of symbols in preloader to "hidden".
by Alexandre Julliard June 20, 2023

June 20, 2023

Module: wine Branch: master Commit: 966233aee62ca6d64f32d635aa8bc7af0a8d7175 URL: https://gitlab.winehq.org/wine/wine/-/commit/966233aee62ca6d64f32d635aa8bc7… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jun 20 23:01:25 2023 +0900 loader: Set the visibility of symbols in preloader to "hidden". Today, the preloader is linked with -fPIE in spite of the fact that the preloader is a non-PIE statically linked binary. This is due to a limitation in tools/makedep that makes it difficult to specify CFLAGS for each individual object file's recipe. This can seemingly cause problems with some GOTPCREL(X) relocations inside the preloader. Since preloader does not link to the system library directly, there is no need for a Global Offset Table (GOT). However, a few extern (non-static) function symbols are declared, the use of which makes GCC emit instructions that references those symbols by indirection through GOT. The linker then tries to optimize such instructions to eliminate GOT references, which can fail due to various reasons. This stands in contradiction with Jinoh Kang's suggestion (in bug 55050) that "-fPIE is harmless even when applied to an object linked into non-PIE executables." The claim is theoretically true since position-independent code can in principle be relocated to any address (fixed or dynamic); however, it fails due to some peculiar practical issues, which is arguably a limitation in the linker's implementation (since it can be worked around with -Wl,--no-relax without issues). Fix this by eliminating GOT usage by setting the default visibility of non-static declarations to "hidden". Assuming GCC's medium code model (-mcmodel=medium; default code model for x86_64), this suppresses any unnecessary PLT or GOT relocations for defined symbols, and provides opportunity for GCC to optimize the code better. Fixes: 78ed343842dcd8ffb95c416420953e121959d40d Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55091 --- loader/preloader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/loader/preloader.c b/loader/preloader.c index 4045db64822..635e85ee7cb 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -89,6 +89,8 @@ #include "wine/asm.h" #include "main.h" +#pragma GCC visibility push(hidden) + /* ELF definitions */ #define ELF_PREFERRED_ADDRESS(loader, maplength, mapstartpref) (mapstartpref) #define ELF_FIXED_ADDRESS(loader, mapstart) ((void) 0) @@ -1497,4 +1499,6 @@ void* wld_start( void **stack ) return (void *)ld_so_map.l_entry; } +#pragma GCC visibility pop + #endif /* __linux__ */

1 0