Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 74633: [WIN32l:NTGDI] -Check the return value IntGetOutlineTextMetrics and stop using garbage from the pool in case of error. CORE-13089, CORE-12752
by gadamopoulos＠svn.reactos.org 23 May '17

23 May '17

Author: gadamopoulos Date: Tue May 23 09:40:07 2017 New Revision: 74633 URL: http://svn.reactos.org/svn/reactos?rev=74633&view=rev Log: [WIN32l:NTGDI] -Check the return value IntGetOutlineTextMetrics and stop using garbage from the pool in case of error. CORE-13089, CORE-12752 Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Tue May 23 09:40:07 2017 @@ -2264,7 +2264,12 @@ { return; } - IntGetOutlineTextMetrics(FontGDI, Size, Otm); + Size = IntGetOutlineTextMetrics(FontGDI, Size, Otm); + if (!Size) + { + ExFreePoolWithTag(Otm, GDITAG_TEXT); + return; + } Lf = &Info->EnumLogFontEx.elfLogFont; TM = &Otm->otmTextMetrics; @@ -3182,7 +3187,14 @@ TEXTOBJ_UnlockText(TextObj); return GDI_ERROR; } - IntGetOutlineTextMetrics(FontGDI, Size, potm); + Size = IntGetOutlineTextMetrics(FontGDI, Size, potm); + if (!Size) + { + /* FIXME: last error? */ + ExFreePoolWithTag(potm, GDITAG_TEXT); + TEXTOBJ_UnlockText(TextObj); + return GDI_ERROR; + } IntLockFreeType; TextIntUpdateSize(dc, TextObj, FontGDI, FALSE); @@ -4441,7 +4453,10 @@ /* update FontObj if lowest penalty */ if (Otm) { - IntGetOutlineTextMetrics(FontGDI, OtmSize, Otm); + OtmSize = IntGetOutlineTextMetrics(FontGDI, OtmSize, Otm); + if (!OtmSize) + continue; + OldOtmSize = OtmSize; Penalty = GetFontPenalty(LogFont, Otm, Face->style_name); @@ -6467,8 +6482,9 @@ cwc = GDI_ERROR; goto ErrorRet; } - IntGetOutlineTextMetrics(FontGDI, Size, potm); - DefChar = potm->otmTextMetrics.tmDefaultChar; + Size = IntGetOutlineTextMetrics(FontGDI, Size, potm); + if (Size) + DefChar = potm->otmTextMetrics.tmDefaultChar; ExFreePoolWithTag(potm, GDITAG_TEXT); } }

1 0

[hbelusca] 74632: [USETUP]: Further improve the OS detection code. - Improve FindExistingNTOSInstall() so that we can find an existing installation either by system root ARC path or NT path; this i...
by hbelusca＠svn.reactos.org 22 May '17

22 May '17

Author: hbelusca Date: Mon May 22 22:59:11 2017 New Revision: 74632 URL: http://svn.reactos.org/svn/reactos?rev=74632&view=rev Log: [USETUP]: Further improve the OS detection code. - Improve FindExistingNTOSInstall() so that we can find an existing installation either by system root ARC path or NT path; this is used when enumerating available installations from the boot.ini/freeldr.ini and checking whether we have to resolve the ARC paths into NT paths, and whether we have to really check for the existence & validity of such an installation (or whether it was previously checked for). - Improve AddNTOSInstallation() so that we can save the system root ARC path and NT path of the installation, as well as its partition entry structure pointer, for caching & later retrieval purposes. - Remove some deprecated comments & todos, and implement other todos. - Improve the output of some DPRINTs. - Fix the return value of FindSubStrI. Modified: branches/setup_improvements/base/setup/usetup/osdetect.c branches/setup_improvements/base/setup/usetup/osdetect.h Modified: branches/setup_improvements/base/setup/usetup/osdetect.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/osdetect.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/osdetect.c [iso-8859-1] Mon May 22 22:59:11 2017 @@ -27,7 +27,7 @@ BOOL IsWindowsOS(VOID) { - // TODO: + // TODO? : // Load the "SystemRoot\System32\Config\SOFTWARE" hive and mount it, // then go to (SOFTWARE\\)Microsoft\\Windows NT\\CurrentVersion, // check the REG_SZ value "ProductName" and see whether it's "Windows" @@ -99,11 +99,21 @@ IN PCWSTR SystemRoot OPTIONAL); static PNTOS_INSTALLATION +FindExistingNTOSInstall( + IN PGENERIC_LIST List, + IN PCWSTR SystemRootArcPath OPTIONAL, + IN PUNICODE_STRING SystemRootNtPath OPTIONAL // or PCWSTR ? + ); + +static PNTOS_INSTALLATION AddNTOSInstallation( IN PGENERIC_LIST List, + IN PCWSTR SystemRootArcPath, + IN PUNICODE_STRING SystemRootNtPath, // or PCWSTR ? + IN PCWSTR PathComponent, // Pointer inside SystemRootNtPath buffer IN ULONG DiskNumber, IN ULONG PartitionNumber, - IN PCWSTR SystemRoot, + IN PPARTENTRY PartEntry OPTIONAL, IN PCWSTR InstallationName); static NTSTATUS @@ -119,7 +129,15 @@ PINICACHEITERATOR Iterator; PINICACHESECTION IniSection, OsIniSection; PWCHAR SectionName, KeyData; - WCHAR InstallName[MAX_PATH]; + UNICODE_STRING InstallName; + + HANDLE SystemRootDirectory; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + PNTOS_INSTALLATION NtOsInstall; + UNICODE_STRING SystemRootPath; + WCHAR SystemRoot[MAX_PATH]; + WCHAR InstallNameW[MAX_PATH]; /* Open an *existing* FreeLdr.ini configuration file */ Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); @@ -147,16 +165,16 @@ PWCHAR End = wcschr(Begin, L'"'); if (!End) End = Begin + wcslen(Begin); - StringCchCopyNW(InstallName, ARRAYSIZE(InstallName), - Begin, End - Begin); + RtlInitEmptyUnicodeString(&InstallName, Begin, (ULONG_PTR)End - (ULONG_PTR)Begin); + InstallName.Length = InstallName.MaximumLength; } else { /* Non-quoted name, copy everything */ - StringCchCopyW(InstallName, ARRAYSIZE(InstallName), KeyData); - } - - DPRINT1("Possible installation '%S' in OS section '%S'\n", InstallName, SectionName); + RtlInitUnicodeString(&InstallName, KeyData); + } + + DPRINT1("Possible installation '%wZ' in OS section '%S'\n", &InstallName, SectionName); /* Search for an existing ReactOS entry */ OsIniSection = IniCacheGetSection(IniCache, SectionName); @@ -186,27 +204,25 @@ Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); if (!NT_SUCCESS(Status)) { - DPRINT1(" A Win2k3 install '%S' without an ARC path?!\n", InstallName); - continue; - } - - { - HANDLE SystemRootDirectory; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING SystemRootPath; - WCHAR SystemRoot[MAX_PATH]; - WCHAR InstallNameW[MAX_PATH]; - - DPRINT1(" Found a candidate Win2k3 install '%S' with ARC path '%S'\n", InstallName, KeyData); - - // Note that in ARC path, the disk number is the BIOS disk number, so a conversion - // should be done. - - // TODO 1: Normalize the ARC path. - - // TODO 2: Check whether we already have an installation with this ARC path. - // If that's the case, stop there. If not, continue... + DPRINT1(" A Win2k3 install '%wZ' without an ARC path?!\n", &InstallName); + continue; + } + + DPRINT1(" Found a candidate Win2k3 install '%wZ' with ARC path '%S'\n", &InstallName, KeyData); + + // TODO: Normalize the ARC path. + + /* + * Check whether we already have an installation with this ARC path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(List, KeyData, NULL); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemArcPath); + continue; + } /* * Convert the ARC path into an NT path, from which we will deduce @@ -216,18 +232,26 @@ RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot)); if (!ArcPathToNtPath(&SystemRootPath, KeyData, PartList)) { - DPRINT1("ArcPathToNtPath(%S) failed, installation skipped.\n", KeyData); - // FIXME: Do not continue! - continue; - } - - DPRINT1("ArcPathToNtPath() succeeded: %S --> %wZ\n", KeyData, &SystemRootPath); - - // TODO 3: Check whether we already have an installation with this NT path. - // If that's the case, stop there. If not, continue... + DPRINT1("ArcPathToNtPath(%S) failed, skip the installation.\n", KeyData); + continue; + } + + DPRINT1("ArcPathToNtPath() succeeded: '%S' --> '%wZ'\n", KeyData, &SystemRootPath); + + /* + * Check whether we already have an installation with this NT path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(List, NULL /*KeyData*/, &SystemRootPath); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); + continue; + } /* Set SystemRootPath */ - DPRINT1("FreeLdrEnumerateInstallations: SystemRootPath: %wZ\n", &SystemRootPath); + DPRINT1("FreeLdrEnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); /* Open SystemRootPath */ InitializeObjectAttributes(&ObjectAttributes, @@ -243,18 +267,18 @@ FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open SystemRoot %wZ, Status 0x%08lx\n", &SystemRootPath, Status); + DPRINT1("Failed to open SystemRoot '%wZ', Status 0x%08lx\n", &SystemRootPath, Status); continue; } if (IsValidNTOSInstallation(SystemRootDirectory, NULL)) { - ULONG DiskNumber, PartitionNumber; - PCWSTR PathComponent; + ULONG DiskNumber = 0, PartitionNumber = 0; + PCWSTR PathComponent = NULL; PDISKENTRY DiskEntry = NULL; PPARTENTRY PartEntry = NULL; - DPRINT1("Found a valid NTOS installation in SystemRoot ARC path %S, NT path %wZ\n", KeyData, &SystemRootPath); + DPRINT1("Found a valid NTOS installation in SystemRoot ARC path '%S', NT path '%wZ'\n", KeyData, &SystemRootPath); /* From the NT path, compute the disk, partition and path components */ if (NtPathToDiskPartComponents(SystemRootPath.Buffer, &DiskNumber, &PartitionNumber, &PathComponent)) @@ -274,20 +298,21 @@ if (PartEntry && PartEntry->DriveLetter) { /* We have retrieved a partition that is mounted */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%s\"", - PartEntry->DriveLetter, PathComponent, InstallName); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%wZ\"", + PartEntry->DriveLetter, PathComponent, &InstallName); } else { /* We failed somewhere, just show the NT path */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%s\"", - &SystemRootPath, InstallName); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%wZ\"", + &SystemRootPath, &InstallName); } - AddNTOSInstallation(List, 0, 0 /*DiskNumber, PartitionNumber*/, KeyData, InstallNameW); + AddNTOSInstallation(List, KeyData, &SystemRootPath, PathComponent, + DiskNumber, PartitionNumber, PartEntry, + InstallNameW); } NtClose(SystemRootDirectory); - } } while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); @@ -311,7 +336,15 @@ PINICACHEITERATOR Iterator; PINICACHESECTION IniSection; PWCHAR SectionName, KeyData; - WCHAR InstallName[MAX_PATH]; + UNICODE_STRING InstallName; + + HANDLE SystemRootDirectory; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + PNTOS_INSTALLATION NtOsInstall; + UNICODE_STRING SystemRootPath; + WCHAR SystemRoot[MAX_PATH]; + WCHAR InstallNameW[MAX_PATH]; /* Open an *existing* FreeLdr.ini configuration file */ Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); @@ -339,40 +372,32 @@ PWCHAR End = wcschr(Begin, L'"'); if (!End) End = Begin + wcslen(Begin); - StringCchCopyNW(InstallName, ARRAYSIZE(InstallName), - Begin, End - Begin); + RtlInitEmptyUnicodeString(&InstallName, Begin, (ULONG_PTR)End - (ULONG_PTR)Begin); + InstallName.Length = InstallName.MaximumLength; } else { /* Non-quoted name, copy everything */ - StringCchCopyW(InstallName, ARRAYSIZE(InstallName), KeyData); - } - - DPRINT1("Possible installation '%S' with ARC path '%S'\n", InstallName, SectionName); - - // FIXME TODO: Determine whether we indeed have an ARC path, in which case - // this is an NT installation, or, whether we have something else like a DOS - // path, which means that we are booting a boot sector... - - DPRINT1(" Found a Win2k3 install '%S' with ARC path '%S'\n", InstallName, SectionName); - // TODO: Dissect it in order to retrieve the real disk drive & partition numbers. - // Note that in ARC path, the disk number is the BIOS disk number, so a conversion - // should be done. - { - HANDLE SystemRootDirectory; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING SystemRootPath; - WCHAR SystemRoot[MAX_PATH]; - WCHAR InstallNameW[MAX_PATH]; - - // Note that in ARC path, the disk number is the BIOS disk number, so a conversion - // should be done. - - // TODO 1: Normalize the ARC path. - - // TODO 2: Check whether we already have an installation with this ARC path. - // If that's the case, stop there. If not, continue... + RtlInitUnicodeString(&InstallName, KeyData); + } + + DPRINT1("Possible installation '%wZ' with ARC path '%S'\n", &InstallName, SectionName); + + DPRINT1(" Found a Win2k3 install '%wZ' with ARC path '%S'\n", &InstallName, SectionName); + + // TODO: Normalize the ARC path. + + /* + * Check whether we already have an installation with this ARC path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(List, SectionName, NULL); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemArcPath); + continue; + } /* * Convert the ARC path into an NT path, from which we will deduce @@ -382,18 +407,26 @@ RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot)); if (!ArcPathToNtPath(&SystemRootPath, SectionName, PartList)) { - DPRINT1("ArcPathToNtPath(%S) failed, installation skipped.\n", SectionName); - // FIXME: Do not continue! - continue; - } - - DPRINT1("ArcPathToNtPath() succeeded: %S --> %wZ\n", SectionName, &SystemRootPath); - - // TODO 3: Check whether we already have an installation with this NT path. - // If that's the case, stop there. If not, continue... + DPRINT1("ArcPathToNtPath(%S) failed, skip the installation.\n", SectionName); + continue; + } + + DPRINT1("ArcPathToNtPath() succeeded: '%S' --> '%wZ'\n", SectionName, &SystemRootPath); + + /* + * Check whether we already have an installation with this NT path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(List, NULL /*SectionName*/, &SystemRootPath); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); + continue; + } /* Set SystemRootPath */ - DPRINT1("NtLdrEnumerateInstallations: SystemRootPath: %wZ\n", &SystemRootPath); + DPRINT1("NtLdrEnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); /* Open SystemRootPath */ InitializeObjectAttributes(&ObjectAttributes, @@ -409,18 +442,18 @@ FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open SystemRoot %wZ, Status 0x%08lx\n", &SystemRootPath, Status); + DPRINT1("Failed to open SystemRoot '%wZ', Status 0x%08lx\n", &SystemRootPath, Status); continue; } if (IsValidNTOSInstallation(SystemRootDirectory, NULL)) { - ULONG DiskNumber, PartitionNumber; - PCWSTR PathComponent; + ULONG DiskNumber = 0, PartitionNumber = 0; + PCWSTR PathComponent = NULL; PDISKENTRY DiskEntry = NULL; PPARTENTRY PartEntry = NULL; - DPRINT1("Found a valid NTOS installation in SystemRoot ARC path %S, NT path %wZ\n", SectionName, &SystemRootPath); + DPRINT1("Found a valid NTOS installation in SystemRoot ARC path '%S', NT path '%wZ'\n", SectionName, &SystemRootPath); /* From the NT path, compute the disk, partition and path components */ if (NtPathToDiskPartComponents(SystemRootPath.Buffer, &DiskNumber, &PartitionNumber, &PathComponent)) @@ -440,20 +473,21 @@ if (PartEntry && PartEntry->DriveLetter) { /* We have retrieved a partition that is mounted */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%s\"", - PartEntry->DriveLetter, PathComponent, InstallName); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%wZ\"", + PartEntry->DriveLetter, PathComponent, &InstallName); } else { /* We failed somewhere, just show the NT path */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%s\"", - &SystemRootPath, InstallName); + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%wZ\"", + &SystemRootPath, &InstallName); } - AddNTOSInstallation(List, 0, 0 /*DiskNumber, PartitionNumber*/, SectionName, InstallNameW); + AddNTOSInstallation(List, SectionName, &SystemRootPath, PathComponent, + DiskNumber, PartitionNumber, PartEntry, + InstallNameW); } NtClose(SystemRootDirectory); - } } while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); @@ -464,38 +498,23 @@ return STATUS_SUCCESS; } -/*** -*wchar_t *wcsstr(string1, string2) - search for string2 in string1 -* (wide strings) -* -*Purpose: -* finds the first occurrence of string2 in string1 (wide strings) -* -*Entry: -* wchar_t *string1 - string to search in -* wchar_t *string2 - string to search for -* -*Exit: -* returns a pointer to the first occurrence of string2 in -* string1, or NULL if string2 does not occur in string1 -* -*Uses: -* -*Exceptions: -* -*******************************************************************************/ -PWSTR FindSubStrI(PCWSTR str, PCWSTR strSearch) -{ - PWSTR cp = (PWSTR)str; - PWSTR s1, s2; +/* + * FindSubStrI(PCWSTR str, PCWSTR strSearch) : + * Searches for a sub-string 'strSearch' inside 'str', similarly to what + * wcsstr(str, strSearch) does, but ignores the case during the comparisons. + */ +PCWSTR FindSubStrI(PCWSTR str, PCWSTR strSearch) +{ + PCWSTR cp = str; + PCWSTR s1, s2; if (!*strSearch) - return (PWSTR)str; + return str; while (*cp) { s1 = cp; - s2 = (PWSTR)strSearch; + s2 = strSearch; while (*s1 && *s2 && (towupper(*s1) == towupper(*s2))) ++s1, ++s2; @@ -536,14 +555,14 @@ &FileHandle, &SectionHandle, &ViewBase, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open and map file %S, Status 0x%08lx\n", FileName, Status); + DPRINT1("Failed to open and map file '%S', Status 0x%08lx\n", FileName, Status); return FALSE; // Status; } /* Make sure it's a valid PE file */ if (!RtlImageNtHeader(ViewBase)) { - DPRINT1("File %S does not seem to be a valid PE, bail out\n", FileName); + DPRINT1("File '%S' does not seem to be a valid PE, bail out\n", FileName); Status = STATUS_INVALID_IMAGE_FORMAT; goto UnmapFile; } @@ -555,7 +574,7 @@ Status = NtGetVersionResource((PVOID)((ULONG_PTR)ViewBase | 1), &VersionBuffer, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to get version resource for file %S, Status 0x%08lx\n", FileName, Status); + DPRINT1("Failed to get version resource for file '%S', Status 0x%08lx\n", FileName, Status); goto UnmapFile; } @@ -581,7 +600,7 @@ if (NT_SUCCESS(Status) /*&& pvData*/) { /* BufLen includes the NULL terminator count */ - DPRINT1("Found version vendor: \"%S\" for file %S\n", pvData, FileName); + DPRINT1("Found version vendor: \"%S\" for file '%S'\n", pvData, FileName); StringCbCopyNW(VendorName->Buffer, VendorName->MaximumLength, pvData, BufLen * sizeof(WCHAR)); @@ -592,7 +611,7 @@ } if (!NT_SUCCESS(Status)) - DPRINT1("No version vendor found for file %S\n", FileName); + DPRINT1("No version vendor found for file '%S'\n", FileName); UnmapFile: /* Finally, unmap and close the file */ @@ -615,8 +634,8 @@ { BOOLEAN Success = FALSE; USHORT i; + UNICODE_STRING VendorName; WCHAR PathBuffer[MAX_PATH]; - UNICODE_STRING VendorName; /* * Use either the 'SystemRootDirectory' handle or the 'SystemRoot' string, @@ -636,7 +655,7 @@ StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\"); if (!DoesPathExist(SystemRootDirectory, PathBuffer)) { - // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } @@ -644,7 +663,7 @@ StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\drivers\\"); if (!DoesPathExist(SystemRootDirectory, PathBuffer)) { - // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } @@ -652,7 +671,7 @@ StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\config\\"); if (!DoesPathExist(SystemRootDirectory, PathBuffer)) { - // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } @@ -663,12 +682,12 @@ */ if (!DoesFileExist(SystemRootDirectory, SystemRoot, L"System32\\config\\SYSTEM")) { - // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } if (!DoesFileExist(SystemRootDirectory, SystemRoot, L"System32\\config\\SOFTWARE")) { - // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); + // DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } #endif @@ -736,9 +755,9 @@ NtOsInstall = (PNTOS_INSTALLATION)GetListEntryUserData(Entry); Entry = GetNextListEntry(Entry); - DPRINT1(" On disk #%d, partition #%d: Installation \"%S\" in SystemRoot %S\n", + DPRINT1(" On disk #%d, partition #%d: Installation \"%S\" in SystemRoot '%wZ'\n", NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, - NtOsInstall->InstallationName, NtOsInstall->SystemRoot); + NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); } DPRINT1("Done.\n"); @@ -747,12 +766,22 @@ static PNTOS_INSTALLATION FindExistingNTOSInstall( IN PGENERIC_LIST List, - IN ULONG DiskNumber, - IN ULONG PartitionNumber, - IN PCWSTR SystemRoot) + IN PCWSTR SystemRootArcPath OPTIONAL, + IN PUNICODE_STRING SystemRootNtPath OPTIONAL // or PCWSTR ? + ) { PGENERIC_LIST_ENTRY Entry; PNTOS_INSTALLATION NtOsInstall; + UNICODE_STRING SystemArcPath; + + /* + * We search either via ARC path or NT path. + * If both pointers are NULL then we fail straight away. + */ + if (!SystemRootArcPath && !SystemRootNtPath) + return NULL; + + RtlInitUnicodeString(&SystemArcPath, SystemRootArcPath); Entry = GetFirstListEntry(List); while (Entry) @@ -760,9 +789,17 @@ NtOsInstall = (PNTOS_INSTALLATION)GetListEntryUserData(Entry); Entry = GetNextListEntry(Entry); - if (NtOsInstall->DiskNumber == DiskNumber && - NtOsInstall->PartitionNumber == PartitionNumber && - _wcsicmp(NtOsInstall->SystemRoot, SystemRoot) == 0) + /* + * Note that if both ARC paths are equal, then the corresponding + * NT paths must be the same. However, two ARC paths may be different + * but resolve into the same NT path. + */ + if ( (SystemRootArcPath && + RtlEqualUnicodeString(&NtOsInstall->SystemArcPath, + &SystemArcPath, TRUE)) || + (SystemRootNtPath && + RtlEqualUnicodeString(&NtOsInstall->SystemNtPath, + SystemRootNtPath, TRUE)) ) { /* Found it! */ return NtOsInstall; @@ -775,20 +812,24 @@ static PNTOS_INSTALLATION AddNTOSInstallation( IN PGENERIC_LIST List, + IN PCWSTR SystemRootArcPath, + IN PUNICODE_STRING SystemRootNtPath, // or PCWSTR ? + IN PCWSTR PathComponent, // Pointer inside SystemRootNtPath buffer IN ULONG DiskNumber, IN ULONG PartitionNumber, - IN PCWSTR SystemRoot, + IN PPARTENTRY PartEntry OPTIONAL, IN PCWSTR InstallationName) { PNTOS_INSTALLATION NtOsInstall; + SIZE_T ArcPathLength, NtPathLength; CHAR InstallNameA[MAX_PATH]; /* Is there already any installation with these settings? */ - NtOsInstall = FindExistingNTOSInstall(List, DiskNumber, PartitionNumber, SystemRoot); + NtOsInstall = FindExistingNTOSInstall(List, SystemRootArcPath, SystemRootNtPath); if (NtOsInstall) { - DPRINT1("An NTOS installation with name \"%S\" already exists on disk #%d, partition #%d, in SystemRoot %S\n", - NtOsInstall->InstallationName, NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, NtOsInstall->SystemRoot); + DPRINT1("An NTOS installation with name \"%S\" already exists on disk #%d, partition #%d, in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, &NtOsInstall->SystemNtPath); // // NOTE: We may use its "IsDefault" attribute, and only keep the entries that have IsDefault == TRUE... // Setting IsDefault to TRUE would imply searching for the "Default" entry in the loader configuration file. @@ -796,14 +837,34 @@ return NtOsInstall; } + ArcPathLength = (wcslen(SystemRootArcPath) + 1) * sizeof(WCHAR); + // NtPathLength = ROUND_UP(SystemRootNtPath->Length + sizeof(UNICODE_NULL), sizeof(WCHAR)); + NtPathLength = SystemRootNtPath->Length + sizeof(UNICODE_NULL); + /* None was found, so add a new one */ - NtOsInstall = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(*NtOsInstall)); + NtOsInstall = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, + sizeof(*NtOsInstall) + + ArcPathLength + NtPathLength); if (!NtOsInstall) return NULL; NtOsInstall->DiskNumber = DiskNumber; NtOsInstall->PartitionNumber = PartitionNumber; - StringCchCopyW(NtOsInstall->SystemRoot, ARRAYSIZE(NtOsInstall->SystemRoot), SystemRoot); + NtOsInstall->PartEntry = PartEntry; + + RtlInitEmptyUnicodeString(&NtOsInstall->SystemArcPath, + (PWCHAR)(NtOsInstall + 1), + ArcPathLength); + RtlCopyMemory(NtOsInstall->SystemArcPath.Buffer, SystemRootArcPath, ArcPathLength); + NtOsInstall->SystemArcPath.Length = ArcPathLength - sizeof(UNICODE_NULL); + + RtlInitEmptyUnicodeString(&NtOsInstall->SystemNtPath, + (PWCHAR)((ULONG_PTR)(NtOsInstall + 1) + ArcPathLength), + NtPathLength); + RtlCopyUnicodeString(&NtOsInstall->SystemNtPath, SystemRootNtPath); + NtOsInstall->PathComponent = NtOsInstall->SystemNtPath.Buffer + + (PathComponent - SystemRootNtPath->Buffer); + StringCchCopyW(NtOsInstall->InstallationName, ARRAYSIZE(NtOsInstall->InstallationName), InstallationName); // Having the GENERIC_LIST storing the display item string plainly sucks... @@ -820,27 +881,25 @@ IN PPARTENTRY PartEntry) { NTSTATUS Status; - UINT i; + ULONG DiskNumber = PartEntry->DiskEntry->DiskNumber; + ULONG PartitionNumber = PartEntry->PartitionNumber; HANDLE PartitionHandle, FileHandle; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; UNICODE_STRING PartitionRootPath; + UINT i; HANDLE SectionHandle; // SIZE_T ViewSize; ULONG FileSize; PVOID ViewBase; WCHAR PathBuffer[MAX_PATH]; -PDISKENTRY DiskEntry = PartEntry->DiskEntry; -ULONG DiskNumber = DiskEntry->DiskNumber; -ULONG PartitionNumber = PartEntry->PartitionNumber; - /* Set PartitionRootPath */ StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu\\", DiskNumber, PartitionNumber); RtlInitUnicodeString(&PartitionRootPath, PathBuffer); - DPRINT1("FindNTOSInstallations: PartitionRootPath: %wZ\n", &PartitionRootPath); + DPRINT1("FindNTOSInstallations: PartitionRootPath: '%wZ'\n", &PartitionRootPath); /* Open the partition */ InitializeObjectAttributes(&ObjectAttributes, @@ -856,7 +915,7 @@ FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open partition %wZ, Status 0x%08lx\n", &PartitionRootPath, Status); + DPRINT1("Failed to open partition '%wZ', Status 0x%08lx\n", &PartitionRootPath, Status); return; } @@ -867,7 +926,7 @@ if (!DoesFileExist(PartitionHandle, NULL, NtosBootLoaders[i].LoaderExecutable)) { /* The loader does not exist, continue with another one */ - DPRINT1("Loader executable %S does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderExecutable); + DPRINT1("Loader executable '%S' does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderExecutable); continue; } @@ -878,7 +937,7 @@ { /* The loader does not exist, continue with another one */ // FIXME: Consider it might be optional?? - DPRINT1("Loader configuration file %S does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderConfigurationFile); + DPRINT1("Loader configuration file '%S' does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderConfigurationFile); continue; } Modified: branches/setup_improvements/base/setup/usetup/osdetect.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/osdetect.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/osdetect.h [iso-8859-1] Mon May 22 22:59:11 2017 @@ -2,15 +2,15 @@ typedef struct _NTOS_INSTALLATION { LIST_ENTRY ListEntry; +// BOOLEAN IsDefault; // TRUE / FALSE whether this installation is marked as "default" in its corresponding loader configuration file. +// Vendor???? (Microsoft / ReactOS) + UNICODE_STRING SystemArcPath; // Normalized ARC path + UNICODE_STRING SystemNtPath; // Corresponding NT path + PCWSTR PathComponent; // Pointer inside SystemNtPath.Buffer ULONG DiskNumber; ULONG PartitionNumber; PPARTENTRY PartEntry; -// BOOLEAN IsDefault; // TRUE / FALSE whether this installation is marked as "default" in its corresponding loader configuration file. -// Vendor???? (Microsoft / ReactOS) -/**/WCHAR SystemRoot[MAX_PATH];/**/ - UNICODE_STRING SystemArcPath; // Normalized ARC path - UNICODE_STRING SystemNtPath; // Corresponding NT path -/**/WCHAR InstallationName[MAX_PATH];/**/ + WCHAR InstallationName[MAX_PATH]; } NTOS_INSTALLATION, *PNTOS_INSTALLATION; // EnumerateNTOSInstallations

1 0

[hbelusca] 74631: [USETUP]: arcname_tests.c: remove an unneeded function prototype.
by hbelusca＠svn.reactos.org 22 May '17

22 May '17

Author: hbelusca Date: Mon May 22 22:54:09 2017 New Revision: 74631 URL: http://svn.reactos.org/svn/reactos?rev=74631&view=rev Log: [USETUP]: arcname_tests.c: remove an unneeded function prototype. Modified: branches/setup_improvements/base/setup/lib/arcname_tests.c Modified: branches/setup_improvements/base/setup/lib/arcname_tests.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/arcname_tests.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/arcname_tests.c [iso-8859-1] Mon May 22 22:54:09 2017 @@ -23,13 +23,6 @@ #include "arcname.h" - -BOOLEAN -NTAPI -RtlEqualUnicodeString( - IN CONST UNICODE_STRING *s1, - IN CONST UNICODE_STRING *s2, - IN BOOLEAN CaseInsensitive); #define OBJ_NAME_PATH_SEPARATOR ((WCHAR)L'\\')

1 0

[gadamopoulos] 74630: [WIN32K] -Simplify the parameters passed to GetFontPenalty and FindBestFontFromList. Make SubstituteFontRecurse update a LOGFONT and get rid of some needless allocations.
by gadamopoulos＠svn.reactos.org 22 May '17

22 May '17

Author: gadamopoulos Date: Mon May 22 18:17:49 2017 New Revision: 74630 URL: http://svn.reactos.org/svn/reactos?rev=74630&view=rev Log: [WIN32K] -Simplify the parameters passed to GetFontPenalty and FindBestFontFromList. Make SubstituteFontRecurse update a LOGFONT and get rid of some needless allocations. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Mon May 22 18:17:49 2017 @@ -522,7 +522,6 @@ BYTE RequestedCharSet, BYTE CharSetMap[FONTSUBST_FROM_AND_TO]) { - NTSTATUS Status; PLIST_ENTRY pListEntry; PFONTSUBST_ENTRY pSubstEntry; BYTE CharSets[FONTSUBST_FROM_AND_TO]; @@ -564,14 +563,7 @@ } /* update *pOutputName */ - RtlFreeUnicodeString(pOutputName); - Status = RtlCreateUnicodeString(pOutputName, - pSubstEntry->FontNames[FONTSUBST_TO].Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlCreateUnicodeString failed: 0x%08X\n", Status); - continue; /* cannot create string */ - } + *pOutputName = pSubstEntry->FontNames[FONTSUBST_TO]; if (CharSetMap[FONTSUBST_FROM] == DEFAULT_CHARSET) { @@ -586,32 +578,33 @@ } static BOOL -SubstituteFontRecurse(PUNICODE_STRING pInOutName, BYTE *pRequestedCharSet) +SubstituteFontRecurse(LOGFONTW* pLogFont) { UINT RecurseCount = 5; UNICODE_STRING OutputNameW = { 0 }; BYTE CharSetMap[FONTSUBST_FROM_AND_TO]; BOOL Found; - - if (pInOutName->Buffer[0] == UNICODE_NULL) + UNICODE_STRING InputNameW; + + if (pLogFont->lfFaceName[0] == UNICODE_NULL) return FALSE; + RtlInitUnicodeString(&InputNameW, pLogFont->lfFaceName); + while (RecurseCount-- > 0) { - RtlInitUnicodeString(&OutputNameW, NULL); Found = SubstituteFontByList(&FontSubstListHead, - &OutputNameW, pInOutName, - *pRequestedCharSet, CharSetMap); + &OutputNameW, &InputNameW, + pLogFont->lfCharSet, CharSetMap); if (!Found) break; - /* update *pInOutName and *pRequestedCharSet */ - RtlFreeUnicodeString(pInOutName); - *pInOutName = OutputNameW; + RtlStringCbCopyW(pLogFont->lfFaceName, LF_FACESIZE, OutputNameW.Buffer); + if (CharSetMap[FONTSUBST_FROM] == DEFAULT_CHARSET || - CharSetMap[FONTSUBST_FROM] == *pRequestedCharSet) - { - *pRequestedCharSet = CharSetMap[FONTSUBST_TO]; + CharSetMap[FONTSUBST_FROM] == pLogFont->lfCharSet) + { + pLogFont->lfCharSet = CharSetMap[FONTSUBST_TO]; } } @@ -4032,11 +4025,9 @@ } // NOTE: See Table 1. of https://msdn.microsoft.com/en-us/library/ms969909.aspx -static UINT FASTCALL -GetFontPenalty(LOGFONTW * LogFont, - PUNICODE_STRING RequestedNameW, - BYTE RequestedCharSet, - OUTLINETEXTMETRICW * Otm, +static UINT +GetFontPenalty(const LOGFONTW * LogFont, + const OUTLINETEXTMETRICW * Otm, const char * style_name) { ULONG Penalty = 0; @@ -4044,15 +4035,19 @@ LONG Long; BOOL fFixedSys = FALSE, fNeedScaling = FALSE; const BYTE UserCharSet = CharSetFromLangID(gusLanguageID); - TEXTMETRICW * TM = &Otm->otmTextMetrics; - UNICODE_STRING ActualNameW; + const TEXTMETRICW * TM = &Otm->otmTextMetrics; + WCHAR* ActualNameW; + + ASSERT(Otm); + ASSERT(LogFont); + ASSERT(style_name); /* FIXME: Aspect Penalty 30 */ /* FIXME: IntSizeSynth Penalty 20 */ /* FIXME: SmallPenalty Penalty 1 */ /* FIXME: FaceNameSubst Penalty 500 */ - if (RtlEqualUnicodeString(RequestedNameW, &SystemW, TRUE)) + if (_wcsicmp(LogFont->lfFaceName, L"System") == 0) { /* "System" font */ if (TM->tmCharSet != UserCharSet) @@ -4062,7 +4057,7 @@ Penalty += 65000; } } - else if (RtlEqualUnicodeString(RequestedNameW, &FixedSysW, TRUE)) + else if (_wcsicmp(LogFont->lfFaceName, L"FixedSys") == 0) { /* "FixedSys" font */ if (TM->tmCharSet != UserCharSet) @@ -4075,10 +4070,10 @@ } else /* Request is non-"System" font */ { - Byte = RequestedCharSet; + Byte = LogFont->lfCharSet; if (Byte == DEFAULT_CHARSET) { - if (RtlEqualUnicodeString(RequestedNameW, &MarlettW, TRUE)) + if (_wcsicmp(LogFont->lfFaceName, L"Marlett") == 0) { if (Byte == ANSI_CHARSET) { @@ -4179,22 +4174,22 @@ } } - RtlInitUnicodeString(&ActualNameW, (WCHAR*)((ULONG_PTR)Otm + (ULONG_PTR)Otm->otmpFamilyName)); - - if (RequestedNameW->Buffer[0]) + ActualNameW = (WCHAR*)((ULONG_PTR)Otm + (ULONG_PTR)Otm->otmpFamilyName); + + if (LogFont->lfFaceName[0]) { BOOL Found = FALSE; /* localized family name */ if (!Found) { - Found = RtlEqualUnicodeString(RequestedNameW, &ActualNameW, TRUE); + Found = (_wcsicmp(LogFont->lfFaceName, ActualNameW) == 0); } /* localized full name */ if (!Found) { - RtlInitUnicodeString(&ActualNameW, (WCHAR*)((ULONG_PTR)Otm + (ULONG_PTR)Otm->otmpFaceName)); - Found = RtlEqualUnicodeString(RequestedNameW, &ActualNameW, TRUE); + ActualNameW = (WCHAR*)((ULONG_PTR)Otm + (ULONG_PTR)Otm->otmpFaceName); + Found = (_wcsicmp(LogFont->lfFaceName, ActualNameW) == 0); } if (!Found) { @@ -4393,7 +4388,7 @@ DPRINT("WARNING: Penalty:%ld < 200: RequestedNameW:%ls, " "ActualNameW:%ls, lfCharSet:%d, lfWeight:%ld, " "tmCharSet:%d, tmWeight:%ld\n", - Penalty, RequestedNameW->Buffer, ActualNameW.Buffer, + Penalty, LogFont->lfFaceName, ActualNameW, LogFont->lfCharSet, LogFont->lfWeight, TM->tmCharSet, TM->tmWeight); } @@ -4402,10 +4397,9 @@ } static __inline VOID -FindBestFontFromList(FONTOBJ **FontObj, ULONG *MatchPenalty, LOGFONTW *LogFont, - PUNICODE_STRING pRequestedNameW, - BYTE RequestedCharSet, - PLIST_ENTRY Head) +FindBestFontFromList(FONTOBJ **FontObj, ULONG *MatchPenalty, + const LOGFONTW *LogFont, + const PLIST_ENTRY Head) { ULONG Penalty; PLIST_ENTRY Entry; @@ -4418,7 +4412,6 @@ ASSERT(FontObj); ASSERT(MatchPenalty); ASSERT(LogFont); - ASSERT(pRequestedNameW); ASSERT(Head); /* Start with a pretty big buffer */ @@ -4451,8 +4444,7 @@ IntGetOutlineTextMetrics(FontGDI, OtmSize, Otm); OldOtmSize = OtmSize; - Penalty = GetFontPenalty(LogFont, pRequestedNameW, RequestedCharSet, - Otm, Face->style_name); + Penalty = GetFontPenalty(LogFont, Otm, Face->style_name); if (*MatchPenalty == 0xFFFFFFFF || Penalty < *MatchPenalty) { *FontObj = GDIToObj(FontGDI, FONT); @@ -4503,12 +4495,11 @@ { NTSTATUS Status = STATUS_SUCCESS; PTEXTOBJ TextObj; - UNICODE_STRING RequestedNameW; PPROCESSINFO Win32Process; ULONG MatchPenalty; LOGFONTW *pLogFont; + LOGFONTW SubstitutedLogFont; FT_Face Face; - BYTE RequestedCharSet; if (!pTextObj) { @@ -4530,18 +4521,12 @@ } pLogFont = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; - if (!RtlCreateUnicodeString(&RequestedNameW, pLogFont->lfFaceName)) - { - if (!pTextObj) TEXTOBJ_UnlockText(TextObj); - return STATUS_NO_MEMORY; - } /* substitute */ - RequestedCharSet = pLogFont->lfCharSet; - DPRINT("Font '%ls,%u' is substituted by: ", - RequestedNameW.Buffer, RequestedCharSet); - SubstituteFontRecurse(&RequestedNameW, &RequestedCharSet); - DPRINT("'%ls,%u'.\n", RequestedNameW.Buffer, RequestedCharSet); + SubstitutedLogFont = *pLogFont; + DPRINT("Font '%S,%u' is substituted by: ", pLogFont->lfFaceName, pLogFont->lfCharSet); + SubstituteFontRecurse(&SubstitutedLogFont); + DPRINT("'%S,%u'.\n", SubstitutedLogFont.lfFaceName, SubstitutedLogFont.lfCharSet); MatchPenalty = 0xFFFFFFFF; TextObj->Font = NULL; @@ -4550,15 +4535,13 @@ /* Search private fonts */ IntLockProcessPrivateFonts(Win32Process); - FindBestFontFromList(&TextObj->Font, &MatchPenalty, pLogFont, - &RequestedNameW, RequestedCharSet, + FindBestFontFromList(&TextObj->Font, &MatchPenalty, &SubstitutedLogFont, &Win32Process->PrivateFontListHead); IntUnLockProcessPrivateFonts(Win32Process); /* Search system fonts */ IntLockGlobalFonts; - FindBestFontFromList(&TextObj->Font, &MatchPenalty, pLogFont, - &RequestedNameW, RequestedCharSet, + FindBestFontFromList(&TextObj->Font, &MatchPenalty, &SubstitutedLogFont, &FontListHead); IntUnLockGlobalFonts; @@ -4595,7 +4578,6 @@ Status = STATUS_SUCCESS; } - RtlFreeUnicodeString(&RequestedNameW); if (!pTextObj) TEXTOBJ_UnlockText(TextObj); ASSERT((NT_SUCCESS(Status) ^ (NULL == TextObj->Font)) != 0);

1 0

[hbelusca] 74629: [USETUP]: Some fixes/improvements suggested by Thomas: - isspace('\0') returns FALSE anyways so no need to separately test for a NULL character; - The (str/wcs)toul function canno...
by hbelusca＠svn.reactos.org 22 May '17

22 May '17

Author: hbelusca Date: Mon May 22 15:55:16 2017 New Revision: 74629 URL: http://svn.reactos.org/svn/reactos?rev=74629&view=rev Log: [USETUP]: Some fixes/improvements suggested by Thomas: - isspace('\0') returns FALSE anyways so no need to separately test for a NULL character; - The (str/wcs)toul function cannot return a NULL pointer from its second paramter; - VersionInfo32_FindChild(): the third argument is indeed a number of characters (not bytes), so rename the parameter to make this fact clear. The function is however correctly used within this module. - In the partlist.c disk getters: Remove useless "IsListEmpty(&List->DiskListHead)" checks, because this is actually the kind of check the while() loop does just after... - Fix few DPRINTs. Modified: branches/setup_improvements/base/setup/lib/arcname.c branches/setup_improvements/base/setup/lib/ntverrsrc.c branches/setup_improvements/base/setup/lib/partlist.c branches/setup_improvements/base/setup/usetup/filesup.c Modified: branches/setup_improvements/base/setup/lib/arcname.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] Mon May 22 15:55:16 2017 @@ -143,7 +143,7 @@ KeyValue = strtoul(p, (PSTR*)&p, 10); /* Skip any trailing whitespace */ - while (*p && isspace(*p)) ++p; + while (isspace(*p)) ++p; /* The token must terminate with ')' */ if (*p != ')') @@ -203,10 +203,9 @@ */ // KeyValue = _wtoi(p); KeyValue = wcstoul(p, (PWSTR*)&p, 10); - ASSERT(p); /* Skip any trailing whitespace */ - while (*p && iswspace(*p)) ++p; + while (iswspace(*p)) ++p; /* The token must terminate with ')' */ if (*p != L')') Modified: branches/setup_improvements/base/setup/lib/ntverrsrc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/ntverrsrc.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/ntverrsrc.c [iso-8859-1] Mon May 22 15:55:16 2017 @@ -105,13 +105,13 @@ VersionInfo32_FindChild( IN PCVS_VERSION_INFO_STRUCT32 info, IN PCWSTR szKey, - IN UINT cbKey) + IN UINT cchKey) { PCVS_VERSION_INFO_STRUCT32 child = VersionInfo32_Children(info); while ((ULONG_PTR)child < (ULONG_PTR)info + info->wLength) { - if (!_wcsnicmp(child->szKey, szKey, cbKey) && !child->szKey[cbKey]) + if (!_wcsnicmp(child->szKey, szKey, cchKey) && !child->szKey[cchKey]) return child; if (child->wLength == 0) return NULL; Modified: branches/setup_improvements/base/setup/lib/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/partlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/partlist.c [iso-8859-1] Mon May 22 15:55:16 2017 @@ -1356,10 +1356,6 @@ PDISKENTRY DiskEntry; PLIST_ENTRY Entry; - /* Check for empty disks */ - if (IsListEmpty(&List->DiskListHead)) - return NULL; - /* Loop over the disks and find the correct one */ Entry = List->DiskListHead.Flink; while (Entry != &List->DiskListHead) @@ -1385,10 +1381,6 @@ { PDISKENTRY DiskEntry; PLIST_ENTRY Entry; - - /* Check for empty disks */ - if (IsListEmpty(&List->DiskListHead)) - return NULL; /* Loop over the disks and find the correct one */ Entry = List->DiskListHead.Flink; @@ -1418,10 +1410,6 @@ PDISKENTRY DiskEntry; PLIST_ENTRY Entry; - /* Check for empty disks */ - if (IsListEmpty(&List->DiskListHead)) - return NULL; - /* Loop over the disks and find the correct one */ Entry = List->DiskListHead.Flink; while (Entry != &List->DiskListHead) @@ -1449,10 +1437,6 @@ { PDISKENTRY DiskEntry; PLIST_ENTRY Entry; - - /* Check for empty disks */ - if (IsListEmpty(&List->DiskListHead)) - return NULL; /* Loop over the disks and find the correct one */ Entry = List->DiskListHead.Flink; Modified: branches/setup_improvements/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] Mon May 22 15:55:16 2017 @@ -594,12 +594,7 @@ DiskNumber = wcstoul(Path, (PWSTR*)&Path, 10); /* Either NULL termination, or a path separator must be present now */ - if (!Path) - { - DPRINT1("An error happened!\n"); - return FALSE; - } - else if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) + if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) { DPRINT1("'%S' : expected a path separator!\n", Path); return FALSE; @@ -632,13 +627,7 @@ PartNumber = wcstoul(Path, (PWSTR*)&Path, 10); /* Either NULL termination, or a path separator must be present now */ - if (!Path) - { - /* We fail here because wcstoul failed for whatever reason */ - DPRINT1("An error happened!\n"); - return FALSE; - } - else if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) + if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) { /* We shouldn't fail here because it just means this part of path is actually not a partition specifier. Or should we? */ DPRINT1("'%S' : expected a path separator!\n", Path); @@ -703,7 +692,7 @@ FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &Name, Status); return Status; } @@ -725,7 +714,7 @@ } if (FileInfo.EndOfFile.HighPart != 0) - DPRINT1("WARNING!! The file %wZ is too large!\n", Name); + DPRINT1("WARNING!! The file '%wZ' is too large!\n", &Name); *FileSize = FileInfo.EndOfFile.LowPart; @@ -744,7 +733,7 @@ *FileHandle); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to create a memory section for file %wZ, Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to create a memory section for file '%wZ', Status 0x%08lx\n", &Name, Status); NtClose(*FileHandle); *FileHandle = NULL; return Status;

1 0

[tfaber] 74628: [CMLIB] - Fix an assert that only works by chance
by tfaber＠svn.reactos.org 22 May '17

22 May '17

Author: tfaber Date: Mon May 22 13:48:11 2017 New Revision: 74628 URL: http://svn.reactos.org/svn/reactos?rev=74628&view=rev Log: [CMLIB] - Fix an assert that only works by chance Modified: trunk/reactos/sdk/lib/cmlib/hivecell.c Modified: trunk/reactos/sdk/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/cmlib/hivecell.c?r… ============================================================================== --- trunk/reactos/sdk/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/cmlib/hivecell.c [iso-8859-1] Mon May 22 13:48:11 2017 @@ -33,7 +33,7 @@ } else { - ASSERT((CellIndex & HCELL_TYPE_MASK) == Stable); + ASSERT(HvGetCellType(CellIndex) == Stable); return (PVOID)((ULONG_PTR)RegistryHive->BaseBlock + HBLOCK_SIZE + CellIndex); }

1 0

[tfaber] 74627: [NTOS:MM] - In MmDumpArmPfnDatabase, actually print all usage buckets to provide a complete and verifiable view of the database
by tfaber＠svn.reactos.org 22 May '17

22 May '17

Author: tfaber Date: Mon May 22 13:37:44 2017 New Revision: 74627 URL: http://svn.reactos.org/svn/reactos?rev=74627&view=rev Log: [NTOS:MM] - In MmDumpArmPfnDatabase, actually print all usage buckets to provide a complete and verifiable view of the database Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Mon May 22 13:37:44 2017 @@ -1563,6 +1563,7 @@ DbgPrint("Active: %5d pages\t[%6d KB]\n", ActivePages, (ActivePages << PAGE_SHIFT) / 1024); DbgPrint("Free: %5d pages\t[%6d KB]\n", FreePages, (FreePages << PAGE_SHIFT) / 1024); + DbgPrint("Other: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); DbgPrint("-----------------------------------------\n"); #if MI_TRACE_PFNS OtherPages = UsageBucket[MI_USAGE_BOOT_DRIVER]; @@ -1571,12 +1572,26 @@ DbgPrint("System Drivers: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); OtherPages = UsageBucket[MI_USAGE_PFN_DATABASE]; DbgPrint("PFN Database: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); - OtherPages = UsageBucket[MI_USAGE_PAGE_TABLE] + UsageBucket[MI_USAGE_LEGACY_PAGE_DIRECTORY]; + OtherPages = UsageBucket[MI_USAGE_PAGE_TABLE] + UsageBucket[MI_USAGE_PAGE_DIRECTORY] + UsageBucket[MI_USAGE_LEGACY_PAGE_DIRECTORY]; DbgPrint("Page Tables: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); + OtherPages = UsageBucket[MI_USAGE_SYSTEM_PTE]; + DbgPrint("System PTEs: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); + OtherPages = UsageBucket[MI_USAGE_VAD]; + DbgPrint("VADs: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); + OtherPages = UsageBucket[MI_USAGE_CONTINOUS_ALLOCATION]; + DbgPrint("Continuous Allocs: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); + OtherPages = UsageBucket[MI_USAGE_MDL]; + DbgPrint("MDLs: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); OtherPages = UsageBucket[MI_USAGE_NONPAGED_POOL] + UsageBucket[MI_USAGE_NONPAGED_POOL_EXPANSION]; DbgPrint("NonPaged Pool: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); OtherPages = UsageBucket[MI_USAGE_PAGED_POOL]; DbgPrint("Paged Pool: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); + OtherPages = UsageBucket[MI_USAGE_DEMAND_ZERO]; + DbgPrint("Demand Zero: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); + OtherPages = UsageBucket[MI_USAGE_ZERO_LOOP]; + DbgPrint("Zero Loop: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); + OtherPages = UsageBucket[MI_USAGE_PEB_TEB]; + DbgPrint("PEB/TEB: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); OtherPages = UsageBucket[MI_USAGE_KERNEL_STACK] + UsageBucket[MI_USAGE_KERNEL_STACK_EXPANSION]; DbgPrint("Kernel Stack: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); OtherPages = UsageBucket[MI_USAGE_INIT_MEMORY]; @@ -1585,6 +1600,8 @@ DbgPrint("Sections: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); OtherPages = UsageBucket[MI_USAGE_CACHE]; DbgPrint("Cache: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); + OtherPages = UsageBucket[MI_USAGE_FREE_PAGE]; + DbgPrint("Free: %5d pages\t[%6d KB]\n", OtherPages, (OtherPages << PAGE_SHIFT) / 1024); #endif KeLowerIrql(OldIrql); }

1 0

[tfaber] 74626: [NTOS:MM] - Make PFN tracing work... somewhat
by tfaber＠svn.reactos.org 22 May '17

22 May '17

Author: tfaber Date: Mon May 22 13:30:44 2017 New Revision: 74626 URL: http://svn.reactos.org/svn/reactos?rev=74626&view=rev Log: [NTOS:MM] - Make PFN tracing work... somewhat Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/session.c trunk/reactos/ntoskrnl/mm/ARM3/special.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=746… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Mon May 22 13:30:44 2017 @@ -607,6 +607,7 @@ { PFN_NUMBER PageFrameNumber; + MI_SET_USAGE(MI_USAGE_CACHE); Status = MmRequestPageMemoryConsumer(MC_CACHE, TRUE, &PageFrameNumber); if (PageFrameNumber == 0) { @@ -741,8 +742,15 @@ PWCHAR pos = NULL; ULONG len = 0; pos = wcsrchr(SharedCacheMap->FileObject->FileName.Buffer, '\\'); - len = wcslen(pos) * sizeof(WCHAR); - if (pos) snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos); + if (pos) + { + len = wcslen(pos) * sizeof(WCHAR); + snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos); + } + else + { + snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%wZ", &SharedCacheMap->FileObject->FileName); + } } #endif Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Mon May 22 13:30:44 2017 @@ -653,8 +653,9 @@ if (UserPdeFault) MI_SET_USAGE(MI_USAGE_PAGE_TABLE); if (!UserPdeFault) MI_SET_USAGE(MI_USAGE_DEMAND_ZERO); #endif - if (Process) MI_SET_PROCESS2(Process->ImageFileName); - if (!Process) MI_SET_PROCESS2("Kernel Demand 0"); + if (Process == HYDRA_PROCESS) MI_SET_PROCESS2("Hydra"); + else if (Process) MI_SET_PROCESS2(Process->ImageFileName); + else MI_SET_PROCESS2("Kernel Demand 0"); /* Do we need a zero page? */ if (Color != 0xFFFFFFFF) Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon May 22 13:30:44 2017 @@ -994,6 +994,8 @@ /* Acquire the PFN lock and grab a zero page */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + MI_SET_USAGE(MI_USAGE_PAGE_TABLE); + MI_SET_PROCESS2(PsGetCurrentProcess()->ImageFileName); Color = (++MmSessionSpace->Color) & MmSecondaryColorMask; PageFrameNumber = MiRemoveZeroPage(Color); TempPde.u.Hard.PageFrameNumber = PageFrameNumber; Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/session.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] Mon May 22 13:30:44 2017 @@ -511,6 +511,7 @@ if (AllocatedPageTable != FALSE) { /* Get a zeroed colored zero page */ + MI_SET_USAGE(MI_USAGE_INIT_MEMORY); Color = MI_GET_NEXT_COLOR(); PageFrameIndex = MiRemoveZeroPageSafe(Color); if (!PageFrameIndex) @@ -542,6 +543,7 @@ } /* Get a zeroed colored zero page */ + MI_SET_USAGE(MI_USAGE_INIT_MEMORY); Color = MI_GET_NEXT_COLOR(); PageFrameIndex = MiRemoveZeroPageSafe(Color); if (!PageFrameIndex) @@ -679,6 +681,7 @@ for (i = 0; i < MiSessionDataPages; i++) { /* Get a zeroed colored zero page */ + MI_SET_USAGE(MI_USAGE_INIT_MEMORY); Color = MI_GET_NEXT_COLOR(); DataPage[i] = MiRemoveZeroPageSafe(Color); if (!DataPage[i]) @@ -701,6 +704,7 @@ SessionGlobal = MiPteToAddress(SessionPte); /* Get a zeroed colored zero page */ + MI_SET_USAGE(MI_USAGE_INIT_MEMORY); Color = MI_GET_NEXT_COLOR(); SessionPageDirIndex = MiRemoveZeroPageSafe(Color); if (!SessionPageDirIndex) @@ -742,6 +746,7 @@ for (i = 0; i < MiSessionTagPages; i++) { /* Grab a zeroed colored page */ + MI_SET_USAGE(MI_USAGE_INIT_MEMORY); Color = MI_GET_NEXT_COLOR(); TagPage[i] = MiRemoveZeroPageSafe(Color); if (!TagPage[i]) Modified: trunk/reactos/ntoskrnl/mm/ARM3/special.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/special.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/special.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/special.c [iso-8859-1] Mon May 22 13:30:44 2017 @@ -328,6 +328,15 @@ MiSpecialPoolFirstPte = MmSystemPteBase + PointerPte->u.List.NextEntry; /* Allocate a physical page */ + if (PoolType == PagedPool) + { + MI_SET_USAGE(MI_USAGE_PAGED_POOL); + } + else + { + MI_SET_USAGE(MI_USAGE_NONPAGED_POOL); + } + MI_SET_PROCESS2("Kernel-Special"); PageFrameNumber = MiRemoveAnyPage(MI_GET_NEXT_COLOR()); /* Initialize PFN and make it valid */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Mon May 22 13:30:44 2017 @@ -178,25 +178,25 @@ /* Lock the PFN database */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - /* Some debug stuff */ - MI_SET_USAGE(MI_USAGE_DRIVER_PAGE); -#if MI_TRACE_PFNS - if (FileName->Buffer) - { - PWCHAR pos = NULL; - ULONG len = 0; - pos = wcsrchr(FileName->Buffer, '\\'); - len = wcslen(pos) * sizeof(WCHAR); - if (pos) snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos); - } -#endif - /* Loop the new driver PTEs */ TempPte = ValidKernelPte; while (PointerPte < LastPte) { /* Make sure the PTE is not valid for whatever reason */ ASSERT(PointerPte->u.Hard.Valid == 0); + + /* Some debug stuff */ + MI_SET_USAGE(MI_USAGE_DRIVER_PAGE); +#if MI_TRACE_PFNS + if (FileName->Buffer) + { + PWCHAR pos = NULL; + ULONG len = 0; + pos = wcsrchr(FileName->Buffer, '\\'); + len = wcslen(pos) * sizeof(WCHAR); + if (pos) snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos); + } +#endif /* Grab a page */ PageFrameIndex = MiRemoveAnyPage(MI_GET_NEXT_COLOR());

1 0

[tfaber] 74625: [CALC] - Remove Czech koruna from currency conversions... their exchange rate is not a constant - While here, add new Euro currencies, and improve the accuracy of some conversion rates
by tfaber＠svn.reactos.org 22 May '17

22 May '17

Author: tfaber Date: Mon May 22 13:13:45 2017 New Revision: 74625 URL: http://svn.reactos.org/svn/reactos?rev=74625&view=rev Log: [CALC] - Remove Czech koruna from currency conversions... their exchange rate is not a constant - While here, add new Euro currencies, and improve the accuracy of some conversion rates Modified: trunk/reactos/base/applications/calc/convert.c trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/cs-CZ.rc trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/calc/lang/el-GR.rc trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/calc/lang/fr-FR.rc trunk/reactos/base/applications/calc/lang/he-IL.rc trunk/reactos/base/applications/calc/lang/hu-HU.rc trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/calc/lang/ja-JP.rc trunk/reactos/base/applications/calc/lang/ko-KR.rc trunk/reactos/base/applications/calc/lang/nl-NL.rc trunk/reactos/base/applications/calc/lang/no-NO.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/pt-BR.rc trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/calc/lang/sq-AL.rc trunk/reactos/base/applications/calc/lang/sv-SE.rc trunk/reactos/base/applications/calc/lang/th-TH.rc trunk/reactos/base/applications/calc/lang/tr-TR.rc trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/calc/lang/zh-CN.rc trunk/reactos/base/applications/calc/resource.h Modified: trunk/reactos/base/applications/calc/convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/con… ============================================================================== --- trunk/reactos/base/applications/calc/convert.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/convert.c [iso-8859-1] Mon May 22 13:13:45 2017 @@ -144,15 +144,17 @@ DECLARE_CONV_UNIT(CURRENCY, AUSTRIAN_SCHILLING, "$/13,7603", "$*13,7603") DECLARE_CONV_UNIT(CURRENCY, BELGIAN_FRANC, "$/40,3399", "$*40,3399") DECLARE_CONV_UNIT(CURRENCY, CYPRIOT_POUND, "$/0,585274","$*0,585274") - DECLARE_CONV_UNIT(CURRENCY, CZECH_KORUNA, "$/27,9766", "$*27,9766") - DECLARE_CONV_UNIT(CURRENCY, DEUTSCHE_MARK, "$/1,9558", "$*1,9558") + DECLARE_CONV_UNIT(CURRENCY, DEUTSCHE_MARK, "$/1,95583", "$*1,95583") DECLARE_CONV_UNIT(CURRENCY, DUTCH_GUILDER, "$/2,20371", "$*2,20371") + DECLARE_CONV_UNIT(CURRENCY, ESTONIAN_KROON, "$/15,6466", "$*15,6466") DECLARE_CONV_UNIT(CURRENCY, EURO, "$", "$") - DECLARE_CONV_UNIT(CURRENCY, FINNISH_MARKKA, "$/5,9457", "$*5,9457") - DECLARE_CONV_UNIT(CURRENCY, FRENCH_FRANC, "$/6,5596", "$*6,5596") - DECLARE_CONV_UNIT(CURRENCY, GREEK_DRACHMA, "$/340,75", "$*340,75") - DECLARE_CONV_UNIT(CURRENCY, IRISH_POUND, "$/0,7876", "$*0,7876") + DECLARE_CONV_UNIT(CURRENCY, FINNISH_MARKKA, "$/5,94573", "$*5,94573") + DECLARE_CONV_UNIT(CURRENCY, FRENCH_FRANC, "$/6,55957", "$*6,55957") + DECLARE_CONV_UNIT(CURRENCY, GREEK_DRACHMA, "$/340,751", "$*340,751") + DECLARE_CONV_UNIT(CURRENCY, IRISH_POUND, "$/0,787564","$*0,787564") DECLARE_CONV_UNIT(CURRENCY, ITALIAN_LIRA, "$/1936.27", "$*1936.27") + DECLARE_CONV_UNIT(CURRENCY, LATVIAN_LATS, "$/0,7028", "$*0,7028") + DECLARE_CONV_UNIT(CURRENCY, LITHUANIAN_LITAS, "$/3,45280", "$*3,45280") DECLARE_CONV_UNIT(CURRENCY, LUXEMBOURG_FRANC, "$/40,3399", "$*40,3399") DECLARE_CONV_UNIT(CURRENCY, MALTESE_LIRA, "$/0.42930", "$*0.42930") DECLARE_CONV_UNIT(CURRENCY, PORTOGUESE_ESCUDO, "$/200,482", "$*200,482") Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -497,12 +497,15 @@ IDS_CURRENCY_CZECH_KORUNA "Ð§ÐµÑÐºÐ° ÐºÑÐ¾Ð½Ð°" IDS_CURRENCY_DEUTSCHE_MARK "ÐÐµÑÐ¼Ð°Ð½ÑÐºÐ° Ð¼Ð°ÑÐºÐ°" IDS_CURRENCY_DUTCH_GUILDER "Ð¥Ð¾Ð»Ð°Ð½Ð´ÑÐºÐ¸ Ð³ÑÐ»Ð´ÐµÐ½" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "ÐÐ²ÑÐ¾" IDS_CURRENCY_FINNISH_MARKKA "Ð¤Ð¸Ð½ÑÐºÐ° Ð¼Ð°ÑÐºÐ°" IDS_CURRENCY_FRENCH_FRANC "Ð¤ÑÐµÐ½ÑÐºÐ¸ ÑÑÐ°Ð½Ðº" IDS_CURRENCY_GREEK_DRACHMA "ÐÑÑÑÐºÐ° Ð´ÑÐ°ÑÐ¼Ð°" IDS_CURRENCY_IRISH_POUND "ÐÑÐ»Ð°Ð½Ð´ÑÐºÐ° Ð»Ð¸ÑÐ°" IDS_CURRENCY_ITALIAN_LIRA "ÐÑÐ°Ð»Ð¸Ð°Ð½ÑÐºÐ° Ð»Ð¸ÑÐ°" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "ÐÑÐºÑÐµÐ¼Ð±ÑÑÐ³ÑÐºÐ¸ ÑÑÐ°Ð½Ðº" IDS_CURRENCY_MALTESE_LIRA "ÐÐ°Ð»ÑÐ¸Ð¹ÑÐºÐ° Ð»Ð¸ÑÐ°" IDS_CURRENCY_PORTOGUESE_ESCUDO "ÐÐ¾ÑÑÑÐ³Ð°Ð»ÑÐºÐ¾ ÐµÑÐºÑÐ´Ð¾" Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -496,12 +496,15 @@ IDS_CURRENCY_CZECH_KORUNA "ÄeskÃ¡ koruna" IDS_CURRENCY_DEUTSCHE_MARK "NÄmeckÃ¡ marka" IDS_CURRENCY_DUTCH_GUILDER "NizozemskÃ½ gulden" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "FinskÃ¡ marka" IDS_CURRENCY_FRENCH_FRANC "FrancouzskÃ½ frank" IDS_CURRENCY_GREEK_DRACHMA "ÅeckÃ¡ drachma" IDS_CURRENCY_IRISH_POUND "IrskÃ¡ libra" IDS_CURRENCY_ITALIAN_LIRA "ItalskÃ¡ lira" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "LucemburskÃ½ frank" IDS_CURRENCY_MALTESE_LIRA "MaltskÃ¡ lira" IDS_CURRENCY_PORTOGUESE_ESCUDO "PortugalskÃ© escudo" Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -491,12 +491,15 @@ IDS_CURRENCY_CZECH_KORUNA "Tschechische Krone" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "NiederlÃ¤ndische Guilder" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "Finnische Mark" IDS_CURRENCY_FRENCH_FRANC "FranzÃ¶schische Franc" IDS_CURRENCY_GREEK_DRACHMA "Griechische Drachme" IDS_CURRENCY_IRISH_POUND "Irische Pfund" IDS_CURRENCY_ITALIAN_LIRA "Italienische Lire" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgische Franc" IDS_CURRENCY_MALTESE_LIRA "Maltesische Lire" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugiesische Escudo" Modified: trunk/reactos/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -491,12 +491,15 @@ IDS_CURRENCY_CZECH_KORUNA "Czech koruna" IDS_CURRENCY_DEUTSCHE_MARK "ÎÎµÏÎ¼Î±Î½Î¹ÎºÏ Î¼Î¬ÏÎºÎ¿" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "ÎÏÏÏ" IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" IDS_CURRENCY_FRENCH_FRANC "ÎÎ±Î»Î»Î¹ÎºÏ ÏÏÎ¬Î³ÎºÎ¿" IDS_CURRENCY_GREEK_DRACHMA "ÎÏÎ±ÏÎ¼Î®" IDS_CURRENCY_IRISH_POUND "Irish pound" IDS_CURRENCY_ITALIAN_LIRA "ÎÏÎ±Î»Î¹ÎºÎ® Î»Î¯ÏÎ±" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "ÎÎ±Î»ÏÎÎ¶Î¹ÎºÎ· Î»Î¯ÏÎ±" IDS_CURRENCY_PORTOGUESE_ESCUDO "Î Î¿ÏÏÎ¿Î³Î±Î»Î¹ÎºÏ ÎµÏÎºÎ¿ÏÎ´Î¿" Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -491,12 +491,15 @@ IDS_CURRENCY_CZECH_KORUNA "Czech koruna" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" IDS_CURRENCY_FRENCH_FRANC "French franc" IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" IDS_CURRENCY_IRISH_POUND "Irish pound" IDS_CURRENCY_ITALIAN_LIRA "Italian lira" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portuguese escudo" Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -497,12 +497,15 @@ IDS_CURRENCY_CZECH_KORUNA "Corona checa" IDS_CURRENCY_DEUTSCHE_MARK "Marco alemÃ¡n" IDS_CURRENCY_DUTCH_GUILDER "FlorÃn neerlandÃ©s" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "Marco finlandÃ©s" IDS_CURRENCY_FRENCH_FRANC "Franco frances" IDS_CURRENCY_GREEK_DRACHMA "Drachma griego" IDS_CURRENCY_IRISH_POUND "Libra irlandesa" IDS_CURRENCY_ITALIAN_LIRA "Lira italiana" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Franco luxemburguÃ©s" IDS_CURRENCY_MALTESE_LIRA "Lira maltesa" IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portuguÃ©s" Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -491,12 +491,15 @@ IDS_CURRENCY_CZECH_KORUNA "Couronne tchÃ¨que" IDS_CURRENCY_DEUTSCHE_MARK "Mark allemand" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "Marks finlandais" IDS_CURRENCY_FRENCH_FRANC "Franc franÃ§ais" IDS_CURRENCY_GREEK_DRACHMA "Drachmes grecques" IDS_CURRENCY_IRISH_POUND "Livre irlandaise" IDS_CURRENCY_ITALIAN_LIRA "Lire italienne" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Franc luxembourgeois" IDS_CURRENCY_MALTESE_LIRA "Lire maltaise" IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portugaise" Modified: trunk/reactos/base/applications/calc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/he-IL.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -493,12 +493,15 @@ IDS_CURRENCY_CZECH_KORUNA "×§××¨×× × ×¦'××" IDS_CURRENCY_DEUTSCHE_MARK "×××¨×§ ××¨×× ×" IDS_CURRENCY_DUTCH_GUILDER "×××××¨ ×××× ××" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "×××¨×" IDS_CURRENCY_FINNISH_MARKKA "×××¨×§× ×¤×× ××ª" IDS_CURRENCY_FRENCH_FRANC "×¤×¨× ×§ ×¦×¨×¤×ª×" IDS_CURRENCY_GREEK_DRACHMA "××¨××× ×××× ××ª" IDS_CURRENCY_IRISH_POUND "×××¨× ×××¨××ª" IDS_CURRENCY_ITALIAN_LIRA "×××¨× ×××××§××ª" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "×¤×¨× ×§ ×××§×¡××××¨××" IDS_CURRENCY_MALTESE_LIRA "×××¨× ×××××" IDS_CURRENCY_PORTOGUESE_ESCUDO "××¡×§××× ×¤××¨××××" Modified: trunk/reactos/base/applications/calc/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/hu-HU.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -499,12 +499,15 @@ IDS_CURRENCY_CZECH_KORUNA "Cseh korona" IDS_CURRENCY_DEUTSCHE_MARK "NÃ©met mÃ¡rka" IDS_CURRENCY_DUTCH_GUILDER "Holland gulden" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "EurÃ³" IDS_CURRENCY_FINNISH_MARKKA "Finn mÃ¡rka" IDS_CURRENCY_FRENCH_FRANC "Francia frank" IDS_CURRENCY_GREEK_DRACHMA "GÃ¶rÃ¶g drachma" IDS_CURRENCY_IRISH_POUND "Ãr font" IDS_CURRENCY_ITALIAN_LIRA "Olasz lÃra" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgi frank" IDS_CURRENCY_MALTESE_LIRA "MÃ¡ltai lÃra" IDS_CURRENCY_PORTOGUESE_ESCUDO "PortugÃ¡l escudo" Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -491,12 +491,15 @@ IDS_CURRENCY_CZECH_KORUNA "Corona ceca" IDS_CURRENCY_DEUTSCHE_MARK "Marco tedesco" IDS_CURRENCY_DUTCH_GUILDER "Fiorino olandese" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "Markka finlandese" IDS_CURRENCY_FRENCH_FRANC "Franco francese" IDS_CURRENCY_GREEK_DRACHMA "Dracma greca" IDS_CURRENCY_IRISH_POUND "Sterlina irlandese" IDS_CURRENCY_ITALIAN_LIRA "Lira italiana" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Franco Lussemburghese" IDS_CURRENCY_MALTESE_LIRA "Lira maltese" IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portoghese" Modified: trunk/reactos/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ja-JP.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -491,12 +491,15 @@ IDS_CURRENCY_CZECH_KORUNA "ãã§ã³ ã³ã«ã" IDS_CURRENCY_DEUTSCHE_MARK "ãã¤ã ãã«ã¯" IDS_CURRENCY_DUTCH_GUILDER "ãªã©ã³ã ã®ã«ãã¼" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "ã¦ã¼ã" IDS_CURRENCY_FINNISH_MARKKA "ãã£ã³ã©ã³ã ãã«ãã«" IDS_CURRENCY_FRENCH_FRANC "ãã©ã³ã¹ ãã©ã³" IDS_CURRENCY_GREEK_DRACHMA "ã®ãªã·ã£ ãã©ã¯ã" IDS_CURRENCY_IRISH_POUND "ã¢ã¤ã«ã©ã³ã ãã³ã" IDS_CURRENCY_ITALIAN_LIRA "ã¤ã¿ãªã¢ ãªã©" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "ã«ã¯ã»ã³ãã«ã¯ ãã©ã³" IDS_CURRENCY_MALTESE_LIRA "ãã«ã¿ ãªã©" IDS_CURRENCY_PORTOGUESE_ESCUDO "ãã«ãã¬ã« ã¨ã¹ã¯ã¼ã" Modified: trunk/reactos/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -493,12 +493,15 @@ IDS_CURRENCY_CZECH_KORUNA "Czech koruna" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" IDS_CURRENCY_FRENCH_FRANC "French franc" IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" IDS_CURRENCY_IRISH_POUND "Irish pound" IDS_CURRENCY_ITALIAN_LIRA "Italian lira" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -491,12 +491,15 @@ IDS_CURRENCY_CZECH_KORUNA "Tsjechische kroon" IDS_CURRENCY_DEUTSCHE_MARK "Duitse Mark" IDS_CURRENCY_DUTCH_GUILDER "Nederlandse gulden" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "Finse markka" IDS_CURRENCY_FRENCH_FRANC "Franse franc" IDS_CURRENCY_GREEK_DRACHMA "Griekse Drachma" IDS_CURRENCY_IRISH_POUND "Ierse pound" IDS_CURRENCY_ITALIAN_LIRA "Italiaanse lira" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgse franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugese escudo" Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -491,12 +491,15 @@ IDS_CURRENCY_CZECH_KORUNA "Tsjekkisk koruna" IDS_CURRENCY_DEUTSCHE_MARK "Tusk Mark" IDS_CURRENCY_DUTCH_GUILDER "Nederlansk guilder" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "Finisk markka" IDS_CURRENCY_FRENCH_FRANC "Fransk franc" IDS_CURRENCY_GREEK_DRACHMA "Gresk Drachma" IDS_CURRENCY_IRISH_POUND "Irisk pound" IDS_CURRENCY_ITALIAN_LIRA "Italiask lira" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltesisk lira" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portogisisk escudo" Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -500,12 +500,15 @@ IDS_CURRENCY_CZECH_KORUNA "Czeska korona" IDS_CURRENCY_DEUTSCHE_MARK "Niemiecka marka" IDS_CURRENCY_DUTCH_GUILDER "Holenderki gulden" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "FiÅska marka" IDS_CURRENCY_FRENCH_FRANC "Francuski frank" IDS_CURRENCY_GREEK_DRACHMA "Grecka drachma" IDS_CURRENCY_IRISH_POUND "Irlandzki funt" IDS_CURRENCY_ITALIAN_LIRA "WÅoskie liry" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luksemburski frank" IDS_CURRENCY_MALTESE_LIRA "MaltaÅskie liry" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalskie escudo" Modified: trunk/reactos/base/applications/calc/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pt-BR.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -493,12 +493,15 @@ IDS_CURRENCY_CZECH_KORUNA "Coroa checa" IDS_CURRENCY_DEUTSCHE_MARK "Marco alemÃ£o" IDS_CURRENCY_DUTCH_GUILDER "Florim neerlandÃªs" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "Marco finlandÃªs" IDS_CURRENCY_FRENCH_FRANC "Franco francÃªs" IDS_CURRENCY_GREEK_DRACHMA "Dracma" IDS_CURRENCY_IRISH_POUND "Libra irlandesa" IDS_CURRENCY_ITALIAN_LIRA "Lira italiana" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Franco luxemburguÃªs" IDS_CURRENCY_MALTESE_LIRA "Lira maltesa" IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portuguÃªs" Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -496,12 +496,15 @@ IDS_CURRENCY_CZECH_KORUNA "CoroanÄ cehÄ" IDS_CURRENCY_DEUTSCHE_MARK "MarcÄ nemÈeascÄ" IDS_CURRENCY_DUTCH_GUILDER "Guilder olandez" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "MarcÄ finlandezÄ" IDS_CURRENCY_FRENCH_FRANC "Franc framcez" IDS_CURRENCY_GREEK_DRACHMA "DrahmÄ greceascÄ" IDS_CURRENCY_IRISH_POUND "LirÄ irlandezÄ" IDS_CURRENCY_ITALIAN_LIRA "LirÄ italianÄ" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Franc luxemburghez" IDS_CURRENCY_MALTESE_LIRA "LitrÄ maltezÄ" IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portughez" Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -491,12 +491,15 @@ IDS_CURRENCY_CZECH_KORUNA "Ð§ÐµÑÑÐºÐ°Ñ ÐºÑÐ¾Ð½Ð°" IDS_CURRENCY_DEUTSCHE_MARK "ÐÐµÐ¼ÐµÑÐºÐ°Ñ Ð¼Ð°ÑÐºÐ°" IDS_CURRENCY_DUTCH_GUILDER "ÐÐ¾Ð»Ð»Ð°Ð½Ð´ÑÐºÐ¸Ð¹ Ð³ÑÐ»ÑÐ´ÐµÐ½" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "ÐÐ²ÑÐ¾" IDS_CURRENCY_FINNISH_MARKKA "Ð¤Ð¸Ð½ÑÐºÐ°Ñ Ð¼Ð°ÑÐºÐ°" IDS_CURRENCY_FRENCH_FRANC "Ð¤ÑÐ°Ð½ÑÑÐ·ÑÐºÐ¸Ð¹ ÑÑÐ°Ð½Ðº" IDS_CURRENCY_GREEK_DRACHMA "ÐÑÐµÑÐµÑÐºÐ°Ñ Ð´ÑÐ°ÑÐ¼Ð°" IDS_CURRENCY_IRISH_POUND "ÐÑÐ»Ð°Ð½Ð´ÑÐºÐ¸Ð¹ ÑÑÐ½Ñ" IDS_CURRENCY_ITALIAN_LIRA "ÐÑÐ°Ð»ÑÑÐ½ÑÐºÐ°Ñ Ð»Ð¸ÑÐ°" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "ÐÑÐºÑÐµÐ¼Ð±ÑÑÐ³ÑÐºÐ¸Ð¹ ÑÑÐ°Ð½Ðº" IDS_CURRENCY_MALTESE_LIRA "ÐÐ°Ð»ÑÑÐ¸Ð¹ÑÐºÐ°Ñ Ð»Ð¸ÑÐ°" IDS_CURRENCY_PORTOGUESE_ESCUDO "ÐÐ¾ÑÑÑÐ³Ð°Ð»ÑÑÐºÐ¾Ðµ ÑÑÐºÑÐ´Ð¾" Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -498,12 +498,15 @@ IDS_CURRENCY_CZECH_KORUNA "ÄeskÃ¡ koruna" IDS_CURRENCY_DEUTSCHE_MARK "NemeckÃ¡ marka" IDS_CURRENCY_DUTCH_GUILDER "HolandskÃ½ gulden" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "FÃnska marka" IDS_CURRENCY_FRENCH_FRANC "FrancÃºzsky frank" IDS_CURRENCY_GREEK_DRACHMA "GrÃ©cka drachma" IDS_CURRENCY_IRISH_POUND "Ãrska libra" IDS_CURRENCY_ITALIAN_LIRA "TalianskÃ¡ lÃra" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "LuxemburskÃ½ frank" IDS_CURRENCY_MALTESE_LIRA "MaltskÃ¡ lÃra" IDS_CURRENCY_PORTOGUESE_ESCUDO "PortugalskÃ© escudo" Modified: trunk/reactos/base/applications/calc/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sq-AL.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -495,12 +495,15 @@ IDS_CURRENCY_CZECH_KORUNA "Koruna Czech" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Deutsche Mark" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "Finnish marka" IDS_CURRENCY_FRENCH_FRANC "Franga Franceze" IDS_CURRENCY_GREEK_DRACHMA "Drachma Greeke" IDS_CURRENCY_IRISH_POUND "Poundi irlandes" IDS_CURRENCY_ITALIAN_LIRA "Lira Italiane" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Lira Maltese" IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo Portugez" Modified: trunk/reactos/base/applications/calc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sv-SE.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -498,12 +498,15 @@ IDS_CURRENCY_CZECH_KORUNA "Tjeckisk koruna" IDS_CURRENCY_DEUTSCHE_MARK "Tysk Mark" IDS_CURRENCY_DUTCH_GUILDER "NederlÃ¤nsk guilder" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "Finisk mark" IDS_CURRENCY_FRENCH_FRANC "Fransk franc" IDS_CURRENCY_GREEK_DRACHMA "Gresk Drachma" IDS_CURRENCY_IRISH_POUND "Irisk pound" IDS_CURRENCY_ITALIAN_LIRA "Italiask lire" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltesisk lire" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portogisisk escudo" Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -491,12 +491,15 @@ IDS_CURRENCY_CZECH_KORUNA "Czech koruna" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "à¸¢à¸¹à¹à¸£" IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" IDS_CURRENCY_FRENCH_FRANC "French franc" IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" IDS_CURRENCY_IRISH_POUND "Irish pound" IDS_CURRENCY_ITALIAN_LIRA "Italian lira" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" Modified: trunk/reactos/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/tr-TR.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -493,12 +493,15 @@ IDS_CURRENCY_CZECH_KORUNA "Ãek KorunasÄ±" IDS_CURRENCY_DEUTSCHE_MARK "Alman MarkÄ±" IDS_CURRENCY_DUTCH_GUILDER "Hollanda Guilderi" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "Avro" IDS_CURRENCY_FINNISH_MARKKA "Fin MarkkasÄ±" IDS_CURRENCY_FRENCH_FRANC "FransÄ±z FrangÄ±" IDS_CURRENCY_GREEK_DRACHMA "Yunan Drahmisi" IDS_CURRENCY_IRISH_POUND "Ä°rlanda Pondu" IDS_CURRENCY_ITALIAN_LIRA "Ä°talyan LirasÄ±" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "LÃ¼ksemburg FrangÄ±" IDS_CURRENCY_MALTESE_LIRA "Malta LirasÄ±" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portekiz EskÃ¼dosu" Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -499,12 +499,15 @@ IDS_CURRENCY_CZECH_KORUNA "Ð§ÐµÑÑÑÐºÐ° ÐºÑÐ¾Ð½Ð°" IDS_CURRENCY_DEUTSCHE_MARK "ÐÐµÐ¼ÐµÑÑÐºÐ° Ð¼Ð°ÑÐºÐ°" IDS_CURRENCY_DUTCH_GUILDER "ÐÐ¾Ð»Ð°Ð½Ð´ÑÑÐºÐ¸Ð¹ Ð³ÑÐ»ÑÐ´ÐµÐ½" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "ÐÐ²ÑÐ¾" IDS_CURRENCY_FINNISH_MARKKA "Ð¤ÑÐ½ÑÑÐºÐ° Ð¼Ð°ÑÐºÐ°" IDS_CURRENCY_FRENCH_FRANC "Ð¤ÑÐ°Ð½ÑÑÐ·ÑÑÐºÐ¸Ð¹ ÑÑÐ°Ð½Ðº" IDS_CURRENCY_GREEK_DRACHMA "ÐÑÐµÑÑÐºÐ° Ð´ÑÐ°ÑÐ¼Ð°" IDS_CURRENCY_IRISH_POUND "ÐÑÐ»Ð°Ð½Ð´ÑÑÐºÐ¸Ð¹ ÑÑÐ½Ñ" IDS_CURRENCY_ITALIAN_LIRA "ÐÑÐ°Ð»ÑÑÐ½ÑÑÐºÐ°Ñ Ð»ÑÑÐ°" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "ÐÑÐºÑÐµÐ¼Ð±ÑÑÐ³ÑÑÐºÐ¸Ð¹ ÑÑÐ°Ð½Ðº" IDS_CURRENCY_MALTESE_LIRA "ÐÐ°Ð»ÑÑÐ¸Ð¹ÑÑÐºÐ°Ñ Ð»ÑÑÐ°" IDS_CURRENCY_PORTOGUESE_ESCUDO "ÐÐ¾ÑÑÑÐ³Ð°Ð»ÑÑÑÐºÐµ ÐµÑÐºÑÐ´Ð¾" Modified: trunk/reactos/base/applications/calc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/zh-CN.rc [iso-8859-1] Mon May 22 13:13:45 2017 @@ -493,12 +493,15 @@ IDS_CURRENCY_CZECH_KORUNA "æ·ååæ" IDS_CURRENCY_DEUTSCHE_MARK "å¾·å½é©¬å" IDS_CURRENCY_DUTCH_GUILDER "è·å°ç¾" + IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" IDS_CURRENCY_EURO "æ¬§å" IDS_CURRENCY_FINNISH_MARKKA "è¬å°é©¬å" IDS_CURRENCY_FRENCH_FRANC "æ³é" IDS_CURRENCY_GREEK_DRACHMA "å¸èå¾·æåé©¬" IDS_CURRENCY_IRISH_POUND "ç±å°å°é" IDS_CURRENCY_ITALIAN_LIRA "æå¤§å©éæ" + IDS_CURRENCY_LATVIAN_LATS "Latvian lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "å¢æ£®å ¡æ³é" IDS_CURRENCY_MALTESE_LIRA "é©¬è³ä»éæ" IDS_CURRENCY_PORTOGUESE_ESCUDO "è¡èçåæ¯åºå¤" Modified: trunk/reactos/base/applications/calc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.h [iso-8859-1] Mon May 22 13:13:45 2017 @@ -171,18 +171,21 @@ #define IDS_CURRENCY_CZECH_KORUNA 2403 #define IDS_CURRENCY_DEUTSCHE_MARK 2404 #define IDS_CURRENCY_DUTCH_GUILDER 2405 -#define IDS_CURRENCY_EURO 2406 -#define IDS_CURRENCY_FINNISH_MARKKA 2407 -#define IDS_CURRENCY_FRENCH_FRANC 2408 -#define IDS_CURRENCY_GREEK_DRACHMA 2409 -#define IDS_CURRENCY_IRISH_POUND 2410 -#define IDS_CURRENCY_ITALIAN_LIRA 2411 -#define IDS_CURRENCY_LUXEMBOURG_FRANC 2412 -#define IDS_CURRENCY_MALTESE_LIRA 2413 -#define IDS_CURRENCY_PORTOGUESE_ESCUDO 2414 -#define IDS_CURRENCY_SLOVAK_KORUNA 2415 -#define IDS_CURRENCY_SLOVENIAN_TOLAR 2416 -#define IDS_CURRENCY_SPANISH_PESETA 2417 +#define IDS_CURRENCY_ESTONIAN_KROON 2406 +#define IDS_CURRENCY_EURO 2407 +#define IDS_CURRENCY_FINNISH_MARKKA 2408 +#define IDS_CURRENCY_FRENCH_FRANC 2409 +#define IDS_CURRENCY_GREEK_DRACHMA 2410 +#define IDS_CURRENCY_IRISH_POUND 2411 +#define IDS_CURRENCY_ITALIAN_LIRA 2412 +#define IDS_CURRENCY_LATVIAN_LATS 2413 +#define IDS_CURRENCY_LITHUANIAN_LITAS 2414 +#define IDS_CURRENCY_LUXEMBOURG_FRANC 2415 +#define IDS_CURRENCY_MALTESE_LIRA 2416 +#define IDS_CURRENCY_PORTOGUESE_ESCUDO 2417 +#define IDS_CURRENCY_SLOVAK_KORUNA 2418 +#define IDS_CURRENCY_SLOVENIAN_TOLAR 2419 +#define IDS_CURRENCY_SPANISH_PESETA 2420 /* TYPES OF ENERGIES */ #define IDS_ENERGY_15_C_CALORIES 2500

1 0

[tfaber] 74624: [HHPCOMP] - Avoid casting pointers to 'unsigned long'
by tfaber＠svn.reactos.org 22 May '17

22 May '17

Author: tfaber Date: Mon May 22 12:50:08 2017 New Revision: 74624 URL: http://svn.reactos.org/svn/reactos?rev=74624&view=rev Log: [HHPCOMP] - Avoid casting pointers to 'unsigned long' Modified: trunk/reactos/sdk/tools/hhpcomp/chmc/list.h Modified: trunk/reactos/sdk/tools/hhpcomp/chmc/list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/hhpcomp/chmc/lis… ============================================================================== --- trunk/reactos/sdk/tools/hhpcomp/chmc/list.h [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/hhpcomp/chmc/list.h [iso-8859-1] Mon May 22 12:50:08 2017 @@ -186,8 +186,13 @@ * @type: the type of the struct this is embedded in. * @member: the name of the list_struct within the struct. */ +#ifdef __REACTOS__ +#define list_entry(ptr, type, member) \ + ((type *)((char *)(ptr)-(size_t)(&((type *)0)->member))) +#else /* __REACTOS__ */ #define list_entry(ptr, type, member) \ ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member))) +#endif /* __REACTOS__ */ /** * list_for_each - iterate over a list

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