wine-commits April 2007

wine-commits@winehq.org

4 participants
687 discussions

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

30 Apr '07

Module: wine Branch: master Commit: 51971335738dfac2a51bc7faeb2d4b20b0a1f5a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51971335738dfac2a51bc7fae… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 28 15:38:35 2007 +0100 comdlg32: Exclude unused headers. --- dlls/comdlg32/filedlg.c | 1 - dlls/comdlg32/filedlg31.c | 1 - dlls/comdlg32/fontdlg16.c | 1 - dlls/comdlg32/printdlg16.c | 1 - 4 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 0b940ea..68b6b60 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -73,7 +73,6 @@ #include "filedlg31.h" #include "cderr.h" #include "shellapi.h" -#include "shlguid.h" #include "shlobj.h" #include "filedlgbrowser.h" #include "shlwapi.h" diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index b49cc7e..6c0f08d 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -30,7 +30,6 @@ #include "winuser.h" #include "wine/unicode.h" #include "wine/debug.h" -#include "cderr.h" #include "winreg.h" #include "winternl.h" #include "commdlg.h" diff --git a/dlls/comdlg32/fontdlg16.c b/dlls/comdlg32/fontdlg16.c index 7ed63dc..3580af5 100644 --- a/dlls/comdlg32/fontdlg16.c +++ b/dlls/comdlg32/fontdlg16.c @@ -32,7 +32,6 @@ #include "wine/winbase16.h" #include "wine/winuser16.h" #include "commdlg.h" -#include "dlgs.h" #include "wine/debug.h" #include "cderr.h" diff --git a/dlls/comdlg32/printdlg16.c b/dlls/comdlg32/printdlg16.c index 4f883da..6aa8c6c 100644 --- a/dlls/comdlg32/printdlg16.c +++ b/dlls/comdlg32/printdlg16.c @@ -40,7 +40,6 @@ #include "wine/debug.h" #include "cderr.h" #include "winspool.h" -#include "winerror.h" WINE_DEFAULT_DEBUG_CHANNEL(commdlg);

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 : 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

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 : 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 : 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

Ken Thomases : winebrowser: Don' t put the default mailers or browsers into the registry.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: 8dc41cf5f7d1bc67a3a861eb3da74b0b8734b949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc41cf5f7d1bc67a3a861eb3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Apr 27 12:26:21 2007 -0500 winebrowser: Don't put the default mailers or browsers into the registry. --- programs/winebrowser/main.c | 30 ++++++------------------------ 1 files changed, 6 insertions(+), 24 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 7bea32c..fa4f0c9 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -83,22 +83,13 @@ static int open_http_url( const char *url ) length = sizeof(browsers); /* @@ Wine registry key: HKCU\Software\Wine\WineBrowser */ - if (RegCreateKeyEx( HKEY_CURRENT_USER, "Software\\Wine\\WineBrowser", 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &key, NULL)) + if (!(r = RegOpenKey( HKEY_CURRENT_USER, "Software\\Wine\\WineBrowser", &key ))) { - fprintf( stderr, "winebrowser: cannot create config key\n" ); - return 1; + r = RegQueryValueExA( key, "Browsers", 0, &type, (LPBYTE)browsers, &length ); + RegCloseKey( key ); } - - r = RegQueryValueExA( key, "Browsers", 0, &type, (LPBYTE)browsers, &length ); if (r != ERROR_SUCCESS) - { - /* set value to the default */ - RegSetValueExA( key, "Browsers", 0, REG_SZ, (const BYTE *)defaultbrowsers, - lstrlen( defaultbrowsers ) + 1 ); strcpy( browsers, defaultbrowsers ); - } - RegCloseKey( key ); return launch_app( browsers, url ); } @@ -115,22 +106,13 @@ static int open_mailto_url( const char *url ) length = sizeof(mailers); /* @@ Wine registry key: HKCU\Software\Wine\WineBrowser */ - if (RegCreateKeyEx( HKEY_CURRENT_USER, "Software\\Wine\\WineBrowser", 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &key, NULL )) + if (!(r = RegOpenKey( HKEY_CURRENT_USER, "Software\\Wine\\WineBrowser", &key ))) { - fprintf( stderr, "winebrowser: cannot create config key\n" ); - return 1; + r = RegQueryValueExA( key, "Mailers", 0, &type, (LPBYTE)mailers, &length ); + RegCloseKey( key ); } - - r = RegQueryValueExA( key, "Mailers", 0, &type, (LPBYTE)mailers, &length ); if (r != ERROR_SUCCESS) - { - /* set value to the default */ - RegSetValueExA( key, "Mailers", 0, REG_SZ, (const BYTE *)defaultmailers, - lstrlen( defaultmailers ) + 1 ); strcpy( mailers, defaultmailers ); - } - RegCloseKey( key ); return launch_app( mailers, url ); }

1 0

Stefan Dösinger : ddraw: Add a test for surface attachments.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: a61e58dbf4de82f626e1f4b3026966baf6f3c036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61e58dbf4de82f626e1f4b30… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 24 10:28:01 2007 +0200 ddraw: Add a test for surface attachments. --- dlls/ddraw/surface.c | 12 ++++- dlls/ddraw/tests/dsurface.c | 100 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3c64deb..fa9ce3d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -794,8 +794,16 @@ IDirectDrawSurfaceImpl_AddAttachedSurface(IDirectDrawSurface7 *iface, if(Surf == This) return DDERR_CANNOTATTACHSURFACE; /* unchecked */ - /* TODO MSDN: "You can attach only z-buffer surfaces with this method." - * But apparently backbuffers and mipmaps can be attached too. */ + /* MSDN: Only Z buffer surfaces can be attached. An old comment said that apparently + * mipmaps and back buffers can be attached too, although our tests say no. + */ + if(!(Surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) + { + /* Write a fixme until we know for sure what is going on */ + FIXME("Application tries to attach a non Z buffer surface. caps %08x\n", + Surf->surface_desc.ddsCaps.dwCaps); + return DDERR_CANNOTATTACHSURFACE; + } /* Set MIPMAPSUBLEVEL if this seems to be one */ if (This->surface_desc.ddsCaps.dwCaps & diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index e269983..6db2d98 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -943,6 +943,105 @@ static void EnumTest(void) IDirectDrawSurface_Release(surface); } +HRESULT WINAPI SurfaceCounter(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +{ + UINT *num = context; + (*num)++; + IDirectDrawSurface_Release(surface); + return DDENUMRET_OK; +} + +static void AttachmentTest(void) +{ + HRESULT hr; + IDirectDraw7 *dd7; + IDirectDrawSurface7 *surface1, *surface2, *surface3; + DDSURFACEDESC2 ddsd; + UINT num; + DDSCAPS2 caps = {DDSCAPS_TEXTURE, 0, 0, 0}; + HWND window = CreateWindow( "static", "ddraw_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); + ok(hr == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(ddsd).dwMipMapCount = 3; /* Will create 128x128, 64x64, 32x32 */ + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface1, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + /* ROOT */ + num = 0; + IDirectDrawSurface7_EnumAttachedSurfaces(surface1, &num, SurfaceCounter); + ok(num == 1, "Mipmap root has %d surfaces attached, expected 1\n", num); + /* DONE ROOT */ + + /* LEVEL 1 */ + hr = IDirectDrawSurface7_GetAttachedSurface(surface1, &caps, &surface2); + ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); + num = 0; + IDirectDrawSurface7_EnumAttachedSurfaces(surface2, &num, SurfaceCounter); + ok(num == 1, "First mip level has %d surfaces attached, expected 1\n", num); + /* DONE LEVEL 1 */ + + /* LEVEL 2 */ + hr = IDirectDrawSurface7_GetAttachedSurface(surface2, &caps, &surface3); + ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); + IDirectDrawSurface7_Release(surface2); + num = 0; + IDirectDrawSurface7_EnumAttachedSurfaces(surface3, &num, SurfaceCounter); + ok(num == 0, "Secound mip level has %d surfaces attached, expected 1\n", num); + /* Done level 2 */ + /* Mip level 3 is still needed */ + + /* Try to attach a 16x16 miplevel - Should not work as far I can see */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface2, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + hr = IDirectDrawSurface7_AddAttachedSurface(surface1, surface2); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 surface to a 128x128 texture root returned %08x\n", hr); + hr = IDirectDrawSurface7_AddAttachedSurface(surface2, surface1); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 128x128 texture root to a 16x16 texture returned %08x\n", hr); + hr = IDirectDrawSurface7_AddAttachedSurface(surface3, surface2); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 surface to a 32x32 texture mip level returned %08x\n", hr); + hr = IDirectDrawSurface7_AddAttachedSurface(surface2, surface3); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 32x32 texture mip level to a 16x16 surface returned %08x\n", hr); + + IDirectDrawSurface7_Release(surface3); + IDirectDrawSurface7_Release(surface2); + IDirectDrawSurface7_Release(surface1); + + hr = IDirectDraw7_SetCooperativeLevel(dd7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_BACKBUFFERCOUNT | DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + U2(ddsd).dwBackBufferCount = 2; + hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface1, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + num = 0; + IDirectDrawSurface7_EnumAttachedSurfaces(surface1, &num, SurfaceCounter); + ok(num == 1, "Primary surface has %d surfaces attached, expected 1\n", num); + IDirectDrawSurface7_Release(surface1); + + hr =IDirectDraw7_SetCooperativeLevel(dd7, NULL, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); + IDirectDraw7_Release(dd7); +} + START_TEST(dsurface) { if (!CreateDirectDraw()) @@ -955,5 +1054,6 @@ START_TEST(dsurface) GetDDInterface_4(); GetDDInterface_7(); EnumTest(); + AttachmentTest(); ReleaseDirectDraw(); }

1 0

Stefan Dösinger : ddraw: Complex surfaces form a tree.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: 9e3e799ca3e5e74e20f9c3da1aefd74dfb15e9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3e799ca3e5e74e20f9c3da1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 27 15:31:12 2007 +0200 ddraw: Complex surfaces form a tree. --- dlls/ddraw/ddraw.c | 15 ++--- dlls/ddraw/ddraw_private.h | 14 ++++- dlls/ddraw/device.c | 3 + dlls/ddraw/main.c | 2 +- dlls/ddraw/surface.c | 142 ++++++++++++++++++++++++-------------------- 5 files changed, 99 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e3e799ca3e5e74e20f9c…

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

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 2007