Skip to content

W
wine-cw
Commit 3d3d5595 authored by Alexander Morozov's avatar Alexander Morozov Committed by Alexandre Julliard
Browse files
Options

cryptui/tests: Always use a function pointer for CryptUIWizImport.

parent f23f2dc3
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
dlls/cryptui/tests/cryptui.c
View file @ 3d3d5595
...@@ -528,17 +528,17 @@ static void test_crypt_ui_wiz_import(void) ...@@ -528,17 +528,17 @@ static void test_crypt_ui_wiz_import(void)
store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
CERT_STORE_CREATE_NEW_FLAG, NULL); CERT_STORE_CREATE_NEW_FLAG, NULL);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT,
0, NULL, &info, store); 0, NULL, &info, store);
ok(!ret && GetLastError() == E_INVALIDARG, ok(!ret && GetLastError() == E_INVALIDARG,
"expected E_INVALIDARG, got %08x\n", GetLastError()); "expected E_INVALIDARG, got %08x\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL,
0, NULL, &info, store); 0, NULL, &info, store);
ok(!ret && GetLastError() == E_INVALIDARG, ok(!ret && GetLastError() == E_INVALIDARG,
"expected E_INVALIDARG, got %08x\n", GetLastError()); "expected E_INVALIDARG, got %08x\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI |
CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE | CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE |
CRYPTUI_WIZ_IMPORT_ALLOW_CERT | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, CRYPTUI_WIZ_IMPORT_ALLOW_CERT | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL,
&info, store); &info, store);
...@@ -576,7 +576,7 @@ static void test_crypt_ui_wiz_import(void) ...@@ -576,7 +576,7 @@ static void test_crypt_ui_wiz_import(void)
store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
CERT_STORE_CREATE_NEW_FLAG, NULL); CERT_STORE_CREATE_NEW_FLAG, NULL);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT,
0, NULL, &info, store); 0, NULL, &info, store);
ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError());
if (ret) if (ret)
...@@ -599,7 +599,7 @@ static void test_crypt_ui_wiz_import(void) ...@@ -599,7 +599,7 @@ static void test_crypt_ui_wiz_import(void)
ok(count == 0, "expected 0 CRLs, got %d\n", count); ok(count == 0, "expected 0 CRLs, got %d\n", count);
} }
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL,
0, NULL, &info, store); 0, NULL, &info, store);
ok(!ret && GetLastError() == E_INVALIDARG, ok(!ret && GetLastError() == E_INVALIDARG,
"expected E_INVALIDARG, got %08x\n", GetLastError()); "expected E_INVALIDARG, got %08x\n", GetLastError());
...@@ -616,7 +616,7 @@ static void test_crypt_ui_wiz_import(void) ...@@ -616,7 +616,7 @@ static void test_crypt_ui_wiz_import(void)
store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
CERT_STORE_CREATE_NEW_FLAG, NULL); CERT_STORE_CREATE_NEW_FLAG, NULL);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL,
0, NULL, &info, store); 0, NULL, &info, store);
ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError());
if (ret) if (ret)
...@@ -639,7 +639,7 @@ static void test_crypt_ui_wiz_import(void) ...@@ -639,7 +639,7 @@ static void test_crypt_ui_wiz_import(void)
ok(count == 1, "expected 1 CRL, got %d\n", count); ok(count == 1, "expected 1 CRL, got %d\n", count);
} }
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT,
0, NULL, &info, store); 0, NULL, &info, store);
ok(!ret && GetLastError() == E_INVALIDARG, ok(!ret && GetLastError() == E_INVALIDARG,
"expected E_INVALIDARG, got %08x\n", GetLastError()); "expected E_INVALIDARG, got %08x\n", GetLastError());
......
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