From: Amine Khaldi Date: Sat, 21 Nov 2015 09:30:09 +0000 (+0000) Subject: [SXS] Sync with Wine Staging 1.7.55. CORE-10536 X-Git-Tag: ReactOS-0.4.0~83 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=bc46fd6df7e6dca1a9e7f813660eff7f7803abb6 [SXS] Sync with Wine Staging 1.7.55. CORE-10536 svn path=/trunk/; revision=69977 --- diff --git a/reactos/dll/win32/sxs/sxs_private.h b/reactos/dll/win32/sxs/sxs_private.h index 7b332028f56..de462512f30 100644 --- a/reactos/dll/win32/sxs/sxs_private.h +++ b/reactos/dll/win32/sxs/sxs_private.h @@ -46,7 +46,7 @@ enum name_attr_id NAME_ATTR_ID_VERSION }; -const WCHAR *get_name_attribute( IAssemblyName *, enum name_attr_id ); +const WCHAR *get_name_attribute( IAssemblyName *, enum name_attr_id ) DECLSPEC_HIDDEN; static inline WCHAR *strdupW( const WCHAR *src ) { diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index a8c82b022f7..32804c9d6ba 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -186,7 +186,7 @@ reactos/dll/win32/spoolss # Synced to WineStaging-1.7.47 reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.7.47 reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.7.47 reactos/dll/win32/sti # Synced to WineStaging-1.7.47 -reactos/dll/win32/sxs # Synced to WineStaging-1.7.47 +reactos/dll/win32/sxs # Synced to WineStaging-1.7.55 reactos/dll/win32/tapi32 # Synced to WineStaging-1.7.47 reactos/dll/win32/traffic # Synced to WineStaging-1.7.47 reactos/dll/win32/twain_32 # Synced to WineStaging-1.7.37