Paul Vriens : setupapi/tests: Don't use hardcoded C: for the system drive.

Alexandre Julliard julliard at winehq.org
Fri Nov 14 07:54:46 CST 2008


Module: wine
Branch: master
Commit: 10fcf6285ed34f9ad9cbff78fe7053f51da15a6a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=10fcf6285ed34f9ad9cbff78fe7053f51da15a6a

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Fri Nov 14 08:37:05 2008 +0100

setupapi/tests: Don't use hardcoded C: for the system drive.

---

 dlls/setupapi/tests/query.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c
index 67c44f9..167727a 100644
--- a/dlls/setupapi/tests/query.c
+++ b/dlls/setupapi/tests/query.c
@@ -382,6 +382,7 @@ static void test_SetupGetSourceInfo(void)
 static void test_SetupGetTargetPath(void)
 {
     char buffer[MAX_PATH], inf_filename[MAX_PATH];
+    char destfile[MAX_PATH];
     DWORD required;
     HINF hinf;
     INFCONTEXT ctx;
@@ -405,9 +406,14 @@ static void test_SetupGetTargetPath(void)
 
     ret = SetupGetTargetPathA(hinf, &ctx, NULL, buffer, sizeof(buffer), &required);
     ok(ret, "SetupGetTargetPathA failed\n");
-
     ok(required == 10, "unexpected required size: %d\n", required);
-    ok(!lstrcmpiA("C:\\LANCOM", buffer), "unexpected result string: %s\n", buffer);
+    /* Retrieve the system drive from the windows directory.
+     * (%SystemDrive% is not available on Win9x)
+     */
+    lstrcpyA(destfile, WIN_DIR);
+    destfile[3] = '\0';
+    lstrcatA(destfile, "LANCOM");
+    ok(!lstrcmpiA(destfile, buffer), "unexpected result string: %s\n", buffer);
 
     SetupCloseInfFile(hinf);
     DeleteFileA(inf_filename);




More information about the wine-cvs mailing list