Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 27093: start implement of GetDeviceIdentifier we are filling one more member right. this time we getting the driver name
by greatlrd＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: greatlrd Date: Sun Jun 10 00:22:09 2007 New Revision: 27093 URL: http://svn.reactos.org/svn/reactos?rev=27093&view=rev Log: start implement of GetDeviceIdentifier we are filling one more member right. this time we getting the driver name Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.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 Sun Jun 10 00:22:09 2007 @@ -458,6 +458,9 @@ BOOL found = FALSE; DWORD iDevNum = 0; DISPLAY_DEVICEA DisplayDeviceA; + HKEY hKey; + DWORD lpType = 0; + DWORD strSize = MAX_DDDEVICEID_STRING; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; @@ -506,10 +509,36 @@ /* we found our driver now we start setup it */ strcpy( pDDDI->szDescription, DisplayDeviceA.DeviceString); + if (!_strnicmp(DisplayDeviceA.DeviceKey,"\\REGISTRY\\Machine\\",18)) + { + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, &DisplayDeviceA.DeviceKey[18], 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS ) + { + if (RegQueryValueExA(hKey, "InstalledDisplayDrivers",0, &lpType, (LPBYTE)pDDDI->szDriver, &strSize) == ERROR_SUCCESS) + { + char *pdest; + /* FIXME if the file is name + ati2dvag.dll.dll then we are doom + a better code should be use to strip away .dll + */ + pdest = strstr(pDDDI->szDriver,".dll"); + memset(pdest,0,3); + } + RegCloseKey(hKey); + } + retVal = DD_OK; + } + //else + //{ + // /* FIXME ?? */ + // DX_STUB_str("Error did not manger cut reg key\n" + // DX_STUB_str(DisplayDeviceA.DeviceKey); + //} + + /* This api still under devloping now we can get desc of the primary drv */ - retVal = DD_OK; + break; }

1 0

[hpoussin] 27092: Simplify method to call to DriverEntry of a driver
by hpoussin＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: hpoussin Date: Sun Jun 10 00:16:29 2007 New Revision: 27092 URL: http://svn.reactos.org/svn/reactos?rev=27092&view=rev Log: Simplify method to call to DriverEntry of a driver 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 00:16:29 2007 @@ -805,6 +805,7 @@ NTAPI IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, + IN PUNICODE_STRING RegistryPath, 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 00:16:29 2007 @@ -100,7 +100,7 @@ UNICODE_STRING DriverName; NTSTATUS Status; - DPRINT("IopOpenDriverObject(%p '%wZ' %x)\n", + DPRINT("IopGetDriverObject(%p '%wZ' %x)\n", DriverObject, ServiceName, FileSystem); *DriverObject = NULL; @@ -340,13 +340,6 @@ return Status; } -static NTSTATUS -NTAPI -IopDriverInitializeEmpty(IN struct _DRIVER_OBJECT *DriverObject, IN PUNICODE_STRING RegistryPath) -{ - return STATUS_SUCCESS; -} - /* * IopInitializeDriverModule * @@ -418,38 +411,24 @@ RtlInitUnicodeString(&DriverName, NameBuffer); DPRINT("Driver name: '%wZ'\n", &DriverName); - Status = IopCreateDriver(&DriverName, IopDriverInitializeEmpty, &Driver); + Status = IopCreateDriver(&DriverName, DriverEntry, &RegistryKey, &Driver); } else { - Status = IopCreateDriver(NULL, IopDriverInitializeEmpty, &Driver); - } + Status = IopCreateDriver(NULL, DriverEntry, &RegistryKey, &Driver); + } + RtlFreeUnicodeString(&RegistryKey); *DriverObject = Driver; if (!NT_SUCCESS(Status)) { - DPRINT("IopCreateDriver() failed (Status 0x%08lx)\n", Status); + DPRINT1("IopCreateDriver() failed (Status 0x%08lx)\n", Status); return Status; } Driver->HardwareDatabase = &IopHardwareDatabaseKey; Driver->DriverStart = ModuleObject->DllBase; Driver->DriverSize = ModuleObject->SizeOfImage; - - DPRINT("RegistryKey: %wZ\n", &RegistryKey); - DPRINT("Calling driver entrypoint at %08lx\n", DriverEntry); - - Status = DriverEntry(Driver, &RegistryKey); - - RtlFreeUnicodeString(&RegistryKey); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("DriverEntry() returned Status=0x%08X\n", Status); - ObMakeTemporaryObject(Driver); - ObDereferenceObject(Driver); - return Status; - } /* Set the driver as initialized */ Driver->Flags |= DRVO_INITIALIZED; @@ -1113,6 +1092,7 @@ NTAPI IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, + IN PUNICODE_STRING RegistryPath, OUT PDRIVER_OBJECT *pDriverObject) { WCHAR NameBuffer[100]; @@ -1246,7 +1226,9 @@ ZwClose(hDriver); /* Finally, call its init function */ - Status = (*InitializationFunction)(DriverObject, NULL); + DPRINT("RegistryKey: %wZ\n", RegistryKey); + DPRINT("Calling driver entrypoint at %p\n", InitializationFunction); + Status = (*InitializationFunction)(DriverObject, RegistryPath); if (!NT_SUCCESS(Status)) { /* If it didn't work, then kill the object */ @@ -1274,7 +1256,7 @@ IN PDRIVER_INITIALIZE InitializationFunction) { PDRIVER_OBJECT DriverObject; - return IopCreateDriver(DriverName, InitializationFunction, &DriverObject); + return IopCreateDriver(DriverName, InitializationFunction, NULL, &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 00:16:29 2007 @@ -3315,7 +3315,7 @@ * Create root device node */ - Status = IopCreateDriver(NULL, PnpDriverInitializeEmpty, &IopRootDriverObject); + Status = IopCreateDriver(NULL, PnpDriverInitializeEmpty, NULL, &IopRootDriverObject); if (!NT_SUCCESS(Status)) { CPRINT("IoCreateDriverObject() failed\n");

1 0

[dreimer] 27091: - Whitespace trim in cpucount.c - Added links to all needed Tools to info.txt - Fixed my own stupidness once more... parameters for make got skipped...
by dreimer＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: dreimer Date: Sun Jun 10 00:03:02 2007 New Revision: 27091 URL: http://svn.reactos.org/svn/reactos?rev=27091&view=rev Log: - Whitespace trim in cpucount.c - Added links to all needed Tools to info.txt - Fixed my own stupidness once more... parameters for make got skipped... Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Tools/cpucount.c trunk/tools/RosBE-Windows/Tools/info.txt Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Sun Jun 10 00:03:02 2007 @@ -11,7 +11,7 @@ :: if it is then abort the build and inform the user. :: if exist "%_ROSSOURCEDIR%\config.rbuild" ( - "%ROSBEBASEDIR%\Tools\test.exe" "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" + %ROSBEBASEDIR%\Tools\test.exe "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** @@ -26,16 +26,13 @@ :: Get the current date and time for use in :: in our build log's file name. :: -call %ROSBEBASEDIR%\TimeDate.cmd +call "%ROSBEBASEDIR%\TimeDate.cmd" :: -:: Execute the Build command +:: Now use mingw32-make to build ReactOS, passing along options, if any. :: -if "%1" == "" ( - %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% 2>&1 | %ROSBEBASEDIR%\Tools\tee.exe %_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt -) else ( - %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% %* 2>&1 | %ROSBEBASEDIR%\Tools\tee.exe %_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt -) + +call "%ROSBEBASEDIR%\Tools\buildtime.exe" %MAKE_COMMAND% 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" :: :: highlight the fact that building has ended Modified: trunk/tools/RosBE-Windows/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cpucount… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/cpucount.c (original) +++ trunk/tools/RosBE-Windows/Tools/cpucount.c Sun Jun 10 00:03:02 2007 @@ -29,4 +29,3 @@ return 1; } } - 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 00:03:02 2007 @@ -1,1 +1,11 @@ -Built Tools need to be copied to /Root/Tools/ +Additional Tools needed: +tee: http://gnuwin32.sourceforge.net/packages/coreutils.htm +test: http://gnuwin32.sourceforge.net/packages/coreutils.htm +sed: http://gnuwin32.sourceforge.net/packages/sed.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 + +Built Tools and Rest needs to be copied to /Root/Tools/

1 0

[hpoussin] 27090: Zero the full structure. Thanks Fireball
by hpoussin＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: hpoussin Date: Sat Jun 9 23:37:41 2007 New Revision: 27090 URL: http://svn.reactos.org/svn/reactos?rev=27090&view=rev Log: Zero the full structure. Thanks Fireball Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Sat Jun 9 23:37:41 2007 @@ -169,7 +169,7 @@ Status = STATUS_NO_MEMORY; goto cleanup; } - RtlZeroMemory(Device, sizeof(Device)); + RtlZeroMemory(Device, sizeof(PNPROOT_DEVICE)); if (!RtlCreateUnicodeString(&Device->DeviceID, DevicePath)) { Status = STATUS_NO_MEMORY;

1 0

[dreimer] 27089: Part 1 of X. Add Stuff for Version 0.3.7 - Basic SVN update/create/cleanup Feature (not final yet) - Readded makex, its not the fault of my Code, its a GCC Bug, so why not readd it?
by dreimer＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: dreimer Date: Sat Jun 9 23:31:30 2007 New Revision: 27089 URL: http://svn.reactos.org/svn/reactos?rev=27089&view=rev Log: Part 1 of X. Add Stuff for Version 0.3.7 - Basic SVN update/create/cleanup Feature (not final yet) - Readded makex, its not the fault of my Code, its a GCC Bug, so why not readd it? Added: trunk/tools/RosBE-Windows/Root/SVN.cmd Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/RosBE.mac 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 Sat Jun 9 23:31:30 2007 @@ -9,6 +9,9 @@ - New cool Icon. Thanks to ROSFan for it. - Readded buildtime. - Removed makex for now, until the bug is fixed. +- Added Colin Finck's Build.cmd Unification +- Added Ged Murphy's flash tool to letthe window flash at build's end +- Updated all other tools *** Janruary 26th, 2007 - RosBE 0.3.5b2 Released 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 Sat Jun 9 23:31:30 2007 @@ -4,7 +4,7 @@ :: @echo off -title ReactOS Build Environment 0.3.6 +title ReactOS Build Environment 0.3.7 if "%1" == "" ( echo. @@ -12,10 +12,15 @@ echo make [OPTIONS] - make, without options does a standard build of echo ReactOS. OPTIONS are the standard ReactOS build echo options ie. bootcd. + echo makex [OPTIONS] - Same as 'make' but automatically determines the + echo number of CPUs in the system and uses -j with + echo the appropriate number. echo clean [logs] - Fully clean the ReactOS source directory or the echo RosBE build logs. echo help [COMMAND] - Display the available commands or help on a echo specific command. + echo svn [OPTIONS] - Create, Update or clean up your ReactOS Source + echo tree. echo basedir - Switch back to the ReactOS source directory. goto :EOF ) @@ -25,15 +30,15 @@ echo are the standard ReactOS build options ie. bootcd. goto :EOF ) -:: if "%1" == "makex" ( -:: echo Usage: makex [OPTIONS] -:: echo Same as 'make' but automatically determines the number of CPUs -:: echo in the system and uses -j with the appropriate number. -:: echo NOTE: The number makex uses can be modified by editing -:: echo Build-Multi.cmd located in the RosBE directory, -:: echo instructions for doing so are contained within the file. -:: goto :EOF -:: ) +if "%1" == "makex" ( + echo Usage: makex [OPTIONS] + echo Same as 'make' but automatically determines the number of CPUs + echo in the system and uses -j with the appropriate number. + echo NOTE: The number makex uses can be modified by editing + echo Build-Multi.cmd located in the RosBE directory, + echo instructions for doing so are contained within the file. + goto :EOF +) if "%1" == "clean" ( echo Usage: clean [logs] echo Fully clean the ReactOS source directory. @@ -46,6 +51,11 @@ echo Shows help for the specified command or lists all available commands. goto :EOF ) +if "%1" == "svn" ( + echo Usage: svn [OPTIONS] + echo Creates, Updates or cleans up your ReactOS Source tree. + goto :EOF +) if "%1" == "basedir" ( echo Usage: basedir echo Switches back to the ReactOS source directory. 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 Sat Jun 9 23:31:30 2007 @@ -1,4 +1,4 @@ - ReactOS Build Environment v0.3.6 + ReactOS Build Environment v0.3.7 Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. (The complete text for each license is included in this document) 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 Sat Jun 9 23:31:30 2007 @@ -1,7 +1,7 @@ - ReactOS Build Environment 0.3.6 + ReactOS Build Environment 0.3.7 -The ReactOS Build Environment v0.3.6 contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. +The ReactOS Build Environment v0.3.7 contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. While installing the ReactOS Build Environment you are asked to provide the directory where your ReactOS sources are located (ie.reactos\), you must enter the complete path to them (ie. C:\projects\reactos). The path is now @@ -12,7 +12,7 @@ menu. Now you have a choice of using either the built in commands (which are displayed onscreen with information about their use) or you can build as you normally would using the standard MinGW/RBuild commands. -The ReactOS Build Environment v0.3.6 contains the following packages: +The ReactOS Build Environment v0.3.7 contains the following packages: binutils-2.17.50-20070122-1.tar.gz mingw-runtime-3.12.tar.gz Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Sat Jun 9 23:31:30 2007 @@ -5,7 +5,7 @@ :: @echo off -title ReactOS Build Environment 0.3.6 +title ReactOS Build Environment 0.3.7 if "%1" == "" ( color 0A @@ -73,7 +73,7 @@ echo ******************************************************************************* echo * * - echo * ReactOS Build Environment 0.3.6-4.1.3-20070405-prerelease-patched * + echo * ReactOS Build Environment 0.3.7-4.1.3-20070405-prerelease-patched * echo * * echo ******************************************************************************* echo. Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.mac Sat Jun 9 23:31:30 2007 @@ -1,4 +1,6 @@ BASEDIR = cd /d "%_ROSSOURCEDIR%" CLEAN = "%ROSBEBASEDIR%\Clean.cmd" $* +SVN = "%ROSBEBASEDIR%\SVN.cmd" $* HELP = "%ROSBEBASEDIR%\Help.cmd" $* MAKE = "%ROSBEBASEDIR%\Build.cmd" $* +MAKEX = "%ROSBEBASEDIR%\Build-Multi.cmd" $* Added: 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 (added) +++ trunk/tools/RosBE-Windows/Root/SVN.cmd Sat Jun 9 23:31:30 2007 @@ -1,0 +1,42 @@ +:: Copyright (c) Peter Ward and Daniel Reimer. All rights reserved. +:: +:: SVN Client +:: +@echo off + +:: +:: Execute the Build command +:: +if "%1" == "update" ( + title Updating... + %ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% %2 + goto :ExitSVN +) +if "%1" == "cleanup" ( + title Cleaning... + %ROSBEBASEDIR%\Tools\svn.exe cleanup %_ROSSOURCEDIR% + goto :ExitSVN +) +if "%1" == "create" ( + title Creating... +if not exist "%_ROSSOURCEDIR%\." ( + mkdir %_ROSSOURCEDIR% + goto :SVN +) +if exist "%_ROSSOURCEDIR%\.svn\." ( + echo Folder already cotains a Reposority. Exiting + goto :ExitSVN +) +if exist "%_ROSSOURCEDIR%\*.*" ( + echo Folder is not empty. Continuing is dangerous and can cause errors. + goto :SVN +) +) + +:SVN +%ROSBEBASEDIR%\Tools\svn.exe checkout svn://svn.reactos.org/reactos/trunk/reactos %_ROSSOURCEDIR% +goto :ExitSVN + +:ExitSVN +title ReactOS Build Environment 0.3.7 +pause

1 0

[greatlrd] 27088: start implement of GetDeviceIdentifier we are filling one member right.
by greatlrd＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: greatlrd Date: Sat Jun 9 21:24:32 2007 New Revision: 27088 URL: http://svn.reactos.org/svn/reactos?rev=27088&view=rev Log: start implement of GetDeviceIdentifier we are filling one member right. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.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 Sat Jun 9 21:24:32 2007 @@ -11,6 +11,8 @@ #include "rosdraw.h" +#include <string.h> + /* PSEH for SEH Support */ #include <pseh/pseh.h> @@ -451,16 +453,69 @@ Main_DirectDraw_GetDeviceIdentifier7(LPDIRECTDRAW7 iface, LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) { - // HRESULT retVal = DD_OK; - HRESULT retVal = DD_FALSE; - DX_WINDBG_trace(); - - _SEH_TRY - { - if (IsBadWritePtr( pDDDI, sizeof(DDDEVICEIDENTIFIER2) ) ) + HRESULT retVal = DDERR_INVALIDPARAMS; + + BOOL found = FALSE; + DWORD iDevNum = 0; + DISPLAY_DEVICEA DisplayDeviceA; + + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; + + DX_WINDBG_trace(); + + _SEH_TRY + { + if ( (IsBadWritePtr( pDDDI, sizeof(DDDEVICEIDENTIFIER2) ) ) || + (dwFlags & ~DDGDI_GETHOSTIDENTIFIER)) { retVal = DDERR_INVALIDPARAMS; - } + _SEH_LEAVE; + } + + /* now we can start getting the driver data */ + + while (1) + { + ZeroMemory(&DisplayDeviceA,sizeof(DISPLAY_DEVICEA)); + + DisplayDeviceA.cb = sizeof(DISPLAY_DEVICEA); + + if ( EnumDisplayDevicesA( NULL, iDevNum, &DisplayDeviceA, 0) == 0) + { + retVal = DDERR_INVALIDPARAMS; + break; + } + + if (!_stricmp(DisplayDeviceA.DeviceName, This->lpLcl->lpGbl->cDriverName)) + { + // if we got another device like hardware mpeg decoder or video card or another drv + found = TRUE; + } + else if (DisplayDeviceA.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + /* double check if it primary driver we just found */ + if (!_stricmp( This->lpLcl->lpGbl->cDriverName, "DISPLAY")) + { + /* yeah we found it */ + found = TRUE; + } + } + + if (found == TRUE) + { + /* we found our driver now we start setup it */ + strcpy( pDDDI->szDescription, DisplayDeviceA.DeviceString); + + /* This api still under devloping now we can get desc of the + primary drv + */ + retVal = DD_OK; + break; + } + + iDevNum++; + } + } _SEH_HANDLE {

1 0

[greatlrd] 27087: prepare testkit for GetDeviceIdentifier
by greatlrd＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: greatlrd Date: Sat Jun 9 17:23:18 2007 New Revision: 27087 URL: http://svn.reactos.org/svn/reactos?rev=27087&view=rev Log: prepare testkit for GetDeviceIdentifier Modified: trunk/rostests/dxtest/ddraw/testlist.cpp trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp 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 Sat Jun 9 17:23:18 2007 @@ -12,8 +12,10 @@ /* The List of tests */ TEST TestList[] = { + { "IDirectDraw: COM Stuff", Test_CreateDDraw }, - { "IDirectDraw: Display Frequency", Test_GetMonitorFrequency }, + { "IDirectDraw: GetDeviceIdentifier", Test_GetDeviceIdentifier }, + { "IDirectDraw: Display Frequency", Test_GetMonitorFrequency }, { "IDirectDraw: Display Modes", Test_DisplayModes }, { "IDirectDraw: Available Video Memory", Test_GetAvailableVidMem }, { "IDirectDraw: GetFourCC", Test_GetFourCCCodes }, 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 Sat Jun 9 17:23:18 2007 @@ -375,7 +375,21 @@ return TRUE; } - +BOOL Test_GetDeviceIdentifier (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; + } + + DirectDraw->Release(); + + return TRUE; +} LONG WINAPI BasicWindowProc (HWND hwnd, UINT message, UINT wParam, LONG lParam)

1 0

[fireball] 27086: - If the module failed to load (e.g. fixup couldn't be done), then don't include it in the list of loaded modules.
by fireball＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: fireball Date: Sat Jun 9 17:10:02 2007 New Revision: 27086 URL: http://svn.reactos.org/svn/reactos?rev=27086&view=rev Log: - If the module failed to load (e.g. fixup couldn't be done), then don't include it in the list of loaded modules. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Sat Jun 9 17:10:02 2007 @@ -655,7 +655,13 @@ if (ImageType == 1) FrLdrLoadImage("hal.dll", 10, FALSE); /* Perform import fixups */ - LdrPEFixupImports(LoadBase, Name); + if (!NT_SUCCESS(LdrPEFixupImports(LoadBase, Name))) + { + /* Fixup failed, just don't include it in the list */ + // NextModuleBase = OldNextModuleBase; + LoaderBlock.ModsCount = ImageId; + return NULL; + } /* Return the final mapped address */ return LoadBase;

1 0

[janderwald] 27085: - disable building avtest for now
by janderwald＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: janderwald Date: Sat Jun 9 14:15:00 2007 New Revision: 27085 URL: http://svn.reactos.org/svn/reactos?rev=27085&view=rev Log: - disable building avtest for now Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=27085… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Sat Jun 9 14:15:00 2007 @@ -1,7 +1,8 @@ + <directory name="cmdutils"> <xi:include href="cmdutils/cmdutils.rbuild" /> </directory>

1 0

[greatlrd] 27084: commit GetDeviceIdentifier and GetDeviceIdentifier7 both are under devloping, I hope I finish this implement today
by greatlrd＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: greatlrd Date: Sat Jun 9 14:05:41 2007 New Revision: 27084 URL: http://svn.reactos.org/svn/reactos?rev=27084&view=rev Log: commit GetDeviceIdentifier and GetDeviceIdentifier7 both are under devloping, I hope I finish this implement today Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h Sat Jun 9 14:05:41 2007 @@ -6,7 +6,8 @@ HRESULT WINAPI Main_DirectDraw_CreateClipper(LPDIRECTDRAW7, DWORD, LPDIRECTDRAWCLIPPER *, IUnknown *); HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7, DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE*, LPUNKNOWN); HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7, LPDIRECTDRAWSURFACE7, LPDIRECTDRAWSURFACE7*); -HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7, LPDDDEVICEIDENTIFIER2, DWORD); +HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW4, LPDDDEVICEIDENTIFIER, DWORD); +HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier7(LPDIRECTDRAW7, LPDDDEVICEIDENTIFIER2, DWORD); HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7, DWORD, LPDDSURFACEDESC2, LPVOID, LPDDENUMSURFACESCALLBACK7); @@ -39,7 +40,7 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface(LPDIRECTDRAW, LPDDSURFACEDESC, LPDIRECTDRAWSURFACE *, IUnknown *); HRESULT WINAPI Main_DirectDraw_CreateSurface4(LPDIRECTDRAW7, LPDDSURFACEDESC2, LPDIRECTDRAWSURFACE7 *, IUnknown *); HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7, LPDIRECTDRAWSURFACE7, LPDIRECTDRAWSURFACE7*); -HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7, LPDDDEVICEIDENTIFIER2, DWORD); + HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7, DWORD, LPDDSURFACEDESC2, LPVOID, LPDDENUMSURFACESCALLBACK7); 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 Sat Jun 9 14:05:41 2007 @@ -411,6 +411,64 @@ // LeaveCriticalSection(&ddcs); return ret; +} + +/* For DirectDraw 4 - 6 */ +HRESULT WINAPI +Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW4 iface, + LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags) +{ + HRESULT retVal = DD_OK; + DDDEVICEIDENTIFIER2 pDDDI2; + + ZeroMemory(&pDDDI2,sizeof(DDDEVICEIDENTIFIER2)); + + _SEH_TRY + { + memcpy(&pDDDI2 , pDDDI, sizeof(DDDEVICEIDENTIFIER)); + + retVal = Main_DirectDraw_GetDeviceIdentifier7((LPDIRECTDRAW7)iface, &pDDDI2, dwFlags); + + if (IsBadWritePtr(pDDDI, sizeof(DDDEVICEIDENTIFIER))) + { + retVal = DDERR_INVALIDPARAMS; + } + else + { + memcpy(pDDDI , &pDDDI2, sizeof(DDDEVICEIDENTIFIER) ); + } + } + _SEH_HANDLE + { + retVal = DD_FALSE; + } + _SEH_END; + + return retVal; +} + +HRESULT WINAPI +Main_DirectDraw_GetDeviceIdentifier7(LPDIRECTDRAW7 iface, + LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) +{ + // HRESULT retVal = DD_OK; + HRESULT retVal = DD_FALSE; + DX_WINDBG_trace(); + + _SEH_TRY + { + if (IsBadWritePtr( pDDDI, sizeof(DDDEVICEIDENTIFIER2) ) ) + { + retVal = DDERR_INVALIDPARAMS; + } + } + _SEH_HANDLE + { + retVal = DD_FALSE; + } + _SEH_END; + + return retVal; } /* 5 of 31 DirectDraw7_Vtable api are working simluare to windows */ @@ -445,7 +503,7 @@ Main_DirectDraw_GetSurfaceFromDC, Main_DirectDraw_RestoreAllSurfaces, Main_DirectDraw_TestCooperativeLevel, - Main_DirectDraw_GetDeviceIdentifier, + Main_DirectDraw_GetDeviceIdentifier7, Main_DirectDraw_StartModeTest, Main_DirectDraw_EvaluateMode }; Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Sat Jun 9 14:05:41 2007 @@ -117,12 +117,6 @@ DX_STUB; } -HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, - LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs