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

Zebediah Figura : kernel32/tests: Add more tests for deleting and replacing open files.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: faebd0ce1415d36f0fead47e69a0e5c70e1470c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faebd0ce1415d36f0fead47e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 28 23:09:34 2020 -0500 kernel32/tests: Add more tests for deleting and replacing open files. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 70 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 90338f52d1..41d03c14fa 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1795,7 +1795,8 @@ static void test_DeleteFileA( void ) { BOOL ret; char temp_path[MAX_PATH], temp_file[MAX_PATH]; - HANDLE hfile; + HANDLE hfile, mapping; + char **argv; ret = DeleteFileA(NULL); ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER || @@ -1842,6 +1843,28 @@ static void test_DeleteFileA( void ) "Expected ERROR_ACCESS_DENIED, got error %d\n", GetLastError()); ret = RemoveDirectoryA("testdir"); ok(ret, "Remove a directory failed, got error %d\n", GetLastError()); + + winetest_get_mainargs(&argv); + + ret = CopyFileA(argv[0], temp_file, FALSE); + ok(ret, "got error %u\n", GetLastError()); + hfile = CreateFileA(temp_file, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + mapping = CreateFileMappingA(hfile, NULL, PAGE_READONLY | SEC_IMAGE, 0, 0, NULL); + ok(!!mapping, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DeleteFileA(temp_file); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + CloseHandle(mapping); + + ret = DeleteFileA(temp_file); + ok(ret, "got error %u\n", GetLastError()); + + CloseHandle(hfile); } static void test_DeleteFileW( void ) @@ -3540,7 +3563,7 @@ static BOOL check_file_time( const FILETIME *ft1, const FILETIME *ft2, UINT tole static void test_ReplaceFileA(void) { char replaced[MAX_PATH], replacement[MAX_PATH], backup[MAX_PATH]; - HANDLE hReplacedFile, hReplacementFile, hBackupFile; + HANDLE hReplacedFile, hReplacementFile, hBackupFile, mapping; static const char replacedData[] = "file-to-replace"; static const char replacementData[] = "new-file"; static const char backupData[] = "backup-file"; @@ -3549,6 +3572,7 @@ static void test_ReplaceFileA(void) char temp_path[MAX_PATH]; DWORD ret; BOOL retok, removeBackup = FALSE; + char **argv; if (!pReplaceFileA) { @@ -3786,6 +3810,43 @@ static void test_ReplaceFileA(void) broken(GetLastError() == ERROR_ACCESS_DENIED), /* win2k */ "DeleteFileA: error (backup) %d\n", GetLastError()); } + + ret = GetTempFileNameA(temp_path, prefix, 0, replaced); + ok(ret, "got error %u\n", GetLastError()); + hReplacedFile = CreateFileA(replaced, 0, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacedFile != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + ret = GetTempFileNameA(temp_path, prefix, 0, replacement); + ok(ret, "got error %u\n", GetLastError()); + + ret = ReplaceFileA(replaced, replacement, NULL, 0, 0, 0); + ok(ret, "got error %u\n", GetLastError()); + + CloseHandle(hReplacedFile); + ret = DeleteFileA(replaced); + ok(ret, "got error %u\n", GetLastError()); + + winetest_get_mainargs(&argv); + + ret = CopyFileA(argv[0], replaced, FALSE); + ok(ret, "got error %u\n", GetLastError()); + hReplacedFile = CreateFileA(replaced, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacedFile != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + mapping = CreateFileMappingA(hReplacedFile, NULL, PAGE_READONLY | SEC_IMAGE, 0, 0, NULL); + ok(!!mapping, "got error %u\n", GetLastError()); + + ret = GetTempFileNameA(temp_path, prefix, 0, replacement); + ok(ret, "got error %u\n", GetLastError()); + + ret = ReplaceFileA(replaced, replacement, NULL, 0, 0, 0); + todo_wine ok(ret, "got error %u\n", GetLastError()); + + CloseHandle(mapping); + CloseHandle(hReplacedFile); + ret = DeleteFileA(replaced); + todo_wine ok(ret, "got error %u\n", GetLastError()); } /* @@ -3847,9 +3908,10 @@ static void test_ReplaceFileW(void) ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "SetFileAttributesW: error setting to read only %d\n", GetLastError()); + SetLastError(0xdeadbeef); ret = pReplaceFileW(replaced, replacement, backup, 0, 0, 0); - ok(ret != ERROR_UNABLE_TO_REMOVE_REPLACED, - "ReplaceFileW: unexpected error %d\n", GetLastError()); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); ret = SetFileAttributesW(replaced, FILE_ATTRIBUTE_NORMAL); ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "SetFileAttributesW: error setting to normal %d\n", GetLastError());

1 0

Zebediah Figura : kernel32: Don't fail ReplaceFile() if unable to delete a generated backup.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: bae4776c571cf975be1689594f4caf93ad23e0ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=bae4776c571cf975be168959… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 28 23:09:35 2020 -0500 kernel32: Don't fail ReplaceFile() if unable to delete a generated backup. Windows will just leave the file if unable to delete it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 6 +----- dlls/kernel32/tests/file.c | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 2a2ace5dd8..3b2d82cc37 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -507,11 +507,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa || !MoveFileExW( lpReplacedFileName, temp_file, MOVEFILE_REPLACE_EXISTING )) return FALSE; - if (!DeleteFileW( temp_file )) - { - SetLastError( ERROR_UNABLE_TO_REMOVE_REPLACED ); - return FALSE; - } + DeleteFileW( temp_file ); } /* diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 41d03c14fa..e8a31c6e74 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3841,12 +3841,12 @@ static void test_ReplaceFileA(void) ok(ret, "got error %u\n", GetLastError()); ret = ReplaceFileA(replaced, replacement, NULL, 0, 0, 0); - todo_wine ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %u\n", GetLastError()); CloseHandle(mapping); CloseHandle(hReplacedFile); ret = DeleteFileA(replaced); - todo_wine ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %u\n", GetLastError()); } /*

1 0

Jacek Caban : dbghelp: Pass module to map_dwarf_register.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 5d8067c6088a30cdb4fe6945e6ae1cda0da85467 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d8067c6088a30cdb4fe6945… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:00:21 2020 +0200 dbghelp: Pass module to map_dwarf_register. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_arm.c | 2 +- dlls/dbghelp/cpu_arm64.c | 2 +- dlls/dbghelp/cpu_i386.c | 2 +- dlls/dbghelp/cpu_ppc.c | 2 +- dlls/dbghelp/cpu_x86_64.c | 2 +- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/dwarf.c | 84 +++++++++++++++++++++--------------------- 7 files changed, 48 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d8067c6088a30cdb4fe…

1 0

Jacek Caban : dbghelp: Use DWARF registry mapping quirk only for actual macho modules.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 3b6c268380d703079fa3c5ca06f67b6feb02487f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b6c268380d703079fa3c5ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:01:02 2020 +0200 dbghelp: Use DWARF registry mapping quirk only for actual macho modules. Fixes handling DWARF in PE on macOS. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_i386.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 6636d445c5..fd808a0d32 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -520,13 +520,11 @@ static unsigned i386_map_dwarf_register(unsigned regno, const struct module* mod case 3: reg = CV_REG_EBX; break; case 4: case 5: -#ifdef __APPLE__ /* On OS X, DWARF eh_frame uses a different mapping for the registers. It's apparently the mapping as emitted by GCC, at least at some point in its history. */ - if (eh_frame) + if (eh_frame && module->type == DMT_MACHO) reg = (regno == 4) ? CV_REG_EBP : CV_REG_ESP; else -#endif reg = (regno == 4) ? CV_REG_ESP : CV_REG_EBP; break; case 6: reg = CV_REG_ESI; break;

1 0

Jacek Caban : dbghelp: Provide N_PEXT and N_SECT defines when not available.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 208719a7507c41b77d3db9f6b8ffbcc5a4e02f3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=208719a7507c41b77d3db9f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:01:33 2020 +0200 dbghelp: Provide N_PEXT and N_SECT defines when not available. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/stabs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index ac3209c37b..744ccfa9df 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -69,6 +69,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); #ifndef N_STAB #define N_STAB 0xe0 #endif +#ifndef N_PEXT +#define N_PEXT 0x10 +#endif #ifndef N_TYPE #define N_TYPE 0x1e #endif @@ -83,6 +86,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); #ifndef N_ABS #define N_ABS 0x02 #endif +#ifndef N_SECT +#define N_SECT 0x0e +#endif #define N_GSYM 0x20 #define N_FUN 0x24 @@ -1643,16 +1649,13 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, /* Always ignore these, they seem to be used only on Darwin. */ break; case N_ABS: -#ifdef N_SECT case N_SECT: -#endif /* FIXME: Other definition types (N_TEXT, N_DATA, N_BSS, ...)? */ if (callback) { BOOL is_public = (stab_ptr->n_type & N_EXT); BOOL is_global = is_public; -#ifdef N_PEXT /* "private extern"; shared among compilation units in a shared * library, but not accessible from outside the library. */ if (stab_ptr->n_type & N_PEXT) @@ -1660,7 +1663,6 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, is_public = FALSE; is_global = TRUE; } -#endif if (*ptr == '_') ptr++; stab_strcpy(symname, sizeof(symname), ptr);

1 0

Jacek Caban : dbghelp: Use local stab_nlist declaration in macho_module.c.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 061146c2ab530a54f8323331e88c5771dd7bba49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=061146c2ab530a54f8323331… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:02:23 2020 +0200 dbghelp: Use local stab_nlist declaration in macho_module.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 9 +++++++++ dlls/dbghelp/macho_module.c | 2 +- dlls/dbghelp/stabs.c | 10 +--------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index d3c154b713..2b094d6db5 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -134,6 +134,15 @@ struct image_section_map LONG_PTR sidx; }; +struct stab_nlist +{ + unsigned n_strx; + unsigned char n_type; + char n_other; + short n_desc; + unsigned n_value; +}; + BOOL image_check_alternate(struct image_file_map* fmap, const struct module* module) DECLSPEC_HIDDEN; BOOL elf_map_handle(HANDLE handle, struct image_file_map* fmap) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index d10e402de2..ff7cf2b3c0 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -932,7 +932,7 @@ static int macho_parse_symtab(struct image_file_map* ifm, struct macho_debug_info* mdi = user; const char* stabstr; int ret = 0; - size_t stabsize = (ifm->addr_size == 32) ? sizeof(struct nlist) : sizeof(struct nlist_64); + size_t stabsize = (ifm->addr_size == 32) ? sizeof(struct stab_nlist) : sizeof(struct nlist_64); const char *stab; TRACE("(%p/%p, %p, %p) %u syms at 0x%08x, strings 0x%08x - 0x%08x\n", fmap, fmap->handle, lc, diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index fedb1084ab..6b15ca1f0d 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -60,6 +60,7 @@ #include "winnls.h" #include "dbghelp_private.h" +#include "image_private.h" #include "wine/debug.h" @@ -112,15 +113,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); #define N_EXCL 0xc2 #define N_RBRAC 0xe0 -struct stab_nlist -{ - unsigned n_strx; - unsigned char n_type; - char n_other; - short n_desc; - unsigned n_value; -}; - static void stab_strcpy(char* dest, int sz, const char* source) { char* ptr = dest;

1 0

Jacek Caban : dbghelp: Use local declaration for 64-bit macho nlist.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: f48f8cc39980f2d93015ecd56f28e3e9f52843fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=f48f8cc39980f2d93015ecd5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:03:04 2020 +0200 dbghelp: Use local declaration for 64-bit macho nlist. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 9 +++++++++ dlls/dbghelp/macho_module.c | 2 +- dlls/dbghelp/stabs.c | 17 ++--------------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 2b094d6db5..13af7524fe 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -143,6 +143,15 @@ struct stab_nlist unsigned n_value; }; +struct macho64_nlist +{ + unsigned n_strx; + unsigned char n_type; + char n_other; + short n_desc; + UINT64 n_value; +}; + BOOL image_check_alternate(struct image_file_map* fmap, const struct module* module) DECLSPEC_HIDDEN; BOOL elf_map_handle(HANDLE handle, struct image_file_map* fmap) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index ff7cf2b3c0..ab88d27108 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -932,7 +932,7 @@ static int macho_parse_symtab(struct image_file_map* ifm, struct macho_debug_info* mdi = user; const char* stabstr; int ret = 0; - size_t stabsize = (ifm->addr_size == 32) ? sizeof(struct stab_nlist) : sizeof(struct nlist_64); + size_t stabsize = (ifm->addr_size == 32) ? sizeof(struct stab_nlist) : sizeof(struct macho64_nlist); const char *stab; TRACE("(%p/%p, %p, %p) %u syms at 0x%08x, strings 0x%08x - 0x%08x\n", fmap, fmap->handle, lc, diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 6b15ca1f0d..b2da8f866b 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -34,27 +34,14 @@ #include <sys/types.h> #include <fcntl.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif #include <limits.h> #include <stdint.h> #include <stdlib.h> #include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #include <stdio.h> #include <assert.h> #include <stdarg.h> -#ifdef HAVE_MACH_O_NLIST_H -# include <mach-o/nlist.h> -#endif - #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -1290,7 +1277,7 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, #ifdef __APPLE__ if (module->process->is_64bit) - stabsize = sizeof(struct nlist_64); + stabsize = sizeof(struct macho64_nlist); #endif nstab = stablen / stabsize; strs_end = strs + strtablen; @@ -1314,7 +1301,7 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, n_value = stab_ptr->n_value; #ifdef __APPLE__ if (module->process->is_64bit) - n_value = ((struct nlist_64 *)stab_ptr)->n_value; + n_value = ((struct macho64_nlist *)stab_ptr)->n_value; #endif ptr = strs + stab_ptr->n_strx; if ((ptr > strs_end) || (ptr + strlen(ptr) > strs_end))

1 0

Jacek Caban : dbghelp: Pass stab size to stabs_parse.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 9c2cedabc7c7b48c4f9042d444c45a3036cfd4be URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c2cedabc7c7b48c4f9042d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:03:34 2020 +0200 dbghelp: Pass stab size to stabs_parse. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 2 +- dlls/dbghelp/macho_module.c | 2 +- dlls/dbghelp/pe_module.c | 2 +- dlls/dbghelp/stabs.c | 15 ++------------- 5 files changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 6d6f6c7614..73b9cf9c8c 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -694,7 +694,7 @@ typedef void (*stabs_def_cb)(struct module* module, ULONG_PTR load_offset, BOOL is_public, BOOL is_global, unsigned char other, struct symt_compiland* compiland, void* user); extern BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, - const char* stabs, int stablen, + const char* stabs, size_t nstab, size_t stabsize, const char* strs, int strtablen, stabs_def_cb callback, void* user) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 01759cd18e..50f19bc79a 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1007,7 +1007,7 @@ static BOOL elf_load_debug_info_from_map(struct module* module, { /* OK, now just parse all of the stabs. */ lret = stabs_parse(module, module->format_info[DFI_ELF]->u.elf_info->elf_addr, - stab, image_get_map_size(&stab_sect), + stab, image_get_map_size(&stab_sect) / sizeof(struct stab_nlist), sizeof(struct stab_nlist), stabstr, image_get_map_size(&stabstr_sect), NULL, NULL); if (lret) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index ab88d27108..1e01d84c19 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -944,7 +944,7 @@ static int macho_parse_symtab(struct image_file_map* ifm, if (!stabs_parse(mdi->module, mdi->module->format_info[DFI_MACHO]->u.macho_info->load_addr - fmap->segs_start, - stab, sc->nsyms * stabsize, + stab, sc->nsyms, stabsize, stabstr, sc->strsize, macho_stabs_def_cb, mdi)) ret = -1; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 9d4e82cc71..0560f3ef05 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -500,7 +500,7 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module) { ret = stabs_parse(module, module->module.BaseOfImage - fmap->u.pe.ntheader.OptionalHeader.ImageBase, - stab, image_get_map_size(&sect_stabs), + stab, image_get_map_size(&sect_stabs) / sizeof(struct stab_nlist), sizeof(struct stab_nlist), stabstr, image_get_map_size(&sect_stabstr), NULL, NULL); } diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index b2da8f866b..9ac3089d02 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1247,7 +1247,7 @@ static inline void stabbuf_append(char **buf, unsigned *buf_size, const char *st } BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, - const char* pv_stab_ptr, int stablen, + const char* pv_stab_ptr, size_t nstab, size_t stabsize, const char* strs, int strtablen, stabs_def_cb callback, void* user) { @@ -1256,7 +1256,6 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, struct symt_compiland* compiland = NULL; char* srcpath = NULL; int i; - int nstab; const char* ptr; char* stabbuff; unsigned int stabbufflen; @@ -1272,14 +1271,8 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, BOOL ret = TRUE; struct location loc; unsigned char type; - size_t stabsize = sizeof(struct stab_nlist); uint64_t n_value; -#ifdef __APPLE__ - if (module->process->is_64bit) - stabsize = sizeof(struct macho64_nlist); -#endif - nstab = stablen / stabsize; strs_end = strs + strtablen; memset(stabs_basic, 0, sizeof(stabs_basic)); @@ -1298,11 +1291,7 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, for (i = 0; i < nstab; i++) { stab_ptr = (struct stab_nlist *)(pv_stab_ptr + i * stabsize); - n_value = stab_ptr->n_value; -#ifdef __APPLE__ - if (module->process->is_64bit) - n_value = ((struct macho64_nlist *)stab_ptr)->n_value; -#endif + n_value = stabsize == sizeof(struct macho64_nlist) ? ((struct macho64_nlist *)stab_ptr)->n_value : stab_ptr->n_value; ptr = strs + stab_ptr->n_strx; if ((ptr > strs_end) || (ptr + strlen(ptr) > strs_end)) {

1 0

Jacek Caban : dbghelp: Fix misleading indentation warning.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 94ad6bd2e66f589303fe9102b9a81b1f3e8ea9c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94ad6bd2e66f589303fe9102… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:03:47 2020 +0200 dbghelp: Fix misleading indentation warning. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 949cd412d3..52de3b66f7 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -755,7 +755,10 @@ compute_location(const struct module *module, dwarf2_traverse_context_t* ctx, st case DW_OP_eq: stack[stk-1] = (stack[stk-1] == stack[stk]); stk--; break; case DW_OP_ne: stack[stk-1] = (stack[stk-1] != stack[stk]); stk--; break; case DW_OP_skip: tmp = dwarf2_parse_u2(ctx); ctx->data += tmp; break; - case DW_OP_bra: tmp = dwarf2_parse_u2(ctx); if (!stack[stk--]) ctx->data += tmp; break; + case DW_OP_bra: + tmp = dwarf2_parse_u2(ctx); + if (!stack[stk--]) ctx->data += tmp; + break; case DW_OP_regx: tmp = dwarf2_leb128_as_unsigned(ctx); if (!piece_found)

1 0

Serge Gautherie : include: Remove remaining '&& !defined(CINTERFACE)' in guiddef.h.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 34f3e7793b40d0eac60c373f66f262be2e0d5cdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=34f3e7793b40d0eac60c373f… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Mon Mar 30 07:29:30 2020 +0200 include: Remove remaining '&& !defined(CINTERFACE)' in guiddef.h. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/guiddef.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 9fc40c73eb..1871910efa 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -145,14 +145,14 @@ typedef GUID FMTID,*LPFMTID; #define REFCLSID const CLSID & #define REFIID const IID & #define REFFMTID const FMTID & -#else /* !defined(__cplusplus) */ +#else #define REFGUID const GUID* __MIDL_CONST #define REFCLSID const CLSID* __MIDL_CONST #define REFIID const IID* __MIDL_CONST #define REFFMTID const FMTID* __MIDL_CONST -#endif /* !defined(__cplusplus) */ +#endif -#if defined(__cplusplus) && !defined(CINTERFACE) +#ifdef __cplusplus #define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID))) inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2) { @@ -161,16 +161,16 @@ inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2) ((ULONG *)&rguid1)[2] == ((ULONG *)&rguid2)[2] && ((ULONG *)&rguid1)[3] == ((ULONG *)&rguid2)[3]); } -#else /* defined(__cplusplus) && !defined(CINTERFACE) */ +#else #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID))) #define InlineIsEqualGUID(rguid1, rguid2) \ (((ULONG *)rguid1)[0] == ((ULONG *)rguid2)[0] && \ ((ULONG *)rguid1)[1] == ((ULONG *)rguid2)[1] && \ ((ULONG *)rguid1)[2] == ((ULONG *)rguid2)[2] && \ ((ULONG *)rguid1)[3] == ((ULONG *)rguid2)[3]) -#endif /* defined(__cplusplus) && !defined(CINTERFACE) */ +#endif -#if defined(__cplusplus) && !defined(CINTERFACE) +#ifdef __cplusplus #include <string.h> inline bool operator==(const GUID& guidOne, const GUID& guidOther) {

1 0