January 2013 - Wine-commits

Matteo Bruni : wined3d: Rebind texture before checking for its content in check_fbo_compat().
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 59171c06ceadcd0138c025a9fbe3d756ba8fdbc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59171c06ceadcd0138c025a9f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sat Jan 26 23:48:54 2013 +0100 wined3d: Rebind texture before checking for its content in check_fbo_compat(). --- dlls/wined3d/utils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bcdc8c8..e395bee 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1171,6 +1171,8 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined gl_info->gl_ops.gl.p_glDisable(GL_BLEND); + /* Rebinding texture to workaround a fglrx bug. */ + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, tex); gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); checkGLcall("Post-pixelshader blending check");

1 0

Francois Gouget : wined3d: Make device_stream_info_from_declaration() static.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: e7adf7fbf7c8e53b6e6cc4c1973f4d8393995789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7adf7fbf7c8e53b6e6cc4c19… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 29 07:04:44 2013 +0100 wined3d: Make device_stream_info_from_declaration() static. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f08a826..26c0832 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -174,7 +174,7 @@ static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) } /* Context activation is done by the caller. */ -void device_stream_info_from_declaration(struct wined3d_device *device, struct wined3d_stream_info *stream_info) +static void device_stream_info_from_declaration(struct wined3d_device *device, struct wined3d_stream_info *stream_info) { const struct wined3d_state *state = &device->stateBlock->state; /* We need to deal with frequency data! */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5d1814d..55a3386 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1779,8 +1779,6 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; -void device_stream_info_from_declaration(struct wined3d_device *device, - struct wined3d_stream_info *stream_info) DECLSPEC_HIDDEN; void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_context *context, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; void device_update_stream_info(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0

Francois Gouget : wined3d: debug_{d3dbasis, d3ddegree}() are not used anymore so remove them.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 68b22623b2092bab834eabb8f45d5e852d2c4c6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b22623b2092bab834eabb8f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 29 07:04:54 2013 +0100 wined3d: debug_{d3dbasis, d3ddegree}() are not used anymore so remove them. --- dlls/wined3d/utils.c | 23 ----------------------- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 0 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e395bee..2b95dfd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2526,29 +2526,6 @@ const char *debug_glerror(GLenum error) { } } -const char *debug_d3dbasis(enum wined3d_basis_type basis) -{ - switch (basis) - { - case WINED3D_BASIS_BEZIER: return "WINED3D_BASIS_BEZIER"; - case WINED3D_BASIS_BSPLINE: return "WINED3D_BASIS_BSPLINE"; - case WINED3D_BASIS_INTERPOLATE: return "WINED3D_BASIS_INTERPOLATE"; - default: return "unrecognized"; - } -} - -const char *debug_d3ddegree(enum wined3d_degree_type degree) -{ - switch (degree) - { - case WINED3D_DEGREE_LINEAR: return "WINED3D_DEGREE_LINEAR"; - case WINED3D_DEGREE_QUADRATIC: return "WINED3D_DEGREE_QUADRATIC"; - case WINED3D_DEGREE_CUBIC: return "WINED3D_DEGREE_CUBIC"; - case WINED3D_DEGREE_QUINTIC: return "WINED3D_DEGREE_QUINTIC"; - default: return "unrecognized"; - } -} - static const char *debug_fixup_channel_source(enum fixup_channel_source source) { switch(source) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 55a3386..0ce0c65 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2495,8 +2495,6 @@ const char *debug_d3dtstype(enum wined3d_transform_state tstype) DECLSPEC_HIDDEN const char *debug_d3dpool(enum wined3d_pool pool) DECLSPEC_HIDDEN; const char *debug_fbostatus(GLenum status) DECLSPEC_HIDDEN; const char *debug_glerror(GLenum error) DECLSPEC_HIDDEN; -const char *debug_d3dbasis(enum wined3d_basis_type basis) DECLSPEC_HIDDEN; -const char *debug_d3ddegree(enum wined3d_degree_type order) DECLSPEC_HIDDEN; const char *debug_d3dtop(enum wined3d_texture_op d3dtop) DECLSPEC_HIDDEN; void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN; const char *debug_surflocation(DWORD flag) DECLSPEC_HIDDEN;

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: a5ff4b80887aa7b83e0aff2120060ccd418e0c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ff4b80887aa7b83e0aff212… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 29 07:06:07 2013 +0100 Assorted spelling fixes. --- dlls/comctl32/listview.c | 6 +++--- dlls/msvcrt/file.c | 4 ++-- dlls/usp10/tests/usp10.c | 6 +++--- dlls/ws2_32/tests/sock.c | 2 +- programs/cmd/wcmdmain.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a87ab98..fd09ffb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4287,12 +4287,12 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL } /* If we are asked to change focus, and we manage it, do it. It's important to have all new item data stored at this point, - cause changing existing focus could result in redrawing operation, + because changing existing focus could result in a redrawing operation, which in turn could ask for disp data, application should see all data for inserted item when processing LVN_GETDISPINFO. The way this works application will see nested item change notifications - - changed item notifications interrupted by ones from item loosing focus. */ + changed item notifications interrupted by ones from item losing focus. */ if (stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED) { if (lpLVItem->state & LVIS_FOCUSED) @@ -8861,7 +8861,7 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE UINT oldstate = 0; BOOL notify; - /* special case optimization for recurring attemp to deselect all */ + /* special case optimization for recurring attempt to deselect all */ if (lvItem.state == 0 && lvItem.stateMask == LVIS_SELECTED && !LISTVIEW_GetSelectedCount(infoPtr)) return TRUE; diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d80a99a..d9b0e19 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1920,7 +1920,7 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int sizeof(utf8_bom)-written, &tmp, NULL)) written += tmp; if (written != sizeof(utf8_bom)) { - WARN("error writting BOM\n"); + WARN("error writing BOM\n"); CloseHandle(hand); msvcrt_set_errno(GetLastError()); return *MSVCRT__errno(); @@ -1935,7 +1935,7 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int written += tmp; if (written != sizeof(utf16_bom)) { - WARN("error writting BOM\n"); + WARN("error writing BOM\n"); CloseHandle(hand); msvcrt_set_errno(GetLastError()); return *MSVCRT__errno(); diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 9f7088d..7752f2c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1791,9 +1791,9 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) ok (hr == S_OK, "ScriptGetCMap should return S_OK not (%08x)\n", hr); ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); ok(pwOutGlyphs3[0] == pwOutGlyphs2[0], "glyph incorrectly altered\n"); - ok(pwOutGlyphs3[1] == pwOutGlyphs2[1], "glyph incorreclty altered\n"); - ok(pwOutGlyphs3[2] == pwOutGlyphs2[2], "glyph incorreclty altered\n"); - ok(pwOutGlyphs3[3] == pwOutGlyphs2[3], "glyph incorreclty altered\n"); + ok(pwOutGlyphs3[1] == pwOutGlyphs2[1], "glyph incorrectly altered\n"); + ok(pwOutGlyphs3[2] == pwOutGlyphs2[2], "glyph incorrectly altered\n"); + ok(pwOutGlyphs3[3] == pwOutGlyphs2[3], "glyph incorrectly altered\n"); ok(pwOutGlyphs3[4] == pwOutGlyphs2[4], "glyph not mirrored correctly\n"); ok(pwOutGlyphs3[5] == pwOutGlyphs2[5], "glyph not mirrored correctly\n"); ok(pwOutGlyphs3[6] == pwOutGlyphs2[6], "glyph not mirrored correctly\n"); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4b4b99a..ebde182 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4786,7 +4786,7 @@ static void test_AcceptEx(void) iret = getsockname( connector, (struct sockaddr *)&peerAddress, &remoteSize); ok( !iret, "getsockname failed.\n"); - /* Check if the buffer from AcceptEx is decoded correclty */ + /* Check if the buffer from AcceptEx is decoded correctly */ pGetAcceptExSockaddrs(buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, (struct sockaddr **)&readBindAddress, &localSize, (struct sockaddr **)&readRemoteAddress, &remoteSize); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index fbe5794..ee64253 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -797,8 +797,8 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR startchar) * Expand the command. Native expands lines from batch programs as they are * read in and not again, except for 'for' variable substitution. * eg. As evidence, "echo %1 && shift && echo %1" or "echo %%path%%" - * atExecute is TRUE when the expansion is occuring as the command is executed - * rather than at parse time, ie delayed expansion and for loops need to be + * atExecute is TRUE when the expansion is occurring as the command is executed + * rather than at parse time, i.e. delayed expansion and for loops need to be * processed */ static void handleExpansion(WCHAR *cmd, BOOL atExecute, BOOL delayed) {

1 0

Alexandre Julliard : kernel32: We no longer need the server start time in kernel32.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 199c99d852d2db635bbc8d41986d971551ca7d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199c99d852d2db635bbc8d419… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 29 11:50:21 2013 +0100 kernel32: We no longer need the server start time in kernel32. --- dlls/kernel32/kernel_main.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 2edfcbc..cf548e3 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -41,8 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(process); extern int CDECL __wine_set_signal_handler(unsigned, int (*)(unsigned)); -static ULONGLONG server_start_time; - /*********************************************************************** * set_entry_point */ @@ -83,12 +81,8 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) */ static BOOL process_attach( HMODULE module ) { - SYSTEM_TIMEOFDAY_INFORMATION ti; RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; - NtQuerySystemInformation( SystemTimeOfDayInformation, &ti, sizeof(ti), NULL ); - server_start_time = ti.liKeBootTime.QuadPart; - /* Setup registry locale information */ LOCALE_InitRegistry();

1 0

Jacek Caban : wininet: Moved WORKREQ_SENDCALLBACK out of WORKREQUEST.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 195ea90f3bd55304c5f1c2cd69a1861adab41acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=195ea90f3bd55304c5f1c2cd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 12:04:28 2013 +0100 wininet: Moved WORKREQ_SENDCALLBACK out of WORKREQUEST. --- dlls/wininet/internet.h | 9 --------- dlls/wininet/utility.c | 46 +++++++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index c61caf2..b1a7cfe 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -427,14 +427,6 @@ struct WORKREQ_FTPFINDNEXTW LPWIN32_FIND_DATAW lpFindFileData; }; -struct WORKREQ_SENDCALLBACK -{ - DWORD_PTR dwContext; - DWORD dwInternetStatus; - LPVOID lpvStatusInfo; - DWORD dwStatusInfoLength; -}; - typedef struct WORKREQ task_header_t; typedef void (*async_task_proc_t)(task_header_t*); @@ -455,7 +447,6 @@ typedef struct WORKREQ struct WORKREQ_FTPREMOVEDIRECTORYW FtpRemoveDirectoryW; struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW; struct WORKREQ_FTPFINDNEXTW FtpFindNextW; - struct WORKREQ_SENDCALLBACK SendCallback; } u; } WORKREQUEST, *LPWORKREQUEST; diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index c6b75fd..8879b8d 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -356,18 +356,24 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, heap_free(lpvNewInfo); } -static void SendAsyncCallbackProc(WORKREQUEST *workRequest) +typedef struct { + task_header_t hdr; + DWORD_PTR context; + DWORD status; + LPVOID status_info; + DWORD status_info_len; +} send_callback_task_t; + +static void SendAsyncCallbackProc(task_header_t *hdr) { - struct WORKREQ_SENDCALLBACK const *req = &workRequest->u.SendCallback; + send_callback_task_t *task = (send_callback_task_t*)hdr; - TRACE("%p\n", workRequest->hdr); + TRACE("%p\n", task->hdr.hdr); - INTERNET_SendCallback(workRequest->hdr, - req->dwContext, req->dwInternetStatus, req->lpvStatusInfo, - req->dwStatusInfoLength); + INTERNET_SendCallback(task->hdr.hdr, task->context, task->status, task->status_info, task->status_info_len); /* And frees the copy of the status info */ - heap_free(req->lpvStatusInfo); + heap_free(task->status_info); } void SendAsyncCallback(object_header_t *hdr, DWORD_PTR dwContext, @@ -385,24 +391,22 @@ void SendAsyncCallback(object_header_t *hdr, DWORD_PTR dwContext, if (hdr->dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_SENDCALLBACK *req; - void *lpvStatusInfo_copy = lpvStatusInfo; + send_callback_task_t *task; + void *lpvStatusInfo_copy = lpvStatusInfo; - if (lpvStatusInfo) - { - lpvStatusInfo_copy = heap_alloc(dwStatusInfoLength); - memcpy(lpvStatusInfo_copy, lpvStatusInfo, dwStatusInfoLength); - } + if (lpvStatusInfo) + { + lpvStatusInfo_copy = heap_alloc(dwStatusInfoLength); + memcpy(lpvStatusInfo_copy, lpvStatusInfo, dwStatusInfoLength); + } task = alloc_async_task(hdr, SendAsyncCallbackProc, sizeof(*task)); - req = &task->u.SendCallback; - req->dwContext = dwContext; - req->dwInternetStatus = dwInternetStatus; - req->lpvStatusInfo = lpvStatusInfo_copy; - req->dwStatusInfoLength = dwStatusInfoLength; + task->context = dwContext; + task->status = dwInternetStatus; + task->status_info = lpvStatusInfo_copy; + task->status_info_len = dwStatusInfoLength; - INTERNET_AsyncCall(task); + INTERNET_AsyncCall(&task->hdr); } else INTERNET_SendCallback(hdr, dwContext, dwInternetStatus,

1 0

Jacek Caban : wininet: Moved WORKREQ_HTTPENDREQUESTW out of WORKREQUEST.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 7ca22d701d170b28b8079c69f68e0b0937a093a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca22d701d170b28b8079c69f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 12:04:16 2013 +0100 wininet: Moved WORKREQ_HTTPENDREQUESTW out of WORKREQUEST. --- dlls/wininet/http.c | 26 +++++++++++++++----------- dlls/wininet/internet.h | 7 ------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5ec4089..8d8ffec 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5065,14 +5065,20 @@ BOOL WINAPI HttpEndRequestA(HINTERNET hRequest, return HttpEndRequestW(hRequest, NULL, dwFlags, dwContext); } -static void AsyncHttpEndRequestProc(WORKREQUEST *work) +typedef struct { + task_header_t hdr; + DWORD flags; + DWORD context; +} end_request_task_t; + +static void AsyncHttpEndRequestProc(task_header_t *hdr) { - struct WORKREQ_HTTPENDREQUESTW const *req = &work->u.HttpEndRequestW; - http_request_t *request = (http_request_t*)work->hdr; + end_request_task_t *task = (end_request_task_t*)hdr; + http_request_t *req = (http_request_t*)task->hdr.hdr; - TRACE("%p\n", request); + TRACE("%p\n", req); - HTTP_HttpEndRequestW(request, req->dwFlags, req->dwContext); + HTTP_HttpEndRequestW(req, task->flags, task->context); } /*********************************************************************** @@ -5112,15 +5118,13 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, if (request->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_HTTPENDREQUESTW *work_endrequest; + end_request_task_t *task; task = alloc_async_task(&request->hdr, AsyncHttpEndRequestProc, sizeof(*task)); - work_endrequest = &task->u.HttpEndRequestW; - work_endrequest->dwFlags = dwFlags; - work_endrequest->dwContext = dwContext; + task->flags = dwFlags; + task->context = dwContext; - INTERNET_AsyncCall(task); + INTERNET_AsyncCall(&task->hdr); res = ERROR_IO_PENDING; } else diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index a9c52e0..c61caf2 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -427,12 +427,6 @@ struct WORKREQ_FTPFINDNEXTW LPWIN32_FIND_DATAW lpFindFileData; }; -struct WORKREQ_HTTPENDREQUESTW -{ - DWORD dwFlags; - DWORD_PTR dwContext; -}; - struct WORKREQ_SENDCALLBACK { DWORD_PTR dwContext; @@ -461,7 +455,6 @@ typedef struct WORKREQ struct WORKREQ_FTPREMOVEDIRECTORYW FtpRemoveDirectoryW; struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW; struct WORKREQ_FTPFINDNEXTW FtpFindNextW; - struct WORKREQ_HTTPENDREQUESTW HttpEndRequestW; struct WORKREQ_SENDCALLBACK SendCallback; } u; } WORKREQUEST, *LPWORKREQUEST;

1 0

Jacek Caban : wininet: Moved WORKREQ_FTPPUTFILEW out of WORKREQUEST.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 47d0f5a167766a2a65739e4eb617387c7ddf908e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d0f5a167766a2a65739e4eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 12:04:40 2013 +0100 wininet: Moved WORKREQ_FTPPUTFILEW out of WORKREQUEST. --- dlls/wininet/ftp.c | 37 ++++++++++++++++++++++--------------- dlls/wininet/internet.h | 10 ---------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 41e008e..3f86dc3 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -251,18 +251,26 @@ BOOL WINAPI FtpPutFileA(HINTERNET hConnect, LPCSTR lpszLocalFile, return ret; } -static void AsyncFtpPutFileProc(WORKREQUEST *workRequest) +typedef struct { + task_header_t hdr; + WCHAR *local_file; + WCHAR *remote_file; + DWORD flags; + DWORD_PTR context; +} put_file_task_t; + +static void AsyncFtpPutFileProc(task_header_t *hdr) { - struct WORKREQ_FTPPUTFILEW const *req = &workRequest->u.FtpPutFileW; - ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr; + put_file_task_t *task = (put_file_task_t*)hdr; + ftp_session_t *session = (ftp_session_t*)task->hdr.hdr; - TRACE("%p\n", lpwfs); + TRACE("%p\n", session); - FTP_FtpPutFileW(lpwfs, req->lpszLocalFile, - req->lpszNewRemoteFile, req->dwFlags, req->dwContext); + FTP_FtpPutFileW(session, task->local_file, task->remote_file, + task->flags, task->context); - heap_free(req->lpszLocalFile); - heap_free(req->lpszNewRemoteFile); + heap_free(task->local_file); + heap_free(task->remote_file); } /*********************************************************************** @@ -316,15 +324,14 @@ BOOL WINAPI FtpPutFileW(HINTERNET hConnect, LPCWSTR lpszLocalFile, hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task = alloc_async_task(&lpwfs->hdr, AsyncFtpPutFileProc, sizeof(*task)); - struct WORKREQ_FTPPUTFILEW *req = &task->u.FtpPutFileW; + put_file_task_t *task = alloc_async_task(&lpwfs->hdr, AsyncFtpPutFileProc, sizeof(*task)); - req->lpszLocalFile = heap_strdupW(lpszLocalFile); - req->lpszNewRemoteFile = heap_strdupW(lpszNewRemoteFile); - req->dwFlags = dwFlags; - req->dwContext = dwContext; + task->local_file = heap_strdupW(lpszLocalFile); + task->remote_file = heap_strdupW(lpszNewRemoteFile); + task->flags = dwFlags; + 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 b1a7cfe..dd3da94 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -355,15 +355,6 @@ typedef struct } http_request_t; - -struct WORKREQ_FTPPUTFILEW -{ - LPWSTR lpszLocalFile; - LPWSTR lpszNewRemoteFile; - DWORD dwFlags; - DWORD_PTR dwContext; -}; - struct WORKREQ_FTPSETCURRENTDIRECTORYW { LPWSTR lpszDirectory; @@ -436,7 +427,6 @@ typedef struct WORKREQ object_header_t *hdr; union { - struct WORKREQ_FTPPUTFILEW FtpPutFileW; struct WORKREQ_FTPSETCURRENTDIRECTORYW FtpSetCurrentDirectoryW; struct WORKREQ_FTPCREATEDIRECTORYW FtpCreateDirectoryW; struct WORKREQ_FTPFINDFIRSTFILEW FtpFindFirstFileW;

1 0

Jacek Caban : wininet: Moved WORKREQ_FTPSETCURRENTDIRECTORYW out of WORKREQUEST.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 989bb5b9839ec12597b52679644f7e90990278f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=989bb5b9839ec12597b526796… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 12:04:55 2013 +0100 wininet: Moved WORKREQ_FTPSETCURRENTDIRECTORYW out of WORKREQUEST. --- dlls/wininet/ftp.c | 24 +++++++++++++----------- dlls/wininet/internet.h | 6 ------ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 3f86dc3..9007d56 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -441,16 +441,20 @@ BOOL WINAPI FtpSetCurrentDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory) return ret; } +typedef struct { + task_header_t hdr; + WCHAR *directory; +} directory_task_t; -static void AsyncFtpSetCurrentDirectoryProc(WORKREQUEST *workRequest) +static void AsyncFtpSetCurrentDirectoryProc(task_header_t *hdr) { - struct WORKREQ_FTPSETCURRENTDIRECTORYW const *req = &workRequest->u.FtpSetCurrentDirectoryW; - ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr; + directory_task_t *task = (directory_task_t*)hdr; + ftp_session_t *session = (ftp_session_t*)task->hdr.hdr; - TRACE("%p\n", lpwfs); + TRACE("%p\n", session); - FTP_FtpSetCurrentDirectoryW(lpwfs, req->lpszDirectory); - heap_free(req->lpszDirectory); + FTP_FtpSetCurrentDirectoryW(session, task->directory); + heap_free(task->directory); } /*********************************************************************** @@ -493,14 +497,12 @@ BOOL WINAPI FtpSetCurrentDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory) hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_FTPSETCURRENTDIRECTORYW *req; + directory_task_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpSetCurrentDirectoryProc, sizeof(*task)); - req = &task->u.FtpSetCurrentDirectoryW; - req->lpszDirectory = heap_strdupW(lpszDirectory); + task->directory = heap_strdupW(lpszDirectory); - 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 dd3da94..83cc750 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -355,11 +355,6 @@ typedef struct } http_request_t; -struct WORKREQ_FTPSETCURRENTDIRECTORYW -{ - LPWSTR lpszDirectory; -}; - struct WORKREQ_FTPCREATEDIRECTORYW { LPWSTR lpszDirectory; @@ -427,7 +422,6 @@ typedef struct WORKREQ object_header_t *hdr; union { - struct WORKREQ_FTPSETCURRENTDIRECTORYW FtpSetCurrentDirectoryW; struct WORKREQ_FTPCREATEDIRECTORYW FtpCreateDirectoryW; struct WORKREQ_FTPFINDFIRSTFILEW FtpFindFirstFileW; struct WORKREQ_FTPGETCURRENTDIRECTORYW FtpGetCurrentDirectoryW;

1 0

Jacek Caban : wininet: Moved WORKREQ_FTPCREATEDIRECTORYW out of WORKREQUEST .
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: d816de27fbeb24c4de14aa056d3694b6b846dff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d816de27fbeb24c4de14aa056… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 12:05:03 2013 +0100 wininet: Moved WORKREQ_FTPCREATEDIRECTORYW out of WORKREQUEST. --- dlls/wininet/ftp.c | 20 +++++++++----------- dlls/wininet/internet.h | 6 ------ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 9007d56..21163d5 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -589,15 +589,15 @@ BOOL WINAPI FtpCreateDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory) } -static void AsyncFtpCreateDirectoryProc(WORKREQUEST *workRequest) +static void AsyncFtpCreateDirectoryProc(task_header_t *hdr) { - struct WORKREQ_FTPCREATEDIRECTORYW const *req = &workRequest->u.FtpCreateDirectoryW; - ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr; + directory_task_t *task = (directory_task_t*)hdr; + ftp_session_t *session = (ftp_session_t*)task->hdr.hdr; - TRACE(" %p\n", lpwfs); + TRACE(" %p\n", session); - FTP_FtpCreateDirectoryW(lpwfs, req->lpszDirectory); - heap_free(req->lpszDirectory); + FTP_FtpCreateDirectoryW(session, task->directory); + heap_free(task->directory); } /*********************************************************************** @@ -644,14 +644,12 @@ BOOL WINAPI FtpCreateDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory) hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_FTPCREATEDIRECTORYW *req; + directory_task_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpCreateDirectoryProc, sizeof(*task)); - req = &task->u.FtpCreateDirectoryW; - req->lpszDirectory = heap_strdupW(lpszDirectory); + task->directory = heap_strdupW(lpszDirectory); - 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 83cc750..01bf5b3 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -355,11 +355,6 @@ typedef struct } http_request_t; -struct WORKREQ_FTPCREATEDIRECTORYW -{ - LPWSTR lpszDirectory; -}; - struct WORKREQ_FTPFINDFIRSTFILEW { LPWSTR lpszSearchFile; @@ -422,7 +417,6 @@ typedef struct WORKREQ object_header_t *hdr; union { - struct WORKREQ_FTPCREATEDIRECTORYW FtpCreateDirectoryW; struct WORKREQ_FTPFINDFIRSTFILEW FtpFindFirstFileW; struct WORKREQ_FTPGETCURRENTDIRECTORYW FtpGetCurrentDirectoryW; struct WORKREQ_FTPOPENFILEW FtpOpenFileW;

1 0