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
May 2007
----- 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
17 participants
322 discussions
Start a n
N
ew thread
[mbosma] 26868: Change EnumDisplayModes to use EnumDisplaySettingsEx because Nvidia does not set lpModeInfo in DDHALINFO.
by mbosma@svn.reactos.org
Author: mbosma Date: Tue May 22 16:39:59 2007 New Revision: 26868 URL:
http://svn.reactos.org/svn/reactos?rev=26868&view=rev
Log: Change EnumDisplayModes to use EnumDisplaySettingsEx because Nvidia does not set lpModeInfo in DDHALINFO. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd…
============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Tue May 22 16:39:59 2007 @@ -16,38 +16,48 @@ LPDDSURFACEDESC2 pDDSD, LPVOID pContext, LPDDENUMMODESCALLBACK2 pCallback) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + INT iMode = 0; + DEVMODE DevMode; + DX_WINDBG_trace(); if(!pCallback) return DDERR_INVALIDPARAMS; - // FIXME: Process DDEDM_STANDARDVGAMODES flag + DevMode.dmSize = sizeof(DEVMODE); + DevMode.dmDriverExtra = 0; - int i; - for (i=0; i<This->lpLcl->lpGbl->dwNumModes; i++) + while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0) == TRUE) { DDSURFACEDESC2 SurfaceDesc; - // FIXME: do we need to set/test more sturcture members ? + iMode++; + SurfaceDesc.dwSize = sizeof (DDSURFACEDESC2); SurfaceDesc.dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PIXELFORMAT; - SurfaceDesc.dwHeight = This->lpLcl->lpGbl->lpModeInfo[i].dwWidth; - SurfaceDesc.dwWidth = This->lpLcl->lpGbl->lpModeInfo[i].dwHeight; - SurfaceDesc.lPitch = This->lpLcl->lpGbl->lpModeInfo[i].lPitch; - SurfaceDesc.dwRefreshRate = This->lpLcl->lpGbl->lpModeInfo[i].wRefreshRate; + SurfaceDesc.dwHeight = DevMode.dmPelsHeight; + SurfaceDesc.dwWidth = DevMode.dmPelsWidth; + SurfaceDesc.lPitch = DevMode.dmPelsWidth * DevMode.dmBitsPerPel / 8; + SurfaceDesc.dwRefreshRate = DevMode.dmDisplayFrequency; SurfaceDesc.ddpfPixelFormat.dwSize = sizeof (DDPIXELFORMAT); SurfaceDesc.ddpfPixelFormat.dwFlags = DDPF_RGB; - SurfaceDesc.ddpfPixelFormat.dwRBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwRBitMask; - SurfaceDesc.ddpfPixelFormat.dwGBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwGBitMask; - SurfaceDesc.ddpfPixelFormat.dwBBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwBBitMask; - SurfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwAlphaBitMask; - SurfaceDesc.ddpfPixelFormat.dwRGBBitCount = This->lpLcl->lpGbl->lpModeInfo[i].dwBPP; + // FIXME: get these +/* + SurfaceDesc.ddpfPixelFormat.dwRBitMask = + SurfaceDesc.ddpfPixelFormat.dwGBitMask = + SurfaceDesc.ddpfPixelFormat.dwBBitMask = + SurfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask = +*/ + SurfaceDesc.ddpfPixelFormat.dwRGBBitCount = DevMode.dmBitsPerPel; + // FIXME1: This->lpLcl->lpGbl->dwMonitorFrequency is not set ! if(dwFlags & DDEDM_REFRESHRATES && SurfaceDesc.dwRefreshRate != This->lpLcl->lpGbl->dwMonitorFrequency) { - continue; + //continue; // FIXME2: what is SurfaceDesc.dwRefreshRate supposed to be set to ? } + + // FIXME: Take case when DDEDM_STANDARDVGAMODES flag is not set in account if(pDDSD) { @@ -67,7 +77,8 @@ continue; // FIXME: test for the other members of ddpfPixelFormat as well } - (*pCallback)(&SurfaceDesc, pContext); + if((*pCallback)(&SurfaceDesc, pContext) == DDENUMRET_CANCEL) + return DD_OK; } return DD_OK;
17 years, 7 months
1
0
0
0
[gedmurphy] 26867: remove unnecessary NDEBUG definitions. freeldr has it's own debugging system.
by gedmurphy@svn.reactos.org
Author: gedmurphy Date: Tue May 22 15:00:00 2007 New Revision: 26867 URL:
http://svn.reactos.org/svn/reactos?rev=26867&view=rev
Log: remove unnecessary NDEBUG definitions. freeldr has it's own debugging system. Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c trunk/reactos/boot/freeldr/freeldr/cache/cache.c trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/disk/partition.c trunk/reactos/boot/freeldr/freeldr/drivemap.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c trunk/reactos/boot/freeldr/freeldr/fs/iso.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c trunk/reactos/boot/freeldr/freeldr/inifile/parse.c trunk/reactos/boot/freeldr/freeldr/linuxboot.c trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/mm/mm.c trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/registry.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c trunk/reactos/boot/freeldr/freeldr/windows/conversion.c trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c (original) +++ trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> // Returns a pointer to a CACHE_BLOCK structure Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cache/cache.c (original) +++ trunk/reactos/boot/freeldr/freeldr/cache/cache.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> /////////////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> #undef UNIMPLEMENTED Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> BOOLEAN DiskGetActivePartitionEntry(ULONG DriveNumber, Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/drive…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/drivemap.c (original) +++ trunk/reactos/boot/freeldr/freeldr/drivemap.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> #ifdef __i386__ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> VOID BootMain(LPSTR CmdLine) Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> GEOMETRY Ext2DiskGeometry; // Ext2 file system disk geometry Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> ULONG BytesPerSector; /* Number of bytes per sector */ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> ///////////////////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> ///////////////////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/is…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> #define SECTORSIZE 2048 Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Tue May 22 15:00:00 2007 @@ -24,8 +24,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> PNTFS_BOOTSECTOR NtfsBootSector; Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> BOOLEAN IniOpenSection(PCSTR SectionName, ULONG* SectionId) Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/parse.c (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/parse.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> PINI_SECTION IniFileSectionListHead = NULL; Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c Tue May 22 15:00:00 2007 @@ -19,8 +19,6 @@ #include <freeldr.h> - -#define NDEBUG #include <debug.h> #ifdef __i386__ Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> #ifdef DBG Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> ULONG AllocationCount = 0; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Tue May 22 15:00:00 2007 @@ -21,8 +21,6 @@ #include <freeldr.h> #include <cmlib.h> - -#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Tue May 22 15:00:00 2007 @@ -20,8 +20,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> ROS_LOADER_PARAMETER_BLOCK LoaderBlock; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Tue May 22 15:00:00 2007 @@ -19,8 +19,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> static FRLDRHKEY RootKey; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Tue May 22 15:00:00 2007 @@ -20,8 +20,6 @@ #define _NTSYSTEM_ #include <freeldr.h> - -#define NDEBUG #include <debug.h> ROS_LOADER_PARAMETER_BLOCK LoaderBlock; Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c Tue May 22 15:00:00 2007 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> Modified: trunk/reactos/boot/freeldr/freeldr/windows/conversion.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/conversion.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/conversion.c Tue May 22 15:00:00 2007 @@ -11,8 +11,6 @@ #include <freeldr.h> //#include <ndk/ldrtypes.h> - -#define NDEBUG #include <debug.h> /* FUNCTIONS **************************************************************/ Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c Tue May 22 15:00:00 2007 @@ -15,8 +15,6 @@ /* INCLUDES ***************************************************************/ #include <freeldr.h> - -#define NDEBUG #include <debug.h> /* FUNCTIONS **************************************************************/ Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Tue May 22 15:00:00 2007 @@ -22,8 +22,6 @@ #include <freeldr.h> #include <ndk/ldrtypes.h> - -//#define NDEBUG #include <debug.h> //FIXME: Do a better way to retrieve Arc disk information Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Tue May 22 15:00:00 2007 @@ -11,8 +11,6 @@ #include <freeldr.h> #include <ndk/asm.h> - -#define NDEBUG #include <debug.h> extern ULONG TotalNLSSize; Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Tue May 22 15:00:00 2007 @@ -9,8 +9,6 @@ /* INCLUDES ***************************************************************/ #include <freeldr.h> - -#define NDEBUG #include <debug.h> // The only global var here, used to mark mem pages as NLS in WinLdrTurnOnPaging()
17 years, 7 months
1
0
0
0
[mbosma] 26866: Fix another typo.
by mbosma@svn.reactos.org
Author: mbosma Date: Tue May 22 14:58:27 2007 New Revision: 26866 URL:
http://svn.reactos.org/svn/reactos?rev=26866&view=rev
Log: Fix another typo. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd…
============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c Tue May 22 14:58:27 2007 @@ -33,7 +33,7 @@ } #endif - if(hwnd && IsWindow(hwnd)) + if(hwnd && !IsWindow(hwnd)) return DDERR_INVALIDPARAMS; /* Tests suggest that we need one of them: */
17 years, 7 months
1
0
0
0
[mbosma] 26865: Fix a typo and improve a test.
by mbosma@svn.reactos.org
Author: mbosma Date: Tue May 22 14:57:53 2007 New Revision: 26865 URL:
http://svn.reactos.org/svn/reactos?rev=26865&view=rev
Log: Fix a typo and improve a test. Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create…
============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Tue May 22 14:57:53 2007 @@ -119,12 +119,12 @@ /* Here we go */ DWORD dwNumCodes, *lpCodes; - TEST (DirectDraw->GetFourCCCodes(NULL, NULL) == DDERR_INVALIDPARAMS); - TEST ( DirectDraw->GetFourCCCodes(NULL, lpCodes) == DDERR_INVALIDPARAMS ); + TEST (DirectDraw->GetFourCCCodes(NULL, (PDWORD)0xdeadbeef) == DDERR_INVALIDPARAMS); TEST (DirectDraw->GetFourCCCodes(&dwNumCodes, NULL) == DD_OK && dwNumCodes); lpCodes = (PDWORD)HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)*dwNumCodes); *lpCodes = 0; + TEST ( DirectDraw->GetFourCCCodes(NULL, lpCodes) == DDERR_INVALIDPARAMS ); TEST (DirectDraw->GetFourCCCodes(&dwNumCodes, lpCodes) == DD_OK && *lpCodes ); DirectDraw->Release(); Modified: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create…
============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp Tue May 22 14:57:53 2007 @@ -22,7 +22,7 @@ if (DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL) != DD_OK) { - printf("ERROR: you not set cooperative level\n"); + printf("ERROR: Could not set cooperative level\n"); DirectDraw->Release(); return 0; } @@ -207,4 +207,4 @@ DirectDraw->Release(); return TRUE; -} +}
17 years, 7 months
1
0
0
0
[greatlrd] 26864: Fixing another memory crash bug this time for GetFourCCCodes
by greatlrd@svn.reactos.org
Author: greatlrd Date: Tue May 22 14:46:17 2007 New Revision: 26864 URL:
http://svn.reactos.org/svn/reactos?rev=26864&view=rev
Log: Fixing another memory crash bug this time for GetFourCCCodes Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd…
============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Tue May 22 14:46:17 2007 @@ -11,6 +11,9 @@ #include "rosdraw.h" +/* PSEH for SEH Support */ +#include <pseh/pseh.h> + HRESULT WINAPI Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface, REFIID id, @@ -150,26 +153,33 @@ DX_WINDBG_trace(); - /* FIXME protect with SEH or something else if lpCodes or lpNumCodes for bad user pointers */ - EnterCriticalSection(&ddcs); - - if(!lpNumCodes) - { - retVal = DDERR_INVALIDPARAMS; - } - else - { - if ((lpCodes) && (*lpCodes)) - { - memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)* min(This->lpLcl->lpGbl->dwNumFourCC, *lpNumCodes)); - } - else - { - *lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC; - } - } - - LeaveCriticalSection(&ddcs); + + // EnterCriticalSection(&ddcs); + + _SEH_TRY + { + if(IsBadWritePtr(lpNumCodes,sizeof(LPDWORD))) + { + retVal = DDERR_INVALIDPARAMS; + } + else + { + if(!IsBadWritePtr(lpCodes,sizeof(LPDWORD))) + { + memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)* min(This->lpLcl->lpGbl->dwNumFourCC, *lpNumCodes)); + } + else + { + *lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC; + } + } + } + _SEH_HANDLE + { + } + _SEH_END; + + //LeaveCriticalSection(&ddcs); return retVal; } Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb…
============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Tue May 22 14:46:17 2007 @@ -16,6 +16,7 @@ <library>user32</library> <library>advapi32</library> <library>msvcrt</library> + <library>pseh</library> <file>ddraw.rc</file> <file>main.c</file>
17 years, 7 months
1
0
0
0
[hpoussin] 26863: Add installation path for VMware 6.0
by hpoussin@svn.reactos.org
Author: hpoussin Date: Tue May 22 14:40:57 2007 New Revision: 26863 URL:
http://svn.reactos.org/svn/reactos?rev=26863&view=rev
Log: Add installation path for VMware 6.0 Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst…
============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.c (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.c Tue May 22 14:40:57 2007 @@ -42,6 +42,7 @@ static WCHAR DestinationDriversPath[MAX_PATH+1]; static WCHAR CDDrive = L'\0'; +static WCHAR PathToVideoDrivers60[MAX_PATH+1] = L"X:\\program files\\VMWare\\VMWare Tools\\Drivers\\video\\2k\\32bit\\"; static WCHAR PathToVideoDrivers55[MAX_PATH+1] = L"X:\\program files\\VMware\\VMware Tools\\Drivers\\video\\winnt2k\\32Bit\\"; static WCHAR PathToVideoDrivers45[MAX_PATH+1] = L"X:\\program files\\VMware\\VMware Tools\\Drivers\\video\\winnt2k\\"; static WCHAR PathToVideoDrivers40[MAX_PATH+1] = L"X:\\video\\winnt2k\\"; @@ -164,9 +165,12 @@ if(GetDriveType(Drive) == DRIVE_CDROM) { #endif + PathToVideoDrivers60[0] = Current; PathToVideoDrivers55[0] = Current; PathToVideoDrivers40[0] = Current; PathToVideoDrivers45[0] = Current; + if(SetCurrentDirectory(PathToVideoDrivers60)) + SrcPath = PathToVideoDrivers60; if(SetCurrentDirectory(PathToVideoDrivers55)) SrcPath = PathToVideoDrivers55; else if(SetCurrentDirectory(PathToVideoDrivers45))
17 years, 7 months
1
0
0
0
[gedmurphy] 26862: turn debugging off
by gedmurphy@svn.reactos.org
Author: gedmurphy Date: Tue May 22 14:17:07 2007 New Revision: 26862 URL:
http://svn.reactos.org/svn/reactos?rev=26862&view=rev
Log: turn debugging off Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service…
============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Tue May 22 14:17:07 2007 @@ -14,8 +14,7 @@ #include <advapi32.h> -//#define NDEBUG -#undef NDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS *****************************************************************/
17 years, 7 months
1
0
0
0
[gedmurphy] 26861: - fix the release build for Colin. - clean up formatting of a file I was playing with.
by gedmurphy@svn.reactos.org
Author: gedmurphy Date: Tue May 22 03:12:16 2007 New Revision: 26861 URL:
http://svn.reactos.org/svn/reactos?rev=26861&view=rev
Log: - fix the release build for Colin. - clean up formatting of a file I was playing with. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/include/debug.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Tue May 22 03:12:16 2007 @@ -19,8 +19,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> BOOLEAN AcpiPresent = FALSE; @@ -28,49 +26,49 @@ static BOOLEAN FindAcpiBios(VOID) { - PUCHAR Ptr; + PUCHAR Ptr; - /* Find the 'Root System Descriptor Table Pointer' */ - Ptr = (PUCHAR)0xE0000; - while ((ULONG)Ptr < 0x100000) + /* Find the 'Root System Descriptor Table Pointer' */ + Ptr = (PUCHAR)0xE0000; + while ((ULONG)Ptr < 0x100000) { - if (!memcmp(Ptr, "RSD PTR ", 8)) - { - DbgPrint((DPRINT_HWDETECT, "ACPI supported\n")); + if (!memcmp(Ptr, "RSD PTR ", 8)) + { + DbgPrint((DPRINT_HWDETECT, "ACPI supported\n")); - return TRUE; - } + return TRUE; + } - Ptr = (PUCHAR)((ULONG)Ptr + 0x10); + Ptr = (PUCHAR)((ULONG)Ptr + 0x10); } - DbgPrint((DPRINT_HWDETECT, "ACPI not supported\n")); + DbgPrint((DPRINT_HWDETECT, "ACPI not supported\n")); - return FALSE; + return FALSE; } VOID DetectAcpiBios(FRLDRHKEY SystemKey, ULONG *BusNumber) { - WCHAR Buffer[80]; - FRLDRHKEY BiosKey; - LONG Error; + WCHAR Buffer[80]; + FRLDRHKEY BiosKey; + LONG Error; - if (FindAcpiBios()) + if (FindAcpiBios()) { - AcpiPresent = TRUE; - /* Create new bus key */ - swprintf(Buffer, - L"MultifunctionAdapter\\%u", *BusNumber); - Error = RegCreateKey(SystemKey, - Buffer, - &BiosKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } + AcpiPresent = TRUE; + /* Create new bus key */ + swprintf(Buffer, + L"MultifunctionAdapter\\%u", *BusNumber); + Error = RegCreateKey(SystemKey, + Buffer, + &BiosKey); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); + return; + } #if 0 /* Set 'Component Information' */ @@ -80,20 +78,20 @@ 0xFFFFFFFF); #endif - /* Increment bus number */ - (*BusNumber)++; + /* Increment bus number */ + (*BusNumber)++; - /* Set 'Identifier' value */ - Error = RegSetValue(BiosKey, - L"Identifier", - REG_SZ, - (PCHAR)L"ACPI BIOS", - 10 * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - return; - } + /* Set 'Identifier' value */ + Error = RegSetValue(BiosKey, + L"Identifier", + REG_SZ, + (PCHAR)L"ACPI BIOS", + 10 * sizeof(WCHAR)); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); + return; + } } } Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h Tue May 22 03:12:16 2007 @@ -35,15 +35,16 @@ #define DPRINT_HWDETECT 0x00000400 // OR this with DebugPrintMask to enable hardware detection messages #define DPRINT_WINDOWS 0x00000800 // OR this with DebugPrintMask to enable messages from Windows loader +VOID DebugPrint(ULONG Mask, char *format, ...); + #ifdef DBG VOID DebugInit(VOID); - VOID DebugPrint(ULONG Mask, char *format, ...); VOID DebugPrint1(char *format, ...); VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length); #define DbgPrint(_x_) DebugPrint _x_ ; - #define DPRINT1 DebugPrint1 + #define DPRINT1 DebugPrint1 #define BugCheck(_x_) { DebugPrint(DPRINT_WARNING, "Fatal Error: %s:%d(%s)\n", __FILE__, __LINE__, __FUNCTION__); DebugPrint _x_ ; for (;;); } #define DbgDumpBuffer(_x_, _y_, _z_) DebugDumpBuffer(_x_, _y_, _z_) @@ -77,7 +78,7 @@ #else #define DebugInit() - #define DbgPrint(_x_) { if (0) DebugPrint _x_; } + #define DbgPrint(_x_) { if (0) DebugPrint _x_; } #define DPRINT1(_x_) { if (0) printf _x_; } #define BugCheck(_x_) #define DbgDumpBuffer(_x_, _y_, _z_)
17 years, 7 months
1
0
0
0
[greatlrd] 26860: Fixing another memory crash bug this time for GetFourCCCodes
by greatlrd@svn.reactos.org
Author: greatlrd Date: Tue May 22 00:51:55 2007 New Revision: 26860 URL:
http://svn.reactos.org/svn/reactos?rev=26860&view=rev
Log: Fixing another memory crash bug this time for GetFourCCCodes Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd…
============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Tue May 22 00:51:55 2007 @@ -146,28 +146,31 @@ Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD lpNumCodes, LPDWORD lpCodes) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + HRESULT retVal = DD_OK; + DX_WINDBG_trace(); /* FIXME protect with SEH or something else if lpCodes or lpNumCodes for bad user pointers */ EnterCriticalSection(&ddcs); - if(!lpNumCodes) - { - LeaveCriticalSection(&ddcs); - return DDERR_INVALIDPARAMS; - } - - if(lpCodes) - { - memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)* min(This->lpLcl->lpGbl->dwNumFourCC, *lpNumCodes)); - } - else - { - *lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC; - } + if(!lpNumCodes) + { + retVal = DDERR_INVALIDPARAMS; + } + else + { + if ((lpCodes) && (*lpCodes)) + { + memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)* min(This->lpLcl->lpGbl->dwNumFourCC, *lpNumCodes)); + } + else + { + *lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC; + } + } LeaveCriticalSection(&ddcs); - return DD_OK; + return retVal; } HRESULT WINAPI Modified: trunk/reactos/dll/directx/ddraw/startup.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.…
============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Tue May 22 00:51:55 2007 @@ -188,7 +188,7 @@ if (reenable == FALSE) { - if (This->lpLink == NULL) + if ((!IsBadReadPtr(This->lpLink,sizeof(LPDIRECTDRAW))) && (This->lpLink == NULL)) { RtlZeroMemory(&ddgbl, sizeof(DDRAWI_DIRECTDRAW_GBL)); This->lpLcl->lpGbl->dwRefCnt++; @@ -470,6 +470,8 @@ // FIXME Close DX fristcall and second call return DD_FALSE; } + + DX_STUB_str("Here\n"); /* Alloc mpFourCC */ mpFourCC = NULL;
17 years, 7 months
1
0
0
0
[greatlrd] 26859: hacking so we manger only create one directdraw interface, the linked code for create one is offline.
by greatlrd@svn.reactos.org
Author: greatlrd Date: Tue May 22 00:25:23 2007 New Revision: 26859 URL:
http://svn.reactos.org/svn/reactos?rev=26859&view=rev
Log: hacking so we manger only create one directdraw interface, the linked code for create one is offline. Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.…
============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Tue May 22 00:25:23 2007 @@ -36,6 +36,8 @@ This = (LPDDRAWI_DIRECTDRAW_INT)*pIface; +#if 0 + /* fixme linking too second link when we shall not doing it */ if (IsBadReadPtr(This,sizeof(LPDIRECTDRAW))) { DX_STUB_str("1. no linking\n"); @@ -76,7 +78,7 @@ } /* step 2 check if it not DDCREATE_HARDWAREONLY we got if so we fail */ - if (pGUID != (LPGUID)DDCREATE_HARDWAREONLY) + if ((pGUID) && (pGUID != (LPGUID)DDCREATE_HARDWAREONLY)) { if (pGUID !=NULL) { @@ -100,6 +102,29 @@ This = newThis; } +#else + /* FIXME HACK linking does not working we need figout why */ + LPDDRAWI_DIRECTDRAW_INT memThis; + + memThis = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); + This = memThis; + if (This == NULL) + { + if (memThis != NULL) + DxHeapMemFree(memThis); + + DX_STUB_str("DDERR_OUTOFMEMORY"); + return DDERR_OUTOFMEMORY; + } + + /* Fixme release memory alloc if we fail */ + This->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); + if (This->lpLcl == NULL) + { + DX_STUB_str("DDERR_OUTOFMEMORY"); + return DDERR_OUTOFMEMORY; + } +#endif This->lpLcl->lpGbl = &ddgbl; @@ -172,19 +197,20 @@ ddgbl.lpDDCBtmp = (LPDDHAL_CALLBACKS) DxHeapMemAlloc(sizeof(DDHAL_CALLBACKS)); if (ddgbl.lpDDCBtmp == NULL) { - DX_STUB_str("Out of memmory"); + DX_STUB_str("Out of memmory\n"); return DD_FALSE; } } } } - DX_STUB_str("here"); + DX_STUB_str("here\n"); if (reenable == FALSE) { if (lpGuid == NULL) { + DX_STUB_str("lpGuid == NULL\n"); devicetypes= 1; /* Create HDC for default, hal and hel driver */ @@ -195,6 +221,8 @@ RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7); RtlCopyMemory(&ddgbl.cDriverName,&"DISPLAY",7); dwFlags |= DDRAWI_DISPLAYDRV | DDRAWI_GDIDRV; + + } else if (lpGuid == (LPGUID) DDCREATE_HARDWAREONLY) { @@ -234,7 +262,7 @@ if ( (HDC)This->lpLcl->hDC == NULL) { - DX_STUB_str("DDERR_OUTOFMEMORY"); + DX_STUB_str("DDERR_OUTOFMEMORY\n"); return DDERR_OUTOFMEMORY ; } } @@ -262,11 +290,13 @@ hel_ret = StartDirectDrawHel(iface, reenable); } + DX_STUB_str("return\n"); + if (hal_ret!=DD_OK) { if (hel_ret!=DD_OK) { - DX_STUB_str("DDERR_NODIRECTDRAWSUPPORT"); + DX_STUB_str("DDERR_NODIRECTDRAWSUPPORT\n"); return DDERR_NODIRECTDRAWSUPPORT; } dwFlags |= DDRAWI_NOHARDWARE; @@ -453,8 +483,10 @@ return DD_FALSE; } } + DX_STUB_str("Here\n"); /* Alloc mpTextures */ +#if 0 mpTextures = NULL; if (mD3dDriverData.dwNumTextureFormats > 0) { @@ -466,7 +498,11 @@ // FIXME Close DX fristcall and second call } } +#else + mpTextures = NULL; +#endif + DX_STUB_str("Here\n"); /* Get all basic data from the driver */ if (!DdQueryDirectDrawObject( @@ -502,6 +538,8 @@ This->lpLcl->lpGbl->dwNumModes = mHALInfo.dwNumModes; This->lpLcl->lpGbl->lpModeInfo = mHALInfo.lpModeInfo; + DX_STUB_str("Here\n"); + /* FIXME convert mpTextures to DDHALMODEINFO */ // DxHeapMemFree( mpTextures); @@ -520,5 +558,6 @@ return DD_FALSE; } + DX_STUB_str("Return DD_OK\n"); return DD_OK; }
17 years, 7 months
1
0
0
0
← Newer
1
...
4
5
6
7
8
9
10
...
33
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
Results per page:
10
25
50
100
200