setupapi: SetupDiGetDeviceRegistryProperty should return ERROR_INVALID_DATA when…

setupapi: SetupDiGetDeviceRegistryProperty should return ERROR_INVALID_DATA when buffer size is not 0 but buffer is NULL.

setupapi: SetupDiGetDeviceRegistryProperty should return ERROR_INVALID_DATA when…
af5e168f · Alexander Morozov · Alexandre Julliard · 85861a49 · af5e168f · af5e168f
Commit af5e168f authored Apr 17, 2008 by Alexander Morozov Committed by Alexandre Julliard Apr 17, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

devinst.c dlls/setupapi/devinst.c +10 -0

devinst.c dlls/setupapi/tests/devinst.c +0 -2

No files found.
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -3110,6 +3110,11 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(
        SetLastError(ERROR_INVALID_PARAMETER);
        return FALSE;
    }
+    if (PropertyBufferSize && PropertyBuffer == NULL)
+    {
+        SetLastError(ERROR_INVALID_DATA);
+        return FALSE;
+    }
    devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved;
    if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0])
        && PropertyMap[Property].nameA)
@@ -3166,6 +3171,11 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(
        SetLastError(ERROR_INVALID_PARAMETER);
        return FALSE;
    }
+    if (PropertyBufferSize && PropertyBuffer == NULL)
+    {
+        SetLastError(ERROR_INVALID_DATA);
+        return FALSE;
+    }
    devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved;
    if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0])
        && PropertyMap[Property].nameW)

--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -917,7 +917,6 @@ static void testDeviceRegistryPropertyA()
    SetLastError(0xdeadbeef);
    ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME,
     NULL, NULL, buflen, NULL);
-    todo_wine
    ok(!ret && GetLastError() == ERROR_INVALID_DATA,
     "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError());
    SetLastError(0xdeadbeef);
@@ -1011,7 +1010,6 @@ static void testDeviceRegistryPropertyW()
    SetLastError(0xdeadbeef);
    ret = pSetupDiGetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME,
     NULL, NULL, buflen, NULL);
-    todo_wine
    ok(!ret && GetLastError() == ERROR_INVALID_DATA,
     "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError());
    SetLastError(0xdeadbeef);