https://git.reactos.org/?p=reactos.git;a=commitdiff;h=234f89c07b0cde29f7751…
commit 234f89c07b0cde29f775101750f15da6ae20cf2c
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sun May 27 04:07:12 2018 +0100
Commit: Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sun May 27 04:07:12 2018 +0100
[COMDLG32_WINETEST] Sync with Wine Staging 3.9. CORE-14656
---
modules/rostests/winetests/comdlg32/filedlg.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/modules/rostests/winetests/comdlg32/filedlg.c
b/modules/rostests/winetests/comdlg32/filedlg.c
index 4d940555a0..4cad889050 100644
--- a/modules/rostests/winetests/comdlg32/filedlg.c
+++ b/modules/rostests/winetests/comdlg32/filedlg.c
@@ -943,29 +943,27 @@ static void test_resizable2(void)
ofn.hInstance = GetModuleHandleA(NULL);
ofn.lpTemplateName = "template1";
ofn.Flags = OFN_EXPLORER;
-#define ISSIZABLE TRUE
ret = GetOpenFileNameA(&ofn);
- ok( ret == ISSIZABLE, "File Dialog should have been sizable\n");
+ ok( ret == TRUE, "File Dialog should have been sizable\n");
ret = CommDlgExtendedError();
ok(!ret, "CommDlgExtendedError returned %#x\n", ret);
ofn.Flags = OFN_EXPLORER | OFN_ENABLETEMPLATE;
ret = GetOpenFileNameA(&ofn);
- ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n");
+ ok( !ret, "File Dialog should NOT have been sizable\n");
ret = CommDlgExtendedError();
ok(!ret, "CommDlgExtendedError returned %#x\n", ret);
ofn.Flags = OFN_EXPLORER | OFN_ENABLETEMPLATEHANDLE;
ofn.hInstance = LoadResource( GetModuleHandleA(NULL), FindResourceA(
GetModuleHandleA(NULL), "template1", (LPSTR)RT_DIALOG));
ofn.lpTemplateName = NULL;
ret = GetOpenFileNameA(&ofn);
- ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n");
+ ok( !ret, "File Dialog should NOT have been sizable\n");
ret = CommDlgExtendedError();
ok(!ret, "CommDlgExtendedError returned %#x\n", ret);
ofn.Flags = OFN_EXPLORER | OFN_ENABLEHOOK;
ret = GetOpenFileNameA(&ofn);
- ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n");
+ ok( !ret, "File Dialog should NOT have been sizable\n");
ret = CommDlgExtendedError();
ok(!ret, "CommDlgExtendedError returned %#x\n", ret);
-#undef ISSIZABLE
}
static void test_mru(void)
@@ -1032,8 +1030,6 @@ static UINT_PTR WINAPI test_extension_wndproc(HWND dlg, UINT msg,
WPARAM wParam,
return FALSE;
}
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
-
static void test_extension_helper(OPENFILENAMEA* ofn, const char *filter,
const char *expected_filename)
{