wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Michael Stefaniuc : dmime: DirectMusicPerformance doesn' t supports COM aggregation.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 0ea219429fdcf65f379077b747c4694e90cbc375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea219429fdcf65f379077b74… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 2 00:05:47 2012 +0200 dmime: DirectMusicPerformance doesn't supports COM aggregation. --- dlls/dmime/performance.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 0b4bf4c..dac4a42 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1178,8 +1178,13 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicPerformanceImpl (LPCGUID lpcGUID, LPVOID TRACE("(%p,%p,%p)\n", lpcGUID, ppobj, pUnkOuter); + if (pUnkOuter) { + *ppobj = NULL; + return CLASS_E_NOAGGREGATION; + } + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicPerformance8Impl)); - if (NULL == obj) { + if (NULL == obj) { *ppobj = NULL; return E_OUTOFMEMORY; }

1 0

Michael Stefaniuc : dmime: COM cleanup for IDirectMusicPerformance8.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 5bd335668d75ed3aa2b272744237d4bb481404bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd335668d75ed3aa2b272744… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 2 00:03:00 2012 +0200 dmime: COM cleanup for IDirectMusicPerformance8. --- dlls/dmime/dmime_private.h | 2 +- dlls/dmime/performance.c | 409 ++++++++++++++++++++++++++++++-------------- 2 files changed, 278 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5bd335668d75ed3aa2b27…

1 0

Detlef Riekenberg : comdlg32: Remove an unused 16-bit macro.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: f726e0c00fa9b2e0adf36d9d3c094d2b1f4a20f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f726e0c00fa9b2e0adf36d9d3… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Apr 1 23:16:12 2012 +0200 comdlg32: Remove an unused 16-bit macro. --- dlls/comdlg32/cdlg.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index 91491d3..1a47524 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -31,9 +31,6 @@ extern HINSTANCE COMDLG32_hInstance DECLSPEC_HIDDEN; void COMDLG32_SetCommDlgExtendedError(DWORD err) DECLSPEC_HIDDEN; LPVOID COMDLG32_AllocMem(int size) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN; -/* handle<-handle16 conversion */ -#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) - /* Find/Replace local definitions */ #define FR_WINE_UNICODE 0x80000000

1 0

Józef Kucia : include/d3dx9: Fix spelling errors.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 8be9d69909ee5b0e0d788b64f7bb418b62c11f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be9d69909ee5b0e0d788b64f… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Apr 1 15:47:24 2012 +0200 include/d3dx9: Fix spelling errors. --- include/d3dx9mesh.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index f7be81e..220a5ff 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -113,8 +113,8 @@ typedef enum _D3DXTANGENT D3DXTANGENT_WRAP_UV = 0x0003, D3DXTANGENT_DONT_NORMALIZE_PARTIALS = 0x0004, D3DXTANGENT_DONT_ORTHOGONALIZE = 0x0008, - D3DXTANGENT_ORTHOGANALIZE_FROM_V = 0x0010, - D3DXTANGENT_ORTHOGANALIZE_FROM_U = 0x0020, + D3DXTANGENT_ORTHOGONALIZE_FROM_V = 0x0010, + D3DXTANGENT_ORTHOGONALIZE_FROM_U = 0x0020, D3DXTANGENT_WEIGHT_BY_AREA = 0x0040, D3DXTANGENT_WEIGHT_EQUAL = 0x0080, D3DXTANGENT_WIND_CW = 0x0100,

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DQuery9Impl_QueryInterface ().
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: a84eaf3d2236836ea0fec6fce5ee216da38d7260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84eaf3d2236836ea0fec6fce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 1 13:12:05 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DQuery9Impl_QueryInterface(). --- dlls/d3d9/query.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 4252332..9617fa3 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -33,18 +33,18 @@ static inline IDirect3DQuery9Impl *impl_from_IDirect3DQuery9(IDirect3DQuery9 *if static HRESULT WINAPI IDirect3DQuery9Impl_QueryInterface(IDirect3DQuery9 *iface, REFIID riid, void **ppobj) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DQuery9)) { + if (IsEqualGUID(riid, &IID_IDirect3DQuery9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DQuery9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DStateBlock9Impl_QueryInterface ().
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 71aa7cd81edcfc4feae7cc0cfcbf9fcb27dfa542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71aa7cd81edcfc4feae7cc0cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 1 13:12:04 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DStateBlock9Impl_QueryInterface(). --- dlls/d3d9/stateblock.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 6ecf596..9123a1a 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -33,18 +33,18 @@ static inline IDirect3DStateBlock9Impl *impl_from_IDirect3DStateBlock9(IDirect3D static HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(IDirect3DStateBlock9 *iface, REFIID riid, void **ppobj) { - IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DStateBlock9)) { + if (IsEqualGUID(riid, &IID_IDirect3DStateBlock9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DStateBlock9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : ddraw: The texture interface shares its refcount with the surface interface version used to create the surface .
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 814fd3b39efa7e2e99d598212648786bf301b914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=814fd3b39efa7e2e99d598212… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 1 13:12:03 2012 +0200 ddraw: The texture interface shares its refcount with the surface interface version used to create the surface. This probably implies that on native the texture interface is part of a separate object that's aggregated by the surface. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 700a781..fa0f144 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -151,6 +151,7 @@ struct ddraw_surface LONG ref7, ref4, ref3, ref2, ref1, iface_count, gamma_count; IUnknown *ifaceToRelease; + IUnknown *texture_outer; int version; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d8c43a1..860a80d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -429,7 +429,7 @@ static ULONG WINAPI d3d_texture2_AddRef(IDirect3DTexture2 *iface) TRACE("iface %p.\n", iface); - return ddraw_surface1_AddRef(&surface->IDirectDrawSurface_iface); + return IUnknown_AddRef(surface->texture_outer); } static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) @@ -438,7 +438,7 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) TRACE("iface %p.\n", iface); - return ddraw_surface1_AddRef(&surface->IDirectDrawSurface_iface); + return IUnknown_AddRef(surface->texture_outer); } /***************************************************************************** @@ -659,18 +659,20 @@ static ULONG WINAPI ddraw_gamma_control_Release(IDirectDrawGammaControl *iface) static ULONG WINAPI d3d_texture2_Release(IDirect3DTexture2 *iface) { - struct ddraw_surface *This = impl_from_IDirect3DTexture2(iface); + struct ddraw_surface *surface = impl_from_IDirect3DTexture2(iface); + TRACE("iface %p.\n", iface); - return ddraw_surface1_Release(&This->IDirectDrawSurface_iface); + return IUnknown_Release(surface->texture_outer); } static ULONG WINAPI d3d_texture1_Release(IDirect3DTexture *iface) { - struct ddraw_surface *This = impl_from_IDirect3DTexture(iface); + struct ddraw_surface *surface = impl_from_IDirect3DTexture(iface); + TRACE("iface %p.\n", iface); - return ddraw_surface1_Release(&This->IDirectDrawSurface_iface); + return IUnknown_Release(surface->texture_outer); } /***************************************************************************** @@ -5733,14 +5735,17 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, if (version == 7) { surface->ref7 = 1; + surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface7_iface; } else if (version == 4) { surface->ref4 = 1; + surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface4_iface; } else { surface->ref1 = 1; + surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface_iface; } copy_to_surfacedesc2(&surface->surface_desc, desc);

1 0

Henri Verbeet : ddraw: The texture interfaces can' t be queried from version 7 surfaces.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 7dd4f439e33c37d6a1f2afd1febee7062886b751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd4f439e33c37d6a1f2afd1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 1 13:12:02 2012 +0200 ddraw: The texture interfaces can't be queried from version 7 surfaces. --- dlls/ddraw/surface.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0109449..d8c43a1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -222,21 +222,21 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, return E_NOINTERFACE; } - if (IsEqualGUID( &IID_IDirect3DTexture2, riid) - || IsEqualGUID(&IID_IDirect3DTexture, riid)) + if (This->version != 7) { - if (IsEqualGUID( &IID_IDirect3DTexture, riid )) + if (IsEqualGUID(&IID_IDirect3DTexture2, riid)) { - *obj = &This->IDirect3DTexture_iface; - TRACE(" returning Direct3DTexture interface at %p.\n", *obj); + IDirect3DTexture2_AddRef(&This->IDirect3DTexture2_iface); + *obj = &This->IDirect3DTexture2_iface; + return S_OK; } - else + + if (IsEqualGUID( &IID_IDirect3DTexture, riid )) { - *obj = &This->IDirect3DTexture2_iface; - TRACE(" returning Direct3DTexture2 interface at %p.\n", *obj); + IDirect3DTexture2_AddRef(&This->IDirect3DTexture_iface); + *obj = &This->IDirect3DTexture_iface; + return S_OK; } - IUnknown_AddRef( (IUnknown *) *obj); - return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));

1 0

Henri Verbeet : ddraw: Explicitly check for the IDirectDrawColorControl interface in ddraw_surface7_QueryInterface ().
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 8481625fa4db17dc29f69dc8f4ec2e82550b13d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8481625fa4db17dc29f69dc8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 1 13:12:01 2012 +0200 ddraw: Explicitly check for the IDirectDrawColorControl interface in ddraw_surface7_QueryInterface(). --- dlls/ddraw/surface.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 202eb4d..0109449 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -191,6 +191,13 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, return S_OK; } + if (IsEqualGUID(riid, &IID_IDirectDrawColorControl)) + { + WARN("Color control not implemented.\n"); + *obj = NULL; + return E_NOINTERFACE; + } + if (IsEqualGUID(riid, &IID_D3DDEVICE_WineD3D) || IsEqualGUID(riid, &IID_IDirect3DHALDevice) || IsEqualGUID(riid, &IID_IDirect3DRGBDevice))

1 0

Jeff Latimer : ws2_32: Make a common fixme more meaningful and return success.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: a84f7204af49af457e01023ac3aa7fbf95443a99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84f7204af49af457e01023ac… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sun Apr 1 18:23:17 2012 +1000 ws2_32: Make a common fixme more meaningful and return success. --- dlls/ws2_32/socket.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d3a4590..228d101 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4298,6 +4298,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_DONTFRAG: FIXME("IPV6_DONTFRAG is silently ignored!\n"); return 0; + case WS_IPV6_PROTECTION_LEVEL: + FIXME("IPV6_PROTECTION_LEVEL is ignored!\n"); + return 0; default: FIXME("Unknown IPPROTO_IPV6 optname 0x%08x\n", optname); return SOCKET_ERROR;

1 0

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