wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Alexandre Julliard : libport: Remove the readlink() implementation.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: ee213bcbeacae19e6e7cc3526312caee3c49a172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee213bcbeacae19e6e7cc352… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:17:41 2021 +0200 libport: Remove the readlink() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 4 ---- libs/port/Makefile.in | 1 - libs/port/readlink.c | 32 -------------------------------- 6 files changed, 42 deletions(-) diff --git a/configure b/configure index 3de53b0255b..6ca64c1fcfd 100755 --- a/configure +++ b/configure @@ -17915,7 +17915,6 @@ for ac_func in \ posix_fallocate \ prctl \ proc_pidinfo \ - readlink \ sched_yield \ setproctitle \ setprogname \ diff --git a/configure.ac b/configure.ac index c0fa6ec37c8..d1f23bcc9e9 100644 --- a/configure.ac +++ b/configure.ac @@ -2146,7 +2146,6 @@ AC_CHECK_FUNCS(\ posix_fallocate \ prctl \ proc_pidinfo \ - readlink \ sched_yield \ setproctitle \ setprogname \ diff --git a/include/config.h.in b/include/config.h.in index db58743fe46..7d7393c19db 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -510,9 +510,6 @@ /* Define to 1 if you have the <QuickTime/ImageCompression.h> header file. */ #undef HAVE_QUICKTIME_IMAGECOMPRESSION_H -/* Define to 1 if you have the `readlink' function. */ -#undef HAVE_READLINK - /* Define to 1 if the system has the type `request_sense'. */ #undef HAVE_REQUEST_SENSE diff --git a/include/wine/port.h b/include/wine/port.h index f3b39582f9c..be8e5463a14 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -99,10 +99,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; * Function definitions (only when using libwine_port) */ -#ifndef HAVE_READLINK -int readlink( const char *path, char *buf, size_t size ); -#endif /* HAVE_READLINK */ - #ifndef HAVE_SYMLINK int symlink(const char *from, const char *to); #endif diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 392aa2ad713..7daaa9c845d 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,5 +1,4 @@ STATICLIB = libwine_port.a C_SRCS = \ - readlink.c \ symlink.c diff --git a/libs/port/readlink.c b/libs/port/readlink.c deleted file mode 100644 index 24f7084c9a8..00000000000 --- a/libs/port/readlink.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * readlink function - * - * Copyright 2004 Alexandre Julliard - * - * 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 <errno.h> - -#ifndef HAVE_READLINK -int readlink( const char *path, char *buf, size_t size ) -{ - errno = -ENOSYS; - return -1; -} -#endif /* HAVE_READLINK */

1 0

Alexandre Julliard : libport: Remove the lstat() implementation.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 6d2cf0230ef6f1ecf415c5f591f276798be3f80a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d2cf0230ef6f1ecf415c5f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:17:27 2021 +0200 libport: Remove the lstat() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 4 ---- libs/port/Makefile.in | 1 - libs/port/lstat.c | 29 ----------------------------- 6 files changed, 39 deletions(-) diff --git a/configure b/configure index 50c29234c80..3de53b0255b 100755 --- a/configure +++ b/configure @@ -17908,7 +17908,6 @@ for ac_func in \ getifaddrs \ getrandom \ kqueue \ - lstat \ mach_continuous_time \ pipe2 \ port_create \ diff --git a/configure.ac b/configure.ac index 42f97efb4a4..c0fa6ec37c8 100644 --- a/configure.ac +++ b/configure.ac @@ -2139,7 +2139,6 @@ AC_CHECK_FUNCS(\ getifaddrs \ getrandom \ kqueue \ - lstat \ mach_continuous_time \ pipe2 \ port_create \ diff --git a/include/config.h.in b/include/config.h.in index e27b23f658f..db58743fe46 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -348,9 +348,6 @@ /* Define to 1 if you have the <linux/videodev2.h> header file. */ #undef HAVE_LINUX_VIDEODEV2_H -/* Define to 1 if you have the `lstat' function. */ -#undef HAVE_LSTAT - /* Define to 1 if you have the <lwp.h> header file. */ #undef HAVE_LWP_H diff --git a/include/wine/port.h b/include/wine/port.h index 6e05d73d05a..f3b39582f9c 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -99,10 +99,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; * Function definitions (only when using libwine_port) */ -#ifndef HAVE_LSTAT -int lstat(const char *file_name, struct stat *buf); -#endif /* HAVE_LSTAT */ - #ifndef HAVE_READLINK int readlink( const char *path, char *buf, size_t size ); #endif /* HAVE_READLINK */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 9b36c6c5a3b..392aa2ad713 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,6 +1,5 @@ STATICLIB = libwine_port.a C_SRCS = \ - lstat.c \ readlink.c \ symlink.c diff --git a/libs/port/lstat.c b/libs/port/lstat.c deleted file mode 100644 index 346b412a8b1..00000000000 --- a/libs/port/lstat.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * lstat function - * - * Copyright 1996 Alexandre Julliard - * - * 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" - -#ifndef HAVE_LSTAT -int lstat(const char *file_name, struct stat *buf) -{ - return stat( file_name, buf ); -} -#endif /* HAVE_LSTAT */

1 0

Alexandre Julliard : libport: Remove the obsolete O_LARGEFILE define.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 9df976766fa224cad63895d74c90646664121e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9df976766fa224cad63895d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:17:12 2021 +0200 libport: Remove the obsolete O_LARGEFILE define. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- include/wine/port.h | 5 ----- server/device.c | 3 +-- server/file.c | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 43e85b0c955..7e47e32bab9 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1172,7 +1172,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) struct stat st; int fd, flags; - if ((fd = open( dir, O_RDONLY | O_NONBLOCK | O_LARGEFILE )) == -1) + if ((fd = open( dir, O_RDONLY | O_NONBLOCK )) == -1) return TRUE; if (ioctl( fd, EXT2_IOC_GETFLAGS, &flags ) != -1 && (flags & EXT4_CASEFOLD_FL)) diff --git a/include/wine/port.h b/include/wine/port.h index 3bb13275c32..6e05d73d05a 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -82,11 +82,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; #define RTLD_GLOBAL 0x100 #endif -/* So we open files in 64 bit access mode on Linux */ -#ifndef O_LARGEFILE -# define O_LARGEFILE 0 -#endif - /**************************************************************** * Constants */ diff --git a/server/device.c b/server/device.c index 5abe1e3bb00..f61f24ea4ea 100644 --- a/server/device.c +++ b/server/device.c @@ -440,8 +440,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, mode_t mode = 0666; access = file->obj.ops->map_access( &file->obj, access ); nt_name.str = device->obj.ops->get_full_name( &device->obj, &nt_name.len ); - file->fd = open_fd( NULL, device->unix_path, nt_name, O_NONBLOCK | O_LARGEFILE, - &mode, access, sharing, options ); + file->fd = open_fd( NULL, device->unix_path, nt_name, O_NONBLOCK, &mode, access, sharing, options ); if (file->fd) set_fd_user( file->fd, &device_file_fd_ops, &file->obj ); } else file->fd = alloc_pseudo_fd( &device_file_fd_ops, &file->obj, options ); diff --git a/server/file.c b/server/file.c index 2c7cb0ce5ca..08b0b59beb0 100644 --- a/server/file.c +++ b/server/file.c @@ -269,7 +269,7 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si access = map_access( access, &file_type.mapping ); /* FIXME: should set error to STATUS_OBJECT_NAME_COLLISION if file existed before */ - fd = open_fd( root, name, nt_name, flags | O_NONBLOCK | O_LARGEFILE, &mode, access, sharing, options ); + fd = open_fd( root, name, nt_name, flags | O_NONBLOCK, &mode, access, sharing, options ); if (!fd) goto done; if (S_ISDIR(mode))

1 0

Alexandre Julliard : tools: Move some portability defines out of port.h.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 207068c48ce80d35badbe79a253b8a735c70fc52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=207068c48ce80d35badbe79a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:16:59 2021 +0200 tools: Move some portability defines out of port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 49 ------------------------------------------------- tools/makedep.c | 9 +-------- tools/tools.h | 25 +++++++++++++++++++++++++ tools/widl/typelib.c | 2 +- tools/widl/widl.c | 2 +- tools/winedump/output.c | 4 ++-- tools/winedump/pdb.c | 4 ++-- tools/winedump/pe.c | 2 +- tools/wmc/mcl.c | 2 +- tools/wmc/mcy.y | 2 +- tools/wmc/utils.c | 3 +-- tools/wmc/utils.h | 1 - tools/wmc/wmc.h | 1 + 13 files changed, 37 insertions(+), 69 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index b7f537bec86..3bb13275c32 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -53,17 +53,12 @@ #include <io.h> #include <process.h> -#define mkdir(path,mode) mkdir(path) - static inline void *dlopen(const char *name, int flags) { return NULL; } static inline void *dlsym(void *handle, const char *name) { return NULL; } static inline int dlclose(void *handle) { return 0; } static inline const char *dlerror(void) { return "No dlopen support on Windows"; } #ifdef _MSC_VER - -#define popen _popen -#define pclose _pclose /* The UCRT headers in the Windows SDK #error out if we #define snprintf. * The C headers that came with previous Visual Studio versions do not have * snprintf. Check for VS 2015, which appears to be the first version to @@ -71,25 +66,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; #if _MSC_VER < 1900 # define snprintf _snprintf #endif -#define strtoll _strtoi64 -#define strtoull _strtoui64 -#define strncasecmp _strnicmp -#define strcasecmp _stricmp - -typedef long off_t; -typedef int pid_t; -typedef int ssize_t; - -#endif /* _MSC_VER */ - -#else /* _WIN32 */ - -#ifndef __int64 -# if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__) || defined(_WIN64) -# define __int64 long -# else -# define __int64 long long -# endif #endif #endif /* _WIN32 */ @@ -106,36 +82,11 @@ typedef int ssize_t; #define RTLD_GLOBAL 0x100 #endif -#ifndef S_ISLNK -# define S_ISLNK(mod) (0) -#endif - -#ifndef S_ISDIR -# define S_ISDIR(mod) (((mod) & _S_IFMT) == _S_IFDIR) -#endif - -#ifndef S_ISCHR -# define S_ISCHR(mod) (((mod) & _S_IFMT) == _S_IFCHR) -#endif - -#ifndef S_ISREG -# define S_ISREG(mod) (((mod) & _S_IFMT) == _S_IFREG) -#endif - /* So we open files in 64 bit access mode on Linux */ #ifndef O_LARGEFILE # define O_LARGEFILE 0 #endif -#ifndef O_NONBLOCK -# define O_NONBLOCK 0 -#endif - -#ifndef O_BINARY -# define O_BINARY 0 -#endif - - /**************************************************************** * Constants */ diff --git a/tools/makedep.c b/tools/makedep.c index 121fd4f3565..15939edfb78 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -31,14 +31,7 @@ #include <string.h> #include <sys/types.h> #include <sys/stat.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#if defined(_WIN32) && !defined(__CYGWIN__) -#include <direct.h> -#include <io.h> -#define mkdir(path,mode) mkdir(path) -#endif + #include "tools.h" #include "wine/list.h" diff --git a/tools/tools.h b/tools/tools.h index f013bf7a510..cd87e20c163 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -26,6 +26,7 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> +#include <sys/stat.h> #include <fcntl.h> #include <time.h> #include <errno.h> @@ -34,10 +35,34 @@ #endif #if defined(_WIN32) && !defined(__CYGWIN__) +# include <direct.h> +# include <io.h> # include <process.h> +# define mkdir(path,mode) mkdir(path) +# ifndef S_ISREG +# define S_ISREG(mod) (((mod) & _S_IFMT) == _S_IFREG) +# endif +# ifdef _MSC_VER +# define popen _popen +# define pclose _pclose +# define strtoll _strtoi64 +# define strtoull _strtoui64 +# define strncasecmp _strnicmp +# define strcasecmp _stricmp +# endif #else # include <sys/wait.h> # include <unistd.h> +# ifndef O_BINARY +# define O_BINARY 0 +# endif +# ifndef __int64 +# if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__) +# define __int64 long +# else +# define __int64 long long +# endif +# endif #endif #if !defined(__GNUC__) && !defined(__attribute__) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 1d7e21da937..7f34aa4efcf 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -250,7 +250,7 @@ static void tlb_read(int fd, void *buf, int count) error("error while reading importlib.\n"); } -static void tlb_lseek(int fd, off_t offset) +static void tlb_lseek(int fd, int offset) { if(lseek(fd, offset, SEEK_SET) == -1) error("lseek failed\n"); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 5c11f6285ea..97a26743cf3 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -287,7 +287,7 @@ static void add_widl_version_define(void) if (p) version += atoi(p + 1); - snprintf(version_str, sizeof(version_str), "__WIDL__=0x%x", version); + sprintf(version_str, "__WIDL__=0x%x", version); wpp_add_cmdline_define(version_str); } diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 5911f22f6c8..ad3a70c3b0f 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -68,7 +68,7 @@ void output_spec_symbol (const parsed_symbol *sym) assert (sym && sym->symbol); if (sym->ordinal >= 0) - snprintf(ord_spec, 12, "%d", sym->ordinal); + sprintf(ord_spec, "%d", sym->ordinal); else { ord_spec[0] = '@'; @@ -485,7 +485,7 @@ void output_c_banner (const parsed_symbol *sym) size_t i; if (sym->ordinal >= 0) - snprintf(ord_spec, sizeof (ord_spec), "%d", sym->ordinal); + sprintf(ord_spec, "%d", sym->ordinal); else { ord_spec[0] = '@'; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 9057a544065..30001d224da 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -279,9 +279,9 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx printf("-Unknown symbol info version %d\n", symbols->version); } if (symbols->flags & 0x8000) /* new */ - snprintf(tcver, sizeof(tcver), "%u.%u", (symbols->flags >> 8) & 0x7f, symbols->flags & 0xff); + sprintf(tcver, "%u.%u", (symbols->flags >> 8) & 0x7f, symbols->flags & 0xff); else - snprintf(tcver, sizeof(tcver), "old-%x", symbols->flags); + sprintf(tcver, "old-%x", symbols->flags); printf("Symbols:\n" "\tsignature: %08x\n" "\tversion: %u\n" diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index e21084ad4cf..4455ab61bd0 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -2442,7 +2442,7 @@ static void do_grab_sym( void ) { char ordinal_text[256]; /* Ordinal only entry */ - snprintf (ordinal_text, sizeof(ordinal_text), "%s_%u", + sprintf (ordinal_text, "%s_%u", globals.forward_dll ? globals.forward_dll : OUTPUT_UC_DLL_NAME, exportDir->Base + i); str_toupper(ordinal_text); diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 93e666fed74..c0ca4eeba5c 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -26,8 +26,8 @@ #include <assert.h> #include <string.h> -#include "utils.h" #include "wmc.h" +#include "utils.h" #include "lang.h" #include "mcy.tab.h" diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 2ed8f72813a..879c46ffc77 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -44,8 +44,8 @@ #include <stdlib.h> #include <assert.h> -#include "utils.h" #include "wmc.h" +#include "utils.h" #include "lang.h" static const char err_syntax[] = "Syntax error\n"; diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index a1286f8da30..5a91d420cb4 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -28,10 +28,9 @@ #include <assert.h> #include <ctype.h> -#include "wmctypes.h" +#include "wmc.h" #include "winnls.h" #include "utils.h" -#include "wmc.h" #define SUPPRESS_YACC_ERROR_MESSAGE diff --git a/tools/wmc/utils.h b/tools/wmc/utils.h index 39db674d4c9..3a8010d77cc 100644 --- a/tools/wmc/utils.h +++ b/tools/wmc/utils.h @@ -21,7 +21,6 @@ #ifndef __WMC_UTILS_H #define __WMC_UTILS_H -#include "../tools.h" #include "wmctypes.h" int mcy_error(const char *s, ...) __attribute__((format (printf, 1, 2))); diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index 438a645ebfc..913c2a9443e 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -21,6 +21,7 @@ #ifndef __WMC_WMC_H #define __WMC_WMC_H +#include "../tools.h" #include "wmctypes.h" /*

1 0

Alexandre Julliard : configure: Disable building mountmgr.sys on Windows for now.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 65f3c3ae2733ddae379de0d8417c9ba5fda39632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65f3c3ae2733ddae379de0d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:16:31 2021 +0200 configure: Disable building mountmgr.sys on Windows for now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index db2e07679d4..50c29234c80 100755 --- a/configure +++ b/configure @@ -8341,6 +8341,7 @@ if test "x$ac_cv_cflags__Wl___disable_stdcall_fixup" = xyes; then : fi ;; esac enable_iphlpapi=${enable_iphlpapi:-no} + enable_mountmgr_sys=${enable_mountmgr_sys:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} with_x=${with_x:-no} diff --git a/configure.ac b/configure.ac index 6321206b9db..42f97efb4a4 100644 --- a/configure.ac +++ b/configure.ac @@ -724,6 +724,7 @@ case $host_os in esac dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} + enable_mountmgr_sys=${enable_mountmgr_sys:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} dnl Disable dependencies that are not useful on Windows

1 0

Eric Pouech : dbghelp: Added support for custom symbols.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: b6044788ea299671e937f96dfe8aa3052c1cacdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6044788ea299671e937f96d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:02:31 2021 +0200 dbghelp: Added support for custom symbols. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 12 +++++ dlls/dbghelp/module.c | 1 + dlls/dbghelp/symbol.c | 106 +++++++++++++++++++++++++++++++---------- dlls/dbghelp/type.c | 12 +++++ 4 files changed, 107 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6044788ea299671e937…

1 0

Eric Pouech : dbghelp: Handle address of labels not included in functions.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 841083898b460ace8efed2fc4d3b66ed3c60f468 URL: https://source.winehq.org/git/wine.git/?a=commit;h=841083898b460ace8efed2fc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:02:24 2021 +0200 dbghelp: Handle address of labels not included in functions. (MASM generate those) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index ee6e1865fa8..b09406028e8 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -160,7 +160,7 @@ BOOL symt_get_address(const struct symt* type, ULONG64* addr) case SymTagLabel: if (!((const struct symt_hierarchy_point*)type)->parent || !symt_get_address(((const struct symt_hierarchy_point*)type)->parent, addr)) - return FALSE; + *addr = 0; *addr += ((const struct symt_hierarchy_point*)type)->loc.offset; break; case SymTagThunk:

1 0

Eric Pouech : dbghelp: MapDebugInformation and UnmapDebugInformation are not available on 64 bit architectures.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: e1132a6e5aeb5d0f15ebe96c6e898adfc0f1528e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1132a6e5aeb5d0f15ebe96c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:02:18 2021 +0200 dbghelp: MapDebugInformation and UnmapDebugInformation are not available on 64 bit architectures. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 4 ++-- dlls/dbghelp/image.c | 6 ++++-- include/dbghelp.h | 9 +++++---- include/imagehlp.h | 17 ++++++++++------- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 39820a98566..9f719bd6a6e 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -25,7 +25,7 @@ @ stdcall ImagehlpApiVersion() @ stdcall ImagehlpApiVersionEx(ptr) @ stdcall MakeSureDirectoryPathExists(str) -@ stdcall MapDebugInformation(long str str long) +@ stdcall -arch=win32 MapDebugInformation(long str str long) @ stdcall MiniDumpReadDumpStream(ptr long ptr ptr ptr) @ stdcall MiniDumpWriteDump(ptr long ptr long ptr ptr ptr) @ stdcall SearchTreeForFile(str str ptr) @@ -187,7 +187,7 @@ @ stdcall SymUnloadModule64(long int64) @ stdcall UnDecorateSymbolName(str ptr long long) @ stdcall UnDecorateSymbolNameW(wstr ptr long long) -@ stdcall UnmapDebugInformation(ptr) +@ stdcall -arch=win32 UnmapDebugInformation(ptr) @ stdcall WinDbgExtensionDllInit(ptr long long) #@ stub block #@ stub chksym diff --git a/dlls/dbghelp/image.c b/dlls/dbghelp/image.c index 59622180dc7..7de0a6e23c8 100644 --- a/dlls/dbghelp/image.c +++ b/dlls/dbghelp/image.c @@ -26,8 +26,6 @@ #include "winternl.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); - /*********************************************************************** * GetTimestampForLoadedLibrary (DBGHELP.@) */ @@ -37,6 +35,9 @@ DWORD WINAPI GetTimestampForLoadedLibrary(HMODULE Module) return (nth) ? nth->FileHeader.TimeDateStamp : 0; } +#ifndef _WIN64 +WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); + /*********************************************************************** * MapDebugInformation (DBGHELP.@) */ @@ -57,3 +58,4 @@ BOOL WINAPI UnmapDebugInformation(PIMAGE_DEBUG_INFORMATION DebugInfo) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } +#endif diff --git a/include/dbghelp.h b/include/dbghelp.h index 75dfd76b327..c4770553809 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1408,6 +1408,7 @@ typedef struct API_VERSION LPAPI_VERSION WINAPI ImagehlpApiVersion(void); LPAPI_VERSION WINAPI ImagehlpApiVersionEx(LPAPI_VERSION); +#ifndef _WIN64 typedef struct _IMAGE_DEBUG_INFORMATION { LIST_ENTRY List; @@ -1443,6 +1444,10 @@ typedef struct _IMAGE_DEBUG_INFORMATION DWORD Reserved[ 2 ]; } IMAGE_DEBUG_INFORMATION, *PIMAGE_DEBUG_INFORMATION; +PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation(HANDLE, PCSTR, PCSTR, ULONG); +BOOL WINAPI UnmapDebugInformation(PIMAGE_DEBUG_INFORMATION); +#endif + typedef enum { SYMOPT_EX_DISABLEACCESSTIMEUPDATE, @@ -1453,10 +1458,6 @@ typedef enum #endif } IMAGEHLP_EXTENDED_OPTIONS; -PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation(HANDLE, PCSTR, PCSTR, ULONG); - -BOOL WINAPI UnmapDebugInformation(PIMAGE_DEBUG_INFORMATION); - DWORD WINAPI SymGetOptions(void); DWORD WINAPI SymSetOptions(DWORD); diff --git a/include/imagehlp.h b/include/imagehlp.h index 5ee978a3d4c..72936e4353e 100644 --- a/include/imagehlp.h +++ b/include/imagehlp.h @@ -239,6 +239,7 @@ typedef struct _API_VERSION { USHORT Reserved; } API_VERSION, *LPAPI_VERSION; +#ifndef _WIN64 typedef struct _IMAGE_DEBUG_INFORMATION { LIST_ENTRY List; DWORD Size; @@ -282,6 +283,15 @@ typedef struct _IMAGE_DEBUG_INFORMATION { DWORD Reserved[3]; } IMAGE_DEBUG_INFORMATION, *PIMAGE_DEBUG_INFORMATION; +PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation( + HANDLE FileHandle, PCSTR FileName, + PCSTR SymbolPath, ULONG ImageBase +); +BOOL WINAPI UnmapDebugInformation( + PIMAGE_DEBUG_INFORMATION DebugInfo +); +#endif + typedef struct _ADDRESS { DWORD Offset; WORD Segment; @@ -958,10 +968,6 @@ BOOL WINAPI MapAndLoad( PCSTR ImageName, PCSTR DllPath, PLOADED_IMAGE LoadedImage, BOOL DotDll, BOOL ReadOnly ); -PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation( - HANDLE FileHandle, PCSTR FileName, - PCSTR SymbolPath, ULONG ImageBase -); DWORD WINAPI MapFileAndCheckSumA( PCSTR Filename, PDWORD HeaderSum, PDWORD CheckSum ); @@ -1385,9 +1391,6 @@ DWORD WINAPI UnDecorateSymbolNameW( BOOL WINAPI UnMapAndLoad( PLOADED_IMAGE LoadedImage ); -BOOL WINAPI UnmapDebugInformation( - PIMAGE_DEBUG_INFORMATION DebugInfo -); BOOL WINAPI UpdateDebugInfoFile( PCSTR ImageFileName, PCSTR SymbolPath, PSTR DebugFilePath, PIMAGE_NT_HEADERS32 NtHeaders

1 0

Eric Pouech : dbghelp/dwarf: Correctly compute address of label.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 2da1698312bbc7dc1c2df4d4c15ca969499b9391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2da1698312bbc7dc1c2df4d4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:02:12 2021 +0200 dbghelp/dwarf: Correctly compute address of label. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 430544196c5..c15b59b57c3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1988,7 +1988,7 @@ static void dwarf2_parse_subprogram_label(dwarf2_subprogram_t* subpgm, name.u.string = NULL; loc.kind = loc_absolute; - loc.offset = subpgm->ctx->module_ctx->load_offset + low_pc.u.uvalue; + loc.offset = subpgm->ctx->module_ctx->load_offset + low_pc.u.uvalue - subpgm->func->address; symt_add_function_point(subpgm->ctx->module_ctx->module, subpgm->func, SymTagLabel, &loc, name.u.string); }

1 0

Eric Pouech : dbghelp: Report once FIXME of unsupported requests in SymGetTypeInfo().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 94abe0761ed1695318d208da395dc5af05200345 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94abe0761ed1695318d208da… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:02:06 2021 +0200 dbghelp: Report once FIXME of unsupported requests in SymGetTypeInfo(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index eaec124c57b..ee6e1865fa8 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -970,17 +970,15 @@ BOOL symt_get_info(struct module* module, const struct symt* type, #undef X - case TI_GET_ADDRESSOFFSET: - case TI_GET_SYMINDEX: - case TI_GET_THISADJUST: - case TI_GET_VIRTUALBASECLASS: - case TI_GET_VIRTUALBASEPOINTEROFFSET: - case TI_GET_VIRTUALTABLESHAPEID: - case TI_IS_EQUIV_TO: - FIXME("Unsupported GetInfo request (%u)\n", req); - return FALSE; default: - FIXME("Unknown GetInfo request (%u)\n", req); + { + static DWORD64 once; + if (!(once & ((DWORD64)1 << req))) + { + FIXME("Unsupported GetInfo request (%u)\n", req); + once |= (DWORD64)1 << req; + } + } return FALSE; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021