January 2013 - Wine-Commits

Piotr Caban : msvcrt: Use temporary buffers to speed up operations on stdout and stderr.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: a8df9b14ada72409625dead81936c7b2c0fcec64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8df9b14ada72409625dead81… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 29 13:21:27 2013 +0100 msvcrt: Use temporary buffers to speed up operations on stdout and stderr. --- dlls/msvcrt/file.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8e2a067..fc4154c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -595,6 +595,29 @@ static BOOL msvcrt_alloc_buffer(MSVCRT_FILE* file) return TRUE; } +/* INTERNAL: Allocate temporary buffer for stdout and stderr */ +static BOOL add_std_buffer(MSVCRT_FILE *file) +{ + static char buffers[2][MSVCRT_BUFSIZ]; + + if((file->_file!=MSVCRT_STDOUT_FILENO && file->_file!=MSVCRT_STDERR_FILENO) + || !MSVCRT__isatty(file->_file) || file->_bufsiz) + return FALSE; + + file->_ptr = file->_base = buffers[file->_file == MSVCRT_STDOUT_FILENO ? 0 : 1]; + file->_bufsiz = file->_cnt = MSVCRT_BUFSIZ; + return TRUE; +} + +/* INTERNAL: Removes temporary buffer from stdout or stderr */ +/* Only call this function when add_std_buffer returned TRUE */ +static void remove_std_buffer(MSVCRT_FILE *file) +{ + msvcrt_flush_buffer(file); + file->_ptr = file->_base = NULL; + file->_bufsiz = file->_cnt = 0; +} + /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ static int msvcrt_int_to_base32(int num, char *str) { @@ -3911,6 +3934,7 @@ int CDECL MSVCRT_fputs(const char *s, MSVCRT_FILE* file) int CDECL MSVCRT_fputws(const MSVCRT_wchar_t *s, MSVCRT_FILE* file) { MSVCRT_size_t i, len = strlenW(s); + BOOL tmp_buf; int ret; MSVCRT__lock_file(file); @@ -3919,13 +3943,17 @@ int CDECL MSVCRT_fputws(const MSVCRT_wchar_t *s, MSVCRT_FILE* file) MSVCRT__unlock_file(file); return ret; } + + tmp_buf = add_std_buffer(file); for (i=0; i<len; i++) { if(MSVCRT_fputwc(s[i], file) == MSVCRT_WEOF) { + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return MSVCRT_WEOF; } } + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return 0; } @@ -4271,10 +4299,13 @@ static int puts_clbk_file_w(void *file, int len, const MSVCRT_wchar_t *str) */ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list valist) { + BOOL tmp_buf; int ret; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_a(puts_clbk_file_a, file, format, NULL, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret; @@ -4285,12 +4316,15 @@ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list va */ int CDECL MSVCRT_vfprintf_s(MSVCRT_FILE* file, const char *format, __ms_va_list valist) { + BOOL tmp_buf; int ret; if(!MSVCRT_CHECK_PMT(file != NULL)) return -1; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_a(puts_clbk_file_a, file, format, NULL, FALSE, TRUE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret; @@ -4301,10 +4335,13 @@ int CDECL MSVCRT_vfprintf_s(MSVCRT_FILE* file, const char *format, __ms_va_list */ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) { + BOOL tmp_buf; int ret; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_w(puts_clbk_file_w, file, format, NULL, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret; @@ -4315,12 +4352,15 @@ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms */ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) { + BOOL tmp_buf; int ret; if (!MSVCRT_CHECK_PMT( file != NULL )) return -1; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_w(puts_clbk_file_w, file, format, NULL, FALSE, TRUE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret; @@ -4332,12 +4372,15 @@ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ int CDECL MSVCRT__vfwprintf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) { + BOOL tmp_buf; int ret; if (!MSVCRT_CHECK_PMT( file != NULL )) return -1; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_w(puts_clbk_file_w, file, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret;

1 0

Jacek Caban : wininet: Get rid of WORKREQ* types.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: f824e20010a4bc23bd54a6489e1e64c6e5019a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f824e20010a4bc23bd54a6489… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 30 11:39:34 2013 +0100 wininet: Get rid of WORKREQ* types. --- dlls/wininet/ftp.c | 4 ++-- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.c | 6 +++--- dlls/wininet/internet.h | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 152e336..f0a6257 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1248,9 +1248,9 @@ static void FTP_ReceiveRequestData(ftp_file_t *file, BOOL first_notif) sizeof(INTERNET_ASYNC_RESULT)); } -static void FTPFILE_AsyncQueryDataAvailableProc(WORKREQUEST *workRequest) +static void FTPFILE_AsyncQueryDataAvailableProc(task_header_t *task) { - ftp_file_t *file = (ftp_file_t*)workRequest->hdr; + ftp_file_t *file = (ftp_file_t*)task->hdr; FTP_ReceiveRequestData(file, FALSE); } diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8d8ffec..d4c822d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2993,9 +2993,9 @@ static DWORD HTTPREQ_WriteFile(object_header_t *hdr, const void *buffer, DWORD s return res; } -static void AsyncQueryDataAvailableProc(WORKREQUEST *workRequest) +static void AsyncQueryDataAvailableProc(task_header_t *task) { - http_request_t *req = (http_request_t*)workRequest->hdr; + http_request_t *req = (http_request_t*)task->hdr; HTTP_ReceiveRequestData(req, FALSE); } diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index dff24d9..384516c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3715,16 +3715,16 @@ void *alloc_async_task(object_header_t *hdr, async_task_proc_t proc, size_t size * RETURNS * */ -DWORD INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) +DWORD INTERNET_AsyncCall(task_header_t *task) { BOOL bSuccess; TRACE("\n"); - bSuccess = QueueUserWorkItem(INTERNET_WorkerThreadFunc, lpWorkRequest, WT_EXECUTELONGFUNCTION); + bSuccess = QueueUserWorkItem(INTERNET_WorkerThreadFunc, task, WT_EXECUTELONGFUNCTION); if (!bSuccess) { - heap_free(lpWorkRequest); + heap_free(task); return ERROR_INTERNET_ASYNC_THREAD_FAILED; } return ERROR_SUCCESS; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index bcb7fe6..6d08db1 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -354,14 +354,14 @@ typedef struct netconn_stream_t netconn_stream; } http_request_t; -typedef struct WORKREQ task_header_t; +typedef struct task_header_t task_header_t; typedef void (*async_task_proc_t)(task_header_t*); -typedef struct WORKREQ +struct task_header_t { async_task_proc_t proc; object_header_t *hdr; -} WORKREQUEST, *LPWORKREQUEST; +}; void *alloc_async_task(object_header_t*,async_task_proc_t,size_t) DECLSPEC_HIDDEN; @@ -393,7 +393,7 @@ BOOL set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*) DECLSPEC_HI void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN; DWORD INTERNET_GetLastError(void) DECLSPEC_HIDDEN; -DWORD INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) DECLSPEC_HIDDEN; +DWORD INTERNET_AsyncCall(task_header_t*) DECLSPEC_HIDDEN; LPSTR INTERNET_GetResponseBuffer(void) DECLSPEC_HIDDEN; LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) DECLSPEC_HIDDEN;

1 0

Jacek Caban : wininet: Moved WORKREQ_FTPFINDNEXTW out of WORKREQUEST.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: a489677fb55b7831a17dee27b77da4df8777d2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=a489677fb55b7831a17dee27b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 30 12:56:44 2013 +0100 wininet: Moved WORKREQ_FTPFINDNEXTW out of WORKREQUEST. --- dlls/wininet/ftp.c | 22 ++++++++++++---------- dlls/wininet/internet.h | 6 ------ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index d7c439b..f3764ed 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2138,7 +2138,7 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFtpSession, LPCWSTR lpszSrc, LPCWSTR lpszD hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - rename_file_t *task; + rename_file_task_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpRenameFileProc, sizeof(*task)); task->src_file = heap_strdupW(lpszSrc); @@ -3430,11 +3430,16 @@ static DWORD FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data return res; } -static void FTPFINDNEXT_AsyncFindNextFileProc(WORKREQUEST *workRequest) +typedef struct { + task_header_t hdr; + WIN32_FIND_DATAW *find_data; +} find_next_task_t; + +static void FTPFINDNEXT_AsyncFindNextFileProc(task_header_t *hdr) { - struct WORKREQ_FTPFINDNEXTW *req = &workRequest->u.FtpFindNextW; + find_next_task_t *task = (find_next_task_t*)hdr; - FTPFINDNEXT_FindNextFileProc((WININETFTPFINDNEXTW*)workRequest->hdr, req->lpFindFileData); + FTPFINDNEXT_FindNextFileProc((WININETFTPFINDNEXTW*)task->hdr.hdr, task->find_data); } static DWORD FTPFINDNEXT_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) @@ -3460,15 +3465,12 @@ static DWORD FTPFINDNEXT_FindNextFileW(object_header_t *hdr, void *data) if (find->lpFtpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_FTPFINDNEXTW *req; + find_next_task_t *task; task = alloc_async_task(&find->hdr, FTPFINDNEXT_AsyncFindNextFileProc, sizeof(*task)); - req = &task->u.FtpFindNextW; - req->lpFindFileData = data; - - INTERNET_AsyncCall(task); + task->find_data = data; + INTERNET_AsyncCall(&task->hdr); return ERROR_SUCCESS; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 26dc286..82a15ae 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -360,11 +360,6 @@ struct WORKREQ_FTPDELETEFILEW LPWSTR lpszFilename; }; -struct WORKREQ_FTPFINDNEXTW -{ - LPWIN32_FIND_DATAW lpFindFileData; -}; - typedef struct WORKREQ task_header_t; typedef void (*async_task_proc_t)(task_header_t*); @@ -375,7 +370,6 @@ typedef struct WORKREQ union { struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW; - struct WORKREQ_FTPFINDNEXTW FtpFindNextW; } u; } WORKREQUEST, *LPWORKREQUEST;

1 0

Jacek Caban : wininet: Moved WORKREQ_FTPGETCURRENTDIRECTORYW out of WORKREQUEST.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: 059c77956f0de0f15b7305221fa3e4c81f01af98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=059c77956f0de0f15b7305221… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 30 11:38:22 2013 +0100 wininet: Moved WORKREQ_FTPGETCURRENTDIRECTORYW out of WORKREQUEST. --- dlls/wininet/ftp.c | 25 ++++++++++++++----------- dlls/wininet/internet.h | 7 ------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 6694edb..0adce0a 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -936,15 +936,20 @@ BOOL WINAPI FtpGetCurrentDirectoryA(HINTERNET hFtpSession, LPSTR lpszCurrentDire return ret; } +typedef struct { + task_header_t hdr; + WCHAR *directory; + DWORD *directory_len; +} get_current_dir_task_t; -static void AsyncFtpGetCurrentDirectoryProc(WORKREQUEST *workRequest) +static void AsyncFtpGetCurrentDirectoryProc(task_header_t *hdr) { - struct WORKREQ_FTPGETCURRENTDIRECTORYW const *req = &workRequest->u.FtpGetCurrentDirectoryW; - ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr; + get_current_dir_task_t *task = (get_current_dir_task_t*)hdr; + ftp_session_t *session = (ftp_session_t*)task->hdr.hdr; - TRACE("%p\n", lpwfs); + TRACE("%p\n", session); - FTP_FtpGetCurrentDirectoryW(lpwfs, req->lpszDirectory, req->lpdwDirectory); + FTP_FtpGetCurrentDirectoryW(session, task->directory, task->directory_len); } /*********************************************************************** @@ -1000,15 +1005,13 @@ BOOL WINAPI FtpGetCurrentDirectoryW(HINTERNET hFtpSession, LPWSTR lpszCurrentDir hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_FTPGETCURRENTDIRECTORYW *req; + get_current_dir_task_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpGetCurrentDirectoryProc, sizeof(*task)); - req = &task->u.FtpGetCurrentDirectoryW; - req->lpszDirectory = lpszCurrentDirectory; - req->lpdwDirectory = lpdwCurrentDirectory; + task->directory = lpszCurrentDirectory; + task->directory_len = lpdwCurrentDirectory; - r = res_to_le(INTERNET_AsyncCall(task)); + r = res_to_le(INTERNET_AsyncCall(&task->hdr)); } else { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 628f0c0..4dd0abe 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -363,12 +363,6 @@ struct WORKREQ_FTPFINDFIRSTFILEW DWORD_PTR dwContext; }; -struct WORKREQ_FTPGETCURRENTDIRECTORYW -{ - LPWSTR lpszDirectory; - DWORD *lpdwDirectory; -}; - struct WORKREQ_FTPOPENFILEW { LPWSTR lpszFilename; @@ -403,7 +397,6 @@ typedef struct WORKREQ union { struct WORKREQ_FTPFINDFIRSTFILEW FtpFindFirstFileW; - struct WORKREQ_FTPGETCURRENTDIRECTORYW FtpGetCurrentDirectoryW; struct WORKREQ_FTPOPENFILEW FtpOpenFileW; struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW; struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW;

1 0

Nikolay Sivov : comctl32/listview: Fix item search with keyboard input.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: 8f87fc5b39c83d59da5f5a2f1b482304f401719b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f87fc5b39c83d59da5f5a2f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 30 12:14:53 2013 +0400 comctl32/listview: Fix item search with keyboard input. --- dlls/comctl32/listview.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c16a619..8031d37 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1838,9 +1838,9 @@ static inline INT LISTVIEW_GetCountPerColumn(const LISTVIEW_INFO *infoPtr) static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, LPARAM keyData) { WCHAR buffer[MAX_PATH]; - INT endidx, startidx; DWORD prevTime; LVITEMW item; + int startidx; INT nItem; INT diff; @@ -1880,15 +1880,16 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L infoPtr->nSearchParamLength = 1; } - /* and search from the current position */ - nItem = -1; - endidx = infoPtr->nItemCount; - /* should start from next after focused item, so next item that matches will be selected, if there isn't any and focused matches it will be selected on second search stage from beginning of the list */ if (infoPtr->nFocusedItem >= 0 && infoPtr->nItemCount > 1) - startidx = infoPtr->nFocusedItem + 1; + { + /* with some accumulated search data available start with current focus, otherwise + it's excluded from search */ + startidx = infoPtr->nSearchParamLength > 1 ? infoPtr->nFocusedItem : infoPtr->nFocusedItem + 1; + if (startidx == infoPtr->nItemCount) startidx = 0; + } else startidx = 0; @@ -1908,7 +1909,11 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L } else { - INT i = startidx; + int i = startidx, endidx; + + /* and search from the current position */ + nItem = -1; + endidx = infoPtr->nItemCount; /* first search in [startidx, endidx), on failure continue in [0, startidx) */ while (1) @@ -1930,12 +1935,15 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L item.cchTextMax = MAX_PATH; if (!LISTVIEW_GetItemW(infoPtr, &item)) return 0; - if (lstrncmpiW(item.pszText, infoPtr->szSearchParam, infoPtr->nSearchParamLength) == 0) + if (!lstrncmpiW(item.pszText, infoPtr->szSearchParam, infoPtr->nSearchParamLength)) { nItem = i; break; } - else if (nItem == -1 && lstrncmpiW(item.pszText, infoPtr->szSearchParam, 1) == 0) + /* this is used to find first char match when search string is not available yet, + otherwise every WM_CHAR will search to next item by first char, ignoring that we're + already waiting for user to complete a string */ + else if (nItem == -1 && infoPtr->nSearchParamLength == 1 && !lstrncmpiW(item.pszText, infoPtr->szSearchParam, 1)) { /* this would work but we must keep looking for a longer match */ nItem = i;

1 0

Nikolay Sivov : comctl32: Test WM_GETDLGCODE return value for TreeView.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: 8418ae533440bba49a537cca79b3c92cbf76b96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8418ae533440bba49a537cca7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 29 11:23:53 2013 +0400 comctl32: Test WM_GETDLGCODE return value for TreeView. --- dlls/comctl32/tests/treeview.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 4a7c60c..3c437de 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1950,6 +1950,19 @@ static void test_TVM_HITTEST(void) DestroyWindow(hTree); } +static void test_WM_GETDLGCODE(void) +{ + DWORD code; + HWND hTree; + + hTree = create_treeview_control(0); + + code = SendMessageA(hTree, WM_GETDLGCODE, VK_TAB, 0); + ok(code == (DLGC_WANTCHARS | DLGC_WANTARROWS), "0x%08x\n", code); + + DestroyWindow(hTree); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -2023,6 +2036,7 @@ START_TEST(treeview) test_TVS_CHECKBOXES(); test_TVM_GETNEXTITEM(); test_TVM_HITTEST(); + test_WM_GETDLGCODE(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -2048,6 +2062,7 @@ START_TEST(treeview) /* comctl32 version 6 tests start here */ test_expandedimage(); test_htreeitem_layout(); + test_WM_GETDLGCODE(); unload_v6_module(ctx_cookie, hCtx);

1 0

Piotr Caban : msvcrt: Don' t make stdout and stderr bufferred when writing to console.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: 2ee5323a91025b914c6c3c5b0c6ec87cfeb6448b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee5323a91025b914c6c3c5b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 29 13:21:08 2013 +0100 msvcrt: Don't make stdout and stderr bufferred when writing to console. --- dlls/msvcrt/file.c | 67 ++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 33 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d9b0e19..8e2a067 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -560,20 +560,39 @@ static int msvcrt_flush_buffer(MSVCRT_FILE* file) return 0; } +/********************************************************************* + * _isatty (MSVCRT.@) + */ +int CDECL MSVCRT__isatty(int fd) +{ + HANDLE hand = msvcrt_fdtoh(fd); + + TRACE(":fd (%d) handle (%p)\n",fd,hand); + if (hand == INVALID_HANDLE_VALUE) + return 0; + + return GetFileType(hand) == FILE_TYPE_CHAR? 1 : 0; +} + /* INTERNAL: Allocate stdio file buffer */ -static void msvcrt_alloc_buffer(MSVCRT_FILE* file) +static BOOL msvcrt_alloc_buffer(MSVCRT_FILE* file) { - file->_base = MSVCRT_calloc(MSVCRT_BUFSIZ,1); - if(file->_base) { - file->_bufsiz = MSVCRT_BUFSIZ; - file->_flag |= MSVCRT__IOMYBUF; - } else { - file->_base = (char*)(&file->_charbuf); - /* put here 2 ??? */ - file->_bufsiz = sizeof(file->_charbuf); - } - file->_ptr = file->_base; - file->_cnt = 0; + if((file->_file==MSVCRT_STDOUT_FILENO || file->_file==MSVCRT_STDERR_FILENO) + && MSVCRT__isatty(file->_file)) + return FALSE; + + file->_base = MSVCRT_calloc(MSVCRT_BUFSIZ,1); + if(file->_base) { + file->_bufsiz = MSVCRT_BUFSIZ; + file->_flag |= MSVCRT__IOMYBUF; + } else { + file->_base = (char*)(&file->_charbuf); + /* put here 2 ??? */ + file->_bufsiz = sizeof(file->_charbuf); + } + file->_ptr = file->_base; + file->_cnt = 0; + return TRUE; } /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ @@ -1619,20 +1638,6 @@ MSVCRT_intptr_t CDECL MSVCRT__get_osfhandle(int fd) } /********************************************************************* - * _isatty (MSVCRT.@) - */ -int CDECL MSVCRT__isatty(int fd) -{ - HANDLE hand = msvcrt_fdtoh(fd); - - TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand == INVALID_HANDLE_VALUE) - return 0; - - return GetFileType(hand) == FILE_TYPE_CHAR? 1 : 0; -} - -/********************************************************************* * _mktemp (MSVCRT.@) */ char * CDECL MSVCRT__mktemp(char *pattern) @@ -3661,10 +3666,8 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm /* Fill the buffer on small reads. * TODO: Use a better buffering strategy. */ - if (!file->_cnt && size*nmemb <= MSVCRT_BUFSIZ/2 && !(file->_flag & MSVCRT__IONBF)) { - if (file->_bufsiz == 0) { - msvcrt_alloc_buffer(file); - } + if (!file->_cnt && size*nmemb <= MSVCRT_BUFSIZ/2 && !(file->_flag & MSVCRT__IONBF) + && (file->_bufsiz != 0 || msvcrt_alloc_buffer(file))) { file->_cnt = MSVCRT__read(file->_file, file->_base, file->_bufsiz); file->_ptr = file->_base; i = (file->_cnt<rcnt) ? file->_cnt : rcnt; @@ -4472,10 +4475,8 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) return MSVCRT_EOF; MSVCRT__lock_file(file); - if(file->_bufsiz == 0) { - msvcrt_alloc_buffer(file); + if(file->_bufsiz == 0 && msvcrt_alloc_buffer(file)) file->_ptr++; - } if(file->_ptr>file->_base) { file->_ptr--; *file->_ptr=c;

1 0

Jacek Caban : wininet: Moved WORKREQ_FTPRENAMEFILEW out of WORKREQUEST.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: d5c0b17ae7d952440d9c7cec3e4b4320e75c9fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c0b17ae7d952440d9c7cec3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 30 11:38:59 2013 +0100 wininet: Moved WORKREQ_FTPRENAMEFILEW out of WORKREQUEST. --- dlls/wininet/ftp.c | 30 +++++++++++++++++------------- dlls/wininet/internet.h | 7 ------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index ba7d5c3..d7c439b 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2076,16 +2076,22 @@ BOOL WINAPI FtpRenameFileA(HINTERNET hFtpSession, LPCSTR lpszSrc, LPCSTR lpszDes return ret; } -static void AsyncFtpRenameFileProc(WORKREQUEST *workRequest) +typedef struct { + task_header_t hdr; + WCHAR *src_file; + WCHAR *dst_file; +} rename_file_task_t; + +static void AsyncFtpRenameFileProc(task_header_t *hdr) { - struct WORKREQ_FTPRENAMEFILEW const *req = &workRequest->u.FtpRenameFileW; - ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr; + rename_file_task_t *task = (rename_file_task_t*)hdr; + ftp_session_t *session = (ftp_session_t*)task->hdr.hdr; - TRACE("%p\n", lpwfs); + TRACE("%p\n", session); - FTP_FtpRenameFileW(lpwfs, req->lpszSrcFile, req->lpszDestFile); - heap_free(req->lpszSrcFile); - heap_free(req->lpszDestFile); + FTP_FtpRenameFileW(session, task->src_file, task->dst_file); + heap_free(task->src_file); + heap_free(task->dst_file); } /*********************************************************************** @@ -2132,15 +2138,13 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFtpSession, LPCWSTR lpszSrc, LPCWSTR lpszD hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_FTPRENAMEFILEW *req; + rename_file_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpRenameFileProc, sizeof(*task)); - req = &task->u.FtpRenameFileW; - req->lpszSrcFile = heap_strdupW(lpszSrc); - req->lpszDestFile = heap_strdupW(lpszDest); + task->src_file = heap_strdupW(lpszSrc); + task->dst_file = heap_strdupW(lpszDest); - r = res_to_le(INTERNET_AsyncCall(task)); + r = res_to_le(INTERNET_AsyncCall(&task->hdr)); } else { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index efb6ef5..26dc286 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -360,12 +360,6 @@ struct WORKREQ_FTPDELETEFILEW LPWSTR lpszFilename; }; -struct WORKREQ_FTPRENAMEFILEW -{ - LPWSTR lpszSrcFile; - LPWSTR lpszDestFile; -}; - struct WORKREQ_FTPFINDNEXTW { LPWIN32_FIND_DATAW lpFindFileData; @@ -381,7 +375,6 @@ typedef struct WORKREQ union { struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW; - struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW; struct WORKREQ_FTPFINDNEXTW FtpFindNextW; } u; } WORKREQUEST, *LPWORKREQUEST;

1 0

Jacek Caban : wininet: Moved WORKREQ_FTPFINDFIRSTFILEW out of WORKREQUEST.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: f05b5b7e7e5f7c20774feae2539aeee61ed55195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f05b5b7e7e5f7c20774feae25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 30 11:38:39 2013 +0100 wininet: Moved WORKREQ_FTPFINDFIRSTFILEW out of WORKREQUEST. --- dlls/wininet/ftp.c | 38 +++++++++++++++++++++----------------- dlls/wininet/internet.h | 9 --------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 0adce0a..3d05a42 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -739,17 +739,23 @@ HINTERNET WINAPI FtpFindFirstFileA(HINTERNET hConnect, return ret; } +typedef struct { + task_header_t hdr; + WCHAR *search_file; + WIN32_FIND_DATAW *find_file_data; + DWORD flags; + DWORD_PTR context; +} find_first_file_task_t; -static void AsyncFtpFindFirstFileProc(WORKREQUEST *workRequest) +static void AsyncFtpFindFirstFileProc(task_header_t *hdr) { - struct WORKREQ_FTPFINDFIRSTFILEW const *req = &workRequest->u.FtpFindFirstFileW; - ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr; + find_first_file_task_t *task = (find_first_file_task_t*)hdr; + ftp_session_t *session = (ftp_session_t*)task->hdr.hdr; - TRACE("%p\n", lpwfs); + TRACE("%p\n", session); - FTP_FtpFindFirstFileW(lpwfs, req->lpszSearchFile, - req->lpFindFileData, req->dwFlags, req->dwContext); - heap_free(req->lpszSearchFile); + FTP_FtpFindFirstFileW(session, task->search_file, task->find_file_data, task->flags, task->context); + heap_free(task->search_file); } /*********************************************************************** @@ -785,18 +791,16 @@ HINTERNET WINAPI FtpFindFirstFileW(HINTERNET hConnect, hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_FTPFINDFIRSTFILEW *req; + find_first_file_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpFindFirstFileProc, sizeof(*task)); - req = &task->u.FtpFindFirstFileW; - req->lpszSearchFile = (lpszSearchFile == NULL) ? NULL : heap_strdupW(lpszSearchFile); - req->lpFindFileData = lpFindFileData; - req->dwFlags = dwFlags; - req->dwContext= dwContext; + task->search_file = heap_strdupW(lpszSearchFile); + task->find_file_data = lpFindFileData; + task->flags = dwFlags; + task->context = dwContext; - INTERNET_AsyncCall(task); - r = NULL; + INTERNET_AsyncCall(&task->hdr); + r = NULL; } else { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 4dd0abe..7e49e9d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -355,14 +355,6 @@ typedef struct } http_request_t; -struct WORKREQ_FTPFINDFIRSTFILEW -{ - LPWSTR lpszSearchFile; - LPWIN32_FIND_DATAW lpFindFileData; - DWORD dwFlags; - DWORD_PTR dwContext; -}; - struct WORKREQ_FTPOPENFILEW { LPWSTR lpszFilename; @@ -396,7 +388,6 @@ typedef struct WORKREQ object_header_t *hdr; union { - struct WORKREQ_FTPFINDFIRSTFILEW FtpFindFirstFileW; struct WORKREQ_FTPOPENFILEW FtpOpenFileW; struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW; struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW;

1 0

Jacek Caban : wininet: Moved WORKREQ_FTPGETFILEW out of WORKREQUEST.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: b2deb676968084dac07ea889aa6e973b05786ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2deb676968084dac07ea889a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 30 11:38:12 2013 +0100 wininet: Moved WORKREQ_FTPGETFILEW out of WORKREQUEST. --- dlls/wininet/ftp.c | 44 +++++++++++++++++++++++++------------------- dlls/wininet/internet.h | 11 ----------- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 599b38e..6694edb 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1563,19 +1563,27 @@ BOOL WINAPI FtpGetFileA(HINTERNET hInternet, LPCSTR lpszRemoteFile, LPCSTR lpszN return ret; } +typedef struct { + task_header_t hdr; + WCHAR *remote_file; + WCHAR *new_file; + BOOL fail_if_exists; + DWORD local_attr; + DWORD flags; + DWORD_PTR context; +} get_file_task_t; -static void AsyncFtpGetFileProc(WORKREQUEST *workRequest) +static void AsyncFtpGetFileProc(task_header_t *hdr) { - struct WORKREQ_FTPGETFILEW const *req = &workRequest->u.FtpGetFileW; - ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr; + get_file_task_t *task = (get_file_task_t*)hdr; + ftp_session_t *session = (ftp_session_t*)task->hdr.hdr; - TRACE("%p\n", lpwfs); + TRACE("%p\n", session); - FTP_FtpGetFileW(lpwfs, req->lpszRemoteFile, - req->lpszNewFile, req->fFailIfExists, - req->dwLocalFlagsAttribute, req->dwFlags, req->dwContext); - heap_free(req->lpszRemoteFile); - heap_free(req->lpszNewFile); + FTP_FtpGetFileW(session, task->remote_file, task->new_file, task->fail_if_exists, + task->local_attr, task->flags, task->context); + heap_free(task->remote_file); + heap_free(task->new_file); } @@ -1631,19 +1639,17 @@ BOOL WINAPI FtpGetFileW(HINTERNET hInternet, LPCWSTR lpszRemoteFile, LPCWSTR lps hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_FTPGETFILEW *req; + get_file_task_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpGetFileProc, sizeof(*task)); - req = &task->u.FtpGetFileW; - req->lpszRemoteFile = heap_strdupW(lpszRemoteFile); - req->lpszNewFile = heap_strdupW(lpszNewFile); - req->dwLocalFlagsAttribute = dwLocalFlagsAttribute; - req->fFailIfExists = fFailIfExists; - req->dwFlags = dwInternetFlags; - req->dwContext = dwContext; + task->remote_file = heap_strdupW(lpszRemoteFile); + task->new_file = heap_strdupW(lpszNewFile); + task->local_attr = dwLocalFlagsAttribute; + task->fail_if_exists = fFailIfExists; + task->flags = dwInternetFlags; + task->context = dwContext; - r = res_to_le(INTERNET_AsyncCall(task)); + r = res_to_le(INTERNET_AsyncCall(&task->hdr)); } else { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 382cae9..628f0c0 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -377,16 +377,6 @@ struct WORKREQ_FTPOPENFILEW DWORD_PTR dwContext; }; -struct WORKREQ_FTPGETFILEW -{ - LPWSTR lpszRemoteFile; - LPWSTR lpszNewFile; - BOOL fFailIfExists; - DWORD dwLocalFlagsAttribute; - DWORD dwFlags; - DWORD_PTR dwContext; -}; - struct WORKREQ_FTPDELETEFILEW { LPWSTR lpszFilename; @@ -415,7 +405,6 @@ typedef struct WORKREQ struct WORKREQ_FTPFINDFIRSTFILEW FtpFindFirstFileW; struct WORKREQ_FTPGETCURRENTDIRECTORYW FtpGetCurrentDirectoryW; struct WORKREQ_FTPOPENFILEW FtpOpenFileW; - struct WORKREQ_FTPGETFILEW FtpGetFileW; struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW; struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW; struct WORKREQ_FTPFINDNEXTW FtpFindNextW;

1 0