ReactOS.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
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
List overview
Download
Ros-diffs
June 2017
----- 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
ros-diffs@reactos.org
20 participants
526 discussions
Start a n
N
ew thread
[sgasiorek] 75181: [WIN32SS][NTDDRAW] Remove debug dump. Forgot about this.
by sgasiorek@svn.reactos.org
Author: sgasiorek Date: Sat Jun 24 13:21:24 2017 New Revision: 75181 URL:
http://svn.reactos.org/svn/reactos?rev=75181&view=rev
Log: [WIN32SS][NTDDRAW] Remove debug dump. Forgot about this. Modified: trunk/reactos/win32ss/reactx/ntddraw/intddraw.h Modified: trunk/reactos/win32ss/reactx/ntddraw/intddraw.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/ntddraw/int…
============================================================================== --- trunk/reactos/win32ss/reactx/ntddraw/intddraw.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/ntddraw/intddraw.h [iso-8859-1] Sat Jun 24 13:21:24 2017 @@ -111,28 +111,3 @@ /* Gammaramp internal prototype */ BOOL FASTCALL IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); BOOL FASTCALL IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL); - -/* Debug function oly for win32k dx */ -void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl); -void dump_edd_directdraw_local(PEDD_DIRECTDRAW_LOCAL pEddlcl); -void dump_halinfo(DD_HALINFO *pHalInfo); - -#define checkflag(dwflag,dwvalue,text) \ - if (dwflag & dwvalue) \ - { \ - if (count!=0) \ - { \ - DPRINT1("| "); \ - } \ - dwflag = (ULONG)dwflag - (ULONG)dwvalue; \ - DPRINT1("%s ",text); \ - count++; \ - } - -#define endcheckflag(dwflag,text) \ - if (count==0) \ - DPRINT1("0x%08lx\n", (ULONG) dwflag);\ - else \ - DPRINT1("\n");\ - if (flag != 0) \ - DPRINT1("undoc value in %s flags value %08lx\n",text, (ULONG) dwflag);
7 years, 6 months
1
0
0
0
[sgasiorek] 75180: [WIN32SS][NTDDRAW] Remove debug dump of structures during ReactX initialisation. It's not needed and shouldn't be commited.
by sgasiorek@svn.reactos.org
Author: sgasiorek Date: Sat Jun 24 12:36:19 2017 New Revision: 75180 URL:
http://svn.reactos.org/svn/reactos?rev=75180&view=rev
Log: [WIN32SS][NTDDRAW] Remove debug dump of structures during ReactX initialisation. It's not needed and shouldn't be commited. Modified: trunk/reactos/win32ss/reactx/ntddraw/ddraw.c Modified: trunk/reactos/win32ss/reactx/ntddraw/ddraw.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/ntddraw/ddr…
============================================================================== --- trunk/reactos/win32ss/reactx/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/ntddraw/ddraw.c [iso-8859-1] Sat Jun 24 12:36:19 2017 @@ -88,9 +88,6 @@ /* Note: it is the hdev struct it wants, not the drv hPDev aka pdc->PDev */ success = pfnDdEnableDirectDraw(pDC->ppdev, TRUE); - - dump_edd_directdraw_global(pDev->pEDDgpl); - dump_halinfo(&pDev->pEDDgpl->ddHalInfo); } } else @@ -663,722 +660,3 @@ DPRINT1("Calling dxg.sys pfnDdSetGammaRamp\n"); return pfnDdSetGammaRamp(hDirectDraw, hdc, lpGammaRamp); } - - -/* Internal debug API */ -void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) -{ - DPRINT1("0x%08lx 0x000 PEDD_DIRECTDRAW_GLOBAL->dhpdev : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dhpdev), pEddgbl->dhpdev); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dwReserved1 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dwReserved1),pEddgbl->dwReserved1); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dwReserved2 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dwReserved2),pEddgbl->dwReserved2); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_000c[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_000c[0]),pEddgbl->unk_000c[0]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_000c[1] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_000c[1]),pEddgbl->unk_000c[1]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_000c[2] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_000c[2]),pEddgbl->unk_000c[2]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->cDriverReferences : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, cDriverReferences),pEddgbl->cDriverReferences); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_01c : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_01c),pEddgbl->unk_01c); - - DPRINT1("0x%08lx 0x020 PEDD_DIRECTDRAW_GLOBAL->dwCallbackFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dwCallbackFlags),pEddgbl->dwCallbackFlags); - - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_024 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_024),pEddgbl->unk_024); - - DPRINT1("0x%08lx 0x028 PEDD_DIRECTDRAW_GLOBAL->llAssertModeTimeout : 0x%llx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, llAssertModeTimeout),pEddgbl->llAssertModeTimeout.QuadPart); - DPRINT1("0x%08lx 0x030 PEDD_DIRECTDRAW_GLOBAL->dwNumHeaps : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dwNumHeaps),pEddgbl->dwNumHeaps); - // VIDEOMEMORY *pvmList; - DPRINT1("0x%08lx 0x034 PEDD_DIRECTDRAW_GLOBAL->pvmList : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, pvmList),pEddgbl->pvmList); - - DPRINT1("0x%08lx 0x038 PEDD_DIRECTDRAW_GLOBAL->dwNumFourCC : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dwNumFourCC),pEddgbl->dwNumFourCC); - DPRINT1("0x%08lx 0x03C PEDD_DIRECTDRAW_GLOBAL->pdwFourCC : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, pdwFourCC),pEddgbl->pdwFourCC); - - // DD_HALINFO ddHalInfo; - DPRINT1("0x%08lx 0x040 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.dwSize),pEddgbl->ddHalInfo.dwSize); - DPRINT1("0x%08lx 0x044 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.fpPrimary : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.fpPrimary),pEddgbl->ddHalInfo.vmiData.fpPrimary); - DPRINT1("0x%08lx 0x048 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.dwFlags),pEddgbl->ddHalInfo.vmiData.dwFlags); - DPRINT1("0x%08lx 0x04C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwDisplayWidth : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.dwDisplayWidth),pEddgbl->ddHalInfo.vmiData.dwDisplayWidth); - DPRINT1("0x%08lx 0x050 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwDisplayHeight : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.dwDisplayHeight),pEddgbl->ddHalInfo.vmiData.dwDisplayHeight); - DPRINT1("0x%08lx 0x054 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.lDisplayPitch : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.lDisplayPitch),pEddgbl->ddHalInfo.vmiData.lDisplayPitch); - DPRINT1("0x%08lx 0x058 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.ddpfDisplay.dwSize),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwSize); - DPRINT1("0x%08lx 0x05C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.ddpfDisplay.dwFlags),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwFlags); - DPRINT1("0x%08lx 0x060 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwFourCC : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.ddpfDisplay.dwFourCC),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwFourCC); - DPRINT1("0x%08lx 0x064 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwRGBBitCount : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.ddpfDisplay.dwRGBBitCount),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwRGBBitCount); - DPRINT1("0x%08lx 0x068 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwRBitMask : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.ddpfDisplay.dwRBitMask),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwRBitMask); - DPRINT1("0x%08lx 0x06C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwGBitMask : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.ddpfDisplay.dwGBitMask),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwGBitMask); - DPRINT1("0x%08lx 0x070 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwBBitMask : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.ddpfDisplay.dwBBitMask),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwGBitMask); - DPRINT1("0x%08lx 0x074 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwRGBAlphaBitMask : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.ddpfDisplay.dwRGBAlphaBitMask),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwRGBAlphaBitMask); - - DPRINT1("0x%08lx 0x078 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwOffscreenAlign : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.dwOffscreenAlign),pEddgbl->ddHalInfo.vmiData.dwOffscreenAlign); - DPRINT1("0x%08lx 0x07C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwOverlayAlign : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.dwOverlayAlign ),pEddgbl->ddHalInfo.vmiData.dwOverlayAlign); - DPRINT1("0x%08lx 0x080 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwTextureAlign : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.dwTextureAlign),pEddgbl->ddHalInfo.vmiData.dwTextureAlign); - DPRINT1("0x%08lx 0x084 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwZBufferAlign : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.dwZBufferAlign),pEddgbl->ddHalInfo.vmiData.dwZBufferAlign); - DPRINT1("0x%08lx 0x088 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwAlphaAlign : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.dwAlphaAlign),pEddgbl->ddHalInfo.vmiData.dwAlphaAlign); - DPRINT1("0x%08lx 0x08C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.pvPrimary : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.vmiData.pvPrimary),pEddgbl->ddHalInfo.vmiData.pvPrimary); - DPRINT1("0x%08lx 0x08C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.ddCaps.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.ddCaps.dwSize),pEddgbl->ddHalInfo.ddCaps.dwSize); - DPRINT1("0x%08lx 0x08C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.ddCaps.dwCaps : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.ddCaps.dwCaps),pEddgbl->ddHalInfo.ddCaps.dwCaps); - - DPRINT1("0x%08lx 0x298 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.dwSize),pEddgbl->ddCallbacks.dwSize); - DPRINT1("0x%08lx 0x29C PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.dwFlags),pEddgbl->ddCallbacks.dwFlags); - DPRINT1("0x%08lx 0x2A0 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.DestroyDriver : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.DestroyDriver),pEddgbl->ddCallbacks.DestroyDriver); - DPRINT1("0x%08lx 0x2A4 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.CreateSurface : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.CreateSurface),pEddgbl->ddCallbacks.CreateSurface); - DPRINT1("0x%08lx 0x2A8 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.SetColorKey : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.SetColorKey),pEddgbl->ddCallbacks.SetColorKey); - DPRINT1("0x%08lx 0x2AC PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.SetMode : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.SetMode),pEddgbl->ddCallbacks.SetMode); - DPRINT1("0x%08lx 0x2B0 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.WaitForVerticalBlank : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.WaitForVerticalBlank),pEddgbl->ddCallbacks.WaitForVerticalBlank); - DPRINT1("0x%08lx 0x2B4 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.CanCreateSurface : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.CanCreateSurface),pEddgbl->ddCallbacks.CanCreateSurface); - DPRINT1("0x%08lx 0x2B8 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.CreatePalette : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.CreatePalette),pEddgbl->ddCallbacks.CreatePalette); - DPRINT1("0x%08lx 0x2BC PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.GetScanLine : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.GetScanLine),pEddgbl->ddCallbacks.GetScanLine); - DPRINT1("0x%08lx 0x2C0 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.MapMemory : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.MapMemory),pEddgbl->ddCallbacks.MapMemory); - - - DPRINT1("0x%08lx 0x2C4 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.dwSize),pEddgbl->ddSurfaceCallbacks.dwSize); - DPRINT1("0x%08lx 0x2C8 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.dwFlags),pEddgbl->ddSurfaceCallbacks.dwFlags); - DPRINT1("0x%08lx 0x2CC PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.DestroySurface : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.DestroySurface),pEddgbl->ddSurfaceCallbacks.DestroySurface); - DPRINT1("0x%08lx 0x2D0 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.Flip : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.Flip),pEddgbl->ddSurfaceCallbacks.Flip); - DPRINT1("0x%08lx 0x2D4 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.SetClipList : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.SetClipList),pEddgbl->ddSurfaceCallbacks.SetClipList); - DPRINT1("0x%08lx 0x2D8 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.Lock : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.Lock),pEddgbl->ddSurfaceCallbacks.Lock); - DPRINT1("0x%08lx 0x2DC PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.Unlock : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.Unlock),pEddgbl->ddSurfaceCallbacks.Unlock); - DPRINT1("0x%08lx 0x2E0 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.Blt : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.Blt),pEddgbl->ddSurfaceCallbacks.Blt); - DPRINT1("0x%08lx 0x2E4 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.SetColorKey : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.SetColorKey),pEddgbl->ddSurfaceCallbacks.SetColorKey); - DPRINT1("0x%08lx 0x2E8 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.AddAttachedSurface : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.AddAttachedSurface),pEddgbl->ddSurfaceCallbacks.AddAttachedSurface); - DPRINT1("0x%08lx 0x2EC PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.GetBltStatus : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.GetBltStatus),pEddgbl->ddSurfaceCallbacks.GetBltStatus); - DPRINT1("0x%08lx 0x2F0 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.GetFlipStatus : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.GetFlipStatus),pEddgbl->ddSurfaceCallbacks.GetFlipStatus); - DPRINT1("0x%08lx 0x2F4 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.UpdateOverlay : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.UpdateOverlay),pEddgbl->ddSurfaceCallbacks.UpdateOverlay); - DPRINT1("0x%08lx 0x2F8 PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.SetOverlayPosition : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.SetOverlayPosition),pEddgbl->ddSurfaceCallbacks.SetOverlayPosition); - DPRINT1("0x%08lx 0x2FC PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.reserved4 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddSurfaceCallbacks.reserved4),pEddgbl->ddSurfaceCallbacks.reserved4); - - DPRINT1("0x%08lx 0x300 PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddPaletteCallbacks.dwSize),pEddgbl->ddPaletteCallbacks.dwSize); - DPRINT1("0x%08lx 0x304 PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddPaletteCallbacks.dwFlags),pEddgbl->ddPaletteCallbacks.dwFlags); - DPRINT1("0x%08lx 0x308 PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.DestroyPalette : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddPaletteCallbacks.DestroyPalette),pEddgbl->ddPaletteCallbacks.DestroyPalette); - DPRINT1("0x%08lx 0x30C PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.SetEntries : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddPaletteCallbacks.SetEntries),pEddgbl->ddPaletteCallbacks.SetEntries); - - DPRINT1("0x%08lx 0x314 PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtGlobalDriverData.dwSize),pEddgbl->d3dNtGlobalDriverData.dwSize); - DPRINT1("0x%08lx 0x3D4 PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks.dwSize),pEddgbl->d3dNtHalCallbacks.dwSize); - DPRINT1("0x%08lx 0x460 PEDD_DIRECTDRAW_GLOBAL->d3dBufCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dBufCallbacks.dwSize),pEddgbl->d3dBufCallbacks.dwSize); - DPRINT1("0x%08lx 0x47C PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks2.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks2.dwSize),pEddgbl->d3dNtHalCallbacks2.dwSize); - - DPRINT1("0x%08lx 0x498 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.dwSize),pEddgbl->ddVideoPortCallback.dwSize); - DPRINT1("0x%08lx 0x49C PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.dwFlags),pEddgbl->ddVideoPortCallback.dwFlags); - DPRINT1("0x%08lx 0x4A0 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.CanCreateVideoPort : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.CanCreateVideoPort),pEddgbl->ddVideoPortCallback.CanCreateVideoPort); - DPRINT1("0x%08lx 0x4A4 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.CreateVideoPort : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.CreateVideoPort),pEddgbl->ddVideoPortCallback.CreateVideoPort); - DPRINT1("0x%08lx 0x4A8 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.FlipVideoPort : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.FlipVideoPort),pEddgbl->ddVideoPortCallback.FlipVideoPort); - DPRINT1("0x%08lx 0x4AC PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortBandwidth : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortBandwidth),pEddgbl->ddVideoPortCallback.GetVideoPortBandwidth); - DPRINT1("0x%08lx 0x4B0 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortInputFormats : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortInputFormats),pEddgbl->ddVideoPortCallback.GetVideoPortInputFormats); - DPRINT1("0x%08lx 0x4B4 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortOutputFormats : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortOutputFormats),pEddgbl->ddVideoPortCallback.GetVideoPortOutputFormats); - DPRINT1("0x%08lx 0x4B8 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.lpReserved1 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.lpReserved1),pEddgbl->ddVideoPortCallback.lpReserved1); - DPRINT1("0x%08lx 0x4BC PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortField : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortField),pEddgbl->ddVideoPortCallback.GetVideoPortField); - DPRINT1("0x%08lx 0x4C0 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortLine : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortLine),pEddgbl->ddVideoPortCallback.GetVideoPortLine); - DPRINT1("0x%08lx 0x4C4 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortConnectInfo : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortConnectInfo),pEddgbl->ddVideoPortCallback.GetVideoPortConnectInfo); - DPRINT1("0x%08lx 0x4C8 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.DestroyVideoPort : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.DestroyVideoPort),pEddgbl->ddVideoPortCallback.DestroyVideoPort); - DPRINT1("0x%08lx 0x4CC PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoPortFlipStatus : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoPortFlipStatus),pEddgbl->ddVideoPortCallback.GetVideoPortFlipStatus); - DPRINT1("0x%08lx 0x4D0 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.UpdateVideoPort : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.UpdateVideoPort),pEddgbl->ddVideoPortCallback.UpdateVideoPort); - DPRINT1("0x%08lx 0x4D4 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.WaitForVideoPortSync : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.WaitForVideoPortSync),pEddgbl->ddVideoPortCallback.WaitForVideoPortSync); - DPRINT1("0x%08lx 0x4D8 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoSignalStatus : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.GetVideoSignalStatus),pEddgbl->ddVideoPortCallback.GetVideoSignalStatus); - DPRINT1("0x%08lx 0x4DC PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.ColorControl : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.ColorControl),pEddgbl->ddVideoPortCallback.ColorControl); - - DPRINT1("0x%08lx 0x4E0 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanousCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanousCallbacks.dwSize),pEddgbl->ddMiscellanousCallbacks.dwSize); - DPRINT1("0x%08lx 0x4E4 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanousCallbacks.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanousCallbacks.dwFlags),pEddgbl->ddMiscellanousCallbacks.dwFlags); - DPRINT1("0x%08lx 0x4E8 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanousCallbacks.GetAvailDriverMemory : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanousCallbacks.GetAvailDriverMemory),pEddgbl->ddMiscellanousCallbacks.GetAvailDriverMemory); - - DPRINT1("0x%08lx 0x4EC PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.dwSize),pEddgbl->ddMiscellanous2Callbacks.dwSize); - DPRINT1("0x%08lx 0x4F0 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.dwFlags),pEddgbl->ddMiscellanous2Callbacks.dwFlags); - DPRINT1("0x%08lx 0x4F4 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.AlphaBlt : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.AlphaBlt),pEddgbl->ddMiscellanous2Callbacks.AlphaBlt); - DPRINT1("0x%08lx 0x4F8 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.CreateSurfaceEx : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.CreateSurfaceEx),pEddgbl->ddMiscellanous2Callbacks.CreateSurfaceEx); - DPRINT1("0x%08lx 0x4FC PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.GetDriverState : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.GetDriverState),pEddgbl->ddMiscellanous2Callbacks.GetDriverState); - DPRINT1("0x%08lx 0x500 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.DestroyDDLocal : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.DestroyDDLocal),pEddgbl->ddMiscellanous2Callbacks.DestroyDDLocal); - - DPRINT1("0x%08lx 0x504 PEDD_DIRECTDRAW_GLOBAL->ddNtCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddNtCallbacks.dwSize),pEddgbl->ddNtCallbacks.dwSize); - DPRINT1("0x%08lx 0x518 PEDD_DIRECTDRAW_GLOBAL->ddColorControlCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddColorControlCallbacks.dwSize),pEddgbl->ddColorControlCallbacks.dwSize); - DPRINT1("0x%08lx 0x524 PEDD_DIRECTDRAW_GLOBAL->ddKernelCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddKernelCallbacks.dwSize),pEddgbl->ddKernelCallbacks.dwSize); - DPRINT1("0x%08lx 0x534 PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks3.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks3.dwSize),pEddgbl->d3dNtHalCallbacks3.dwSize); - - DPRINT1("0x%08lx 0x54C PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.dwSize),pEddgbl->ddMotionCompCallbacks.dwSize); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.dwFlags),pEddgbl->ddMotionCompCallbacks.dwSize); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.GetMoCompGuids : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.GetMoCompGuids),pEddgbl->ddMotionCompCallbacks.GetMoCompGuids); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.GetMoCompFormats : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.GetMoCompFormats),pEddgbl->ddMotionCompCallbacks.GetMoCompFormats); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.CreateMoComp : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.CreateMoComp),pEddgbl->ddMotionCompCallbacks.CreateMoComp); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.GetMoCompBuffInfo : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.GetMoCompBuffInfo),pEddgbl->ddMotionCompCallbacks.GetMoCompBuffInfo); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.GetInternalMoCompInfo : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.GetInternalMoCompInfo),pEddgbl->ddMotionCompCallbacks.GetInternalMoCompInfo); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.BeginMoCompFrame : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.BeginMoCompFrame),pEddgbl->ddMotionCompCallbacks.BeginMoCompFrame); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.EndMoCompFrame : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.EndMoCompFrame),pEddgbl->ddMotionCompCallbacks.EndMoCompFrame); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.RenderMoComp : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.RenderMoComp),pEddgbl->ddMotionCompCallbacks.RenderMoComp); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.QueryMoCompStatus : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.QueryMoCompStatus),pEddgbl->ddMotionCompCallbacks.QueryMoCompStatus); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.DestroyMoComp : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.DestroyMoComp),pEddgbl->ddMotionCompCallbacks.DestroyMoComp); - - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMoreSurfaceCaps.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMoreSurfaceCaps.dwSize),pEddgbl->ddMoreSurfaceCaps.dwSize); - - // EDD_DIRECTDRAW_LOCAL* peDirectDrawLocalList; - DPRINT1("0x%08lx 0x5A8 PEDD_DIRECTDRAW_GLOBAL->peDirectDrawLocalList : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, peDirectDrawLocalList), pEddgbl->peDirectDrawLocalList); - // EDD_SURFACE* peSurface_LockList; - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->peSurface_LockList : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, peSurface_LockList), pEddgbl->peSurface_LockList); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->fl : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, fl), pEddgbl->fl); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->cSurfaceLocks : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, cSurfaceLocks), pEddgbl->cSurfaceLocks); - // PKEVENT pAssertModeEvent; - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->pAssertModeEvent : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, pAssertModeEvent), pEddgbl->pAssertModeEvent); - // EDD_SURFACE *peSurfaceCurrent; - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->peSurfaceCurrent : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, peSurfaceCurrent), pEddgbl->peSurfaceCurrent); - // EDD_SURFACE *peSurfacePrimary; - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->peSurfacePrimary : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, peSurfacePrimary),pEddgbl->peSurfacePrimary); - DPRINT1("0x%08lx 0x5C4 PEDD_DIRECTDRAW_GLOBAL->bSuspended : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, bSuspended),pEddgbl->bSuspended); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[0]),pEddgbl->unk_5c8[0]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[1] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[1]),pEddgbl->unk_5c8[1]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[2] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[2]),pEddgbl->unk_5c8[2]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[3] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[3]),pEddgbl->unk_5c8[3]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[4] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[4]),pEddgbl->unk_5c8[4]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[5] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[5]),pEddgbl->unk_5c8[5]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[6] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[6]),pEddgbl->unk_5c8[6]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[7] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[7]),pEddgbl->unk_5c8[7]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[8] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[8]),pEddgbl->unk_5c8[8]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[9] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[9]),pEddgbl->unk_5c8[9]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[10] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[10]),pEddgbl->unk_5c8[10]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_5c8[11] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_5c8[11]),pEddgbl->unk_5c8[11]); - // RECTL rcbounds; - //DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->rcbounds : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, rcbounds),pEddgbl->rcbounds); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_608 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_608), pEddgbl->unk_608); - DPRINT1("0x%08lx 0x60C PEDD_DIRECTDRAW_GLOBAL->hDev : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, hDev), pEddgbl->hDev); - - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[0]), pEddgbl->unk_610[0]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[1] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[1]), pEddgbl->unk_610[1]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[2] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[2]), pEddgbl->unk_610[2]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[3] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[3]), pEddgbl->unk_610[3]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[4] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[4]), pEddgbl->unk_610[4]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[5] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[5]), pEddgbl->unk_610[5]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[6] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[6]), pEddgbl->unk_610[6]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[7] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[7]), pEddgbl->unk_610[7]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[8] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[8]), pEddgbl->unk_610[8]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[9] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[9]), pEddgbl->unk_610[9]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[10] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[10]), pEddgbl->unk_610[10]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[11] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[11]), pEddgbl->unk_610[11]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[12] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[12]), pEddgbl->unk_610[12]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[13] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[13]), pEddgbl->unk_610[13]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[14] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[14]), pEddgbl->unk_610[14]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[15] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[15]), pEddgbl->unk_610[15]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[16] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[16]), pEddgbl->unk_610[16]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[17] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[17]), pEddgbl->unk_610[17]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[18] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[18]), pEddgbl->unk_610[18]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[19] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[19]), pEddgbl->unk_610[19]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[20] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[20]), pEddgbl->unk_610[20]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[21] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[21]), pEddgbl->unk_610[21]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[22] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[22]), pEddgbl->unk_610[22]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[23] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[23]), pEddgbl->unk_610[23]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[24] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[24]), pEddgbl->unk_610[24]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[25] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[25]), pEddgbl->unk_610[25]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[26] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[26]), pEddgbl->unk_610[26]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[27] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[27]), pEddgbl->unk_610[27]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[28] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[28]), pEddgbl->unk_610[28]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[29] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[29]), pEddgbl->unk_610[29]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[30] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[30]), pEddgbl->unk_610[30]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[31] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[31]), pEddgbl->unk_610[31]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[32] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[32]), pEddgbl->unk_610[32]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[33] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[33]), pEddgbl->unk_610[33]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[34] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[34]), pEddgbl->unk_610[34]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[35] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[35]), pEddgbl->unk_610[35]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[36] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[36]), pEddgbl->unk_610[36]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[37] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[37]), pEddgbl->unk_610[37]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[38] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[38]), pEddgbl->unk_610[38]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[39] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[39]), pEddgbl->unk_610[39]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[40] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[40]), pEddgbl->unk_610[40]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[41] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[41]), pEddgbl->unk_610[41]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[42] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[42]), pEddgbl->unk_610[42]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[43] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[43]), pEddgbl->unk_610[43]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[44] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[44]), pEddgbl->unk_610[44]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[45] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[45]), pEddgbl->unk_610[45]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[46] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[46]), pEddgbl->unk_610[46]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[47] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[47]), pEddgbl->unk_610[47]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[48] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[48]), pEddgbl->unk_610[48]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[49] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[49]), pEddgbl->unk_610[49]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[50] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[50]), pEddgbl->unk_610[50]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[51] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[51]), pEddgbl->unk_610[51]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[52] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[52]), pEddgbl->unk_610[52]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[53] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[53]), pEddgbl->unk_610[53]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[54] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[54]), pEddgbl->unk_610[54]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[55] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[55]), pEddgbl->unk_610[55]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[56] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[56]), pEddgbl->unk_610[56]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[57] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[57]), pEddgbl->unk_610[57]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[58] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[58]), pEddgbl->unk_610[58]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[59] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[59]), pEddgbl->unk_610[59]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[60] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[60]), pEddgbl->unk_610[60]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[61] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[61]), pEddgbl->unk_610[61]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_610[62] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_610[62]), pEddgbl->unk_610[62]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_70C : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_70C), pEddgbl->unk_70C); -} - -void dump_edd_directdraw_local(PEDD_DIRECTDRAW_LOCAL pEddlcl) -{ - //DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->pobj : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, pobj), pEddlcl->pobj); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->peDirectDrawGlobal : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, peDirectDrawGlobal), pEddlcl->peDirectDrawGlobal); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->peSurface_DdList : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, peSurface_DdList), pEddlcl->peSurface_DdList); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_018 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_018), pEddlcl->unk_018); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_01c : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_01c), pEddlcl->unk_01c); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_020 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_020), pEddlcl->unk_020); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->peDirectDrawGlobal2 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, peDirectDrawGlobal2), pEddlcl->peDirectDrawGlobal2); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->fpProcess : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, fpProcess), pEddlcl->fpProcess); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->fl : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, fl), pEddlcl->fl); - - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->peDirectDrawLocal_prev : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, peDirectDrawLocal_prev), pEddlcl->peDirectDrawLocal_prev); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_034 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_034), pEddlcl->unk_034); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_038 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_038), pEddlcl->unk_038); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->UniqueProcess : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, UniqueProcess), pEddlcl->UniqueProcess); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->Process : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, Process), pEddlcl->Process); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_044 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_044), pEddlcl->unk_044); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_048 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_048), pEddlcl->unk_048); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_04C : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_04C), pEddlcl->unk_04C); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_050 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_050), pEddlcl->unk_050); - - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_050 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_050), pEddlcl->unk_050); -} - -void -dump_halinfo(DD_HALINFO *pHalInfo) -{ - if (pHalInfo->dwSize == sizeof(DD_HALINFO_V4)) - { - DD_HALINFO_V4 *pHalInfo4 = (DD_HALINFO_V4 *) pHalInfo; - int t; - - DPRINT1("DD_HALINFO Version NT4 found \n"); - DPRINT1(" pHalInfo4->dwSize : 0x%08lx\n",(long)pHalInfo4->dwSize); - DPRINT1(" pHalInfo4->vmiData->fpPrimary : 0x%08lx\n",(long)pHalInfo4->vmiData.fpPrimary); - DPRINT1(" pHalInfo4->vmiData->dwFlags : 0x%08lx\n",(long)pHalInfo4->vmiData.dwFlags); - DPRINT1(" pHalInfo4->vmiData->dwDisplayWidth : 0x%08lx\n",(long)pHalInfo4->vmiData.dwDisplayWidth); - DPRINT1(" pHalInfo4->vmiData->dwDisplayHeight : 0x%08lx\n",(long)pHalInfo4->vmiData.dwDisplayHeight); - DPRINT1(" pHalInfo4->vmiData->lDisplayPitch : 0x%08lx\n",(long)pHalInfo4->vmiData.lDisplayPitch); - - DPRINT1(" pHalInfo4->vmiData->ddpfDisplay.dwSize : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwSize); - DPRINT1(" pHalInfo4->vmiData->ddpfDisplay.dwFlags : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwFlags); - DPRINT1(" pHalInfo4->vmiData->ddpfDisplay.dwFourCC : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwFourCC); - DPRINT1(" pHalInfo4->vmiData->ddpfDisplay.dwRGBBitCount : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwRGBBitCount); - DPRINT1(" pHalInfo4->vmiData->ddpfDisplay.dwRBitMask : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwRBitMask); - DPRINT1(" pHalInfo4->vmiData->ddpfDisplay.dwGBitMask : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwGBitMask); - DPRINT1(" pHalInfo4->vmiData->ddpfDisplay.dwBBitMask : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwBBitMask); - DPRINT1(" pHalInfo4->vmiData->ddpfDisplay.dwRGBAlphaBitMask : 0x%08lx\n",(long)pHalInfo4->vmiData.ddpfDisplay.dwRGBAlphaBitMask); - - DPRINT1(" pHalInfo4->vmiData->dwOffscreenAlign : 0x%08lx\n",(long)pHalInfo4->vmiData.dwOffscreenAlign); - DPRINT1(" pHalInfo4->vmiData->dwOverlayAlign : 0x%08lx\n",(long)pHalInfo4->vmiData.dwOverlayAlign); - DPRINT1(" pHalInfo4->vmiData->dwTextureAlign : 0x%08lx\n",(long)pHalInfo4->vmiData.dwTextureAlign); - DPRINT1(" pHalInfo4->vmiData->dwZBufferAlign : 0x%08lx\n",(long)pHalInfo4->vmiData.dwZBufferAlign); - DPRINT1(" pHalInfo4->vmiData->dwAlphaAlign : 0x%08lx\n",(long)pHalInfo4->vmiData.dwAlphaAlign); - DPRINT1(" pHalInfo4->vmiData->pvPrimary : 0x%p\n",pHalInfo4->vmiData.pvPrimary); - - DPRINT1(" pHalInfo4->ddCaps.dwSize : 0x%08lx\n",pHalInfo4->ddCaps.dwSize); - DPRINT1(" pHalInfo4->ddCaps.dwCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwCaps); - DPRINT1(" pHalInfo4->ddCaps.dwCaps2 : 0x%08lx\n",pHalInfo4->ddCaps.dwCaps2); - DPRINT1(" pHalInfo4->ddCaps.dwCKeyCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwCKeyCaps); - DPRINT1(" pHalInfo4->ddCaps.dwFXCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwFXCaps); - DPRINT1(" pHalInfo4->ddCaps.dwFXAlphaCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwFXAlphaCaps); - DPRINT1(" pHalInfo4->ddCaps.dwPalCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwPalCaps); - DPRINT1(" pHalInfo4->ddCaps.dwSVCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwSVCaps); - DPRINT1(" pHalInfo4->ddCaps.dwAlphaBltConstBitDepths : 0x%08lx\n",pHalInfo4->ddCaps.dwAlphaBltConstBitDepths); - DPRINT1(" pHalInfo4->ddCaps.dwAlphaBltPixelBitDepths : 0x%08lx\n",pHalInfo4->ddCaps.dwAlphaBltPixelBitDepths); - DPRINT1(" pHalInfo4->ddCaps.dwAlphaBltSurfaceBitDepths : 0x%08lx\n",pHalInfo4->ddCaps.dwAlphaBltSurfaceBitDepths); - DPRINT1(" pHalInfo4->ddCaps.dwAlphaOverlayConstBitDepths : 0x%08lx\n",pHalInfo4->ddCaps.dwAlphaOverlayConstBitDepths); - DPRINT1(" pHalInfo4->ddCaps.dwAlphaOverlayPixelBitDepths : 0x%08lx\n",pHalInfo4->ddCaps.dwAlphaOverlayPixelBitDepths); - DPRINT1(" pHalInfo4->ddCaps.dwAlphaOverlaySurfaceBitDepths : 0x%08lx\n",pHalInfo4->ddCaps.dwAlphaOverlaySurfaceBitDepths); - DPRINT1(" pHalInfo4->ddCaps.dwZBufferBitDepths : 0x%08lx\n",pHalInfo4->ddCaps.dwZBufferBitDepths); - DPRINT1(" pHalInfo4->ddCaps.dwVidMemTotal : 0x%08lx\n",pHalInfo4->ddCaps.dwVidMemTotal); - DPRINT1(" pHalInfo4->ddCaps.dwVidMemFree : 0x%08lx\n",pHalInfo4->ddCaps.dwVidMemFree); - DPRINT1(" pHalInfo4->ddCaps.dwMaxVisibleOverlays : 0x%08lx\n",pHalInfo4->ddCaps.dwMaxVisibleOverlays); - DPRINT1(" pHalInfo4->ddCaps.dwCurrVisibleOverlays : 0x%08lx\n",pHalInfo4->ddCaps.dwCurrVisibleOverlays); - DPRINT1(" pHalInfo4->ddCaps.dwNumFourCCCodes : 0x%08lx\n",pHalInfo4->ddCaps.dwNumFourCCCodes); - DPRINT1(" pHalInfo4->ddCaps.dwAlignBoundarySrc : 0x%08lx\n",pHalInfo4->ddCaps.dwAlignBoundarySrc); - DPRINT1(" pHalInfo4->ddCaps.dwAlignSizeSrc : 0x%08lx\n",pHalInfo4->ddCaps.dwAlignSizeSrc); - DPRINT1(" pHalInfo4->ddCaps.dwAlignBoundaryDes : 0x%08lx\n",pHalInfo4->ddCaps.dwAlignBoundaryDest); - DPRINT1(" pHalInfo4->ddCaps.dwAlignSizeDest : 0x%08lx\n",pHalInfo4->ddCaps.dwAlignSizeDest); - DPRINT1(" pHalInfo4->ddCaps.dwAlignStrideAlign : 0x%08lx\n",pHalInfo4->ddCaps.dwAlignStrideAlign); - for (t=0;t<DD_ROP_SPACE;t++) - { - DPRINT1(" pHalInfo4->ddCaps.dwRops[0x%04x] : 0x%08lx\n",t,pHalInfo4->ddCaps.dwRops[t]); - } - DPRINT1(" pHalInfo4->ddCaps.ddsCaps.dwCaps : 0x%08lx\n",pHalInfo4->ddCaps.ddsCaps.dwCaps); - DPRINT1(" pHalInfo4->ddCaps.dwMinOverlayStretch : 0x%08lx\n",pHalInfo4->ddCaps.dwMinOverlayStretch); - DPRINT1(" pHalInfo4->ddCaps.dwMaxOverlayStretch : 0x%08lx\n",pHalInfo4->ddCaps.dwMaxOverlayStretch); - DPRINT1(" pHalInfo4->ddCaps.dwMinLiveVideoStretch : 0x%08lx\n",pHalInfo4->ddCaps.dwMinLiveVideoStretch); - DPRINT1(" pHalInfo4->ddCaps.dwMaxLiveVideoStretch : 0x%08lx\n",pHalInfo4->ddCaps.dwMaxLiveVideoStretch); - DPRINT1(" pHalInfo4->ddCaps.dwMinHwCodecStretch : 0x%08lx\n",pHalInfo4->ddCaps.dwMinHwCodecStretch); - DPRINT1(" pHalInfo4->ddCaps.dwMaxHwCodecStretch : 0x%08lx\n",pHalInfo4->ddCaps.dwMaxHwCodecStretch); - DPRINT1(" pHalInfo4->ddCaps.dwReserved1 : 0x%08lx\n",pHalInfo4->ddCaps.dwReserved1); - DPRINT1(" pHalInfo4->ddCaps.dwReserved2 : 0x%08lx\n",pHalInfo4->ddCaps.dwReserved2); - DPRINT1(" pHalInfo4->ddCaps.dwReserved3 : 0x%08lx\n",pHalInfo4->ddCaps.dwReserved3); - DPRINT1(" pHalInfo4->ddCaps.dwSVBCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwSVBCaps); - DPRINT1(" pHalInfo4->ddCaps.dwSVBCKeyCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwSVBCKeyCaps); - DPRINT1(" pHalInfo4->ddCaps.dwSVBFXCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwSVBFXCaps); - for (t=0;t<DD_ROP_SPACE;t++) - { - DPRINT1(" pHalInfo4->ddCaps.dwSVBRops[0x%04x] : 0x%08lx\n",t,pHalInfo4->ddCaps.dwSVBRops[t]); - } - DPRINT1(" pHalInfo4->ddCaps.dwVSBCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwVSBCaps); - DPRINT1(" pHalInfo4->ddCaps.dwVSBCKeyCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwVSBCKeyCaps); - DPRINT1(" pHalInfo4->ddCaps.dwVSBFXCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwVSBFXCaps); - for (t=0;t<DD_ROP_SPACE;t++) - { - DPRINT1(" pHalInfo4->ddCaps.dwVSBRops[0x%04x] : 0x%08lx\n",t,pHalInfo4->ddCaps.dwVSBRops[t]); - } - DPRINT1(" pHalInfo4->ddCaps.dwSSBCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwSSBCaps); - DPRINT1(" pHalInfo4->ddCaps.dwSSBCKeyCa : 0x%08lx\n",pHalInfo4->ddCaps.dwSSBCKeyCaps); - DPRINT1(" pHalInfo4->ddCaps.dwSSBFXCaps : 0x%08lx\n",pHalInfo4->ddCaps.dwSSBFXCaps); - for (t=0;t<DD_ROP_SPACE;t++) - { - DPRINT1(" pHalInfo4->ddCaps.dwSSBRops[0x%04x] : 0x%08lx\n",t,pHalInfo4->ddCaps.dwSSBRops[t]); - } - - DPRINT1(" pHalInfo4->ddCaps.dwMaxVideoPorts : 0x%08lx\n",pHalInfo4->ddCaps.dwMaxVideoPorts); - DPRINT1(" pHalInfo4->ddCaps.dwCurrVideoPorts : 0x%08lx\n",pHalInfo4->ddCaps.dwCurrVideoPorts); - DPRINT1(" pHalInfo4->ddCaps.dwSVBCaps2 : 0x%08lx\n",pHalInfo4->ddCaps.dwSVBCaps2); - - - DPRINT1(" pHalInfo4->GetDriverInfo : 0x%p\n",pHalInfo4->GetDriverInfo); - DPRINT1(" pHalInfo4->dwFlags : 0x%08lx\n",(long)pHalInfo4->dwFlags); - - } - else if (pHalInfo->dwSize == sizeof(DD_HALINFO)) - { - int t; - UINT flag; - INT count=0; - - DPRINT1("DD_HALINFO Version NT 2000/XP/2003 found \n"); - DPRINT1(" pHalInfo->dwSize : 0x%08lx\n",(long)pHalInfo->dwSize); - - DPRINT1(" pHalInfo->vmiData->fpPrimary : 0x%08lx\n",(long)pHalInfo->vmiData.fpPrimary); - DPRINT1(" pHalInfo->vmiData->dwFlags : 0x%08lx\n",(long)pHalInfo->vmiData.dwFlags); - DPRINT1(" pHalInfo->vmiData->dwDisplayWidth : 0x%08lx\n",(long)pHalInfo->vmiData.dwDisplayWidth); - DPRINT1(" pHalInfo->vmiData->dwDisplayHeight : 0x%08lx\n",(long)pHalInfo->vmiData.dwDisplayHeight); - DPRINT1(" pHalInfo->vmiData->lDisplayPitch : 0x%08lx\n",(long)pHalInfo->vmiData.lDisplayPitch); - - DPRINT1(" pHalInfo->vmiData->ddpfDisplay.dwSize : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwSize); - DPRINT1(" pHalInfo->vmiData->ddpfDisplay.dwFlags : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwFlags); - DPRINT1(" pHalInfo->vmiData->ddpfDisplay.dwFourCC : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwFourCC); - DPRINT1(" pHalInfo->vmiData->ddpfDisplay.dwRGBBitCount : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwRGBBitCount); - DPRINT1(" pHalInfo->vmiData->ddpfDisplay.dwRBitMask : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwRBitMask); - DPRINT1(" pHalInfo->vmiData->ddpfDisplay.dwGBitMask : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwGBitMask); - DPRINT1(" pHalInfo->vmiData->ddpfDisplay.dwBBitMask : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwBBitMask); - DPRINT1(" pHalInfo->vmiData->ddpfDisplay.dwRGBAlphaBitMask : 0x%08lx\n",(long)pHalInfo->vmiData.ddpfDisplay.dwRGBAlphaBitMask); - - - DPRINT1(" pHalInfo->vmiData->dwOffscreenAlign : 0x%08lx\n",(long)pHalInfo->vmiData.dwOffscreenAlign); - DPRINT1(" pHalInfo->vmiData->dwOverlayAlign : 0x%08lx\n",(long)pHalInfo->vmiData.dwOverlayAlign); - DPRINT1(" pHalInfo->vmiData->dwTextureAlign : 0x%08lx\n",(long)pHalInfo->vmiData.dwTextureAlign); - DPRINT1(" pHalInfo->vmiData->dwZBufferAlign : 0x%08lx\n",(long)pHalInfo->vmiData.dwZBufferAlign); - DPRINT1(" pHalInfo->vmiData->dwAlphaAlign : 0x%08lx\n",(long)pHalInfo->vmiData.dwAlphaAlign); - DPRINT1(" pHalInfo->vmiData->pvPrimary : 0x%p\n",pHalInfo->vmiData.pvPrimary); - - DPRINT1(" pHalInfo->ddCaps.dwSize : 0x%08lx\n",pHalInfo->ddCaps.dwSize); - DPRINT1(" pHalInfo->ddCaps.dwCaps : "); - flag = pHalInfo->ddCaps.dwCaps; - count = 0; - checkflag(flag,DDCAPS_3D,"DDCAPS_3D"); - checkflag(flag,DDCAPS_ALIGNBOUNDARYDEST,"DDCAPS_ALIGNBOUNDARYDEST"); - checkflag(flag,DDCAPS_ALIGNBOUNDARYSRC,"DDCAPS_ALIGNBOUNDARYSRC"); - checkflag(flag,DDCAPS_ALIGNSIZEDEST,"DDCAPS_ALIGNSIZEDEST"); - checkflag(flag,DDCAPS_ALIGNSIZESRC,"DDCAPS_ALIGNSIZESRC"); - checkflag(flag,DDCAPS_ALIGNSTRIDE,"DDCAPS_ALIGNSTRIDE"); - checkflag(flag,DDCAPS_ALPHA,"DDCAPS_ALPHA"); - checkflag(flag,DDCAPS_BANKSWITCHED,"DDCAPS_BANKSWITCHED"); - checkflag(flag,DDCAPS_BLT,"DDCAPS_BLT"); - checkflag(flag,DDCAPS_BLTCOLORFILL,"DDCAPS_BLTCOLORFILL"); - checkflag(flag,DDCAPS_BLTDEPTHFILL,"DDCAPS_BLTDEPTHFILL"); - checkflag(flag,DDCAPS_BLTFOURCC,"DDCAPS_BLTFOURCC"); - checkflag(flag,DDCAPS_BLTQUEUE,"DDCAPS_BLTQUEUE"); - checkflag(flag,DDCAPS_BLTSTRETCH,"DDCAPS_BLTSTRETCH"); - checkflag(flag,DDCAPS_CANBLTSYSMEM,"DDCAPS_CANBLTSYSMEM"); - checkflag(flag,DDCAPS_CANCLIP,"DDCAPS_CANCLIP"); - checkflag(flag,DDCAPS_CANCLIPSTRETCHED,"DDCAPS_CANCLIPSTRETCHED"); - checkflag(flag,DDCAPS_COLORKEY,"DDCAPS_COLORKEY"); - checkflag(flag,DDCAPS_COLORKEYHWASSIST,"DDCAPS_COLORKEYHWASSIST"); - checkflag(flag,DDCAPS_GDI,"DDCAPS_GDI"); - checkflag(flag,DDCAPS_NOHARDWARE,"DDCAPS_NOHARDWARE"); - checkflag(flag,DDCAPS_OVERLAY,"DDCAPS_OVERLAY"); - checkflag(flag,DDCAPS_OVERLAYCANTCLIP,"DDCAPS_OVERLAYCANTCLIP"); - checkflag(flag,DDCAPS_OVERLAYFOURCC,"DDCAPS_OVERLAYFOURCC"); - checkflag(flag,DDCAPS_OVERLAYSTRETCH,"DDCAPS_OVERLAYSTRETCH"); - checkflag(flag,DDCAPS_PALETTE,"DDCAPS_PALETTE"); - checkflag(flag,DDCAPS_PALETTEVSYNC,"DDCAPS_PALETTEVSYNC"); - checkflag(flag,DDCAPS_READSCANLINE,"DDCAPS_READSCANLINE"); - checkflag(flag,DDCAPS_STEREOVIEW,"DDCAPS_STEREOVIEW"); - checkflag(flag,DDCAPS_VBI,"DDCAPS_VBI"); - checkflag(flag,DDCAPS_ZBLTS,"DDCAPS_ZBLTS"); - checkflag(flag,DDCAPS_ZOVERLAYS,"DDCAPS_ZOVERLAYS"); - endcheckflag(flag,"pHalInfo->ddCaps.dwCaps"); - - DPRINT1(" pHalInfo->ddCaps.dwCaps2 : "); - flag = pHalInfo->ddCaps.dwCaps2; - count = 0; - checkflag(flag,DDCAPS2_AUTOFLIPOVERLAY,"DDCAPS2_AUTOFLIPOVERLAY"); - checkflag(flag,DDCAPS2_CANAUTOGENMIPMAP,"DDCAPS2_CANAUTOGENMIPMAP"); - checkflag(flag,DDCAPS2_CANBOBHARDWARE,"DDCAPS2_CANBOBHARDWARE"); - checkflag(flag,DDCAPS2_CANBOBINTERLEAVED,"DDCAPS2_CANBOBINTERLEAVED"); - checkflag(flag,DDCAPS2_CANBOBNONINTERLEAVED,"DDCAPS2_CANBOBNONINTERLEAVED"); - checkflag(flag,DDCAPS2_CANCALIBRATEGAMMA,"DDCAPS2_CANCALIBRATEGAMMA"); - checkflag(flag,DDCAPS2_CANDROPZ16BIT,"DDCAPS2_CANDROPZ16BIT"); - checkflag(flag,DDCAPS2_CANFLIPODDEVEN,"DDCAPS2_CANFLIPODDEVEN"); - checkflag(flag,DDCAPS2_CANMANAGERESOURCE,"DDCAPS2_CANMANAGERESOURCE"); - checkflag(flag,DDCAPS2_CANMANAGETEXTURE,"DDCAPS2_CANMANAGETEXTURE"); - - checkflag(flag,DDCAPS2_CANRENDERWINDOWED,"DDCAPS2_CANRENDERWINDOWED"); - checkflag(flag,DDCAPS2_CERTIFIED,"DDCAPS2_CERTIFIED"); - checkflag(flag,DDCAPS2_COLORCONTROLOVERLAY,"DDCAPS2_COLORCONTROLOVERLAY"); - checkflag(flag,DDCAPS2_COLORCONTROLPRIMARY,"DDCAPS2_COLORCONTROLPRIMARY"); - checkflag(flag,DDCAPS2_COPYFOURCC,"DDCAPS2_COPYFOURCC"); - checkflag(flag,DDCAPS2_FLIPINTERVAL,"DDCAPS2_FLIPINTERVAL"); - checkflag(flag,DDCAPS2_FLIPNOVSYNC,"DDCAPS2_FLIPNOVSYNC"); - checkflag(flag,DDCAPS2_NO2DDURING3DSCENE,"DDCAPS2_NO2DDURING3DSCENE"); - checkflag(flag,DDCAPS2_NONLOCALVIDMEM,"DDCAPS2_NONLOCALVIDMEM"); - checkflag(flag,DDCAPS2_NONLOCALVIDMEMCAPS,"DDCAPS2_NONLOCALVIDMEMCAPS"); - checkflag(flag,DDCAPS2_NOPAGELOCKREQUIRED,"DDCAPS2_NOPAGELOCKREQUIRED"); - checkflag(flag,DDCAPS2_PRIMARYGAMMA,"DDCAPS2_PRIMARYGAMMA"); - checkflag(flag,DDCAPS2_VIDEOPORT,"DDCAPS2_VIDEOPORT"); - checkflag(flag,DDCAPS2_WIDESURFACES,"DDCAPS2_WIDESURFACES"); - endcheckflag(flag,"pHalInfo->ddCaps.dwCaps2"); - - DPRINT1(" pHalInfo->ddCaps.dwCKeyCaps : "); - flag = pHalInfo->ddCaps.dwCKeyCaps; - count = 0; - checkflag(flag,DDCKEYCAPS_DESTBLT,"DDCKEYCAPS_DESTBLT"); - checkflag(flag,DDCKEYCAPS_DESTBLTCLRSPACE,"DDCKEYCAPS_DESTBLTCLRSPACE"); - checkflag(flag,DDCKEYCAPS_DESTBLTCLRSPACEYUV,"DDCKEYCAPS_DESTBLTCLRSPACEYUV"); - checkflag(flag,DDCKEYCAPS_DESTBLTYUV,"DDCKEYCAPS_DESTBLTYUV"); - checkflag(flag,DDCKEYCAPS_DESTOVERLAY,"DDCKEYCAPS_DESTOVERLAY"); - checkflag(flag,DDCKEYCAPS_DESTOVERLAYCLRSPACE,"DDCKEYCAPS_DESTOVERLAYCLRSPACE"); - checkflag(flag,DDCKEYCAPS_DESTOVERLAYCLRSPACEYUV,"DDCKEYCAPS_DESTOVERLAYCLRSPACEYUV"); - checkflag(flag,DDCKEYCAPS_DESTOVERLAYONEACTIVE,"DDCKEYCAPS_DESTOVERLAYONEACTIVE"); - checkflag(flag,DDCKEYCAPS_DESTOVERLAYYUV,"DDCKEYCAPS_DESTOVERLAYYUV"); - checkflag(flag,DDCKEYCAPS_NOCOSTOVERLAY,"DDCKEYCAPS_NOCOSTOVERLAY"); - checkflag(flag,DDCKEYCAPS_SRCBLT,"DDCKEYCAPS_SRCBLT"); - checkflag(flag,DDCKEYCAPS_SRCBLTCLRSPACE,"DDCKEYCAPS_SRCBLTCLRSPACE"); - checkflag(flag,DDCKEYCAPS_SRCBLTCLRSPACEYUV,"DDCKEYCAPS_SRCBLTCLRSPACEYUV"); - checkflag(flag,DDCKEYCAPS_SRCBLTYUV,"DDCKEYCAPS_SRCBLTYUV"); - checkflag(flag,DDCKEYCAPS_SRCOVERLAY,"DDCKEYCAPS_SRCOVERLAY"); - checkflag(flag,DDCKEYCAPS_SRCOVERLAYCLRSPACE,"DDCKEYCAPS_SRCOVERLAYCLRSPACE"); - checkflag(flag,DDCKEYCAPS_SRCOVERLAYCLRSPACEYUV,"DDCKEYCAPS_SRCOVERLAYCLRSPACEYUV"); - checkflag(flag,DDCKEYCAPS_SRCOVERLAYONEACTIVE,"DDCKEYCAPS_SRCOVERLAYONEACTIVE"); - checkflag(flag,DDCKEYCAPS_SRCOVERLAYYUV,"DDCKEYCAPS_SRCOVERLAYYUV"); - endcheckflag(flag,"pHalInfo->ddCaps.dwCKeyCaps"); - - DPRINT1(" pHalInfo->ddCaps.dwFXCaps : "); - flag = pHalInfo->ddCaps.dwFXCaps; - count = 0; - checkflag(flag,DDFXCAPS_BLTARITHSTRETCHY,"DDFXCAPS_BLTARITHSTRETCHY"); - checkflag(flag,DDFXCAPS_BLTARITHSTRETCHYN,"DDFXCAPS_BLTARITHSTRETCHYN"); - checkflag(flag,DDFXCAPS_BLTMIRRORLEFTRIGHT,"DDFXCAPS_BLTMIRRORLEFTRIGHT"); - checkflag(flag,DDFXCAPS_BLTMIRRORUPDOWN,"DDFXCAPS_BLTMIRRORUPDOWN"); - checkflag(flag,DDFXCAPS_BLTROTATION,"DDFXCAPS_BLTROTATION"); - checkflag(flag,DDFXCAPS_BLTROTATION90,"DDFXCAPS_BLTROTATION90"); - checkflag(flag,DDFXCAPS_BLTSHRINKX,"DDFXCAPS_BLTSHRINKX"); - checkflag(flag,DDFXCAPS_BLTSHRINKXN,"DDFXCAPS_BLTSHRINKXN"); - checkflag(flag,DDFXCAPS_BLTSHRINKY,"DDFXCAPS_BLTSHRINKY"); - checkflag(flag,DDFXCAPS_BLTSHRINKYN,"DDFXCAPS_BLTSHRINKYN"); - checkflag(flag,DDFXCAPS_BLTSTRETCHX,"DDFXCAPS_BLTSTRETCHX"); - checkflag(flag,DDFXCAPS_BLTSTRETCHXN,"DDFXCAPS_BLTSTRETCHXN"); - checkflag(flag,DDFXCAPS_BLTSTRETCHY,"DDFXCAPS_BLTSTRETCHY"); - checkflag(flag,DDFXCAPS_BLTSTRETCHYN,"DDFXCAPS_BLTSTRETCHYN"); - checkflag(flag,DDFXCAPS_OVERLAYARITHSTRETCHY,"DDFXCAPS_OVERLAYARITHSTRETCHY"); - checkflag(flag,DDFXCAPS_OVERLAYARITHSTRETCHYN,"DDFXCAPS_OVERLAYARITHSTRETCHYN"); - checkflag(flag,DDFXCAPS_OVERLAYMIRRORLEFTRIGHT,"DDFXCAPS_OVERLAYMIRRORLEFTRIGHT"); - checkflag(flag,DDFXCAPS_OVERLAYMIRRORUPDOWN,"DDFXCAPS_OVERLAYMIRRORUPDOWN"); - checkflag(flag,DDFXCAPS_OVERLAYSHRINKX,"DDFXCAPS_OVERLAYSHRINKX"); - checkflag(flag,DDFXCAPS_OVERLAYSHRINKXN,"DDFXCAPS_OVERLAYSHRINKXN"); - checkflag(flag,DDFXCAPS_OVERLAYSHRINKY,"DDFXCAPS_OVERLAYSHRINKY"); - checkflag(flag,DDFXCAPS_OVERLAYSHRINKYN,"DDFXCAPS_OVERLAYSHRINKYN"); - checkflag(flag,DDFXCAPS_OVERLAYSTRETCHX,"DDFXCAPS_OVERLAYSTRETCHX"); - checkflag(flag,DDFXCAPS_OVERLAYSTRETCHX,"DDFXCAPS_OVERLAYSTRETCHX"); - checkflag(flag,DDFXCAPS_OVERLAYSTRETCHY,"DDFXCAPS_OVERLAYSTRETCHY"); - checkflag(flag,DDFXCAPS_OVERLAYSTRETCHYN,"DDFXCAPS_OVERLAYSTRETCHYN"); - endcheckflag(flag,"pHalInfo->ddCaps.dwFXCaps"); - - DPRINT1(" pHalInfo->ddCaps.dwFXAlphaCaps : 0x%08lx\n",pHalInfo->ddCaps.dwFXAlphaCaps); - DPRINT1(" pHalInfo->ddCaps.dwPalCaps : 0x%08lx\n",pHalInfo->ddCaps.dwPalCaps); - - DPRINT1(" pHalInfo->ddCaps.dwSVCaps : "); - flag = pHalInfo->ddCaps.dwSVCaps; - count = 0; - checkflag(flag,DDSVCAPS_ENIGMA,"DDSVCAPS_ENIGMA"); - checkflag(flag,DDSVCAPS_FLICKER,"DDSVCAPS_FLICKER"); - checkflag(flag,DDSVCAPS_REDBLUE,"DDSVCAPS_REDBLUE"); - checkflag(flag,DDSVCAPS_SPLIT,"DDSVCAPS_SPLIT"); - endcheckflag(flag,"pHalInfo->ddCaps.dwSVCaps"); - - DPRINT1(" pHalInfo->ddCaps.dwAlphaBltConstBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaBltConstBitDepths); - DPRINT1(" pHalInfo->ddCaps.dwAlphaBltPixelBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaBltPixelBitDepths); - DPRINT1(" pHalInfo->ddCaps.dwAlphaBltSurfaceBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaBltSurfaceBitDepths); - DPRINT1(" pHalInfo->ddCaps.dwAlphaOverlayConstBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaOverlayConstBitDepths); - DPRINT1(" pHalInfo->ddCaps.dwAlphaOverlayPixelBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaOverlayPixelBitDepths); - DPRINT1(" pHalInfo->ddCaps.dwAlphaOverlaySurfaceBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaOverlaySurfaceBitDepths); - DPRINT1(" pHalInfo->ddCaps.dwZBufferBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwZBufferBitDepths); - DPRINT1(" pHalInfo->ddCaps.dwVidMemTotal : 0x%08lx\n",pHalInfo->ddCaps.dwVidMemTotal); - DPRINT1(" pHalInfo->ddCaps.dwVidMemFree : 0x%08lx\n",pHalInfo->ddCaps.dwVidMemFree); - DPRINT1(" pHalInfo->ddCaps.dwMaxVisibleOverlays : 0x%08lx\n",pHalInfo->ddCaps.dwMaxVisibleOverlays); - DPRINT1(" pHalInfo->ddCaps.dwCurrVisibleOverlays : 0x%08lx\n",pHalInfo->ddCaps.dwCurrVisibleOverlays); - DPRINT1(" pHalInfo->ddCaps.dwNumFourCCCodes : 0x%08lx\n",pHalInfo->ddCaps.dwNumFourCCCodes); - DPRINT1(" pHalInfo->ddCaps.dwAlignBoundarySrc : 0x%08lx\n",pHalInfo->ddCaps.dwAlignBoundarySrc); - DPRINT1(" pHalInfo->ddCaps.dwAlignSizeSrc : 0x%08lx\n",pHalInfo->ddCaps.dwAlignSizeSrc); - DPRINT1(" pHalInfo->ddCaps.dwAlignBoundaryDes : 0x%08lx\n",pHalInfo->ddCaps.dwAlignBoundaryDest); - DPRINT1(" pHalInfo->ddCaps.dwAlignSizeDest : 0x%08lx\n",pHalInfo->ddCaps.dwAlignSizeDest); - DPRINT1(" pHalInfo->ddCaps.dwAlignStrideAlign : 0x%08lx\n",pHalInfo->ddCaps.dwAlignStrideAlign); - for (t=0;t<DD_ROP_SPACE;t++) - { - DPRINT1(" pHalInfo->ddCaps.dwRops[0x%04x] : 0x%08lx\n",t,pHalInfo->ddCaps.dwRops[t]); - } - DPRINT1(" pHalInfo->ddCaps.ddsCaps.dwCaps : "); - flag = pHalInfo->ddCaps.ddsCaps.dwCaps; - count = 0; - checkflag(flag,DDSCAPS_3DDEVICE,"DDSCAPS_3DDEVICE"); - checkflag(flag,DDSCAPS_ALLOCONLOAD,"DDSCAPS_ALLOCONLOAD"); - checkflag(flag,DDSCAPS_ALPHA,"DDSCAPS_ALPHA"); - checkflag(flag,DDSCAPS_BACKBUFFER,"DDSCAPS_BACKBUFFER"); - checkflag(flag,DDSCAPS_COMPLEX,"DDSCAPS_COMPLEX"); - checkflag(flag,DDSCAPS_EXECUTEBUFFER,"DDSCAPS_EXECUTEBUFFER"); - checkflag(flag,DDSCAPS_FLIP,"DDSCAPS_FLIP"); - checkflag(flag,DDSCAPS_FRONTBUFFER,"DDSCAPS_FRONTBUFFER"); - checkflag(flag,DDSCAPS_HWCODEC,"DDSCAPS_HWCODEC"); - checkflag(flag,DDSCAPS_LIVEVIDEO,"DDSCAPS_LIVEVIDEO"); - checkflag(flag,DDSCAPS_LOCALVIDMEM,"DDSCAPS_LOCALVIDMEM"); - checkflag(flag,DDSCAPS_MIPMAP,"DDSCAPS_MIPMAP"); - checkflag(flag,DDSCAPS_MODEX,"DDSCAPS_MODEX"); - checkflag(flag,DDSCAPS_NONLOCALVIDMEM,"DDSCAPS_NONLOCALVIDMEM"); - checkflag(flag,DDSCAPS_OFFSCREENPLAIN,"DDSCAPS_OFFSCREENPLAIN"); - checkflag(flag,DDSCAPS_OVERLAY,"DDSCAPS_OVERLAY"); - checkflag(flag,DDSCAPS_OPTIMIZED,"DDSCAPS_OPTIMIZED"); - checkflag(flag,DDSCAPS_OWNDC,"DDSCAPS_OWNDC"); - checkflag(flag,DDSCAPS_PALETTE,"DDSCAPS_PALETTE"); - checkflag(flag,DDSCAPS_PRIMARYSURFACE,"DDSCAPS_PRIMARYSURFACE"); - checkflag(flag,DDSCAPS_PRIMARYSURFACELEFT,"DDSCAPS_PRIMARYSURFACELEFT"); - checkflag(flag,DDSCAPS_STANDARDVGAMODE,"DDSCAPS_STANDARDVGAMODE"); - checkflag(flag,DDSCAPS_SYSTEMMEMORY,"DDSCAPS_SYSTEMMEMORY"); - checkflag(flag,DDSCAPS_TEXTURE,"DDSCAPS_TEXTURE"); - checkflag(flag,DDSCAPS_VIDEOMEMORY,"DDSCAPS_VIDEOMEMORY"); - checkflag(flag,DDSCAPS_VIDEOPORT,"DDSCAPS_VIDEOPORT"); - checkflag(flag,DDSCAPS_VISIBLE,"DDSCAPS_VISIBLE"); - checkflag(flag,DDSCAPS_WRITEONLY,"DDSCAPS_WRITEONLY"); - checkflag(flag,DDSCAPS_ZBUFFER,"DDSCAPS_ZBUFFER"); - endcheckflag(flag,"pHalInfo->ddCaps.ddsCaps.dwCaps"); - - DPRINT1(" pHalInfo->ddCaps.dwMinOverlayStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMinOverlayStretch); - DPRINT1(" pHalInfo->ddCaps.dwMaxOverlayStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMaxOverlayStretch); - DPRINT1(" pHalInfo->ddCaps.dwMinLiveVideoStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMinLiveVideoStretch); - DPRINT1(" pHalInfo->ddCaps.dwMaxLiveVideoStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMaxLiveVideoStretch); - DPRINT1(" pHalInfo->ddCaps.dwMinHwCodecStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMinHwCodecStretch); - DPRINT1(" pHalInfo->ddCaps.dwMaxHwCodecStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMaxHwCodecStretch); - DPRINT1(" pHalInfo->ddCaps.dwReserved1 : 0x%08lx\n",pHalInfo->ddCaps.dwReserved1); - DPRINT1(" pHalInfo->ddCaps.dwReserved2 : 0x%08lx\n",pHalInfo->ddCaps.dwReserved2); - DPRINT1(" pHalInfo->ddCaps.dwReserved3 : 0x%08lx\n",pHalInfo->ddCaps.dwReserved3); - - DPRINT1(" pHalInfo->ddCaps.dwSVBCaps : "); - flag = pHalInfo->ddCaps.dwSVBCaps; - count = 0; - checkflag(flag,DDCAPS_3D,"DDCAPS_3D"); - checkflag(flag,DDCAPS_ALIGNBOUNDARYDEST,"DDCAPS_ALIGNBOUNDARYDEST"); - checkflag(flag,DDCAPS_ALIGNBOUNDARYSRC,"DDCAPS_ALIGNBOUNDARYSRC"); - checkflag(flag,DDCAPS_ALIGNSIZEDEST,"DDCAPS_ALIGNSIZEDEST"); - checkflag(flag,DDCAPS_ALIGNSIZESRC,"DDCAPS_ALIGNSIZESRC"); - checkflag(flag,DDCAPS_ALIGNSTRIDE,"DDCAPS_ALIGNSTRIDE"); - checkflag(flag,DDCAPS_ALPHA,"DDCAPS_ALPHA"); - checkflag(flag,DDCAPS_BANKSWITCHED,"DDCAPS_BANKSWITCHED"); - checkflag(flag,DDCAPS_BLT,"DDCAPS_BLT"); - checkflag(flag,DDCAPS_BLTCOLORFILL,"DDCAPS_BLTCOLORFILL"); - checkflag(flag,DDCAPS_BLTDEPTHFILL,"DDCAPS_BLTDEPTHFILL"); - checkflag(flag,DDCAPS_BLTFOURCC,"DDCAPS_BLTFOURCC"); - checkflag(flag,DDCAPS_BLTQUEUE,"DDCAPS_BLTQUEUE"); - checkflag(flag,DDCAPS_BLTSTRETCH,"DDCAPS_BLTSTRETCH"); - checkflag(flag,DDCAPS_CANBLTSYSMEM,"DDCAPS_CANBLTSYSMEM"); - checkflag(flag,DDCAPS_CANCLIP,"DDCAPS_CANCLIP"); - checkflag(flag,DDCAPS_CANCLIPSTRETCHED,"DDCAPS_CANCLIPSTRETCHED"); - checkflag(flag,DDCAPS_COLORKEY,"DDCAPS_COLORKEY"); - checkflag(flag,DDCAPS_COLORKEYHWASSIST,"DDCAPS_COLORKEYHWASSIST"); - checkflag(flag,DDCAPS_GDI,"DDCAPS_GDI"); - checkflag(flag,DDCAPS_NOHARDWARE,"DDCAPS_NOHARDWARE"); - checkflag(flag,DDCAPS_OVERLAY,"DDCAPS_OVERLAY"); - checkflag(flag,DDCAPS_OVERLAYCANTCLIP,"DDCAPS_OVERLAYCANTCLIP"); - checkflag(flag,DDCAPS_OVERLAYFOURCC,"DDCAPS_OVERLAYFOURCC"); - checkflag(flag,DDCAPS_OVERLAYSTRETCH,"DDCAPS_OVERLAYSTRETCH"); - checkflag(flag,DDCAPS_PALETTE,"DDCAPS_PALETTE"); - checkflag(flag,DDCAPS_PALETTEVSYNC,"DDCAPS_PALETTEVSYNC"); - checkflag(flag,DDCAPS_READSCANLINE,"DDCAPS_READSCANLINE"); - checkflag(flag,DDCAPS_STEREOVIEW,"DDCAPS_STEREOVIEW"); - checkflag(flag,DDCAPS_VBI,"DDCAPS_VBI"); - checkflag(flag,DDCAPS_ZBLTS,"DDCAPS_ZBLTS"); - checkflag(flag,DDCAPS_ZOVERLAYS,"DDCAPS_ZOVERLAYS"); - endcheckflag(flag,"pHalInfo->ddCaps.dwSVBCaps"); - - DPRINT1(" pHalInfo->ddCaps.dwSVBCKeyCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSVBCKeyCaps); - DPRINT1(" pHalInfo->ddCaps.dwSVBFXCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSVBFXCaps); - for (t=0;t<DD_ROP_SPACE;t++) - { - DPRINT1(" pHalInfo->ddCaps.dwSVBRops[0x%04x] : 0x%08lx\n",t,pHalInfo->ddCaps.dwSVBRops[t]); - } - - DPRINT1(" pHalInfo->ddCaps.dwVSBCaps : "); - flag = pHalInfo->ddCaps.dwVSBCaps; - count = 0; - checkflag(flag,DDCAPS_3D,"DDCAPS_3D"); - checkflag(flag,DDCAPS_ALIGNBOUNDARYDEST,"DDCAPS_ALIGNBOUNDARYDEST"); - checkflag(flag,DDCAPS_ALIGNBOUNDARYSRC,"DDCAPS_ALIGNBOUNDARYSRC"); - checkflag(flag,DDCAPS_ALIGNSIZEDEST,"DDCAPS_ALIGNSIZEDEST"); - checkflag(flag,DDCAPS_ALIGNSIZESRC,"DDCAPS_ALIGNSIZESRC"); - checkflag(flag,DDCAPS_ALIGNSTRIDE,"DDCAPS_ALIGNSTRIDE"); - checkflag(flag,DDCAPS_ALPHA,"DDCAPS_ALPHA"); - checkflag(flag,DDCAPS_BANKSWITCHED,"DDCAPS_BANKSWITCHED"); - checkflag(flag,DDCAPS_BLT,"DDCAPS_BLT"); - checkflag(flag,DDCAPS_BLTCOLORFILL,"DDCAPS_BLTCOLORFILL"); - checkflag(flag,DDCAPS_BLTDEPTHFILL,"DDCAPS_BLTDEPTHFILL"); - checkflag(flag,DDCAPS_BLTFOURCC,"DDCAPS_BLTFOURCC"); - checkflag(flag,DDCAPS_BLTQUEUE,"DDCAPS_BLTQUEUE"); - checkflag(flag,DDCAPS_BLTSTRETCH,"DDCAPS_BLTSTRETCH"); - checkflag(flag,DDCAPS_CANBLTSYSMEM,"DDCAPS_CANBLTSYSMEM"); - checkflag(flag,DDCAPS_CANCLIP,"DDCAPS_CANCLIP"); - checkflag(flag,DDCAPS_CANCLIPSTRETCHED,"DDCAPS_CANCLIPSTRETCHED"); - checkflag(flag,DDCAPS_COLORKEY,"DDCAPS_COLORKEY"); - checkflag(flag,DDCAPS_COLORKEYHWASSIST,"DDCAPS_COLORKEYHWASSIST"); - checkflag(flag,DDCAPS_GDI,"DDCAPS_GDI"); - checkflag(flag,DDCAPS_NOHARDWARE,"DDCAPS_NOHARDWARE"); - checkflag(flag,DDCAPS_OVERLAY,"DDCAPS_OVERLAY"); - checkflag(flag,DDCAPS_OVERLAYCANTCLIP,"DDCAPS_OVERLAYCANTCLIP"); - checkflag(flag,DDCAPS_OVERLAYFOURCC,"DDCAPS_OVERLAYFOURCC"); - checkflag(flag,DDCAPS_OVERLAYSTRETCH,"DDCAPS_OVERLAYSTRETCH"); - checkflag(flag,DDCAPS_PALETTE,"DDCAPS_PALETTE"); - checkflag(flag,DDCAPS_PALETTEVSYNC,"DDCAPS_PALETTEVSYNC"); - checkflag(flag,DDCAPS_READSCANLINE,"DDCAPS_READSCANLINE"); - checkflag(flag,DDCAPS_STEREOVIEW,"DDCAPS_STEREOVIEW"); - checkflag(flag,DDCAPS_VBI,"DDCAPS_VBI"); - checkflag(flag,DDCAPS_ZBLTS,"DDCAPS_ZBLTS"); - checkflag(flag,DDCAPS_ZOVERLAYS,"DDCAPS_ZOVERLAYS"); - endcheckflag(flag,"pHalInfo->ddCaps.dwVSBCaps"); - - DPRINT1(" pHalInfo->ddCaps.dwVSBCKeyCaps : 0x%08lx\n",pHalInfo->ddCaps.dwVSBCKeyCaps); - DPRINT1(" pHalInfo->ddCaps.dwVSBFXCaps : 0x%08lx\n",pHalInfo->ddCaps.dwVSBFXCaps); - for (t=0;t<DD_ROP_SPACE;t++) - { - DPRINT1(" pHalInfo->ddCaps.dwVSBRops[0x%04x] : 0x%08lx\n",t,pHalInfo->ddCaps.dwVSBRops[t]); - } - DPRINT1(" pHalInfo->ddCaps.dwSSBCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSSBCaps); - DPRINT1(" pHalInfo->ddCaps.dwSSBCKeyCa : 0x%08lx\n",pHalInfo->ddCaps.dwSSBCKeyCaps); - DPRINT1(" pHalInfo->ddCaps.dwSSBFXCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSSBFXCaps); - for (t=0;t<DD_ROP_SPACE;t++) - { - DPRINT1(" pHalInfo->ddCaps.dwSSBRops[0x%04x] : 0x%08lx\n",t,pHalInfo->ddCaps.dwSSBRops[t]); - } - - DPRINT1(" pHalInfo->GetDriverInfo : 0x%p\n",pHalInfo->GetDriverInfo); - DPRINT1(" pHalInfo->dwFlags : "); - - flag = pHalInfo->dwFlags; - count = 0; - checkflag(flag,DDHALINFO_ISPRIMARYDISPLAY,"DDHALINFO_ISPRIMARYDISPLAY"); - checkflag(flag,DDHALINFO_MODEXILLEGAL,"DDHALINFO_MODEXILLEGAL"); - checkflag(flag,DDHALINFO_GETDRIVERINFOSET,"DDHALINFO_GETDRIVERINFOSET"); - checkflag(flag,DDHALINFO_GETDRIVERINFO2,"DDHALINFO_GETDRIVERINFO2"); - endcheckflag(flag,"pHalInfo->dwFlags"); - - DPRINT1(" pHalInfo->lpD3DGlobalDriverData : 0x%p\n",pHalInfo->lpD3DGlobalDriverData); - DPRINT1(" pHalInfo->lpD3DHALCallbacks : 0x%p\n",pHalInfo->lpD3DHALCallbacks); - DPRINT1(" pHalInfo->lpD3DBufCallbacks : 0x%p\n",pHalInfo->lpD3DBufCallbacks); - } - else - { - if (pHalInfo->dwSize !=0) - { - DPRINT1("unkonwn dwSize DD_HALINFO : the size found is 0x%08lx\n",pHalInfo->dwSize); - } - else - { - DPRINT1("none pHalInfo from the driver 0x%08lx\n",pHalInfo->dwSize); - } - } -} - -/* EOF */
7 years, 6 months
1
0
0
0
[sgasiorek] 75179: [DXG] Replace wrong PLONG with PBYTE as it was in original development. CORE-13392
by sgasiorek@svn.reactos.org
Author: sgasiorek Date: Sat Jun 24 12:14:01 2017 New Revision: 75179 URL:
http://svn.reactos.org/svn/reactos?rev=75179&view=rev
Log: [DXG] Replace wrong PLONG with PBYTE as it was in original development. CORE-13392 Modified: trunk/reactos/win32ss/reactx/dxg/ddhmg.c Modified: trunk/reactos/win32ss/reactx/dxg/ddhmg.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/ddhmg.c…
============================================================================== --- trunk/reactos/win32ss/reactx/dxg/ddhmg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/ddhmg.c [iso-8859-1] Sat Jun 24 12:14:01 2017 @@ -158,7 +158,7 @@ if ( Index < gcMaxDdHmgr ) { - pEntry = (PDD_ENTRY)((PLONG)gpentDdHmgr + (sizeof(DD_ENTRY) * Index)); + pEntry = (PDD_ENTRY)((PBYTE)gpentDdHmgr + (sizeof(DD_ENTRY) * Index)); if ( VerifyObjectOwner(pEntry) ) { @@ -276,7 +276,7 @@ if (ghFreeDdHmgr) { index = ghFreeDdHmgr; - pEntry = (PDD_ENTRY)((PLONG)gpentDdHmgr + (sizeof(DD_ENTRY) * index)); + pEntry = (PDD_ENTRY)((PBYTE)gpentDdHmgr + (sizeof(DD_ENTRY) * index)); // put next free index to our global variable ghFreeDdHmgr = pEntry->NextFree; @@ -303,7 +303,7 @@ gpentDdHmgr = mAllocMem; } - pEntry = (PDD_ENTRY)((PLONG)gpentDdHmgr + (sizeof(DD_ENTRY) * gcMaxDdHmgr)); + pEntry = (PDD_ENTRY)((PBYTE)gpentDdHmgr + (sizeof(DD_ENTRY) * gcMaxDdHmgr)); // build handle pEntry->FullUnique = objType | 8; @@ -357,7 +357,7 @@ { Index = DDHMG_HTOI(DdHandle); - pEntry = (PDD_ENTRY)((PLONG)gpentDdHmgr + (sizeof(DD_ENTRY) * Index)); + pEntry = (PDD_ENTRY)((PBYTE)gpentDdHmgr + (sizeof(DD_ENTRY) * Index)); pEntry->pobj = pObject; pEntry->Objt = objType; @@ -408,7 +408,7 @@ EngAcquireSemaphore(ghsemHmgr); - pEntry = (PDD_ENTRY)((PLONG)gpentDdHmgr + (sizeof(DD_ENTRY) * Index)); + pEntry = (PDD_ENTRY)((PBYTE)gpentDdHmgr + (sizeof(DD_ENTRY) * Index)); // check if we have object that should be freed if (pEntry->pobj)
7 years, 6 months
1
0
0
0
[tthompson] 75178: [NTFS] - Fix POSIX rules. Fix accessing long filenames created in Windows when 8dot3 name creation is disabled. Whether or not a filename should be interpreted as case-sensitive ...
by tthompson@svn.reactos.org
Author: tthompson Date: Sat Jun 24 04:36:28 2017 New Revision: 75178 URL:
http://svn.reactos.org/svn/reactos?rev=75178&view=rev
Log: [NTFS] - Fix POSIX rules. Fix accessing long filenames created in Windows when 8dot3 name creation is disabled. Whether or not a filename should be interpreted as case-sensitive is dependent on a flag passed to the driver when a file is created (opened); it's separate from the namespace associated with the file being accessed. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fcb.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst…
============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Sat Jun 24 04:36:28 2017 @@ -115,6 +115,10 @@ * @param ParentMftIndex * Pointer to a ULONGLONG which will receive the index of the parent directory. * +* @param CaseSensitive +* Boolean indicating if the function should operate in case-sensitive mode. This will be TRUE +* if an application opened the file with the FILE_FLAG_POSIX_SEMANTICS flag. +* * @return * STATUS_SUCCESS on success. STATUS_NOT_IMPLEMENTED if target address isn't at the end * of the given file record. @@ -132,7 +136,8 @@ PNTFS_ATTR_RECORD AttributeAddress, PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, - PULONGLONG ParentMftIndex) + PULONGLONG ParentMftIndex, + BOOLEAN CaseSensitive) { ULONG ResidentHeaderLength = FIELD_OFFSET(NTFS_ATTR_RECORD, Resident.Reserved) + sizeof(UCHAR); PFILENAME_ATTRIBUTE FileNameAttribute; @@ -178,7 +183,13 @@ if(Remaining.Length != 0) RtlCopyUnicodeString(&FilenameNoPath, &Remaining); - Status = NtfsFindMftRecord(DeviceExt, CurrentMFTIndex, &Current, &FirstEntry, FALSE, &CurrentMFTIndex); + Status = NtfsFindMftRecord(DeviceExt, + CurrentMFTIndex, + &Current, + &FirstEntry, + FALSE, + &CurrentMFTIndex, + CaseSensitive); if (!NT_SUCCESS(Status)) break; Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst…
============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] Sat Jun 24 04:36:28 2017 @@ -246,6 +246,7 @@ NtfsOpenFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, PWSTR FileName, + BOOLEAN CaseSensitive, PNTFS_FCB * FoundFCB) { PNTFS_FCB ParentFcb; @@ -253,7 +254,12 @@ NTSTATUS Status; PWSTR AbsFileName = NULL; - DPRINT1("NtfsOpenFile(%p, %p, %S, %p)\n", DeviceExt, FileObject, FileName, FoundFCB); + DPRINT1("NtfsOpenFile(%p, %p, %S, %s, %p)\n", + DeviceExt, + FileObject, + FileName, + CaseSensitive ? "TRUE" : "FALSE", + FoundFCB); *FoundFCB = NULL; @@ -285,7 +291,8 @@ Status = NtfsGetFCBForFile(DeviceExt, &ParentFcb, &Fcb, - FileName); + FileName, + CaseSensitive); if (ParentFcb != NULL) { NtfsReleaseFCB(DeviceExt, @@ -412,6 +419,7 @@ Status = NtfsOpenFile(DeviceExt, FileObject, ((RequestedOptions & FILE_OPEN_BY_FILE_ID) ? FullPath.Buffer : FileObject->FileName.Buffer), + (Stack->Flags & SL_CASE_SENSITIVE), &Fcb); if (RequestedOptions & FILE_OPEN_BY_FILE_ID) Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst…
============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sat Jun 24 04:36:28 2017 @@ -627,7 +627,8 @@ &Ccb->Entry, &FileRecord, &MFTRecord, - Fcb->MFTIndex); + Fcb->MFTIndex, + (Stack->Flags & SL_CASE_SENSITIVE)); if (NT_SUCCESS(Status)) { Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fcb.c URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst…
============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sat Jun 24 04:36:28 2017 @@ -506,6 +506,7 @@ NtfsDirFindFile(PNTFS_VCB Vcb, PNTFS_FCB DirectoryFcb, PWSTR FileToFind, + BOOLEAN CaseSensitive, PNTFS_FCB *FoundFCB) { NTSTATUS Status; @@ -517,7 +518,12 @@ PNTFS_ATTR_CONTEXT DataContext; USHORT Length = 0; - DPRINT1("NtfsDirFindFile(%p, %p, %S, %p)\n", Vcb, DirectoryFcb, FileToFind, FoundFCB); + DPRINT1("NtfsDirFindFile(%p, %p, %S, %s, %p)\n", + Vcb, + DirectoryFcb, + FileToFind, + CaseSensitive ? "TRUE" : "FALSE", + FoundFCB); *FoundFCB = NULL; RtlInitUnicodeString(&File, FileToFind); @@ -551,7 +557,7 @@ DPRINT1("Will now look for file '%wZ' with stream '%S'\n", &File, Colon); } - Status = NtfsLookupFileAt(Vcb, &File, &FileRecord, &MFTIndex, CurrentDir); + Status = NtfsLookupFileAt(Vcb, &File, &FileRecord, &MFTIndex, CurrentDir, CaseSensitive); if (!NT_SUCCESS(Status)) { return Status; @@ -587,7 +593,8 @@ NtfsGetFCBForFile(PNTFS_VCB Vcb, PNTFS_FCB *pParentFCB, PNTFS_FCB *pFCB, - const PWSTR pFileName) + const PWSTR pFileName, + BOOLEAN CaseSensitive) { NTSTATUS Status; WCHAR pathName [MAX_PATH]; @@ -596,11 +603,12 @@ PNTFS_FCB FCB; PNTFS_FCB parentFCB; - DPRINT("NtfsGetFCBForFile(%p, %p, %p, '%S')\n", + DPRINT("NtfsGetFCBForFile(%p, %p, %p, '%S', %s)\n", Vcb, pParentFCB, pFCB, - pFileName); + pFileName, + CaseSensitive ? "TRUE" : "FALSE"); /* Dummy code */ // FCB = NtfsOpenRootFCB(Vcb); @@ -677,7 +685,7 @@ NtfsGetNextPathElement(currentElement) - currentElement); DPRINT(" elementName:%S\n", elementName); - Status = NtfsDirFindFile(Vcb, parentFCB, elementName, &FCB); + Status = NtfsDirFindFile(Vcb, parentFCB, elementName, CaseSensitive, &FCB); if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { *pParentFCB = parentFCB; Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst…
============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Sat Jun 24 04:36:28 2017 @@ -415,6 +415,10 @@ * @param IrpFlags * ULONG describing the flags of the original IRP request (Irp->Flags). * +* @param CaseSensitive +* Boolean indicating if the function should operate in case-sensitive mode. This will be TRUE +* if an application opened the file with the FILE_FLAG_POSIX_SEMANTICS flag. +* * @param NewFileSize * Pointer to a LARGE_INTEGER which indicates the new end of file (file size). * @@ -436,6 +440,7 @@ PFILE_OBJECT FileObject, PDEVICE_EXTENSION DeviceExt, ULONG IrpFlags, + BOOLEAN CaseSensitive, PLARGE_INTEGER NewFileSize) { LARGE_INTEGER CurrentFileSize; @@ -545,7 +550,13 @@ AllocationSize = ROUND_UP(NewFileSize->QuadPart, Fcb->Vcb->NtfsInfo.BytesPerCluster); - Status = UpdateFileNameRecord(Fcb->Vcb, ParentMFTId, &filename, FALSE, NewFileSize->QuadPart, AllocationSize); + Status = UpdateFileNameRecord(Fcb->Vcb, + ParentMFTId, + &filename, + FALSE, + NewFileSize->QuadPart, + AllocationSize, + CaseSensitive); ReleaseAttributeContext(DataContext); ExFreePoolWithTag(FileRecord, TAG_NTFS); @@ -620,7 +631,12 @@ DPRINT1("FIXME: Using hacky method of setting FileAllocationInformation.\n"); case FileEndOfFileInformation: EndOfFileInfo = (PFILE_END_OF_FILE_INFORMATION)SystemBuffer; - Status = NtfsSetEndOfFile(Fcb, FileObject, DeviceExt, Irp->Flags, &EndOfFileInfo->EndOfFile); + Status = NtfsSetEndOfFile(Fcb, + FileObject, + DeviceExt, + Irp->Flags, + (Stack->Flags & SL_CASE_SENSITIVE), + &EndOfFileInfo->EndOfFile); break; // TODO: all other information classes Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst…
============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sat Jun 24 04:36:28 2017 @@ -1359,7 +1359,8 @@ PUNICODE_STRING FileName, BOOLEAN DirSearch, ULONGLONG NewDataSize, - ULONGLONG NewAllocationSize) + ULONGLONG NewAllocationSize, + BOOLEAN CaseSensitive) { PFILE_RECORD_HEADER MftRecord; PNTFS_ATTR_CONTEXT IndexRootCtx; @@ -1369,7 +1370,14 @@ NTSTATUS Status; ULONG CurrentEntry = 0; - DPRINT("UpdateFileNameRecord(%p, %I64d, %wZ, %u, %I64u, %I64u)\n", Vcb, ParentMFTIndex, FileName, DirSearch, NewDataSize, NewAllocationSize); + DPRINT("UpdateFileNameRecord(%p, %I64d, %wZ, %u, %I64u, %I64u, %s)\n", + Vcb, + ParentMFTIndex, + FileName, + DirSearch, + NewDataSize, + NewAllocationSize, + CaseSensitive ? "TRUE" : "FALSE"); MftRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, @@ -1421,7 +1429,8 @@ &CurrentEntry, DirSearch, NewDataSize, - NewAllocationSize); + NewAllocationSize, + CaseSensitive); ReleaseAttributeContext(IndexRootCtx); ExFreePoolWithTag(IndexRecord, TAG_NTFS); @@ -1447,7 +1456,8 @@ PULONG CurrentEntry, BOOLEAN DirSearch, ULONGLONG NewDataSize, - ULONGLONG NewAllocatedSize) + ULONGLONG NewAllocatedSize, + BOOLEAN CaseSensitive) { NTSTATUS Status; ULONG RecordOffset; @@ -1466,7 +1476,7 @@ if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) > 0x10 && *CurrentEntry >= *StartEntry && IndexEntry->FileName.NameType != NTFS_FILE_NAME_DOS && - CompareFileName(FileName, IndexEntry, DirSearch)) + CompareFileName(FileName, IndexEntry, DirSearch, CaseSensitive)) { *StartEntry = *CurrentEntry; IndexEntry->FileName.DataSize = NewDataSize; @@ -1517,7 +1527,19 @@ LastEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); ASSERT(LastEntry <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize)); - Status = UpdateIndexEntryFileNameSize(NULL, NULL, NULL, 0, FirstEntry, LastEntry, FileName, StartEntry, CurrentEntry, DirSearch, NewDataSize, NewAllocatedSize); + Status = UpdateIndexEntryFileNameSize(NULL, + NULL, + NULL, + 0, + FirstEntry, + LastEntry, + FileName, + StartEntry, + CurrentEntry, + DirSearch, + NewDataSize, + NewAllocatedSize, + CaseSensitive); if (Status == STATUS_PENDING) { // write the index record back to disk @@ -1827,7 +1849,8 @@ BOOLEAN CompareFileName(PUNICODE_STRING FileName, PINDEX_ENTRY_ATTRIBUTE IndexEntry, - BOOLEAN DirSearch) + BOOLEAN DirSearch, + BOOLEAN CaseSensitive) { BOOLEAN Ret, Alloc = FALSE; UNICODE_STRING EntryName; @@ -1839,7 +1862,7 @@ if (DirSearch) { UNICODE_STRING IntFileName; - if (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX) + if (!CaseSensitive) { NT_VERIFY(NT_SUCCESS(RtlUpcaseUnicodeString(&IntFileName, FileName, TRUE))); Alloc = TRUE; @@ -1849,7 +1872,7 @@ IntFileName = *FileName; } - Ret = FsRtlIsNameInExpression(&IntFileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX), NULL); + Ret = FsRtlIsNameInExpression(&IntFileName, &EntryName, !CaseSensitive, NULL); if (Alloc) { @@ -1860,7 +1883,7 @@ } else { - return (RtlCompareUnicodeString(FileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX)) == 0); + return (RtlCompareUnicodeString(FileName, &EntryName, !CaseSensitive) == 0); } } @@ -1900,6 +1923,7 @@ PULONG StartEntry, PULONG CurrentEntry, BOOLEAN DirSearch, + BOOLEAN CaseSensitive, ULONGLONG *OutMFTIndex) { NTSTATUS Status; @@ -1909,7 +1933,19 @@ ULONGLONG IndexAllocationSize; PINDEX_BUFFER IndexBuffer; - DPRINT("BrowseIndexEntries(%p, %p, %p, %u, %p, %p, %wZ, %u, %u, %u, %p)\n", Vcb, MftRecord, IndexRecord, IndexBlockSize, FirstEntry, LastEntry, FileName, *StartEntry, *CurrentEntry, DirSearch, OutMFTIndex); + DPRINT("BrowseIndexEntries(%p, %p, %p, %u, %p, %p, %wZ, %u, %u, %s, %s, %p)\n", + Vcb, + MftRecord, + IndexRecord, + IndexBlockSize, + FirstEntry, + LastEntry, + FileName, + *StartEntry, + *CurrentEntry, + DirSearch ? "TRUE" : "FALSE", + CaseSensitive ? "TRUE" : "FALSE", + OutMFTIndex); IndexEntry = FirstEntry; while (IndexEntry < LastEntry && @@ -1918,7 +1954,7 @@ if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) >= 0x10 && *CurrentEntry >= *StartEntry && IndexEntry->FileName.NameType != NTFS_FILE_NAME_DOS && - CompareFileName(FileName, IndexEntry, DirSearch)) + CompareFileName(FileName, IndexEntry, DirSearch, CaseSensitive)) { *StartEntry = *CurrentEntry; *OutMFTIndex = (IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK); @@ -1967,7 +2003,18 @@ LastEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); ASSERT(LastEntry <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize)); - Status = BrowseIndexEntries(NULL, NULL, NULL, 0, FirstEntry, LastEntry, FileName, StartEntry, CurrentEntry, DirSearch, OutMFTIndex); + Status = BrowseIndexEntries(NULL, + NULL, + NULL, + 0, + FirstEntry, + LastEntry, + FileName, + StartEntry, + CurrentEntry, + DirSearch, + CaseSensitive, + OutMFTIndex); if (NT_SUCCESS(Status)) { break; @@ -1984,7 +2031,8 @@ PUNICODE_STRING FileName, PULONG FirstEntry, BOOLEAN DirSearch, - ULONGLONG *OutMFTIndex) + ULONGLONG *OutMFTIndex, + BOOLEAN CaseSensitive) { PFILE_RECORD_HEADER MftRecord; PNTFS_ATTR_CONTEXT IndexRootCtx; @@ -2036,7 +2084,18 @@ DPRINT("IndexRecordSize: %x IndexBlockSize: %x\n", Vcb->NtfsInfo.BytesPerIndexRecord, IndexRoot->SizeOfEntry); - Status = BrowseIndexEntries(Vcb, MftRecord, IndexRecord, IndexRoot->SizeOfEntry, IndexEntry, IndexEntryEnd, FileName, FirstEntry, &CurrentEntry, DirSearch, OutMFTIndex); + Status = BrowseIndexEntries(Vcb, + MftRecord, + IndexRecord, + IndexRoot->SizeOfEntry, + IndexEntry, + IndexEntryEnd, + FileName, + FirstEntry, + &CurrentEntry, + DirSearch, + CaseSensitive, + OutMFTIndex); ExFreePoolWithTag(IndexRecord, TAG_NTFS); ExFreePoolWithTag(MftRecord, TAG_NTFS); @@ -2049,7 +2108,8 @@ PUNICODE_STRING PathName, PFILE_RECORD_HEADER *FileRecord, PULONGLONG MFTIndex, - ULONGLONG CurrentMFTIndex) + ULONGLONG CurrentMFTIndex, + BOOLEAN CaseSensitive) { UNICODE_STRING Current, Remaining; NTSTATUS Status; @@ -2063,7 +2123,7 @@ { DPRINT("Current: %wZ\n", &Current); - Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, &FirstEntry, FALSE, &CurrentMFTIndex); + Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, &FirstEntry, FALSE, &CurrentMFTIndex, CaseSensitive); if (!NT_SUCCESS(Status)) { return Status; @@ -2099,9 +2159,10 @@ NtfsLookupFile(PDEVICE_EXTENSION Vcb, PUNICODE_STRING PathName, PFILE_RECORD_HEADER *FileRecord, - PULONGLONG MFTIndex) -{ - return NtfsLookupFileAt(Vcb, PathName, FileRecord, MFTIndex, NTFS_FILE_ROOT); + PULONGLONG MFTIndex, + BOOLEAN CaseSensitive) +{ + return NtfsLookupFileAt(Vcb, PathName, FileRecord, MFTIndex, NTFS_FILE_ROOT, CaseSensitive); } /** @@ -2150,13 +2211,21 @@ PULONG FirstEntry, PFILE_RECORD_HEADER *FileRecord, PULONGLONG MFTIndex, - ULONGLONG CurrentMFTIndex) + ULONGLONG CurrentMFTIndex, + BOOLEAN CaseSensitive) { NTSTATUS Status; - DPRINT("NtfsFindFileAt(%p, %wZ, %u, %p, %p, %I64x)\n", Vcb, SearchPattern, *FirstEntry, FileRecord, MFTIndex, CurrentMFTIndex); - - Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, SearchPattern, FirstEntry, TRUE, &CurrentMFTIndex); + DPRINT("NtfsFindFileAt(%p, %wZ, %u, %p, %p, %I64x, %s)\n", + Vcb, + SearchPattern, + *FirstEntry, + FileRecord, + MFTIndex, + CurrentMFTIndex, + (CaseSensitive ? "TRUE" : "FALSE")); + + Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, SearchPattern, FirstEntry, TRUE, &CurrentMFTIndex, CaseSensitive); if (!NT_SUCCESS(Status)) { DPRINT("NtfsFindFileAt: NtfsFindMftRecord() failed with status 0x%08lx\n", Status); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst…
============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sat Jun 24 04:36:28 2017 @@ -781,7 +781,8 @@ NtfsGetFCBForFile(PNTFS_VCB Vcb, PNTFS_FCB *pParentFCB, PNTFS_FCB *pFCB, - const PWSTR pFileName); + const PWSTR pFileName, + BOOLEAN CaseSensitive); NTSTATUS NtfsReadFCBAttribute(PNTFS_VCB Vcb, @@ -811,6 +812,7 @@ PFILE_OBJECT FileObject, PDEVICE_EXTENSION DeviceExt, ULONG IrpFlags, + BOOLEAN CaseSensitive, PLARGE_INTEGER NewFileSize); NTSTATUS @@ -892,7 +894,8 @@ BOOLEAN CompareFileName(PUNICODE_STRING FileName, PINDEX_ENTRY_ATTRIBUTE IndexEntry, - BOOLEAN DirSearch); + BOOLEAN DirSearch, + BOOLEAN CaseSensitive); NTSTATUS ReadFileRecord(PDEVICE_EXTENSION Vcb, @@ -911,7 +914,8 @@ PULONG CurrentEntry, BOOLEAN DirSearch, ULONGLONG NewDataSize, - ULONGLONG NewAllocatedSize); + ULONGLONG NewAllocatedSize, + BOOLEAN CaseSensitive); NTSTATUS UpdateFileNameRecord(PDEVICE_EXTENSION Vcb, @@ -919,7 +923,8 @@ PUNICODE_STRING FileName, BOOLEAN DirSearch, ULONGLONG NewDataSize, - ULONGLONG NewAllocationSize); + ULONGLONG NewAllocationSize, + BOOLEAN CaseSensitive); NTSTATUS UpdateFileRecord(PDEVICE_EXTENSION Vcb, @@ -973,7 +978,8 @@ PUNICODE_STRING PathName, PFILE_RECORD_HEADER *FileRecord, PULONGLONG MFTIndex, - ULONGLONG CurrentMFTIndex); + ULONGLONG CurrentMFTIndex, + BOOLEAN CaseSensitive); VOID NtfsDumpFileRecord(PDEVICE_EXTENSION Vcb, @@ -985,7 +991,8 @@ PULONG FirstEntry, PFILE_RECORD_HEADER *FileRecord, PULONGLONG MFTIndex, - ULONGLONG CurrentMFTIndex); + ULONGLONG CurrentMFTIndex, + BOOLEAN CaseSensitive); NTSTATUS NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, @@ -993,7 +1000,8 @@ PUNICODE_STRING FileName, PULONG FirstEntry, BOOLEAN DirSearch, - ULONGLONG *OutMFTIndex); + ULONGLONG *OutMFTIndex, + BOOLEAN CaseSensitive); /* misc.c */ Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst…
============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sat Jun 24 04:36:28 2017 @@ -283,6 +283,10 @@ * @param IrpFlags * TODO: flags are presently ignored in code. * +* @param CaseSensitive +* Boolean indicating if the function should operate in case-sensitive mode. This will be TRUE +* if an application opened the file with the FILE_FLAG_POSIX_SEMANTICS flag. +* * @param LengthWritten * Pointer to a ULONG. This ULONG will be set to the number of bytes successfully written. * @@ -303,6 +307,7 @@ ULONG Length, ULONG WriteOffset, ULONG IrpFlags, + BOOLEAN CaseSensitive, PULONG LengthWritten) { NTSTATUS Status = STATUS_NOT_IMPLEMENTED; @@ -312,7 +317,15 @@ ULONG AttributeOffset; ULONGLONG StreamSize; - DPRINT("NtfsWriteFile(%p, %p, %p, %u, %u, %x, %p)\n", DeviceExt, FileObject, Buffer, Length, WriteOffset, IrpFlags, LengthWritten); + DPRINT("NtfsWriteFile(%p, %p, %p, %u, %u, %x, %s, %p)\n", + DeviceExt, + FileObject, + Buffer, + Length, + WriteOffset, + IrpFlags, + (CaseSensitive ? "TRUE" : "FALSE"), + LengthWritten); *LengthWritten = 0; @@ -444,7 +457,13 @@ filename.Length = fileNameAttribute->NameLength * sizeof(WCHAR); filename.MaximumLength = filename.Length; - Status = UpdateFileNameRecord(Fcb->Vcb, ParentMFTId, &filename, FALSE, DataSize.QuadPart, AllocationSize); + Status = UpdateFileNameRecord(Fcb->Vcb, + ParentMFTId, + &filename, + FALSE, + DataSize.QuadPart, + AllocationSize, + CaseSensitive); } else @@ -667,6 +686,7 @@ Length, ByteOffset.LowPart, Irp->Flags, + (IrpContext->Stack->Flags & SL_CASE_SENSITIVE), &ReturnedWriteLength); IrpContext->Irp->IoStatus.Status = Status;
7 years, 6 months
1
0
0
0
[dquintana] 75177: [NTOBJSHEX] Make nt object symlinks work more like shortcuts. Fixes the addressbar not quite knowing what to show when you click on a symlink.
by dquintana@svn.reactos.org
Author: dquintana Date: Fri Jun 23 23:23:17 2017 New Revision: 75177 URL:
http://svn.reactos.org/svn/reactos?rev=75177&view=rev
Log: [NTOBJSHEX] Make nt object symlinks work more like shortcuts. Fixes the addressbar not quite knowing what to show when you click on a symlink. Modified: trunk/reactos/dll/shellext/ntobjshex/foldercommon.h trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp trunk/reactos/dll/shellext/ntobjshex/regfolder.h Modified: trunk/reactos/dll/shellext/ntobjshex/foldercommon.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/fol…
============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/foldercommon.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/foldercommon.h [iso-8859-1] Fri Jun 23 23:23:17 2017 @@ -187,11 +187,6 @@ LPITEMIDLIST fullPidl = ILCombine(m_shellPidl, first); - if (IsSymLink(info)) - { - return RedirectToSymLink(info, first, rest, pbcReserved, (IShellFolder**)ppvOut); - } - CComPtr<IShellFolder> psfChild; hr = InternalBindToObject(path, info, first, rest, fullPidl, pbcReserved, &psfChild); @@ -225,16 +220,14 @@ LPBC pbcReserved, IShellFolder** ppsfChild) PURE; + virtual HRESULT STDMETHODCALLTYPE ResolveSymLink( + const TItemId * info, + LPITEMIDLIST * fullPidl) + { + return E_NOTIMPL; + } + public: - virtual HRESULT STDMETHODCALLTYPE RedirectToSymLink( - const TItemId * info, - LPITEMIDLIST first, - LPCITEMIDLIST rest, - LPBC pbcReserved, - IShellFolder ** ppsfChild) - { - return E_NOTIMPL; - } virtual HRESULT STDMETHODCALLTYPE BindToStorage( LPCITEMIDLIST pidl, @@ -422,7 +415,40 @@ HKEY keys[1]; + LPITEMIDLIST parent = m_shellPidl; + + CComPtr<IShellFolder> psfParent = this; + + LPCITEMIDLIST child; + int nkeys = _countof(keys); + if (cidl == 1 && IsSymLink(apidl[0])) + { + const TItemId * info; + HRESULT hr = GetInfoFromPidl(apidl[0], &info); + if (FAILED(hr)) + return hr; + + LPITEMIDLIST target; + hr = ResolveSymLink(info, &target); + if (FAILED(hr)) + return hr; + + CComPtr<IShellFolder> psfTarget; + hr = ::SHBindToParent(target, IID_PPV_ARG(IShellFolder, &psfTarget), &child); + if (FAILED(hr)) + { + ILFree(target); + return hr; + } + + parent = ILClone(target); + ILRemoveLastID(parent); + psfParent = psfTarget; + + apidl = &child; + } + if (cidl == 1 && IsFolder(apidl[0])) { res = RegOpenKey(HKEY_CLASSES_ROOT, L"Folder", keys + 0); @@ -434,7 +460,7 @@ nkeys = 0; } - HRESULT hr = CDefFolderMenu_Create2(m_shellPidl, hwndOwner, cidl, apidl, this, DefCtxMenuCallback, nkeys, keys, &pcm); + HRESULT hr = CDefFolderMenu_Create2(parent, hwndOwner, cidl, apidl, psfParent, DefCtxMenuCallback, nkeys, keys, &pcm); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -635,9 +661,29 @@ const TItemId * entry, PULONG inMask) PURE; - virtual BOOL STDMETHODCALLTYPE IsFolder(LPCITEMIDLIST pcidl) PURE; + virtual BOOL STDMETHODCALLTYPE IsFolder(LPCITEMIDLIST pcidl) + { + const TItemId * info; + + HRESULT hr = GetInfoFromPidl(pcidl, &info); + if (FAILED(hr)) + return hr; + + return IsFolder(info); + } virtual BOOL STDMETHODCALLTYPE IsFolder(const TItemId * info) PURE; + + virtual BOOL STDMETHODCALLTYPE IsSymLink(LPCITEMIDLIST pcidl) + { + const TItemId * info; + + HRESULT hr = GetInfoFromPidl(pcidl, &info); + if (FAILED(hr)) + return hr; + + return IsSymLink(info); + } virtual BOOL STDMETHODCALLTYPE IsSymLink(const TItemId * info) { Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto…
============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp [iso-8859-1] Fri Jun 23 23:23:17 2017 @@ -125,72 +125,56 @@ return info->objectType == SYMBOLICLINK_OBJECT; } -HRESULT STDMETHODCALLTYPE CNtObjectFolder::RedirectToSymLink( +HRESULT STDMETHODCALLTYPE CNtObjectFolder::ResolveSymLink( const NtPidlEntry * info, - LPITEMIDLIST first, - LPCITEMIDLIST rest, - LPBC pbcReserved, - IShellFolder ** ppsfChild) -{ - HRESULT hr; - + LPITEMIDLIST * fullPidl) +{ WCHAR wbLink[MAX_PATH] = { 0 }; UNICODE_STRING link; RtlInitEmptyUnicodeString(&link, wbLink, sizeof(wbLink)); - hr = GetNTObjectSymbolicLinkTarget(m_NtPath, info->entryName, &link); + *fullPidl = NULL; + + HRESULT hr = GetNTObjectSymbolicLinkTarget(m_NtPath, info->entryName, &link); if (FAILED_UNEXPECTEDLY(hr)) return hr; WCHAR path[MAX_PATH]; - if (link.Length > 0) - { - if (link.Buffer[1] == L':' && isalphaW(link.Buffer[0])) - { - StringCbCopyNW(path, _countof(path), link.Buffer, link.Length); - - CComPtr<IShellFolder> psfDesktop; - hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = psfDesktop->ParseDisplayName(NULL, NULL, path, NULL, &first, NULL); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = psfDesktop->BindToObject(rest, pbcReserved, IID_PPV_ARG(IShellFolder, ppsfChild)); - if (FAILED(hr)) - return hr; - - return S_FALSE;; - } - - StringCbCopyW(path, _countof(path), L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{845B0FB2-66E0-416B-8F91-314E23F7C12D}"); - PathAppend(path, link.Buffer); + if (link.Length == 0) + return E_UNEXPECTED; + + if (link.Buffer[1] == L':' && isalphaW(link.Buffer[0])) + { + StringCbCopyNW(path, _countof(path), link.Buffer, link.Length); CComPtr<IShellFolder> psfDesktop; hr = SHGetDesktopFolder(&psfDesktop); if (FAILED_UNEXPECTEDLY(hr)) return hr; - LPITEMIDLIST pidl; - - hr = psfDesktop->ParseDisplayName(NULL, NULL, path, NULL, &pidl, NULL); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - CComPtr<IShellFolder> psfChild; - hr = psfDesktop->BindToObject(pidl, pbcReserved, IID_PPV_ARG(IShellFolder, ppsfChild)); - ILFree(pidl); - - if (FAILED(hr)) - return hr; - - return S_FALSE;; - } - - return E_UNEXPECTED; + return psfDesktop->ParseDisplayName(NULL, NULL, path, NULL, fullPidl, NULL); + } + + StringCbCopyW(path, _countof(path), L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{845B0FB2-66E0-416B-8F91-314E23F7C12D}"); + PathAppend(path, link.Buffer); + + CComPtr<IShellFolder> psfDesktop; + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + LPITEMIDLIST pidl; + + hr = psfDesktop->ParseDisplayName(NULL, NULL, path, NULL, &pidl, NULL); + if (FAILED(hr)) + return hr; + + *fullPidl = pidl; + + DumpIdList(pidl); + + return S_OK; } HRESULT STDMETHODCALLTYPE CNtObjectFolder::InternalBindToObject( @@ -487,15 +471,6 @@ return flags & mask; } -BOOL CNtObjectFolder::IsFolder(LPCITEMIDLIST pcidl) -{ - NtPidlEntry * info = (NtPidlEntry*) &(pcidl->mkid); - if ((info->cb < sizeof(NtPidlEntry)) || (info->magic != NT_OBJECT_PIDL_MAGIC)) - return FALSE; - - return IsFolder(info); -} - BOOL CNtObjectFolder::IsFolder(const NtPidlEntry * info) { return (info->objectType == DIRECTORY_OBJECT) || Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto…
============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h [iso-8859-1] Fri Jun 23 23:23:17 2017 @@ -63,6 +63,7 @@ SHCONTF grfFlags, IEnumIDList **ppenumIDList); +protected: virtual HRESULT STDMETHODCALLTYPE InternalBindToObject( PWSTR path, const NtPidlEntry * info, @@ -71,13 +72,12 @@ LPITEMIDLIST fullPidl, LPBC pbcReserved, IShellFolder** ppsfChild); - virtual HRESULT STDMETHODCALLTYPE RedirectToSymLink( + + virtual HRESULT STDMETHODCALLTYPE ResolveSymLink( const NtPidlEntry * info, - LPITEMIDLIST first, - LPCITEMIDLIST rest, - LPBC pbcReserved, - IShellFolder ** ppsfChild); + LPITEMIDLIST * fullPidl); +public: virtual HRESULT STDMETHODCALLTYPE GetDefaultColumnState( UINT iColumn, SHCOLSTATEF *pcsFlags); @@ -105,7 +105,6 @@ protected: virtual HRESULT STDMETHODCALLTYPE CompareIDs(LPARAM lParam, const NtPidlEntry * first, const NtPidlEntry * second); virtual ULONG STDMETHODCALLTYPE ConvertAttributes(const NtPidlEntry * entry, PULONG inMask); - virtual BOOL STDMETHODCALLTYPE IsFolder(LPCITEMIDLIST pcidl); virtual BOOL STDMETHODCALLTYPE IsFolder(const NtPidlEntry * info); virtual BOOL STDMETHODCALLTYPE IsSymLink(const NtPidlEntry * info); Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg…
============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Fri Jun 23 23:23:17 2017 @@ -419,15 +419,6 @@ return flags & mask; } -BOOL CRegistryFolder::IsFolder(LPCITEMIDLIST pcidl) -{ - RegPidlEntry * entry = (RegPidlEntry*) &(pcidl->mkid); - if ((entry->cb < sizeof(RegPidlEntry)) || (entry->magic != REGISTRY_PIDL_MAGIC)) - return FALSE; - - return IsFolder(entry); -} - BOOL CRegistryFolder::IsFolder(const RegPidlEntry * info) { return (info->entryType == REG_ENTRY_KEY) ||(info->entryType == REG_ENTRY_ROOT); Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg…
============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] Fri Jun 23 23:23:17 2017 @@ -63,6 +63,7 @@ SHCONTF grfFlags, IEnumIDList **ppenumIDList); +protected: virtual HRESULT STDMETHODCALLTYPE InternalBindToObject( PWSTR path, const RegPidlEntry * info, @@ -72,6 +73,7 @@ LPBC pbcReserved, IShellFolder** ppsfChild); +public: virtual HRESULT STDMETHODCALLTYPE GetDefaultColumnState( UINT iColumn, SHCOLSTATEF *pcsFlags); @@ -99,7 +101,6 @@ protected: virtual HRESULT STDMETHODCALLTYPE CompareIDs(LPARAM lParam, const RegPidlEntry * first, const RegPidlEntry * second); virtual ULONG STDMETHODCALLTYPE ConvertAttributes(const RegPidlEntry * entry, PULONG inMask); - virtual BOOL STDMETHODCALLTYPE IsFolder(LPCITEMIDLIST pcidl); virtual BOOL STDMETHODCALLTYPE IsFolder(const RegPidlEntry * info); virtual HRESULT GetInfoFromPidl(LPCITEMIDLIST pcidl, const RegPidlEntry ** pentry);
7 years, 6 months
1
0
0
0
[dquintana] 75176: [NTOBJSHEX] Make GCC happy.
by dquintana@svn.reactos.org
Author: dquintana Date: Fri Jun 23 21:40:19 2017 New Revision: 75176 URL:
http://svn.reactos.org/svn/reactos?rev=75176&view=rev
Log: [NTOBJSHEX] Make GCC happy. Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjenum.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp trunk/reactos/dll/shellext/ntobjshex/precomp.h trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjenum.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto…
============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjenum.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjenum.cpp [iso-8859-1] Fri Jun 23 21:40:19 2017 @@ -19,8 +19,6 @@ #include "precomp.h" #include <strsafe.h> -WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); - static struct RootKeyEntry { HKEY key; PCWSTR keyName; Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto…
============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp [iso-8859-1] Fri Jun 23 21:40:19 2017 @@ -8,8 +8,6 @@ #include "precomp.h" -WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); - // {845B0FB2-66E0-416B-8F91-314E23F7C12D} const GUID CLSID_NtObjectFolder = { 0x845b0fb2, 0x66e0, 0x416b, { 0x8f, 0x91, 0x31, 0x4e, 0x23, 0xf7, 0xc1, 0x2d } }; @@ -25,8 +23,8 @@ }; CNtObjectFolderExtractIcon::CNtObjectFolderExtractIcon() : - m_pcidlChild(NULL), - m_NtPath(NULL) + m_NtPath(NULL), + m_pcidlChild(NULL) { } @@ -439,8 +437,8 @@ { HRESULT hr; - LPARAM sortMode = lParam & 0xFFFF0000; - LPARAM column = lParam & 0x0000FFFF; + DWORD sortMode = lParam & 0xFFFF0000; + DWORD column = lParam & 0x0000FFFF; if (sortMode == SHCIDS_ALLFIELDS) { Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto…
============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp [iso-8859-1] Fri Jun 23 21:40:19 2017 @@ -9,8 +9,6 @@ #include "precomp.h" #include <atlwin.h> - -WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_NtObjectFolder, CNtObjectFolder) Modified: trunk/reactos/dll/shellext/ntobjshex/precomp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/pre…
============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/precomp.h [iso-8859-1] Fri Jun 23 21:40:19 2017 @@ -57,6 +57,8 @@ #define GET_SHGDN_FOR(dwFlags) ((DWORD)dwFlags & (DWORD)0x0000FF00) #define GET_SHGDN_RELATION(dwFlags) ((DWORD)dwFlags & (DWORD)0x000000FF) +WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); + #include <rtlfuncs.h> #include <ntquery.h> #include "util.h" Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg…
============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Fri Jun 23 21:40:19 2017 @@ -7,8 +7,6 @@ */ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); // {1C6D6E08-2332-4A7B-A94D-6432DB2B5AE6} const GUID CLSID_RegistryFolder = { 0x1c6d6e08, 0x2332, 0x4a7b, { 0xa9, 0x4d, 0x64, 0x32, 0xdb, 0x2b, 0x5a, 0xe6 } }; @@ -376,8 +374,8 @@ { HRESULT hr; - LPARAM sortMode = lParam & 0xFFFF0000; - LPARAM column = lParam & 0x0000FFFF; + DWORD sortMode = lParam & 0xFFFF0000; + DWORD column = lParam & 0x0000FFFF; if (sortMode == SHCIDS_ALLFIELDS) {
7 years, 6 months
1
0
0
0
[dquintana] 75175: [NTOBJSHEX] * Added a common superclass for the ntobj and registry folders. * Refactored the ntobj and registry folders to make use of this superclass. * Removed the concept of a...
by dquintana@svn.reactos.org
Author: dquintana Date: Fri Jun 23 21:28:36 2017 New Revision: 75175 URL:
http://svn.reactos.org/svn/reactos?rev=75175&view=rev
Log: [NTOBJSHEX] * Added a common superclass for the ntobj and registry folders. * Refactored the ntobj and registry folders to make use of this superclass. * Removed the concept of a "pidl helper", since it works best to just have the methods be part of the folders. * Cleaned up the ItemID comparison logic. Added: trunk/reactos/dll/shellext/ntobjshex/foldercommon.cpp (with props) trunk/reactos/dll/shellext/ntobjshex/foldercommon.h (with props) Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjenum.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h trunk/reactos/dll/shellext/ntobjshex/precomp.h trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp trunk/reactos/dll/shellext/ntobjshex/regfolder.h [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/shellext/ntobjshex/foldercommon.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/fol…
Added: trunk/reactos/dll/shellext/ntobjshex/foldercommon.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/fol…
Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjenum.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto…
Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto…
Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto…
Modified: trunk/reactos/dll/shellext/ntobjshex/precomp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/pre…
Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg…
Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg…
7 years, 6 months
1
0
0
0
[ssawant] 75174: [QCKLNCH] -Added Browse Folder Interface (under test). -Now buttons can show respective icons. -Minor code cleanup.
by ssawant@svn.reactos.org
Author: ssawant Date: Fri Jun 23 20:05:01 2017 New Revision: 75174 URL:
http://svn.reactos.org/svn/reactos?rev=75174&view=rev
Log: [QCKLNCH] -Added Browse Folder Interface (under test). -Now buttons can show respective icons. -Minor code cleanup. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/…
============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] Fri Jun 23 20:05:01 2017 @@ -8,6 +8,7 @@ #include "precomp.h" #include <mshtmcid.h> +#include <commoncontrols.h> #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) @@ -40,77 +41,51 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst) { - //This ought to be global.. (currently testing) - //HIMAGELIST g_hImageList = NULL; - - // Declare and initialize local constants. - const int ImageListID = 0; - const int bitmapSize = 16; - + // Declare and initialize local constants. const DWORD buttonStyles = BTNS_AUTOSIZE; // Create the toolbar. - HWND hWndToolbar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, - WS_CHILD | TBSTYLE_WRAPABLE | TBSTYLE_LIST | CCS_NORESIZE, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, + HWND hWndToolbar = CreateWindowEx(0 , TOOLBARCLASSNAME, NULL, + WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_LIST | CCS_NORESIZE, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, hWndParent, NULL, hInst, NULL); if (hWndToolbar == NULL) - return NULL; - - // Create the image list. - /* g_hImageList = ImageList_Create(bitmapSize, bitmapSize, // Dimensions of individual bitmaps. - ILC_COLOR16 | ILC_MASK, // Ensures transparent background. - numButtons, 0); + return NULL; // Set the image list. - SendMessage(hWndToolbar, TB_SETIMAGELIST, - (WPARAM)ImageListID, - (LPARAM)g_hImageList); - - // Load the button images. - SendMessage(hWndToolbar, TB_LOADIMAGES, - (WPARAM)IDB_STD_SMALL_COLOR, - (LPARAM)HINST_COMMCTRL);*/ - - // Initialize button info. - // IDM_NEW, IDM_OPEN, and IDM_SAVE are application-defined command constants. - /*{ - { MAKELONG(STD_FILENEW, ImageListID), IDM_NEW, TBSTATE_ENABLED, buttonStyles,{ 0 }, 0, (INT_PTR)L"New" }, - { MAKELONG(STD_FILEOPEN, ImageListID), IDM_OPEN, TBSTATE_ENABLED, buttonStyles,{ 0 }, 0, (INT_PTR)L"Open" }, - { MAKELONG(STD_FILESAVE, ImageListID), IDM_SAVE, 0, buttonStyles,{ 0 }, 0, (INT_PTR)L"Save" } - };*/ - // Add buttons. - /*SendMessage(hWndToolbar, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0); - SendMessage(hWndToolbar, TB_ADDBUTTONS, (WPARAM)nb, (LPARAM)&tbButtons);*/ + HIMAGELIST* piml; + HRESULT hr1 = SHGetImageList(SHIL_SMALL, IID_IImageList, (void**)&piml); + SendMessage(hWndToolbar, TB_SETIMAGELIST, 0, (LPARAM)piml); + //SendMessage(hWndToolbar, TB_LOADIMAGES, (WPARAM)IDB_STD_SMALL_COLOR, (LPARAM)HINST_COMMCTRL); //Enumerate objects CComPtr<IEnumIDList> pedl; - HRESULT hr = m_pISF->EnumObjects(0, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &pedl); + HRESULT hr2 = m_pISF->EnumObjects(0, SHCONTF_FOLDERS, &pedl); LPITEMIDLIST pidl = NULL; - STRRET stret; - //LPWSTR pstr = NULL; - - if (SUCCEEDED(hr)) - { - for (int i=0; pedl->Next(MAX_PATH, &pidl, 0) != S_FALSE; i++) + STRRET stret; + + if (SUCCEEDED(hr1) && SUCCEEDED(hr2)) + { + ULONG count = 0; + for (int i=0; pedl->Next(MAX_PATH, &pidl, &count) != S_FALSE; i++) { WCHAR sz[MAX_PATH]; - m_pISF->GetDisplayNameOf(pidl, SHGDN_NORMAL, &stret); - //StrRetToStr(&stret, pidl, &pstr); + int index = SHMapPIDLToSystemImageListIndex(m_pISF, pidl, NULL); + m_pISF->GetDisplayNameOf(pidl, SHGDN_NORMAL, &stret); StrRetToBuf(&stret, pidl, sz, sizeof(sz)); //MessageBox(0, sz, L"Namespace Object Found!", MB_OK | MB_ICONINFORMATION); - TBBUTTON tb = { MAKELONG(I_IMAGENONE, ImageListID), i, TBSTATE_ENABLED, buttonStyles,{ 0 }, 0, (INT_PTR)sz }; - SendMessage(hWndToolbar, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0); + TBBUTTON tb = { MAKELONG(index, 0), i, TBSTATE_ENABLED, buttonStyles,{ 0 }, 0, (INT_PTR)sz }; + //SendMessage(hWndToolbar, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0); SendMessage(hWndToolbar, TB_INSERTBUTTONW, 0, (LPARAM)&tb); } } + else return NULL; // Resize the toolbar, and then show it. SendMessage(hWndToolbar, TB_AUTOSIZE, 0, 0); ShowWindow(hWndToolbar, TRUE); - CoTaskMemFree((void*)pidl); - //CoTaskMemFree((void*)pstr); + CoTaskMemFree((void*)pidl); return hWndToolbar; } @@ -119,7 +94,7 @@ //IObjectWithSite HRESULT STDMETHODCALLTYPE CISFBand::SetSite(IUnknown *pUnkSite) { - MessageBox(0, L"CISFBand::SetSite called!", L"Testing", MB_OK | MB_ICONINFORMATION); + //MessageBox(0, L"CISFBand::SetSite called!", L"Testing", MB_OK | MB_ICONINFORMATION); HRESULT hRet; HWND hwndParent; @@ -263,7 +238,8 @@ if (pdbi->dwMask & DBIM_MINSIZE) { - pdbi->ptMinSize = idealSize; + pdbi->ptMinSize.x = -1; + pdbi->ptMinSize.y = idealSize.y; } if (pdbi->dwMask & DBIM_MAXSIZE) { @@ -281,10 +257,11 @@ wcscpy(pdbi->wszTitle, L"Quick Launch"); if (pdbi->dwMask & DBIM_MODEFLAGS) { - pdbi->dwModeFlags = DBIMF_NORMAL | DBIMF_VARIABLEHEIGHT; + pdbi->dwModeFlags = DBIMF_NORMAL | DBIMF_VARIABLEHEIGHT | DBIMF_USECHEVRON | DBIMF_NOMARGINS | DBIMF_BKCOLOR; } if (pdbi->dwMask & DBIM_BKCOLOR) - pdbi->crBkgnd = 0; + pdbi->dwMask &= ~DBIM_BKCOLOR; + } return S_OK; } @@ -434,6 +411,30 @@ HRESULT STDMETHODCALLTYPE CISFBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { + /* if (*pguidCmdGroup == CGID_IDeskBand) + { + switch (m_BandID) + { + case DBID_BANDINFOCHANGED: + case DBID_MAXIMIZEBAND: + { + pvaIn = (VARIANT*)m_BandID; + return S_OK; + } + case DBID_SHOWONLY: + { + pvaIn = (VARIANT*)VT_UNKNOWN; + return S_OK; + } + case DBID_PUSHCHEVRON: + { + nCmdexecopt = m_BandID; + pvaIn = (VARIANT*)VT_I4; + return S_OK; + } + default: return S_OK; + } + }*/ if (IsEqualIID(*pguidCmdGroup, IID_IBandSite)) { return S_OK; @@ -442,8 +443,8 @@ if (IsEqualIID(*pguidCmdGroup, IID_IDeskBand)) { return S_OK; - } - + } + //MessageBox(0, L"Exec called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); UNIMPLEMENTED; @@ -458,17 +459,20 @@ HRESULT STDMETHODCALLTYPE CISFBand::InitializeSFB(IShellFolder *psf, PCIDLIST_ABSOLUTE pidl) { - if (pidl != NULL) + LPITEMIDLIST pidlRoot; + SHGetSpecialFolderLocation(0, CSIDL_DESKTOP, &pidlRoot); + + if (pidl == NULL || !psf->CompareIDs(0x80000000L, pidl, pidlRoot)) + { + m_pISF = psf; + m_pidl = pidl; + } + else { psf->BindToObject(pidl, 0, IID_IShellFolder, (void**)&m_pISF); m_pidl = pidl; } - else - { - m_pISF = psf; - m_pidl = pidl; - } - + return S_OK; } Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/…
============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] Fri Jun 23 20:05:01 2017 @@ -23,8 +23,7 @@ CComPtr<IUnknown> m_Site; CComPtr<IShellFolder> m_pISF; PCIDLIST_ABSOLUTE m_pidl; - HWND m_hWnd; - HWND m_hWndStartButton; + HWND m_hWnd; DWORD m_BandID; public: Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/…
============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] Fri Jun 23 20:05:01 2017 @@ -38,6 +38,29 @@ return hr; } +//Pidl Browser + LPITEMIDLIST PidlBrowse(HWND hwnd, int nCSIDL) + { + LPITEMIDLIST pidlRoot = NULL; + LPITEMIDLIST pidlSelected = NULL; + WCHAR path[MAX_PATH]; + + if (nCSIDL) + { + SHGetSpecialFolderLocation(hwnd, nCSIDL, &pidlRoot); + } + + BROWSEINFO bi = { hwnd, pidlRoot, path, L"Choose a folder", 0, NULL, 0, 0 }; + pidlSelected = SHBrowseForFolder(&bi); + + if (pidlRoot) + { + CoTaskMemFree(pidlRoot); + } + + return pidlSelected; + } + //CQuickLaunchBand CQuickLaunchBand::CQuickLaunchBand() {} @@ -51,33 +74,27 @@ { //MessageBox(0, L"CQuickLaunchBand::FinalConstruct Begin!", L"Testing", MB_OK | MB_ICONINFORMATION); - HRESULT hr = CIFSBand_CreateInstance(IID_IUnknown, (void**) &m_punkISFB); + HRESULT hr = CISFBand_CreateInstance(IID_IUnknown, (void**) &m_punkISFB); if (SUCCEEDED(hr)) { - MessageBox(0, L"CreateInstance success!", L"Testing", MB_OK | MB_ICONINFORMATION); - /* + //MessageBox(0, L"CreateInstance success!", L"Testing", MB_OK | MB_ICONINFORMATION); + CComPtr<IShellFolderBand> pISFB; hr = m_punkISFB->QueryInterface(IID_IShellFolderBand, (void**) &pISFB); if (SUCCEEDED(hr)) { - // MessageBox(0, L"IID_ISFBand query success!", L"Testing", MB_OK | MB_ICONINFORMATION); + //MessageBox(0, L"IID_ISFBand query success!", L"Testing", MB_OK | MB_ICONINFORMATION); CComPtr<IShellFolder> pISF; hr = SHGetDesktopFolder(&pISF); if (SUCCEEDED(hr)) - { + { //MessageBox(0, L"pisf success!", L"Testing", MB_OK | MB_ICONINFORMATION); - - //LPITEMIDLIST pidl; - //hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); - //if (SUCCEEDED(hr)) - //{ - //MessageBox(0, L"pidl success!", L"Testing", MB_OK | MB_ICONINFORMATION); - - pISFB->InitializeSFB(pISF, 0); - //} + LPITEMIDLIST pidl = PidlBrowse(m_hWndBro, CSIDL_DESKTOP); + if (pidl == NULL) return E_FAIL; + pISFB->InitializeSFB(pISF, pidl); } - } */ + } } // MessageBox(0, L"CQuickLaunchBand::FinalConstruct End!", L"Testing", MB_OK | MB_ICONINFORMATION); Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/…
============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] Fri Jun 23 20:05:01 2017 @@ -23,7 +23,8 @@ public IPersistStream, public IWinEventHandler, public IOleCommandTarget -{ +{ + HWND m_hWndBro; CComPtr<IUnknown> m_punkISFB; public:
7 years, 6 months
1
0
0
0
[pschweitzer] 75173: [MPR] Import Wine commit: - 8d461c1f42b0b667b2aa6a235d007eea1dd6f561, Don't stop enumeration on the first failing network provider. This fixes 'net use' stoping connections enu...
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Fri Jun 23 19:29:31 2017 New Revision: 75173 URL:
http://svn.reactos.org/svn/reactos?rev=75173&view=rev
Log: [MPR] Import Wine commit: - 8d461c1f42b0b667b2aa6a235d007eea1dd6f561, Don't stop enumeration on the first failing network provider. This fixes 'net use' stoping connections enumeration when a network returns an error or no connection. CORE-13475 Modified: trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/wnet.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7…
============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Fri Jun 23 19:29:31 2017 @@ -1479,15 +1479,13 @@ ++curr; } - if (*user_count != -1) - count = *user_count - total_count; - else - count = *user_count; size = left; } - if (ret != WN_SUCCESS || total_count == 0) - break; + if (*user_count != -1) + count = *user_count - total_count; + else + count = *user_count; } }
7 years, 6 months
1
0
0
0
[pschweitzer] 75172: [MPR] Import Wine commit: - 51b4a42969366cc409808aded23d3602a34206e2, Properly handle the count set to -1 when enumerating connections. This fixes 'net use' not being able to e...
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Fri Jun 23 19:21:29 2017 New Revision: 75172 URL:
http://svn.reactos.org/svn/reactos?rev=75172&view=rev
Log: [MPR] Import Wine commit: - 51b4a42969366cc409808aded23d3602a34206e2, Properly handle the count set to -1 when enumerating connections. This fixes 'net use' not being able to enumerate multiple connections served by multiple network providers. CORE-13475 Modified: trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/wnet.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7…
============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Fri Jun 23 19:21:29 2017 @@ -1400,7 +1400,7 @@ static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD* user_count, void* user_buffer, DWORD* user_size) { - DWORD ret, index, count, size, i, left; + DWORD ret, index, count, total_count, size, i, left; void* end; NETRESOURCEW* curr, * buffer; HANDLE* handles; @@ -1424,6 +1424,7 @@ curr = user_buffer; end = (char *)user_buffer + size; count = *user_count; + total_count = 0; ret = WN_NO_MORE_ENTRIES; for (index = 0; index < providerTable->numProviders; index++) @@ -1443,6 +1444,7 @@ ret = providerTable->table[index].enumResource(handles[index], &count, buffer, &size); + total_count += count; if (ret == WN_MORE_DATA) break; @@ -1477,19 +1479,22 @@ ++curr; } - count = *user_count - count; + if (*user_count != -1) + count = *user_count - total_count; + else + count = *user_count; size = left; } - if (ret != WN_SUCCESS || count == 0) + if (ret != WN_SUCCESS || total_count == 0) break; } } - if (count == 0) + if (total_count == 0) ret = WN_NO_MORE_ENTRIES; - *user_count = *user_count - count; + *user_count = total_count; if (ret != WN_MORE_DATA && ret != WN_NO_MORE_ENTRIES) ret = WN_SUCCESS;
7 years, 6 months
1
0
0
0
← Newer
1
...
5
6
7
8
9
10
11
...
53
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
Results per page:
10
25
50
100
200