comdlg32: Fix error precedence in IFileDialog2_SetFileTypes.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comdlg32: Fix error precedence in IFileDialog2_SetFileTypes.
1a047044 · Alex Henrie · Alexandre Julliard · c409ab62 · 1a047044 · 1a047044
Commit 1a047044 authored Sep 09, 2020 by Alex Henrie Committed by Alexandre Julliard Sep 10, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

itemdlg.c dlls/comdlg32/itemdlg.c +3 -3

itemdlg.c dlls/comdlg32/tests/itemdlg.c +2 -0

No files found.
--- a/dlls/comdlg32/itemdlg.c
+++ b/dlls/comdlg32/itemdlg.c
@@ -2402,12 +2402,12 @@ static HRESULT WINAPI IFileDialog2_fnSetFileTypes(IFileDialog2 *iface, UINT cFil
    UINT i;
    TRACE("%p (%d, %p)\n", This, cFileTypes, rgFilterSpec);

-    if(This->filterspecs)
-        return E_UNEXPECTED;
-
    if(!rgFilterSpec)
        return E_INVALIDARG;

+    if(This->filterspecs)
+        return E_UNEXPECTED;
+
    if(!cFileTypes)
        return S_OK;


--- a/dlls/comdlg32/tests/itemdlg.c
+++ b/dlls/comdlg32/tests/itemdlg.c
@@ -675,6 +675,8 @@ static void test_basics(void)
    ok(hr == S_OK, "got 0x%08x.\n", hr);
    hr = IFileOpenDialog_SetFileTypes(pfod, 0, filterspec);
    ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr);
+    hr = IFileOpenDialog_SetFileTypes(pfod, 0, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr);
    hr = IFileOpenDialog_SetFileTypeIndex(pfod, 0);
    ok(hr == S_OK, "got 0x%08x.\n", hr);
    hr = IFileOpenDialog_GetFileTypeIndex(pfod, &filetype);