Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[peterw] 29861: - Added a small utility (chkslash) to check if a string contains a backslash '\', it's needed for the reladdr2line.cmd changes below. - Modified reladdr2line so that you can now use 'raddr2line ntdll.dll 7c90e143' instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can also use part of the file name ie. 'ntdll' instead of 'ntdll.dll' and it will match it. Searchs the current directory and all sub-directories. (does not match directories of course) (yes you can s
by peterw＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: peterw Date: Thu Oct 25 05:15:26 2007 New Revision: 29861 URL: http://svn.reactos.org/svn/reactos?rev=29861&view=rev Log: - Added a small utility (chkslash) to check if a string contains a backslash '\', it's needed for the reladdr2line.cmd changes below. - Modified reladdr2line so that you can now use 'raddr2line ntdll.dll 7c90e143' instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can also use part of the file name ie. 'ntdll' instead of 'ntdll.dll' and it will match it. Searchs the current directory and all sub-directories. (does not match directories of course) (yes you can still specify the full path if you like) - Some other miscellaneous cleanup. Added: trunk/tools/RosBE-Windows/Tools/chkslash.c (with props) Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE-Windows/Tools/chknewer.c trunk/tools/RosBE-Windows/Tools/makefile 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 Thu Oct 25 05:15:26 2007 @@ -5,64 +5,84 @@ :: PURPOSE: Converts a value to hex and displays it. :: COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> :: Daniel Reimer <reimer.daniel(a)freenet.de> +:: Peter Ward <dralnix(a)gmail.com> :: :: @echo off -title relAddr2Line... +title reladdr2line... + +:: +:: Clear variables before use. +:: +set _1= +set _2= :: :: Receive the Parameters and decide what to do. :: - -if "%1" == "" ( - goto :MAN +if not "%3" == "" ( + echo ERROR: Too many parameters specified. + goto :EOC ) if not "%1" == "" ( set _1=%1 - if "%2" == "" ( - goto :AUTO1 - ) else ( - set _2=%2 - goto :EOC - ) + call :CHECKPATH ) +if not "%2" == "" ( + set _2=%2 +) +call :INTERACTIVE -:: -:: If Parameters were set, parse them, if not, ask the user to add them. -:: -:MAN -set /p _1="Please enter the path to the executable to be examined: " -:AUTO1 -set /p _2="Please enter the address you would like to analyze: " - -:EOC -if not exist "%_1%\." ( - echo ERROR: The path specified doesn't seem to exist. - goto :END -) -if /i "%_1%" == "" ( - echo ERROR: You must enter a valid directory. - goto :END -) -if /i "%_2%" == "" ( - echo ERROR: You must enter a address to analyze. - goto :END -) +:RADD2RLINE :: :: First get the ImageBase of the File. If its smaller than the given :: Parameter, everything is ok, because it was already added onto the :: adress and can be given directly to raddr2line. If not, add it and :: give the result to raddr2line. :: +if %_1% == "" ( + echo ERROR: You must specify a path/file to examine. + goto :EOC +) +if not exist "%_1%\." ( + echo ERROR: The path specified doesn't seem to exist. + goto :EOC +) for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i if %%i lss %_2% ( - raddr2line "%_1%" "%_2%" 2>NUL + raddr2line "%_1%" "%_2%" ) else ( set /a baseaddr+=0x%_2% for /f %%i in ('"echoh %baseaddr%"') do set relbase=%%i - raddr2line "%_1%" "%relbase%" 2>NUL + raddr2line "%_1%" "%relbase%" ) +goto :EOC -:END +:: +:: If Parameters were set, parse them, if not, ask the user to add them. +:: +:INTERACTIVE +if "%_1%" == "" ( + set /p _1="Please enter the path/file to be examined: " + call :CHECKPATH +) +if "%_2%" == "" ( + set /p _2="Please enter the address you would like to analyze: " +) +goto :EOF + +:: +:: Check if the user supplied a path, if they didn't look for +:: the specified file in the current directory and any +:: sub-directories. +:: +:CHECKPATH + chkslash %_1% + if errorlevel 2 ( + for /f "usebackq" %%i in (`"dir /a:-d /s /b %1 | findstr "%_1%""`) do set _1=%%i + ) +goto :EOF + +:EOC title ReactOS Build Environment %_ROSBE_VERSION% Modified: trunk/tools/RosBE-Windows/Tools/chknewer.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chknewer… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chknewer.c (original) +++ trunk/tools/RosBE-Windows/Tools/chknewer.c Thu Oct 25 05:15:26 2007 @@ -11,11 +11,10 @@ #include <sys/types.h> #include <sys/stat.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> time_t -StatFile( +getfmodtime( char* FileName ); @@ -53,7 +52,7 @@ { printf("%s: Error closing file \"%s\"\n", argv[0], argv[1]); } - file1time = StatFile(argv[1]); + file1time = getfmodtime(argv[1]); if (!file1time) { printf("%s: Error unable to aquire stats for file: %s\n", argv[0], argv[1]); @@ -73,7 +72,7 @@ { printf("%s: Error closing file \"%s\"\n", argv[0], argv[2]); } - file2time = StatFile(argv[2]); + file2time = getfmodtime(argv[2]); if (!file2time) { printf("%s: Error unable to aquire stats for file: %s\n", argv[0], argv[2]); @@ -91,11 +90,11 @@ } } -time_t StatFile(char* FileName) +time_t getfmodtime(char* filename) { struct stat filestat; - if (!stat(FileName, &filestat)) + if (!stat(filename, &filestat)) { return mktime(localtime(&filestat.st_mtime)); } Added: trunk/tools/RosBE-Windows/Tools/chkslash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chkslash… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chkslash.c (added) +++ trunk/tools/RosBE-Windows/Tools/chkslash.c Thu Oct 25 05:15:26 2007 @@ -1,0 +1,49 @@ +/* + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. + * FILE: Tools/chkslash.c + * PURPOSE: Checks if a string has a backslash '\' in it or not. + * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> + * + */ + +#include <stdio.h> +#include <string.h> + +int main(int argc, char* argv[]) +{ + int hasslash = 0; + unsigned int i = 0; + + if (argc > 2) + { + printf("%s: Error too many parameters specified.\n", argv[0]); + return -1; + } + if ((argc == 1) || + (!strncmp(argv[1], "/?", 2)) || + (!strncmp(argv[1], "-h", 2)) || + (!strncmp(argv[1], "--help", 6))) + { + printf("Usage: %s STRING\n", argv[0]); + printf("Checks if STRING has a backslash or not. Returns\n"); + printf("1 if STRING has a backslash and 2 if not.\n\n"); + return 0; + } + for (i = 0; i < strlen(argv[1]); i++) + { + if (argv[1][i] == '\\') + { + hasslash = 1; + } + } + + if (hasslash) + { + return 1; + } + else + { + return 2; + } +} Propchange: trunk/tools/RosBE-Windows/Tools/chkslash.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/makefile Thu Oct 25 05:15:26 2007 @@ -7,13 +7,16 @@ LFLAGS := -s WINVER := 0x502 -all: buildtime chknewer cpucount echoh flash getdate +all: buildtime chknewer chkslash cpucount echoh flash getdate buildtime: buildtime.c ${CC} ${CFLAGS} buildtime buildtime.c chknewer: chknewer.c ${CC} ${CFLAGS} chknewer chknewer.c + +chkslash: chkslash.c + ${CC} ${CFLAGS} chkslash chkslash.c cpucount: cpucount.c ${CC} ${CFLAGS} cpucount cpucount.c @@ -28,4 +31,4 @@ ${CC} ${CFLAGS} getdate getdate.c clean: - del /f buildtime.exe chknewer.exe cpucount.exe echoh.exe flash.exe getdate.exe + del /f buildtime.exe chknewer.exe chkslash.exe cpucount.exe echoh.exe flash.exe getdate.exe

1 0

[mpiulachs] 29860: Build files updates and fixes
by mpiulachs＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: mpiulachs Date: Thu Oct 25 05:15:21 2007 New Revision: 29860 URL: http://svn.reactos.org/svn/reactos?rev=29860&view=rev Log: Build files updates and fixes Added: trunk/rosapps/sysutils/tcat/tcat.rbuild - copied unchanged from r29859, trunk/rosapps/sysutils/tcat/cat.rbuild Removed: trunk/rosapps/sysutils/tcat/cat.rbuild Modified: trunk/rosapps/cmdutils/cmdutils.rbuild trunk/rosapps/cmdutils/uptime/uptime.rbuild trunk/rosapps/directory.rbuild trunk/rosapps/sysutils/sysutils.rbuild trunk/rosapps/sysutils/utils/binpatch/binpatch.rbuild trunk/rosapps/sysutils/utils/cat/cat.rbuild trunk/rosapps/sysutils/utils/driver/load/load.rbuild trunk/rosapps/sysutils/utils/driver/unload/unload.rbuild trunk/rosapps/sysutils/utils/infinst/infinst.rbuild trunk/rosapps/sysutils/utils/stats/stats.rbuild trunk/rosapps/sysutils/utils/tickcount/tickcount.rbuild Modified: trunk/rosapps/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cmdutils/cmdutils.rbuild?r… ============================================================================== --- trunk/rosapps/cmdutils/cmdutils.rbuild (original) +++ trunk/rosapps/cmdutils/cmdutils.rbuild Thu Oct 25 05:15:21 2007 @@ -18,4 +18,7 @@ <directory name="y"> <xi:include href="y/y.rbuild" /> </directory> + <directory name="uptime"> + <xi:include href="uptime/uptime.rbuild" /> + </directory> </group> Modified: trunk/rosapps/cmdutils/uptime/uptime.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cmdutils/uptime/uptime.rbu… ============================================================================== --- trunk/rosapps/cmdutils/uptime/uptime.rbuild (original) +++ trunk/rosapps/cmdutils/uptime/uptime.rbuild Thu Oct 25 05:15:21 2007 @@ -1,4 +1,4 @@ -<module name="uptime" type="win32cui" installbase="system32" installname="uptime.exe"> +<module name="uptime" type="win32cui" installbase="system32" installname="uptime.exe" allowwarnings="true"> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=29860… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Thu Oct 25 05:15:21 2007 @@ -26,11 +26,19 @@ <directory name="downloader"> <xi:include href="downloader/downloader.rbuild" /> </directory> - + <directory name="fontview"> <xi:include href="fontview/fontview.rbuild" /> </directory> - + <directory name="gettype"> <xi:include href="gettype/gettype.rbuild" /> </directory> Modified: trunk/rosapps/sysutils/sysutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/sysutils.rbuild?r… ============================================================================== --- trunk/rosapps/sysutils/sysutils.rbuild (original) +++ trunk/rosapps/sysutils/sysutils.rbuild Thu Oct 25 05:15:21 2007 @@ -39,7 +39,11 @@ </directory> <directory name="tcat"> - <xi:include href="tcat/cat.rbuild" /> + <xi:include href="tcat/tcat.rbuild" /> + </directory> + + <directory name="utils"> + <xi:include href="utils/utils.rbuild" /> </directory> <directory name="tlist"> Removed: trunk/rosapps/sysutils/tcat/cat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/tcat/cat.rbuild?r… ============================================================================== --- trunk/rosapps/sysutils/tcat/cat.rbuild (original) +++ trunk/rosapps/sysutils/tcat/cat.rbuild (removed) @@ -1,8 +1,0 @@ -<module name="tcat" type="win32cui" installbase="system32" installname="tcat.exe"> - <define name="__USE_W32API" /> - <library>ntdll</library> - <library>kernel32</library> - <library>user32</library> - - <file>cat.c</file> -</module> Modified: trunk/rosapps/sysutils/utils/binpatch/binpatch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/binpatch/bi… ============================================================================== --- trunk/rosapps/sysutils/utils/binpatch/binpatch.rbuild (original) +++ trunk/rosapps/sysutils/utils/binpatch/binpatch.rbuild Thu Oct 25 05:15:21 2007 @@ -1,6 +1,5 @@ <module name="binpatch" type="win32cui" installbase="bin" installname="binpatch.exe" > <define name="__USE_W32API" /> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> <file>patch.c</file> Modified: trunk/rosapps/sysutils/utils/cat/cat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/cat/cat.rbu… ============================================================================== --- trunk/rosapps/sysutils/utils/cat/cat.rbuild (original) +++ trunk/rosapps/sysutils/utils/cat/cat.rbuild Thu Oct 25 05:15:21 2007 @@ -1,6 +1,5 @@ <module name="cat" type="win32cui" installbase="bin" installname="cat.exe" > <define name="__USE_W32API" /> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> <file>cat.c</file> Modified: trunk/rosapps/sysutils/utils/driver/load/load.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/driver/load… ============================================================================== --- trunk/rosapps/sysutils/utils/driver/load/load.rbuild (original) +++ trunk/rosapps/sysutils/utils/driver/load/load.rbuild Thu Oct 25 05:15:21 2007 @@ -1,6 +1,5 @@ <module name="load" type="win32cui" installbase="bin" installname="load.exe" unicode="true" > <define name="__USE_W32API" /> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> <library>user32</library> Modified: trunk/rosapps/sysutils/utils/driver/unload/unload.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/driver/unlo… ============================================================================== --- trunk/rosapps/sysutils/utils/driver/unload/unload.rbuild (original) +++ trunk/rosapps/sysutils/utils/driver/unload/unload.rbuild Thu Oct 25 05:15:21 2007 @@ -1,6 +1,5 @@ <module name="unload" type="win32cui" installbase="bin" installname="unload.exe" unicode="true"> <define name="__USE_W32API" /> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> <library>user32</library> Modified: trunk/rosapps/sysutils/utils/infinst/infinst.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/infinst/inf… ============================================================================== --- trunk/rosapps/sysutils/utils/infinst/infinst.rbuild (original) +++ trunk/rosapps/sysutils/utils/infinst/infinst.rbuild Thu Oct 25 05:15:21 2007 @@ -1,6 +1,5 @@ <module name="infinst" type="win32cui" installbase="bin" installname="infinst.exe" > <define name="__USE_W32API" /> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> <library>user32</library> Modified: trunk/rosapps/sysutils/utils/stats/stats.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/stats/stats… ============================================================================== --- trunk/rosapps/sysutils/utils/stats/stats.rbuild (original) +++ trunk/rosapps/sysutils/utils/stats/stats.rbuild Thu Oct 25 05:15:21 2007 @@ -1,8 +1,5 @@ <module name="stats" type="win32cui" installbase="bin" installname="stats.exe" unicode="true" > <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> <file>stats.c</file> Modified: trunk/rosapps/sysutils/utils/tickcount/tickcount.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/tickcount/t… ============================================================================== --- trunk/rosapps/sysutils/utils/tickcount/tickcount.rbuild (original) +++ trunk/rosapps/sysutils/utils/tickcount/tickcount.rbuild Thu Oct 25 05:15:21 2007 @@ -1,8 +1,5 @@ <module name="tickcount" type="win32cui" installbase="bin" installname="tickcount.exe" unicode="true" > <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> <file>tickcount.c</file>

1 0

[greatlrd] 29859: Fix the build of ReactX and smaller typos
by greatlrd＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: greatlrd Date: Thu Oct 25 03:18:05 2007 New Revision: 29859 URL: http://svn.reactos.org/svn/reactos?rev=29859&view=rev Log: Fix the build of ReactX and smaller typos Modified: branches/reactx/reactos/drivers/directx/dxg/dxg_int.h branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg_int.h (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg_int.h Thu Oct 25 03:18:05 2007 @@ -20,6 +20,8 @@ #include <prntfont.h> #include <dde.h> #include <wincon.h> + +#include <reactos/drivers/directx/directxint.h> #include <reactos/win32k/ntgdityp.h> #include <reactos/win32k/ntgdihdl.h> @@ -44,3 +46,10 @@ BOOL DdHmgCreate(); BOOL DdHmgDestroy(); +/* define stuff */ +#define drvDxEngLockDC gpEngFuncs[DXENG_INDEX_DxEngLockDC] +#define drvDxEngGetDCState gpEngFuncs[DXENG_INDEX_DxEngGetDCState] +#define drvDxEngGetHdevData gpEngFuncs[DXENG_INDEX_DxEngGetHdevData] +#define drvDxEngUnlockDC gpEngFuncs[DXENG_INDEX_DxEngUnlockDC] +#define drvDxEngUnlockHdev gpEngFuncs[DXENG_INDEX_DxEngUnlockHdev] +#define drvDxEngLockHdev gpEngFuncs[DXENG_INDEX_DxEngLockHdev] Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Thu Oct 25 03:18:05 2007 @@ -132,8 +132,7 @@ /* resverd in msdn for internal use in win32k */ #define HDEVGETDATA_DWRESERVED19 1 -/* Get the destory palette functions */ -#define HDEVGETDATA_PFN_DESTORYPALETTE 2 +#define HDEVGETDATA_PALETTECALLBACKS_DWFLAGS 2 /* resverd in msdn for internal use in win32k */ #define HDEVGETDATA_DWRESERVED24 3 @@ -141,7 +140,6 @@ /* Unknown */ #define HDEVGETDATA_UNK_54C_20 4 -/* Get the DD_CALLBACKS dwSize member value */ #define DEVGETDATA_PALETTECALLBACKS_DWSIZE 5 /* Unknown */ Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Thu Oct 25 03:18:05 2007 @@ -318,8 +318,8 @@ case HDEVGETDATA_DWRESERVED19: return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved19; - case HDEVGETDATA_PFN_DESTORYPALETTE: - return (DWORD)pEDDgpl->ddPaletteCallbacks.DestroyPalette; + case HDEVGETDATA_PALETTECALLBACKS_DWFLAGS: + return (DWORD)pEDDgpl->ddPaletteCallbacks.dwFlags; case HDEVGETDATA_DWRESERVED24: return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved24;

1 0

[greatlrd] 29858: Implement DxEngGetHdevData after some old notes I found , hope every things works. Partly implement DxEngGetDCState
by greatlrd＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: greatlrd Date: Thu Oct 25 02:52:13 2007 New Revision: 29858 URL: http://svn.reactos.org/svn/reactos?rev=29858&view=rev Log: Implement DxEngGetHdevData after some old notes I found , hope every things works. Partly implement DxEngGetDCState Modified: branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h Thu Oct 25 02:52:13 2007 @@ -1,6 +1,9 @@ #ifndef __WIN32K_FLOAT_H #define __WIN32K_FLOAT_H + +#include <reactos/win32k/ntgdityp.h> +#include <reactos/win32k/ntgdihdl.h> #include "dc.h" #include "math.h" #include <ft2build.h> Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Thu Oct 25 02:52:13 2007 @@ -3,6 +3,7 @@ #include <ddrawint.h> #include <ddkernel.h> +#include <reactos/drivers/directx/directxint.h> #include <reactos/drivers/directx/dxg.h> #include <reactos/drivers/directx/dxeng.h> Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Thu Oct 25 02:52:13 2007 @@ -306,10 +306,70 @@ /************************************************************************/ /* DxEngGetHdevData */ /************************************************************************/ -DWORD DxEngGetHdevData(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; +DWORD +DxEngGetHdevData(PEDD_DIRECTDRAW_GLOBAL pEDDgpl, + DWORD Index) +{ + switch (Index) + { + case HDEVGETDATA_UNK_54C_8: + return (DWORD)pEDDgpl->unk_54c[8]; + + case HDEVGETDATA_DWRESERVED19: + return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved19; + + case HDEVGETDATA_PFN_DESTORYPALETTE: + return (DWORD)pEDDgpl->ddPaletteCallbacks.DestroyPalette; + + case HDEVGETDATA_DWRESERVED24: + return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved24; + + case HDEVGETDATA_UNK_54C_20: + return (DWORD)pEDDgpl->unk_54c[20]; + + case DEVGETDATA_PALETTECALLBACKS_DWSIZE: + return (DWORD)pEDDgpl->ddPaletteCallbacks.dwSize; + + case HDEVGETDATA_UNK_70C: + return (DWORD)pEDDgpl->unk_70C; + + case HDEVGETDATA_SURFACECALLBACK_DWFLAGS: + return (DWORD)pEDDgpl->ddSurfaceCallbacks.dwFlags; + + case HDEVGETDATA_UNK_588: + return (DWORD)pEDDgpl->unk_54c[15]; + + case HDEVGETDATA_UNK_01C_F400: + return (DWORD)pEDDgpl->unk_01c[1] & 0x400; + + case HDEVGETDATA_UNK_01C_F20000: + return (DWORD)pEDDgpl->unk_01c[1] & 0x20000; + + case 0x0B: + return (DWORD)pEDDgpl->unk_01c[1] & 0x1; + + case 0x0C: + return (DWORD)pEDDgpl->unk_01c[0]; + + case HDEVGETDATA_CDRIVERREF: + return (DWORD) (pEDDgpl->cDriverReferences) ? TRUE : FALSE ; + + case 0x11: + return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved8 & 0x100; + + case HDEVGETDATA_PFN_SETPALETTE: + return (DWORD)pEDDgpl->ddSurfaceCallbacks.SetPalette; + + case 0x13: + return (DWORD)pEDDgpl->unk_54c[0x0A]; + + case 0x14: + return (DWORD)pEDDgpl->unk_01c[1] & 0x80000; + + default: + break; + } + return 0; } /************************************************************************/ @@ -369,10 +429,34 @@ /************************************************************************/ /* DxEngGetDCState */ /************************************************************************/ -DWORD DxEngGetDCState(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; +DWORD +DxEngGetDCState(HDC hDC, + DWORD type) +{ + PEDD_DIRECTDRAW_GLOBAL pEDDgpl = NULL; + PDC pDC = DC_LockDc(hDC); + if (pDC) + { + switch (type) + { + case 1: + UNIMPLEMENTED; + return 0; + case 2: + UNIMPLEMENTED; + return 0; + case 3: + pEDDgpl = pDC->pEDDgpl; + DC_UnlockDc(pDC); + return (DWORD)pEDDgpl; + + default: + UNIMPLEMENTED; + break; + } + } + + return 0; } /************************************************************************/

1 0

[greatlrd] 29857: Header fix only --------------------- update DxEngGetHdevData define values in dxeng.h add new member to PDEV the _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; add missing struct D3DNTHAL_CALLBACKS2 and D3DNTHAL_CALLBACKS3 to ddk/d3dnthal.h add missing struct _EDD_DIRECTDRAW_LOCAL to directxint.h from "Windows Graphics Programming Win32 GDI and DirectDraw by Feng Yuan" fixed smaller typos in directxint.h
by greatlrd＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: greatlrd Date: Thu Oct 25 02:49:06 2007 New Revision: 29857 URL: http://svn.reactos.org/svn/reactos?rev=29857&view=rev Log: Header fix only --------------------- update DxEngGetHdevData define values in dxeng.h add new member to PDEV the _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; add missing struct D3DNTHAL_CALLBACKS2 and D3DNTHAL_CALLBACKS3 to ddk/d3dnthal.h add missing struct _EDD_DIRECTDRAW_LOCAL to directxint.h from "Windows Graphics Programming Win32 GDI and DirectDraw by Feng Yuan" fixed smaller typos in directxint.h Modified: branches/reactx/reactos/include/ddk/d3dnthal.h branches/reactx/reactos/include/reactos/drivers/directx/directxint.h branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h branches/reactx/reactos/include/reactos/drivers/directx/dxg.h branches/reactx/reactos/include/reactos/win32k/ntgdihdl.h Modified: branches/reactx/reactos/include/ddk/d3dnthal.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/ddk/d3dn… ============================================================================== --- branches/reactx/reactos/include/ddk/d3dnthal.h (original) +++ branches/reactx/reactos/include/ddk/d3dnthal.h Thu Oct 25 02:49:06 2007 @@ -167,6 +167,36 @@ ULONG_PTR dwReserved9; } D3DNTHAL_CALLBACKS, *LPD3DNTHAL_CALLBACKS; +typedef DWORD (APIENTRY *LPD3DNTHAL_SETRENDERTARGETCB)(LPD3DNTHAL_SETRENDERTARGETDATA); + +typedef struct _D3DNTHAL_CALLBACKS2 +{ + DWORD dwSize; + DWORD dwFlags; + + LPD3DNTHAL_SETRENDERTARGETCB SetRenderTarget; + LPVOID dwReserved1; + LPVOID dwReserved2; + LPVOID dwReserved3; + LPVOID dwReserved4; +} D3DNTHAL_CALLBACKS2, *LPD3DNTHAL_CALLBACKS2; + +typedef DWORD (APIENTRY *LPD3DNTHAL_CLEAR2CB)(LPD3DNTHAL_CLEAR2DATA); +typedef DWORD (APIENTRY *LPD3DNTHAL_VALIDATETEXTURESTAGESTATECB)(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA); +typedef DWORD (APIENTRY *LPD3DNTHAL_DRAWPRIMITIVES2CB)(LPD3DNTHAL_DRAWPRIMITIVES2DATA); + +typedef struct _D3DNTHAL_CALLBACKS3 +{ + DWORD dwSize; + DWORD dwFlags; + + LPD3DNTHAL_CLEAR2CB Clear2; + LPVOID lpvReserved; + LPD3DNTHAL_VALIDATETEXTURESTAGESTATECB ValidateTextureStageState; + LPD3DNTHAL_DRAWPRIMITIVES2CB DrawPrimitives2; +} D3DNTHAL_CALLBACKS3, *LPD3DNTHAL_CALLBACKS3; + + typedef struct _D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA { ULONG_PTR dwhContext; Modified: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/directxint.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/directxint.h Thu Oct 25 02:49:06 2007 @@ -1,20 +1,31 @@ -// -// Surface Object Flags -// -#define DDPF_ALPHAPIXELS 0x0001 -#define DDPF_ALPHA 0x0002 -#define DDPF_FOURCC 0x0004 -#define DDPF_PALETTEINDEXED4 0x0008 -#define DDPF_PALETTEINDEXEDTO8 0x0010 -#define DDPF_PALETTEINDEXED8 0x0020 -#define DDPF_RGB 0x0040 -#define DDPF_COMPRESSED 0x0080 -#define DDPF_RGBTOYUV 0x0100 -#define DDPF_YUV 0x0200 -#define DDPF_ZBUFFER 0x0400 -#define DDPF_PALETTEINDEXED1 0x0800 -#define DDPF_PALETTEINDEXED2 0x1000 -#define DDPF_ZPIXELS 0x2000 + +#ifndef _DXINTERNEL_ +#define _DXINTERNEL_ + +typedef struct _EDD_DIRECTDRAW_LOCAL +{ + // + // GDI Object Header + // + HANDLE hHmgr; + PVOID pEntry; + INT cExcLock; + HANDLE Tid; + + struct _EDD_DIRECTDRAW_GLOBAL * peDirectDrawGlobal; + struct _EDD_DIRECTDRAW_GLOBAL * peDirectDrawGlobal2; + struct _EDD_SURFACE * peSurface_DdList; + ULONG unk_01c[2]; + struct _EDD_DIRECTDRAW_LOCAL * peDirectDrawLocalNext; + FLATPTR fpProcess; + FLONG fl; + HANDLE UniqueProcess; + PEPROCESS Process; + ULONG unk_038[2]; + VOID *unk_040; + VOID *unk_044; +} EDD_DIRECTDRAW_LOCAL, PEDD_DIRECTDRAW_LOCAL; + // // Surface Object @@ -33,7 +44,7 @@ // Direct Draw Surface Data // DD_SURFACE_LOCAL ddsSurfaceLocal; - DD_SURCFACE_MORE ddsSurfaceMore; + DD_SURFACE_MORE ddsSurfaceMore; DD_SURFACE_GLOBAL ddsSurfaceGlobal; DD_SURFACE_INT ddsSurfaceInt; @@ -77,7 +88,7 @@ // // Surface Lock // - ERECTL rclLock; + RECTL rclLock; ULONG field_FC[2]; } EDD_SURFACE, *PEDD_SURFACE; @@ -89,17 +100,17 @@ /* 0x008 */ DWORD dwReserved2; /* 0x00C */ ULONG unk_000c[3]; /* 0x018 */ LONG cDriverReferences; -/* 0x01C */ ULONG unk_01c[3]; /* CallBackFlags ? */ +/* 0x01C */ ULONG unk_01c[3]; /* 0x028 */ LONGLONG llAssertModeTimeout; /* 0x030 */ DWORD dwNumHeaps; /* 0x034 */ VIDEOMEMORY *pvmList; /* 0x038 */ DWORD dwNumFourCC; /* 0x03C */ PDWORD pdwFourCC; -/* 0x040 */ DD_HHALINFO ddHalInfo; +/* 0x040 */ DD_HALINFO ddHalInfo; /* 0x1E0 */ ULONG unk_1e0[44]; /* 0x290 */ DD_CALLBACKS ddCallbacks; /* 0x2C4 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; -/* 0x304 */ DD_PALETTE_CALLBACKS ddPaletteCallbacks; +/* 0x304 */ DD_PALETTECALLBACKS ddPaletteCallbacks; /* 0x314 */ ULONG unk_314[48]; /* 0x3D4 */ D3DNTHAL_CALLBACKS d3dNtHalCallbacks; /* 0x460 */ ULONG unk_460[7]; @@ -127,4 +138,4 @@ /* 0x70C */ ULONG unk_70C; } EDD_DIRECTDRAW_GLOBAL, *PEDD_DIRECTDRAW_GLOBAL; - +#endif Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Thu Oct 25 02:49:06 2007 @@ -95,14 +95,14 @@ DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngSpSpritesVisible(DWORD x1); -DWORD DxEngGetHdevData(DWORD x1, DWORD x2); +DWORD DxEngGetHdevData(PEDD_DIRECTDRAW_GLOBAL pEDDgpl, DWORD Index); DWORD DxEngSetHdevData(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngDeleteDC(DWORD x1, DWORD x2); DWORD DxEngCleanDC(DWORD x1); DWORD DxEngSetDCOwner(DWORD x1, DWORD x2); DWORD DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); -DWORD DxEngGetDCState(DWORD x1, DWORD x2); +DWORD DxEngGetDCState(HDC hDC, DWORD type); DWORD DxEngSelectBitmap(DWORD x1, DWORD x2); DWORD DxEngSetBitmapOwner(DWORD x1, DWORD x2); DWORD DxEngDeleteSurface(DWORD x1); @@ -147,6 +147,18 @@ /* Unknown */ #define HDEVGETDATA_UNK_70C 6 +/* Get the DD_SURFACECALLBACKS dwFlag member value */ +#define HDEVGETDATA_SURFACECALLBACK_DWFLAGS 7 + +/* Unknown */ +#define HDEVGETDATA_UNK_588 8 + +/* Unknown */ +#define HDEVGETDATA_UNK_01C_F400 9 + +/* Unknown */ +#define HDEVGETDATA_UNK_01C_F20000 10 + /* Get if the driver is refens or not */ #define HDEVGETDATA_CDRIVERREF 16 Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxg.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxg.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxg.h Thu Oct 25 02:49:06 2007 @@ -120,7 +120,7 @@ /***********************************************************************************/ /* Driver Functions Protypes */ /***********************************************************************************/ -typedef DWORD (NTAPI *PGD_DXDXGGENERICTHUNK)(ULONG_PTR, ULONG_PTR, SIZE_T *, PVOID, SIZE_T *, PVOID); +typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID); //typedef x (NTAPI *PGD_DxD3dContextCreate)( //typedef x (NTAPI *PGD_DxD3dContextDestroy)( //typedef x (NTAPI *PGD_DxD3dContextDestroyAll)( Modified: branches/reactx/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ branches/reactx/reactos/include/reactos/win32k/ntgdihdl.h Thu Oct 25 02:49:06 2007 @@ -473,6 +473,9 @@ DHPDEV PDev; INT DC_Type; INT DC_Flags; + + struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; + PDC_ATTR pDc_Attr; DC_ATTR Dc_Attr;

1 0

[cfinck] 29856: Replace "LTEXT ... SS_CENTER" by a simple "CTEXT"
by cfinck＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: cfinck Date: Thu Oct 25 00:26:13 2007 New Revision: 29856 URL: http://svn.reactos.org/svn/reactos?rev=29856&view=rev Log: Replace "LTEXT ... SS_CENTER" by a simple "CTEXT" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc Thu Oct 25 00:26:13 2007 @@ -45,7 +45,7 @@ CAPTION "Bitte warten.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ereignis-Protokolle werden geladen. Bitte warten...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX + CTEXT "Ereignis-Protokolle werden geladen. Bitte warten...",IDC_STATIC,0,15,230,8,SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc Thu Oct 25 00:26:13 2007 @@ -45,7 +45,7 @@ CAPTION "Wait.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Loading Event Logs. Please wait ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX + CTEXT "Loading Event Logs. Please wait ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc Thu Oct 25 00:26:13 2007 @@ -45,7 +45,7 @@ CAPTION "Wait.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Recuperando eventos. Por favor, espere ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX + CTEXT "Recuperando eventos. Por favor, espere ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc Thu Oct 25 00:26:13 2007 @@ -45,7 +45,7 @@ CAPTION "Patientez.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Chargement des journaux d'événements. Veuillez patienter ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX + CTEXT "Chargement des journaux d'événements. Veuillez patienter ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc Thu Oct 25 00:26:13 2007 @@ -45,7 +45,7 @@ CAPTION "Ïîäîæäèòå.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Èäåò çàãðóçêà. Ïîäîæäèòå ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX + CTEXT "Èäåò çàãðóçêà. Ïîäîæäèòå ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282

1 0

[greatlrd] 29855: Update the dxeng.h header with some more info format the struct _EDD_DIRECTDRAW_GLOBAL as Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw Update the _EDD_DIRECTDRAW_GLOBAL struct with some private notes. (it is not all notes I have of it yet)
by greatlrd＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: greatlrd Date: Wed Oct 24 23:35:31 2007 New Revision: 29855 URL: http://svn.reactos.org/svn/reactos?rev=29855&view=rev Log: Update the dxeng.h header with some more info format the struct _EDD_DIRECTDRAW_GLOBAL as Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw Update the _EDD_DIRECTDRAW_GLOBAL struct with some private notes. (it is not all notes I have of it yet) Modified: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Modified: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/directxint.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/directxint.h Wed Oct 24 23:35:31 2007 @@ -84,42 +84,47 @@ typedef struct _EDD_DIRECTDRAW_GLOBAL { - PVOID dhpdev; - DWORD dwReserved1; - DWORD dwReserved2; - ULONG unk_000c[3]; - LONG cDriverReferences; - ULONG unk_01c[3]; - LONGLONG llAssertModeTimeout; - DWORD dwNumHeaps; - VIDEOMEMORY *pvmList; - DWORD dwNumFourCC; - PDWORD pdwFourCC; - DD_HHALINFO ddHalInfo; - ULONG unk_1e0[44]; - DD_CALLBACKS ddCallbacks; - DD_SURFACECALLBACKS ddSurfaceCallbacks; - DD_PALETTE_CALLBACKS ddPaletteCallbacks; - ULONG unk_314[48]; - D3DNTHAL_CALLBACKS d3dNtHalCallbacks; - ULONG unk_460[7]; - D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; - ULONG unk_498[18]; - DD_MISCELLANEOUSCALLBACKS ddMiscellanousCallbacks; - ULONG unk_4ec[18]; - D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; - ULONG unk_54c[23]; - EDD_DIRECTDRAW_LOCAL* peDirectDrawLocalList; - EDD_SURFACE* peSurface_LockList; - FLONG fl; - ULONG cSurfaceLocks; - PKEVENT pAssertModeEvent; - EDD_SURFACE *peSurfaceCurrent; - EDD_SURFACE *peSurfacePrimary; - BOOL bSuspended; - ULONG unk_5c8[12]; - RECTL rcbounds; - HDEV hDev; - ULONG unk_60c; +/* 0x000 */ PVOID dhpdev; /* The assign pdev */ +/* 0x004 */ DWORD dwReserved1; +/* 0x008 */ DWORD dwReserved2; +/* 0x00C */ ULONG unk_000c[3]; +/* 0x018 */ LONG cDriverReferences; +/* 0x01C */ ULONG unk_01c[3]; /* CallBackFlags ? */ +/* 0x028 */ LONGLONG llAssertModeTimeout; +/* 0x030 */ DWORD dwNumHeaps; +/* 0x034 */ VIDEOMEMORY *pvmList; +/* 0x038 */ DWORD dwNumFourCC; +/* 0x03C */ PDWORD pdwFourCC; +/* 0x040 */ DD_HHALINFO ddHalInfo; +/* 0x1E0 */ ULONG unk_1e0[44]; +/* 0x290 */ DD_CALLBACKS ddCallbacks; +/* 0x2C4 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; +/* 0x304 */ DD_PALETTE_CALLBACKS ddPaletteCallbacks; +/* 0x314 */ ULONG unk_314[48]; +/* 0x3D4 */ D3DNTHAL_CALLBACKS d3dNtHalCallbacks; +/* 0x460 */ ULONG unk_460[7]; +/* 0x47C */ D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; +/* 0x498 */ ULONG unk_498[18]; +/* 0x4E0 */ DD_MISCELLANEOUSCALLBACKS ddMiscellanousCallbacks; +/* 0x4EC */ ULONG unk_4ec[18]; +/* 0x534 */ D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; +/* 0x54C */ ULONG unk_54c[23]; +/* 0x5A8 */ EDD_DIRECTDRAW_LOCAL* peDirectDrawLocalList; +/* 0x5ac */ EDD_SURFACE* peSurface_LockList; +/* 0x5B0 */ FLONG fl; +/* 0x5B4 */ ULONG cSurfaceLocks; +/* 0x5B8 */ PKEVENT pAssertModeEvent; +/* 0x5Bc */ EDD_SURFACE *peSurfaceCurrent; +/* 0x5C0 */ EDD_SURFACE *peSurfacePrimary; +/* 0x5C4 */ BOOL bSuspended; +/* 0x5C8 */ ULONG unk_5c8[12]; +/* 0x5F8 */ RECTL rcbounds; +/* 0x608 */ HDEV hDev; +/* 0x60c */ PVOID hPDev; /* The real Pdev */ + +/* Windows XP and higher */ +/* 0x610 */ ULONG unk_610[63]; +/* 0x70C */ ULONG unk_70C; } EDD_DIRECTDRAW_GLOBAL, *PEDD_DIRECTDRAW_GLOBAL; + Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Wed Oct 24 23:35:31 2007 @@ -118,6 +118,40 @@ DWORD DxEngIncDispUniq(); +/******************************************************/ +/* DxEngGetHdevData define value for the Index param */ +/* This value are not document in msdn or ddk, they */ +/* optain with blackbox win32k and reading the BOOK */ +/* "Windows Graphics Programming Win32 Gdi And */ +/* Directdraw of Feng Yuan" and use you head */ +/******************************************************/ + +/* Unknown */ +#define HDEVGETDATA_UNK_54C_8 0 + +/* resverd in msdn for internal use in win32k */ +#define HDEVGETDATA_DWRESERVED19 1 + +/* Get the destory palette functions */ +#define HDEVGETDATA_PFN_DESTORYPALETTE 2 + +/* resverd in msdn for internal use in win32k */ +#define HDEVGETDATA_DWRESERVED24 3 + +/* Unknown */ +#define HDEVGETDATA_UNK_54C_20 4 + +/* Get the DD_CALLBACKS dwSize member value */ +#define DEVGETDATA_PALETTECALLBACKS_DWSIZE 5 + +/* Unknown */ +#define HDEVGETDATA_UNK_70C 6 + +/* Get if the driver is refens or not */ +#define HDEVGETDATA_CDRIVERREF 16 + +/* Get the Set palette functions */ +#define HDEVGETDATA_PFN_SETPALETTE 18 @@ -127,3 +161,5 @@ + +

1 0

[dreimer] 29854: Improve the GUI to be easier to understand.
by dreimer＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: dreimer Date: Wed Oct 24 20:42:07 2007 New Revision: 29854 URL: http://svn.reactos.org/svn/reactos?rev=29854&view=rev Log: Improve the GUI to be easier to understand. Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Wed Oct 24 20:42:07 2007 @@ -5,28 +5,28 @@ CAPTION "RosBE Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Reactos Build Environment Einstellungen", 0x0, 10, 10, 140, 13 - LTEXT "Hintergrundfarbe", 0x0, 10, 35, 60, 12 - COMBOBOX IDC_BACK, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Schriftfarbe", 0x0, 10, 60, 60, 12 - COMBOBOX IDC_FONT, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "Beispieltext", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 10, 85, 235, 15 - CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 100, 95, 21 - CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 100, 95, 21 - CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 95, 21 - CONTROL "Daten strippen", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 120, 95, 21 - CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 140, 95, 21 - CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 140, 95, 21 - EDITTEXT ID_LOGDIR, 10, 160, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSE, 215, 160, 30, 13, WS_TABSTOP | WS_DISABLED - EDITTEXT ID_MGWDIR, 10, 178, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 178, 30, 13, WS_TABSTOP - EDITTEXT ID_OBJDIR, 10, 196, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOBJ, 215, 196, 30, 13, WS_TABSTOP | WS_DISABLED - EDITTEXT ID_OUTDIR, 10, 214, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOUT, 215, 214, 30, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Speichern", ID_OK, 63, 240, 59, 26, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 240, 59, 26, WS_TABSTOP + LTEXT "Pfad zum Kompiler", 0x0, 10, 107, 110, 15 + LTEXT "Hintergrundfarbe", 0x0, 10, 10, 75, 12 + COMBOBOX IDC_BACK, 100, 10, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Schriftfarbe", 0x0, 10, 35, 75, 12 + COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "Beispieltext", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 + CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 110, 12 + CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 110, 12 + CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 110, 12 + CONTROL "Daten strippen", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 110, 12 + CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 110, 12 + CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 110, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Speichern", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP END STRINGTABLE Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Wed Oct 24 20:42:07 2007 @@ -2,31 +2,31 @@ ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 270 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "RosBE Settings" +CAPTION "ReactOS Build Environment Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Build Environment Settings", 0x0, 10, 10, 140, 13 - LTEXT "Background Color", 0x0, 10, 35, 60, 12 - COMBOBOX IDC_BACK, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Font Color", 0x0, 10, 60, 60, 12 - COMBOBOX IDC_FONT, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "Sample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 10, 85, 235, 15 - CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 100, 90, 21 - CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 100, 60, 21 - CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 90, 21 - CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 120, 60, 21 - CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 140, 95, 21 - CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 140, 95, 21 - EDITTEXT ID_LOGDIR, 10, 160, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSE, 215, 160, 30, 13, WS_TABSTOP | WS_DISABLED - EDITTEXT ID_MGWDIR, 10, 178, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 178, 30, 13, WS_TABSTOP - EDITTEXT ID_OBJDIR, 10, 196, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOBJ, 215, 196, 30, 13, WS_TABSTOP | WS_DISABLED - EDITTEXT ID_OUTDIR, 10, 214, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOUT, 215, 214, 30, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Save", ID_OK, 63, 240, 59, 26, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Cancel", ID_CANCEL, 133, 240, 59, 26, WS_TABSTOP + LTEXT "Path to gcc Compiler", 0x0, 10, 107, 110, 15 + LTEXT "Background Color", 0x0, 10, 10, 75, 12 + COMBOBOX IDC_BACK, 100, 10, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Font Color", 0x0, 10, 35, 75, 12 + COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "Sample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 + CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 110, 12 + CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 110, 12 + CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 110, 12 + CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 110, 12 + CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 110, 12 + CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 110, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Save", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Cancel", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP END STRINGTABLE Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Wed Oct 24 20:42:07 2007 @@ -2,31 +2,31 @@ ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 270 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Paramètre du RosBE" +CAPTION "Paramètres de l'Environnement de Compilation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Paramètres de l'Environnement de Compilation de ReactOS", 0x0, 10, 10, 240, 15 - LTEXT "Couleur d'arrière plan", 0x0, 10, 35, 60, 17 - COMBOBOX IDC_BACK, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Couleur de la police", 0x0, 10, 60, 60, 17 - COMBOBOX IDC_FONT, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "Texte d'exemple", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 10, 85, 235, 15 - CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 100, 110, 21 - CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 135, 100, 85, 21 - CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 90, 21 - CONTROL "Optimiser les fichiers", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 135, 120, 90, 21 - CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 140, 95, 21 - CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 140, 95, 21 - EDITTEXT ID_LOGDIR, 10, 160, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSE, 215, 160, 30, 13, WS_TABSTOP | WS_DISABLED - EDITTEXT ID_MGWDIR, 10, 178, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 178, 30, 13, WS_TABSTOP - EDITTEXT ID_OBJDIR, 10, 196, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOBJ, 215, 196, 30, 13, WS_TABSTOP | WS_DISABLED - EDITTEXT ID_OUTDIR, 10, 214, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOUT, 215, 214, 30, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Sauvegarder", ID_OK, 63, 240, 59, 26, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Annuler", ID_CANCEL, 133, 240, 59, 26, WS_TABSTOP + LTEXT "Path to gcc Compiler", 0x0, 10, 107, 110, 15 + LTEXT "Couleur d'arrière plan", 0x0, 10, 10, 75, 12 + COMBOBOX IDC_BACK, 100, 10, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Couleur de la police", 0x0, 10, 35, 75, 12 + COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "Texte d'exemple", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 + CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 110, 12 + CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 110, 12 + CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 110, 12 + CONTROL "Optimiser les fichiers", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 110, 12 + CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 110, 12 + CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 110, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 1, WS_TABSTOP | WS_DISABLED + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Sauvegarder", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Annuler", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP END STRINGTABLE Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Wed Oct 24 20:42:07 2007 @@ -4,31 +4,31 @@ ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 270 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêè RosBE" +CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ÐåàêòÎÑ" FONT 8,"MS Sans Serif",0,0 BEGIN - LTEXT "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ÐåàêòÎÑ", 0x0, 10, 10, 140, 13 - LTEXT "Öâåò Ôîíà", 0x0, 10, 35, 60, 12 - COMBOBOX IDC_BACK, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Öâåò Øðèôòà", 0x0, 10, 60, 60, 12 - COMBOBOX IDC_FONT, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "Sample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 10, 85, 235, 15 - CONTROL "Ïîêàçûâàòü Âðåìÿ", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 100, 90, 21 - CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 100, 60, 21 - CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 90, 21 - CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 120, 60, 21 - CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 140, 95, 21 - CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 140, 95, 21 - EDITTEXT ID_LOGDIR, 10, 160, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSE, 215, 160, 30, 13, WS_TABSTOP | WS_DISABLED - EDITTEXT ID_MGWDIR, 10, 178, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 178, 30, 13, WS_TABSTOP - EDITTEXT ID_OBJDIR, 10, 196, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOBJ, 215, 196, 30, 13, WS_TABSTOP | WS_DISABLED - EDITTEXT ID_OUTDIR, 10, 214, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOUT, 215, 214, 30, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 240, 59, 26, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 240, 59, 26, WS_TABSTOP + LTEXT "Path to gcc Compiler", 0x0, 10, 107, 110, 15 + LTEXT "Öâåò Ôîíà", 0x0, 10, 10, 75, 12 + COMBOBOX IDC_BACK, 100, 10, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Öâåò Øðèôòà", 0x0, 10, 35, 75, 12 + COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "Sample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 + CONTROL "Ïîêàçûâàòü Âðåìÿ", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 110, 12 + CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 110, 12 + CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 110, 12 + CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 110, 12 + CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 110, 12 + CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 110, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP END STRINGTABLE

1 0

[mnordell] 29853: Interlocked add/sub for quota. Still disabled code.
by mnordell＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: mnordell Date: Wed Oct 24 17:33:19 2007 New Revision: 29853 URL: http://svn.reactos.org/svn/reactos?rev=29853&view=rev Log: Interlocked add/sub for quota. Still disabled code. Modified: trunk/reactos/ntoskrnl/ps/quota.c Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c (original) +++ trunk/reactos/ntoskrnl/ps/quota.c Wed Oct 24 17:33:19 2007 @@ -85,7 +85,8 @@ refuse } */ - Process->QuotaUsage[2] += Amount; + InterlockedExchangeAdd((LONG*)&Process->QuotaUsage[2], Amount); + /* Note: possibility for race. */ if (Process->QuotaPeak[2] < Process->QuotaUsage[2]) { Process->QuotaPeak[2] = Process->QuotaUsage[2]; @@ -202,7 +203,8 @@ refuse } */ - Process->QuotaUsage[PoolIndex] += Amount; + InterlockedExchangeAdd((LONG*)&Process->QuotaUsage[PoolIndex], Amount); + /* Note: possibility for race. */ if (Process->QuotaPeak[PoolIndex] < Process->QuotaUsage[PoolIndex]) { Process->QuotaPeak[PoolIndex] = Process->QuotaUsage[PoolIndex]; @@ -240,7 +242,7 @@ } else { - Process->QuotaUsage[PoolIndex] -= Amount; + InterlockedExchangeAdd((LONG*)&Process->QuotaUsage[PoolIndex], -Amount); } } #else @@ -301,7 +303,7 @@ } else { - Process->QuotaUsage[2] -= Amount; + InterlockedExchangeAdd((LONG*)&Process->QuotaUsage[2], -Amount); } } #else

1 0

[dreimer] 29852: /me == stupid. OK, next time I will initialize everything...
by dreimer＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: dreimer Date: Wed Oct 24 17:32:10 2007 New Revision: 29852 URL: http://svn.reactos.org/svn/reactos?rev=29852&view=rev Log: /me == stupid. OK, next time I will initialize everything... Modified: trunk/tools/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE-Windows/Tools/config/resources.h Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Wed Oct 24 17:32:10 2007 @@ -47,8 +47,8 @@ WriteSettings(HWND hwnd) { int foreground, background; - BOOL showtime, writelog, useccache, strip; - WCHAR logdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH], checklog[MAX_PATH]; + BOOL showtime, writelog, useccache, strip, otherobj, otherout; + WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH], checklog[MAX_PATH]; WCHAR msgerror[256]; HANDLE hFile; FILE *pFile; @@ -57,10 +57,14 @@ writelog = (SendDlgItemMessage(hwnd, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); useccache = (SendDlgItemMessage(hwnd, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); strip = (SendDlgItemMessage(hwnd, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); + otherobj = (SendDlgItemMessage(hwnd, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); + otherout = (SendDlgItemMessage(hwnd, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); foreground = (UINT)SendDlgItemMessage(hwnd, IDC_FONT, CB_GETCURSEL, 0, 0); background = (UINT)SendDlgItemMessage(hwnd, IDC_BACK, CB_GETCURSEL, 0, 0); GetDlgItemText(hwnd, ID_LOGDIR, logdir, MAX_PATH); GetDlgItemText(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); + GetDlgItemText(hwnd, ID_OBJDIR, objdir, MAX_PATH); + GetDlgItemText(hwnd, ID_OUTDIR, outdir, MAX_PATH); if (writelog) { @@ -106,6 +110,8 @@ fprintf(pFile, "set _ROSBE_WRITELOG=%d\n", writelog); fprintf(pFile, "set _ROSBE_LOGDIR=%S\n", logdir); fprintf(pFile, "set _ROSBE_MINGWPATH=%S\n", mingwpath); + fprintf(pFile, "set _ROSBE_OBJPATH=%S\n", objdir); + fprintf(pFile, "set _ROSBE_OUTPATH=%S\n", outdir); fclose(pFile); return TRUE; } @@ -175,6 +181,8 @@ } case ID_BROWSE: case ID_BROWSEMGW: + case ID_BROWSEOBJ: + case ID_BROWSEOUT: { BROWSEINFO PathInfo; LPITEMIDLIST pidl; @@ -203,7 +211,42 @@ FreeLibrary(hDLL); } } - + if (wParam == ID_BROWSEOBJ) + { + HINSTANCE hDLL; + ILCREATEFROMPATHW ILCreateFromPathW; + Control = ID_OBJDIR; + PathInfo.lpszTitle = L"Please choose the directory where you want to save OBJ Files to:"; + hDLL = LoadLibrary(L"shell32.dll"); + if (hDLL) + { + ILCreateFromPathW = (ILCREATEFROMPATHW)GetProcAddress(hDLL, "ILCreateFromPathW"); + if (ILCreateFromPathW) + { + GetDlgItemText(Dlg, ID_OBJDIR, path, MAX_PATH); + PathInfo.pidlRoot = ILCreateFromPathW(path); + } + FreeLibrary(hDLL); + } + } + if (wParam == ID_BROWSEOUT) + { + HINSTANCE hDLL; + ILCREATEFROMPATHW ILCreateFromPathW; + Control = ID_OUTDIR; + PathInfo.lpszTitle = L"Please choose the directory where you want to save OBJ Files to:"; + hDLL = LoadLibrary(L"shell32.dll"); + if (hDLL) + { + ILCreateFromPathW = (ILCREATEFROMPATHW)GetProcAddress(hDLL, "ILCreateFromPathW"); + if (ILCreateFromPathW) + { + GetDlgItemText(Dlg, ID_OUTDIR, path, MAX_PATH); + PathInfo.pidlRoot = ILCreateFromPathW(path); + } + FreeLibrary(hDLL); + } + } pidl = SHBrowseForFolder(&PathInfo); if (pidl) { @@ -228,6 +271,24 @@ EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), WriteLogSet); break; } + case ID_OTHEROBJ: + { + BOOL WriteLogSet; + WriteLogSet = SendDlgItemMessage(Dlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED; + EnableWindow(GetDlgItem(Dlg, ID_BROWSEOBJ), WriteLogSet); + EnableWindow(GetDlgItem(Dlg, ID_OBJDIR), WriteLogSet); + EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); + break; + } + case ID_OTHEROUT: + { + BOOL WriteLogSet; + WriteLogSet = SendDlgItemMessage(Dlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED; + EnableWindow(GetDlgItem(Dlg, ID_BROWSEOUT), WriteLogSet); + EnableWindow(GetDlgItem(Dlg, ID_OUTDIR), WriteLogSet); + EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); + break; + } } } Modified: trunk/tools/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/r… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/resources.h (original) +++ trunk/tools/RosBE-Windows/Tools/config/resources.h Wed Oct 24 17:32:10 2007 @@ -4,20 +4,20 @@ #define ID_OPTICON 0x03 #define ID_SAVELOGS 0x04 #define ID_SHOWBUILDTIME 0x05 -#define ID_LOGDIR 0x06 -#define ID_BROWSE 0x07 -#define ID_MGWDIR 0x08 -#define ID_BROWSEMGW 0x09 -#define ID_DIALOG 0x0a -#define ID_EXAMPLE 0x0b -#define ID_USECCACHE 0x0c -#define ID_STRIP 0x0d -#define ID_OBJDIR 0x0e -#define ID_OUTDIR 0x0f +#define ID_USECCACHE 0x06 +#define ID_STRIP 0x07 +#define ID_OTHEROBJ 0x08 +#define ID_OTHEROUT 0x09 +#define ID_LOGDIR 0x0a +#define ID_MGWDIR 0x0b +#define ID_OBJDIR 0x0c +#define ID_OUTDIR 0x0d +#define ID_BROWSE 0x0e +#define ID_BROWSEMGW 0x0f #define ID_BROWSEOBJ 0x10 #define ID_BROWSEOUT 0x11 -#define ID_OTHEROBJ 0x12 -#define ID_OTHEROUT 0x13 +#define ID_DIALOG 0x12 +#define ID_EXAMPLE 0x13 #define IDC_FONT 0x14 #define IDC_BACK 0x15

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007