Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:23:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

kill rosrtl from system modules

Browse source 
svn path=/trunk/; revision=16354
This commit is contained in:
Alex Ionescu 2005-06-30 16:57:06 +00:00
parent 493ca2fe71
commit 30a6f296fd
4 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/subsys/system/directory.xml
View file

@ -13,12 +13,6 @@
<directory name="expand"> <directory name="expand">
<xi:include href="expand/expand.xml" /> <xi:include href="expand/expand.xml" />
</directory> </directory>
<directory name="explorer">
<xi:include href="explorer/explorer.xml" />
</directory>
<directory name="ibrowser">
<xi:include href="ibrowser/ibrowser.xml" />
</directory>
<directory name="format"> <directory name="format">
<xi:include href="format/format.xml" /> <xi:include href="format/format.xml" />
</directory> </directory>

12
reactos/subsys/system/services/database.c
View file

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

1
reactos/subsys/system/sndvol32/sndvol32.h
View file

@ -7,7 +7,6 @@
#include <stdio.h> #include <stdio.h>
#include <tchar.h> #include <tchar.h>
#include <string.h> #include <string.h>
#include <rosrtl/resstr.h>
#include "resources.h" #include "resources.h"
typedef struct _MIXER_WINDOW typedef struct _MIXER_WINDOW

4
reactos/subsys/system/taskmgr/font.c
View file

@ -37,11 +37,11 @@ void Font_DrawText(HDC hDC, LPCTSTR lpszText, int x, int y)
if ((lpszText[i] >= '0') && (lpszText[i] <= '9')) { if ((lpszText[i] >= '0') && (lpszText[i] <= '9')) {
BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, (lpszText[i] - '0') * 8, 0, SRCCOPY); 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); 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); BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 88, 0, SRCCOPY);
} }