https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ddee95dfcdece35a8f0481a1ec546c1be5c9249c
commit ddee95dfcdece35a8f0481a1ec546c1be5c9249c Author: Amine Khaldi <[email protected]> AuthorDate: Sat Nov 9 21:57:34 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sat Nov 9 21:57:34 2019 +0100 [MSCAT32] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/mscat32/main.c | 2 -- dll/win32/mscat32/mscat32.spec | 4 +++- media/doc/README.WINE | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/mscat32/main.c b/dll/win32/mscat32/main.c index d2b9d8bd67b..8408070282c 100644 --- a/dll/win32/mscat32/main.c +++ b/dll/win32/mscat32/main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dll/win32/mscat32/mscat32.spec b/dll/win32/mscat32/mscat32.spec index 3c3c9d8d4c1..b0b1788c53d 100644 --- a/dll/win32/mscat32/mscat32.spec +++ b/dll/win32/mscat32/mscat32.spec @@ -1,4 +1,5 @@ -@ stub CryptCATVerifyMember +1 stub CryptCATVerifyMember +#@ stub CatalogCompactHashDatabase @ stdcall CryptCATAdminAcquireContext(long ptr long) wintrust.CryptCATAdminAcquireContext @ stdcall CryptCATAdminAddCatalog(long wstr wstr long) wintrust.CryptCATAdminAddCatalog @ stdcall CryptCATAdminCalcHashFromFileHandle(long ptr ptr long) wintrust.CryptCATAdminCalcHashFromFileHandle @@ -11,6 +12,7 @@ @ stdcall CryptCATCDFEnumCatAttributes(ptr ptr ptr) wintrust.CryptCATCDFEnumCatAttributes @ stub CryptCATCDFEnumMembers @ stdcall CryptCATCDFEnumMembersByCDFTag(ptr wstr ptr ptr long) wintrust.CryptCATCDFEnumMembersByCDFTag +@ stdcall CryptCATCDFEnumMembersByCDFTagEx(ptr wstr ptr ptr long ptr) wintrust.CryptCATCDFEnumMembersByCDFTagEx @ stdcall CryptCATCDFOpen(wstr ptr) wintrust.CryptCATCDFOpen @ stdcall CryptCATCatalogInfoFromContext(ptr ptr long) wintrust.CryptCATCatalogInfoFromContext @ stdcall CryptCATClose(long) wintrust.CryptCATClose diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 6ef81693421..cb3d4f5b742 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -104,7 +104,7 @@ dll/win32/mprapi # Synced to WineStaging-3.3 dll/win32/msacm32 # Synced to WineStaging-4.18 dll/win32/msacm32.drv # Synced to WineStaging-3.3 dll/win32/msadp32.acm # Synced to WineStaging-4.0 -dll/win32/mscat32 # Synced to WineStaging-3.3 +dll/win32/mscat32 # Synced to WineStaging-4.18 dll/win32/mscms # Synced to WineStaging-4.0 dll/win32/mscoree # Synced to Wine-1.5.4 dll/win32/msctf # Synced to WineStaging-4.0
