April 2012 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : gdi32: Refuse to load a large .fot file earlier.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 62b9c26bb542581d62b6214bf0143dd32a1d3fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b9c26bb542581d62b6214bf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 2 14:40:50 2012 +0900 gdi32: Refuse to load a large .fot file earlier. --- dlls/gdi32/font.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 230d421..f5c44d8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3454,10 +3454,15 @@ static void *map_file( const WCHAR *filename, LARGE_INTEGER *size ) file = CreateFileW( filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); if (file == INVALID_HANDLE_VALUE) return NULL; - GetFileSizeEx( file, size ); + if (!GetFileSizeEx( file, size ) || size->u.HighPart) + { + CloseHandle( file ); + return NULL; + } + mapping = CreateFileMappingW( file, NULL, PAGE_READONLY, 0, 0, NULL ); CloseHandle( file ); - if (mapping == NULL) return NULL; + if (!mapping) return NULL; ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); CloseHandle( mapping ); @@ -3478,7 +3483,6 @@ static WCHAR *get_scalable_filename( const WCHAR *res ) if (!ptr) return NULL; - if (size.u.HighPart) goto fail; if (size.u.LowPart < sizeof( *dos )) goto fail; dos = (const IMAGE_DOS_HEADER *)ptr; if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto fail;

1 0

Michael Stefaniuc : dmime: Move struct IDirectMusicPerformance8Impl to the c file.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: a84245463ad09b0ac2a4eeebb385b82521c61ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84245463ad09b0ac2a4eeebb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 2 00:08:57 2012 +0200 dmime: Move struct IDirectMusicPerformance8Impl to the c file. --- dlls/dmime/dmime_private.h | 42 ------------------------------------------ dlls/dmime/performance.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 42 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 95c3324..de6533d 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -46,7 +46,6 @@ /***************************************************************************** * Interfaces */ -typedef struct IDirectMusicPerformance8Impl IDirectMusicPerformance8Impl; typedef struct IDirectMusicSegment8Impl IDirectMusicSegment8Impl; typedef struct IDirectMusicSegmentState8Impl IDirectMusicSegmentState8Impl; typedef struct IDirectMusicGraphImpl IDirectMusicGraphImpl; @@ -124,47 +123,6 @@ typedef struct DMUSIC_PRIVATE_PCHANNEL_ { } DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL; /***************************************************************************** - * IDirectMusicPerformance8Impl implementation structure - */ -struct IDirectMusicPerformance8Impl { - /* IUnknown fields */ - IDirectMusicPerformance8 IDirectMusicPerformance8_iface; - LONG ref; - - /* IDirectMusicPerformanceImpl fields */ - IDirectMusic8* pDirectMusic; - IDirectSound* pDirectSound; - IDirectMusicGraph* pToolGraph; - DMUS_AUDIOPARAMS pParams; - - /* global parameters */ - BOOL fAutoDownload; - char cMasterGrooveLevel; - float fMasterTempo; - long lMasterVolume; - - /* performance channels */ - DMUSIC_PRIVATE_PCHANNEL PChannel[32]; - - /* IDirectMusicPerformance8Impl fields */ - IDirectMusicAudioPath* pDefaultPath; - HANDLE hNotification; - REFERENCE_TIME rtMinimum; - - REFERENCE_TIME rtLatencyTime; - DWORD dwBumperLength; - DWORD dwPrepareTime; - /** Message Processing */ - HANDLE procThread; - DWORD procThreadId; - REFERENCE_TIME procThreadStartTime; - BOOL procThreadTicStarted; - CRITICAL_SECTION safe; - struct DMUS_PMSGItem* head; - struct DMUS_PMSGItem* imm_head; -}; - -/***************************************************************************** * IDirectMusicSegment8Impl implementation structure */ struct IDirectMusicSegment8Impl { diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index dac4a42..bc44fa5 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -22,6 +22,38 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); +typedef struct IDirectMusicPerformance8Impl { + IDirectMusicPerformance8 IDirectMusicPerformance8_iface; + LONG ref; + /* IDirectMusicPerformanceImpl fields */ + IDirectMusic8 *pDirectMusic; + IDirectSound *pDirectSound; + IDirectMusicGraph *pToolGraph; + DMUS_AUDIOPARAMS pParams; + /* global parameters */ + BOOL fAutoDownload; + char cMasterGrooveLevel; + float fMasterTempo; + long lMasterVolume; + /* performance channels */ + DMUSIC_PRIVATE_PCHANNEL PChannel[32]; + /* IDirectMusicPerformance8Impl fields */ + IDirectMusicAudioPath *pDefaultPath; + HANDLE hNotification; + REFERENCE_TIME rtMinimum; + REFERENCE_TIME rtLatencyTime; + DWORD dwBumperLength; + DWORD dwPrepareTime; + /** Message Processing */ + HANDLE procThread; + DWORD procThreadId; + REFERENCE_TIME procThreadStartTime; + BOOL procThreadTicStarted; + CRITICAL_SECTION safe; + struct DMUS_PMSGItem *head; + struct DMUS_PMSGItem *imm_head; +} IDirectMusicPerformance8Impl; + typedef struct DMUS_PMSGItem DMUS_PMSGItem; struct DMUS_PMSGItem { DMUS_PMSGItem* next;

1 0

Detlef Riekenberg : comdlg32: Remove an unused 16-bit macro.
by Alexandre Julliard April 2, 2012

April 2, 2012

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

Dmitry Timoshkov : gdi32: Remove a no longer needed shortcut in CreateScalableFontResource test.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: b2af51956dd065e63e9935f9337b77d48095b949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2af51956dd065e63e9935f93… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 2 14:40:38 2012 +0900 gdi32: Remove a no longer needed shortcut in CreateScalableFontResource test. --- dlls/gdi32/tests/font.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 38a8544..93f174a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4003,9 +4003,6 @@ static void test_CreateScalableFontResource(void) todo_wine ok(!ret, "RemoveFontResourceEx() should fail\n"); - /* FIXME: since CreateScalableFontResource is a stub further testing is impossible */ - if (ret) return; - /* test public font resource */ SetLastError(0xdeadbeef); ret = CreateScalableFontResource(0, fot_name, ttf_name, NULL); @@ -4022,11 +4019,11 @@ todo_wine ok(ret, "font wine_test should be enumerated\n"); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); +todo_wine ok(!ret, "RemoveFontResourceEx() with not matching flags should fail\n"); SetLastError(0xdeadbeef); ret = pRemoveFontResourceExA(fot_name, 0, 0); -todo_wine ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test");

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DQuery9Impl_QueryInterface ().
by Alexandre Julliard April 2, 2012

April 2, 2012

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

Vincent Povirk : gdiplus: Implement GdipGetPathGradientTransform.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 52bf030b84c502bc67bcf5a082a4fcbf98c7d571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52bf030b84c502bc67bcf5a08… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 31 12:59:24 2012 -0500 gdiplus: Implement GdipGetPathGradientTransform. --- dlls/gdiplus/brush.c | 29 ++++++++++++++++++++++++----- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 12 ++++++++++++ 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 07d32dc..aa02598 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -78,6 +78,14 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) return stat; } + stat = GdipCloneMatrix(src->transform, &dest->transform); + + if(stat != Ok){ + GdipDeletePath(dest->path); + GdipFree(dest); + return stat; + } + /* blending */ count = src->blendcount; dest->blendcount = count; @@ -94,6 +102,7 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) if(!dest->blendfac || !dest->blendpos || !dest->surroundcolors || (pcount && (!dest->pblendcolor || !dest->pblendpos))){ GdipDeletePath(dest->path); + GdipDeleteMatrix(dest->transform); GdipFree(dest->blendfac); GdipFree(dest->blendpos); GdipFree(dest->surroundcolors); @@ -503,6 +512,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect* rect static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) { GpRectF bounds; + GpStatus stat; if(!path || !grad) return InvalidParameter; @@ -515,10 +525,18 @@ static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) return OutOfMemory; } + stat = GdipCreateMatrix(&(*grad)->transform); + if (stat != Ok) + { + GdipFree(*grad); + return stat; + } + (*grad)->blendfac = GdipAlloc(sizeof(REAL)); (*grad)->blendpos = GdipAlloc(sizeof(REAL)); (*grad)->surroundcolors = GdipAlloc(sizeof(ARGB)); if(!(*grad)->blendfac || !(*grad)->blendpos || !(*grad)->surroundcolors){ + GdipDeleteMatrix((*grad)->transform); GdipFree((*grad)->blendfac); GdipFree((*grad)->blendpos); GdipFree((*grad)->surroundcolors); @@ -890,6 +908,7 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) { case BrushTypePathGradient: GdipDeletePath(((GpPathGradient*) brush)->path); + GdipDeleteMatrix(((GpPathGradient*) brush)->transform); GdipFree(((GpPathGradient*) brush)->blendfac); GdipFree(((GpPathGradient*) brush)->blendpos); GdipFree(((GpPathGradient*) brush)->surroundcolors); @@ -1641,14 +1660,14 @@ GpStatus WINGDIPAPI GdipSetPathGradientTransform(GpPathGradient *grad, GpStatus WINGDIPAPI GdipGetPathGradientTransform(GpPathGradient *grad, GpMatrix *matrix) { - static int calls; - TRACE("(%p,%p)\n", grad, matrix); - if(!(calls++)) - FIXME("not implemented\n"); + if (!grad || !matrix) + return InvalidParameter; - return NotImplemented; + memcpy(matrix, grad->transform, sizeof(GpMatrix)); + + return Ok; } GpStatus WINGDIPAPI GdipMultiplyPathGradientTransform(GpPathGradient *grad, diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index c9853ec..5d5a92c 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -201,6 +201,7 @@ struct GpPathGradient{ ARGB* pblendcolor; /* preset blend colors */ REAL* pblendpos; /* preset blend positions */ INT pblendcount; + GpMatrix *transform; }; struct GpLineGradient{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 885d9a7..2c6c4b2 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1192,6 +1192,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, INT min_y, max_y, min_x, max_x; INT x, y; ARGB outer_color; + static int transform_fixme_once; if (fill->focus.X != 0.0 || fill->focus.Y != 0.0) { @@ -1221,6 +1222,17 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, FIXME("path gradient preset blend not implemented\n"); } + if (!transform_fixme_once) + { + BOOL is_identity=TRUE; + GdipIsMatrixIdentity(fill->transform, &is_identity); + if (!is_identity) + { + FIXME("path gradient transform not implemented\n"); + transform_fixme_once = 1; + } + } + stat = GdipClonePath(fill->path, &flat_path); if (stat != Ok)

1 0

Hans Leidekker : msi: Reimplement MsiEnumComponents on top of MsiEnumComponentsEx.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 25b7228274902fef682df818f70a5f675952d0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b7228274902fef682df818f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 17:54:30 2012 +0200 msi: Reimplement MsiEnumComponents on top of MsiEnumComponentsEx. --- dlls/msi/registry.c | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index bc67ab2..31e7b4f 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1205,7 +1205,9 @@ UINT WINAPI MsiEnumComponentsA(DWORD index, LPSTR lpguid) DWORD r; WCHAR szwGuid[GUID_SIZE]; - TRACE("%d %p\n", index, lpguid); + TRACE("%u, %p\n", index, lpguid); + + if (!lpguid) return ERROR_INVALID_PARAMETER; r = MsiEnumComponentsW(index, szwGuid); if( r == ERROR_SUCCESS ) @@ -1216,23 +1218,11 @@ UINT WINAPI MsiEnumComponentsA(DWORD index, LPSTR lpguid) UINT WINAPI MsiEnumComponentsW(DWORD index, LPWSTR lpguid) { - HKEY hkey; - REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR szKeyName[SQUISH_GUID_SIZE]; - DWORD r; - - TRACE("%d %p\n", index, lpguid); + TRACE("%u, %p\n", index, lpguid); - r = RegCreateKeyExW(HKEY_LOCAL_MACHINE, szInstaller_Components, 0, NULL, 0, access, NULL, &hkey, NULL); - if( r != ERROR_SUCCESS ) - return ERROR_NO_MORE_ITEMS; + if (!lpguid) return ERROR_INVALID_PARAMETER; - r = RegEnumKeyW(hkey, index, szKeyName, SQUISH_GUID_SIZE); - if( r == ERROR_SUCCESS ) - unsquash_guid(szKeyName, lpguid); - - RegCloseKey(hkey); - return r; + return MsiEnumComponentsExW( szAllSid, MSIINSTALLCONTEXT_ALL, index, lpguid, NULL, NULL, NULL ); } UINT WINAPI MsiEnumComponentsExA( LPCSTR user_sid, DWORD ctx, DWORD index, CHAR guid[39],

1 0

Bruno Jesus : ws2_32/tests: Avoid usage of inet_ntoa since its return is static.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 9f6ce27ede1f7cc544608be504ad04ec533cd45e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6ce27ede1f7cc544608be50… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Mar 31 17:16:06 2012 -0300 ws2_32/tests: Avoid usage of inet_ntoa since its return is static. --- dlls/ws2_32/tests/sock.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f4cc909..cc045ea 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4504,7 +4504,7 @@ static void test_AcceptEx(void) struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ int got, conn1, i; DWORD bytesReturned, connect_time; - char buffer[1024]; + char buffer[1024], ipbuffer[32]; OVERLAPPED overlapped; int iret, localSize = sizeof(struct sockaddr_in), remoteSize = localSize; BOOL bret; @@ -4720,15 +4720,17 @@ static void test_AcceptEx(void) pGetAcceptExSockaddrs(buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, (struct sockaddr **)&readBindAddress, &localSize, (struct sockaddr **)&readRemoteAddress, &remoteSize); + strcpy( ipbuffer, inet_ntoa(readBindAddress->sin_addr)); ok( readBindAddress->sin_addr.s_addr == bindAddress.sin_addr.s_addr, "Local socket address is different %s != %s\n", - inet_ntoa(readBindAddress->sin_addr), inet_ntoa(bindAddress.sin_addr)); + ipbuffer, inet_ntoa(bindAddress.sin_addr)); ok( readBindAddress->sin_port == bindAddress.sin_port, "Local socket port is different: %d != %d\n", readBindAddress->sin_port, bindAddress.sin_port); + strcpy( ipbuffer, inet_ntoa(readRemoteAddress->sin_addr)); ok( readRemoteAddress->sin_addr.s_addr == peerAddress.sin_addr.s_addr, "Remote socket address is different %s != %s\n", - inet_ntoa(readRemoteAddress->sin_addr), inet_ntoa(peerAddress.sin_addr)); + ipbuffer, inet_ntoa(peerAddress.sin_addr)); ok( readRemoteAddress->sin_port == peerAddress.sin_port, "Remote socket port is different: %d != %d\n", readRemoteAddress->sin_port, peerAddress.sin_port);

1 0

Henri Verbeet : ddraw: The texture interface shares its refcount with the surface interface version used to create the surface .
by Alexandre Julliard April 2, 2012

April 2, 2012

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

Jeff Latimer : ws2_32: Make a common fixme more meaningful and return success.
by Alexandre Julliard April 2, 2012

April 2, 2012

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