winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2007
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
4 participants
687 discussions
Start a n
N
ew thread
Kirill K. Smirnov : kernel32: Add partial stub for NeedCurrentDirectoryForExePath.
by Alexandre Julliard
27 Apr '07
27 Apr '07
Module: wine Branch: master Commit: fff6db62f389f4e6bf974b67926409b84d762faa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fff6db62f389f4e6bf974b679…
Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Wed Apr 25 11:39:02 2007 +0400 kernel32: Add partial stub for NeedCurrentDirectoryForExePath. --- dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/path.c | 37 +++++++++++++++++++++++++++++++++++++ include/winbase.h | 3 +++ 3 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a675386..4d3d083 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -799,6 +799,8 @@ @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) @ stdcall MulDiv(long long long) @ stdcall MultiByteToWideChar(long long str long ptr long) +@ stdcall NeedCurrentDirectoryForExePathA(str) +@ stdcall NeedCurrentDirectoryForExePathW(wstr) # @ stub NlsConvertIntegerToString # @ stub NlsGetCacheUpdateCount # @ stub NlsResetProcessLocale diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index b195435..eb752f0 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1511,6 +1511,43 @@ UINT WINAPI GetSystemWow64DirectoryA( LPSTR lpBuffer, UINT uSize ) /*********************************************************************** + * NeedCurrentDirectoryForExePathW (KERNEL32.@) + */ +BOOL WINAPI NeedCurrentDirectoryForExePathW( LPCWSTR name ) +{ + static const WCHAR env_name[] = {'N','o','D','e','f','a','u','l','t', + 'C','u','r','r','e','n','t', + 'D','i','r','e','c','t','o','r','y', + 'I','n','E','x','e','P','a','t','h',0}; + WCHAR env_val; + + /* MSDN mentions some 'registry location'. We do not use registry. */ + FIXME("(%s): partial stub\n", debugstr_w(name)); + + if (strchrW(name, '\\')) + return TRUE; + + /* Check the existence of the variable, not value */ + if (!GetEnvironmentVariableW( env_name, &env_val, 1 )) + return TRUE; + + return FALSE; +} + + +/*********************************************************************** + * NeedCurrentDirectoryForExePathA (KERNEL32.@) + */ +BOOL WINAPI NeedCurrentDirectoryForExePathA( LPCSTR name ) +{ + WCHAR *nameW; + + if (!(nameW = FILE_name_AtoW( name, FALSE ))) return TRUE; + return NeedCurrentDirectoryForExePathW( nameW ); +} + + +/*********************************************************************** * wine_get_unix_file_name (KERNEL32.@) Not a Windows API * * Return the full Unix file name for a given path. diff --git a/include/winbase.h b/include/winbase.h index 59e7718..da9c547 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1839,6 +1839,9 @@ BOOL WINAPI MoveFileWithProgressA(LPCSTR,LPCSTR,LPPROGRESS_ROUTINE,LPVOID BOOL WINAPI MoveFileWithProgressW(LPCWSTR,LPCWSTR,LPPROGRESS_ROUTINE,LPVOID,DWORD); #define MoveFileWithProgress WINELIB_NAME_AW(MoveFileWithProgress) INT WINAPI MulDiv(INT,INT,INT); +BOOL WINAPI NeedCurrentDirectoryForExePathA(LPCSTR); +BOOL WINAPI NeedCurrentDirectoryForExePathW(LPCWSTR); +#define NeedCurrentDirectoryForExePath WINELIB_NAME_AW(NeedCurrentDirectoryForExePath) BOOL WINAPI NotifyChangeEventLog(HANDLE,HANDLE); BOOL WINAPI ObjectCloseAuditAlarmA(LPCSTR,LPVOID,BOOL); BOOL WINAPI ObjectCloseAuditAlarmW(LPCWSTR,LPVOID,BOOL);
1
0
0
0
Alexandre Julliard : winecoreaudio: Avoid sizeof in trace.
by Alexandre Julliard
27 Apr '07
27 Apr '07
Module: wine Branch: master Commit: b43167a4cfe2321320536e4e3da65d10a4afd32d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b43167a4cfe2321320536e4e3…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 27 11:55:07 2007 +0200 winecoreaudio: Avoid sizeof in trace. --- dlls/winecoreaudio.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 98d7d8f..27c87cb 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -711,8 +711,8 @@ static DWORD MIDIIn_Prepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || lpMidiHdr->dwBufferLength >= 0x10000ul) { - WARN("Invalid parameter %p %p %08x %d/%d\n", lpMidiHdr, lpMidiHdr->lpData, - lpMidiHdr->dwFlags, sizeof(MIDIHDR), dwSize); + WARN("Invalid parameter %p %p %08x %d\n", lpMidiHdr, lpMidiHdr->lpData, + lpMidiHdr->dwFlags, dwSize); return MMSYSERR_INVALPARAM; }
1
0
0
0
Kevin Koltzau : user32: Draw menu item bitmaps in the correct location when the scroll arrows are active .
by Alexandre Julliard
27 Apr '07
27 Apr '07
Module: wine Branch: master Commit: 069f5b90ae79593d5a9acfba292d9a26da6b2506 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=069f5b90ae79593d5a9acfba2…
Author: Kevin Koltzau <kevin(a)plop.org> Date: Thu Apr 26 22:03:06 2007 -0400 user32: Draw menu item bitmaps in the correct location when the scroll arrows are active. --- dlls/user32/menu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 63cb444..4aca343 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1515,7 +1515,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, if( menuBar && !(lpitem->hbmpItem == HBMMENU_CALLBACK)) bmprc.top = 0; else - bmprc.top = (lpitem->rect.bottom - lpitem->rect.top - + bmprc.top = (rect.bottom - rect.top - lpitem->bmpsize.cy) / 2; bmprc.bottom = bmprc.top + lpitem->bmpsize.cy; } @@ -1570,7 +1570,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, !( checked && (menu->dwStyle & MNS_CHECKORBMP))) { POINT origorg; /* some applications make this assumption on the DC's origin */ - SetViewportOrgEx( hdc, lpitem->rect.left, lpitem->rect.top, &origorg); + SetViewportOrgEx( hdc, rect.left, rect.top, &origorg); MENU_DrawBitmapItem(hdc, lpitem, &bmprc, hmenu, hwndOwner, odaction, FALSE); SetViewportOrgEx( hdc, origorg.x, origorg.y, NULL); @@ -1588,7 +1588,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, { /* Draw the bitmap */ POINT origorg; - SetViewportOrgEx( hdc, lpitem->rect.left, lpitem->rect.top, &origorg); + SetViewportOrgEx( hdc, rect.left, rect.top, &origorg); MENU_DrawBitmapItem( hdc, lpitem, &bmprc, hmenu, hwndOwner, odaction, menuBar); SetViewportOrgEx( hdc, origorg.x, origorg.y, NULL);
1
0
0
0
Alexey Markachev : ntdll: Fix mistake in Novosibirsk time zone.
by Alexandre Julliard
27 Apr '07
27 Apr '07
Module: wine Branch: master Commit: 160f1c350e3760bc75e673f7774c29fca42cb4f6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=160f1c350e3760bc75e673f77…
Author: Alexey Markachev <alexey(a)etersoft.ru> Date: Thu Apr 26 13:03:55 2007 +0400 ntdll: Fix mistake in Novosibirsk time zone. --- dlls/ntdll/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index ea316d1..30c71db 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -403,7 +403,7 @@ static const struct tagTZ_INFO TZ_INFO[] = {'P','h','i','l','i','p','p','i','n','e',' ','T','i','m','e','\0'}, -480, 0}, {"NOVST", {'N','o','v','o','s','i','b','i','r','s','k',' ','S','u','m','m','e','r', - ' ','T','i','m','e','\0'}, -480, 1}, + ' ','T','i','m','e','\0'}, -420, 1}, {"UZT", {'U','z','b','e','k','i','s','t','h','a','n',' ','T','i','m','e','\0'}, -300, 0} };
1
0
0
0
Stefan Dösinger : ddraw: Use EnumAttachedSurfaces for SetColorKey.
by Alexandre Julliard
27 Apr '07
27 Apr '07
Module: wine Branch: master Commit: 88af9702f161849702d8f138f9e14e63f951bf64 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=88af9702f161849702d8f138f…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 22 21:15:30 2007 +0200 ddraw: Use EnumAttachedSurfaces for SetColorKey. --- dlls/ddraw/surface.c | 66 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e374f98..4d62362 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2073,6 +2073,45 @@ IDirectDrawSurfaceImpl_GetPalette(IDirectDrawSurface7 *iface, } /***************************************************************************** + * SetColorKeyEnum + * + * EnumAttachedSurface callback for SetColorKey. Used to set color keys + * recursively in the surface tree + * + *****************************************************************************/ +struct SCKContext +{ + HRESULT ret; + WINEDDCOLORKEY *CKey; + DWORD Flags; +}; + +static HRESULT WINAPI +SetColorKeyEnum(IDirectDrawSurface7 *surface, + DDSURFACEDESC2 *desc, + void *context) +{ + ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, surface); + struct SCKContext *ctx = context; + HRESULT hr; + + hr = IWineD3DSurface_SetColorKey(This->WineD3DSurface, + ctx->Flags, + ctx->CKey); + if(hr != DD_OK) + { + WARN("IWineD3DSurface_SetColorKey failed, hr = %08x\n", hr); + ctx->ret = hr; + } + + IDirectDrawSurface7_EnumAttachedSurfaces(surface, + context, + SetColorKeyEnum); + IDirectDrawSurface7_Release(surface); + return DDENUMRET_OK; +} + +/***************************************************************************** * IDirectDrawSurface7::SetColorKey * * Sets the color keying options for the surface. Observations showed that @@ -2094,8 +2133,7 @@ IDirectDrawSurfaceImpl_SetColorKey(IDirectDrawSurface7 *iface, DDCOLORKEY *CKey) { ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); - IDirectDrawSurfaceImpl *surf; - HRESULT hr; + struct SCKContext ctx = { DD_OK, (WINEDDCOLORKEY *) CKey, Flags }; TRACE("(%p)->(%x,%p)\n", This, Flags, CKey); if (CKey) @@ -2150,23 +2188,17 @@ IDirectDrawSurfaceImpl_SetColorKey(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } } - for(surf = This->first_complex; surf; surf = surf->next_complex) + ctx.ret = IWineD3DSurface_SetColorKey(This->WineD3DSurface, + Flags, + ctx.CKey); + IDirectDrawSurface7_EnumAttachedSurfaces(iface, + (void *) &ctx, + SetColorKeyEnum); + switch(ctx.ret) { - hr = IWineD3DSurface_SetColorKey(surf->WineD3DSurface, - Flags, - (WINEDDCOLORKEY *) CKey); - if(FAILED(hr)) - { - WARN("IWineD3DSurface::SetColorKey for surface %p failed with hr=%08x\n", - surf->WineD3DSurface, hr); - switch(hr) - { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: return hr; - } - } + case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; + default: return ctx.ret; } - return DD_OK; } /*****************************************************************************
1
0
0
0
Stefan Dösinger : ddraw: Search for texture sublevels with GetAttachedSurface.
by Alexandre Julliard
27 Apr '07
27 Apr '07
Module: wine Branch: master Commit: a46012eff218b7aac6359a304f1a3ed2b9c2bc6b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a46012eff218b7aac6359a304…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 22 20:30:45 2007 +0200 ddraw: Search for texture sublevels with GetAttachedSurface. --- dlls/ddraw/ddraw.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index df107ce..8b8308a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1598,12 +1598,20 @@ D3D7CB_CreateSurface(IUnknown *device, { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, device); IDirectDrawSurfaceImpl *surf = This->tex_root; - int i; + int i = 0; TRACE("(%p) call back. surf=%p\n", device, surf); /* Find the wanted mipmap. There are enough mipmaps in the chain */ - for(i = 0; i < level; i++) - surf = surf->next_complex; + while(i < level) + { + IDirectDrawSurface7 *attached; + IDirectDrawSurface7_GetAttachedSurface(ICOM_INTERFACE(surf, IDirectDrawSurface7), + &This->tex_root->surface_desc.ddsCaps, + &attached); + surf = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, attached); + IDirectDrawSurface7_Release(attached); + i++; + } /* Return the surface */ *Surface = surf->WineD3DSurface;
1
0
0
0
Stefan Dösinger : ddraw: Use EnumAttachedSurfaces to search for a render target.
by Alexandre Julliard
27 Apr '07
27 Apr '07
Module: wine Branch: master Commit: c2ffffe1ffe163e57100b9c9df766a114ad46da6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c2ffffe1ffe163e57100b9c9d…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 22 20:26:16 2007 +0200 ddraw: Use EnumAttachedSurfaces to search for a render target. --- dlls/ddraw/ddraw.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3f8cea8..df107ce 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2574,6 +2574,28 @@ IDirectDrawImpl_EnumSurfaces(IDirectDraw7 *iface, return DD_OK; } +static HRESULT WINAPI +findRenderTarget(IDirectDrawSurface7 *surface, + DDSURFACEDESC2 *desc, + void *ctx) +{ + IDirectDrawSurfaceImpl *surf = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, surface); + IDirectDrawSurfaceImpl **target = (IDirectDrawSurfaceImpl **) ctx; + + if(!surf->isRenderTarget) { + *target = surf; + IDirectDrawSurface7_Release(surface); + return DDENUMRET_CANCEL; + } + + /* Recurse into the surface tree */ + IDirectDrawSurface7_EnumAttachedSurfaces(surface, ctx, findRenderTarget); + + IDirectDrawSurface7_Release(surface); + if(*target) return DDENUMRET_CANCEL; + else return DDENUMRET_OK; /* Continue with the next neighbor surface */ +} + /***************************************************************************** * D3D7CB_CreateRenderTarget * @@ -2606,25 +2628,29 @@ D3D7CB_CreateRenderTarget(IUnknown *device, IUnknown *pSuperior, HANDLE* pSharedHandle) { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, device); - IDirectDrawSurfaceImpl *d3dSurface = (IDirectDrawSurfaceImpl *) This->d3d_target->first_complex; + IDirectDrawSurfaceImpl *d3dSurface = This->d3d_target->first_complex, *target = NULL; TRACE("(%p) call back\n", device); - /* Loop through the complex chain and try to find unused primary surfaces */ - while(d3dSurface->isRenderTarget) + if(d3dSurface->isRenderTarget) + { + IDirectDrawSurface7_EnumAttachedSurfaces(ICOM_INTERFACE(d3dSurface, IDirectDrawSurface7), + &target, findRenderTarget); + } + else { - d3dSurface = d3dSurface->next_complex; - if(!d3dSurface) break; + target = d3dSurface; } - if(!d3dSurface) + + if(!target) { - d3dSurface = This->d3d_target; + target = This->d3d_target; ERR(" (%p) : No DirectDrawSurface found to create the back buffer. Using the front buffer as back buffer. Uncertain consequences\n", This); } /* TODO: Return failure if the dimensions do not match, but this shouldn't happen */ - *ppSurface = d3dSurface->WineD3DSurface; - d3dSurface->isRenderTarget = TRUE; + *ppSurface = target->WineD3DSurface; + target->isRenderTarget = TRUE; TRACE("Returning wineD3DSurface %p, it belongs to surface %p\n", *ppSurface, d3dSurface); return D3D_OK; }
1
0
0
0
Stefan Dösinger : ddraw: Add a test for EnumSurfaces.
by Alexandre Julliard
27 Apr '07
27 Apr '07
Module: wine Branch: master Commit: 86eb79b0c9d642f07b4c2f0e07f9f90b22a36650 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=86eb79b0c9d642f07b4c2f0e0…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 22 19:43:56 2007 +0200 ddraw: Add a test for EnumSurfaces. --- dlls/ddraw/tests/dsurface.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 2d5a625..e269983 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -885,6 +885,64 @@ static void GetDDInterface_7(void) IDirectDrawSurface7_Release(dsurface7); } +#define MAXEXPECTED 8 /* Can match up to 8 expected surfaces */ +struct enumstruct +{ + IDirectDrawSurface *expected[MAXEXPECTED]; + UINT count; +}; + +static HRESULT WINAPI enumCB(IDirectDrawSurface *surf, DDSURFACEDESC *desc, void *ctx) +{ + int i; + BOOL found = FALSE; + + for(i = 0; i < MAXEXPECTED; i++) + { + if(((struct enumstruct *)ctx)->expected[i] == surf) found = TRUE; + } + + ok(found, "Unexpected surface %p enumerated\n", surf); + ((struct enumstruct *)ctx)->count++; + IDirectDrawSurface_Release(surf); + return DDENUMRET_OK; +} + +static void EnumTest(void) +{ + HRESULT rc; + DDSURFACEDESC ddsd; + IDirectDrawSurface *surface; + struct enumstruct ctx; + + 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; + ddsd.dwWidth = 32; + ddsd.dwHeight = 32; + rc = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); + ok(rc==DD_OK,"CreateSurface returned: %x\n",rc); + + memset(&ctx, 0, sizeof(ctx)); + ctx.expected[0] = surface; + rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[0], &ddsd.ddsCaps, &ctx.expected[1]); + ok(rc == DD_OK, "GetAttachedSurface returned %08x\n", rc); + rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[1], &ddsd.ddsCaps, &ctx.expected[2]); + ok(rc == DD_OK, "GetAttachedSurface returned %08x\n", rc); + rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[2], &ddsd.ddsCaps, &ctx.expected[3]); + ok(rc == DDERR_NOTFOUND, "GetAttachedSurface returned %08x\n", rc); + ctx.count = 0; + + rc = IDirectDraw_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &ddsd, (void *) &ctx, enumCB); + ok(rc == DD_OK, "IDirectDraw_EnumSurfaces returned %08x\n", rc); + ok(ctx.count == 3, "%d surfaces enumerated, expected 3\n", ctx.count); + + IDirectDrawSurface_Release(ctx.expected[2]); + IDirectDrawSurface_Release(ctx.expected[1]); + IDirectDrawSurface_Release(surface); +} + START_TEST(dsurface) { if (!CreateDirectDraw()) @@ -896,5 +954,6 @@ START_TEST(dsurface) GetDDInterface_2(); GetDDInterface_4(); GetDDInterface_7(); + EnumTest(); ReleaseDirectDraw(); }
1
0
0
0
Andrew Riedi : winex11.drv: Add legacy 32-bit cursor support.
by Alexandre Julliard
27 Apr '07
27 Apr '07
Module: wine Branch: master Commit: 2c709c59b81732ee481f3a3d81214ed485187583 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2c709c59b81732ee481f3a3d8…
Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Wed Apr 25 16:49:22 2007 -0700 winex11.drv: Add legacy 32-bit cursor support. --- dlls/winex11.drv/mouse.c | 154 +++++++++++++++++++++++++++------------------ 1 files changed, 92 insertions(+), 62 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c709c59b81732ee481f3…
1
0
0
0
Yuval Fledel : schannel: Tests for SpLsaModeInitialize, SpUserModeInitialize and GetInfo.
by Alexandre Julliard
27 Apr '07
27 Apr '07
Module: wine Branch: master Commit: 735df24617154f689cbedf1510afea35a47a40e0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=735df24617154f689cbedf151…
Author: Yuval Fledel <yuvalfl(a)gmail.com> Date: Wed Apr 25 22:49:08 2007 +0300 schannel: Tests for SpLsaModeInitialize, SpUserModeInitialize and GetInfo. --- .gitignore | 4 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/schannel/tests/Makefile.in | 13 +++ dlls/schannel/tests/main.c | 180 +++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 208 insertions(+), 0 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=735df24617154f689cbed…
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
9
...
69
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
Results per page:
10
25
50
100
200