Paul Vriens : setupapi/tests: Remove win9x specifics from testCreateDeviceInfo.

[Alexandre Julliard]

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

Author: Paul Vriens 
Date:   Mon Jun 23 09:47:48 2008 +0200

setupapi/tests: Remove win9x specifics from testCreateDeviceInfo.

---

dlls/setupapi/tests/devinst.c |   19 +------------------
 1 files changed, 1 insertions(+), 18 deletions(-)

diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 2612f21..346257e 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -401,30 +401,13 @@ static void testCreateDeviceInfo(void)
      'E','n','u','m','\','R','o','o','t','\',
      'L','E','G','A','C','Y','_','B','O','G','U','S',0};

-    if (!pSetupDiCreateDeviceInfoList || !pSetupDiEnumDeviceInfo ||
-     !pSetupDiDestroyDeviceInfoList || !pSetupDiCreateDeviceInfoA)
-    {
-        skip("No SetupDiCreateDeviceInfoA\n");
-        return;
-    }
     SetLastError(0xdeadbeef);
     ret = pSetupDiCreateDeviceInfoA(NULL, NULL, NULL, NULL, NULL, 0, NULL);
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_INVALID_DEVINST_NAME ||
-      GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */ ||
-      GetLastError() == ERROR_INVALID_HANDLE /* Win9x */,
+      GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */,
      "Unexpected last error, got %08x\n", GetLastError());

-    /* If we are running on win9x we should skip these tests. Win95
-     * fails most tests anyway and win98 pops up the "Add New Hardware
-     * Wizard".
-     */
-    if (GetLastError() == ERROR_INVALID_HANDLE)
-    {
-        skip("We are on win9x where the tests introduce issues\n");
-        return;
-    }
-
     SetLastError(0xdeadbeef);
     ret = pSetupDiCreateDeviceInfoA(NULL, "Root\LEGACY_BOGUS\0000", NULL,
      NULL, NULL, 0, NULL);