final step , rename the scrnsave.scr to blankscr.scr to avoid conflicts with scrnsave.lib
authorMarc Piulachs <marc.piulachs@live.com>
Mon, 26 Nov 2007 21:47:35 +0000 (21:47 +0000)
committerMarc Piulachs <marc.piulachs@live.com>
Mon, 26 Nov 2007 21:47:35 +0000 (21:47 +0000)
caution: manually deleting makefile.auto may be required!
note: It works fine in windows it highlights a but in reactos

svn path=/trunk/; revision=30793

14 files changed:
rosapps/applications/screensavers/blankscr/blankscr.rbuild [moved from rosapps/applications/screensavers/scrnsave/scrnsave.rbuild with 87% similarity]
rosapps/applications/screensavers/blankscr/lang/bg-BG.rc [moved from rosapps/applications/screensavers/scrnsave/lang/bg-BG.rc with 100% similarity]
rosapps/applications/screensavers/blankscr/lang/de-DE.rc [moved from rosapps/applications/screensavers/scrnsave/lang/de-DE.rc with 100% similarity]
rosapps/applications/screensavers/blankscr/lang/en-US.rc [moved from rosapps/applications/screensavers/scrnsave/lang/en-US.rc with 100% similarity]
rosapps/applications/screensavers/blankscr/lang/fr-FR.rc [moved from rosapps/applications/screensavers/scrnsave/lang/fr-FR.rc with 100% similarity]
rosapps/applications/screensavers/blankscr/lang/lt-LT.rc [moved from rosapps/applications/screensavers/scrnsave/lang/lt-LT.rc with 100% similarity]
rosapps/applications/screensavers/blankscr/lang/nl-NL.rc [moved from rosapps/applications/screensavers/scrnsave/lang/nl-NL.rc with 100% similarity]
rosapps/applications/screensavers/blankscr/lang/sk-SK.rc [moved from rosapps/applications/screensavers/scrnsave/lang/sk-SK.rc with 100% similarity]
rosapps/applications/screensavers/blankscr/lang/uk-UA.rc [moved from rosapps/applications/screensavers/scrnsave/lang/uk-UA.rc with 100% similarity]
rosapps/applications/screensavers/blankscr/resource.h [moved from rosapps/applications/screensavers/scrnsave/resource.h with 100% similarity]
rosapps/applications/screensavers/blankscr/scrnsave.c [moved from rosapps/applications/screensavers/scrnsave/scrnsave.c with 64% similarity]
rosapps/applications/screensavers/blankscr/scrnsave.def [moved from rosapps/applications/screensavers/scrnsave/scrnsave.def with 100% similarity]
rosapps/applications/screensavers/blankscr/scrnsave.rc [moved from rosapps/applications/screensavers/scrnsave/scrnsave.rc with 100% similarity]
rosapps/applications/screensavers/screensavers.rbuild

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="blankscr" type="win32scr" installbase="system32" installname="scrnsave.scr">
+<module name="blankscr" type="win32scr" installbase="system32" installname="blankscr.scr">
        <importlibrary definition="scrnsave.def" />
        <library>scrnsave</library>
        <library>kernel32</library>
@@ -9,7 +9,7 @@
        <library>opengl32</library>
        <library>glu32</library>
        <library>advapi32</library>
-        <library>shell32</library>
+       <library>shell32</library>
 
        <file>scrnsave.c</file>
        <file>scrnsave.rc</file>
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <windows.h> 
-#include <scrnsave.h> 
+#include <windows.h>
+#include <scrnsave.h>
 #include "resource.h"
 
-LRESULT WINAPI ScreenSaverProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) 
+LRESULT WINAPI ScreenSaverProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 { 
-    static HDC  hdc;   
+    static HDC  hdc;
     static RECT rc;
 
-    switch(message) 
-    { 
-        case WM_CREATE: 
-            break; 
-        case WM_DESTROY: 
-            PostQuitMessage(0); 
-            break; 
-        case WM_ERASEBKGND: 
-            hdc = GetDC(hwnd); 
-            GetClientRect (hwnd, &rc); 
-            FillRect (hdc, &rc, GetStockObject(BLACK_BRUSH)); 
-            ReleaseDC(hwnd,hdc); 
-            break; 
-       case WM_PAINT: 
-            break; 
-       default: 
-            return DefScreenSaverProc(hwnd, message, wParam, lParam); 
-    } 
-    return 0; 
+    switch(message)
+    {
+        case WM_CREATE:
+            break;
+        case WM_DESTROY:
+            PostQuitMessage(0);
+            break;
+        case WM_ERASEBKGND:
+            hdc = GetDC(hwnd);
+            GetClientRect (hwnd, &rc);
+            FillRect (hdc, &rc, GetStockObject(BLACK_BRUSH));
+            ReleaseDC(hwnd,hdc);
+            break;
+       case WM_PAINT:
+            break;
+       default:
+            return DefScreenSaverProc(hwnd, message, wParam, lParam);
+    }
+    return 0;
 }
 
-BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) 
-{ 
-    return FALSE; 
+BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+{
+    return FALSE;
 }
 
 BOOL WINAPI RegisterDialogClasses(HANDLE hInst)
index 9d1613b..d5237d7 100644 (file)
@@ -7,8 +7,8 @@
        <directory name="matrix">
                <xi:include href="matrix/matrix.rbuild" />
        </directory>
-       <directory name="scrnsave">
-               <xi:include href="scrnsave/scrnsave.rbuild" />
+       <directory name="blankscr">
+               <xi:include href="blankscr/blankscr.rbuild" />
        </directory>
        <directory name="starfield">
                <xi:include href="starfield/starfield.rbuild" />