Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 33250: This cleans up the output of gcc warnings. Open for testing now. Let me know if you like it and if not, tell me why.
by dreimer＠svn.reactos.org 02 May '08

02 May '08

Author: dreimer Date: Fri May 2 15:35:52 2008 New Revision: 33250 URL: http://svn.reactos.org/svn/reactos?rev=33250&view=rev Log: This cleans up the output of gcc warnings. Open for testing now. Let me know if you like it and if not, tell me why. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Fri May 2 15:35:52 2008 @@ -87,6 +87,7 @@ } function BUILD { + $ErrorActionPreference = "SilentlyContinue" if ($_ROSBE_SHOWTIME -eq 1) { [System.Diagnostics.Stopwatch] $sw; $sw = New-Object System.Diagnostics.StopWatch

1 0

[greatlrd] 33249: Fixed the last regress I intdues for loading ms dxg.sys now it works loading again and we come allot futuer with our ddraw.dll. without using hacks.
by greatlrd＠svn.reactos.org 02 May '08

02 May '08

Author: greatlrd Date: Fri May 2 15:16:03 2008 New Revision: 33249 URL: http://svn.reactos.org/svn/reactos?rev=33249&view=rev Log: Fixed the last regress I intdues for loading ms dxg.sys now it works loading again and we come allot futuer with our ddraw.dll. without using hacks. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Fri May 2 15:16:03 2008 @@ -34,8 +34,8 @@ NTSTATUS Status; PEPROCESS Proc = NULL; PDC pDC = NULL; - PGDIDEVICE pDev = (PGDIDEVICE)pDC->pPDev; - PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = (PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn; + PGDIDEVICE pDev = NULL; + PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = NULL; BOOL success = FALSE; /* FIXME get the process data */ @@ -57,7 +57,9 @@ DPRINT1("Warning : Failed to lock hdc\n"); return FALSE; } - + + pDev = (PGDIDEVICE)pDC->pPDev; + /* test see if drv got a dx interface or not */ if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || ( pDev->DriverFunctions.EnableDirectDraw == NULL)) @@ -65,17 +67,16 @@ DPRINT1("Waring : DisableDirectDraw and EnableDirectDraw are NULL, no dx driver \n"); } else - { - /* FIXME HACK : some how pEDDgpl got zero out */ - pDev->pEDDgpl = (PVOID)&edd_DdirectDraw_Global; - - /* FIXME : proper check see if it been disable */ - if (pDev->pEDDgpl->dhpdev == 0) + { + + /* CHeck see if dx have been enable or not */ + if (pDev->pEDDgpl->hDev != pDC->pPDev) { pDev->pEDDgpl->ddCallbacks.dwSize = sizeof(DD_CALLBACKS); pDev->pEDDgpl->ddSurfaceCallbacks.dwSize = sizeof(DD_SURFACECALLBACKS); pDev->pEDDgpl->ddPaletteCallbacks.dwSize = sizeof(DD_PALETTECALLBACKS); + pfnDdEnableDirectDraw = (PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn; if (pfnDdEnableDirectDraw == NULL) { DPRINT1("Warning: no pfnDdEnableDirectDraw\n"); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Fri May 2 15:16:03 2008 @@ -553,7 +553,7 @@ PrimarySurface.ppdevNext = NULL; // Fixme! We need to support more than display drvs. PrimarySurface.ppdevParent = NULL; // Always NULL if primary. PrimarySurface.pGraphicsDev = NULL; // Fixme! - PrimarySurface.pEDDgpl = (PVOID)&edd_DdirectDraw_Global; // FIXME! We need to support more than display drvs. + PrimarySurface.pEDDgpl = (EDD_DIRECTDRAW_GLOBAL *)&edd_DdirectDraw_Global; // FIXME! We need to support more than display drvs. RtlZeroMemory( &edd_DdirectDraw_Global ,sizeof(EDD_DIRECTDRAW_GLOBAL)); ret = TRUE; goto cleanup;

1 0

[dreimer] 33248: If my Java Teacher would see this, he would kill me several times... NOW it works as it should. Thx to Jaykul from #powershell
by dreimer＠svn.reactos.org 02 May '08

02 May '08

Author: dreimer Date: Fri May 2 15:07:41 2008 New Revision: 33248 URL: http://svn.reactos.org/svn/reactos?rev=33248&view=rev Log: If my Java Teacher would see this, he would kill me several times... NOW it works as it should. Thx to Jaykul from #powershell Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Fri May 2 15:07:41 2008 @@ -163,12 +163,12 @@ if ($args[0] -eq "multi") { $host.ui.RawUI.WindowTitle = "makex $($args) parallel build started: $TIMERAW" } - BUILDMULTI + BUILDMULTI $args } else { if ($args.count -gt 0) { $host.ui.RawUI.WindowTitle = "make $($args) build started: $TIMERAW" } - BUILD + BUILD $args } #

1 0

[dreimer] 33247: Try to fix the bug with not parsed args.
by dreimer＠svn.reactos.org 02 May '08

02 May '08

Author: dreimer Date: Fri May 2 14:55:47 2008 New Revision: 33247 URL: http://svn.reactos.org/svn/reactos?rev=33247&view=rev Log: Try to fix the bug with not parsed args. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Fri May 2 14:55:47 2008 @@ -95,12 +95,12 @@ $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) } $sw.Start() - & "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + IEX "&'$_ROSBE_MINGWMAKE' $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" $sw.Stop() write-host "Total Build Time:" $sw.Elapsed.ToString() } else { $sw.Start() - & "$_ROSBE_MINGWMAKE" $($args) + IEX "&'$_ROSBE_MINGWMAKE' $($args)" $sw.Stop() write-host "Total Build Time:" $sw.Elapsed.ToString() } @@ -109,9 +109,9 @@ if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) } - & "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + IEX "&'$_ROSBE_MINGWMAKE' $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { - & "$_ROSBE_MINGWMAKE" $($args) + IEX "&'$_ROSBE_MINGWMAKE' $($args)" } } } @@ -135,12 +135,12 @@ $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) } $sw.Start() - & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" $sw.Stop() write-host "Total Build Time:" $sw.Elapsed.ToString() } else { $sw.Start() - & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) + IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" $sw.Stop() write-host "Total Build Time:" $sw.Elapsed.ToString() } @@ -149,9 +149,9 @@ if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) } - & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { - & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) + IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" } } }

1 0

[dreimer] 33246: ByeBye checknewer. HELLO gi ByeBye cpucount. HELLO WMI Commands
by dreimer＠svn.reactos.org 02 May '08

02 May '08

Author: dreimer Date: Fri May 2 14:44:47 2008 New Revision: 33246 URL: http://svn.reactos.org/svn/reactos?rev=33246&view=rev Log: ByeBye checknewer. HELLO gi ByeBye cpucount. HELLO WMI Commands Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Fri May 2 14:44:47 2008 @@ -12,8 +12,7 @@ # abort the build and inform the user. # if (Test-Path ".\config.rbuild") { - "$_ROSBE_BASEDIR\Tools\chknewer.exe .\config.template.rbuild .\config.rbuild" - if (errorlevel -eq 1) { + if ((gi .\config.template.rbuild).LastWriteTime -gt (gi .\config.rbuild).LastWriteTime) { "" "*** config.template.rbuild is newer than config.rbuild ***" "*** aborting build. Please check for changes and ***" @@ -126,7 +125,7 @@ # -x2 - Number of CPUs, doubled. # -a - Determine the cpu count based on the inherited process affinity mask. # - $CPUCOUNT= &"$_ROSBE_BASEDIR\Tools\cpucount.exe" -x1 + $CPUCOUNT= (gwmi win32_processor).numberofcores + 1 if ($_ROSBE_SHOWTIME -eq 1) { [System.Diagnostics.Stopwatch] $sw;

1 0

[greatlrd] 33245: re adding a small hack for edd_directdraw_globalk getting clear out some where in win32k. we need track down this bug.
by greatlrd＠svn.reactos.org 02 May '08

02 May '08

Author: greatlrd Date: Fri May 2 14:42:38 2008 New Revision: 33245 URL: http://svn.reactos.org/svn/reactos?rev=33245&view=rev Log: re adding a small hack for edd_directdraw_globalk getting clear out some where in win32k. we need track down this bug. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Fri May 2 14:42:38 2008 @@ -66,6 +66,9 @@ } else { + /* FIXME HACK : some how pEDDgpl got zero out */ + pDev->pEDDgpl = (PVOID)&edd_DdirectDraw_Global; + /* FIXME : proper check see if it been disable */ if (pDev->pEDDgpl->dhpdev == 0) { Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Fri May 2 14:42:38 2008 @@ -553,7 +553,7 @@ PrimarySurface.ppdevNext = NULL; // Fixme! We need to support more than display drvs. PrimarySurface.ppdevParent = NULL; // Always NULL if primary. PrimarySurface.pGraphicsDev = NULL; // Fixme! - PrimarySurface.pEDDgpl = &edd_DdirectDraw_Global; // FIXME! We need to support more than display drvs. + PrimarySurface.pEDDgpl = (PVOID)&edd_DdirectDraw_Global; // FIXME! We need to support more than display drvs. RtlZeroMemory( &edd_DdirectDraw_Global ,sizeof(EDD_DIRECTDRAW_GLOBAL)); ret = TRUE; goto cleanup;

1 0

[greatlrd] 33244: fixed a small regress for 3 boot i did by mistake intrudes. sorry
by greatlrd＠svn.reactos.org 02 May '08

02 May '08

Author: greatlrd Date: Fri May 2 14:25:26 2008 New Revision: 33244 URL: http://svn.reactos.org/svn/reactos?rev=33244&view=rev Log: fixed a small regress for 3 boot i did by mistake intrudes. sorry Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Fri May 2 14:25:26 2008 @@ -554,7 +554,7 @@ PrimarySurface.ppdevParent = NULL; // Always NULL if primary. PrimarySurface.pGraphicsDev = NULL; // Fixme! PrimarySurface.pEDDgpl = &edd_DdirectDraw_Global; // FIXME! We need to support more than display drvs. - RtlZeroMemory(&PrimarySurface.pEDDgpl,sizeof(EDD_DIRECTDRAW_GLOBAL)); + RtlZeroMemory( &edd_DdirectDraw_Global ,sizeof(EDD_DIRECTDRAW_GLOBAL)); ret = TRUE; goto cleanup; }

1 0

[dreimer] 33243: ByeBye buildtime.exe. HELLO [System.Diagnostics.Stopwatch]
by dreimer＠svn.reactos.org 02 May '08

02 May '08

Author: dreimer Date: Fri May 2 13:53:59 2008 New Revision: 33243 URL: http://svn.reactos.org/svn/reactos?rev=33243&view=rev Log: ByeBye buildtime.exe. HELLO [System.Diagnostics.Stopwatch] Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Fri May 2 13:53:59 2008 @@ -89,13 +89,21 @@ function BUILD { if ($_ROSBE_SHOWTIME -eq 1) { + [System.Diagnostics.Stopwatch] $sw; + $sw = New-Object System.Diagnostics.StopWatch if ($_ROSBE_WRITELOG -eq 1) { if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) } - & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + $sw.Start() + & "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + $sw.Stop() + write-host "Total Build Time:" $sw.Elapsed.ToString() } else { - & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" $($args) + $sw.Start() + & "$_ROSBE_MINGWMAKE" $($args) + $sw.Stop() + write-host "Total Build Time:" $sw.Elapsed.ToString() } } else { if ($_ROSBE_WRITELOG -eq 1) { @@ -121,13 +129,21 @@ $CPUCOUNT= &"$_ROSBE_BASEDIR\Tools\cpucount.exe" -x1 if ($_ROSBE_SHOWTIME -eq 1) { + [System.Diagnostics.Stopwatch] $sw; + $sw = New-Object System.Diagnostics.StopWatch if ($_ROSBE_WRITELOG -eq 1) { if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) } - & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + $sw.Start() + & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + $sw.Stop() + write-host "Total Build Time:" $sw.Elapsed.ToString() } else { - & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) + $sw.Start() + & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) + $sw.Stop() + write-host "Total Build Time:" $sw.Elapsed.ToString() } } else { if ($_ROSBE_WRITELOG -eq 1) {

1 0

[greatlrd] 33242: cleanup the startup process allot 1. Remove the hack in ddraw.c that only allown one edd_directdraw_global it been move to dc.c for it is each drv that need alloc this space. 2. Remove we do not trying loading dxg.sys twice. 3. Remove we do not try enable the dx interface when it is already enable, better check for it is need it later.
by greatlrd＠svn.reactos.org 02 May '08

02 May '08

Author: greatlrd Date: Fri May 2 13:31:21 2008 New Revision: 33242 URL: http://svn.reactos.org/svn/reactos?rev=33242&view=rev Log: cleanup the startup process allot 1. Remove the hack in ddraw.c that only allown one edd_directdraw_global it been move to dc.c for it is each drv that need alloc this space. 2. Remove we do not trying loading dxg.sys twice. 3. Remove we do not try enable the dx interface when it is already enable, better check for it is need it later. Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intddraw.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intddraw.h [iso-8859-1] Fri May 2 13:31:21 2008 @@ -8,7 +8,8 @@ #include <reactos/drivers/directx/dxeng.h> /* From ddraw.c */ -BOOL intEnableReactXDriver(PEDD_DIRECTDRAW_GLOBAL pEddgbl, PDC pDC); +BOOL intEnableReactXDriver(HDC); +NTSTATUS STDCALL DxDdStartupDxGraphics(ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS); extern DRVFN gpDxFuncs[]; typedef BOOL (NTAPI* PGD_DDSETGAMMARAMP)(HANDLE, HDC, LPVOID); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Fri May 2 13:31:21 2008 @@ -10,7 +10,6 @@ #include <w32k.h> #include <debug.h> -#define DXDDRAWDEBUG 1 PGD_DXDDSTARTUPDXGRAPHICS gpfnStartupDxGraphics = NULL; PGD_DXDDCLEANUPDXGRAPHICS gpfnCleanupDxGraphics = NULL; @@ -18,58 +17,81 @@ /* export from dxeng.c */ extern DRVFN gaEngFuncs; extern ULONG gcEngFuncs; +extern EDD_DIRECTDRAW_GLOBAL edd_DdirectDraw_Global; + DRVFN gpDxFuncs[DXG_INDEX_DxDdIoctl]; HANDLE ghDxGraphics = NULL; ULONG gdwDirectDrawContext; -EDD_DIRECTDRAW_GLOBAL edd_DdirectDraw_Global; - /************************************************************************/ /* DirectX graphic/video driver enable start here */ /************************************************************************/ BOOL -intEnableReactXDriver(PEDD_DIRECTDRAW_GLOBAL pEddgbl, PDC pDC) -{ +intEnableReactXDriver(HDC hdc) +{ + NTSTATUS Status; + PEPROCESS Proc = NULL; + PDC pDC = NULL; PGDIDEVICE pDev = (PGDIDEVICE)pDC->pPDev; PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = (PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn; BOOL success = FALSE; - - /*clean up some of the cache entry */ - RtlZeroMemory(pEddgbl,sizeof(EDD_DIRECTDRAW_GLOBAL)); - + + /* FIXME get the process data */ + + /* Do not try load dxg.sys when it have already been load once */ + if (gpfnStartupDxGraphics == NULL) + { + Status = DxDdStartupDxGraphics(0,NULL,0,NULL,NULL, Proc); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Warning : Failed to create the directx interface\n"); + return FALSE; + } + } + + pDC = DC_LockDc(hdc); + if (pDC == NULL) + { + DPRINT1("Warning : Failed to lock hdc\n"); + return FALSE; + } + /* test see if drv got a dx interface or not */ if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || ( pDev->DriverFunctions.EnableDirectDraw == NULL)) { - DPRINT1("Waring : DisableDirectDraw and EnableDirectDraw are NULL, no dx driver \n"); - return FALSE; - } - - /* setup EDD_DIRECTDRAW_GLOBAL for pDev xp */ - pDev->pEDDgpl = pEddgbl; - - pEddgbl->ddCallbacks.dwSize = sizeof(DD_CALLBACKS); - pEddgbl->ddSurfaceCallbacks.dwSize = sizeof(DD_SURFACECALLBACKS); - pEddgbl->ddPaletteCallbacks.dwSize = sizeof(DD_PALETTECALLBACKS); - - if (pfnDdEnableDirectDraw == NULL) - { - DPRINT1("Warning: no pfnDdEnableDirectDraw\n"); + DPRINT1("Waring : DisableDirectDraw and EnableDirectDraw are NULL, no dx driver \n"); } else { - DPRINT1(" call to pfnDdEnableDirectDraw \n "); - /* Note it is the hdev struct it want, not the drv hPDev aka pdc->PDev */ - success = pfnDdEnableDirectDraw(pDC->pPDev, TRUE); - - dump_edd_directdraw_global(pEddgbl); - dump_halinfo(&pEddgbl->ddHalInfo); - DPRINT1(" end call to pfnDdEnableDirectDraw \n "); - } - + /* FIXME : proper check see if it been disable */ + if (pDev->pEDDgpl->dhpdev == 0) + { + pDev->pEDDgpl->ddCallbacks.dwSize = sizeof(DD_CALLBACKS); + pDev->pEDDgpl->ddSurfaceCallbacks.dwSize = sizeof(DD_SURFACECALLBACKS); + pDev->pEDDgpl->ddPaletteCallbacks.dwSize = sizeof(DD_PALETTECALLBACKS); + + if (pfnDdEnableDirectDraw == NULL) + { + DPRINT1("Warning: no pfnDdEnableDirectDraw\n"); + } + else + { + DPRINT1(" call to pfnDdEnableDirectDraw \n "); + /* Note it is the hdev struct it want, not the drv hPDev aka pdc->PDev */ + success = pfnDdEnableDirectDraw(pDC->pPDev, TRUE); + + dump_edd_directdraw_global(pDev->pEDDgpl); + dump_halinfo(&pDev->pEDDgpl->ddHalInfo); + } + } + } + DPRINT1("Return value : 0x%08x\n",success); + DC_UnlockDc(pDC); + DPRINT1(" end call to pfnDdEnableDirectDraw \n "); return success; } @@ -189,45 +211,20 @@ NtGdiDdCreateDirectDrawObject(HDC hdc) { PGD_DDCREATEDIRECTDRAWOBJECT pfnDdCreateDirectDrawObject; - NTSTATUS Status; - PEPROCESS Proc = NULL; - PDC pDC; - + if (hdc == NULL) { DPRINT1("Warning : hdc is NULL\n"); return 0; } - - /* FIXME this code should be add where the driver being load */ - /* FIXME get the process data */ - /* FIXME this code should be add where the driver being load */ - Status = DxDdStartupDxGraphics(0,NULL,0,NULL,NULL, Proc); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Warning : Failed to create the directx interface\n"); - return 0; - } - - pDC = DC_LockDc(hdc); - if (pDC == NULL) - { - DPRINT1("Warning : Failed to lock hdc\n"); - return 0; - } - + /* FIXME This should be alloc for each drv and use it from each drv, not global for whole win32k */ - if (intEnableReactXDriver(&edd_DdirectDraw_Global, pDC) == FALSE) - { - DC_UnlockDc(pDC); + if (intEnableReactXDriver(hdc) == FALSE) + { DPRINT1("Warning : Failed to start the directx interface from the graphic driver\n"); return DDHAL_DRIVER_NOTHANDLED; } - - DC_UnlockDc(pDC); - - - + /* get the pfnDdCreateDirectDrawObject after we load the drv */ pfnDdCreateDirectDrawObject = (PGD_DDCREATEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateDirectDrawObject].pfn; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Fri May 2 13:31:21 2008 @@ -31,7 +31,7 @@ static GDIDEVICE PrimarySurface; static KEVENT VideoDriverNeedsPreparation; static KEVENT VideoDriverPrepared; - +EDD_DIRECTDRAW_GLOBAL edd_DdirectDraw_Global; NTSTATUS FASTCALL InitDcImpl(VOID) @@ -553,6 +553,8 @@ PrimarySurface.ppdevNext = NULL; // Fixme! We need to support more than display drvs. PrimarySurface.ppdevParent = NULL; // Always NULL if primary. PrimarySurface.pGraphicsDev = NULL; // Fixme! + PrimarySurface.pEDDgpl = &edd_DdirectDraw_Global; // FIXME! We need to support more than display drvs. + RtlZeroMemory(&PrimarySurface.pEDDgpl,sizeof(EDD_DIRECTDRAW_GLOBAL)); ret = TRUE; goto cleanup; }

1 0

[greatlrd] 33241: fix a typo in function DxEngGetHdevData the sub function DxEGShDevData_OpenRefs did validate data bit wrong it should send back 0 for no openrefs and 1 for openrefs. thx Pigglesworth debuglog to found it.
by greatlrd＠svn.reactos.org 02 May '08

02 May '08

Author: greatlrd Date: Fri May 2 12:47:46 2008 New Revision: 33241 URL: http://svn.reactos.org/svn/reactos?rev=33241&view=rev Log: fix a typo in function DxEngGetHdevData the sub function DxEGShDevData_OpenRefs did validate data bit wrong it should send back 0 for no openrefs and 1 for openrefs. thx Pigglesworth debuglog to found it. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Fri May 2 12:47:46 2008 @@ -362,7 +362,7 @@ break; case DxEGShDevData_OpenRefs: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_OpenRefs\n"); - retVal = (DWORD_PTR) PDev->cPdevOpenRefs == 0; + retVal = (DWORD_PTR) PDev->cPdevOpenRefs != 0; break; case DxEGShDevData_palette: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_palette\n");

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