wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

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 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

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

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: Introduce a format flag for texturing.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 7c8dab24e6a2326b9572f3a014cc1766aa6ed5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8dab24e6a2326b9572f3a01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 28 11:15:38 2013 +0100 wined3d: Introduce a format flag for texturing. --- dlls/wined3d/directx.c | 266 +--------------------------------------- dlls/wined3d/utils.c | 257 +++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 184 insertions(+), 340 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c8dab24e6a2326b9572f…

1 0

Henri Verbeet : d3drm: Avoid LPD3DRMMATERIALOVERRIDE.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 740c44f5ff759cbcd8d6ac6521b072357facadcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=740c44f5ff759cbcd8d6ac652… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 28 11:15:37 2013 +0100 d3drm: Avoid LPD3DRMMATERIALOVERRIDE. --- dlls/d3drm/frame.c | 8 ++++---- include/d3drmobj.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 03f0184..525a3fa 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2531,8 +2531,8 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetSceneFogMethod(IDirect3DRMFrame3* return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_SetMaterialOverride(IDirect3DRMFrame3* iface, - LPD3DRMMATERIALOVERRIDE override) +static HRESULT WINAPI IDirect3DRMFrame3Impl_SetMaterialOverride(IDirect3DRMFrame3 *iface, + D3DRMMATERIALOVERRIDE *override) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); @@ -2541,8 +2541,8 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_SetMaterialOverride(IDirect3DRMFrame return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_GetMaterialOverride(IDirect3DRMFrame3* iface, - LPD3DRMMATERIALOVERRIDE override) +static HRESULT WINAPI IDirect3DRMFrame3Impl_GetMaterialOverride(IDirect3DRMFrame3 *iface, + D3DRMMATERIALOVERRIDE *override) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 14f8a7e..47e4d48 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1691,8 +1691,8 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD(GetTraversalOptions)(THIS_ LPDWORD pFlags) PURE; STDMETHOD(SetSceneFogMethod)(THIS_ DWORD flags) PURE; STDMETHOD(GetSceneFogMethod)(THIS_ LPDWORD pFlags) PURE; - STDMETHOD(SetMaterialOverride)(THIS_ LPD3DRMMATERIALOVERRIDE) PURE; - STDMETHOD(GetMaterialOverride)(THIS_ LPD3DRMMATERIALOVERRIDE) PURE; + STDMETHOD(SetMaterialOverride)(THIS_ D3DRMMATERIALOVERRIDE *override) PURE; + STDMETHOD(GetMaterialOverride)(THIS_ D3DRMMATERIALOVERRIDE *override) PURE; }; #undef INTERFACE

1 0

Henri Verbeet : d3drm: Avoid LPD3DRMIMAGE.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 33f0e190f25d98ec3c350b569c965c970d3e07cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f0e190f25d98ec3c350b569… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 28 11:15:36 2013 +0100 d3drm: Avoid LPD3DRMIMAGE. --- dlls/d3drm/d3drm.c | 24 ++++++++++++------------ dlls/d3drm/texture.c | 4 ++-- include/d3drm.h | 6 +++--- include/d3drmobj.h | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 709a2f8..48b362d 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -191,14 +191,14 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateAnimationSet(IDirect3DRM* iface, LPD return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_CreateTexture(IDirect3DRM* iface, LPD3DRMIMAGE pImage, - LPDIRECT3DRMTEXTURE * ppTexture) +static HRESULT WINAPI IDirect3DRMImpl_CreateTexture(IDirect3DRM *iface, + D3DRMIMAGE *image, IDirect3DRMTexture **texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, pImage, ppTexture); + FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, image, texture); - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown**)ppTexture); + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)texture); } static HRESULT WINAPI IDirect3DRMImpl_CreateLight(IDirect3DRM* iface, D3DRMLIGHTTYPE type, @@ -568,14 +568,14 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimationSet(IDirect3DRM2* iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_CreateTexture(IDirect3DRM2* iface, LPD3DRMIMAGE pImage, - LPDIRECT3DRMTEXTURE2 * ppTexture) +static HRESULT WINAPI IDirect3DRM2Impl_CreateTexture(IDirect3DRM2 *iface, + D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, pImage, ppTexture); + FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, image, texture); - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown**)ppTexture); + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)texture); } static HRESULT WINAPI IDirect3DRM2Impl_CreateLight(IDirect3DRM2* iface, D3DRMLIGHTTYPE type, @@ -988,14 +988,14 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateAnimationSet(IDirect3DRM3* iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateTexture(IDirect3DRM3* iface, LPD3DRMIMAGE Image, - LPDIRECT3DRMTEXTURE3* Texture) +static HRESULT WINAPI IDirect3DRM3Impl_CreateTexture(IDirect3DRM3 *iface, + D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, Image, Texture); + FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, image, texture); - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown**)Texture); + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown **)texture); } static HRESULT WINAPI IDirect3DRM3Impl_CreateLight(IDirect3DRM3* iface, D3DRMLIGHTTYPE type, diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 21ac96b..f72dcaa 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -346,7 +346,7 @@ static D3DCOLOR WINAPI IDirect3DRMTexture2Impl_GetDecalTransparentColor(IDirect3 } /*** IDirect3DRMTexture2 methods ***/ -static HRESULT WINAPI IDirect3DRMTexture2Impl_InitFromImage(IDirect3DRMTexture2* iface, LPD3DRMIMAGE image) +static HRESULT WINAPI IDirect3DRMTexture2Impl_InitFromImage(IDirect3DRMTexture2 *iface, D3DRMIMAGE *image) { IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture2(iface); @@ -722,7 +722,7 @@ static D3DCOLOR WINAPI IDirect3DRMTexture3Impl_GetDecalTransparentColor(IDirect3 return 0; } -static HRESULT WINAPI IDirect3DRMTexture3Impl_InitFromImage(IDirect3DRMTexture3* iface, LPD3DRMIMAGE image) +static HRESULT WINAPI IDirect3DRMTexture3Impl_InitFromImage(IDirect3DRMTexture3 *iface, D3DRMIMAGE *image) { IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture3(iface); diff --git a/include/d3drm.h b/include/d3drm.h index 8311759..93330d8 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -64,7 +64,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; - STDMETHOD(CreateTexture)(THIS_ LPD3DRMIMAGE, LPDIRECT3DRMTEXTURE *) PURE; + STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL *) PURE; @@ -200,7 +200,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; - STDMETHOD(CreateTexture)(THIS_ LPD3DRMIMAGE, LPDIRECT3DRMTEXTURE2 *) PURE; + STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL *) PURE; @@ -339,7 +339,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE2 *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION2 *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET2 *) PURE; - STDMETHOD(CreateTexture)(THIS_ LPD3DRMIMAGE, LPDIRECT3DRMTEXTURE3 *) PURE; + STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL2 *) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 7c7a913..14f8a7e 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -3327,7 +3327,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) STDMETHOD_(BOOL, GetDecalTransparency)(THIS) PURE; STDMETHOD_(D3DCOLOR, GetDecalTransparentColor)(THIS) PURE; /*** IDirect3DRMTexture2 methods ***/ - STDMETHOD(InitFromImage)(THIS_ LPD3DRMIMAGE) PURE; + STDMETHOD(InitFromImage)(THIS_ D3DRMIMAGE *image) PURE; STDMETHOD(InitFromResource2)(THIS_ HMODULE hModule, LPCSTR /* LPCTSTR */ strName, LPCSTR /* LPCTSTR */ strType) PURE; STDMETHOD(GenerateMIPMap)(THIS_ DWORD) PURE; }; @@ -3450,7 +3450,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) STDMETHOD_(DWORD, GetDecalScale)(THIS) PURE; STDMETHOD_(BOOL, GetDecalTransparency)(THIS) PURE; STDMETHOD_(D3DCOLOR, GetDecalTransparentColor)(THIS) PURE; - STDMETHOD(InitFromImage)(THIS_ LPD3DRMIMAGE) PURE; + STDMETHOD(InitFromImage)(THIS_ D3DRMIMAGE *image) PURE; STDMETHOD(InitFromResource2)(THIS_ HMODULE hModule, LPCSTR /* LPCTSTR */ strName, LPCSTR /* LPCTSTR */ strType) PURE; STDMETHOD(GenerateMIPMap)(THIS_ DWORD) PURE; STDMETHOD(GetSurface)(THIS_ DWORD flags, IDirectDrawSurface **surface) PURE;

1 0

Dmitry Timoshkov : dwrite: Avoid triggering an exception on DLL_PROCESS_DETACH.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 1ea524a861f94e09a609507d6b6d0079ff87dae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ea524a861f94e09a609507d6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 28 14:37:36 2013 +0800 dwrite: Avoid triggering an exception on DLL_PROCESS_DETACH. --- dlls/dwrite/font.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0ec581b..191397e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -793,7 +793,8 @@ static void release_font_collection(IDWriteFontCollection *iface) void release_system_fontcollection(void) { - release_font_collection(system_collection); + if (system_collection) + release_font_collection(system_collection); } HRESULT get_system_fontcollection(IDWriteFontCollection **collection)

1 0

Nikolay Sivov : comctl32/listview: Implement dragging with right button with a message loop.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 500da7def68934d2e2d74e611bb6cce77d59d60e URL: http://source.winehq.org/git/wine.git/?a=commit;h=500da7def68934d2e2d74e611… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 28 07:56:01 2013 +0400 comctl32/listview: Implement dragging with right button with a message loop. --- dlls/comctl32/listview.c | 186 ++++++++++++++++++++++++++-------------------- 1 files changed, 105 insertions(+), 81 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 49da83c..a87ab98 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -99,7 +99,6 @@ * -- LVN_GETINFOTIP * -- LVN_HOTTRACK * -- LVN_SETDISPINFO - * -- LVN_BEGINRDRAG * * Messages: * -- LVM_ENABLEGROUPVIEW @@ -325,7 +324,6 @@ typedef struct tagLISTVIEW_INFO /* mouse operation */ BOOL bLButtonDown; - BOOL bRButtonDown; BOOL bDragging; POINT ptClickPos; /* point where the user clicked */ INT nLButtonDownItem; /* tracks item to reset multiselection on WM_LBUTTONUP */ @@ -3984,17 +3982,23 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent */ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, INT y) { + LVHITTESTINFO ht; + RECT rect; + POINT pt; + if (!(fwKeys & MK_LBUTTON)) infoPtr->bLButtonDown = FALSE; if (infoPtr->bLButtonDown) { - POINT tmp; - RECT rect; - LVHITTESTINFO lvHitTestInfo; - WORD wDragWidth = GetSystemMetrics(SM_CXDRAG); - WORD wDragHeight= GetSystemMetrics(SM_CYDRAG); + rect.left = rect.right = infoPtr->ptClickPos.x; + rect.top = rect.bottom = infoPtr->ptClickPos.y; + InflateRect(&rect, GetSystemMetrics(SM_CXDRAG), GetSystemMetrics(SM_CYDRAG)); + } + + if (infoPtr->bLButtonDown) + { if (infoPtr->bMarqueeSelect) { POINT coords_orig; @@ -4037,22 +4041,17 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN return 0; } - rect.left = infoPtr->ptClickPos.x - wDragWidth; - rect.right = infoPtr->ptClickPos.x + wDragWidth; - rect.top = infoPtr->ptClickPos.y - wDragHeight; - rect.bottom = infoPtr->ptClickPos.y + wDragHeight; - - tmp.x = x; - tmp.y = y; + pt.x = x; + pt.y = y; - lvHitTestInfo.pt = tmp; - LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); + ht.pt = pt; + LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE); /* reset item marker */ - if (infoPtr->nLButtonDownItem != lvHitTestInfo.iItem) + if (infoPtr->nLButtonDownItem != ht.iItem) infoPtr->nLButtonDownItem = -1; - if (!PtInRect(&rect, tmp)) + if (!PtInRect(&rect, pt)) { /* this path covers the following: 1. WM_LBUTTONDOWN over selected item (sets focus on it) @@ -4072,12 +4071,12 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN if (!infoPtr->bDragging) { - lvHitTestInfo.pt = infoPtr->ptClickPos; - LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); + ht.pt = infoPtr->ptClickPos; + LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE); /* If the click is outside the range of an item, begin a highlight. If not, begin an item drag. */ - if (lvHitTestInfo.iItem == -1) + if (ht.iItem == -1) { NMHDR hdr; @@ -4102,7 +4101,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN NMLISTVIEW nmlv; ZeroMemory(&nmlv, sizeof(nmlv)); - nmlv.iItem = lvHitTestInfo.iItem; + nmlv.iItem = ht.iItem; nmlv.ptAction = infoPtr->ptClickPos; notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv); @@ -10015,6 +10014,52 @@ static LRESULT LISTVIEW_LButtonDblClk(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, return 0; } +static LRESULT LISTVIEW_TrackMouse(const LISTVIEW_INFO *infoPtr, POINT pt) +{ + MSG msg; + RECT r; + + r.top = r.bottom = pt.y; + r.left = r.right = pt.x; + + InflateRect(&r, GetSystemMetrics(SM_CXDRAG), GetSystemMetrics(SM_CYDRAG)); + + SetCapture(infoPtr->hwndSelf); + + while (1) + { + if (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) + { + if (msg.message == WM_MOUSEMOVE) + { + pt.x = (short)LOWORD(msg.lParam); + pt.y = (short)HIWORD(msg.lParam); + if (PtInRect(&r, pt)) + continue; + else + { + ReleaseCapture(); + return 1; + } + } + else if (msg.message >= WM_LBUTTONDOWN && + msg.message <= WM_RBUTTONDBLCLK) + { + break; + } + + DispatchMessageW(&msg); + } + + if (GetCapture() != infoPtr->hwndSelf) + return 0; + } + + ReleaseCapture(); + return 0; +} + + /*** * DESCRIPTION: * Processes mouse down messages (left mouse button). @@ -10619,94 +10664,76 @@ static LRESULT LISTVIEW_RButtonDblClk(const LISTVIEW_INFO *infoPtr, WORD wKey, I /*** * DESCRIPTION: - * Processes mouse down messages (right mouse button). + * Processes WM_RBUTTONDOWN message and corresponding drag operation. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure * [I] wKey : key flag - * [I] x,y : mouse coordinate + * [I] x, y : mouse coordinate * * RETURN: * Zero */ static LRESULT LISTVIEW_RButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT y) { - LVHITTESTINFO lvHitTestInfo; - INT nItem; + LVHITTESTINFO ht; + INT item; - TRACE("(key=%hu,X=%u,Y=%u)\n", wKey, x, y); + TRACE("(key=%hu, x=%d, y=%d)\n", wKey, x, y); /* send NM_RELEASEDCAPTURE notification */ if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; + /* determine the index of the selected item */ + ht.pt.x = x; + ht.pt.y = y; + item = LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE); + /* make sure the listview control window has the focus */ if (!infoPtr->bFocus) SetFocus(infoPtr->hwndSelf); - /* set right button down flag */ - infoPtr->bRButtonDown = TRUE; - - /* determine the index of the selected item */ - lvHitTestInfo.pt.x = x; - lvHitTestInfo.pt.y = y; - nItem = LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); - - if ((nItem >= 0) && (nItem < infoPtr->nItemCount)) + if ((item >= 0) && (item < infoPtr->nItemCount)) { - LISTVIEW_SetItemFocus(infoPtr, nItem); + LISTVIEW_SetItemFocus(infoPtr, item); if (!((wKey & MK_SHIFT) || (wKey & MK_CONTROL)) && - !LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED)) - LISTVIEW_SetSelection(infoPtr, nItem); + !LISTVIEW_GetItemState(infoPtr, item, LVIS_SELECTED)) + LISTVIEW_SetSelection(infoPtr, item); } else - { LISTVIEW_DeselectAll(infoPtr); - } - - return 0; -} - -/*** - * DESCRIPTION: - * Processes mouse up messages (right mouse button). - * - * PARAMETER(S): - * [I] infoPtr : valid pointer to the listview structure - * [I] wKey : key flag - * [I] x,y : mouse coordinate - * - * RETURN: - * Zero - */ -static LRESULT LISTVIEW_RButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT y) -{ - LVHITTESTINFO lvHitTestInfo; - POINT pt; - TRACE("(key=%hu,X=%u,Y=%u)\n", wKey, x, y); + if (LISTVIEW_TrackMouse(infoPtr, ht.pt)) + { + if (ht.iItem != -1) + { + NMLISTVIEW nmlv; - if (!infoPtr->bRButtonDown) return 0; - - /* set button flag */ - infoPtr->bRButtonDown = FALSE; + memset(&nmlv, 0, sizeof(nmlv)); + nmlv.iItem = ht.iItem; + nmlv.ptAction = ht.pt; - /* Send NM_RCLICK notification */ - lvHitTestInfo.pt.x = x; - lvHitTestInfo.pt.y = y; - LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, FALSE); - if (!notify_click(infoPtr, NM_RCLICK, &lvHitTestInfo)) return 0; + notify_listview(infoPtr, LVN_BEGINRDRAG, &nmlv); + } + } + else + { + SetFocus(infoPtr->hwndSelf); - /* Change to screen coordinate for WM_CONTEXTMENU */ - pt = lvHitTestInfo.pt; - ClientToScreen(infoPtr->hwndSelf, &pt); + ht.pt.x = x; + ht.pt.y = y; + LISTVIEW_HitTest(infoPtr, &ht, TRUE, FALSE); - /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ - SendMessageW(infoPtr->hwndSelf, WM_CONTEXTMENU, - (WPARAM)infoPtr->hwndSelf, MAKELPARAM(pt.x, pt.y)); + if (notify_click(infoPtr, NM_RCLICK, &ht)) + { + /* Send a WM_CONTEXTMENU message in response to the WM_RBUTTONUP */ + SendMessageW(infoPtr->hwndSelf, WM_CONTEXTMENU, + (WPARAM)infoPtr->hwndSelf, (LPARAM)GetMessagePos()); + } + } return 0; } - /*** * DESCRIPTION: * Sets the cursor. @@ -11600,9 +11627,6 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_RBUTTONDOWN: return LISTVIEW_RButtonDown(infoPtr, (WORD)wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); - case WM_RBUTTONUP: - return LISTVIEW_RButtonUp(infoPtr, (WORD)wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); - case WM_SETCURSOR: return LISTVIEW_SetCursor(infoPtr, wParam, lParam);

1 0

Nikolay Sivov : xmllite: Fail to set input for external IXmlReaderInput.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 8954671cdc64a63d5e10864fd9218d907a72b4ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=8954671cdc64a63d5e10864fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 11:54:58 2013 +0400 xmllite: Fail to set input for external IXmlReaderInput. --- dlls/xmllite/reader.c | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 785d9bf..b3f7194 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -114,6 +114,8 @@ typedef struct unsigned int pending : 1; } xmlreaderinput; +static const struct IUnknownVtbl xmlreaderinputvtbl; + typedef struct { WCHAR *str; @@ -1764,7 +1766,7 @@ static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, v { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IXmlReader)) @@ -1774,6 +1776,7 @@ static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, v else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } @@ -1814,6 +1817,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) { xmlreader *This = impl_from_IXmlReader(iface); + IXmlReaderInput *readerinput; HRESULT hr; TRACE("(%p)->(%p)\n", This, input); @@ -1838,11 +1842,23 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) } /* now try IXmlReaderInput, ISequentialStream, IStream */ - hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&This->input); - if (hr != S_OK) + hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&readerinput); + if (hr == S_OK) { - IXmlReaderInput *readerinput; + if (readerinput->lpVtbl == &xmlreaderinputvtbl) + This->input = impl_from_IXmlReaderInput(readerinput); + else + { + ERR("got external IXmlReaderInput implementation: %p, vtbl=%p\n", + readerinput, readerinput->lpVtbl); + IUnknown_Release(readerinput); + return E_FAIL; + } + } + + if (hr != S_OK || !readerinput) + { /* create IXmlReaderInput basing on supplied interface */ hr = CreateXmlReaderInputWithEncodingName(input, NULL, NULL, FALSE, NULL, &readerinput); @@ -2160,7 +2176,7 @@ static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFI { xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IXmlReaderInput) || IsEqualGUID(riid, &IID_IUnknown)) @@ -2170,6 +2186,7 @@ static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFI else { WARN("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } @@ -2207,7 +2224,7 @@ static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) return ref; } -static const struct IUnknownVtbl xmlreaderinput_vtbl = +static const struct IUnknownVtbl xmlreaderinputvtbl = { xmlreaderinput_QueryInterface, xmlreaderinput_AddRef, @@ -2281,7 +2298,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, readerinput = heap_alloc(sizeof(*readerinput)); if(!readerinput) return E_OUTOFMEMORY; - readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl; + readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinputvtbl; readerinput->ref = 1; readerinput->imalloc = imalloc; readerinput->stream = NULL;

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2013