https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72e8d9fa92eae8f28e89e7...
commit 72e8d9fa92eae8f28e89e7c764d767f34e5b4549 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Fri Mar 9 13:04:41 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Fri Mar 9 13:04:41 2018 +0100
[CRYPTUI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/cryptui/cryptui.rc | 7 +------ dll/win32/cryptui/cryptuires.h | 6 +++--- dll/win32/cryptui/main.c | 40 ++++++++++++++++++---------------------- media/doc/README.WINE | 2 +- 4 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/dll/win32/cryptui/cryptui.rc b/dll/win32/cryptui/cryptui.rc index e1e7f01fb1..3f3027b92d 100644 --- a/dll/win32/cryptui/cryptui.rc +++ b/dll/win32/cryptui/cryptui.rc @@ -17,11 +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 "winbase.h" -#include <winuser.h> -#include <commctrl.h> -//#include "dlgs.h"
#include "cryptuires.h"
@@ -98,4 +93,4 @@ IDB_CERT_HEADER BITMAP "res/certheader.bmp" #endif #ifdef LANGUAGE_ZH_CN #include "lang/cryptui_Zh.rc" -#endif \ No newline at end of file +#endif diff --git a/dll/win32/cryptui/cryptuires.h b/dll/win32/cryptui/cryptuires.h index 9b3edafb7c..df321df463 100644 --- a/dll/win32/cryptui/cryptuires.h +++ b/dll/win32/cryptui/cryptuires.h @@ -18,9 +18,9 @@ #ifndef __CRYPTUIRES_H_ #define __CRYPTUIRES_H_
-//#include <windef.h> -//#include <winuser.h> -//#include <commctrl.h> +#include <windef.h> +#include <winuser.h> +#include <commctrl.h>
#define IDS_CERTIFICATE 1000 #define IDS_CERTIFICATEINFORMATION 1001 diff --git a/dll/win32/cryptui/main.c b/dll/win32/cryptui/main.c index 010fe5da3c..a652239bb3 100644 --- a/dll/win32/cryptui/main.c +++ b/dll/win32/cryptui/main.c @@ -16,35 +16,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <wine/config.h> +#include "config.h"
#include <stdarg.h>
#define COBJMACROS #define NONAMELESSUNION
-#include <windef.h> -#include <winbase.h> -//#include "winnls.h" -#include <winuser.h> -#include <softpub.h> -#include <wingdi.h> -#include <richedit.h> -#include <ole2.h> -#include <richole.h> -#include <commdlg.h> -#include <commctrl.h> -#include <cryptuiapi.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winuser.h" +#include "softpub.h" +#include "wingdi.h" +#include "richedit.h" +#include "ole2.h" +#include "richole.h" +#include "commdlg.h" +#include "commctrl.h" +#include "cryptuiapi.h" #include "cryptuires.h" -//#include "urlmon.h" -#include <hlink.h> -#include <winreg.h> -#include <wine/debug.h> -#include <wine/unicode.h> +#include "urlmon.h" +#include "hlink.h" +#include "winreg.h" +#include "wine/debug.h" +#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(cryptui);
diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 11662a9f7b..38f498ab7d 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -62,7 +62,7 @@ reactos/dll/win32/crypt32 # Synced to WineStaging-3.3 reactos/dll/win32/cryptdlg # Synced to WineStaging-3.3 reactos/dll/win32/cryptdll # Synced to WineStaging-3.3 reactos/dll/win32/cryptnet # Synced to WineStaging-3.3 -reactos/dll/win32/cryptui # Synced to WineStaging-2.16 +reactos/dll/win32/cryptui # Synced to WineStaging-3.3 reactos/dll/win32/dbghelp # Synced to WineStaging-3.3 reactos/dll/win32/dciman32 # Synced to WineStaging-2.9 reactos/dll/win32/faultrep # Synced to WineStaging-2.9
-
Amine Khaldi