Skip to content

W
wine-winehq
Commit a4087cec authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

cryptui: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 0db20c44
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 20 deletions
dlls/cryptui/Makefile.in
View file @ a4087cec
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = cryptui.dll MODULE = cryptui.dll
IMPORTS = uuid crypt32 ole32 comctl32 comdlg32 user32 gdi32 advapi32 IMPORTS = uuid crypt32 ole32 comctl32 comdlg32 user32 gdi32 advapi32
DELAYIMPORTS = wintrust urlmon DELAYIMPORTS = wintrust urlmon
......
dlls/cryptui/main.c
View file @ a4087cec
...@@ -48,7 +48,7 @@ static const WCHAR empty[] = {0}; ...@@ -48,7 +48,7 @@ static const WCHAR empty[] = {0};
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) switch (fdwReason)
{ {
...@@ -1298,7 +1298,7 @@ BOOL WINAPI CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr) ...@@ -1298,7 +1298,7 @@ BOOL WINAPI CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr)
if (pCryptUICertMgr->dwSize != sizeof(CRYPTUI_CERT_MGR_STRUCT)) if (pCryptUICertMgr->dwSize != sizeof(CRYPTUI_CERT_MGR_STRUCT))
{ {
WARN("unexpected size %d\n", pCryptUICertMgr->dwSize); WARN("unexpected size %ld\n", pCryptUICertMgr->dwSize);
SetLastError(E_INVALIDARG); SetLastError(E_INVALIDARG);
return FALSE; return FALSE;
} }
...@@ -1605,7 +1605,7 @@ HCERTSTORE WINAPI CryptUIDlgSelectStoreW(PCRYPTUI_SELECTSTORE_INFO_W info) ...@@ -1605,7 +1605,7 @@ HCERTSTORE WINAPI CryptUIDlgSelectStoreW(PCRYPTUI_SELECTSTORE_INFO_W info)
if (info->dwSize != sizeof(CRYPTUI_SELECTSTORE_INFO_W)) if (info->dwSize != sizeof(CRYPTUI_SELECTSTORE_INFO_W))
{ {
WARN("unexpected size %d\n", info->dwSize); WARN("unexpected size %ld\n", info->dwSize);
SetLastError(E_INVALIDARG); SetLastError(E_INVALIDARG);
return NULL; return NULL;
} }
...@@ -1627,7 +1627,7 @@ HCERTSTORE WINAPI CryptUIDlgSelectStoreA(PCRYPTUI_SELECTSTORE_INFO_A info) ...@@ -1627,7 +1627,7 @@ HCERTSTORE WINAPI CryptUIDlgSelectStoreA(PCRYPTUI_SELECTSTORE_INFO_A info)
if (info->dwSize != sizeof(CRYPTUI_SELECTSTORE_INFO_A)) if (info->dwSize != sizeof(CRYPTUI_SELECTSTORE_INFO_A))
{ {
WARN("unexpected size %d\n", info->dwSize); WARN("unexpected size %ld\n", info->dwSize);
SetLastError(E_INVALIDARG); SetLastError(E_INVALIDARG);
return NULL; return NULL;
} }
...@@ -1706,7 +1706,7 @@ static DWORD CALLBACK read_text_callback(DWORD_PTR dwCookie, LPBYTE buf, ...@@ -1706,7 +1706,7 @@ static DWORD CALLBACK read_text_callback(DWORD_PTR dwCookie, LPBYTE buf,
struct ReadStringStruct *string = (struct ReadStringStruct *)dwCookie; struct ReadStringStruct *string = (struct ReadStringStruct *)dwCookie;
LONG cch = min(cb / sizeof(WCHAR), string->len - string->pos); LONG cch = min(cb / sizeof(WCHAR), string->len - string->pos);
TRACE("(%p, %p, %d, %p)\n", string, buf, cb, pcb); TRACE("(%p, %p, %ld, %p)\n", string, buf, cb, pcb);
memmove(buf, string->buf + string->pos, cch * sizeof(WCHAR)); memmove(buf, string->buf + string->pos, cch * sizeof(WCHAR));
string->pos += cch; string->pos += cch;
...@@ -2497,7 +2497,7 @@ static INT_PTR CALLBACK general_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, ...@@ -2497,7 +2497,7 @@ static INT_PTR CALLBACK general_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
PROPSHEETPAGEW *page; PROPSHEETPAGEW *page;
PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo; PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo;
TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp);
switch (msg) switch (msg)
{ {
...@@ -3586,7 +3586,7 @@ static INT_PTR CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg, ...@@ -3586,7 +3586,7 @@ static INT_PTR CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg,
{ {
PROPSHEETPAGEW *page; PROPSHEETPAGEW *page;
TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp);
switch (msg) switch (msg)
{ {
...@@ -3781,7 +3781,7 @@ static INT_PTR CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, ...@@ -3781,7 +3781,7 @@ static INT_PTR CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
PROPSHEETPAGEW *page; PROPSHEETPAGEW *page;
struct detail_data *data; struct detail_data *data;
TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp);
switch (msg) switch (msg)
{ {
...@@ -4138,7 +4138,7 @@ static INT_PTR CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, ...@@ -4138,7 +4138,7 @@ static INT_PTR CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
INT_PTR ret = 0; INT_PTR ret = 0;
HWND tree = GetDlgItem(hwnd, IDC_CERTPATH); HWND tree = GetDlgItem(hwnd, IDC_CERTPATH);
TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp);
switch (msg) switch (msg)
{ {
...@@ -4267,7 +4267,7 @@ static int CALLBACK cert_prop_sheet_proc(HWND hwnd, UINT msg, LPARAM lp) ...@@ -4267,7 +4267,7 @@ static int CALLBACK cert_prop_sheet_proc(HWND hwnd, UINT msg, LPARAM lp)
{ {
RECT rc; RECT rc;
TRACE("(%p, %08x, %08lx)\n", hwnd, msg, lp); TRACE("(%p, %08x, %08Ix)\n", hwnd, msg, lp);
switch (msg) switch (msg)
{ {
...@@ -4469,7 +4469,7 @@ BOOL WINAPI CryptUIDlgViewContext(DWORD dwContextType, LPVOID pvContext, ...@@ -4469,7 +4469,7 @@ BOOL WINAPI CryptUIDlgViewContext(DWORD dwContextType, LPVOID pvContext,
{ {
BOOL ret; BOOL ret;
TRACE("(%d, %p, %p, %s, %08x, %p)\n", dwContextType, pvContext, hwnd, TRACE("(%ld, %p, %p, %s, %08lx, %p)\n", dwContextType, pvContext, hwnd,
debugstr_w(pwszTitle), dwFlags, pvReserved); debugstr_w(pwszTitle), dwFlags, pvReserved);
switch (dwContextType) switch (dwContextType)
...@@ -4487,7 +4487,7 @@ BOOL WINAPI CryptUIDlgViewContext(DWORD dwContextType, LPVOID pvContext, ...@@ -4487,7 +4487,7 @@ BOOL WINAPI CryptUIDlgViewContext(DWORD dwContextType, LPVOID pvContext,
break; break;
} }
default: default:
FIXME("unimplemented for context type %d\n", dwContextType); FIXME("unimplemented for context type %ld\n", dwContextType);
SetLastError(E_INVALIDARG); SetLastError(E_INVALIDARG);
ret = FALSE; ret = FALSE;
} }
...@@ -5335,7 +5335,7 @@ static BOOL do_import(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, ...@@ -5335,7 +5335,7 @@ static BOOL do_import(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle,
pImportSrc->u.hCertStore, hDestCertStore); pImportSrc->u.hCertStore, hDestCertStore);
break; break;
default: default:
WARN("unknown source type: %u\n", pImportSrc->dwSubjectChoice); WARN("unknown source type: %lu\n", pImportSrc->dwSubjectChoice);
SetLastError(E_INVALIDARG); SetLastError(E_INVALIDARG);
ret = FALSE; ret = FALSE;
} }
...@@ -5536,7 +5536,7 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT ...@@ -5536,7 +5536,7 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT
{ {
BOOL ret; BOOL ret;
TRACE("(0x%08x, %p, %s, %p, %p)\n", dwFlags, hwndParent, debugstr_w(pwszWizardTitle), TRACE("(0x%08lx, %p, %s, %p, %p)\n", dwFlags, hwndParent, debugstr_w(pwszWizardTitle),
pImportSrc, hDestCertStore); pImportSrc, hDestCertStore);
if (pImportSrc && if (pImportSrc &&
...@@ -6967,7 +6967,7 @@ BOOL WINAPI CryptUIWizExport(DWORD dwFlags, HWND hwndParent, ...@@ -6967,7 +6967,7 @@ BOOL WINAPI CryptUIWizExport(DWORD dwFlags, HWND hwndParent,
{ {
BOOL ret; BOOL ret;
TRACE("(%08x, %p, %s, %p, %p)\n", dwFlags, hwndParent, TRACE("(%08lx, %p, %s, %p, %p)\n", dwFlags, hwndParent,
debugstr_w(pwszWizardTitle), pExportInfo, pvoid); debugstr_w(pwszWizardTitle), pExportInfo, pvoid);
if (!(dwFlags & CRYPTUI_WIZ_NO_UI)) if (!(dwFlags & CRYPTUI_WIZ_NO_UI))
...@@ -7409,7 +7409,7 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateW(PCCRYPTUI_SELECTCERTIFICATE_S ...@@ -7409,7 +7409,7 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateW(PCCRYPTUI_SELECTCERTIFICATE_S
if (pcsc->dwSize != sizeof(*pcsc) && pcsc->dwSize != sizeof(*pcsc) - sizeof(HCERTSTORE)) if (pcsc->dwSize != sizeof(*pcsc) && pcsc->dwSize != sizeof(*pcsc) - sizeof(HCERTSTORE))
{ {
WARN("unexpected size %d\n", pcsc->dwSize); WARN("unexpected size %ld\n", pcsc->dwSize);
SetLastError(E_INVALIDARG); SetLastError(E_INVALIDARG);
return NULL; return NULL;
} }
...@@ -7511,7 +7511,7 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateA(PCCRYPTUI_SELECTCERTIFICATE_S ...@@ -7511,7 +7511,7 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateA(PCCRYPTUI_SELECTCERTIFICATE_S
if (pcsc->dwSize != sizeof(*pcsc) && pcsc->dwSize != sizeof(*pcsc) - sizeof(HCERTSTORE)) if (pcsc->dwSize != sizeof(*pcsc) && pcsc->dwSize != sizeof(*pcsc) - sizeof(HCERTSTORE))
{ {
WARN("unexpected size %d\n", pcsc->dwSize); WARN("unexpected size %ld\n", pcsc->dwSize);
SetLastError(E_INVALIDARG); SetLastError(E_INVALIDARG);
return NULL; return NULL;
} }
...@@ -7548,7 +7548,7 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore ...@@ -7548,7 +7548,7 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore
{ {
CRYPTUI_SELECTCERTIFICATE_STRUCTW sc; CRYPTUI_SELECTCERTIFICATE_STRUCTW sc;
TRACE("%p %p %s %s %x %x %p\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved); TRACE("%p %p %s %s %lx %lx %p\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved);
memset(&sc, 0, sizeof(sc)); memset(&sc, 0, sizeof(sc));
...@@ -7566,6 +7566,6 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore ...@@ -7566,6 +7566,6 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore
BOOL WINAPI CryptUIWizDigitalSign(DWORD flags, HWND parent, LPCWSTR title, PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO info, BOOL WINAPI CryptUIWizDigitalSign(DWORD flags, HWND parent, LPCWSTR title, PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO info,
PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *context) PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *context)
{ {
FIXME("%d %p %s %p %p: stub\n", flags, parent, debugstr_w(title), info, context); FIXME("%ld %p %s %p %p: stub\n", flags, parent, debugstr_w(title), info, context);
return FALSE; return FALSE;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment