[ros-diffs] [ion] 16354: kill rosrtl from system modules

kill rosrtl from system modules
Modified: trunk/reactos/subsys/system/directory.xml
Modified: trunk/reactos/subsys/system/services/database.c
Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.h
Modified: trunk/reactos/subsys/system/taskmgr/font.c
  _____  

Modified: trunk/reactos/subsys/system/directory.xml
--- trunk/reactos/subsys/system/directory.xml	2005-06-30 16:52:26 UTC
(rev 16353)
+++ trunk/reactos/subsys/system/directory.xml	2005-06-30 16:57:06 UTC
(rev 16354)
@@ -13,12 +13,6 @@

 <directory name="expand">
 	<xi:include href="expand/expand.xml" />
 </directory>
-<directory name="explorer">
-	<xi:include href="explorer/explorer.xml" />
-</directory>
-<directory name="ibrowser">
-	<xi:include href="ibrowser/ibrowser.xml" />
-</directory>
 <directory name="format">
 	<xi:include href="format/format.xml" />
 </directory>
  _____  

Modified: trunk/reactos/subsys/system/services/database.c
--- trunk/reactos/subsys/system/services/database.c	2005-06-30
16:52:26 UTC (rev 16353)
+++ trunk/reactos/subsys/system/services/database.c	2005-06-30
16:57:06 UTC (rev 16354)
@@ -28,8 +28,6 @@

 #include "services.h"
 #include <services/services.h>
 
-#include <rosrtl/string.h>
-
 #define NDEBUG
 #include <debug.h>
 
@@ -298,7 +296,8 @@
 {
   RTL_QUERY_REGISTRY_TABLE QueryTable[2];
   OBJECT_ATTRIBUTES ObjectAttributes;
-  UNICODE_STRING ServicesKeyName;
+  UNICODE_STRING ServicesKeyName = 
+
RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Se
rvices");
   UNICODE_STRING SubKeyName;
   HKEY ServicesKey;
   ULONG Index;
@@ -329,9 +328,6 @@
   if (!NT_SUCCESS(Status))
     return Status;
 
-  RtlRosInitUnicodeStringFromLiteral(&ServicesKeyName,
-
L"\\Registry\\Machine\\System\\CurrentControlSet\\Services");
-
   InitializeObjectAttributes(&ObjectAttributes,
 			     &ServicesKeyName,
 			     OBJ_CASE_INSENSITIVE,
@@ -417,12 +413,12 @@
 
   if (Service->Type == SERVICE_KERNEL_DRIVER)
     {
-      RtlRosInitUnicodeStringFromLiteral(&DirName,
+      RtlInitUnicodeString(&DirName,
 			   L"\\Driver");
     }
   else
     {
-      RtlRosInitUnicodeStringFromLiteral(&DirName,
+      RtlInitUnicodeString(&DirName,
 			   L"\\FileSystem");
     }
 
  _____  

Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.h
--- trunk/reactos/subsys/system/sndvol32/sndvol32.h	2005-06-30
16:52:26 UTC (rev 16353)
+++ trunk/reactos/subsys/system/sndvol32/sndvol32.h	2005-06-30
16:57:06 UTC (rev 16354)
@@ -7,7 +7,6 @@

 #include <stdio.h>
 #include <tchar.h>
 #include <string.h>
-#include <rosrtl/resstr.h>
 #include "resources.h"
 
 typedef struct _MIXER_WINDOW
  _____  

Modified: trunk/reactos/subsys/system/taskmgr/font.c
--- trunk/reactos/subsys/system/taskmgr/font.c	2005-06-30 16:52:26 UTC
(rev 16353)
+++ trunk/reactos/subsys/system/taskmgr/font.c	2005-06-30 16:57:06 UTC
(rev 16354)
@@ -37,11 +37,11 @@

         if ((lpszText[i] >= '0') && (lpszText[i] <= '9'))
{
             BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, (lpszText[i] -
'0') * 8, 0, SRCCOPY);
         }
-        else if (lpszText[i] == 'K')
+        else if (lpszText[i] == '%')
         {
             BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 80, 0,
SRCCOPY);
         }
-        else if (lpszText[i] == '%')
+        else if (lpszText[i] == 'K')
         {
             BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 88, 0,
SRCCOPY);
         }