January 2013 - Wine-commits

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

30 Jan '13

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

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

30 Jan '13

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

Dmitry Timoshkov : gdiplus: Avoid not necessary memory allocation for BITMAPINFO.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 35fc9c12dcffa646dfb56c6a48930f5b6a6e208c URL: http://source.winehq.org/git/wine.git/?a=commit;h=35fc9c12dcffa646dfb56c6a4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 30 18:02:14 2013 +0800 gdiplus: Avoid not necessary memory allocation for BITMAPINFO. --- dlls/gdiplus/image.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 6aa8d32..9c34333 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1821,7 +1821,6 @@ static GpStatus get_screen_resolution(REAL *xres, REAL *yres) GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, PixelFormat format, BYTE* scan0, GpBitmap** bitmap) { - BITMAPINFO* pbmi; HBITMAP hbitmap=NULL; INT row_size, dib_stride; BYTE *bits=NULL, *own_bits=NULL; @@ -1851,9 +1850,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, if (format & PixelFormatGDI && !(format & (PixelFormatAlpha|PixelFormatIndexed)) && !scan0) { - pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - if (!pbmi) - return OutOfMemory; + char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *pbmi = (BITMAPINFO *)bmibuf; pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); pbmi->bmiHeader.biWidth = width; @@ -1870,8 +1868,6 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, hbitmap = CreateDIBSection(0, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); - GdipFree(pbmi); - if (!hbitmap) return GenericError; stride = dib_stride;

1 0

Marcus Meissner : kernel32: Conditional variable tests.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 17ca7ee82f63600b05324687aff7aa2a867d0ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ca7ee82f63600b05324687a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 30 11:19:56 2013 +0100 kernel32: Conditional variable tests. --- dlls/kernel32/tests/sync.c | 154 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 145 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 0ab82f0..3924dc0 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1253,12 +1253,12 @@ static LONG condvar_producer_sleepcnt,condvar_consumer_sleepcnt; #define BUFFER_SIZE 5 static DWORD WINAPI condvar_producer(LPVOID x) { - DWORD sleepinterval = 50; + DWORD sleepinterval = 5; while (1) { Sleep(sleepinterval); - if (sleepinterval > 10) - sleepinterval -= 10; + if (sleepinterval > 1) + sleepinterval -= 1; EnterCriticalSection(&buffercrit); while ((bufferlen == BUFFER_SIZE) && !condvar_stop) { @@ -1282,7 +1282,7 @@ static DWORD WINAPI condvar_producer(LPVOID x) { static DWORD WINAPI condvar_consumer(LPVOID x) { DWORD *cnt = (DWORD*)x; - DWORD sleepinterval = 10; + DWORD sleepinterval = 1; while (1) { EnterCriticalSection(&buffercrit); @@ -1303,12 +1303,12 @@ static DWORD WINAPI condvar_consumer(LPVOID x) { LeaveCriticalSection(&buffercrit); pWakeConditionVariable(&buffernotfull); Sleep(sleepinterval); - if (sleepinterval < 50) sleepinterval += 10; + if (sleepinterval < 5) sleepinterval += 1; } return 0; } -static void test_condvars(void) +static void test_condvars_consumer_producer(void) { HANDLE hp1,hp2,hp3,hc1,hc2,hc3; DWORD dummy; @@ -1328,8 +1328,10 @@ static void test_condvars(void) * pInitializeConditionVariable(&buffernotfull); */ pInitializeConditionVariable(&buffernotempty); - InitializeCriticalSection(&buffercrit); + + /* Larger Test: consumer/producer example */ + bufferlen = totalproduced = totalconsumed = cnt1 = cnt2 = cnt3 = 0; hp1 = CreateThread(NULL, 0, condvar_producer, NULL, 0, &dummy); @@ -1349,7 +1351,9 @@ static void test_condvars(void) pWakeAllConditionVariable (&buffernotfull); pWakeAllConditionVariable (&buffernotempty); - ok(buffernotfull.Ptr == NULL, "buffernotfull.Ptr is %p\n", buffernotfull.Ptr); + /* (mostly an implementation detail) + * ok(buffernotfull.Ptr == NULL, "buffernotfull.Ptr is %p\n", buffernotfull.Ptr); + */ WaitForSingleObject(hp1, 1000); WaitForSingleObject(hp2, 1000); @@ -1371,6 +1375,137 @@ static void test_condvars(void) trace("producer sleep %d, consumer sleep %d\n", condvar_producer_sleepcnt, condvar_consumer_sleepcnt); } +/* Sample test for some sequence of events happening, sequenced using "condvar_seq" */ +static DWORD condvar_seq = 0; +static CONDITION_VARIABLE condvar_base = CONDITION_VARIABLE_INIT; +static CRITICAL_SECTION condvar_crit; + +/* Sequence of wake/sleep to check boundary conditions: + * 0: init + * 1: producer emits a WakeConditionVaribale without consumer waiting. + * 2: consumer sleeps without a wake expecting timeout + * 3: producer emits a WakeAllConditionVaribale without consumer waiting. + * 4: consumer sleeps without a wake expecting timeout + * 5: a wake is handed to a SleepConditionVariableCS + * 6: a wakeall is handed to a SleepConditionVariableCS + * 7: sleep after above should timeout + * 8: wake with crit section locked into the sleep timeout + * 9: end + */ +static DWORD WINAPI condvar_base_producer(LPVOID x) { + while (condvar_seq < 1) Sleep(1); + + pWakeConditionVariable (&condvar_base); + condvar_seq = 2; + + while (condvar_seq < 3) Sleep(1); + pWakeAllConditionVariable (&condvar_base); + condvar_seq = 4; + + while (condvar_seq < 5) Sleep(1); + EnterCriticalSection (&condvar_crit); + pWakeConditionVariable (&condvar_base); + LeaveCriticalSection (&condvar_crit); + while (condvar_seq < 6) Sleep(1); + EnterCriticalSection (&condvar_crit); + pWakeAllConditionVariable (&condvar_base); + LeaveCriticalSection (&condvar_crit); + + while (condvar_seq < 8) Sleep(1); + EnterCriticalSection (&condvar_crit); + pWakeConditionVariable (&condvar_base); + Sleep(50); + LeaveCriticalSection (&condvar_crit); + + return 0; +} + +static DWORD WINAPI condvar_base_consumer(LPVOID x) { + BOOL ret; + + while (condvar_seq < 2) Sleep(1); + + /* wake was emitted, but we were not sleeping */ + EnterCriticalSection (&condvar_crit); + ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + LeaveCriticalSection (&condvar_crit); + ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); + ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); + + condvar_seq = 3; + while (condvar_seq < 4) Sleep(1); + + /* wake all was emitted, but we were not sleeping */ + EnterCriticalSection (&condvar_crit); + ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + LeaveCriticalSection (&condvar_crit); + ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); + ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); + + EnterCriticalSection (&condvar_crit); + condvar_seq = 5; + ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 200); + LeaveCriticalSection (&condvar_crit); + ok (ret, "SleepConditionVariableCS should return TRUE on good wake\n"); + + EnterCriticalSection (&condvar_crit); + condvar_seq = 6; + ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 200); + LeaveCriticalSection (&condvar_crit); + ok (ret, "SleepConditionVariableCS should return TRUE on good wakeall\n"); + condvar_seq = 7; + + EnterCriticalSection (&condvar_crit); + ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + LeaveCriticalSection (&condvar_crit); + ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); + ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); + + EnterCriticalSection (&condvar_crit); + condvar_seq = 8; + ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 20); + LeaveCriticalSection (&condvar_crit); + ok (ret, "SleepConditionVariableCS should still return TRUE on crit unlock delay\n"); + condvar_seq = 9; + + return 0; +} + +static void test_condvars_base(void) { + HANDLE hp, hc; + DWORD dummy; + BOOL ret; + + + if (!pInitializeConditionVariable) { + /* function is not yet in XP, only in newer Windows */ + /* and not yet implemented in Wine for some days/weeks */ + todo_wine win_skip("no condition variable support.\n"); + return; + } + + InitializeCriticalSection (&condvar_crit); + + EnterCriticalSection (&condvar_crit); + ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + LeaveCriticalSection (&condvar_crit); + + ok (!ret, "SleepConditionVariableCS should return FALSE on untriggered condvar\n"); + ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); + + + hp = CreateThread(NULL, 0, condvar_base_producer, NULL, 0, &dummy); + hc = CreateThread(NULL, 0, condvar_base_consumer, NULL, 0, &dummy); + + condvar_seq = 1; /* go */ + + while (condvar_seq < 9) + Sleep (5); + WaitForSingleObject(hp, 100); + WaitForSingleObject(hc, 100); +} + + START_TEST(sync) { HMODULE hdll = GetModuleHandle("kernel32"); @@ -1403,5 +1538,6 @@ START_TEST(sync) test_WaitForSingleObject(); test_WaitForMultipleObjects(); test_initonce(); - test_condvars(); + test_condvars_base(); + test_condvars_consumer_producer(); }

1 0

Jacek Caban : wininet: Moved WORKREQ_FTPGETFILEW out of WORKREQUEST.
by Alexandre Julliard 30 Jan '13

30 Jan '13

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

Jacek Caban : wininet: Moved WORKREQ_FTPGETCURRENTDIRECTORYW out of WORKREQUEST.
by Alexandre Julliard 30 Jan '13

30 Jan '13

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

Jacek Caban : wininet: Moved WORKREQ_FTPFINDFIRSTFILEW out of WORKREQUEST.
by Alexandre Julliard 30 Jan '13

30 Jan '13

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_FTPOPENFILEW out of WORKREQUEST.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 228d6a6064d2e68646db4e85ccf7243759291b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=228d6a6064d2e68646db4e85c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 30 11:38:49 2013 +0100 wininet: Moved WORKREQ_FTPOPENFILEW out of WORKREQUEST. --- dlls/wininet/ftp.c | 40 ++++++++++++++++++++++------------------ dlls/wininet/internet.h | 9 --------- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 3d05a42..ba7d5c3 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -791,7 +791,7 @@ HINTERNET WINAPI FtpFindFirstFileW(HINTERNET hConnect, hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - find_first_file_t *task; + find_first_file_task_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpFindFirstFileProc, sizeof(*task)); task->search_file = heap_strdupW(lpszSearchFile); @@ -1454,17 +1454,23 @@ HINTERNET WINAPI FtpOpenFileA(HINTERNET hFtpSession, return ret; } +typedef struct { + task_header_t hdr; + WCHAR *file_name; + DWORD access; + DWORD flags; + DWORD_PTR context; +} open_file_task_t; -static void AsyncFtpOpenFileProc(WORKREQUEST *workRequest) +static void AsyncFtpOpenFileProc(task_header_t *hdr) { - struct WORKREQ_FTPOPENFILEW const *req = &workRequest->u.FtpOpenFileW; - ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr; + open_file_task_t *task = (open_file_task_t*)hdr; + ftp_session_t *session = (ftp_session_t*)task->hdr.hdr; - TRACE("%p\n", lpwfs); + TRACE("%p\n", session); - FTP_FtpOpenFileW(lpwfs, req->lpszFilename, - req->dwAccess, req->dwFlags, req->dwContext); - heap_free(req->lpszFilename); + FTP_FtpOpenFileW(session, task->file_name, task->access, task->flags, task->context); + heap_free(task->file_name); } /*********************************************************************** @@ -1518,18 +1524,16 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession, hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_FTPOPENFILEW *req; + open_file_task_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpOpenFileProc, sizeof(*task)); - req = &task->u.FtpOpenFileW; - req->lpszFilename = heap_strdupW(lpszFileName); - req->dwAccess = fdwAccess; - req->dwFlags = dwFlags; - req->dwContext = dwContext; + task->file_name = heap_strdupW(lpszFileName); + task->access = fdwAccess; + 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 7e49e9d..efb6ef5 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -355,14 +355,6 @@ typedef struct } http_request_t; -struct WORKREQ_FTPOPENFILEW -{ - LPWSTR lpszFilename; - DWORD dwAccess; - DWORD dwFlags; - DWORD_PTR dwContext; -}; - struct WORKREQ_FTPDELETEFILEW { LPWSTR lpszFilename; @@ -388,7 +380,6 @@ typedef struct WORKREQ object_header_t *hdr; union { - struct WORKREQ_FTPOPENFILEW FtpOpenFileW; struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW; struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW; struct WORKREQ_FTPFINDNEXTW FtpFindNextW;

1 0

Jacek Caban : wininet: Moved WORKREQ_FTPRENAMEFILEW out of WORKREQUEST.
by Alexandre Julliard 30 Jan '13

30 Jan '13

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_FTPFINDNEXTW out of WORKREQUEST.
by Alexandre Julliard 30 Jan '13

30 Jan '13

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