Ros-diffs April 2011

ros-diffs@reactos.org

19 participants
296 discussions

[tkreuzer] 51242: [CMAKE] - Add HAVE_GETPAGESIZE to host config.h. should fix linux build (fix by Sylvain) - uncomment @echo off in configure script - Move a DECLSPEC_NORETURN
by tkreuzer＠svn.reactos.org 03 Apr '11

03 Apr '11

Author: tkreuzer Date: Sun Apr 3 20:21:04 2011 New Revision: 51242 URL: http://svn.reactos.org/svn/reactos?rev=51242&view=rev Log: [CMAKE] - Add HAVE_GETPAGESIZE to host config.h. should fix linux build (fix by Sylvain) - uncomment @echo off in configure script - Move a DECLSPEC_NORETURN Modified: branches/cmake-bringup/configure.cmd branches/cmake-bringup/include/host/config.h branches/cmake-bringup/include/xdk/kefuncs.h Modified: branches/cmake-bringup/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.cmd?rev… ============================================================================== --- branches/cmake-bringup/configure.cmd [iso-8859-1] (original) +++ branches/cmake-bringup/configure.cmd [iso-8859-1] Sun Apr 3 20:21:04 2011 @@ -1,4 +1,4 @@ -::@echo off +@echo off :: Get the source root directory set REACTOS_SOURCE_DIR=%~dp0 Modified: branches/cmake-bringup/include/host/config.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/host/conf… ============================================================================== --- branches/cmake-bringup/include/host/config.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/host/config.h [iso-8859-1] Sun Apr 3 20:21:04 2011 @@ -7,6 +7,9 @@ /* Define to 1 if you have the <float.h> header file. */ #define HAVE_FLOAT_H 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 Modified: branches/cmake-bringup/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/xdk/kefun… ============================================================================== --- branches/cmake-bringup/include/xdk/kefuncs.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/xdk/kefuncs.h [iso-8859-1] Sun Apr 3 20:21:04 2011 @@ -207,8 +207,8 @@ } #endif -NTKERNELAPI -//DECLSPEC_NORETURN +DECLSPEC_NORETURN +NTKERNELAPI VOID NTAPI KeBugCheckEx(

1 0

[gedmurphy] 51241: [FULLFAT] - Add the kernel APIs required by the library
by gedmurphy＠svn.reactos.org 03 Apr '11

03 Apr '11

Author: gedmurphy Date: Sun Apr 3 16:22:15 2011 New Revision: 51241 URL: http://svn.reactos.org/svn/reactos?rev=51241&view=rev Log: [FULLFAT] - Add the kernel APIs required by the library Modified: trunk/reactos/lib/3rdparty/fullfat/ff_safety.c Modified: trunk/reactos/lib/3rdparty/fullfat/ff_safety.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_sa… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/ff_safety.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/ff_safety.c [iso-8859-1] Sun Apr 3 16:22:15 2011 @@ -55,50 +55,113 @@ **/ #include "ff_safety.h" // Íncludes ff_types.h +#include <ntifs.h> +#define TAG_FULLFAT 'FLUF' + +// Call your OS's CreateSemaphore function +// void *FF_CreateSemaphore(void) { - // Call your OS's CreateSemaphore function - // + PKSEMAPHORE ProcessSemaphore; - // return pointer to semaphore - return NULL; // Comment this out for your implementation. + /* Allocate some memory to store the semaphore */ + ProcessSemaphore = ExAllocatePoolWithTag(NonPagedPool, + sizeof(KSEMAPHORE), + TAG_FULLFAT); + if (ProcessSemaphore) + { + /* Initialize it */ + KeInitializeSemaphore(ProcessSemaphore, + 0, + MAXLONG); + } + + return ProcessSemaphore; } +// Call your OS's PendSemaphore with the provided pSemaphore pointer. +// +// This should block indefinitely until the Semaphore +// becomes available. (No timeout!) +// If your OS doesn't do it for you, you should sleep +// this thread until the Semaphore is available. void FF_PendSemaphore(void *pSemaphore) { - // Call your OS's PendSemaphore with the provided pSemaphore pointer. - // - // This should block indefinitely until the Semaphore - // becomes available. (No timeout!) - // If your OS doesn't do it for you, you should sleep - // this thread until the Semaphore is available. - pSemaphore = 0; + NTSTATUS Status; + + /* Sanity check */ + if (pSemaphore) + { + /* Wait for the sempaphore to become signaled */ + Status = KeWaitForSingleObject(pSemaphore, + Executive, + KernelMode, + FALSE, + NULL); + if (NT_SUCCESS(Status)) + { + if (Status != STATUS_SUCCESS) + { + // log an error? + } + } + else + { + // log an error? + } + } } +// Call your OS's ReleaseSemaphore with the provided pSemaphore pointer. +// void FF_ReleaseSemaphore(void *pSemaphore) { - // Call your OS's ReleaseSemaphore with the provided pSemaphore pointer. - // - // - pSemaphore = 0; + /* Sanity check */ + if (pSemaphore) + { + /* Increment the semaphore */ + KeReleaseSemaphore(pSemaphore, + 0, + 1, + FALSE); + } } +// Call your OS's DestroySemaphore with the provided pSemaphore pointer. +// void FF_DestroySemaphore(void *pSemaphore) { - // Call your OS's DestroySemaphore with the provided pSemaphore pointer. - // - // - pSemaphore = 0; + /* Sanity check */ + if (pSemaphore) + { + /* Free the semaphore memory */ + ExFreePoolWithTag(pSemaphore, + TAG_FULLFAT); + } } +// FIXME: what do we do with this? void FF_Yield(void) { // Call your OS's thread Yield function. // If this doesn't work, then a deadlock will occur } +// Call your OS's thread sleep function, +// Sleep for TimeMs milliseconds void FF_Sleep(FF_T_UINT32 TimeMs) { - // Call your OS's thread sleep function, - // Sleep for TimeMs milliseconds - TimeMs = 0; + LARGE_INTEGER Interval; + NTSTATUS Status; + + /* Calculate the interval */ + Interval.QuadPart = -((LONGLONG)TimeMs * 10000); + + /* Do the wait */ + Status = KeDelayExecutionThread(KernelMode, + FALSE, + &Interval); + if (!NT_SUCCESS(Status)) + { + // log an error? + } }

1 0

[ekohl] 51240: [LSASRV] Fix typos in lsa.idl (LsarLookupNames2, LsarLookupNames3 and LsarLookupNames4) and fix resulting errors in lsasrv.dll.
by ekohl＠svn.reactos.org 03 Apr '11

03 Apr '11

Author: ekohl Date: Sun Apr 3 14:51:18 2011 New Revision: 51240 URL: http://svn.reactos.org/svn/reactos?rev=51240&view=rev Log: [LSASRV] Fix typos in lsa.idl (LsarLookupNames2, LsarLookupNames3 and LsarLookupNames4) and fix resulting errors in lsasrv.dll. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/include/reactos/idl/lsa.idl Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Apr 3 14:51:18 2011 @@ -1185,7 +1185,7 @@ DWORD Count, PRPC_UNICODE_STRING Names, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, - PLSAPR_TRANSLATED_SID_EX TranslatedSids, + PLSAPR_TRANSLATED_SIDS_EX TranslatedSids, LSAP_LOOKUP_LEVEL LookupLevel, DWORD *MappedCount, DWORD LookupOptions, @@ -1287,7 +1287,7 @@ DWORD Count, PRPC_UNICODE_STRING Names, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, - PLSAPR_TRANSLATED_SID_EX2 TranslatedSids, + PLSAPR_TRANSLATED_SIDS_EX2 TranslatedSids, LSAP_LOOKUP_LEVEL LookupLevel, DWORD *MappedCount, DWORD LookupOptions, @@ -1391,7 +1391,7 @@ DWORD Count, PRPC_UNICODE_STRING Names, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, - PLSAPR_TRANSLATED_SID_EX2 TranslatedSids, + PLSAPR_TRANSLATED_SIDS_EX2 TranslatedSids, LSAP_LOOKUP_LEVEL LookupLevel, DWORD *MappedCount, DWORD LookupOptions, Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sun Apr 3 14:51:18 2011 @@ -975,7 +975,7 @@ [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, - [in, out] PLSAPR_TRANSLATED_SID_EX TranslatedSids, + [in, out] PLSAPR_TRANSLATED_SIDS_EX TranslatedSids, [in] LSAP_LOOKUP_LEVEL LookupLevel, [in, out] DWORD *MappedCount, [in] DWORD LookupOptions, @@ -1029,7 +1029,7 @@ [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, - [in, out] PLSAPR_TRANSLATED_SID_EX2 TranslatedSids, + [in, out] PLSAPR_TRANSLATED_SIDS_EX2 TranslatedSids, [in] LSAP_LOOKUP_LEVEL LookupLevel, [in, out] DWORD *MappedCount, [in] DWORD LookupOptions, @@ -1088,7 +1088,7 @@ [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, - [in, out] PLSAPR_TRANSLATED_SID_EX2 TranslatedSids, + [in, out] PLSAPR_TRANSLATED_SIDS_EX2 TranslatedSids, [in] LSAP_LOOKUP_LEVEL LookupLevel, [in, out] DWORD *MappedCount, [in] DWORD LookupOptions,

1 0

[jimtabor] 51239: [Win32k] - Fix DDE test crash. it's a band-aide. - Fix the last two post quite message test, all pass now.
by jimtabor＠svn.reactos.org 03 Apr '11

03 Apr '11

Author: jimtabor Date: Sun Apr 3 12:22:00 2011 New Revision: 51239 URL: http://svn.reactos.org/svn/reactos?rev=51239&view=rev Log: [Win32k] - Fix DDE test crash. it's a band-aide. - Fix the last two post quite message test, all pass now. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c 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] Sun Apr 3 12:22:00 2011 @@ -320,6 +320,7 @@ { PMSGMEMORY MsgMemoryEntry; PVOID PackedData; + SIZE_T size; MsgMemoryEntry = FindMsgMemory(Msg); @@ -328,7 +329,13 @@ /* Keep previous behavior */ return STATUS_SUCCESS; } - PackedData = ExAllocatePoolWithTag(NonPagedPool, MsgMemorySize(MsgMemoryEntry, wParam, lParam), TAG_MSG); + size = MsgMemorySize(MsgMemoryEntry, wParam, lParam); + if (!size) + { + DPRINT1("No size for lParamPacked\n"); + return STATUS_SUCCESS; + } + PackedData = ExAllocatePoolWithTag(NonPagedPool, size, TAG_MSG); RtlCopyMemory(PackedData, (PVOID)lParam, MsgMemorySize(MsgMemoryEntry, wParam, lParam)); *lParamPacked = (LPARAM)PackedData; } @@ -937,11 +944,7 @@ co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)pMsg); - if ( bGMSG ) - { - Present = (WM_QUIT != pMsg->message); - break; - } + if ( bGMSG ) break; } if ( bGMSG ) @@ -1044,7 +1047,6 @@ PTHREADINFO pti; MSG Message, KernelModeMsg; LARGE_INTEGER LargeTickCount; - PMSGMEMORY MsgMemoryEntry; Message.hwnd = Wnd; Message.message = Msg; @@ -1054,11 +1056,18 @@ KeQueryTickCount(&LargeTickCount); Message.time = MsqCalculateMessageTime(&LargeTickCount); - MsgMemoryEntry = FindMsgMemory(Message.message); + if (is_pointer_message(Message.message)) + { + EngSetLastError(ERROR_MESSAGE_SYNC_ONLY ); + return FALSE; + } if( Msg >= WM_DDE_FIRST && Msg <= WM_DDE_LAST ) { NTSTATUS Status; + PMSGMEMORY MsgMemoryEntry; + + MsgMemoryEntry = FindMsgMemory(Message.message); Status = CopyMsgToKernelMem(&KernelModeMsg, &Message, MsgMemoryEntry); if (! NT_SUCCESS(Status)) @@ -1075,12 +1084,6 @@ ExFreePool((PVOID) KernelModeMsg.lParam); return TRUE; - } - - if (is_pointer_message(Message.message)) - { - EngSetLastError(ERROR_MESSAGE_SYNC_ONLY ); - return FALSE; } if (!Wnd) @@ -1276,8 +1279,8 @@ if (STATUS_TIMEOUT == Status) { - /* -MSDN says: +/* + MSDN says: Microsoft Windows 2000: If GetLastError returns zero, then the function timed out. XP+ : If the function fails or times out, the return value is zero. @@ -1873,7 +1876,7 @@ _SEH2_END; } - return Ret; + return Ret ? (WM_QUIT != pMsg->message) : FALSE; } BOOL APIENTRY

1 0

[fireball] 51238: [KERNEL32] - Rewrite large part of ldr.c code, including FreeLibrary, FreeLibraryAndExitThread, GetModuleFileNameA/W, GetModuleHandleA/W, ExA/W. Now they properly validate paramet...
by fireball＠svn.reactos.org 03 Apr '11

03 Apr '11

Author: fireball Date: Sun Apr 3 09:42:08 2011 New Revision: 51238 URL: http://svn.reactos.org/svn/reactos?rev=51238&view=rev Log: [KERNEL32] - Rewrite large part of ldr.c code, including FreeLibrary, FreeLibraryAndExitThread, GetModuleFileNameA/W, GetModuleHandleA/W, ExA/W. Now they properly validate parameters, common code for getting module handles is factored into a standalone function which is reused for all 4 APIs instead of duplicating almost the same code four times. GetModuleFileNameA became a typical A->W wrapper around GetModuleFileNameW so duplication is also removed there. - Getting module handle also became a correct implementation because now it takes process's dll path into account instead of always assuming a "default" one (which is incompatible with a new ntdll loader). - Fixed a typo in BasepGetProcessPath which led to incorrect value being returned. Downgrade two debugprints. Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c trunk/reactos/dll/win32/kernel32/process/procsup.c Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Sun Apr 3 09:42:08 2011 @@ -1,10 +1,10 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT : ReactOS user mode libraries * MODULE : kernel32.dll - * FILE : reactos/lib/kernel32/misc/ldr.c - * AUTHOR : Ariadne + * FILE : reactos/dll/win32/kernel32/misc/ldr.c + * AUTHOR : Aleksey Bragin <aleksey(a)reactos.org> + * Ariadne */ #include <k32.h> @@ -22,7 +22,52 @@ extern BOOLEAN InWindows; extern WaitForInputIdleType lpfnGlobalRegisterWaitForInputIdle; +#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL 1 +#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS 2 +#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_CONTINUE 3 + /* FUNCTIONS ****************************************************************/ + +DWORD +WINAPI +BasepGetModuleHandleExParameterValidation(DWORD dwFlags, + LPCWSTR lpwModuleName, + HMODULE *phModule) +{ + /* Set phModule to 0 if it's not a NULL pointer */ + if (phModule) *phModule = 0; + + /* Check for invalid flags combination */ + if (dwFlags & ~(GET_MODULE_HANDLE_EX_FLAG_PIN | + GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT | + GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) || + (dwFlags & GET_MODULE_HANDLE_EX_FLAG_PIN && + dwFlags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT) || + (!lpwModuleName && (dwFlags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) + ) + { + BaseSetLastNTError(STATUS_INVALID_PARAMETER_1); + return BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL; + } + + /* Check 2nd parameter */ + if (!phModule) + { + BaseSetLastNTError(STATUS_INVALID_PARAMETER_2); + return BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL; + } + + /* Return what we have according to the module name */ + if (lpwModuleName) + { + return BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_CONTINUE; + } + + /* No name given, so put ImageBaseAddress there */ + *phModule = (HMODULE)NtCurrentPeb()->ImageBaseAddress; + + return BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS; +} /** * @name GetDllLoadPath @@ -220,7 +265,7 @@ HINSTANCE hInst; NTSTATUS Status; PWSTR SearchPath; - ULONG DllCharacteristics; + ULONG DllCharacteristics = 0; BOOL FreeString = FALSE; (void)hFile; @@ -350,199 +395,360 @@ { NTSTATUS Status; - if (!hLibModule) - { - SetLastError(ERROR_INVALID_HANDLE); + if ((ULONG_PTR)hLibModule & 1) + { + /* This is a LOAD_LIBRARY_AS_DATAFILE module */ + if (RtlImageNtHeader((PVOID)((ULONG_PTR)hLibModule & ~1))) + { + /* Unmap view */ + Status = NtUnmapViewOfSection(NtCurrentProcess(), (PVOID)((ULONG_PTR)hLibModule & ~1)); + + /* Unload alternate resource module */ + LdrUnloadAlternateResourceModule(hLibModule); + } + else + Status = STATUS_INVALID_IMAGE_FORMAT; + } + else + { + /* Just unload it */ + Status = LdrUnloadDll((PVOID)hLibModule); + } + + /* Check what kind of status we got */ + if (!NT_SUCCESS(Status)) + { + /* Set last error */ + BaseSetLastNTError(Status); + + /* Return failure */ return FALSE; } + /* Return success */ + return TRUE; +} + + +/* + * @implemented + */ +VOID +WINAPI +FreeLibraryAndExitThread(HMODULE hLibModule, + DWORD dwExitCode) +{ + NTSTATUS Status; + if ((ULONG_PTR)hLibModule & 1) { - /* this is a LOAD_LIBRARY_AS_DATAFILE module */ - char *ptr = (char *)hLibModule - 1; - return UnmapViewOfFile(ptr); - } - - Status = LdrUnloadDll(hLibModule); + /* This is a LOAD_LIBRARY_AS_DATAFILE module */ + if (RtlImageNtHeader((PVOID)((ULONG_PTR)hLibModule & ~1))) + { + /* Unmap view */ + Status = NtUnmapViewOfSection(NtCurrentProcess(), (PVOID)((ULONG_PTR)hLibModule & ~1)); + + /* Unload alternate resource module */ + LdrUnloadAlternateResourceModule(hLibModule); + } + } + else + { + /* Just unload it */ + Status = LdrUnloadDll((PVOID)hLibModule); + } + + /* Exit thread */ + ExitThread(dwExitCode); +} + + +/* + * @implemented + */ +DWORD +WINAPI +GetModuleFileNameA(HINSTANCE hModule, + LPSTR lpFilename, + DWORD nSize) +{ + UNICODE_STRING filenameW; + ANSI_STRING FilenameA; + NTSTATUS Status; + DWORD Length = 0; + + /* Allocate a unicode buffer */ + filenameW.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, nSize * sizeof(WCHAR)); + if (!filenameW.Buffer) + { + BaseSetLastNTError(STATUS_NO_MEMORY); + return 0; + } + + /* Call unicode API */ + filenameW.Length = GetModuleFileNameW(hModule, filenameW.Buffer, nSize) * sizeof(WCHAR); + filenameW.MaximumLength = filenameW.Length + sizeof(WCHAR); + + if (filenameW.Length) + { + /* Convert to ansi string */ + Status = BasepUnicodeStringTo8BitString(&FilenameA, &filenameW, TRUE); + if (!NT_SUCCESS(Status)) + { + /* Set last error, free string and retun failure */ + BaseSetLastNTError(Status); + RtlFreeUnicodeString(&filenameW); + return 0; + } + + /* Calculate size to copy */ + Length = min(nSize, FilenameA.Length); + + /* Remove terminating zero */ + if (Length == FilenameA.Length) + Length--; + + /* Now copy back to the caller amount he asked */ + RtlMoveMemory(lpFilename, FilenameA.Buffer, Length); + + /* Free ansi filename */ + RtlFreeAnsiString(&FilenameA); + } + + /* Free unicode filename */ + RtlFreeHeap(RtlGetProcessHeap(), 0, filenameW.Buffer); + + /* Return length copied */ + return Length; +} + +/* + * @implemented + */ +DWORD +WINAPI +GetModuleFileNameW(HINSTANCE hModule, + LPWSTR lpFilename, + DWORD nSize) +{ + PLIST_ENTRY ModuleListHead, Entry; + PLDR_DATA_TABLE_ENTRY Module; + ULONG Length = 0; + ULONG Cookie; + PPEB Peb; + + /* Upscale nSize from chars to bytes */ + nSize *= sizeof(WCHAR); + + _SEH2_TRY + { + /* We don't use per-thread cur dir now */ + //PRTL_PERTHREAD_CURDIR PerThreadCurdir = (PRTL_PERTHREAD_CURDIR)teb->NtTib.SubSystemTib; + + Peb = NtCurrentPeb (); + + /* Acquire a loader lock */ + LdrLockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS, NULL, &Cookie); + + /* Traverse the module list */ + ModuleListHead = &Peb->Ldr->InLoadOrderModuleList; + Entry = ModuleListHead->Flink; + while (Entry != ModuleListHead) + { + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + /* Check if this is the requested module */ + if (Module->DllBase == (PVOID)hModule) + { + /* Calculate size to copy */ + Length = min(nSize, Module->FullDllName.MaximumLength); + + /* Copy contents */ + RtlMoveMemory(lpFilename, Module->FullDllName.Buffer, Length); + + /* Subtract a terminating zero */ + if (Length == Module->FullDllName.MaximumLength) + Length -= sizeof(WCHAR); + + /* Break out of the loop */ + break; + } + + /* Advance to the next entry */ + Entry = Entry->Flink; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BaseSetLastNTError(_SEH2_GetExceptionCode()); + Length = 0; + } _SEH2_END + + /* Release the loader lock */ + LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS, Cookie); + + return Length; +} + +HMODULE +WINAPI +GetModuleHandleForUnicodeString(PUNICODE_STRING ModuleName) +{ + NTSTATUS Status; + PVOID Module; + LPWSTR DllPath; + + /* Try to get a handle with a magic value of 1 for DllPath */ + Status = LdrGetDllHandle((LPWSTR)1, NULL, ModuleName, &Module); + + /* If that succeeded - we're done */ + if (NT_SUCCESS(Status)) return Module; + + /* If not, then the path should be computed */ + DllPath = BasepGetDllPath(NULL, 0); + + /* Call LdrGetHandle() again providing the computed DllPath + and wrapped into SEH */ + _SEH2_TRY + { + Status = LdrGetDllHandle(DllPath, NULL, ModuleName, &Module); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Fail with the SEH error */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Free the DllPath */ + RtlFreeHeap(RtlGetProcessHeap(), 0, DllPath); + + /* In case of error set last win32 error and return NULL */ if (!NT_SUCCESS(Status)) { + DPRINT("Failure acquiring DLL module '%wZ' handle, Status 0x%08X\n", ModuleName, Status); SetLastErrorByStatus(Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -VOID -WINAPI -FreeLibraryAndExitThread ( - HMODULE hLibModule, - DWORD dwExitCode - ) -{ - FreeLibrary(hLibModule); - ExitThread(dwExitCode); -} - - -/* - * @implemented - */ -DWORD -WINAPI -GetModuleFileNameA ( - HINSTANCE hModule, - LPSTR lpFilename, - DWORD nSize - ) -{ - ANSI_STRING FileName; - PLIST_ENTRY ModuleListHead; - PLIST_ENTRY Entry; - PLDR_DATA_TABLE_ENTRY Module; - PPEB Peb; - ULONG Length = 0; - - Peb = NtCurrentPeb (); - RtlEnterCriticalSection (Peb->LoaderLock); - - if (hModule == NULL) - hModule = Peb->ImageBaseAddress; - - ModuleListHead = &Peb->Ldr->InLoadOrderModuleList; - Entry = ModuleListHead->Flink; - - while (Entry != ModuleListHead) - { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - if (Module->DllBase == (PVOID)hModule) - { - Length = min(nSize, Module->FullDllName.Length / sizeof(WCHAR)); - FileName.Length = 0; - FileName.MaximumLength = (USHORT)Length * sizeof(WCHAR); - FileName.Buffer = lpFilename; - - /* convert unicode string to ansi (or oem) */ - if (bIsFileApiAnsi) - RtlUnicodeStringToAnsiString (&FileName, - &Module->FullDllName, - FALSE); - else - RtlUnicodeStringToOemString (&FileName, - &Module->FullDllName, - FALSE); - - if (Length < nSize) - lpFilename[Length] = '\0'; - else - SetLastErrorByStatus (STATUS_BUFFER_TOO_SMALL); - - RtlLeaveCriticalSection (Peb->LoaderLock); - return Length; - } - - Entry = Entry->Flink; - } - - SetLastErrorByStatus (STATUS_DLL_NOT_FOUND); - RtlLeaveCriticalSection (Peb->LoaderLock); - - return 0; -} - - -/* - * @implemented - */ -DWORD -WINAPI -GetModuleFileNameW ( - HINSTANCE hModule, - LPWSTR lpFilename, - DWORD nSize - ) -{ - UNICODE_STRING FileName; - PLIST_ENTRY ModuleListHead; - PLIST_ENTRY Entry; - PLDR_DATA_TABLE_ENTRY Module; - PPEB Peb; - ULONG Length = 0; - - Peb = NtCurrentPeb (); - RtlEnterCriticalSection (Peb->LoaderLock); - - if (hModule == NULL) - hModule = Peb->ImageBaseAddress; - - ModuleListHead = &Peb->Ldr->InLoadOrderModuleList; - Entry = ModuleListHead->Flink; - while (Entry != ModuleListHead) - { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - if (Module->DllBase == (PVOID)hModule) - { - Length = min(nSize, Module->FullDllName.Length / sizeof(WCHAR)); - FileName.Length = 0; - FileName.MaximumLength = (USHORT) Length * sizeof(WCHAR); - FileName.Buffer = lpFilename; - - RtlCopyUnicodeString (&FileName, - &Module->FullDllName); - if (Length < nSize) - lpFilename[Length] = L'\0'; - else - SetLastErrorByStatus (STATUS_BUFFER_TOO_SMALL); - - RtlLeaveCriticalSection (Peb->LoaderLock); - - return Length; - } - - Entry = Entry->Flink; - } - - SetLastErrorByStatus (STATUS_DLL_NOT_FOUND); - RtlLeaveCriticalSection (Peb->LoaderLock); - - return 0; -} - + Module = 0; + } + + /* Return module */ + return (HMODULE)Module; +} + +BOOLEAN +WINAPI +BasepGetModuleHandleExW(BOOLEAN NoLock, DWORD dwPublicFlags, LPCWSTR lpwModuleName, HMODULE *phModule) +{ + DWORD Cookie; + NTSTATUS Status = STATUS_SUCCESS, Status2; + HANDLE hModule = 0; + UNICODE_STRING ModuleNameU; + DWORD dwValid; + BOOLEAN Redirected = FALSE; // FIXME + + /* Validate parameters */ + dwValid = BasepGetModuleHandleExParameterValidation(dwPublicFlags, lpwModuleName, phModule); + ASSERT(dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_CONTINUE); + + /* Acquire lock if necessary */ + if (!NoLock) + { + Status = LdrLockLoaderLock(0, NULL, &Cookie); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + SetLastErrorByStatus(Status); + if (phModule) *phModule = 0; + return Status; + } + } + + if (!(dwPublicFlags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) + { + /* Create a unicode string out of module name */ + RtlInitUnicodeString(&ModuleNameU, lpwModuleName); + + // FIXME: Do some redirected DLL stuff? + if (Redirected) + { + UNIMPLEMENTED; + } + + if (!hModule) + { + hModule = GetModuleHandleForUnicodeString(&ModuleNameU); + if (!hModule) + { + // FIXME: Status?! + goto quickie; + } + } + } + else + { + /* Perform Pc to file header to get module instance */ + hModule = (HMODULE)RtlPcToFileHeader((PVOID)lpwModuleName, + (PVOID*)&hModule); + + /* Check if it succeeded */ + if (!hModule) + { + /* Set "dll not found" status and quit */ + Status = STATUS_DLL_NOT_FOUND; + goto quickie; + } + } + + /* Check if changing reference is not forbidden */ + if (!(dwPublicFlags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + { + /* Add reference to this DLL */ + Status = LdrAddRefDll((dwPublicFlags & GET_MODULE_HANDLE_EX_FLAG_PIN) ? LDR_PIN_MODULE : 0, + hModule); + } + +quickie: + /* Unlock loader lock if it was acquired */ + if (!NoLock) + { + Status2 = LdrUnlockLoaderLock(0, Cookie); + ASSERT(NT_SUCCESS(Status2)); + } + + /* Set last error in case of failure */ + if (!NT_SUCCESS(Status)) + SetLastErrorByStatus(Status); + + /* Set the module handle to the caller */ + if (phModule) *phModule = hModule; + + /* Return TRUE on success and FALSE otherwise */ + return NT_SUCCESS(Status); +} /* * @implemented */ HMODULE WINAPI -GetModuleHandleA ( LPCSTR lpModuleName ) -{ - ANSI_STRING ModuleName; - NTSTATUS Status; - PTEB pTeb = NtCurrentTeb(); - - if (lpModuleName == NULL) - { - return ((HMODULE)pTeb->ProcessEnvironmentBlock->ImageBaseAddress); - } - - RtlInitAnsiString(&ModuleName, lpModuleName); - - Status = RtlAnsiStringToUnicodeString(&pTeb->StaticUnicodeString, - &ModuleName, - FALSE); - - if (NT_SUCCESS(Status)) - { - return GetModuleHandleW(pTeb->StaticUnicodeString.Buffer); - } - - SetLastErrorByStatus(Status); - return FALSE; +GetModuleHandleA(LPCSTR lpModuleName) +{ + PUNICODE_STRING ModuleNameW; + PTEB pTeb = NtCurrentTeb(); + + /* Check if we have no name to convert */ + if (!lpModuleName) + return ((HMODULE)pTeb->ProcessEnvironmentBlock->ImageBaseAddress); + + /* Convert module name to unicode */ + ModuleNameW = Basep8BitStringToStaticUnicodeString(lpModuleName); + + /* Call W version if conversion was successful */ + if (ModuleNameW) + return GetModuleHandleW(ModuleNameW->Buffer); + + /* Return failure */ + return 0; } @@ -551,140 +757,108 @@ */ HMODULE WINAPI -GetModuleHandleW (LPCWSTR lpModuleName) -{ - UNICODE_STRING ModuleName; - PVOID BaseAddress; - NTSTATUS Status; - - if (lpModuleName == NULL) - return ((HMODULE)NtCurrentPeb()->ImageBaseAddress); - - RtlInitUnicodeString (&ModuleName, - (LPWSTR)lpModuleName); - - Status = LdrGetDllHandle (0, - 0, - &ModuleName, - &BaseAddress); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus (Status); - return NULL; - } - - return ((HMODULE)BaseAddress); -} - - -/* - * @implemented - */ -BOOL -WINAPI -GetModuleHandleExW(IN DWORD dwFlags, - IN LPCWSTR lpModuleName OPTIONAL, - OUT HMODULE* phModule) +GetModuleHandleW(LPCWSTR lpModuleName) { HMODULE hModule; NTSTATUS Status; + + /* If current module is requested - return it right away */ + if (!lpModuleName) + return ((HMODULE)NtCurrentPeb()->ImageBaseAddress); + + /* Use common helper routine */ + Status = BasepGetModuleHandleExW(TRUE, + GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, + lpModuleName, + &hModule); + + /* If it wasn't successful - return 0 */ + if (!NT_SUCCESS(Status)) hModule = 0; + + /* Return the handle */ + return hModule; +} + + +/* + * @implemented + */ +BOOL +WINAPI +GetModuleHandleExW(IN DWORD dwFlags, + IN LPCWSTR lpwModuleName OPTIONAL, + OUT HMODULE* phModule) +{ + NTSTATUS Status; + DWORD dwValid; BOOL Ret = FALSE; - if (phModule == NULL || - ((dwFlags & (GET_MODULE_HANDLE_EX_FLAG_PIN | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) == - (GET_MODULE_HANDLE_EX_FLAG_PIN | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT))) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if (lpModuleName == NULL) - { - hModule = NtCurrentPeb()->ImageBaseAddress; + /* Validate parameters */ + dwValid = BasepGetModuleHandleExParameterValidation(dwFlags, lpwModuleName, phModule); + + /* If result is invalid parameter - return failure */ + if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL) return FALSE; + + /* If result is 2, there is no need to do anything - return success. */ + if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS) return TRUE; + + /* Use common helper routine */ + Status = BasepGetModuleHandleExW(FALSE, + dwFlags, + lpwModuleName, + phModule); + + /* Return TRUE in case of success */ + if (NT_SUCCESS(Status)) Ret = TRUE; + + return Ret; +} + +/* + * @implemented + */ +BOOL +WINAPI +GetModuleHandleExA(IN DWORD dwFlags, + IN LPCSTR lpModuleName OPTIONAL, + OUT HMODULE* phModule) +{ + PUNICODE_STRING lpModuleNameW; + DWORD dwValid; + BOOL Ret; + + /* Validate parameters */ + dwValid = BasepGetModuleHandleExParameterValidation(dwFlags, (LPCWSTR)lpModuleName, phModule); + + /* If result is invalid parameter - return failure */ + if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL) return FALSE; + + /* If result is 2, there is no need to do anything - return success. */ + if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS) return TRUE; + + /* Check if we don't need to convert the name */ + if (dwFlags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) + { + /* Call the W version of the API without conversion */ + Ret = GetModuleHandleExW(dwFlags, + (LPCWSTR)lpModuleName, + phModule); } else { - if (dwFlags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) - { - hModule = (HMODULE)RtlPcToFileHeader((PVOID)lpModuleName, - (PVOID*)&hModule); - if (hModule == NULL) - { - SetLastErrorByStatus(STATUS_DLL_NOT_FOUND); - } - } - else - { - hModule = GetModuleHandleW(lpModuleName); - } - } - - if (hModule != NULL) - { - if (!(dwFlags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) - { - Status = LdrAddRefDll((dwFlags & GET_MODULE_HANDLE_EX_FLAG_PIN) ? LDR_PIN_MODULE : 0, - hModule); - - if (NT_SUCCESS(Status)) - { - Ret = TRUE; - } - else - { - SetLastErrorByStatus(Status); - hModule = NULL; - } - } - else - Ret = TRUE; - } - - *phModule = hModule; - return Ret; -} - -/* - * @implemented - */ -BOOL -WINAPI -GetModuleHandleExA(IN DWORD dwFlags, - IN LPCSTR lpModuleName OPTIONAL, - OUT HMODULE* phModule) -{ - ANSI_STRING ModuleName; - LPCWSTR lpModuleNameW; - NTSTATUS Status; - BOOL Ret; - - PTEB pTeb = NtCurrentTeb(); - - if (dwFlags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) - { - lpModuleNameW = (LPCWSTR)lpModuleName; - } - else - { - RtlInitAnsiString(&ModuleName, lpModuleName); - - Status = RtlAnsiStringToUnicodeString(&pTeb->StaticUnicodeString, - &ModuleName, - FALSE); - - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - lpModuleNameW = pTeb->StaticUnicodeString.Buffer; - } - - Ret = GetModuleHandleExW(dwFlags, - lpModuleNameW, - phModule); - + /* Convert module name to unicode */ + lpModuleNameW = Basep8BitStringToStaticUnicodeString(lpModuleName); + + /* Return FALSE if conversion failed */ + if (!lpModuleNameW) return FALSE; + + /* Call the W version of the API */ + Ret = GetModuleHandleExW(dwFlags, + lpModuleNameW->Buffer, + phModule); + } + + /* Return result */ return Ret; } Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Sun Apr 3 09:42:08 2011 @@ -452,7 +452,7 @@ if (!BasepExeLdrEntry) LdrEnumerateLoadedModules(0, BasepLocateExeLdrEntry, Peb->ImageBaseAddress); - DPRINT1("Found BasepExeLdrEntry %wZ\n", &BasepExeLdrEntry->FullDllName); + DPRINT("Found BasepExeLdrEntry %wZ\n", &BasepExeLdrEntry->FullDllName); /* Set name pointer to the full dll path */ NamePtr = BasepExeLdrEntry->FullDllName.Buffer; @@ -542,9 +542,7 @@ /* Null terminate the string */ NamePtr[DefaultLength / sizeof(WCHAR)] = 0; - DPRINT("Path: %S\n", NamePtr); - - return NULL; + return PathBuffer; } LPWSTR

1 0

[jimtabor] 51237: [Win32k] - Fix the return checks for co_MsqWaitForNewMessages, now the wait_idle test no longer randomly crash, also tested the testkbd check from bug 3212. Setup co_MsqWaitForNew...
by jimtabor＠svn.reactos.org 03 Apr '11

03 Apr '11

Author: jimtabor Date: Sun Apr 3 02:14:14 2011 New Revision: 51237 URL: http://svn.reactos.org/svn/reactos?rev=51237&view=rev Log: [Win32k] - Fix the return checks for co_MsqWaitForNewMessages, now the wait_idle test no longer randomly crash, also tested the testkbd check from bug 3212. Setup co_MsqWaitForNewMessages to act like get message, checking QS bits and dispatching send messages if queued. - Added desktop hit test data point, now the new track mouse timer code works. Not yet committed. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c 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] Sun Apr 3 02:14:14 2011 @@ -857,6 +857,10 @@ return FALSE; } + if (Status == STATUS_USER_APC || Status == STATUS_TIMEOUT) + { + return FALSE; + } } while ( TRUE ); @@ -946,7 +950,9 @@ Window, MsgFilterMin, MsgFilterMax); - if ( !NT_SUCCESS(Status) ) + if ( !NT_SUCCESS(Status) || + Status == STATUS_USER_APC || + Status == STATUS_TIMEOUT ) { Present = -1; break; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun Apr 3 02:14:14 2011 @@ -193,6 +193,7 @@ { LARGE_INTEGER LargeTickCount; MSLLHOOKSTRUCT MouseHookData; + PDESKTOP pDesk; PWND pwnd, pwndDesktop; KeQueryTickCount(&LargeTickCount); @@ -254,6 +255,9 @@ IntPtInWindow(pwnd, Msg->pt.x, Msg->pt.y)) { Msg->hwnd = pwnd->head.h; + pDesk = pwnd->head.rpdesk; + pDesk->htEx = HTCLIENT; + pDesk->spwndTrack = pwnd; break; } } @@ -1030,8 +1034,6 @@ } /* message is accepted now (but may still get dropped) */ - - pti->rpdesk->htEx = hittest; /* Now set the capture hit. */ event.message = msg->message; event.time = msg->time; @@ -1351,8 +1353,20 @@ co_MsqWaitForNewMessages(PUSER_MESSAGE_QUEUE MessageQueue, PWND WndFilter, UINT MsgFilterMin, UINT MsgFilterMax) { - NTSTATUS ret; - + PTHREADINFO pti; + NTSTATUS ret = STATUS_SUCCESS; + + pti = MessageQueue->Thread->Tcb.Win32Thread; + + while ( co_MsqDispatchOneSentMessage(MessageQueue) ); + + if (pti->pcti->fsWakeBits & pti->pcti->fsChangeBits ) + { + return ret; + } + + pti->pClientInfo->cSpins = 0; + IdlePing(); UserLeaveCo(); ret = KeWaitForSingleObject(MessageQueue->NewMessages, Executive, @@ -1360,6 +1374,7 @@ FALSE, NULL); UserEnterCo(); + IdlePong(); return ret; }

1 0

[gedmurphy] 51236: [FULLFAT] - Map the memory functions onto kernel APIs
by gedmurphy＠svn.reactos.org 02 Apr '11

02 Apr '11

Author: gedmurphy Date: Sat Apr 2 18:51:41 2011 New Revision: 51236 URL: http://svn.reactos.org/svn/reactos?rev=51236&view=rev Log: [FULLFAT] - Map the memory functions onto kernel APIs Modified: trunk/reactos/include/reactos/libs/fullfat/ff_config.h trunk/reactos/include/reactos/libs/fullfat/ff_memory.h Modified: trunk/reactos/include/reactos/libs/fullfat/ff_config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… ============================================================================== --- trunk/reactos/include/reactos/libs/fullfat/ff_config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fullfat/ff_config.h [iso-8859-1] Sat Apr 2 18:51:41 2011 @@ -121,8 +121,8 @@ //---------- MALLOC // These should map on to platform specific memory allocators. -#define FF_MALLOC(aSize) malloc(aSize) -#define FF_FREE(apPtr) free(apPtr) +#define FF_MALLOC(aSize) FF_Malloc(aSize) +#define FF_FREE(apPtr) FF_Free(apPtr) //---------- IN-LINE FUNCTIONS Modified: trunk/reactos/include/reactos/libs/fullfat/ff_memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… ============================================================================== --- trunk/reactos/include/reactos/libs/fullfat/ff_memory.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fullfat/ff_memory.h [iso-8859-1] Sat Apr 2 18:51:41 2011 @@ -40,6 +40,12 @@ #include "ff_config.h" #include "ff_types.h" + +#ifdef __REACTOS__ +// defined in fullfat.c +void *FF_Malloc(FF_T_UINT32 allocSize); +void FF_Free(void *pBuffer); +#endif /* HT changed type of aOffset to u32

1 0

[fireball] 51235: [NDK] - Add RTL_PERTHREAD_CURDIR structure definition. - Fix RTL_DRIVE_LETTER_CURDIR type vs. structure definition typo (adding more underscores is a truly universal fix!).
by fireball＠svn.reactos.org 02 Apr '11

02 Apr '11

Author: fireball Date: Sat Apr 2 18:32:04 2011 New Revision: 51235 URL: http://svn.reactos.org/svn/reactos?rev=51235&view=rev Log: [NDK] - Add RTL_PERTHREAD_CURDIR structure definition. - Fix RTL_DRIVE_LETTER_CURDIR type vs. structure definition typo (adding more underscores is a truly universal fix!). Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Sat Apr 2 18:32:04 2011 @@ -1012,13 +1012,20 @@ HANDLE Handle; } CURDIR, *PCURDIR; -typedef struct RTL_DRIVE_LETTER_CURDIR +typedef struct _RTL_DRIVE_LETTER_CURDIR { USHORT Flags; USHORT Length; ULONG TimeStamp; UNICODE_STRING DosPath; } RTL_DRIVE_LETTER_CURDIR, *PRTL_DRIVE_LETTER_CURDIR; + +typedef struct _RTL_PERTHREAD_CURDIR +{ + PRTL_DRIVE_LETTER_CURDIR CurrentDirectories; + PUNICODE_STRING ImageName; + PVOID Environment; +} RTL_PERTHREAD_CURDIR, *PRTL_PERTHREAD_CURDIR; // // Private State structure for RtlAcquirePrivilege/RtlReleasePrivilege

1 0

[gedmurphy] 51234: [FULLFAT] - Fix warnings for both msc and rbuild - These fixes will be applied to the FullFat source too, so I've not bothered with a local ros.diff
by gedmurphy＠svn.reactos.org 02 Apr '11

02 Apr '11

Author: gedmurphy Date: Sat Apr 2 18:12:31 2011 New Revision: 51234 URL: http://svn.reactos.org/svn/reactos?rev=51234&view=rev Log: [FULLFAT] - Fix warnings for both msc and rbuild - These fixes will be applied to the FullFat source too, so I've not bothered with a local ros.diff Removed: trunk/reactos/lib/3rdparty/fullfat/ff_dir.h Modified: trunk/reactos/include/reactos/libs/fullfat/ff_string.h trunk/reactos/lib/3rdparty/fullfat/ff_dir.c trunk/reactos/lib/3rdparty/fullfat/fullfat.rbuild Modified: trunk/reactos/include/reactos/libs/fullfat/ff_string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… ============================================================================== --- trunk/reactos/include/reactos/libs/fullfat/ff_string.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fullfat/ff_string.h [iso-8859-1] Sat Apr 2 18:12:31 2011 @@ -48,10 +48,8 @@ #include <string.h> #ifdef WIN32 -#define stricmp stricmp #define FF_stricmp stricmp #else -#define strcasecmp strcasecmp #define FF_stricmp strcasecmp #endif Modified: trunk/reactos/lib/3rdparty/fullfat/ff_dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_di… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/ff_dir.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/ff_dir.c [iso-8859-1] Sat Apr 2 18:12:31 2011 @@ -261,12 +261,14 @@ #else FF_T_INT8 *lastPtr = pDirent->FileName + sizeof(pDirent->FileName); #endif - FF_T_UINT8 CheckSum; + FF_T_UINT8 CheckSum = 0; FF_T_UINT8 lastAttrib; FF_T_INT8 totalLFNs = 0; FF_T_INT8 numLFNs = 0; FF_T_INT32 i; FF_T_UINT16 lfnItem = 0; + + pError = NULL; pDirent->CurrentItem = 0; pDirent->Attrib = 0; @@ -1095,8 +1097,8 @@ FF_ERROR Error; FF_T_UINT uiNumLFNs; FF_T_UINT uiLfnLength = 0; +#ifdef FF_UNICODE_UTF8_SUPPORT FF_T_UINT i,y; -#ifdef FF_UNICODE_UTF8_SUPPORT // FF_T_SINT32 slRetVal; FF_T_UINT16 nLfnBegin; FF_T_UINT16 usUtf8Len = 0; Removed: trunk/reactos/lib/3rdparty/fullfat/ff_dir.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_di… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/ff_dir.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/ff_dir.h (removed) @@ -1,169 +1,0 @@ -/***************************************************************************** - * FullFAT - High Performance, Thread-Safe Embedded FAT File-System * - * Copyright (C) 2009 James Walmsley (james(a)worm.me.uk) * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - * IMPORTANT NOTICE: * - * ================= * - * Alternative Licensing is available directly from the Copyright holder, * - * (James Walmsley). For more information consult LICENSING.TXT to obtain * - * a Commercial license. * - * * - * See RESTRICTIONS.TXT for extra restrictions on the use of FullFAT. * - * * - * Removing the above notice is illegal and will invalidate this license. * - ***************************************************************************** - * See http://worm.me.uk/fullfat for more information. * - * Or http://fullfat.googlecode.com/ for latest releases and the wiki. * - *****************************************************************************/ - -/** - * @file ff_dir.h - * @author James Walmsley - * @ingroup DIR - **/ -#ifndef _FF_DIR_H_ -#define _FF_DIR_H_ - -#include "ff_types.h" -#include "ff_config.h" -#include "ff_error.h" -#include "ff_ioman.h" -#include "ff_blk.h" -#include "ff_fat.h" -#include "ff_fatdef.h" -#include "ff_memory.h" -#include "ff_time.h" -#include "ff_hash.h" -#include "ff_crc.h" -#include "ff_file.h" -#include <string.h> - -typedef struct { - FF_T_UINT32 ulChainLength; - FF_T_UINT32 ulDirCluster; - FF_T_UINT32 ulCurrentClusterLCN; - FF_T_UINT32 ulCurrentClusterNum; - FF_T_UINT32 ulCurrentEntry; - FF_BUFFER *pBuffer; -} FF_FETCH_CONTEXT; - -typedef struct { - FF_T_UINT32 Filesize; - FF_T_UINT32 ObjectCluster; - - // Book Keeping - FF_T_UINT32 CurrentCluster; - FF_T_UINT32 AddrCurrentCluster; - FF_T_UINT32 DirCluster; - FF_T_UINT16 CurrentItem; - // End Book Keeping - -#ifdef FF_TIME_SUPPORT - FF_SYSTEMTIME CreateTime; ///< Date and Time Created. - FF_SYSTEMTIME ModifiedTime; ///< Date and Time Modified. - FF_SYSTEMTIME AccessedTime; ///< Date of Last Access. -#endif - -#ifdef FF_FINDAPI_ALLOW_WILDCARDS -#ifdef FF_UNICODE_SUPPORT - FF_T_WCHAR szWildCard[FF_MAX_FILENAME]; -#else - FF_T_INT8 szWildCard[FF_MAX_FILENAME]; -#endif -#endif - -#ifdef FF_UNICODE_SUPPORT - FF_T_WCHAR FileName[FF_MAX_FILENAME]; -#else - FF_T_INT8 FileName[FF_MAX_FILENAME]; -#endif - -#if defined(FF_LFN_SUPPORT) && defined(FF_INCLUDE_SHORT_NAME) - FF_T_INT8 ShortName[13]; -#endif - FF_T_UINT8 Attrib; - FF_FETCH_CONTEXT FetchContext; -} FF_DIRENT; - - - -// PUBLIC API -#ifdef FF_UNICODE_SUPPORT -FF_ERROR FF_FindFirst (FF_IOMAN *pIoman, FF_DIRENT *pDirent, const FF_T_WCHAR *path); -FF_ERROR FF_MkDir (FF_IOMAN *pIoman, const FF_T_WCHAR *Path); -#else -FF_ERROR FF_FindFirst (FF_IOMAN *pIoman, FF_DIRENT *pDirent, const FF_T_INT8 *path); -FF_ERROR FF_MkDir (FF_IOMAN *pIoman, const FF_T_INT8 *Path); -#endif - -FF_ERROR FF_FindNext (FF_IOMAN *pIoman, FF_DIRENT *pDirent); - - -// INTERNAL API -FF_ERROR FF_GetEntry (FF_IOMAN *pIoman, FF_T_UINT16 nEntry, FF_T_UINT32 DirCluster, FF_DIRENT *pDirent); -FF_ERROR FF_PutEntry (FF_IOMAN *pIoman, FF_T_UINT16 Entry, FF_T_UINT32 DirCluster, FF_DIRENT *pDirent); -FF_T_SINT8 FF_FindEntry (FF_IOMAN *pIoman, FF_T_UINT32 DirCluster, FF_T_INT8 *Name, FF_DIRENT *pDirent, FF_T_BOOL LFNs); - -void FF_PopulateShortDirent (FF_IOMAN *pIoman, FF_DIRENT *pDirent, FF_T_UINT8 *EntryBuffer); -FF_ERROR FF_PopulateLongDirent (FF_IOMAN *pIoman, FF_DIRENT *pDirent, FF_T_UINT16 nEntry, FF_FETCH_CONTEXT *pFetchContext); - -FF_ERROR FF_InitEntryFetch (FF_IOMAN *pIoman, FF_T_UINT32 ulDirCluster, FF_FETCH_CONTEXT *pContext); -FF_ERROR FF_FetchEntryWithContext (FF_IOMAN *pIoman, FF_T_UINT32 ulEntry, FF_FETCH_CONTEXT *pContext, FF_T_UINT8 *pEntryBuffer); -FF_ERROR FF_PushEntryWithContext (FF_IOMAN *pIoman, FF_T_UINT32 ulEntry, FF_FETCH_CONTEXT *pContext, FF_T_UINT8 *pEntryBuffer); -void FF_CleanupEntryFetch (FF_IOMAN *pIoman, FF_FETCH_CONTEXT *pContext); - -FF_T_SINT8 FF_PushEntry (FF_IOMAN *pIoman, FF_T_UINT32 DirCluster, FF_T_UINT16 nEntry, FF_T_UINT8 *buffer, void *pParam); -FF_T_BOOL FF_isEndOfDir (FF_T_UINT8 *EntryBuffer); -FF_ERROR FF_FindNextInDir (FF_IOMAN *pIoman, FF_DIRENT *pDirent, FF_FETCH_CONTEXT *pFetchContext); - -#ifdef FF_UNICODE_SUPPORT -FF_T_UINT32 FF_FindEntryInDir (FF_IOMAN *pIoman, FF_T_UINT32 DirCluster, const FF_T_WCHAR *name, FF_T_UINT8 pa_Attrib, FF_DIRENT *pDirent, FF_ERROR *pError); -FF_T_SINT8 FF_CreateShortName (FF_IOMAN *pIoman, FF_T_UINT32 DirCluster, FF_T_WCHAR *ShortName, FF_T_WCHAR *LongName); -#else -FF_T_UINT32 FF_FindEntryInDir (FF_IOMAN *pIoman, FF_T_UINT32 DirCluster, const FF_T_INT8 *name, FF_T_UINT8 pa_Attrib, FF_DIRENT *pDirent, FF_ERROR *pError); -FF_T_SINT8 FF_CreateShortName (FF_IOMAN *pIoman, FF_T_UINT32 DirCluster, FF_T_INT8 *ShortName, FF_T_INT8 *LongName); -#endif - - -void FF_lockDIR (FF_IOMAN *pIoman); -void FF_unlockDIR (FF_IOMAN *pIoman); - -#ifdef FF_UNICODE_SUPPORT -FF_T_UINT32 FF_CreateFile(FF_IOMAN *pIoman, FF_T_UINT32 DirCluster, FF_T_WCHAR *FileName, FF_DIRENT *pDirent, FF_ERROR *pError); -#else -FF_T_UINT32 FF_CreateFile(FF_IOMAN *pIoman, FF_T_UINT32 DirCluster, FF_T_INT8 *FileName, FF_DIRENT *pDirent, FF_ERROR *pError); -#endif - -FF_ERROR FF_CreateDirent (FF_IOMAN *pIoman, FF_T_UINT32 DirCluster, FF_DIRENT *pDirent); -FF_ERROR FF_ExtendDirectory (FF_IOMAN *pIoman, FF_T_UINT32 DirCluster); - -#ifdef FF_UNICODE_SUPPORT -FF_T_UINT32 FF_FindDir (FF_IOMAN *pIoman, const FF_T_WCHAR *path, FF_T_UINT16 pathLen, FF_ERROR *pError); -#else -FF_T_UINT32 FF_FindDir (FF_IOMAN *pIoman, const FF_T_INT8 *path, FF_T_UINT16 pathLen, FF_ERROR *pError); -#endif - -#ifdef FF_HASH_CACHE -FF_T_BOOL FF_CheckDirentHash (FF_IOMAN *pIoman, FF_T_UINT32 DirCluster, FF_T_UINT32 nHash); -FF_T_BOOL FF_DirHashed (FF_IOMAN *pIoman, FF_T_UINT32 DirCluster); -FF_ERROR FF_AddDirentHash (FF_IOMAN *pIoman, FF_T_UINT32 DirCluster, FF_T_UINT32 nHash); -FF_ERROR FF_HashDir (FF_IOMAN *pIoman, FF_T_UINT32 ulDirCluster); -#endif - -FF_ERROR FF_RmLFNs(FF_IOMAN *pIoman, FF_T_UINT16 usDirEntry, FF_FETCH_CONTEXT *pContext); - -#endif - Modified: trunk/reactos/lib/3rdparty/fullfat/fullfat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/fullf… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/fullfat.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/fullfat.rbuild [iso-8859-1] Sat Apr 2 18:12:31 2011 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="fullfat" type="staticlibrary" allowwarnings="true" > +<module name="fullfat" type="staticlibrary" > <include base="ReactOS">include/reactos/libs/fullfat</include> <define name="__NTDRIVER__" />

1 0

[rharabien] 51233: [SYSTEMINFO] Clean it up a bit Prepare for CSV format support
by rharabien＠svn.reactos.org 02 Apr '11

02 Apr '11

Author: rharabien Date: Sat Apr 2 17:51:09 2011 New Revision: 51233 URL: http://svn.reactos.org/svn/reactos?rev=51233&view=rev Log: [SYSTEMINFO] Clean it up a bit Prepare for CSV format support Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc trunk/rosapps/applications/sysutils/systeminfo/resource.h trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc [iso-8859-1] Sat Apr 2 17:51:09 2011 @@ -31,34 +31,38 @@ SYSTEMINFO /S system /FO LIST\n\ SYSTEMINFO /S system /FO CSV /NH\n" -IDS_HOST_NAME, "Domäne: %s\n" -IDS_OS_NAME, "OS Name: %s\n" -IDS_OS_VERSION, "OS Version: %u.%u.%u %s Build %u\n" -IDS_OS_BUILD_TYPE, "OS Build Typ: %s\n" -IDS_REG_OWNER, "Registrierter Benutzer: %s\n" -IDS_REG_ORG, "Registrierte Organisation: %s\n" -IDS_PRODUCT_ID, "Produkt ID: %s\n" -IDS_INST_DATE, "Installationsdatum: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u Minutes, %u Seconds\n" -IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" -IDS_SYS_MODEL, "System Model: %s\n" -IDS_SYS_TYPE, "Systemtyp: %s\n" -IDS_PROCESSORS, "Prozessor(en): %u Prozessor(en) Installiert.\n" -IDS_BIOS_DATE, "BIOS Datum: %s\n" -IDS_BIOS_VERSION, "BIOS Version: %s\n" -IDS_ROS_DIR, "ReactOS Verzeichnis: %s\n" -IDS_SYS_DIR, "System Verzeichnis: %s\n" -IDS_BOOT_DEV, "Startgerät: %s\n" -IDS_SYS_LOCALE, "Systemgebietsschema: %s\n" -IDS_INPUT_LOCALE, "Eingabegebietsschema: %s\n" -IDS_TIME_ZONE, "Zeitzone: %s\n" -IDS_TOTAL_PHYS_MEM, "Gesamter Physikalischer Speicher: %s MB\n" -IDS_AVAIL_PHISICAL_MEM, "Verfügbarer Physikalischer Speicher: %s MB\n" -IDS_VIRT_MEM_MAX, "Auslagerungsdatei: Max Größe: %s MB\n" -IDS_VIRT_MEM_AVAIL, "Auslagerungsdatei: Verfügbar: %s MB\n" -IDS_VIRT_MEM_INUSE, "Auslagerungsdatei: In Verwendung: %s MB\n" +IDS_HOST_NAME, "Domäne" +IDS_OS_NAME, "OS Name" +IDS_OS_VERSION, "OS Version: Build %u" +IDS_BUILD, "Build" +IDS_OS_BUILD_TYPE, "OS Build Typ" +IDS_REG_OWNER, "Registrierter Benutzer" +IDS_REG_ORG, "Registrierte Organisation" +IDS_PRODUCT_ID, "Produkt ID" +IDS_INST_DATE, "Installationsdatum" +IDS_UP_TIME, "System Up Time" +IDS_UP_TIME_FORMAT "%u Days, %u Hours, %u Minutes, %u Seconds" +IDS_SYS_MANUFACTURER, "System Manufacturer" +IDS_SYS_MODEL, "System Model" +IDS_SYS_TYPE, "Systemtyp" +IDS_PROCESSORS, "Prozessor(en)" +IDS_PROCESSORS_FORMAT, "%u Prozessor(en) Installiert." +IDS_BIOS_DATE, "BIOS Datum" +IDS_BIOS_VERSION, "BIOS Version" +IDS_ROS_DIR, "ReactOS Verzeichnis" +IDS_SYS_DIR, "System Verzeichnis" +IDS_BOOT_DEV, "Startgerät" +IDS_SYS_LOCALE, "Systemgebietsschema" +IDS_INPUT_LOCALE, "Eingabegebietsschema" +IDS_TIME_ZONE, "Zeitzone" +IDS_TOTAL_PHYS_MEM, "Gesamter Physikalischer Speicher" +IDS_AVAIL_PHISICAL_MEM, "Verfügbarer Physikalischer Speicher" +IDS_VIRT_MEM_MAX, "Auslagerungsdatei: Max Größe" +IDS_VIRT_MEM_AVAIL, "Auslagerungsdatei: Verfügbar" +IDS_VIRT_MEM_INUSE, "Auslagerungsdatei: In Verwendung" IDS_PAGEFILE_LOC, "Auslagerungsdateipfad(e): %s" -IDS_DOMAIN, "Domain: %s\n" -IDS_NETWORK_CARDS, "Netzwerkkarte(n) %u Installiert.\n" +IDS_DOMAIN, "Domain" +IDS_NETWORK_CARDS, "Netzwerkkarte(n)" +IDS_NETWORK_CARDS_FORMAT, "%u Installiert." END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc [iso-8859-1] Sat Apr 2 17:51:09 2011 @@ -29,34 +29,38 @@ SYSTEMINFO /S system /FO LIST\n\ SYSTEMINFO /S system /FO CSV /NH\n" -IDS_HOST_NAME, "Host Name: %s\n" -IDS_OS_NAME, "OS Name: %s\n" -IDS_OS_VERSION, "OS Version: %u.%u.%u %s Build %u\n" -IDS_OS_BUILD_TYPE, "OS Build Type: %s\n" -IDS_REG_OWNER, "Registered Owner: %s\n" -IDS_REG_ORG, "Registered Organization: %s\n" -IDS_PRODUCT_ID, "Product ID: %s\n" -IDS_INST_DATE, "Install Date: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u Minutes, %u Seconds\n" -IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" -IDS_SYS_MODEL, "System Model: %s\n" -IDS_SYS_TYPE, "System type: %s\n" -IDS_PROCESSORS, "Processor(s): %u Processor(s) Installed.\n" -IDS_BIOS_DATE, "BIOS Date: %s\n" -IDS_BIOS_VERSION, "BIOS Version: %s\n" -IDS_ROS_DIR, "ReactOS Directory: %s\n" -IDS_SYS_DIR, "System Directory: %s\n" -IDS_BOOT_DEV, "Boot Device: %s\n" -IDS_SYS_LOCALE, "System Locale: %s\n" -IDS_INPUT_LOCALE, "Input Locale: %s\n" -IDS_TIME_ZONE, "Time zone: %s\n" -IDS_TOTAL_PHYS_MEM, "Total Physical Memory: %s MB\n" -IDS_AVAIL_PHISICAL_MEM, "Available Physical Memory: %s MB\n" -IDS_VIRT_MEM_MAX, "Virtual Memory: Max Size: %s MB\n" -IDS_VIRT_MEM_AVAIL, "Virtual Memory: Available: %s MB\n" -IDS_VIRT_MEM_INUSE, "Virtual Memory: In Use: %s MB\n" -IDS_PAGEFILE_LOC, "Page File Location(s): %s\n" -IDS_DOMAIN, "Domain: %s\n" -IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" +IDS_HOST_NAME, "Host Name" +IDS_OS_NAME, "OS Name" +IDS_OS_VERSION, "OS Version" +IDS_BUILD, "Build" +IDS_OS_BUILD_TYPE, "OS Build Type" +IDS_REG_OWNER, "Registered Owner" +IDS_REG_ORG, "Registered Organization" +IDS_PRODUCT_ID, "Product ID" +IDS_INST_DATE, "Install Date" +IDS_UP_TIME, "System Up Time" +IDS_UP_TIME_FORMAT "%u Days, %u Hours, %u Minutes, %u Seconds" +IDS_SYS_MANUFACTURER, "System Manufacturer" +IDS_SYS_MODEL, "System Model" +IDS_SYS_TYPE, "System type" +IDS_PROCESSORS, "Processor(s)" +IDS_PROCESSORS_FORMAT, "%u Processor(s) Installed." +IDS_BIOS_DATE, "BIOS Date" +IDS_BIOS_VERSION, "BIOS Version" +IDS_ROS_DIR, "ReactOS Directory" +IDS_SYS_DIR, "System Directory" +IDS_BOOT_DEV, "Boot Device" +IDS_SYS_LOCALE, "System Locale" +IDS_INPUT_LOCALE, "Input Locale" +IDS_TIME_ZONE, "Time zone" +IDS_TOTAL_PHYS_MEM, "Total Physical Memory" +IDS_AVAIL_PHISICAL_MEM, "Available Physical Memory" +IDS_VIRT_MEM_MAX, "Virtual Memory: Max Size" +IDS_VIRT_MEM_AVAIL, "Virtual Memory: Available" +IDS_VIRT_MEM_INUSE, "Virtual Memory: In Use" +IDS_PAGEFILE_LOC, "Page File Location(s)" +IDS_DOMAIN, "Domain" +IDS_NETWORK_CARDS, "Network Card(s)" +IDS_NETWORK_CARDS_FORMAT, "%u Installed." END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc [iso-8859-1] Sat Apr 2 17:51:09 2011 @@ -34,34 +34,38 @@ SYSTEMINFO /S sistema /FO LIST\n\ SYSTEMINFO /S sistema /FO CSV /NH\n" -IDS_HOST_NAME, "Nombre del Servidor: %s\n" -IDS_OS_NAME, "Nombre Sistema Operativo: %s\n" -IDS_OS_VERSION, "Versión Sistema Operativo: %u.%u.%u %s Compilación %u\n" -IDS_OS_BUILD_TYPE, "Tipo Compilación: %s\n" -IDS_REG_OWNER, "Propietario: %s\n" -IDS_REG_ORG, "Organización: %s\n" -IDS_PRODUCT_ID, "Identificador de Producto %s\n" -IDS_INST_DATE, "Fecha de Instalación: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u Minutes, %u Seconds\n" -IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" -IDS_SYS_MODEL, "System Model: %s\n" -IDS_SYS_TYPE, "Tipo de sistema: %s\n" -IDS_PROCESSORS, "Procesador(es): %u Procesador(es) Instalados.\n" -IDS_BIOS_DATE, "Fecha BIOS: %s\n" -IDS_BIOS_VERSION, "Versión BIOS: %s\n" -IDS_ROS_DIR, "Directorio de ReactOS: %s\n" -IDS_SYS_DIR, "Directorio del Sistema: %s\n" -IDS_BOOT_DEV, "Dispositivo de Inicio: %s\n" -IDS_SYS_LOCALE, "Idioma del sistema: %s\n" -IDS_INPUT_LOCALE, "Idioma de entrada: %s\n" -IDS_TIME_ZONE, "Zona horario: %s\n" -IDS_TOTAL_PHYS_MEM, "Memoria Física Total: %s MB\n" -IDS_AVAIL_PHISICAL_MEM, "Memoria Física Disponible: %s MB\n" -IDS_VIRT_MEM_MAX, "Memoria Virtual: Tamaño Máx: %s MB\n" -IDS_VIRT_MEM_AVAIL, "Memoria Virtual: Disponible: %s MB\n" -IDS_VIRT_MEM_INUSE, "Memoria Virtual: En Uso: %s MB\n" -IDS_PAGEFILE_LOC, "Ruta(s) Archivo Paginación: %s\n" -IDS_DOMAIN, "Dominio: %s\n" -IDS_NETWORK_CARDS, "Tarjeta(s) de Red %u No Instalada.\n" +IDS_HOST_NAME, "Nombre del Servidor" +IDS_OS_NAME, "Nombre Sistema Operativo" +IDS_OS_VERSION, "Versión Sistema Operativo" +IDS_BUILD, "Compilación" +IDS_OS_BUILD_TYPE, "Tipo Compilación" +IDS_REG_OWNER, "Propietario" +IDS_REG_ORG, "Organización" +IDS_PRODUCT_ID, "Identificador de Producto" +IDS_INST_DATE, "Fecha de Instalación" +IDS_UP_TIME, "System Up Time" +IDS_UP_TIME_FORMAT "%u Days, %u Hours, %u Minutes, %u Seconds" +IDS_SYS_MANUFACTURER, "System Manufacturer" +IDS_SYS_MODEL, "System Model" +IDS_SYS_TYPE, "Tipo de sistema" +IDS_PROCESSORS, "Procesador(es)" +IDS_PROCESSORS_FORMAT, "%u Procesador(es) Instalados." +IDS_BIOS_DATE, "Fecha BIOS" +IDS_BIOS_VERSION, "Versión BIOS" +IDS_ROS_DIR, "Directorio de ReactOS" +IDS_SYS_DIR, "Directorio del Sistema" +IDS_BOOT_DEV, "Dispositivo de Inicio" +IDS_SYS_LOCALE, "Idioma del sistema" +IDS_INPUT_LOCALE, "Idioma de entrada" +IDS_TIME_ZONE, "Zona horario" +IDS_TOTAL_PHYS_MEM, "Memoria Física Total" +IDS_AVAIL_PHISICAL_MEM, "Memoria Física Disponible" +IDS_VIRT_MEM_MAX, "Memoria Virtual: Tamaño Máx" +IDS_VIRT_MEM_AVAIL, "Memoria Virtual: Disponible" +IDS_VIRT_MEM_INUSE, "Memoria Virtual: En Uso" +IDS_PAGEFILE_LOC, "Ruta(s) Archivo Paginación" +IDS_DOMAIN, "Dominio" +IDS_NETWORK_CARDS, "Tarjeta(s) de Red" +IDS_NETWORK_CARDS_FORMAT, "%u No Instalada." END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc [iso-8859-1] Sat Apr 2 17:51:09 2011 @@ -29,34 +29,38 @@ SYSTEMINFO /S système /FO LIST\n\ SYSTEMINFO /S système /FO CSV /NH\n" -IDS_HOST_NAME, "Nom d'hôte : %s\n" -IDS_OS_NAME, "Nom du système d'exploitation : %s\n" -IDS_OS_VERSION, "Version du système d'exploitation : %u.%u.%u %s Compilation %u\n" -IDS_OS_BUILD_TYPE, "Type de compilation du système d'exploitation : %s\n" -IDS_REG_OWNER, "Propriétaire enregistré : %s\n" -IDS_REG_ORG, "Organisation enregistrée : %s\n" -IDS_PRODUCT_ID, "ID du produit : %s\n" -IDS_INST_DATE, "Date d'installation : %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u Minutes, %u Seconds\n" -IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" -IDS_SYS_MODEL, "System Model: %s\n" -IDS_SYS_TYPE, "Type du système : %s\n" -IDS_PROCESSORS, "Processeur(s) : %u Processeur(s) installé(s).\n" -IDS_BIOS_DATE, "Date du BIOS : %s\n" -IDS_BIOS_VERSION, "Version du BIOS : %s\n" -IDS_ROS_DIR, "Répertoire ReactOS : %s\n" -IDS_SYS_DIR, "Répertoire système : %s\n" -IDS_BOOT_DEV, "Périphérique de démarrage : %s\n" -IDS_SYS_LOCALE, "Paramètre régional du système : %s\n" -IDS_INPUT_LOCALE, "Paramètre régional de saisie : %s\n" -IDS_TIME_ZONE, "Fuseau horaire : %s\n" -IDS_TOTAL_PHYS_MEM, "Mémoire physique totale : %s Mo\n" -IDS_AVAIL_PHISICAL_MEM, "Mémoire physique disponible : %s Mo\n" -IDS_VIRT_MEM_MAX, "Mémoire virtuelle: Taille max : %s Mo\n" -IDS_VIRT_MEM_AVAIL, "Mémoire virtuelle: Disponible : %s Mo\n" -IDS_VIRT_MEM_INUSE, "Mémoire virtuelle: Utilisée : %s Mo\n" -IDS_PAGEFILE_LOC, "Emplacement(s) des fichiers d'échange : %s" -IDS_DOMAIN, "Domaine : %s\n" -IDS_NETWORK_CARDS, "Carte(s) réseau %u installée(s).\n" +IDS_HOST_NAME, "Nom d'hôte" +IDS_OS_NAME, "Nom du système d'exploitation" +IDS_OS_VERSION, "Version du système d'exploitation" +IDS_BUILD, "Compilation" +IDS_OS_BUILD_TYPE, "Type de compilation du système d'exploitation" +IDS_REG_OWNER, "Propriétaire enregistré" +IDS_REG_ORG, "Organisation enregistrée" +IDS_PRODUCT_ID, "ID du produit" +IDS_INST_DATE, "Date d'installation" +IDS_UP_TIME, "System Up Time" +IDS_UP_TIME_FORMAT "%u Days, %u Hours, %u Minutes, %u Seconds" +IDS_SYS_MANUFACTURER, "System Manufacturer" +IDS_SYS_MODEL, "System Model" +IDS_SYS_TYPE, "Type du système" +IDS_PROCESSORS, "Processeur(s)" +IDS_PROCESSORS_FORMAT, "%u Processeur(s) installé(s)." +IDS_BIOS_DATE, "Date du BIOS" +IDS_BIOS_VERSION, "Version du BIOS" +IDS_ROS_DIR, "Répertoire ReactOS" +IDS_SYS_DIR, "Répertoire système" +IDS_BOOT_DEV, "Périphérique de démarrage" +IDS_SYS_LOCALE, "Paramètre régional du système" +IDS_INPUT_LOCALE, "Paramètre régional de saisie" +IDS_TIME_ZONE, "Fuseau horaire" +IDS_TOTAL_PHYS_MEM, "Mémoire physique totale" +IDS_AVAIL_PHISICAL_MEM, "Mémoire physique disponible" +IDS_VIRT_MEM_MAX, "Mémoire virtuelle: Taille max" +IDS_VIRT_MEM_AVAIL, "Mémoire virtuelle: Disponible" +IDS_VIRT_MEM_INUSE, "Mémoire virtuelle: Utilisée" +IDS_PAGEFILE_LOC, "Emplacement(s) des fichiers d'échange" +IDS_DOMAIN, "Domaine" +IDS_NETWORK_CARDS, "Carte(s) réseau" +IDS_NETWORK_CARDS_FORMAT, "%u installée(s)." END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] Sat Apr 2 17:51:09 2011 @@ -29,34 +29,38 @@ SYSTEMINFO /S system /FO LIST\n\ SYSTEMINFO /S system /FO CSV /NH\n" -IDS_HOST_NAME, "Datamaskin navn: %s\n" -IDS_OS_NAME, "OS navn: %s\n" -IDS_OS_VERSION, "OS versjon: %u.%u.%u %s Bygget %u\n" -IDS_OS_BUILD_TYPE, "OS bygg type: %s\n" -IDS_REG_OWNER, "Registert eier: %s\n" -IDS_REG_ORG, "Registerert organisasjon: %s\n" -IDS_PRODUCT_ID, "Produkt ID: %s\n" -IDS_INST_DATE, "Installert dato: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u Minutes, %u Seconds\n" -IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" -IDS_SYS_MODEL, "System Model: %s\n" -IDS_SYS_TYPE, "Systemtype: %s\n" -IDS_PROCESSORS, "Prosessor(er): %u Prosessor(er) installert.\n" -IDS_BIOS_DATE, "BIOS dato: %s\n" -IDS_BIOS_VERSION, "BIOS Versjon: %s\n" -IDS_ROS_DIR, "ReactOS mappe: %s\n" -IDS_SYS_DIR, "System mappe: %s\n" -IDS_BOOT_DEV, "Oppstartsenhet: %s\n" -IDS_SYS_LOCALE, "System lokal: %s\n" -IDS_INPUT_LOCALE, "Input lokal: %s\n" -IDS_TIME_ZONE, "Tidssone: %s\n" -IDS_TOTAL_PHYS_MEM, "Total fysisk minne: %s MB\n" -IDS_AVAIL_PHISICAL_MEM, "Tilgjengelig fysisk minne: %s MB\n" -IDS_VIRT_MEM_MAX, "Virtuelt minne: Maks Størrelse: %s MB\n" -IDS_VIRT_MEM_AVAIL, "Virtuelt minne: Tilgjengelig: %s MB\n" -IDS_VIRT_MEM_INUSE, "Virtuelt minne: i bruk: %s MB\n" -IDS_PAGEFILE_LOC, "Sidevekslingsfil lokalsjon(er): %s\n" -IDS_DOMAIN, "Domene: %s\n" -IDS_NETWORK_CARDS, "Nettverkskort(er) %u installert.\n" +IDS_HOST_NAME, "Datamaskin navn" +IDS_OS_NAME, "OS navn" +IDS_OS_VERSION, "OS versjon" +IDS_BUILD, "Bygget" +IDS_OS_BUILD_TYPE, "OS bygg type" +IDS_REG_OWNER, "Registert eier" +IDS_REG_ORG, "Registerert organisasjon" +IDS_PRODUCT_ID, "Produkt ID" +IDS_INST_DATE, "Installert dato" +IDS_UP_TIME, "System Up Time" +IDS_UP_TIME_FORMAT "%u Days, %u Hours, %u Minutes, %u Seconds" +IDS_SYS_MANUFACTURER, "System Manufacturer" +IDS_SYS_MODEL, "System Model" +IDS_SYS_TYPE, "Systemtype" +IDS_PROCESSORS, "Prosessor(er)" +IDS_PROCESSORS_FORMAT, "%u Prosessor(er) installert." +IDS_BIOS_DATE, "BIOS dato" +IDS_BIOS_VERSION, "BIOS Versjon" +IDS_ROS_DIR, "ReactOS mappe" +IDS_SYS_DIR, "System mappe" +IDS_BOOT_DEV, "Oppstartsenhet" +IDS_SYS_LOCALE, "System lokal" +IDS_INPUT_LOCALE, "Input lokal" +IDS_TIME_ZONE, "Tidssone" +IDS_TOTAL_PHYS_MEM, "Total fysisk minne" +IDS_AVAIL_PHISICAL_MEM, "Tilgjengelig fysisk minne" +IDS_VIRT_MEM_MAX, "Virtuelt minne: Maks Størrelse" +IDS_VIRT_MEM_AVAIL, "Virtuelt minne: Tilgjengelig" +IDS_VIRT_MEM_INUSE, "Virtuelt minne: i bruk" +IDS_PAGEFILE_LOC, "Sidevekslingsfil lokalsjon(er)" +IDS_DOMAIN, "Domene" +IDS_NETWORK_CARDS, "Nettverkskort(er)" +IDS_NETWORK_CARDS_FORMAT, "%u installert." END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc [iso-8859-1] Sat Apr 2 17:51:09 2011 @@ -36,34 +36,38 @@ SYSTEMINFO /S system /FO LIST\n\ SYSTEMINFO /S system /FO CSV /NH\n" -IDS_HOST_NAME, "Nazwa hosta: %s\n" -IDS_OS_NAME, "Nazwa Systemu: %s\n" -IDS_OS_VERSION, "Wersja: %u.%u.%u %s Kompilacja %u\n" -IDS_OS_BUILD_TYPE, "Rodzaj kompilacji: %s\n" -IDS_REG_OWNER, "U¿ytkownik: %s\n" -IDS_REG_ORG, "Organizacja: %s\n" -IDS_PRODUCT_ID, "ID produktu: %s\n" -IDS_INST_DATE, "Data instalacji: %s\n" -IDS_UP_TIME, "Czas pracy systemu: %u dni, %u godzin, %u minut, %u sekund\n" -IDS_SYS_MANUFACTURER, "Producent systemu: %s\n" -IDS_SYS_MODEL, "Model systemu: %s\n" -IDS_SYS_TYPE, "Rodzaj systemu: %s\n" -IDS_PROCESSORS, "Iloæ Procesorów: %u.\n" -IDS_BIOS_DATE, "Data BIOSu: %s\n" -IDS_BIOS_VERSION, "Wersja BIOSu: %s\n" -IDS_ROS_DIR, "Katalog ReactOS: %s\n" -IDS_SYS_DIR, "Katalog Systemowy: %s\n" -IDS_BOOT_DEV, "Urz¹dzenie ród³owe: %s\n" -IDS_SYS_LOCALE, "Wersja lokalizacji: %s\n" -IDS_INPUT_LOCALE, "Lokalizacja klawiatury: %s\n" -IDS_TIME_ZONE, "Strefa czasowa: %s\n" -IDS_TOTAL_PHYS_MEM, "Pamiêci fizycznej ogó³em: %s MB\n" -IDS_AVAIL_PHISICAL_MEM, "Dostêpnej pamiêci fizycznej: %s MB\n" -IDS_VIRT_MEM_MAX, "Pamiêci wirtualnej: maksymalnie: %s MB\n" -IDS_VIRT_MEM_AVAIL, "Pamiêci wirtualnej: dostêpne: %s MB\n" -IDS_VIRT_MEM_INUSE, "Pamiêci wirtualnej: w u¿yciu: %s MB\n" -IDS_PAGEFILE_LOC, "Lokalizacja pliku wymiany: %s\n" -IDS_DOMAIN, "Domena: %s\n" -IDS_NETWORK_CARDS, "Liczba kart sieciowych %u.\n" +IDS_HOST_NAME, "Nazwa hosta" +IDS_OS_NAME, "Nazwa systemu" +IDS_OS_VERSION, "Wersja systemu" +IDS_BUILD, "Kompilacja" +IDS_OS_BUILD_TYPE, "Rodzaj kompilacji" +IDS_REG_OWNER, "U¿ytkownik" +IDS_REG_ORG, "Organizacja" +IDS_PRODUCT_ID, "ID produktu" +IDS_INST_DATE, "Data instalacji" +IDS_UP_TIME, "Czas pracy systemu" +IDS_UP_TIME_FORMAT "%u dni, %u godzin, %u minut, %u sekund" +IDS_SYS_MANUFACTURER, "Producent systemu" +IDS_SYS_MODEL, "Model systemu" +IDS_SYS_TYPE, "Rodzaj systemu" +IDS_PROCESSORS, "Procesory" +IDS_PROCESSORS_FORMAT, "Zainstalowane procesory: %u." +IDS_BIOS_DATE, "Data BIOSu" +IDS_BIOS_VERSION, "Wersja BIOSu" +IDS_ROS_DIR, "Katalog ReactOS" +IDS_SYS_DIR, "Katalog Systemowy" +IDS_BOOT_DEV, "Urz¹dzenie ród³owe" +IDS_SYS_LOCALE, "Wersja lokalizacji" +IDS_INPUT_LOCALE, "Lokalizacja klawiatury" +IDS_TIME_ZONE, "Strefa czasowa" +IDS_TOTAL_PHYS_MEM, "Pamiêci fizycznej ogó³em" +IDS_AVAIL_PHISICAL_MEM, "Dostêpnej pamiêci fizycznej" +IDS_VIRT_MEM_MAX, "Pamiêci wirtualnej: maksymalnie" +IDS_VIRT_MEM_AVAIL, "Pamiêci wirtualnej: dostêpne" +IDS_VIRT_MEM_INUSE, "Pamiêci wirtualnej: w u¿yciu" +IDS_PAGEFILE_LOC, "Lokalizacja pliku wymiany" +IDS_DOMAIN, "Domena" +IDS_NETWORK_CARDS, "Karty sieciowe" +IDS_NETWORK_CARDS_FORMAT, "Zainstalowane karty NIC: %u." END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] Sat Apr 2 17:51:09 2011 @@ -33,34 +33,38 @@ SYSTEMINFO /S system /FO LIST\n\ SYSTEMINFO /S system /FO CSV /NH\n" -IDS_HOST_NAME, "Host Name: %s\n" -IDS_OS_NAME, "N zov OS: %s\n" -IDS_OS_VERSION, "Verzia OS: %u.%u.%u %s Build %u\n" -IDS_OS_BUILD_TYPE, "OS Build typ: %s\n" -IDS_REG_OWNER, "Registovanì vlastn¡k: %s\n" -IDS_REG_ORG, "Registrovan organiz cia: %s\n" -IDS_PRODUCT_ID, "ID produktu: %s\n" -IDS_INST_DATE, "D tum inçtal cie: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u Minutes, %u Seconds\n" -IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" -IDS_SYS_MODEL, "System Model: %s\n" -IDS_SYS_TYPE, "Typ systmu: %s\n" -IDS_PROCESSORS, "Procesor(y): %u Procesor(y) nainçtalovanì.\n" -IDS_BIOS_DATE, "D tum BIOSu: %s\n" -IDS_BIOS_VERSION, "Verzia BIOSu: %s\n" -IDS_ROS_DIR, "Adres r ReactOS: %s\n" -IDS_SYS_DIR, "Adres r System: %s\n" -IDS_BOOT_DEV, "Zav dzacie zariadenie: %s\n" -IDS_SYS_LOCALE, "System Locale: %s\n" -IDS_INPUT_LOCALE, "Input Locale: %s\n" -IDS_TIME_ZONE, "¬asov p smo: %s\n" -IDS_TOTAL_PHYS_MEM, "Celkov fyzick pam: %s MB\n" -IDS_AVAIL_PHISICAL_MEM, "Dostupn fyzick pam: %s MB\n" -IDS_VIRT_MEM_MAX, "Virtu lna pam: Max Size: %s MB\n" -IDS_VIRT_MEM_AVAIL, "Virtu lna pam: Available: %s MB\n" -IDS_VIRT_MEM_INUSE, "Virtu lna pam: In Use: %s MB\n" -IDS_PAGEFILE_LOC, "Umiestnenie(a) str nkovacieho s£boru: %s\n" -IDS_DOMAIN, "Domna: %s\n" -IDS_NETWORK_CARDS, "Sieov karta(y) %u nainçtalovan .\n" +IDS_HOST_NAME, "Host Name" +IDS_OS_NAME, "N zov OS" +IDS_OS_VERSION, "Verzia OS" +IDS_BUILD, "Build" +IDS_OS_BUILD_TYPE, "OS Build typ" +IDS_REG_OWNER, "Registovanì vlastn¡k" +IDS_REG_ORG, "Registrovan organiz cia" +IDS_PRODUCT_ID, "ID produktu" +IDS_INST_DATE, "D tum inçtal cie" +IDS_UP_TIME, "System Up Time" +IDS_UP_TIME_FORMAT "%u Days, %u Hours, %u Minutes, %u Seconds" +IDS_SYS_MANUFACTURER, "System Manufacturer" +IDS_SYS_MODEL, "System Model" +IDS_SYS_TYPE, "Typ systmu" +IDS_PROCESSORS, "Procesor(y)" +IDS_PROCESSORS_FORMAT, "%u Procesor(y) nainçtalovanì." +IDS_BIOS_DATE, "D tum BIOSu" +IDS_BIOS_VERSION, "Verzia BIOSu" +IDS_ROS_DIR, "Adres r ReactOS" +IDS_SYS_DIR, "Adres r System" +IDS_BOOT_DEV, "Zav dzacie zariadenie" +IDS_SYS_LOCALE, "System Locale" +IDS_INPUT_LOCALE, "Input Locale" +IDS_TIME_ZONE, "¬asov p smo" +IDS_TOTAL_PHYS_MEM, "Celkov fyzick pam" +IDS_AVAIL_PHISICAL_MEM, "Dostupn fyzick pam" +IDS_VIRT_MEM_MAX, "Virtu lna pam: Max Size" +IDS_VIRT_MEM_AVAIL, "Virtu lna pam: Available" +IDS_VIRT_MEM_INUSE, "Virtu lna pam: In Use" +IDS_PAGEFILE_LOC, "Umiestnenie(a) str nkovacieho s£boru" +IDS_DOMAIN, "Domna" +IDS_NETWORK_CARDS, "Sieov karta(y)" +IDS_NETWORK_CARDS_FORMAT, "%u nainçtalovan." END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc [iso-8859-1] Sat Apr 2 17:51:09 2011 @@ -37,34 +37,38 @@ SYSTEMINFO /S ñèñòåìà /FO LIST\n\ SYSTEMINFO /S ñèñòåìà /FO CSV /NH\n" -IDS_HOST_NAME, "²ì'ÿ êîìï'þòåðà: %s\n" -IDS_OS_NAME, "²ì'ÿ ÎÑ: %s\n" -IDS_OS_VERSION, "Âåðñ³ÿ ÎÑ: %u.%u.%u %s Çá³ðêà %u\n" -IDS_OS_BUILD_TYPE, "Òèï çá³ðêè ÎÑ: %s\n" -IDS_REG_OWNER, "Çàðåºñòðîâàíèé âëàñíèê: %s\n" -IDS_REG_ORG, "Çàðåºñòðîâàíà îðãàí³çàö³ÿ: %s\n" -IDS_PRODUCT_ID, "ID ïðîäóêòà: %s\n" -IDS_INST_DATE, "Äàòà óñòàíîâêè: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u Minutes, %u Seconds\n" -IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" -IDS_SYS_MODEL, "System Model: %s\n" -IDS_SYS_TYPE, "Òèï ñèñòåìè: %s\n" -IDS_PROCESSORS, "Ïðîöåñîð(è): %u ïðîöåñîð(à,³â) âñòàíîâëåíî.\n" -IDS_BIOS_DATE, "Äàòà BIOS: %s\n" -IDS_BIOS_VERSION, "Âåðñ³ÿ BIOS: %s\n" -IDS_ROS_DIR, "Ïàïêà ReactOS: %s\n" -IDS_SYS_DIR, "Ñèñòåìíà ïàïêà: %s\n" -IDS_BOOT_DEV, "Ïðèñòð³é çàâàíòàæåííÿ: %s\n" -IDS_SYS_LOCALE, "Ìîâà ñèñòåìè: %s\n" -IDS_INPUT_LOCALE, "Ìîâà ââîäó: %s\n" -IDS_TIME_ZONE, "×àñîâèé ïîÿñ: %s\n" -IDS_TOTAL_PHYS_MEM, "Âñüîãî ô³çè÷íî¿ ïàì'ÿò³: %s ÌÁ\n" -IDS_AVAIL_PHISICAL_MEM, "Äîñòóïíî ô³çè÷íî¿ ïàì'ÿò³: %s ÌÁ\n" -IDS_VIRT_MEM_MAX, "Â³ðòóàëüíà ïàì'ÿòü: Ìàêñ. ðîçì³ð: %s ÌÁ\n" -IDS_VIRT_MEM_AVAIL, "Â³ðòóàëüíà ïàì'ÿòü: Äîñòóïíî: %s ÌÁ\n" -IDS_VIRT_MEM_INUSE, "Â³ðòóàëüíà ïàì'ÿòü: Âèêîðèñò.: %s ÌÁ\n" -IDS_PAGEFILE_LOC, "Ðîçòàøóâàííÿ ôàéëó äîâàíòàæåííÿ: %s\n" -IDS_DOMAIN, "Äîìåí: %s\n" -IDS_NETWORK_CARDS, "Ìåðåæíà êàðòà(è) %u Installed.\n" +IDS_HOST_NAME, "²ì'ÿ êîìï'þòåðà" +IDS_OS_NAME, "²ì'ÿ ÎÑ" +IDS_OS_VERSION, "Âåðñ³ÿ ÎÑ" +IDS_BUILD, "Çá³ðêà" +IDS_OS_BUILD_TYPE, "Òèï çá³ðêè ÎÑ" +IDS_REG_OWNER, "Çàðåºñòðîâàíèé âëàñíèê" +IDS_REG_ORG, "Çàðåºñòðîâàíà îðãàí³çàö³ÿ" +IDS_PRODUCT_ID, "ID ïðîäóêòà" +IDS_INST_DATE, "Äàòà óñòàíîâêè" +IDS_UP_TIME, "System Up Time" +IDS_UP_TIME_FORMAT "%u Days, %u Hours, %u Minutes, %u Seconds" +IDS_SYS_MANUFACTURER, "System Manufacturer" +IDS_SYS_MODEL, "System Model" +IDS_SYS_TYPE, "Òèï ñèñòåìè" +IDS_PROCESSORS, "Ïðîöåñîð(è)" +IDS_PROCESSORS_FORMAT, "%u ïðîöåñîð(à,³â) âñòàíîâëåíî." +IDS_BIOS_DATE, "Äàòà BIOS" +IDS_BIOS_VERSION, "Âåðñ³ÿ BIOS" +IDS_ROS_DIR, "Ïàïêà ReactOS" +IDS_SYS_DIR, "Ñèñòåìíà ïàïêà" +IDS_BOOT_DEV, "Ïðèñòð³é çàâàíòàæåííÿ" +IDS_SYS_LOCALE, "Ìîâà ñèñòåìè" +IDS_INPUT_LOCALE, "Ìîâà ââîäó" +IDS_TIME_ZONE, "×àñîâèé ïîÿñ" +IDS_TOTAL_PHYS_MEM, "Âñüîãî ô³çè÷íî¿ ïàì'ÿò³" +IDS_AVAIL_PHISICAL_MEM, "Äîñòóïíî ô³çè÷íî¿ ïàì'ÿò³" +IDS_VIRT_MEM_MAX, "Â³ðòóàëüíà ïàì'ÿòü: Ìàêñ. ðîçì³ð" +IDS_VIRT_MEM_AVAIL, "Â³ðòóàëüíà ïàì'ÿòü: Äîñòóïíî" +IDS_VIRT_MEM_INUSE, "Â³ðòóàëüíà ïàì'ÿòü: Âèêîðèñò." +IDS_PAGEFILE_LOC, "Ðîçòàøóâàííÿ ôàéëó äîâàíòàæåííÿ" +IDS_DOMAIN, "Äîìåí" +IDS_NETWORK_CARDS, "Ìåðåæíà êàðòà(è)" +IDS_NETWORK_CARDS_FORMAT, "%u Installed." END Modified: trunk/rosapps/applications/sysutils/systeminfo/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/resource.h [iso-8859-1] Sat Apr 2 17:51:09 2011 @@ -3,29 +3,33 @@ #define IDS_HOST_NAME 100 #define IDS_OS_NAME 101 #define IDS_OS_VERSION 102 -#define IDS_OS_BUILD_TYPE 103 -#define IDS_REG_OWNER 104 -#define IDS_REG_ORG 105 -#define IDS_PRODUCT_ID 106 -#define IDS_INST_DATE 107 +#define IDS_BUILD 103 +#define IDS_OS_BUILD_TYPE 104 +#define IDS_REG_OWNER 105 +#define IDS_REG_ORG 106 +#define IDS_PRODUCT_ID 107 +#define IDS_INST_DATE 108 #define IDS_UP_TIME 109 -#define IDS_SYS_MANUFACTURER 110 -#define IDS_SYS_MODEL 111 -#define IDS_SYS_TYPE 112 -#define IDS_PROCESSORS 113 -#define IDS_BIOS_DATE 114 -#define IDS_BIOS_VERSION 115 -#define IDS_ROS_DIR 116 -#define IDS_SYS_DIR 117 -#define IDS_BOOT_DEV 118 -#define IDS_SYS_LOCALE 119 -#define IDS_INPUT_LOCALE 120 -#define IDS_TOTAL_PHYS_MEM 121 -#define IDS_AVAIL_PHISICAL_MEM 122 -#define IDS_VIRT_MEM_MAX 123 -#define IDS_VIRT_MEM_AVAIL 124 -#define IDS_VIRT_MEM_INUSE 125 -#define IDS_PAGEFILE_LOC 126 -#define IDS_TIME_ZONE 127 -#define IDS_DOMAIN 128 -#define IDS_NETWORK_CARDS 130 +#define IDS_UP_TIME_FORMAT 110 +#define IDS_SYS_MANUFACTURER 111 +#define IDS_SYS_MODEL 112 +#define IDS_SYS_TYPE 113 +#define IDS_PROCESSORS 114 +#define IDS_PROCESSORS_FORMAT 115 +#define IDS_BIOS_DATE 116 +#define IDS_BIOS_VERSION 117 +#define IDS_ROS_DIR 118 +#define IDS_SYS_DIR 119 +#define IDS_BOOT_DEV 120 +#define IDS_SYS_LOCALE 121 +#define IDS_INPUT_LOCALE 122 +#define IDS_TOTAL_PHYS_MEM 123 +#define IDS_AVAIL_PHISICAL_MEM 124 +#define IDS_VIRT_MEM_MAX 125 +#define IDS_VIRT_MEM_AVAIL 126 +#define IDS_VIRT_MEM_INUSE 127 +#define IDS_PAGEFILE_LOC 128 +#define IDS_TIME_ZONE 129 +#define IDS_DOMAIN 130 +#define IDS_NETWORK_CARDS 131 +#define IDS_NETWORK_CARDS_FORMAT 132 Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] Sat Apr 2 17:51:09 2011 @@ -19,6 +19,7 @@ #include <wchar.h> #include <stdio.h> #include <string.h> +#include <stdarg.h> #include <windows.h> #include <time.h> #include <locale.h> @@ -42,11 +43,11 @@ /* Load data from registry */ static -BOOL -RegGetSZ(HKEY hKey, LPCWSTR lpSubKey, LPCWSTR lpValueName, LPWSTR Buf) -{ - DWORD dwBytes = BUFFER_SIZE*sizeof(WCHAR), dwType; - BOOL bRet = TRUE; +unsigned +RegGetSZ(HKEY hKey, LPCWSTR lpSubKey, LPCWSTR lpValueName, LPWSTR lpBuf, DWORD cchBuf) +{ + DWORD dwBytes = cchBuf*sizeof(WCHAR), dwType; + unsigned cChars; /* If SubKy is specified open it */ if (lpSubKey && RegOpenKeyExW(hKey, @@ -56,29 +57,34 @@ &hKey) != ERROR_SUCCESS) { wprintf(L"Warning! Cannot open %s. Last error: %lu.\n", lpSubKey, GetLastError()); - return FALSE; + return 0; } if (RegQueryValueExW(hKey, lpValueName, NULL, &dwType, - (LPBYTE)Buf, + (LPBYTE)lpBuf, &dwBytes) != ERROR_SUCCESS || (dwType != REG_SZ && dwType != REG_MULTI_SZ)) { wprintf(L"Warning! Cannot query %s. Last error: %lu, type: %lu.\n", lpValueName, GetLastError(), dwType); dwBytes = 0; - bRet = FALSE; } /* Close key if we opened it */ if (lpSubKey) RegCloseKey(hKey); + cChars = dwBytes/sizeof(WCHAR); + /* NULL-terminate string */ - Buf[min(BUFFER_SIZE-1, dwBytes/sizeof(WCHAR))] = L'\0'; - - return bRet; + lpBuf[min(cchBuf-1, cChars)] = L'\0'; + + /* Don't count NULL characters */ + while(cChars && !lpBuf[cChars-1]) + --cChars; + + return cChars; } static @@ -119,11 +125,12 @@ } static -void -FormatBytes(LPWSTR Buf, unsigned cBytes) +VOID +FormatBytes(LPWSTR lpBuf, unsigned cBytes) { WCHAR szMB[32]; NUMBERFMTW fmt; + unsigned i; _itow(cBytes / (1024*1024), szMB, 10); @@ -134,15 +141,17 @@ fmt.lpThousandSep = L" "; fmt.NegativeOrder = 0; - if(!GetNumberFormatW(LOCALE_SYSTEM_DEFAULT, 0, szMB, &fmt, Buf, BUFFER_SIZE)) - wprintf(L"Error! GetNumberFormat failed.\n"); -} - -static -void + i = GetNumberFormatW(LOCALE_SYSTEM_DEFAULT, 0, szMB, &fmt, lpBuf, BUFFER_SIZE - 3); + if (i) + --i; /* don't count NULL character */ + wcscpy(lpBuf + i, L" MB"); +} + +static +VOID FormatDateTime(time_t Time, LPWSTR lpBuf) { - unsigned cchBuf = BUFFER_SIZE, i; + unsigned i; SYSTEMTIME SysTime; const struct tm *lpTm; @@ -156,14 +165,15 @@ SysTime.wSecond = (WORD)lpTm->tm_sec; SysTime.wMilliseconds = 0; - /* Time first */ - i = GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &SysTime, NULL, lpBuf, cchBuf); + /* Copy date first */ + i = GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &SysTime, NULL, lpBuf, BUFFER_SIZE - 2); if (i) --i; /* don't count NULL character */ - /* Time now */ + /* Copy time now */ i += swprintf(lpBuf + i, L", "); - GetTimeFormatW(LOCALE_SYSTEM_DEFAULT, 0, &SysTime, NULL, lpBuf + i, cchBuf - i); + i += 2; + GetTimeFormatW(LOCALE_SYSTEM_DEFAULT, 0, &SysTime, NULL, lpBuf + i, BUFFER_SIZE - i); } /* Show usage */ @@ -175,6 +185,32 @@ if(GetOemStrings(IDS_USAGE, Buf)) wprintf(L"%s", Buf); +} + +static +VOID +PrintRow(UINT nTitleID, unsigned cxOffset, LPWSTR lpFormat, ...) +{ + WCHAR Buf[BUFFER_SIZE]; + va_list Args; + unsigned c; + + if (nTitleID) + { + c = LoadStringW(GetModuleHandle(NULL), nTitleID, Buf, BUFFER_SIZE); + if (!c) + return; + + wcscpy(Buf + c, L":"); + } else + Buf[0] = L'\0'; + wprintf(L"%-32s ", Buf); + + va_start(Args, lpFormat); + vwprintf(lpFormat, Args); + va_end(Args); + + wprintf(L"\n"); } /* Print all system information */ @@ -189,7 +225,7 @@ LPWSTR lpBuffer; NETSETUP_JOIN_STATUS NetJoinStatus; MEMORYSTATUS MemoryStatus; - unsigned int cSeconds; + unsigned int cSeconds, i, j; TIME_ZONE_INFORMATION TimeZoneInfo; HKEY hKey; @@ -205,8 +241,8 @@ dwCharCount = BUFFER_SIZE; if (!GetComputerNameW(Buf, &dwCharCount)) wprintf(L"Error! GetComputerName failed.\n"); - else if (GetOemStrings(IDS_HOST_NAME, Msg)) - wprintf(Msg, Buf); + else + PrintRow(IDS_HOST_NAME, 0, L"%s", Buf); // open CurrentVersion key if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, @@ -220,60 +256,60 @@ } //getting OS Name - RegGetSZ(hKey, NULL, L"ProductName", Buf); - if (GetOemStrings(IDS_OS_NAME, Msg)) - wprintf(Msg, Buf); + RegGetSZ(hKey, NULL, L"ProductName", Buf, BUFFER_SIZE); + PrintRow(IDS_OS_NAME, 0, L"%s", Buf); //getting OS Version ZeroMemory(&VersionInfo, sizeof(VersionInfo)); VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); GetVersionExW(&VersionInfo); - if (GetOemStrings(IDS_OS_VERSION, Msg)) - wprintf(Msg, - (unsigned)VersionInfo.dwMajorVersion, - (unsigned)VersionInfo.dwMinorVersion, - (unsigned)VersionInfo.dwBuildNumber, - VersionInfo.szCSDVersion, - (unsigned)VersionInfo.dwBuildNumber); + if (!LoadStringW(GetModuleHandle(NULL), IDS_BUILD, Tmp, BUFFER_SIZE)) + Tmp[0] = L'\0'; + PrintRow(IDS_OS_VERSION, + 0, + L"%u.%u.%u %s %s %u", + (unsigned)VersionInfo.dwMajorVersion, + (unsigned)VersionInfo.dwMinorVersion, + (unsigned)VersionInfo.dwBuildNumber, + VersionInfo.szCSDVersion, + Tmp, + (unsigned)VersionInfo.dwBuildNumber); //getting OS Manufacturer //getting OS Configuration //getting OS Build Type - RegGetSZ(hKey, NULL, L"CurrentType", Buf); - if (GetOemStrings(IDS_OS_BUILD_TYPE, Msg)) - wprintf(Msg, Buf); + RegGetSZ(hKey, NULL, L"CurrentType", Buf, BUFFER_SIZE); + PrintRow(IDS_OS_BUILD_TYPE, 0, L"%s", Buf); //getting Registered Owner - RegGetSZ(hKey, NULL, L"RegisteredOwner", Buf); - if (GetOemStrings(IDS_REG_OWNER, Msg)) - wprintf(Msg, Buf); + RegGetSZ(hKey, NULL, L"RegisteredOwner", Buf, BUFFER_SIZE); + PrintRow(IDS_REG_OWNER, 0, L"%s", Buf); //getting Registered Organization - RegGetSZ(hKey, NULL, L"RegisteredOrganization", Buf); - if (GetOemStrings(IDS_REG_ORG, Msg)) - wprintf(Msg, Buf); + RegGetSZ(hKey, NULL, L"RegisteredOrganization", Buf, BUFFER_SIZE); + PrintRow(IDS_REG_ORG, 0, L"%s", Buf); //getting Product ID - RegGetSZ(hKey, NULL, L"ProductId", Buf); - if (GetOemStrings(IDS_PRODUCT_ID, Msg)) - wprintf(Msg, Buf); + RegGetSZ(hKey, NULL, L"ProductId", Buf, BUFFER_SIZE); + PrintRow(IDS_PRODUCT_ID, 0, L"%s", Buf); //getting Install Date RegGetDWORD(hKey, NULL, L"InstallDate", &dwTimestamp); FormatDateTime((time_t)dwTimestamp, Buf); - if (GetOemStrings(IDS_INST_DATE, Msg)) - wprintf(Msg, Buf); + PrintRow(IDS_INST_DATE, 0, L"%s", Buf); // close Current Version key now RegCloseKey(hKey); //getting System Up Time cSeconds = GetTickCount() / 1000; - if (GetOemStrings(IDS_UP_TIME, Msg)) - wprintf(Msg, cSeconds / (60*60*24), (cSeconds / (60*60)) % 24, (cSeconds / 60) % 60, cSeconds % 60); + if (!LoadStringW(GetModuleHandle(NULL), IDS_UP_TIME_FORMAT, Tmp, BUFFER_SIZE)) + Tmp[0] = L'\0'; + swprintf(Buf, Tmp, cSeconds / (60*60*24), (cSeconds / (60*60)) % 24, (cSeconds / 60) % 60, cSeconds % 60); + PrintRow(IDS_UP_TIME, 0, L"%s", Buf); //getting System Manufacturer; HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OEMInformation\Manufacturer for Win >= 6.0 swprintf(Tmp, L"%s\\oeminfo.ini", szSystemDir); @@ -283,8 +319,7 @@ Buf, sizeof(Buf)/sizeof(Buf[0]), Tmp); - if (GetOemStrings(IDS_SYS_MANUFACTURER, Msg)) - wprintf(Msg, Buf); + PrintRow(IDS_SYS_MANUFACTURER, 0, L"%s", Buf); //getting System Model; HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OEMInformation\Model for Win >= 6.0 GetPrivateProfileStringW(L"General", @@ -293,8 +328,7 @@ Buf, sizeof(Buf)/sizeof(Buf[0]), Tmp); - if (GetOemStrings(IDS_SYS_MODEL, Msg)) - wprintf(Msg, Buf); + PrintRow(IDS_SYS_MODEL, 0, L"%s", Buf); //getting System type switch (SysInfo.wProcessorArchitecture) @@ -312,93 +346,93 @@ lpcszSysType = L"Unknown"; break; } - if (GetOemStrings(IDS_SYS_TYPE, Msg)) - wprintf(Msg, lpcszSysType); + PrintRow(IDS_SYS_TYPE, 0, L"%s", lpcszSysType); //getting Processor(s) - if (GetOemStrings(IDS_PROCESSORS, Msg)) - { - unsigned int i; - wprintf(Msg, (unsigned int)SysInfo.dwNumberOfProcessors); - for(i = 0; i < (unsigned int)SysInfo.dwNumberOfProcessors; i++) - { - swprintf(Tmp, L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\%u", i); - - RegGetSZ(HKEY_LOCAL_MACHINE, Tmp, L"Identifier", Buf); - wprintf(L" [%02u]: %s", i+1, Buf); - - RegGetSZ(HKEY_LOCAL_MACHINE, Tmp, L"VendorIdentifier", Buf); - wprintf(L" %s\n", Buf); - } + if (!LoadStringW(GetModuleHandle(NULL), IDS_PROCESSORS_FORMAT, Tmp, BUFFER_SIZE)) + Tmp[0] = L'\0'; + swprintf(Buf, Tmp, (unsigned)SysInfo.dwNumberOfProcessors); + PrintRow(IDS_PROCESSORS, 0, L"%s", Buf); + for(i = 0; i < (unsigned int)SysInfo.dwNumberOfProcessors; i++) + { + swprintf(Tmp, L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\%u", i); + j = swprintf(Buf, L"[%02u]: ", i + 1); + + j += RegGetSZ(HKEY_LOCAL_MACHINE, Tmp, L"Identifier", Buf + j, BUFFER_SIZE - j); + if(j + 1 < BUFFER_SIZE) + Buf[j++] = L' '; + RegGetSZ(HKEY_LOCAL_MACHINE, Tmp, L"VendorIdentifier", Buf + j, BUFFER_SIZE - j); + + PrintRow(0, 0, L"%s", Buf); } //getting BIOS Version RegGetSZ(HKEY_LOCAL_MACHINE, L"HARDWARE\\DESCRIPTION\\System", L"SystemBiosVersion", - Buf); - if (GetOemStrings(IDS_BIOS_VERSION, Msg)) - wprintf(Msg, Buf); + Buf, + BUFFER_SIZE); + PrintRow(IDS_BIOS_VERSION, 0, L"%s", Buf); //gettings BIOS date RegGetSZ(HKEY_LOCAL_MACHINE, L"HARDWARE\\DESCRIPTION\\System", L"SystemBiosDate", - Buf); - if (GetOemStrings(IDS_BIOS_DATE, Msg)) - wprintf(Msg, Buf); + Buf, + BUFFER_SIZE); + PrintRow(IDS_BIOS_DATE, 0, L"%s", Buf); //getting ReactOS Directory if (!GetWindowsDirectoryW(Buf, BUFFER_SIZE)) wprintf(L"Error! GetWindowsDirectory failed."); - else if (GetOemStrings(IDS_ROS_DIR, Msg)) - wprintf(Msg, Buf); + else + PrintRow(IDS_ROS_DIR, 0, L"%s", Buf); //getting System Directory - if (GetOemStrings(IDS_SYS_DIR, Msg)) - wprintf(Msg, szSystemDir); + PrintRow(IDS_SYS_DIR, 0, L"%s", szSystemDir); //getting Boot Device RegGetSZ(HKEY_LOCAL_MACHINE, L"SYSTEM\\Setup", L"SystemPartition", - Buf); - if (GetOemStrings(IDS_BOOT_DEV, Msg)) - wprintf(Msg, Buf); + Buf, + BUFFER_SIZE); + PrintRow(IDS_BOOT_DEV, 0, L"%s", Buf); //getting System Locale if (GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_ILANGUAGE, Tmp, BUFFER_SIZE)) if (RegGetSZ(HKEY_CLASSES_ROOT, L"MIME\\Database\\Rfc1766", Tmp, - Buf)) + Buf, + BUFFER_SIZE)) { /* get rid of @filename,resource */ lpBuffer = wcschr(Buf, L';'); if (lpBuffer) SHLoadIndirectString(lpBuffer+1, lpBuffer+1, BUFFER_SIZE - (lpBuffer-Buf) - 1, NULL); - if (GetOemStrings(IDS_SYS_LOCALE, Msg)) - wprintf(Msg, Buf); + PrintRow(IDS_SYS_LOCALE, 0, L"%s", Buf); } //getting Input Locale if (RegGetSZ(HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", L"1", - Tmp) && wcslen(Tmp) > 4) + Tmp, + BUFFER_SIZE) && wcslen(Tmp) > 4) if (RegGetSZ(HKEY_CLASSES_ROOT, L"MIME\\Database\\Rfc1766", Tmp + 4, - Buf)) + Buf, + BUFFER_SIZE)) { /* get rid of @filename,resource */ lpBuffer = wcschr(Buf, L';'); if (lpBuffer) SHLoadIndirectString(lpBuffer+1, lpBuffer+1, BUFFER_SIZE - (lpBuffer-Buf) - 1, NULL); - if (GetOemStrings(IDS_INPUT_LOCALE, Msg)) - wprintf(Msg, Buf); + PrintRow(IDS_INPUT_LOCALE, 0, L"%s", Buf); } //getting Time Zone @@ -417,14 +451,13 @@ dwCharCount = 256; // Windows seems to have a bug - it doesnt accept BUFFER_SIZE here for(i = 0; RegEnumKeyExW(hKey, i, Tmp, &dwCharCount, NULL, NULL, NULL, NULL) == ERROR_SUCCESS; ++i, dwCharCount = 255) { - RegGetSZ(hKey, Tmp, L"Std", Buf); + RegGetSZ(hKey, Tmp, L"Std", Buf, BUFFER_SIZE); if(!wcscmp(Buf, TimeZoneInfo.StandardName)) { - RegGetSZ(hKey, Tmp, L"Display", Buf); - - if (GetOemStrings(IDS_TIME_ZONE, Msg)) - wprintf(Msg, Buf); + RegGetSZ(hKey, Tmp, L"Display", Buf, BUFFER_SIZE); + + PrintRow(IDS_TIME_ZONE, 0, L"%s", Buf); break; } @@ -435,55 +468,49 @@ //getting Total Physical Memory GlobalMemoryStatus(&MemoryStatus); FormatBytes(Buf, MemoryStatus.dwTotalPhys); - if (GetOemStrings(IDS_TOTAL_PHYS_MEM, Msg)) - wprintf(Msg, Buf); + PrintRow(IDS_TOTAL_PHYS_MEM, 0, L"%s", Buf); //getting Available Physical Memory FormatBytes(Buf, MemoryStatus.dwAvailPhys); - if (GetOemStrings(IDS_AVAIL_PHISICAL_MEM,Msg)) - wprintf(Msg, Buf); + PrintRow(IDS_AVAIL_PHISICAL_MEM, 0, L"%s", Buf); //getting Virtual Memory: Max Size FormatBytes(Buf, MemoryStatus.dwTotalVirtual); - if (GetOemStrings(IDS_VIRT_MEM_MAX, Msg)) - wprintf(Msg, Buf); + PrintRow(IDS_VIRT_MEM_MAX, 0, L"%s", Buf); //getting Virtual Memory: Available FormatBytes(Buf, MemoryStatus.dwAvailVirtual); - if (GetOemStrings(IDS_VIRT_MEM_AVAIL, Msg)) - wprintf(Msg, Buf); + PrintRow(IDS_VIRT_MEM_AVAIL, 0, L"%s", Buf); //getting Virtual Memory: In Use FormatBytes(Buf, MemoryStatus.dwTotalVirtual-MemoryStatus.dwAvailVirtual); - if (GetOemStrings(IDS_VIRT_MEM_INUSE, Msg)) - wprintf(Msg, Buf); + PrintRow(IDS_VIRT_MEM_INUSE, 0, L"%s", Buf); //getting Page File Location(s) if (RegGetSZ(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management", L"PagingFiles", - Buf)) + Buf, + BUFFER_SIZE)) { int i; - for(i = 0; i < strlen((char*)Buf); i++) + for(i = 0; Buf[i]; i++) { - if (Buf[i] == TEXT(' ')) + if (Buf[i] == L' ') { - Buf[i] = TEXT('\0'); + Buf[i] = L'\0'; break; } } - if(GetOemStrings(IDS_PAGEFILE_LOC, Msg)) - wprintf(Msg, Buf); + PrintRow(IDS_PAGEFILE_LOC, 0, L"%s", Buf); } //getting Domain if (NetGetJoinInformation (NULL, &lpBuffer, &NetJoinStatus) == NERR_Success) { - if(GetOemStrings(IDS_DOMAIN, Msg)) - wprintf(Msg, lpBuffer); + PrintRow(IDS_DOMAIN, 0, L"%s", lpBuffer); NetApiBufferFree(lpBuffer); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2011