- Wine-Commits - list.winehq.org

Eric Pouech : winscard: Use SecureZeroMemory() to clear magic fields.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: c20a0dc6a4540b2733cdfececa7759914e56c218 URL: https://gitlab.winehq.org/wine/wine/-/commit/c20a0dc6a4540b2733cdfececa7759… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Nov 8 09:27:08 2023 +0100 winscard: Use SecureZeroMemory() to clear magic fields. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/winscard/winscard.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index d0c7f412a6c..7e53fba45f6 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -205,7 +205,8 @@ LONG WINAPI SCardReleaseContext( SCARDCONTEXT context ) params.handle = handle->unix_handle; ret = UNIX_CALL( scard_release_context, &params ); - handle->magic = 0; + /* Ensure compiler doesn't optimize out the assignment with 0. */ + SecureZeroMemory( &handle->magic, sizeof(handle->magic) ); free( handle ); TRACE( "returning %#lx\n", ret ); @@ -794,7 +795,8 @@ LONG WINAPI SCardDisconnect( SCARDHANDLE connect, DWORD disposition ) params.disposition = disposition; if (!(ret = UNIX_CALL( scard_disconnect, &params ))) { - handle->magic = 0; + /* Ensure compiler doesn't optimize out the assignment with 0. */ + SecureZeroMemory( &handle->magic, sizeof(handle->magic) ); free( handle ); } TRACE( "returning %#lx\n", ret );

1 0

Alexandre Julliard : configure: Use hidden visibility also when building Unix libraries.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: 4502eb56baca156f9b0817806f81b5dde2163801 URL: https://gitlab.winehq.org/wine/wine/-/commit/4502eb56baca156f9b0817806f81b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 10:27:08 2023 +0100 configure: Use hidden visibility also when building Unix libraries. --- configure | 56 ++++++++++++++++++++++++------------------------ configure.ac | 2 +- dlls/ntdll/unix/loader.c | 2 +- include/dde.h | 2 +- include/ddeml.h | 2 +- include/ntgdi.h | 2 +- include/ntuser.h | 2 +- include/rpc.h | 2 +- include/wine/debug.h | 10 ++++----- include/wine/unixlib.h | 4 ++-- include/wingdi.h | 2 +- include/winnt.h | 2 +- include/winuser.h | 2 +- loader/main.c | 2 +- 14 files changed, 46 insertions(+), 46 deletions(-) diff --git a/configure b/configure index 646f44ede24..d91a345acfe 100755 --- a/configure +++ b/configure @@ -18654,6 +18654,34 @@ printf "%s\n" "$ac_cv_cflags__fcf_protection_none" >&6; } if test "x$ac_cv_cflags__fcf_protection_none" = xyes then : EXTRACFLAGS="$EXTRACFLAGS -fcf-protection=none" +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fvisibility=hidden" >&5 +printf %s "checking whether the compiler supports -fvisibility=hidden... " >&6; } +if test ${ac_cv_cflags__fvisibility_hidden+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fvisibility=hidden" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_cflags__fvisibility_hidden=yes +else $as_nop + ac_cv_cflags__fvisibility_hidden=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fvisibility_hidden" >&5 +printf "%s\n" "$ac_cv_cflags__fvisibility_hidden" >&6; } +if test "x$ac_cv_cflags__fvisibility_hidden" = xyes +then : + EXTRACFLAGS="$EXTRACFLAGS -fvisibility=hidden" fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-stack-protector" >&5 printf %s "checking whether the compiler supports -fno-stack-protector... " >&6; } @@ -19358,34 +19386,6 @@ printf "%s\n" "$ac_cv_cflags__fshort_wchar" >&6; } if test "x$ac_cv_cflags__fshort_wchar" = xyes then : MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar" -fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fvisibility=hidden" >&5 -printf %s "checking whether the compiler supports -fvisibility=hidden... " >&6; } -if test ${ac_cv_cflags__fvisibility_hidden+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -fvisibility=hidden" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_cflags__fvisibility_hidden=yes -else $as_nop - ac_cv_cflags__fvisibility_hidden=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fvisibility_hidden" >&5 -printf "%s\n" "$ac_cv_cflags__fvisibility_hidden" >&6; } -if test "x$ac_cv_cflags__fvisibility_hidden" = xyes -then : - MSVCRTFLAGS="$MSVCRTFLAGS -fvisibility=hidden" fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5 printf %s "checking whether the compiler supports -Wno-format... " >&6; } diff --git a/configure.ac b/configure.ac index fd1a58b9170..8a58ef8a5b5 100644 --- a/configure.ac +++ b/configure.ac @@ -1841,6 +1841,7 @@ then WINE_TRY_CFLAGS([-Werror=unused-command-line-argument],[CFLAGS="$CFLAGS -Werror=unused-command-line-argument"]) WINE_TRY_CFLAGS([-Werror=ignored-optimization-argument],[CFLAGS="$CFLAGS -Werror=ignored-optimization-argument"]) WINE_TRY_CFLAGS([-fcf-protection=none]) + WINE_TRY_CFLAGS([-fvisibility=hidden]) WINE_TRY_CFLAGS([-fno-stack-protector]) WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) @@ -1922,7 +1923,6 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= *) MSVCRTFLAGS="-D_WIN32" WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) - WINE_TRY_CFLAGS([-fvisibility=hidden],[MSVCRTFLAGS="$MSVCRTFLAGS -fvisibility=hidden"]) WINE_TRY_CFLAGS([-Wno-format],[MSVCRTFLAGS="$MSVCRTFLAGS -Wno-format"]) ;; esac diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0db25f88527..875e2f48cc7 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2305,7 +2305,7 @@ static void check_command_line( int argc, char *argv[] ) * * Main entry point called by the wine loader. */ -void __wine_main( int argc, char *argv[], char *envp[] ) +DECLSPEC_EXPORT void __wine_main( int argc, char *argv[], char *envp[] ) { init_paths( argv ); diff --git a/include/dde.h b/include/dde.h index fda798b06f4..7b236414dac 100644 --- a/include/dde.h +++ b/include/dde.h @@ -30,7 +30,7 @@ extern "C" { #ifndef WINUSERAPI #if defined(_USER32_) || defined(WINE_UNIX_LIB) -#define WINUSERAPI +#define WINUSERAPI DECLSPEC_EXPORT #else #define WINUSERAPI DECLSPEC_IMPORT #endif diff --git a/include/ddeml.h b/include/ddeml.h index 41c43e6b321..0bffa851c79 100644 --- a/include/ddeml.h +++ b/include/ddeml.h @@ -28,7 +28,7 @@ extern "C" { #ifndef WINUSERAPI #if defined(_USER32_) || defined(WINE_UNIX_LIB) -#define WINUSERAPI +#define WINUSERAPI DECLSPEC_EXPORT #else #define WINUSERAPI DECLSPEC_IMPORT #endif diff --git a/include/ntgdi.h b/include/ntgdi.h index 95aba913c05..c2cb1924730 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -26,7 +26,7 @@ #ifndef W32KAPI # if defined(_WIN32U_) || defined(WINE_UNIX_LIB) -# define W32KAPI +# define W32KAPI DECLSPEC_EXPORT # else # define W32KAPI DECLSPEC_IMPORT # endif diff --git a/include/ntuser.h b/include/ntuser.h index 1fed42e38df..def89a82aff 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -27,7 +27,7 @@ #ifndef W32KAPI # if defined(_WIN32U_) || defined(WINE_UNIX_LIB) -# define W32KAPI +# define W32KAPI DECLSPEC_EXPORT # else # define W32KAPI DECLSPEC_IMPORT # endif diff --git a/include/rpc.h b/include/rpc.h index 0b029532655..2d4323428c4 100644 --- a/include/rpc.h +++ b/include/rpc.h @@ -43,7 +43,7 @@ #if !defined(_RPCRT4_) && !defined(_KRPCENV_) #define RPCRTAPI DECLSPEC_IMPORT #else -#define RPCRTAPI +#define RPCRTAPI DECLSPEC_EXPORT #endif #endif diff --git a/include/wine/debug.h b/include/wine/debug.h index 281666fbff1..86e008a1408 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -109,11 +109,11 @@ struct __wine_debug_channel #endif NTSYSAPI int WINAPI __wine_dbg_write( const char *str, unsigned int len ); -extern unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); -extern const char * __cdecl __wine_dbg_strdup( const char *str ); -extern int __cdecl __wine_dbg_output( const char *str ); -extern int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, - const char *function ); +extern DECLSPEC_EXPORT unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); +extern DECLSPEC_EXPORT const char * __cdecl __wine_dbg_strdup( const char *str ); +extern DECLSPEC_EXPORT int __cdecl __wine_dbg_output( const char *str ); +extern DECLSPEC_EXPORT int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *function ); /* * Exported definitions and macros diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 46b5e982943..81c59e732ba 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -29,8 +29,8 @@ typedef UINT64 unixlib_handle_t; typedef NTSTATUS (*unixlib_entry_t)( void *args ); -extern const unixlib_entry_t __wine_unix_call_funcs[]; -extern const unixlib_entry_t __wine_unix_call_wow64_funcs[]; +extern DECLSPEC_EXPORT const unixlib_entry_t __wine_unix_call_funcs[]; +extern DECLSPEC_EXPORT const unixlib_entry_t __wine_unix_call_wow64_funcs[]; /* some useful helpers from ntdll */ NTSYSAPI const char *ntdll_get_build_dir(void); diff --git a/include/wingdi.h b/include/wingdi.h index 6ae9409803c..ff0bbb6fc85 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -26,7 +26,7 @@ extern "C" { #ifndef WINGDIAPI #if defined(_GDI32_) || defined(WINE_UNIX_LIB) -#define WINGDIAPI +#define WINGDIAPI DECLSPEC_EXPORT #else #define WINGDIAPI DECLSPEC_IMPORT #endif diff --git a/include/winnt.h b/include/winnt.h index 7bbf224e3c9..4739f9a1a0f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -43,7 +43,7 @@ extern "C" { #endif #if defined(_NTSYSTEM_) || defined(WINE_UNIX_LIB) -#define NTSYSAPI +#define NTSYSAPI DECLSPEC_EXPORT #else #define NTSYSAPI DECLSPEC_IMPORT #endif diff --git a/include/winuser.h b/include/winuser.h index c0736502a2e..73e7919aaea 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -23,7 +23,7 @@ #if !defined(_USER32_) && !defined(WINE_UNIX_LIB) #define WINUSERAPI DECLSPEC_IMPORT #else -#define WINUSERAPI +#define WINUSERAPI DECLSPEC_EXPORT #endif #endif diff --git a/loader/main.c b/loader/main.c index 242ff15accd..c258e025183 100644 --- a/loader/main.c +++ b/loader/main.c @@ -39,7 +39,7 @@ extern char **environ; /* the preloader will set this variable */ -const struct wine_preload_info *wine_main_preload_info = NULL; +const __attribute((visibility("default"))) struct wine_preload_info *wine_main_preload_info = NULL; /* canonicalize path and return its directory name */ static char *realpath_dirname( const char *name )

1 0

Alexandre Julliard : include: Remove DECLSPEC_HIDDEN from GUID definitions.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: 19cc2439ede6562613d03d75305ddbbe03d11152 URL: https://gitlab.winehq.org/wine/wine/-/commit/19cc2439ede6562613d03d75305ddb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 10:10:50 2023 +0100 include: Remove DECLSPEC_HIDDEN from GUID definitions. --- include/dbs.idl | 20 +++++++++----------- include/devpropdef.h | 4 +--- include/guiddef.h | 12 +----------- include/knownfolders.h | 4 +--- include/netiodef.h | 8 +++----- include/propkeydef.h | 6 +++--- include/rpcndr.h | 1 - include/rpcproxy.h | 5 ++--- 8 files changed, 20 insertions(+), 40 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index fd04f7b1ae0..f664518ca37 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -501,22 +501,20 @@ enum DBPROPENUM26 { cpp_quote("#ifdef DBINITCONSTANTS") cpp_quote("#ifdef __cplusplus") cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\") -cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN; \\") -cpp_quote(" EXTERN_C const GUID name = \\") +cpp_quote(" EXTERN_C const GUID name = \\") cpp_quote(" { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }") cpp_quote("#else") cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\") -cpp_quote(" const GUID name DECLSPEC_HIDDEN; \\") -cpp_quote(" const GUID name = \\") +cpp_quote(" const GUID name = \\") cpp_quote(" { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }") cpp_quote("#endif") cpp_quote("#define DEFINE_DBID(name, dbguid, kind, val) \\") -cpp_quote(" const DBID name = { {dbguid}, kind, {(LPOLESTR)val} };") +cpp_quote(" const DBID name = { {dbguid}, kind, {(LPOLESTR)val} }") cpp_quote("#else") cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\") -cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN") +cpp_quote(" EXTERN_C const GUID name") cpp_quote("#define DEFINE_DBID(name, dbguid, kind, val) \\") -cpp_quote(" EXTERN_C const DBID name;") +cpp_quote(" EXTERN_C const DBID name") cpp_quote("#endif") cpp_quote("#define DBCIDGUID {0x0c733a81, 0x2a1c, 0x11ce, {0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d}}") @@ -544,10 +542,10 @@ cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") -cpp_quote("DEFINE_DBID(DB_NULLID, DB_NULLGUID, 0, 0)") -cpp_quote("DEFINE_DBID(DBCOLUMN_BASECOLUMNNAME, DBCIDGUID, DBKIND_GUID_PROPID, 10)") -cpp_quote("DEFINE_DBID(DBCOLUMN_BASETABLENAME, DBCIDGUID, DBKIND_GUID_PROPID, 11)") -cpp_quote("DEFINE_DBID(DBCOLUMN_KEYCOLUMN, DBCIDGUID, DBKIND_GUID_PROPID, 41)") +cpp_quote("DEFINE_DBID(DB_NULLID, DB_NULLGUID, 0, 0);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASECOLUMNNAME, DBCIDGUID, DBKIND_GUID_PROPID, 10);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASETABLENAME, DBCIDGUID, DBKIND_GUID_PROPID, 11);") +cpp_quote("DEFINE_DBID(DBCOLUMN_KEYCOLUMN, DBCIDGUID, DBKIND_GUID_PROPID, 41);") cpp_quote("#define DBPROMPT_PROMPT 0x01") cpp_quote("#define DBPROMPT_COMPLETE 0x02") diff --git a/include/devpropdef.h b/include/devpropdef.h index 2b0b7f4a849..94046f5bce0 100644 --- a/include/devpropdef.h +++ b/include/devpropdef.h @@ -82,18 +82,16 @@ typedef struct _DEVPROPKEY { #ifdef INITGUID #ifdef __cplusplus #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN; \ EXTERN_C const DEVPROPKEY DECLSPEC_SELECTANY name = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #else #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - extern const DEVPROPKEY name DECLSPEC_HIDDEN; \ const DEVPROPKEY DECLSPEC_SELECTANY name = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #endif #else #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN + EXTERN_C const DEVPROPKEY name #endif #ifndef IsEqualDevPropKey diff --git a/include/guiddef.h b/include/guiddef.h index 6f7e26df0c6..c5ba9635b89 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -89,29 +89,19 @@ extern "C++" { #undef DEFINE_GUID -#ifndef DECLSPEC_HIDDEN -# if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__CYGWIN__) -# define DECLSPEC_HIDDEN __attribute__((visibility ("hidden"))) -# else -# define DECLSPEC_HIDDEN -# endif -#endif - #ifdef INITGUID #ifdef __cplusplus #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name DECLSPEC_HIDDEN; \ EXTERN_C const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } #else #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - const GUID name DECLSPEC_HIDDEN; \ const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } #endif #else #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name DECLSPEC_HIDDEN + EXTERN_C const GUID name #endif #define DEFINE_OLEGUID(name, l, w1, w2) \ diff --git a/include/knownfolders.h b/include/knownfolders.h index 1b0bb7f3c47..ca85ef04c04 100644 --- a/include/knownfolders.h +++ b/include/knownfolders.h @@ -26,18 +26,16 @@ #ifdef INITGUID #ifdef __cplusplus #define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name DECLSPEC_HIDDEN; \ EXTERN_C const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } #else #define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - const GUID name DECLSPEC_HIDDEN; \ const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } #endif #else #define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name DECLSPEC_HIDDEN + EXTERN_C const GUID name #endif DEFINE_KNOWN_FOLDER(FOLDERID_AccountPictures, 0x008ca0b1, 0x55b4, 0x4c56, 0xb8, 0xa8, 0x4d, 0xe4, 0xb2, 0x99, 0xd3, 0xbe); diff --git a/include/netiodef.h b/include/netiodef.h index 658dd235db0..0d0d316b8eb 100644 --- a/include/netiodef.h +++ b/include/netiodef.h @@ -60,18 +60,16 @@ static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI #ifdef __WINE_INIT_NPI_MODULEID #ifdef __cplusplus #define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN; \ - EXTERN_C const NPI_MODULEID name = \ + EXTERN_C const NPI_MODULEID name = \ { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } } #else #define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - const NPI_MODULEID name DECLSPEC_HIDDEN; \ - const NPI_MODULEID name = \ + const NPI_MODULEID name = \ { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } } #endif #else /* __WINE_INIT_MODULEID */ #define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN + EXTERN_C const NPI_MODULEID name #endif /* __WINE_INIT_MODULEID */ #define DEFINE_NPI_MS_MODULEID(name, n) DEFINE_NPI_GUID_MODULEID(name, 0xeb004a00 + (n), 0x9b1a, 0x11d4, \ diff --git a/include/propkeydef.h b/include/propkeydef.h index 189af7faa26..fb3902ae35f 100644 --- a/include/propkeydef.h +++ b/include/propkeydef.h @@ -33,16 +33,16 @@ #ifdef INITGUID #ifdef __cplusplus #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const PROPERTYKEY DECLSPEC_SELECTANY name DECLSPEC_HIDDEN = \ + EXTERN_C const PROPERTYKEY DECLSPEC_SELECTANY name = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #else #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - const PROPERTYKEY DECLSPEC_SELECTANY name DECLSPEC_HIDDEN = \ + const PROPERTYKEY DECLSPEC_SELECTANY name = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #endif #else #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN + EXTERN_C const PROPERTYKEY name #endif #ifndef IsEqualPropertyKey diff --git a/include/rpcndr.h b/include/rpcndr.h index 2d836726a15..4e2a4e1ddb6 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -40,7 +40,6 @@ extern "C" { #ifndef EXTERN_GUID #ifdef __cplusplus #define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID DECLSPEC_SELECTANY name DECLSPEC_HIDDEN; \ EXTERN_C const GUID DECLSPEC_SELECTANY name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } #else diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 98c9430fdcb..8d4ab259af5 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -242,11 +242,10 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ /* define PROXY_CLSID_IS to specify the CLSID data of the PSFactoryBuffer */ /* define neither to use the GUID of the first interface */ #ifdef PROXY_CLSID -# define CLSID_PSFACTORYBUFFER extern CLSID PROXY_CLSID DECLSPEC_HIDDEN; +# define CLSID_PSFACTORYBUFFER extern CLSID PROXY_CLSID; #else # ifdef PROXY_CLSID_IS -# define CLSID_PSFACTORYBUFFER const CLSID CLSID_PSFactoryBuffer DECLSPEC_HIDDEN; \ - const CLSID CLSID_PSFactoryBuffer = PROXY_CLSID_IS; +# define CLSID_PSFACTORYBUFFER const CLSID CLSID_PSFactoryBuffer = PROXY_CLSID_IS; # define PROXY_CLSID CLSID_PSFactoryBuffer # else # define CLSID_PSFACTORYBUFFER

1 0

Eric Pouech : wintrust: Use SecureZeroMemory() to clear magic fields.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: fce67d1ec2d3b82c0d07c2a905192363fd9d1955 URL: https://gitlab.winehq.org/wine/wine/-/commit/fce67d1ec2d3b82c0d07c2a9051923… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Nov 8 09:27:26 2023 +0100 wintrust: Use SecureZeroMemory() to clear magic fields. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/wintrust/crypt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index dec945fe1e5..7321b84eea4 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -424,7 +424,8 @@ BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN hCatAdmin, SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - ci->magic = 0; + /* Ensure compiler doesn't optimize out the assignment with 0. */ + SecureZeroMemory(&ci->magic, sizeof(ci->magic)); free(ci); return TRUE; } @@ -455,7 +456,8 @@ BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags ) return FALSE; } if (ca->find != INVALID_HANDLE_VALUE) FindClose(ca->find); - ca->magic = 0; + /* Ensure compiler doesn't optimize out the assignment with 0. */ + SecureZeroMemory(&ca->magic, sizeof(ca->magic)); free(ca); return TRUE; } @@ -555,7 +557,8 @@ BOOL WINAPI CryptCATClose(HANDLE hCatalog) free(cc->inner); CryptMsgClose(cc->msg); - cc->magic = 0; + /* Ensure compiler doesn't optimize out the assignment with 0. */ + SecureZeroMemory(&cc->magic, sizeof(cc->magic)); free(cc); return TRUE; }

1 0

Alistair Leslie-Hughes : mpr: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: d4223b255cb3277bff118f73a5cbb94b832a08f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4223b255cb3277bff118f73a5cbb9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:28 2023 +1100 mpr: Remove DECLSPEC_HIDDEN usage. --- dlls/mpr/wnetpriv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnetpriv.h b/dlls/mpr/wnetpriv.h index 3e744c55ca7..7a329029f3d 100644 --- a/dlls/mpr/wnetpriv.h +++ b/dlls/mpr/wnetpriv.h @@ -21,7 +21,7 @@ #ifndef __WNET_PRIV_H__ #define __WNET_PRIV_H__ -void wnetInit(HINSTANCE hInstDll) DECLSPEC_HIDDEN; -void wnetFree(void) DECLSPEC_HIDDEN; +void wnetInit(HINSTANCE hInstDll); +void wnetFree(void); #endif /* ndef __WNET_PRIV_H__ */

1 0

Alexandre Julliard : include: Remove DECLSPEC_HIDDEN from RPC functions.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: 30ce97dd20ef3876eafa40a85994ddaba1194a9c URL: https://gitlab.winehq.org/wine/wine/-/commit/30ce97dd20ef3876eafa40a85994dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 10:09:47 2023 +0100 include: Remove DECLSPEC_HIDDEN from RPC functions. --- include/rpcproxy.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 747d2225954..98c9430fdcb 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -139,8 +139,8 @@ RPCRTAPI void WINAPI CStdStubBuffer_DebugServerRelease( IRpcStubBuffer *Thi RPCRTAPI ULONG WINAPI NdrCStdStubBuffer_Release( IRpcStubBuffer *This, IPSFactoryBuffer *pPSF ); RPCRTAPI ULONG WINAPI NdrCStdStubBuffer2_Release(IRpcStubBuffer *This, IPSFactoryBuffer *pPSF); -ULONG STDMETHODCALLTYPE CStdStubBuffer_Release( IRpcStubBuffer *This ) DECLSPEC_HIDDEN; -ULONG STDMETHODCALLTYPE CStdStubBuffer2_Release(IRpcStubBuffer *This) DECLSPEC_HIDDEN; +ULONG STDMETHODCALLTYPE CStdStubBuffer_Release( IRpcStubBuffer *This ); +ULONG STDMETHODCALLTYPE CStdStubBuffer2_Release(IRpcStubBuffer *This); #define CStdStubBuffer_METHODS \ CStdStubBuffer_QueryInterface, \ @@ -224,10 +224,10 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ /* macros used in dlldata.c files */ #define EXTERN_PROXY_FILE(proxy) \ - EXTERN_C const ProxyFileInfo proxy##_ProxyFileInfo DECLSPEC_HIDDEN; + EXTERN_C const ProxyFileInfo proxy##_ProxyFileInfo; #define PROXYFILE_LIST_START \ - const ProxyFileInfo * aProxyFileList[] DECLSPEC_HIDDEN = \ + const ProxyFileInfo * aProxyFileList[] = \ { #define REFERENCE_PROXY_FILE(proxy) \ @@ -287,7 +287,7 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ #define DLLDATA_GETPROXYDLLINFO(pfl, rclsid) \ void RPC_ENTRY GetProxyDllInfo(const ProxyFileInfo ***ppProxyFileInfo, \ - const CLSID **ppClsid) DECLSPEC_HIDDEN; \ + const CLSID **ppClsid); \ void RPC_ENTRY GetProxyDllInfo(const ProxyFileInfo ***ppProxyFileInfo, \ const CLSID **ppClsid) \ { \ @@ -296,7 +296,7 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ } #define DLLGETCLASSOBJECTROUTINE(pfl, factory_clsid, factory) \ - HRESULT WINAPI DLLGETCLASSOBJECT_ENTRY(REFCLSID rclsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; \ + HRESULT WINAPI DLLGETCLASSOBJECT_ENTRY(REFCLSID rclsid, REFIID riid, void **ppv); \ HRESULT WINAPI DLLGETCLASSOBJECT_ENTRY(REFCLSID rclsid, REFIID riid, \ void **ppv) \ { \ @@ -305,16 +305,16 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ } #define DLLCANUNLOADNOW(factory) \ - HRESULT WINAPI DLLCANUNLOADNOW_ENTRY(void) DECLSPEC_HIDDEN; \ + HRESULT WINAPI DLLCANUNLOADNOW_ENTRY(void); \ HRESULT WINAPI DLLCANUNLOADNOW_ENTRY(void) \ { \ return NdrDllCanUnloadNow((factory)); \ } #define REGISTER_PROXY_DLL_ROUTINES(pfl, factory_clsid) \ - HINSTANCE hProxyDll DECLSPEC_HIDDEN = NULL; \ + HINSTANCE hProxyDll = NULL; \ \ - BOOL WINAPI DLLMAIN_ENTRY(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DECLSPEC_HIDDEN; \ + BOOL WINAPI DLLMAIN_ENTRY(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); \ BOOL WINAPI DLLMAIN_ENTRY(HINSTANCE hinstDLL, DWORD fdwReason, \ LPVOID lpvReserved) \ { \ @@ -326,13 +326,13 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ return TRUE; \ } \ \ - HRESULT WINAPI DLLREGISTERSERVER_ENTRY(void) DECLSPEC_HIDDEN; \ + HRESULT WINAPI DLLREGISTERSERVER_ENTRY(void); \ HRESULT WINAPI DLLREGISTERSERVER_ENTRY(void) \ { \ WINE_DO_REGISTER_DLL( (pfl), (factory_clsid) ); \ } \ \ - HRESULT WINAPI DLLUNREGISTERSERVER_ENTRY(void) DECLSPEC_HIDDEN; \ + HRESULT WINAPI DLLUNREGISTERSERVER_ENTRY(void); \ HRESULT WINAPI DLLUNREGISTERSERVER_ENTRY(void) \ { \ WINE_DO_UNREGISTER_DLL( (pfl), (factory_clsid) ); \ @@ -347,7 +347,7 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ #define DLLDATA_ROUTINES(pfl, factory_clsid) \ CLSID_PSFACTORYBUFFER \ - CStdPSFactoryBuffer DECLSPEC_HIDDEN gPFactory = { NULL, 0, NULL, 0 }; \ + CStdPSFactoryBuffer gPFactory = { NULL, 0, NULL, 0 }; \ DLLDATA_GETPROXYDLLINFO(pfl, factory_clsid) \ DLLGETCLASSOBJECTROUTINE(pfl, factory_clsid, &gPFactory) \ DLLCANUNLOADNOW(&gPFactory) \

1 0

Alexandre Julliard : include: Remove DECLSPEC_HIDDEN from standard Dll* functions.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: a02ff4b5d3b43fab0662dac3834388d758661769 URL: https://gitlab.winehq.org/wine/wine/-/commit/a02ff4b5d3b43fab0662dac3834388… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 10:08:39 2023 +0100 include: Remove DECLSPEC_HIDDEN from standard Dll* functions. --- dlls/winecrt0/dll_main.c | 2 +- include/objbase.h | 4 ++-- include/shlwapi.h | 4 ++-- include/winbase.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winecrt0/dll_main.c b/dlls/winecrt0/dll_main.c index 08a9322d809..a177438584c 100644 --- a/dlls/winecrt0/dll_main.c +++ b/dlls/winecrt0/dll_main.c @@ -22,7 +22,7 @@ #include "windef.h" #include "winbase.h" -BOOL WINAPI DECLSPEC_HIDDEN DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); return TRUE; diff --git a/include/objbase.h b/include/objbase.h index 15851a13550..bae8de54bab 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -420,8 +420,8 @@ WINOLE32API HRESULT WINAPI StringFromIID(REFIID riid, LPOLESTR*); /***************************************************************************** * COM Server dll - exports */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; -HRESULT WINAPI DllCanUnloadNow(void) DECLSPEC_HIDDEN; +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * ppv); +HRESULT WINAPI DllCanUnloadNow(void); /***************************************************************************** * Data Object diff --git a/include/shlwapi.h b/include/shlwapi.h index aafbdd3870b..c643d2a4e3a 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1089,7 +1089,7 @@ typedef HRESULT (CALLBACK *DLLGETVERSIONPROC)(DLLVERSIONINFO *); #ifdef __WINESRC__ /* shouldn't be here, but is nice for type checking */ -HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *) DECLSPEC_HIDDEN; +HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *); #endif typedef struct _DLLVERSIONINFO2 { @@ -1106,7 +1106,7 @@ typedef struct _DLLVERSIONINFO2 { #define MAKEDLLVERULL(mjr, mnr, bld, qfe) (((ULONGLONG)(mjr)<< 48)| \ ((ULONGLONG)(mnr)<< 32) | ((ULONGLONG)(bld)<< 16) | (ULONGLONG)(qfe)) -HRESULT WINAPI DllInstall(BOOL,LPCWSTR) DECLSPEC_HIDDEN; +HRESULT WINAPI DllInstall(BOOL,LPCWSTR); /* IsOS definitions */ diff --git a/include/winbase.h b/include/winbase.h index 5f005fcd82b..16e449f7c2d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -3048,7 +3048,7 @@ int WINAPI wWinMain(HINSTANCE,HINSTANCE,LPWSTR,int); #ifdef __WINESRC__ /* shouldn't be here, but is nice for type checking */ -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) DECLSPEC_HIDDEN; +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ); #endif #ifdef __cplusplus

1 0

Alistair Leslie-Hughes : rsaenh: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: d8f37d0a047e51b98d21c36a2f666d646e4fae58 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8f37d0a047e51b98d21c36a2f666d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:28 2023 +1100 rsaenh: Remove DECLSPEC_HIDDEN usage. --- dlls/rsaenh/handle.h | 14 +++++++------- dlls/rsaenh/implglue.h | 32 +++++++++++++++----------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/rsaenh/handle.h b/dlls/rsaenh/handle.h index 05cbb77fbfe..f28f2af1f3a 100644 --- a/dlls/rsaenh/handle.h +++ b/dlls/rsaenh/handle.h @@ -56,15 +56,15 @@ struct handle_table CRITICAL_SECTION mutex; }; -void init_handle_table (struct handle_table *lpTable) DECLSPEC_HIDDEN; -void destroy_handle_table(struct handle_table *lpTable) DECLSPEC_HIDDEN; -BOOL release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; -BOOL copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) DECLSPEC_HIDDEN; -BOOL lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) DECLSPEC_HIDDEN; -BOOL is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; +void init_handle_table (struct handle_table *lpTable); +void destroy_handle_table(struct handle_table *lpTable); +BOOL release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType); +BOOL copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy); +BOOL lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject); +BOOL is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType); HCRYPTKEY new_object (struct handle_table *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor, - OBJECTHDR **ppObject) DECLSPEC_HIDDEN; + OBJECTHDR **ppObject); #ifdef __cplusplus } diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 423474dc52e..2d490aa345b 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -38,34 +38,32 @@ typedef union tagKEY_CONTEXT { rsa_key rsa; } KEY_CONTEXT; -BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) DECLSPEC_HIDDEN; -BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, - DWORD dwDataLen) DECLSPEC_HIDDEN; -BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *hash_value, DWORD hash_size) DECLSPEC_HIDDEN; -BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, - BCRYPT_HASH_HANDLE *dest_hash_handle) DECLSPEC_HIDDEN; +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle); +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen); +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *hash_value, DWORD hash_size); +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, BCRYPT_HASH_HANDLE *dest_hash_handle); -BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) DECLSPEC_HIDDEN; -BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext) DECLSPEC_HIDDEN; +BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen); +BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext); BOOL setup_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwEffectiveKeyLen, DWORD dwSaltLen, BYTE *abKeyValue) DECLSPEC_HIDDEN; + DWORD dwEffectiveKeyLen, DWORD dwSaltLen, BYTE *abKeyValue); BOOL duplicate_key_impl(ALG_ID aiAlgid, const KEY_CONTEXT *pSrcKeyContext, - KEY_CONTEXT *pDestKeyContext) DECLSPEC_HIDDEN; + KEY_CONTEXT *pDestKeyContext); /* dwKeySpec is optional for symmetric key algorithms */ BOOL encrypt_block_impl(ALG_ID aiAlgid, DWORD dwKeySpec, KEY_CONTEXT *pKeyContext, const BYTE *pbIn, - BYTE *pbOut, DWORD enc) DECLSPEC_HIDDEN; -BOOL encrypt_stream_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, BYTE *pbInOut, DWORD dwLen) DECLSPEC_HIDDEN; + BYTE *pbOut, DWORD enc); +BOOL encrypt_stream_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, BYTE *pbInOut, DWORD dwLen); BOOL export_public_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD *pdwPubExp) DECLSPEC_HIDDEN; + DWORD *pdwPubExp); BOOL import_public_key_impl(const BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwPubExp) DECLSPEC_HIDDEN; + DWORD dwPubExp); BOOL export_private_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD *pdwPubExp) DECLSPEC_HIDDEN; + DWORD *pdwPubExp); BOOL import_private_key_impl(const BYTE* pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwDataLen, DWORD dwPubExp) DECLSPEC_HIDDEN; + DWORD dwDataLen, DWORD dwPubExp); -BOOL gen_rand_impl(BYTE *pbBuffer, DWORD dwLen) DECLSPEC_HIDDEN; +BOOL gen_rand_impl(BYTE *pbBuffer, DWORD dwLen); #endif /* __WINE_IMPLGLUE_H */

1 0

Alistair Leslie-Hughes : itss: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: ee211f34c6e2555bf94d1aaa024bcc168e4c3d12 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee211f34c6e2555bf94d1aaa024bcc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:28 2023 +1100 itss: Remove DECLSPEC_HIDDEN usage. --- dlls/itss/chm_lib.h | 24 ++++++++---------------- dlls/itss/itsstor.h | 10 ++++------ 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/itss/chm_lib.h b/dlls/itss/chm_lib.h index 23b51bd6d9d..45b18af3070 100644 --- a/dlls/itss/chm_lib.h +++ b/dlls/itss/chm_lib.h @@ -72,25 +72,20 @@ struct chmUnitInfo WCHAR path[CHM_MAX_PATHLEN+1]; }; -struct chmFile* chm_openW(const WCHAR *filename) DECLSPEC_HIDDEN; -struct chmFile *chm_dup(struct chmFile *oldHandle) DECLSPEC_HIDDEN; +struct chmFile* chm_openW(const WCHAR *filename); +struct chmFile *chm_dup(struct chmFile *oldHandle); /* close an ITS archive */ -void chm_close(struct chmFile *h) DECLSPEC_HIDDEN; +void chm_close(struct chmFile *h); /* resolve a particular object from the archive */ #define CHM_RESOLVE_SUCCESS (0) #define CHM_RESOLVE_FAILURE (1) -int chm_resolve_object(struct chmFile *h, - const WCHAR *objPath, - struct chmUnitInfo *ui) DECLSPEC_HIDDEN; +int chm_resolve_object(struct chmFile *h, const WCHAR *objPath, struct chmUnitInfo *ui); /* retrieve part of an object from the archive */ -LONGINT64 chm_retrieve_object(struct chmFile *h, - struct chmUnitInfo *ui, - unsigned char *buf, - LONGUINT64 addr, - LONGINT64 len) DECLSPEC_HIDDEN; +LONGINT64 chm_retrieve_object(struct chmFile *h, struct chmUnitInfo *ui, unsigned char *buf, + LONGUINT64 addr, LONGINT64 len); /* enumerate the objects in the .chm archive */ typedef int (*CHM_ENUMERATOR)(struct chmFile *h, @@ -105,10 +100,7 @@ typedef int (*CHM_ENUMERATOR)(struct chmFile *h, #define CHM_ENUMERATOR_FAILURE (0) #define CHM_ENUMERATOR_CONTINUE (1) #define CHM_ENUMERATOR_SUCCESS (2) -BOOL chm_enumerate_dir(struct chmFile *h, - const WCHAR *prefix, - int what, - CHM_ENUMERATOR e, - void *context) DECLSPEC_HIDDEN; +BOOL chm_enumerate_dir(struct chmFile *h, const WCHAR *prefix, int what, + CHM_ENUMERATOR e, void *context); #endif /* INCLUDED_CHMLIB_H */ diff --git a/dlls/itss/itsstor.h b/dlls/itss/itsstor.h index f4fa72b216b..ef91d1c6fbb 100644 --- a/dlls/itss/itsstor.h +++ b/dlls/itss/itsstor.h @@ -29,15 +29,13 @@ extern HRESULT ITSS_StgOpenStorage( DWORD grfMode, SNB snbExclude, DWORD reserved, - IStorage** ppstgOpen) DECLSPEC_HIDDEN; + IStorage** ppstgOpen); -extern HRESULT ITS_IParseDisplayName_create( - IUnknown *pUnkOuter, - LPVOID *ppObj) DECLSPEC_HIDDEN; +extern HRESULT ITS_IParseDisplayName_create(IUnknown *pUnkOuter, LPVOID *ppObj); -extern HRESULT ITSProtocol_create(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT ITSProtocol_create(IUnknown *pUnkOuter, LPVOID *ppobj); -extern LONG dll_count DECLSPEC_HIDDEN; +extern LONG dll_count; static inline void ITSS_LockModule(void) { InterlockedIncrement(&dll_count); } static inline void ITSS_UnlockModule(void) { InterlockedDecrement(&dll_count); }

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: wine Branch: master Commit: 2aa688326d1ad923138754e186e566835e07b24e URL: https://gitlab.winehq.org/wine/wine/-/commit/2aa688326d1ad923138754e186e566… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:28 2023 +1100 ntoskrnl.exe: Remove DECLSPEC_HIDDEN usage. --- dlls/ntoskrnl.exe/ntoskrnl_private.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index ef1fa99057c..472dc46fde3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -72,8 +72,8 @@ struct _ETHREAD struct _KTHREAD kthread; }; -void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ) DECLSPEC_HIDDEN; -NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) DECLSPEC_HIDDEN; +void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ); +NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ); extern POBJECT_TYPE ExEventObjectType; extern POBJECT_TYPE ExSemaphoreObjectType; @@ -100,15 +100,15 @@ struct wine_driver struct list root_pnp_devices; }; -void ObReferenceObject( void *obj ) DECLSPEC_HIDDEN; +void ObReferenceObject( void *obj ); -void pnp_manager_start(void) DECLSPEC_HIDDEN; -void pnp_manager_stop_driver( struct wine_driver *driver ) DECLSPEC_HIDDEN; -void pnp_manager_stop(void) DECLSPEC_HIDDEN; +void pnp_manager_start(void); +void pnp_manager_stop_driver( struct wine_driver *driver ); +void pnp_manager_stop(void); void CDECL wine_enumerate_root_devices( const WCHAR *driver_name ); -struct wine_driver *get_driver( const WCHAR *name ) DECLSPEC_HIDDEN; +struct wine_driver *get_driver( const WCHAR *name ); static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', '\\','M','a','c','h','i','n','e',

1 0