Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 27233: Not in LE mode anymore, toto.
by arty＠svn.reactos.org 19 Jun '07

19 Jun '07

Author: arty Date: Tue Jun 19 10:13:10 2007 New Revision: 27233 URL: http://svn.reactos.org/svn/reactos?rev=27233&view=rev Log: Not in LE mode anymore, toto. Modified: branches/powerpc/reactos/hal/halppc/generic/display.c branches/powerpc/reactos/hal/halppc/generic/portio.c Modified: branches/powerpc/reactos/hal/halppc/generic/display.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… ============================================================================== --- branches/powerpc/reactos/hal/halppc/generic/display.c (original) +++ branches/powerpc/reactos/hal/halppc/generic/display.c Tue Jun 19 10:13:10 2007 @@ -196,6 +196,8 @@ VOID STATIC FASTCALL HalPutCharacter (CHAR Character) { + WRITE_PORT_UCHAR((PVOID)0x3f8, Character); +#if 0 int i,j,k; ULONG Dest = (GraphVideoBuffer + @@ -213,6 +215,7 @@ } Dest += PpcEarlybootInfo.dispDeviceRowBytes; } +#endif } /* PRIVATE FUNCTIONS ********************************************************/ Modified: branches/powerpc/reactos/hal/halppc/generic/portio.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… ============================================================================== --- branches/powerpc/reactos/hal/halppc/generic/portio.c (original) +++ branches/powerpc/reactos/hal/halppc/generic/portio.c Tue Jun 19 10:13:10 2007 @@ -78,7 +78,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,4\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "isync\n\t" @@ -98,7 +97,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,6\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "isync\n\t" @@ -118,7 +116,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,7\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "isync\n\t" @@ -138,7 +135,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,4\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "sync\n\t" @@ -160,7 +156,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,6\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "sync\n\t" @@ -182,7 +177,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,7\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "sync\n\t"

1 0

[greatlrd] 27232: Check the sub_lang before a commit I do not want other langues that english, like getting ukrain instead for english when the os are set to english
by greatlrd＠svn.reactos.org 18 Jun '07

18 Jun '07

Author: greatlrd Date: Tue Jun 19 01:57:11 2007 New Revision: 27232 URL: http://svn.reactos.org/svn/reactos?rev=27232&view=rev Log: Check the sub_lang before a commit I do not want other langues that english, like getting ukrain instead for english when the os are set to english Modified: trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc Tue Jun 19 01:57:11 2007 @@ -1,4 +1,4 @@ -LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc Tue Jun 19 01:57:11 2007 @@ -1,5 +1,5 @@ // Hungarian resource file by Peter Lukacs -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc Tue Jun 19 01:57:11 2007 @@ -1,4 +1,4 @@ -LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc Tue Jun 19 01:57:11 2007 @@ -6,7 +6,7 @@ * TRANSLATOR: Artem Reznikov */ -LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION

1 0

[dreimer] 27231: I don't know if it is a common phenomenon, but everytime I commit stuff, I IMMEDIATELY find things to fix/change afterwards.... - Added ability to set non, only executable or both parameters. Missing stuff will be asked for then. - Added Comments
by dreimer＠svn.reactos.org 18 Jun '07

18 Jun '07

Author: dreimer Date: Tue Jun 19 01:49:44 2007 New Revision: 27231 URL: http://svn.reactos.org/svn/reactos?rev=27231&view=rev Log: I don't know if it is a common phenomenon, but everytime I commit stuff, I IMMEDIATELY find things to fix/change afterwards.... - Added ability to set non, only executable or both parameters. Missing stuff will be asked for then. - Added Comments Modified: trunk/tools/RosBE-Windows/Root/RAddr.cmd Modified: trunk/tools/RosBE-Windows/Root/RAddr.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RAddr.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RAddr.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RAddr.cmd Tue Jun 19 01:49:44 2007 @@ -10,17 +10,23 @@ title RAddr2Line... +:: +:: Receive the Parameters and decide what to do. +:: if "%1" == "" ( goto :MAN ) if not "%1" == "" ( if "%2" == "" ( - echo No Address Set. - goto :EOF + goto :AUTO1 ) else ( - goto :AUTO + goto :AUTO2 + ) ) +:: +:: If Parameters were set, parse them, if not, ask the user to add them. +:: :MAN echo Set the Path to the Executable to be examined. SET /P EXE= @@ -29,6 +35,14 @@ echo. echo. "%ROSBEBASEDIR%\Tools\raddr2line.exe" %EXE% %ADDR% +goto :EOF -:AUTO -"%ROSBEBASEDIR%\Tools\raddr2line.exe" %1 %2 +:AUTO1 +echo Set the Address you wanna analyze inside the Executable. +SET /P ADDR= +"%ROSBEBASEDIR%\Tools\raddr2line.exe" %1 %ADDR% +goto :EOF + +:AUTO2 +"%ROSBEBASEDIR%\Tools\raddr2line.exe" %1 %2 +goto :EOF

1 0

[dreimer] 27230: - Disabled Christoph's Tool (Wish of some devs) - Added a basic RAddr2Line tool runner. More will come.
by dreimer＠svn.reactos.org 18 Jun '07

18 Jun '07

Author: dreimer Date: Tue Jun 19 01:38:53 2007 New Revision: 27230 URL: http://svn.reactos.org/svn/reactos?rev=27230&view=rev Log: - Disabled Christoph's Tool (Wish of some devs) - Added a basic RAddr2Line tool runner. More will come. Added: trunk/tools/RosBE-Windows/Root/RAddr.cmd Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt 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 Tue Jun 19 01:38:53 2007 @@ -7,6 +7,7 @@ - Added a config.rbuild Configurator. - Added grep/cut/sed Tools for the new Configurator. - Added SVN 1.4.4 for the SVN Feature. +- Added RAddr2Line Tool for the Devs out there. - Added use of ROS_LEAN_AND_MEAN by typeing "make/makex %command% strip". - Readded makex. Sorry, bug in Vista still persists... its a GCC bug. Added: trunk/tools/RosBE-Windows/Root/RAddr.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RAddr.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RAddr.cmd (added) +++ trunk/tools/RosBE-Windows/Root/RAddr.cmd Tue Jun 19 01:38:53 2007 @@ -1,0 +1,34 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/RAddr.cmd +:: PURPOSE: Analyze Adresses in Executables. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off + +title RAddr2Line... + +if "%1" == "" ( + goto :MAN +) +if not "%1" == "" ( + if "%2" == "" ( + echo No Address Set. + goto :EOF + ) else ( + goto :AUTO +) + +:MAN +echo Set the Path to the Executable to be examined. +SET /P EXE= +echo Set the Address you wanna analyze inside the Executable. +SET /P ADDR= +echo. +echo. +"%ROSBEBASEDIR%\Tools\raddr2line.exe" %EXE% %ADDR% + +:AUTO +"%ROSBEBASEDIR%\Tools\raddr2line.exe" %1 %2 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 Tue Jun 19 01:38:53 2007 @@ -1,8 +1,8 @@ -BASEDIR = cd /d "%_ROSSOURCEDIR%" -CLEAN = "%ROSBEBASEDIR%\Clean.cmd" $* -SVN = "%ROSBEBASEDIR%\SVN.cmd" $* -CONFIG = "%ROSBEBASEDIR%\Config.cmd" $* -HELP = "%ROSBEBASEDIR%\Help.cmd" $* -MAKE = "%ROSBEBASEDIR%\Build.cmd" $* -MAKEX = "%ROSBEBASEDIR%\Build-Multi.cmd" $* -RELADDR2LINE = "%ROSBEBASEDIR%\reladdr2line.cmd" $* +BASEDIR = cd /d "%_ROSSOURCEDIR%" +CLEAN = "%ROSBEBASEDIR%\Clean.cmd" $* +SVN = "%ROSBEBASEDIR%\SVN.cmd" $* +CONFIG = "%ROSBEBASEDIR%\Config.cmd" $* +HELP = "%ROSBEBASEDIR%\Help.cmd" $* +MAKE = "%ROSBEBASEDIR%\Build.cmd" $* +MAKEX = "%ROSBEBASEDIR%\Build-Multi.cmd" $* +RADDR2LINE = "%ROSBEBASEDIR%\RAddr.cmd" $*

1 0

[dreimer] 27229: - Head0rz t0 teh masses. - Fix a typo in Help.cmd
by dreimer＠svn.reactos.org 18 Jun '07

18 Jun '07

Author: dreimer Date: Tue Jun 19 01:08:09 2007 New Revision: 27229 URL: http://svn.reactos.org/svn/reactos?rev=27229&view=rev Log: - Head0rz t0 teh masses. - Fix a typo in Help.cmd Modified: trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/reladdr2line.cmd 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 Tue Jun 19 01:08:09 2007 @@ -25,7 +25,7 @@ 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 svn [OPTIONS] - Create, Update or Clean-up your ReactOS Source echo Tree or show the Status. echo config [OPTIONS]- Configures the way, ReactOS will be built. echo. Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Tue Jun 19 01:08:09 2007 @@ -1,4 +1,13 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/reladdr2line.cmd +:: PURPOSE: Converts a value to hex and displays it +:: COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> +:: +:: @echo off + for /f "tokens=2" %%i in ('"objdump -p %1 2>NUL | findstr ImageBase"') do SET baseaddr=0x%%i set /a baseaddr += 0x%2 for /f %%i in ('"%ROSBEBASEDIR%\Tools\echoh %baseaddr%"') do set relbase=%%i

1 0

[cfinck] 27228: Add a "reladdr2line" tool coded by Christoph I slightly modified his batch file, so it integrates into RosBE
by cfinck＠svn.reactos.org 18 Jun '07

18 Jun '07

Author: cfinck Date: Tue Jun 19 00:54:50 2007 New Revision: 27228 URL: http://svn.reactos.org/svn/reactos?rev=27228&view=rev Log: Add a "reladdr2line" tool coded by Christoph I slightly modified his batch file, so it integrates into RosBE Added: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE-Windows/Tools/echoh.c Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac 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 Tue Jun 19 00:54:50 2007 @@ -5,3 +5,4 @@ HELP = "%ROSBEBASEDIR%\Help.cmd" $* MAKE = "%ROSBEBASEDIR%\Build.cmd" $* MAKEX = "%ROSBEBASEDIR%\Build-Multi.cmd" $* +RELADDR2LINE = "%ROSBEBASEDIR%\reladdr2line.cmd" $* Added: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (added) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Tue Jun 19 00:54:50 2007 @@ -1,0 +1,5 @@ +@echo off +for /f "tokens=2" %%i in ('"objdump -p %1 2>NUL | findstr ImageBase"') do SET baseaddr=0x%%i +set /a baseaddr += 0x%2 +for /f %%i in ('"%ROSBEBASEDIR%\Tools\echoh %baseaddr%"') do set relbase=%%i +addr2line --exe=%1 %relbase% 2>NUL Added: trunk/tools/RosBE-Windows/Tools/echoh.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/echoh.c?… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/echoh.c (added) +++ trunk/tools/RosBE-Windows/Tools/echoh.c Tue Jun 19 00:54:50 2007 @@ -1,0 +1,17 @@ +/* + * PROJECT: RosBE - ReactOS Build Environment for Windows + * LICENSE: GPL - See COPYING in the top level directory + * FILE: Tools/echoh.c + * PURPOSE: Converts a value to hex and displays it + * COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> + * + */ + + +#include <stdio.h> + +int main(int argc, char** argv) { + if (argc == 2) + printf("%x", atoi(argv[1])); + return 0; +}

1 0

[dreimer] 27227: Added ability to the SVN Client to show the recent online and offline Revision Number to compare. This takes ~10 seconds, so my plan to add it to main menu was canceled. But as "svn status" is has a nice place.
by dreimer＠svn.reactos.org 18 Jun '07

18 Jun '07

Author: dreimer Date: Tue Jun 19 00:18:34 2007 New Revision: 27227 URL: http://svn.reactos.org/svn/reactos?rev=27227&view=rev Log: Added ability to the SVN Client to show the recent online and offline Revision Number to compare. This takes ~10 seconds, so my plan to add it to main menu was canceled. But as "svn status" is has a nice place. Modified: trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/SVN.cmd 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 Tue Jun 19 00:18:34 2007 @@ -26,7 +26,7 @@ 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 Tree or show the Status. echo config [OPTIONS]- Configures the way, ReactOS will be built. echo. echo basedir - Switch back to the ReactOS source directory. @@ -64,10 +64,12 @@ echo Usage: svn [OPTIONS] echo Creates, Updates or cleans up your ReactOS Source Tree. echo. - echo update - Updates to HEAD Revision or to a specific one when - echo second parameter specifies one. - echo create - Creates a new ReactOS Tree. + echo update - Updates to HEAD Revision or to a specific one when + echo second parameter specifies one. + echo create - Creates a new ReactOS Tree. echo cleanup - Cleans up and fixes errors in Tree. + echo status - Shows Actual offline Revision Number and online HEAD + echo Revision Number. goto :EOF ) if "%1" == "config" ( 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 Tue Jun 19 00:18:34 2007 @@ -36,6 +36,20 @@ goto :SVN ) ) +if "%1" == "status" ( + title Status + call "%ROSBEBASEDIR%\Tools\svn.exe" info %_ROSSOURCEDIR% > "%ROSBEBASEDIR%\x.tmp" + echo Recent Offline Revision: + call "%ROSBEBASEDIR%\Tools\grep.exe" Revision: %ROSBEBASEDIR%\x.tmp|"%ROSBEBASEDIR%\Tools\cut.exe" -d " " -f 2 + del "%ROSBEBASEDIR%\x.tmp" + + call "%ROSBEBASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\x.tmp" + echo Online HEAD Revision: + call "%ROSBEBASEDIR%\Tools\grep.exe" Revision: %ROSBEBASEDIR%\x.tmp|"%ROSBEBASEDIR%\Tools\cut.exe" -d " " -f 2 + del "%ROSBEBASEDIR%\x.tmp" + goto :ExitSVN +) + if not "%1" == "" ( echo Unknown parameter specified. Try 'help [COMMAND]'. goto :ExitSVN

1 0

[greatlrd] 27226: Fixed some smaller bugs
by greatlrd＠svn.reactos.org 18 Jun '07

18 Jun '07

Author: greatlrd Date: Mon Jun 18 22:11:39 2007 New Revision: 27226 URL: http://svn.reactos.org/svn/reactos?rev=27226&view=rev Log: Fixed some smaller bugs Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Mon Jun 18 22:11:39 2007 @@ -24,8 +24,6 @@ Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { - DDSURFACEDESC2 desc; - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface = { 0 }; DDHAL_CREATESURFACEDATA mDdCreateSurface = { 0 }; @@ -158,6 +156,16 @@ ThisSurfaceGbl->wHeight = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayHeight; ThisSurfaceGbl->lPitch = pDDraw->lpLcl->lpGbl->vmiData.lDisplayPitch; ThisSurfaceGbl->dwLinearSize = pDDraw->lpLcl->lpGbl->vmiData.lDisplayPitch; + + + ThisSurfaceMore->dmiDDrawReserved7.wWidth = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayWidth; + ThisSurfaceMore->dmiDDrawReserved7.wHeight = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayHeight; + ThisSurfaceMore->dmiDDrawReserved7.wBPP = pDDraw->lpLcl->lpGbl->dwMonitorFrequency; + + /* FIXME ThisSurfaceMore->dmiDDrawReserved7.wMonitorsAttachedToDesktop */ + ThisSurfaceMore->dmiDDrawReserved7.wMonitorsAttachedToDesktop = 1; + pDDraw->lpLcl->lpPrimary = ThisSurfInt; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)pDDraw); } else { @@ -180,6 +188,8 @@ /* FIXME the lpLnk */ /* FIXME the ref counter */ + + Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)ThisSurfInt); } /* Fixme call on DdCanCreate then on DdCreateSurface createsurface data here */ @@ -207,7 +217,7 @@ mDdCreateSurface.lpDD = pDDraw->lpLcl->lpGbl; mDdCreateSurface.CreateSurface = pDDraw->lpLcl->lpGbl->lpDDCBtmp->HALDD.CreateSurface; mDdCreateSurface.ddRVal = DDERR_GENERIC; - mDdCreateSurface.dwSCnt = slist_int[0]->dwIntRefCnt + 1; // is this correct + mDdCreateSurface.dwSCnt = num_of_surf; mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; mDdCreateSurface.lplpSList = slist_lcl; @@ -234,343 +244,4 @@ dst_pDesc->dwSize = sizeof(DDSURFACEDESC2); } -HRESULT -CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, - LPDDRAWI_DDRAWSURFACE_INT That, - LPDDRAWI_DDRAWSURFACE_LCL lpLcl, - LPDDSURFACEDESC2 pDDSD) -{ - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - - - DxHeapMemAlloc( That->lpLcl->lpSurfMore, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - if (That->lpLcl->lpSurfMore == NULL) - { - DxHeapMemFree(That); - return DDERR_OUTOFMEMORY; - } - - // That->lpLcl->lpSurfMore->slist = lpLcl; - - That->lpVtbl = &DirectDrawSurface7_Vtable; - That->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - That->lpLcl->lpSurfMore->lpDD_int = This; - That->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; - That->lpLcl->lpSurfMore->slist[0] = That->lpLcl; - That->lpLcl->dwProcessId = GetCurrentProcessId(); - - mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; - if (pDDSD->dwFlags & DDSD_PIXELFORMAT) - { - That->lpLcl->dwFlags |= DDRAWISURF_HASPIXELFORMAT; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - } - else - { - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; - } - mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface; - mDdCanCreateSurface.ddRVal = DDERR_GENERIC; - - mDdCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; - mDdCreateSurface.ddRVal = DDERR_GENERIC; - mDdCreateSurface.dwSCnt = That->dwIntRefCnt + 1; // is this correct - mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - - mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; - - That->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - - This->lpLcl->lpPrimary = That; - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - That->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; - - That->lpLink = This->lpLcl->lpGbl->dsList; - This->lpLcl->lpGbl->dsList = That; - - return DD_OK; -} - -HRESULT -CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, - LPDDRAWI_DDRAWSURFACE_INT *That, - LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, - LPDDSURFACEDESC2 pDDSD) -{ - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - DWORD t; - - - /* we are building the backbuffersurface pointer list - * and create the backbuffer surface and set it up - */ - - That[0]->lpLcl->dwBackBufferCount = pDDSD->dwBackBufferCount; - - for (t=0;t<pDDSD->dwBackBufferCount+1;t++) - { - - - DxHeapMemAlloc(That[t]->lpLcl->lpSurfMore, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - if (That[t]->lpLcl->lpSurfMore == NULL) - { - DxHeapMemFree(That); - return DDERR_OUTOFMEMORY; - } - - That[t]->lpLcl->lpSurfMore->slist = lpLcl; - - That[t]->lpVtbl = &DirectDrawSurface7_Vtable; - That[t]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - That[t]->lpLcl->lpSurfMore->lpDD_int = This; - That[t]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; - That[t]->lpLcl->lpSurfMore->slist[0] = That[t]->lpLcl; - That[t]->lpLcl->dwProcessId = GetCurrentProcessId(); - - mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; - if (pDDSD->dwFlags & DDSD_PIXELFORMAT) - { - That[t]->lpLcl->dwFlags |= DDRAWISURF_HASPIXELFORMAT; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - } - else - { - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; - } - mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface; - mDdCanCreateSurface.ddRVal = DDERR_GENERIC; - - mDdCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; - mDdCreateSurface.ddRVal = DDERR_GENERIC; - mDdCreateSurface.dwSCnt = That[t]->dwIntRefCnt + 1; // is this correct - mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - - mDdCreateSurface.lplpSList = That[t]->lpLcl->lpSurfMore->slist; - - That[t]->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - - This->lpLcl->lpPrimary = That[0]; - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - mDdCreateSurface.lplpSList = That[t]->lpLcl->lpSurfMore->slist; - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - That[t]->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; - - /* Build the linking buffer */ - That[t]->lpLink = This->lpLcl->lpGbl->dsList; - This->lpLcl->lpGbl->dsList = That[t]; -DX_STUB_str( "ok"); - } - return DD_OK; -} - - - -HRESULT -CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, - LPDDRAWI_DDRAWSURFACE_INT *That, - LPDDSURFACEDESC2 pDDSD) -{ - DDSURFACEDESC mddsdOverlay; - DDRAWI_DDRAWSURFACE_GBL mOverlayGlobal; - DDRAWI_DDRAWSURFACE_LCL mOverlayLocal[6]; - DDRAWI_DDRAWSURFACE_LCL *mpOverlayLocals[6]; - DDRAWI_DDRAWSURFACE_MORE mOverlayMore[6]; - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - INT i; - INT j; - INT cSurfaces; - DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; - - /* create overlay surface now */ - ZeroMemory(&mddsdOverlay, sizeof(DDSURFACEDESC)); - mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); - mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; - - mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - - mddsdOverlay.dwWidth = 100; //pels; - mddsdOverlay.dwHeight = 100; // lines; - mddsdOverlay.dwBackBufferCount = 1; //cBuffers; - - mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; - mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32; - - - //DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - mDdCanCreateSurface.lpDDSurfaceDesc = &mddsdOverlay; // pDDSD; - - - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - // derr(L"DirectDrawImpl[%08x]::__createPrimary Cannot create primary [%08x]", this, rv); - // printf("Fail to mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED \n"); - DX_STUB_str("mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - DX_STUB_str("mDdCanCreateSurface fail"); -// printf("Fail to mDdCanCreateSurface mDdCanCreateSurface.ddRVal = %d:%s\n",(int)mDdCanCreateSurface.ddRVal,DDErrorString(mDdCanCreateSurface.ddRVal)); - return DDERR_NOTINITIALIZED; - } - - - ZeroMemory(&mOverlayGlobal, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - mOverlayGlobal.dwGlobalFlags = 0; - mOverlayGlobal.lpDD = This->lpLcl->lpGbl; - mOverlayGlobal.lpDDHandle = This->lpLcl->lpGbl; - mOverlayGlobal.wWidth = (WORD)mddsdOverlay.dwWidth; - mOverlayGlobal.wHeight = (WORD)mddsdOverlay.dwHeight; - mOverlayGlobal.lPitch = -1; - mOverlayGlobal.ddpfSurface = mddsdOverlay.ddpfPixelFormat; - - // setup front- and backbuffer surfaces - cSurfaces = mddsdOverlay.dwBackBufferCount + 1; - for ( i = 0; i < cSurfaces; i++) - { - ZeroMemory(&mOverlayMore[i], sizeof(DDRAWI_DDRAWSURFACE_MORE)); - mOverlayMore[i].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - ZeroMemory(&mOverlayLocal[i], sizeof(DDRAWI_DDRAWSURFACE_LCL)); - mOverlayLocal[i].lpGbl = &mOverlayGlobal; - mOverlayLocal[i].lpSurfMore = &mOverlayMore[i]; - mOverlayLocal[i].dwProcessId = GetCurrentProcessId(); - mOverlayLocal[i].dwFlags = (i == 0) ? - (DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER): - (DDRAWISURF_IMPLICITCREATE|DDRAWISURF_BACKBUFFER); - - mOverlayLocal[i].dwFlags |= - DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| - DDRAWISURF_HASPIXELFORMAT| - DDRAWISURF_HASOVERLAYDATA; - - mOverlayLocal[i].ddsCaps.dwCaps = mddsdOverlay.ddsCaps.dwCaps; - mpOverlayLocals[i] = &mOverlayLocal[i]; - } - - for ( i = 0; i < cSurfaces; i++) - { - j = (i + 1) % cSurfaces; - - - /*if (!mHALInfo.lpDDSurfaceCallbacks->AddAttachedSurface(mpOverlayLocals[i], mpOverlayLocals[j])) - { - // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); - return DD_FALSE; - }*/ - - if (!DdAttachSurface(mpOverlayLocals[i], mpOverlayLocals[j])) - { - // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); -//printf("Fail to DdAttachSurface (%d:%d)\n", i, j); - DX_STUB_str("DdAttachSurface fail"); - return DD_FALSE; - } - - } - - // DDHAL_CREATESURFACEDATA mDdCreateSurface; - mDdCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; - mDdCreateSurface.lpDDSurfaceDesc = &mddsdOverlay;//pDDSD; - mDdCreateSurface.lplpSList = mpOverlayLocals; //cSurfaces; - mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - DX_STUB_str("mDdCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); - return DDERR_NOTINITIALIZED; - } - - - if (mDdCreateSurface.ddRVal != DD_OK) - { - DX_STUB_str("mDdCreateSurface fail"); - return mDdCreateSurface.ddRVal; - } - - mDdUpdateOverlay.lpDD = This->lpLcl->lpGbl; - mDdUpdateOverlay.UpdateOverlay = This->lpLcl->lpDDCB->HALDDSurface.UpdateOverlay; - mDdUpdateOverlay.lpDDDestSurface = This->lpLcl->lpPrimary->lpLcl->lpSurfMore->slist[0]; - mDdUpdateOverlay.lpDDSrcSurface = mpOverlayLocals[0];//pDDSurface; - mDdUpdateOverlay.dwFlags = DDOVER_SHOW; - - mDdUpdateOverlay.rDest.top = 0; - mDdUpdateOverlay.rDest.left = 0; - mDdUpdateOverlay.rDest.right = 50; - mDdUpdateOverlay.rDest.bottom = 50; - - mDdUpdateOverlay.rSrc.top = 0; - mDdUpdateOverlay.rSrc.left = 0; - mDdUpdateOverlay.rSrc.right = 50; - mDdUpdateOverlay.rSrc.bottom = 50; - - if ( mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) - { - DX_STUB_str("UpdateOverlay fail"); - return DDERR_NOTINITIALIZED; - } - - - if (mDdUpdateOverlay.ddRVal != DD_OK) - { - DX_STUB_str("mDdUpdateOverlay fail"); - //printf("Fail to mDdUpdateOverlay mDdUpdateOverlay.ddRVal = %d:%s\n",(int)mDdUpdateOverlay.ddRVal,DDErrorString(mDdUpdateOverlay.ddRVal)); - return mDdUpdateOverlay.ddRVal; - } - - DX_STUB_str("OK"); - return DD_OK; -} + Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Mon Jun 18 22:11:39 2007 @@ -209,7 +209,7 @@ This->lpLcl->lpSurfMore->slist[0]->hDC = This->lpLcl->lpSurfMore->lpDD_lcl->hDC; mdLock.ddRVal = DDERR_NOTPALETTIZED; - mdLock.Lock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.Lock; + mdLock.Lock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->HALDDSurface.Lock; mdLock.dwFlags = flags; mdLock.lpDDSurface = This->lpLcl->lpSurfMore->slist[0]; mdLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; @@ -278,7 +278,7 @@ mdUnLock.ddRVal = DDERR_NOTPALETTIZED; mdUnLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; mdUnLock.lpDDSurface = This->lpLcl->lpSurfMore->slist[0]; - mdUnLock.Unlock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.Unlock; + mdUnLock.Unlock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->HALDDSurface.Unlock; if (!DdResetVisrgn( mdUnLock.lpDDSurface, NULL)) {

1 0

[dreimer] 27225: Fix buildtime
by dreimer＠svn.reactos.org 18 Jun '07

18 Jun '07

Author: dreimer Date: Mon Jun 18 19:40:27 2007 New Revision: 27225 URL: http://svn.reactos.org/svn/reactos?rev=27225&view=rev Log: Fix buildtime Modified: trunk/tools/RosBE-Windows/Tools/buildtime.c Modified: trunk/tools/RosBE-Windows/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/buildtim… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/buildtime.c (original) +++ trunk/tools/RosBE-Windows/Tools/buildtime.c Mon Jun 18 19:40:27 2007 @@ -8,6 +8,7 @@ */ +#include <windows.h> #include <time.h> #include <stdio.h> #include <stdlib.h>

1 0

[mbosma] 27224: - Some formatting fixes - Some checks and fixed return values
by mbosma＠svn.reactos.org 18 Jun '07

18 Jun '07

Author: mbosma Date: Mon Jun 18 18:58:44 2007 New Revision: 27224 URL: http://svn.reactos.org/svn/reactos?rev=27224&view=rev Log: - Some formatting fixes - Some checks and fixed return values Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.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 Mon Jun 18 18:58:44 2007 @@ -489,7 +489,7 @@ } _SEH_HANDLE { - ret = DDERR_GENERIC; + ret = DDERR_INVALIDPARAMS; } _SEH_END; // LeaveCriticalSection(&ddcs); @@ -502,24 +502,22 @@ Main_DirectDraw_CreateSurface4(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { - HRESULT ret; + HRESULT ret; DX_WINDBG_trace(); // EnterCriticalSection(&ddcs); _SEH_TRY { ret = Internal_CreateSurface( (LPDDRAWI_DIRECTDRAW_INT)iface,pDDSD, ppSurf,pUnkOuter); } - _SEH_HANDLE - { - ret = DDERR_GENERIC; + _SEH_HANDLE + { + ret = DDERR_INVALIDPARAMS; } _SEH_END; // LeaveCriticalSection(&ddcs); return ret; } - - /* 5 of 31 DirectDraw7_Vtable api are working simluare to windows */ /* 8 of 31 DirectDraw7_Vtable api are under devloping / testing */ Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Mon Jun 18 18:58:44 2007 @@ -41,8 +41,33 @@ DWORD num_of_surf=1; DWORD count; - /* Fixme adding vaidlate of income param */ + if(pDDraw->lpLcl->dwLocalFlags == 0x20000) + { + return DDERR_NOCOOPERATIVELEVELSET; + } + + if(pUnkOuter) + { + return CLASS_E_NOAGGREGATION; + } + + if(!pDDSD->dwFlags & DDSD_CAPS) + { + return DDERR_INVALIDPARAMS; + } + + if(!(pDDSD->dwFlags & DDSD_HEIGHT) && !(pDDSD->dwFlags & DDSD_HEIGHT) + && !(pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) + { + return DDERR_INVALIDPARAMS; + } + + else if(pDDSD->dwFlags & DDSD_HEIGHT && pDDSD->dwFlags & DDSD_HEIGHT + && pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + return DDERR_INVALIDPARAMS; + } /* FIXME count our how many surface we need */ @@ -74,9 +99,6 @@ DxHeapMemFree(slist_int); return DDERR_OUTOFMEMORY; } - - - for( count=0; count < num_of_surf; count++ ) { @@ -156,13 +178,9 @@ ThisSurfLcl->dwProcessId = GetCurrentProcessId(); - - - /* FIXME the lpLnk */ /* FIXME the ref counter */ } - /* Fixme call on DdCanCreate then on DdCreateSurface createsurface data here */ @@ -180,11 +198,11 @@ return DDERR_NOTINITIALIZED; } - if (mDdCanCreateSurface.ddRVal != DD_OK) - { + if (mDdCanCreateSurface.ddRVal != DD_OK) + { DX_STUB_str("mDdCanCreateSurface fail"); return DDERR_NOTINITIALIZED; - } + } mDdCreateSurface.lpDD = pDDraw->lpLcl->lpGbl; mDdCreateSurface.CreateSurface = pDDraw->lpLcl->lpGbl->lpDDCBtmp->HALDD.CreateSurface; @@ -195,12 +213,12 @@ if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) { - return DDERR_NOTINITIALIZED; + return DDERR_NOTINITIALIZED; } if (mDdCreateSurface.ddRVal != DD_OK) { - return mDdCreateSurface.ddRVal; + return mDdCreateSurface.ddRVal; } *ppSurf = &slist_int[0]->lpVtbl; @@ -233,7 +251,7 @@ return DDERR_OUTOFMEMORY; } - // That->lpLcl->lpSurfMore->slist = lpLcl; + // That->lpLcl->lpSurfMore->slist = lpLcl; That->lpVtbl = &DirectDrawSurface7_Vtable; That->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); @@ -263,38 +281,38 @@ mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; - - That->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - - This->lpLcl->lpPrimary = That; - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - That->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; - - That->lpLink = This->lpLcl->lpGbl->dsList; - This->lpLcl->lpGbl->dsList = That; - - return DD_OK; + + That->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; + + This->lpLcl->lpPrimary = That; + if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCanCreateSurface.ddRVal != DD_OK) + { + return DDERR_NOTINITIALIZED; + } + + mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; + + if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCreateSurface.ddRVal != DD_OK) + { + return mDdCreateSurface.ddRVal; + } + + That->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; + + That->lpLink = This->lpLcl->lpGbl->dsList; + This->lpLcl->lpGbl->dsList = That; + + return DD_OK; } HRESULT @@ -398,7 +416,6 @@ LPDDRAWI_DDRAWSURFACE_INT *That, LPDDSURFACEDESC2 pDDSD) { - DDSURFACEDESC mddsdOverlay; DDRAWI_DDRAWSURFACE_GBL mOverlayGlobal; DDRAWI_DDRAWSURFACE_LCL mOverlayLocal[6]; @@ -487,21 +504,21 @@ { j = (i + 1) % cSurfaces; - + /*if (!mHALInfo.lpDDSurfaceCallbacks->AddAttachedSurface(mpOverlayLocals[i], mpOverlayLocals[j])) - { + { // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); return DD_FALSE; }*/ - if (!DdAttachSurface(mpOverlayLocals[i], mpOverlayLocals[j])) - { + if (!DdAttachSurface(mpOverlayLocals[i], mpOverlayLocals[j])) + { // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); //printf("Fail to DdAttachSurface (%d:%d)\n", i, j); DX_STUB_str("DdAttachSurface fail"); return DD_FALSE; } - + } // DDHAL_CREATESURFACEDATA mDdCreateSurface; @@ -513,14 +530,14 @@ if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) { - DX_STUB_str("mDdCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); - return DDERR_NOTINITIALIZED; + DX_STUB_str("mDdCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); + return DDERR_NOTINITIALIZED; } if (mDdCreateSurface.ddRVal != DD_OK) { - DX_STUB_str("mDdCreateSurface fail"); + DX_STUB_str("mDdCreateSurface fail"); return mDdCreateSurface.ddRVal; } @@ -540,20 +557,17 @@ mDdUpdateOverlay.rSrc.right = 50; mDdUpdateOverlay.rSrc.bottom = 50; - - - if ( mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) { - DX_STUB_str("UpdateOverlay fail"); - return DDERR_NOTINITIALIZED; + DX_STUB_str("UpdateOverlay fail"); + return DDERR_NOTINITIALIZED; } if (mDdUpdateOverlay.ddRVal != DD_OK) { DX_STUB_str("mDdUpdateOverlay fail"); - //printf("Fail to mDdUpdateOverlay mDdUpdateOverlay.ddRVal = %d:%s\n",(int)mDdUpdateOverlay.ddRVal,DDErrorString(mDdUpdateOverlay.ddRVal)); + //printf("Fail to mDdUpdateOverlay mDdUpdateOverlay.ddRVal = %d:%s\n",(int)mDdUpdateOverlay.ddRVal,DDErrorString(mDdUpdateOverlay.ddRVal)); return mDdUpdateOverlay.ddRVal; }

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