June 2011 - Wine-Commits - list.winehq.org

Marko Nikolic : comctl32/tests: Removed sign comparison warning in monthcal tests.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 589d87f215d7b8c76b42a795e4b7d13d207e08b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589d87f215d7b8c76b42a795e… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Sat Jun 4 23:27:33 2011 +0200 comctl32/tests: Removed sign comparison warning in monthcal tests. --- dlls/comctl32/tests/monthcal.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index f585376..83b789d 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -581,9 +581,9 @@ static void test_color(void) /* invalid color index */ color = SendMessage(hwnd, MCM_GETCOLOR, MCSC_TRAILINGTEXT + 1, 0); - expect(-1, color); + expect(~0u, color); prev = SendMessage(hwnd, MCM_SETCOLOR, MCSC_TRAILINGTEXT + 1, RGB(255,255,255)); - expect(-1, prev); + expect(~0u, prev); color = SendMessage(hwnd, MCM_GETCOLOR, MCSC_BACKGROUND, 0); prev = SendMessage(hwnd, MCM_SETCOLOR, MCSC_BACKGROUND, RGB(0,0,0)); @@ -920,11 +920,11 @@ static void test_hittest(void) res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); expect(0, mchit.pt.x); expect(0, mchit.pt.y); - expect(-1, res); + expect(~0u, res); expect(0, mchit.uHit); /* test with invalid pointer */ res = SendMessage(hwnd, MCM_HITTEST, 0, 0); - expect(-1, res); + expect(~0u, res); /* resize control to display single Calendar */ res = SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r); @@ -1655,7 +1655,7 @@ static void test_hittest_v6(void) mchit.iRow = -1; mchit.iCol = -1; ret = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); - if (ret == -1) + if (ret == ~0u) { win_skip("Only MCHITTESTINFO_V1 supported\n"); DestroyWindow(hwnd);

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in listview tests.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 38bf3a6bbd2461d0e3923b364e8253e8380bd406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38bf3a6bbd2461d0e3923b364… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Sun Jun 5 01:36:55 2011 +0200 comctl32/tests: Removed sign comparison warning in listview tests. --- dlls/comctl32/tests/listview.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 949b214..e0dfd72 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -662,7 +662,7 @@ static void test_lvm_hittest_(HWND hwnd, INT x, INT y, INT item, UINT flags, UIN BOOL todo_item, BOOL todo_flags, int line) { LVHITTESTINFO lpht; - DWORD ret; + INT ret; lpht.pt.x = x; lpht.pt.y = y; @@ -705,7 +705,7 @@ static void test_lvm_subitemhittest_(HWND hwnd, INT x, INT y, INT item, INT subi BOOL todo_item, BOOL todo_subitem, BOOL todo_flags, int line) { LVHITTESTINFO lpht; - DWORD ret; + INT ret; lpht.pt.x = x; lpht.pt.y = y; @@ -748,7 +748,7 @@ static void test_lvm_subitemhittest_(HWND hwnd, INT x, INT y, INT item, INT subi static void test_images(void) { HWND hwnd; - DWORD r; + INT r; LVITEM item; HIMAGELIST himl; HBITMAP hbmp; @@ -1018,7 +1018,7 @@ static void test_checkboxes(void) static void insert_column(HWND hwnd, int idx) { LVCOLUMN column; - DWORD rc; + INT rc; memset(&column, 0xcc, sizeof(column)); column.mask = LVCF_SUBITEM; @@ -1033,7 +1033,7 @@ static void insert_item(HWND hwnd, int idx) static CHAR text[] = "foo"; LVITEMA item; - DWORD rc; + INT rc; memset(&item, 0xcc, sizeof (item)); item.mask = LVIF_TEXT; @@ -1701,7 +1701,7 @@ static void test_icon_spacing(void) HWND hwnd; WORD w, h; - DWORD r; + INT r; hwnd = create_listview_control(LVS_ICON); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -2017,7 +2017,7 @@ static void test_multiselect(void) } select_task; HWND hwnd; - DWORD r; + INT r; int i,j,item_count,selected_count; static const int items=5; BYTE kstate[256]; @@ -2393,7 +2393,7 @@ static void test_sorting(void) { HWND hwnd; LVITEMA item = {0}; - DWORD r; + INT r; LONG_PTR style; static CHAR names[][5] = {"A", "B", "C", "D", "0"}; CHAR buff[10]; @@ -3633,7 +3633,7 @@ static void test_editbox(void) static CHAR buffer[25]; HWND hwnd, hwndedit, hwndedit2, header; LVITEMA item; - DWORD r; + INT r; hwnd = create_listview_control(LVS_EDITLABELS | LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -4128,7 +4128,7 @@ static void test_canceleditlabel(void) static void test_mapidindex(void) { HWND hwnd; - DWORD ret; + INT ret; /* LVM_MAPINDEXTOID unsupported with LVS_OWNERDATA */ hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); @@ -4250,7 +4250,7 @@ todo_wine { static void test_getcolumnwidth(void) { HWND hwnd; - DWORD ret; + INT ret; DWORD_PTR style; LVCOLUMNA col; LVITEMA itema; @@ -4442,7 +4442,7 @@ static void test_finditem(void) LVFINDINFOA fi; static char f[5]; HWND hwnd; - DWORD r; + INT r; hwnd = create_listview_control(LVS_REPORT); insert_item(hwnd, 0);

1 0

Henri Verbeet : wined3d: Rename Context_MarkStateDirty() to context_invalidate_state().
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 84ce0020f44d31af2e2387cd330b78ee99ee1b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ce0020f44d31af2e2387cd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 22:48:52 2011 +0200 wined3d: Rename Context_MarkStateDirty() to context_invalidate_state(). --- dlls/wined3d/context.c | 107 ++++++++++++++++++++--------------------------- 1 files changed, 46 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84ce0020f44d31af2e238…

1 0

Henri Verbeet : wined3d: Rename IWineD3DDeviceImpl_MarkStateDirty() to device_invalidate_state().
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: c8f26a1345661b94d4aec2e4d338657a7a4965fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8f26a1345661b94d4aec2e4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 22:48:51 2011 +0200 wined3d: Rename IWineD3DDeviceImpl_MarkStateDirty() to device_invalidate_state(). --- dlls/wined3d/buffer.c | 22 ++---- dlls/wined3d/context.c | 4 +- dlls/wined3d/device.c | 140 +++++++++++++++++++--------------------- dlls/wined3d/drawprim.c | 19 +++--- dlls/wined3d/surface.c | 22 +++---- dlls/wined3d/swapchain.c | 10 ++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 4 +- dlls/wined3d/wined3d_private.h | 2 +- 9 files changed, 105 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8f26a1345661b94d4aec…

1 0

Alexandre Julliard : Remove some obsolete WineConf information.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: website Branch: master Commit: ace6a002fedc9e8764c8c1717f99f998c7da2438 URL: http://source.winehq.org/git/website.git/?a=commit;h=ace6a002fedc9e8764c8c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 22:34:50 2011 +0200 Remove some obsolete WineConf information. --- templates/en/wineconf.template | 68 -------------- templates/en/wineconf/travel.template | 134 ---------------------------- templates/he/wineconf.template | 68 -------------- templates/he/wineconf/media.template | 33 ------- templates/he/wineconf/rsvp.template | 14 --- templates/he/wineconf/rsvp_done.template | 5 - templates/he/wineconf/rsvp_form.template | 30 ------ templates/he/wineconf/survey.template | 14 --- templates/he/wineconf/survey_done.template | 5 - templates/he/wineconf/survey_form.template | 103 --------------------- templates/he/wineconf/travel.template | 134 ---------------------------- 11 files changed, 0 insertions(+), 608 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=ace6a002fedc9e8764…

1 0

Alexandre Julliard : Update the WineConf rsvp for 2011.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: website Branch: master Commit: 709512b65e5ff2b33442c6c2d10d7adc288ed39c URL: http://source.winehq.org/git/website.git/?a=commit;h=709512b65e5ff2b33442c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 22:35:10 2011 +0200 Update the WineConf rsvp for 2011. --- templates/en/wineconf/rsvp.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/wineconf/rsvp.template b/templates/en/wineconf/rsvp.template index 3962af0..f07b9ac 100644 --- a/templates/en/wineconf/rsvp.template +++ b/templates/en/wineconf/rsvp.template @@ -1,9 +1,9 @@ - + <table width="100%"> <tr> <td><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></td> - <td align="right"><center>November 20 - 21, 2010 Paris, France</center></td> + <td align="right"><center>October 1 - 2, 2011 Minneapolis, MN</center></td> </tr> </table>

1 0

Jacek Caban : urlmon: Avoid accessing an uninitialized variable (valgrind).
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: e21c5282e0c629dd99284b097ad4085067279ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21c5282e0c629dd99284b097… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 11:40:23 2011 +0200 urlmon: Avoid accessing an uninitialized variable (valgrind). Also a bit of code clean up. --- dlls/urlmon/internet.c | 41 ++++++++++++++++++----------------------- 1 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 3832c52..c09bace 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -549,39 +549,34 @@ static HRESULT set_internet_feature(INTERNETFEATURELIST feature, DWORD flags, BO static BOOL get_feature_from_reg(HKEY feature_control, LPCWSTR feature_name, LPCWSTR process_name, BOOL *enabled) { - BOOL ret = FALSE; + DWORD type, value, size; HKEY feature; DWORD res; static const WCHAR wildcardW[] = {'*',0}; res = RegOpenKeyW(feature_control, feature_name, &feature); - if(res == ERROR_SUCCESS) { - DWORD type, value, size; + if(res != ERROR_SUCCESS) + return FALSE; + size = sizeof(DWORD); + res = RegQueryValueExW(feature, process_name, NULL, &type, (BYTE*)&value, &size); + if(res != ERROR_SUCCESS || type != REG_DWORD) { size = sizeof(DWORD); - res = RegQueryValueExW(feature, process_name, NULL, &type, (BYTE*)&value, &size); - if(type != REG_DWORD) - WARN("Unexpected registry value type %d (expected REG_DWORD) for %s\n", type, debugstr_w(process_name)); - - if(res == ERROR_SUCCESS && type == REG_DWORD) { - *enabled = value == 1; - ret = TRUE; - } else { - size = sizeof(DWORD); - res = RegQueryValueExW(feature, wildcardW, NULL, &type, (BYTE*)&value, &size); - if(type != REG_DWORD) - WARN("Unexpected registry value type %d (expected REG_DWORD) for %s\n", type, debugstr_w(wildcardW)); - - if(res == ERROR_SUCCESS && type == REG_DWORD) { - *enabled = value == 1; - ret = TRUE; - } - } - RegCloseKey(feature); + res = RegQueryValueExW(feature, wildcardW, NULL, &type, (BYTE*)&value, &size); + } + + RegCloseKey(feature); + if(res != ERROR_SUCCESS) + return FALSE; + + if(type != REG_DWORD) { + WARN("Unexpected registry value type %d (expected REG_DWORD) for %s\n", type, debugstr_w(wildcardW)); + return FALSE; } - return ret; + *enabled = value == 1; + return TRUE; } /* Assumes 'process_features_cs' is held. */

1 0

Piotr Caban : msvcrt: Fix mingw compilation issues.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: f9de4eef75ecfc074f726f39e54a77211eca2e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9de4eef75ecfc074f726f39e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 3 15:28:32 2011 +0200 msvcrt: Fix mingw compilation issues. --- dlls/msvcrt/ctype.c | 52 +++++++------- dlls/msvcrt/data.c | 6 +- dlls/msvcrt/dir.c | 42 ++++++------ dlls/msvcrt/environ.c | 6 +- dlls/msvcrt/errno.c | 6 +- dlls/msvcrt/file.c | 74 ++++++++++---------- dlls/msvcrt/locale.c | 10 ++-- dlls/msvcrt/math.c | 36 +++++----- dlls/msvcrt/misc.c | 4 +- dlls/msvcrt/msvcrt.h | 24 ++++---- dlls/msvcrt/msvcrt.spec | 168 +++++++++++++++++++++++----------------------- dlls/msvcrt/process.c | 16 ++-- dlls/msvcrt/string.c | 10 ++-- dlls/msvcrt/time.c | 16 ++-- dlls/msvcrt/wcs.c | 20 +++--- 15 files changed, 245 insertions(+), 245 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9de4eef75ecfc074f726…

1 0

Andrew Nguyen : ws2_32/tests: Fix some test thread procedure prototypes.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: a282c150fa14242b04482808e0a3344c00d6b082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a282c150fa14242b04482808e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jun 3 07:37:03 2011 -0500 ws2_32/tests: Fix some test thread procedure prototypes. --- dlls/ws2_32/tests/sock.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7853a8c..28d5db3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1550,7 +1550,7 @@ static void test_UDP(void) } } -static void WINAPI do_getservbyname( HANDLE *starttest ) +static DWORD WINAPI do_getservbyname( void *param ) { struct { const char *name; @@ -1558,6 +1558,7 @@ static void WINAPI do_getservbyname( HANDLE *starttest ) int port; } serv[2] = { {"domain", "udp", 53}, {"telnet", "tcp", 23} }; + HANDLE *starttest = param; int i, j; struct servent *pserv[2]; @@ -1579,6 +1580,8 @@ static void WINAPI do_getservbyname( HANDLE *starttest ) ok ( pserv[0] == pserv[1], "getservbyname: winsock resized servent buffer when not necessary\n" ); } + + return 0; } static void test_getservbyname(void) @@ -1591,7 +1594,7 @@ static void test_getservbyname(void) /* create threads */ for ( i = 0; i < NUM_THREADS; i++ ) { - thread[i] = CreateThread ( NULL, 0, (LPTHREAD_START_ROUTINE) &do_getservbyname, &starttest, 0, &thread_id[i] ); + thread[i] = CreateThread ( NULL, 0, do_getservbyname, &starttest, 0, &thread_id[i] ); } /* signal threads to start */ @@ -2235,8 +2238,9 @@ static void test_WSAStringToAddressW(void) } -static VOID WINAPI SelectReadThread(select_thread_params *par) +static DWORD WINAPI SelectReadThread(void *param) { + select_thread_params *par = param; fd_set readfds; int ret; struct sockaddr_in addr; @@ -2256,6 +2260,8 @@ static VOID WINAPI SelectReadThread(select_thread_params *par) SetEvent(server_ready); ret = select(par->s+1, &readfds, NULL, NULL, &select_timeout); par->ReadKilled = (ret == 1); + + return 0; } static void test_errors(void) @@ -2344,7 +2350,7 @@ static void test_select(void) thread_params.s = fdRead; thread_params.ReadKilled = FALSE; server_ready = CreateEventA(NULL, TRUE, FALSE, NULL); - thread_handle = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) &SelectReadThread, &thread_params, 0, &id ); + thread_handle = CreateThread (NULL, 0, SelectReadThread, &thread_params, 0, &id ); ok ( (thread_handle != NULL), "CreateThread failed unexpectedly: %d\n", GetLastError()); WaitForSingleObject (server_ready, INFINITE); @@ -2396,8 +2402,9 @@ static void test_select(void) ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); } -static DWORD WINAPI AcceptKillThread(select_thread_params *par) +static DWORD WINAPI AcceptKillThread(void *param) { + select_thread_params *par = param; struct sockaddr_in address; int len = sizeof(address); SOCKET client_socket; @@ -2482,8 +2489,7 @@ static void test_accept(void) thread_params.s = server_socket; thread_params.ReadKilled = FALSE; - thread_handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) AcceptKillThread, - &thread_params, 0, &id); + thread_handle = CreateThread(NULL, 0, AcceptKillThread, &thread_params, 0, &id); if (thread_handle == NULL) { trace("error creating thread: %d\n", GetLastError());

1 0

Louis Lenders : crypt32: Add stub for PFXVerifyPassword.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: e11e1841f3c58e87d5c77d246c2a86b0e946fd70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11e1841f3c58e87d5c77d246… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Jun 3 13:50:38 2011 +0200 crypt32: Add stub for PFXVerifyPassword. --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/decode.c | 7 +++++++ include/wincrypt.h | 2 ++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 45ec666..66d831b 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -225,6 +225,7 @@ @ stdcall PFXExportCertStoreEx(ptr ptr ptr ptr long) @ stdcall PFXImportCertStore(ptr ptr long) @ stdcall PFXIsPFXBlob(ptr) +@ stdcall PFXVerifyPassword(ptr wstr long) @ stub RegCreateHKCUKeyExU @ stub RegCreateKeyExU @ stub RegDeleteValueU diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index cd9a2a1..649ca55 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -6112,3 +6112,10 @@ HCERTSTORE WINAPI PFXImportCertStore(CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, FIXME_(crypt)("(%p, %p, %08x): stub\n", pPFX, szPassword, dwFlags); return NULL; } + +BOOL WINAPI PFXVerifyPassword(CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, + DWORD dwFlags) +{ + FIXME_(crypt)("(%p, %p, %08x): stub\n", pPFX, szPassword, dwFlags); + return FALSE; +} diff --git a/include/wincrypt.h b/include/wincrypt.h index 7a2e5b3..2f41360 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4496,6 +4496,8 @@ BOOL WINAPI PFXExportCertStoreEx(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, void *pvReserved, DWORD dwFlags); BOOL WINAPI PFXExportCertStore(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, DWORD dwFlags); +BOOL WINAPI PFXVerifyPassword(CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, + DWORD dwFlags); /* cryptnet.dll functions */ BOOL WINAPI CryptCancelAsyncRetrieval(HCRYPTASYNC hAsyncRetrieval);

1 0