Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-08 04:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

return 0 when type is DWORD

Browse source 
remove unused alias struct

svn path=/trunk/; revision=32123
This commit is contained in:
Christoph von Wittich 2008-02-04 22:11:56 +00:00
parent db26f5d219
commit e31d1017f5
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
reactos/dll/win32/kernel32/misc/console.c
View file

@ -19,14 +19,6 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
typedef struct tagALIAS
{
struct tagALIAS *next;
LPWSTR lpName;
LPWSTR lpSubst;
DWORD dwUsed;
} ALIAS, *LPALIAS;
extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event);
extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag);
extern RTL_CRITICAL_SECTION ConsoleLock; extern RTL_CRITICAL_SECTION ConsoleLock;
@ -187,11 +179,11 @@ AddConsoleAliasA (LPCSTR lpSource,
BOOL STDCALL BOOL STDCALL
AddConsoleAliasW (LPCWSTR lpSource, AddConsoleAliasW (LPCWSTR lpSource,
LPCWSTR lpTarget, LPCWSTR lpTarget,
LPCWSTR lpExeName /* FIXME: currently ignored */) LPCWSTR lpExeName)
{ {
CSR_API_MESSAGE Request; CSR_API_MESSAGE Request;
ULONG CsrRequest; ULONG CsrRequest;
NTSTATUS Status; NTSTATUS Status;
CsrRequest = MAKE_CSR_API(ADD_CONSOLE_ALIAS, CSR_NATIVE); CsrRequest = MAKE_CSR_API(ADD_CONSOLE_ALIAS, CSR_NATIVE);
@ -308,7 +300,7 @@ GetConsoleAliasW (LPWSTR lpSource,
{ {
CSR_API_MESSAGE Request; CSR_API_MESSAGE Request;
ULONG CsrRequest; ULONG CsrRequest;
NTSTATUS Status; NTSTATUS Status;
CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIAS, CSR_NATIVE); CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIAS, CSR_NATIVE);
@ -325,7 +317,7 @@ GetConsoleAliasW (LPWSTR lpSource,
if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status))
{ {
SetLastErrorByStatus(Status); SetLastErrorByStatus(Status);
return FALSE; return 0;
} }
return Request.Data.GetConsoleAlias.BytesWritten / sizeof(WCHAR); return Request.Data.GetConsoleAlias.BytesWritten / sizeof(WCHAR);
@ -376,12 +368,12 @@ GetConsoleAliasA (LPSTR lpSource,
* @implemented * @implemented
*/ */
DWORD STDCALL DWORD STDCALL
GetConsoleAliasExesW (LPWSTR lpExeNameBuffer, GetConsoleAliasExesW (LPWSTR lpExeNameBuffer,
DWORD ExeNameBufferLength) DWORD ExeNameBufferLength)
{ {
CSR_API_MESSAGE Request; CSR_API_MESSAGE Request;
ULONG CsrRequest; ULONG CsrRequest;
NTSTATUS Status; NTSTATUS Status;
CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIASES_EXES, CSR_NATIVE); CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIASES_EXES, CSR_NATIVE);
Request.Data.GetConsoleAliasesExes.ExeNames = lpExeNameBuffer; Request.Data.GetConsoleAliasesExes.ExeNames = lpExeNameBuffer;
@ -395,7 +387,7 @@ GetConsoleAliasExesW (LPWSTR lpExeNameBuffer,
if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status))
{ {
SetLastErrorByStatus(Status); SetLastErrorByStatus(Status);
return FALSE; return 0;
} }
return Request.Data.GetConsoleAliasesExes.BytesWritten / sizeof(WCHAR); return Request.Data.GetConsoleAliasesExes.BytesWritten / sizeof(WCHAR);
@ -445,7 +437,7 @@ GetConsoleAliasExesLengthW (VOID)
if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status))
{ {
SetLastErrorByStatus(Status); SetLastErrorByStatus(Status);
return FALSE; return 0;
} }
return Request.Data.GetConsoleAliasesExesLength.Length; return Request.Data.GetConsoleAliasesExesLength.Length;
@ -478,12 +470,12 @@ GetConsoleAliasesW (LPWSTR AliasBuffer,
{ {
CSR_API_MESSAGE Request; CSR_API_MESSAGE Request;
ULONG CsrRequest; ULONG CsrRequest;
NTSTATUS Status; NTSTATUS Status;
DWORD dwLength; DWORD dwLength;
dwLength = GetConsoleAliasesLengthW(ExeName); dwLength = GetConsoleAliasesLengthW(ExeName);
if (!dwLength || dwLength > AliasBufferLength) if (!dwLength || dwLength > AliasBufferLength)
return FALSE; return 0;
CsrRequest = MAKE_CSR_API(GET_ALL_CONSOLE_ALIASES, CSR_NATIVE); CsrRequest = MAKE_CSR_API(GET_ALL_CONSOLE_ALIASES, CSR_NATIVE);
Request.Data.GetAllConsoleAlias.AliasBuffer = AliasBuffer; Request.Data.GetAllConsoleAlias.AliasBuffer = AliasBuffer;
@ -498,7 +490,7 @@ GetConsoleAliasesW (LPWSTR AliasBuffer,
if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status))
{ {
SetLastErrorByStatus(Status); SetLastErrorByStatus(Status);
return FALSE; return 0;
} }
return Request.Data.GetAllConsoleAlias.BytesWritten / sizeof(WCHAR); return Request.Data.GetAllConsoleAlias.BytesWritten / sizeof(WCHAR);
@ -557,7 +549,7 @@ GetConsoleAliasesLengthW (LPWSTR lpExeName)
if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status))
{ {
SetLastErrorByStatus(Status); SetLastErrorByStatus(Status);
return FALSE; return 0;
} }
return Request.Data.GetAllConsoleAliasesLength.Length; return Request.Data.GetAllConsoleAliasesLength.Length;