Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[dreimer] 33200: aliases now work globally. Just type "&make" and it runs build.ps1 Last Problem: build.ps1 does not even think about starting those biig lines to start the compiler + log generator + other stuff...

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Apr 30 17:44:58 2008 New Revision: 33200 URL: http://svn.reactos.org/svn/reactos?rev=33200&view=rev Log: aliases now work globally. Just type "&make" and it runs build.ps1 Last Problem: build.ps1 does not even think about starting those biig lines to start the compiler + log generator + other stuff... Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Wed Apr 30 17:44:58 2008 @@ -1,11 +1,9 @@ # # PROJECT: RosBE - ReactOS Build Environment for Windows # LICENSE: GNU General Public License v2. (see LICENSE.txt) -# FILE: Root/Build.cmd +# FILE: Root/Build.ps1 # PURPOSE: Perform the build of ReactOS. -# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> -# Colin Finck <mail(a)colinfinck.de> -# Peter Ward <dralnix(a)gmail.com> +# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> # # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Wed Apr 30 17:44:58 2008 @@ -4,8 +4,7 @@ # FILE: Root/RosBE.ps1 # PURPOSE: This script provides/sets up various build environments for # ReactOS. Currently it provides a GCC 4.1.3 build environment. -# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> -# Peter Ward <dralnix(a)gmail.com> +# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> # # @@ -60,42 +59,42 @@ function LOADDOSKEYMACROS { if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { -set-alias CHDEFDIR "& $_ROSBE_BASEDIR\chdefdir.ps1" +set-alias CHDEFDIR "$_ROSBE_BASEDIR\chdefdir.ps1" -scope Global } if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { -set-alias CHDEFGCC "& $_ROSBE_BASEDIR\chdefgcc.ps1" +set-alias CHDEFGCC "$_ROSBE_BASEDIR\chdefgcc.ps1" -scope Global } if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { -set-alias CHARCH "& $_ROSBE_BASEDIR\charch.ps1" +set-alias CHARCH "$_ROSBE_BASEDIR\charch.ps1" -scope Global } -set-alias CLEAN "& $_ROSBE_BASEDIR\Clean.ps1" +set-alias CLEAN "$_ROSBE_BASEDIR\Clean.ps1" -scope Global if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { -set-alias CONFIG "& $_ROSBE_BASEDIR\Config.ps1" +set-alias CONFIG "$_ROSBE_BASEDIR\Config.ps1" -scope Global } -set-alias HELP "& $_ROSBE_BASEDIR\Help.ps1" -set-alias MAKE "& $_ROSBE_BASEDIR\Build.ps1" -set-alias MAKEX "& $_ROSBE_BASEDIR\Build.ps1 multi" +set-alias HELP "$_ROSBE_BASEDIR\Help.ps1" -scope Global +set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global +set-alias MAKEX "$_ROSBE_BASEDIR\Build.ps1 multi" -scope Global if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { -set-alias RADDR2LINE "& $_ROSBE_BASEDIR\reladdr2line.ps1" +set-alias RADDR2LINE "$_ROSBE_BASEDIR\reladdr2line.ps1" -scope Global } if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { -set-alias SCUT "& $_ROSBE_BASEDIR\scut.ps1" +set-alias SCUT "$_ROSBE_BASEDIR\scut.ps1" -scope Global } if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { -set-alias SSVN "& $_ROSBE_BASEDIR\sSVN.ps1" -set-alias SVN "& $_ROSBE_BASEDIR\Tools\svn.exe" +set-alias SSVN "$_ROSBE_BASEDIR\sSVN.ps1" -scope Global +set-alias SVN "$_ROSBE_BASEDIR\Tools\svn.exe" -scope Global } if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { -set-alias OPTIONS "& $_ROSBE_BASEDIR\options.ps1" +set-alias OPTIONS "$_ROSBE_BASEDIR\options.ps1" -scope Global } } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Wed Apr 30 17:44:58 2008 @@ -1,10 +1,9 @@ # # PROJECT: RosBE - ReactOS Build Environment for Windows # LICENSE: GNU General Public License v2. (see LICENSE.txt) -# FILE: Root/rosbe-gcc-env.cmd +# FILE: Root/rosbe-gcc-env.ps1 # PURPOSE: Set up the GCC 4.x.x build environment. -# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> -# Peter Ward <dralnix(a)gmail.com> +# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> # #

16 years, 7 months

[pschweitzer] 33199: - Added a stub for NtfsLib - Added a stub for untfs.dll - Added the support of untfs.dll to autochk.exe (and a bit reviewed code when loading provider) That way, autochk won't complain anymore... And it creates places to work!

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Apr 30 16:35:23 2008 New Revision: 33199 URL: http://svn.reactos.org/svn/reactos?rev=33199&view=rev Log: - Added a stub for NtfsLib - Added a stub for untfs.dll - Added the support of untfs.dll to autochk.exe (and a bit reviewed code when loading provider) That way, autochk won't complain anymore... And it creates places to work! Added: trunk/reactos/dll/win32/untfs/ trunk/reactos/dll/win32/untfs/untfs.c (with props) trunk/reactos/dll/win32/untfs/untfs.def (with props) trunk/reactos/dll/win32/untfs/untfs.rbuild (with props) trunk/reactos/dll/win32/untfs/untfs.rc (with props) trunk/reactos/lib/fslib/ntfslib/ trunk/reactos/lib/fslib/ntfslib/ntfslib.c (with props) trunk/reactos/lib/fslib/ntfslib/ntfslib.h (with props) trunk/reactos/lib/fslib/ntfslib/ntfslib.rbuild (with props) Modified: trunk/reactos/base/system/autochk/autochk.c trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/lib/fslib/directory.rbuild Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Wed Apr 30 16:35:23 2008 @@ -243,16 +243,24 @@ LoadProvider( IN PWCHAR FileSystem) { - UNICODE_STRING ProviderDll = RTL_CONSTANT_STRING(L"ufat.dll"); + UNICODE_STRING ProviderDll; PVOID BaseAddress; NTSTATUS Status; /* FIXME: add more providers here */ - if (wcscmp(FileSystem, L"FAT") != 0 - && wcscmp(FileSystem, L"FAT32") != 0) - { - return NULL; + if (wcscmp(FileSystem, L"NTFS") == 0) + { + RtlInitUnicodeString(&ProviderDll, L"untfs.dll"); + } + else if (wcscmp(FileSystem, L"FAT") == 0 + || wcscmp(FileSystem, L"FAT32") == 0) + { + RtlInitUnicodeString(&ProviderDll, L"ufat.dll"); + } + else + { + return NULL; } Status = LdrLoadDll(NULL, NULL, &ProviderDll, &BaseAddress); Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=331… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Wed Apr 30 16:35:23 2008 @@ -13,6 +13,7 @@ <property name="BASEADDRESS_JOY" value="0x589b0000" /> <property name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> + <property name="BASEADDRESS_UNTFS" value="0x5b340000" /> <property name="BASEADDRESS_OBJSEL" value="0x5b400000" /> <property name="BASEADDRESS_UFAT" value="0x5b570000" /> <property name="BASEADDRESS_TAPIUI" value="0x5b770000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Apr 30 16:35:23 2008 @@ -293,6 +293,7 @@ dll\win32\twain_32\twain_32.dll 1 dll\win32\ufat\ufat.dll 1 dll\win32\ufatx\ufatx.dll 1 optional +dll\win32\untfs\untfs.dll 1 dll\win32\urlmon\urlmon.dll 1 dll\win32\user32\user32.dll 1 dll\win32\userenv\userenv.dll 1 Added: trunk/reactos/dll/win32/untfs/untfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.c?re… ============================================================================== --- trunk/reactos/dll/win32/untfs/untfs.c (added) +++ trunk/reactos/dll/win32/untfs/untfs.c [iso-8859-1] Wed Apr 30 16:35:23 2008 @@ -1,0 +1,27 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: NTFS File System Management + * FILE: dll/win32/untfs/untfs.c + * PURPOSE: untfs DLL initialisation + * + * PROGRAMMERS: Pierre Schweitzer + */ + +#define WIN32_NO_STATUS +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <fmifs/fmifs.h> + +INT WINAPI +DllMain( + IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(hinstDLL); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(lpvReserved); + + return TRUE; +} Propchange: trunk/reactos/dll/win32/untfs/untfs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/untfs/untfs.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.def?… ============================================================================== --- trunk/reactos/dll/win32/untfs/untfs.def (added) +++ trunk/reactos/dll/win32/untfs/untfs.def [iso-8859-1] Wed Apr 30 16:35:23 2008 @@ -1,0 +1,4 @@ +LIBRARY UNTFS.DLL +EXPORTS +ChkdskEx=NtfsChkdsk@24 +FormatEx=NtfsFormat@24 Propchange: trunk/reactos/dll/win32/untfs/untfs.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/untfs/untfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.rbui… ============================================================================== --- trunk/reactos/dll/win32/untfs/untfs.rbuild (added) +++ trunk/reactos/dll/win32/untfs/untfs.rbuild [iso-8859-1] Wed Apr 30 16:35:23 2008 @@ -1,0 +1,10 @@ +<module name="untfs" type="win32dll" baseaddress="${BASEADDRESS_UNTFS}" installbase="system32" installname="untfs.dll"> + <importlibrary definition="untfs.def" /> + <include base="untfs">.</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0600</define> + <library>ntfslib</library> + <library>ntdll</library> + <file>untfs.c</file> + <file>untfs.rc</file> +</module> Propchange: trunk/reactos/dll/win32/untfs/untfs.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/untfs/untfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.rc?r… ============================================================================== --- trunk/reactos/dll/win32/untfs/untfs.rc (added) +++ trunk/reactos/dll/win32/untfs/untfs.rc [iso-8859-1] Wed Apr 30 16:35:23 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "NTFS File System Management\0" +#define REACTOS_STR_INTERNAL_NAME "untfs\0" +#define REACTOS_STR_ORIGINAL_FILENAME "untfs.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/untfs/untfs.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Wed Apr 30 16:35:23 2008 @@ -316,6 +316,9 @@ <directory name="ufatx"> <xi:include href="ufatx/ufatx.rbuild" /> </directory> +<directory name="untfs"> + <xi:include href="untfs/untfs.rbuild" /> +</directory> <directory name="urlmon"> <xi:include href="urlmon/urlmon.rbuild" /> </directory> Modified: trunk/reactos/lib/fslib/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/directory.rbuild… ============================================================================== --- trunk/reactos/lib/fslib/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/directory.rbuild [iso-8859-1] Wed Apr 30 16:35:23 2008 @@ -3,6 +3,9 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="ext2lib"> <xi:include href="ext2lib/ext2lib.rbuild" /> + </directory> + <directory name="ntfslib"> + <xi:include href="ntfslib/ntfslib.rbuild" /> </directory> <directory name="vfatlib"> <xi:include href="vfatlib/vfatlib.rbuild" /> Added: trunk/reactos/lib/fslib/ntfslib/ntfslib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ntfslib/ntfslib.… ============================================================================== --- trunk/reactos/lib/fslib/ntfslib/ntfslib.c (added) +++ trunk/reactos/lib/fslib/ntfslib/ntfslib.c [iso-8859-1] Wed Apr 30 16:35:23 2008 @@ -1,0 +1,36 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NTFS FS library + * FILE: lib/fslib/ntfslib/ntfslib.c + * PURPOSE: NTFS lib + * PROGRAMMERS: Pierre Schweitzer + */ +#include "ntfslib.h" + +#define NDEBUG +#include <debug.h> + +NTSTATUS NTAPI +NtfsFormat(PUNICODE_STRING DriveRoot, + FMIFS_MEDIA_FLAG MediaFlag, + PUNICODE_STRING Label, + BOOLEAN QuickFormat, + ULONG ClusterSize, + PFMIFSCALLBACK Callback) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + + +NTSTATUS WINAPI +NtfsChkdsk(IN PUNICODE_STRING DriveRoot, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} Propchange: trunk/reactos/lib/fslib/ntfslib/ntfslib.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/fslib/ntfslib/ntfslib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ntfslib/ntfslib.… ============================================================================== --- trunk/reactos/lib/fslib/ntfslib/ntfslib.h (added) +++ trunk/reactos/lib/fslib/ntfslib/ntfslib.h [iso-8859-1] Wed Apr 30 16:35:23 2008 @@ -1,0 +1,10 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NTFS FS library + * FILE: lib/fslib/ntfslib/ntfslib.h + */ +#define WIN32_NO_STATUS +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <fmifs/fmifs.h> Propchange: trunk/reactos/lib/fslib/ntfslib/ntfslib.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/fslib/ntfslib/ntfslib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ntfslib/ntfslib.… ============================================================================== --- trunk/reactos/lib/fslib/ntfslib/ntfslib.rbuild (added) +++ trunk/reactos/lib/fslib/ntfslib/ntfslib.rbuild [iso-8859-1] Wed Apr 30 16:35:23 2008 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="ntfslib" type="staticlibrary"> + <include base="ntfslib">.</include> + <define name="_DISABLE_TIDENTS" /> + <file>ntfslib.c</file> +</module> Propchange: trunk/reactos/lib/fslib/ntfslib/ntfslib.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 7 months

[tkreuzer] 33198: - DxEngGetHdevData: return a DWORD_PTR instead of a DWORD - DxEngSetHdevdata: use DWORD_PTR as Data parameter - DxEngGetDcState: return a DWORD_PTR instead of a DWORD

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Apr 30 15:34:04 2008 New Revision: 33198 URL: http://svn.reactos.org/svn/reactos?rev=33198&view=rev Log: - DxEngGetHdevData: return a DWORD_PTR instead of a DWORD - DxEngSetHdevdata: use DWORD_PTR as Data parameter - DxEngGetDcState: return a DWORD_PTR instead of a DWORD Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Wed Apr 30 15:34:04 2008 @@ -75,11 +75,11 @@ BOOLEAN STDCALL DxEngNUIsTermSrv(); PDC STDCALL DxEngLockDC(HDC hDC); BOOLEAN STDCALL DxEngUnlockDC(PDC pDC); -DWORD STDCALL DxEngGetHdevData(HDEV, DXEGSHDEVDATA); -BOOLEAN STDCALL DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD); +DWORD_PTR STDCALL DxEngGetHdevData(HDEV, DXEGSHDEVDATA); +BOOLEAN STDCALL DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD_PTR); BOOLEAN STDCALL DxEngLockHdev(HDEV hdev); BOOLEAN STDCALL DxEngUnlockHdev(HDEV hdev); -DWORD STDCALL DxEngGetDCState(HDC hDC, DWORD type); +DWORD_PTR STDCALL DxEngGetDCState(HDC hDC, DWORD type); DWORD STDCALL DxEngReferenceHdev(HDEV hdev); BOOLEAN STDCALL DxEngLockShareSem(); BOOLEAN STDCALL DxEngUnlockShareSem(); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Wed Apr 30 15:34:04 2008 @@ -287,12 +287,12 @@ * ReactOS specific: Implementation is incomplete, I do not save the value into the hdev yet. * *--*/ -DWORD +DWORD_PTR STDCALL DxEngGetHdevData(HDEV hDev, DXEGSHDEVDATA Type) { - DWORD retVal = 0; + DWORD_PTR retVal = 0; PGDIDEVICE PDev = (PGDIDEVICE)hDev; DPRINT1("ReactX Calling : DxEngGetHdevData DXEGSHDEVDATA : %ld\n", Type); @@ -305,67 +305,67 @@ { case DxEGShDevData_Surface: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_Surface\n"); - retVal = (DWORD) PDev->pSurface; // ptr to Surface handle. + retVal = (DWORD_PTR) PDev->pSurface; // ptr to Surface handle. break; case DxEGShDevData_hSpooler: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_hSpooler\n"); - retVal = (DWORD) PDev->hSpooler; // If the device is a spooler driver. + retVal = (DWORD_PTR) PDev->hSpooler; // If the device is a spooler driver. break; case DxEGShDevData_DitherFmt: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DitherFmt\n"); - retVal = (DWORD) PDev->DevInfo.iDitherFormat; + retVal = (DWORD_PTR) PDev->DevInfo.iDitherFormat; break; case DxEGShDevData_FxCaps: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps\n"); - retVal = (DWORD) PDev->DevInfo.flGraphicsCaps; + retVal = (DWORD_PTR) PDev->DevInfo.flGraphicsCaps; break; case DxEGShDevData_FxCaps2: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps2\n"); - retVal = (DWORD) PDev->DevInfo.flGraphicsCaps2; + retVal = (DWORD_PTR) PDev->DevInfo.flGraphicsCaps2; break; case DxEGShDevData_DrvFuncs: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DrvFuncs\n"); - retVal = (DWORD) &PDev->DriverFunctions; + retVal = (DWORD_PTR) &PDev->DriverFunctions; break; case DxEGShDevData_dhpdev: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dhpdev\n"); - retVal = (DWORD) PDev->hPDev; // DHPDEV + retVal = (DWORD_PTR) PDev->hPDev; // DHPDEV break; case DxEGShDevData_eddg: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_eddg\n"); - retVal = (DWORD) PDev->pEDDgpl; + retVal = (DWORD_PTR) PDev->pEDDgpl; break; case DxEGShDevData_dd_nCount: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_nCount\n"); - retVal = (DWORD) PDev->DxDd_nCount; + retVal = (DWORD_PTR) PDev->DxDd_nCount; break; case DxEGShDevData_dd_flags: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_flags\n"); - retVal = (DWORD) PDev->DxDd_Flags; + retVal = (DWORD_PTR) PDev->DxDd_Flags; break; case DxEGShDevData_disable: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_disable\n"); - retVal = (DWORD) PDev->flFlags & PDEV_DISABLED; + retVal = (DWORD_PTR) PDev->flFlags & PDEV_DISABLED; break; case DxEGShDevData_metadev: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_metadev\n"); - retVal = (DWORD) PDev->flFlags & PDEV_META_DEVICE; + retVal = (DWORD_PTR) PDev->flFlags & PDEV_META_DEVICE; break; case DxEGShDevData_display: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_display\n"); - retVal = (DWORD) PDev->flFlags & PDEV_DISPLAY; + retVal = (DWORD_PTR) PDev->flFlags & PDEV_DISPLAY; break; case DxEGShDevData_Parent: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_Parent\n"); - retVal = (DWORD) PDev->ppdevParent; + retVal = (DWORD_PTR) PDev->ppdevParent; break; case DxEGShDevData_OpenRefs: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_OpenRefs\n"); - retVal = (DWORD) PDev->cPdevOpenRefs == 0; + retVal = (DWORD_PTR) PDev->cPdevOpenRefs == 0; break; case DxEGShDevData_palette: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_palette\n"); - retVal = (DWORD) PDev->GDIInfo.flRaster & RC_PALETTE; + retVal = (DWORD_PTR) PDev->GDIInfo.flRaster & RC_PALETTE; break; case DxEGShDevData_ldev: DPRINT1("DxEGShDevData_ldev not supported yet\n"); @@ -374,11 +374,11 @@ break; case DxEGShDevData_GDev: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_GDev\n"); - retVal = (DWORD) PDev->pGraphicsDev; // P"GRAPHICS_DEVICE" + retVal = (DWORD_PTR) PDev->pGraphicsDev; // P"GRAPHICS_DEVICE" break; case DxEGShDevData_clonedev: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_clonedev\n"); - retVal = (DWORD) PDev->flFlags & PDEV_CLONE_DEVICE; + retVal = (DWORD_PTR) PDev->flFlags & PDEV_CLONE_DEVICE; break; default: @@ -419,7 +419,7 @@ STDCALL DxEngSetHdevData(HDEV hDev, DXEGSHDEVDATA Type, - DWORD Data) + DWORD_PTR Data) { BOOLEAN retVal = FALSE; // Default, no set. @@ -458,13 +458,13 @@ * We do not have type 2 implemented yet * *--*/ -DWORD +DWORD_PTR STDCALL DxEngGetDCState(HDC hDC, DWORD type) { PDC pDC = DC_LockDc(hDC); - DWORD retVal = 0; + DWORD_PTR retVal = 0; DPRINT1("ReactX Calling : DxEngGetDCState type : %ld\n", type); @@ -473,7 +473,7 @@ switch (type) { case 1: - retVal = (DWORD) pDC->DC_Flags & DC_FLAG_FULLSCREEN; + retVal = (DWORD_PTR) pDC->DC_Flags & DC_FLAG_FULLSCREEN; break; case 2: UNIMPLEMENTED; @@ -481,7 +481,7 @@ case 3: { /* Return the HDEV of this DC. */ - retVal = (DWORD) pDC->pPDev; + retVal = (DWORD_PTR) pDC->pPDev; break; } default: @@ -533,7 +533,7 @@ * none * *--*/ -BOOLEAN +BOOLEAN STDCALL DxEngLockHdev(HDEV hDev) {

16 years, 7 months

[dreimer] 33197: Progress to get Build script work. But not ready yet. It does not interpret the commands in the lines which should start the compiler.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Apr 30 14:36:11 2008 New Revision: 33197 URL: http://svn.reactos.org/svn/reactos?rev=33197&view=rev Log: Progress to get Build script work. But not ready yet. It does not interpret the commands in the lines which should start the compiler. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Wed Apr 30 14:36:11 2008 @@ -13,118 +13,99 @@ # Check if config.template.rbuild is newer than config.rbuild, if it is then # abort the build and inform the user. # -if exist .\config.rbuild ( - "%_ROSBE_BASEDIR%\Tools\chknewer.exe" .\config.template.rbuild .\config.rbuild - if !errorlevel! == 1 ( - echo. - echo *** config.template.rbuild is newer than config.rbuild *** - echo *** aborting build. Please check for changes and *** - echo *** update your config.rbuild. *** - echo. - endlocal - goto :EOC - ) -) +if (Test-Path ".\config.rbuild") { + "$_ROSBE_BASEDIR\Tools\chknewer.exe .\config.template.rbuild .\config.rbuild" + if (errorlevel -eq 1) { + "" + "*** config.template.rbuild is newer than config.rbuild ***" + "*** aborting build. Please check for changes and ***" + "*** update your config.rbuild. ***" + "" + exit + } +} # # Check if strip or ccache are being used and set the appropriate options. # -if defined _ROSBE_STRIP ( - if %_ROSBE_STRIP% == 1 ( - set ROS_LEAN_AND_MEAN=yes - ) else ( - set ROS_LEAN_AND_MEAN=no - ) -) -if defined _ROSBE_USECCACHE ( - if %_ROSBE_USECCACHE% == 1 ( - set CCACHE_DIR=%APPDATA%\RosBE\.ccache - set HOST_CC=ccache gcc - set HOST_CPP=ccache g++ - set TARGET_CC=ccache gcc - set TARGET_CPP=ccache g++ - ) else ( - set HOST_CC=gcc - set HOST_CPP=g++ - set TARGET_CC=gcc - set TARGET_CPP=g++ - ) -) +if ($_ROSBE_STRIP -ne $null) { + if ($_ROSBE_STRIP -ne 1) { + $ENV:ROS_LEAN_AND_MEAN = "yes" + } else { + $ENV:ROS_LEAN_AND_MEAN = "no" + } +} +if ($_ROSBE_USECCACHE -ne $null) { + if ($_ROSBE_USECCACHE -eq 1) { + $ENV:CCACHE_DIR = "$APPDATA\RosBE\.ccache" + $ENV:HOST_CC = "ccache gcc" + $ENV:HOST_CPP = "ccache g++" + $ENV:TARGET_CC = "ccache gcc" + $ENV:TARGET_CPP = "ccache g++" + } else { + $ENV:HOST_CC = "gcc" + $ENV:HOST_CPP = "g++" + $ENV:TARGET_CC = "gcc" + $ENV:TARGET_CPP = "g++" + } +} # # Check if the user has chosen to use a different object or output path # and set it accordingly. # -if defined _ROSBE_OBJPATH ( - if not exist "%_ROSBE_OBJPATH%\." ( - echo ERROR: The path specified doesn't seem to exist. - goto :EOC - ) else ( - set ROS_INTERMEDIATE=%_ROSBE_OBJPATH% - ) -) -if defined _ROSBE_OUTPATH ( - if not exist "%_ROSBE_OUTPATH%\." ( - echo ERROR: The path specified doesn't seem to exist. - goto :EOC - ) else ( - set ROS_OUTPUT=%_ROSBE_OUTPATH% - set ROS_TEMPORARY=%_ROSBE_OUTPATH% - ) -) +if ($_ROSBE_OBJPATH -ne $null) { + if ( Test-Path "$_ROSBE_OBJPATH\.") { + "ERROR: The path specified doesn't seem to exist." + exit + } else { + $ENV:ROS_INTERMEDIATE = "$_ROSBE_OBJPATH" + } +} +if ($_ROSBE_OUTPATH -ne $null) { + if (Test-Path "$_ROSBE_OUTPATH\.") { + "ERROR: The path specified doesn't seem to exist." + exit + } else { + $ENV:ROS_OUTPUT = "$_ROSBE_OUTPATH" + $ENV:ROS_TEMPORARY = "$_ROSBE_OUTPATH" + } +} # # Get the current date and time for use in in our build log's file name. # -call "%_ROSBE_BASEDIR%\TimeDate.cmd" +$DATENAME = get-date -f d +$TIMENAME = get-date -f t + # # Check if writing logs is enabled, if so check if our log directory # exists, if it doesn't, create it. # -if %_ROSBE_WRITELOG% == 1 ( - if not exist "%_ROSBE_LOGDIR%\." ( - mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL - ) -) +if ($_ROSBE_WRITELOG -eq 1) { + if (Test-Path "$_ROSBE_LOGDIR\.") { + mkdir "$_ROSBE_LOGDIR" 1> NUL 2> NUL + } +} -# -# Check if we are using -j or not. -# -if "%1" == "multi" ( - if not "%2" == "" ( - title 'makex %2' parallel build started: %TIMERAW% - ) else ( - title 'makex' parallel build started: %TIMERAW% - ) - call :BUILDMULTI %* -) else ( - if not "%1" == "" ( - title 'make %1' build started: %TIMERAW% - ) else ( - title 'make' build started: %TIMERAW% - ) - call :BUILD %* -) -goto :EOC +function BUILD { + if ($_ROSBE_SHOWTIME -eq 1) { + if ($_ROSBE_WRITELOG -eq 1) { + """$_ROSBE_BASEDIR\Tools\buildtime.exe"" ""$_ROSBE_MINGWMAKE"" $args[0..5] 2>&1 | ""$_ROSBE_BASEDIR\Tools\tee.exe"" ""$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt""" + } else { + """$_ROSBE_BASEDIR\Tools\buildtime.exe"" ""$_ROSBE_MINGWMAKE"" $args[0..5]" + } + } else { + if ($_ROSBE_WRITELOG -eq 1) { + """$_ROSBE_MINGWMAKE"" $args[0..5] 2>&1 | ""$_ROSBE_BASEDIR\Tools\tee.exe"" ""$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt""" + } else { + """$_ROSBE_MINGWMAKE"" $args[0..5]" + } + } +} -:BUILD - if %_ROSBE_SHOWTIME% == 1 ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* - ) - ) else ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_MINGWMAKE%" %* - ) - ) -goto :EOF - -:BUILDMULTI +function BUILDMULTI { # # Get the number of CPUs in the system so we know how many jobs to execute. # To modify the number used alter the options used with cpucount: @@ -133,43 +114,65 @@ # -x2 - Number of CPUs, doubled. # -a - Determine the cpu count based on the inherited process affinity mask. # - for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i +# for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i - if %_ROSBE_SHOWTIME% == 1 ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 - ) - ) else ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 - ) - ) -goto :EOF + if ($_ROSBE_SHOWTIME -eq 1) { + if ($_ROSBE_WRITELOG -eq 1) { +# "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "$_ROSBE_BASEDIR\Tools\tee.exe" "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + } else { +# "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9 + } + } else { + if ($_ROSBE_WRITELOG -eq 1) { +# "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "$_ROSBE_BASEDIR\Tools\tee.exe" "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + } else { +# "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9 + } + } +} -:EOC +# +# Check if we are using -j or not. +# +if ($args.count -gt 1) { +if ($args[0] -eq "multi") { + if ($args[1] -ne "") { + $host.ui.RawUI.WindowTitle = "makex $args[1] parallel build started: $TIMERAW" + } else { + $host.ui.RawUI.WindowTitle = "makex parallel build started: $TIMERAW" + } +BUILDMULTI +} +} else { +if ($args.count -gt 0) { + if ($args[0] -ne "") { + $host.ui.RawUI.WindowTitle = "make $args[1] build started: $TIMERAW" + } else { + $host.ui.RawUI.WindowTitle = "make build started: $TIMERAW" + } +BUILD +} +} + # # Highlight the fact that building has ended. # -"%_ROSBE_BASEDIR%\Tools\flash.exe" +"$_ROSBE_BASEDIR\Tools\flash.exe" -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -) +if ($_ROSBE_VERSION -ne $null) { +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" +} # # Unload all used Vars. # -set ROS_LEAN_AND_MEAN= -set HOST_CC= -set HOST_CPP= -set TARGET_CC= -set TARGET_CPP= -set ROS_INTERMEDIATE= -set ROS_OUTPUT= -set ROS_TEMPORARY= -set CPUCOUNT= -set CCACHE_DIR= +$ENV:ROS_LEAN_AND_MEAN = "" +$ENV:HOST_CC = "" +$ENV:HOST_CPP = "" +$ENV:TARGET_CC = "" +$ENV:TARGET_CPP = "" +$ENV:ROS_INTERMEDIATE = "" +$ENV:ROS_OUTPUT = "" +$ENV:ROS_TEMPORARY = "" +$ENV:CPUCOUNT = "" +$ENV:CCACHE_DIR = "" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Wed Apr 30 14:36:11 2008 @@ -22,12 +22,12 @@ # Set up the GCC 4.x.x build environment. # $ENV:PATH = "$_ROSBE_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" -$_ROSBE_GCCVERSION = $null -$_ROSBE_GCCTARGET = $null +$global:_ROSBE_GCCVERSION = $null +$global:_ROSBE_GCCTARGET = $null #for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i #for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i $ENV:PATH = "$_ROSBE_MINGWPATH\bin;$_ROSBE_MINGWPATH\libexec\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION;$_ROSBE_ORIGINALPATH" -$_ROSBE_MINGWMAKE = "$_ROSBE_MINGWPATH\bin\mingw32-make.exe" +$global:_ROSBE_MINGWMAKE = "$_ROSBE_MINGWPATH\bin\mingw32-make.exe" if ($_ROSBE_MODE = "MinGW") { $ENV:C_INCLUDE_PATH = "$_ROSBE_MINGWPATH\include;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_MINGWPATH\include;$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION;$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Wed Apr 30 14:36:11 2008 @@ -66,7 +66,7 @@ if not "%1" == "" ( cls echo Unknown parameter specified. Exiting. - goto :EOC + goto :EOF ) cls @@ -108,7 +108,7 @@ ) endlocal -goto :EOC +goto :EOF :: :: Display the banner and set up the environment for the GCC 4.x.x build @@ -146,5 +146,3 @@ if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SVN= ) if not exist "%_ROSBE_BASEDIR%\options.cmd" ( doskey OPTIONS= ) goto :EOF - -:EOC

16 years, 7 months

[janderwald] 33196: - use tab control as parent for the child dialogs - fixes display problems - thanks to GedMurphy & Colin_Finck for finding the issue

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Apr 30 05:55:35 2008 New Revision: 33196 URL: http://svn.reactos.org/svn/reactos?rev=33196&view=rev Log: - use tab control as parent for the child dialogs - fixes display problems - thanks to GedMurphy & Colin_Finck for finding the issue Modified: trunk/reactos/base/applications/dxdiag/display.c trunk/reactos/base/applications/dxdiag/dxdiag.c trunk/reactos/base/applications/dxdiag/precomp.h trunk/reactos/base/applications/dxdiag/sound.c Modified: trunk/reactos/base/applications/dxdiag/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/display.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/display.c [iso-8859-1] Wed Apr 30 05:55:35 2008 @@ -313,7 +313,7 @@ break; pContext->hDisplayWnd = hDlgs; - hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hMainDialog, DisplayPageWndProc, (LPARAM)pContext); + hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hTabCtrl, DisplayPageWndProc, (LPARAM)pContext); if (!hwndDlg) break; Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Wed Apr 30 05:55:35 2008 @@ -98,15 +98,19 @@ VOID InitializeTabCtrl(HWND hwndDlg, PDXDIAG_CONTEXT pContext) { + /* get tabctrl */ + hTabCtrlWnd = GetDlgItem(hwndDlg, IDC_TAB_CONTROL); + pContext->hTabCtrl = hTabCtrlWnd; + /* create the dialogs */ - pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), hwndDlg, SystemPageWndProc, (LPARAM)pContext); - pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), hwndDlg, MusicPageWndProc, (LPARAM)pContext); - pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), hwndDlg, InputPageWndProc, (LPARAM)pContext); - pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), hwndDlg, NetworkPageWndProc, (LPARAM)pContext); - pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), hwndDlg, HelpPageWndProc, (LPARAM)pContext); + pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), hTabCtrlWnd, SystemPageWndProc, (LPARAM)pContext); + pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), hTabCtrlWnd, MusicPageWndProc, (LPARAM)pContext); + pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), hTabCtrlWnd, InputPageWndProc, (LPARAM)pContext); + pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), hTabCtrlWnd, NetworkPageWndProc, (LPARAM)pContext); + pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), hTabCtrlWnd, HelpPageWndProc, (LPARAM)pContext); /* insert tab ctrl items */ - hTabCtrlWnd = GetDlgItem(hwndDlg, IDC_TAB_CONTROL); + InsertTabCtrlItem(hTabCtrlWnd, 0, MAKEINTRESOURCEW(IDS_SYSTEM_DIALOG)); InitializeDisplayAdapters(pContext); InitializeDirectSoundPage(pContext); Modified: trunk/reactos/base/applications/dxdiag/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/p… ============================================================================== --- trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] Wed Apr 30 05:55:35 2008 @@ -20,6 +20,7 @@ typedef struct { HWND hMainDialog; + HWND hTabCtrl; ULONG NumDisplayAdapter; HWND * hDisplayWnd; ULONG NumSoundAdapter; Modified: trunk/reactos/base/applications/dxdiag/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/s… ============================================================================== --- trunk/reactos/base/applications/dxdiag/sound.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/sound.c [iso-8859-1] Wed Apr 30 05:55:35 2008 @@ -29,7 +29,7 @@ return FALSE; pContext->hSoundWnd = hDlgs; - hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG), pContext->hMainDialog, SoundPageWndProc, (LPARAM)pContext); + hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG), pContext->hTabCtrl, SoundPageWndProc, (LPARAM)pContext); if (!hwndDlg) return FALSE; @@ -40,7 +40,7 @@ swprintf (szText, L"%s %u", szSound, pContext->NumSoundAdapter + 1); - InsertTabCtrlItem(GetDlgItem(pContext->hMainDialog, IDC_TAB_CONTROL), pContext->NumDisplayAdapter + pContext->NumSoundAdapter + 1, szText); + InsertTabCtrlItem(pContext->hTabCtrl, pContext->NumDisplayAdapter + pContext->NumSoundAdapter + 1, szText); hDlgs[pContext->NumSoundAdapter] = hwndDlg; pContext->NumSoundAdapter++;

16 years, 7 months

[janderwald] 33195: - fix a bug in tab selection code - add DirectSound dialog resources

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Apr 29 18:05:57 2008 New Revision: 33195 URL: http://svn.reactos.org/svn/reactos?rev=33195&view=rev Log: - fix a bug in tab selection code - add DirectSound dialog resources Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c trunk/reactos/base/applications/dxdiag/lang/de-DE.rc trunk/reactos/base/applications/dxdiag/lang/en-US.rc trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc trunk/reactos/base/applications/dxdiag/resource.h Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Tue Apr 29 18:05:57 2008 @@ -79,7 +79,9 @@ if (CurSel == 0 || CurSel > pContext->NumDisplayAdapter + pContext->NumSoundAdapter) { - ShowWindow(pContext->hDialogs[min(0, CurSel-pContext->NumDisplayAdapter-pContext->NumSoundAdapter)], SW_SHOW); + if (CurSel) + CurSel -= pContext->NumDisplayAdapter + pContext->NumSoundAdapter; + ShowWindow(pContext->hDialogs[CurSel], SW_SHOW); return; } Modified: trunk/reactos/base/applications/dxdiag/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/de-DE.rc [iso-8859-1] Tue Apr 29 18:05:57 2008 @@ -65,7 +65,7 @@ LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10 - GROUPBOX "Treiber", -1, 270, 10, 220, 100 + GROUPBOX "Treiber", -1, 270, 10, 190, 100 RTEXT "Hauptreiber:", -1, 275, 25, 55, 10 RTEXT "Version:", -1, 275, 35, 55, 10 RTEXT "Datum:", -1, 275, 45, 55, 10 @@ -103,6 +103,38 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Gerät", -1, 10, 10, 250, 100 + RTEXT "Name:", -1, 20, 25, 70, 10 + RTEXT "Gerätekennung:", -1, 20, 35, 70, 10 + RTEXT "Herstellerkennung:", -1, 20, 45, 70, 10 + RTEXT "Produktkennung:", -1, 20, 55, 70, 10 + RTEXT "Typ:", -1, 20, 65, 70, 10 + RTEXT "Standardgerät:", -1, 20, 75, 70, 10 + LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10 + GROUPBOX "Treiber", -1, 270, 10, 190, 100 + RTEXT "Name:", -1, 275, 25, 55, 10 + RTEXT "Version:", -1, 275, 35, 55, 10 + RTEXT "Datum:", -1, 275, 45, 55, 10 + RTEXT "Mit WHQL-Logo:", -1, 275, 55, 55, 10 + RTEXT "Andere Dateien:", -1, 275, 65, 55, 10 + RTEXT "Anbieter:", -1, 275, 75, 55, 10 + LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 + GROUPBOX "ReactX-Funktionen", -1, 10, 115, 450, 60 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | WS_TABSTOP, 120, 135, 80, 17 + RTEXT "Einstellung der Sound-\nhardwarebeschleunigung:", -1, 20, 135, 90, 20 + PUSHBUTTON "DirectSound testen", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 + GROUPBOX "Hinweise", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP END IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 220 @@ -188,4 +220,5 @@ IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?" IDS_FORMAT_ADAPTER_MEM "%u MB" IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" -END + IDS_OPTION_NO "Nein" +END Modified: trunk/reactos/base/applications/dxdiag/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/en-US.rc [iso-8859-1] Tue Apr 29 18:05:57 2008 @@ -65,7 +65,7 @@ LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10 - GROUPBOX "Driver", -1, 270, 10, 220, 100 + GROUPBOX "Driver", -1, 270, 10, 190, 100 RTEXT "Main Driver:", -1, 275, 25, 55, 10 RTEXT "Version:", -1, 275, 35, 55, 10 RTEXT "Date:", -1, 275, 45, 55, 10 @@ -103,6 +103,38 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Device", -1, 10, 10, 250, 100 + RTEXT "Name:", -1, 20, 25, 70, 10 + RTEXT "Device ID:", -1, 20, 35, 70, 10 + RTEXT "Manufacturer ID:", -1, 20, 45, 70, 10 + RTEXT "Product ID:", -1, 20, 55, 70, 10 + RTEXT "Type:", -1, 20, 65, 70, 10 + RTEXT "Default Device:", -1, 20, 75, 70, 10 + LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10 + GROUPBOX "Driver", -1, 270, 10, 190, 100 + RTEXT "Name:", -1, 275, 25, 55, 10 + RTEXT "Version:", -1, 275, 35, 55, 10 + RTEXT "Datw:", -1, 275, 45, 55, 10 + RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10 + RTEXT "Other Files:", -1, 275, 65, 55, 10 + RTEXT "Provider:", -1, 275, 75, 55, 10 + LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 + GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | WS_TABSTOP, 120, 135, 80, 17 + RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20 + PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 + GROUPBOX "Notes", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP END IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 @@ -188,4 +220,5 @@ IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?" IDS_FORMAT_ADAPTER_MEM "%u MB" IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" -END + IDS_OPTION_NO "No" +END Modified: trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] Tue Apr 29 18:05:57 2008 @@ -65,7 +65,7 @@ LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 130, 10 - GROUPBOX "Driver", -1, 240, 10, 220, 100 + GROUPBOX "Driver", -1, 240, 10, 190, 100 RTEXT "Main Driver:", -1, 245, 30, 55, 10 RTEXT "Version:", -1, 245, 40, 55, 10 RTEXT "Date:", -1, 245, 50, 55, 10 @@ -103,6 +103,38 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Device", -1, 10, 10, 250, 100 + RTEXT "Name:", -1, 20, 25, 70, 10 + RTEXT "Device ID:", -1, 20, 35, 70, 10 + RTEXT "Manufacturer ID:", -1, 20, 45, 70, 10 + RTEXT "Product ID:", -1, 20, 55, 70, 10 + RTEXT "Type:", -1, 20, 65, 70, 10 + RTEXT "Default Device:", -1, 20, 75, 70, 10 + LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10 + GROUPBOX "Driver", -1, 270, 10, 190, 100 + RTEXT "Name:", -1, 275, 25, 55, 10 + RTEXT "Version:", -1, 275, 35, 55, 10 + RTEXT "Datw:", -1, 275, 45, 55, 10 + RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10 + RTEXT "Other Files:", -1, 275, 65, 55, 10 + RTEXT "Provider:", -1, 275, 75, 55, 10 + LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 + GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | WS_TABSTOP, 120, 135, 80, 17 + RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20 + PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 + GROUPBOX "Notes", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP END IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 @@ -163,7 +195,7 @@ IDS_DEVICE_PRODUCT "Product ID" IDS_DEVICE_FORCEFEEDBACK "Force Feedback-Driver" IDS_NOT_APPLICABLE "Not applicable" - IDS_OPTION_YES "Yes" + IDS_OPTION_YES "Oui" IDS_DIRECTPLAY_COL_NAME1 "Name" IDS_DIRECTPLAY_COL_NAME2 "Registry" IDS_DIRECTPLAY_COL_NAME3 "File" @@ -188,4 +220,5 @@ IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?" IDS_FORMAT_ADAPTER_MEM "%u MB" IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" -END + IDS_OPTION_NO "Non" +END Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] Tue Apr 29 18:05:57 2008 @@ -72,7 +72,7 @@ LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 130, 10 - GROUPBOX "Driver", -1, 240, 10, 220, 100 + GROUPBOX "Driver", -1, 240, 10, 190, 100 RTEXT "Main Driver:", -1, 245, 30, 55, 10 RTEXT "Version:", -1, 245, 40, 55, 10 RTEXT "Date:", -1, 245, 50, 55, 10 @@ -110,6 +110,38 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Device", -1, 10, 10, 250, 100 + RTEXT "Name:", -1, 20, 25, 70, 10 + RTEXT "Device ID:", -1, 20, 35, 70, 10 + RTEXT "Manufacturer ID:", -1, 20, 45, 70, 10 + RTEXT "Product ID:", -1, 20, 55, 70, 10 + RTEXT "Type:", -1, 20, 65, 70, 10 + RTEXT "Default Device:", -1, 20, 75, 70, 10 + LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10 + GROUPBOX "Driver", -1, 270, 10, 190, 100 + RTEXT "Name:", -1, 275, 25, 55, 10 + RTEXT "Version:", -1, 275, 35, 55, 10 + RTEXT "Datw:", -1, 275, 45, 55, 10 + RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10 + RTEXT "Other Files:", -1, 275, 65, 55, 10 + RTEXT "Provider:", -1, 275, 75, 55, 10 + LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 + GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | WS_TABSTOP, 120, 135, 80, 17 + RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20 + PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 + GROUPBOX "Notes", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP END IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 @@ -195,4 +227,5 @@ IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?" IDS_FORMAT_ADAPTER_MEM "%u MB" IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" -END + IDS_OPTION_NO "No" +END Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] Tue Apr 29 18:05:57 2008 @@ -65,7 +65,7 @@ LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 130, 10 - GROUPBOX "Äðàéâåðû", -1, 240, 10, 220, 100 + GROUPBOX "Äðàéâåðû", -1, 240, 10, 190, 100 RTEXT "Ãëàâíûé:", -1, 245, 30, 55, 10 RTEXT "Âåðñèÿ:", -1, 245, 40, 55, 10 RTEXT "Äàòà:", -1, 245, 50, 55, 10 @@ -103,6 +103,38 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Device", -1, 10, 10, 250, 100 + RTEXT "Name:", -1, 20, 25, 70, 10 + RTEXT "Device ID:", -1, 20, 35, 70, 10 + RTEXT "Manufacturer ID:", -1, 20, 45, 70, 10 + RTEXT "Product ID:", -1, 20, 55, 70, 10 + RTEXT "Type:", -1, 20, 65, 70, 10 + RTEXT "Default Device:", -1, 20, 75, 70, 10 + LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10 + GROUPBOX "Driver", -1, 270, 10, 190, 100 + RTEXT "Name:", -1, 275, 25, 55, 10 + RTEXT "Version:", -1, 275, 35, 55, 10 + RTEXT "Datw:", -1, 275, 45, 55, 10 + RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10 + RTEXT "Other Files:", -1, 275, 65, 55, 10 + RTEXT "Provider:", -1, 275, 75, 55, 10 + LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 + GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | WS_TABSTOP, 120, 135, 80, 17 + RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20 + PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 + GROUPBOX "Notes", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP END IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 @@ -188,4 +220,5 @@ IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?" IDS_FORMAT_ADAPTER_MEM "%u MB" IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" -END + IDS_OPTION_NO "No" +END Modified: trunk/reactos/base/applications/dxdiag/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… ============================================================================== --- trunk/reactos/base/applications/dxdiag/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/resource.h [iso-8859-1] Tue Apr 29 18:05:57 2008 @@ -48,17 +48,32 @@ #define IDC_STATIC_ADAPTER_MINIVDD 3011 #define IDC_STATIC_ADAPTER_VDD 3012 #define IDC_STATIC_ADAPTER_DDI 3013 +#define IDC_BUTTON_DDRAW 3014 +#define IDC_BUTTON_D3D 3015 +#define IDC_BUTTON_AGP 3016 +#define IDC_BUTTON_TESTDD 3017 +#define IDC_BUTTON_TEST3D 3018 +#define IDC_STATIC_DDSTATE 3019 +#define IDC_STATIC_D3DSTATE 3020 +#define IDC_STATIC_AGPSTATE 3021 +#define IDC_TEXT_INFO 3022 - -#define IDC_BUTTON_DDRAW 2011 -#define IDC_BUTTON_D3D 2012 -#define IDC_BUTTON_AGP 2013 -#define IDC_BUTTON_TESTDD 2014 -#define IDC_BUTTON_TEST3D 2015 -#define IDC_STATIC_DDSTATE 2016 -#define IDC_STATIC_D3DSTATE 2017 -#define IDC_STATIC_AGPSTATE 2018 -#define IDC_TEXT_INFO 2019 +/* DirectSound dialog constants */ +#define IDC_STATIC_DSOUND_NAME 4000 +#define IDC_STATIC_DSOUND_DEVICEID 4001 +#define IDC_STATIC_DSOUND_VENDORID 4002 +#define IDC_STATIC_DSOUND_PRODUCTID 4003 +#define IDC_STATIC_DSOUND_TYPE 4004 +#define IDC_STATIC_DSOUND_STANDARD 4005 +#define IDC_STATIC_DSOUND_DRIVER 4006 +#define IDC_STATIC_DSOUND_VERSION 4007 +#define IDC_STATIC_DSOUND_DATE 4008 +#define IDC_STATIC_DSOUND_LOGO 4009 +#define IDC_STATIC_DSOUND_FILES 4010 +#define IDC_STATIC_ADAPTER_PROVIDER 4011 +#define IDC_SLIDER_DSOUND 4012 +#define IDC_BUTTON_TESTDSOUND 4013 +#define IDC_TEXT_DSOUNDINFO 4014 /* DirectInput dialog constants */ @@ -121,6 +136,7 @@ #define IDS_DDTEST_TITLE 10124 #define IDS_FORMAT_ADAPTER_MEM 10125 #define IDS_FORMAT_ADAPTER_MODE 10126 +#define IDS_OPTION_NO 10127 /* icon resource constants */ #define IDI_APPICON 20000

16 years, 7 months

[dreimer] 33194: build.ps1 does still not work, but you can build now with "mingw32-make bootcd".

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Apr 29 16:46:25 2008 New Revision: 33194 URL: http://svn.reactos.org/svn/reactos?rev=33194&view=rev Log: build.ps1 does still not work, but you can build now with "mingw32-make bootcd". Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Apr 29 16:46:25 2008 @@ -97,10 +97,6 @@ if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { set-alias OPTIONS "& $_ROSBE_BASEDIR\options.ps1" } - -set-alias test "ddd" - -test } # @@ -126,11 +122,12 @@ if ($args[0] = "oldmode") { # cls $_ROSBE_MODE = "MinGW" -} + } else { # cls "Unknown parameter specified. Exiting." exit +} } RosBE4 #cls Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Tue Apr 29 16:46:25 2008 @@ -12,56 +12,56 @@ # Check if we are running within the RosBE, and if not # initialize GCC for the current directory. # -if not defined _ROSBE_MINGWPATH ( - set _ROSBE_MODE=MinGW - set _ROSBE_MINGWPATH=%CD% - set _ROSBE_ORIGINALPATH=%PATH% -) +if ($ENV:_ROSBE_MINGWPATH = $null) { + $ENV:_ROSBE_MODE = "MinGW" + $ENV:_ROSBE_MINGWPATH = "$pwd" + $ENV:_ROSBE_ORIGINALPATH = "$PATH" +} # # Set up the GCC 4.x.x build environment. # -set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% -set _ROSBE_GCCVERSION= -set _ROSBE_GCCTARGET= -for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i -for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i -set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH% -set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe -if "%_ROSBE_MODE%" == "MinGW" ( - set C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include - set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include -) else ( - set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" - set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" -) -set LIBRARY_PATH=%_ROSBE_MINGWPATH%\lib;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION% +$ENV:PATH = "$_ROSBE_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" +$_ROSBE_GCCVERSION = $null +$_ROSBE_GCCTARGET = $null +#for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i +#for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i +$ENV:PATH = "$_ROSBE_MINGWPATH\bin;$_ROSBE_MINGWPATH\libexec\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION;$_ROSBE_ORIGINALPATH" +$_ROSBE_MINGWMAKE = "$_ROSBE_MINGWPATH\bin\mingw32-make.exe" +if ($_ROSBE_MODE = "MinGW") { + $ENV:C_INCLUDE_PATH = "$_ROSBE_MINGWPATH\include;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" + $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_MINGWPATH\include;$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION;$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" +} else { + $ENV:HOST_CFLAGS = "-I""$_ROSBE_MINGWPATH\include"" -I""$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" + $ENV:HOST_CPPFLAGS = "-I""$_ROSBE_MINGWPATH\include"" -I""$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION"" -I""$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET"" -I""$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" +} +$ENV:LIBRARY_PATH = "$_ROSBE_MINGWPATH\lib;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION" # # Display the current version of GCC, NASM, ld and make. # gcc -v 2>&1 | find "gcc version" -echo gcc target^: %_ROSBE_GCCTARGET% +"gcc target - $_ROSBE_GCCTARGET" ld -v -if exist "%_ROSBE_MINGWPATH%\bin\nasm.exe" ( +if (Test-Path "$_ROSBE_MINGWPATH\bin\nasm.exe") { nasm -v -) else ( - if "%_ROSBE_MODE%" == "RosBE" ( - echo ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC. - ) -) -if exist "%_ROSBE_MINGWPATH%\bin\bison.exe" ( +} else { + if ($_ROSBE_MODE = "RosBE") { + "ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC." + } +} +if (Test-Path "$_ROSBE_MINGWPATH\bin\bison.exe") { bison --version | find "GNU Bison" -) else ( - if "%_ROSBE_MODE%" == "RosBE" ( - echo WARNING: Bison will soon be required to build ReactOS, none found in the current MinGW/GCC. - ) -) -if exist "%_ROSBE_MINGWPATH%\bin\flex.exe" ( +} else { + if ($_ROSBE_MODE = "RosBE") { + "WARNING: Bison will soon be required to build ReactOS, none found in the current MinGW/GCC." + } +} +if (Test-Path "$_ROSBE_MINGWPATH\bin\flex.exe") { flex --version -) else ( - if "%_ROSBE_MODE%" == "RosBE" ( - echo WARNING: Flex will soon be required to build ReactOS, none found in the current MinGW/GCC. - ) -) +} else { + if ($_ROSBE_MODE = "RosBE") { + "WARNING: Flex will soon be required to build ReactOS, none found in the current MinGW/GCC." + } +} mingw32-make -v | find "GNU Make"

16 years, 7 months

[fireball] 33193: - Enter into critical region before acquiring the resource. See issue #3193 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Apr 29 15:01:38 2008 New Revision: 33193 URL: http://svn.reactos.org/svn/reactos?rev=33193&view=rev Log: - Enter into critical region before acquiring the resource. See issue #3193 for more details. Modified: trunk/reactos/drivers/filesystems/cdfs/cleanup.c Modified: trunk/reactos/drivers/filesystems/cdfs/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cleanup.c [iso-8859-1] Tue Apr 29 15:01:38 2008 @@ -79,11 +79,13 @@ FileObject = Stack->FileObject; DeviceExtension = DeviceObject->DeviceExtension; + KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&DeviceExtension->DirResource, TRUE); Status = CdfsCleanupFile(DeviceExtension, FileObject); ExReleaseResourceLite(&DeviceExtension->DirResource); + KeLeaveCriticalRegion(); ByeBye:

16 years, 7 months

[dreimer] 33192: Start of a PowerShell Port of RosBE. Right now it does not do anything useful, because my DOSKEY Replacement function does not set the aliases global and I dont have any idea how to correct this right now.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Apr 29 13:41:31 2008 New Revision: 33192 URL: http://svn.reactos.org/svn/reactos?rev=33192&view=rev Log: Start of a PowerShell Port of RosBE. Right now it does not do anything useful, because my DOSKEY Replacement function does not set the aliases global and I dont have any idea how to correct this right now. Added: trunk/tools/RosBE/RosBE-Windows/Powershell/ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 (with props) trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 (with props) trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 (with props) Added: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Tue Apr 29 13:41:31 2008 @@ -1,0 +1,175 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/Build.cmd +# PURPOSE: Perform the build of ReactOS. +# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# Colin Finck <mail(a)colinfinck.de> +# Peter Ward <dralnix(a)gmail.com> +# +# + +# +# Check if config.template.rbuild is newer than config.rbuild, if it is then +# abort the build and inform the user. +# +if exist .\config.rbuild ( + "%_ROSBE_BASEDIR%\Tools\chknewer.exe" .\config.template.rbuild .\config.rbuild + if !errorlevel! == 1 ( + echo. + echo *** config.template.rbuild is newer than config.rbuild *** + echo *** aborting build. Please check for changes and *** + echo *** update your config.rbuild. *** + echo. + endlocal + goto :EOC + ) +) + +# +# Check if strip or ccache are being used and set the appropriate options. +# +if defined _ROSBE_STRIP ( + if %_ROSBE_STRIP% == 1 ( + set ROS_LEAN_AND_MEAN=yes + ) else ( + set ROS_LEAN_AND_MEAN=no + ) +) +if defined _ROSBE_USECCACHE ( + if %_ROSBE_USECCACHE% == 1 ( + set CCACHE_DIR=%APPDATA%\RosBE\.ccache + set HOST_CC=ccache gcc + set HOST_CPP=ccache g++ + set TARGET_CC=ccache gcc + set TARGET_CPP=ccache g++ + ) else ( + set HOST_CC=gcc + set HOST_CPP=g++ + set TARGET_CC=gcc + set TARGET_CPP=g++ + ) +) + +# +# Check if the user has chosen to use a different object or output path +# and set it accordingly. +# +if defined _ROSBE_OBJPATH ( + if not exist "%_ROSBE_OBJPATH%\." ( + echo ERROR: The path specified doesn't seem to exist. + goto :EOC + ) else ( + set ROS_INTERMEDIATE=%_ROSBE_OBJPATH% + ) +) +if defined _ROSBE_OUTPATH ( + if not exist "%_ROSBE_OUTPATH%\." ( + echo ERROR: The path specified doesn't seem to exist. + goto :EOC + ) else ( + set ROS_OUTPUT=%_ROSBE_OUTPATH% + set ROS_TEMPORARY=%_ROSBE_OUTPATH% + ) +) + +# +# Get the current date and time for use in in our build log's file name. +# +call "%_ROSBE_BASEDIR%\TimeDate.cmd" + +# +# Check if writing logs is enabled, if so check if our log directory +# exists, if it doesn't, create it. +# +if %_ROSBE_WRITELOG% == 1 ( + if not exist "%_ROSBE_LOGDIR%\." ( + mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL + ) +) + +# +# Check if we are using -j or not. +# +if "%1" == "multi" ( + if not "%2" == "" ( + title 'makex %2' parallel build started: %TIMERAW% + ) else ( + title 'makex' parallel build started: %TIMERAW% + ) + call :BUILDMULTI %* +) else ( + if not "%1" == "" ( + title 'make %1' build started: %TIMERAW% + ) else ( + title 'make' build started: %TIMERAW% + ) + call :BUILD %* +) +goto :EOC + +:BUILD + if %_ROSBE_SHOWTIME% == 1 ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* + ) + ) else ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_MINGWMAKE%" %* + ) + ) +goto :EOF + +:BUILDMULTI + # + # Get the number of CPUs in the system so we know how many jobs to execute. + # To modify the number used alter the options used with cpucount: + # No Option - Number of CPUs. + # -x1 - Number of CPUs, plus 1. + # -x2 - Number of CPUs, doubled. + # -a - Determine the cpu count based on the inherited process affinity mask. + # + for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i + + if %_ROSBE_SHOWTIME% == 1 ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + ) + ) else ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + ) + ) +goto :EOF + +:EOC +# +# Highlight the fact that building has ended. +# +"%_ROSBE_BASEDIR%\Tools\flash.exe" + +if defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +) + +# +# Unload all used Vars. +# +set ROS_LEAN_AND_MEAN= +set HOST_CC= +set HOST_CPP= +set TARGET_CC= +set TARGET_CPP= +set ROS_INTERMEDIATE= +set ROS_OUTPUT= +set ROS_TEMPORARY= +set CPUCOUNT= +set CCACHE_DIR= Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Apr 29 13:41:31 2008 @@ -1,0 +1,168 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/RosBE.ps1 +# PURPOSE: This script provides/sets up various build environments for +# ReactOS. Currently it provides a GCC 4.1.3 build environment. +# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# Peter Ward <dralnix(a)gmail.com> +# +# + +# +# Set defaults to work with and override them if edited by +# the options utility. +# +(Get-Host).UI.RawUI.ForegroundColor = "Green" +(Get-Host).UI.RawUI.BackgroundColor = "Black" +cls +if ($APPDATA.Length -lt 1) {$APPDATA = $ENV:USERPROFILE} +$global:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" +$global:_ROSBE_VERSION = 1.2 +$global:_ROSBE_BASEDIR = "C:\Programme\RosBE" #NOCH FALSCH +$global:_ROSBE_MODE = "RosBE" +$global:_ROSBE_ROSSOURCEDIR = "$pwd" +$global:_ROSBE_ORIGINALPATH = "$PATH" +$global:_ROSBE_SHOWTIME = 1 +$global:_ROSBE_WRITELOG = 1 +$global:_ROSBE_USECCACHE = 0 +$global:_ROSBE_STRIP = 0 +$global:_ROSBE_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" +$global:_ROSBE_LOGDIR = "$_ROSBE_ROSSOURCEDIR\RosBE-Logs" +$global:_ROSBE_OBJPATH = $null +$global:_ROSBE_OUTPATH = $null + +# +# Display the banner and set up the environment for the GCC 4.x.x build +# environment. +# +function RosBE4 +{ +"*******************************************************************************" +"* *" +"* ReactOS Build Environment $_ROSBE_VERSION *" +"* *" +"*******************************************************************************" +"" +"" +(get-WmiObject Win32_OperatingSystem).caption +# +# Set the correct path for the build tools and set the MinGW make. +# +& "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" +} + +# +# Load the doskey macros and delete any macros for components +# that are not actually present. +# + +function LOADDOSKEYMACROS +{ +if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { +set-alias CHDEFDIR "& $_ROSBE_BASEDIR\chdefdir.ps1" +} + +if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { +set-alias CHDEFGCC "& $_ROSBE_BASEDIR\chdefgcc.ps1" +} + +if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { +set-alias CHARCH "& $_ROSBE_BASEDIR\charch.ps1" +} + +set-alias CLEAN "& $_ROSBE_BASEDIR\Clean.ps1" + +if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { +set-alias CONFIG "& $_ROSBE_BASEDIR\Config.ps1" +} + +set-alias HELP "& $_ROSBE_BASEDIR\Help.ps1" +set-alias MAKE "& $_ROSBE_BASEDIR\Build.ps1" +set-alias MAKEX "& $_ROSBE_BASEDIR\Build.ps1 multi" + +if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { +set-alias RADDR2LINE "& $_ROSBE_BASEDIR\reladdr2line.ps1" +} + +if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { +set-alias SCUT "& $_ROSBE_BASEDIR\scut.ps1" +} + +if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { +set-alias SSVN "& $_ROSBE_BASEDIR\sSVN.ps1" +set-alias SVN "& $_ROSBE_BASEDIR\Tools\svn.exe" +} + +if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { +set-alias OPTIONS "& $_ROSBE_BASEDIR\options.ps1" +} + +set-alias test "ddd" + +test +} + +# +# Check if RosBE data directory exists, if not, create it. +# +if (!(Test-Path "$APPDATA\RosBE")) {mkdir $APPDATA\RosBE} + +# +# Check if the user has used the options utility and +# if so, load their options. +# +if (Test-Path "$APPDATA\RosBE\rosbe-options.ps1") { +& "$APPDATA\RosBE\rosbe-options.ps1" +} + +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" + +# +# Check if we are using oldmode or if any unknown parameters +# were specified. +# +if ($args.count -gt 0) { +if ($args[0] = "oldmode") { +# cls + $_ROSBE_MODE = "MinGW" +} +} else { +# cls + "Unknown parameter specified. Exiting." +exit +} +RosBE4 +#cls + +# +# Load the base directory from srclist.txt and set it as the +# new source directory. +# +if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { +& "$_ROSBE_BASEDIR\scut.ps1" +} + +# +# Tell how to display the available commands. +# +"" +"For a list of all included commands, type: ""help""" +"-------------------------------------------------" +"" + +# +# Load the doskey macros that serve as our commands. +# +LOADDOSKEYMACROS + +# +# Look if the ReactOS source directory is empty. If so, +# inform the user and mention 'ssvn create' (only if ssvn is installed). +# +if (!(Test-Path "$_ROSBE_BASEDIR\sSVN.ps1")) { +# dir /b $_ROSBE_ROSSOURCEDIR 2>nul | findstr "." >nul + if ($errorlevel = 1) { + "No ReactOS source detected. Please use ""ssvn create"" to download it." + } +} Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Tue Apr 29 13:41:31 2008 @@ -1,0 +1,67 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/rosbe-gcc-env.cmd +# PURPOSE: Set up the GCC 4.x.x build environment. +# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# Peter Ward <dralnix(a)gmail.com> +# +# + +# +# Check if we are running within the RosBE, and if not +# initialize GCC for the current directory. +# +if not defined _ROSBE_MINGWPATH ( + set _ROSBE_MODE=MinGW + set _ROSBE_MINGWPATH=%CD% + set _ROSBE_ORIGINALPATH=%PATH% +) + +# +# Set up the GCC 4.x.x build environment. +# +set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% +set _ROSBE_GCCVERSION= +set _ROSBE_GCCTARGET= +for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i +for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i +set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH% +set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe +if "%_ROSBE_MODE%" == "MinGW" ( + set C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include + set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include +) else ( + set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" + set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" +) +set LIBRARY_PATH=%_ROSBE_MINGWPATH%\lib;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION% + +# +# Display the current version of GCC, NASM, ld and make. +# +gcc -v 2>&1 | find "gcc version" +echo gcc target^: %_ROSBE_GCCTARGET% +ld -v +if exist "%_ROSBE_MINGWPATH%\bin\nasm.exe" ( + nasm -v +) else ( + if "%_ROSBE_MODE%" == "RosBE" ( + echo ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC. + ) +) +if exist "%_ROSBE_MINGWPATH%\bin\bison.exe" ( + bison --version | find "GNU Bison" +) else ( + if "%_ROSBE_MODE%" == "RosBE" ( + echo WARNING: Bison will soon be required to build ReactOS, none found in the current MinGW/GCC. + ) +) +if exist "%_ROSBE_MINGWPATH%\bin\flex.exe" ( + flex --version +) else ( + if "%_ROSBE_MODE%" == "RosBE" ( + echo WARNING: Flex will soon be required to build ReactOS, none found in the current MinGW/GCC. + ) +) +mingw32-make -v | find "GNU Make" Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 7 months

[fireball] 33191: - All DxEng APIs are STDCALL. The only possible exception are FASTCALLs, but this is to be determined and fixed by Magnus. - Also fix numerous typos, greatlordisms, and other shamefully-looking strings.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Apr 29 12:00:31 2008 New Revision: 33191 URL: http://svn.reactos.org/svn/reactos?rev=33191&view=rev Log: - All DxEng APIs are STDCALL. The only possible exception are FASTCALLs, but this is to be determined and fixed by Magnus. - Also fix numerous typos, greatlordisms, and other shamefully-looking strings. Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Tue Apr 29 12:00:31 2008 @@ -1,6 +1,6 @@ /************************************************************************/ -/* This driver interface are exported from win32k.sys to dxg.sys */ +/* These functions are imported from win32k.sys by dxg.sys */ /************************************************************************/ #define DXENG_INDEX_Resverd0 0x00 #define DXENG_INDEX_DxEngNUIsTermSrv 0x01 @@ -70,7 +70,7 @@ } DXEGSHDEVDATA,*PDXEGSHDEVDATA; /************************************************************************/ -/* win32k.sys internal protypes for the driver functions it export */ +/* win32k.sys internal protypes for driver functions it exports */ /************************************************************************/ BOOLEAN STDCALL DxEngNUIsTermSrv(); PDC STDCALL DxEngLockDC(HDC hDC); @@ -86,39 +86,37 @@ DWORD STDCALL DxEngScreenAccessCheck(); BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask); -/* prototypes are not done yet, I need gather all my notes - * to make them correct - */ -BOOLEAN DxEngRedrawDesktop(); -ULONG DxEngDispUniq(); -ULONG DxEngVisRgnUniq(); -HDEV *DxEngEnumerateHdev(HDEV *hdev); -BOOL DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); -BOOLEAN DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse); -BOOLEAN DxEngCleanDC(HDC hdc); -BOOLEAN DxEngIncDispUniq(); +/* Prototypes for the following functions are not yet finished */ +BOOLEAN STDCALL DxEngRedrawDesktop(); +ULONG STDCALL DxEngDispUniq(); +ULONG STDCALL DxEngVisRgnUniq(); +HDEV* STDCALL DxEngEnumerateHdev(HDEV *hdev); +BOOL STDCALL DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); +BOOLEAN STDCALL DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse); +BOOLEAN STDCALL DxEngCleanDC(HDC hdc); +BOOLEAN STDCALL DxEngIncDispUniq(); -DWORD DxEngCreateMemoryDC(DWORD x1); +DWORD STDCALL DxEngCreateMemoryDC(DWORD x1); -DWORD DxEngIsHdevLockedByCurrentThread(DWORD x1); -DWORD DxEngUnreferenceHdev(DWORD x1); -DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); -DWORD DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); -DWORD DxEngSpSpritesVisible(DWORD x1); -DWORD DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3); -DWORD DxEngDeleteDC(DWORD x1, DWORD x2); -DWORD DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); -DWORD DxEngSelectBitmap(DWORD x1, DWORD x2); -DWORD DxEngSetBitmapOwner(DWORD x1, DWORD x2); -DWORD DxEngDeleteSurface(DWORD x1); -DWORD DxEngGetSurfaceData(DWORD x1, DWORD x2); -DWORD DxEngAltLockSurface(DWORD x1); -DWORD DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4); -DWORD DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2); -DWORD DxEngSelectPaletteToSurface(DWORD x1, DWORD x2); -DWORD DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2); -DWORD DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3); +DWORD STDCALL DxEngIsHdevLockedByCurrentThread(DWORD x1); +DWORD STDCALL DxEngUnreferenceHdev(DWORD x1); +DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); +DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); +DWORD STDCALL DxEngSpSpritesVisible(DWORD x1); +DWORD STDCALL DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3); +DWORD STDCALL DxEngDeleteDC(DWORD x1, DWORD x2); +DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); +DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2); +DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2); +DWORD STDCALL DxEngDeleteSurface(DWORD x1); +DWORD STDCALL DxEngGetSurfaceData(DWORD x1, DWORD x2); +DWORD STDCALL DxEngAltLockSurface(DWORD x1); +DWORD STDCALL DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4); +DWORD STDCALL DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2); +DWORD STDCALL DxEngSelectPaletteToSurface(DWORD x1, DWORD x2); +DWORD STDCALL DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2); +DWORD STDCALL DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngGetRedirectionBitmap(DWORD x1); -DWORD DxEngLoadImage(DWORD x1,DWORD x2); +DWORD STDCALL DxEngLoadImage(DWORD x1,DWORD x2); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Tue Apr 29 12:00:31 2008 @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Native driver enumate of dxeng implementation - * FILE: subsys/win32k/ntddraw/dxeng.c - * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) - * REVISION HISTORY: - * 15/10-2007 Magnus Olsen + * PROJECT: ReactOS Win32 Subsystem + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/ntddraw/dxeng.c + * PURPOSE: Implementation of DxEng functions + * PROGRAMMERS: Magnus Olsen (magnus(a)greatlord.com) */ #include <w32k.h> @@ -102,6 +100,7 @@ * *--*/ BOOL +STDCALL DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp) { DPRINT1("ReactX Calling : DxEngGetDeviceGammaRamp\n"); @@ -242,6 +241,7 @@ * *--*/ BOOLEAN +STDCALL DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test) { DPRINT1("ReactX Calling : DxEngSetDeviceGammaRamp\n"); @@ -646,6 +646,7 @@ /************************************************************************/ /* Enumerate all drivers in win32k */ HDEV * +STDCALL DxEngEnumerateHdev(HDEV *hdev) { /* FIXME Enumerate all drivers in win32k */ @@ -656,7 +657,9 @@ /************************************************************************/ /* DxEngCreateMemoryDC */ /************************************************************************/ -DWORD DxEngCreateMemoryDC(DWORD x1) +DWORD +STDCALL +DxEngCreateMemoryDC(DWORD x1) { UNIMPLEMENTED; return FALSE; @@ -676,7 +679,9 @@ /************************************************************************/ /* DxEngIsHdevLockedByCurrentThread */ /************************************************************************/ -DWORD DxEngIsHdevLockedByCurrentThread(DWORD x1) +DWORD +STDCALL +DxEngIsHdevLockedByCurrentThread(DWORD x1) { UNIMPLEMENTED; return FALSE; @@ -686,7 +691,9 @@ /************************************************************************/ /* DxEngUnreferenceHdev */ /************************************************************************/ -DWORD DxEngUnreferenceHdev(DWORD x1) +DWORD +STDCALL +DxEngUnreferenceHdev(DWORD x1) { UNIMPLEMENTED; return FALSE; @@ -695,7 +702,9 @@ /************************************************************************/ /* DxEngGetDesktopDC */ /************************************************************************/ -DWORD DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3) +DWORD +STDCALL +DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3) { UNIMPLEMENTED; return FALSE; @@ -704,7 +713,9 @@ /************************************************************************/ /* DxEngDeleteDC */ /************************************************************************/ -DWORD DxEngDeleteDC(DWORD x1, DWORD x2) +DWORD +STDCALL +DxEngDeleteDC(DWORD x1, DWORD x2) { UNIMPLEMENTED; return FALSE; @@ -713,7 +724,9 @@ /************************************************************************/ /* DxEngCleanDC */ /************************************************************************/ -BOOLEAN DxEngCleanDC(HDC hdc) +BOOLEAN +STDCALL +DxEngCleanDC(HDC hdc) { UNIMPLEMENTED; return FALSE; @@ -730,7 +743,7 @@ /************************************************************************/ /* DxEngSetDCState */ /************************************************************************/ -DWORD DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3) +DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3) { UNIMPLEMENTED; return FALSE; @@ -739,7 +752,7 @@ /************************************************************************/ /* DxEngSelectBitmap */ /************************************************************************/ -DWORD DxEngSelectBitmap(DWORD x1, DWORD x2) +DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2) { UNIMPLEMENTED; return FALSE; @@ -748,7 +761,7 @@ /************************************************************************/ /* DxEngSetBitmapOwner */ /************************************************************************/ -DWORD DxEngSetBitmapOwner(DWORD x1, DWORD x2) +DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2) { UNIMPLEMENTED; return FALSE; @@ -757,7 +770,7 @@ /************************************************************************/ /* DxEngDeleteSurface */ /************************************************************************/ -DWORD DxEngDeleteSurface(DWORD x1) +DWORD STDCALL DxEngDeleteSurface(DWORD x1) { UNIMPLEMENTED; return FALSE; @@ -766,7 +779,7 @@ /************************************************************************/ /* DxEngGetSurfaceData */ /************************************************************************/ -DWORD DxEngGetSurfaceData(DWORD x1, DWORD x2) +DWORD STDCALL DxEngGetSurfaceData(DWORD x1, DWORD x2) { UNIMPLEMENTED; return FALSE; @@ -775,7 +788,7 @@ /************************************************************************/ /* DxEngAltLockSurface */ /************************************************************************/ -DWORD DxEngAltLockSurface(DWORD x1) +DWORD STDCALL DxEngAltLockSurface(DWORD x1) { UNIMPLEMENTED; return FALSE; @@ -784,7 +797,7 @@ /************************************************************************/ /* DxEngUploadPaletteEntryToSurface */ /************************************************************************/ -DWORD DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4) +DWORD STDCALL DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4) { UNIMPLEMENTED; return FALSE; @@ -793,7 +806,7 @@ /************************************************************************/ /* DxEngMarkSurfaceAsDirectDraw */ /************************************************************************/ -DWORD DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2) +DWORD STDCALL DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2) { UNIMPLEMENTED; return FALSE; @@ -802,7 +815,7 @@ /************************************************************************/ /* DxEngSelectPaletteToSurface */ /************************************************************************/ -DWORD DxEngSelectPaletteToSurface(DWORD x1, DWORD x2) +DWORD STDCALL DxEngSelectPaletteToSurface(DWORD x1, DWORD x2) { UNIMPLEMENTED; return FALSE; @@ -811,7 +824,7 @@ /************************************************************************/ /* DxEngSyncPaletteTableWithDevice */ /************************************************************************/ -DWORD DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2) +DWORD STDCALL DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2) { UNIMPLEMENTED; return FALSE; @@ -820,7 +833,7 @@ /************************************************************************/ /* DxEngSetPaletteState */ /************************************************************************/ -DWORD DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3) +DWORD STDCALL DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3) { UNIMPLEMENTED; return FALSE; @@ -839,7 +852,7 @@ /************************************************************************/ /* DxEngLoadImage */ /************************************************************************/ -DWORD DxEngLoadImage(DWORD x1,DWORD x2) +DWORD STDCALL DxEngLoadImage(DWORD x1,DWORD x2) { UNIMPLEMENTED; return FALSE; @@ -848,7 +861,7 @@ /************************************************************************/ /* DxEngSpTearDownSprites */ /************************************************************************/ -DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3) +DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3) { UNIMPLEMENTED; return FALSE; @@ -857,7 +870,7 @@ /************************************************************************/ /* DxEngSpUnTearDownSprites */ /************************************************************************/ -DWORD DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3) +DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3) { UNIMPLEMENTED; return FALSE; @@ -866,8 +879,8 @@ /************************************************************************/ /* DxEngSpSpritesVisible */ /************************************************************************/ -DWORD DxEngSpSpritesVisible(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} +DWORD STDCALL DxEngSpSpritesVisible(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +}

16 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2008