Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[jimtabor] 34818: Turn off WH_CALLWNDPROC and WH_GETMESSAGE debug spam.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jul 26 19:56:18 2008 New Revision: 34818 URL: http://svn.reactos.org/svn/reactos?rev=34818&view=rev Log: Turn off WH_CALLWNDPROC and WH_GETMESSAGE debug spam. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Sat Jul 26 19:56:18 2008 @@ -913,10 +913,6 @@ NextObj = IntGetNextHook(HookObj); ClientInfo->phkCurrent = NextObj; // Preset next hook from list. - if (HookObj->HookId == WH_GETMESSAGE) - { - DPRINT1(" WH_GETMESSAGE, Hook %x NextHook %x \n", HookObj, NextObj); - } UserCallNextHookEx( HookObj, Code, wParam, lParam, Ansi); UserDereferenceObject(HookObj); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat Jul 26 19:56:18 2008 @@ -2114,7 +2114,7 @@ CWP.message = Msg; CWP.wParam = wParam; CWP.lParam = lParam; - DPRINT1("WH_CALLWNDPROC: Hook %x NextHook %x\n", Hook, NextObj ); + DPRINT("WH_CALLWNDPROC: Hook %x NextHook %x\n", Hook, NextObj ); lResult = co_IntCallHookProc( Hook->HookId, HC_ACTION,

16 years, 1 month

[jmorlan] 34817: Move console alias functions from csrss to win32csr, and make aliases per-console.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sat Jul 26 19:41:45 2008 New Revision: 34817 URL: http://svn.reactos.org/svn/reactos?rev=34817&view=rev Log: Move console alias functions from csrss to win32csr, and make aliases per-console. Added: trunk/reactos/subsystems/win32/csrss/win32csr/alias.c - copied, changed from r34805, trunk/reactos/subsystems/win32/csrss/api/alias.c Removed: trunk/reactos/subsystems/win32/csrss/api/alias.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/subsystems/win32/csrss/csrss.rbuild trunk/reactos/subsystems/win32/csrss/include/api.h trunk/reactos/subsystems/win32/csrss/include/conio.h trunk/reactos/subsystems/win32/csrss/init.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Sat Jul 26 19:41:45 2008 @@ -217,7 +217,7 @@ Request->Data.AddConsoleAlias.TargetLength = TargetLength; - CsrRequest = MAKE_CSR_API(ADD_CONSOLE_ALIAS, CSR_NATIVE); + CsrRequest = MAKE_CSR_API(ADD_CONSOLE_ALIAS, CSR_CONSOLE); Status = CsrClientCallServer(Request, NULL, CsrRequest, @@ -342,7 +342,7 @@ DPRINT("GetConsoleAliasW entered lpSource %S lpExeName %S\n", lpSource, lpExeName); - CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIAS, CSR_NATIVE); + CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIAS, CSR_CONSOLE); ExeLength = wcslen(lpExeName) + 1; SourceLength = wcslen(lpSource) + 1; @@ -458,7 +458,7 @@ return 0; } - CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIASES_EXES, CSR_NATIVE); + CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIASES_EXES, CSR_CONSOLE); CsrAllocateMessagePointer(CaptureBuffer, ExeNameBufferLength, (PVOID*)&Request.Data.GetConsoleAliasesExes.ExeNames); @@ -519,7 +519,7 @@ DPRINT("GetConsoleAliasExesLengthW entered\n"); - CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIASES_EXES_LENGTH, CSR_NATIVE); + CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIASES_EXES_LENGTH, CSR_CONSOLE); Request.Data.GetConsoleAliasesExesLength.Length = 0; @@ -575,7 +575,7 @@ if (!dwLength || dwLength > AliasBufferLength) return 0; - CsrRequest = MAKE_CSR_API(GET_ALL_CONSOLE_ALIASES, CSR_NATIVE); + CsrRequest = MAKE_CSR_API(GET_ALL_CONSOLE_ALIASES, CSR_CONSOLE); Request.Data.GetAllConsoleAlias.AliasBuffer = AliasBuffer; Request.Data.GetAllConsoleAlias.AliasBufferLength = AliasBufferLength; Request.Data.GetAllConsoleAlias.lpExeName = ExeName; @@ -639,7 +639,7 @@ DPRINT("GetConsoleAliasesLengthW entered\n"); - CsrRequest = MAKE_CSR_API(GET_ALL_CONSOLE_ALIASES_LENGTH, CSR_NATIVE); + CsrRequest = MAKE_CSR_API(GET_ALL_CONSOLE_ALIASES_LENGTH, CSR_CONSOLE); Request.Data.GetAllConsoleAliasesLength.lpExeName = lpExeName; Request.Data.GetAllConsoleAliasesLength.Length = 0; Removed: trunk/reactos/subsystems/win32/csrss/api/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/alias.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/alias.c (removed) @@ -1,552 +1,0 @@ -/* $Id: init.c 31400 2007-12-22 17:18:32Z fireball $ - * PROJECT: ReactOS CSRSS - * LICENSE: GPL - See COPYING in the top level directory - * FILE: subsystems/win32/csrss/api/alias.c - * PURPOSE: CSRSS alias support functions - * COPYRIGHT: Christoph Wittich - * Johannes Anderwald - * - */ - - -/* INCLUDES ******************************************************************/ - -#include <csrss.h> - -#define NDEBUG -#include <debug.h> - -typedef struct tagALIAS_ENTRY -{ - LPCWSTR lpSource; - LPCWSTR lpTarget; - struct tagALIAS_ENTRY * Next; -}ALIAS_ENTRY, *PALIAS_ENTRY; - - -typedef struct tagALIAS_HEADER -{ - LPCWSTR lpExeName; - PALIAS_ENTRY Data; - struct tagALIAS_HEADER * Next; - -}ALIAS_HEADER, *PALIAS_HEADER; - -static PALIAS_HEADER RootHeader = NULL; - -/* Ensure that a buffer is contained within the process's shared memory section. */ -static BOOL -ValidateBuffer(PCSRSS_PROCESS_DATA ProcessData, PVOID Buffer, ULONG Size) -{ - ULONG Offset = (BYTE *)Buffer - (BYTE *)ProcessData->CsrSectionViewBase; - if (Offset >= ProcessData->CsrSectionViewSize - || Size > (ProcessData->CsrSectionViewSize - Offset)) - { - DPRINT1("Invalid buffer %p %d; not within %p %d\n", - Buffer, Size, ProcessData->CsrSectionViewBase, ProcessData->CsrSectionViewSize); - return FALSE; - } - return TRUE; -} - -static -PALIAS_HEADER -IntFindAliasHeader(PALIAS_HEADER RootHeader, LPCWSTR lpExeName) -{ - while(RootHeader) - { - INT diff = _wcsicmp(RootHeader->lpExeName, lpExeName); - if (!diff) - return RootHeader; - - if (diff > 0) - break; - - RootHeader = RootHeader->Next; - } - return NULL; -} - -PALIAS_HEADER -IntCreateAliasHeader(LPCWSTR lpExeName) -{ - PALIAS_HEADER Entry; - UINT dwLength = wcslen(lpExeName) + 1; - - Entry = RtlAllocateHeap(CsrssApiHeap, 0, sizeof(ALIAS_HEADER) + sizeof(WCHAR) * dwLength); - if (!Entry) - return Entry; - - Entry->lpExeName = (LPCWSTR)(Entry + 1); - wcscpy((WCHAR*)Entry->lpExeName, lpExeName); - Entry->Data = NULL; - Entry->Next = NULL; - return Entry; -} - -VOID -IntInsertAliasHeader(PALIAS_HEADER * RootHeader, PALIAS_HEADER NewHeader) -{ - PALIAS_HEADER CurrentHeader; - PALIAS_HEADER LastHeader = NULL; - - if (*RootHeader == 0) - { - *RootHeader = NewHeader; - return; - } - - CurrentHeader = *RootHeader; - - while(CurrentHeader) - { - INT Diff = _wcsicmp(NewHeader->lpExeName, CurrentHeader->lpExeName); - if (Diff < 0) - { - if (!LastHeader) - *RootHeader = NewHeader; - else - LastHeader->Next = NewHeader; - - NewHeader->Next = CurrentHeader; - return; - } - LastHeader = CurrentHeader; - CurrentHeader = CurrentHeader->Next; - } - - LastHeader->Next = NewHeader; - NewHeader->Next = NULL; -} - -PALIAS_ENTRY -IntGetAliasEntry(PALIAS_HEADER Header, LPCWSTR lpSrcName) -{ - if (Header == NULL) - return NULL; - - PALIAS_ENTRY RootHeader = Header->Data; - while(RootHeader) - { - DPRINT("IntGetAliasEntry>lpSource %S\n", RootHeader->lpSource); - INT diff = _wcsicmp(RootHeader->lpSource, lpSrcName); - if (!diff) - return RootHeader; - - if (diff > 0) - break; - - RootHeader = RootHeader->Next; - } - return NULL; -} - - -VOID -IntInsertAliasEntry(PALIAS_HEADER Header, PALIAS_ENTRY NewEntry) -{ - PALIAS_ENTRY CurrentEntry; - PALIAS_ENTRY LastEntry = NULL; - - CurrentEntry = Header->Data; - - if (!CurrentEntry) - { - Header->Data = NewEntry; - NewEntry->Next = NULL; - return; - } - - while(CurrentEntry) - { - INT Diff = _wcsicmp(NewEntry->lpSource, CurrentEntry->lpSource); - if (Diff < 0) - { - if (!LastEntry) - Header->Data = NewEntry; - else - LastEntry->Next = NewEntry; - NewEntry->Next = CurrentEntry; - return; - } - LastEntry = CurrentEntry; - CurrentEntry = CurrentEntry->Next; - } - - LastEntry->Next = NewEntry; - NewEntry->Next = NULL; -} - -PALIAS_ENTRY -IntCreateAliasEntry(LPCWSTR lpSource, LPCWSTR lpTarget) -{ - UINT dwSource; - UINT dwTarget; - PALIAS_ENTRY Entry; - - dwSource = wcslen(lpSource) + 1; - dwTarget = wcslen(lpTarget) + 1; - - Entry = RtlAllocateHeap(CsrssApiHeap, 0, sizeof(ALIAS_ENTRY) + sizeof(WCHAR) * (dwSource + dwTarget)); - if (!Entry) - return Entry; - - Entry->lpSource = (LPCWSTR)(Entry + 1); - wcscpy((LPWSTR)Entry->lpSource, lpSource); - Entry->lpTarget = Entry->lpSource + dwSource; - wcscpy((LPWSTR)Entry->lpTarget, lpTarget); - Entry->Next = NULL; - - return Entry; -} - -UINT -IntGetConsoleAliasesExesLength(PALIAS_HEADER RootHeader) -{ - UINT length = 0; - - while(RootHeader) - { - length += (wcslen(RootHeader->lpExeName) + 1) * sizeof(WCHAR); - RootHeader = RootHeader->Next; - } - if (length) - length += sizeof(WCHAR); // last entry entry is terminated with 2 zero bytes - - return length; -} - -UINT -IntGetConsoleAliasesExes(PALIAS_HEADER RootHeader, LPWSTR TargetBuffer, UINT TargetBufferSize) -{ - UINT Offset = 0; - UINT Length; - - TargetBufferSize /= sizeof(WCHAR); - while(RootHeader) - { - Length = wcslen(RootHeader->lpExeName) + 1; - if (TargetBufferSize > Offset + Length) - { - wcscpy(&TargetBuffer[Offset], RootHeader->lpExeName); - Offset += Length; - } - else - { - break; - } - RootHeader = RootHeader->Next; - } - Length = min(Offset+1, TargetBufferSize); - TargetBuffer[Length] = L'\0'; - return Length * sizeof(WCHAR); -} - -UINT -IntGetAllConsoleAliasesLength(PALIAS_HEADER Header) -{ - UINT Length = 0; - PALIAS_ENTRY CurEntry = Header->Data; - - while(CurEntry) - { - Length += wcslen(CurEntry->lpSource); - Length += wcslen(CurEntry->lpTarget); - Length += 2; // zero byte and '=' - CurEntry = CurEntry->Next; - } - - if (Length) - { - return (Length+1) * sizeof(WCHAR); - } - return 0; -} -UINT -IntGetAllConsoleAliases(PALIAS_HEADER Header, LPWSTR TargetBuffer, UINT TargetBufferLength) -{ - PALIAS_ENTRY CurEntry = Header->Data; - UINT Offset = 0; - UINT SrcLength, TargetLength; - - TargetBufferLength /= sizeof(WCHAR); - while(CurEntry) - { - SrcLength = wcslen(CurEntry->lpSource) + 1; - TargetLength = wcslen(CurEntry->lpTarget) + 1; - if (Offset + TargetLength + SrcLength >= TargetBufferLength) - break; - - wcscpy(&TargetBuffer[Offset], CurEntry->lpSource); - Offset += SrcLength; - TargetBuffer[Offset] = L'='; - wcscpy(&TargetBuffer[Offset], CurEntry->lpTarget); - Offset += TargetLength; - - CurEntry = CurEntry->Next; - } - TargetBuffer[Offset] = L'\0'; - return Offset * sizeof(WCHAR); -} -VOID -IntDeleteAliasEntry(PALIAS_HEADER Header, PALIAS_ENTRY Entry) -{ - PALIAS_ENTRY LastEntry; - PALIAS_ENTRY CurEntry; - - if (Header->Data == Entry) - { - Header->Data = Entry->Next; - RtlFreeHeap(CsrssApiHeap, 0, Entry); - return; - } - LastEntry = Header->Data; - CurEntry = LastEntry->Next; - - while(CurEntry) - { - if (CurEntry == Entry) - { - LastEntry->Next = Entry->Next; - RtlFreeHeap(CsrssApiHeap, 0, Entry); - return; - } - LastEntry = CurEntry; - CurEntry = CurEntry->Next; - } -} - -CSR_API(CsrAddConsoleAlias) -{ - PALIAS_HEADER Header; - PALIAS_ENTRY Entry; - WCHAR * lpExeName; - WCHAR * lpSource; - WCHAR * lpTarget; - ULONG TotalLength; - WCHAR * Ptr; - - TotalLength = Request->Data.AddConsoleAlias.SourceLength + Request->Data.AddConsoleAlias.ExeLength + Request->Data.AddConsoleAlias.TargetLength; - Ptr = (WCHAR*)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE)); - - lpSource = (WCHAR*)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE)); - lpExeName = (WCHAR*)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE) + Request->Data.AddConsoleAlias.SourceLength * sizeof(WCHAR)); - lpTarget = (Request->Data.AddConsoleAlias.TargetLength != 0 ? lpExeName + Request->Data.AddConsoleAlias.ExeLength : NULL); - - DPRINT("CsrAddConsoleAlias entered Request %p lpSource %p lpExeName %p lpTarget %p\n", Request, lpSource, lpExeName, lpTarget); - - if (lpExeName == NULL || lpSource == NULL) - { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } - - Header = IntFindAliasHeader(RootHeader, lpExeName); - if (!Header && lpTarget != NULL) - { - Header = IntCreateAliasHeader(lpExeName); - if (!Header) - { - Request->Status = STATUS_INSUFFICIENT_RESOURCES; - return Request->Status; - } - IntInsertAliasHeader(&RootHeader, Header); - } - - if (lpTarget == NULL) // delete the entry - { - Entry = IntGetAliasEntry(Header, lpSource); - if (Entry) - { - IntDeleteAliasEntry(Header, Entry); - Request->Status = STATUS_SUCCESS; - } - else - { - Request->Status = STATUS_INVALID_PARAMETER; - } - return Request->Status; - } - - Entry = IntCreateAliasEntry(lpSource, lpTarget); - - if (!Entry) - { - Request->Status = STATUS_INSUFFICIENT_RESOURCES; - return Request->Status; - } - - IntInsertAliasEntry(Header, Entry); - Request->Status = STATUS_SUCCESS; - return Request->Status; -} - -CSR_API(CsrGetConsoleAlias) -{ - PALIAS_HEADER Header; - PALIAS_ENTRY Entry; - UINT Length; - WCHAR * lpExeName; - WCHAR * lpSource; - WCHAR * lpTarget; - - lpSource = (LPWSTR)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE)); - lpExeName = lpSource + Request->Data.GetConsoleAlias.SourceLength; - lpTarget = Request->Data.GetConsoleAlias.TargetBuffer; - - - DPRINT("CsrGetConsoleAlias entered lpExeName %p lpSource %p TargetBuffer %p TargetBufferLength %u\n", - lpExeName, lpSource, lpTarget, Request->Data.GetConsoleAlias.TargetBufferLength); - - if (Request->Data.GetConsoleAlias.ExeLength == 0 || lpTarget == NULL || - Request->Data.GetConsoleAlias.TargetBufferLength == 0 || Request->Data.GetConsoleAlias.SourceLength == 0) - { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } - - Header = IntFindAliasHeader(RootHeader, lpExeName); - if (!Header) - { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } - - Entry = IntGetAliasEntry(Header, lpSource); - if (!Entry) - { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } - - Length = (wcslen(Entry->lpTarget)+1) * sizeof(WCHAR); - if (Length > Request->Data.GetConsoleAlias.TargetBufferLength) - { - Request->Status = STATUS_BUFFER_TOO_SMALL; - return Request->Status; - } - - if (!ValidateBuffer(ProcessData, lpTarget, Request->Data.GetConsoleAlias.TargetBufferLength)) - { - Request->Status = STATUS_ACCESS_VIOLATION; - return Request->Status; - } - - wcscpy(lpTarget, Entry->lpTarget); - Request->Data.GetConsoleAlias.BytesWritten = Length; - Request->Status = STATUS_SUCCESS; - return Request->Status; -} - -CSR_API(CsrGetAllConsoleAliases) -{ - ULONG BytesWritten; - PALIAS_HEADER Header; - - if (Request->Data.GetAllConsoleAlias.lpExeName == NULL) - { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } - - Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAlias.lpExeName); - if (!Header) - { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } - - if (IntGetAllConsoleAliasesLength(Header) > Request->Data.GetAllConsoleAlias.AliasBufferLength) - { - Request->Status = STATUS_BUFFER_OVERFLOW; - return Request->Status; - } - - if (!ValidateBuffer(ProcessData, - Request->Data.GetAllConsoleAlias.AliasBuffer, - Request->Data.GetAllConsoleAlias.AliasBufferLength)) - { - Request->Status = STATUS_ACCESS_VIOLATION; - return Request->Status; - } - - BytesWritten = IntGetAllConsoleAliases(Header, - Request->Data.GetAllConsoleAlias.AliasBuffer, - Request->Data.GetAllConsoleAlias.AliasBufferLength); - - Request->Data.GetAllConsoleAlias.BytesWritten = BytesWritten; - Request->Status = STATUS_SUCCESS; - return Request->Status; -} - -CSR_API(CsrGetAllConsoleAliasesLength) -{ - PALIAS_HEADER Header; - UINT Length; - - if (Request->Data.GetAllConsoleAliasesLength.lpExeName == NULL) - { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } - - Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAliasesLength.lpExeName); - if (!Header) - { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } - - Length = IntGetAllConsoleAliasesLength(Header); - Request->Data.GetAllConsoleAliasesLength.Length = Length; - Request->Status = STATUS_SUCCESS; - return Request->Status; - -} - -CSR_API(CsrGetConsoleAliasesExes) -{ - UINT BytesWritten; - UINT ExesLength; - - DPRINT("CsrGetConsoleAliasesExes entered\n"); - - ExesLength = IntGetConsoleAliasesExesLength(RootHeader); - - if (ExesLength > Request->Data.GetConsoleAliasesExes.Length) - { - Request->Status = STATUS_BUFFER_OVERFLOW; - return Request->Status; - } - - if (Request->Data.GetConsoleAliasesExes.ExeNames == NULL) - { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } - - if (!ValidateBuffer(ProcessData, - Request->Data.GetConsoleAliasesExes.ExeNames, - Request->Data.GetConsoleAliasesExes.Length)) - { - Request->Status = STATUS_ACCESS_VIOLATION; - return Request->Status; - } - - BytesWritten = IntGetConsoleAliasesExes(RootHeader, - Request->Data.GetConsoleAliasesExes.ExeNames, - Request->Data.GetConsoleAliasesExes.Length); - - Request->Data.GetConsoleAliasesExes.BytesWritten = BytesWritten; - Request->Status = STATUS_SUCCESS; - return Request->Status; -} - -CSR_API(CsrGetConsoleAliasesExesLength) -{ - DPRINT("CsrGetConsoleAliasesExesLength entered\n"); - - Request->Status = STATUS_SUCCESS; - Request->Data.GetConsoleAliasesExesLength.Length = IntGetConsoleAliasesExesLength(RootHeader); - return Request->Status; -} Modified: trunk/reactos/subsystems/win32/csrss/csrss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.rbuild [iso-8859-1] Sat Jul 26 19:41:45 2008 @@ -17,7 +17,6 @@ <file>process.c</file> <file>user.c</file> <file>wapi.c</file> - <file>alias.c</file> </directory> <pch>csrss.h</pch> <file>csrss.c</file> Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Sat Jul 26 19:41:45 2008 @@ -156,13 +156,6 @@ CSR_API(CsrSetLogonNotifyWindow); CSR_API(CsrRegisterLogonProcess); -CSR_API(CsrAddConsoleAlias); -CSR_API(CsrGetConsoleAlias); -CSR_API(CsrGetAllConsoleAliases); -CSR_API(CsrGetAllConsoleAliasesLength); -CSR_API(CsrGetConsoleAliasesExes); -CSR_API(CsrGetConsoleAliasesExesLength); - #endif /* ndef API_H_INCLUDED */ Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/conio.h [iso-8859-1] Sat Jul 26 19:41:45 2008 @@ -83,8 +83,10 @@ UINT OutputCodePage; PCSRSS_CONSOLE_VTBL Vtbl; LIST_ENTRY ProcessList; + struct tagALIAS_HEADER *Aliases; } CSRSS_CONSOLE; +NTSTATUS FASTCALL ConioConsoleFromProcessData(PCSRSS_PROCESS_DATA ProcessData, PCSRSS_CONSOLE *Console); VOID STDCALL ConioDeleteConsole(Object_t *Object); VOID STDCALL ConioDeleteScreenBuffer(Object_t *Buffer); void STDCALL ConioProcessKey(MSG *msg, PCSRSS_CONSOLE Console, BOOL TextMode); @@ -162,6 +164,16 @@ Win32CsrUnlockObject((Object_t *) Buff) #define ConioChangeIcon(Console, hWindowIcon) (Console)->Vtbl->ChangeIcon(Console, hWindowIcon) +/* alias.c */ +VOID IntDeleteAllAliases(struct tagALIAS_HEADER *RootHeader); +CSR_API(CsrAddConsoleAlias); +CSR_API(CsrGetConsoleAlias); +CSR_API(CsrGetAllConsoleAliases); +CSR_API(CsrGetAllConsoleAliasesLength); +CSR_API(CsrGetConsoleAliasesExes); +CSR_API(CsrGetConsoleAliasesExesLength); + + #endif /* CONIO_H_INCLUDED */ /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/init.c [iso-8859-1] Sat Jul 26 19:41:45 2008 @@ -294,12 +294,6 @@ CSRSS_DEFINE_API(VERIFY_HANDLE, CsrVerifyHandle), CSRSS_DEFINE_API(DUPLICATE_HANDLE, CsrDuplicateHandle), CSRSS_DEFINE_API(GET_INPUT_WAIT_HANDLE, CsrGetInputWaitHandle), - CSRSS_DEFINE_API(ADD_CONSOLE_ALIAS, CsrAddConsoleAlias), - CSRSS_DEFINE_API(GET_CONSOLE_ALIAS, CsrGetConsoleAlias), - CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES, CsrGetAllConsoleAliases), - CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES_LENGTH, CsrGetAllConsoleAliasesLength), - CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES, CsrGetConsoleAliasesExes), - CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES_LENGTH, CsrGetConsoleAliasesExesLength), { 0, 0, NULL } }; Copied: trunk/reactos/subsystems/win32/csrss/win32csr/alias.c (from r34805, trunk/reactos/subsystems/win32/csrss/api/alias.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/alias.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] Sat Jul 26 19:41:45 2008 @@ -11,7 +11,7 @@ /* INCLUDES ******************************************************************/ -#include <csrss.h> +#include "w32csr.h" #define NDEBUG #include <debug.h> @@ -32,8 +32,6 @@ }ALIAS_HEADER, *PALIAS_HEADER; -static PALIAS_HEADER RootHeader = NULL; - /* Ensure that a buffer is contained within the process's shared memory section. */ static BOOL ValidateBuffer(PCSRSS_PROCESS_DATA ProcessData, PVOID Buffer, ULONG Size) @@ -73,7 +71,7 @@ PALIAS_HEADER Entry; UINT dwLength = wcslen(lpExeName) + 1; - Entry = RtlAllocateHeap(CsrssApiHeap, 0, sizeof(ALIAS_HEADER) + sizeof(WCHAR) * dwLength); + Entry = RtlAllocateHeap(Win32CsrApiHeap, 0, sizeof(ALIAS_HEADER) + sizeof(WCHAR) * dwLength); if (!Entry) return Entry; @@ -187,7 +185,7 @@ dwSource = wcslen(lpSource) + 1; dwTarget = wcslen(lpTarget) + 1; - Entry = RtlAllocateHeap(CsrssApiHeap, 0, sizeof(ALIAS_ENTRY) + sizeof(WCHAR) * (dwSource + dwTarget)); + Entry = RtlAllocateHeap(Win32CsrApiHeap, 0, sizeof(ALIAS_ENTRY) + sizeof(WCHAR) * (dwSource + dwTarget)); if (!Entry) return Entry; @@ -297,7 +295,7 @@ if (Header->Data == Entry) { Header->Data = Entry->Next; - RtlFreeHeap(CsrssApiHeap, 0, Entry); + RtlFreeHeap(Win32CsrApiHeap, 0, Entry); return; } LastEntry = Header->Data; @@ -308,16 +306,33 @@ if (CurEntry == Entry) { LastEntry->Next = Entry->Next; - RtlFreeHeap(CsrssApiHeap, 0, Entry); + RtlFreeHeap(Win32CsrApiHeap, 0, Entry); return; } LastEntry = CurEntry; CurEntry = CurEntry->Next; } } +VOID +IntDeleteAllAliases(PALIAS_HEADER RootHeader) +{ + PALIAS_HEADER Header, NextHeader; + PALIAS_ENTRY Entry, NextEntry; + for (Header = RootHeader; Header; Header = NextHeader) + { + NextHeader = Header->Next; + for (Entry = Header->Data; Entry; Entry = NextEntry) + { + NextEntry = Entry->Next; + RtlFreeHeap(Win32CsrApiHeap, 0, Entry); + } + RtlFreeHeap(Win32CsrApiHeap, 0, Header); + } +} CSR_API(CsrAddConsoleAlias) { + PCSRSS_CONSOLE Console; PALIAS_HEADER Header; PALIAS_ENTRY Entry; WCHAR * lpExeName; @@ -341,16 +356,23 @@ return Request->Status; } - Header = IntFindAliasHeader(RootHeader, lpExeName); + Request->Status = ConioConsoleFromProcessData(ProcessData, &Console); + if (!NT_SUCCESS(Request->Status)) + { + return Request->Status; + } + + Header = IntFindAliasHeader(Console->Aliases, lpExeName); if (!Header && lpTarget != NULL) { Header = IntCreateAliasHeader(lpExeName); if (!Header) { Request->Status = STATUS_INSUFFICIENT_RESOURCES; + ConioUnlockConsole(Console); return Request->Status; } - IntInsertAliasHeader(&RootHeader, Header); + IntInsertAliasHeader(&Console->Aliases, Header); } if (lpTarget == NULL) // delete the entry @@ -365,6 +387,7 @@ { Request->Status = STATUS_INVALID_PARAMETER; } + ConioUnlockConsole(Console); return Request->Status; } @@ -373,16 +396,19 @@ if (!Entry) { Request->Status = STATUS_INSUFFICIENT_RESOURCES; + ConioUnlockConsole(Console); return Request->Status; } IntInsertAliasEntry(Header, Entry); Request->Status = STATUS_SUCCESS; + ConioUnlockConsole(Console); return Request->Status; } CSR_API(CsrGetConsoleAlias) { + PCSRSS_CONSOLE Console; PALIAS_HEADER Header; PALIAS_ENTRY Entry; UINT Length; @@ -405,10 +431,17 @@ return Request->Status; } - Header = IntFindAliasHeader(RootHeader, lpExeName); + Request->Status = ConioConsoleFromProcessData(ProcessData, &Console); + if (!NT_SUCCESS(Request->Status)) + { + return Request->Status; + } + + Header = IntFindAliasHeader(Console->Aliases, lpExeName); if (!Header) { Request->Status = STATUS_INVALID_PARAMETER; + ConioUnlockConsole(Console); return Request->Status; } @@ -416,6 +449,7 @@ if (!Entry) { Request->Status = STATUS_INVALID_PARAMETER; + ConioUnlockConsole(Console); return Request->Status; } @@ -423,23 +457,27 @@ if (Length > Request->Data.GetConsoleAlias.TargetBufferLength) { Request->Status = STATUS_BUFFER_TOO_SMALL; + ConioUnlockConsole(Console); return Request->Status; } if (!ValidateBuffer(ProcessData, lpTarget, Request->Data.GetConsoleAlias.TargetBufferLength)) { Request->Status = STATUS_ACCESS_VIOLATION; + ConioUnlockConsole(Console); return Request->Status; } wcscpy(lpTarget, Entry->lpTarget); Request->Data.GetConsoleAlias.BytesWritten = Length; Request->Status = STATUS_SUCCESS; + ConioUnlockConsole(Console); return Request->Status; } CSR_API(CsrGetAllConsoleAliases) { + PCSRSS_CONSOLE Console; ULONG BytesWritten; PALIAS_HEADER Header; @@ -449,16 +487,24 @@ return Request->Status; } - Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAlias.lpExeName); + Request->Status = ConioConsoleFromProcessData(ProcessData, &Console); + if (!NT_SUCCESS(Request->Status)) + { + return Request->Status; + } + + Header = IntFindAliasHeader(Console->Aliases, Request->Data.GetAllConsoleAlias.lpExeName); if (!Header) { Request->Status = STATUS_INVALID_PARAMETER; + ConioUnlockConsole(Console); return Request->Status; } if (IntGetAllConsoleAliasesLength(Header) > Request->Data.GetAllConsoleAlias.AliasBufferLength) { Request->Status = STATUS_BUFFER_OVERFLOW; + ConioUnlockConsole(Console); return Request->Status; } @@ -467,6 +513,7 @@ Request->Data.GetAllConsoleAlias.AliasBufferLength)) { Request->Status = STATUS_ACCESS_VIOLATION; + ConioUnlockConsole(Console); return Request->Status; } @@ -476,11 +523,13 @@ Request->Data.GetAllConsoleAlias.BytesWritten = BytesWritten; Request->Status = STATUS_SUCCESS; + ConioUnlockConsole(Console); return Request->Status; } CSR_API(CsrGetAllConsoleAliasesLength) { + PCSRSS_CONSOLE Console; PALIAS_HEADER Header; UINT Length; @@ -490,38 +539,55 @@ return Request->Status; } - Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAliasesLength.lpExeName); + Request->Status = ConioConsoleFromProcessData(ProcessData, &Console); + if (!NT_SUCCESS(Request->Status)) + { + return Request->Status; + } + + Header = IntFindAliasHeader(Console->Aliases, Request->Data.GetAllConsoleAliasesLength.lpExeName); if (!Header) { Request->Status = STATUS_INVALID_PARAMETER; + ConioUnlockConsole(Console); return Request->Status; } Length = IntGetAllConsoleAliasesLength(Header); Request->Data.GetAllConsoleAliasesLength.Length = Length; Request->Status = STATUS_SUCCESS; + ConioUnlockConsole(Console); return Request->Status; } CSR_API(CsrGetConsoleAliasesExes) { + PCSRSS_CONSOLE Console; UINT BytesWritten; UINT ExesLength; DPRINT("CsrGetConsoleAliasesExes entered\n"); - ExesLength = IntGetConsoleAliasesExesLength(RootHeader); + Request->Status = ConioConsoleFromProcessData(ProcessData, &Console); + if (!NT_SUCCESS(Request->Status)) + { + return Request->Status; + } + + ExesLength = IntGetConsoleAliasesExesLength(Console->Aliases); if (ExesLength > Request->Data.GetConsoleAliasesExes.Length) { Request->Status = STATUS_BUFFER_OVERFLOW; + ConioUnlockConsole(Console); return Request->Status; } if (Request->Data.GetConsoleAliasesExes.ExeNames == NULL) { Request->Status = STATUS_INVALID_PARAMETER; + ConioUnlockConsole(Console); return Request->Status; } @@ -530,23 +596,30 @@ Request->Data.GetConsoleAliasesExes.Length)) { Request->Status = STATUS_ACCESS_VIOLATION; - return Request->Status; - } - - BytesWritten = IntGetConsoleAliasesExes(RootHeader, + ConioUnlockConsole(Console); + return Request->Status; + } + + BytesWritten = IntGetConsoleAliasesExes(Console->Aliases, Request->Data.GetConsoleAliasesExes.ExeNames, Request->Data.GetConsoleAliasesExes.Length); Request->Data.GetConsoleAliasesExes.BytesWritten = BytesWritten; Request->Status = STATUS_SUCCESS; + ConioUnlockConsole(Console); return Request->Status; } CSR_API(CsrGetConsoleAliasesExesLength) { + PCSRSS_CONSOLE Console; DPRINT("CsrGetConsoleAliasesExesLength entered\n"); - Request->Status = STATUS_SUCCESS; - Request->Data.GetConsoleAliasesExesLength.Length = IntGetConsoleAliasesExesLength(RootHeader); + Request->Status = ConioConsoleFromProcessData(ProcessData, &Console); + if (NT_SUCCESS(Request->Status)) + { + Request->Data.GetConsoleAliasesExesLength.Length = IntGetConsoleAliasesExesLength(Console->Aliases); + ConioUnlockConsole(Console); + } return Request->Status; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Sat Jul 26 19:41:45 2008 @@ -36,7 +36,7 @@ /* FUNCTIONS *****************************************************************/ -static NTSTATUS FASTCALL +NTSTATUS FASTCALL ConioConsoleFromProcessData(PCSRSS_PROCESS_DATA ProcessData, PCSRSS_CONSOLE *Console) { PCSRSS_CONSOLE ProcessConsole = ProcessData->Console; @@ -961,6 +961,7 @@ CloseHandle(Console->ActiveEvent); DeleteCriticalSection(&Console->Header.Lock); RtlFreeUnicodeString(&Console->Title); + IntDeleteAllAliases(Console->Aliases); HeapFree(Win32CsrApiHeap, 0, Console); } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sat Jul 26 19:41:45 2008 @@ -68,6 +68,12 @@ CSRSS_DEFINE_API(GET_CONSOLE_OUTPUT_CP, CsrGetConsoleOutputCodePage), CSRSS_DEFINE_API(SET_CONSOLE_OUTPUT_CP, CsrSetConsoleOutputCodePage), CSRSS_DEFINE_API(GET_PROCESS_LIST, CsrGetProcessList), + CSRSS_DEFINE_API(ADD_CONSOLE_ALIAS, CsrAddConsoleAlias), + CSRSS_DEFINE_API(GET_CONSOLE_ALIAS, CsrGetConsoleAlias), + CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES, CsrGetAllConsoleAliases), + CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES_LENGTH, CsrGetAllConsoleAliasesLength), + CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES, CsrGetConsoleAliasesExes), + CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES_LENGTH, CsrGetConsoleAliasesExesLength), { 0, 0, NULL } }; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Sat Jul 26 19:41:45 2008 @@ -17,6 +17,7 @@ <library>psapi</library> <library>msvcrt</library> <pch>w32csr.h</pch> + <file>alias.c</file> <file>conio.c</file> <file>desktopbg.c</file> <file>dllmain.c</file>

16 years, 1 month

[jmorlan] 34816: - In cmd, add ConOutResPrintf and ConErrResPrintf functions for printf-ing from a resource string; use it to shorten several instances of LoadString+Con*Printf. - Also change FilePromptYN and FilePromptYNA to take a resource ID. Remove varargs code which nobody used (and didn't actually work anyway)

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sat Jul 26 17:49:49 2008 New Revision: 34816 URL: http://svn.reactos.org/svn/reactos?rev=34816&view=rev Log: - In cmd, add ConOutResPrintf and ConErrResPrintf functions for printf-ing from a resource string; use it to shorten several instances of LoadString+Con*Printf. - Also change FilePromptYN and FilePromptYNA to take a resource ID. Remove varargs code which nobody used (and didn't actually work anyway) Modified: trunk/reactos/base/shell/cmd/chcp.c trunk/reactos/base/shell/cmd/choice.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/color.c trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/copy.c trunk/reactos/base/shell/cmd/date.c trunk/reactos/base/shell/cmd/del.c trunk/reactos/base/shell/cmd/echo.c trunk/reactos/base/shell/cmd/error.c trunk/reactos/base/shell/cmd/free.c trunk/reactos/base/shell/cmd/goto.c trunk/reactos/base/shell/cmd/internal.c trunk/reactos/base/shell/cmd/label.c trunk/reactos/base/shell/cmd/memory.c trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/move.c trunk/reactos/base/shell/cmd/path.c trunk/reactos/base/shell/cmd/ren.c trunk/reactos/base/shell/cmd/replace.c trunk/reactos/base/shell/cmd/set.c trunk/reactos/base/shell/cmd/timer.c trunk/reactos/base/shell/cmd/type.c trunk/reactos/base/shell/cmd/ver.c trunk/reactos/base/shell/cmd/verify.c trunk/reactos/base/shell/cmd/vol.c Modified: trunk/reactos/base/shell/cmd/chcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/chcp.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/chcp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/chcp.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -19,7 +19,6 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR *arg; INT args; UINT uNewCodePage; @@ -39,8 +38,7 @@ if (args == 0) { /* display active code page number */ - LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, InputCodePage); + ConErrResPrintf(STRING_CHCP_ERROR1, InputCodePage); freep (arg); return 0; } @@ -48,8 +46,7 @@ if (args >= 2) { /* too many parameters */ - LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, param); + ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, param); nErrorLevel = 1; freep (arg); return 1; @@ -59,8 +56,7 @@ if (uNewCodePage == 0) { - LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, arg[0]); + ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, arg[0]); freep (arg); nErrorLevel = 1; return 1; Modified: trunk/reactos/base/shell/cmd/choice.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/choice.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/choice.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/choice.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -102,7 +102,6 @@ INT CommandChoice (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR lpOptions; TCHAR Options[6]; LPTSTR lpText = NULL; @@ -208,8 +207,7 @@ } else if (arg[i][0] == _T('/')) { - LoadString(CMD_ModuleHandle, STRING_CHOICE_ERROR_OPTION, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, arg[i]); + ConErrResPrintf(STRING_CHOICE_ERROR_OPTION, arg[i]); freep (arg); return 1; } Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -687,7 +687,6 @@ VOID ParseCommandLine (LPTSTR cmd) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR cmdline[CMDLINE_LENGTH]; LPTSTR s; #ifdef FEATURE_REDIRECTION @@ -786,15 +785,13 @@ FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, in); + ConErrResPrintf(STRING_CMD_ERROR1, in); return; } if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, in); + ConErrResPrintf(STRING_CMD_ERROR1, in); return; } TRACE ("Input redirected from: %s\n", debugstr_aw(in)); @@ -820,8 +817,7 @@ if (hFile[1] == INVALID_HANDLE_VALUE) { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR2, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); + ConErrResPrintf(STRING_CMD_ERROR2); return; } @@ -884,8 +880,7 @@ if (out[size] != _T(':')) { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, out); + ConErrResPrintf(STRING_CMD_ERROR3, out); return; } @@ -896,8 +891,7 @@ if (hFile == INVALID_HANDLE_VALUE) { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, out); + ConErrResPrintf(STRING_CMD_ERROR3, out); return; } @@ -905,8 +899,7 @@ if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile)) { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, out); + ConErrResPrintf(STRING_CMD_ERROR3, out); return; } @@ -955,16 +948,14 @@ NULL); if (hFile == INVALID_HANDLE_VALUE) { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, err); + ConErrResPrintf(STRING_CMD_ERROR3, err); return; } } if (!SetStdHandle (STD_ERROR_HANDLE, hFile)) { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, err); + ConErrResPrintf(STRING_CMD_ERROR3, err); return; } Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -161,6 +161,8 @@ VOID ConOutResPuts (UINT resID); VOID ConErrResPuts (UINT resID); +VOID ConOutResPrintf (UINT resID, ...); +VOID ConErrResPrintf (UINT resID, ...); VOID ConOutResPaging(BOOL NewPage, UINT resID); /* Prototypes for COPY.C */ @@ -311,8 +313,8 @@ #define PROMPT_BREAK 3 INT PagePrompt (VOID); -INT FilePromptYN (LPTSTR, ...); -INT FilePromptYNA (LPTSTR, ...); +INT FilePromptYN (UINT); +INT FilePromptYNA (UINT); /* Prototypes for MOVE.C */ Modified: trunk/reactos/base/shell/cmd/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/color.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/color.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/color.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -65,8 +65,6 @@ */ INT CommandColor (LPTSTR first, LPTSTR rest) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - if (_tcsncmp (rest, _T("/?"), 2) == 0) { ConOutResPaging(TRUE,STRING_COLOR_HELP1); @@ -115,14 +113,12 @@ if (((bc) && (bc->bEcho)) || !bc) { - LoadString(CMD_ModuleHandle, STRING_COLOR_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, wColor); + ConErrResPrintf(STRING_COLOR_ERROR3, wColor); } if ((wColor & 0xF) == (wColor &0xF0) >> 4) { - LoadString(CMD_ModuleHandle, STRING_COLOR_ERROR4, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, wColor); + ConErrResPrintf(STRING_COLOR_ERROR4, wColor); nErrorLevel = 1; return 1; } Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -382,6 +382,17 @@ } } +VOID ConOutResPrintf (UINT resID, ...) +{ + TCHAR szMsg[RC_STRING_MAX_SIZE]; + va_list arg_ptr; + + va_start (arg_ptr, resID); + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + ConPrintf(szMsg, arg_ptr, STD_OUTPUT_HANDLE); + va_end (arg_ptr); +} + VOID ConOutPrintf (LPTSTR szFormat, ...) { va_list arg_ptr; @@ -420,6 +431,17 @@ ConPuts(szText, STD_ERROR_HANDLE); } + +VOID ConErrResPrintf (UINT resID, ...) +{ + TCHAR szMsg[RC_STRING_MAX_SIZE]; + va_list arg_ptr; + + va_start (arg_ptr, resID); + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + ConPrintf(szMsg, arg_ptr, STD_ERROR_HANDLE); + va_end (arg_ptr); +} VOID ConErrPrintf (LPTSTR szFormat, ...) { Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -54,7 +54,6 @@ DWORD lpdwFlags, BOOL bTouch) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; FILETIME srctime,NewFileTime; HANDLE hFileSrc; HANDLE hFileDest; @@ -80,8 +79,7 @@ NULL, OPEN_EXISTING, 0, NULL); if (hFileSrc == INVALID_HANDLE_VALUE) { - LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, source); + ConOutResPrintf(STRING_COPY_ERROR1, source); nErrorLevel = 1; return 0; } @@ -108,8 +106,7 @@ NULL, OPEN_EXISTING, 0, NULL); if (hFileSrc == INVALID_HANDLE_VALUE) { - LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, source); + ConOutResPrintf(STRING_COPY_ERROR1, source); nErrorLevel = 1; return 0; } @@ -286,18 +283,15 @@ static INT CopyOverwrite (LPTSTR fn) { /*ask the user if they want to override*/ - TCHAR szMsg[RC_STRING_MAX_SIZE]; INT res; - LoadString(CMD_ModuleHandle, STRING_COPY_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg,fn); - res = FilePromptYNA (_T("")); + ConOutResPrintf(STRING_COPY_HELP1, fn); + res = FilePromptYNA (0); return res; } INT cmd_copy (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR *arg; INT argc, i, nFiles, nOverwrite = 0, nSrc = -1, nDes = -1; /* this is the path up to the folder of the src and dest ie C:\windows\ */ @@ -462,8 +456,7 @@ default: /* Invalid switch */ - LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_SWITCH, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, _totupper(arg[i][1])); + ConOutResPrintf(STRING_ERROR_INVALID_SWITCH, _totupper(arg[i][1])); nErrorLevel = 1; freep (arg); return 1; @@ -524,8 +517,7 @@ if(nFiles > 2) { /* There are too many file names in command */ - LoadString(CMD_ModuleHandle, STRING_ERROR_TOO_MANY_PARAMETERS, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg,_T("")); + ConErrResPrintf(STRING_ERROR_TOO_MANY_PARAMETERS,_T("")); nErrorLevel = 1; freep (arg); return 1; @@ -604,8 +596,7 @@ szTouch = _tcsstr (arg[nSrc], _T("+")); if(_tcsncmp (szTouch,_T("+,,\0"),4) || nDes != -1) { - LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg,arg[nSrc]); + ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT,arg[nSrc]); nErrorLevel = 1; freep (arg); return 1; @@ -794,8 +785,7 @@ /* Check to see if the file is the same file */ if(!bTouch && !_tcscmp (tmpSrcPath, tmpDestPath)) { - LoadString(CMD_ModuleHandle, STRING_COPY_ERROR2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg); + ConOutResPrintf(STRING_COPY_ERROR2); nErrorLevel = 1; break; @@ -821,8 +811,7 @@ else { /* print out the error message */ - LoadString(CMD_ModuleHandle, STRING_COPY_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg); + ConOutResPrintf(STRING_COPY_ERROR3); ConOutFormatMessage (GetLastError(), szSrcPath); nErrorLevel = 1; } @@ -834,8 +823,7 @@ } while(!bDone); /* print out the number of files copied */ - LoadString(CMD_ModuleHandle, STRING_COPY_FILE, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, nFiles); + ConOutResPrintf(STRING_COPY_FILE, nFiles); FindClose(hFile); Modified: trunk/reactos/base/shell/cmd/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/date.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/date.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/date.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -46,24 +46,19 @@ static VOID PrintDateString (VOID) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - switch (nDateFormat) { case 0: /* mmddyy */ default: - LoadString(CMD_ModuleHandle, STRING_DATE_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, cDateSeparator, cDateSeparator); + ConOutResPrintf(STRING_DATE_HELP1, cDateSeparator, cDateSeparator); break; case 1: /* ddmmyy */ - LoadString(CMD_ModuleHandle, STRING_DATE_HELP2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, cDateSeparator, cDateSeparator); + ConOutResPrintf(STRING_DATE_HELP2, cDateSeparator, cDateSeparator); break; case 2: /* yymmdd */ - LoadString(CMD_ModuleHandle, STRING_DATE_HELP3, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, cDateSeparator, cDateSeparator); + ConOutResPrintf(STRING_DATE_HELP3, cDateSeparator, cDateSeparator); break; } } Modified: trunk/reactos/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/del.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/del.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/del.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -77,12 +77,6 @@ }; static TCHAR szDeleteWipe[RC_STRING_MAX_SIZE]; -static TCHAR szDelHelp2[RC_STRING_MAX_SIZE]; -static TCHAR szDelHelp3[RC_STRING_MAX_SIZE]; -static TCHAR szDelHelp4[RC_STRING_MAX_SIZE]; -static TCHAR szDelError5[RC_STRING_MAX_SIZE]; -static TCHAR szDelError6[RC_STRING_MAX_SIZE]; -static TCHAR szDelError7[RC_STRING_MAX_SIZE]; static TCHAR CMDPath[MAX_PATH]; static BOOLEAN StringsLoaded = FALSE; @@ -90,12 +84,6 @@ static VOID LoadStrings(VOID) { LoadString( CMD_ModuleHandle, STRING_DELETE_WIPE, szDeleteWipe, RC_STRING_MAX_SIZE); - LoadString( CMD_ModuleHandle, STRING_DEL_HELP2, szDelHelp2, RC_STRING_MAX_SIZE); - LoadString( CMD_ModuleHandle, STRING_DEL_HELP3, szDelHelp3, RC_STRING_MAX_SIZE); - LoadString( CMD_ModuleHandle, STRING_DEL_HELP4, szDelHelp4, RC_STRING_MAX_SIZE); - LoadString( CMD_ModuleHandle, STRING_DEL_ERROR5, szDelError5, RC_STRING_MAX_SIZE); - LoadString( CMD_ModuleHandle, STRING_DEL_ERROR6, szDelError6, RC_STRING_MAX_SIZE); - LoadString( CMD_ModuleHandle, STRING_DEL_ERROR7, szDelError7, RC_STRING_MAX_SIZE); GetModuleFileName(NULL, CMDPath, MAX_PATH); StringsLoaded = TRUE; } @@ -193,7 +181,7 @@ if (!((*dwFlags & DEL_YES) || (*dwFlags & DEL_QUIET) || (*dwFlags & DEL_PROMPT))) { - res = FilePromptYNA (szDelHelp2); + res = FilePromptYNA (STRING_DEL_HELP2); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) return 0x80000000; if(res == PROMPT_ALL) @@ -256,9 +244,9 @@ /* ask for deleting */ if (*dwFlags & DEL_PROMPT) { - ConErrPrintf(szDelError5, szFullPath); - - res = FilePromptYN (szDelError6); + ConErrResPrintf(STRING_DEL_ERROR5, szFullPath); + + res = FilePromptYN (STRING_DEL_ERROR6); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { @@ -270,7 +258,7 @@ /*user cant ask it to be quiet and tell you what it did*/ if (!(*dwFlags & DEL_QUIET) && !(*dwFlags & DEL_TOTAL)) { - ConErrPrintf(szDelError7, szFullPath); + ConErrResPrintf(STRING_DEL_ERROR7, szFullPath); } /* delete the file */ @@ -552,11 +540,11 @@ dwFiles &= 0x7fffffff; if (dwFiles < 2) { - ConOutPrintf(szDelHelp3, dwFiles); + ConOutResPrintf(STRING_DEL_HELP3, dwFiles); } else { - ConOutPrintf(szDelHelp4, dwFiles); + ConOutResPrintf(STRING_DEL_HELP4, dwFiles); } } Modified: trunk/reactos/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/echo.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -31,7 +31,6 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR p1, p2; TRACE ("CommandEcho '%s' : '%s'\n", debugstr_aw(cmd), debugstr_aw(param)); @@ -98,8 +97,7 @@ } else { - LoadString(CMD_ModuleHandle, STRING_ECHO_HELP5, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, bEcho ? D_ON : D_OFF); + ConOutResPrintf(STRING_ECHO_HELP5, bEcho ? D_ON : D_OFF); } } Modified: trunk/reactos/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/error.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/error.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/error.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -61,30 +61,21 @@ VOID error_parameter_format(TCHAR ch) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - - LoadString(CMD_ModuleHandle, STRING_ERROR_PARAMETERF_ERROR, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, ch); + ConErrResPrintf(STRING_ERROR_PARAMETERF_ERROR, ch); nErrorLevel = 1; } VOID error_invalid_switch (TCHAR ch) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - - LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_SWITCH, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, ch); + ConErrResPrintf(STRING_ERROR_INVALID_SWITCH, ch); nErrorLevel = 1; } VOID error_too_many_parameters (LPTSTR s) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - - LoadString(CMD_ModuleHandle, STRING_ERROR_TOO_MANY_PARAMETERS, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, s); + ConErrResPrintf(STRING_ERROR_TOO_MANY_PARAMETERS, s); nErrorLevel = 1; } Modified: trunk/reactos/base/shell/cmd/free.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/free.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/free.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/free.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -35,8 +35,7 @@ if (_tcslen (szDisk) < 2 || szDisk[1] != _T(':')) { - LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); + ConErrResPrintf(STRING_FREE_ERROR1); return; } @@ -81,8 +80,7 @@ ConvertULargeInteger (uliSize, szFree, 40, TRUE); - LoadString(CMD_ModuleHandle, STRING_FREE_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, szDrive, szVolume, szSerial, szTotal, szUsed, szFree); + ConOutResPrintf(STRING_FREE_HELP1, szDrive, szVolume, szSerial, szTotal, szUsed, szFree); } Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -124,8 +124,7 @@ } - LoadString(CMD_ModuleHandle, STRING_GOTO_ERROR2, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, param); + ConErrResPrintf(STRING_GOTO_ERROR2, param); ExitBatch(NULL); return 1; } Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -277,7 +277,6 @@ TCHAR szFinalPath[MAX_PATH]; TCHAR * tmpPath; TCHAR szCurrent[MAX_PATH]; - TCHAR szMsg[RC_STRING_MAX_SIZE]; INT i; @@ -301,8 +300,7 @@ if(!tmpPath) { /* Didnt find an directories */ - LoadString(CMD_ModuleHandle, STRING_ERROR_PATH_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); + ConErrResPrintf(STRING_ERROR_PATH_NOT_FOUND); nErrorLevel = 1; return 1; } @@ -368,8 +366,7 @@ return 0; } /* Didnt find an directories */ - LoadString(CMD_ModuleHandle, STRING_ERROR_PATH_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); + ConErrResPrintf(STRING_ERROR_PATH_NOT_FOUND); nErrorLevel = 1; return 1; @@ -414,8 +411,7 @@ }while(FindNextFile (hFile, &f)); /* Didnt find an directories */ - LoadString(CMD_ModuleHandle, STRING_ERROR_PATH_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); + ConErrResPrintf(STRING_ERROR_PATH_NOT_FOUND); nErrorLevel = 1; return 1; } @@ -589,7 +585,6 @@ HANDLE hFile; WIN32_FIND_DATA f; INT res; - TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szFullPath[MAX_PATH]; if (!_tcsncmp (param, _T("/?"), 2)) @@ -658,8 +653,7 @@ /* ask if they want to delete evrything in the folder */ if (!RD_QUIET) { - LoadString( CMD_ModuleHandle, STRING_DEL_HELP2, szMsg, RC_STRING_MAX_SIZE); - res = FilePromptYNA (szMsg); + res = FilePromptYNA (STRING_DEL_HELP2); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { freep(arg); Modified: trunk/reactos/base/shell/cmd/label.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/label.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/label.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/label.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -24,7 +24,6 @@ INT cmd_label (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szRootPath[] = _T("A:\\"); TCHAR szLabel[80]; TCHAR szOldLabel[80]; @@ -74,18 +73,15 @@ /* print drive info */ if (szOldLabel[0] != _T('\0')) { - LoadString(CMD_ModuleHandle, STRING_LABEL_HELP2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, _totupper(szRootPath[0]), szOldLabel); + ConOutResPrintf(STRING_LABEL_HELP2, _totupper(szRootPath[0]), szOldLabel); } else { - LoadString(CMD_ModuleHandle, STRING_LABEL_HELP3, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, _totupper(szRootPath[0])); + ConOutResPrintf(STRING_LABEL_HELP3, _totupper(szRootPath[0])); } /* print the volume serial number */ - LoadString(CMD_ModuleHandle, STRING_LABEL_HELP4, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); + ConOutResPrintf(STRING_LABEL_HELP4, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); if (szLabel[0] == _T('\0')) { Modified: trunk/reactos/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/memory.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/memory.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/memory.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -34,7 +34,6 @@ INT CommandMemory (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; MEMORYSTATUS ms; TCHAR szMemoryLoad[20]; TCHAR szTotalPhys[20]; @@ -62,10 +61,9 @@ ConvertDWord (ms.dwTotalVirtual, szTotalVirtual, 20, TRUE); ConvertDWord (ms.dwAvailVirtual, szAvailVirtual, 20, TRUE); - LoadString(CMD_ModuleHandle, STRING_MEMMORY_HELP2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, - szMemoryLoad, szTotalPhys, szAvailPhys, szTotalPageFile, - szAvailPageFile, szTotalVirtual, szAvailVirtual); + ConOutResPrintf(STRING_MEMMORY_HELP2, + szMemoryLoad, szTotalPhys, szAvailPhys, szTotalPageFile, + szAvailPageFile, szTotalVirtual, szAvailVirtual); return 0; } Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -519,22 +519,17 @@ } -INT FilePromptYN (LPTSTR szFormat, ...) +INT FilePromptYN (UINT resID) { TCHAR szMsg[RC_STRING_MAX_SIZE]; - TCHAR szOut[512]; - va_list arg_ptr; // TCHAR cKey = 0; // LPTSTR szKeys = _T("yna"); TCHAR szIn[10]; LPTSTR p; - va_start (arg_ptr, szFormat); - _vstprintf (szOut, szFormat, arg_ptr); - va_end (arg_ptr); - - ConOutPrintf (szFormat); + if (resID != 0) + ConOutResPrintf (resID); /* preliminary fix */ ConInString (szIn, 10); @@ -589,22 +584,17 @@ } -INT FilePromptYNA (LPTSTR szFormat, ...) +INT FilePromptYNA (UINT resID) { TCHAR szMsg[RC_STRING_MAX_SIZE]; - TCHAR szOut[512]; - va_list arg_ptr; // TCHAR cKey = 0; // LPTSTR szKeys = _T("yna"); TCHAR szIn[10]; LPTSTR p; - va_start (arg_ptr, szFormat); - _vstprintf (szOut, szFormat, arg_ptr); - va_end (arg_ptr); - - ConOutPrintf (szFormat); + if (resID != 0) + ConOutResPrintf (resID); /* preliminary fix */ ConInString (szIn, 10); Modified: trunk/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/move.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/move.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/move.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -55,11 +55,9 @@ static INT MoveOverwrite (LPTSTR fn) { /*ask the user if they want to override*/ - TCHAR szMsg[RC_STRING_MAX_SIZE]; INT res; - LoadString(CMD_ModuleHandle, STRING_MOVE_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg,fn); - res = FilePromptYNA (_T("")); + ConOutResPrintf(STRING_MOVE_HELP1, fn); + res = FilePromptYNA (0); return res; } @@ -87,7 +85,6 @@ INT cmd_move (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR *arg; INT argc, i, nFiles; TCHAR szDestPath[MAX_PATH]; @@ -519,11 +516,9 @@ } } if (MoveStatus) - LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); + ConOutResPrintf(STRING_MOVE_ERROR1); else - LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE); - - ConOutPrintf(szMsg); + ConOutResPrintf(STRING_MOVE_ERROR2); } while ((!OnlyOneFile || dwMoveStatusFlags & MOVE_SRC_CURRENT_IS_DIR ) && !(dwMoveStatusFlags & MOVE_SOURCE_IS_DIR) && Modified: trunk/reactos/base/shell/cmd/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/path.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/path.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/path.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -49,14 +49,12 @@ { DWORD dwBuffer; LPTSTR pszBuffer; - TCHAR szMsg[RC_STRING_MAX_SIZE]; pszBuffer = (LPTSTR)cmd_alloc (ENV_BUFFER_SIZE * sizeof(TCHAR)); dwBuffer = GetEnvironmentVariable (_T("PATH"), pszBuffer, ENV_BUFFER_SIZE); if (dwBuffer == 0) { - LoadString(CMD_ModuleHandle, STRING_VOL_HELP2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, _T("PATH")); + ConOutResPrintf(STRING_VOL_HELP2, _T("PATH")); return 0; } else if (dwBuffer > ENV_BUFFER_SIZE) Modified: trunk/reactos/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/ren.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ren.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -42,7 +42,6 @@ */ INT cmd_rename (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR *arg = NULL; INT args = 0; INT nEvalArgs = 0; /* nunber of evaluated arguments */ @@ -232,8 +231,7 @@ { if (!(dwFlags & REN_ERROR)) { - LoadString(CMD_ModuleHandle, STRING_REN_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, GetLastError()); + ConErrResPrintf(STRING_REN_ERROR1, GetLastError()); } } } @@ -245,10 +243,9 @@ if (!(dwFlags & REN_QUIET)) { if (dwFiles == 1) - LoadString( CMD_ModuleHandle, STRING_REN_HELP2, szMsg, RC_STRING_MAX_SIZE); + ConOutResPrintf(STRING_REN_HELP2, dwFiles); else - LoadString( CMD_ModuleHandle, STRING_REN_HELP3, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg,dwFiles); + ConOutResPrintf(STRING_REN_HELP3, dwFiles); } freep(arg); Modified: trunk/reactos/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/replace.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/replace.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/replace.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -29,10 +29,7 @@ /*just makes a print out if there is a problem with the switches*/ void invalid_switch(LPTSTR is) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - - LoadString(CMD_ModuleHandle, STRING_REPLACE_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg,is); + ConOutResPrintf(STRING_REPLACE_ERROR1,is); ConOutResPaging(TRUE,STRING_REPLACE_HELP3); } @@ -49,7 +46,6 @@ /*makes the replace*/ INT replace(TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH], DWORD dwFlags, BOOL *doMore) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR d[MAX_PATH]; TCHAR s[MAX_PATH]; HANDLE hFileSrc, hFileDest; @@ -71,8 +67,7 @@ hFileSrc = CreateFile (source, GENERIC_READ, FILE_SHARE_READ,NULL, OPEN_EXISTING, 0, NULL); if (hFileSrc == INVALID_HANDLE_VALUE) { - LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, source); + ConOutResPrintf(STRING_COPY_ERROR1, source); return 0; } @@ -99,8 +94,7 @@ if (hFileSrc == INVALID_HANDLE_VALUE) { - LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, dest); + ConOutResPrintf(STRING_COPY_ERROR1, dest); return 0; } @@ -125,20 +119,18 @@ { /* Output depending on add flag */ if(dwFlags & REPLACE_ADD) - LoadString(CMD_ModuleHandle, STRING_REPLACE_HELP9, szMsg, RC_STRING_MAX_SIZE); - else - LoadString(CMD_ModuleHandle, STRING_REPLACE_HELP10, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, dest); - if( !FilePromptYNA (_T(""))) + ConOutResPrintf(STRING_REPLACE_HELP9, dest); + else + ConOutResPrintf(STRING_REPLACE_HELP10, dest); + if( !FilePromptYNA (0)) return 0; } /* Output depending on add flag */ if(dwFlags & REPLACE_ADD) - LoadString(CMD_ModuleHandle, STRING_REPLACE_HELP11, szMsg, RC_STRING_MAX_SIZE); + ConOutResPrintf(STRING_REPLACE_HELP11, dest); else - LoadString(CMD_ModuleHandle, STRING_REPLACE_HELP5, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg,dest); + ConOutResPrintf(STRING_REPLACE_HELP5, dest); /* Make sure source and destination is not the same */ if(!_tcscmp(s, d)) @@ -210,7 +202,7 @@ /* Function to iterate over source files and call replace for each of them */ INT recReplace(DWORD dwFlags, TCHAR szSrcPath[MAX_PATH], TCHAR szDestPath[MAX_PATH], BOOL *doMore) { - TCHAR szMsg[RC_STRING_MAX_SIZE], tmpDestPath[MAX_PATH], tmpSrcPath[MAX_PATH]; + TCHAR tmpDestPath[MAX_PATH], tmpSrcPath[MAX_PATH]; INT filesReplaced=0, i; DWORD dwAttrib = 0; HANDLE hFile; @@ -269,8 +261,7 @@ { if(!(dwFlags & REPLACE_READ_ONLY)) { - LoadString(CMD_ModuleHandle, STRING_REPLACE_ERROR5, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, tmpDestPath); + ConOutResPrintf(STRING_REPLACE_ERROR5, tmpDestPath); *doMore = FALSE; break; } @@ -369,7 +360,6 @@ INT cmd_replace (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR *arg; INT argc, i,filesReplaced = 0, nFiles, srcIndex = -1, destIndex = -1; DWORD dwFlags = 0; @@ -474,8 +464,7 @@ if (_tcschr (arg[destIndex], _T('*')) != NULL || _tcschr (arg[destIndex], _T('?')) != NULL) { - LoadString(CMD_ModuleHandle, STRING_REPLACE_ERROR2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg,arg[destIndex]); + ConOutResPrintf(STRING_REPLACE_ERROR2,arg[destIndex]); ConOutResPaging(TRUE,STRING_REPLACE_HELP3); freep(arg); return 1; @@ -484,8 +473,7 @@ /* Make sure that destination exists */ if(!IsExistingDirectory(szDestPath)) { - LoadString(CMD_ModuleHandle, STRING_REPLACE_ERROR2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, szDestPath); + ConOutResPrintf(STRING_REPLACE_ERROR2, szDestPath); ConOutResPaging(TRUE,STRING_REPLACE_HELP3); freep(arg); return 1; @@ -511,8 +499,7 @@ /* Check so that source is not a directory, because that is not allowed */ if(IsExistingDirectory(szSrcPath)) { - LoadString(CMD_ModuleHandle, STRING_REPLACE_ERROR6, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, szSrcPath); + ConOutResPrintf(STRING_REPLACE_ERROR6, szSrcPath); ConOutResPaging(TRUE,STRING_REPLACE_HELP3); freep(arg); return 1; @@ -563,10 +550,9 @@ { /* Add switch dependent output */ if(dwFlags & REPLACE_ADD) - LoadString(CMD_ModuleHandle, STRING_REPLACE_HELP8, szMsg, RC_STRING_MAX_SIZE); + ConOutResPrintf(STRING_REPLACE_HELP8, filesReplaced); else - LoadString(CMD_ModuleHandle, STRING_REPLACE_HELP4, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, filesReplaced); + ConOutResPrintf(STRING_REPLACE_HELP4, filesReplaced); } } /* Return memory */ Modified: trunk/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/set.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/set.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/set.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -53,7 +53,6 @@ INT cmd_set (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; INT i; LPTSTR p; @@ -114,8 +113,7 @@ if ( !_tcsnicmp (param, _T("/"), 1) ) { - LoadString(CMD_ModuleHandle, STRING_SYNTAX_COMMAND_INCORRECT, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf (szMsg, param); + ConErrResPrintf (STRING_SYNTAX_COMMAND_INCORRECT, param); return 0; } @@ -126,8 +124,7 @@ if (p == param) { /* handle set =val case */ - LoadString(CMD_ModuleHandle, STRING_SYNTAX_COMMAND_INCORRECT, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf (szMsg, param); + ConErrResPrintf (STRING_SYNTAX_COMMAND_INCORRECT, param); return 0; } @@ -149,8 +146,7 @@ dwBuffer = GetEnvironmentVariable (param, pszBuffer, ENV_BUFFER_SIZE); if (dwBuffer == 0) { - LoadString(CMD_ModuleHandle, STRING_PATH_ERROR, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf (szMsg, param); + ConErrResPrintf (STRING_PATH_ERROR, param); return 0; } else if (dwBuffer > ENV_BUFFER_SIZE) Modified: trunk/reactos/base/shell/cmd/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/timer.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/timer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/timer.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -34,7 +34,6 @@ static VOID PrintElapsedTime (DWORD time,INT format) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; DWORD h,m,s,ms; TRACE ("PrintElapsedTime(%d,%d)",time,format); @@ -42,8 +41,7 @@ switch (format) { case 0: - LoadString(CMD_ModuleHandle, STRING_TIMER_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, time); + ConOutResPrintf(STRING_TIMER_HELP1, time); break; case 1: @@ -53,11 +51,10 @@ time /=60; m = time % 60; h = time / 60; - LoadString( CMD_ModuleHandle, STRING_TIMER_HELP2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, - h, cTimeSeparator, - m, cTimeSeparator, - s, cDecimalSeparator, ms/10); + ConOutResPrintf(STRING_TIMER_HELP2, + h, cTimeSeparator, + m, cTimeSeparator, + s, cDecimalSeparator, ms/10); break; } } @@ -65,8 +62,6 @@ INT CommandTimer (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - // all timers are kept static DWORD clksT[10]; @@ -99,14 +94,11 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { - LoadString(CMD_ModuleHandle, STRING_TIMER_HELP3, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, cTimeSeparator, cTimeSeparator, cDecimalSeparator); + ConOutResPrintf(STRING_TIMER_HELP3, cTimeSeparator, cTimeSeparator, cDecimalSeparator); return 0; } nErrorLevel = 0; - - LoadString( CMD_ModuleHandle, STRING_TIMER_TIME, szMsg, RC_STRING_MAX_SIZE); p = split (param, &argc, FALSE); @@ -160,7 +152,7 @@ cT=GetTickCount(); cS=TRUE; - ConOutPrintf (szMsg,clk_n,cS?_T("ON"):_T("OFF")); + ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); PrintTime(); freep(p); return 0; @@ -170,7 +162,7 @@ { if(cS) { - ConOutPrintf (szMsg,clk_n,cS?_T("ON"):_T("OFF")); + ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); PrintTime(); PrintElapsedTime(GetTickCount()-cT, iFormat); freep(p); @@ -179,7 +171,7 @@ cT=GetTickCount(); cS=TRUE; - ConOutPrintf (szMsg,clk_n,cS?_T("ON"):_T("OFF")); + ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); PrintTime(); freep(p); return 0; @@ -190,7 +182,7 @@ if (cS) { cS=FALSE; - ConOutPrintf (szMsg,clk_n,cS?_T("ON"):_T("OFF")); + ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); PrintTime(); PrintElapsedTime(GetTickCount()-cT, iFormat); freep(p); @@ -199,7 +191,7 @@ cT=GetTickCount(); cS=TRUE; - ConOutPrintf (szMsg,clk_n,cS?_T("ON"):_T("OFF")); + ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); PrintTime(); freep(p); return 0; @@ -211,13 +203,13 @@ if (cS) { cS=FALSE; - ConOutPrintf (szMsg,clk_n,cS?_T("ON"):_T("OFF")); + ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); PrintTime(); PrintElapsedTime(GetTickCount()-cT, iFormat); freep(p); return 0; } - ConOutPrintf (szMsg,clk_n,cS?_T("ON"):_T("OFF")); + ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); PrintTime(); freep(p); return 0; Modified: trunk/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/type.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/type.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/type.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -33,7 +33,6 @@ INT cmd_type (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR buff[256]; HANDLE hFile, hConsoleOut; BOOL bRet; @@ -71,8 +70,7 @@ { if (_T('/') == argv[i][0] && _totupper(argv[i][1]) != _T('P')) { - LoadString(CMD_ModuleHandle, STRING_TYPE_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, argv[i] + 1); + ConErrResPrintf(STRING_TYPE_ERROR1, argv[i] + 1); continue; } Modified: trunk/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -29,7 +29,6 @@ OSVERSIONINFO VersionInfo; unsigned RosVersionLen; LPTSTR RosVersion; - TCHAR szMsg[RC_STRING_MAX_SIZE]; ConOutResPuts (STRING_CMD_SHELLINFO ); VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); @@ -44,8 +43,7 @@ (RosVersion - VersionInfo.szCSDVersion); if (7 <= RosVersionLen && 0 == _tcsnicmp(RosVersion, _T("ReactOS"), 7)) { - LoadString( CMD_ModuleHandle, STRING_VERSION_RUNVER, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf (szMsg, RosVersion); + ConOutResPrintf(STRING_VERSION_RUNVER, RosVersion); } } ConOutPuts (_T("\n")); Modified: trunk/reactos/base/shell/cmd/verify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/verify.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/verify.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/verify.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -29,8 +29,6 @@ INT cmd_verify (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_VERIFY_HELP1); @@ -41,8 +39,7 @@ if (!*param) { - LoadString(CMD_ModuleHandle, STRING_VERIFY_HELP2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, bVerify ? D_ON : D_OFF); + ConOutResPrintf(STRING_VERIFY_HELP2, bVerify ? D_ON : D_OFF); } else if (_tcsicmp (param, D_OFF) == 0) bVerify = FALSE; Modified: trunk/reactos/base/shell/cmd/vol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/vol.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/vol.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/vol.c [iso-8859-1] Sat Jul 26 17:49:49 2008 @@ -28,7 +28,6 @@ static INT PrintVolumeHeader (LPTSTR pszRootPath) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szVolName[80]; DWORD dwSerialNr; @@ -49,18 +48,15 @@ /* print drive info */ if (szVolName[0] != '\0') { - LoadString(CMD_ModuleHandle, STRING_VOL_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, pszRootPath[0],szVolName); + ConOutResPrintf(STRING_VOL_HELP1, pszRootPath[0],szVolName); } else { - LoadString(CMD_ModuleHandle, STRING_VOL_HELP2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, pszRootPath[0]); + ConOutResPrintf(STRING_VOL_HELP2, pszRootPath[0]); } /* print the volume serial number */ - LoadString(CMD_ModuleHandle, STRING_VOL_HELP3, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); + ConOutResPrintf(STRING_VOL_HELP3, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); return 0; }

16 years, 1 month

[mkupfer] 34815: reenable Norwegian language and keyboard layout (tested by Frode Lillerud)

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sat Jul 26 17:20:02 2008 New Revision: 34815 URL: http://svn.reactos.org/svn/reactos?rev=34815&view=rev Log: reenable Norwegian language and keyboard layout (tested by Frode Lillerud) Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sat Jul 26 17:20:02 2008 @@ -189,8 +189,8 @@ ;0000043E = "Malay (Malaysia)" ;0000044E = "Marathi" ;00000450 = "Mongolian (Mongolia)" -;00000414 = "Norwegian (Bokmal)" -;00000814 = "Norwegian (Nynorsk)" +00000414 = "Norwegian (Bokmal)" +00000814 = "Norwegian (Nynorsk)" 00000415 = "Polish" 00000816 = "Portuguese (Portugal)" 00000416 = "Portuguese (Brazil)"

16 years, 1 month

[jimtabor] 34814: - Fix crash in callback and disable HCBT_CREATEWND until it is implemented correctly. Hooks seem to be working.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jul 26 17:06:31 2008 New Revision: 34814 URL: http://svn.reactos.org/svn/reactos?rev=34814&view=rev Log: - Fix crash in callback and disable HCBT_CREATEWND until it is implemented correctly. Hooks seem to be working. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Sat Jul 26 17:06:31 2008 @@ -339,7 +339,7 @@ { ULONG ArgumentLength; PVOID Argument; - LRESULT Result; + LRESULT Result = 0; NTSTATUS Status; PVOID ResultPointer; ULONG ResultLength; @@ -491,10 +491,21 @@ &ResultPointer, &ResultLength); - /* Simulate old behaviour: copy into our local buffer */ - Result = *(LRESULT*)ResultPointer; - UserEnterCo(); + + _SEH_TRY + { + ProbeForRead((PVOID)*(LRESULT*)ResultPointer, + sizeof(LRESULT), + 1); + /* Simulate old behaviour: copy into our local buffer */ + Result = *(LRESULT*)ResultPointer; + } + _SEH_HANDLE + { + Result = 0; + } + _SEH_END; IntCbFreeMemory(Argument); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Sat Jul 26 17:06:31 2008 @@ -413,6 +413,7 @@ FASTCALL co_HOOK_CallHookNext(PHOOK Hook, INT Code, WPARAM wParam, LPARAM lParam) { + DPRINT("CALLING HOOK %d\n",Hook->HookId); return co_IntCallHookProc(Hook->HookId, Code, wParam, lParam, Hook->Proc, Hook->Ansi, &Hook->ModuleName); } @@ -708,16 +709,18 @@ } case WH_CBT: + DPRINT1("HOOK WH_CBT!\n"); switch (Code) { case HCBT_CREATEWND: // Use Ansi. - lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); + DPRINT1("HOOK HCBT_CREATEWND\n"); +// lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); break; case HCBT_MOVESIZE: { RECT rt; - + DPRINT1("HOOK HCBT_MOVESIZE\n"); if (lParam) { _SEH_TRY @@ -749,7 +752,7 @@ case HCBT_ACTIVATE: { CBTACTIVATESTRUCT CbAs; - + DPRINT1("HOOK HCBT_ACTIVATE\n"); if (lParam) { _SEH_TRY @@ -781,6 +784,7 @@ The rest just use default. */ default: + DPRINT1("HOOK HCBT_ %d\n",Code); lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); break; } @@ -909,6 +913,10 @@ NextObj = IntGetNextHook(HookObj); ClientInfo->phkCurrent = NextObj; // Preset next hook from list. + if (HookObj->HookId == WH_GETMESSAGE) + { + DPRINT1(" WH_GETMESSAGE, Hook %x NextHook %x \n", HookObj, NextObj); + } UserCallNextHookEx( HookObj, Code, wParam, lParam, Ansi); UserDereferenceObject(HookObj);

16 years, 1 month

[tkreuzer] 34813: - add Zw.S back to ntoskrnl, as it now contains valid 64 bit assembly - I cheat and add all unresolved references in a stub file for now ntoskrnl links now, so I can continue on freeldr again.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jul 26 16:22:34 2008 New Revision: 34813 URL: http://svn.reactos.org/svn/reactos?rev=34813&view=rev Log: - add Zw.S back to ntoskrnl, as it now contains valid 64 bit assembly - I cheat and add all unresolved references in a stub file for now ntoskrnl links now, so I can continue on freeldr again. Added: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c (with props) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild Added: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Sat Jul 26 16:22:34 2008 @@ -1,0 +1,572 @@ + +#define STUB(x) void x() {} + +STUB(KfLowerIrql) +STUB(KeRaiseIrql) +STUB(KeLowerIrql) +STUB(KeRaiseIrqlToSynchLevel) +STUB(KeRaiseIrqlToDpcLevel) +STUB(KiIdleLoop) +STUB(KeGetCurrentIrql) +STUB(KeBugCheckEx) +STUB(KeAcquireInStackQueuedSpinLockRaiseToSynch) +STUB(KeNumberProcessors) +STUB(KeBugcheckCallbackListHead) +STUB(NtAdjustGroupsToken) +STUB(NtAdjustPrivilegesToken) +STUB(NtAllocateUserPhysicalPages) +STUB(NtAllocateVirtualMemory) +STUB(NtAreMappedFilesTheSame) +STUB(MmUserProbeAddress) +STUB(MmSizeOfMdl) +STUB(MmBuildMdlForNonPagedPool) +STUB(MmMapViewOfSection) +STUB(ExpInterlockedPushEntrySList) +STUB(ExAllocatePool) +STUB(ExFreePool) +STUB(ExFreePoolWithTag) +STUB(ExAllocatePoolWithTag) +STUB(PsGetCurrentThreadId) +STUB(NtContinue) +STUB(NtCreateEvent) +STUB(NtCreateMutant) +STUB(NtCreateSection) +STUB(NtCreateSemaphore) +STUB(NtCreateThread) +STUB(NtCreateTimer) +STUB(NtCreateToken) +STUB(NtDebugContinue) +STUB(NtDuplicateToken) +STUB(NtExtendSection) +STUB(NtFilterToken) +STUB(NtFlushInstructionCache) +STUB(NtFreeUserPhysicalPages) +STUB(NtDebugActiveProcess) +STUB(KeActiveProcessors) +STUB(KeDisableInterrupts) +STUB(KiSwapContext) +STUB(KeContextToTrapFrame) +STUB(KiDispatchException) +STUB(MmSystemRangeStart) +STUB(MiGetUserPageDirectoryCount) +STUB(MmStats) +STUB(PsCreateSystemThread) +STUB(ExAcquireResourceLock) +STUB(ExReleaseResourceLock) +STUB(MiNonPagedPoolLength) +STUB(MiNonPagedPoolStart) +STUB(MmGetPfnForProcess) +STUB(KiInitializeUserApc) +STUB(KiComputeTimerTableIndex) +STUB(KeBugcheckReasonCallbackListHead) +STUB(BugCheckCallbackLock) +STUB(NtCallbackReturn) +STUB(NtCancelTimer) +STUB(NtClearEvent) +STUB(NtCompareTokens) +STUB(NtCreateDebugObject) +STUB(NtCreateIoCompletion) +STUB(NtEnumerateSystemEnvironmentValuesEx) +STUB(NtFlushVirtualMemory) +STUB(NtFreeVirtualMemory) +STUB(NtGetWriteWatch) +STUB(NtImpersonateAnonymousToken) +STUB(NtLockVirtualMemory) +STUB(NtMapUserPhysicalPages) +STUB(NtMapUserPhysicalPagesScatter) +STUB(NtMapViewOfSection) +STUB(NtOpenEvent) +STUB(NtOpenIoCompletion) +STUB(NtOpenMutant) +STUB(NtOpenSection) +STUB(NtOpenSemaphore) +STUB(NtOpenThread) +STUB(NtOpenThreadToken) +STUB(NtOpenTimer) +STUB(NtProtectVirtualMemory) +STUB(NtPulseEvent) +STUB(NtQueryEvent) +STUB(NtQueryInformationToken) +STUB(NtQueryIoCompletion) +STUB(NtQueryMutant) +STUB(NtQuerySection) +STUB(NtQuerySemaphore) +STUB(NtQuerySystemEnvironmentValue) +STUB(NtQuerySystemEnvironmentValueEx) +STUB(NtQuerySystemInformation) +STUB(NtQueryTimer) +STUB(NtQueryVirtualMemory) +STUB(NtRaiseException) +STUB(NtReadVirtualMemory) +STUB(NtReleaseMutant) +STUB(NtReleaseSemaphore) +STUB(NtRemoveIoCompletion) +STUB(NtRemoveProcessDebug) +STUB(NtResetEvent) +STUB(NtResetWriteWatch) +STUB(NtSetEvent) +STUB(NtSetEventBoostPriority) +STUB(NtSetInformationTokenNtSetInformationDebugObject) +STUB(NtSetIoCompletion) +STUB(NtSetLdtEntries) +STUB(NtSetSystemEnvironmentValue) +STUB(NtSetSystemEnvironmentValueEx) +STUB(NtSetSystemInformation) +STUB(NtSetTimer) +STUB(NtUnlockVirtualMemory) +STUB(NtUnmapViewOfSection) +STUB(NtVdmControl) +STUB(NtWaitForDebugEvent) +STUB(NtWriteVirtualMemory) +STUB(NtGetCurrentProcessorNumber) +STUB(NtOpenThreadTokenEx) +STUB(NtSetInformationDebugObject) +STUB(NtSetInformationToken) +STUB(KiSwapProcess) +STUB(MmUpdatePageDir) +STUB(KeGetCurrentProcessorNumber) +STUB(MmDeleteKernelStack) +STUB(MmCreateKernelStack) +STUB(Ke386InitThreadWithContext) +STUB(MmUnmapLockedPages) +STUB(ExpInterlockedPopEntrySList) +STUB(MmGetPhysicalAddress) +STUB(MmFreeSectionSegments) +STUB(ExAllocateFromNPagedLookasideList) +STUB(ExInitializeNPagedLookasideList) +STUB(SeTokenType) +STUB(RtlGetCallersAddress) +STUB(RtlCompareMemory) +STUB(DbgkpSendApiMessage) +STUB(MmGetFileNameForSection) +STUB(DbgkpTraceLevel) +STUB(ExpInitializeEventImplementation) +STUB(ExpInitializeMutantImplementation) +STUB(ExpInitializeSemaphoreImplementation) +STUB(ExpInitializeTimerImplementation) +STUB(ExpEnvironmentLock) +STUB(ExpFirmwareTableProviderListHead) +STUB(MmSectionObjectType) +STUB(IoAcquireCancelSpinLock) +STUB(IoReleaseCancelSpinLock) +STUB(ExInterlockedInsertTailList) +STUB(ExInterlockedRemoveHeadList) +STUB(ExInterlockedAddLargeStatistic) +STUB(MmProbeAndLockPages) +STUB(IopCompletionMapping) +STUB(CmpInitializeMachineDependentConfiguration) +STUB(ExpInitLookasideLists) +STUB(ExpFirmwareTableResource) +STUB(MmMapViewInSystemSpace) +STUB(MmNumberOfPhysicalPages) +STUB(MmInitSystem) +STUB(RtlInitializeRangeListPackage) +STUB(ExInitPoolLookasidePointers) +STUB(KiInitializeBugCheck) +STUB(MmHighestUserAddress) +STUB(DbgkInitialize) +STUB(MmCreateMdl) +STUB(MmMapLockedPage) +STUB(PsThreadType) +STUB(MiShutdownMemoryManager) +STUB(ExfInterlockedCompareExchange64) +STUB(ExAllocatePoolWithQuotaTag) +STUB(ExInitializePagedLookasideList) +STUB(ExInterlockedInsertHeadList) +STUB(IoCheckEaBufferValidity) +STUB(ExEventObjectType) +STUB(IopDeleteIoCompletion) +STUB(IoCompletionType) +STUB(IoCompletionPacketLookaside) +STUB(CancelSpinLock) +STUB(KdbpCliInit) +STUB(MmUnlockPages) +STUB(KeDisconnectInterrupt) +STUB(KeInitializeInterrupt) +STUB(MmUnmapViewOfSection) +STUB(MiFreeDescriptor) +STUB(MmPfnDatabase) +STUB(MmHighestPhysicalPage) +STUB(MmIsPagePresent) +STUB(MmCreateVirtualMappingForKernel) +STUB(MmSetPageProtect) +STUB(MiFreeDescriptorOrg) +STUB(MmMapLockedPages) +STUB(_PsThreadType) +STUB(_ExEventObjectType) +STUB(MmCreateHyperspaceMapping) +STUB(MmDeleteHyperspaceMapping) +STUB(MmFreeVirtualMemory) +STUB(MmCreateVirtualMapping) +STUB(MmRawDeleteVirtualMapping) +STUB(MmIsPageSwapEntry) +STUB(MmDeletePageFileMapping) +STUB(KeRosDumpStackFrames) +STUB(RtlWalkFrameChain) +STUB(MmCommitPagedPoolAddress) +STUB(MmIsDirtyPage) +STUB(MmSetDirtyPage) +STUB(MmSetCleanPage) +STUB(MmPageOutSectionView) +STUB(MmPageOutVirtualMemory) +STUB(MmAllocateSection) +STUB(MmDeleteVirtualMapping) +STUB(ExSystemLookasideListHead) +STUB(PspGetOrSetContextKernelRoutine) +STUB(PspW32ThreadCallout) +STUB(ExTimerRundown) +STUB(KeConnectInterrupt) +STUB(MmWritePageSectionView) +STUB(MmWritePageVirtualMemory) +STUB(ExInitializeSystemLookasideList) +STUB(KeRaiseUserException) +STUB(PsIsThreadTerminating) +STUB(ExMutantObjectType) +STUB(_ExSemaphoreObjectType) +STUB(MmCleanProcessAddressSpace) +STUB(MmDeleteProcessAddressSpace) +STUB(MmDeleteTeb) +STUB(DbgkClearProcessDebugObject) +STUB(MmSetMemoryPriorityProcess) +STUB(MmInitializeHandBuiltProcess) +STUB(MmInitializeHandBuiltProcess2) +STUB(MmInitializeProcessAddressSpace) +STUB(MmCreatePeb) +STUB(MmQuerySystemSize) +STUB(KeFeatureBits) +STUB(MmGetFileObjectForSection) +STUB(SepTokenObjectType) +STUB(SeExchangePrimaryToken) +STUB(SeIsTokenChild) +STUB(SeTokenImpersonationLevel) +STUB(SeSubProcessToken) +STUB(SeAssignPrimaryToke) +STUB(SeCopyClientToken) +STUB(SepInitializeTokenImplementation) +STUB(KiSystemService) +STUB(KdpGdbStubInit) +STUB(KdbpGetCommandLineSettings) +STUB(KdbpSafeReadMemory) +STUB(RtlpAllocateMemory) +STUB(RtlFillMemoryUlong) +STUB(RtlCaptureContext) +STUB(RtlpGetExceptionAddress) +STUB(RtlpCheckForActiveDebugger) +STUB(RtlDispatchException) +STUB(RtlpFreeMemory) +STUB(RtlpLockAtomTable) +STUB(RtlpUnlockAtomTable) +STUB(PspW32ProcessCallout) +STUB(DbgkDebugObjectType) +STUB(DbgkCopyProcessDebugPort) +STUB(MmCreateProcessAddressSpace) +STUB(SeAssignPrimaryToken) +STUB(SeDeassignPrimaryToken) +STUB(SepCreateSystemProcessToken) +STUB(KdbEnterDebuggerException) +STUB(KdbpCliModuleLoaded) +STUB(RtlpSetInDbgPrint) +STUB(CHECK_PAGED_CODE_RTL) +STUB(RtlpGetAtomEntry) +STUB(RtlpFreeAtomHandle) +STUB(RtlpFreeAtomTableEntry) +STUB(RtlpAllocAtomTableEntry) +STUB(RtlAcquirePebLock) +STUB(RtlpGetMode) +STUB(RtlReleasePebLock) +STUB(RtlEnterHeapLock) +STUB(RtlLeaveHeapLock) +STUB(RtlInitializeHeapLock) +STUB(LdrShutdownThread) +STUB(RtlpDestroyAtomHandleTable) +STUB(RtlpDestroyAtomTableLock) +STUB(RtlpFreeAtomTable) +STUB(RtlpAllocAtomTable) +STUB(RtlpInitAtomTableLock) +STUB(RtlpCreateAtomHandleTable) +STUB(RtlpAllocDeallocQueryBufferSize) +STUB(find_entry) +STUB(RtlDeleteHeapLock) +STUB(RtlUnwind) +STUB(RtlpCreateAtomHandle) +STUB(RtlInitializeContext) +STUB(RtlpCurrentPeb) + +STUB(DbgCommandString) +STUB(ExAcquireRundownProtection) +STUB(ExAcquireRundownProtectionCacheAware) +STUB(ExAcquireRundownProtectionCacheAwareEx) +STUB(ExAcquireRundownProtectionEx) +STUB(ExAllocateFromPagedLookasideList) +STUB(ExAllocatePoolWithQuota) +STUB(ExAllocatePoolWithTagPriority) +STUB(ExDeleteNPagedLookasideList) +STUB(ExDeletePagedLookasideList) +STUB(ExEnterCriticalRegionAndAcquireResourceShared) +STUB(ExEnterCriticalRegionAndAcquireSharedWaitForExclusive) +STUB(ExFreeToPagedLookasideList) +STUB(ExGetCurrentProcessorCounts) +STUB(ExGetCurrentProcessorCpuUsage) +STUB(ExGetPreviousMode) +STUB(ExInitializeRundownProtection) +STUB(ExInterlockedAddLargeInteger) +STUB(ExInterlockedAddUlong) +STUB(ExInterlockedPopEntryList) +STUB(ExInterlockedPushEntryList) +STUB(ExIsProcessorFeaturePresent) +STUB(ExQueryDepthSList) +STUB(ExQueryPoolBlockSize) +STUB(ExRaiseException) +STUB(ExRaiseStatus) +STUB(ExReInitializeRundownProtection) +STUB(ExReInitializeRundownProtectionCacheAware) +STUB(ExReleaseRundownProtection) +STUB(ExReleaseRundownProtectionCacheAware) +STUB(ExReleaseRundownProtectionCacheAwareEx) +STUB(ExReleaseRundownProtectionEx) +STUB(ExRundownCompleted) +STUB(ExRundownCompletedCacheAware) +STUB(ExSemaphoreObjectType) +STUB(ExVerifySuite) +STUB(ExWaitForRundownProtectionRelease) +STUB(ExWaitForRundownProtectionReleaseCacheAware) +STUB(ExpInterlockedFlushSList) +STUB(FsRtlAddBaseMcbEntry) +STUB(FsRtlGetNextBaseMcbEntry) +STUB(FsRtlInitializeBaseMcb) +STUB(FsRtlLegalAnsiCharacterArray) +STUB(FsRtlLookupBaseMcbEntry) +STUB(FsRtlLookupLastBaseMcbEntry) +STUB(FsRtlLookupLastBaseMcbEntryAndIndex) +STUB(FsRtlNumberOfRunsInBaseMcb) +STUB(FsRtlRemoveBaseMcbEntry) +STUB(FsRtlResetBaseMcb) +STUB(FsRtlSplitBaseMcb) +STUB(FsRtlTruncateBaseMcb) +STUB(FsRtlUninitializeBaseMcb) +STUB(HalDispatchTable) +STUB(HeadlessDispatch) +STUB(InitializeSListHead) +STUB(IoCheckDesiredAccess) +STUB(IoCheckFunctionAccess) +STUB(IoCheckQuerySetVolumeInformation) +STUB(IoEnumerateRegisteredFiltersList) +STUB(IoFileObjectType) +STUB(IoForwardAndCatchIrp) +STUB(IoGetCurrentProcess) +STUB(IoGetDeviceToVerify) +STUB(IoGetInitialStack) +STUB(IoGetPagingIoPriority) +STUB(IoGetStackLimits) +STUB(IoIs32bitProcess) +STUB(IoIsSystemThread) +STUB(IoIsWdmVersionAvailable) +STUB(IoSetCompletionRoutineEx) +STUB(IoSetDeviceToVerify) +STUB(IoSetHardErrorOrVerifyDevice) +STUB(IoSetIoCompletion) +STUB(IoThreadToProcess) +STUB(IoTranslateBusAddress) +STUB(IoValidateDeviceIoControlAccess) +STUB(IoWMIDeviceObjectToProviderId) +STUB(KdDebuggerEnabled) +STUB(KdDebuggerNotPresent) +STUB(KdRefreshDebuggerNotPresent) +STUB(KeAcquireInStackQueuedSpinLockForDpc) +STUB(KeAcquireQueuedSpinLock) +STUB(KeAcquireQueuedSpinLockRaiseToSynch) +STUB(KeAcquireSpinLockForDpc) +STUB(KeAcquireSpinLockRaiseToDpc) +STUB(KeAcquireSpinLockRaiseToSynch) +STUB(KeDeregisterBugCheckCallback) +STUB(KeDeregisterBugCheckReasonCallback) +STUB(KeDeregisterNmiCallback) +STUB(KeEnterCriticalRegion) +STUB(KeEnterGuardedRegion) +STUB(KeEnterKernelDebugger) +STUB(KeExpandKernelStackAndCallout) +STUB(KeFlushEntireTb) +STUB(KeGenericCallDpc) +STUB(KeGetRecommendedSharedDataAlignment) +STUB(KeInitializeCrashDumpHeader) +STUB(KeInvalidateAllCaches) +STUB(KeIsWaitListEmpty) +STUB(KeLastBranchMSR) +STUB(KeLeaveCriticalRegion) +STUB(KeLeaveGuardedRegion) +STUB(KeQueryActiveProcessors) +STUB(KeQueryMultiThreadProcessorSet) +STUB(KeQueryPrcbAddress) +STUB(KeReadStateMutex) +STUB(KeRegisterBugCheckCallback) +STUB(KeRegisterBugCheckReasonCallback) +STUB(KeRegisterNmiCallback) +STUB(KeReleaseInStackQueuedSpinLockForDpc) +STUB(KeReleaseQueuedSpinLock) +STUB(KeReleaseSpinLock) +STUB(KeReleaseSpinLockForDpc) +STUB(KeRestoreFloatingPointState) +STUB(KeSaveFloatingPointState) +STUB(KeSaveStateForHibernate) +STUB(KeSetDmaIoCoherency) +STUB(KeSignalCallDpcDone) +STUB(KeSignalCallDpcSynchronize) +STUB(KeSynchronizeExecution) +STUB(KeTestSpinLock) +STUB(KeTryToAcquireQueuedSpinLock) +STUB(KeTryToAcquireQueuedSpinLockRaiseToSynch) +STUB(KeUpdateRunTime) +STUB(KeUpdateSystemTime) +STUB(KeUserModeCallback) +STUB(KeWaitForMutexObject) +STUB(KfRaiseIrql) +STUB(KiBugCheckData) +STUB(KiCpuId) +STUB(Mm64BitPhysicalAddress) +STUB(MmAdjustWorkingSetSize) +STUB(MmAdvanceMdl) +STUB(MmAllocateContiguousMemory) +STUB(MmAllocateContiguousMemorySpecifyCache) +STUB(MmAllocateMappingAddress) +STUB(MmAllocateNonCachedMemory) +STUB(MmAllocatePagesForMdl) +STUB(MmAllocatePagesForMdlEx) +STUB(MmCanFileBeTruncated) +STUB(MmCommitSessionMappedView) +STUB(MmCreateMirror) +STUB(MmCreateSection) +STUB(MmDisableModifiedWriteOfSection) +STUB(MmFlushImageSection) +STUB(MmForceSectionClosed) +STUB(MmFreeContiguousMemory) +STUB(MmFreeContiguousMemorySpecifyCache) +STUB(MmFreeMappingAddress) +STUB(MmFreeNonCachedMemory) +STUB(MmFreePagesFromMdl) +STUB(MmGetVirtualForPhysical) +STUB(MmGrowKernelStack) +STUB(MmIsAddressValid) +STUB(MmIsIoSpaceActive) +STUB(MmIsNonPagedSystemAddressValid) +STUB(MmIsThisAnNtAsSystem) +STUB(MmLockPagableImageSection) +STUB(MmMapLockedPagesSpecifyCache) +STUB(MmMapLockedPagesWithReservedMapping) +STUB(MmMapMemoryDumpMdl) +STUB(MmMapVideoDisplay) +STUB(MmMapViewInSessionSpace) +STUB(MmPrefetchPages) +STUB(MmProbeAndLockProcessPages) +STUB(MmProbeAndLockSelectedPages) +STUB(MmProtectMdlSystemAddress) +STUB(MmSecureVirtualMemory) +STUB(MmSetAddressRangeModified) +STUB(MmSetBankedSection) +STUB(MmUnmapReservedMapping) +STUB(MmUnmapVideoDisplay) +STUB(MmUnmapViewInSessionSpace) +STUB(MmUnmapViewInSystemSpace) +STUB(MmUnsecureVirtualMemory) +STUB(NlsOemLeadByteInfo) +STUB(ObDeleteCapturedInsertInfo) +STUB(ObSetHandleAttributes) +STUB(PfxFindPrefix) +STUB(PfxInitialize) +STUB(PfxInsertPrefix) +STUB(PfxRemovePrefix) +STUB(PoCancelDeviceNotify) +STUB(PoRegisterDeviceNotify) +STUB(PoRequestShutdownEvent) +STUB(PoSetHiberRange) +STUB(PoShutdownBugCheck) +STUB(PsEstablishWin32Callouts) +STUB(PsGetCurrentProcess) +STUB(PsGetCurrentProcessWow64Process) +STUB(PsGetCurrentThread) +STUB(PsGetCurrentThreadPreviousMode) +STUB(PsGetCurrentThreadProcess) +STUB(PsGetCurrentThreadProcessId) +STUB(PsGetCurrentThreadStackBase) +STUB(PsGetCurrentThreadStackLimit) +STUB(PsGetCurrentThreadTeb) +STUB(PsGetCurrentThreadWin32Thread) +STUB(PsGetCurrentThreadWin32ThreadAndEnterCriticalRegion) +STUB(PsGetProcessSessionIdEx) +STUB(PsGetProcessWow64Process) +STUB(PsGetThreadFreezeCount) +STUB(PsGetThreadHardErrorsAreDisabled) +STUB(PsGetThreadId) +STUB(PsGetThreadProcess) +STUB(PsGetThreadProcessId) +STUB(PsGetThreadSessionId) +STUB(PsGetThreadTeb) +STUB(PsGetThreadWin32Thread) +STUB(PsIsSystemProcess) +STUB(PsIsSystemThread) +STUB(PsIsThreadImpersonating) +STUB(PsLookupThreadByThreadId) +STUB(PsProcessType) +STUB(PsSetThreadHardErrorsAreDisabled) +STUB(PsSetThreadWin32Thread) +STUB(PsWrapApcWow64Thread) +STUB(RtlAnsiStringToUnicodeSize) +STUB(RtlCompareMemoryUlong) +STUB(RtlCopyMemory) +STUB(RtlCopyMemoryNonTemporal) +STUB(RtlFillMemory) +STUB(RtlLookupFunctionEntry) +STUB(RtlMoveMemory) +STUB(RtlOemStringToUnicodeSize) +STUB(RtlPcToFileHeader) +STUB(RtlPrefetchMemoryNonTemporal) +STUB(RtlRestoreContext) +STUB(RtlTraceDatabaseAdd) +STUB(RtlTraceDatabaseCreate) +STUB(RtlTraceDatabaseDestroy) +STUB(RtlTraceDatabaseEnumerate) +STUB(RtlTraceDatabaseFind) +STUB(RtlTraceDatabaseLock) +STUB(RtlTraceDatabaseUnlock) +STUB(RtlTraceDatabaseValidate) +STUB(RtlUnicodeStringToAnsiSize) +STUB(RtlUnicodeStringToOemSize) +STUB(RtlUnwindEx) +STUB(RtlVirtualUnwind) +STUB(RtlZeroMemory) +STUB(SeFilterToken) +STUB(SeQueryAuthenticationIdToken) +STUB(SeQueryInformationToken) +STUB(SeQuerySessionIdToken) +STUB(SeReportSecurityEvent) +STUB(SeSetAuditParameter) +STUB(SeTokenIsAdmin) +STUB(SeTokenIsRestricted) +STUB(SeTokenObjectType) +STUB(VfFailDeviceNode) +STUB(VfFailDriver) +STUB(VfFailSystemBIOS) +STUB(VfIsVerificationEnabled) +STUB(WmiFlushTrace) +STUB(WmiGetClock) +STUB(WmiQueryTrace) +STUB(WmiQueryTraceInformation) +STUB(WmiStartTrace) +STUB(WmiStopTrace) +STUB(WmiTraceFastEvent) +STUB(WmiTraceMessage) +STUB(WmiTraceMessageVa) +STUB(WmiUpdateTrace) +STUB(XIPDispatch) +STUB(__C_specific_handler) +STUB(__misaligned_access) +STUB(_local_unwind) +STUB(_setjmp) +STUB(_setjmpex) +STUB(longjmp) +STUB(KfReleaseSpinLock) +STUB(KeAcquireInStackQueuedSpinLock) +STUB(KeReleaseInStackQueuedSpinLock) +STUB(KfAcquireSpinLock) +STUB(KeBugCheck) +STUB(MmMapIoSpace) +STUB(MmUnmapIoSpace) Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sat Jul 26 16:22:34 2008 @@ -36,6 +36,7 @@ <directory name="include"> <pch>ntoskrnl.h</pch> </directory> + <file>amd64stubs.c</file> <directory name="ke"> <if property="ARCH" value="i386"> <directory name="i386"> @@ -172,7 +173,7 @@  </directory> <directory name="ex" root="intermediate"> -  + <file>zw.S</file> </directory> <directory name="ex"> <if property="ARCH" value="i386">

16 years, 1 month

[tkreuzer] 34812: stubbed hal more or less copied from arm. It compiles...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jul 26 16:18:00 2008 New Revision: 34812 URL: http://svn.reactos.org/svn/reactos?rev=34812&view=rev Log: stubbed hal more or less copied from arm. It compiles... Added: branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild (with props) branches/ros-amd64-bringup/reactos/hal/halamd64/generic/ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/generic.rbuild (with props) branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c (with props) branches/ros-amd64-bringup/reactos/hal/halamd64/include/ branches/ros-amd64-bringup/reactos/hal/halamd64/include/hal.h (with props) branches/ros-amd64-bringup/reactos/hal/halamd64/include/halp.h (with props) branches/ros-amd64-bringup/reactos/hal/halamd64/up/ branches/ros-amd64-bringup/reactos/hal/halamd64/up/halinit_up.c (with props) branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild (with props) branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rc (with props) Removed: branches/ros-amd64-bringup/reactos/hal/halamd64/hal_generic.c branches/ros-amd64-bringup/reactos/hal/halamd64/hal_generic.rbuild Modified: branches/ros-amd64-bringup/reactos/hal/hal.rbuild branches/ros-amd64-bringup/reactos/hal/hal/hal.c branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def Modified: branches/ros-amd64-bringup/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] Sat Jul 26 16:18:00 2008 @@ -26,7 +26,7 @@ </if> <if property="ARCH" value="amd64"> <directory name="halamd64"> - <xi:include href="halamd64/hal_generic.rbuild" /> + <xi:include href="halamd64/directory.rbuild" /> </directory> </if> </group> Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal/hal.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal/hal.c [iso-8859-1] Sat Jul 26 16:18:00 2008 @@ -74,7 +74,7 @@ KEBUGCHECK(0); return Interval; } - +#if 0 VOID FASTCALL ExAcquireFastMutex( @@ -101,7 +101,7 @@ return TRUE; } - +#endif VOID NTAPI Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def [iso-8859-1] Sat Jul 26 16:18:00 2008 @@ -59,7 +59,7 @@ ;IoReadPartitionTable ;IoSetPartitionInformation ;IoWritePartitionTable -;KdComPortInUse +KdComPortInUse=_KdComPortInUse DATA KeFlushWriteBuffer KeQueryPerformanceCounter KeStallExecutionProcessor Added: branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild (added) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild [iso-8859-1] Sat Jul 26 16:18:00 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="generic"> + <xi:include href="generic/generic.rbuild" /> + </directory> + <directory name="up"> + <xi:include href="up/halup.rbuild" /> + </directory> +</group> Propchange: branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/generic.rbuild (added) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/generic.rbuild [iso-8859-1] Sat Jul 26 16:18:00 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="halamd64_generic" type="objectlibrary"> + <include base="halamd64_generic">../include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <file>hal.c</file> + <pch>../include/hal.h</pch> +</module> Propchange: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/generic.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c (added) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c [iso-8859-1] Sat Jul 26 16:18:00 2008 @@ -1,0 +1,1538 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: hal/halarm/generic/hal.c + * PURPOSE: Hardware Abstraction Layer + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> +#include <ndk/inbvfuncs.h> + +#undef ExAcquireFastMutex +#undef ExReleaseFastMutex +#undef ExTryToAcquireFastMutex +#undef KeAcquireSpinLock +#undef KeLowerIrql +#undef KeRaiseIrql +#undef KeReleaseSpinLock + +#define READ_REGISTER_ULONG(r) (*(volatile ULONG * const)(r)) +#define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG *)(r) = (v)) + +/* DATA **********************************************************************/ + +ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount; +ULONG _KdComPortInUse = 0; + +ULONG HalpIrqlTable[HIGH_LEVEL + 1] = +{ + 0xFFFFFFFF, // IRQL 0 PASSIVE_LEVEL + 0xFFFFFFFD, // IRQL 1 APC_LEVEL + 0xFFFFFFF9, // IRQL 2 DISPATCH_LEVEL + 0xFFFFFFD9, // IRQL 3 + 0xFFFFFF99, // IRQL 4 + 0xFFFFFF19, // IRQL 5 + 0xFFFFFE19, // IRQL 6 + 0xFFFFFC19, // IRQL 7 + 0xFFFFF819, // IRQL 8 + 0xFFFFF019, // IRQL 9 + 0xFFFFE019, // IRQL 10 + 0xFFFFC019, // IRQL 11 + 0xFFFF8019, // IRQL 12 + 0xFFFF0019, // IRQL 13 + 0xFFFE0019, // IRQL 14 + 0xFFFC0019, // IRQL 15 + 0xFFF80019, // IRQL 16 + 0xFFF00019, // IRQL 17 + 0xFFE00019, // IRQL 18 + 0xFFC00019, // IRQL 19 + 0xFF800019, // IRQL 20 + 0xFF000019, // IRQL 21 + 0xFE000019, // IRQL 22 + 0xFC000019, // IRQL 23 + 0xF0000019, // IRQL 24 + 0x80000019, // IRQL 25 + 0x19, // IRQL 26 + 0x18, // IRQL 27 PROFILE_LEVEL + 0x10, // IRQL 28 CLOCK2_LEVEL + 0x00, // IRQL 29 IPI_LEVEL + 0x00, // IRQL 30 POWER_LEVEL + 0x00, // IRQL 31 HIGH_LEVEL +}; + +UCHAR HalpMaskTable[HIGH_LEVEL + 1] = +{ + PROFILE_LEVEL, // INT 0 WATCHDOG + APC_LEVEL, // INT 1 SOFTWARE INTERRUPT + DISPATCH_LEVEL,// INT 2 COMM RX + IPI_LEVEL, // INT 3 COMM TX + CLOCK2_LEVEL, // INT 4 TIMER 0 + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 26, + 26 +}; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +DriverEntry( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + UNIMPLEMENTED; + + return STATUS_SUCCESS; +} + +/* +* @unimplemented +*/ +VOID +NTAPI +HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) +{ + KEBUGCHECK(0); + return; +} + +/* +* @unimplemented +*/ +VOID +NTAPI +HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) +{ + KEBUGCHECK(0); + return; +} + +/* +* @unimplemented +*/ +ULONG_PTR +NTAPI +HalSetProfileInterval(IN ULONG_PTR Interval) +{ + KEBUGCHECK(0); + return Interval; +} + +VOID +FASTCALL +ExAcquireFastMutex( + PFAST_MUTEX FastMutex) +{ + UNIMPLEMENTED; +} + + +VOID +FASTCALL +ExReleaseFastMutex( + PFAST_MUTEX FastMutex) +{ + UNIMPLEMENTED; +} + + +BOOLEAN FASTCALL +ExTryToAcquireFastMutex( + PFAST_MUTEX FastMutex) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +NTSTATUS +NTAPI +HalAdjustResourceList( + PCM_RESOURCE_LIST Resources) +{ + UNIMPLEMENTED; + + return STATUS_SUCCESS; +} + + +/* + * @implemented + */ +BOOLEAN +NTAPI +HalAllProcessorsStarted(VOID) +{ + /* Do nothing */ + return TRUE; +} + + +NTSTATUS +NTAPI +HalAllocateAdapterChannel( + PADAPTER_OBJECT AdapterObject, + PWAIT_CONTEXT_BLOCK WaitContextBlock, + ULONG NumberOfMapRegisters, + PDRIVER_CONTROL ExecutionRoutine) +{ + UNIMPLEMENTED; + + return STATUS_SUCCESS; +} + + +PVOID +NTAPI +HalAllocateCommonBuffer( + PADAPTER_OBJECT AdapterObject, + ULONG Length, + PPHYSICAL_ADDRESS LogicalAddress, + BOOLEAN CacheEnabled) +{ + UNIMPLEMENTED; + + return NULL; +} + + +PVOID +NTAPI +HalAllocateCrashDumpRegisters( + PADAPTER_OBJECT AdapterObject, + PULONG NumberOfMapRegisters) +{ + UNIMPLEMENTED; + return NULL; +} + + +NTSTATUS +NTAPI +HalAssignSlotResources( + PUNICODE_STRING RegistryPath, + PUNICODE_STRING DriverClassName, + PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT DeviceObject, + INTERFACE_TYPE BusType, + ULONG BusNumber, + ULONG SlotNumber, + PCM_RESOURCE_LIST *AllocatedResources) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +BOOLEAN +NTAPI +HalBeginSystemInterrupt (KIRQL Irql, + ULONG Vector, + PKIRQL OldIrql) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalCalibratePerformanceCounter( + volatile LONG *Count, + ULONGLONG NewCount) +{ + UNIMPLEMENTED; +} + + +BOOLEAN +NTAPI +HalDisableSystemInterrupt( + ULONG Vector, + KIRQL Irql) +{ + UNIMPLEMENTED; + + return TRUE; +} + +VOID +NTAPI +HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters) +{ + // + // Stub since Windows XP implemented Inbv + // + return; +} + +VOID +NTAPI +HalDisplayString(IN PCH String) +{ + // + // Call the Inbv driver + // + InbvDisplayString(String); +} + +VOID +NTAPI +HalQueryDisplayParameters(OUT PULONG DispSizeX, + OUT PULONG DispSizeY, + OUT PULONG CursorPosX, + OUT PULONG CursorPosY) +{ + // + // Stub since Windows XP implemented Inbv + // + return; +} + +VOID +NTAPI +HalSetDisplayParameters(IN ULONG CursorPosX, + IN ULONG CursorPosY) +{ + // + // Stub since Windows XP implemented Inbv + // + return; +} + +BOOLEAN +NTAPI +HalEnableSystemInterrupt( + ULONG Vector, + KIRQL Irql, + KINTERRUPT_MODE InterruptMode) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalEndSystemInterrupt( + KIRQL Irql, + ULONG Unknown2) +{ + UNIMPLEMENTED; +} + + +BOOLEAN +NTAPI +HalFlushCommonBuffer( + ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3, + ULONG Unknown4, + ULONG Unknown5) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalFreeCommonBuffer( + PADAPTER_OBJECT AdapterObject, + ULONG Length, + PHYSICAL_ADDRESS LogicalAddress, + PVOID VirtualAddress, + BOOLEAN CacheEnabled) +{ + UNIMPLEMENTED; +} + + +PADAPTER_OBJECT +NTAPI +HalGetAdapter( + PDEVICE_DESCRIPTION DeviceDescription, + PULONG NumberOfMapRegisters) +{ + UNIMPLEMENTED; + + return (PADAPTER_OBJECT)NULL; +} + + +ULONG +NTAPI +HalGetBusData( + BUS_DATA_TYPE BusDataType, + ULONG BusNumber, + ULONG SlotNumber, + PVOID Buffer, + ULONG Length) +{ + UNIMPLEMENTED; + + return 0; +} + + +ULONG +NTAPI +HalGetBusDataByOffset( + BUS_DATA_TYPE BusDataType, + ULONG BusNumber, + ULONG SlotNumber, + PVOID Buffer, + ULONG Offset, + ULONG Length) +{ + UNIMPLEMENTED; + + return 0; +} + + +ARC_STATUS +NTAPI +HalGetEnvironmentVariable( + PCH Name, + USHORT ValueLength, + PCH Value) +{ + UNIMPLEMENTED; + + return ENOENT; +} + + +ULONG +NTAPI +HalGetInterruptVector( + INTERFACE_TYPE InterfaceType, + ULONG BusNumber, + ULONG BusInterruptLevel, + ULONG BusInterruptVector, + PKIRQL Irql, + PKAFFINITY Affinity) +{ + UNIMPLEMENTED; + + return 0; +} + + +VOID +NTAPI +HalHandleNMI( + PVOID NmiData) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PCHAR CommandLine; + + /* Make sure we have a loader block and command line */ + if ((LoaderBlock) && (LoaderBlock->LoadOptions)) + { + /* Read the command line */ + CommandLine = LoaderBlock->LoadOptions; + + /* Check for initial breakpoint */ + if (strstr(CommandLine, "BREAK")) DbgBreakPoint(); + } +} + +ULONG +HalGetInterruptSource(VOID) +{ + ULONG InterruptStatus; + + // + // Get the interrupt status, and return the highest bit set + // + InterruptStatus = READ_REGISTER_ULONG(VIC_INT_STATUS); + return 31 - _clz(InterruptStatus); +} + +VOID +HalpClockInterrupt(VOID) +{ + // + // Clear the interrupt + // + ASSERT(KeGetCurrentIrql() == CLOCK2_LEVEL); + WRITE_REGISTER_ULONG(TIMER0_INT_CLEAR, 1); + + // + // FIXME: Update HAL Perf counters + // + + // + // FIXME: Check if someone changed the clockrate + // + + // + // Call the kernel + // + KeUpdateSystemTime(KeGetCurrentThread()->TrapFrame, + CLOCK2_LEVEL, + HalpCurrentTimeIncrement); + + // + // We're done + // +} + +VOID +HalpStallInterrupt(VOID) +{ + // + // Clear the interrupt + // + WRITE_REGISTER_ULONG(TIMER0_INT_CLEAR, 1); +} + +VOID +HalpInitializeInterrupts(VOID) +{ + PKPCR Pcr = (PKPCR)KeGetPcr(); + ULONG ClockInterval; + SP804_CONTROL_REGISTER ControlRegister; + + // + // Fill out the IRQL mappings + // + RtlCopyMemory(Pcr->IrqlTable, HalpIrqlTable, sizeof(Pcr->IrqlTable)); + RtlCopyMemory(Pcr->IrqlMask, HalpMaskTable, sizeof(Pcr->IrqlMask)); + + // + // Setup the clock and profile interrupt + // + Pcr->InterruptRoutine[CLOCK2_LEVEL] = HalpStallInterrupt; + + // + // Configure the interval to 10ms + // (INTERVAL (10ms) * TIMCLKfreq (1MHz)) + // --------------------------------------- == 10^4 + // (TIMCLKENXdiv (1) * PRESCALEdiv (1)) + // + ClockInterval = 0x2710; + + // + // Configure the timer + // + ControlRegister.AsUlong = 0; + ControlRegister.Wide = TRUE; + ControlRegister.Periodic = TRUE; + ControlRegister.Interrupt = TRUE; + ControlRegister.Enabled = TRUE; + + // + // Enable the timer + // + WRITE_REGISTER_ULONG(TIMER0_LOAD, ClockInterval); + WRITE_REGISTER_ULONG(TIMER0_CONTROL, ControlRegister.AsUlong); +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +HalInitSystem(IN ULONG BootPhase, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + + // + // Check the boot phase + // + if (!BootPhase) + { + // + // Get command-line parameters + // + HalpGetParameters(LoaderBlock); + +#if DBG + // + // Checked HAL requires checked kernel + // + if (!(Prcb->BuildType & PRCB_BUILD_DEBUG)) + { + // + // No match, bugcheck + // + KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 1, 0); + } +#else + // + // Release build requires release HAL + // + if (Prcb->BuildType & PRCB_BUILD_DEBUG) + { + // + // No match, bugcheck + // + KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 0, 0); + } +#endif + +#ifdef CONFIG_SMP + // + // SMP HAL requires SMP kernel + // + if (Prcb->BuildType & PRCB_BUILD_UNIPROCESSOR) + { + // + // No match, bugcheck + // + KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 0, 0); + } +#endif + + // + // Validate the PRCB + // + if (Prcb->MajorVersion != PRCB_MAJOR_VERSION) + { + // + // Validation failed, bugcheck + // + KeBugCheckEx(MISMATCHED_HAL, 1, Prcb->MajorVersion, 1, 0); + } + + // + // Setup time increments to 10ms and 1ms + // + HalpCurrentTimeIncrement = 100000; + HalpNextTimeIncrement = 100000; + HalpNextIntervalCount = 0; + KeSetTimeIncrement(100000, 10000); + + // + // Initialize interrupts + // + HalpInitializeInterrupts(); + } + else if (BootPhase == 1) + { + // + // Switch to real clock interrupt + // + PCR->InterruptRoutine[CLOCK2_LEVEL] = HalpClockInterrupt; + } + + // + // All done, return + // + return TRUE; +} + + +VOID +NTAPI +HalInitializeProcessor(IN ULONG ProcessorNumber, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + // + // Nothing to do + // + return; +} + + +BOOLEAN +NTAPI +HalMakeBeep( + ULONG Frequency) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalProcessorIdle(VOID) +{ + UNIMPLEMENTED; +} + + +#define RTC_DATA (PVOID)0xE00E8000 + +BOOLEAN +NTAPI +HalQueryRealTimeClock(IN PTIME_FIELDS Time) +{ + LARGE_INTEGER LargeTime; + ULONG Seconds; + + // + // Query the RTC value + // + Seconds = READ_REGISTER_ULONG(RTC_DATA); + + // + // Convert to time + // + RtlSecondsSince1970ToTime(Seconds, &LargeTime); + + // + // Convert to time-fields + // + RtlTimeToTimeFields(&LargeTime, Time); + return TRUE; +} + +ULONG +NTAPI +HalReadDmaCounter( + PADAPTER_OBJECT AdapterObject) +{ + UNIMPLEMENTED; + + return 0; +} + + +VOID +NTAPI +HalReportResourceUsage(VOID) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +HalRequestIpi( + ULONG Unknown) +{ + UNIMPLEMENTED; +} + + +VOID +FASTCALL +HalRequestSoftwareInterrupt(IN KIRQL Request) +{ + // + // Force a software interrupt + // + WRITE_REGISTER_ULONG(VIC_SOFT_INT, 1 << Request); +} + +VOID +FASTCALL +HalClearSoftwareInterrupt(IN KIRQL Request) +{ + // + // Clear a software interrupt + // + WRITE_REGISTER_ULONG(VIC_SOFT_INT_CLEAR, 1 << Request); +} + +VOID +NTAPI +HalReturnToFirmware( + FIRMWARE_REENTRY Action) +{ + UNIMPLEMENTED; +} + + +ULONG +NTAPI +HalSetBusData( + BUS_DATA_TYPE BusDataType, + ULONG BusNumber, + ULONG SlotNumber, + PVOID Buffer, + ULONG Length) +{ + UNIMPLEMENTED; + + return 0; +} + + +ULONG +NTAPI +HalSetBusDataByOffset( + BUS_DATA_TYPE BusDataType, + ULONG BusNumber, + ULONG SlotNumber, + PVOID Buffer, + ULONG Offset, + ULONG Length) +{ + UNIMPLEMENTED; + + return 0; +} + + +ARC_STATUS +NTAPI +HalSetEnvironmentVariable( + PCH Name, + PCH Value) +{ + UNIMPLEMENTED; + + return ESUCCESS; +} + + +BOOLEAN +NTAPI +HalSetRealTimeClock( + PTIME_FIELDS Time) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +ULONG +NTAPI +HalSetTimeIncrement( + ULONG Increment) +{ + UNIMPLEMENTED; + + return Increment; +} + + +BOOLEAN +NTAPI +HalStartNextProcessor(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PKPROCESSOR_STATE ProcessorState) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +ULONG +FASTCALL +HalSystemVectorDispatchEntry( + ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3) +{ + UNIMPLEMENTED; + + return 0; +} + + +BOOLEAN +NTAPI +HalTranslateBusAddress( + INTERFACE_TYPE InterfaceType, + ULONG BusNumber, + PHYSICAL_ADDRESS BusAddress, + PULONG AddressSpace, + PPHYSICAL_ADDRESS TranslatedAddress) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalpAssignDriveLetters(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, + IN PSTRING NtDeviceName, + OUT PUCHAR NtSystemPath, + OUT PSTRING NtSystemPathString) +{ + /* Call the kernel */ + IoAssignDriveLetters(LoaderBlock, + NtDeviceName, + NtSystemPath, + NtSystemPathString); +} + +NTSTATUS +NTAPI +HalpReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + IN OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) +{ + /* Call the kernel */ + return IoReadPartitionTable(DeviceObject, + SectorSize, + ReturnRecognizedPartitions, + PartitionBuffer); +} + +NTSTATUS +NTAPI +HalpWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG SectorsPerTrack, + IN ULONG NumberOfHeads, + IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer) +{ + /* Call the kernel */ + return IoWritePartitionTable(DeviceObject, + SectorSize, + SectorsPerTrack, + NumberOfHeads, + PartitionBuffer); +} + +NTSTATUS +NTAPI +HalpSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG PartitionNumber, + IN ULONG PartitionType) +{ + /* Call the kernel */ + return IoSetPartitionInformation(DeviceObject, + SectorSize, + PartitionNumber, + PartitionType); +} + + +BOOLEAN +NTAPI +IoFlushAdapterBuffers( + PADAPTER_OBJECT AdapterObject, + PMDL Mdl, + PVOID MapRegisterBase, + PVOID CurrentVa, + ULONG Length, + BOOLEAN WriteToDevice) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +IoFreeAdapterChannel( + PADAPTER_OBJECT AdapterObject) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +IoFreeMapRegisters( + PADAPTER_OBJECT AdapterObject, + PVOID MapRegisterBase, + ULONG NumberOfMapRegisters) +{ + UNIMPLEMENTED; +} + + +PHYSICAL_ADDRESS +NTAPI +IoMapTransfer( + PADAPTER_OBJECT AdapterObject, + PMDL Mdl, + PVOID MapRegisterBase, + PVOID CurrentVa, + PULONG Length, + BOOLEAN WriteToDevice) +{ + PHYSICAL_ADDRESS Address; + + UNIMPLEMENTED; + + Address.QuadPart = 0; + + return Address; +} + +VOID +NTAPI +KeFlushWriteBuffer(VOID) +{ + UNIMPLEMENTED; +} + +LARGE_INTEGER +NTAPI +KeQueryPerformanceCounter( + PLARGE_INTEGER PerformanceFreq) +{ + LARGE_INTEGER Value; + + UNIMPLEMENTED; + + Value.QuadPart = 0; + + return Value; +} + +VOID +NTAPI +KeStallExecutionProcessor(IN ULONG Microseconds) +{ + SP804_CONTROL_REGISTER ControlRegister; + + // + // Enable the timer + // + WRITE_REGISTER_ULONG(TIMER1_LOAD, Microseconds); + + // + // Configure the timer + // + ControlRegister.AsUlong = 0; + ControlRegister.OneShot = TRUE; + ControlRegister.Wide = TRUE; + ControlRegister.Periodic = TRUE; + ControlRegister.Enabled = TRUE; + WRITE_REGISTER_ULONG(TIMER1_CONTROL, ControlRegister.AsUlong); + + // + // Now we will loop until the timer reached 0 + // + while (READ_REGISTER_ULONG(TIMER1_VALUE)); +} + +VOID +FASTCALL +KfLowerIrql(IN KIRQL NewIrql) +{ + ULONG InterruptMask; + ARM_STATUS_REGISTER Flags; + PKPCR Pcr = (PKPCR)KeGetPcr(); + + // + // Validate the new IRQL + // + Flags = KeArmStatusRegisterGet(); + _disable(); + ASSERT(NewIrql <= Pcr->CurrentIrql); + + // + // IRQLs are internally 8 bits + // + NewIrql &= 0xFF; + + // + // Setup the interrupt mask for this IRQL + // + InterruptMask = KeGetPcr()->IrqlTable[NewIrql]; +// DPRINT1("[LOWER] IRQL: %d InterruptMask: %lx\n", NewIrql, InterruptMask); + + // + // Clear interrupts associated to the old IRQL + // + WRITE_REGISTER_ULONG(VIC_INT_CLEAR, 0xFFFFFFFF); + + // + // Set the new interrupt mask + // PL190 VIC support only for now + // + WRITE_REGISTER_ULONG(VIC_INT_ENABLE, InterruptMask); + + // + // Save the new IRQL + // + Pcr->CurrentIrql = NewIrql; + if (!Flags.IrqDisable) _enable(); +} + +KIRQL +FASTCALL +KfRaiseIrql(IN KIRQL NewIrql) +{ + KIRQL OldIrql; + ULONG InterruptMask; + ARM_STATUS_REGISTER Flags; + PKPCR Pcr = (PKPCR)KeGetPcr(); + + // + // Save the current IRQL + // + Flags = KeArmStatusRegisterGet(); + _disable(); + OldIrql = Pcr->CurrentIrql; + + // + // IRQLs are internally 8 bits + // + NewIrql &= 0xFF; + + // + // Setup the interrupt mask for this IRQL + // + InterruptMask = KeGetPcr()->IrqlTable[NewIrql]; + // DPRINT1("[RAISE] IRQL: %d InterruptMask: %lx\n", NewIrql, InterruptMask); + ASSERT(NewIrql >= OldIrql); + + // + // Clear interrupts associated to the old IRQL + // + WRITE_REGISTER_ULONG(VIC_INT_CLEAR, 0xFFFFFFFF); + + // + // Set the new interrupt mask + // PL190 VIC support only for now + // + WRITE_REGISTER_ULONG(VIC_INT_ENABLE, InterruptMask); + + // + // Save the new IRQL + // + Pcr->CurrentIrql = NewIrql; + if (!Flags.IrqDisable) _enable(); + return OldIrql; +} + +VOID +NTAPI +READ_PORT_BUFFER_UCHAR( + PUCHAR Port, + PUCHAR Buffer, + ULONG Count) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +READ_PORT_BUFFER_ULONG( + PULONG Port, + PULONG Buffer, + ULONG Count) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +READ_PORT_BUFFER_USHORT( + PUSHORT Port, + PUSHORT Buffer, + ULONG Count) +{ + UNIMPLEMENTED; +} + + +UCHAR +NTAPI +READ_PORT_UCHAR( + PUCHAR Port) +{ + UNIMPLEMENTED; + + return 0; +} + + +ULONG +NTAPI +READ_PORT_ULONG( + PULONG Port) +{ + UNIMPLEMENTED; + + return 0; +} + + +USHORT +NTAPI +READ_PORT_USHORT( + PUSHORT Port) +{ + UNIMPLEMENTED; + + return 0; +} + + +VOID +NTAPI +WRITE_PORT_BUFFER_UCHAR( + PUCHAR Port, + PUCHAR Buffer, + ULONG Count) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +WRITE_PORT_BUFFER_USHORT( + PUSHORT Port, + PUSHORT Buffer, + ULONG Count) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +WRITE_PORT_BUFFER_ULONG( + PULONG Port, + PULONG Buffer, + ULONG Count) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +WRITE_PORT_UCHAR( + PUCHAR Port, + UCHAR Value) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WRITE_PORT_ULONG( + PULONG Port, + ULONG Value) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WRITE_PORT_USHORT( + PUSHORT Port, + USHORT Value) +{ + UNIMPLEMENTED; +} + +KIRQL +KeRaiseIrqlToDpcLevel(VOID) +{ + // + // Call the generic routine + // + return KfRaiseIrql(DISPATCH_LEVEL); +} + +KIRQL +KeRaiseIrqlToSynchLevel(VOID) +{ + // + // Call the generic routine + // + return KfRaiseIrql(DISPATCH_LEVEL); +} + +BOOLEAN HalpProcessorIdentified; +BOOLEAN HalpTestCleanSupported; + +VOID +HalpIdentifyProcessor(VOID) +{ + ARM_ID_CODE_REGISTER IdRegister; + + // + // Don't do it again + // + HalpProcessorIdentified = TRUE; + + // + // Read the ID Code + // + IdRegister = KeArmIdCodeRegisterGet(); + + // + // Architecture "6" CPUs support test-and-clean (926EJ-S and 1026EJ-S) + // + HalpTestCleanSupported = (IdRegister.Architecture == 6); +} + +VOID +HalSweepDcache(VOID) +{ + // + // We get called very early on, before HalInitSystem or any of the Hal* + // processor routines, so we need to figure out what CPU we're on. + // + if (!HalpProcessorIdentified) HalpIdentifyProcessor(); + + // + // Check if we can do it the ARMv5TE-J way + // + if (HalpTestCleanSupported) + { + // + // Test, clean, flush D-Cache + // + __asm__ __volatile__ ("1: mrc p15, 0, pc, c7, c14, 3; bne 1b"); + } + else + { + // + // We need to do it it by set/way + // + UNIMPLEMENTED; + } +} + +VOID +HalSweepIcache(VOID) +{ + // + // All ARM cores support the same Icache flush command, no need for HAL work + // + KeArmFlushIcache(); +} + +/* + * @implemented + */ +#undef KeGetCurrentIrql +KIRQL +NTAPI +KeGetCurrentIrql(VOID) +{ + /* Return IRQL */ + return PCR->CurrentIrql; +} + +/* + * @implemented + */ +VOID +NTAPI +KeLowerIrql(KIRQL NewIrql) +{ + /* Call the fastcall function */ + KfLowerIrql(NewIrql); +} + +/* + * @implemented + */ +VOID +NTAPI +KeRaiseIrql(KIRQL NewIrql, + PKIRQL OldIrql) +{ + /* Call the fastcall function */ + *OldIrql = KfRaiseIrql(NewIrql); +} + +/* + * @implemented + */ +VOID +NTAPI +KeAcquireSpinLock(PKSPIN_LOCK SpinLock, + PKIRQL OldIrql) +{ + /* Call the fastcall function */ + *OldIrql = KfAcquireSpinLock(SpinLock); +} + +/* + * @implemented + */ +KIRQL +FASTCALL +KeAcquireSpinLockRaiseToSynch(PKSPIN_LOCK SpinLock) +{ + /* Simply raise to dispatch */ + return KfRaiseIrql(DISPATCH_LEVEL); +} + +/* + * @implemented + */ +VOID +NTAPI +KeReleaseSpinLock(PKSPIN_LOCK SpinLock, + KIRQL NewIrql) +{ + /* Call the fastcall function */ + KfReleaseSpinLock(SpinLock, NewIrql); +} + +/* + * @implemented + */ +KIRQL +FASTCALL +KfAcquireSpinLock(PKSPIN_LOCK SpinLock) +{ + /* Simply raise to dispatch */ + return KfRaiseIrql(DISPATCH_LEVEL); +} + +/* + * @implemented + */ +VOID +FASTCALL +KfReleaseSpinLock(PKSPIN_LOCK SpinLock, + KIRQL OldIrql) +{ + /* Simply lower IRQL back */ + KfLowerIrql(OldIrql); +} + +/* + * @implemented + */ +KIRQL +FASTCALL +KeAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) +{ + /* Simply raise to dispatch */ + return KfRaiseIrql(DISPATCH_LEVEL); +} + +/* + * @implemented + */ +KIRQL +FASTCALL +KeAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) +{ + /* Simply raise to dispatch */ + return KfRaiseIrql(DISPATCH_LEVEL); +} + +/* + * @implemented + */ +VOID +FASTCALL +KeAcquireInStackQueuedSpinLock(IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + /* Simply raise to dispatch */ + LockHandle->OldIrql = KfRaiseIrql(DISPATCH_LEVEL); +} + +/* + * @implemented + */ +VOID +FASTCALL +KeAcquireInStackQueuedSpinLockRaiseToSynch(IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + /* Simply raise to synch */ + LockHandle->OldIrql = KfRaiseIrql(DISPATCH_LEVEL); +} + +/* + * @implemented + */ +VOID +FASTCALL +KeReleaseQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, + IN KIRQL OldIrql) +{ + /* Simply lower IRQL back */ + KfLowerIrql(OldIrql); +} + +/* + * @implemented + */ +VOID +FASTCALL +KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + /* Simply lower IRQL back */ + KfLowerIrql(LockHandle->OldIrql); +} + +/* + * @implemented + */ +BOOLEAN +FASTCALL +KeTryToAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, + IN PKIRQL OldIrql) +{ + /* Simply raise to dispatch */ + *OldIrql = KfRaiseIrql(DISPATCH_LEVEL); + + /* Always return true on UP Machines */ + return TRUE; +} + +/* + * @implemented + */ +LOGICAL +FASTCALL +KeTryToAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, + OUT PKIRQL OldIrql) +{ + /* Simply raise to dispatch */ + *OldIrql = KfRaiseIrql(DISPATCH_LEVEL); + + /* Always return true on UP Machines */ + return TRUE; +} + +/* EOF */ Propchange: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/ros-amd64-bringup/reactos/hal/halamd64/hal_generic.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/hal_generic.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/hal_generic.c (removed) @@ -1,34 +1,0 @@ -/* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halamd64/ - * PURPOSE: I/O HAL Routines for Disk Access - * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS *****************************************************************/ - - - - -NTSTATUS -NTAPI -HalpSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG PartitionNumber, - IN ULONG PartitionType) -{ - /* Call the kernel */ - return IoSetPartitionInformation(DeviceObject, - SectorSize, - PartitionNumber, - PartitionType); -} - - Removed: branches/ros-amd64-bringup/reactos/hal/halamd64/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/hal_generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/hal_generic.rbuild (removed) @@ -1,11 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> -<group> - <module name="hal_generic" type="objectlibrary"> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_NTHAL_" /> - <file>hal_generic.c</file> - </module> -</group> Added: branches/ros-amd64-bringup/reactos/hal/halamd64/include/hal.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/include/hal.h (added) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/include/hal.h [iso-8859-1] Sat Jul 26 16:18:00 2008 @@ -1,0 +1,43 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: hal/halarm/include/hal.h + * PURPOSE: Hardware Abstraction Layer Header + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES ******************************************************************/ + +/* C Headers */ +#include <stdio.h> + +/* WDK HAL Compilation hack */ +#ifdef _MSC_VER +#include <excpt.h> +#include <ntdef.h> +#undef _NTHAL_ +#undef DECLSPEC_IMPORT +#define DECLSPEC_IMPORT +#define __declspec(dllimport) +#endif + +/* IFS/DDK/NDK Headers */ +#include <ntifs.h> +#include <bugcodes.h> +#include <ntdddisk.h> +#include <arc/arc.h> +#include <iotypes.h> +#include <kefuncs.h> +#include <intrin.h> +#include <halfuncs.h> +#include <iofuncs.h> +#include <ldrtypes.h> +#include <obfuncs.h> + +/* Internal HAL Headers */ +#include "halp.h" + +/* Helper Header */ +#include <reactos/helper.h> + +/* EOF */ Propchange: branches/ros-amd64-bringup/reactos/hal/halamd64/include/hal.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/hal/halamd64/include/halp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/include/halp.h (added) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/include/halp.h [iso-8859-1] Sat Jul 26 16:18:00 2008 @@ -1,0 +1,22 @@ +#ifndef __INTERNAL_HAL_HAL_H +#define __INTERNAL_HAL_HAL_H + +// +// ARM Headers +// +#include <internal/arm/ke.h> +#include <internal/arm/intrin_i.h> + +// +// Versatile Peripherals +// +#include <peripherals/pl011.h> +#include <peripherals/pl190.h> +#include <peripherals/sp804.h> + +// +// WDK Hack +// +#define KdComPortInUse _KdComPortInUse + +#endif /* __INTERNAL_HAL_HAL_H */ Propchange: branches/ros-amd64-bringup/reactos/hal/halamd64/include/halp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/hal/halamd64/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/up/halinit_up.c (added) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/up/halinit_up.c [iso-8859-1] Sat Jul 26 16:18:00 2008 @@ -1,0 +1,32 @@ +/* $Id: halinit_up.c 24964 2006-11-29 08:28:20Z ion $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/hal/x86/halinit.c + * PURPOSE: Initalize the x86 hal + * PROGRAMMER: David Welch (welch(a)cwcom.net) + * UPDATE HISTORY: + * 11/06/98: Created + */ + +/* INCLUDES *****************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ***************************************************************/ + +VOID +HalpInitPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + +} + +VOID +HalpInitPhase1(VOID) +{ + +} + +/* EOF */ Propchange: branches/ros-amd64-bringup/reactos/hal/halamd64/up/halinit_up.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild (added) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1] Sat Jul 26 16:18:00 2008 @@ -1,0 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="halarm_up" type="kernelmodedll" installbase="system32" installname="hal.dll"> + <importlibrary definition="../../hal/hal_amd64.def" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <include base="halamd64_generic">../include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <library>halamd64_generic</library> + <library>ntoskrnl</library> + <file>halinit_up.c</file> + <file>halup.rc</file> +</module> Propchange: branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rc (added) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rc [iso-8859-1] Sat Jul 26 16:18:00 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "AMD64 Uniprocessor Hardware Abstraction Layer\0" +#define REACTOS_STR_INTERNAL_NAME "halup\0" +#define REACTOS_STR_ORIGINAL_FILENAME "halup.dll\0" +#include <reactos/version.rc> Propchange: branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rc ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 1 month

[tkreuzer] 34811: on amd64 KfAcquireSpinLock, KfReleaseSpinLock, KeAcquireInStackQueuedSpinLock and KeReleaseInStackQueuedSpinLock belong to ntoskrnl, not to hal.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jul 26 16:13:25 2008 New Revision: 34811 URL: http://svn.reactos.org/svn/reactos?rev=34811&view=rev Log: on amd64 KfAcquireSpinLock, KfReleaseSpinLock, KeAcquireInStackQueuedSpinLock and KeReleaseInStackQueuedSpinLock belong to ntoskrnl, not to hal. Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Sat Jul 26 16:13:25 2008 @@ -5817,6 +5817,20 @@ KefReleaseSpinLockFromDpcLevel( IN PKSPIN_LOCK SpinLock); +#if defined(_M_AMD64) +NTKERNELAPI +KIRQL +FASTCALL +KfAcquireSpinLock( + IN PKSPIN_LOCK SpinLock); + +NTKERNELAPI +VOID +FASTCALL +KfReleaseSpinLock( + IN PKSPIN_LOCK SpinLock, + IN KIRQL NewIrql); +#else NTHALAPI KIRQL FASTCALL @@ -5829,6 +5843,7 @@ KfReleaseSpinLock( IN PKSPIN_LOCK SpinLock, IN KIRQL NewIrql); +#endif NTKERNELAPI BOOLEAN @@ -9322,12 +9337,33 @@ /** Kernel routines **/ -NTHALAPI +#if defined (_M_AMD64) +NTKERNELAPI VOID FASTCALL KeAcquireInStackQueuedSpinLock( IN PKSPIN_LOCK SpinLock, IN PKLOCK_QUEUE_HANDLE LockHandle); + +NTKERNELAPI +VOID +FASTCALL +KeReleaseInStackQueuedSpinLock( + IN PKLOCK_QUEUE_HANDLE LockHandle); +#else +NTHALAPI +VOID +FASTCALL +KeAcquireInStackQueuedSpinLock( + IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHandle); + +NTHALAPI +VOID +FASTCALL +KeReleaseInStackQueuedSpinLock( + IN PKLOCK_QUEUE_HANDLE LockHandle); +#endif NTKERNELAPI VOID @@ -9585,12 +9621,6 @@ IN PVOID Buffer, IN ULONG Length, IN PUCHAR Component); - -NTHALAPI -VOID -FASTCALL -KeReleaseInStackQueuedSpinLock( - IN PKLOCK_QUEUE_HANDLE LockHandle); NTKERNELAPI VOID

16 years, 1 month

[jmorlan] 34810: In mkdir, don't add a backslash to the end - it can trick CreateDirectory into creating a dir with the name of a DOS device (even in Windows).

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sat Jul 26 12:15:37 2008 New Revision: 34810 URL: http://svn.reactos.org/svn/reactos?rev=34810&view=rev Log: In mkdir, don't add a backslash to the end - it can trick CreateDirectory into creating a dir with the name of a DOS device (even in Windows). Modified: trunk/reactos/base/shell/cmd/internal.c Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Sat Jul 26 12:15:37 2008 @@ -439,16 +439,16 @@ p += 2; while (*p == _T('\\')) p++; /* skip drive root */ - while ((p = _tcschr(p, _T('\\'))) != NULL) + do { - n = p - DirPath + 1; + p = _tcschr(p, _T('\\')); + n = p ? p++ - DirPath : _tcslen(DirPath); _tcsncpy(path, DirPath, n); path[n] = _T('\0'); if( !CreateDirectory(path, NULL) && (GetLastError() != ERROR_ALREADY_EXISTS)) return FALSE; - p++; - } + } while (p != NULL); if (GetLastError() == ERROR_ALREADY_EXISTS) SetLastError(ERROR_SUCCESS); @@ -463,7 +463,7 @@ { LPTSTR dir; /* pointer to the directory to change to */ LPTSTR place; /* used to search for the \ when no space is used */ - LPTSTR new_dir, *p = NULL; + LPTSTR *p = NULL; INT argc; nErrorLevel = 0; if (!_tcsncmp (param, _T("/?"), 2)) @@ -514,17 +514,6 @@ if(p != NULL) freep (p); return 1; - } - - /* Add a \ at the end of the path is there isnt on already */ - if (dir[_tcslen (dir) - 1] != _T('\\')) - { - new_dir = cmd_realloc(dir, (_tcslen (dir) + 2) * sizeof(TCHAR)); - if (new_dir != NULL) - { - p[0] = dir = new_dir; - _tcscat(dir,_T("\\")); - } } if (!MakeFullPath(dir))

16 years, 1 month

[dchapyshev] 34809: - Update Russian translation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Jul 26 10:50:14 2008 New Revision: 34809 URL: http://svn.reactos.org/svn/reactos?rev=34809&view=rev Log: - Update Russian translation Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc [iso-8859-1] Sat Jul 26 10:50:14 2008 @@ -15,7 +15,7 @@ CONTROL "\n\nÏðèìåð òåêñòà", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 CONTROL "Îòîáðàæàòü âðåìÿ êîìïèëÿöèè", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 CONTROL "Âåñòè ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 - CONTROL "Èñïîëüçîâàòü êýøèðîâàíèå", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 + CONTROL "Èñïîëüçîâàòü êåøèðîâàíèå", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 CONTROL "Âûðåçàòü ïóñòîé êîä ïðè êîìïèë.", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 CONTROL "Ïóòü ê êàòàëîãó îáúåêòîâ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 CONTROL "Ïóòü ê êàòàëîãó âûâîäà", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 @@ -28,7 +28,7 @@ EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + PUSHBUTTON "Îòìåíà", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP CONTROL "Ââåäåíèå", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 END @@ -52,7 +52,7 @@ CLR15, "ßðêî-áåëûé" MSG_NOGCCFOUND, "Êîìïèëÿòîð GCC íå íàéäåí! Ïðîâåðüòå ïðàâèëüíîñòü óñòàíîâêè." MSG_FILEFAILED, "Íåâîçìîæíî ñîçäàòü ôàéë rosbe-options.cmd" - MSG_DIREFAILED, "Failed to create directory!" + MSG_DIREFAILED, "Íå óäàëîñü ñîçäàòü äèðåêòîðèþ!" MSG_SETLOADSUC, "Ðàíåå ñîõðàíåííûå íàñòðîéêè çàãðóæåíû." MSG_FINDLOGDIR, "Óêàæèòå êàòàëîã ñîõðàíåíèÿ ëîã-ôàéëîâ:" MSG_FINDMGWDIR, "Óêàæèòå êàòàëîã ðàñïîëîæåíèÿ êîìïèëÿòîðà MinGW:" @@ -60,18 +60,18 @@ MSG_FINDOUTDIR, "Óêàæèòå êàòàëîã ñîõðàíåíèÿ êîìïèëèðîâàííûõ ôàéëîâ:" MSG_WARNINGBOX, "Âíèìàíèå!" MSG_EXITCHANGE, "Âû çàêðûâàåòå ïðîãðàììó íå ñîõðàíèâ íàñòðîéêè?" - MSG_INVALIDDIR, "The directory you entered doesn't exist. Do you want to create it?" + MSG_INVALIDDIR, "Óêàçàííàÿ äèðåêòîðèÿ íå ñóùåñòâóåò. Ñîçäàòü åå?" /* Help Strings */ HLP_BACKCOLORC, "Âûáåðèòå öâåò ôîíà â îêíå êîíñîëè RosBE" HLP_FONTCOLORC, "Âûáåðèòå öâåò øðèôòà â îêíå êîíñîëè RosBE" HLP_SBUILDTIME, "Ïîçâîëÿåò âèäåòü âðåìÿ çàòðà÷åííîå îò íà÷àëà äî êîíöà ïðîöåññà êîìïèëÿöèè" - HLP_CCACHEUSED, "Îòìåòüòå òóò åñëè âû õîòèòå èñïîëüçîâàòü êýø êîìïèëÿòîðà" - HLP_STRIPEDEXE, "Îòìåòüòå òóò åñëè âû õîòèòå óäàëèòü íåèñïîëüçóåìûé êîä èç èñïîëíÿåìûõ ôàéëîâ" - HLP_FINDMGWDIR, "Ýòîò ïàðàìåòð îïðåäåëÿåò ðàñïîëîæåíèå MingW" + HLP_CCACHEUSED, "Îòìåòüòå åñëè âû õîòèòå èñïîëüçîâàòü êåø êîìïèëÿòîðà" + HLP_STRIPEDEXE, "Îòìåòüòå åñëè âû õîòèòå óäàëèòü íåèñïîëüçóåìûé êîä èç èñïîëíÿåìûõ ôàéëîâ" + HLP_FINDMGWDIR, "Ýòîò ïàðàìåòð îïðåäåëÿåò ðàñïîëîæåíèå MinGW" HLP_FINDLOGDIR, "Ýòîò ïàðàìåòð îïðåäåëÿåò ìåñòî ñîõðàíåíèÿ ëîãîâ" HLP_FINDOBJDIR, "Ýòîò ïàðàìåòð îïðåäåëÿåò ìåñòî äëÿ õðàíåíèÿ ôàéëîâ îáúåêòíûõ ìîäóëåé" HLP_FINDOUTDIR, "Ýòîò ïàðàìåòð îïðåäåëÿåò ìåñòî äëÿ ñîõðàíåíèÿ îòêîìïèëèðîâàííûõ èñïîëíÿåìûõ ôàéëîâ" HLP_SAVEBUTTON, "Àêòèâíîå ñîñòîÿíèå êíîïêè óêàçûâàåò íà âîçìîæíîñòü ñîõðàíåíèÿ èçìåíåííûõ íàñòðîåê" HLP_QUITBUTTON, "Ýòî êëàâèøà ïîçâîëÿåò âûéòè áåç ñîõðàíåíèÿ èçìåíåíèé" - HLP_DEFAULTMSG, "Ïîäñêàçêà ïî óñòàíîâêàì ïî óìîë÷àíèþ" + HLP_DEFAULTMSG, "Ïîìîùü ïî èçíà÷àëüíûì ïàðàìåòðàì" END

16 years, 1 month

← Newer
1
...
15
16
17
18
19
20
21
...
77
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008