July 2009 - Wine-commits - list.winehq.org

Juan Lang : winhttp: Set a socket's timeouts when it's created.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 80100334f1e3c8f31430af93e0935926ff7f3507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80100334f1e3c8f31430af93e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 21 13:52:47 2009 -0700 winhttp: Set a socket's timeouts when it's created. --- dlls/winhttp/request.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5704417..344bb14 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -920,6 +920,8 @@ static BOOL open_connection( request_t *request ) heap_free( addressW ); return FALSE; } + netconn_set_timeout( &request->netconn, TRUE, request->send_timeout ); + netconn_set_timeout( &request->netconn, FALSE, request->recv_timeout ); if (!netconn_connect( &request->netconn, (struct sockaddr *)&connect->sockaddr, slen )) { netconn_close( &request->netconn );

1 0

Juan Lang : winhttp: Store send and receive timeouts in request_t, and only set them in a netconn_t if it's connected.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 64d69b55f95303a10c439062b634eaf5583aa1ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d69b55f95303a10c439062b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 21 13:52:22 2009 -0700 winhttp: Store send and receive timeouts in request_t, and only set them in a netconn_t if it's connected. --- dlls/winhttp/session.c | 15 +++++++++++++-- dlls/winhttp/winhttp_private.h | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 683a6fb..81113e4 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -33,6 +33,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); +#define DEFAULT_SEND_TIMEOUT 30000 +#define DEFAULT_RECEIVE_TIMEOUT 30000 + void set_last_error( DWORD error ) { /* FIXME */ @@ -633,6 +636,8 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o list_add_head( &connect->hdr.children, &request->hdr.entry ); if (!netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE )) goto end; + request->send_timeout = DEFAULT_SEND_TIMEOUT; + request->recv_timeout = DEFAULT_RECEIVE_TIMEOUT; if (!verb || !verb[0]) verb = getW; if (!(request->verb = strdupW( verb ))) goto end; @@ -1178,10 +1183,16 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int } if (send < 0) send = 0; - if (netconn_set_timeout( &request->netconn, TRUE, send )) ret = FALSE; + request->send_timeout = send; if (receive < 0) receive = 0; - if (netconn_set_timeout( &request->netconn, FALSE, receive )) ret = FALSE; + request->recv_timeout = receive; + + if (netconn_connected( &request->netconn )) + { + if (netconn_set_timeout( &request->netconn, TRUE, send )) ret = FALSE; + if (netconn_set_timeout( &request->netconn, FALSE, receive )) ret = FALSE; + } release_object( &request->hdr ); return ret; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 2431d7c..97c8f90 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -139,6 +139,8 @@ typedef struct LPWSTR version; LPWSTR raw_headers; netconn_t netconn; + int send_timeout; + int recv_timeout; LPWSTR status_text; DWORD content_length; /* total number of bytes to be read (per chunk) */ DWORD content_read; /* bytes read so far */

1 0

Dmitry Timoshkov : user32: Pass the same PRF_ flags from WM_PRINT to WM_PRINTCLIENT.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 19e4cfd003373ecf2bee39002835a705f7dc31ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e4cfd003373ecf2bee39002… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jul 22 15:22:35 2009 +0900 user32: Pass the same PRF_ flags from WM_PRINT to WM_PRINTCLIENT. --- dlls/user32/defwnd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index bf30c97..19d6ab2 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -216,7 +216,7 @@ static void DEFWND_Print( HWND hwnd, HDC hdc, ULONG uFlags) * Client area */ if ( uFlags & PRF_CLIENT) - SendMessageW(hwnd, WM_PRINTCLIENT, (WPARAM)hdc, PRF_CLIENT); + SendMessageW(hwnd, WM_PRINTCLIENT, (WPARAM)hdc, uFlags); }

1 0

Francois Gouget : notepad: Remove spaces before '\n'.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 108a930e670dfd8f5760f59d355fa7f35ae9d27d URL: http://source.winehq.org/git/wine.git/?a=commit;h=108a930e670dfd8f5760f59d3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 22 08:53:14 2009 +0200 notepad: Remove spaces before '\n'. --- programs/notepad/Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc index 56167de..94f1d10 100644 --- a/programs/notepad/Ko.rc +++ b/programs/notepad/Ko.rc @@ -127,9 +127,9 @@ STRING_UNICODE_LE, " STRING_UNICODE_BE, "��ڵ� (UTF-16 ��-��)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ -��ڵ� ��ڸ� ��ϰ� �ִ� �� %s ��ڵ�� \n\ +��ڵ� ��ڸ� ��ϰ� �ִ� �� %s ��ڵ��\n\ �� ϸ� �� ս�� Դϴ�.\n\ -�� ڸ� ��Ϸ�� Ҹ� Ŭ��ϰ�, ��ڵ� ��Ӵٿ�� ڵ� \n\ +�� ڸ� ��Ϸ�� Ҹ� Ŭ��ϰ�, ��ڵ� ��Ӵٿ�� ڵ�\n\ �ɼ� �� ϳ�� Ͻʽÿ�t.\n\ ��Ͻðڽ��ϱ�?" }

1 0

Francois Gouget : appwiz.cpl: Make sure we have a space before the ellipses in Slovenian resources.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 548b06aae971428a973a1ef8961420ee9aa0f068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=548b06aae971428a973a1ef89… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 22 08:53:07 2009 +0200 appwiz.cpl: Make sure we have a space before the ellipses in Slovenian resources. --- dlls/appwiz.cpl/Si.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/Si.rc b/dlls/appwiz.cpl/Si.rc index d936cf9..dc37ae0 100644 --- a/dlls/appwiz.cpl/Si.rc +++ b/dlls/appwiz.cpl/Si.rc @@ -40,7 +40,7 @@ STRINGTABLE IDS_INSTALL_FILTER, "Instalacijski programi\0*instal*.exe;*setup*.exe;*.msi\0Programi (*.exe)\0*.exe\0Vse datoteke (*.*)\0*.*\0\0" IDS_REMOVE, "&Odstrani ..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_MODIFY_REMOVE, "&Modify/Remove ..." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -55,7 +55,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Naslednji programi omogočajo samodejno odstranitev. Za odstranitev programa oz. spremembo nameščenih komponent izberite program s seznama in kliknite 'Dodaj/Odstrani'.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Informacije ...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 - CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Modify ...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 CONTROL "&Odstrani ...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 }

1 0

Francois Gouget : taskmgr: Remove space before ellipsis.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 045dc433debf4ca9980a250b5d98f327c76227a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=045dc433debf4ca9980a250b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 22 08:52:49 2009 +0200 taskmgr: Remove space before ellipsis. --- programs/taskmgr/No.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/No.rc b/programs/taskmgr/No.rc index cc61a18..598b567 100644 --- a/programs/taskmgr/No.rc +++ b/programs/taskmgr/No.rc @@ -497,7 +497,7 @@ BEGIN IDS_VIEW_SMALL "S&må ikoner" IDS_VIEW_DETAILS "&Detaljer" IDS_WINDOWS "&Vinduer" - IDS_VIEW_SELECTCOLUMNS "Velg &kolonner ..." + IDS_VIEW_SELECTCOLUMNS "Velg &kolonner..." IDS_OPTIONS_SHOW16BITTASKS "Vi&s 16 bit-jobber" IDS_VIEW_CPUHISTORY "&Prosessorhistorikk" IDS_VIEW_CPUHISTORY_ONEGRAPHALL "Én graf, alle pr&osessorer"

1 0

Francois Gouget : shell32: Add a trailing '\n' to a WARN().
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: fb0e107b1863f963e7074786e9a3363a5ac638cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb0e107b1863f963e7074786e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 22 08:52:07 2009 +0200 shell32: Add a trailing '\n' to a WARN(). --- dlls/shell32/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index e7c7d95..9b566b6 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -97,7 +97,7 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) sizeof(*applet) + (applet->count - 1) * sizeof(NEWCPLINFOW)); if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmd)+1) * sizeof(WCHAR)))) { - WARN("Cannot allocate memory for applet path"); + WARN("Cannot allocate memory for applet path\n"); goto theError; }

1 0

Nikolay Sivov : comctl32/listview: LVM_SETITEMSTATE - select all item case tests.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: af0f00b671864059cdaa890b5eaa40b8b70ebac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0f00b671864059cdaa890b5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 21 22:06:18 2009 +0400 comctl32/listview: LVM_SETITEMSTATE - select all item case tests. --- dlls/comctl32/tests/listview.c | 56 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index b886d86..6454187 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -205,6 +205,29 @@ static const struct message ownderdata_select_focus_parent_seq[] = { { 0 } }; +static const struct message ownerdata_select_all_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message select_all_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + static const struct message textcallback_set_again_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, @@ -1916,6 +1939,20 @@ static void test_multiselect(void) } item_count = (int)SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); expect(items,item_count); + + /* select all, check notifications */ + ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + + ok_sequence(sequences, PARENT_SEQ_INDEX, select_all_parent_seq, + "select all notification", FALSE); + /* deselect all items */ ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED); SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); @@ -2385,7 +2422,7 @@ static void test_ownerdata(void) /* check notifications after focused/selected changed */ hwnd = create_listview_control(LVS_OWNERDATA); ok(hwnd != NULL, "failed to create a listview window\n"); - res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 20, 0); ok(res != 0, "Expected LVM_SETITEMCOUNT to succeed\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -2409,6 +2446,23 @@ static void test_ownerdata(void) ok_sequence(sequences, PARENT_SEQ_INDEX, ownderdata_select_focus_parent_seq, "ownerdata focus notification", TRUE); + + /* select all, check notifications */ + item.stateMask = LVIS_SELECTED; + item.state = 0; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_select_all_parent_seq, + "ownerdata select all notification", TRUE); + DestroyWindow(hwnd); /* check notifications on LVM_GETITEM */

1 0

Mike Kaplinskiy : ws2_32/tests: Fix the last failures on NT4.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 7b683a9008697c948d58e88cc70d94a5b857ab39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b683a9008697c948d58e88cc… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Tue Jul 21 22:25:45 2009 -0400 ws2_32/tests: Fix the last failures on NT4. --- dlls/ws2_32/tests/sock.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 21502c2..b1b85fe 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2777,7 +2777,19 @@ static void test_AcceptEx(void) bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on already pending socket returned %d + errno %d\n", bret, WSAGetLastError()); + ok((bret == FALSE && WSAGetLastError() == WSAEINVAL) || broken(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING) /* NT4 */, + "AcceptEx on already pending socket returned %d + errno %d\n", bret, WSAGetLastError()); + if (bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING) { + /* We need to cancel this call, otherwise things fail */ + bret = CancelIo((HANDLE) listener); + ok(bret, "Failed to cancel failed test. Bailing...\n"); + if (!bret) return; + + bret = pAcceptEx(listener, acceptor, buffer, 0, + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + } iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError());

1 0

Owen Rudge : winhlp32: Ensure win-> page is not NULL when selecting Help on Help.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: b4f2c5528311782446be534db3ec04aeb86fa414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4f2c5528311782446be534db… Author: Owen Rudge <owen(a)owenrudge.net> Date: Wed Jul 22 00:48:28 2009 -0300 winhlp32: Ensure win->page is not NULL when selecting Help on Help. --- programs/winhlp32/macro.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index c2fc3cc..fdec6b3 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -446,10 +446,13 @@ static void CALLBACK MACRO_GotoMark(LPCSTR str) void CALLBACK MACRO_HelpOn(void) { - LPCSTR file; + WINHELP_WINDOW *win = MACRO_CurrentWindow(); + LPCSTR file = NULL; WINE_TRACE("()\n"); - file = MACRO_CurrentWindow()->page->file->help_on_file; + if (win && win->page && win->page->file) + file = win->page->file->help_on_file; + if (!file) file = (Globals.wVersion > 4) ? "winhlp32.hlp" : "winhelp.hlp";

1 0