Author: cwittich
Date: Tue Feb 5 01:11:56 2008
New Revision: 32123
URL:
http://svn.reactos.org/svn/reactos?rev=32123&view=rev
Log:
return 0 when type is DWORD
remove unused alias struct
Modified:
trunk/reactos/dll/win32/kernel32/misc/console.c
Modified: trunk/reactos/dll/win32/kernel32/misc/console.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/misc/console.c (original)
+++ trunk/reactos/dll/win32/kernel32/misc/console.c Tue Feb 5 01:11:56 2008
@@ -18,14 +18,6 @@
#define NDEBUG
#include <debug.h>
-
-typedef struct tagALIAS
-{
- struct tagALIAS *next;
- LPWSTR lpName;
- LPWSTR lpSubst;
- DWORD dwUsed;
-} ALIAS, *LPALIAS;
extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event);
extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag);
@@ -187,11 +179,11 @@
BOOL STDCALL
AddConsoleAliasW (LPCWSTR lpSource,
LPCWSTR lpTarget,
- LPCWSTR lpExeName /* FIXME: currently ignored */)
+ LPCWSTR lpExeName)
{
CSR_API_MESSAGE Request;
ULONG CsrRequest;
- NTSTATUS Status;
+ NTSTATUS Status;
CsrRequest = MAKE_CSR_API(ADD_CONSOLE_ALIAS, CSR_NATIVE);
@@ -308,7 +300,7 @@
{
CSR_API_MESSAGE Request;
ULONG CsrRequest;
- NTSTATUS Status;
+ NTSTATUS Status;
CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIAS, CSR_NATIVE);
@@ -325,7 +317,7 @@
if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status))
{
SetLastErrorByStatus(Status);
- return FALSE;
+ return 0;
}
return Request.Data.GetConsoleAlias.BytesWritten / sizeof(WCHAR);
@@ -376,12 +368,12 @@
* @implemented
*/
DWORD STDCALL
-GetConsoleAliasExesW (LPWSTR lpExeNameBuffer,
+GetConsoleAliasExesW (LPWSTR lpExeNameBuffer,
DWORD ExeNameBufferLength)
{
CSR_API_MESSAGE Request;
ULONG CsrRequest;
- NTSTATUS Status;
+ NTSTATUS Status;
CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIASES_EXES, CSR_NATIVE);
Request.Data.GetConsoleAliasesExes.ExeNames = lpExeNameBuffer;
@@ -395,7 +387,7 @@
if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status))
{
SetLastErrorByStatus(Status);
- return FALSE;
+ return 0;
}
return Request.Data.GetConsoleAliasesExes.BytesWritten / sizeof(WCHAR);
@@ -445,7 +437,7 @@
if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status))
{
SetLastErrorByStatus(Status);
- return FALSE;
+ return 0;
}
return Request.Data.GetConsoleAliasesExesLength.Length;
@@ -478,12 +470,12 @@
{
CSR_API_MESSAGE Request;
ULONG CsrRequest;
- NTSTATUS Status;
+ NTSTATUS Status;
DWORD dwLength;
dwLength = GetConsoleAliasesLengthW(ExeName);
if (!dwLength || dwLength > AliasBufferLength)
- return FALSE;
+ return 0;
CsrRequest = MAKE_CSR_API(GET_ALL_CONSOLE_ALIASES, CSR_NATIVE);
Request.Data.GetAllConsoleAlias.AliasBuffer = AliasBuffer;
@@ -498,7 +490,7 @@
if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status))
{
SetLastErrorByStatus(Status);
- return FALSE;
+ return 0;
}
return Request.Data.GetAllConsoleAlias.BytesWritten / sizeof(WCHAR);
@@ -557,7 +549,7 @@
if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status))
{
SetLastErrorByStatus(Status);
- return FALSE;
+ return 0;
}
return Request.Data.GetAllConsoleAliasesLength.Length;