Commit e240aeb7 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

comdlg32/tests: Enable compilation with long types.

parent cd4c58f5
EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = comdlg32.dll TESTDLL = comdlg32.dll
IMPORTS = uuid shell32 ole32 comdlg32 winspool user32 gdi32 IMPORTS = uuid shell32 ole32 comdlg32 winspool user32 gdi32
......
...@@ -58,7 +58,7 @@ static void test_param_check(void) ...@@ -58,7 +58,7 @@ static void test_param_check(void)
ok(is_ok, "%s should%s fail\n", #FUNC, FAIL ? "" : "n't"); \ ok(is_ok, "%s should%s fail\n", #FUNC, FAIL ? "" : "n't"); \
if (FAIL && is_ok) { \ if (FAIL && is_ok) { \
DWORD ext_err = CommDlgExtendedError(); \ DWORD ext_err = CommDlgExtendedError(); \
ok(ext_err == ERR_CODE, "expected err %x got %x\n", \ ok(ext_err == ERR_CODE, "expected err %x got %lx\n", \
ERR_CODE, ext_err); \ ERR_CODE, ext_err); \
} else { \ } else { \
DestroyWindow(hwnd); \ DestroyWindow(hwnd); \
......
...@@ -108,8 +108,8 @@ static void test_ChooseFontA(void) ...@@ -108,8 +108,8 @@ static void test_ChooseFontA(void)
ok(ret == TRUE, "ChooseFontA returned FALSE\n"); ok(ret == TRUE, "ChooseFontA returned FALSE\n");
ok(cfa.iPointSize == expected_pointsize, "Expected %i, got %i\n", expected_pointsize, cfa.iPointSize); ok(cfa.iPointSize == expected_pointsize, "Expected %i, got %i\n", expected_pointsize, cfa.iPointSize);
ok(lfa.lfHeight == expected_lfheight, "Expected %i, got %i\n", expected_lfheight, lfa.lfHeight); ok(lfa.lfHeight == expected_lfheight, "Expected %i, got %li\n", expected_lfheight, lfa.lfHeight);
ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %i\n", lfa.lfWeight); ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %li\n", lfa.lfWeight);
ok(lfa.lfCharSet == SYMBOL_CHARSET, "Expected SYMBOL_CHARSET, got %i\n", lfa.lfCharSet); ok(lfa.lfCharSet == SYMBOL_CHARSET, "Expected SYMBOL_CHARSET, got %i\n", lfa.lfCharSet);
ok(strcmp(lfa.lfFaceName, "Symbol") == 0, "Expected Symbol, got %s\n", lfa.lfFaceName); ok(strcmp(lfa.lfFaceName, "Symbol") == 0, "Expected Symbol, got %s\n", lfa.lfFaceName);
...@@ -142,8 +142,8 @@ static void test_ChooseFontA(void) ...@@ -142,8 +142,8 @@ static void test_ChooseFontA(void)
ok(ret == TRUE, "ChooseFontA returned FALSE\n"); ok(ret == TRUE, "ChooseFontA returned FALSE\n");
ok(cfa.iPointSize == expected_pointsize, "Expected %i, got %i\n", expected_pointsize, cfa.iPointSize); ok(cfa.iPointSize == expected_pointsize, "Expected %i, got %i\n", expected_pointsize, cfa.iPointSize);
ok(lfa.lfHeight == expected_lfheight, "Expected %i, got %i\n", expected_lfheight, lfa.lfHeight); ok(lfa.lfHeight == expected_lfheight, "Expected %i, got %li\n", expected_lfheight, lfa.lfHeight);
ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %i\n", lfa.lfWeight); ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %li\n", lfa.lfWeight);
ok((strcmp(lfa.lfFaceName, "Symbol") == 0) || ok((strcmp(lfa.lfFaceName, "Symbol") == 0) ||
broken(*lfa.lfFaceName == 0), "Expected Symbol, got %s\n", lfa.lfFaceName); broken(*lfa.lfFaceName == 0), "Expected Symbol, got %s\n", lfa.lfFaceName);
......
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