[PATCH v2] setupapi/tests: Get rid of variables holding empty strings

[Vijay Kiran Kamuju]

Signed-off-by: Vijay Kiran Kamuju 
---
 dlls/setupapi/tests/diskspace.c | 10 ++++------
 dlls/setupapi/tests/setupcab.c  |  5 ++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dlls/setupapi/tests/diskspace.c b/dlls/setupapi/tests/diskspace.c
index dab6705eee33..c92c15a821ae 100644
--- a/dlls/setupapi/tests/diskspace.c
+++ b/dlls/setupapi/tests/diskspace.c
@@ -375,8 +375,6 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void)

static void test_SetupQuerySpaceRequiredOnDriveW(void)
 {
-    static const WCHAR emptyW[] = {0};
-
     BOOL ret;
     HDSKSPC handle;
     LONGLONG space;
@@ -403,7 +401,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void)
        GetLastError());

SetLastError(0xdeadbeef);
-    ret = SetupQuerySpaceRequiredOnDriveW(NULL, emptyW, NULL, NULL, 0);
+    ret = SetupQuerySpaceRequiredOnDriveW(NULL, L"", NULL, NULL, 0);
     ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret);
     ok(GetLastError() == ERROR_INVALID_HANDLE,
        "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n",
@@ -411,7 +409,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void)

SetLastError(0xdeadbeef);
     space = 0xdeadbeef;
-    ret = SetupQuerySpaceRequiredOnDriveW(NULL, emptyW, &space, NULL, 0);
+    ret = SetupQuerySpaceRequiredOnDriveW(NULL, L"", &space, NULL, 0);
     ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret);
     ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n");
     ok(GetLastError() == ERROR_INVALID_HANDLE,
@@ -441,7 +439,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void)
        GetLastError());

SetLastError(0xdeadbeef);
-    ret = SetupQuerySpaceRequiredOnDriveW(handle, emptyW, NULL, NULL, 0);
+    ret = SetupQuerySpaceRequiredOnDriveW(handle, L"", NULL, NULL, 0);
     ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret);
     ok(GetLastError() == ERROR_INVALID_DRIVE,
        "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n",
@@ -449,7 +447,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void)

SetLastError(0xdeadbeef);
     space = 0xdeadbeef;
-    ret = SetupQuerySpaceRequiredOnDriveW(handle, emptyW, &space, NULL, 0);
+    ret = SetupQuerySpaceRequiredOnDriveW(handle, L"", &space, NULL, 0);
     ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret);
     ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n");
     ok(GetLastError() == ERROR_INVALID_DRIVE,
diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c
index bb9add035dbb..183da9016594 100644
--- a/dlls/setupapi/tests/setupcab.c
+++ b/dlls/setupapi/tests/setupcab.c
@@ -143,7 +143,6 @@ static void test_invalid_parametersA(void)
 static void test_invalid_parametersW(void)
 {
     static const WCHAR nonexistentW[] = {'c',':','\','n','o','n','e','x','i','s','t','e','n','t','.','c','a','b',0};
-    static const WCHAR emptyW[] = {0};

BOOL ret;
     WCHAR source[MAX_PATH], temp[MAX_PATH];
@@ -204,7 +203,7 @@ static void test_invalid_parametersW(void)
        GetLastError());

SetLastError(0xdeadbeef);
-    ret = SetupIterateCabinetW(emptyW, 0, NULL, NULL);
+    ret = SetupIterateCabinetW(L"", 0, NULL, NULL);
     ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret);
     ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY ||
        GetLastError() == ERROR_FILE_NOT_FOUND, /* NT4/Win2k */
@@ -212,7 +211,7 @@ static void test_invalid_parametersW(void)
        GetLastError());

SetLastError(0xdeadbeef);
-    ret = SetupIterateCabinetW(emptyW, 0, dummy_callbackW, NULL);
+    ret = SetupIterateCabinetW(L"", 0, dummy_callbackW, NULL);
     ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret);
     ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY ||
        GetLastError() == ERROR_FILE_NOT_FOUND, /* NT4/Win2k */