01/01: [WINTRUST] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95d5c4bed3df75e55ec7d…

commit 95d5c4bed3df75e55ec7d61a5c7ecfb6f52ea506
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sat Mar 24 13:18:57 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sat Mar 24 13:18:57 2018 +0100

    [WINTRUST] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/wintrust/CMakeLists.txt  |  4 ++--
 dll/win32/wintrust/asn.c           | 17 ++++++++++++++---
 dll/win32/wintrust/crypt.c         | 15 ++++++++++++---
 dll/win32/wintrust/precomp.h       | 27 +++++++++++++++++++++++++++
 dll/win32/wintrust/register.c      | 15 +++++++++++++++
 dll/win32/wintrust/softpub.c       | 14 ++++++++++++--
 dll/win32/wintrust/wintrust_main.c | 22 +++++++++++++++++++---
 dll/win32/wintrust/wintrust_priv.h | 23 +----------------------
 media/doc/README.WINE              |  2 +-
 9 files changed, 103 insertions(+), 36 deletions(-)

diff --git a/dll/win32/wintrust/CMakeLists.txt b/dll/win32/wintrust/CMakeLists.txt
index 87e9f32e8c..1e8d8bf535 100644
--- a/dll/win32/wintrust/CMakeLists.txt
+++ b/dll/win32/wintrust/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     register.c
     softpub.c
     wintrust_main.c
-    wintrust_priv.h
+    precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/wintrust_stubs.c)
 
 add_library(wintrust SHARED
@@ -23,5 +23,5 @@ target_link_libraries(wintrust wine ${PSEH_LIB})
 #add_delay_importlibs(wintrust cryptui imagehlp)
 add_delay_importlibs(wintrust cryptui)
 add_importlibs(wintrust imagehlp crypt32 user32 advapi32 msvcrt kernel32 ntdll)
-add_pch(wintrust wintrust_priv.h SOURCE)
+add_pch(wintrust precomp.h SOURCE)
 add_cd_file(TARGET wintrust DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/wintrust/asn.c b/dll/win32/wintrust/asn.c
index 67dbf8be63..6406ba3428 100644
--- a/dll/win32/wintrust/asn.c
+++ b/dll/win32/wintrust/asn.c
@@ -18,11 +18,22 @@
  *
  */
 
-#include "wintrust_priv.h"
+#include "config.h"
+#include "wine/port.h"
 
+#include <stdarg.h>
+#include <stdio.h>
 #include <assert.h>
-#include <snmp.h>
-#include <wine/exception.h>
+#define NONAMELESSUNION
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wincrypt.h"
+#include "wintrust.h"
+#include "snmp.h"
+#include "winternl.h"
+#include "wine/debug.h"
+#include "wine/exception.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(cryptasn);
 
diff --git a/dll/win32/wintrust/crypt.c b/dll/win32/wintrust/crypt.c
index b59bfddedc..84188f881a 100644
--- a/dll/win32/wintrust/crypt.c
+++ b/dll/win32/wintrust/crypt.c
@@ -22,9 +22,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wintrust_priv.h"
-
-#include <imagehlp.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wintrust.h"
+#include "mscat.h"
+#include "mssip.h"
+#include "imagehlp.h"
+#include "winternl.h"
+
+#include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
 
diff --git a/dll/win32/wintrust/precomp.h b/dll/win32/wintrust/precomp.h
new file mode 100644
index 0000000000..049a53dac4
--- /dev/null
+++ b/dll/win32/wintrust/precomp.h
@@ -0,0 +1,27 @@
+
+#ifndef _WINTRUST_PRECOMP_H
+#define _WINTRUST_PRECOMP_H
+
+#include <wine/config.h>
+
+#include <stdio.h>
+
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define NONAMELESSUNION
+
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <winternl.h>
+#include <softpub.h>
+#include <mscat.h>
+
+#include <wine/debug.h>
+#include <wine/unicode.h>
+
+#include "wintrust_priv.h"
+
+#endif /* !_WINTRUST_PRECOMP_H */
diff --git a/dll/win32/wintrust/register.c b/dll/win32/wintrust/register.c
index 7bee6c86c7..effe9d18f2 100644
--- a/dll/win32/wintrust/register.c
+++ b/dll/win32/wintrust/register.c
@@ -18,7 +18,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "winnls.h"
+#include "objbase.h"
+
+#include "guiddef.h"
+#include "wintrust.h"
+#include "softpub.h"
+#include "mssip.h"
 #include "wintrust_priv.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
 
diff --git a/dll/win32/wintrust/softpub.c b/dll/win32/wintrust/softpub.c
index c70a19f5d2..0c04001985 100644
--- a/dll/win32/wintrust/softpub.c
+++ b/dll/win32/wintrust/softpub.c
@@ -16,8 +16,18 @@
  * 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 "wintrust_priv.h"
+#include <stdarg.h>
+
+#define NONAMELESSUNION
+
+#include "windef.h"
+#include "winbase.h"
+#include "winternl.h"
+#include "wintrust.h"
+#include "mssip.h"
+#include "softpub.h"
+#include "winnls.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
 
diff --git a/dll/win32/wintrust/wintrust_main.c b/dll/win32/wintrust/wintrust_main.c
index 6977fa0ee2..58e3ac39c0 100644
--- a/dll/win32/wintrust/wintrust_main.c
+++ b/dll/win32/wintrust/wintrust_main.c
@@ -17,10 +17,26 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "config.h"
+
+#include <stdarg.h>
+
+#define NONAMELESSUNION
+
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winreg.h"
+#include "guiddef.h"
+#include "wintrust.h"
+#include "softpub.h"
+#include "mscat.h"
+#include "objbase.h"
+#include "winuser.h"
+#include "cryptdlg.h"
+#include "cryptuiapi.h"
 #include "wintrust_priv.h"
-
-#include <cryptdlg.h>
-#include <cryptuiapi.h>
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
 
diff --git a/dll/win32/wintrust/wintrust_priv.h b/dll/win32/wintrust/wintrust_priv.h
index ef8decb3d9..66c925ade5 100644
--- a/dll/win32/wintrust/wintrust_priv.h
+++ b/dll/win32/wintrust/wintrust_priv.h
@@ -15,30 +15,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
 #ifndef __WINTRUST_PRIV_H__
 #define __WINTRUST_PRIV_H__
 
-#include <wine/config.h>
-
-#include <stdio.h>
-
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <winreg.h>
-#include <winternl.h>
-#include <softpub.h>
-#include <mscat.h>
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
 void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN;
 void WINAPI WINTRUST_Free(void *p) DECLSPEC_HIDDEN;
 BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store)
DECLSPEC_HIDDEN;
@@ -49,4 +28,4 @@ BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD
idxSigner,
 BOOL WINAPI WINTRUST_AddPrivData(CRYPT_PROVIDER_DATA *data,
  CRYPT_PROVIDER_PRIVDATA *pPrivData2Add) DECLSPEC_HIDDEN;
 
-#endif /* __WINTRUST_PRIV_H__ */
+#endif /* ndef __WINTRUST_PRIV_H__ */
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 9013bb9d4e..b66f8a0f2b 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -206,7 +206,7 @@ reactos/dll/win32/winmm               # Forked at Wine-20050628
 reactos/dll/win32/winmm/midimap       # Forked at Wine-20050628
 reactos/dll/win32/winmm/wavemap       # Forked at Wine-20050628
 reactos/dll/win32/winscard            # Synced to WineStaging-3.3
-reactos/dll/win32/wintrust            # Synced to WineStaging-2.16
+reactos/dll/win32/wintrust            # Synced to WineStaging-3.3
 reactos/dll/win32/wldap32             # Synced to Wine-3.0
 reactos/dll/win32/wmi                 # Synced to WineStaging-2.9
 reactos/dll/win32/wmiutils            # Synced to WineStaging-2.9