January 2009 - Wine-Commits

Alexandre Julliard : ntdll/tests: Avoid long long printf formats in traces.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: b84fda836ee439ebc07993c4496c453174bc87fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84fda836ee439ebc07993c44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:25:19 2009 +0100 ntdll/tests: Avoid long long printf formats in traces. --- dlls/ntdll/tests/string.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 205a880..6f4d85b 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -591,20 +591,23 @@ static void one_i64toa_test(int test_num, const ulonglong2str_t *ulonglong2str) dest_str[LARGE_STRI_BUFFER_LENGTH] = '\0'; result = p_i64toa(ulonglong2str->value, dest_str, ulonglong2str->base); ok(result == dest_str, - "(test %d): _i64toa(%Lu, [out], %d) has result %p, expected: %p\n", - test_num, ulonglong2str->value, ulonglong2str->base, result, dest_str); + "(test %d): _i64toa(%08x%08x, [out], %d) has result %p, expected: %p\n", + test_num, (DWORD)(ulonglong2str->value >> 32), (DWORD)ulonglong2str->value, + ulonglong2str->base, result, dest_str); if (ulonglong2str->mask & 0x04) { if (memcmp(dest_str, ulonglong2str->Buffer, LARGE_STRI_BUFFER_LENGTH) != 0) { if (memcmp(dest_str, ulonglong2str[1].Buffer, LARGE_STRI_BUFFER_LENGTH) != 0) { ok(memcmp(dest_str, ulonglong2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0, - "(test %d): _i64toa(%Lu, [out], %d) assigns string \"%s\", expected: \"%s\"\n", - test_num, ulonglong2str->value, ulonglong2str->base, dest_str, ulonglong2str->Buffer); + "(test %d): _i64toa(%08x%08x, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + test_num, (DWORD)(ulonglong2str->value >> 32), (DWORD)ulonglong2str->value, + ulonglong2str->base, dest_str, ulonglong2str->Buffer); } /* if */ } /* if */ } else { ok(memcmp(dest_str, ulonglong2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0, - "(test %d): _i64toa(%Lu, [out], %d) assigns string \"%s\", expected: \"%s\"\n", - test_num, ulonglong2str->value, ulonglong2str->base, dest_str, ulonglong2str->Buffer); + "(test %d): _i64toa(%08x%08x, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + test_num, (DWORD)(ulonglong2str->value >> 32), (DWORD)ulonglong2str->value, + ulonglong2str->base, dest_str, ulonglong2str->Buffer); } /* if */ }

1 0

Alexandre Julliard : kernel32/tests: Fix the NT header initialization for 64-bit.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: b71235815256e5f8cbf05863b8ea84ad78b9d167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b71235815256e5f8cbf05863b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:21:25 2009 +0100 kernel32/tests: Fix the NT header initialization for 64-bit. --- dlls/kernel32/tests/loader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 106926f..45cdcf6 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -72,7 +72,9 @@ static IMAGE_NT_HEADERS nt_header = 0, /* SizeOfUninitializedData */ 0, /* AddressOfEntryPoint */ 0x10, /* BaseOfCode, also serves as e_lfanew in the truncated MZ header */ +#ifndef _WIN64 0, /* BaseOfData */ +#endif 0x10000000, /* ImageBase */ 0, /* SectionAlignment */ 0, /* FileAlignment */

1 0

Alexandre Julliard : kernel32/tests: Use the correct SIZE_T type instead of unsigned long.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 9e070a610820b44facbd3d9ea4768442bafe13e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e070a610820b44facbd3d9ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:21:43 2009 +0100 kernel32/tests: Use the correct SIZE_T type instead of unsigned long. --- dlls/kernel32/tests/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 0fdd69e..6990543 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -57,7 +57,7 @@ static void test_VirtualAllocEx(void) { const unsigned int alloc_size = 1<<15; char *src, *dst; - unsigned long bytes_written = 0, bytes_read = 0, i; + SIZE_T bytes_written = 0, bytes_read = 0, i; void *addr1, *addr2; BOOL b; DWORD old_prot;

1 0

Alexandre Julliard : kernel32/tests: Don' t compare the result of llseek or hwrite against HFILE_ERROR.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 52f99aeacbec46ce175152078d8be695cf1f8837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f99aeacbec46ce175152078… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:21:01 2009 +0100 kernel32/tests: Don't compare the result of llseek or hwrite against HFILE_ERROR. --- dlls/kernel32/tests/file.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index e8e5c8f..b4a0b98 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -356,20 +356,20 @@ static void test__llseek( void ) for (i = 0; i < 400; i++) { - ok( HFILE_ERROR != _hwrite( filehandle, sillytext, strlen( sillytext ) ), "_hwrite complains\n" ); + ok( _hwrite( filehandle, sillytext, strlen( sillytext ) ) != -1, "_hwrite complains\n" ); } - ok( HFILE_ERROR != _llseek( filehandle, 400 * strlen( sillytext ), FILE_CURRENT ), "should be able to seek\n" ); - ok( HFILE_ERROR != _llseek( filehandle, 27 + 35 * strlen( sillytext ), FILE_BEGIN ), "should be able to seek\n" ); + ok( _llseek( filehandle, 400 * strlen( sillytext ), FILE_CURRENT ) != -1, "should be able to seek\n" ); + ok( _llseek( filehandle, 27 + 35 * strlen( sillytext ), FILE_BEGIN ) != -1, "should be able to seek\n" ); bytes_read = _hread( filehandle, buffer, 1); ok( 1 == bytes_read, "file read size error\n" ); ok( buffer[0] == sillytext[27], "_llseek error, it got lost seeking\n" ); - ok( HFILE_ERROR != _llseek( filehandle, -400 * strlen( sillytext ), FILE_END ), "should be able to seek\n" ); + ok( _llseek( filehandle, -400 * strlen( sillytext ), FILE_END ) != -1, "should be able to seek\n" ); bytes_read = _hread( filehandle, buffer, 1); ok( 1 == bytes_read, "file read size error\n" ); ok( buffer[0] == sillytext[0], "_llseek error, it got lost seeking\n" ); - ok( HFILE_ERROR != _llseek( filehandle, 1000000, FILE_END ), "should be able to seek past file; poor, poor Windows programmers\n" ); + ok( _llseek( filehandle, 1000000, FILE_END ) != -1, "should be able to seek past file; poor, poor Windows programmers\n" ); ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains\n" ); ret = DeleteFileA( filename );

1 0

Alexandre Julliard : kernel32/tests: Fix pointer casting warnings on 64-bit .
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: bb7de132dd47459939b102a5cf978422f72de898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb7de132dd47459939b102a5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:17:31 2009 +0100 kernel32/tests: Fix pointer casting warnings on 64-bit. --- dlls/kernel32/tests/atom.c | 20 ++++++------ dlls/kernel32/tests/comm.c | 65 +++++++++++++++++++-------------------- dlls/kernel32/tests/debugger.c | 2 +- dlls/kernel32/tests/pipe.c | 2 +- dlls/kernel32/tests/sync.c | 2 +- dlls/kernel32/tests/thread.c | 10 +++--- dlls/kernel32/tests/toolhelp.c | 6 ++-- 7 files changed, 53 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb7de132dd47459939b10…

1 0

Alexandre Julliard : wldap32/tests: Use ~0u instead of ~0ul for DWORD values.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 796197d97cf3ce6c1d567d4950bc6466ab9b693c URL: http://source.winehq.org/git/wine.git/?a=commit;h=796197d97cf3ce6c1d567d495… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:15:13 2009 +0100 wldap32/tests: Use ~0u instead of ~0ul for DWORD values. --- dlls/wldap32/tests/parse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 22390a5..d4b5de2 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -60,7 +60,7 @@ static void test_ldap_parse_sort_control( LDAP *ld ) ret = ldap_parse_resultA( NULL, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA failed 0x%x\n", ret ); - result = ~0UL; + result = ~0u; ret = ldap_parse_resultA( ld, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); ok( !ret, "ldap_parse_resultA failed 0x%x\n", ret ); ok( !result, "got 0x%x expected 0\n", result );

1 0

Alexandre Julliard : user32/tests: Fix some printf formats for 64-bit.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: d8e11632f1236218012ace895d10a2f63095b854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8e11632f1236218012ace895… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:16:33 2009 +0100 user32/tests: Fix some printf formats for 64-bit. --- dlls/user32/tests/combo.c | 21 +++++----------- dlls/user32/tests/win.c | 58 +++++++++++++++++++++++++++++--------------- 2 files changed, 45 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8e11632f1236218012ac…

1 0

Alexandre Julliard : winmm/tests: Fix handle casting warnings on 64-bit.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 94d9cfadb0b5b417640bfc1ba1be77b56f9d0753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94d9cfadb0b5b417640bfc1ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:15:25 2009 +0100 winmm/tests: Fix handle casting warnings on 64-bit. --- dlls/winmm/tests/capture.c | 6 +++--- dlls/winmm/tests/wave.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index f6155e9..c46d35a 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -148,7 +148,7 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format, return; win=NULL; - rc=waveInOpen(&win,device,pwfx,(DWORD)hevent,0,CALLBACK_EVENT|flags); + rc=waveInOpen(&win,device,pwfx,(DWORD_PTR)hevent,0,CALLBACK_EVENT|flags); /* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */ ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NOTENABLED || rc==MMSYSERR_NODRIVER || @@ -255,7 +255,7 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format, HWAVEOUT wout; trace("Playing back recorded sound\n"); - rc=waveOutOpen(&wout,WAVE_MAPPER,pwfx,(DWORD)hevent,0,CALLBACK_EVENT); + rc=waveOutOpen(&wout,WAVE_MAPPER,pwfx,(DWORD_PTR)hevent,0,CALLBACK_EVENT); ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NOTENABLED || rc==MMSYSERR_NODRIVER || rc==MMSYSERR_ALLOCATED || @@ -295,7 +295,7 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format, CloseHandle(hevent); } -static void wave_in_test_device(int device) +static void wave_in_test_device(UINT_PTR device) { WAVEINCAPSA capsA; WAVEINCAPSW capsW; diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index fc6f0ff..b2b3d7c 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -604,8 +604,8 @@ static void wave_out_test_deviceOut(int device, double duration, BOOL has_volume = pcaps->dwSupport & WAVECAPS_VOLUME ? TRUE : FALSE; double paused = 0.0; double actual; - DWORD callback = 0; - DWORD callback_instance = 0; + DWORD_PTR callback = 0; + DWORD_PTR callback_instance = 0; HANDLE thread = 0; DWORD thread_id; char * buffer; @@ -619,11 +619,11 @@ static void wave_out_test_deviceOut(int device, double duration, return; if ((flags & CALLBACK_TYPEMASK) == CALLBACK_EVENT) { - callback = (DWORD)hevent; + callback = (DWORD_PTR)hevent; callback_instance = 0; } else if ((flags & CALLBACK_TYPEMASK) == CALLBACK_FUNCTION) { - callback = (DWORD)callback_func; - callback_instance = (DWORD)hevent; + callback = (DWORD_PTR)callback_func; + callback_instance = (DWORD_PTR)hevent; } else if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) { thread = CreateThread(NULL, 0, callback_thread, hevent, 0, &thread_id); if (thread) { @@ -827,7 +827,7 @@ EXIT: HeapFree(GetProcessHeap(), 0, frags); } -static void wave_out_test_device(int device) +static void wave_out_test_device(UINT_PTR device) { WAVEOUTCAPSA capsA; WAVEOUTCAPSW capsW;

1 0

Alexandre Julliard : user32/tests: Fix pointer casting warnings on 64-bit.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: d97b398767b4684e773617a22442400bc718df19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97b398767b4684e773617a22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:16:16 2009 +0100 user32/tests: Fix pointer casting warnings on 64-bit. --- dlls/user32/tests/cursoricon.c | 2 +- dlls/user32/tests/dde.c | 2 +- dlls/user32/tests/listbox.c | 2 +- dlls/user32/tests/menu.c | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 5d1cf2b..fc1ceaa 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -175,7 +175,7 @@ static void do_parent(void) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - sprintf(path_name, "%s cursoricon %x", test_argv[0], (unsigned int) parent); + sprintf(path_name, "%s cursoricon %lx", test_argv[0], (INT_PTR)parent); ok(CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess failed.\n"); child_process = info.hProcess; diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index dafb68c..f11e0fe 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -160,7 +160,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA lstrcpyA((LPSTR)data->Value, str); GlobalUnlock(hglobal); - lparam = PackDDElParam(WM_DDE_ACK, (UINT)hglobal, HIWORD(lparam)); + lparam = PackDDElParam(WM_DDE_ACK, (UINT_PTR)hglobal, HIWORD(lparam)); PostMessageA(client, WM_DDE_DATA, (WPARAM)hwnd, lparam); break; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index c872357..6c89f62 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -50,7 +50,7 @@ static HWND create_listbox (DWORD add_style, HWND parent) { HWND handle; - int ctl_id=0; + INT_PTR ctl_id=0; if (parent) ctl_id=1; handle=CreateWindow ("LISTBOX", "TestList", diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index adc9410..c0a5f02 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -285,7 +285,7 @@ static void test_menu_ownerdraw(void) NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); if( !hwnd) return; - SetWindowLongPtr( hwnd, GWLP_WNDPROC, (LONG)menu_ownerdraw_wnd_proc); + SetWindowLongPtr( hwnd, GWLP_WNDPROC, (LONG_PTR)menu_ownerdraw_wnd_proc); hmenu = CreatePopupMenu(); ok(hmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); if( !hmenu) { DestroyWindow(hwnd);return;} @@ -538,7 +538,7 @@ static void test_menu_bmp_and_string(void) ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); if( !hwnd) return; - SetWindowLongPtr( hwnd, GWLP_WNDPROC, (LONG)menu_ownerdraw_wnd_proc); + SetWindowLongPtr( hwnd, GWLP_WNDPROC, (LONG_PTR)menu_ownerdraw_wnd_proc); if( winetest_debug) trace(" check %d,%d arrow %d avechar %d\n", @@ -552,7 +552,7 @@ static void test_menu_bmp_and_string(void) for( szidx=0; szidx < sizeof( bmsizes) / sizeof( SIZE); szidx++) { HBITMAP hbm = CreateBitmap( bmsizes[szidx].cx, bmsizes[szidx].cy,1,1,bmfill); HBITMAP bitmaps[] = { HBMMENU_CALLBACK, hbm, NULL }; - ok( (int)hbm, "CreateBitmap failed err %d\n", GetLastError()); + ok( hbm != 0, "CreateBitmap failed err %d\n", GetLastError()); for( txtidx = 0; txtidx < sizeof(MOD_txtsizes)/sizeof(MOD_txtsizes[0]); txtidx++) { for( hassub = 0; hassub < 2 ; hassub++) { /* add submenu item */ for( mnuopt = 0; mnuopt < 3 ; mnuopt++){ /* test MNS_NOCHECK/MNS_CHECKORBMP */ @@ -1607,7 +1607,7 @@ static void test_menu_search_bycommand( void ) rc = GetMenuItemInfo(hmenu, (UINT_PTR)hmenuSub2, FALSE, &info); ok (rc, "Getting the menus info failed\n"); - ok (info.wID == (UINT)hmenuSub2, "IDs differ for popup menu\n"); + ok (info.wID == (UINT_PTR)hmenuSub2, "IDs differ for popup menu\n"); ok (!strcmp(info.dwTypeData, "Submenu2"), "Returned item has wrong label (%s)\n", info.dwTypeData); DestroyMenu( hmenu ); @@ -1872,7 +1872,7 @@ static void test_menu_flags( void ) hMenu = CreateMenu(); hPopupMenu = CreatePopupMenu(); - AppendMenu(hMenu, MF_POPUP | MF_STRING, (UINT)hPopupMenu, "Popup"); + AppendMenu(hMenu, MF_POPUP | MF_STRING, (UINT_PTR)hPopupMenu, "Popup"); AppendMenu(hPopupMenu, MF_STRING | MF_HILITE | MF_DEFAULT, 101, "Item 1"); InsertMenu(hPopupMenu, 1, MF_BYPOSITION | MF_STRING | MF_HILITE | MF_DEFAULT, 102, "Item 2"); @@ -1920,7 +1920,7 @@ static void test_menu_hilitemenuitem( void ) hMenu = CreateMenu(); hPopupMenu = CreatePopupMenu(); - AppendMenu(hMenu, MF_POPUP | MF_STRING, (UINT)hPopupMenu, "Popup"); + AppendMenu(hMenu, MF_POPUP | MF_STRING, (UINT_PTR)hPopupMenu, "Popup"); AppendMenu(hPopupMenu, MF_STRING, 101, "Item 1"); AppendMenu(hPopupMenu, MF_STRING, 102, "Item 2"); @@ -2053,7 +2053,7 @@ static void check_menu_items(HMENU hmenu, UINT checked_cmd, UINT checked_type, #endif if (mii.hSubMenu) { - ok((HMENU)mii.wID == mii.hSubMenu, "id %u: wID should be equal to hSubMenu\n", checked_cmd); + ok(mii.wID == (UINT_PTR)mii.hSubMenu, "id %u: wID should be equal to hSubMenu\n", checked_cmd); check_menu_items(mii.hSubMenu, checked_cmd, checked_type, checked_state); } else

1 0

Alexandre Julliard : wininet/tests: Use ~0u instead of ~0ul for DWORD values.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 523881678bed77a1515eb905894e41e8987f8911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=523881678bed77a1515eb9058… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:15:06 2009 +0100 wininet/tests: Use ~0u instead of ~0ul for DWORD values. --- dlls/wininet/tests/http.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 8b3a8f8..de81651 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1666,7 +1666,7 @@ static void test_header_handling_order(int port) request = HttpOpenRequest(connect, NULL, "/test3", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION, 0); ok(request != NULL, "HttpOpenRequest failed\n"); - ret = HttpAddRequestHeaders(request, authorization, ~0UL, HTTP_ADDREQ_FLAG_ADD); + ret = HttpAddRequestHeaders(request, authorization, ~0u, HTTP_ADDREQ_FLAG_ADD); ok(ret, "HttpAddRequestHeaders failed\n"); ret = HttpSendRequest(request, NULL, 0, NULL, 0); @@ -1683,7 +1683,7 @@ static void test_header_handling_order(int port) request = HttpOpenRequest(connect, NULL, "/test4", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION, 0); ok(request != NULL, "HttpOpenRequest failed\n"); - ret = HttpSendRequest(request, connection, ~0UL, NULL, 0); + ret = HttpSendRequest(request, connection, ~0u, NULL, 0); ok(ret, "HttpSendRequest failed\n"); status = 0; @@ -1697,10 +1697,10 @@ static void test_header_handling_order(int port) request = HttpOpenRequest(connect, "POST", "/test7", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION, 0); ok(request != NULL, "HttpOpenRequest failed\n"); - ret = HttpAddRequestHeaders(request, "Content-Length: 100\r\n", ~0UL, HTTP_ADDREQ_FLAG_ADD_IF_NEW); + ret = HttpAddRequestHeaders(request, "Content-Length: 100\r\n", ~0u, HTTP_ADDREQ_FLAG_ADD_IF_NEW); ok(ret, "HttpAddRequestHeaders failed\n"); - ret = HttpSendRequest(request, connection, ~0UL, NULL, 0); + ret = HttpSendRequest(request, connection, ~0u, NULL, 0); ok(ret, "HttpSendRequest failed\n"); status = 0; @@ -2055,7 +2055,7 @@ static void test_user_agent_header(void) ok(!ret, "HttpQueryInfo succeeded\n"); ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND, got %u\n", err); - ret = HttpAddRequestHeaders(req, "User-Agent: Gizmo Project\r\n", ~0UL, HTTP_ADDREQ_FLAG_ADD_IF_NEW); + ret = HttpAddRequestHeaders(req, "User-Agent: Gizmo Project\r\n", ~0u, HTTP_ADDREQ_FLAG_ADD_IF_NEW); ok(ret, "HttpAddRequestHeaders succeeded\n"); size = sizeof(buffer); @@ -2075,7 +2075,7 @@ static void test_user_agent_header(void) ok(!ret, "HttpQueryInfo succeeded\n"); ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND, got %u\n", err); - ret = HttpAddRequestHeaders(req, "Accept: audio/*, image/*, text/*\r\nUser-Agent: Gizmo Project\r\n", ~0UL, HTTP_ADDREQ_FLAG_ADD_IF_NEW); + ret = HttpAddRequestHeaders(req, "Accept: audio/*, image/*, text/*\r\nUser-Agent: Gizmo Project\r\n", ~0u, HTTP_ADDREQ_FLAG_ADD_IF_NEW); ok(ret, "HttpAddRequestHeaders failed\n"); buffer[0] = 0;

1 0