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

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7342d6751c456df1dbc32…

commit 7342d6751c456df1dbc32b2c81d78faf78c8c9d3
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Fri Mar 9 13:01:37 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Fri Mar 9 13:01:37 2018 +0100

    [CRYPTDLG] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/cryptdlg/cryptdlg.rc |  1 -
 dll/win32/cryptdlg/cryptres.h  |  2 +-
 dll/win32/cryptdlg/main.c      | 28 +++++++++++++---------------
 media/doc/README.WINE          |  2 +-
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/dll/win32/cryptdlg/cryptdlg.rc b/dll/win32/cryptdlg/cryptdlg.rc
index 4444211a2d..f1a96aaabe 100644
--- a/dll/win32/cryptdlg/cryptdlg.rc
+++ b/dll/win32/cryptdlg/cryptdlg.rc
@@ -17,7 +17,6 @@
  * 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 <windef.h>
 
 #include "cryptres.h"
 
diff --git a/dll/win32/cryptdlg/cryptres.h b/dll/win32/cryptdlg/cryptres.h
index 821fda378f..4d3c2d2ffb 100644
--- a/dll/win32/cryptdlg/cryptres.h
+++ b/dll/win32/cryptdlg/cryptres.h
@@ -18,7 +18,7 @@
 #ifndef __CRYPTRES_H__
 #define __CRYPTRES_H__
 
-//#include <windef.h>
+#include <windef.h>
 
 #define IDS_CERT_POLICY 100
 #define IDS_POLICY_ID 101
diff --git a/dll/win32/cryptdlg/main.c b/dll/win32/cryptdlg/main.c
index 7e875c3b49..e3eaec1e19 100644
--- a/dll/win32/cryptdlg/main.c
+++ b/dll/win32/cryptdlg/main.c
@@ -16,27 +16,25 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
 #define NONAMELESSUNION
 
-#include <config.h>
+#include "config.h"
 
 #include <stdarg.h>
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winnls.h"
-#include <winreg.h>
-#include <wincrypt.h>
-//#include "wintrust.h"
-#include <winuser.h>
-//#include "objbase.h"
-#include <cryptdlg.h>
-#include <cryptuiapi.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "winreg.h"
+#include "wincrypt.h"
+#include "wintrust.h"
+#include "winuser.h"
+#include "objbase.h"
+#include "cryptdlg.h"
+#include "cryptuiapi.h"
 #include "cryptres.h"
-#include <wine/unicode.h>
-#include <wine/debug.h>
+#include "wine/unicode.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(cryptdlg);
 
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 7d6bb23c99..c9a7dca4f2 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -59,7 +59,7 @@ reactos/dll/win32/comdlg32            # Synced to WineStaging-3.3
 reactos/dll/win32/compstui            # Synced to WineStaging-3.3
 reactos/dll/win32/credui              # Synced to WineStaging-3.3
 reactos/dll/win32/crypt32             # Synced to WineStaging-3.3
-reactos/dll/win32/cryptdlg            # Synced to WineStaging-2.9
+reactos/dll/win32/cryptdlg            # Synced to WineStaging-3.3
 reactos/dll/win32/cryptdll            # Synced to WineStaging-2.9
 reactos/dll/win32/cryptnet            # Synced to WineStaging-2.9
 reactos/dll/win32/cryptui             # Synced to WineStaging-2.16