Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[akhaldi] 51232: Remove branch and recreate it from cmake branch 2/2
by akhaldi＠svn.reactos.org 02 Apr '11

02 Apr '11

Author: akhaldi Date: Sat Apr 2 17:23:12 2011 New Revision: 51232 URL: http://svn.reactos.org/svn/reactos?rev=51232&view=rev Log: Remove branch and recreate it from cmake branch 2/2 Added: branches/nyadav-audio-branch/ (props changed) - copied from r51231, branches/cmake-bringup/ Propchange: branches/nyadav-audio-branch/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Apr 2 17:23:12 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nyadav-audio-branch/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nyadav-audio-branch/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nyadav-audio-branch/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Apr 2 17:23:12 2011 @@ -1,0 +1,16 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +build* +*.patch +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/nyadav-audio-branch/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Apr 2 17:23:12 2011 @@ -1,0 +1,6 @@ +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/trunk/reactos:48236-51165 Propchange: branches/nyadav-audio-branch/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[janderwald] 51231: - Remove branch and recreate it from cmake branch 1/2
by janderwald＠svn.reactos.org 02 Apr '11

02 Apr '11

Author: janderwald Date: Sat Apr 2 17:14:35 2011 New Revision: 51231 URL: http://svn.reactos.org/svn/reactos?rev=51231&view=rev Log: - Remove branch and recreate it from cmake branch 1/2 Removed: branches/nyadav-audio-branch/

1 0

[gedmurphy] 51230: [FULLFAT] - Switch UTF-16 support on throughout the library.
by gedmurphy＠svn.reactos.org 02 Apr '11

02 Apr '11

Author: gedmurphy Date: Sat Apr 2 16:37:25 2011 New Revision: 51230 URL: http://svn.reactos.org/svn/reactos?rev=51230&view=rev Log: [FULLFAT] - Switch UTF-16 support on throughout the library. Modified: trunk/reactos/include/reactos/libs/fullfat/ff_config.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 16:37:25 2011 @@ -51,7 +51,7 @@ //---------- UNICODE SUPPORT -//#define FF_UNICODE_SUPPORT // If this is defined, then all of FullFAT's API's will expect to receive UTF-16 formatted strings. +#define FF_UNICODE_SUPPORT // If this is defined, then all of FullFAT's API's will expect to receive UTF-16 formatted strings. // FF_FindFirst() and FF_FindNext() will also return Filenames in UTF-16 format. // NOTE: This option may cause FullFAT to not "Clean-compile" when using GCC. This is because // pedantically GCC refuses to accept C99 library functions, unless the -std=c99 flag is used.

1 0

[gedmurphy] 51229: [FULLFAT] - Update FullFat to the latest SVN code on James' recommendation. - This release has many advantages over the previous, including full UTF-8 and UTF-16 support and the ...
by gedmurphy＠svn.reactos.org 02 Apr '11

02 Apr '11

Author: gedmurphy Date: Sat Apr 2 16:31:43 2011 New Revision: 51229 URL: http://svn.reactos.org/svn/reactos?rev=51229&view=rev Log: [FULLFAT] - Update FullFat to the latest SVN code on James' recommendation. - This release has many advantages over the previous, including full UTF-8 and UTF-16 support and the ability to modify attributes and timestamps. All of which are important for ros. - It currently has a few warnings (in both gcc and msc), so I've had to turn allow warnings on. Added: trunk/reactos/include/reactos/libs/fullfat/ff_format.h (with props) trunk/reactos/include/reactos/libs/fullfat/ff_unicode.h (with props) trunk/reactos/lib/3rdparty/fullfat/ff_format.c (with props) trunk/reactos/lib/3rdparty/fullfat/ff_unicode.c (with props) Modified: trunk/reactos/include/reactos/libs/fullfat/ff_config.h trunk/reactos/include/reactos/libs/fullfat/ff_crc.h trunk/reactos/include/reactos/libs/fullfat/ff_dir.h trunk/reactos/include/reactos/libs/fullfat/ff_error.h trunk/reactos/include/reactos/libs/fullfat/ff_fat.h trunk/reactos/include/reactos/libs/fullfat/ff_fatdef.h trunk/reactos/include/reactos/libs/fullfat/ff_file.h trunk/reactos/include/reactos/libs/fullfat/ff_ioman.h trunk/reactos/include/reactos/libs/fullfat/ff_memory.h trunk/reactos/include/reactos/libs/fullfat/ff_string.h trunk/reactos/include/reactos/libs/fullfat/ff_types.h trunk/reactos/include/reactos/libs/fullfat/fullfat.h trunk/reactos/lib/3rdparty/fullfat/ff_crc.c trunk/reactos/lib/3rdparty/fullfat/ff_dir.c trunk/reactos/lib/3rdparty/fullfat/ff_dir.h trunk/reactos/lib/3rdparty/fullfat/ff_error.c trunk/reactos/lib/3rdparty/fullfat/ff_fat.c trunk/reactos/lib/3rdparty/fullfat/ff_file.c trunk/reactos/lib/3rdparty/fullfat/ff_hash.c trunk/reactos/lib/3rdparty/fullfat/ff_ioman.c trunk/reactos/lib/3rdparty/fullfat/ff_string.c trunk/reactos/lib/3rdparty/fullfat/fullfat.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/reactos/libs/fullfat/ff_config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… Modified: trunk/reactos/include/reactos/libs/fullfat/ff_crc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… Modified: trunk/reactos/include/reactos/libs/fullfat/ff_dir.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… Modified: trunk/reactos/include/reactos/libs/fullfat/ff_error.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… Modified: trunk/reactos/include/reactos/libs/fullfat/ff_fat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… Modified: trunk/reactos/include/reactos/libs/fullfat/ff_fatdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… Modified: trunk/reactos/include/reactos/libs/fullfat/ff_file.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… Added: trunk/reactos/include/reactos/libs/fullfat/ff_format.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… Modified: trunk/reactos/include/reactos/libs/fullfat/ff_ioman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… Modified: trunk/reactos/include/reactos/libs/fullfat/ff_memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… Modified: trunk/reactos/include/reactos/libs/fullfat/ff_string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… Modified: trunk/reactos/include/reactos/libs/fullfat/ff_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… Added: trunk/reactos/include/reactos/libs/fullfat/ff_unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… Modified: trunk/reactos/include/reactos/libs/fullfat/fullfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… Modified: trunk/reactos/lib/3rdparty/fullfat/ff_crc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_cr… Modified: trunk/reactos/lib/3rdparty/fullfat/ff_dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_di… Modified: trunk/reactos/lib/3rdparty/fullfat/ff_dir.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_di… Modified: trunk/reactos/lib/3rdparty/fullfat/ff_error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_er… Modified: trunk/reactos/lib/3rdparty/fullfat/ff_fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_fa… Modified: trunk/reactos/lib/3rdparty/fullfat/ff_file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_fi… Added: trunk/reactos/lib/3rdparty/fullfat/ff_format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_fo… Modified: trunk/reactos/lib/3rdparty/fullfat/ff_hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_ha… Modified: trunk/reactos/lib/3rdparty/fullfat/ff_ioman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_io… Modified: trunk/reactos/lib/3rdparty/fullfat/ff_string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_st… Added: trunk/reactos/lib/3rdparty/fullfat/ff_unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_un… Modified: trunk/reactos/lib/3rdparty/fullfat/fullfat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/fullf…

1 0

[rharabien] 51228: [SYSTEMINFO] * Fix System Locale field * Fix Input Locale field
by rharabien＠svn.reactos.org 02 Apr '11

02 Apr '11

Author: rharabien Date: Sat Apr 2 15:50:45 2011 New Revision: 51228 URL: http://svn.reactos.org/svn/reactos?rev=51228&view=rev Log: [SYSTEMINFO] * Fix System Locale field * Fix Input Locale field Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild 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 15:50:45 2011 @@ -18,13 +18,12 @@ #include <wchar.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> -#include <ctype.h> #include <windows.h> #include <time.h> #include <locale.h> #include <lm.h> +#include <shlwapi.h> #include "resource.h" @@ -56,7 +55,7 @@ KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) { - //wprintf("Warning! Cannot open %s. Last error: %lu.\n", lpSubKey, GetLastError()); + wprintf(L"Warning! Cannot open %s. Last error: %lu.\n", lpSubKey, GetLastError()); return FALSE; } @@ -67,7 +66,7 @@ (LPBYTE)Buf, &dwBytes) != ERROR_SUCCESS || (dwType != REG_SZ && dwType != REG_MULTI_SZ)) { - //wprintf("Warning! Cannot query %s. Last error: %lu, type: %lu.\n", lpValueName, GetLastError(), dwType); + wprintf(L"Warning! Cannot query %s. Last error: %lu, type: %lu.\n", lpValueName, GetLastError(), dwType); dwBytes = 0; bRet = FALSE; } @@ -96,6 +95,7 @@ KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) { + wprintf(L"Warning! Cannot open %s. Last error: %lu.\n", lpSubKey, GetLastError()); return FALSE; } @@ -106,7 +106,7 @@ (LPBYTE)lpData, &dwBytes) != ERROR_SUCCESS || dwType != REG_DWORD) { - //wprintf("Warning! Cannot query %s. Last err: %lu, type: %lu\n", lpValueName, GetLastError(), dwType); + wprintf(L"Warning! Cannot query %s. Last err: %lu, type: %lu\n", lpValueName, GetLastError(), dwType); *lpData = 0; bRet = FALSE; } @@ -186,7 +186,7 @@ SYSTEM_INFO SysInfo; WCHAR Buf[BUFFER_SIZE], Tmp[BUFFER_SIZE], Msg[BUFFER_SIZE], szSystemDir[MAX_PATH]; const WCHAR *lpcszSysType; - LPWSTR lpNetBuffer; + LPWSTR lpBuffer; NETSETUP_JOIN_STATUS NetJoinStatus; MEMORYSTATUS MemoryStatus; unsigned int cSeconds; @@ -325,7 +325,7 @@ swprintf(Tmp, L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\%u", i); RegGetSZ(HKEY_LOCAL_MACHINE, Tmp, L"Identifier", Buf); - wprintf(L" [%02u]: %s", i+1, Buf); + wprintf(L" [%02u]: %s", i+1, Buf); RegGetSZ(HKEY_LOCAL_MACHINE, Tmp, L"VendorIdentifier", Buf); wprintf(L" %s\n", Buf); @@ -367,35 +367,39 @@ wprintf(Msg, Buf); //getting System Locale - if (RegGetSZ(HKEY_CURRENT_USER, - L"Control Panel\\International", - L"Locale", - Tmp)) + if (GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_ILANGUAGE, Tmp, BUFFER_SIZE)) if (RegGetSZ(HKEY_CLASSES_ROOT, L"MIME\\Database\\Rfc1766", Tmp, Buf)) + { + /* 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); + } //getting Input Locale if (RegGetSZ(HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", L"1", - Buf)) - { - int i, j; - - for(j = 0, i = 4; i <= 8; j++, i++) - Tmp[j] = Buf[i]; - + Tmp) && wcslen(Tmp) > 4) if (RegGetSZ(HKEY_CLASSES_ROOT, L"MIME\\Database\\Rfc1766", - Tmp, + Tmp + 4, Buf)) + { + /* 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); - } + } //getting Time Zone GetTimeZoneInformation(&TimeZoneInfo); @@ -476,12 +480,12 @@ } //getting Domain - if (NetGetJoinInformation (NULL, &lpNetBuffer, &NetJoinStatus) == NERR_Success) + if (NetGetJoinInformation (NULL, &lpBuffer, &NetJoinStatus) == NERR_Success) { if(GetOemStrings(IDS_DOMAIN, Msg)) - wprintf(Msg, lpNetBuffer); - - NetApiBufferFree(lpNetBuffer); + wprintf(Msg, lpBuffer); + + NetApiBufferFree(lpBuffer); } //getting Logon Server Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild [iso-8859-1] Sat Apr 2 15:50:45 2011 @@ -3,6 +3,7 @@ <library>ntdll</library> <library>advapi32</library> <library>netapi32</library> + <library>shlwapi</library> <file>systeminfo.c</file> <file>systeminfo.rc</file> <file>rsrc.rc</file>

1 0

[gedmurphy] 51227: {FULLFAT] - Update FullFat to the latest stable release (1.0.5) - I'm awaiting a reply from James as to when 1.1.0 will be released as it have some nice improvements.
by gedmurphy＠svn.reactos.org 02 Apr '11

02 Apr '11

Author: gedmurphy Date: Sat Apr 2 15:22:48 2011 New Revision: 51227 URL: http://svn.reactos.org/svn/reactos?rev=51227&view=rev Log: {FULLFAT] - Update FullFat to the latest stable release (1.0.5) - I'm awaiting a reply from James as to when 1.1.0 will be released as it have some nice improvements. Added: trunk/reactos/include/reactos/libs/fullfat/ff_fatdef.h (with props) Modified: trunk/reactos/include/reactos/libs/fullfat/ff_config.h trunk/reactos/include/reactos/libs/fullfat/ff_dir.h trunk/reactos/include/reactos/libs/fullfat/ff_fat.h trunk/reactos/include/reactos/libs/fullfat/ff_ioman.h trunk/reactos/include/reactos/libs/fullfat/ff_memory.h trunk/reactos/include/reactos/libs/fullfat/fullfat.h trunk/reactos/lib/3rdparty/fullfat/ff_dir.c trunk/reactos/lib/3rdparty/fullfat/ff_dir.h trunk/reactos/lib/3rdparty/fullfat/ff_fat.c trunk/reactos/lib/3rdparty/fullfat/ff_file.c trunk/reactos/lib/3rdparty/fullfat/ff_hash.c trunk/reactos/lib/3rdparty/fullfat/ff_ioman.c trunk/reactos/lib/3rdparty/fullfat/ff_memory.c 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 15:22:48 2011 @@ -74,13 +74,24 @@ // within the same path. E.g. a copy \dir1\*.* \dir2\*.* command. // This command requires FF_MAX_PATH number of bytes of memory. (Defined below, default 2600). +//---------- BLKDEV USES SEMAPHORE +#define FF_BLKDEV_USES_SEM // When defined, each call to fnReadBlocks and fnWriteBlocks will be done while semaphore is locked + // See also ff_safety.c + // (HT addition) + #define FF_PATH_CACHE_DEPTH 2 // The Number of PATH's to Cache. //---------- DON'T USE MALLOC //#define FF_NO_MALLOC -//---------- DON'T +#define FF_MALLOC(aSize) malloc(aSize) +#define FF_FREE(apPtr) free(apPtr) + +//#define FF_INLINE_MEMORY_ACCESS + +//#define FF_INLINE static __forceinline // Keywords to inline functions (Windows) +#define FF_INLINE static inline // Standard for GCC //---------- Hash Table Support @@ -117,7 +128,7 @@ //---------- AUTOMATIC SETTINGS DO NOT EDIT -- These configure your options from above, and check sanity! #ifdef FF_LFN_SUPPORT -#define FF_MAX_FILENAME 260 +#define FF_MAX_FILENAME (129) #else #define FF_MAX_FILENAME 13 #endif Modified: trunk/reactos/include/reactos/libs/fullfat/ff_dir.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… ============================================================================== --- trunk/reactos/include/reactos/libs/fullfat/ff_dir.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fullfat/ff_dir.h [iso-8859-1] Sat Apr 2 15:22:48 2011 @@ -43,7 +43,7 @@ #include "ff_ioman.h" #include "ff_blk.h" #include "ff_fat.h" -#include "fat.h" +#include "ff_fatdef.h" #include "ff_memory.h" #include "ff_time.h" #include "ff_hash.h" Modified: trunk/reactos/include/reactos/libs/fullfat/ff_fat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… ============================================================================== --- trunk/reactos/include/reactos/libs/fullfat/ff_fat.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fullfat/ff_fat.h [iso-8859-1] Sat Apr 2 15:22:48 2011 @@ -39,7 +39,7 @@ #define _FF_FAT_H_ #include "ff_config.h" -#include "fat.h" +#include "ff_fatdef.h" #include "ff_ioman.h" #include "ff_blk.h" #include "ff_types.h" Added: trunk/reactos/include/reactos/libs/fullfat/ff_fatdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… ============================================================================== --- trunk/reactos/include/reactos/libs/fullfat/ff_fatdef.h (added) +++ trunk/reactos/include/reactos/libs/fullfat/ff_fatdef.h [iso-8859-1] Sat Apr 2 15:22:48 2011 @@ -1,0 +1,90 @@ +/***************************************************************************** + * 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. * + *****************************************************************************/ +#ifndef _FF_FATDEF_H_ +#define _FF_FATDEF_H_ + +/* + This file defines offsets to various data for the FAT specification. +*/ + +// MBR / PBR Offsets + +#define FF_FAT_BYTES_PER_SECTOR 0x00B +#define FF_FAT_SECTORS_PER_CLUS 0x00D +#define FF_FAT_RESERVED_SECTORS 0x00E +#define FF_FAT_NUMBER_OF_FATS 0x010 +#define FF_FAT_ROOT_ENTRY_COUNT 0x011 +#define FF_FAT_16_TOTAL_SECTORS 0x013 +#define FF_FAT_32_TOTAL_SECTORS 0x020 +#define FF_FAT_16_SECTORS_PER_FAT 0x016 +#define FF_FAT_32_SECTORS_PER_FAT 0x024 +#define FF_FAT_ROOT_DIR_CLUSTER 0x02C + +#define FF_FAT_16_VOL_LABEL 0x02B +#define FF_FAT_32_VOL_LABEL 0x047 + +#define FF_FAT_PTBL 0x1BE +#define FF_FAT_PTBL_LBA 0x008 +#define FF_FAT_PTBL_ACTIVE 0x000 +#define FF_FAT_PTBL_ID 0x004 + +#define FF_FAT_MBR_SIGNATURE 0x1FE + +#define FF_FAT_DELETED 0xE5 + +// Directory Entry Offsets +#define FF_FAT_DIRENT_SHORTNAME 0x000 +#define FF_FAT_DIRENT_ATTRIB 0x00B +#define FF_FAT_DIRENT_CREATE_TIME 0x00E ///< Creation Time. +#define FF_FAT_DIRENT_CREATE_DATE 0x010 ///< Creation Date. +#define FF_FAT_DIRENT_LASTACC_DATE 0x012 ///< Date of Last Access. +#define FF_FAT_DIRENT_CLUS_HIGH 0x014 +#define FF_FAT_DIRENT_LASTMOD_TIME 0x016 ///< Time of Last modification. +#define FF_FAT_DIRENT_LASTMOD_DATE 0x018 ///< Date of Last modification. +#define FF_FAT_DIRENT_CLUS_LOW 0x01A +#define FF_FAT_DIRENT_FILESIZE 0x01C +#define FF_FAT_LFN_ORD 0x000 +#define FF_FAT_LFN_NAME_1 0x001 +#define FF_FAT_LFN_CHECKSUM 0x00D +#define FF_FAT_LFN_NAME_2 0x00E +#define FF_FAT_LFN_NAME_3 0x01C + +// Dirent Attributes +#define FF_FAT_ATTR_READONLY 0x01 +#define FF_FAT_ATTR_HIDDEN 0x02 +#define FF_FAT_ATTR_SYSTEM 0x04 +#define FF_FAT_ATTR_VOLID 0x08 +#define FF_FAT_ATTR_DIR 0x10 +#define FF_FAT_ATTR_ARCHIVE 0x20 +#define FF_FAT_ATTR_LFN 0x0F + +#endif + Propchange: trunk/reactos/include/reactos/libs/fullfat/ff_fatdef.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/reactos/libs/fullfat/ff_ioman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… ============================================================================== --- trunk/reactos/include/reactos/libs/fullfat/ff_ioman.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fullfat/ff_ioman.h [iso-8859-1] Sat Apr 2 15:22:48 2011 @@ -100,10 +100,10 @@ **/ typedef struct { FF_T_UINT32 Sector; ///< The LBA of the Cached sector. - FF_T_UINT8 Mode; ///< Read or Write mode. + FF_T_UINT32 LRU; ///< For the Least Recently Used algorithm. FF_T_UINT16 NumHandles; ///< Number of objects using this buffer. FF_T_UINT16 Persistance; ///< For the persistance algorithm. - FF_T_UINT32 LRU; ///< For the Least Recently Used algorithm. + FF_T_UINT8 Mode; ///< Read or Write mode. FF_T_BOOL Modified; ///< If the sector was modified since read. FF_T_BOOL Valid; ///< Initially FALSE. FF_T_UINT8 *pBuffer; ///< Pointer to the cache block. @@ -129,7 +129,7 @@ FF_T_UINT16 BlkSize; ///< Size of a Sector Block in bytes. FF_T_UINT8 BlkFactor; ///< Scale Factor for blocksizes above 512! //FF_T_INT8 Name[FF_MAX_PARTITION_NAME]; ///< Partition Identifier e.g. c: sd0: etc. - //FF_T_INT8 VolLabel[12]; ///< Volume Label of the partition. + FF_T_INT8 VolLabel[12]; ///< Volume Label of the partition. FF_T_UINT32 BeginLBA; ///< LBA start address of the partition. FF_T_UINT32 PartSize; ///< Size of Partition in number of sectors. FF_T_UINT32 FatBeginLBA; ///< LBA of the FAT tables. @@ -182,14 +182,15 @@ FF_BLK_DEVICE *pBlkDevice; ///< Pointer to a Block device description. FF_PARTITION *pPartition; ///< Pointer to a partition description. FF_BUFFER *pBuffers; ///< Pointer to the first buffer description. + void *pSemaphore; ///< Pointer to a Semaphore object. (For buffer description modifications only!). + void *FirstFile; ///< Pointer to the first File object. + FF_T_UINT8 *pCacheMem; ///< Pointer to a block of memory for the cache. FF_T_UINT32 LastReplaced; ///< Marks which sector was last replaced in the cache. FF_T_UINT16 BlkSize; ///< The Block size that IOMAN is configured to. - FF_T_UINT8 *pCacheMem; ///< Pointer to a block of memory for the cache. FF_T_UINT16 CacheSize; ///< Size of the cache in number of Sectors. + FF_T_UINT8 PreventFlush; ///< Flushing to disk only allowed when 0 FF_T_UINT8 MemAllocation; ///< Bit-Mask identifying allocated pointers. FF_T_UINT8 Locks; ///< Lock Flag for FAT & DIR Locking etc (This must be accessed via a semaphore). - void *pSemaphore; ///< Pointer to a Semaphore object. (For buffer description modifications only!). - void *FirstFile; ///< Pointer to the first File object. } FF_IOMAN; // Bit-Masks for Memory Allocation testing. 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 15:22:48 2011 @@ -41,19 +41,119 @@ #include "ff_config.h" #include "ff_types.h" - +/* + HT changed type of aOffset to u32 +*/ //---------- PROTOTYPES -FF_T_UINT8 FF_getChar (FF_T_UINT8 *pBuffer, FF_T_UINT16 offset); -FF_T_UINT16 FF_getShort (FF_T_UINT8 *pBuffer, FF_T_UINT16 offset); -FF_T_UINT32 FF_getLong (FF_T_UINT8 *pBuffer, FF_T_UINT16 offset); +#if defined(FF_LITTLE_ENDIAN) -void FF_putChar (FF_T_UINT8 *pBuffer, FF_T_UINT16 offset, FF_T_UINT8 Value); -void FF_putShort (FF_T_UINT8 *pBuffer, FF_T_UINT16 offset, FF_T_UINT16 Value); -void FF_putLong (FF_T_UINT8 *pBuffer, FF_T_UINT16 offset, FF_T_UINT32 Value); +typedef struct { + FF_T_UINT8 u8_0; + FF_T_UINT8 u8_1; +} FF_T_SHORT; -void *FF_Malloc(FF_T_UINT32 allocSize); -void FF_Free(void *pBuffer); +typedef struct { + FF_T_UINT8 u8_0; + FF_T_UINT8 u8_1; + FF_T_UINT8 u8_2; + FF_T_UINT8 u8_3; +} FF_T_LONG; + +#elif defined(FF_BIG_ENDIAN) + +typedef struct { + FF_T_UINT8 u8_1; + FF_T_UINT8 u8_0; +} FF_T_SHORT; + +typedef struct { + FF_T_UINT8 u8_3; + FF_T_UINT8 u8_2; + FF_T_UINT8 u8_1; + FF_T_UINT8 u8_0; +} FF_T_LONG; + +#else + +#error Little or Big Endian? #endif +//! 16-bit union. +typedef union { + FF_T_UINT16 u16; + FF_T_SHORT bytes; +} FF_T_UN16; + +//! 32-bit union. +typedef union { + FF_T_UINT32 u32; + FF_T_LONG bytes; +} FF_T_UN32; + +/* HT inlined these functions: + */ + +#ifdef FF_INLINE_MEMORY_ACCESS + +FF_INLINE FF_T_UINT8 FF_getChar(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset) +{ + return (FF_T_UINT8) (pBuffer[aOffset]); +} + +FF_INLINE FF_T_UINT16 FF_getShort(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset) +{ + FF_T_UN16 u16; + pBuffer += aOffset; + u16.bytes.u8_1 = pBuffer[1]; + u16.bytes.u8_0 = pBuffer[0]; + return u16.u16; +} + +FF_INLINE FF_T_UINT32 FF_getLong(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset) { + FF_T_UN32 u32; + pBuffer += aOffset; + u32.bytes.u8_3 = pBuffer[3]; + u32.bytes.u8_2 = pBuffer[2]; + u32.bytes.u8_1 = pBuffer[1]; + u32.bytes.u8_0 = pBuffer[0]; + return u32.u32; +} + +FF_INLINE void FF_putChar(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset, FF_T_UINT8 Value) { + pBuffer[aOffset] = Value; +} + +FF_INLINE void FF_putShort(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset, FF_T_UINT16 Value) { + FF_T_UN16 u16; + u16.u16 = Value; + pBuffer += aOffset; + pBuffer[0] = u16.bytes.u8_0; + pBuffer[1] = u16.bytes.u8_1; +} + +FF_INLINE void FF_putLong(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset, FF_T_UINT32 Value) { + FF_T_UN32 u32; + u32.u32 = Value; + pBuffer += aOffset; + pBuffer[0] = u32.bytes.u8_0; + pBuffer[1] = u32.bytes.u8_1; + pBuffer[2] = u32.bytes.u8_2; + pBuffer[3] = u32.bytes.u8_3; +} + +#else + +FF_T_UINT8 FF_getChar(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset); +FF_T_UINT16 FF_getShort(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset); +FF_T_UINT32 FF_getLong(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset); +void FF_putChar(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset, FF_T_UINT8 Value); +void FF_putShort(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset, FF_T_UINT16 Value); +void FF_putLong(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset, FF_T_UINT32 Value); + + +#endif + +#endif + Modified: trunk/reactos/include/reactos/libs/fullfat/fullfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fullf… ============================================================================== --- trunk/reactos/include/reactos/libs/fullfat/fullfat.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fullfat/fullfat.h [iso-8859-1] Sat Apr 2 15:22:48 2011 @@ -32,6 +32,10 @@ #ifndef _FULLFAT_H_ #define _FULLFAT_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include "ff_config.h" #include "ff_ioman.h" #include "ff_fat.h" @@ -41,6 +45,10 @@ #include "ff_crc.h" #include "ff_hash.h" #include "ff_string.h" +//#include "ff_format.h" +#ifdef __cplusplus +} // extern "C" +#endif #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 15:22:48 2011 @@ -1769,4 +1769,3 @@ }while(FF_getChar(EntryBuffer, (FF_T_UINT16)(FF_FAT_DIRENT_ATTRIB)) == FF_FAT_ATTR_LFN); } - Modified: 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 [iso-8859-1] Sat Apr 2 15:22:48 2011 @@ -43,7 +43,7 @@ #include "ff_ioman.h" #include "ff_blk.h" #include "ff_fat.h" -#include "fat.h" +#include "ff_fatdef.h" #include "ff_memory.h" #include "ff_time.h" #include "ff_hash.h" Modified: trunk/reactos/lib/3rdparty/fullfat/ff_fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_fa… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/ff_fat.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/ff_fat.c [iso-8859-1] Sat Apr 2 15:22:48 2011 @@ -136,13 +136,13 @@ FatSectorEntry = FatOffset % pIoman->pPartition->BlkSize; LBAadjust = (FF_T_UINT8) (FatSectorEntry / pIoman->BlkSize); - relClusterEntry = (FF_T_UINT16) (FatSectorEntry % pIoman->BlkSize); + relClusterEntry = (FF_T_UINT32) (FatSectorEntry % pIoman->BlkSize); FatSector = FF_getRealLBA(pIoman, FatSector); #ifdef FF_FAT12_SUPPORT if(pIoman->pPartition->Type == FF_T_FAT12) { - if(relClusterEntry == (pIoman->BlkSize - 1)) { + if(relClusterEntry == (FF_T_UINT32)(pIoman->BlkSize - 1)) { // Fat Entry SPANS a Sector! // First Buffer get the last Byte in buffer (first byte of our address)! pBuffer = FF_GetBuffer(pIoman, FatSector + LBAadjust, FF_MODE_READ); @@ -333,7 +333,7 @@ FF_T_UINT32 FatSectorEntry; FF_T_UINT32 FatEntry; FF_T_UINT8 LBAadjust; - FF_T_UINT16 relClusterEntry; + FF_T_UINT32 relClusterEntry; #ifdef FF_FAT12_SUPPORT FF_T_UINT8 F12short[2]; // For FAT12 FAT Table Across sector boundary traversal. #endif @@ -350,13 +350,13 @@ FatSectorEntry = FatOffset % pIoman->pPartition->BlkSize; LBAadjust = (FF_T_UINT8) (FatSectorEntry / pIoman->BlkSize); - relClusterEntry = (FF_T_UINT16)(FatSectorEntry % pIoman->BlkSize); + relClusterEntry = (FF_T_UINT32)(FatSectorEntry % pIoman->BlkSize); FatSector = FF_getRealLBA(pIoman, FatSector); #ifdef FF_FAT12_SUPPORT if(pIoman->pPartition->Type == FF_T_FAT12) { - if(relClusterEntry == (FF_T_UINT16) (pIoman->BlkSize - 1)) { + if(relClusterEntry == (FF_T_UINT32)(pIoman->BlkSize - 1)) { // Fat Entry SPANS a Sector! // First Buffer get the last Byte in buffer (first byte of our address)! pBuffer = FF_GetBuffer(pIoman, FatSector + LBAadjust, FF_MODE_READ); @@ -497,6 +497,11 @@ for(i = FatSector; i < pIoman->pPartition->SectorsPerFAT; i++) { pBuffer = FF_GetBuffer(pIoman, pIoman->pPartition->FatBeginLBA + i, FF_MODE_READ); { + // HT addition: don't use non-existing clusters + if (nCluster >= pIoman->pPartition->NumClusters) { + FF_ReleaseBuffer(pIoman, pBuffer); + return 0; + } for(x = nCluster % EntriesPerSector; x < EntriesPerSector; x++) { if(pIoman->pPartition->Type == FF_T_FAT32) { FatOffset = x * 4; @@ -612,6 +617,7 @@ FF_T_UINT32 fatEntry; FF_T_UINT32 currentCluster, chainLength = 0; FF_T_UINT32 iLen = 0; + FF_T_UINT32 lastFree = StartCluster; /* HT addition : reset LastFreeCluster */ fatEntry = StartCluster; @@ -622,9 +628,15 @@ do { fatEntry = FF_getFatEntry(pIoman, fatEntry); FF_putFatEntry(pIoman, currentCluster, 0x00000000); + if (lastFree > currentCluster) { + lastFree = currentCluster; + } currentCluster = fatEntry; iLen ++; }while(!FF_isEndOfChain(pIoman, fatEntry)); + if (pIoman->pPartition->LastFreeCluster > lastFree) { + pIoman->pPartition->LastFreeCluster = lastFree; + } FF_IncreaseFreeClusters(pIoman, iLen); } else { // Truncation - This is quite hard, because we can only do it backwards. @@ -694,7 +706,7 @@ } else { FatOffset = x * 2; FatSectorEntry = FatOffset % pIoman->pPartition->BlkSize; - FatEntry = (FF_T_UINT32) FF_getShort(pBuffer->pBuffer, (FF_T_UINT16)FatSectorEntry); + FatEntry = (FF_T_UINT32) FF_getShort(pBuffer->pBuffer, FatSectorEntry); } if(FatEntry == 0x00000000) { FreeClusters += 1; @@ -706,7 +718,7 @@ FF_ReleaseBuffer(pIoman, pBuffer); } - return FreeClusters; + return FreeClusters <= pIoman->pPartition->NumClusters ? FreeClusters : pIoman->pPartition->NumClusters; } #ifdef FF_64_NUM_SUPPORT @@ -747,4 +759,4 @@ } return 0; } -#endif +#endif Modified: trunk/reactos/lib/3rdparty/fullfat/ff_file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_fi… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/ff_file.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/ff_file.c [iso-8859-1] Sat Apr 2 15:22:48 2011 @@ -163,7 +163,7 @@ } return (FF_FILE *)NULL; } - pFile = FF_Malloc(sizeof(FF_FILE)); + pFile = FF_MALLOC(sizeof(FF_FILE)); if(!pFile) { if(pError) { *pError = FF_ERR_NOT_ENOUGH_MEMORY; @@ -222,7 +222,7 @@ if(Object.Attrib == FF_FAT_ATTR_DIR) { if(!(pFile->Mode & FF_MODE_DIR)) { // Not the object, File Not Found! - FF_Free(pFile); + FF_FREE(pFile); if(pError) { *pError = FF_ERR_FILE_OBJECT_IS_A_DIR; } @@ -233,7 +233,7 @@ //---------- Ensure Read-Only files don't get opened for Writing. if((pFile->Mode & FF_MODE_WRITE) || (pFile->Mode & FF_MODE_APPEND)) { if((Object.Attrib & FF_FAT_ATTR_READONLY)) { - FF_Free(pFile); + FF_FREE(pFile); if(pError) { *pError = FF_ERR_FILE_IS_READ_ONLY; } @@ -276,7 +276,7 @@ if(pFileChain->ObjectCluster == pFile->ObjectCluster) { // File is already open! DON'T ALLOW IT! FF_ReleaseSemaphore(pIoman->pSemaphore); - FF_Free(pFile); + FF_FREE(pFile); if(pError) { *pError = FF_ERR_FILE_ALREADY_OPEN; } @@ -294,7 +294,7 @@ return pFile; }else { - FF_Free(pFile); + FF_FREE(pFile); if(pError) { *pError = FF_ERR_FILE_NOT_FOUND; } @@ -305,7 +305,7 @@ *pError = FF_ERR_FILE_INVALID_PATH; } - FF_Free(pFile); + FF_FREE(pFile); return (FF_FILE *)NULL; } @@ -600,7 +600,14 @@ do { if(pFile->pIoman->pBlkDevice->fnReadBlocks) { +#ifdef FF_BLKDEV_USES_SEM + FF_PendSemaphore(pFile->pIoman->pSemaphore); +#endif + // Called from FF_Read, sem not claimed RetVal = pFile->pIoman->pBlkDevice->fnReadBlocks(buffer, nItemLBA, Sectors, pFile->pIoman->pBlkDevice->pParam); +#ifdef FF_BLKDEV_USES_SEM + FF_ReleaseSemaphore(pFile->pIoman->pSemaphore); +#endif if(RetVal == FF_ERR_DRIVER_BUSY) { FF_Yield(); FF_Sleep(FF_DRIVER_BUSY_SLEEP); @@ -703,7 +710,14 @@ do { if(pFile->pIoman->pBlkDevice->fnWriteBlocks) { +#ifdef FF_BLKDEV_USES_SEM + FF_PendSemaphore(pFile->pIoman->pSemaphore); +#endif + // Called from FF_Write, sem not claimed RetVal = pFile->pIoman->pBlkDevice->fnWriteBlocks(buffer, nItemLBA, Sectors, pFile->pIoman->pBlkDevice->pParam); +#ifdef FF_BLKDEV_USES_SEM + FF_ReleaseSemaphore(pFile->pIoman->pSemaphore); +#endif if(RetVal == FF_ERR_DRIVER_BUSY) { FF_Yield(); FF_Sleep(FF_DRIVER_BUSY_SLEEP); @@ -832,7 +846,13 @@ do { if(pIoman->pBlkDevice->fnReadBlocks) { +#ifdef FF_BLKDEV_USES_SEM + FF_PendSemaphore(pFile->pIoman->pSemaphore); +#endif RetVal = pFile->pIoman->pBlkDevice->fnReadBlocks(buffer, nItemLBA, sSectors, pIoman->pBlkDevice->pParam); +#ifdef FF_BLKDEV_USES_SEM + FF_ReleaseSemaphore(pFile->pIoman->pSemaphore); +#endif } if(RetVal == FF_ERR_DRIVER_BUSY) { FF_Yield(); @@ -887,7 +907,13 @@ do { if(pIoman->pBlkDevice->fnReadBlocks) { +#ifdef FF_BLKDEV_USES_SEM + FF_PendSemaphore(pFile->pIoman->pSemaphore); +#endif RetVal = pFile->pIoman->pBlkDevice->fnReadBlocks(buffer, nItemLBA, sSectors, pIoman->pBlkDevice->pParam); +#ifdef FF_BLKDEV_USES_SEM + FF_ReleaseSemaphore(pFile->pIoman->pSemaphore); +#endif } if(RetVal == FF_ERR_DRIVER_BUSY) { FF_Yield(); @@ -1116,7 +1142,13 @@ do { if(pIoman->pBlkDevice->fnWriteBlocks) { +#ifdef FF_BLKDEV_USES_SEM + FF_PendSemaphore(pFile->pIoman->pSemaphore); +#endif RetVal = pFile->pIoman->pBlkDevice->fnWriteBlocks(buffer, nItemLBA, sSectors, pIoman->pBlkDevice->pParam); +#ifdef FF_BLKDEV_USES_SEM + FF_ReleaseSemaphore(pFile->pIoman->pSemaphore); +#endif } if(RetVal == FF_ERR_DRIVER_BUSY) { FF_Yield(); @@ -1174,7 +1206,13 @@ do { if(pIoman->pBlkDevice->fnWriteBlocks) { +#ifdef FF_BLKDEV_USES_SEM + FF_PendSemaphore(pFile->pIoman->pSemaphore); +#endif RetVal = pFile->pIoman->pBlkDevice->fnWriteBlocks(buffer, nItemLBA, sSectors, pIoman->pBlkDevice->pParam); +#ifdef FF_BLKDEV_USES_SEM + FF_ReleaseSemaphore(pFile->pIoman->pSemaphore); +#endif } if(RetVal == FF_ERR_DRIVER_BUSY) { FF_Yield(); @@ -1405,7 +1443,7 @@ FF_ReleaseSemaphore(pFile->pIoman->pSemaphore); // If file written, flush to disk - FF_Free(pFile); + FF_FREE(pFile); // Simply free the pointer! return FF_ERR_NONE; } Modified: trunk/reactos/lib/3rdparty/fullfat/ff_hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_ha… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/ff_hash.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/ff_hash.c [iso-8859-1] Sat Apr 2 15:22:48 2011 @@ -53,7 +53,7 @@ * **/ FF_HASH_TABLE FF_CreateHashTable() { - FF_HASH_TABLE pHash = (FF_HASH_TABLE) FF_Malloc(sizeof(struct _FF_HASH_TABLE)); + FF_HASH_TABLE pHash = (FF_HASH_TABLE) FF_MALLOC(sizeof(struct _FF_HASH_TABLE)); if(pHash) { FF_ClearHashTable(pHash); @@ -110,7 +110,7 @@ FF_ERROR FF_DestroyHashTable(FF_HASH_TABLE pHash) { if(pHash) { - free(pHash); + FF_FREE(pHash); return FF_ERR_NONE; } return FF_ERR_NULL_POINTER; Modified: trunk/reactos/lib/3rdparty/fullfat/ff_ioman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_io… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/ff_ioman.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/ff_ioman.c [iso-8859-1] Sat Apr 2 15:22:48 2011 @@ -42,8 +42,10 @@ * Destroying a FullFAT IO object. **/ +#include <string.h> + #include "ff_ioman.h" // Includes ff_types.h, ff_safety.h, <stdio.h> -#include "fat.h" +#include "ff_fatdef.h" extern FF_T_UINT32 FF_FindFreeCluster (FF_IOMAN *pIoman); extern FF_T_UINT32 FF_CountFreeClusters (FF_IOMAN *pIoman); @@ -89,7 +91,7 @@ return NULL; // Memory Size not a multiple of BlkSize > 0 } - pIoman = (FF_IOMAN *) FF_Malloc(sizeof(FF_IOMAN)); + pIoman = (FF_IOMAN *) FF_MALLOC(sizeof(FF_IOMAN)); if(!pIoman) { // Ensure malloc() succeeded. if(pError) { @@ -98,62 +100,68 @@ return NULL; } + memset (pIoman, '\0', sizeof(FF_IOMAN)); + // This is just a bit-mask, to use a byte to keep track of memory. // pIoman->MemAllocation = 0x00; // Unset all allocation identifiers. - pIoman->pBlkDevice = NULL; - pIoman->pBuffers = NULL; - pIoman->pCacheMem = NULL; - pIoman->pPartition = NULL; - pIoman->pSemaphore = NULL; - - pIoman->pPartition = (FF_PARTITION *) FF_Malloc(sizeof(FF_PARTITION)); - if(pIoman->pPartition) { // If succeeded, flag that allocation. - pIoman->MemAllocation |= FF_IOMAN_ALLOC_PART; - pIoman->pPartition->LastFreeCluster = 0; - pIoman->pPartition->PartitionMounted = FF_FALSE; // This should be checked by FF_Open(); -#ifdef FF_PATH_CACHE - pIoman->pPartition->PCIndex = 0; - for(i = 0; i < FF_PATH_CACHE_DEPTH; i++) { - pIoman->pPartition->PathCache[i].DirCluster = 0; - pIoman->pPartition->PathCache[i].Path[0] = '\0'; -#ifdef FF_HASH_TABLE_SUPPORT - pIoman->pPartition->PathCache[i].pHashTable = FF_CreateHashTable(); - pIoman->pPartition->PathCache[i].bHashed = FF_FALSE; -#endif - } -#endif - } else { + pIoman->pPartition = (FF_PARTITION *) FF_MALLOC(sizeof(FF_PARTITION)); + if(!pIoman->pPartition) { + if(pError) { + *pError = FF_ERR_NOT_ENOUGH_MEMORY; + } FF_DestroyIOMAN(pIoman); return NULL; } - - pIoman->pBlkDevice = (FF_BLK_DEVICE *) FF_Malloc(sizeof(FF_BLK_DEVICE)); - if(pIoman->pBlkDevice) { // If succeeded, flag that allocation. - pIoman->MemAllocation |= FF_IOMAN_ALLOC_BLKDEV; - - // Make sure all pointers are NULL - pIoman->pBlkDevice->fnReadBlocks = NULL; - pIoman->pBlkDevice->fnWriteBlocks = NULL; - pIoman->pBlkDevice->pParam = NULL; - - } else { + memset (pIoman->pPartition, '\0', sizeof(FF_PARTITION)); + + pIoman->MemAllocation |= FF_IOMAN_ALLOC_PART; // If succeeded, flag that allocation. + pIoman->pPartition->LastFreeCluster = 0; + pIoman->pPartition->PartitionMounted = FF_FALSE; // This should be checked by FF_Open(); +#ifdef FF_PATH_CACHE + pIoman->pPartition->PCIndex = 0; + for(i = 0; i < FF_PATH_CACHE_DEPTH; i++) { + pIoman->pPartition->PathCache[i].DirCluster = 0; + pIoman->pPartition->PathCache[i].Path[0] = '\0'; +#ifdef FF_HASH_TABLE_SUPPORT + pIoman->pPartition->PathCache[i].pHashTable = FF_CreateHashTable(); + pIoman->pPartition->PathCache[i].bHashed = FF_FALSE; +#endif + } +#endif + + pIoman->pBlkDevice = (FF_BLK_DEVICE *) FF_MALLOC(sizeof(FF_BLK_DEVICE)); + if(!pIoman->pBlkDevice) { // If succeeded, flag that allocation. + if(pError) { + *pError = FF_ERR_NOT_ENOUGH_MEMORY; + } FF_DestroyIOMAN(pIoman); return NULL; } + memset (pIoman->pBlkDevice, '\0', sizeof(FF_BLK_DEVICE)); + pIoman->MemAllocation |= FF_IOMAN_ALLOC_BLKDEV; + + // Make sure all pointers are NULL + pIoman->pBlkDevice->fnReadBlocks = NULL; + pIoman->pBlkDevice->fnWriteBlocks = NULL; + pIoman->pBlkDevice->pParam = NULL; // Organise the memory provided, or create our own! if(pCacheMem) { pIoman->pCacheMem = pCacheMem; }else { // No-Cache buffer provided (malloc) - pLong = (FF_T_UINT32 *) FF_Malloc(Size); + pLong = (FF_T_UINT32 *) FF_MALLOC(Size); pIoman->pCacheMem = (FF_T_UINT8 *) pLong; if(!pIoman->pCacheMem) { - pIoman->MemAllocation |= FF_IOMAN_ALLOC_BUFFERS; + if(pError) { + *pError = FF_ERR_NOT_ENOUGH_MEMORY; + } FF_DestroyIOMAN(pIoman); return NULL; } - - } + pIoman->MemAllocation |= FF_IOMAN_ALLOC_BUFFERS; + + } + memset (pIoman->pCacheMem, '\0', Size); pIoman->BlkSize = BlkSize; pIoman->CacheSize = (FF_T_UINT16) (Size / BlkSize); @@ -163,14 +171,19 @@ /* Malloc() memory for buffer objects. (FullFAT never refers to a buffer directly but uses buffer objects instead. Allows us to provide thread safety. */ - pIoman->pBuffers = (FF_BUFFER *) FF_Malloc(sizeof(FF_BUFFER) * pIoman->CacheSize); - - if(pIoman->pBuffers) { - pIoman->MemAllocation |= FF_IOMAN_ALLOC_BUFDESCR; - FF_IOMAN_InitBufferDescriptors(pIoman); - } else { + pIoman->pBuffers = (FF_BUFFER *) FF_MALLOC(sizeof(FF_BUFFER) * pIoman->CacheSize); + + if(!pIoman->pBuffers) { + if(pError) { + *pError = FF_ERR_NOT_ENOUGH_MEMORY; + } FF_DestroyIOMAN(pIoman); - } + return NULL; // HT added + } + memset (pIoman->pBuffers, '\0', sizeof(FF_BUFFER) * pIoman->CacheSize); + + pIoman->MemAllocation |= FF_IOMAN_ALLOC_BUFDESCR; + FF_IOMAN_InitBufferDescriptors(pIoman); // Finally create a Semaphore for Buffer Description modifications. pIoman->pSemaphore = FF_CreateSemaphore(); @@ -196,22 +209,22 @@ // Ensure pPartition pointer was allocated. if((pIoman->MemAllocation & FF_IOMAN_ALLOC_PART)) { - FF_Free(pIoman->pPartition); + FF_FREE(pIoman->pPartition); } // Ensure pBlkDevice pointer was allocated. if((pIoman->MemAllocation & FF_IOMAN_ALLOC_BLKDEV)) { - FF_Free(pIoman->pBlkDevice); + FF_FREE(pIoman->pBlkDevice); } // Ensure pBuffers pointer was allocated. if((pIoman->MemAllocation & FF_IOMAN_ALLOC_BUFDESCR)) { - FF_Free(pIoman->pBuffers); + FF_FREE(pIoman->pBuffers); } // Ensure pCacheMem pointer was allocated. if((pIoman->MemAllocation & FF_IOMAN_ALLOC_BUFFERS)) { - FF_Free(pIoman->pCacheMem); + FF_FREE(pIoman->pCacheMem); } // Destroy any Semaphore that was created. @@ -220,7 +233,7 @@ } // Finally free the FF_IOMAN object. - FF_Free(pIoman); + FF_FREE(pIoman); return FF_ERR_NONE; } @@ -236,15 +249,9 @@ FF_T_UINT16 i; FF_BUFFER *pBuffer = pIoman->pBuffers; pIoman->LastReplaced = 0; + // HT : it is assmued that pBuffer was cleared by memset () for(i = 0; i < pIoman->CacheSize; i++) { - pBuffer->Mode = 0; - pBuffer->NumHandles = 0; - pBuffer->Persistance = 0; - pBuffer->LRU = 0; - pBuffer->Sector = 0; pBuffer->pBuffer = (FF_T_UINT8 *)((pIoman->pCacheMem) + (pIoman->BlkSize * i)); - pBuffer->Modified = FF_FALSE; - pBuffer->Valid = FF_FALSE; pBuffer++; } } @@ -272,6 +279,8 @@ * @param pIoman FF_IOMAN object. * @param Sector LBA address of the sector to fetch. * @param pBuffer Pointer to a byte-wise buffer to store the fetched data. + * + * HT Note: will be called while semaphore claimed (by FF_GetBuffer) * * @return FF_TRUE when valid, else FF_FALSE. **/ @@ -279,6 +288,7 @@ FF_T_SINT32 retVal = 0; if(pIoman->pBlkDevice->fnReadBlocks) { // Make sure we don't execute a NULL. do{ + // Called from FF_GetBuffer with semaphore claimed retVal = pIoman->pBlkDevice->fnReadBlocks(pBuffer, Sector, 1, pIoman->pBlkDevice->pParam); if(retVal == FF_ERR_DRIVER_BUSY) { FF_Sleep(FF_DRIVER_BUSY_SLEEP); @@ -306,9 +316,13 @@ * @param Sector LBA address of the sector to fetch. * @param pBuffer Pointer to a byte-wise buffer to store the fetched data. * + * + * HT made it a globally accesible function to be used by new module ff_format.c + * Note that this function is called when semaphore is already locked + * * @return FF_TRUE when valid, else FF_FALSE. **/ -static FF_ERROR FF_IOMAN_FlushBuffer(FF_IOMAN *pIoman, FF_T_UINT32 Sector, FF_T_UINT8 *pBuffer) { +/* static */ FF_ERROR FF_IOMAN_FlushBuffer(FF_IOMAN *pIoman, FF_T_UINT32 Sector, FF_T_UINT8 *pBuffer) { FF_T_SINT32 retVal = 0; if(pIoman->pBlkDevice->fnWriteBlocks) { // Make sure we don't execute a NULL. do{ @@ -481,7 +495,7 @@ } } FF_ReleaseSemaphore(pIoman->pSemaphore); - FF_Yield(); + FF_Yield(); // Better to go asleep to give low-priority task a chance to release buffer(s) } return pBufMatch; // Return the Matched Buffer! @@ -500,7 +514,11 @@ // Protect description changes with a semaphore. FF_PendSemaphore(pIoman->pSemaphore); { - pBuffer->NumHandles--; + if (pBuffer->NumHandles) { + pBuffer->NumHandles--; + } else { + //printf ("FF_ReleaseBuffer: buffer not claimed\n"); + } } FF_ReleaseSemaphore(pIoman->pSemaphore); } @@ -630,6 +648,34 @@ return FF_ERR_IOMAN_NOT_FAT_FORMATTED; } + +static FF_T_SINT8 FF_PartitionCount (FF_T_UINT8 *pBuffer) +{ + FF_T_SINT8 count = 0; + FF_T_SINT8 part; + // Check PBR or MBR signature + if (FF_getChar(pBuffer, FF_FAT_MBR_SIGNATURE) != 0x55 && + FF_getChar(pBuffer, FF_FAT_MBR_SIGNATURE) != 0xAA ) { + // No MBR, but is it a PBR ? + if (FF_getChar(pBuffer, 0) == 0xEB && // PBR Byte 0 + FF_getChar(pBuffer, 2) == 0x90 && // PBR Byte 2 + (FF_getChar(pBuffer, 21) & 0xF0) == 0xF0) {// PBR Byte 21 : Media byte + return 1; // No MBR but PBR exist then only one partition + } + return 0; // No MBR and no PBR then no partition found + } + for (part = 0; part < 4; part++) { + FF_T_UINT8 active = FF_getChar(pBuffer, FF_FAT_PTBL + FF_FAT_PTBL_ACTIVE + (16 * part)); + FF_T_UINT8 part_id = FF_getChar(pBuffer, FF_FAT_PTBL + FF_FAT_PTBL_ID + (16 * part)); + // The first sector must be a MBR, then check the partition entry in the MBR + if (active != 0x80 && (active != 0 || part_id == 0)) { + break; + } + count++; + } + return count; +} + /** * @public * @brief Mounts the Specified partition, the volume specified by the FF_IOMAN object provided. @@ -651,6 +697,7 @@ FF_ERROR FF_MountPartition(FF_IOMAN *pIoman, FF_T_UINT8 PartitionNumber) { FF_PARTITION *pPart; FF_BUFFER *pBuffer = 0; + int partCount; if(!pIoman) { return FF_ERR_NULL_POINTER; @@ -661,19 +708,28 @@ } pPart = pIoman->pPartition; + + memset (pIoman->pBuffers, '\0', sizeof(FF_BUFFER) * pIoman->CacheSize); + memset (pIoman->pCacheMem, '\0', pIoman->BlkSize * pIoman->CacheSize); + + FF_IOMAN_InitBufferDescriptors(pIoman); + pIoman->FirstFile = 0; pBuffer = FF_GetBuffer(pIoman, 0, FF_MODE_READ); if(!pBuffer) { return FF_ERR_DEVICE_DRIVER_FAILED; } + + partCount = FF_PartitionCount (pBuffer->pBuffer); + pPart->BlkSize = FF_getShort(pBuffer->pBuffer, FF_FAT_BYTES_PER_SECTOR); - if((pPart->BlkSize % 512) == 0 && pPart->BlkSize > 0) { + if (partCount == 0) { //(pPart->BlkSize % 512) == 0 && pPart->BlkSize > 0) { // Volume is not partitioned (MBR Found) pPart->BeginLBA = 0; } else { // Primary Partitions to deal with! - pPart->BeginLBA = FF_getLong(pBuffer->pBuffer, (FF_T_UINT16)(FF_FAT_PTBL + FF_FAT_PTBL_LBA + (16 * PartitionNumber))); + pPart->BeginLBA = FF_getLong(pBuffer->pBuffer, FF_FAT_PTBL + FF_FAT_PTBL_LBA + (16 * PartitionNumber)); FF_ReleaseBuffer(pIoman, pBuffer); if(!pPart->BeginLBA) { @@ -690,6 +746,7 @@ return FF_ERR_IOMAN_INVALID_FORMAT; } } + // Assume FAT16, then we'll adjust if its FAT32 pPart->ReservedSectors = FF_getShort(pBuffer->pBuffer, FF_FAT_RESERVED_SECTORS); pPart->FatBeginLBA = pPart->BeginLBA + pPart->ReservedSectors; @@ -709,6 +766,7 @@ if(pPart->TotalSectors == 0) { pPart->TotalSectors = FF_getLong(pBuffer->pBuffer, FF_FAT_32_TOTAL_SECTORS); } + memcpy (pPart->VolLabel, pBuffer->pBuffer + FF_FAT_32_VOL_LABEL, sizeof pPart->VolLabel); } else { // FAT16 pPart->ClusterBeginLBA = pPart->BeginLBA + pPart->ReservedSectors + (pPart->NumFATS * pPart->SectorsPerFAT); pPart->TotalSectors = (FF_T_UINT32) FF_getShort(pBuffer->pBuffer, FF_FAT_16_TOTAL_SECTORS); @@ -716,6 +774,7 @@ if(pPart->TotalSectors == 0) { pPart->TotalSectors = FF_getLong(pBuffer->pBuffer, FF_FAT_32_TOTAL_SECTORS); } + memcpy (pPart->VolLabel, pBuffer->pBuffer + FF_FAT_16_VOL_LABEL, sizeof pPart->VolLabel); } FF_ReleaseBuffer(pIoman, pBuffer); // Release the buffer finally! Modified: trunk/reactos/lib/3rdparty/fullfat/ff_memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/ff_me… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/ff_memory.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/ff_memory.c [iso-8859-1] Sat Apr 2 15:22:48 2011 @@ -48,87 +48,55 @@ #include "ff_memory.h" #include "ff_config.h" -#ifdef FF_LITTLE_ENDIAN +/* + * HT inlined these functions + * + * Not much left for the C-module + */ -/** - * @public - * @brief 8 bit memory access routines. - **/ -/* - These functions swap the byte-orders of shorts and longs. A getChar function is provided - incase there is a system that doesn't have byte-wise access to all memory. - These functions can be replaced with your own platform specific byte-order swapping routines - for more efficiency. - - The provided functions should work on almost all platforms. -*/ -FF_T_UINT8 FF_getChar(FF_T_UINT8 *pBuffer, FF_T_UINT16 offset) { - return (FF_T_UINT8) (pBuffer[offset]); +#ifndef FF_INLINE_MEMORY_ACCESS +FF_T_UINT8 FF_getChar(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset) { + return (FF_T_UINT8) (pBuffer[aOffset]); } -FF_T_UINT16 FF_getShort(FF_T_UINT8 *pBuffer, FF_T_UINT16 offset) { - return (FF_T_UINT16) (pBuffer[offset] & 0x00FF) | ((FF_T_UINT16) (pBuffer[offset+1] << 8) & 0xFF00); +FF_T_UINT16 FF_getShort(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset) { + FF_T_UN16 u16; + pBuffer += aOffset; + u16.bytes.u8_1 = pBuffer[1]; + u16.bytes.u8_0 = pBuffer[0]; + return u16.u16; } -FF_T_UINT32 FF_getLong(FF_T_UINT8 *pBuffer, FF_T_UINT16 offset) { - return (FF_T_UINT32) (pBuffer[offset] & 0x000000FF) | ((FF_T_UINT32) (pBuffer[offset+1] << 8) & 0x0000FF00) | ((FF_T_UINT32) (pBuffer[offset+2] << 16) & 0x00FF0000) | ((FF_T_UINT32) (pBuffer[offset+3] << 24) & 0xFF000000); +FF_T_UINT32 FF_getLong(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset) { + FF_T_UN32 u32; + pBuffer += aOffset; + u32.bytes.u8_3 = pBuffer[3]; + u32.bytes.u8_2 = pBuffer[2]; + u32.bytes.u8_1 = pBuffer[1]; + u32.bytes.u8_0 = pBuffer[0]; + return u32.u32; } -void FF_putChar(FF_T_UINT8 *pBuffer, FF_T_UINT16 offset, FF_T_UINT8 Value) { - pBuffer[offset] = Value; +void FF_putChar(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset, FF_T_UINT8 Value) { + pBuffer[aOffset] = Value; } -void FF_putShort(FF_T_UINT8 *pBuffer, FF_T_UINT16 offset, FF_T_UINT16 Value) { - FF_T_UINT8 *Val = (FF_T_UINT8 *) &Value; - pBuffer[offset] = Val[0]; - pBuffer[offset + 1] = Val[1]; +void FF_putShort(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset, FF_T_UINT16 Value) { + FF_T_UN16 u16; + u16.u16 = Value; + pBuffer += aOffset; + pBuffer[0] = u16.bytes.u8_0; + pBuffer[1] = u16.bytes.u8_1; } -void FF_putLong(FF_T_UINT8 *pBuffer, FF_T_UINT16 offset, FF_T_UINT32 Value) { - FF_T_UINT8 *Val = (FF_T_UINT8 *) &Value; - pBuffer[offset] = Val[0]; - pBuffer[offset + 1] = Val[1]; - pBuffer[offset + 2] = Val[2]; - pBuffer[offset + 3] = Val[3]; -} - -#endif - -#ifdef FF_BIG_ENDIAN -/* - These haven't been tested or checked. They should work in theory :) - Please contact james(a)worm.me.uk if they don't work, and also any fix. -*/ -FF_T_UINT8 FF_getChar(FF_T_UINT8 *pBuffer, FF_T_UINT16 offset) { - return (FF_T_UINT8) (pBuffer[offset]); -} - -FF_T_UINT16 FF_getShort(FF_T_UINT8 *pBuffer, FF_T_UINT16 offset) { - return (FF_T_UINT16) ((pBuffer[offset] & 0xFF00) << 8) | ((FF_T_UINT16) (pBuffer[offset+1]) & 0x00FF); -} - -FF_T_UINT32 FF_getLong(FF_T_UINT8 *pBuffer, FF_T_UINT16 offset) { - return (FF_T_UINT32) ((pBuffer[offset] << 24) & 0xFF0000) | ((FF_T_UINT32) (pBuffer[offset+1] << 16) & 0x00FF0000) | ((FF_T_UINT32) (pBuffer[offset+2] << 8) & 0x0000FF00) | ((FF_T_UINT32) (pBuffer[offset+3]) & 0x000000FF); -} - -void FF_putChar(FF_T_UINT8 *pBuffer, FF_T_UINT16 offset, FF_T_UINT8 Value) { - pBuffer[offset] = Value; -} - -void FF_putShort(FF_T_UINT8 *pBuffer, FF_T_UINT16 offset, FF_T_UINT16 Value) { - FF_T_UINT8 *Val = (FF_T_UINT8 *) &Value; - pBuffer[offset] = Val[1]; - pBuffer[offset + 1] = Val[0]; -} - -void FF_putLong(FF_T_UINT8 *pBuffer, FF_T_UINT16 offset, FF_T_UINT32 Value) { - FF_T_UINT8 *Val = (FF_T_UINT8 *) &Value; - pBuffer[offset] = Val[3]; - pBuffer[offset + 1] = Val[2]; - pBuffer[offset + 2] = Val[1]; - pBuffer[offset + 3] = Val[0]; +void FF_putLong(FF_T_UINT8 *pBuffer, FF_T_UINT32 aOffset, FF_T_UINT32 Value) { + FF_T_UN32 u32; + u32.u32 = Value; + pBuffer += aOffset; + pBuffer[0] = u32.bytes.u8_0; + pBuffer[1] = u32.bytes.u8_1; + pBuffer[2] = u32.bytes.u8_2; + pBuffer[3] = u32.bytes.u8_3; } #endif - -

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