From fdb78c697c65a8a4c0804adfbf8c1697a8b57b63 Mon Sep 17 00:00:00 2001
From: Marc Piulachs <marc.piulachs@live.com>
Date: Mon, 26 Nov 2007 21:47:35 +0000
Subject: [PATCH] final step , rename the scrnsave.scr to blankscr.scr to avoid
 conflicts with scrnsave.lib

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
---
 .../blankscr.rbuild}                          |  4 +-
 .../{scrnsave => blankscr}/lang/bg-BG.rc      |  0
 .../{scrnsave => blankscr}/lang/de-DE.rc      |  0
 .../{scrnsave => blankscr}/lang/en-US.rc      |  0
 .../{scrnsave => blankscr}/lang/fr-FR.rc      |  0
 .../{scrnsave => blankscr}/lang/lt-LT.rc      |  0
 .../{scrnsave => blankscr}/lang/nl-NL.rc      |  0
 .../{scrnsave => blankscr}/lang/sk-SK.rc      |  0
 .../{scrnsave => blankscr}/lang/uk-UA.rc      |  0
 .../{scrnsave => blankscr}/resource.h         |  0
 .../{scrnsave => blankscr}/scrnsave.c         | 52 +++++++++----------
 .../{scrnsave => blankscr}/scrnsave.def       |  0
 .../{scrnsave => blankscr}/scrnsave.rc        |  0
 .../screensavers/screensavers.rbuild          |  4 +-
 14 files changed, 30 insertions(+), 30 deletions(-)
 rename rosapps/applications/screensavers/{scrnsave/scrnsave.rbuild => blankscr/blankscr.rbuild} (87%)
 rename rosapps/applications/screensavers/{scrnsave => blankscr}/lang/bg-BG.rc (100%)
 rename rosapps/applications/screensavers/{scrnsave => blankscr}/lang/de-DE.rc (100%)
 rename rosapps/applications/screensavers/{scrnsave => blankscr}/lang/en-US.rc (100%)
 rename rosapps/applications/screensavers/{scrnsave => blankscr}/lang/fr-FR.rc (100%)
 rename rosapps/applications/screensavers/{scrnsave => blankscr}/lang/lt-LT.rc (100%)
 rename rosapps/applications/screensavers/{scrnsave => blankscr}/lang/nl-NL.rc (100%)
 rename rosapps/applications/screensavers/{scrnsave => blankscr}/lang/sk-SK.rc (100%)
 rename rosapps/applications/screensavers/{scrnsave => blankscr}/lang/uk-UA.rc (100%)
 rename rosapps/applications/screensavers/{scrnsave => blankscr}/resource.h (100%)
 rename rosapps/applications/screensavers/{scrnsave => blankscr}/scrnsave.c (64%)
 rename rosapps/applications/screensavers/{scrnsave => blankscr}/scrnsave.def (100%)
 rename rosapps/applications/screensavers/{scrnsave => blankscr}/scrnsave.rc (100%)

diff --git a/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild b/rosapps/applications/screensavers/blankscr/blankscr.rbuild
similarity index 87%
rename from rosapps/applications/screensavers/scrnsave/scrnsave.rbuild
rename to rosapps/applications/screensavers/blankscr/blankscr.rbuild
index 8aceb7d35cc..ef617124eee 100644
--- a/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild
+++ b/rosapps/applications/screensavers/blankscr/blankscr.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>
diff --git a/rosapps/applications/screensavers/scrnsave/lang/bg-BG.rc b/rosapps/applications/screensavers/blankscr/lang/bg-BG.rc
similarity index 100%
rename from rosapps/applications/screensavers/scrnsave/lang/bg-BG.rc
rename to rosapps/applications/screensavers/blankscr/lang/bg-BG.rc
diff --git a/rosapps/applications/screensavers/scrnsave/lang/de-DE.rc b/rosapps/applications/screensavers/blankscr/lang/de-DE.rc
similarity index 100%
rename from rosapps/applications/screensavers/scrnsave/lang/de-DE.rc
rename to rosapps/applications/screensavers/blankscr/lang/de-DE.rc
diff --git a/rosapps/applications/screensavers/scrnsave/lang/en-US.rc b/rosapps/applications/screensavers/blankscr/lang/en-US.rc
similarity index 100%
rename from rosapps/applications/screensavers/scrnsave/lang/en-US.rc
rename to rosapps/applications/screensavers/blankscr/lang/en-US.rc
diff --git a/rosapps/applications/screensavers/scrnsave/lang/fr-FR.rc b/rosapps/applications/screensavers/blankscr/lang/fr-FR.rc
similarity index 100%
rename from rosapps/applications/screensavers/scrnsave/lang/fr-FR.rc
rename to rosapps/applications/screensavers/blankscr/lang/fr-FR.rc
diff --git a/rosapps/applications/screensavers/scrnsave/lang/lt-LT.rc b/rosapps/applications/screensavers/blankscr/lang/lt-LT.rc
similarity index 100%
rename from rosapps/applications/screensavers/scrnsave/lang/lt-LT.rc
rename to rosapps/applications/screensavers/blankscr/lang/lt-LT.rc
diff --git a/rosapps/applications/screensavers/scrnsave/lang/nl-NL.rc b/rosapps/applications/screensavers/blankscr/lang/nl-NL.rc
similarity index 100%
rename from rosapps/applications/screensavers/scrnsave/lang/nl-NL.rc
rename to rosapps/applications/screensavers/blankscr/lang/nl-NL.rc
diff --git a/rosapps/applications/screensavers/scrnsave/lang/sk-SK.rc b/rosapps/applications/screensavers/blankscr/lang/sk-SK.rc
similarity index 100%
rename from rosapps/applications/screensavers/scrnsave/lang/sk-SK.rc
rename to rosapps/applications/screensavers/blankscr/lang/sk-SK.rc
diff --git a/rosapps/applications/screensavers/scrnsave/lang/uk-UA.rc b/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc
similarity index 100%
rename from rosapps/applications/screensavers/scrnsave/lang/uk-UA.rc
rename to rosapps/applications/screensavers/blankscr/lang/uk-UA.rc
diff --git a/rosapps/applications/screensavers/scrnsave/resource.h b/rosapps/applications/screensavers/blankscr/resource.h
similarity index 100%
rename from rosapps/applications/screensavers/scrnsave/resource.h
rename to rosapps/applications/screensavers/blankscr/resource.h
diff --git a/rosapps/applications/screensavers/scrnsave/scrnsave.c b/rosapps/applications/screensavers/blankscr/scrnsave.c
similarity index 64%
rename from rosapps/applications/screensavers/scrnsave/scrnsave.c
rename to rosapps/applications/screensavers/blankscr/scrnsave.c
index b8a9edb4065..360d3996fa4 100644
--- a/rosapps/applications/screensavers/scrnsave/scrnsave.c
+++ b/rosapps/applications/screensavers/blankscr/scrnsave.c
@@ -17,39 +17,39 @@
  *  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)
diff --git a/rosapps/applications/screensavers/scrnsave/scrnsave.def b/rosapps/applications/screensavers/blankscr/scrnsave.def
similarity index 100%
rename from rosapps/applications/screensavers/scrnsave/scrnsave.def
rename to rosapps/applications/screensavers/blankscr/scrnsave.def
diff --git a/rosapps/applications/screensavers/scrnsave/scrnsave.rc b/rosapps/applications/screensavers/blankscr/scrnsave.rc
similarity index 100%
rename from rosapps/applications/screensavers/scrnsave/scrnsave.rc
rename to rosapps/applications/screensavers/blankscr/scrnsave.rc
diff --git a/rosapps/applications/screensavers/screensavers.rbuild b/rosapps/applications/screensavers/screensavers.rbuild
index 9d1613b633b..d5237d7b55d 100644
--- a/rosapps/applications/screensavers/screensavers.rbuild
+++ b/rosapps/applications/screensavers/screensavers.rbuild
@@ -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" />
-- 
2.17.1