January 2009 - Wine-commits

Alexandre Julliard : shell32/tests: Fix handle casting warnings on 64-bit.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: d3ed2df9ee709da1f1541b037eccb4c657720e69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3ed2df9ee709da1f1541b037… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:14:32 2009 +0100 shell32/tests: Fix handle casting warnings on 64-bit. --- dlls/shell32/tests/shlexec.c | 45 ++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 4ea855a..a51dba0 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -90,7 +90,7 @@ static void strcat_param(char* str, const char* param) static char shell_call[2048]=""; static int shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, LPCSTR directory) { - int rc; + INT_PTR rc; strcpy(shell_call, "ShellExecute("); strcat_param(shell_call, operation); @@ -111,8 +111,7 @@ static int shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, LPCST * association it displays the 'Open With' dialog and I could not find * a flag to prevent this. */ - rc=(int)ShellExecute(NULL, operation, file, parameters, directory, - SW_SHOWNORMAL); + rc=(INT_PTR)ShellExecute(NULL, operation, file, parameters, directory, SW_SHOWNORMAL); if (rc > 32) { @@ -135,7 +134,7 @@ static int shell_execute_ex(DWORD mask, LPCSTR operation, LPCSTR file, { SHELLEXECUTEINFO sei; BOOL success; - int rc; + INT_PTR rc; strcpy(shell_call, "ShellExecuteEx("); strcat_param(shell_call, operation); @@ -168,9 +167,9 @@ static int shell_execute_ex(DWORD mask, LPCSTR operation, LPCSTR file, DeleteFile(child_file); SetLastError(0xcafebabe); success=ShellExecuteEx(&sei); - rc=(int)sei.hInstApp; + rc=(INT_PTR)sei.hInstApp; ok((success && rc > 32) || (!success && rc <= 32), - "%s rc=%d and hInstApp=%d is not allowed\n", shell_call, success, rc); + "%s rc=%d and hInstApp=%ld is not allowed\n", shell_call, success, rc); if (rc > 32) { @@ -835,7 +834,7 @@ static void test_find_executable(void) char filename[MAX_PATH]; char command[MAX_PATH]; const filename_tests_t* test; - int rc; + INT_PTR rc; if (!create_test_association(".sfe")) { @@ -849,26 +848,26 @@ static void test_find_executable(void) strcpy(command, "your word"); if (0) /* Can crash on Vista! */ { - rc=(int)FindExecutableA(NULL, NULL, command); - ok(rc == SE_ERR_FNF || rc > 32 /* nt4 */, "FindExecutable(NULL) returned %d\n", rc); + rc=(INT_PTR)FindExecutableA(NULL, NULL, command); + ok(rc == SE_ERR_FNF || rc > 32 /* nt4 */, "FindExecutable(NULL) returned %ld\n", rc); ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); } strcpy(command, "your word"); - rc=(int)FindExecutableA(tmpdir, NULL, command); - ok(rc == SE_ERR_NOASSOC /* >= win2000 */ || rc > 32 /* win98, nt4 */, "FindExecutable(NULL) returned %d\n", rc); + rc=(INT_PTR)FindExecutableA(tmpdir, NULL, command); + ok(rc == SE_ERR_NOASSOC /* >= win2000 */ || rc > 32 /* win98, nt4 */, "FindExecutable(NULL) returned %ld\n", rc); ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); sprintf(filename, "%s\\test file.sfe", tmpdir); - rc=(int)FindExecutableA(filename, NULL, command); - ok(rc > 32, "FindExecutable(%s) returned %d\n", filename, rc); + rc=(INT_PTR)FindExecutableA(filename, NULL, command); + ok(rc > 32, "FindExecutable(%s) returned %ld\n", filename, rc); /* Depending on the platform, command could be '%1' or 'test file.sfe' */ - rc=(int)FindExecutableA("test file.sfe", tmpdir, command); - ok(rc > 32, "FindExecutable(%s) returned %d\n", filename, rc); + rc=(INT_PTR)FindExecutableA("test file.sfe", tmpdir, command); + ok(rc > 32, "FindExecutable(%s) returned %ld\n", filename, rc); - rc=(int)FindExecutableA("test file.sfe", NULL, command); - ok(rc == SE_ERR_FNF, "FindExecutable(%s) returned %d\n", filename, rc); + rc=(INT_PTR)FindExecutableA("test file.sfe", NULL, command); + ok(rc == SE_ERR_FNF, "FindExecutable(%s) returned %ld\n", filename, rc); delete_test_association(".sfe"); @@ -880,11 +879,11 @@ static void test_find_executable(void) create_test_verb(".shl", "Open", 0, "Open"); sprintf(filename, "%s\\test file.shl", tmpdir); - rc=(int)FindExecutableA(filename, NULL, command); - ok(rc == SE_ERR_FNF /* NT4 */ || rc > 32, "FindExecutable(%s) returned %d\n", filename, rc); + rc=(INT_PTR)FindExecutableA(filename, NULL, command); + ok(rc == SE_ERR_FNF /* NT4 */ || rc > 32, "FindExecutable(%s) returned %ld\n", filename, rc); sprintf(filename, "%s\\test file.shlfoo", tmpdir); - rc=(int)FindExecutableA(filename, NULL, command); + rc=(INT_PTR)FindExecutableA(filename, NULL, command); delete_test_association(".shl"); @@ -919,16 +918,16 @@ static void test_find_executable(void) } /* Win98 does not '\0'-terminate command! */ memset(command, '\0', sizeof(command)); - rc=(int)FindExecutableA(filename, NULL, command); + rc=(INT_PTR)FindExecutableA(filename, NULL, command); if (rc > 32) rc=33; if ((test->todo & 0x10)==0) { - ok(rc==test->rc, "FindExecutable(%s) failed: rc=%d\n", filename, rc); + ok(rc==test->rc, "FindExecutable(%s) failed: rc=%ld\n", filename, rc); } else todo_wine { - ok(rc==test->rc, "FindExecutable(%s) failed: rc=%d\n", filename, rc); + ok(rc==test->rc, "FindExecutable(%s) failed: rc=%ld\n", filename, rc); } if (rc > 32) {

1 0

Alexandre Julliard : winhttp/tests: Use ~0u instead of ~0ul for DWORD values.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 97f4bfa7ed75725e1e4b3046c9aee436ecb8f46d URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f4bfa7ed75725e1e4b3046c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:15:00 2009 +0100 winhttp/tests: Use ~0u instead of ~0ul for DWORD values. --- dlls/winhttp/tests/url.c | 20 ++++++++++---------- dlls/winhttp/tests/winhttp.c | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 2a04208..2765a67 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -124,12 +124,12 @@ static void WinHttpCreateUrl_test( void ) BOOL ret; /* NULL components */ - len = ~0UL; + len = ~0u; SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( NULL, 0, NULL, &len ); ok( !ret, "expected failure\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == ~0UL, "expected len ~0UL got %u\n", len ); + ok( len == ~0u, "expected len ~0u got %u\n", len ); /* zero'ed components */ memset( &uc, 0, sizeof(URL_COMPONENTS) ); @@ -137,7 +137,7 @@ static void WinHttpCreateUrl_test( void ) ret = WinHttpCreateUrl( &uc, 0, NULL, &len ); ok( !ret, "expected failure\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == ~0UL, "expected len ~0UL got %u\n", len ); + ok( len == ~0u, "expected len ~0u got %u\n", len ); /* valid components, NULL url, NULL length */ fill_url_components( &uc ); @@ -145,7 +145,7 @@ static void WinHttpCreateUrl_test( void ) ret = WinHttpCreateUrl( &uc, 0, NULL, NULL ); ok( !ret, "expected failure\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == ~0UL, "expected len ~0UL got %u\n", len ); + ok( len == ~0u, "expected len ~0u got %u\n", len ); /* valid components, NULL url */ SetLastError( 0xdeadbeef ); @@ -310,13 +310,13 @@ static void reset_url_components( URL_COMPONENTS *uc ) { memset( uc, 0, sizeof(URL_COMPONENTS) ); uc->dwStructSize = sizeof(URL_COMPONENTS); - uc->dwSchemeLength = ~0UL; - uc->dwHostNameLength = ~0UL; + uc->dwSchemeLength = ~0u; + uc->dwHostNameLength = ~0u; uc->nPort = 0; - uc->dwUserNameLength = ~0UL; - uc->dwPasswordLength = ~0UL; - uc->dwUrlPathLength = ~0UL; - uc->dwExtraInfoLength = ~0UL; + uc->dwUserNameLength = ~0u; + uc->dwPasswordLength = ~0u; + uc->dwUrlPathLength = ~0u; + uc->dwExtraInfoLength = ~0u; } static void WinHttpCrackUrl_test( void ) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index a4e33b4..74e1c9a 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -665,22 +665,22 @@ static void test_WinHttpAddHeaders(void) test_header_name, buffer, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders succeeded unexpectedly, found third header.\n"); - ret = WinHttpAddRequestHeaders(request, test_headers[8], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ret = WinHttpAddRequestHeaders(request, test_headers[8], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(!ret, "WinHttpAddRequestHeaders failed\n"); - ret = WinHttpAddRequestHeaders(request, test_headers[9], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ret = WinHttpAddRequestHeaders(request, test_headers[9], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(ret, "WinHttpAddRequestHeaders failed\n"); - ret = WinHttpAddRequestHeaders(request, test_headers[10], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ret = WinHttpAddRequestHeaders(request, test_headers[10], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(!ret, "WinHttpAddRequestHeaders failed\n"); - ret = WinHttpAddRequestHeaders(request, test_headers[11], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ret = WinHttpAddRequestHeaders(request, test_headers[11], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(!ret, "WinHttpAddRequestHeaders failed\n"); - ret = WinHttpAddRequestHeaders(request, test_headers[12], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ret = WinHttpAddRequestHeaders(request, test_headers[12], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(!ret, "WinHttpAddRequestHeaders failed\n"); - ret = WinHttpAddRequestHeaders(request, test_headers[13], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ret = WinHttpAddRequestHeaders(request, test_headers[13], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(ret, "WinHttpAddRequestHeaders failed\n"); index = 0;

1 0

Alexandre Julliard : wininet/tests: Use ~0u instead of ~0ul for DWORD values.
by Alexandre Julliard 04 Jan '09

04 Jan '09

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

Alexandre Julliard : comctl32/tests: Fix pointer casting warnings on 64-bit .
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: a52977dc4a0e28feafadbd5766787748d96260b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52977dc4a0e28feafadbd576… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:13:20 2009 +0100 comctl32/tests: Fix pointer casting warnings on 64-bit. --- dlls/comctl32/tests/dpa.c | 16 ++++++++-------- dlls/comctl32/tests/subclass.c | 2 +- dlls/comctl32/tests/toolbar.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 08a7b02..a0d1920 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -182,7 +182,7 @@ static BOOL CheckDPA(HDPA dpa, DWORD dwIn, PDWORD pdwOut) do { - pDPA_InsertPtr(dpa, 0, (PVOID)(dwIn & 0xf)); + pDPA_InsertPtr(dpa, 0, (PVOID)(ULONG_PTR)(dwIn & 0xf)); dwIn >>= 4; } while(dwIn); @@ -242,9 +242,9 @@ static void test_dpa(void) for(i = 1; i <= 6; i++) { INT j, k; - k = pDPA_GetPtrIndex(dpa, (PVOID)i); + k = pDPA_GetPtrIndex(dpa, (PVOID)(INT_PTR)i); /* Linear searches should work on unsorted DPAs */ - j = pDPA_Search(dpa, (PVOID)i, 0, CB_CmpLT, 0xdeadbeef, 0); + j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, 0, CB_CmpLT, 0xdeadbeef, 0); ok(j == k, "j=%d k=%d\n", j, k); } @@ -279,16 +279,16 @@ static void test_dpa(void) INT j; /* The array is in order so ptr == index+1 */ - j = pDPA_GetPtrIndex(dpa, (PVOID)i); + j = pDPA_GetPtrIndex(dpa, (PVOID)(INT_PTR)i); ok(j+1 == i, "j=%d i=%d\n", j, i); - j = pDPA_Search(dpa, (PVOID)i, 0, CB_CmpLT, 0xdeadbeef, DPAS_SORTED); + j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, 0, CB_CmpLT, 0xdeadbeef, DPAS_SORTED); ok(j+1 == i, "j=%d i=%d\n", j, i); /* Linear searches respect iStart ... */ - j = pDPA_Search(dpa, (PVOID)i, i+1, CB_CmpLT, 0xdeadbeef, 0); + j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, i+1, CB_CmpLT, 0xdeadbeef, 0); ok(j == DPA_ERR, "j=%d\n", j); /* ... but for a binary search it's ignored */ - j = pDPA_Search(dpa, (PVOID)i, i+1, CB_CmpLT, 0xdeadbeef, DPAS_SORTED); + j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, i+1, CB_CmpLT, 0xdeadbeef, DPAS_SORTED); todo_wine ok(j+1 == i, "j=%d i=%d\n", j, i); } @@ -331,7 +331,7 @@ static void test_dpa(void) * should be bogus */ for(i = 0; i < 6; i++) { - INT j = pDPA_Search(dpa, (PVOID)i, 0, CB_CmpGT, 0xdeadbeef, + INT j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, 0, CB_CmpGT, 0xdeadbeef, DPAS_SORTED|DPAS_INSERTBEFORE); ok(j != i, "i=%d\n", i); } diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index c225f72..f4d0b72 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -234,7 +234,7 @@ static void test_subclass(void) ok_sequence(Sub_AfterDeletedTest, "After Deleted"); pSetWindowSubclass(hwnd, WndProcSub, 2, 0); - origProc3 = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG)WndProc3); + origProc3 = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc3); SendMessage(hwnd, WM_USER, 1, 0); SendMessage(hwnd, WM_USER, 2, 0); ok_sequence(Sub_OldAfterNewTest, "Old after New"); diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 328ee2f..c92f3f2 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1151,7 +1151,7 @@ static void test_setrows(void) memset(&rc, 0xCC, sizeof(rc)); SendMessageA(hToolbar, TB_SETROWS, MAKELONG(tbrows_results[i].nRows, tbrows_results[i].bLarger), - (LONG) &rc); + (LPARAM) &rc); rows = SendMessageA(hToolbar, TB_GETROWS, MAKELONG(0,0), MAKELONG(0,0)); ok(rows == tbrows_results[i].expectedRows,

1 0

Alexandre Julliard : gdi32/tests: Fix a pointer casting warning on 64-bit.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 428de06982a59edb648904f6e2740ef00971732d URL: http://source.winehq.org/git/wine.git/?a=commit;h=428de06982a59edb648904f6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:13:29 2009 +0100 gdi32/tests: Fix a pointer casting warning on 64-bit. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f2fde19..0624de0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1435,7 +1435,7 @@ static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count ok(!(fs.fsCsb[0] & (1 << 31)), "symbol encoding should NOT be available\n"); } - if (!TranslateCharsetInfo((DWORD *)cs, &csi, TCI_SRCCHARSET)) + if (!TranslateCharsetInfo((DWORD *)(INT_PTR)cs, &csi, TCI_SRCCHARSET)) { trace("Can't find codepage for charset %d\n", cs); ReleaseDC(0, hdc);

1 0

Alexandre Julliard : mlang/tests: Fix a pointer casting warning on 64-bit.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: c2cef54ea097a8fa63f08dced05bc43261a028df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cef54ea097a8fa63f08dced… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:13:37 2009 +0100 mlang/tests: Fix a pointer casting warning on 64-bit. --- dlls/mlang/tests/mlang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 37b6224..1506963 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -379,7 +379,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) #endif ok(cpinfo[i].dwFlags & flags, "enumerated flags %08x do not include requested %08x\n", cpinfo[i].dwFlags, flags); - if (TranslateCharsetInfo((DWORD *)cpinfo[i].uiFamilyCodePage, &csi, TCI_SRCCODEPAGE)) + if (TranslateCharsetInfo((DWORD *)(INT_PTR)cpinfo[i].uiFamilyCodePage, &csi, TCI_SRCCODEPAGE)) ok(cpinfo[i].bGDICharset == csi.ciCharset, "%d != %d\n", cpinfo[i].bGDICharset, csi.ciCharset); else trace("TranslateCharsetInfo failed for cp %u\n", cpinfo[i].uiFamilyCodePage);

1 0

Alexandre Julliard : msi/tests: Fix pointer casting warnings on 64-bit.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: ddc34141cda2bc57f3c6f71cdd8018b0fa48de87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc34141cda2bc57f3c6f71cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:13:45 2009 +0100 msi/tests: Fix pointer casting warnings on 64-bit. --- dlls/msi/tests/automation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 9568fbf..1c392cb 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -723,7 +723,7 @@ static HRESULT Installer_RegistryValue(HKEY hkey, LPCWSTR szKey, VARIANT vValue, VariantInit(&vararg[2]); V_VT(&vararg[2]) = VT_I4; - V_I4(&vararg[2]) = (int)hkey; + V_I4(&vararg[2]) = (INT_PTR)hkey; VariantInit(&vararg[1]); V_VT(&vararg[1]) = VT_BSTR; V_BSTR(&vararg[1]) = SysAllocString(szKey); @@ -2401,7 +2401,7 @@ static void test_Installer(void) } /* Installer::OpenDatabase */ - hr = Installer_OpenDatabase(szPath, (int)MSIDBOPEN_TRANSACT, &pDatabase); + hr = Installer_OpenDatabase(szPath, (INT_PTR)MSIDBOPEN_TRANSACT, &pDatabase); ok(hr == S_OK, "Installer_OpenDatabase failed, hresult 0x%08x\n", hr); if (hr == S_OK) {

1 0

Alexandre Julliard : ntdll/tests: Fix pointer casting warnings on 64-bit.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 90541731aac4d89bf4b48bef958b8c2dae39265f URL: http://source.winehq.org/git/wine.git/?a=commit;h=90541731aac4d89bf4b48bef9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:14:01 2009 +0100 ntdll/tests: Fix pointer casting warnings on 64-bit. --- dlls/ntdll/tests/atom.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index 7526654..220ea40 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -295,7 +295,7 @@ static void test_NtIntAtom(void) RTL_ATOM_TABLE AtomTable; RTL_ATOM testAtom; ULONG RefCount = 0, PinCount = 0; - int i; + INT_PTR i; WCHAR Name[64]; ULONG Len; @@ -311,25 +311,25 @@ static void test_NtIntAtom(void) ok(res == STATUS_INVALID_PARAMETER, "Didn't get expected result from adding 0 int atom, retval: %x\n", res); for (i = 1; i <= 0xbfff; i++) { - res = pRtlAddAtomToAtomTable(AtomTable, (PWSTR)i, &testAtom); - ok(!res, "Unable to add valid integer atom %i, retval: %x\n", i, res); + res = pRtlAddAtomToAtomTable(AtomTable, (LPWSTR)i, &testAtom); + ok(!res, "Unable to add valid integer atom %li, retval: %x\n", i, res); } for (i = 1; i <= 0xbfff; i++) { - res = pRtlLookupAtomInAtomTable(AtomTable, (PWSTR)i, &testAtom); - ok(!res, "Unable to find int atom %i, retval: %x\n", i, res); + res = pRtlLookupAtomInAtomTable(AtomTable, (LPWSTR)i, &testAtom); + ok(!res, "Unable to find int atom %li, retval: %x\n", i, res); if (!res) { res = pRtlPinAtomInAtomTable(AtomTable, testAtom); - ok(!res, "Unable to pin int atom %i, retval: %x\n", i, res); + ok(!res, "Unable to pin int atom %li, retval: %x\n", i, res); } } for (i = 0xc000; i <= 0xffff; i++) { - res = pRtlAddAtomToAtomTable(AtomTable, (PWSTR)i, &testAtom); - ok(res, "Able to illeageal integer atom %i, retval: %x\n", i, res); + res = pRtlAddAtomToAtomTable(AtomTable, (LPWSTR)i, &testAtom); + ok(res, "Able to illeageal integer atom %li, retval: %x\n", i, res); } res = pRtlDestroyAtomTable(AtomTable);

1 0

Alexandre Julliard : ole32/tests: Fix a pointer casting warning on 64-bit.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 68bd54b55808576679f0c56d81c48d4695ca77b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68bd54b55808576679f0c56d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:14:11 2009 +0100 ole32/tests: Fix a pointer casting warning on 64-bit. --- dlls/ole32/tests/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 35f0021..02dc080 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -887,7 +887,7 @@ static void test_registered_object_thread_affinity(void) ok(hr == S_OK, "CoGetClassObject on local server object registered in same " "thread should return S_OK instead of 0x%08x\n", hr); - thread = CreateThread(NULL, 0, revoke_class_object_thread, (LPVOID)cookie, 0, &tid); + thread = CreateThread(NULL, 0, revoke_class_object_thread, (LPVOID)(DWORD_PTR)cookie, 0, &tid); ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); WaitForSingleObject(thread, INFINITE); GetExitCodeThread(thread, &exitcode);

1 0

Alexandre Julliard : msi/tests: Add CDECL to the cabinet callback functions .
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 3e7ac7ea2eb9854748e753bc17e03dd23e7f1f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e7ac7ea2eb9854748e753bc1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:12:49 2009 +0100 msi/tests: Add CDECL to the cabinet callback functions. --- dlls/msi/tests/install.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 56d36e1..6d1f308 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1211,34 +1211,34 @@ static const msi_table pc_tables[] = /* the FCI callbacks */ -static void *mem_alloc(ULONG cb) +static void * CDECL mem_alloc(ULONG cb) { return HeapAlloc(GetProcessHeap(), 0, cb); } -static void mem_free(void *memory) +static void CDECL mem_free(void *memory) { HeapFree(GetProcessHeap(), 0, memory); } -static BOOL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) +static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) { sprintf(pccab->szCab, pv, pccab->iCab); return TRUE; } -static long progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) +static long CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) { return 0; } -static int file_placed(PCCAB pccab, char *pszFile, long cbFile, - BOOL fContinuation, void *pv) +static int CDECL file_placed(PCCAB pccab, char *pszFile, long cbFile, + BOOL fContinuation, void *pv) { return 0; } -static INT_PTR fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) +static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) { HANDLE handle; DWORD dwAccess = 0; @@ -1262,7 +1262,7 @@ static INT_PTR fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) return (INT_PTR)handle; } -static UINT fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) +static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD dwRead; @@ -1274,7 +1274,7 @@ static UINT fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) return dwRead; } -static UINT fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) +static UINT CDECL fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD dwWritten; @@ -1286,7 +1286,7 @@ static UINT fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) return dwWritten; } -static int fci_close(INT_PTR hf, int *err, void *pv) +static int CDECL fci_close(INT_PTR hf, int *err, void *pv) { HANDLE handle = (HANDLE)hf; ok(CloseHandle(handle), "Failed to CloseHandle\n"); @@ -1294,7 +1294,7 @@ static int fci_close(INT_PTR hf, int *err, void *pv) return 0; } -static long fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) +static long CDECL fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD ret; @@ -1305,7 +1305,7 @@ static long fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) return ret; } -static int fci_delete(char *pszFile, int *err, void *pv) +static int CDECL fci_delete(char *pszFile, int *err, void *pv) { BOOL ret = DeleteFileA(pszFile); ok(ret, "Failed to DeleteFile %s\n", pszFile); @@ -1378,7 +1378,7 @@ static BOOL check_record(MSIHANDLE rec, UINT field, LPCSTR val) return (r == ERROR_SUCCESS ) && !strcmp(val, buffer); } -static BOOL get_temp_file(char *pszTempName, int cbTempName, void *pv) +static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) { LPSTR tempname; @@ -1397,8 +1397,8 @@ static BOOL get_temp_file(char *pszTempName, int cbTempName, void *pv) return FALSE; } -static INT_PTR get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, - USHORT *pattribs, int *err, void *pv) +static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, + USHORT *pattribs, int *err, void *pv) { BY_HANDLE_FILE_INFORMATION finfo; FILETIME filetime;

1 0