November 2012 - Wine-commits

Hans Leidekker : windowscodecs: Add a stub IWICColorContext implementation.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 96ebc618b5029723d1f2401dc54e5e0fac5e060f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ebc618b5029723d1f2401dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:06:25 2012 +0100 windowscodecs: Add a stub IWICColorContext implementation. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/colorcontext.c | 161 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/imgfactory.c | 4 +- dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 165 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 65cd913..d031daa 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ bmpdecode.c \ bmpencode.c \ clsfactory.c \ + colorcontext.c \ converter.c \ fliprotate.c \ gifformat.c \ diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c new file mode 100644 index 0000000..9517988 --- /dev/null +++ b/dlls/windowscodecs/colorcontext.c @@ -0,0 +1,161 @@ +/* + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct ColorContext { + IWICColorContext IWICColorContext_iface; + LONG ref; +} ColorContext; + +static inline ColorContext *impl_from_IWICColorContext(IWICColorContext *iface) +{ + return CONTAINING_RECORD(iface, ColorContext, IWICColorContext_iface); +} + +static HRESULT WINAPI ColorContext_QueryInterface(IWICColorContext *iface, REFIID iid, + void **ppv) +{ + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICColorContext, iid)) + { + *ppv = &This->IWICColorContext_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ColorContext_AddRef(IWICColorContext *iface) +{ + ColorContext *This = impl_from_IWICColorContext(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ColorContext_Release(IWICColorContext *iface) +{ + ColorContext *This = impl_from_IWICColorContext(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI ColorContext_InitializeFromFilename(IWICColorContext *iface, + LPCWSTR wzFilename) +{ + FIXME("(%p,%s)\n", iface, debugstr_w(wzFilename)); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorContext_InitializeFromMemory(IWICColorContext *iface, + const BYTE *pbBuffer, UINT cbBufferSize) +{ + FIXME("(%p,%p,%u)\n", iface, pbBuffer, cbBufferSize); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorContext_InitializeFromExifColorSpace(IWICColorContext *iface, + UINT value) +{ + FIXME("(%p,%u)\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorContext_GetType(IWICColorContext *iface, + WICColorContextType *pType) +{ + FIXME("(%p,%p)\n", iface, pType); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorContext_GetProfileBytes(IWICColorContext *iface, + UINT cbBuffer, BYTE *pbBuffer, UINT *pcbActual) +{ + FIXME("(%p,%u,%p,%p)\n", iface, cbBuffer, pbBuffer, pcbActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorContext_GetExifColorSpace(IWICColorContext *iface, + UINT *pValue) +{ + FIXME("(%p,%p)\n", iface, pValue); + return E_NOTIMPL; +} + +static const IWICColorContextVtbl ColorContext_Vtbl = { + ColorContext_QueryInterface, + ColorContext_AddRef, + ColorContext_Release, + ColorContext_InitializeFromFilename, + ColorContext_InitializeFromMemory, + ColorContext_InitializeFromExifColorSpace, + ColorContext_GetType, + ColorContext_GetProfileBytes, + ColorContext_GetExifColorSpace +}; + +HRESULT ColorContext_Create(IWICColorContext **colorcontext) +{ + ColorContext *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(ColorContext)); + if (!This) return E_OUTOFMEMORY; + + This->IWICColorContext_iface.lpVtbl = &ColorContext_Vtbl; + This->ref = 1; + + *colorcontext = &This->IWICColorContext_iface; + + return S_OK; +} diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 8ba0a1d..54b390b 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -442,8 +442,8 @@ static HRESULT WINAPI ComponentFactory_CreateStream(IWICComponentFactory *iface, static HRESULT WINAPI ComponentFactory_CreateColorContext(IWICComponentFactory *iface, IWICColorContext **ppIColorContext) { - FIXME("(%p,%p): stub\n", iface, ppIColorContext); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIColorContext); + return ColorContext_Create(ppIColorContext); } static HRESULT WINAPI ComponentFactory_CreateColorTransformer(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 41d2d80..6857176 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -51,6 +51,7 @@ extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN; extern HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator) DECLSPEC_HIDDEN; extern HRESULT PaletteImpl_Create(IWICPalette **palette) DECLSPEC_HIDDEN; extern HRESULT StreamImpl_Create(IWICStream **stream) DECLSPEC_HIDDEN; +extern HRESULT ColorContext_Create(IWICColorContext **context) DECLSPEC_HIDDEN; extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride,

1 0

Hans Leidekker : windowscodecs: Implement IWICBitmapFrameDecode:: GetColorContexts for PNG images.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: cfb91803c28d6de75cedca90c1f1eb903ee8c6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb91803c28d6de75cedca90c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:07:00 2012 +0100 windowscodecs: Implement IWICBitmapFrameDecode::GetColorContexts for PNG images. --- dlls/windowscodecs/pngformat.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 686f9c6..89f092e 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -166,6 +166,7 @@ MAKE_FUNCPTR(png_error); MAKE_FUNCPTR(png_get_bit_depth); MAKE_FUNCPTR(png_get_color_type); MAKE_FUNCPTR(png_get_error_ptr); +MAKE_FUNCPTR(png_get_iCCP); MAKE_FUNCPTR(png_get_image_height); MAKE_FUNCPTR(png_get_image_width); MAKE_FUNCPTR(png_get_io_ptr); @@ -213,6 +214,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_bit_depth); LOAD_FUNCPTR(png_get_color_type); LOAD_FUNCPTR(png_get_error_ptr); + LOAD_FUNCPTR(png_get_iCCP); LOAD_FUNCPTR(png_get_image_height); LOAD_FUNCPTR(png_get_image_width); LOAD_FUNCPTR(png_get_io_ptr); @@ -624,7 +626,7 @@ static HRESULT WINAPI PngDecoder_GetPreview(IWICBitmapDecoder *iface, static HRESULT WINAPI PngDecoder_GetColorContexts(IWICBitmapDecoder *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { - FIXME("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); return WINCODEC_ERR_UNSUPPORTEDOPERATION; } @@ -844,8 +846,35 @@ static HRESULT WINAPI PngDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDec static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); + png_charp name, profile; + png_uint_32 len; + int compression_type; + HRESULT hr; + + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + + EnterCriticalSection(&This->lock); + + if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, &profile, &len)) + { + if (cCount && ppIColorContexts) + { + hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, (const BYTE *)profile, len); + if (FAILED(hr)) + { + LeaveCriticalSection(&This->lock); + return hr; + } + } + *pcActualCount = 1; + } + else + *pcActualCount = 0; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface,

1 0

Hans Leidekker : windowscodecs: Implement IWICColorContext::GetType.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: c9acbecdf0780c3bcb61a6dae48ab6345994c376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9acbecdf0780c3bcb61a6dae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:07:23 2012 +0100 windowscodecs: Implement IWICColorContext::GetType. --- dlls/windowscodecs/colorcontext.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 9517988..1c772c0 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct ColorContext { IWICColorContext IWICColorContext_iface; LONG ref; + WICColorContextType type; } ColorContext; static inline ColorContext *impl_from_IWICColorContext(IWICColorContext *iface) @@ -115,8 +116,11 @@ static HRESULT WINAPI ColorContext_InitializeFromExifColorSpace(IWICColorContext static HRESULT WINAPI ColorContext_GetType(IWICColorContext *iface, WICColorContextType *pType) { - FIXME("(%p,%p)\n", iface, pType); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%p)\n", iface, pType); + + *pType = This->type; + return S_OK; } static HRESULT WINAPI ColorContext_GetProfileBytes(IWICColorContext *iface, @@ -154,6 +158,7 @@ HRESULT ColorContext_Create(IWICColorContext **colorcontext) This->IWICColorContext_iface.lpVtbl = &ColorContext_Vtbl; This->ref = 1; + This->type = 0; *colorcontext = &This->IWICColorContext_iface;

1 0

Hans Leidekker : windowscodecs: Implement IWICColorContext:: InitializeFromMemory.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 7712c0e8cd7061e6abf3ab5ab1049b55e8949f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7712c0e8cd7061e6abf3ab5ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:07:49 2012 +0100 windowscodecs: Implement IWICColorContext::InitializeFromMemory. --- dlls/windowscodecs/colorcontext.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 1c772c0..2678fc2 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -37,6 +37,8 @@ typedef struct ColorContext { IWICColorContext IWICColorContext_iface; LONG ref; WICColorContextType type; + BYTE *profile; + UINT profile_len; } ColorContext; static inline ColorContext *impl_from_IWICColorContext(IWICColorContext *iface) @@ -86,6 +88,7 @@ static ULONG WINAPI ColorContext_Release(IWICColorContext *iface) if (ref == 0) { + HeapFree(GetProcessHeap(), 0, This->profile); HeapFree(GetProcessHeap(), 0, This); } @@ -102,8 +105,21 @@ static HRESULT WINAPI ColorContext_InitializeFromFilename(IWICColorContext *ifac static HRESULT WINAPI ColorContext_InitializeFromMemory(IWICColorContext *iface, const BYTE *pbBuffer, UINT cbBufferSize) { - FIXME("(%p,%p,%u)\n", iface, pbBuffer, cbBufferSize); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%p,%u)\n", iface, pbBuffer, cbBufferSize); + + if (This->type != WICColorContextUninitialized) + return WINCODEC_ERR_WRONGSTATE; + + HeapFree(GetProcessHeap(), 0, This->profile); + if (!(This->profile = HeapAlloc(GetProcessHeap(), 0, cbBufferSize))) + return E_OUTOFMEMORY; + + memcpy(This->profile, pbBuffer, cbBufferSize); + This->profile_len = cbBufferSize; + This->type = WICColorContextProfile; + + return S_OK; } static HRESULT WINAPI ColorContext_InitializeFromExifColorSpace(IWICColorContext *iface, @@ -159,6 +175,8 @@ HRESULT ColorContext_Create(IWICColorContext **colorcontext) This->IWICColorContext_iface.lpVtbl = &ColorContext_Vtbl; This->ref = 1; This->type = 0; + This->profile = NULL; + This->profile_len = 0; *colorcontext = &This->IWICColorContext_iface;

1 0

Hans Leidekker : windowscodecs: Implement IWICColorContext:: InitializeFromExifColorSpace.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: a7f0c14bef80e047ed209d8bf4589f59bc8e4d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f0c14bef80e047ed209d8bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:08:21 2012 +0100 windowscodecs: Implement IWICColorContext::InitializeFromExifColorSpace. --- dlls/windowscodecs/colorcontext.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 2678fc2..5c8e4db 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -39,6 +39,7 @@ typedef struct ColorContext { WICColorContextType type; BYTE *profile; UINT profile_len; + UINT exif_color_space; } ColorContext; static inline ColorContext *impl_from_IWICColorContext(IWICColorContext *iface) @@ -125,8 +126,16 @@ static HRESULT WINAPI ColorContext_InitializeFromMemory(IWICColorContext *iface, static HRESULT WINAPI ColorContext_InitializeFromExifColorSpace(IWICColorContext *iface, UINT value) { - FIXME("(%p,%u)\n", iface, value); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%u)\n", iface, value); + + if (This->type != WICColorContextUninitialized && This->type != WICColorContextExifColorSpace) + return WINCODEC_ERR_WRONGSTATE; + + This->exif_color_space = value; + This->type = WICColorContextExifColorSpace; + + return S_OK; } static HRESULT WINAPI ColorContext_GetType(IWICColorContext *iface, @@ -177,6 +186,7 @@ HRESULT ColorContext_Create(IWICColorContext **colorcontext) This->type = 0; This->profile = NULL; This->profile_len = 0; + This->exif_color_space = ~0u; *colorcontext = &This->IWICColorContext_iface;

1 0

Piotr Caban : urlmon: Update reference counter in bsc_from_bctx.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: c29c639cce45ee5967f14bc9ff240c726ad1a1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29c639cce45ee5967f14bc9f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 15 15:51:08 2012 +0100 urlmon: Update reference counter in bsc_from_bctx. --- dlls/urlmon/bindctx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 00f6844..b2d2776 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -83,6 +83,7 @@ IBindStatusCallback *bsc_from_bctx(IBindCtx *bctx) if(holder->callback) { IBindStatusCallback_Release(bsc); bsc = holder->callback; + IBindStatusCallback_AddRef(bsc); } IBindStatusCallbackEx_Release(&holder->IBindStatusCallbackEx_iface);

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DDEVICE2.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: d3b739ff31a26829db3505ab5fa4dc6fad4095f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b739ff31a26829db3505ab5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 14 23:05:56 2012 +0100 ddraw: Avoid LPDIRECT3DDEVICE2. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 5a8f576..4bec630 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -496,7 +496,7 @@ DECLARE_INTERFACE_(IDirect3DMaterial2,IUnknown) /*** IDirect3DMaterial2 methods ***/ STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; - STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE2 lpDirect3DDevice2, LPD3DMATERIALHANDLE lpHandle) PURE; + STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice2 *device, D3DMATERIALHANDLE *handle) PURE; }; #undef INTERFACE @@ -614,7 +614,7 @@ DECLARE_INTERFACE_(IDirect3DTexture2,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DTexture2 methods ***/ - STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE2 lpDirect3DDevice2, LPD3DTEXTUREHANDLE lpHandle) PURE; + STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice2 *device, D3DTEXTUREHANDLE *handle) PURE; STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE; STDMETHOD(Load)(THIS_ IDirect3DTexture2 *texture) PURE; };

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DDEVICE.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 4dd685ecbe02b11657da16fc618718f5532f965f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd685ecbe02b11657da16fc6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 14 23:05:57 2012 +0100 ddraw: Avoid LPDIRECT3DDEVICE. --- include/d3d.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 4bec630..b9fdde9 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -450,7 +450,7 @@ DECLARE_INTERFACE_(IDirect3DMaterial,IUnknown) STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; - STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DMATERIALHANDLE lpHandle) PURE; + STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice *device, D3DMATERIALHANDLE *handle) PURE; STDMETHOD(Reserve)(THIS) PURE; STDMETHOD(Unreserve)(THIS) PURE; }; @@ -571,7 +571,7 @@ DECLARE_INTERFACE_(IDirect3DTexture,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DTexture methods ***/ STDMETHOD(Initialize)(THIS_ struct IDirect3DDevice *device, IDirectDrawSurface *surface) PURE; - STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DTEXTUREHANDLE lpHandle) PURE; + STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice *device, D3DTEXTUREHANDLE *handle) PURE; STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE; STDMETHOD(Load)(THIS_ IDirect3DTexture *texture) PURE; STDMETHOD(Unload)(THIS) PURE; @@ -886,7 +886,7 @@ DECLARE_INTERFACE_(IDirect3DExecuteBuffer,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DExecuteBuffer methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DEXECUTEBUFFERDESC lpDesc) PURE; + STDMETHOD(Initialize)(THIS_ struct IDirect3DDevice *device, D3DEXECUTEBUFFERDESC *desc) PURE; STDMETHOD(Lock)(THIS_ LPD3DEXECUTEBUFFERDESC lpDesc) PURE; STDMETHOD(Unlock)(THIS) PURE; STDMETHOD(SetExecuteData)(THIS_ LPD3DEXECUTEDATA lpData) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DLIGHT.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: db3b97debf850e615658e63240acca355f320963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db3b97debf850e615658e6324… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 14 23:05:58 2012 +0100 ddraw: Avoid LPDIRECT3DLIGHT. --- include/d3d.h | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index b9fdde9..4f1ffba 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -213,7 +213,7 @@ DECLARE_INTERFACE_(IDirect3D,IUnknown) /*** IDirect3D methods ***/ STDMETHOD(Initialize)(THIS_ REFIID riid) PURE; STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; - STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport **viewport, IUnknown *outer) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lplpD3DDevice) PURE; @@ -259,7 +259,7 @@ DECLARE_INTERFACE_(IDirect3D2,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3D2 methods ***/ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; - STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial2 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport2 **viewport, IUnknown *outer) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; @@ -307,7 +307,7 @@ DECLARE_INTERFACE_(IDirect3D3,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3D3 methods ***/ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; - STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial3 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport3 **viewport, IUnknown *outer) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; @@ -662,9 +662,9 @@ DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; - STDMETHOD(AddLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(NextLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight, LPDIRECT3DLIGHT *lplpDirect3DLight, DWORD dwFlags) PURE; + STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; }; #undef INTERFACE @@ -730,9 +730,9 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; - STDMETHOD(AddLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(NextLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight, LPDIRECT3DLIGHT *lplpDirect3DLight, DWORD dwFlags) PURE; + STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; /*** IDirect3DViewport2 methods ***/ STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; @@ -806,9 +806,9 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; - STDMETHOD(AddLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(NextLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight, LPDIRECT3DLIGHT *lplpDirect3DLight, DWORD dwFlags) PURE; + STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; /*** IDirect3DViewport2 methods ***/ STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE;

1 0

Henri Verbeet : wined3d: Add support for geometry shaders to the GLSL shader backend.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 9a27b0ad71acd52855eef1a710cb487ad677f37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a27b0ad71acd52855eef1a71… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 14 23:05:59 2012 +0100 wined3d: Add support for geometry shaders to the GLSL shader backend. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 173 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/shader.c | 24 ++++++ dlls/wined3d/wined3d_private.h | 9 ++ 4 files changed, 204 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a27b0ad71acd52855eef…

1 0