From 46cea0a5a334a92078667f2fcc257c343cc33053 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 9 Nov 2007 10:21:42 -0800 Subject: [PATCH] wininet: update test to pass on newer versions of windows --- dlls/wininet/tests/internet.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index c441bf2..e07ef24 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -218,7 +218,7 @@ static void test_null(void) static const WCHAR szServer[] = { 's','e','r','v','e','r',0 }; static const WCHAR szEmpty[] = { 0 }; static const WCHAR szUrl[] = { 'h','t','t','p',':','/','/','a','.','b','.','c',0 }; - static const WCHAR szExpect[] = { 's','e','r','v','e','r',';',' ','s','e','r','v','e','r',0 }; + static const WCHAR szExpect[] = { 's','e','r','v','e','r',0 }; WCHAR buffer[0x20]; BOOL r; DWORD sz; @@ -295,18 +295,19 @@ static void test_null(void) sz = 0; r = InternetGetCookieW(szUrl, szServer, NULL, &sz); ok( r == TRUE, "return wrong\n"); - todo_wine { - ok( sz == 30, "sz wrong\n"); - } + + /* sz is 14 on XP SP1 and beyond, 30 on XP and before */ + todo_wine ok( sz == 14, "sz wrong\n"); sz = 0x20; memset(buffer, 0, sizeof buffer); r = InternetGetCookieW(szUrl, szServer, buffer, &sz); ok( r == TRUE, "return wrong\n"); - todo_wine { - ok( sz == lstrlenW(buffer), "sz wrong\n"); - ok( !lstrcmpW(szExpect, buffer), "cookie data wrong\n"); - } + + /* sz == lstrlenW(buffer) only in XP SP1 */ + todo_wine ok( sz == 1 + lstrlenW(buffer), "sz wrong\n"); + /* before XP SP2, buffer is "server; server" */ + todo_wine ok( !lstrcmpW(szExpect, buffer), "cookie data wrong\n"); sz = sizeof(buffer); r = InternetQueryOptionA(NULL, INTERNET_OPTION_CONNECTED_STATE, buffer, &sz); -- 1.4.1