October 2021 - Wine-Commits

Eric Pouech : dbghelp: Added support for custom symbols.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

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

Alexandre Julliard : libport: Remove the obsolete O_LARGEFILE define.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

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 : libport: Remove the lstat() implementation.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

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 readlink() implementation.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

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 symlink() implementation.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: dd895f496ae1ff76f1726d5ce3b0bc0024a47f8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd895f496ae1ff76f1726d5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:17:54 2021 +0200 libport: Remove the symlink() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 11 ++--------- libs/port/Makefile.in | 3 --- libs/port/symlink.c | 38 -------------------------------------- 6 files changed, 2 insertions(+), 55 deletions(-) diff --git a/configure b/configure index 6ca64c1fcfd..f1d9aeb24ef 100755 --- a/configure +++ b/configure @@ -17919,7 +17919,6 @@ for ac_func in \ setproctitle \ setprogname \ sigprocmask \ - symlink \ sysinfo \ tcdrain \ thr_kill2 diff --git a/configure.ac b/configure.ac index d1f23bcc9e9..3fff076470e 100644 --- a/configure.ac +++ b/configure.ac @@ -2150,7 +2150,6 @@ AC_CHECK_FUNCS(\ setproctitle \ setprogname \ sigprocmask \ - symlink \ sysinfo \ tcdrain \ thr_kill2 diff --git a/include/config.h.in b/include/config.h.in index 7d7393c19db..fc3749895a3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -687,9 +687,6 @@ /* Define to 1 if `_u._ext.nscount6' is a member of `struct __res_state'. */ #undef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 -/* Define to 1 if you have the `symlink' function. */ -#undef HAVE_SYMLINK - /* Define to 1 if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H diff --git a/include/wine/port.h b/include/wine/port.h index be8e5463a14..410fa670757 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -50,6 +50,7 @@ #if defined(_WIN32) && !defined(__CYGWIN__) #include <direct.h> +#include <errno.h> #include <io.h> #include <process.h> @@ -57,6 +58,7 @@ 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"; } +static inline int symlink(const char *from, const char *to) { errno = ENOSYS; return -1; } #ifdef _MSC_VER /* The UCRT headers in the Windows SDK #error out if we #define snprintf. @@ -94,13 +96,4 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; #define M_PI_2 1.570796326794896619 #endif - -/**************************************************************** - * Function definitions (only when using libwine_port) - */ - -#ifndef HAVE_SYMLINK -int symlink(const char *from, const char *to); -#endif - #endif /* !defined(__WINE_WINE_PORT_H) */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 7daaa9c845d..670b272cbf1 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,4 +1 @@ STATICLIB = libwine_port.a - -C_SRCS = \ - symlink.c diff --git a/libs/port/symlink.c b/libs/port/symlink.c deleted file mode 100644 index efb44eca1d9..00000000000 --- a/libs/port/symlink.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * symlink function - * - * Copyright 2008 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> -#include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - -#ifndef HAVE_SYMLINK - -int symlink( const char *from, const char *to ) -{ - errno = ENOSYS; - return -1; -} - -#endif /* HAVE_SYMLINK */

1 0

Eric Pouech : dbghelp: Handle address of labels not included in functions.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

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

Alexandre Julliard : makefiles: Remove libwine_port.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: c60d604544107eea9e4b28e3e60640b2c06a0eec URL: https://source.winehq.org/git/wine.git/?a=commit;h=c60d604544107eea9e4b28e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:19:24 2021 +0200 makefiles: Remove libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 -- configure.ac | 1 - libs/port/Makefile.in | 1 - tools/makedep.c | 1 - 4 files changed, 5 deletions(-) diff --git a/configure b/configure index f1d9aeb24ef..d9ba80332bd 100755 --- a/configure +++ b/configure @@ -1786,7 +1786,6 @@ enable_xpsprint enable_xpssvcs enable_fonts enable_include -enable_port enable_wine enable_loader enable_nls @@ -21012,7 +21011,6 @@ wine_fn_config_makefile dlls/xpsprint enable_xpsprint wine_fn_config_makefile dlls/xpssvcs enable_xpssvcs wine_fn_config_makefile fonts enable_fonts wine_fn_config_makefile include enable_include -wine_fn_config_makefile libs/port enable_port wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index 3fff076470e..4497e98e7bb 100644 --- a/configure.ac +++ b/configure.ac @@ -3842,7 +3842,6 @@ WINE_CONFIG_MAKEFILE(dlls/xpsprint) WINE_CONFIG_MAKEFILE(dlls/xpssvcs) WINE_CONFIG_MAKEFILE(fonts) WINE_CONFIG_MAKEFILE(include) -WINE_CONFIG_MAKEFILE(libs/port) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in deleted file mode 100644 index 670b272cbf1..00000000000 --- a/libs/port/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -STATICLIB = libwine_port.a diff --git a/tools/makedep.c b/tools/makedep.c index 15939edfb78..88b179a9070 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2024,7 +2024,6 @@ static struct strarray add_unix_libraries( const struct makefile *make, struct s struct strarray all_libs = empty_strarray; unsigned int i, j; - strarray_add( &all_libs, "-lwine_port" ); if (make->native_unix_lib && strcmp( make->unixlib, "ntdll.so" )) strarray_add( &all_libs, "-lntdll" ); strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); strarray_addall( &all_libs, libs );

1 0

Eric Pouech : dbghelp: Silence FIXMEs in SymGetTypeInfo().
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: dd572227cb7c9473a06bc7e565435daf46441492 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd572227cb7c9473a06bc7e5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:01:36 2021 +0200 dbghelp: Silence FIXMEs 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 | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 709a4bc851b..d2721c764cf 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -111,6 +111,10 @@ const char* symt_get_name(const struct symt* sym) case SymTagArrayType: case SymTagPointerType: case SymTagFunctionType: + case SymTagFunctionArgType: + case SymTagBlock: + case SymTagFuncDebugStart: + case SymTagFuncDebugEnd: return NULL; } } @@ -167,6 +171,14 @@ BOOL symt_get_address(const struct symt* type, ULONG64* addr) /* fall through */ case SymTagExe: case SymTagCompiland: + case SymTagFunctionType: + case SymTagFunctionArgType: + case SymTagBaseType: + case SymTagUDT: + case SymTagEnum: + case SymTagTypedef: + case SymTagPointerType: + case SymTagArrayType: return FALSE; } return TRUE; @@ -728,6 +740,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagExe: case SymTagCompiland: case SymTagFunctionType: + case SymTagFunctionArgType: return FALSE; } break; @@ -798,6 +811,20 @@ BOOL symt_get_info(struct module* module, const struct symt* type, default: FIXME("Unsupported sym-tag %s for get-offset\n", symt_get_tag_str(type->tag)); + /* fall through */ + case SymTagExe: + case SymTagCompiland: + case SymTagUDT: + case SymTagFunctionType: + case SymTagFunctionArgType: + case SymTagPointerType: + case SymTagArrayType: + case SymTagBaseType: + case SymTagTypedef: + case SymTagBlock: + case SymTagFuncDebugStart: + case SymTagFuncDebugEnd: + case SymTagLabel: return FALSE; } break; @@ -862,7 +889,14 @@ BOOL symt_get_info(struct module* module, const struct symt* type, /* fall through */ case SymTagPublicSymbol: case SymTagThunk: + case SymTagBlock: + case SymTagFuncDebugStart: + case SymTagFuncDebugEnd: case SymTagLabel: + case SymTagExe: + case SymTagCompiland: + case SymTagUDT: + case SymTagBaseType: return FALSE; } break;

1 0

Eric Pouech : dbghelp: Return SymTagExe when requesting lexical parent of types in SymGetTypeInfo().
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 507a3ef304243fef934932a821b027fe8d210c04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=507a3ef304243fef934932a8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:01:48 2021 +0200 dbghelp: Return SymTagExe when requesting lexical parent of types 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 320af023135..b45e79e9946 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -763,7 +763,13 @@ BOOL symt_get_info(struct module* module, const struct symt* type, break; case SymTagUDT: case SymTagEnum: + case SymTagFunctionType: case SymTagFunctionArgType: + case SymTagPointerType: + case SymTagArrayType: + case SymTagBaseType: + case SymTagTypedef: + case SymTagBaseClass: X(DWORD) = symt_ptr2index(module, &module->top->symt); break; default:

1 0

Eric Pouech : dbghelp: Return error when requesting SymTagLabel's size in SymGetTypeInfo().
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: f3107eb095bfb7d26f0c92237dc98a21448387e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3107eb095bfb7d26f0c9223… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:01:42 2021 +0200 dbghelp: Return error when requesting SymTagLabel's size 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 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index d2721c764cf..320af023135 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -730,9 +730,6 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagThunk: X(DWORD64) = ((const struct symt_thunk*)type)->size; break; - case SymTagLabel: - X(DWORD64) = 0; - break; default: FIXME("Unsupported sym-tag %s for get-length\n", symt_get_tag_str(type->tag)); @@ -741,6 +738,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagCompiland: case SymTagFunctionType: case SymTagFunctionArgType: + case SymTagLabel: return FALSE; } break;

1 0