Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[fireball] 32447: Pierre Schweitzer <heis_spiter@hotmail.com> - Implement FsRtlDissectName() based on MSDN description. Improvements and bugfixes to the patch were made by Aleksey Bragin.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Feb 22 13:50:26 2008 New Revision: 32447 URL: http://svn.reactos.org/svn/reactos?rev=32447&view=rev Log: Pierre Schweitzer <heis_spiter(a)hotmail.com> - Implement FsRtlDissectName() based on MSDN description. Improvements and bugfixes to the patch were made by Aleksey Bragin. Modified: trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c Fri Feb 22 13:50:26 2008 @@ -139,7 +139,45 @@ OUT PUNICODE_STRING FirstPart, OUT PUNICODE_STRING RemainingPart) { - KEBUGCHECK(0); + ULONG FirstPosition, i; + ULONG SkipFirstSlash = 0; + + /* Just quit if the string is empty */ + if (!Name.Length) return; + + /* Find first backslash */ + FirstPosition = Name.Length / sizeof(WCHAR) ; + for (i = 0; i < Name.Length / sizeof(WCHAR); i++) + { + /* If we found one... */ + if (Name.Buffer[i] == '\\') + { + /* If it begins string, just notice it and continue */ + if (i == 0) + { + SkipFirstSlash = 1; + } + else + { + /* Else, save its position and break out of the loop */ + FirstPosition = i; + break; + } + } + } + + /* Set up the first result string */ + FirstPart->Buffer = Name.Buffer + SkipFirstSlash; + FirstPart->Length = (FirstPosition - SkipFirstSlash) * sizeof(WCHAR); + FirstPart->MaximumLength = Name.MaximumLength - FirstPart->Length; + + /* And second one, if necessary */ + if (FirstPosition < (Name.Length / sizeof(WCHAR))) + { + RemainingPart->Buffer = Name.Buffer + FirstPosition + 1; + RemainingPart->Length = (Name.Length - FirstPosition) * sizeof(WCHAR); + RemainingPart->MaximumLength = Name.MaximumLength - RemainingPart->Length; + } } /*++

16 years, 10 months

[mpiulachs] 32446: - Use the new 'package' module type.

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Fri Feb 22 02:27:21 2008 New Revision: 32446 URL: http://svn.reactos.org/svn/reactos?rev=32446&view=rev Log: - Use the new 'package' module type. Modified: branches/rbuild/reactos/base/shell/explorer/explorer.rbuild branches/rbuild/reactos/media/fonts/fonts.rbuild branches/rbuild/reactos/media/inf/inf.rbuild Modified: branches/rbuild/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/shell/explo… ============================================================================== --- branches/rbuild/reactos/base/shell/explorer/explorer.rbuild (original) +++ branches/rbuild/reactos/base/shell/explorer/explorer.rbuild Fri Feb 22 02:27:21 2008 @@ -70,8 +70,10 @@ <file>explorer.cpp</file> <file>i386-stub-win32.c</file> <file>explorer.rc</file> + + <installfile installbase=".">explorer-cfg-template.xml</installfile> </module> -<installfile installbase=".">explorer-cfg-template.xml</installfile> + <directory name="notifyhook"> <xi:include href="notifyhook/notifyhook.rbuild" /> </directory> Modified: branches/rbuild/reactos/media/fonts/fonts.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/media/fonts/font… ============================================================================== --- branches/rbuild/reactos/media/fonts/fonts.rbuild (original) +++ branches/rbuild/reactos/media/fonts/fonts.rbuild Fri Feb 22 02:27:21 2008 @@ -1,55 +1,63 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> - <installfile installbase="media/fonts">DejaVuSans-Bold.ttf </installfile> - <installfile installbase="media/fonts">DejaVuSans.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSans-BoldOblique.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSansCondensed.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSansCondensed-Bold.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSansCondensed-Oblique.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSans-ExtraLight.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSansMono.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSansMono-Bold.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSansMono-BoldOblique.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSansMono-Oblique.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSans-Oblique.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSerif.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSerif-Bold.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSerif-BoldOblique.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSerifCondensed.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSerifCondensed-Bold.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSerifCondensed-BoldOblique.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSerifCondensed-Oblique.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSerif-Italic.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSerif-BoldItalic.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSerifCondensed-BoldItalic.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSerifCondensed-Italic.ttf</installfile> - <installfile installbase="media/fonts">c0419bt_.ttf</installfile> - <installfile installbase="media/fonts">c0582bt_.ttf</installfile> - <installfile installbase="media/fonts">c0583bt_.ttf</installfile> - <installfile installbase="media/fonts">c0611bt_.ttf</installfile> - <installfile installbase="media/fonts">c0632bt_.ttf</installfile> - <installfile installbase="media/fonts">c0633bt_.ttf</installfile> - <installfile installbase="media/fonts">c0648bt_.ttf</installfile> - <installfile installbase="media/fonts">c0649bt_.ttf</installfile> - <installfile installbase="media/fonts">cour.ttf</installfile> - <installfile installbase="media/fonts">courb.ttf</installfile> - <installfile installbase="media/fonts">courbi.ttf</installfile> - <installfile installbase="media/fonts">helb____.ttf</installfile> - <installfile installbase="media/fonts">Marlett.ttf</installfile> - <installfile installbase="media/fonts">timr____.ttf</installfile> - <installfile installbase="media/fonts">UTB_____.ttf</installfile> - <installfile installbase="media/fonts">UTBI____.ttf</installfile> - <installfile installbase="media/fonts">UTI_____.ttf</installfile> - <installfile installbase="media/fonts">UTRG____.ttf</installfile> - <installfile installbase="media/fonts">Vera.ttf</installfile> - <installfile installbase="media/fonts">VeraBd.ttf</installfile> - <installfile installbase="media/fonts">VeraBI.ttf</installfile> - <installfile installbase="media/fonts">VeraIt.ttf</installfile> - <installfile installbase="media/fonts">VeraMoBd.ttf</installfile> - <installfile installbase="media/fonts">VeraMoBI.ttf</installfile> - <installfile installbase="media/fonts">VeraMoIt.ttf</installfile> - <installfile installbase="media/fonts">VeraMono.ttf</installfile> - <installfile installbase="media/fonts">VeraSe.ttf</installfile> - <installfile installbase="media/fonts">VeraSeBd.ttf</installfile> + <module name="dejavufonts" type="package"> + <installfile installbase="media/fonts">DejaVuSans-Bold.ttf </installfile> + <installfile installbase="media/fonts">DejaVuSans.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSans-BoldOblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansCondensed.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansCondensed-Bold.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansCondensed-Oblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSans-ExtraLight.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansMono.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansMono-Bold.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansMono-BoldOblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansMono-Oblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSans-Oblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif-Bold.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif-BoldOblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-Bold.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-BoldOblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-Oblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif-Italic.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif-BoldItalic.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-BoldItalic.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-Italic.ttf</installfile> + </module> + + <module name="standardfonts" type="package"> + <installfile installbase="media/fonts">c0419bt_.ttf</installfile> + <installfile installbase="media/fonts">c0582bt_.ttf</installfile> + <installfile installbase="media/fonts">c0583bt_.ttf</installfile> + <installfile installbase="media/fonts">c0611bt_.ttf</installfile> + <installfile installbase="media/fonts">c0632bt_.ttf</installfile> + <installfile installbase="media/fonts">c0633bt_.ttf</installfile> + <installfile installbase="media/fonts">c0648bt_.ttf</installfile> + <installfile installbase="media/fonts">c0649bt_.ttf</installfile> + <installfile installbase="media/fonts">cour.ttf</installfile> + <installfile installbase="media/fonts">courb.ttf</installfile> + <installfile installbase="media/fonts">courbi.ttf</installfile> + <installfile installbase="media/fonts">helb____.ttf</installfile> + <installfile installbase="media/fonts">Marlett.ttf</installfile> + <installfile installbase="media/fonts">timr____.ttf</installfile> + <installfile installbase="media/fonts">UTB_____.ttf</installfile> + <installfile installbase="media/fonts">UTBI____.ttf</installfile> + <installfile installbase="media/fonts">UTI_____.ttf</installfile> + <installfile installbase="media/fonts">UTRG____.ttf</installfile> + </module> + + <module name="verafonts" type="package"> + <installfile installbase="media/fonts">Vera.ttf</installfile> + <installfile installbase="media/fonts">VeraBd.ttf</installfile> + <installfile installbase="media/fonts">VeraBI.ttf</installfile> + <installfile installbase="media/fonts">VeraIt.ttf</installfile> + <installfile installbase="media/fonts">VeraMoBd.ttf</installfile> + <installfile installbase="media/fonts">VeraMoBI.ttf</installfile> + <installfile installbase="media/fonts">VeraMoIt.ttf</installfile> + <installfile installbase="media/fonts">VeraMono.ttf</installfile> + <installfile installbase="media/fonts">VeraSe.ttf</installfile> + <installfile installbase="media/fonts">VeraSeBd.ttf</installfile> + </module> </group> Modified: branches/rbuild/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/media/inf/inf.rb… ============================================================================== --- branches/rbuild/reactos/media/inf/inf.rbuild (original) +++ branches/rbuild/reactos/media/inf/inf.rbuild Fri Feb 22 02:27:21 2008 @@ -1,23 +1,25 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> - <installfile installbase="inf">acpi.inf</installfile> - <installfile installbase="inf">cdrom.inf</installfile> - <installfile installbase="inf">display.inf</installfile> - <installfile installbase="inf">hdc.inf</installfile> - <installfile installbase="inf">keyboard.inf</installfile> - <installfile installbase="inf">layout.inf</installfile> - <installfile installbase="inf">machine.inf</installfile> - <installfile installbase="inf">msmouse.inf</installfile> - <installfile installbase="inf">NET_NIC.inf</installfile> - <installfile installbase="inf">netamd.inf</installfile> - <installfile installbase="inf">netisa.inf</installfile> - <installfile installbase="inf">netrtpnt.inf</installfile> - <installfile installbase="inf">nettcpip.inf</installfile> - <installfile installbase="inf">ports.inf</installfile> - <installfile installbase="inf">scsi.inf</installfile> + <module name="hardwareinfs" type="package"> + <installfile installbase="inf">acpi.inf</installfile> + <installfile installbase="inf">cdrom.inf</installfile> + <installfile installbase="inf">display.inf</installfile> + <installfile installbase="inf">hdc.inf</installfile> + <installfile installbase="inf">keyboard.inf</installfile> + <installfile installbase="inf">layout.inf</installfile> + <installfile installbase="inf">machine.inf</installfile> + <installfile installbase="inf">msmouse.inf</installfile> + <installfile installbase="inf">NET_NIC.inf</installfile> + <installfile installbase="inf">netamd.inf</installfile> + <installfile installbase="inf">netisa.inf</installfile> + <installfile installbase="inf">netrtpnt.inf</installfile> + <installfile installbase="inf">nettcpip.inf</installfile> + <installfile installbase="inf">ports.inf</installfile> + <installfile installbase="inf">scsi.inf</installfile> + <installfile installbase="inf">usbport.inf</installfile> + <installfile installbase="inf">usbstor.inf</installfile> + <installfile installbase="inf">xboxdisp.inf</installfile> + </module> <installfile installbase="inf" root="output">syssetup.inf</installfile> - <installfile installbase="inf">usbport.inf</installfile> - <installfile installbase="inf">usbstor.inf</installfile> - <installfile installbase="inf">xboxdisp.inf</installfile> -</group> +</group>

16 years, 10 months

[mpiulachs] 32445: - Add support to modules for handling <InstallFile> elements. That instructs rbuild on what files the module must also copy if installed. - Introduced a new module type (Package). Allows us to apply logic like manipulate or conditional include/exclude a group of files that represent altogether an entity. (It will be used when auto generating packages file)

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Fri Feb 22 02:24:44 2008 New Revision: 32445 URL: http://svn.reactos.org/svn/reactos?rev=32445&view=rev Log: - Add support to modules for handling <InstallFile> elements. That instructs rbuild on what files the module must also copy if installed. - Introduced a new module type (Package). Allows us to apply logic like manipulate or conditional include/exclude a group of files that represent altogether an entity. (It will be used when auto generating packages file) Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.h branches/rbuild/reactos/tools/rbuild/bootstrap.cpp branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp Fri Feb 22 02:24:44 2008 @@ -556,6 +556,8 @@ return false; if ( module.type == Alias ) return false; + if ( module.type == Package ) + return false; return true; } @@ -1210,10 +1212,21 @@ MingwBackend::GetNonModuleInstallTargetFiles ( vector<FileLocation>& out ) const { + /* Project install files */ for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ ) { const InstallFile& installfile = *ProjectNode.installfiles[i]; out.push_back ( *installfile.target ); + } + + for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) + { + const Module& module = *ProjectNode.modules[i]; + for ( size_t j = 0; j < module.installfiles.size (); j++ ) + { + const InstallFile& installfile = *module.installfiles[j]; + out.push_back ( *installfile.target ); + } } } @@ -1263,6 +1276,16 @@ { const InstallFile& installfile = *ProjectNode.installfiles[i]; OutputInstallTarget ( *installfile.source, *installfile.target ); + } + + for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) + { + const Module& module = *ProjectNode.modules[i]; + for ( size_t j = 0; j < module.installfiles.size (); j++ ) + { + const InstallFile& installfile = *module.installfiles[j]; + OutputInstallTarget ( *installfile.source, *installfile.target ); + } } } Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Feb 22 02:24:44 2008 @@ -237,6 +237,9 @@ case ElfExecutable: handler = new MingwElfExecutableModuleHandler ( module ); break; + case Package: + handler = new MingwAliasModuleHandler ( module ); + break; default: throw UnknownModuleTypeException ( module.node.location, @@ -3654,6 +3657,21 @@ installfile.target->name ); OutputCopyCommand ( *installfile.source, target ); } + + for ( size_t j = 0; j < module.project.modules.size (); j++ ) + { + const Module& mdl = *module.project.modules[j]; + for ( size_t i = 0; i < mdl.installfiles.size (); i++ ) + { + const InstallFile& installfile = *mdl.installfiles[i]; + FileLocation target ( OutputDirectory, + installfile.target->relative_path.length () > 0 + ? livecdReactosDirectory + sSep + installfile.target->relative_path + : livecdReactosDirectory, + installfile.target->name ); + OutputCopyCommand ( *installfile.source, target ); + } + } } void @@ -3846,6 +3864,18 @@ { } +MingwPackageModuleHandler::MingwPackageModuleHandler ( + const Module& module_ ) + + : MingwModuleHandler ( module_ ) +{ +} + +void +MingwPackageModuleHandler::Process () +{ +} + MingwIdlHeaderModuleHandler::MingwIdlHeaderModuleHandler ( const Module& module_ ) Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.h Fri Feb 22 02:24:44 2008 @@ -488,6 +488,14 @@ virtual void Process (); }; +class MingwPackageModuleHandler : public MingwModuleHandler +{ +public: + MingwPackageModuleHandler ( const Module& module ); + virtual HostType DefaultHost() { return HostFalse; } + virtual void Process (); +}; + class MingwAliasModuleHandler : public MingwModuleHandler { public: Modified: branches/rbuild/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/boo… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/bootstrap.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/bootstrap.cpp Fri Feb 22 02:24:44 2008 @@ -68,7 +68,8 @@ case IdlHeader: case EmbeddedTypeLib: case ElfExecutable: - return false; + case Package: + return false; } throw InvalidOperationException ( __FILE__, __LINE__ ); Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Fri Feb 22 02:24:44 2008 @@ -686,6 +686,12 @@ parseContext.ifData->data.defines.push_back ( pDefine ); else non_if_data.defines.push_back ( pDefine ); + subs_invalid = true; + } + else if ( e.name == "installfile" ) + { + InstallFile* installfile = new InstallFile ( project, e, relative_path ); + installfiles.push_back ( installfile ); /* add the file to project for now */ subs_invalid = true; } else if ( e.name == "family" ) @@ -1073,6 +1079,8 @@ return EmbeddedTypeLib; if ( attribute.value == "elfexecutable" ) return ElfExecutable; + if ( attribute.value == "package" ) + return Package; throw InvalidAttributeValueException ( location, attribute.name, attribute.value ); @@ -1110,6 +1118,7 @@ case RpcServer: case RpcClient: case Alias: + case Package: case IdlHeader: return IntermediateDirectory; } @@ -1161,6 +1170,7 @@ return ".o"; case RpcClient: return ".o"; + case Package: case Alias: case ElfExecutable: case IdlHeader: @@ -1213,6 +1223,7 @@ case RpcServer: case RpcClient: case Alias: + case Package: case BootProgram: case IdlHeader: case ElfExecutable: @@ -1258,6 +1269,7 @@ case RpcServer: case RpcClient: case Alias: + case Package: case BootProgram: case IdlHeader: case EmbeddedTypeLib: @@ -1303,6 +1315,7 @@ case RpcServer: case RpcClient: case Alias: + case Package: case IdlHeader: case EmbeddedTypeLib: case ElfExecutable: Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Fri Feb 22 02:24:44 2008 @@ -359,7 +359,8 @@ IsoRegTest = 24, LiveIsoRegTest = 25, EmbeddedTypeLib = 26, - ElfExecutable = 27 + ElfExecutable = 27, + Package = 28 }; enum HostType @@ -427,6 +428,7 @@ std::vector<CompilerFlag*> compilerFlags; std::vector<LinkerFlag*> linkerFlags; std::vector<StubbedComponent*> stubbedComponents; + std::vector<InstallFile*> installfiles; LinkerScript* linkerScript; PchFile* pch; bool cplusplus;

16 years, 10 months

[mpiulachs] 32444: - Move hostname command line application to /base/applications/cmdutils/hostname - Add eventvwr to bootcd , it refuses to load under ros but highlights a problem with RPC that hopefully someone will investigate

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Fri Feb 22 00:58:40 2008 New Revision: 32444 URL: http://svn.reactos.org/svn/reactos?rev=32444&view=rev Log: - Move hostname command line application to /base/applications/cmdutils/hostname - Add eventvwr to bootcd , it refuses to load under ros but highlights a problem with RPC that hopefully someone will investigate Added: trunk/reactos/base/applications/cmdutils/hostname/ - copied from r32442, trunk/reactos/base/applications/hostname/ Removed: trunk/reactos/base/applications/hostname/ Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/base/applications/cmdutils/cmdutils.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Fri Feb 22 00:58:40 2008 @@ -1,70 +1,67 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<directory name="cacls"> - <xi:include href="cacls/cacls.rbuild" /> -</directory> -<directory name="calc"> - <xi:include href="calc/calc.rbuild" /> -</directory> -<directory name="charmap"> - <xi:include href="charmap/charmap.rbuild" /> -</directory> -<directory name="cmdutils"> - <xi:include href="cmdutils/cmdutils.rbuild" /> -</directory> -<directory name="control"> - <xi:include href="control/control.rbuild" /> -</directory> -<directory name="games"> - <xi:include href="games/games.rbuild" /> -</directory> -<directory name="hh"> - <xi:include href="hh/hh.rbuild" /> -</directory> -<directory name="hostname"> - <xi:include href="hostname/hostname.rbuild" /> -</directory> -<directory name="logoff"> - <xi:include href="logoff/logoff.rbuild" /> -</directory> -<directory name="msconfig"> - <xi:include href="msconfig/msconfig.rbuild" /> -</directory> -<directory name="mscutils"> - <xi:include href="mscutils/directory.rbuild" /> -</directory> -<directory name="mstsc"> - <xi:include href="mstsc/mstsc.rbuild" /> -</directory> -<directory name="network"> - <xi:include href="network/network.rbuild" /> -</directory> -<directory name="notepad"> - <xi:include href="notepad/notepad.rbuild" /> -</directory> -<directory name="regedit"> - <xi:include href="regedit/regedit.rbuild" /> -</directory> -<directory name="sc"> - <xi:include href="sc/sc.rbuild" /> -</directory> -<directory name="screensavers"> - <xi:include href="screensavers/screensavers.rbuild" /> -</directory> -<directory name="shutdown"> - <xi:include href="shutdown/shutdown.rbuild" /> -</directory> -<directory name="sndvol32"> - <xi:include href="sndvol32/sndvol32.rbuild" /> -</directory> -<directory name="taskmgr"> - <xi:include href="taskmgr/taskmgr.rbuild" /> -</directory> -<directory name="winhelp"> - <xi:include href="winhelp/winhelp.rbuild" /> -</directory> -<directory name="wordpad"> - <xi:include href="wordpad/wordpad.rbuild" /> -</directory> + <directory name="cacls"> + <xi:include href="cacls/cacls.rbuild" /> + </directory> + <directory name="calc"> + <xi:include href="calc/calc.rbuild" /> + </directory> + <directory name="charmap"> + <xi:include href="charmap/charmap.rbuild" /> + </directory> + <directory name="cmdutils"> + <xi:include href="cmdutils/cmdutils.rbuild" /> + </directory> + <directory name="control"> + <xi:include href="control/control.rbuild" /> + </directory> + <directory name="games"> + <xi:include href="games/games.rbuild" /> + </directory> + <directory name="hh"> + <xi:include href="hh/hh.rbuild" /> + </directory> + <directory name="logoff"> + <xi:include href="logoff/logoff.rbuild" /> + </directory> + <directory name="msconfig"> + <xi:include href="msconfig/msconfig.rbuild" /> + </directory> + <directory name="mscutils"> + <xi:include href="mscutils/directory.rbuild" /> + </directory> + <directory name="mstsc"> + <xi:include href="mstsc/mstsc.rbuild" /> + </directory> + <directory name="network"> + <xi:include href="network/network.rbuild" /> + </directory> + <directory name="notepad"> + <xi:include href="notepad/notepad.rbuild" /> + </directory> + <directory name="regedit"> + <xi:include href="regedit/regedit.rbuild" /> + </directory> + <directory name="sc"> + <xi:include href="sc/sc.rbuild" /> + </directory> + <directory name="screensavers"> + <xi:include href="screensavers/screensavers.rbuild" /> + </directory> + <directory name="shutdown"> + <xi:include href="shutdown/shutdown.rbuild" /> + </directory> + <directory name="sndvol32"> + <xi:include href="sndvol32/sndvol32.rbuild" /> + </directory> + <directory name="taskmgr"> + <xi:include href="taskmgr/taskmgr.rbuild" /> + </directory> + <directory name="winhelp"> + <xi:include href="winhelp/winhelp.rbuild" /> + </directory> + <directory name="wordpad"> + <xi:include href="wordpad/wordpad.rbuild" /> + </directory> </group> Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/cmdutils.rbuild (original) +++ trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Fri Feb 22 00:58:40 2008 @@ -10,6 +10,9 @@ <directory name="find"> <xi:include href="find/find.rbuild" /> </directory> + <directory name="hostname"> + <xi:include href="hostname/hostname.rbuild" /> + </directory> <directory name="more"> <xi:include href="more/more.rbuild" /> </directory> 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 (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Feb 22 00:58:40 2008 @@ -36,14 +36,15 @@ base\applications\cmdutils\dbgprint\dbgprint.exe 1 base\applications\cmdutils\doskey\doskey.exe 1 base\applications\cmdutils\find\find.exe 1 +base\applications\cmdutils\hostname\hostname.exe 1 base\applications\cmdutils\more\more.exe 1 base\applications\cmdutils\xcopy\xcopy.exe 1 base\applications\control\control.exe 1 base\applications\mscutils\devmgmt\devmgmt.exe 1 +base\applications\mscutils\eventvwr\eventvwr.exe 1 base\applications\games\solitaire\sol.exe 1 base\applications\games\winemine\winemine.exe 1 base\applications\hh\hh.exe 1 -base\applications\hostname\hostname.exe 1 base\applications\logoff\logoff.exe 1 base\applications\msconfig\msconfig.exe 1 base\applications\mstsc\mstsc.exe 1

16 years, 10 months

[mpiulachs] 32443: Add support for ARM architecture

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Thu Feb 21 21:34:16 2008 New Revision: 32443 URL: http://svn.reactos.org/svn/reactos?rev=32443&view=rev Log: Add support for ARM architecture Modified: branches/rbuild/reactos/tools/rbuild/project.cpp Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Thu Feb 21 21:34:16 2008 @@ -504,6 +504,15 @@ non_if_data.defines.push_back ( pDefine ); } break; + case ARM: + { + Define* pDefine = new Define (*this, "_ARM_" ); + non_if_data.defines.push_back ( pDefine ); + + pDefine = new Define (*this, "__arm__" ); + non_if_data.defines.push_back ( pDefine ); + } + break; } } @@ -514,6 +523,8 @@ return I386; if ( attribute.value == "powerpc" ) return PowerPC; + if ( attribute.value == "arm" ) + return ARM; throw InvalidAttributeValueException ( location, attribute.name, attribute.value );

16 years, 10 months

[mpiulachs] 32442: - Modified to use the screensaver library - Reduce the amount of code to minimum - Remove unneeded resources

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Thu Feb 21 20:07:01 2008 New Revision: 32442 URL: http://svn.reactos.org/svn/reactos?rev=32442&view=rev Log: - Modified to use the screensaver library - Reduce the amount of code to minimum - Remove unneeded resources Added: trunk/reactos/base/applications/screensavers/logon/logon.def (with props) Modified: trunk/reactos/base/applications/screensavers/logon/lang/bg-BG.rc trunk/reactos/base/applications/screensavers/logon/lang/de-DE.rc trunk/reactos/base/applications/screensavers/logon/lang/el-GR.rc trunk/reactos/base/applications/screensavers/logon/lang/en-US.rc trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc trunk/reactos/base/applications/screensavers/logon/lang/fr-FR.rc trunk/reactos/base/applications/screensavers/logon/lang/it-IT.rc trunk/reactos/base/applications/screensavers/logon/lang/lt-LT.rc trunk/reactos/base/applications/screensavers/logon/lang/nl-NL.rc trunk/reactos/base/applications/screensavers/logon/lang/pl-PL.rc trunk/reactos/base/applications/screensavers/logon/lang/ru-RU.rc trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc trunk/reactos/base/applications/screensavers/logon/lang/uk-UA.rc trunk/reactos/base/applications/screensavers/logon/logon.c trunk/reactos/base/applications/screensavers/logon/logon.rbuild trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/screensavers/logon/resource.h Modified: trunk/reactos/base/applications/screensavers/logon/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/bg-BG.rc Thu Feb 21 20:07:01 2008 @@ -3,6 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Âõîäåí åêðàíåí ïðåäïàçèòåë" - IDS_TITLE "Çà" IDS_TEXT "Íÿìà âúçìîæíîñò çà íàñòðîéêè." END Modified: trunk/reactos/base/applications/screensavers/logon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/de-DE.rc Thu Feb 21 20:07:01 2008 @@ -3,6 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Logon Bildschirmschoner" - IDS_TITLE "Über" IDS_TEXT "Keinerlei Einstellungen notwendig." END Modified: trunk/reactos/base/applications/screensavers/logon/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/el-GR.rc Thu Feb 21 20:07:01 2008 @@ -3,6 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Ðñïöýëáîç ïèüíçò Logon" - IDS_TITLE "Ðåñß" IDS_TEXT "ÁõôÞ ç ðñïöýëáîç ïèüíçò äå äéáèÝôåé åðéëïãÝò ôéò ïðïßåò ìðïñåßôå íá ïñßóåôå." END Modified: trunk/reactos/base/applications/screensavers/logon/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/en-US.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/en-US.rc Thu Feb 21 20:07:01 2008 @@ -3,6 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Logon ScreenSaver" - IDS_TITLE "About" IDS_TEXT "No options need to be set." END Modified: trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc Thu Feb 21 20:07:01 2008 @@ -3,6 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Logotipo ReactOS" - IDS_TITLE "Acerca de" IDS_TEXT "Ninguna opción necesita ser configurada." END Modified: trunk/reactos/base/applications/screensavers/logon/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/fr-FR.rc Thu Feb 21 20:07:01 2008 @@ -3,6 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Écran de veille de logon" - IDS_TITLE "À propos de" IDS_TEXT "Il n'y a aucune option à définir." END Modified: trunk/reactos/base/applications/screensavers/logon/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/it-IT.rc Thu Feb 21 20:07:01 2008 @@ -3,6 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Salvaschermo Logon" - IDS_TITLE "Informazioni su ..." IDS_TEXT "Nessuna impostazione necessaria." END Modified: trunk/reactos/base/applications/screensavers/logon/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/lt-LT.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/lt-LT.rc Thu Feb 21 20:07:01 2008 @@ -12,6 +12,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Logon" - IDS_TITLE "Apie" IDS_TEXT "Nëra keièiamø parametrø." END Modified: trunk/reactos/base/applications/screensavers/logon/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/nl-NL.rc Thu Feb 21 20:07:01 2008 @@ -3,6 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Logon Schermbeveiliging" - IDS_TITLE "Informatie" IDS_TEXT "Geen dingen om in te stellen." END Modified: trunk/reactos/base/applications/screensavers/logon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/pl-PL.rc Thu Feb 21 20:07:01 2008 @@ -3,6 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Wygaszacz ekranu Logon" - IDS_TITLE "O programie..." IDS_TEXT "Brak opcji." END Modified: trunk/reactos/base/applications/screensavers/logon/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/ru-RU.rc Thu Feb 21 20:07:01 2008 @@ -3,6 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Çàñòàâêà ""Âõîä â ñèñòåìó""" - IDS_TITLE "Î ïðîãðàììå" IDS_TEXT "Ýòà çàñòàâêà íå èìååò íàñòðàèâàåìûõ ïàðàìåòðîâ." END Modified: trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc Thu Feb 21 20:07:01 2008 @@ -7,6 +7,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Logon - etriè obrazovky" - IDS_TITLE "Èo je ..." IDS_TEXT "Nie sú potrebné iadne nastavenia." END Modified: trunk/reactos/base/applications/screensavers/logon/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/uk-UA.rc Thu Feb 21 20:07:01 2008 @@ -11,6 +11,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Çàñòàâêà ""Âõ³ä äî ñèñòåìè""" - IDS_TITLE "Ïðî" IDS_TEXT "Öÿ çàñòàâêà íå ìàº íàëàøòîâóâàíèõ ïàðàìåòð³â." END Modified: trunk/reactos/base/applications/screensavers/logon/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.c (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.c Thu Feb 21 20:07:01 2008 @@ -19,6 +19,7 @@ */ #include <windows.h> +#include <scrnsave.h> #include <tchar.h> #include "resource.h" @@ -28,40 +29,8 @@ #define APP_TIMER 1 #define APP_TIMER_INTERVAL 2000 -#define BITMAP_HEIGHT 240; +#define BITMAP_HEIGHT 240 #define BITMAP_WIDTH 340 - -HINSTANCE hInstance; - -BOOL fullscreen = FALSE; - -void DrawScreen (HDC hdc, HDC hMemDC , RECT rect) -{ - int x; - int y; - int width = BITMAP_WIDTH; - int height = BITMAP_HEIGHT; - - if (!fullscreen) - { - width = width / 20; - height = height / 20; - } - - x = RANDOM (0, rect.right - width); - y = RANDOM (0, rect.bottom - height); - - BitBlt( - hdc, - x, - y, - width, - height, - hMemDC, - 0, - 0, - SRCCOPY); -} HBITMAP GetScreenSaverBitmap (void) { @@ -74,49 +43,39 @@ switch(osvi.wProductType) { case VER_NT_WORKSTATION: - return LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_WORKSTATION)); + return LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_WORKSTATION), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); break; default: - return LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_SERVER)); + return LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_SERVER), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); break; } } -LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +LRESULT CALLBACK +ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - static POINT ptLast; - static POINT ptCursor; - static BOOL fFirstTime = TRUE; - - static PAINTSTRUCT ps; static RECT rect; - static HDC hDC; - static HDC hMemDC; - static HBRUSH hBlkBrush; static HBITMAP bitmap; - switch (msg) + switch (message) { case WM_CREATE: { - hDC = GetDC(hwnd); - hBlkBrush = (HBRUSH) GetStockObject(BLACK_BRUSH); - hMemDC = CreateCompatibleDC(hDC); - GetClientRect(hwnd, &rect); + GetClientRect(hWnd, &rect); bitmap = GetScreenSaverBitmap (); if(bitmap == NULL) { MessageBox( - hwnd, + hWnd, _T("Fatal Error: Could not load bitmap"), _T("Error"), MB_OK | MB_ICONEXCLAMATION); } SetTimer ( - hwnd, + hWnd, APP_TIMER, APP_TIMER_INTERVAL, NULL); @@ -124,209 +83,73 @@ break; } case WM_PAINT: - { - hDC = BeginPaint(hwnd, &ps); - SelectObject(hMemDC, bitmap); - DrawScreen (hDC , hMemDC , rect); - EndPaint(hwnd, &ps); - break; - } - case WM_TIMER : { - if (wParam == APP_TIMER) - { - InvalidateRect(hwnd, NULL, 1); - } + BITMAP bm; /* Bitmap structure as seen in bmWidth & bmHeight */ + PAINTSTRUCT ps; + + HDC hdc = BeginPaint(hWnd, &ps); + HDC hdcMem = CreateCompatibleDC(hdc); + HBITMAP hbmOld = SelectObject(hdcMem, bitmap); + + GetObject(bitmap, sizeof(bm), &bm); + + bm.bmWidth = 1000; + bm.bmHeight = 700; + + BitBlt( + hdc, + RANDOM (0, rect.right - BITMAP_WIDTH), + RANDOM (0, rect.bottom - BITMAP_HEIGHT), + bm.bmWidth, + bm.bmHeight, + hdcMem, + 5, + 5, + SRCCOPY); + + SelectObject(hdcMem, hbmOld); + DeleteDC(hdcMem); + + EndPaint(hWnd, &ps); + break; } - case WM_ERASEBKGND: - { - SelectObject(hDC, hBlkBrush); - - PatBlt( - hDC, - 0, - 0, - rect.right, - rect.bottom, - PATCOPY); - break; - } - case WM_DESTROY: - { - KillTimer (hwnd, APP_TIMER); - DeleteObject(bitmap); - ShowCursor(TRUE); - PostQuitMessage(0); - break; - } - - // break out of screen-saver if any keyboard activity - case WM_NOTIFY: - case WM_SYSKEYDOWN: - PostMessage(hwnd, WM_CLOSE, 0, 0); - break; - - // break out of screen-saver if any mouse activity - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_MOUSEMOVE: - // If we've got a parent then we must be a preview - if(GetParent(hwnd) != 0) - return 0; - - if(fFirstTime) - { - GetCursorPos(&ptLast); - fFirstTime = FALSE; - } - - GetCursorPos(&ptCursor); - - // if the mouse has moved more than 3 pixels then exit - if(abs(ptCursor.x - ptLast.x) >= 3 || abs(ptCursor.y - ptLast.y) >= 3) - PostMessage(hwnd, WM_CLOSE, 0, 0); - - ptLast = ptCursor; - - return 0; + case WM_TIMER: + { + InvalidateRect(hWnd, NULL, 1); + break; + } + case WM_DESTROY: + { + KillTimer (hWnd, APP_TIMER); + DeleteObject(bitmap); + PostQuitMessage(0); + break; } - return DefWindowProc(hwnd, msg, wParam, lParam); + default: + // Pass Windows Messages to the default screensaver window procedure + return DefScreenSaverProc(hWnd, message, wParam, lParam); + } + + return 0; } -void InitSaver(HWND hwndParent) +BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - WNDCLASS wc; - ZeroMemory(&wc, sizeof(wc)); - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = WndProc; - wc.lpszClassName = APPNAME; - wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); - RegisterClass(&wc); - - if (hwndParent != 0) - { - RECT rect; - GetClientRect(hwndParent, &rect); - CreateWindow(APPNAME, APPNAME, - WS_VISIBLE | WS_CHILD, - 0, 0, - rect.right, - rect.bottom, - hwndParent, 0, - hInstance, NULL); - fullscreen = FALSE; - } - else - { - HWND hwnd; - hwnd = CreateWindowEx(WS_EX_TOPMOST, - APPNAME, - APPNAME, - WS_VISIBLE | WS_POPUP, - 0, 0, - GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), - HWND_DESKTOP, 0, - hInstance, NULL); - - SetWindowPos(hwnd, - 0, 0, 0, 0, 0, - SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW); - - ShowCursor(FALSE); - fullscreen = TRUE; - } + return FALSE; } -VOID ParseCommandLine(LPWSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) +// This function is only called one time before opening the configuration dialog. +// Use it to show a message that no configuration is necesssary and return FALSE to indicate that no configuration dialog shall be opened. +BOOL WINAPI RegisterDialogClasses(HANDLE hInst) { - UCHAR ch = *szCmdLine++; + TCHAR szMessage[256]; + TCHAR szTitle[25]; - if(ch == '-' || ch == '/') - ch = *szCmdLine++; + LoadString(hInst, IDS_TEXT, szMessage, sizeof(szMessage) / sizeof(TCHAR)); + LoadString(hInst, IDS_DESCRIPTION, szTitle, sizeof(szTitle) / sizeof(TCHAR)); - if(ch >= 'A' && ch <= 'Z') - ch += 'a' - 'A'; //convert to lower case + MessageBox(NULL, szMessage, szTitle, MB_OK | MB_ICONEXCLAMATION); - *chOption = ch; - ch = *szCmdLine++; - - if(ch == ':') - ch = *szCmdLine++; - - while(ch == ' ' || ch == '\t') - ch = *szCmdLine++; - - if(isdigit(ch)) - { - unsigned int i = _wtoi(szCmdLine - 1); - *hwndParent = (HWND)i; - } - else - *hwndParent = NULL; + return FALSE; } - -void Configure(void) -{ - TCHAR szTitle[256]; - TCHAR szText[256]; - - LoadString(hInstance, - IDS_TITLE, - szTitle, - 256); - - LoadString(hInstance, - IDS_TEXT, - szText, - 256); - - MessageBox(0, - szText, - szTitle, - MB_OK | MB_ICONWARNING); -} - -int CALLBACK wWinMain (HINSTANCE hInst, - HINSTANCE hPrev, - LPWSTR lpCmdLine, - int iCmdShow) -{ - HWND hwndParent; - UINT nPreviousState; - UCHAR chOption; - MSG Message; - - hInstance = hInst; - - ParseCommandLine(lpCmdLine, &chOption, &hwndParent); - - SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); - - switch (chOption) - { - case 's': - InitSaver(0); - break; - - case 'p': - InitSaver(hwndParent); - break; - - case 'c': - default: - Configure(); - return 0; - } - - while (GetMessage(&Message, 0, 0, 0)) - DispatchMessage(&Message); - - SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); - - return Message.wParam; -} Added: trunk/reactos/base/applications/screensavers/logon/logon.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.def (added) +++ trunk/reactos/base/applications/screensavers/logon/logon.def Thu Feb 21 20:07:01 2008 @@ -1,0 +1,5 @@ +NAME logon.scr + +EXPORTS + ScreenSaverProc + ScreenSaverConfigureDialog Propchange: trunk/reactos/base/applications/screensavers/logon/logon.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/logon/logon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rbuild (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rbuild Thu Feb 21 20:07:01 2008 @@ -1,7 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="logon" type="win32scr" installbase="system32" installname="logon.scr" unicode="true"> + <importlibrary definition="logon.def" /> <include base="logon">.</include> + <library>scrnsave</library> <library>kernel32</library> <library>user32</library> <library>gdi32</library> Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc Thu Feb 21 20:07:01 2008 @@ -1,4 +1,5 @@ #include <windows.h> +#include <scrnsave.h> #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/screensavers/logon/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/resource.h (original) +++ trunk/reactos/base/applications/screensavers/logon/resource.h Thu Feb 21 20:07:01 2008 @@ -1,6 +1,3 @@ - -#define IDS_DESCRIPTION 1 -#define IDS_TITLE 2 #define IDS_TEXT 3 #define IDB_WORKSTATION 0x100 #define IDB_SERVER 0x200

16 years, 10 months

[tkreuzer] 32441: FORMATTING: apply consistent indentation, no code change

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 21 05:40:23 2008 New Revision: 32441 URL: http://svn.reactos.org/svn/reactos?rev=32441&view=rev Log: FORMATTING: apply consistent indentation, no code change Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…

16 years, 10 months

[cfinck] 32440: Few fixes to make valid HTML out of this (according to the W3 Validator) The syntax for the HTML tags in JavaScript is described in detail here: http://www.w3.org/TR/html4/appendix/notes.html#h-B.3.2.1

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Feb 21 02:03:41 2008 New Revision: 32440 URL: http://svn.reactos.org/svn/reactos?rev=32440&view=rev Log: Few fixes to make valid HTML out of this (according to the W3 Validator) The syntax for the HTML tags in JavaScript is described in detail here: http://www.w3.org/TR/html4/appendix/notes.html#h-B.3.2.1 Modified: trunk/web/reactos.org/htdocs/peoplemap/index.php trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php Modified: trunk/web/reactos.org/htdocs/peoplemap/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/index.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/index.php Thu Feb 21 02:03:41 2008 @@ -265,7 +265,7 @@ $logintext = $peoplemap_langres["mylocation_login"]; $logintext .= "<br><br>"; $logintext .= "<div style=\"text-align: center;\">"; - $logintext .= "<a href=\"/roscms/?page=login&target=" . urlencode($_SERVER["PHP_SELF"]) . "\">" . $peoplemap_langres["mylocation_login_page"] . "</a>"; + $logintext .= "<a href=\"/roscms/?page=login&target=" . urlencode($_SERVER["PHP_SELF"]) . "\">" . $peoplemap_langres["mylocation_login_page"] . "</a>"; $logintext .= "<script type=\"text/javascript\">MyUserId = -1;</script>"; $logintext .= "</div>"; Modified: trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/p… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/peoplemap.js.php Thu Feb 21 02:03:41 2008 @@ -4,7 +4,16 @@ FILE: web/reactos.org/htdocs/peoplemap/peoplemap.js.php PURPOSE: Main JavaScript file (parsed by PHP before) COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + + charset=utf-8 */ + +<?php + function AddJSSlashes($input) + { + return str_replace("</", "<\/", $input); + } +?> var Map; var IconTable; @@ -19,7 +28,7 @@ function UpdateCounts() { - document.getElementById("counttext").innerHTML = "<?php echo $peoplemap_langres["count1"]; ?>" + MarkerCount + "<?php echo $peoplemap_langres["count2"]; ?>" + LocationCount + "<?php echo $peoplemap_langres["count3"]; ?>" + UserCount + "<?php echo $peoplemap_langres["count4"]; ?>"; + document.getElementById("counttext").innerHTML = "<?php echo $peoplemap_langres["count1"]; ?>" + MarkerCount + "<?php echo $peoplemap_langres["count2"]; ?>" + LocationCount + "<?php echo AddJSSlashes($peoplemap_langres["count3"]); ?>" + UserCount + "<?php echo $peoplemap_langres["count4"]; ?>"; } function GetIconPath(UserGroup) @@ -47,14 +56,14 @@ var Marker = new GMarker( new GLatLng(Latitude, Longitude), CurrentIcon ); var html; - html = "<strong><a href=\"http://reactos.org/roscms/?page=user&sec=profil&sec2=" + UserId + "\" target=\"_blank\">" + UserName + "</a></strong><br>"; + html = "<strong><a href=\"http://reactos.org/roscms/?page=user&sec=profil&sec2=" + UserId + "\" target=\"_blank\">" + UserName + "<\/a><\/strong><br>"; html += FullName + "<br><br>"; // parseFloat strips off trailing zeros html += "<?php echo $peoplemap_langres["latitude"]; ?>: " + parseFloat(Latitude) + "°<br>"; html += "<?php echo $peoplemap_langres["longitude"]; ?>: " + parseFloat(Longitude) + "°<br><br>"; - html += "<a href=\"javascript:RemoveUserFromMap(" + UserId + "); UpdateCounts();\"><?php echo $peoplemap_langres["removefrommap"]; ?></a>"; + html += "<a href=\"javascript:RemoveUserFromMap(" + UserId + "); UpdateCounts();\"><?php echo $peoplemap_langres["removefrommap"]; ?><\/a>"; MarkerTable[UserId] = new Object(); MarkerTable[UserId].click = GEvent.addListener( Marker, "click", function() {Marker.openInfoWindowHtml(html);} ); @@ -187,15 +196,15 @@ html += "<li>"; html += "<a href=\"javascript:AddUserToMap(" + UserId + ", '" + UserName + "', '" + FullName + "', " + Latitude + ", " + Longitude + "); UpdateCounts();\">"; html += UserName; - html += "</a>"; + html += "<\/a>"; if(FullName != "") html += " (" + FullName + ")"; - html += "</li>"; + html += "<\/li>"; } - html += "</ul>"; + html += "<\/ul>"; document.getElementById("add_user_result").innerHTML = html; } @@ -489,7 +498,7 @@ } else { - // We set the marker at 0° N, 0° E. To ensure that the user sees the marker, reset the viewport. + // We set the marker at 0Â° N, 0Â° E. To ensure that the user sees the marker, reset the viewport. Map.setCenter(new GLatLng(0, 0), 1); }

16 years, 10 months

[cfinck] 32439: Fix butterflies' build All screensavers using the scrnsave library must be compiled with Unicode now.

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Feb 21 01:14:36 2008 New Revision: 32439 URL: http://svn.reactos.org/svn/reactos?rev=32439&view=rev Log: Fix butterflies' build All screensavers using the scrnsave library must be compiled with Unicode now. Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.c trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.c (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.c Thu Feb 21 01:14:36 2008 @@ -1,5 +1,6 @@ #include <windows.h> #include <scrnsave.h> +#include <tchar.h> #include <math.h> #include <stdio.h> #include <stdlib.h> @@ -12,7 +13,7 @@ GLuint texture[3]; //stores texture objects and display list -LPCTSTR registryPath = ("Software\\Microsoft\\ScreenSavers\\Butterflies"); +LPCTSTR registryPath = _T("Software\\Microsoft\\ScreenSavers\\Butterflies"); BOOL dRotate; @@ -50,7 +51,7 @@ valsize=sizeof(val); - result = RegQueryValueEx(skey, "Rotate", 0, &valtype, (LPBYTE)&val, &valsize); + result = RegQueryValueEx(skey, _T("Rotate"), 0, &valtype, (LPBYTE)&val, &valsize); if(result == ERROR_SUCCESS) dRotate = val; RegCloseKey(skey); @@ -66,7 +67,7 @@ return; val = dRotate; - RegSetValueEx(skey, "Rotate", 0, REG_DWORD, (CONST BYTE*)&val, sizeof(val)); + RegSetValueEx(skey, _T("Rotate"), 0, REG_DWORD, (CONST BYTE*)&val, sizeof(val)); RegCloseKey(skey); } @@ -246,10 +247,10 @@ EndDialog(hdlg, LOWORD(wpm)); break; case WEBPAGE1: - ShellExecute(NULL, "open", "http://nehe.gamedev.net", NULL, NULL, SW_SHOWNORMAL); + ShellExecute(NULL, _T("open"), _T("http://nehe.gamedev.net"), NULL, NULL, SW_SHOWNORMAL); break; case WEBPAGE2: - ShellExecute(NULL, "open", "http://www.thaputer.com", NULL, NULL, SW_SHOWNORMAL); + ShellExecute(NULL, _T("open"), _T("http://www.thaputer.com"), NULL, NULL, SW_SHOWNORMAL); break; } } Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild Thu Feb 21 01:14:36 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="butterflies" type="win32scr" installbase="system32" installname="butterflies.scr" allowwarnings="true"> +<module name="butterflies" type="win32scr" installbase="system32" installname="butterflies.scr" unicode="yes"> <importlibrary definition="butterflies.def" /> <include base="butterflies">.</include> <library>scrnsave</library> @@ -10,7 +10,7 @@ <library>opengl32</library> <library>glu32</library> <library>advapi32</library> - <library>shell32</library> + <library>shell32</library> <metadata description = "OpenGL Butterflies screensaver" />

16 years, 10 months

[jimtabor] 32438: Goodbye xpstubs.c.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Feb 21 00:43:49 2008 New Revision: 32438 URL: http://svn.reactos.org/svn/reactos?rev=32438&view=rev Log: Goodbye xpstubs.c. Removed: trunk/reactos/subsystems/win32/win32k/stubs/xpstubs.c Removed: trunk/reactos/subsystems/win32/win32k/stubs/xpstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== (empty)

16 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
46
Older →

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 February 2008