April 2007 - Wine-commits - list.winehq.org

Vitaliy Margolen : ntdll: Use correct full access bitmask in NtQuerySecurityObject.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: cf1b810d747358167681a38d8f2e1e40dd354c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1b810d747358167681a38d8… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 28 15:50:00 2007 -0600 ntdll: Use correct full access bitmask in NtQuerySecurityObject. --- dlls/ntdll/om.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 35ce1be..0e94e35 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -247,7 +247,7 @@ NtQuerySecurityObject( pace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; pace->Header.AceFlags = CONTAINER_INHERIT_ACE; pace->Header.AceSize = sizeof(ACCESS_ALLOWED_ACE)-sizeof(DWORD) + RtlLengthRequiredSid(1); - pace->Mask = DELETE | READ_CONTROL | WRITE_DAC | WRITE_OWNER | 0x3f; + pace->Mask = STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL; pace->SidStart = BufferIndex; /* SID S-1-5-12 (System) */ @@ -267,7 +267,7 @@ NtQuerySecurityObject( pace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; pace->Header.AceFlags = CONTAINER_INHERIT_ACE; pace->Header.AceSize = sizeof(ACCESS_ALLOWED_ACE)-sizeof(DWORD) + RtlLengthRequiredSid(2); - pace->Mask = DELETE | READ_CONTROL | WRITE_DAC | WRITE_OWNER | 0x3f; + pace->Mask = STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL; pace->SidStart = BufferIndex; /* S-1-5-12 (Administrators) */

1 0

Andrew Talbot : compstui: Exclude unused headers.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: de35a9550e14f48cea6730b03b814418e7e57499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de35a9550e14f48cea6730b03… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 28 15:38:51 2007 +0100 compstui: Exclude unused headers. --- dlls/compstui/compstui_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/compstui/compstui_main.c b/dlls/compstui/compstui_main.c index 1299971..41b2441 100644 --- a/dlls/compstui/compstui_main.c +++ b/dlls/compstui/compstui_main.c @@ -26,9 +26,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winreg.h" -#include "winver.h" -#include "winnls.h" #include "ddk/compstui.h" #include "wine/unicode.h"

1 0

Andrew Talbot : advapi32: Exclude unused headers.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: ff19b2f25ace72d964a80986ab3eed6a87a5b585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff19b2f25ace72d964a80986a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Apr 27 17:09:45 2007 +0100 advapi32: Exclude unused headers. --- dlls/advapi32/crypt_lmhash.c | 2 -- dlls/advapi32/eventlog.c | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/crypt_lmhash.c b/dlls/advapi32/crypt_lmhash.c index 2e379d4..2f57842 100644 --- a/dlls/advapi32/crypt_lmhash.c +++ b/dlls/advapi32/crypt_lmhash.c @@ -25,8 +25,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" -#include "winbase.h" -#include "winreg.h" #include "winternl.h" #include "crypt.h" diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 7b9ee49..03bb4f3 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "winternl.h" #include "wmistr.h" #include "evntrace.h"

1 0

Andrew Talbot : dsound: Constify some variables.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: 824c9c8ee6fe0f82c05c2547a9179c033241ecff URL: http://source.winehq.org/git/wine.git/?a=commit;h=824c9c8ee6fe0f82c05c2547a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 28 15:39:28 2007 +0100 dsound: Constify some variables. --- dlls/dsound/mixer.c | 9 +++++---- dlls/dsound/sound3d.c | 14 +++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index b961cf6..adbee9e 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -175,7 +175,7 @@ static inline BYTE cvtS16toU8(INT16 s) * Copy a single frame from the given input buffer to the given output buffer. * Translate 8 <-> 16 bits and mono <-> stereo */ -static inline void cp_fields(const IDirectSoundBufferImpl *dsb, BYTE *ibuf, BYTE *obuf ) +static inline void cp_fields(const IDirectSoundBufferImpl *dsb, const BYTE *ibuf, BYTE *obuf ) { DirectSoundDevice * device = dsb->device; INT fl,fr; @@ -192,8 +192,8 @@ static inline void cp_fields(const IDirectSoundBufferImpl *dsb, BYTE *ibuf, BYTE fl = cvtU8toS16(*ibuf); fr = (dsb->pwfx->nChannels==2 ? cvtU8toS16(*(ibuf + 1)) : fl); } else { - fl = *((INT16 *)ibuf); - fr = (dsb->pwfx->nChannels==2 ? *(((INT16 *)ibuf) + 1) : fl); + fl = *((const INT16 *)ibuf); + fr = (dsb->pwfx->nChannels==2 ? *(((const INT16 *)ibuf) + 1) : fl); } if (device->pwfx->nChannels == 2) { @@ -910,7 +910,8 @@ post_mix: * * Returns: the length beyond the writepos that was mixed to. */ -static DWORD DSOUND_MixToPrimary(DirectSoundDevice *device, DWORD playpos, DWORD writepos, DWORD mixlen, BOOL recover) +static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD playpos, DWORD writepos, + DWORD mixlen, BOOL recover) { INT i, len, maxlen = 0; IDirectSoundBufferImpl *dsb; diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 234c40b..6145cff 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -66,7 +66,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound3d); */ /* scalar product (i believe it's called dot product in english) */ -static inline D3DVALUE ScalarProduct (LPD3DVECTOR a, LPD3DVECTOR b) +static inline D3DVALUE ScalarProduct (const D3DVECTOR *a, const D3DVECTOR *b) { D3DVALUE c; c = (a->x*b->x) + (a->y*b->y) + (a->z*b->z); @@ -76,7 +76,7 @@ static inline D3DVALUE ScalarProduct (LPD3DVECTOR a, LPD3DVECTOR b) } /* vector product (i believe it's called cross product in english */ -static inline D3DVECTOR VectorProduct (LPD3DVECTOR a, LPD3DVECTOR b) +static inline D3DVECTOR VectorProduct (const D3DVECTOR *a, const D3DVECTOR *b) { D3DVECTOR c; c.x = (a->y*b->z) - (a->z*b->y); @@ -88,7 +88,7 @@ static inline D3DVECTOR VectorProduct (LPD3DVECTOR a, LPD3DVECTOR b) } /* magnitude (length) of vector */ -static inline D3DVALUE VectorMagnitude (LPD3DVECTOR a) +static inline D3DVALUE VectorMagnitude (const D3DVECTOR *a) { D3DVALUE l; l = sqrt (ScalarProduct (a, a)); @@ -106,7 +106,7 @@ static inline D3DVALUE RadToDeg (D3DVALUE angle) } /* angle between vectors - deg version */ -static inline D3DVALUE AngleBetweenVectorsDeg (LPD3DVECTOR a, LPD3DVECTOR b) +static inline D3DVALUE AngleBetweenVectorsDeg (const D3DVECTOR *a, const D3DVECTOR *b) { D3DVALUE la, lb, product, angle, cos; /* definition of scalar product: a*b = |a|*|b|*cos...therefore: */ @@ -123,7 +123,7 @@ static inline D3DVALUE AngleBetweenVectorsDeg (LPD3DVECTOR a, LPD3DVECTOR b) } /* angle between vectors - rad version */ -static inline D3DVALUE AngleBetweenVectorsRad (LPD3DVECTOR a, LPD3DVECTOR b) +static inline D3DVALUE AngleBetweenVectorsRad (const D3DVECTOR *a, const D3DVECTOR *b) { D3DVALUE la, lb, product, angle, cos; /* definition of scalar product: a*b = |a|*|b|*cos...therefore: */ @@ -138,7 +138,7 @@ static inline D3DVALUE AngleBetweenVectorsRad (LPD3DVECTOR a, LPD3DVECTOR b) } /* calculates vector between two points */ -static inline D3DVECTOR VectorBetweenTwoPoints (LPD3DVECTOR a, LPD3DVECTOR b) +static inline D3DVECTOR VectorBetweenTwoPoints (const D3DVECTOR *a, const D3DVECTOR *b) { D3DVECTOR c; c.x = b->x - a->x; @@ -150,7 +150,7 @@ static inline D3DVECTOR VectorBetweenTwoPoints (LPD3DVECTOR a, LPD3DVECTOR b) } /* calculates the length of vector's projection on another vector */ -static inline D3DVALUE ProjectVector (LPD3DVECTOR a, LPD3DVECTOR p) +static inline D3DVALUE ProjectVector (const D3DVECTOR *a, const D3DVECTOR *p) { D3DVALUE prod, result; prod = ScalarProduct(a, p);

1 0

Andrew Talbot : crypt32: Exclude unused headers.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: 79d1d77f744732b923b7aed9771cb1a65273cc77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d1d77f744732b923b7aed97… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 28 15:39:10 2007 +0100 crypt32: Exclude unused headers. --- dlls/crypt32/decode.c | 2 -- dlls/crypt32/encode.c | 2 -- dlls/crypt32/main.c | 3 --- dlls/crypt32/protectdata.c | 1 - dlls/crypt32/serialize.c | 1 - dlls/crypt32/store.c | 1 - 6 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index cb83a80..2ab9de3 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -40,10 +40,8 @@ #include "windef.h" #include "winbase.h" -#include "excpt.h" #include "wincrypt.h" #include "winnls.h" -#include "winreg.h" #include "snmp.h" #include "wine/debug.h" #include "wine/exception.h" diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index d897617..9522b96 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -40,9 +40,7 @@ #include "windef.h" #include "winbase.h" -#include "excpt.h" #include "wincrypt.h" -#include "winreg.h" #include "snmp.h" #include "wine/debug.h" #include "wine/exception.h" diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index f5d68d5..a0c4f4c 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -25,10 +25,7 @@ #include "winbase.h" #include "wincrypt.h" #include "winreg.h" -#include "winnls.h" -#include "mssip.h" #include "winuser.h" -#include "advpub.h" #include "crypt32_private.h" #include "wine/debug.h" diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index 1957e7c..a1a3369 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -42,7 +42,6 @@ #include "windef.h" #include "winbase.h" #include "wincrypt.h" -#include "winreg.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 49749e3..e45dcd0 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -20,7 +20,6 @@ #include "winbase.h" #include "wincrypt.h" #include "wine/debug.h" -#include "excpt.h" #include "wine/exception.h" #include "crypt32_private.h" diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 3b9bcb8..77a75b1 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -36,7 +36,6 @@ #include "wincrypt.h" #include "wine/debug.h" #include "wine/list.h" -#include "excpt.h" #include "wine/exception.h" #include "crypt32_private.h"

1 0

Andrew Talbot : dswave: Constify a variable.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: d865fc9fa1c9643a1509c90399bebd3dfbc5be16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d865fc9fa1c9643a1509c9039… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 28 15:39:42 2007 +0100 dswave: Constify a variable. --- dlls/dswave/dswave_main.c | 2 +- dlls/dswave/dswave_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index d919de8..939c492 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -144,7 +144,7 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -const char *debugstr_dmversion (LPDMUS_VERSION version) { +const char *debugstr_dmversion (const DMUS_VERSION *version) { if (!version) return "'null'"; return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 19ad4ba..0c2d675 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -111,7 +111,7 @@ extern int even_or_odd (DWORD number); /* FOURCC to string conversion for debug messages */ extern const char *debugstr_fourcc (DWORD fourcc); /* DMUS_VERSION struct to string conversion for debug messages */ -extern const char *debugstr_dmversion (LPDMUS_VERSION version); +extern const char *debugstr_dmversion (const DMUS_VERSION *version); /* returns name of given GUID */ extern const char *debugstr_dmguid (const GUID *id); /* returns name of given error code */

1 0

Dan Kegel : advapi: Improve SetEntriesInAclA stub.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: 67e2c97a88ce75dbbe22eefcd3137bf8315786e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e2c97a88ce75dbbe22eefcd… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Apr 27 18:42:10 2007 -0700 advapi: Improve SetEntriesInAclA stub. --- dlls/advapi32/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 80dd89f..729727f 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "rpcnterr.h" #include "winreg.h" #include "winternl.h" #include "winioctl.h" @@ -2865,7 +2864,8 @@ DWORD WINAPI SetEntriesInAclA( ULONG count, PEXPLICIT_ACCESSA pEntries, PACL OldAcl, PACL* NewAcl ) { FIXME("%d %p %p %p\n",count,pEntries,OldAcl,NewAcl); - return ERROR_CALL_NOT_IMPLEMENTED; + *NewAcl = NULL; + return ERROR_SUCCESS; } /******************************************************************************

1 0

Stefan Dösinger : ddraw: Search for d3d primary a bit differently.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: b4d48c7fce205bcba522830d1a500d924a0f9816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d48c7fce205bcba522830d1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 23 23:00:29 2007 +0200 ddraw: Search for d3d primary a bit differently. --- dlls/ddraw/ddraw.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8b8308a..0194736 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2341,7 +2341,8 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, LIST_FOR_EACH(entry, &This->surface_list) { surface = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); - if(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + if((surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) == + (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) { /* found */ target = surface; @@ -2351,7 +2352,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, } TRACE("(%p) Attaching a D3DDevice, rendertarget = %p\n", This, target); - hr = IDirectDrawImpl_AttachD3DDevice(This, target->first_complex); + hr = IDirectDrawImpl_AttachD3DDevice(This, target); if(hr != D3D_OK) { ERR("IDirectDrawImpl_AttachD3DDevice failed, hr = %x\n", hr); @@ -2636,7 +2637,7 @@ D3D7CB_CreateRenderTarget(IUnknown *device, IUnknown *pSuperior, HANDLE* pSharedHandle) { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, device); - IDirectDrawSurfaceImpl *d3dSurface = This->d3d_target->first_complex, *target = NULL; + IDirectDrawSurfaceImpl *d3dSurface = This->d3d_target, *target = NULL; TRACE("(%p) call back\n", device); if(d3dSurface->isRenderTarget)

1 0

Stefan Dösinger : ddraw: Do not access the surface connection structure directly in SetPalette.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: d30c25be839e84307de978eb5353d31ccaa0cbf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30c25be839e84307de978eb5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 23 21:28:06 2007 +0200 ddraw: Do not access the surface connection structure directly in SetPalette. --- dlls/ddraw/surface.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4d62362..e6e316e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2238,13 +2238,30 @@ IDirectDrawSurfaceImpl_SetPalette(IDirectDrawSurface7 *iface, /* Release the old palette */ if(oldPal) IDirectDrawPalette_Release(oldPal); - /* If this is a front buffer, also update the back buffers */ + /* If this is a front buffer, also update the back buffers + * TODO: How do things work for palettized cube textures? + */ if(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) { - for(surf = This->next_complex; surf != NULL; surf = surf->next_complex) + /* For primary surfaces the tree is just a list, so the simpler scheme fits too */ + DDSCAPS2 caps2 = { DDSCAPS_PRIMARYSURFACE, 0, 0, 0 }; + + surf = This; + while(1) { - IDirectDrawSurface7_SetPalette(ICOM_INTERFACE(surf, IDirectDrawSurface7), + IDirectDrawSurface7 *attach; + HRESULT hr; + hr = IDirectDrawSurface7_GetAttachedSurface(ICOM_INTERFACE(surf, IDirectDrawSurface7), + &caps2, &attach); + if(hr != DD_OK) + { + break; + } + + IDirectDrawSurface7_SetPalette(attach, Pal); + surf = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, attach); + IDirectDrawSurface7_Release(attach); } }

1 0

Stefan Dösinger : ddraw: Move the additional surface creation into a seperate function.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: 87544190a5ff61312b0972b828483eba47646007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87544190a5ff61312b0972b82… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 23 19:53:09 2007 +0200 ddraw: Move the additional surface creation into a seperate function. --- dlls/ddraw/ddraw.c | 93 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 54 insertions(+), 39 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 0194736..f6e153b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1950,6 +1950,54 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This, return DD_OK; } +static HRESULT +CreateAdditionalSurfaces(IDirectDrawImpl *This, + IDirectDrawSurfaceImpl *root, + UINT count, + DDSURFACEDESC2 *DDSD) +{ + UINT i, level = 0; + HRESULT hr; + for(i = 0; i < count; i++) + { + IDirectDrawSurfaceImpl *object2 = NULL; + IDirectDrawSurfaceImpl *iterator; + + /* increase the mipmap level, but only if a mipmap is created + * In this case, also halve the size + */ + if(DDSD->ddsCaps.dwCaps & DDSCAPS_MIPMAP) + { + level++; + if(DDSD->dwWidth > 1) DDSD->dwWidth /= 2; + if(DDSD->dwHeight > 1) DDSD->dwHeight /= 2; + } + + hr = IDirectDrawImpl_CreateNewSurface(This, + DDSD, + &object2, + level); + if(hr != DD_OK) + { + return hr; + } + + /* Add the new surface to the complex attachment list */ + object2->first_complex = root; + object2->next_complex = NULL; + iterator = root; + while(iterator->next_complex) iterator = iterator->next_complex; + iterator->next_complex = object2; + + /* Remove the (possible) back buffer cap from the new surface description, + * because only one surface in the flipping chain is a back buffer, one + * is a front buffer, the others are just primary surfaces. + */ + DDSD->ddsCaps.dwCaps &= ~DDSCAPS_BACKBUFFER; + } + return DD_OK; +} + /***************************************************************************** * IDirectDraw7::CreateSurface * @@ -2036,9 +2084,8 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); IDirectDrawSurfaceImpl *object = NULL; HRESULT hr; - LONG extra_surfaces = 0, i; + LONG extra_surfaces = 0; DDSURFACEDESC2 desc2; - UINT level = 0; WINED3DDISPLAYMODE Mode; TRACE("(%p)->(%p,%p,%p)\n", This, DDSD, Surf, UnkOuter); @@ -2279,44 +2326,12 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, desc2.ddsCaps.dwCaps2 |= DDSCAPS2_MIPMAPSUBLEVEL; } - for(i = 0; i < extra_surfaces; i++) + hr = CreateAdditionalSurfaces(This, object, extra_surfaces, &desc2); + if(hr != DD_OK) { - IDirectDrawSurfaceImpl *object2 = NULL; - IDirectDrawSurfaceImpl *iterator; - - /* increase the mipmap level, but only if a mipmap is created - * In this case, also halve the size - */ - if(DDSD->ddsCaps.dwCaps & DDSCAPS_MIPMAP) - { - level++; - if(desc2.dwWidth > 1) desc2.dwWidth /= 2; - if(desc2.dwHeight > 1) desc2.dwHeight /= 2; - } - - hr = IDirectDrawImpl_CreateNewSurface(This, - &desc2, - &object2, - level); - if(hr != DD_OK) - { - /* This destroys and possibly created surfaces too */ - IDirectDrawSurface_Release( ICOM_INTERFACE(object, IDirectDrawSurface7) ); - return hr; - } - - /* Add the new surface to the complex attachment list */ - object2->first_complex = object; - object2->next_complex = NULL; - iterator = object; - while(iterator->next_complex) iterator = iterator->next_complex; - iterator->next_complex = object2; - - /* Remove the (possible) back buffer cap from the new surface description, - * because only one surface in the flipping chain is a back buffer, one - * is a front buffer, the others are just primary surfaces. - */ - desc2.ddsCaps.dwCaps &= ~DDSCAPS_BACKBUFFER; + /* This destroys and possibly created surfaces too */ + IDirectDrawSurface_Release( ICOM_INTERFACE(object, IDirectDrawSurface7) ); + return hr; } /* Addref the ddraw interface to keep an reference for each surface */

1 0