Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[dreimer] 28958: Removed NTLPC Setting from Config.cmd. Its not useful anymore.
by dreimer＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: dreimer Date: Sun Sep 9 01:24:31 2007 New Revision: 28958 URL: http://svn.reactos.org/svn/reactos?rev=28958&view=rev Log: Removed NTLPC Setting from Config.cmd. Its not useful anymore. Modified: trunk/tools/RosBE-Windows/Root/Config.cmd Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Sep 9 01:24:31 2007 @@ -187,15 +187,6 @@ sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" "%ROSBEBASEDIR%\config7.rbuild" > "%ROSBEBASEDIR%\config8.rbuild" cls -echo Whether to compile with NT-compatible LPC Semantics. This should -echo always be 1. -echo. -echo Right now -grep \"NTLPC\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P E="(0), (1)" -sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" "%ROSBEBASEDIR%\config8.rbuild" > "%ROSBEBASEDIR%\config9.rbuild" -cls - echo Whether to compile with the KD protocol. This will disable support for echo KDBG as well as rossym and symbol lookups, and allow WinDBG to connect echo to ReactOS. This is currently not fully working, and requires kdcom

1 0

[cfinck] 28957: - Solve our wchar_t host problems the easy way by defining WCHAR to "unsigned short" (thx KJK for the hint) - Revert my changes to the "unicode" module in r28411 and r28423 - Include "typedefs_host.h" instead of the Windows headers in "wine/unicode.h", this component doesn't depend on target headers anymore. To get it to work completely without Windows headers, I also had to copy some definitions from <winnls.h> to the "wine/unicode.h" file.
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 23:50:20 2007 New Revision: 28957 URL: http://svn.reactos.org/svn/reactos?rev=28957&view=rev Log: - Solve our wchar_t host problems the easy way by defining WCHAR to "unsigned short" (thx KJK for the hint) - Revert my changes to the "unicode" module in r28411 and r28423 - Include "typedefs_host.h" instead of the Windows headers in "wine/unicode.h", this component doesn't depend on target headers anymore. To get it to work completely without Windows headers, I also had to copy some definitions from <winnls.h> to the "wine/unicode.h" file. Modified: trunk/reactos/include/reactos/typedefs_host.h trunk/reactos/tools/unicode/cptable.c trunk/reactos/tools/unicode/mbtowc.c trunk/reactos/tools/unicode/string.c trunk/reactos/tools/unicode/unicode.mak trunk/reactos/tools/unicode/utf8.c trunk/reactos/tools/unicode/wctomb.c trunk/reactos/tools/unicode/wine/unicode.h Modified: trunk/reactos/include/reactos/typedefs_host.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/typedefs_h… ============================================================================== --- trunk/reactos/include/reactos/typedefs_host.h (original) +++ trunk/reactos/include/reactos/typedefs_host.h Sat Sep 8 23:50:20 2007 @@ -67,8 +67,8 @@ typedef long int W64 LONG_PTR, *PLONG_PTR; typedef long unsigned int W64 ULONG_PTR, *PULONG_PTR; typedef ULONG_PTR SIZE_T, *PSIZE_T; -typedef wchar_t WCHAR, *PWCHAR, *PWSTR, *LPWSTR; -typedef const wchar_t *PCWSTR, *LPCWSTR; +typedef unsigned short WCHAR, *PWCHAR, *PWSTR, *LPWSTR; +typedef const unsigned short *PCWSTR, *LPCWSTR; typedef int NTSTATUS; typedef int POOL_TYPE; Modified: trunk/reactos/tools/unicode/cptable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/cptable.c?re… ============================================================================== --- trunk/reactos/tools/unicode/cptable.c (original) +++ trunk/reactos/tools/unicode/cptable.c Sat Sep 8 23:50:20 2007 @@ -18,8 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdlib.h> + #include "wine/unicode.h" -#include <stdlib.h> /* Everything below this line is generated automatically by cpmap.pl */ /* ### cpmap begin ### */ Modified: trunk/reactos/tools/unicode/mbtowc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/mbtowc.c?rev… ============================================================================== --- trunk/reactos/tools/unicode/mbtowc.c (original) +++ trunk/reactos/tools/unicode/mbtowc.c Sat Sep 8 23:50:20 2007 @@ -18,8 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <string.h> + #include "wine/unicode.h" -#include <string.h> /* get the decomposition of a Unicode char */ static int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen ) Modified: trunk/reactos/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/string.c?rev… ============================================================================== --- trunk/reactos/tools/unicode/string.c (original) +++ trunk/reactos/tools/unicode/string.c Sat Sep 8 23:50:20 2007 @@ -18,9 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/unicode.h" +#include <ctype.h> #include <limits.h> #include <stdio.h> + +#include "wine/unicode.h" extern const WCHAR wine_casemap_lower[]; extern const WCHAR wine_casemap_upper[]; Modified: trunk/reactos/tools/unicode/unicode.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/unicode.mak?… ============================================================================== --- trunk/reactos/tools/unicode/unicode.mak (original) +++ trunk/reactos/tools/unicode/unicode.mak Sat Sep 8 23:50:20 2007 @@ -96,7 +96,7 @@ UNICODE_HOST_CFLAGS = \ -D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \ - -I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/psdk \ + -I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/psdk -Iinclude/reactos \ $(TOOLS_CFLAGS) .PHONY: unicode Modified: trunk/reactos/tools/unicode/utf8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/utf8.c?rev=2… ============================================================================== --- trunk/reactos/tools/unicode/utf8.c (original) +++ trunk/reactos/tools/unicode/utf8.c Sat Sep 8 23:50:20 2007 @@ -18,8 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <string.h> + #include "wine/unicode.h" -#include <string.h> /* number of following bytes in sequence based on first byte value (for bytes above 0x7f) */ static const char utf8_length[128] = Modified: trunk/reactos/tools/unicode/wctomb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wctomb.c?rev… ============================================================================== --- trunk/reactos/tools/unicode/wctomb.c (original) +++ trunk/reactos/tools/unicode/wctomb.c Sat Sep 8 23:50:20 2007 @@ -18,8 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <string.h> + #include "wine/unicode.h" -#include <string.h> /* search for a character in the unicode_compose_table; helper for compose() */ static inline int binary_search( WCHAR ch, int low, int high ) Modified: trunk/reactos/tools/unicode/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wine/unicode… ============================================================================== --- trunk/reactos/tools/unicode/wine/unicode.h (original) +++ trunk/reactos/tools/unicode/wine/unicode.h Sat Sep 8 23:50:20 2007 @@ -22,10 +22,25 @@ #define __WINE_UNICODE_H #include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winnls.h> +#include <typedefs_host.h> + +// Definitions copied from <winnls.h> +// We only want to include host headers, so we define them manually +#define C1_UPPER 1 +#define C1_LOWER 2 +#define C1_DIGIT 4 +#define C1_SPACE 8 +#define C1_PUNCT 16 +#define C1_CNTRL 32 +#define C1_BLANK 64 +#define C1_XDIGIT 128 +#define C1_ALPHA 256 +#define MB_COMPOSITE 2 +#define MB_ERR_INVALID_CHARS 8 +#define WC_COMPOSITECHECK 512 +#define WC_DISCARDNS 16 +#define WC_DEFAULTCHAR 64 +#define WC_NO_BEST_FIT_CHARS 1024 #ifndef WINE_UNICODE_API #define WINE_UNICODE_API DECLSPEC_IMPORT

1 0

[hpoussin] 28956: Let ImportLibrary class use the FileLocation concept. I disabled def files in codeblocks and msvc backends, someone will have to update them
by hpoussin＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: hpoussin Date: Sat Sep 8 23:27:07 2007 New Revision: 28956 URL: http://svn.reactos.org/svn/reactos?rev=28956&view=rev Log: Let ImportLibrary class use the FileLocation concept. I disabled def files in codeblocks and msvc backends, someone will have to update them Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Sat Sep 8 23:27:07 2007 @@ -653,10 +653,12 @@ fprintf ( OUT, "\t\t\t\t<ExtraCommands>\r\n" ); +#if 0 if ( module.type == StaticLibrary && module.importLibrary ) fprintf ( OUT, "\t\t\t\t\t<Add after=\"dlltool --dllname %s --def %s --output-lib $exe_output; %s -U\" />\r\n", module.importLibrary->dllname.c_str (), module.importLibrary->definition.c_str(), module.mangledSymbols ? "" : "--kill-at" ); else if ( module.importLibrary != NULL ) fprintf ( OUT, "\t\t\t\t\t<Add after=\"dlltool --dllname %s --def %s --output-lib "$(TARGET_OBJECT_DIR)lib$(TARGET_OUTPUT_BASENAME).a" %s\" />\r\n", module.GetTargetName ().c_str(), module.importLibrary->definition.c_str(), module.mangledSymbols ? "" : "--kill-at" ); +#endif for ( i = 0; i < resource_files.size(); i++ ) @@ -671,6 +673,7 @@ #endif } +#if 0 if ( dll ) { if (IsWineModule( module )) @@ -684,6 +687,7 @@ #endif fprintf ( OUT, "\t\t\t\t\t<Mode after=\"always\" />\r\n" ); } +#endif fprintf ( OUT, "\t\t\t\t</ExtraCommands>\r\n" ); @@ -894,6 +898,6 @@ if ( module.importLibrary == NULL) return false; - size_t index = module.importLibrary->definition.rfind ( ".spec.def" ); + size_t index = module.importLibrary->source->name.rfind ( ".spec.def" ); return ( index != string::npos ); } Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sat Sep 8 23:27:07 2007 @@ -2244,7 +2244,7 @@ if ( module.importLibrary == NULL) return false; - size_t index = module.importLibrary->definition.rfind ( ".spec.def" ); + size_t index = module.importLibrary->source->name.rfind ( ".spec.def" ); return ( index != string::npos ); } @@ -2259,19 +2259,9 @@ else directory = SourceDirectory; - size_t pos = module.importLibrary->definition.find_last_of ( "/\\" ); - if ( pos == string::npos ) - { - return new FileLocation ( directory, - module.GetBasePath (), - module.importLibrary->definition ); - } - - string dir = module.importLibrary->definition.substr ( 0, pos ); - string name = module.importLibrary->definition.substr ( pos + 1); - return new FileLocation ( directory, - NormalizeFilename ( module.GetBasePath () + sSep + dir ), - name ); + return new FileLocation ( directory, + module.importLibrary->source->relative_path, + module.importLibrary->source->name ); } else return new FileLocation ( SourceDirectory, "tools" + sSep + "rbuild", "empty.def" ); Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Sat Sep 8 23:27:07 2007 @@ -374,6 +374,7 @@ { if (module.HasImportLibrary ()) { +#if 0 string modulename = module.GetBasePath (); string file = module.importLibrary->definition; size_t pos = file.find (".def"); @@ -383,6 +384,7 @@ } modulename += DEF_SSEP + file; out.push_back (modulename); +#endif } } Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sat Sep 8 23:27:07 2007 @@ -436,8 +436,10 @@ fprintf ( OUT, "\t\t\t\tDataExecutionPrevention=\"0\"\r\n" ); } +#if 0 if (module.importLibrary != NULL) fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->definition.c_str()); +#endif fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); bool use_msvcrt_lib = false; for ( i = 0; i < libraries.size(); i++ ) Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Sat Sep 8 23:27:07 2007 @@ -719,7 +719,7 @@ e.location, "Only one <importlibrary> is valid per module" ); } - importLibrary = new ImportLibrary ( e, *this ); + importLibrary = new ImportLibrary ( project, e, *this ); subs_invalid = true; } else if ( e.name == "if" ) @@ -1577,35 +1577,43 @@ } -ImportLibrary::ImportLibrary ( const XMLElement& _node, - const Module& _module ) - : node (_node), - module (_module) -{ - const XMLAttribute* att = _node.GetAttribute ( "basename", false ); - if (att != NULL) - basename = att->value; - else - basename = module.name; - - att = _node.GetAttribute ( "dllname", false ); - if (att != NULL) - dllname = att->value; - else - { - if ( _module.type == StaticLibrary ) - { - throw XMLInvalidBuildFileException ( - node.location, - "<importlibrary> dllname attribute required." ); - } - - dllname = ""; - } - - att = _node.GetAttribute ( "definition", true ); - assert (att); - definition = FixSeparator(att->value); +ImportLibrary::ImportLibrary ( const Project& project, + const XMLElement& node, + const Module& module ) + : XmlNode ( project, node ), + module (module) +{ + const XMLAttribute* dllname = node.GetAttribute ( "dllname", false ); + const XMLAttribute* definition = node.GetAttribute ( "definition", true ); + assert ( definition ); + + if ( dllname ) + this->dllname = dllname->value; + else if ( module.type == StaticLibrary ) + throw XMLInvalidBuildFileException ( + node.location, + "<importlibrary> dllname attribute required." ); + + DirectoryLocation directory = SourceDirectory; + size_t index = definition->value.rfind ( ".spec.def" ); + if ( index != string::npos ) + directory = IntermediateDirectory; + + index = definition->value.find_last_of ( "/\\" ); + if ( index == string::npos ) + { + source = new FileLocation ( directory, + module.GetBasePath (), + definition->value ); + } + else + { + string dir = definition->value.substr ( 0, index ); + string name = definition->value.substr ( index + 1); + source = new FileLocation ( directory, + NormalizeFilename ( module.GetBasePath () + sSep + dir ), + name ); + } } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Sat Sep 8 23:27:07 2007 @@ -542,19 +542,16 @@ void ProcessXML(); }; -class ImportLibrary -{ -public: - const XMLElement& node; +class ImportLibrary : public XmlNode +{ +public: const Module& module; - std::string basename; - std::string definition; std::string dllname; - - ImportLibrary ( const XMLElement& _node, + FileLocation *source; + + ImportLibrary ( const Project& project, + const XMLElement& node, const Module& module ); - - void ProcessXML (); };

1 0

[cfinck] 28955: - Set g_nMatrixSpeed to 10 as the default value (150 is higher than the maximum value). Same fix is also found in Version 3.0 of the original Matrix ScreenSaver. Under Windows NT, 2000 and XP up to SP1, this fix is not needed as the SetTimer behaviour is different there, but XP SP2 and Server 2003 have a different SetTimer behaviour (which now also applies to ReactOS). See http://msdn2.microsoft.com/en-us/library/ms644906.aspx for more details. - Remove all the MSVC stuff from th
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 23:04:47 2007 New Revision: 28955 URL: http://svn.reactos.org/svn/reactos?rev=28955&view=rev Log: - Set g_nMatrixSpeed to 10 as the default value (150 is higher than the maximum value). Same fix is also found in Version 3.0 of the original Matrix ScreenSaver. Under Windows NT, 2000 and XP up to SP1, this fix is not needed as the SetTimer behaviour is different there, but XP SP2 and Server 2003 have a different SetTimer behaviour (which now also applies to ReactOS). See http://msdn2.microsoft.com/en-us/library/ms644906.aspx for more details. - Remove all the MSVC stuff from the translation files to get them to compile with MSVC ^^ Sounds stupid, but the files include a non-existing "afxres.h", which lead to an error in MSVC. - Include <stdlib.h> in "settings.c" for malloc. - Use UCHAR values instead of int's for ParseCommandLine and chOption. MSVC has an assertion (ch >= 0 && ch <= 255) in the isdigit function, so negative values would lead to an error here. (for example, when no arguments are given and the variable contains lots of crap) We still need to "merge" the cool new stuff from Matrix 3.0 :-) Modified: trunk/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc trunk/reactos/base/applications/screensavers/matrix/lang/de-DE.rc trunk/reactos/base/applications/screensavers/matrix/lang/en-US.rc trunk/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc trunk/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc trunk/reactos/base/applications/screensavers/matrix/lang/th-TH.rc trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc trunk/reactos/base/applications/screensavers/matrix/matrix.c trunk/reactos/base/applications/screensavers/matrix/resource.h trunk/reactos/base/applications/screensavers/matrix/rsrc.rc trunk/reactos/base/applications/screensavers/matrix/screensave.c trunk/reactos/base/applications/screensavers/matrix/settings.c Modified: trunk/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc Sat Sep 8 23:04:47 2007 @@ -1,30 +1,6 @@ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Bulgarian (BG) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -#pragma code_page(1251) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -71,97 +47,7 @@ 158,75,18 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 176 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Åêðàíåí ïðåäïàçèòåë Matrix" END - -#endif // Bulgarian (BG) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - Modified: trunk/reactos/base/applications/screensavers/matrix/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/de-DE.rc Sat Sep 8 23:04:47 2007 @@ -1,34 +1,10 @@ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// German (Germany) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Matrix ScreenSaver Konfiguration" +CAPTION "Matrix Bildschirmschoner-Konfiguration" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Dekodierung&sgeschwindigkeit",IDC_STATIC,7,7,133,36 @@ -70,97 +46,7 @@ CTEXT "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,143, 158, 75, 18 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 176 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Matrix ScreenSaver" + IDS_DESCRIPTION "Matrix Bildschirmschoner" END - -#endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - Modified: trunk/reactos/base/applications/screensavers/matrix/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/en-US.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/en-US.rc Sat Sep 8 23:04:47 2007 @@ -1,30 +1,6 @@ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -71,97 +47,7 @@ 158,75,18 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 176 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Matrix ScreenSaver" END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - Modified: trunk/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc Sat Sep 8 23:04:47 2007 @@ -1,30 +1,6 @@ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// French resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) -#ifdef _WIN32 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -71,97 +47,7 @@ 158,75,18 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 176 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Matrix ScreenSaver" END - -#endif // French resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - Modified: trunk/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc Sat Sep 8 23:04:47 2007 @@ -6,33 +6,9 @@ * DATE OF TR: 25-07-2007 */ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Slovak resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -#pragma code_page(1250) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -79,97 +55,7 @@ 158,75,18 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 176 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Matrix - etriè obrazovky" END - -#endif // Slovak resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - Modified: trunk/reactos/base/applications/screensavers/matrix/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/th-TH.rc Sat Sep 8 23:04:47 2007 @@ -1,30 +1,6 @@ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Thai resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_THAI, SUBLANG_DEFAULT -#pragma code_page(874) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -71,97 +47,7 @@ 158,75,18 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 176 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Matrix ScreenSaver" END - -#endif // Thai resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - Modified: trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc Sat Sep 8 23:04:47 2007 @@ -1,30 +1,6 @@ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Ukrainian resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -#pragma code_page(1251) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -71,97 +47,7 @@ 158,75,18 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 176 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Çàñòàâêà ""Ìàòðèöÿ""" END - -#endif // Ukrainian resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/matrix.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/matrix.c Sat Sep 8 23:04:47 2007 @@ -304,7 +304,7 @@ static POINT ptLast; static POINT ptCursor; static BOOL fFirstTime = TRUE; - + MATRIX *matrix = GetMatrix(hwnd); switch(msg) @@ -432,7 +432,7 @@ wcx.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); wcx.lpszMenuName = 0; wcx.lpszClassName = APPNAME; - wcx.hIconSm = 0; + wcx.hIconSm = 0; if(fPreview) wcx.hCursor = LoadCursor(0, IDC_ARROW); Modified: trunk/reactos/base/applications/screensavers/matrix/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/resource.h (original) +++ trunk/reactos/base/applications/screensavers/matrix/resource.h Sat Sep 8 23:04:47 2007 @@ -1,7 +1,5 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by matrix.rc -// +#define IDC_STATIC -1 + #define IDS_DESCRIPTION 1 #define IDD_CONFIG 101 #define IDB_BITMAP1 104 @@ -22,14 +20,3 @@ #define IDC_COMBO2 1020 #define IDC_MSGSPEEDGRP 1021 #define IDC_ABOUT 1022 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 109 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1023 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif Modified: trunk/reactos/base/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/rsrc.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/rsrc.rc Sat Sep 8 23:04:47 2007 @@ -2,6 +2,10 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" +IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" +IDI_ICON1 ICON DISCARDABLE "icon1.ico" #include "lang/bg-BG.rc" #include "lang/en-US.rc" Modified: trunk/reactos/base/applications/screensavers/matrix/screensave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/screensave.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/screensave.c Sat Sep 8 23:04:47 2007 @@ -21,13 +21,13 @@ //#pragma comment(linker, "/OPT:NOWIN98") // -// Added: Multimonitor support!! +// Added: Multimonitor support!! // HMONITOR (WINAPI * pfnEnumDisplayMonitors)(HDC, LPCRECT, MONITORENUMPROC, LPARAM); BOOL (WINAPI * pfnGetMonitorInfo)(HMONITOR, LPMONITORINFO); // -// Callback function for EnumDisplayMonitors API. Use this function +// Callback function for EnumDisplayMonitors API. Use this function // to kickstart a screen-saver window for each monitor in the system // BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, RECT *rcMonitor, LPARAM Param) @@ -100,9 +100,9 @@ // -p <hwnd> (preview) // -c <hwnd> (configure) // -BOOL ParseCommandLine(LPSTR szCmdLine, int *chOption, HWND *hwndParent) +VOID ParseCommandLine(LPSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) { - int ch = *szCmdLine++; + UCHAR ch = *szCmdLine++; if(ch == '-' || ch == '/') ch = *szCmdLine++; @@ -126,8 +126,6 @@ } else *hwndParent = NULL; - - return TRUE; } // @@ -135,8 +133,8 @@ // int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int iCmdShow) { - HWND hwndParent; - int chOption; + HWND hwndParent; + UCHAR chOption; // Make sure that only 1 instance runs at a time - // Win98 seems to want us to restart every 5 seconds!! @@ -151,12 +149,12 @@ switch(chOption) { - case 's': return ScreenSaver(NULL); // screen save - case 'p': return ScreenSaver(hwndParent); // preview in small window - case 'a': return ChangePassword(hwndParent); // ask for password - case 'c': return Configure(hwndParent); // configuration dialog - default: return Configure(hwndParent); // configuration dialog + case 's': return ScreenSaver(NULL); // screen save + case 'p': return ScreenSaver(hwndParent); // preview in small window + case 'a': return ChangePassword(hwndParent); // ask for password + case 'c': return Configure(hwndParent); // configuration dialog + default: return Configure(hwndParent); // configuration dialog } - return 0; + return 0; } Modified: trunk/reactos/base/applications/screensavers/matrix/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/settings.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/settings.c Sat Sep 8 23:04:47 2007 @@ -3,6 +3,7 @@ // // Load/Save settings from registry // +#include <stdlib.h> #include <windows.h> #include <tchar.h> #include "globals.h" @@ -14,7 +15,7 @@ int g_nMessageSpeed = 5; TCHAR g_szFontName[512] = _T("Arial"); -int g_nMatrixSpeed = 150; +int g_nMatrixSpeed = 10; int g_nDensity = 32; int g_nFontSize = 12; BOOL g_fRandomizeMessages = FALSE;

1 0

[fireball] 28954: - Don't unlock a not locked TEXTOBJ. Solves booting issue under vmware.
by fireball＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: fireball Date: Sat Sep 8 22:44:33 2007 New Revision: 28954 URL: http://svn.reactos.org/svn/reactos?rev=28954&view=rev Log: - Don't unlock a not locked TEXTOBJ. Solves booting issue under vmware. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Sat Sep 8 22:44:33 2007 @@ -3483,10 +3483,10 @@ { Result = TextIntGetTextExtentPoint(dc, TextObj, String, Count, MaxExtent, NULL == UnsafeFit ? NULL : &Fit, Dx, &Size); + TEXTOBJ_UnlockText(TextObj); } else Result = FALSE; - TEXTOBJ_UnlockText(TextObj); DC_UnlockDc(dc); ExFreePool(String);

1 0

[cfinck] 28953: Enable the Windows Server 2003 behaviour for SetTimer. Finally, Matrix Screensaver does not work anymore under ReactOS, so we are compatible with Windows XP SP2 and Windows Server 2003 in this case :-D
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 22:43:36 2007 New Revision: 28953 URL: http://svn.reactos.org/svn/reactos?rev=28953&view=rev Log: Enable the Windows Server 2003 behaviour for SetTimer. Finally, Matrix Screensaver does not work anymore under ReactOS, so we are compatible with Windows XP SP2 and Windows Server 2003 in this case :-D Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Sat Sep 8 22:43:36 2007 @@ -104,9 +104,9 @@ MessageQueue = Window->MessageQueue; } -#if 1 - - /* Win NT/2k/XP */ +#if 0 + + /* Windows NT/2k/XP behaviour */ if (Elapse > 0x7fffffff) { DPRINT("Adjusting uElapse\n"); @@ -115,7 +115,7 @@ #else - /* Win Server 2003 */ + /* Windows XP SP2 and Windows Server 2003 behaviour */ if (Elapse > 0x7fffffff) { DPRINT("Adjusting uElapse\n"); @@ -124,7 +124,7 @@ #endif - /* Win 2k/XP */ + /* Windows 2k/XP and Windows Server 2003 SP1 behaviour */ if (Elapse < 10) { DPRINT("Adjusting uElapse\n");

1 0

[fireball] 28952: - Remove intl_new.cpl
by fireball＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: fireball Date: Sat Sep 8 21:42:23 2007 New Revision: 28952 URL: http://svn.reactos.org/svn/reactos?rev=28952&view=rev Log: - Remove intl_new.cpl Removed: trunk/reactos/dll/cpl/intl_new/ Modified: trunk/reactos/dll/cpl/cpl.rbuild Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=289… ============================================================================== --- trunk/reactos/dll/cpl/cpl.rbuild (original) +++ trunk/reactos/dll/cpl/cpl.rbuild Sat Sep 8 21:42:23 2007 @@ -15,9 +15,6 @@ </directory> <directory name="intl"> <xi:include href="intl/intl.rbuild" /> -</directory> -<directory name="intl_new"> - <xi:include href="intl_new/intl.rbuild" /> </directory> <directory name="main"> <xi:include href="main/main.rbuild" />

1 0

[cfinck] 28951: Merge french translation for syssetup from r28646
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 20:47:21 2007 New Revision: 28951 URL: http://svn.reactos.org/svn/reactos?rev=28951&view=rev Log: Merge french translation for syssetup from r28646 Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc Sat Sep 8 20:47:21 2007 @@ -217,8 +217,8 @@ STRINGTABLE BEGIN - IDS_SYS_TOOLS "System Tools" - IDS_CMT_CHARMAP "CharMap" + IDS_SYS_TOOLS "Outils système" + IDS_CMT_CHARMAP "Table des Caractères" END STRINGTABLE

1 0

[ekohl] 28950: - Update language samples upon selection of a new language. - Add a workaround for a special case: "Spanish (Spain)" uses two sorting methods but two sublang ids are used to distinguish them instead of two sort ids. Ensure they don't appear twice in the language list. - Add "Spanish (Spain)" as a translatable string resource.
by ekohl＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: ekohl Date: Sat Sep 8 19:43:19 2007 New Revision: 28950 URL: http://svn.reactos.org/svn/reactos?rev=28950&view=rev Log: - Update language samples upon selection of a new language. - Add a workaround for a special case: "Spanish (Spain)" uses two sorting methods but two sublang ids are used to distinguish them instead of two sort ids. Ensure they don't appear twice in the language list. - Add "Spanish (Spain)" as a translatable string resource. Modified: trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc trunk/reactos/dll/cpl/intl/resource.h Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c (original) +++ trunk/reactos/dll/cpl/intl/generalp.c Sat Sep 8 19:43:19 2007 @@ -40,6 +40,7 @@ HWND hList; HWND hLocaleList, hGeoList; +BOOL bSpain = FALSE; static BOOL CALLBACK LocalesEnumProc(LPTSTR lpLocale) @@ -47,12 +48,30 @@ LCID lcid; TCHAR lang[255]; INT index; - - //swscanf(lpLocale, L"%lx", &lcid); // maybe use wcstoul? + BOOL bNoShow = FALSE; + lcid = _tcstoul(lpLocale, NULL, 16); - GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); - + if (lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) || + lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT)) + { + if (bSpain == FALSE) + { + LoadString(hApplet, IDS_SPAIN, lang, 255); + bSpain = TRUE; + } + else + { + bNoShow = TRUE; + } + } + else + { + GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); + } + + if (bNoShow == FALSE) + { index = SendMessage(hList, CB_ADDSTRING, 0, @@ -62,6 +81,7 @@ CB_SETITEMDATA, index, (LPARAM)lcid); + } return TRUE; } @@ -110,6 +130,7 @@ TCHAR langSel[255]; hList = hwnd; + bSpain = FALSE; EnumSystemLocales(LocalesEnumProc, LCID_SUPPORTED); /* Select current locale */ @@ -322,6 +343,25 @@ case IDC_LANGUAGELIST: if (HIWORD(wParam) == CBN_SELCHANGE) { + LCID NewLcid; + INT iCurSel; + + iCurSel = SendMessage(hList, + CB_GETCURSEL, + 0, + 0); + if (iCurSel == CB_ERR) + break; + + NewLcid = SendMessage(hList, + CB_GETITEMDATA, + iCurSel, + 0); + if (NewLcid == (LCID)CB_ERR) + break; + + UpdateLocaleSample(hwndDlg, NewLcid); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc Sat Sep 8 19:43:19 2007 @@ -175,11 +175,12 @@ STRINGTABLE BEGIN - IDS_CUSTOMIZE_TITLE "Regionale Einstellungen bearbeiten" + IDS_CUSTOMIZE_TITLE "Regionale Einstellungen bearbeiten" + IDS_SPAIN "Spanisch (Spanien)" END STRINGTABLE BEGIN - IDS_CPLNAME "Regionale Einstellungen" - IDS_CPLDESCRIPTION "Wählen Sie Anzeigeeinstellungen für Sprache, Zahlen, Währung, Uhrzeit und Datum aus." + IDS_CPLNAME "Regionale Einstellungen" + IDS_CPLDESCRIPTION "Wählen Sie Anzeigeeinstellungen für Sprache, Zahlen, Währung, Uhrzeit und Datum aus." END Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/en-US.rc Sat Sep 8 19:43:19 2007 @@ -178,11 +178,12 @@ STRINGTABLE BEGIN - IDS_CUSTOMIZE_TITLE "Customize Regional Options" + IDS_CUSTOMIZE_TITLE "Customize Regional Options" + IDS_SPAIN "Spanish (Spain)" END STRINGTABLE BEGIN - IDS_CPLNAME "Regional Options" - IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date." + IDS_CPLNAME "Regional Options" + IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date." END Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc Sat Sep 8 19:43:19 2007 @@ -179,11 +179,12 @@ STRINGTABLE BEGIN - IDS_CUSTOMIZE_TITLE "Opzioni internazionali e della lingua" + IDS_CUSTOMIZE_TITLE "Opzioni internazionali e della lingua" + IDS_SPAIN "Spanish (Spain)" END STRINGTABLE BEGIN - IDS_CPLNAME "Opzioni internazionali e della lingua" - IDS_CPLDESCRIPTION "Personalizza le impostazioni per la visualizzazione delle lingue, numeri, ora e data." + IDS_CPLNAME "Opzioni internazionali e della lingua" + IDS_CPLDESCRIPTION "Personalizza le impostazioni per la visualizzazione delle lingue, numeri, ora e data." END Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc Sat Sep 8 19:43:19 2007 @@ -178,11 +178,12 @@ STRINGTABLE BEGIN - IDS_CUSTOMIZE_TITLE "Íàñòðîéêà ðåãèîíàëüíûõ ïàðàìåòðîâ" + IDS_CUSTOMIZE_TITLE "Íàñòðîéêà ðåãèîíàëüíûõ ïàðàìåòðîâ" + IDS_SPAIN "Spanish (Spain)" END STRINGTABLE BEGIN - IDS_CPLNAME "ßçûê è ðåãèîíàëüíûå ñòàíäàðòû" - IDS_CPLDESCRIPTION "Âûáîð ÿçûêà, ôîðìàòà ÷èñåë, äåíåæíûõ åäèíèö, âðåìåíè è äàòû." + IDS_CPLNAME "ßçûê è ðåãèîíàëüíûå ñòàíäàðòû" + IDS_CPLDESCRIPTION "Âûáîð ÿçûêà, ôîðìàòà ÷èñåë, äåíåæíûõ åäèíèö, âðåìåíè è äàòû." END Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/uk-UA.rc Sat Sep 8 19:43:19 2007 @@ -184,11 +184,12 @@ STRINGTABLE BEGIN - IDS_CUSTOMIZE_TITLE "Íàñòðîéêà ðåã³îíàëüíèõ ïàðàìåòð³â" + IDS_CUSTOMIZE_TITLE "Íàñòðîéêà ðåã³îíàëüíèõ ïàðàìåòð³â" + IDS_SPAIN "Spanish (Spain)" END STRINGTABLE BEGIN - IDS_CPLNAME "Ðåã³îíàëüí³ ñòàíäàðòè" - IDS_CPLDESCRIPTION "Íàñòðîéêà ìîâíèõ ïàðàìåòð³â ³ ôîðìàòó ÷èñåë, ãðîøîâèõ îäèíèöü, ÷àñó é äàò." + IDS_CPLNAME "Ðåã³îíàëüí³ ñòàíäàðòè" + IDS_CPLDESCRIPTION "Íàñòðîéêà ìîâíèõ ïàðàìåòð³â ³ ôîðìàòó ÷èñåë, ãðîøîâèõ îäèíèöü, ÷àñó é äàò." END Modified: trunk/reactos/dll/cpl/intl/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/resource.h (original) +++ trunk/reactos/dll/cpl/intl/resource.h Sat Sep 8 19:43:19 2007 @@ -74,7 +74,7 @@ #define IDS_CPLNAME 1000 #define IDS_CPLDESCRIPTION 1001 #define IDS_CUSTOMIZE_TITLE 1002 - +#define IDS_SPAIN 1003 #endif /* __CPL_RESOURCE_H */

1 0

[jimtabor] 28949: Reset DC if MemoryDC or SaveLevelDC.
by jimtabor＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: jimtabor Date: Sat Sep 8 18:30:39 2007 New Revision: 28949 URL: http://svn.reactos.org/svn/reactos?rev=28949&view=rev Log: Reset DC if MemoryDC or SaveLevelDC. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sat Sep 8 18:30:39 2007 @@ -1448,7 +1448,8 @@ IntGdiExtSelectClipRgn(dc, dcs->w.hClipRgn, RGN_COPY); DC_UnlockDc ( dc ); #endif - + if(!hDC) return; // Not a MemoryDC or SaveLevel DC, return. + NtGdiSelectObject( hDC, dcs->w.hBitmap ); NtGdiSelectObject( hDC, dcs->Dc_Attr.hbrush ); NtGdiSelectObject( hDC, dcs->Dc_Attr.hlfntNew );

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2007