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

[mpiulachs at svn.reactos.org]

Author: mpiulachs
Date: Tue Nov 27 00:47:35 2007
New Revision: 30793

URL: http://svn.reactos.org/svn/reactos?rev=30793&view=rev
Log:
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

Added:
    trunk/rosapps/applications/screensavers/blankscr/
      - copied from r30653, trunk/rosapps/applications/screensavers/scrnsave/
    trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild
      - copied, changed from r30753, trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild
    trunk/rosapps/applications/screensavers/blankscr/lang/
      - copied from r30792, trunk/rosapps/applications/screensavers/scrnsave/lang/
    trunk/rosapps/applications/screensavers/blankscr/scrnsave.c
      - copied, changed from r30792, trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c
    trunk/rosapps/applications/screensavers/blankscr/scrnsave.def
      - copied unchanged from r30792, trunk/rosapps/applications/screensavers/scrnsave/scrnsave.def
Removed:
    trunk/rosapps/applications/screensavers/blankscr/scrnsave.rbuild
    trunk/rosapps/applications/screensavers/scrnsave/
Modified:
    trunk/rosapps/applications/screensavers/screensavers.rbuild

Copied: trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild (from r30753, trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild)
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild?p2=trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild&p1=trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild&r1=30753&r2=30793&rev=30793&view=diff
==============================================================================
--- trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild (original)
+++ trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild Tue Nov 27 00:47:35 2007
@@ -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>

Copied: trunk/rosapps/applications/screensavers/blankscr/scrnsave.c (from r30792, trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c)
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/blankscr/scrnsave.c?p2=trunk/rosapps/applications/screensavers/blankscr/scrnsave.c&p1=trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c&r1=30792&r2=30793&rev=30793&view=diff
==============================================================================
--- trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c (original)
+++ trunk/rosapps/applications/screensavers/blankscr/scrnsave.c Tue Nov 27 00:47:35 2007
@@ -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)

Removed: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild?rev=30653&view=auto
==============================================================================
--- trunk/rosapps/applications/screensavers/blankscr/scrnsave.rbuild (original)
+++ trunk/rosapps/applications/screensavers/blankscr/scrnsave.rbuild (removed)
@@ -1,13 +1,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="scrnsave" type="win32scr" installbase="system32" installname="scrnsave.scr" unicode="true">
-	<library>kernel32</library>
-	<library>user32</library>
-	<library>gdi32</library>
-	<library>opengl32</library>
-	<library>glu32</library>
-	<library>winmm</library>
-
-	<file>scrnsave.c</file>
-	<file>scrnsave.rc</file>
-</module>

Modified: trunk/rosapps/applications/screensavers/screensavers.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/screensavers.rbuild?rev=30793&r1=30792&r2=30793&view=diff
==============================================================================
--- trunk/rosapps/applications/screensavers/screensavers.rbuild (original)
+++ trunk/rosapps/applications/screensavers/screensavers.rbuild Tue Nov 27 00:47:35 2007
@@ -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" />