Author: dreimer
Date: Sat Apr 18 09:21:51 2015
New Revision: 67240
URL: http://svn.reactos.org/svn/reactos?rev=67240&view=rev
Log:
Fixing some incorrectly written Reactos/ReactOs -> ReactOS by Raked Liska
CORE-9536 #comment Even less of these now.
Modified:
trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt
trunk/reactos/base/setup/usetup/bootsup.c
trunk/reactos/base/setup/usetup/bootsup.h
trunk/reactos/dll/win32/iphlpapi/merge-notes.txt
trunk/reactos/dll/win32/setupapi/install.c
trunk/reactos/include/reactos/subsys/win/winmsg.h
trunk/reactos/media/inf/kscaptur.inf
trunk/reactos/win32ss/user/user32/misc/exit.c
trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c
Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt?rev=67240&r1=67239&r2=67240&view=diff
==============================================================================
--- trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt
[iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt
[iso-8859-1] Sat Apr 18 09:21:51 2015
@@ -24,7 +24,7 @@
[Section.0410]
Name = Driver AC97 per VirtualBox
License = Sconosciuta
-Descrizione = Estrarre nella cartella "ReactOS" e poi riavviare ReactOs due
volte.
+Descrizione = Estrarre nella cartella "ReactOS" e poi riavviare ReactOS due
volte.
[Section.0a]
Name = Controlador AC'97 para VirtualBox
Modified: trunk/reactos/base/setup/usetup/bootsup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.c?rev=67240&r1=67239&r2=67240&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Sat Apr 18
09:21:51 2015
@@ -452,7 +452,7 @@
}
NTSTATUS
-CreateFreeLoaderIniForReactos(
+CreateFreeLoaderIniForReactOS(
PWCHAR IniPath,
PWCHAR ArcPath)
{
@@ -2068,11 +2068,11 @@
wcscpy(DstPath, SystemRootPath->Buffer);
wcscat(DstPath, L"\\freeldr.ini");
- Status = CreateFreeLoaderIniForReactos(DstPath,
+ Status = CreateFreeLoaderIniForReactOS(DstPath,
DestinationArcPath->Buffer);
if (!NT_SUCCESS(Status))
{
- DPRINT1("CreateFreeLoaderIniForReactos() failed (Status
%lx)\n", Status);
+ DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status
%lx)\n", Status);
return Status;
}
@@ -2267,11 +2267,11 @@
wcscat(DstPath, L"\\freeldr.ini");
DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath);
- Status = CreateFreeLoaderIniForReactos(DstPath,
+ Status = CreateFreeLoaderIniForReactOS(DstPath,
DestinationArcPath->Buffer);
if (!NT_SUCCESS(Status))
{
- DPRINT1("CreateFreeLoaderIniForReactos() failed (Status
%lx)\n", Status);
+ DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status
%lx)\n", Status);
return Status;
}
@@ -2409,10 +2409,10 @@
wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.ini");
DPRINT("Create new 'freeldr.ini'\n");
- Status = CreateFreeLoaderIniForReactos(DstPath,
DestinationArcPath->Buffer);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("CreateFreeLoaderIniForReactos() failed (Status %lx)\n",
Status);
+ Status = CreateFreeLoaderIniForReactOS(DstPath,
DestinationArcPath->Buffer);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status %lx)\n",
Status);
return Status;
}
Modified: trunk/reactos/base/setup/usetup/bootsup.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.h?rev=67240&r1=67239&r2=67240&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] Sat Apr 18
09:21:51 2015
@@ -32,7 +32,7 @@
PWCHAR ArcPath);
NTSTATUS
-CreateFreeLoaderIniForReactos(
+CreateFreeLoaderIniForReactOS(
PWCHAR IniPath,
PWCHAR ArcPath);
Modified: trunk/reactos/dll/win32/iphlpapi/merge-notes.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/merge-notes.txt?rev=67240&r1=67239&r2=67240&view=diff
==============================================================================
--- trunk/reactos/dll/win32/iphlpapi/merge-notes.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iphlpapi/merge-notes.txt [iso-8859-1] Sat Apr 18
09:21:51 2015
@@ -8,7 +8,7 @@
GetNetworkParams --
-- Make workable interface for _res
-- Wine based on real _res
- -- Reactos based on my enumerator funcs
+ -- ReactOS based on my enumerator funcs
-- Done -- Prints route info on windows
ROUTE PRINT:
Modified: trunk/reactos/dll/win32/setupapi/install.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install.c?rev=67240&r1=67239&r2=67240&view=diff
==============================================================================
--- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Sat Apr 18
09:21:51 2015
@@ -1722,11 +1722,11 @@
IN OUT LPWSTR *ServiceBinary)
{
LPWSTR Buffer;
- WCHAR ReactosDir[MAX_PATH];
+ WCHAR ReactOSDir[MAX_PATH];
DWORD RosDirLength, ServiceLength, Win32Length;
- GetWindowsDirectoryW(ReactosDir, MAX_PATH);
- RosDirLength = strlenW(ReactosDir);
+ GetWindowsDirectoryW(ReactOSDir, MAX_PATH);
+ RosDirLength = strlenW(ReactOSDir);
ServiceLength = strlenW(*ServiceBinary);
/* Check and fix two things:
@@ -1737,7 +1737,7 @@
if (ServiceLength < RosDirLength)
return;
- if (!wcsnicmp(*ServiceBinary, ReactosDir, RosDirLength))
+ if (!wcsnicmp(*ServiceBinary, ReactOSDir, RosDirLength))
{
/* Yes, the first part is the C:\ReactOS\, just skip it */
MoveMemory(*ServiceBinary, *ServiceBinary + RosDirLength + 1,
@@ -2212,7 +2212,7 @@
if (RequiredSize) *RequiredSize = size;
goto cleanup;
}
-
+
if (DestinationInfFileNameSize != 0)
{
if (WideCharToMultiByte(CP_ACP, 0, DestinationInfFileNameW, -1,
Modified: trunk/reactos/include/reactos/subsys/win/winmsg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win/winmsg.h?rev=67240&r1=67239&r2=67240&view=diff
==============================================================================
--- trunk/reactos/include/reactos/subsys/win/winmsg.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/subsys/win/winmsg.h [iso-8859-1] Sat Apr 18
09:21:51 2015
@@ -93,7 +93,7 @@
ULONG Reserved;
union
{
- USER_EXIT_REACTOS ExitReactosRequest;
+ USER_EXIT_REACTOS ExitReactOSRequest;
USER_END_TASK EndTaskRequest;
USER_LOGON LogonRequest;
USER_GET_THREAD_CONSOLE_DESKTOP GetThreadConsoleDesktopRequest;
Modified: trunk/reactos/media/inf/kscaptur.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/kscaptur.inf?rev=67240&r1=67239&r2=67240&view=diff
==============================================================================
--- trunk/reactos/media/inf/kscaptur.inf [iso-8859-1] (original)
+++ trunk/reactos/media/inf/kscaptur.inf [iso-8859-1] Sat Apr 18
09:21:51 2015
@@ -55,7 +55,7 @@
system.ini,drivers,,"MSVideo.VfWWDM=vfwwdm.drv"
[VfWWDM32.DelFile]
-vfwwdm32.dll
+vfwwdm32.dll
[VfWWDM.Files]
vfwwdm.drv
Modified: trunk/reactos/win32ss/user/user32/misc/exit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/exit.c?rev=67240&r1=67239&r2=67240&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] Sat Apr 18
09:21:51 2015
@@ -1,4 +1,4 @@
-/*
+/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll
* FILE: lib/user32/misc/exit.c
@@ -98,7 +98,7 @@
MSG msg;
USER_API_MESSAGE ApiMessage;
- PUSER_EXIT_REACTOS ExitReactosRequest =
&ApiMessage.Data.ExitReactosRequest;
+ PUSER_EXIT_REACTOS ExitReactOSRequest =
&ApiMessage.Data.ExitReactOSRequest;
/*
* 1- FIXME: Call NtUserCallOneParam(uFlags,
ONEPARAM_ROUTINE_PREPAREFORLOGOFF);
@@ -110,24 +110,24 @@
* We can shutdown synchronously or asynchronously.
*/
- // ExitReactosRequest->LastError = ERROR_SUCCESS;
- ExitReactosRequest->Flags = uFlags;
+ // ExitReactOSRequest->LastError = ERROR_SUCCESS;
+ ExitReactOSRequest->Flags = uFlags;
CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
NULL,
CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX,
UserpExitWindowsEx),
- sizeof(*ExitReactosRequest));
+ sizeof(*ExitReactOSRequest));
/* Set the last error accordingly */
if (NT_SUCCESS(ApiMessage.Status) || ApiMessage.Status == STATUS_CANT_WAIT)
{
- if (ExitReactosRequest->LastError != ERROR_SUCCESS)
- UserSetLastError(ExitReactosRequest->LastError);
+ if (ExitReactOSRequest->LastError != ERROR_SUCCESS)
+ UserSetLastError(ExitReactOSRequest->LastError);
}
else
{
UserSetLastNTError(ApiMessage.Status);
- ExitReactosRequest->Success = FALSE;
+ ExitReactOSRequest->Success = FALSE;
}
/*
@@ -136,7 +136,7 @@
* return the real state of the operation now.
*/
if (NT_SUCCESS(ApiMessage.Status))
- return ExitReactosRequest->Success;
+ return ExitReactOSRequest->Success;
/*
* In case something failed: we have a non-success status and:
Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c?rev=67240&r1=67239&r2=67240&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1]
(original)
+++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1]
Sat Apr 18 09:21:51 2015
@@ -629,7 +629,7 @@
}
static NTSTATUS FASTCALL
-UserExitReactos(PCSR_THREAD CsrThread, UINT Flags)
+UserExitReactOS(PCSR_THREAD CsrThread, UINT Flags)
{
NTSTATUS Status;
LUID CallerLuid;
@@ -805,11 +805,11 @@
CSR_API(SrvExitWindowsEx)
{
NTSTATUS Status;
- PUSER_EXIT_REACTOS ExitReactosRequest =
&((PUSER_API_MESSAGE)ApiMessage)->Data.ExitReactosRequest;
-
- Status = UserExitReactos(CsrGetClientThread(), ExitReactosRequest->Flags);
- ExitReactosRequest->Success = NT_SUCCESS(Status);
- ExitReactosRequest->LastError = GetLastError();
+ PUSER_EXIT_REACTOS ExitReactOSRequest =
&((PUSER_API_MESSAGE)ApiMessage)->Data.ExitReactOSRequest;
+
+ Status = UserExitReactOS(CsrGetClientThread(), ExitReactOSRequest->Flags);
+ ExitReactOSRequest->Success = NT_SUCCESS(Status);
+ ExitReactOSRequest->LastError = GetLastError();
return Status;
}
