[PATCH 1/2] setupapi: Add support for IDF_CHECKFIRST flag in SetupPromptForDiskW.

[Gijs Vermeulen]

From: Michael Müller

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20465
Signed-off-by: Gijs Vermeulen 
---
 dlls/setupapi/dialog.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/dlls/setupapi/dialog.c b/dlls/setupapi/dialog.c
index fdabf887b0..cdc739490b 100644
--- a/dlls/setupapi/dialog.c
+++ b/dlls/setupapi/dialog.c
@@ -241,6 +241,34 @@ UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR Disk
         SetLastError(ERROR_INVALID_PARAMETER);
         return DPROMPT_CANCEL;
     }
+
+    if (PathToSource && (DiskPromptStyle & IDF_CHECKFIRST))
+    {
+        WCHAR filepath[MAX_PATH];
+
+        if (lstrlenW(PathToSource) + 1 + lstrlenW(FileSought) < sizeof(filepath))
+        {
+            _snwprintf(filepath, MAX_PATH, L"%s\%s", PathToSource, FileSought);
+
+            if (GetFileAttributesW(filepath) != INVALID_FILE_ATTRIBUTES)
+            {
+                if (PathRequiredSize)
+                    *PathRequiredSize = lstrlenW(PathToSource) + 1;
+
+                if (!PathBuffer)
+                    return DPROMPT_SUCCESS;
+
+                if (PathBufferSize >= lstrlenW(PathToSource) + 1)
+                {
+                    lstrcpyW(PathBuffer, PathToSource);
+                    return DPROMPT_SUCCESS;
+                }
+                else
+                    return DPROMPT_BUFFERTOOSMALL;
+            }
+        }
+    }
+
     params.DialogTitle = DialogTitle;
     params.DiskName = DiskName;
     params.PathToSource = PathToSource;

[PATCH 2/2] setupapi/tests: Add test for IDF_CHECKFIRST and SetupPromptForDiskA/W.

[Gijs Vermeulen]

From: Michael Müller

With modifications from Hermes Belusca-Maito.

Signed-off-by: Gijs Vermeulen 
---
 dlls/setupapi/tests/Makefile.in |   1 +
 dlls/setupapi/tests/dialog.c    | 107 ++++++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 dlls/setupapi/tests/dialog.c

diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in
index bbfdf590d5..83f751c7db 100644
--- a/dlls/setupapi/tests/Makefile.in
+++ b/dlls/setupapi/tests/Makefile.in
@@ -5,6 +5,7 @@ SOURCES = \
    coinst.c \
    coinst.spec \
    devinst.c \
+	dialog.c \
    diskspace.c \
    install.c \
    misc.c \
diff --git a/dlls/setupapi/tests/dialog.c b/dlls/setupapi/tests/dialog.c
new file mode 100644
index 0000000000..4257e55580
--- /dev/null
+++ b/dlls/setupapi/tests/dialog.c
@@ -0,0 +1,107 @@
+/*
+ * Unit tests for SetupPromptForDisk
+ *
+ * Copyright 2014 Michael Müller
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "guiddef.h"
+#include "setupapi.h"
+
+#include "wine/test.h"
+
+static void test_SetupPromptForDiskA(void)
+{
+    char path[MAX_PATH];
+    char buffer[MAX_PATH];
+    UINT ret;
+    DWORD length;
+
+    GetSystemDirectoryA(path, MAX_PATH);
+
+    memset(buffer, 0, sizeof(buffer));
+    ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, "kernel32.dll", NULL, IDF_CHECKFIRST, buffer, sizeof(buffer) - 1, &length);
+    ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %u\n", ret);
+    ok(length == strlen(path) + 1, "Expect length %u, got %u\n", (DWORD)strlen(path) + 1, length);
+    ok(!strcmp(path, buffer), "Expected path %s, got %s\n", debugstr_a(path), debugstr_a(buffer));
+
+    memset(buffer, 0, sizeof(buffer));
+    ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, "kernel32.dll", NULL, IDF_CHECKFIRST, NULL, 0, &length);
+    ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %d\n", ret);
+    ok(length == strlen(path) + 1, "Expect length %u, got %u\n", (DWORD)strlen(path) + 1, length);
+
+    memset(buffer, 0, sizeof(buffer));
+    ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, "kernel32.dll", NULL, IDF_CHECKFIRST, buffer, 1, &length);
+    ok(ret == DPROMPT_BUFFERTOOSMALL, "Expected DPROMPT_BUFFERTOOSMALL, got %u\n", ret);
+
+    memset(buffer, 0, sizeof(buffer));
+    ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, "kernel32.dll", NULL, IDF_CHECKFIRST, buffer, strlen(path), &length);
+    ok(ret == DPROMPT_BUFFERTOOSMALL, "Expected DPROMPT_BUFFERTOOSMALL, got %u\n", ret);
+
+    memset(buffer, 0, sizeof(buffer));
+    ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, "kernel32.dll", NULL, IDF_CHECKFIRST, buffer, strlen(path) + 1, &length);
+    ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %u\n", ret);
+    ok(length == strlen(path) + 1, "Expect length %u, got %u\n", (DWORD)strlen(path) + 1, length);
+    ok(!strcmp(path, buffer), "Expected path %s, got %s\n", debugstr_a(path), debugstr_a(buffer));
+}
+
+static void test_SetupPromptForDiskW(void)
+{
+    WCHAR path[MAX_PATH];
+    WCHAR buffer[MAX_PATH];
+    UINT ret;
+    DWORD length;
+
+    GetSystemDirectoryW(path, MAX_PATH);
+
+    memset(buffer, 0, sizeof(buffer));
+    ret = SetupPromptForDiskW(0, L"Test", L"Testdisk", path, L"kernel32.dll", NULL, IDF_CHECKFIRST, buffer, sizeof(buffer) - 1, &length);
+    ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %u\n", ret);
+    ok(length == lstrlenW(path) + 1, "Expect length %u, got %u\n", (DWORD)lstrlenW(path) + 1, length);
+    ok(!lstrcmpW(path, buffer), "Expected path %s, got %s\n", debugstr_w(path), debugstr_w(buffer));
+
+    memset(buffer, 0, sizeof(buffer));
+    ret = SetupPromptForDiskW(0, L"Test", L"Testdisk", path, L"kernel32.dll", NULL, IDF_CHECKFIRST, NULL, 0, &length);
+    ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %d\n", ret);
+    ok(length == lstrlenW(path) + 1, "Expect length %u, got %u\n", (DWORD)lstrlenW(path) + 1, length);
+
+    memset(buffer, 0, sizeof(buffer));
+    ret = SetupPromptForDiskW(0, L"Test", L"Testdisk", path, L"kernel32.dll", NULL, IDF_CHECKFIRST, buffer, 1, &length);
+    ok(ret == DPROMPT_BUFFERTOOSMALL, "Expected DPROMPT_BUFFERTOOSMALL, got %u\n", ret);
+
+    memset(buffer, 0, sizeof(buffer));
+    ret = SetupPromptForDiskW(0, L"Test", L"Testdisk", path, L"kernel32.dll", NULL, IDF_CHECKFIRST, buffer, lstrlenW(path), &length);
+    ok(ret == DPROMPT_BUFFERTOOSMALL, "Expected DPROMPT_BUFFERTOOSMALL, got %u\n", ret);
+
+    memset(buffer, 0, sizeof(buffer));
+    ret = SetupPromptForDiskW(0, L"Test", L"Testdisk", path, L"kernel32.dll", NULL, IDF_CHECKFIRST, buffer, lstrlenW(path) + 1, &length);
+    ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %u\n", ret);
+    ok(length == lstrlenW(path) + 1, "Expect length %u, got %u\n", (DWORD)lstrlenW(path) + 1, length);
+    ok(!lstrcmpW(path, buffer), "Expected path %s, got %s\n", debugstr_w(path), debugstr_w(buffer));
+}
+
+START_TEST(dialog)
+{
+    test_SetupPromptForDiskA();
+    test_SetupPromptForDiskW();
+}