Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[dreimer] 27127: Prettify Dr-Fred's Tool a bit
by dreimer＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: dreimer Date: Sun Jun 10 23:53:45 2007 New Revision: 27127 URL: http://svn.reactos.org/svn/reactos?rev=27127&view=rev Log: Prettify Dr-Fred's Tool a bit Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Sun Jun 10 23:53:45 2007 @@ -1,20 +1,20 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 304, 220 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "RosBE Einstellungen" FONT 8, "MS Shell Dlg" { // x, pos_hight, width, hight - LTEXT "Reactos Build Environment Einstellungen", 0x0, 15, 12, 114, 13 - LTEXT "Schriftfarbe", 0x0, 12, 45, 114, 13 - COMBOBOX IDC_FONT, 100, 45, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Hintergrundfarbe", 0x0, 12, 81, 114, 13 - COMBOBOX IDC_BACK, 100, 81, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 123, 110, 21 - CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 123, 60, 21 - EDITTEXT ID_LOGDIR, 34, 140, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSE, 250, 140, 32, 13, WS_TABSTOP - PUSHBUTTON "Speichern", ID_OK, 92, 191, 59, 26, WS_TABSTOP - PUSHBUTTON "Abbrechen", ID_CANCEL, 162, 191, 59, 26, WS_TABSTOP + LTEXT "Reactos Build Environment Einstellungen", 0x0, 10, 10, 130, 13 + LTEXT "Schriftfarbe", 0x0, 10, 35, 114, 13 + COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Hintergrundfarbe", 0x0, 10, 70, 114, 13 + COMBOBOX IDC_BACK, 100, 70, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 90, 110, 21 + CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 60, 21 + EDITTEXT ID_LOGDIR, 25, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSE, 230, 120, 30, 13, WS_TABSTOP + PUSHBUTTON "Speichern", ID_OK, 92, 160, 59, 26, WS_TABSTOP + PUSHBUTTON "Abbrechen", ID_CANCEL, 162, 160, 59, 26, WS_TABSTOP } Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Sun Jun 10 23:53:45 2007 @@ -1,20 +1,20 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 304, 220 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "RosBE Settings" FONT 8, "MS Shell Dlg" { // x, pos_hight, width, hight - LTEXT "Reactos Build Environment Settings", 0x0, 15, 12, 114, 13 - LTEXT "Font Color", 0x0, 12, 45, 114, 13 - COMBOBOX IDC_FONT, 100, 45, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Background Color", 0x0, 12, 81, 114, 13 - COMBOBOX IDC_BACK, 100, 81, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 123, 110, 21 - CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 123, 60, 21 - EDITTEXT ID_LOGDIR, 34, 140, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSE, 250, 140, 32, 13, WS_TABSTOP - PUSHBUTTON "Save", ID_OK, 92, 191, 59, 26, WS_TABSTOP - PUSHBUTTON "Cancel", ID_CANCEL, 162, 191, 59, 26, WS_TABSTOP + LTEXT "Reactos Build Environment Settings", 0x0, 10, 10, 130, 13 + LTEXT "Font Color", 0x0, 10, 35, 114, 13 + COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Background Color", 0x0, 10, 70, 114, 13 + COMBOBOX IDC_BACK, 100, 70, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 90, 110, 21 + CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 60, 21 + EDITTEXT ID_LOGDIR, 25, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSE, 230, 120, 30, 13, WS_TABSTOP + PUSHBUTTON "Save", ID_OK, 92, 160, 59, 26, WS_TABSTOP + PUSHBUTTON "Cancel", ID_CANCEL, 162, 160, 59, 26, WS_TABSTOP }

1 0

[dreimer] 27126: - Updated Changelog. (makex readded) - Updated License to include all new Tools. - Updated Readme.
by dreimer＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: dreimer Date: Sun Jun 10 23:24:23 2007 New Revision: 27126 URL: http://svn.reactos.org/svn/reactos?rev=27126&view=rev Log: - Updated Changelog. (makex readded) - Updated License to include all new Tools. - Updated Readme. Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE-Windows/Root/README.txt Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Sun Jun 10 23:24:23 2007 @@ -2,6 +2,7 @@ - Added a SVN Client - Added a Build Configurator. +- Readded makex. If theres a Bug in Vista, it's a GCC Bug. *** May 21th, 2007 - RosBE 0.3.6 Released Modified: trunk/tools/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/LICENSE.t… ============================================================================== --- trunk/tools/RosBE-Windows/Root/LICENSE.txt (original) +++ trunk/tools/RosBE-Windows/Root/LICENSE.txt Sun Jun 10 23:24:23 2007 @@ -12,6 +12,16 @@ - tee is licensed under the GPLv2. - test is licensed under the GPLv2 or later. + +- cut is licensed under the GPLv2 or later. + +- grep is licensed under the GPLv2 or later. + +- sed is licensed under the GPLv2 or later. + +- pcre is licensed under the GPLv2 or later. + +- svn is licensed under the Apache/BSD-style open source license. - libiconv is licensed under the LGPLv2. Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Sun Jun 10 23:24:23 2007 @@ -1,4 +1,4 @@ - ReactOS Build Environment 0.3.7 +ReactOS Build Environment 0.3.7 The ReactOS Build Environment v0.3.7 contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. @@ -45,6 +45,9 @@ The GnuWin32 Project (tee/test/sed/cut/grep and their dependencies were obtained here) http://gnuwin32.sourceforge.net/ -Inspired by blight's ReactOS Build Environment v0.2-3.4.4 +Subversion Client +http://subversion.tigris.org/ + +Inspired by blight's ReactOS Build Environment v0.2-3.4.5 Inspired by Dazzle from TinyKRNL (http://www.tinykrnl.org/) Icon made by ROSFan

1 0

[dreimer] 27125: - Remove the need of a config.rbuild in the RosBE tree. Just copy the one of ReactOS Tree at first use. - Update Help to really help on the new commands - Add cut/grep to info.txt - Update a Setup Phrase to show that you don't need a Tree before you install.
by dreimer＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: dreimer Date: Sun Jun 10 23:08:35 2007 New Revision: 27125 URL: http://svn.reactos.org/svn/reactos?rev=27125&view=rev Log: - Remove the need of a config.rbuild in the RosBE tree. Just copy the one of ReactOS Tree at first use. - Update Help to really help on the new commands - Add cut/grep to info.txt - Update a Setup Phrase to show that you don't need a Tree before you install. Removed: trunk/tools/RosBE-Windows/Tools/config.rbuild Modified: trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/RosSourceDir.ini trunk/tools/RosBE-Windows/Tools/info.txt Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Jun 10 23:08:35 2007 @@ -6,8 +6,29 @@ title ReactOS Build Configurator -cd "" +if not exist "%ROSBEBASEDIR%\Tools\config.rbuild" ( + copy "%_ROSSOURCEDIR%\config.template.rbuild" "%ROSBEBASEDIR%\Tools\config.rbuild" +) +if "%1" == "delete" ( + del %_ROSSOURCEDIR%\config.rbuild + del %ROSBEBASEDIR%\Tools\config.rbuild + goto :NOK +) + +echo WARNING: +echo Non-Default-Configurations are not useable for pasteing Bugs to Bugzilla +echo or asking quesions about in Forum/Chat! +echo. +echo DID YOU UNDERSTAND? + +SET /P XY=(yes), (no) + +if /I "%XY%"=="yes" goto :OK +if /I "%XY%"=="no" goto :NOK +goto :NOK + +:OK echo Architecture to build for. Not Editable. echo. echo Right now @@ -122,5 +143,6 @@ del %ROSBEBASEDIR%\Tools\*.rbuild copy %ROSBEBASEDIR%\Tools\config.tmp %ROSBEBASEDIR%\Tools\config.rbuild del %ROSBEBASEDIR%\Tools\*.tmp -copy %ROSBEBASEDIR%\Tools\config.rbuild _ROSSOURCEDIR\config.rbuild -cd.. +copy %ROSBEBASEDIR%\Tools\config.rbuild %_ROSSOURCEDIR%\config.rbuild + +:NOK Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Sun Jun 10 23:08:35 2007 @@ -21,15 +21,15 @@ echo specific command. echo svn [OPTIONS] - Create, Update or clean up your ReactOS Source echo tree. - echo config - Configures the way, ReactOS will be built. - echo + echo config [OPTIONS]- Configures the way, ReactOS will be built. + echo. echo basedir - Switch back to the ReactOS source directory. goto :EOF ) if "%1" == "make" ( echo Usage: make [OPTIONS] echo make, without options does a standard build of ReactOS. OPTIONS - echo are the standard ReactOS build options ie. bootcd. + echo are the standard ReactOS build options ie. bootcd, livecd, etc. goto :EOF ) if "%1" == "makex" ( @@ -56,6 +56,15 @@ if "%1" == "svn" ( echo Usage: svn [OPTIONS] echo Creates, Updates or cleans up your ReactOS Source tree. + echo update - Updates to HEAD Revision. + echo create - Creates a new ReactOS Tree. + echo cleanup - Cleans up and fixes errors in Tree. + goto :EOF +) +if "%1" == "config" ( + echo Usage: config [OPTIONS] + echo Creates a Configuration File, which tells RosBE how to build the Tree. + echo delete - Deletes the configuration File and so sets back to default goto :EOF ) if "%1" == "basedir" ( Modified: trunk/tools/RosBE-Windows/RosSourceDir.ini URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosSourceDir.i… ============================================================================== --- trunk/tools/RosBE-Windows/RosSourceDir.ini (original) +++ trunk/tools/RosBE-Windows/RosSourceDir.ini Sun Jun 10 23:08:35 2007 @@ -19,7 +19,7 @@ [Field 3] Type=Label -Text=Select the directory where the ReactOS sources are located. This directory is required for the RosBE to work correctly. If you accept the default here then you must modify the shortcut (The 'Start in:' field) in the start menu later to point to the ReactOS source directory. +Text=Select the directory where the ReactOS sources are located or will be checked out to later. This directory is required for the RosBE to work correctly. If you accept the default here then you must modify the shortcut (The 'Start in:' field) in the start menu later to point to the ReactOS source directory. Left=0 Right=-1 Top=6 Removed: trunk/tools/RosBE-Windows/Tools/config.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config.r… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config.rbuild (original) +++ trunk/tools/RosBE-Windows/Tools/config.rbuild (removed) @@ -1,16 +1,0 @@ -<?xml version="1.0"?> -<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - -<property name="ARCH" value="i386" /> -<property name="SARCH" value="" /> -<property name="OARCH" value="pentium" /> -<property name="OPTIMIZE" value="1" /> -<property name="MP" value="0" /> -<property name="KDBG" value="0" /> -<property name="DBG" value="1" /> -<property name="GDB" value="0" /> -<property name="NSWPAT" value="0" /> -<property name="NTLPC" value="1" /> -<property name="_WINKD_" value="0" /> - -</rbuild> Modified: trunk/tools/RosBE-Windows/Tools/info.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/info.txt… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/info.txt (original) +++ trunk/tools/RosBE-Windows/Tools/info.txt Sun Jun 10 23:08:35 2007 @@ -1,11 +1,14 @@ Additional Tools needed: tee: http://gnuwin32.sourceforge.net/packages/coreutils.htm test: http://gnuwin32.sourceforge.net/packages/coreutils.htm +cut: http://gnuwin32.sourceforge.net/packages/coreutils.htm sed: http://gnuwin32.sourceforge.net/packages/sed.htm +grep: http://gnuwin32.sourceforge.net/packages/grep.htm svn: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 Additional Libs needed: LibIntl: http://gnuwin32.sourceforge.net/packages/libintl.htm LibIconv: http://gnuwin32.sourceforge.net/packages/libiconv.htm +Pcre: http://gnuwin32.sourceforge.net/packages/pcre.htm Built Tools and Rest needs to be copied to /Root/Tools/

1 0

[mbosma] 27124: Tests BltBatch and GetBltStatus
by mbosma＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: mbosma Date: Sun Jun 10 22:19:46 2007 New Revision: 27124 URL: http://svn.reactos.org/svn/reactos?rev=27124&view=rev Log: Tests BltBatch and GetBltStatus Added: trunk/rostests/dxtest/ddraw/Surface/blt.cpp (with props) Modified: trunk/rostests/dxtest/ddraw/testlist.cpp Added: trunk/rostests/dxtest/ddraw/Surface/blt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/Surface/blt.… ============================================================================== --- trunk/rostests/dxtest/ddraw/Surface/blt.cpp (added) +++ trunk/rostests/dxtest/ddraw/Surface/blt.cpp Sun Jun 10 22:19:46 2007 @@ -1,0 +1,72 @@ + +DWORD GetPixel (LPDIRECTDRAWSURFACE7 Surface, UINT x, UINT y) +{ + DWORD ret; + RECT rect = {x, y, x+1, y+1}; + DDSURFACEDESC2 desc = {0}; + desc.dwSize = sizeof(DDSURFACEDESC2); + + if(Surface->Lock(&rect, &desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL)) + { + printf("ERROR: Unable to lock surface\n"); + return 0xdeadbeef; + } + + ret = *((DWORD *)desc.lpSurface); + + if(Surface->Unlock (&rect) != DD_OK) + { + printf("ERROR: Unable to unlock surface ?!\n"); + } + + return ret; +} + +VOID GetBltStatus_Test (LPDIRECTDRAWSURFACE7 Surface, INT* passed, INT* failed) +{ + TEST (Surface->GetBltStatus(0) == DDERR_INVALIDPARAMS); + TEST (Surface->GetBltStatus(DDGBS_CANBLT) == DD_OK); + TEST (Surface->GetBltStatus(DDGBS_ISBLTDONE) == DD_OK); + + // Lock Surface + DDSURFACEDESC2 desc = {0}; + desc.dwSize = sizeof(DDSURFACEDESC2); + Surface->Lock(NULL, &desc, DDLOCK_WAIT, NULL); + TEST (Surface->GetBltStatus(DDGBS_ISBLTDONE) == DD_OK); + TEST (Surface->GetBltStatus(DDGBS_CANBLT) == DD_OK); // does not return DDERR_SURFACEBUSY for me as msdn says (xp,nvidea) - mbosma + Surface->Unlock (NULL); + + // Try to produce busy surface by filling it 500 times + DDBLTFX bltfx; + bltfx.dwSize = sizeof(DDBLTFX); + bltfx.dwFillColor = RGB(0, 0, 0); + + int i; + for(i=0; i<500; i++) + Surface->Blt(NULL, NULL, NULL, DDBLT_COLORFILL, &bltfx); + + TEST (Surface->GetBltStatus(DDGBS_ISBLTDONE) == DDERR_WASSTILLDRAWING); + TEST (Surface->GetBltStatus(DDGBS_CANBLT) == DD_OK); +} + +BOOL Test_Blt (INT* passed, INT* failed) +{ + LPDIRECTDRAWSURFACE7 Surface; + if(!CreateSurface(&Surface)) + return FALSE; + + // Test GetPixel (needs Lock API) + DDBLTFX bltfx; + bltfx.dwSize = sizeof(DDBLTFX); + bltfx.dwFillColor = RGB(0, 0, 0); + Surface->Blt(NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &bltfx); + if(GetPixel(Surface, 0, 0) != RGB(0, 0, 0)) + return FALSE; + + // The tests + TEST(Surface->BltBatch(NULL, 0, 0) == DDERR_UNSUPPORTED); + GetBltStatus_Test (Surface, passed, failed); + + Surface->Release(); + return TRUE; +} Propchange: trunk/rostests/dxtest/ddraw/Surface/blt.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/Surface/blt.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/rostests/dxtest/ddraw/testlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp… ============================================================================== --- trunk/rostests/dxtest/ddraw/testlist.cpp (original) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Sun Jun 10 22:19:46 2007 @@ -10,6 +10,7 @@ #include "DDraw/available_mem.cpp" #include "Surface/create.cpp" #include "Surface/private_data.cpp" +#include "Surface/blt.cpp" #include "Surface/misc.cpp" /* The List of tests */ @@ -22,6 +23,7 @@ { "IDirectDraw: GetFourCC", Test_GetFourCCCodes }, { "IDirectDraw: Cooperative Levels", Test_SetCooperativeLevel }, { "IDirectDrawSurface: Creation", Test_CreateSurface }, + { "IDirectDrawSurface: Blting", Test_Blt }, { "IDirectDrawSurface: Private Data", Test_PrivateData }, { "IDirectDrawSurface: Miscellaneous Tests", Test_Misc }, };

1 0

[dreimer] 27123: Final Work today: - Added a nice Readme in PDF Format, based on Colin's - Started a Updated Changelog - Moved Basic Config.rbuild to the right Folder
by dreimer＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: dreimer Date: Sun Jun 10 22:03:00 2007 New Revision: 27123 URL: http://svn.reactos.org/svn/reactos?rev=27123&view=rev Log: Final Work today: - Added a nice Readme in PDF Format, based on Colin's - Started a Updated Changelog - Moved Basic Config.rbuild to the right Folder Added: trunk/tools/RosBE-Windows/Root/readme.pdf (with props) trunk/tools/RosBE-Windows/Tools/config.rbuild Removed: trunk/tools/RosBE-Windows/Root/config.rbuild Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Sun Jun 10 22:03:00 2007 @@ -1,3 +1,8 @@ +*** Juni 21th, 2007 - RosBE 0.3.7 Released + +- Added a SVN Client +- Added a Build Configurator. + *** May 21th, 2007 - RosBE 0.3.6 Released - Updated: now using GCC 4.1.3 snapshot (20070405) Removed: trunk/tools/RosBE-Windows/Root/config.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/config.rb… ============================================================================== --- trunk/tools/RosBE-Windows/Root/config.rbuild (original) +++ trunk/tools/RosBE-Windows/Root/config.rbuild (removed) @@ -1,16 +1,0 @@ -<?xml version="1.0"?> -<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - -<property name="ARCH" value="i386" /> -<property name="SARCH" value="" /> -<property name="OARCH" value="pentium" /> -<property name="OPTIMIZE" value="1" /> -<property name="MP" value="0" /> -<property name="KDBG" value="0" /> -<property name="DBG" value="1" /> -<property name="GDB" value="0" /> -<property name="NSWPAT" value="0" /> -<property name="NTLPC" value="1" /> -<property name="_WINKD_" value="0" /> - -</rbuild> Added: trunk/tools/RosBE-Windows/Root/readme.pdf URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/readme.pd… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE-Windows/Root/readme.pdf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE-Windows/Tools/config.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config.r… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config.rbuild (added) +++ trunk/tools/RosBE-Windows/Tools/config.rbuild Sun Jun 10 22:03:00 2007 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + +<property name="ARCH" value="i386" /> +<property name="SARCH" value="" /> +<property name="OARCH" value="pentium" /> +<property name="OPTIMIZE" value="1" /> +<property name="MP" value="0" /> +<property name="KDBG" value="0" /> +<property name="DBG" value="1" /> +<property name="GDB" value="0" /> +<property name="NSWPAT" value="0" /> +<property name="NTLPC" value="1" /> +<property name="_WINKD_" value="0" /> + +</rbuild>

1 0

[dreimer] 27122: OK. And this should make it possible to run it in RosBE, not just in a nice Test Folder.
by dreimer＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: dreimer Date: Sun Jun 10 21:46:13 2007 New Revision: 27122 URL: http://svn.reactos.org/svn/reactos?rev=27122&view=rev Log: OK. And this should make it possible to run it in RosBE, not just in a nice Test Folder. Modified: trunk/tools/RosBE-Windows/Root/Config.cmd Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Jun 10 21:46:13 2007 @@ -6,32 +6,34 @@ title ReactOS Build Configurator +cd "" + echo Architecture to build for. Not Editable. -echo +echo. echo Right now -grep \"ARCH\" config.rbuild|cut -d "\"" -f 4 -echo +call "%ROSBEBASEDIR%\Tools\grep.exe" \"ARCH\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 +echo. echo Sub-architecture to build for. echo Default is: none -echo +echo. echo Right now -grep \"SARCH\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"SARCH\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P X= (), (xbox) -sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" config.rbuild > config2.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" %ROSBEBASEDIR%\Tools\config.rbuild > %ROSBEBASEDIR%\Tools\config2.rbuild cls echo Which CPU ReactOS should be optimized for. -echo +echo. echo Examples: i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp, echo athlon-mp, k6-2 echo See GCC manual for more CPU names and which CPUs GCC can optimize for. echo Default is: pentium -echo +echo. echo Right now -grep \"OARCH\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"OARCH\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P XX= -sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" config2.rbuild > config21.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" %ROSBEBASEDIR%\Tools\config2.rbuild > %ROSBEBASEDIR%\Tools\config21.rbuild cls echo What level do you want ReactOS to be optimized at. @@ -40,68 +42,68 @@ echo 1 = Normal compiling. Recommended, it is default setting in echo official build and debug build. echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. -echo +echo. echo Right now -grep \"OPTIMIZE\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"OPTIMIZE\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P Y= (0), (1), (2), (3), (4), (5) -sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" config21.rbuild > config3.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" %ROSBEBASEDIR%\Tools\config21.rbuild > %ROSBEBASEDIR%\Tools\config3.rbuild cls echo Whether to compile for an uniprocessor or multiprocessor machine. echo Default is: 0 -echo +echo. echo Right now -grep \"MP\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"MP\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P Z= (0), (1) -sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" config3.rbuild > config4.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" %ROSBEBASEDIR%\Tools\config3.rbuild > %ROSBEBASEDIR%\Tools\config4.rbuild cls echo Whether to compile in the integrated kernel debugger. echo Default is: 0 -echo +echo. echo Right now -grep \"KDBG\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"KDBG\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P A= (0), (1) -sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" config4.rbuild > config5.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" %ROSBEBASEDIR%\Tools\config4.rbuild > %ROSBEBASEDIR%\Tools\config5.rbuild cls echo Whether to compile for debugging. No compiler optimizations will be echo performed. echo Default is: 1 -echo +echo. echo Right now -grep \"DBG\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"DBG\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P B= (0), (1) -sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" config5.rbuild > config6.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" %ROSBEBASEDIR%\Tools\config5.rbuild > %ROSBEBASEDIR%\Tools\config6.rbuild cls echo Whether to compile for debugging with GDB. If you don't use GDB, don't echo enable this. echo Default is: 0 -echo +echo. echo Right now -grep \"GDB\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"GDB\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P C= (0), (1) -sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" config6.rbuild > config7.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" %ROSBEBASEDIR%\Tools\config6.rbuild > %ROSBEBASEDIR%\Tools\config7.rbuild cls echo Whether to compile apps/libs with features covered software patents or not. echo If you live in a country where software patents are valid/apply, don't echo enable this (except they/you purchased a license from the patent owner). echo Default is: 0 -echo +echo. echo Right now -grep \"NSWPAT\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"NSWPAT\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P D= (0), (1) -sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" config7.rbuild > config8.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" %ROSBEBASEDIR%\Tools\config7.rbuild > %ROSBEBASEDIR%\Tools\config8.rbuild cls echo Whether to compile with NT-compatible LPC Semantics. This should always be 1. -echo +echo. echo Right now -grep \"NTLPC\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"NTLPC\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P E= (0), (1) -sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" config8.rbuild > config9.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" %ROSBEBASEDIR%\Tools\config8.rbuild > %ROSBEBASEDIR%\Tools\config9.rbuild cls echo Whether to compile with the KD protocol. This will disable support for KDBG @@ -110,13 +112,15 @@ echo TinyKRNL. Booting into debug mode with this flag enabled will result in a echo failure to enter GUI mode. Do not enable unless you know what you're doing. echo Default is: 0 -echo +echo. echo Right now -grep \"_WINKD_\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"_WINKD_\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P F= (0), (1) -sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" config9.rbuild > config10.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" %ROSBEBASEDIR%\Tools\config9.rbuild > %ROSBEBASEDIR%\Tools\config10.rbuild -copy config10.rbuild config.tmp -del *.rbuild -copy config.tmp config.rbuild -del *.tmp +copy %ROSBEBASEDIR%\Tools\config10.rbuild %ROSBEBASEDIR%\Tools\config.tmp +del %ROSBEBASEDIR%\Tools\*.rbuild +copy %ROSBEBASEDIR%\Tools\config.tmp %ROSBEBASEDIR%\Tools\config.rbuild +del %ROSBEBASEDIR%\Tools\*.tmp +copy %ROSBEBASEDIR%\Tools\config.rbuild _ROSSOURCEDIR\config.rbuild +cd..

1 0

[dreimer] 27121: - Header Modification in SVN.cmd - Configurator reaches Beta Stadium. Hopefully no bugs are left.
by dreimer＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: dreimer Date: Sun Jun 10 21:16:04 2007 New Revision: 27121 URL: http://svn.reactos.org/svn/reactos?rev=27121&view=rev Log: - Header Modification in SVN.cmd - Configurator reaches Beta Stadium. Hopefully no bugs are left. Modified: trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/SVN.cmd Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Jun 10 21:16:04 2007 @@ -1,64 +1,116 @@ +:: Copyright (c) Daniel Reimer. All rights reserved. +:: +:: A Basic Config.rbuild Creator for ReactOS. +:: @echo off -echo ARCH +title ReactOS Build Configurator + +echo Architecture to build for. Not Editable. +echo echo Right now grep \"ARCH\" config.rbuild|cut -d "\"" -f 4 +echo -echo SARCH +echo Sub-architecture to build for. +echo Default is: none +echo echo Right now grep \"SARCH\" config.rbuild|cut -d "\"" -f 4 SET /P X= (), (xbox) sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" config.rbuild > config2.rbuild +cls -echo OARCH +echo Which CPU ReactOS should be optimized for. +echo +echo Examples: i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp, +echo athlon-mp, k6-2 +echo See GCC manual for more CPU names and which CPUs GCC can optimize for. +echo Default is: pentium +echo echo Right now grep \"OARCH\" config.rbuild|cut -d "\"" -f 4 SET /P XX= -sed "s/\"OARCH\" value=\"\"/\"OARCH\" value=\"%X%\"/g" config2.rbuild > config21.rbuild +sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" config2.rbuild > config21.rbuild +cls -echo OPTIMIZE +echo What level do you want ReactOS to be optimized at. +echo this setting does not work if GDB is set +echo 0 = off +echo 1 = Normal compiling. Recommended, it is default setting in +echo official build and debug build. +echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. +echo echo Right now grep \"OPTIMIZE\" config.rbuild|cut -d "\"" -f 4 SET /P Y= (0), (1), (2), (3), (4), (5) sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" config21.rbuild > config3.rbuild +cls -echo MP +echo Whether to compile for an uniprocessor or multiprocessor machine. +echo Default is: 0 +echo echo Right now grep \"MP\" config.rbuild|cut -d "\"" -f 4 SET /P Z= (0), (1) sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" config3.rbuild > config4.rbuild +cls -echo KDBG +echo Whether to compile in the integrated kernel debugger. +echo Default is: 0 +echo echo Right now grep \"KDBG\" config.rbuild|cut -d "\"" -f 4 SET /P A= (0), (1) sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" config4.rbuild > config5.rbuild +cls -echo DBG +echo Whether to compile for debugging. No compiler optimizations will be +echo performed. +echo Default is: 1 +echo echo Right now grep \"DBG\" config.rbuild|cut -d "\"" -f 4 SET /P B= (0), (1) sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" config5.rbuild > config6.rbuild +cls -echo GDB +echo Whether to compile for debugging with GDB. If you don't use GDB, don't +echo enable this. +echo Default is: 0 +echo echo Right now grep \"GDB\" config.rbuild|cut -d "\"" -f 4 SET /P C= (0), (1) sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" config6.rbuild > config7.rbuild +cls -echo NSWPAT +echo Whether to compile apps/libs with features covered software patents or not. +echo If you live in a country where software patents are valid/apply, don't +echo enable this (except they/you purchased a license from the patent owner). +echo Default is: 0 +echo echo Right now grep \"NSWPAT\" config.rbuild|cut -d "\"" -f 4 SET /P D= (0), (1) sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" config7.rbuild > config8.rbuild +cls -echo NTLPC +echo Whether to compile with NT-compatible LPC Semantics. This should always be 1. +echo echo Right now grep \"NTLPC\" config.rbuild|cut -d "\"" -f 4 SET /P E= (0), (1) sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" config8.rbuild > config9.rbuild +cls -echo _WINKD_ +echo Whether to compile with the KD protocol. This will disable support for KDBG +echo as well as rossym and symbol lookups, and allow WinDBG to connect to ReactOS. +echo This is currently not fully working, and requires kdcom from Windows 2003 or +echo TinyKRNL. Booting into debug mode with this flag enabled will result in a +echo failure to enter GUI mode. Do not enable unless you know what you're doing. +echo Default is: 0 +echo echo Right now grep \"_WINKD_\" config.rbuild|cut -d "\"" -f 4 SET /P F= (0), (1) Modified: trunk/tools/RosBE-Windows/Root/SVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/SVN.cmd?r… ============================================================================== --- trunk/tools/RosBE-Windows/Root/SVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/SVN.cmd Sun Jun 10 21:16:04 2007 @@ -1,6 +1,6 @@ -:: Copyright (c) Peter Ward and Daniel Reimer. All rights reserved. +:: Copyright (c) Daniel Reimer. All rights reserved. :: -:: SVN Client +:: Integrated SVN Client :: @echo off

1 0

[hpoussin] 27120: Fill HardwareDatabase, DriverStart and DriverSize fields before calling init routine
by hpoussin＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: hpoussin Date: Sun Jun 10 20:15:16 2007 New Revision: 27120 URL: http://svn.reactos.org/svn/reactos?rev=27120&view=rev Log: Fill HardwareDatabase, DriverStart and DriverSize fields before calling init routine Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sun Jun 10 20:15:16 2007 @@ -806,6 +806,8 @@ IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, IN PUNICODE_STRING RegistryPath, + IN PVOID DllBase, + IN ULONG SizeOfImage, OUT PDRIVER_OBJECT *pDriverObject); VOID Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Sun Jun 10 20:15:16 2007 @@ -411,24 +411,25 @@ RtlInitUnicodeString(&DriverName, NameBuffer); DPRINT("Driver name: '%wZ'\n", &DriverName); - Status = IopCreateDriver(&DriverName, DriverEntry, &RegistryKey, &Driver); } else - { - Status = IopCreateDriver(NULL, DriverEntry, &RegistryKey, &Driver); - } + DriverName.Length = 0; + + Status = IopCreateDriver( + DriverName.Length > 0 ? &DriverName : NULL, + DriverEntry, + &RegistryKey, + ModuleObject->DllBase, + ModuleObject->SizeOfImage, + &Driver); RtlFreeUnicodeString(&RegistryKey); *DriverObject = Driver; if (!NT_SUCCESS(Status)) { - DPRINT1("IopCreateDriver() failed (Status 0x%08lx)\n", Status); + DPRINT("IopCreateDriver() failed (Status 0x%08lx)\n", Status); return Status; } - - Driver->HardwareDatabase = &IopHardwareDatabaseKey; - Driver->DriverStart = ModuleObject->DllBase; - Driver->DriverSize = ModuleObject->SizeOfImage; /* Set the driver as initialized */ Driver->Flags |= DRVO_INITIALIZED; @@ -1093,6 +1094,8 @@ IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, IN PUNICODE_STRING RegistryPath, + IN PVOID DllBase, + IN ULONG SizeOfImage, OUT PDRIVER_OBJECT *pDriverObject) { WCHAR NameBuffer[100]; @@ -1225,6 +1228,10 @@ /* Close the extra handle */ ZwClose(hDriver); + DriverObject->HardwareDatabase = &IopHardwareDatabaseKey; + DriverObject->DriverStart = DllBase; + DriverObject->DriverSize = SizeOfImage; + /* Finally, call its init function */ DPRINT("RegistryKey: %wZ\n", RegistryKey); DPRINT("Calling driver entrypoint at %p\n", InitializationFunction); @@ -1256,7 +1263,7 @@ IN PDRIVER_INITIALIZE InitializationFunction) { PDRIVER_OBJECT DriverObject; - return IopCreateDriver(DriverName, InitializationFunction, NULL, &DriverObject); + return IopCreateDriver(DriverName, InitializationFunction, NULL, 0, 0, &DriverObject); } /* Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Sun Jun 10 20:15:16 2007 @@ -2022,7 +2022,6 @@ DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); } - DPRINT("Sending IRP_MN_QUERY_DEVICE_TEXT.DeviceTextDescription to device stack\n"); Stack.Parameters.QueryDeviceText.DeviceTextType = DeviceTextDescription; @@ -2275,7 +2274,7 @@ if (!NT_SUCCESS(Status)) { /* FIXME: Log the error */ - DPRINT1("Could not retrieve configuration for device %wZ (Status 0x%08x)\n", + DPRINT("Could not retrieve configuration for device %wZ (Status 0x%08x)\n", &DeviceNode->InstancePath, Status); IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); return STATUS_SUCCESS; @@ -2297,7 +2296,7 @@ return STATUS_SUCCESS; } - DPRINT1("Got Service %S\n", Service->Buffer); + DPRINT("Got Service %S\n", Service->Buffer); } return STATUS_SUCCESS; @@ -3315,7 +3314,7 @@ * Create root device node */ - Status = IopCreateDriver(NULL, PnpDriverInitializeEmpty, NULL, &IopRootDriverObject); + Status = IopCreateDriver(NULL, PnpDriverInitializeEmpty, NULL, 0, 0, &IopRootDriverObject); if (!NT_SUCCESS(Status)) { CPRINT("IoCreateDriverObject() failed\n");

1 0

[dreimer] 27119: Basic Config.rbuild Editor is ready. OARCH is not editable yet.
by dreimer＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: dreimer Date: Sun Jun 10 19:34:40 2007 New Revision: 27119 URL: http://svn.reactos.org/svn/reactos?rev=27119&view=rev Log: Basic Config.rbuild Editor is ready. OARCH is not editable yet. Modified: trunk/tools/RosBE-Windows/Root/Config.cmd Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Jun 10 19:34:40 2007 @@ -1,20 +1,70 @@ -sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\%1"\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%1\"/g" config.rbuild > config2.rbuild +@echo off -grep SARCH config.rbuild|cut -d "\"" -f 4 -grep OARCH config.rbuild|cut -d "\"" -f 4 -grep OPTIMIZE config.rbuild|cut -d "\"" -f 4 -grep MP config.rbuild|cut -d "\"" -f 4 -grep KDBG config.rbuild|cut -d "\"" -f 4 -grep DBG config.rbuild|cut -d "\"" -f 4 -grep GDB config.rbuild|cut -d "\"" -f 4 -grep NSWPAT config.rbuild|cut -d "\"" -f 4 -grep NTLPC config.rbuild|cut -d "\"" -f 4 -grep _WINKD_ config.rbuild|cut -d "\"" -f 4 +echo ARCH +echo Right now +grep \"ARCH\" config.rbuild|cut -d "\"" -f 4 + +echo SARCH +echo Right now +grep \"SARCH\" config.rbuild|cut -d "\"" -f 4 +SET /P X= (), (xbox) +sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" config.rbuild > config2.rbuild + +echo OARCH +echo Right now +grep \"OARCH\" config.rbuild|cut -d "\"" -f 4 +SET /P XX= +sed "s/\"OARCH\" value=\"\"/\"OARCH\" value=\"%X%\"/g" config2.rbuild > config21.rbuild + +echo OPTIMIZE +echo Right now +grep \"OPTIMIZE\" config.rbuild|cut -d "\"" -f 4 +SET /P Y= (0), (1), (2), (3), (4), (5) +sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" config21.rbuild > config3.rbuild + +echo MP +echo Right now +grep \"MP\" config.rbuild|cut -d "\"" -f 4 +SET /P Z= (0), (1) +sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" config3.rbuild > config4.rbuild + +echo KDBG +echo Right now +grep \"KDBG\" config.rbuild|cut -d "\"" -f 4 +SET /P A= (0), (1) +sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" config4.rbuild > config5.rbuild + +echo DBG +echo Right now +grep \"DBG\" config.rbuild|cut -d "\"" -f 4 +SET /P B= (0), (1) +sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" config5.rbuild > config6.rbuild + +echo GDB +echo Right now +grep \"GDB\" config.rbuild|cut -d "\"" -f 4 +SET /P C= (0), (1) +sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" config6.rbuild > config7.rbuild + +echo NSWPAT +echo Right now +grep \"NSWPAT\" config.rbuild|cut -d "\"" -f 4 +SET /P D= (0), (1) +sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" config7.rbuild > config8.rbuild + +echo NTLPC +echo Right now +grep \"NTLPC\" config.rbuild|cut -d "\"" -f 4 +SET /P E= (0), (1) +sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" config8.rbuild > config9.rbuild + +echo _WINKD_ +echo Right now +grep \"_WINKD_\" config.rbuild|cut -d "\"" -f 4 +SET /P F= (0), (1) +sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" config9.rbuild > config10.rbuild + +copy config10.rbuild config.tmp +del *.rbuild +copy config.tmp config.rbuild +del *.tmp

1 0

[mbosma] 27118: Some clean up
by mbosma＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: mbosma Date: Sun Jun 10 18:43:48 2007 New Revision: 27118 URL: http://svn.reactos.org/svn/reactos?rev=27118&view=rev Log: Some clean up Added: trunk/rostests/dxtest/ddraw/DDraw/available_mem.cpp (with props) Modified: trunk/rostests/dxtest/ddraw/DDraw/create.cpp trunk/rostests/dxtest/ddraw/DDraw/display_modes.cpp trunk/rostests/dxtest/ddraw/testlist.cpp Added: trunk/rostests/dxtest/ddraw/DDraw/available_mem.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/availa… ============================================================================== --- trunk/rostests/dxtest/ddraw/DDraw/available_mem.cpp (added) +++ trunk/rostests/dxtest/ddraw/DDraw/available_mem.cpp Sun Jun 10 18:43:48 2007 @@ -1,0 +1,269 @@ + +BOOL Test_GetAvailableVidMem (INT* passed, INT* failed) +{ + LPDIRECTDRAW7 DirectDraw; + + /* Preparations */ + if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) + { + printf("ERROR: Failed to set up ddraw\n"); + return FALSE; + } + + /* Here we go */ + DWORD Total, Free; + DDSCAPS2 Caps = { 0 }; + + TEST (DirectDraw->GetAvailableVidMem(&Caps, NULL, NULL) == DDERR_INVALIDPARAMS); + TEST (DirectDraw->GetAvailableVidMem(NULL, &Total, &Free) == DDERR_INVALIDPARAMS); + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + /* testing caps */ + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_RESERVED1; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_ALPHA; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_BACKBUFFER; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_COMPLEX; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_FLIP; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_FRONTBUFFER; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_OVERLAY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_PALETTE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_PRIMARYSURFACE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_RESERVED3; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_SYSTEMMEMORY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_TEXTURE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_3DDEVICE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_VIDEOMEMORY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_VISIBLE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_WRITEONLY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_ZBUFFER; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_OWNDC; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_LIVEVIDEO; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_HWCODEC; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_MODEX; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_MIPMAP; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_RESERVED2; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_ALLOCONLOAD; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_VIDEOPORT; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_LOCALVIDMEM; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_NONLOCALVIDMEM; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = 0x01; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_RESERVED4; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_HINTDYNAMIC; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_HINTSTATIC; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_TEXTUREMANAGE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_RESERVED1; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_RESERVED2; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_OPAQUE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_HINTANTIALIASING; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_CUBEMAP; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEX; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEX; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEZ; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEZ; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_MIPMAPSUBLEVEL; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_D3DTEXTUREMANAGE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_DONOTPERSIST; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_STEREOSURFACELEFT; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_VOLUME; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_NOTUSERLOCKABLE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_POINTS; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_RTPATCHES; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_NPATCHES; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_RESERVED3; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_DISCARDBACKBUFFER; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_ENABLEALPHACHANNEL; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_EXTENDEDFORMATPRIMARY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_ADDITIONALPRIMARY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps3 = ~(DDSCAPS3_MULTISAMPLE_QUALITY_MASK | DDSCAPS3_MULTISAMPLE_MASK | DDSCAPS3_RESERVED1 | DDSCAPS3_RESERVED2 | DDSCAPS3_LIGHTWEIGHTMIPMAP | DDSCAPS3_AUTOGENMIPMAP | DDSCAPS3_DMAP); + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps3 = (DDSCAPS3_MULTISAMPLE_QUALITY_MASK | DDSCAPS3_MULTISAMPLE_MASK | DDSCAPS3_RESERVED1 | DDSCAPS3_RESERVED2 | DDSCAPS3_LIGHTWEIGHTMIPMAP | DDSCAPS3_AUTOGENMIPMAP | DDSCAPS3_DMAP); + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps4 = 1; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS ); + + DirectDraw->Release(); + + return TRUE; +} Propchange: trunk/rostests/dxtest/ddraw/DDraw/available_mem.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/DDraw/available_mem.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/rostests/dxtest/ddraw/DDraw/create.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/create… ============================================================================== --- trunk/rostests/dxtest/ddraw/DDraw/create.cpp (original) +++ trunk/rostests/dxtest/ddraw/DDraw/create.cpp Sun Jun 10 18:43:48 2007 @@ -79,276 +79,6 @@ return TRUE; } -BOOL Test_GetAvailableVidMem (INT* passed, INT* failed) -{ - LPDIRECTDRAW7 DirectDraw; - - /* Preparations */ - if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) - { - printf("ERROR: Failed to set up ddraw\n"); - return FALSE; - } - - /* Here we go */ - DWORD Total, Free; - DDSCAPS2 Caps = { 0 }; - - TEST (DirectDraw->GetAvailableVidMem(&Caps, NULL, NULL) == DDERR_INVALIDPARAMS); - TEST (DirectDraw->GetAvailableVidMem(NULL, &Total, &Free) == DDERR_INVALIDPARAMS); - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - - /* testing caps */ - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_RESERVED1; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_ALPHA; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_BACKBUFFER; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_COMPLEX; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_FLIP; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_FRONTBUFFER; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_OVERLAY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_PALETTE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_PRIMARYSURFACE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_RESERVED3; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_SYSTEMMEMORY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_TEXTURE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_3DDEVICE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_VIDEOMEMORY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_VISIBLE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_WRITEONLY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_ZBUFFER; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_OWNDC; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_LIVEVIDEO; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_HWCODEC; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_MODEX; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_MIPMAP; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_RESERVED2; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_ALLOCONLOAD; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_VIDEOPORT; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_LOCALVIDMEM; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_NONLOCALVIDMEM; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = 0x01; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RESERVED4; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_HINTDYNAMIC; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_HINTSTATIC; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_TEXTUREMANAGE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RESERVED1; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RESERVED2; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_OPAQUE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_HINTANTIALIASING; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEX; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEX; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEZ; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEZ; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_MIPMAPSUBLEVEL; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_D3DTEXTUREMANAGE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_DONOTPERSIST; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_STEREOSURFACELEFT; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_VOLUME; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_NOTUSERLOCKABLE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_POINTS; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RTPATCHES; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_NPATCHES; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RESERVED3; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_DISCARDBACKBUFFER; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_ENABLEALPHACHANNEL; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_EXTENDEDFORMATPRIMARY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_ADDITIONALPRIMARY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps3 = ~(DDSCAPS3_MULTISAMPLE_QUALITY_MASK | DDSCAPS3_MULTISAMPLE_MASK | DDSCAPS3_RESERVED1 | DDSCAPS3_RESERVED2 | DDSCAPS3_LIGHTWEIGHTMIPMAP | DDSCAPS3_AUTOGENMIPMAP | DDSCAPS3_DMAP); - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps3 = (DDSCAPS3_MULTISAMPLE_QUALITY_MASK | DDSCAPS3_MULTISAMPLE_MASK | DDSCAPS3_RESERVED1 | DDSCAPS3_RESERVED2 | DDSCAPS3_LIGHTWEIGHTMIPMAP | DDSCAPS3_AUTOGENMIPMAP | DDSCAPS3_DMAP); - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps4 = 1; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS ); - - DirectDraw->Release(); - - return TRUE; -} - BOOL Test_GetFourCCCodes (INT* passed, INT* failed) { LPDIRECTDRAW7 DirectDraw; @@ -381,8 +111,6 @@ DDDEVICEIDENTIFIER2 pDDDI; //OLECHAR GuidStr[100]; - - /* Preparations */ if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) { @@ -393,7 +121,6 @@ TEST ( DirectDraw->GetDeviceIdentifier(NULL, 0) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->GetDeviceIdentifier(NULL, ~DDGDI_GETHOSTIDENTIFIER) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->GetDeviceIdentifier(NULL, DDGDI_GETHOSTIDENTIFIER) == DDERR_INVALIDPARAMS ); - memset(&pDDDI,0,sizeof(DDDEVICEIDENTIFIER2)); TEST ( DirectDraw->GetDeviceIdentifier(&pDDDI, 0) == DD_OK ); Modified: trunk/rostests/dxtest/ddraw/DDraw/display_modes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/displa… ============================================================================== --- trunk/rostests/dxtest/ddraw/DDraw/display_modes.cpp (original) +++ trunk/rostests/dxtest/ddraw/DDraw/display_modes.cpp Sun Jun 10 18:43:48 2007 @@ -4,6 +4,8 @@ INT* failed; LPDIRECTDRAW7 DirectDraw; } ENUMCONTEXT; + +BOOL Test_GetMonitorFrequency (INT* passed, INT* failed); HRESULT CALLBACK DummyEnumDisplayModes( LPDDSURFACEDESC2 pDDSD, ENUMCONTEXT* Context ) { @@ -53,6 +55,8 @@ /* The Test */ + Test_GetMonitorFrequency(passed, failed); + /* First try with some generic display modes */ TEST ( DirectDraw->SetDisplayMode (1586, 895, 0, 0, 0) == DDERR_UNSUPPORTED ); TEST ( DirectDraw->SetDisplayMode (0, 0, 0, 0, 0x123) == DDERR_INVALIDPARAMS ); @@ -62,7 +66,6 @@ TEST ( DirectDraw->SetDisplayMode (800, 600, 0, 0, 0) == DD_OK ); TEST ( DirectDraw->SetDisplayMode (0, 0, 16, 0, 0) == DD_OK ); - TEST ( DirectDraw->GetMonitorFrequency (NULL) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->GetDisplayMode (NULL) == DDERR_INVALIDPARAMS ); DDSURFACEDESC2 DisplayMode = {0}; TEST ( DirectDraw->GetDisplayMode (&DisplayMode) == DDERR_INVALIDPARAMS ); @@ -78,10 +81,8 @@ DirectDraw->Release(); - return TRUE; } - BOOL Test_GetMonitorFrequency (INT* passed, INT* failed) { @@ -103,29 +104,24 @@ TEST (DirectDraw->GetMonitorFrequency((PDWORD)0xdeadbeef) == DDERR_INVALIDPARAMS); TEST (DirectDraw->GetMonitorFrequency(NULL) == DDERR_INVALIDPARAMS); - /* This test depns on which graphice card you have */ + // result depends on our graphices card retVal = DirectDraw->GetMonitorFrequency((PDWORD)&lpFreq); + TEST ( retVal == DD_OK || retVal == DDERR_UNSUPPORTED); - if ( retVal == DDERR_UNSUPPORTED) - { - retVal = DD_OK; - } - TEST ( retVal == DD_OK); + /* Test by hacking interal structures */ - /* hacking testing */ - - /* shall return DDERR_UNSUPPORTED */ + // should return DDERR_UNSUPPORTED This->lpLcl->lpGbl->dwMonitorFrequency = 0; TEST (DirectDraw->GetMonitorFrequency(&temp) == DDERR_UNSUPPORTED); - /* shall return DD_OK */ + // should return DD_OK This->lpLcl->lpGbl->dwMonitorFrequency = 85; TEST (DirectDraw->GetMonitorFrequency(&temp) == DD_OK); - /* restore */ + /* Restore */ This->lpLcl->lpGbl->dwMonitorFrequency = lpFreq; DirectDraw->Release(); return TRUE; -} +} Modified: trunk/rostests/dxtest/ddraw/testlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp… ============================================================================== --- trunk/rostests/dxtest/ddraw/testlist.cpp (original) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Sun Jun 10 18:43:48 2007 @@ -7,6 +7,7 @@ /* include the tests */ #include "DDraw/create.cpp" #include "DDraw/display_modes.cpp" +#include "DDraw/available_mem.cpp" #include "Surface/create.cpp" #include "Surface/private_data.cpp" #include "Surface/misc.cpp" @@ -16,7 +17,6 @@ { { "IDirectDraw: COM Stuff", Test_CreateDDraw }, { "IDirectDraw: GetDeviceIdentifier", Test_GetDeviceIdentifier }, - { "IDirectDraw: Display Frequency", Test_GetMonitorFrequency }, { "IDirectDraw: Display Modes", Test_DisplayModes }, { "IDirectDraw: Available Video Memory", Test_GetAvailableVidMem }, { "IDirectDraw: GetFourCC", Test_GetFourCCCodes },

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2007