Ge van Geldorp : shlwapi/tests: Fix tests on Win7.

Alexandre Julliard julliard at winehq.org
Fri Sep 11 10:53:07 CDT 2009


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

Author: Ge van Geldorp <ggeldorp at vmware.com>
Date:   Fri Sep 11 12:22:15 2009 +0200

shlwapi/tests: Fix tests on Win7.

---

 dlls/shlwapi/tests/ordinal.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index 3a50219..c22313a 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -133,6 +133,12 @@ static void test_GetAcceptLanguagesA(void)
             ok(buffersize2 == strlen(buffer),
                "buffer content (length) wrong: got %08x, expected %08x\n", lstrlenA(buffer), buffersize2);
             break;
+        case __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER): /* Win7 */
+            ok(buffersize == 0,
+               "buffersize wrong: got %08x, expected 0 (2nd parameter;Win2k)\n", buffersize);
+            ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(),
+               "last error wrong: got %u; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError());
+            break;
         default:
             ok( 0, "retval %08x, size %08x, buffer (%s), last error %u\n",
                 retval, buffersize, buffer, GetLastError());
@@ -163,6 +169,12 @@ static void test_GetAcceptLanguagesA(void)
             ok(buffersize2 == strlen(buffer),
                "buffer content (length) wrong: got %08x, expected %08x\n", lstrlenA(buffer), buffersize2);
             break;
+	case __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER): /* Win 7 */
+            ok(buffersize == 0,
+               "buffersize wrong: got %08x, expected 0 (2nd parameter;Win2k)\n", buffersize);
+            ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(),
+               "last error wrong: got %u; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError());
+            break;
         default:
             ok( 0, "retval %08x, size %08x, buffer (%s), last error %u\n",
                 retval, buffersize, buffer, GetLastError());




More information about the wine-cvs mailing list