[CRYPTDLG] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 9 Mar 2018 12:01:37 +0000 (13:01 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 9 Mar 2018 12:01:37 +0000 (13:01 +0100)
dll/win32/cryptdlg/cryptdlg.rc
dll/win32/cryptdlg/cryptres.h
dll/win32/cryptdlg/main.c
media/doc/README.WINE

index 4444211..f1a96aa 100644 (file)
@@ -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"
 
index 821fda3..4d3c2d2 100644 (file)
@@ -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
index 7e875c3..e3eaec1 100644 (file)
  * 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);
 
index 7d6bb23..c9a7dca 100644 (file)
@@ -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