Ros-diffs September 2020

ros-diffs@reactos.org

25 participants
382 discussions

[reactos] 74/179: [WINESYNC] dbghelp: Fix reading the address of the target's dyld image info from its PEB.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30e30ca49a4bbd4fd00bc… commit 30e30ca49a4bbd4fd00bc165a37f152a7ac3e584 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 16:49:21 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:43 2020 +0200 [WINESYNC] dbghelp: Fix reading the address of the target's dyld image info from its PEB. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 28a25b052d21a9e2e4fc3c7790711b290d44a488 by Ken Thomases <ken(a)codeweavers.com> --- dll/win32/dbghelp/macho_module.c | 2 +- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/dbghelp/macho_module.c b/dll/win32/dbghelp/macho_module.c index 9d83b006b7c..8eda11ab91c 100644 --- a/dll/win32/dbghelp/macho_module.c +++ b/dll/win32/dbghelp/macho_module.c @@ -1366,7 +1366,7 @@ static ULONG_PTR get_dyld_image_info_address(struct process* pcs) if (status == STATUS_SUCCESS) { /* Read dyld image info address from PEB */ - if (!pcs->is_64bit) + if (pcs->is_64bit) ret = ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved[0], &dyld_image_info_address, sizeof(dyld_image_info_address), NULL); else diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 40f477e891f..24fb63533e3 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: ae6e4017548fc30bf5220bebc674230dc4ccfe06 + wine: 28a25b052d21a9e2e4fc3c7790711b290d44a488

4 years

[reactos] 73/179: [WINESYNC] dbghelp: Avoid dead assignment (scan-build).

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=910ece9f8797236f0db9e… commit 910ece9f8797236f0db9edcedd536452a5eeb388 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 16:48:59 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:42 2020 +0200 [WINESYNC] dbghelp: Avoid dead assignment (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id ae6e4017548fc30bf5220bebc674230dc4ccfe06 by Alex Henrie <alexhenrie24(a)gmail.com> --- dll/win32/dbghelp/symbol.c | 1 - sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/dbghelp/symbol.c b/dll/win32/dbghelp/symbol.c index 56cb673312b..037641e0166 100644 --- a/dll/win32/dbghelp/symbol.c +++ b/dll/win32/dbghelp/symbol.c @@ -1991,7 +1991,6 @@ static BOOL re_match_multi(const WCHAR** pstring, const WCHAR** pre, BOOL _case) if (!(next = re_match_one(string_end, re_beg, _case))) return FALSE; string_end = next; } - re_beg = re_end; } if (*re_end || *string_end) return FALSE; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index f4c31ed58b9..40f477e891f 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: d263ba97fb7c9ada7ae847909f35cbf5db671216 + wine: ae6e4017548fc30bf5220bebc674230dc4ccfe06

4 years

[reactos] 72/179: [WINESYNC] dbghelp: Prevent an invalid memory access when the search path element is empty.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b66bb64916ca52853560e… commit b66bb64916ca52853560e036a717e702c81b30b2 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 16:48:57 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:42 2020 +0200 [WINESYNC] dbghelp: Prevent an invalid memory access when the search path element is empty. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id d263ba97fb7c9ada7ae847909f35cbf5db671216 by Rémi Bernon <rbernon(a)codeweavers.com> --- dll/win32/dbghelp/path.c | 1 + sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/dbghelp/path.c b/dll/win32/dbghelp/path.c index a0fc0cf5b17..f8a7f3d890a 100644 --- a/dll/win32/dbghelp/path.c +++ b/dll/win32/dbghelp/path.c @@ -229,6 +229,7 @@ static BOOL do_searchW(PCWSTR file, PWSTR buffer, BOOL recurse, static const WCHAR S_DotDotW[] = {'.','.','\0'}; pos = strlenW(buffer); + if (pos == 0) return FALSE; if (buffer[pos - 1] != '\\') buffer[pos++] = '\\'; strcpyW(buffer + pos, S_AllW); if ((h = FindFirstFileW(buffer, &fd)) == INVALID_HANDLE_VALUE) diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index f4c28007880..f4c31ed58b9 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: 9d3687ad324f866c835c4b73922f859a30e47aee + wine: d263ba97fb7c9ada7ae847909f35cbf5db671216

4 years

[reactos] 71/179: [WINESYNC] dbghelp: Return NULL instead of IMAGE_NO_MAP when PE file mapping fails.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e225d76e5110aab948cb… commit 5e225d76e5110aab948cb139b0a1d486f3b8a38a Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 16:48:51 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:42 2020 +0200 [WINESYNC] dbghelp: Return NULL instead of IMAGE_NO_MAP when PE file mapping fails. A NULL test is always applied to the return value from pe_map_full(), but IMAGE_NO_MAP is not NULL, it is ((void*)-1). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 9d3687ad324f866c835c4b73922f859a30e47aee by Conor McCarthy <cmccarthy(a)codeweavers.com> --- dll/win32/dbghelp/pe_module.c | 2 +- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/dbghelp/pe_module.c b/dll/win32/dbghelp/pe_module.c index 89d82d930e9..f458b8aa516 100644 --- a/dll/win32/dbghelp/pe_module.c +++ b/dll/win32/dbghelp/pe_module.c @@ -55,7 +55,7 @@ static void* pe_map_full(struct image_file_map* fmap, IMAGE_NT_HEADERS** nth) fmap->u.pe.full_count++; return fmap->u.pe.full_map; } - return IMAGE_NO_MAP; + return NULL; } static void pe_unmap_full(struct image_file_map* fmap) diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 4eeac48bfa8..f4c28007880 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: a91b0faefd801d44063c8d9289dbc69de985f8b6 + wine: 9d3687ad324f866c835c4b73922f859a30e47aee

4 years

[reactos] 70/179: [WINESYNC] dbghelp: Use RtlComputeCrc32().

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8105772fc4b959bf22ee6… commit 8105772fc4b959bf22ee6ddd7b2fca173dbb19e0 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 16:38:46 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:42 2020 +0200 [WINESYNC] dbghelp: Use RtlComputeCrc32(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id a91b0faefd801d44063c8d9289dbc69de985f8b6 by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/dbghelp/CMakeLists.txt | 1 - dll/win32/dbghelp/crc32.c | 149 ------------------------------------ dll/win32/dbghelp/dbghelp.c | 51 ++++++++---- dll/win32/dbghelp/dbghelp_private.h | 2 - sdk/tools/winesync/dbghelp.cfg | 2 +- 5 files changed, 35 insertions(+), 170 deletions(-) diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt index f1790d0d19a..c4e3929e7b9 100644 --- a/dll/win32/dbghelp/CMakeLists.txt +++ b/dll/win32/dbghelp/CMakeLists.txt @@ -53,7 +53,6 @@ else() cpu_i386.c cpu_ppc.c cpu_x86_64.c - crc32.c dbghelp.c dwarf.c elf_module.c diff --git a/dll/win32/dbghelp/crc32.c b/dll/win32/dbghelp/crc32.c deleted file mode 100644 index 73042fefbcd..00000000000 --- a/dll/win32/dbghelp/crc32.c +++ /dev/null @@ -1,149 +0,0 @@ -/* - * File crc32.c - calculate CRC32 checksum of a file - * - * Copyright (C) 1996, Eric Youngdale. - * 1999-2007 Eric Pouech - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdio.h> - -#include "dbghelp_private.h" - -/* Copyright (C) 1986 Gary S. Brown - * Modified by Robert Shearman. You may use the following calc_crc32 code or - * tables extracted from it, as desired without restriction. */ - -/**********************************************************************\ -|* Demonstration program to compute the 32-bit CRC used as the frame *| -|* check sequence in ADCCP (ANSI X3.66, also known as FIPS PUB 71 *| -|* and FED-STD-1003, the U.S. versions of CCITT's X.25 link-level *| -|* protocol). The 32-bit FCS was added via the Federal Register, *| -|* 1 June 1982, p.23798. I presume but don't know for certain that *| -|* this polynomial is or will be included in CCITT V.41, which *| -|* defines the 16-bit CRC (often called CRC-CCITT) polynomial. FIPS *| -|* PUB 78 says that the 32-bit FCS reduces otherwise undetected *| -|* errors by a factor of 10^-5 over 16-bit FCS. *| -\**********************************************************************/ - -/* First, the polynomial itself and its table of feedback terms. The */ -/* polynomial is */ -/* X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 */ -/* Note that we take it "backwards" and put the highest-order term in */ -/* the lowest-order bit. The X^32 term is "implied"; the LSB is the */ -/* X^31 term, etc. The X^0 term (usually shown as "+1") results in */ -/* the MSB being 1. */ - -/* Note that the usual hardware shift register implementation, which */ -/* is what we're using (we're merely optimizing it by doing eight-bit */ -/* chunks at a time) shifts bits into the lowest-order term. In our */ -/* implementation, that means shifting towards the right. Why do we */ -/* do it this way? Because the calculated CRC must be transmitted in */ -/* order from highest-order term to lowest-order term. UARTs transmit */ -/* characters in order from LSB to MSB. By storing the CRC this way, */ -/* we hand it to the UART in the order low-byte to high-byte; the UART */ -/* sends each low-bit to high-bit; and the result is transmission bit */ -/* by bit from highest- to lowest-order term without requiring any bit */ -/* shuffling on our part. Reception works similarly. */ - -/* The feedback terms table consists of 256, 32-bit entries. Notes: */ -/* */ -/* 1. The table can be generated at runtime if desired; code to do so */ -/* is shown later. It might not be obvious, but the feedback */ -/* terms simply represent the results of eight shift/xor opera- */ -/* tions for all combinations of data and CRC register values. */ -/* */ -/* 2. The CRC accumulation logic is the same for all CRC polynomials, */ -/* be they sixteen or thirty-two bits wide. You simply choose the */ -/* appropriate table. Alternatively, because the table can be */ -/* generated at runtime, you can start by generating the table for */ -/* the polynomial in question and use exactly the same "updcrc", */ -/* if your application needn't simultaneously handle two CRC */ -/* polynomials. (Note, however, that XMODEM is strange.) */ -/* */ -/* 3. For 16-bit CRCs, the table entries need be only 16 bits wide; */ -/* of course, 32-bit entries work OK if the high 16 bits are zero. */ -/* */ -/* 4. The values must be right-shifted by eight bits by the "updcrc" */ -/* logic; the shift must be unsigned (bring in zeroes). On some */ -/* hardware you could probably optimize the shift in assembler by */ -/* using byte-swap instructions. */ - - -DWORD calc_crc32(int fd) -{ -#define UPDC32(octet,crc) (crc_32_tab[((crc) ^ (octet)) & 0xff] ^ ((crc) >> 8)) - static const DWORD crc_32_tab[] = - { /* CRC polynomial 0xedb88320 */ - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d - }; - int i, r; - unsigned char buffer[8192]; - DWORD crc = ~0; - - lseek(fd, 0, SEEK_SET); - while ((r = read(fd, buffer, sizeof(buffer))) > 0) - { - for (i = 0; i < r; i++) crc = UPDC32(buffer[i], crc); - } - return ~crc; -#undef UPDC32 -} diff --git a/dll/win32/dbghelp/dbghelp.c b/dll/win32/dbghelp/dbghelp.c index b4f435fd584..40bcb3dd229 100644 --- a/dll/win32/dbghelp/dbghelp.c +++ b/dll/win32/dbghelp/dbghelp.c @@ -21,7 +21,9 @@ #ifndef DBGHELP_STATIC_LIB #include "config.h" +#include <unistd.h> #include "dbghelp_private.h" +#include "winternl.h" #include "winerror.h" #include "psapi.h" #include "wine/debug.h" @@ -38,15 +40,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); * - support for symbols' types is still partly missing * + C++ support * + we should store the underlying type for an enum in the symt_enum struct - * + for enums, we store the names & values (associated to the enum type), + * + for enums, we store the names & values (associated to the enum type), * but those values are not directly usable from a debugger (that's why, I - * assume, that we have also to define constants for enum values, as + * assume, that we have also to define constants for enum values, as * Codeview does BTW. * + SymEnumTypes should only return *user* defined types (UDT, typedefs...) not * all the types stored/used in the modules (like char*) * - SymGetLine{Next|Prev} don't work as expected (they don't seem to work across * functions, and even across function blocks...). Basically, for *Next* to work - * it requires an address after the prolog of the func (the base address of the + * it requires an address after the prolog of the func (the base address of the * func doesn't work) * - most options (dbghelp_options) are not used (loading lines...) * - in symbol lookup by name, we don't use RE everywhere we should. Moreover, when @@ -58,13 +60,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); * while processing a function's parameters * + add support for function-less labels (as MSC seems to define them) * + C++ management - * - stabs: + * - stabs: * + when, in a same module, the same definition is used in several compilation - * units, we get several definitions of the same object (especially + * units, we get several definitions of the same object (especially * struct/union). we should find a way not to duplicate them * + in some cases (dlls/user/dialog16.c DIALOG_GetControl16), the same static * global variable is defined several times (at different scopes). We are - * getting several of those while looking for a unique symbol. Part of the + * getting several of those while looking for a unique symbol. Part of the * issue is that we don't give a scope to a static variable inside a function * + C++ management */ @@ -187,7 +189,7 @@ BOOL WINAPI SymSetSearchPathW(HANDLE hProcess, PCWSTR searchPath) if (!searchPath) return FALSE; HeapFree(GetProcessHeap(), 0, pcs->search_path); - pcs->search_path = lstrcpyW(HeapAlloc(GetProcessHeap(), 0, + pcs->search_path = lstrcpyW(HeapAlloc(GetProcessHeap(), 0, (lstrlenW(searchPath) + 1) * sizeof(WCHAR)), searchPath); return TRUE; @@ -295,7 +297,7 @@ static BOOL check_live_target(struct process* pcs) * our internal ELF modules representation (loading / unloading). This way, * we'll pair every loaded builtin PE module with its ELF counterpart (and * access its debug information). - * - if fInvadeProcess (in SymInitialize) is FALSE, we check anyway if the + * - if fInvadeProcess (in SymInitialize) is FALSE, we check anyway if the * hProcess refers to a running process. We use some heuristics here, so YMMV. * If we detect a live target, then we get the same handling as if * fInvadeProcess is TRUE (except that the modules are not loaded). Otherwise, @@ -303,7 +305,7 @@ static BOOL check_live_target(struct process* pcs) * counterpart. Hence we won't be able to provide the requested debug * information. We'll however be able to load native PE modules (and their * debug information) without any trouble. - * Note also that this scheme can be intertwined with the deferred loading + * Note also that this scheme can be intertwined with the deferred loading * mechanism (ie only load the debug information when we actually need it). */ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeProcess) @@ -336,7 +338,7 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP if (UserSearchPath) { - pcs->search_path = lstrcpyW(HeapAlloc(GetProcessHeap(), 0, + pcs->search_path = lstrcpyW(HeapAlloc(GetProcessHeap(), 0, (lstrlenW(UserSearchPath) + 1) * sizeof(WCHAR)), UserSearchPath); } @@ -373,7 +375,7 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP pcs->dbg_hdr_addr = 0; pcs->next = process_first; process_first = pcs; - + #ifndef DBGHELP_STATIC_LIB if (check_live_target(pcs)) { @@ -661,11 +663,11 @@ static BOOL sym_register_cb(HANDLE hProcess, /*********************************************************************** * SymRegisterCallback (DBGHELP.@) */ -BOOL WINAPI SymRegisterCallback(HANDLE hProcess, +BOOL WINAPI SymRegisterCallback(HANDLE hProcess, PSYMBOL_REGISTERED_CALLBACK CallbackFunction, PVOID UserContext) { - TRACE("(%p, %p, %p)\n", + TRACE("(%p, %p, %p)\n", hProcess, CallbackFunction, UserContext); return sym_register_cb(hProcess, reg_cb64to32, CallbackFunction, (DWORD_PTR)UserContext, FALSE); } @@ -673,11 +675,11 @@ BOOL WINAPI SymRegisterCallback(HANDLE hProcess, /*********************************************************************** * SymRegisterCallback64 (DBGHELP.@) */ -BOOL WINAPI SymRegisterCallback64(HANDLE hProcess, +BOOL WINAPI SymRegisterCallback64(HANDLE hProcess, PSYMBOL_REGISTERED_CALLBACK64 CallbackFunction, ULONG64 UserContext) { - TRACE("(%p, %p, %s)\n", + TRACE("(%p, %p, %s)\n", hProcess, CallbackFunction, wine_dbgstr_longlong(UserContext)); return sym_register_cb(hProcess, CallbackFunction, NULL, UserContext, FALSE); } @@ -685,11 +687,11 @@ BOOL WINAPI SymRegisterCallback64(HANDLE hProcess, /*********************************************************************** * SymRegisterCallbackW64 (DBGHELP.@) */ -BOOL WINAPI SymRegisterCallbackW64(HANDLE hProcess, +BOOL WINAPI SymRegisterCallbackW64(HANDLE hProcess, PSYMBOL_REGISTERED_CALLBACK64 CallbackFunction, ULONG64 UserContext) { - TRACE("(%p, %p, %s)\n", + TRACE("(%p, %p, %s)\n", hProcess, CallbackFunction, wine_dbgstr_longlong(UserContext)); return sym_register_cb(hProcess, CallbackFunction, NULL, UserContext, TRUE); } @@ -736,3 +738,18 @@ void WINAPI WinDbgExtensionDllInit(PWINDBG_EXTENSION_APIS lpExtensionApis, unsigned short major, unsigned short minor) { } + +#ifndef DBGHELP_STATIC_LIB +DWORD calc_crc32(int fd) +{ + BYTE buffer[8192]; + DWORD crc = 0; + int len; + + lseek(fd, 0, SEEK_SET); + while ((len = read(fd, buffer, sizeof(buffer))) > 0) + crc = RtlComputeCrc32(crc, buffer, len); + return crc; +} +#endif + diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h index faaa1f6f2aa..27cb8f2f453 100644 --- a/dll/win32/dbghelp/dbghelp_private.h +++ b/dll/win32/dbghelp/dbghelp_private.h @@ -616,8 +616,6 @@ extern BOOL pcs_callback(const struct process* pcs, ULONG action, void* extern void* fetch_buffer(struct process* pcs, unsigned size) DECLSPEC_HIDDEN; extern const char* wine_dbgstr_addr(const ADDRESS64* addr) DECLSPEC_HIDDEN; extern struct cpu* cpu_find(DWORD) DECLSPEC_HIDDEN; - -/* crc32.c */ extern DWORD calc_crc32(int fd) DECLSPEC_HIDDEN; typedef BOOL (*enum_modules_cb)(const WCHAR*, unsigned long addr, void* user); diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index a61233b26a1..4eeac48bfa8 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: 4aa7fbe0561e6a27f098a05a63c5a7d12397e678 + wine: a91b0faefd801d44063c8d9289dbc69de985f8b6

4 years

[reactos] 69/179: [WINESYNC] dbghelp: Return a dos path from SymGetLineFromAddr.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70880dd15f06e257234c9… commit 70880dd15f06e257234c9ef66e4826f9b8026834 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 16:13:16 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:42 2020 +0200 [WINESYNC] dbghelp: Return a dos path from SymGetLineFromAddr. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34687 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 4aa7fbe0561e6a27f098a05a63c5a7d12397e678 by Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dll/win32/dbghelp/compat.h | 17 ++++++++++------- dll/win32/dbghelp/symbol.c | 14 +++++++++++++- sdk/tools/rsym/rsym.c | 1 + sdk/tools/winesync/dbghelp.cfg | 2 +- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dll/win32/dbghelp/compat.h b/dll/win32/dbghelp/compat.h index e281347d0ee..b249fe1ef79 100644 --- a/dll/win32/dbghelp/compat.h +++ b/dll/win32/dbghelp/compat.h @@ -50,6 +50,8 @@ static __inline const char *debugstr_wn( const WCHAR *s, int n ) { return wine_d static __inline const char *debugstr_a( const char *s ) { return wine_dbgstr_an( s, -1 ); } static __inline const char *debugstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } static __inline const char *wine_dbgstr_w( const WCHAR *s ){return wine_dbgstr_wn( s, -1 );} +/* This should never be called */ +#define wine_get_dos_file_name(__x) (assert(0), NULL) #if 0 #define WARN(fmt, ...) fprintf(stderr, "WARN %s: " fmt, __FUNCTION__, ##__VA_ARGS__) @@ -829,6 +831,13 @@ typedef struct _IMAGEHLP_LINE64 PCHAR FileName; DWORD64 Address; } IMAGEHLP_LINE64, *PIMAGEHLP_LINE64; +typedef enum +{ + SYMOPT_EX_DISABLEACCESSTIMEUPDATE, + SYMOPT_EX_MAX, +/* __WINESRC__ */ + SYMOPT_EX_WINE_NATIVE_MODULES = 1000 +} IMAGEHLP_EXTENDED_OPTIONS; typedef struct _SRCCODEINFO { DWORD SizeOfStruct; @@ -859,6 +868,7 @@ PVOID WINAPI SymFunctionTableAccess64(HANDLE, DWORD64); BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address, DWORD64* Displacement, PSYMBOL_INFO Symbol); BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, PCSTR srcfile, PSYM_ENUMLINES_CALLBACK cb, PVOID user); DWORD WINAPI SymSetOptions(DWORD opts); +BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value); BOOL WINAPI SymGetLineFromAddr64(HANDLE hProcess, DWORD64 dwAddr, PDWORD pdwDisplacement, PIMAGEHLP_LINE64 Line); typedef BOOL (CALLBACK *PFIND_EXE_FILE_CALLBACKW)(HANDLE, PCWSTR, PVOID); #define FindExecutableImageExW __FindExecutableImageExW @@ -1296,13 +1306,6 @@ typedef struct API_VERSION USHORT Revision; USHORT Reserved; } API_VERSION, *LPAPI_VERSION; -typedef enum -{ - SYMOPT_EX_DISABLEACCESSTIMEUPDATE, - SYMOPT_EX_MAX, -/* __WINESRC__ */ - SYMOPT_EX_WINE_NATIVE_MODULES = 1000 -} IMAGEHLP_EXTENDED_OPTIONS; // cvconst.h /* symbols & types enumeration */ diff --git a/dll/win32/dbghelp/symbol.c b/dll/win32/dbghelp/symbol.c index 8db6d403f0c..56cb673312b 100644 --- a/dll/win32/dbghelp/symbol.c +++ b/dll/win32/dbghelp/symbol.c @@ -1502,7 +1502,19 @@ BOOL symt_fill_func_line_info(const struct module* module, const struct symt_fun } if (found) { - line->FileName = (char*)source_get(module, dli->u.source_file); + if (dbghelp_opt_native) + { + /* Return native file paths when using winedbg */ + line->FileName = (char*)source_get(module, dli->u.source_file); + } + else + { + WCHAR *dospath = wine_get_dos_file_name(source_get(module, dli->u.source_file)); + DWORD len = WideCharToMultiByte(CP_ACP, 0, dospath, -1, NULL, 0, NULL, NULL); + line->FileName = fetch_buffer(module->process, len); + WideCharToMultiByte(CP_ACP, 0, dospath, -1, line->FileName, len, NULL, NULL); + HeapFree( GetProcessHeap(), 0, dospath ); + } return TRUE; } } diff --git a/sdk/tools/rsym/rsym.c b/sdk/tools/rsym/rsym.c index 9435c21a464..192d46cdf63 100644 --- a/sdk/tools/rsym/rsym.c +++ b/sdk/tools/rsym/rsym.c @@ -1357,6 +1357,7 @@ int main(int argc, char* argv[]) // SYMOPT_LOAD_ANYTHING // SYMOPT_LOAD_LINES SymSetOptions(0x10000 | 0x800000 | 0x40 | 0x10); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); SymInitialize(FileData, ".", 0); module_base = SymLoadModule(FileData, file, path1, path1, 0, FileSize) & 0xffffffff; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index bc21b3b4ddf..a61233b26a1 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: 101820d01a1c776e4b6ff42e661ac3a1380f10c7 + wine: 4aa7fbe0561e6a27f098a05a63c5a7d12397e678

4 years

[reactos] 68/179: [WINESYNC] dbghelp: Use internal flag for loading native files.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8267536c444abb812f86… commit d8267536c444abb812f86cb635eff3067798767a Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 16:10:10 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:42 2020 +0200 [WINESYNC] dbghelp: Use internal flag for loading native files. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 101820d01a1c776e4b6ff42e661ac3a1380f10c7 by Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dll/win32/dbghelp/dbghelp_private.h | 3 --- dll/win32/dbghelp/module.c | 2 +- dll/win32/dbghelp/symbol.c | 4 ++-- sdk/tools/winesync/dbghelp.cfg | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h index e5b3bfce8ed..faaa1f6f2aa 100644 --- a/dll/win32/dbghelp/dbghelp_private.h +++ b/dll/win32/dbghelp/dbghelp_private.h @@ -129,9 +129,6 @@ void* hash_table_iter_up(struct hash_table_iter* hti) DECLSPEC_HIDDEN; extern unsigned dbghelp_options DECLSPEC_HIDDEN; extern BOOL dbghelp_opt_native DECLSPEC_HIDDEN; -/* some more Wine extensions */ -#define SYMOPT_WINE_WITH_NATIVE_MODULES 0x40000000 - enum location_kind {loc_error, /* reg is the error code */ loc_unavailable, /* location is not available */ loc_absolute, /* offset is the location */ diff --git a/dll/win32/dbghelp/module.c b/dll/win32/dbghelp/module.c index c99b957f254..4dca1cf0a9b 100644 --- a/dll/win32/dbghelp/module.c +++ b/dll/win32/dbghelp/module.c @@ -859,7 +859,7 @@ BOOL WINAPI SymEnumerateModulesW64(HANDLE hProcess, for (module = pcs->lmodules; module; module = module->next) { - if (!(dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) && + if (!dbghelp_opt_native && (module->type == DMT_ELF || module->type == DMT_MACHO)) continue; if (!EnumModulesCallback(module->modulename, diff --git a/dll/win32/dbghelp/symbol.c b/dll/win32/dbghelp/symbol.c index 450e35faf70..8db6d403f0c 100644 --- a/dll/win32/dbghelp/symbol.c +++ b/dll/win32/dbghelp/symbol.c @@ -1086,7 +1086,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR Mask, } /* not found in PE modules, retry on the ELF ones */ - if (!pair.requested && (dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES)) + if (!pair.requested && dbghelp_opt_native) { for (pair.requested = pair.pcs->lmodules; pair.requested; pair.requested = pair.requested->next) { @@ -1417,7 +1417,7 @@ BOOL WINAPI SymFromName(HANDLE hProcess, PCSTR Name, PSYMBOL_INFO Symbol) } /* not found in PE modules, retry on the ELF ones */ - if (dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) + if (dbghelp_opt_native) { for (module = pcs->lmodules; module; module = module->next) { diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index b503937e428..bc21b3b4ddf 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: fa5e5df71db231f6fca9c7a40792c17e9bbe5027 + wine: 101820d01a1c776e4b6ff42e661ac3a1380f10c7

4 years

[reactos] 67/179: [WINESYNC] dbghelp: SymSet/GetExtendedOption support a WINE only option.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=006ce9607c5995d06ab2e… commit 006ce9607c5995d06ab2e4f9398a509a1d723a19 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 16:06:06 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:41 2020 +0200 [WINESYNC] dbghelp: SymSet/GetExtendedOption support a WINE only option. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id fa5e5df71db231f6fca9c7a40792c17e9bbe5027 by Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dll/win32/dbghelp/compat.h | 4 +++- dll/win32/dbghelp/dbghelp.c | 25 ++++++++++++++++++++++--- dll/win32/dbghelp/dbghelp_private.h | 2 ++ sdk/include/psdk/dbghelp.h | 6 +++++- sdk/tools/winesync/dbghelp.cfg | 2 +- 5 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dll/win32/dbghelp/compat.h b/dll/win32/dbghelp/compat.h index 3a6137eca9a..e281347d0ee 100644 --- a/dll/win32/dbghelp/compat.h +++ b/dll/win32/dbghelp/compat.h @@ -1299,7 +1299,9 @@ typedef struct API_VERSION typedef enum { SYMOPT_EX_DISABLEACCESSTIMEUPDATE, - SYMOPT_EX_MAX + SYMOPT_EX_MAX, +/* __WINESRC__ */ + SYMOPT_EX_WINE_NATIVE_MODULES = 1000 } IMAGEHLP_EXTENDED_OPTIONS; // cvconst.h diff --git a/dll/win32/dbghelp/dbghelp.c b/dll/win32/dbghelp/dbghelp.c index 3c3350d8213..b4f435fd584 100644 --- a/dll/win32/dbghelp/dbghelp.c +++ b/dll/win32/dbghelp/dbghelp.c @@ -70,6 +70,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); */ unsigned dbghelp_options = SYMOPT_UNDNAME; +BOOL dbghelp_opt_native = FALSE; static struct process* process_first /* = NULL */; @@ -473,8 +474,19 @@ DWORD WINAPI SymGetOptions(void) */ BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value) { - FIXME("%d, %d\n", option, value); - return FALSE; + BOOL old = FALSE; + + switch(option) + { + case SYMOPT_EX_WINE_NATIVE_MODULES: + old = dbghelp_opt_native; + dbghelp_opt_native = value; + break; + default: + FIXME("Unsupported option %d with value %d\n", option, value); + } + + return old; } /****************************************************************** @@ -483,7 +495,14 @@ BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value) */ BOOL WINAPI SymGetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option) { - FIXME("%d\n", option); + switch(option) + { + case SYMOPT_EX_WINE_NATIVE_MODULES: + return dbghelp_opt_native; + default: + FIXME("Unsupported option %d\n", option); + } + return FALSE; } diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h index 565399ebcc1..e5b3bfce8ed 100644 --- a/dll/win32/dbghelp/dbghelp_private.h +++ b/dll/win32/dbghelp/dbghelp_private.h @@ -127,6 +127,8 @@ void* hash_table_iter_up(struct hash_table_iter* hti) DECLSPEC_HIDDEN; extern unsigned dbghelp_options DECLSPEC_HIDDEN; +extern BOOL dbghelp_opt_native DECLSPEC_HIDDEN; + /* some more Wine extensions */ #define SYMOPT_WINE_WITH_NATIVE_MODULES 0x40000000 diff --git a/sdk/include/psdk/dbghelp.h b/sdk/include/psdk/dbghelp.h index 549155229c5..40eca402a4a 100644 --- a/sdk/include/psdk/dbghelp.h +++ b/sdk/include/psdk/dbghelp.h @@ -2316,7 +2316,11 @@ typedef struct _IMAGE_DEBUG_INFORMATION typedef enum { SYMOPT_EX_DISABLEACCESSTIMEUPDATE, - SYMOPT_EX_MAX + SYMOPT_EX_MAX, + +#ifdef __WINESRC__ + SYMOPT_EX_WINE_NATIVE_MODULES = 1000, +#endif } IMAGEHLP_EXTENDED_OPTIONS; PIMAGE_DEBUG_INFORMATION diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 58583d4c5fe..b503937e428 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: 3fed8787251882c70eeadefb230cd2ff4b251ac2 + wine: fa5e5df71db231f6fca9c7a40792c17e9bbe5027

4 years

[reactos] 66/179: [WINESYNC] dbghelp: Add SymGetExtendedOption/SymSetExtendedOption stubs.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a20474d99dbf03e4e432… commit 1a20474d99dbf03e4e432f9407f1e9bce4a57263 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 16:03:20 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:41 2020 +0200 [WINESYNC] dbghelp: Add SymGetExtendedOption/SymSetExtendedOption stubs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 3fed8787251882c70eeadefb230cd2ff4b251ac2 by Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dll/win32/dbghelp/compat.h | 5 +++++ dll/win32/dbghelp/dbghelp.c | 20 ++++++++++++++++++++ dll/win32/dbghelp/dbghelp.spec | 2 ++ sdk/include/psdk/dbghelp.h | 8 ++++++++ sdk/tools/winesync/dbghelp.cfg | 2 +- 5 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dll/win32/dbghelp/compat.h b/dll/win32/dbghelp/compat.h index 2a212e60558..3a6137eca9a 100644 --- a/dll/win32/dbghelp/compat.h +++ b/dll/win32/dbghelp/compat.h @@ -1296,6 +1296,11 @@ typedef struct API_VERSION USHORT Revision; USHORT Reserved; } API_VERSION, *LPAPI_VERSION; +typedef enum +{ + SYMOPT_EX_DISABLEACCESSTIMEUPDATE, + SYMOPT_EX_MAX +} IMAGEHLP_EXTENDED_OPTIONS; // cvconst.h /* symbols & types enumeration */ diff --git a/dll/win32/dbghelp/dbghelp.c b/dll/win32/dbghelp/dbghelp.c index 76ea6e62470..3c3350d8213 100644 --- a/dll/win32/dbghelp/dbghelp.c +++ b/dll/win32/dbghelp/dbghelp.c @@ -467,6 +467,26 @@ DWORD WINAPI SymGetOptions(void) return dbghelp_options; } +/****************************************************************** + * SymSetExtendedOption (DBGHELP.@) + * + */ +BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value) +{ + FIXME("%d, %d\n", option, value); + return FALSE; +} + +/****************************************************************** + * SymGetExtendedOption (DBGHELP.@) + * + */ +BOOL WINAPI SymGetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option) +{ + FIXME("%d\n", option); + return FALSE; +} + /****************************************************************** * SymSetParentWindow (DBGHELP.@) * diff --git a/dll/win32/dbghelp/dbghelp.spec b/dll/win32/dbghelp/dbghelp.spec index 95cebca63d8..880015fa066 100644 --- a/dll/win32/dbghelp/dbghelp.spec +++ b/dll/win32/dbghelp/dbghelp.spec @@ -83,6 +83,7 @@ @ stdcall SymFromTokenW(ptr double long ptr) @ stdcall SymFunctionTableAccess(long long) @ stdcall SymFunctionTableAccess64(long int64) +@ stdcall SymGetExtendedOption(long) @ stdcall SymGetFileLineOffsets64(ptr str str ptr long) @ stdcall SymGetHomeDirectory(long str ptr) @ stdcall SymGetHomeDirectoryW(long str ptr) @@ -157,6 +158,7 @@ @ stdcall SymSearch(long int64 long long str int64 ptr ptr long) @ stdcall SymSearchW(long int64 long long wstr int64 ptr ptr long) @ stdcall SymSetContext(long ptr ptr) +@ stdcall SymSetExtendedOption(long long) @ stdcall SymSetHomeDirectory(long str) @ stdcall SymSetHomeDirectoryW(long wstr) @ stdcall SymSetOptions(long) diff --git a/sdk/include/psdk/dbghelp.h b/sdk/include/psdk/dbghelp.h index 00843b69978..549155229c5 100644 --- a/sdk/include/psdk/dbghelp.h +++ b/sdk/include/psdk/dbghelp.h @@ -2313,6 +2313,11 @@ typedef struct _IMAGE_DEBUG_INFORMATION DWORD Reserved[ 2 ]; } IMAGE_DEBUG_INFORMATION, *PIMAGE_DEBUG_INFORMATION; +typedef enum +{ + SYMOPT_EX_DISABLEACCESSTIMEUPDATE, + SYMOPT_EX_MAX +} IMAGEHLP_EXTENDED_OPTIONS; PIMAGE_DEBUG_INFORMATION WINAPI @@ -2327,6 +2332,9 @@ BOOL WINAPI UnmapDebugInformation(_Out_ PIMAGE_DEBUG_INFORMATION); DWORD WINAPI SymGetOptions(void); DWORD WINAPI SymSetOptions(_In_ DWORD); +BOOL WINAPI SymGetExtendedOption(_In_ IMAGEHLP_EXTENDED_OPTIONS option); +BOOL WINAPI SymSetExtendedOption(_In_ IMAGEHLP_EXTENDED_OPTIONS option, _In_ BOOL value); + BOOL WINAPI SymSetParentWindow(_In_ HWND); BOOL diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index fb8b2e28649..58583d4c5fe 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: 48a74277f5f9e0c87d8c01457236a89d94cb71d3 + wine: 3fed8787251882c70eeadefb230cd2ff4b251ac2

4 years

[reactos] 65/179: [WINESYNC] dbghelp: Support S_HEAPALLOCSITE entry.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9bc55610e2ba23a5bd1b… commit f9bc55610e2ba23a5bd1b3d3e84c61cf335aab5a Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 16:03:20 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:41 2020 +0200 [WINESYNC] dbghelp: Support S_HEAPALLOCSITE entry. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 48a74277f5f9e0c87d8c01457236a89d94cb71d3 by Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dll/win32/dbghelp/msc.c | 5 +++++ sdk/include/reactos/wine/mscvpdb.h | 10 ++++++++++ sdk/tools/winesync/dbghelp.cfg | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dll/win32/dbghelp/msc.c b/dll/win32/dbghelp/msc.c index 54fbe36596c..4be0cb244da 100644 --- a/dll/win32/dbghelp/msc.c +++ b/dll/win32/dbghelp/msc.c @@ -2011,6 +2011,11 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo case S_ALIGN_V1: TRACE("S-Align V1\n"); break; + case S_HEAPALLOCSITE: + TRACE("heap site: offset=0x%08x at sect_idx 0x%04x, inst_len 0x%08x, index 0x%08x\n", + sym->heap_alloc_site.offset, sym->heap_alloc_site.sect_idx, + sym->heap_alloc_site.inst_len, sym->heap_alloc_site.index); + break; /* the symbols we can safely ignore for now */ case S_TRAMPOLINE: diff --git a/sdk/include/reactos/wine/mscvpdb.h b/sdk/include/reactos/wine/mscvpdb.h index af521ffe56f..29d67bec4a3 100644 --- a/sdk/include/reactos/wine/mscvpdb.h +++ b/sdk/include/reactos/wine/mscvpdb.h @@ -1646,6 +1646,16 @@ union codeview_symbol unsigned short eh_sect; /* section for exception handler */ unsigned int flags; } frame_info_v2; + + struct + { + unsigned short len; + unsigned short id; + unsigned int offset; + unsigned short sect_idx; + unsigned short inst_len; + unsigned int index; + } heap_alloc_site; }; #define S_COMPILAND_V1 0x0001 diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 7fe31aca91f..fb8b2e28649 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: 594a5878d0ac3b5a3aa31c27b0651b7f4bd175e1 + wine: 48a74277f5f9e0c87d8c01457236a89d94cb71d3

4 years

← Newer
1
...
18
19
20
21
22
23
24
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2020