wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Henri Verbeet : d3d11: Make "layers" static in D3D11CoreRegisterLayers().
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: b87eb8d94722c021105f28f8487ed9ec992d670d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b87eb8d94722c021105f28f84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 12:48:47 2015 +0200 d3d11: Make "layers" static in D3D11CoreRegisterLayers(). --- dlls/d3d11/d3d11_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index e3d09a1..40c4a5f 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -103,7 +103,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba HRESULT WINAPI D3D11CoreRegisterLayers(void) { - const struct dxgi_device_layer layers[] = + static const struct dxgi_device_layer layers[] = { {DXGI_DEVICE_LAYER_D3D10_DEVICE, layer_init, layer_get_size, layer_create}, };

1 0

Henri Verbeet : d3d11: Get rid of a redundant include.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 1a23e2fa0b7aafc1d24ea1a9ba85d418e919329b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a23e2fa0b7aafc1d24ea1a9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 12:48:46 2015 +0200 d3d11: Get rid of a redundant include. d3d11_1.h includes d3d11.h, which includes d3d10_1.h. --- dlls/d3d11/d3d11_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index f7f6729..98c0eb1 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -29,7 +29,6 @@ #include "winuser.h" #include "objbase.h" -#include "d3d10_1.h" #include "d3d11_1.h" #ifdef D3D11_INIT_GUID #include "initguid.h"

1 0

Henri Verbeet : d3d10core: Get rid of some redundant includes.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 662cfd41443cd3e47edf2a99cb7ebb95b67f00f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=662cfd41443cd3e47edf2a99c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 12:48:45 2015 +0200 d3d10core: Get rid of some redundant includes. d3d11.h includes d3d10_1.h, which includes d3d10.h. --- dlls/d3d10core/d3d10core_main.c | 1 - dlls/d3d10core/tests/device.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index fec2786..44f1e29 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -22,7 +22,6 @@ #include "initguid.h" #define COBJMACROS -#include "d3d10_1.h" #include "d3d11.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 47719e4..b35801c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -18,7 +18,6 @@ #define COBJMACROS #include "initguid.h" -#include "d3d10.h" #include "d3d11.h" #include "wine/test.h" #include <limits.h>

1 0

Jacek Caban : ntdll: Added new pid debug channel to append process id to debug output.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 719a7d32c5f016084e254df29f32e3cba6f634de URL: http://source.winehq.org/git/wine.git/?a=commit;h=719a7d32c5f016084e254df29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 25 12:31:21 2015 +0200 ntdll: Added new pid debug channel to append process id to debug output. --- dlls/ntdll/debugtools.c | 3 +++ libs/wine/debug.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index cbbf744..eb43224 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -39,6 +39,7 @@ #include "ntdll_misc.h" WINE_DECLARE_DEBUG_CHANNEL(tid); +WINE_DECLARE_DEBUG_CHANNEL(pid); WINE_DECLARE_DEBUG_CHANNEL(timestamp); static struct __wine_debug_functions default_funcs; @@ -170,6 +171,8 @@ static int NTDLL_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_chan ULONG ticks = NtGetTickCount(); ret = wine_dbg_printf( "%3u.%03u:", ticks / 1000, ticks % 1000 ); } + if (TRACE_ON(pid)) + ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); if (TRACE_ON(tid)) ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); if (cls < sizeof(classes)/sizeof(classes[0])) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 548ef22..8b04ef9 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -35,6 +35,7 @@ #if defined(__MINGW32__) || defined(_MSC_VER) WINE_DECLARE_DEBUG_CHANNEL(tid); +WINE_DECLARE_DEBUG_CHANNEL(pid); #endif static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; @@ -407,6 +408,8 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch int ret = 0; #if defined(__MINGW32__) || defined(_MSC_VER) + if (TRACE_ON(pid)) + ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); if (TRACE_ON(tid)) ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); #endif

1 0

Jacek Caban : d3d11.idl: Added some missing declarations.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 4ca5a3567005ff000ddbc6ed21728ca65598cc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ca5a3567005ff000ddbc6ed2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 25 12:27:52 2015 +0200 d3d11.idl: Added some missing declarations. --- include/d3d11.idl | 393 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 393 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ca5a3567005ff000ddbc…

1 0

Aaryaman Vasishta : d3drm: Add stubs for IDirect3DRMTexture methods.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 9eb5361d5aaa63ffef637e7cc405d7a030b32fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb5361d5aaa63ffef637e7cc… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Aug 24 19:46:38 2015 +0530 d3drm: Add stubs for IDirect3DRMTexture methods. --- dlls/d3drm/texture.c | 312 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 307 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9eb5361d5aaa63ffef637…

1 0

Aaryaman Vasishta : d3drm: Thunk relevant texture methods from version 2-> 3.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: a883c6207d4283146da38cf858c5014ced8c6ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a883c6207d4283146da38cf85… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Aug 24 19:46:37 2015 +0530 d3drm: Thunk relevant texture methods from version 2->3. --- dlls/d3drm/texture.c | 114 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 76 insertions(+), 38 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index cc6bc49..a00b5da 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -77,9 +77,11 @@ static ULONG WINAPI d3drm_texture2_Release(IDirect3DRMTexture2 *iface) static HRESULT WINAPI d3drm_texture2_Clone(IDirect3DRMTexture2 *iface, IUnknown *outer, REFIID iid, void **out) { - FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, outer %p, iid %s, out %p.\n", iface, outer, debugstr_guid(iid), out); + + return IDirect3DRMTexture3_Clone(&texture->IDirect3DRMTexture3_iface, outer, iid, out); } static HRESULT WINAPI d3drm_texture2_AddDestroyCallback(IDirect3DRMTexture2 *iface, @@ -118,16 +120,20 @@ static DWORD WINAPI d3drm_texture2_GetAppData(IDirect3DRMTexture2 *iface) static HRESULT WINAPI d3drm_texture2_SetName(IDirect3DRMTexture2 *iface, const char *name) { - FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + + return IDirect3DRMTexture3_SetName(&texture->IDirect3DRMTexture3_iface, name); } static HRESULT WINAPI d3drm_texture2_GetName(IDirect3DRMTexture2 *iface, DWORD *size, char *name) { - FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, size %p, name %p.\n", iface, size, name); + + return IDirect3DRMTexture3_GetName(&texture->IDirect3DRMTexture3_iface, size, name); } static HRESULT WINAPI d3drm_texture2_GetClassName(IDirect3DRMTexture2 *iface, DWORD *size, char *name) @@ -170,107 +176,137 @@ static HRESULT WINAPI d3drm_texture2_Changed(IDirect3DRMTexture2 *iface, BOOL pi static HRESULT WINAPI d3drm_texture2_SetColors(IDirect3DRMTexture2 *iface, DWORD max_colors) { - FIXME("iface %p, max_colors %u stub!\n", iface, max_colors); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, max_colors %u.\n", iface, max_colors); + + return IDirect3DRMTexture3_SetColors(&texture->IDirect3DRMTexture3_iface, max_colors); } static HRESULT WINAPI d3drm_texture2_SetShades(IDirect3DRMTexture2 *iface, DWORD max_shades) { - FIXME("iface %p, max_shades %u stub!\n", iface, max_shades); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, max_shades %u.\n", iface, max_shades); + + return IDirect3DRMTexture3_SetShades(&texture->IDirect3DRMTexture3_iface, max_shades); } static HRESULT WINAPI d3drm_texture2_SetDecalSize(IDirect3DRMTexture2 *iface, D3DVALUE width, D3DVALUE height) { - FIXME("iface %p, width %.8e, height %.8e stub!\n", iface, width, height); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, width %.8e, height %.8e stub!\n", iface, width, height); + + return IDirect3DRMTexture3_SetDecalSize(&texture->IDirect3DRMTexture3_iface, width, height); } static HRESULT WINAPI d3drm_texture2_SetDecalOrigin(IDirect3DRMTexture2 *iface, LONG x, LONG y) { - FIXME("iface %p, x %d, y %d stub!\n", iface, x, y); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, x %d, y %d.\n", iface, x, y); + + return IDirect3DRMTexture3_SetDecalOrigin(&texture->IDirect3DRMTexture3_iface, x, y); } static HRESULT WINAPI d3drm_texture2_SetDecalScale(IDirect3DRMTexture2 *iface, DWORD scale) { - FIXME("iface %p, scale %u stub!\n", iface, scale); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, scale %u.\n", iface, scale); + + return IDirect3DRMTexture3_SetDecalScale(&texture->IDirect3DRMTexture3_iface, scale); } static HRESULT WINAPI d3drm_texture2_SetDecalTransparency(IDirect3DRMTexture2 *iface, BOOL transparency) { - FIXME("iface %p, transparency %#x stub!\n", iface, transparency); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, transparency %#x.\n", iface, transparency); + + return IDirect3DRMTexture3_SetDecalTransparency(&texture->IDirect3DRMTexture3_iface, transparency); } static HRESULT WINAPI d3drm_texture2_SetDecalTransparentColor(IDirect3DRMTexture2 *iface, D3DCOLOR color) { - FIXME("iface %p, color 0x%08x stub!\n", iface, color); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, color 0x%08x.\n", iface, color); + + return IDirect3DRMTexture3_SetDecalTransparentColor(&texture->IDirect3DRMTexture3_iface, color); } static HRESULT WINAPI d3drm_texture2_GetDecalSize(IDirect3DRMTexture2 *iface, D3DVALUE *width, D3DVALUE *height) { - FIXME("iface %p, width %p, height %p stub!\n", iface, width, height); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, width %p, height %p.\n", iface, width, height); + + return IDirect3DRMTexture3_GetDecalSize(&texture->IDirect3DRMTexture3_iface, width, height); } static HRESULT WINAPI d3drm_texture2_GetDecalOrigin(IDirect3DRMTexture2 *iface, LONG *x, LONG *y) { - FIXME("iface %p, x %p, y %p stub!\n", iface, x, y); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, x %p, y %p.\n", iface, x, y); + + return IDirect3DRMTexture3_GetDecalOrigin(&texture->IDirect3DRMTexture3_iface, x, y); } static D3DRMIMAGE * WINAPI d3drm_texture2_GetImage(IDirect3DRMTexture2 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return NULL; + TRACE("iface %p.\n", iface); + + return IDirect3DRMTexture3_GetImage(&texture->IDirect3DRMTexture3_iface); } static DWORD WINAPI d3drm_texture2_GetShades(IDirect3DRMTexture2 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return 0; + TRACE("iface %p.\n", iface); + + return IDirect3DRMTexture3_GetShades(&texture->IDirect3DRMTexture3_iface); } static DWORD WINAPI d3drm_texture2_GetColors(IDirect3DRMTexture2 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return 0; + TRACE("iface %p.\n", iface); + + return IDirect3DRMTexture3_GetColors(&texture->IDirect3DRMTexture3_iface); } static DWORD WINAPI d3drm_texture2_GetDecalScale(IDirect3DRMTexture2 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return 0; + TRACE("iface %p.\n", iface); + + return IDirect3DRMTexture3_GetDecalScale(&texture->IDirect3DRMTexture3_iface); } static BOOL WINAPI d3drm_texture2_GetDecalTransparency(IDirect3DRMTexture2 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return FALSE; + TRACE("iface %p.\n", iface); + + return IDirect3DRMTexture3_GetDecalTransparency(&texture->IDirect3DRMTexture3_iface); } static D3DCOLOR WINAPI d3drm_texture2_GetDecalTransparentColor(IDirect3DRMTexture2 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return 0; + TRACE("iface %p.\n", iface); + + return IDirect3DRMTexture3_GetDecalTransparentColor(&texture->IDirect3DRMTexture3_iface); } static HRESULT WINAPI d3drm_texture2_InitFromImage(IDirect3DRMTexture2 *iface, D3DRMIMAGE *image) @@ -291,9 +327,11 @@ static HRESULT WINAPI d3drm_texture2_InitFromResource2(IDirect3DRMTexture2 *ifac static HRESULT WINAPI d3drm_texture2_GenerateMIPMap(IDirect3DRMTexture2 *iface, DWORD flags) { - FIXME("iface %p, flags %#x stub!\n", iface, flags); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("iface %p, flags %#x.\n", iface, flags); + + return IDirect3DRMTexture3_GenerateMIPMap(&texture->IDirect3DRMTexture3_iface, flags); } static const struct IDirect3DRMTexture2Vtbl d3drm_texture2_vtbl =

1 0

Aaryaman Vasishta : d3drm: Fix spelling mistake in Set/ GetDecalTransparentColor macros.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 364069fe77cec8a9719ef4f89d222c6f9093f7de URL: http://source.winehq.org/git/wine.git/?a=commit;h=364069fe77cec8a9719ef4f89… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Aug 24 19:46:36 2015 +0530 d3drm: Fix spelling mistake in Set/GetDecalTransparentColor macros. --- include/d3drmobj.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 942c69a..28340fb 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -3284,7 +3284,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual) #define IDirect3DRMTexture_SetDecalOrigin(p,a,b) (p)->SetDecalOrigin(a,b) #define IDirect3DRMTexture_SetDecalScale(p,a) (p)->SetDecalScale(a) #define IDirect3DRMTexture_SetDecalTransparency(p,a) (p)->SetDecalTransparency(a) -#define IDirect3DRMTexture_SetDecalTransparencyColor(p,a) (p)->SetDecalTransparentColor(a) +#define IDirect3DRMTexture_SetDecalTransparentColor(p,a) (p)->SetDecalTransparentColor(a) #define IDirect3DRMTexture_GetDecalSize(p,a,b) (p)->GetDecalSize(a,b) #define IDirect3DRMTexture_GetDecalOrigin(p,a,b) (p)->GetDecalOrigin(a,b) #define IDirect3DRMTexture_GetImage(p) (p)->GetImage() @@ -3292,7 +3292,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual) #define IDirect3DRMTexture_GetColors(p) (p)->GetColors() #define IDirect3DRMTexture_GetDecalScale(p) (p)->GetDecalScale() #define IDirect3DRMTexture_GetDecalTransparency(p) (p)->GetDecalTransparency() -#define IDirect3DRMTexture_GetDecalTransparencyColor(p) (p)->GetDecalTransparencyColor() +#define IDirect3DRMTexture_GetDecalTransparentColor(p) (p)->GetDecalTransparentColor() #endif /***************************************************************************** @@ -3404,7 +3404,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) #define IDirect3DRMTexture2_SetDecalOrigin(p,a,b) (p)->SetDecalOrigin(a,b) #define IDirect3DRMTexture2_SetDecalScale(p,a) (p)->SetDecalScale(a) #define IDirect3DRMTexture2_SetDecalTransparency(p,a) (p)->SetDecalTransparency(a) -#define IDirect3DRMTexture2_SetDecalTransparencyColor(p,a) (p)->SetDecalTransparentColor(a) +#define IDirect3DRMTexture2_SetDecalTransparentColor(p,a) (p)->SetDecalTransparentColor(a) #define IDirect3DRMTexture2_GetDecalSize(p,a,b) (p)->GetDecalSize(a,b) #define IDirect3DRMTexture2_GetDecalOrigin(p,a,b) (p)->GetDecalOrigin(a,b) #define IDirect3DRMTexture2_GetImage(p) (p)->GetImage() @@ -3412,7 +3412,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) #define IDirect3DRMTexture2_GetColors(p) (p)->GetColors() #define IDirect3DRMTexture2_GetDecalScale(p) (p)->GetDecalScale() #define IDirect3DRMTexture2_GetDecalTransparency(p) (p)->GetDecalTransparency() -#define IDirect3DRMTexture2_GetDecalTransparencyColor(p) (p)->GetDecalTransparencyColor() +#define IDirect3DRMTexture2_GetDecalTransparentColor(p) (p)->GetDecalTransparentColor() /*** IDirect3DRMTexture2 methods ***/ #define IDirect3DRMTexture2_InitFromImage(p,a) (p)->InitFromImage(a) #define IDirect3DRMTexture2_InitFromResource2(p,a,b,c) (p)->InitFromResource2(a,b,c) @@ -3494,7 +3494,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) #define IDirect3DRMTexture3_SetDecalOrigin(p,a,b) (p)->lpVtbl->SetDecalOrigin(p,a,b) #define IDirect3DRMTexture3_SetDecalScale(p,a) (p)->lpVtbl->SetDecalScale(p,a) #define IDirect3DRMTexture3_SetDecalTransparency(p,a) (p)->lpVtbl->SetDecalTransparency(p,a) -#define IDirect3DRMTexture3_SetDecalTransparencyColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a) +#define IDirect3DRMTexture3_SetDecalTransparentColor(p,a) (p)->lpVtbl->SetDecalTransparentColor(p,a) #define IDirect3DRMTexture3_GetDecalSize(p,a,b) (p)->lpVtbl->GetDecalSize(p,a,b) #define IDirect3DRMTexture3_GetDecalOrigin(p,a,b) (p)->lpVtbl->GetDecalOrigin(p,a,b) #define IDirect3DRMTexture3_GetImage(p) (p)->lpVtbl->GetImage(p) @@ -3502,7 +3502,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) #define IDirect3DRMTexture3_GetColors(p) (p)->lpVtbl->GetColors(p) #define IDirect3DRMTexture3_GetDecalScale(p) (p)->lpVtbl->GetDecalScale(p) #define IDirect3DRMTexture3_GetDecalTransparency(p) (p)->lpVtbl->GetDecalTransparency(p) -#define IDirect3DRMTexture3_GetDecalTransparencyColor(p) (p)->lpVtbl->GetDecalTransparencyColor(p) +#define IDirect3DRMTexture3_GetDecalTransparentColor(p) (p)->lpVtbl->GetDecalTransparentColor(p) #define IDirect3DRMTexture3_InitFromImage(p,a) (p)->lpVtbl->InitFromImage(p,a) #define IDirect3DRMTexture3_InitFromResource2(p,a,b,c) (p)->lpVtbl->InitFromResource2(p,a,b,c) #define IDirect3DRMTexture3_GenerateMIPMap(p,a) (p)->lpVtbl->GenerateMIPMap(p,a)

1 0

Aaryaman Vasishta : d3drm: Thunk IDirect3DRMTexture2:: QueryInterface to version 3.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 895e4a1f661172c7b18beb4ae3ccaa81a4e04537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=895e4a1f661172c7b18beb4ae… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Aug 24 19:46:35 2015 +0530 d3drm: Thunk IDirect3DRMTexture2::QueryInterface to version 3. --- dlls/d3drm/texture.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 3b4ee9e..cc6bc49 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -53,25 +53,7 @@ static HRESULT WINAPI d3drm_texture2_QueryInterface(IDirect3DRMTexture2 *iface, TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2) - || IsEqualGUID(riid, &IID_IDirect3DRMTexture) - || IsEqualGUID(riid, &IID_IUnknown)) - { - *out = &texture->IDirect3DRMTexture2_iface; - } - else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)) - { - *out = &texture->IDirect3DRMTexture3_iface; - } - else - { - *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown *)*out); - return S_OK; + return IDirect3DRMTexture3_QueryInterface(&texture->IDirect3DRMTexture3_iface, riid, out); } static ULONG WINAPI d3drm_texture2_AddRef(IDirect3DRMTexture2 *iface)

1 0

Aaryaman Vasishta : d3drm: Thunk IDirect3DRMTexture2:: Release to version 3.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: ed411d970150338b01999b2a72ba43b5c93a04d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed411d970150338b01999b2a7… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Aug 24 19:46:34 2015 +0530 d3drm: Thunk IDirect3DRMTexture2::Release to version 3. --- dlls/d3drm/texture.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 6bdf7c2..3b4ee9e 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -86,14 +86,10 @@ static ULONG WINAPI d3drm_texture2_AddRef(IDirect3DRMTexture2 *iface) static ULONG WINAPI d3drm_texture2_Release(IDirect3DRMTexture2 *iface) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); - ULONG refcount = InterlockedDecrement(&texture->ref); - - TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!refcount) - HeapFree(GetProcessHeap(), 0, texture); + TRACE("iface %p.\n", iface); - return refcount; + return IDirect3DRMTexture3_Release(&texture->IDirect3DRMTexture3_iface); } static HRESULT WINAPI d3drm_texture2_Clone(IDirect3DRMTexture2 *iface,

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
51
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 August 2015