Ge van Geldorp : setupapi/tests: Add acceptable error code for Win7.

[Alexandre Julliard]

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

Author: Ge van Geldorp <ggeldorp(a)vmware.com>
Date:   Mon Sep 28 12:41:09 2009 +0200

setupapi/tests: Add acceptable error code for Win7.

---

 dlls/setupapi/tests/misc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c
index 4b8bd03..848f64c 100644
--- a/dlls/setupapi/tests/misc.c
+++ b/dlls/setupapi/tests/misc.c
@@ -198,13 +198,13 @@ static void test_SetupCopyOEMInf(void)
     SetLastError(0xdeadbeef);
     res = pSetupCopyOEMInfA(tmpfile, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL);
     ok(res == FALSE, "Expected FALSE, got %d\n", res);
-    if (GetLastError() == ERROR_WRONG_INF_TYPE)
+    if (GetLastError() == ERROR_WRONG_INF_TYPE || GetLastError() == ERROR_UNSUPPORTED_TYPE /* Win7 */)
     {
        /* FIXME:
         * Vista needs a [Manufacturer] entry in the inf file. Doing this will give some
         * popups during the installation though as it also needs a catalog file (signed?).
         */
-       win_skip("Needs a different inf file on Vista/W2K8\n");
+       win_skip("Needs a different inf file on Vista+\n");
        DeleteFile(tmpfile);
        return;
     }