[ros-diffs] [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

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,143T,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;