January 2013 - Wine-commits

Stefan Dösinger : ddraw: Check for NULL pointers in SetCurrentViewport.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 351730e2d681e57fb2e32447ebf9bf9f4acedcc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=351730e2d681e57fb2e32447e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 26 13:39:45 2013 +0100 ddraw: Check for NULL pointers in SetCurrentViewport. --- dlls/ddraw/device.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 92828aa..a65df42 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1703,9 +1703,15 @@ static HRESULT WINAPI d3d_device3_SetCurrentViewport(IDirect3DDevice3 *iface, ID TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport3); + if (!vp) + { + WARN("Direct3DViewport3 is NULL, returning DDERR_INVALIDPARAMS\n"); + return DDERR_INVALIDPARAMS; + } + wined3d_mutex_lock(); /* Do nothing if the specified viewport is the same as the current one */ - if (This->current_viewport == vp ) + if (This->current_viewport == vp) { wined3d_mutex_unlock(); return D3D_OK; @@ -1745,7 +1751,8 @@ static HRESULT WINAPI d3d_device2_SetCurrentViewport(IDirect3DDevice2 *iface, ID TRACE("iface %p, viewport %p.\n", iface, viewport); - return d3d_device3_SetCurrentViewport(&device->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface); + return d3d_device3_SetCurrentViewport(&device->IDirect3DDevice3_iface, + vp ? &vp->IDirect3DViewport3_iface : NULL); } /*****************************************************************************

1 0

Stefan Dösinger : ddraw: AddViewport holds a reference to the viewport.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 0209b0a96cd21cd8d9f0812d0756514555bc2b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0209b0a96cd21cd8d9f0812d0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 26 13:39:46 2013 +0100 ddraw: AddViewport holds a reference to the viewport. --- dlls/ddraw/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a65df42..ace6a12 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -765,6 +765,7 @@ static HRESULT WINAPI d3d_device3_AddViewport(IDirect3DDevice3 *iface, IDirect3D return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); + IDirect3DViewport3_AddRef(viewport); list_add_head(&device->viewport_list, &vp->entry); /* Viewport must be usable for Clear() after AddViewport, so set active_device here. */ vp->active_device = device; @@ -835,6 +836,8 @@ static HRESULT WINAPI d3d_device3_DeleteViewport(IDirect3DDevice3 *iface, IDirec vp->active_device = NULL; list_remove(&vp->entry); + IDirect3DViewport3_Release(viewport); + wined3d_mutex_unlock(); return D3D_OK;

1 0

Stefan Dösinger : ddraw: Unset the viewport if the current vp is deleted.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 06ff1c710e3984f9aabbdeae3e066de1befce3d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ff1c710e3984f9aabbdeae3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 26 13:39:47 2013 +0100 ddraw: Unset the viewport if the current vp is deleted. --- dlls/ddraw/device.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ace6a12..eca9d69 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -833,6 +833,13 @@ static HRESULT WINAPI d3d_device3_DeleteViewport(IDirect3DDevice3 *iface, IDirec return DDERR_INVALIDPARAMS; } + if (device->current_viewport == vp) + { + TRACE("Deleting current viewport, unsetting and releasing\n"); + IDirect3DViewport3_Release(viewport); + device->current_viewport = NULL; + } + vp->active_device = NULL; list_remove(&vp->entry);

1 0

Stefan Dösinger : ddraw: Don' t check for NULL in GetCurrentViewport.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 57ab0363f5252f7d3238d3602762410fc32dde1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ab0363f5252f7d3238d3602… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 26 13:39:48 2013 +0100 ddraw: Don't check for NULL in GetCurrentViewport. --- dlls/ddraw/device.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index eca9d69..6659735 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1786,9 +1786,6 @@ static HRESULT WINAPI d3d_device3_GetCurrentViewport(IDirect3DDevice3 *iface, ID TRACE("iface %p, viewport %p.\n", iface, viewport); - if (!viewport) - return DDERR_INVALIDPARAMS; - wined3d_mutex_lock(); if (!device->current_viewport) {

1 0

Stefan Dösinger : ddraw/tests: Add viewport handling tests.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: ab8276fe9142244d15d146e25ecea0d319313b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8276fe9142244d15d146e25… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 26 13:39:49 2013 +0100 ddraw/tests: Add viewport handling tests. --- dlls/ddraw/tests/ddraw1.c | 51 +++++++++++++++--- dlls/ddraw/tests/ddraw2.c | 109 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 123 +++++++++++++++++++++++++++++++++++++++------ 3 files changed, 256 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab8276fe9142244d15d14…

1 0

Henri Verbeet : wined3d: Get rid of CheckTextureCapability().
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 4cdb03a76e0829f3928b1c3835f91b9949d75070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cdb03a76e0829f3928b1c383… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 28 11:15:39 2013 +0100 wined3d: Get rid of CheckTextureCapability(). --- dlls/wined3d/directx.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 868e3a4..4c38511 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3526,12 +3526,6 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, return FALSE; } -/* Check if a texture format is supported on the given adapter */ -static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) -{ - return format->flags & WINED3DFMT_FLAG_TEXTURE; -} - static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *adapter_format, const struct wined3d_format *check_format, BOOL no3d) @@ -3568,8 +3562,10 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, } } - /* All format that are supported for textures are supported for surfaces as well */ - if (CheckTextureCapability(adapter, check_format)) return TRUE; + /* All formats that are supported for textures are supported for surfaces + * as well. */ + if (check_format->flags & WINED3DFMT_FLAG_TEXTURE) + return TRUE; /* All depth stencil formats are supported on surfaces */ if (CheckDepthStencilCapability(adapter, adapter_format, check_format)) return TRUE; @@ -3630,7 +3626,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - if (!CheckTextureCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_TEXTURE)) { TRACE("[FAILED] - Cube texture format not supported.\n"); return WINED3DERR_NOTAVAILABLE; @@ -3789,7 +3785,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - if (!CheckTextureCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_TEXTURE)) { TRACE("[FAILED] - Texture format not supported.\n"); return WINED3DERR_NOTAVAILABLE; @@ -3926,7 +3922,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - if (!CheckTextureCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_TEXTURE)) { TRACE("[FAILED] - Format not supported.\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Henri Verbeet : wined3d: Get rid of CheckBumpMapCapability().
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: c9ca9c5a7ef8949748c7e1ae7f22cabda48f5245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ca9c5a7ef8949748c7e1ae7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 28 11:15:40 2013 +0100 wined3d: Get rid of CheckBumpMapCapability(). The color fixup being supported is implied by WINED3DFMT_FLAG_TEXTURE. --- dlls/wined3d/directx.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4c38511..d9e2607 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3429,16 +3429,6 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 return WINED3D_OK; } -/* Check if we support bumpmapping for a format */ -static BOOL CheckBumpMapCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) -{ - /* Ask the fixed function pipeline implementation if it can deal - * with the conversion. If we've got a GL extension giving native - * support this will be an identity conversion. */ - return (format->flags & WINED3DFMT_FLAG_BUMPMAP) - && adapter->fragment_pipe->color_fixup_supported(format->color_fixup); -} - /* Check if the given DisplayFormat + DepthStencilFormat combination is valid for the Adapter */ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *display_format, const struct wined3d_format *ds_format) @@ -3831,7 +3821,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) { - if (!CheckBumpMapCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_BUMPMAP)) { TRACE("[FAILED] - No legacy bumpmap support.\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Jacek Caban : wininet: Moved WORKREQUEST allocation to INTERNET_AsyncCall callers.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 63e6a4b2e102841006fd376e5ee198a415597a49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63e6a4b2e102841006fd376e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 28 11:23:03 2013 +0100 wininet: Moved WORKREQUEST allocation to INTERNET_AsyncCall callers. --- dlls/wininet/ftp.c | 108 ++++++++++++++++++++-------------------------- dlls/wininet/http.c | 57 ++++++++++--------------- dlls/wininet/internet.c | 46 ++++++++++---------- dlls/wininet/internet.h | 8 +++- dlls/wininet/utility.c | 9 ++-- 5 files changed, 102 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63e6a4b2e102841006fd3…

1 0

Jacek Caban : wininet: Moved WORKREQ_HTTPSENDREQUESTW out of WORKREQUEST.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 940a67c8a59ea786eff26df103fa415e85b0df22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=940a67c8a59ea786eff26df10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 28 11:23:19 2013 +0100 wininet: Moved WORKREQ_HTTPSENDREQUESTW out of WORKREQUEST. --- dlls/wininet/http.c | 82 ++++++++++++++++++++++++----------------------- dlls/wininet/internet.h | 11 ------ 2 files changed, 42 insertions(+), 51 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d00bd6d..a3ca123 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4930,23 +4930,32 @@ lend: return res; } +typedef struct { + task_header_t hdr; + WCHAR *headers; + DWORD headers_len; + void *optional; + DWORD optional_len; + DWORD content_len; + BOOL end_request; +} send_request_task_t; + /*********************************************************************** * * Helper functions for the HttpSendRequest(Ex) functions * */ -static void AsyncHttpSendRequestProc(WORKREQUEST *workRequest) +static void AsyncHttpSendRequestProc(task_header_t *hdr) { - struct WORKREQ_HTTPSENDREQUESTW const *req = &workRequest->u.HttpSendRequestW; - http_request_t *request = (http_request_t*) workRequest->hdr; + send_request_task_t *task = (send_request_task_t*)hdr; + http_request_t *request = (http_request_t*)task->hdr.hdr; TRACE("%p\n", request); - HTTP_HttpSendRequestW(request, req->lpszHeader, - req->dwHeaderLength, req->lpOptional, req->dwOptionalLength, - req->dwContentLength, req->bEndRequest); + HTTP_HttpSendRequestW(request, task->headers, task->headers_len, task->optional, + task->optional_len, task->content_len, task->end_request); - heap_free(req->lpszHeader); + heap_free(task->headers); } @@ -5211,11 +5220,9 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_HTTPSENDREQUESTW *req; + send_request_task_t *task; task = alloc_async_task(&request->hdr, AsyncHttpSendRequestProc, sizeof(*task)); - req = &task->u.HttpSendRequestW; if (lpBuffersIn) { DWORD size = 0; @@ -5227,31 +5234,28 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, else size = lpBuffersIn->dwHeadersLength * sizeof(WCHAR); - req->lpszHeader = heap_alloc(size); - memcpy( req->lpszHeader, lpBuffersIn->lpcszHeader, size ); + task->headers = heap_alloc(size); + memcpy(task->headers, lpBuffersIn->lpcszHeader, size); } - else req->lpszHeader = NULL; + else task->headers = NULL; - req->dwHeaderLength = size / sizeof(WCHAR); - req->lpOptional = lpBuffersIn->lpvBuffer; - req->dwOptionalLength = lpBuffersIn->dwBufferLength; - req->dwContentLength = lpBuffersIn->dwBufferTotal; + task->headers_len = size / sizeof(WCHAR); + task->optional = lpBuffersIn->lpvBuffer; + task->optional_len = lpBuffersIn->dwBufferLength; + task->content_len = lpBuffersIn->dwBufferTotal; } else { - req->lpszHeader = NULL; - req->dwHeaderLength = 0; - req->lpOptional = NULL; - req->dwOptionalLength = 0; - req->dwContentLength = 0; + task->headers = NULL; + task->headers_len = 0; + task->optional = NULL; + task->optional_len = 0; + task->content_len = 0; } - req->bEndRequest = FALSE; + task->end_request = FALSE; - INTERNET_AsyncCall(task); - /* - * This is from windows. - */ + INTERNET_AsyncCall(&task->hdr); res = ERROR_IO_PENDING; } else @@ -5317,11 +5321,9 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_HTTPSENDREQUESTW *req; + send_request_task_t *task; task = alloc_async_task(&request->hdr, AsyncHttpSendRequestProc, sizeof(*task)); - req = &task->u.HttpSendRequestW; if (lpszHeaders) { DWORD size; @@ -5329,18 +5331,18 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, if (dwHeaderLength == ~0u) size = (strlenW(lpszHeaders) + 1) * sizeof(WCHAR); else size = dwHeaderLength * sizeof(WCHAR); - req->lpszHeader = heap_alloc(size); - memcpy(req->lpszHeader, lpszHeaders, size); + task->headers = heap_alloc(size); + memcpy(task->headers, lpszHeaders, size); } else - req->lpszHeader = 0; - req->dwHeaderLength = dwHeaderLength; - req->lpOptional = lpOptional; - req->dwOptionalLength = dwOptionalLength; - req->dwContentLength = dwOptionalLength; - req->bEndRequest = TRUE; - - INTERNET_AsyncCall(task); + task->headers = NULL; + task->headers_len = dwHeaderLength; + task->optional = lpOptional; + task->optional_len = dwOptionalLength; + task->content_len = dwOptionalLength; + task->end_request = TRUE; + + INTERNET_AsyncCall(&task->hdr); res = ERROR_IO_PENDING; } else diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 5f25f0f..9e66dad 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -427,16 +427,6 @@ struct WORKREQ_FTPFINDNEXTW LPWIN32_FIND_DATAW lpFindFileData; }; -struct WORKREQ_HTTPSENDREQUESTW -{ - LPWSTR lpszHeader; - DWORD dwHeaderLength; - LPVOID lpOptional; - DWORD dwOptionalLength; - DWORD dwContentLength; - BOOL bEndRequest; -}; - struct WORKREQ_HTTPENDREQUESTW { DWORD dwFlags; @@ -488,7 +478,6 @@ typedef struct WORKREQ struct WORKREQ_FTPREMOVEDIRECTORYW FtpRemoveDirectoryW; struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW; struct WORKREQ_FTPFINDNEXTW FtpFindNextW; - struct WORKREQ_HTTPSENDREQUESTW HttpSendRequestW; struct WORKREQ_HTTPENDREQUESTW HttpEndRequestW; struct WORKREQ_SENDCALLBACK SendCallback; struct WORKREQ_INTERNETOPENURLW InternetOpenUrlW;

1 0

Jacek Caban : wininet: Moved WORKREQ_INTERNETOPENURLW out of WORKREQUEST.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: df749512579d4810c89516fc5028dd2323b9883d URL: http://source.winehq.org/git/wine.git/?a=commit;h=df749512579d4810c89516fc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 28 11:23:45 2013 +0100 wininet: Moved WORKREQ_INTERNETOPENURLW out of WORKREQUEST. --- dlls/wininet/internet.c | 42 ++++++++++++++++++++++++------------------ dlls/wininet/internet.h | 11 ----------- 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1db1d32..dff24d9 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3497,17 +3497,25 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, * RETURNS * handle of connection or NULL on failure */ -static void AsyncInternetOpenUrlProc(WORKREQUEST *workRequest) +typedef struct { + task_header_t hdr; + WCHAR *url; + WCHAR *headers; + DWORD headers_len; + DWORD flags; + DWORD_PTR context; +} open_url_task_t; + +static void AsyncInternetOpenUrlProc(task_header_t *hdr) { - struct WORKREQ_INTERNETOPENURLW const *req = &workRequest->u.InternetOpenUrlW; - appinfo_t *hIC = (appinfo_t*) workRequest->hdr; + open_url_task_t *task = (open_url_task_t*)hdr; - TRACE("%p\n", hIC); + TRACE("%p\n", task->hdr.hdr); - INTERNET_InternetOpenUrlW(hIC, req->lpszUrl, - req->lpszHeaders, req->dwHeadersLength, req->dwFlags, req->dwContext); - heap_free(req->lpszUrl); - heap_free(req->lpszHeaders); + INTERNET_InternetOpenUrlW((appinfo_t*)task->hdr.hdr, task->url, task->headers, + task->headers_len, task->flags, task->context); + heap_free(task->url); + heap_free(task->headers); } HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, @@ -3536,19 +3544,17 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, } if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_INTERNETOPENURLW *req; + open_url_task_t *task; task = alloc_async_task(&hIC->hdr, AsyncInternetOpenUrlProc, sizeof(*task)); - req = &task->u.InternetOpenUrlW; - req->lpszUrl = heap_strdupW(lpszUrl); - req->lpszHeaders = heap_strdupW(lpszHeaders); - req->dwHeadersLength = dwHeadersLength; - req->dwFlags = dwFlags; - req->dwContext = dwContext; + task->url = heap_strdupW(lpszUrl); + task->headers = heap_strdupW(lpszHeaders); + task->headers_len = dwHeadersLength; + task->flags = dwFlags; + task->context = dwContext; - INTERNET_AsyncCall(task); - SetLastError(ERROR_IO_PENDING); + INTERNET_AsyncCall(&task->hdr); + SetLastError(ERROR_IO_PENDING); } else { ret = INTERNET_InternetOpenUrlW(hIC, lpszUrl, lpszHeaders, dwHeadersLength, dwFlags, dwContext); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 9e66dad..4b39070 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -441,16 +441,6 @@ struct WORKREQ_SENDCALLBACK DWORD dwStatusInfoLength; }; -struct WORKREQ_INTERNETOPENURLW -{ - HINTERNET hInternet; - LPWSTR lpszUrl; - LPWSTR lpszHeaders; - DWORD dwHeadersLength; - DWORD dwFlags; - DWORD_PTR dwContext; -}; - struct WORKREQ_HTTPREADFILEEX { void *buf; @@ -480,7 +470,6 @@ typedef struct WORKREQ struct WORKREQ_FTPFINDNEXTW FtpFindNextW; struct WORKREQ_HTTPENDREQUESTW HttpEndRequestW; struct WORKREQ_SENDCALLBACK SendCallback; - struct WORKREQ_INTERNETOPENURLW InternetOpenUrlW; struct WORKREQ_HTTPREADFILEEX HttpReadFileEx; } u; } WORKREQUEST, *LPWORKREQUEST;

1 0