Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-30 19:14:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CRYPTUI] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-03-09 13:04:41 +01:00
parent c2d08daae1
commit 72e8d9fa92
4 changed files with 23 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dll/win32/cryptui/cryptui.rc
View file

@ -17,11 +17,6 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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" #include "cryptuires.h"
@ -98,4 +93,4 @@ IDB_CERT_HEADER BITMAP "res/certheader.bmp"
#endif #endif
#ifdef LANGUAGE_ZH_CN #ifdef LANGUAGE_ZH_CN
#include "lang/cryptui_Zh.rc" #include "lang/cryptui_Zh.rc"
#endif #endif

6
dll/win32/cryptui/cryptuires.h
View file

@ -18,9 +18,9 @@
#ifndef __CRYPTUIRES_H_ #ifndef __CRYPTUIRES_H_
#define __CRYPTUIRES_H_ #define __CRYPTUIRES_H_
//#include <windef.h> #include <windef.h>
//#include <winuser.h> #include <winuser.h>
//#include <commctrl.h> #include <commctrl.h>
#define IDS_CERTIFICATE 1000 #define IDS_CERTIFICATE 1000
#define IDS_CERTIFICATEINFORMATION 1001 #define IDS_CERTIFICATEINFORMATION 1001

40
dll/win32/cryptui/main.c
View file

@ -16,35 +16,31 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "config.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <wine/config.h>
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION #define NONAMELESSUNION
#include <windef.h> #include "windef.h"
#include <winbase.h> #include "winbase.h"
//#include "winnls.h" #include "winnls.h"
#include <winuser.h> #include "winuser.h"
#include <softpub.h> #include "softpub.h"
#include <wingdi.h> #include "wingdi.h"
#include <richedit.h> #include "richedit.h"
#include <ole2.h> #include "ole2.h"
#include <richole.h> #include "richole.h"
#include <commdlg.h> #include "commdlg.h"
#include <commctrl.h> #include "commctrl.h"
#include <cryptuiapi.h> #include "cryptuiapi.h"
#include "cryptuires.h" #include "cryptuires.h"
//#include "urlmon.h" #include "urlmon.h"
#include <hlink.h> #include "hlink.h"
#include <winreg.h> #include "winreg.h"
#include <wine/debug.h> #include "wine/debug.h"
#include <wine/unicode.h> #include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(cryptui); WINE_DEFAULT_DEBUG_CHANNEL(cryptui);

2
media/doc/README.WINE
View file

@ -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/cryptdlg # Synced to WineStaging-3.3
reactos/dll/win32/cryptdll # 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/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/dbghelp # Synced to WineStaging-3.3
reactos/dll/win32/dciman32 # Synced to WineStaging-2.9 reactos/dll/win32/dciman32 # Synced to WineStaging-2.9
reactos/dll/win32/faultrep # Synced to WineStaging-2.9 reactos/dll/win32/faultrep # Synced to WineStaging-2.9