Ros-diffs November 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 01/02: [NTOS:EX] Bail out on an invalid locale or language ID

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6438b856055f80f456bed… commit 6438b856055f80f456bede220a19534196da4393 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Nov 12 11:10:27 2023 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Nov 16 21:09:05 2023 +0100 [NTOS:EX] Bail out on an invalid locale or language ID NtSetDefaultLocale and ExpSetCurrentUserUILanguage do not probe the given locale or language ID, and as a result of that these functions would happily take any given argument. This is problematic because overwriting NLS data (specifically the Default registry key value as its gets set by the NtSetDefaultLocale syscall itself) with garbage stuff, rendering the system completely unbootable. In addition to that, these functions do not check the captured language/locale ID against pre-determined locales or languages pre-installed in the system. This basically means an ID of 1, for example, is still valid because it is not bogus albeit there is no such a locale of an ID of 1. That value would get passed to the Default value key and that renders the system unbootable as well. CORE-18100 --- ntoskrnl/ex/locale.c | 337 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 290 insertions(+), 47 deletions(-) diff --git a/ntoskrnl/ex/locale.c b/ntoskrnl/ex/locale.c index b8abb886031..445a304991a 100644 --- a/ntoskrnl/ex/locale.c +++ b/ntoskrnl/ex/locale.c @@ -24,8 +24,231 @@ LANGID PsInstallUILanguageId = LANGIDFROMLCID(0x00000409); LCID PsDefaultThreadLocaleId = 0x00000409; LANGID PsDefaultUILanguageId = LANGIDFROMLCID(0x00000409); +/* DEFINES *******************************************************************/ + +#define BOGUS_LOCALE_ID 0xFFFF0000 + /* PRIVATE FUNCTIONS *********************************************************/ +/** + * @brief + * Validates the registry data of a NLS locale. + * + * @param[in] LocaleData + * A pointer to partial information that contains + * the NLS locale data. + * + * @return + * Returns TRUE if the following conditions are met, + * otherwise FALSE is returned. + */ +static +__inline +BOOLEAN +ExpValidateNlsLocaleData( + _In_ PKEY_VALUE_PARTIAL_INFORMATION LocaleData) +{ + PWCHAR Data; + + /* Is this a null-terminated string type? */ + if (LocaleData->Type != REG_SZ) + { + return FALSE; + } + + /* Does it have a consistent length? */ + if (LocaleData->DataLength < sizeof(WCHAR)) + { + return FALSE; + } + + /* Is the locale set and null-terminated? */ + Data = (PWSTR)LocaleData->Data; + if (Data[0] != L'1' || Data[1] != UNICODE_NULL) + { + return FALSE; + } + + /* All of the conditions above are met */ + return TRUE; +} + +/** + * @brief + * Validates a NLS locale. Whether a locale is valid + * or not depends on the following conditions: + * + * - The locale must exist in the Locale key, otherwise + * in the Alternate Sorts key; + * + * - The locale must exist in the Language Groups key, and + * the queried value must be readable; + * + * - The locale registry data must be of REG_SIZE type, + * has a consistent length and the locale belongs to + * a supported language group that is set. + * + * @param[in] LocaleId + * A locale identifier that corresponds to a specific + * locale to be validated. + * + * @return + * Returns STATUS_SUCCESS if the function has successfully + * validated the locale and it is valid. STATUS_OBJECT_NAME_NOT_FOUND + * is returned if the following locale does not exist on the system. + * A failure NTSTATUS code is returned otherwise. + */ +static +NTSTATUS +ExpValidateNlsLocaleId( + _In_ LCID LocaleId) +{ + NTSTATUS Status; + HANDLE NlsLocaleKey = NULL, AltSortKey = NULL, LangGroupKey = NULL; + OBJECT_ATTRIBUTES NlsLocalKeyAttrs, AltSortKeyAttrs, LangGroupKeyAttrs; + PKEY_VALUE_PARTIAL_INFORMATION BufferKey; + WCHAR ValueBuffer[20], LocaleIdBuffer[20]; + ULONG ReturnedLength; + UNICODE_STRING LocaleIdString; + static UNICODE_STRING NlsLocaleKeyPath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Locale"); + static UNICODE_STRING AltSortKeyPath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Locale\\Alternate Sorts"); + static UNICODE_STRING LangGroupPath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Language Groups"); + + /* Initialize the registry path attributes */ + InitializeObjectAttributes(&NlsLocalKeyAttrs, + &NlsLocaleKeyPath, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + InitializeObjectAttributes(&AltSortKeyAttrs, + &AltSortKeyPath, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + InitializeObjectAttributes(&LangGroupKeyAttrs, + &LangGroupPath, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + /* Copy the locale ID into a buffer */ + swprintf(LocaleIdBuffer, + L"%08lx", + (ULONG)LocaleId); + + /* And build the LCID string */ + RtlInitUnicodeString(&LocaleIdString, LocaleIdBuffer); + + /* Open the NLS locale key */ + Status = ZwOpenKey(&NlsLocaleKey, + KEY_QUERY_VALUE, + &NlsLocalKeyAttrs); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open %wZ (Status 0x%lx)\n", NlsLocaleKeyPath, Status); + return Status; + } + + /* Open the NLS alternate sort locales key */ + Status = ZwOpenKey(&AltSortKey, + KEY_QUERY_VALUE, + &AltSortKeyAttrs); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open %wZ (Status 0x%lx)\n", AltSortKeyPath, Status); + goto Quit; + } + + /* Open the NLS language groups key */ + Status = ZwOpenKey(&LangGroupKey, + KEY_QUERY_VALUE, + &LangGroupKeyAttrs); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open %wZ (Status 0x%lx)\n", LangGroupPath, Status); + goto Quit; + } + + /* Check if the captured locale ID exists in the list of other locales */ + BufferKey = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; + Status = ZwQueryValueKey(NlsLocaleKey, + &LocaleIdString, + KeyValuePartialInformation, + BufferKey, + sizeof(ValueBuffer), + &ReturnedLength); + if (!NT_SUCCESS(Status)) + { + /* We failed, retry by looking at the alternate sorts locales */ + Status = ZwQueryValueKey(AltSortKey, + &LocaleIdString, + KeyValuePartialInformation, + BufferKey, + sizeof(ValueBuffer), + &ReturnedLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to query value from Alternate Sorts key (Status 0x%lx)\n", Status); + goto Quit; + } + } + + /* Ensure the queried locale is of the right key type with a sane length */ + if (BufferKey->Type != REG_SZ || + BufferKey->DataLength < sizeof(WCHAR)) + { + DPRINT1("The queried locale is of bad value type or length (Type %lu, DataLength %lu)\n", + BufferKey->Type, BufferKey->DataLength); + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Quit; + } + + /* We got what we need, now query the locale from the language groups */ + RtlInitUnicodeString(&LocaleIdString, (PWSTR)BufferKey->Data); + Status = ZwQueryValueKey(LangGroupKey, + &LocaleIdString, + KeyValuePartialInformation, + BufferKey, + sizeof(ValueBuffer), + &ReturnedLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to query value from Language Groups key (Status 0x%lx)\n", Status); + goto Quit; + } + + /* + * We have queried the locale with its data. However we are not finished here yet, + * because the locale data could be malformed or the locale itself was not set + * so ensure all of these conditions are met. + */ + if (!ExpValidateNlsLocaleData(BufferKey)) + { + DPRINT1("The locale data is not valid!\n"); + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + +Quit: + if (LangGroupKey != NULL) + { + ZwClose(LangGroupKey); + } + + if (AltSortKey != NULL) + { + ZwClose(AltSortKey); + } + + if (NlsLocaleKey != NULL) + { + ZwClose(NlsLocaleKey); + } + + return Status; +} + NTSTATUS NTAPI ExpGetCurrentUserUILanguage(IN PCWSTR MuiName, @@ -114,6 +337,12 @@ ExpSetCurrentUserUILanguage(IN PCWSTR MuiName, NTSTATUS Status; PAGED_CODE(); + /* Check that the passed language ID is not bogus */ + if (LanguageId & BOGUS_LOCALE_ID) + { + return STATUS_INVALID_PARAMETER; + } + /* Setup the key name */ RtlInitUnicodeString(&ValueName, MuiName); @@ -128,26 +357,31 @@ ExpSetCurrentUserUILanguage(IN PCWSTR MuiName, UserHandle, NULL); - /* Open the key */ - Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); + /* Validate the language ID */ + Status = ExpValidateNlsLocaleId(MAKELCID(LanguageId, SORT_DEFAULT)); if (NT_SUCCESS(Status)) { - /* Setup the value name */ - ValueLength = swprintf(ValueBuffer, - L"%04lX", - (ULONG)LanguageId); - - /* Set the length for the call and set the value */ - ValueLength = (ValueLength + 1) * sizeof(WCHAR); - Status = ZwSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - ValueBuffer, - ValueLength); - - /* Close the handle for this key */ - ZwClose(KeyHandle); + /* Open the key */ + Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Setup the value name */ + ValueLength = swprintf(ValueBuffer, + L"%04lX", + (ULONG)LanguageId); + + /* Set the length for the call and set the value */ + ValueLength = (ValueLength + 1) * sizeof(WCHAR); + Status = ZwSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueBuffer, + ValueLength); + + /* Close the handle for this key */ + ZwClose(KeyHandle); + } } /* Close the user key and return status */ @@ -207,15 +441,21 @@ NtSetDefaultLocale(IN BOOLEAN UserProfile, UNICODE_STRING KeyName; UNICODE_STRING ValueName; UNICODE_STRING LocaleString; - HANDLE KeyHandle; + HANDLE KeyHandle = NULL; ULONG ValueLength; WCHAR ValueBuffer[20]; - HANDLE UserKey; + HANDLE UserKey = NULL; NTSTATUS Status; UCHAR KeyValueBuffer[256]; PKEY_VALUE_PARTIAL_INFORMATION KeyValueInformation; PAGED_CODE(); + /* Check that the passed locale ID is not bogus */ + if (DefaultLocaleId & BOGUS_LOCALE_ID) + { + return STATUS_INVALID_PARAMETER; + } + /* Check if we have a profile */ if (UserProfile) { @@ -234,7 +474,6 @@ NtSetDefaultLocale(IN BOOLEAN UserProfile, L"\\Registry\\Machine\\System\\CurrentControlSet" L"\\Control\\Nls\\Language"); RtlInitUnicodeString(&ValueName, L"Default"); - UserKey = NULL; } /* Initialize the object attributes */ @@ -251,7 +490,6 @@ NtSetDefaultLocale(IN BOOLEAN UserProfile, Status = ZwOpenKey(&KeyHandle, KEY_QUERY_VALUE, &ObjectAttributes); if (!NT_SUCCESS(Status)) { - KeyHandle = NULL; goto Cleanup; } @@ -293,36 +531,41 @@ NtSetDefaultLocale(IN BOOLEAN UserProfile, } else { - /* Otherwise, open the key */ - Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); + /* We have a locale, validate it */ + Status = ExpValidateNlsLocaleId(DefaultLocaleId); if (NT_SUCCESS(Status)) { - /* Check if we had a profile */ - if (UserProfile) - { - /* Fill in the buffer */ - ValueLength = swprintf(ValueBuffer, - L"%08lx", - (ULONG)DefaultLocaleId); - } - else + /* Open the key now */ + Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); + if (NT_SUCCESS(Status)) { - /* Fill in the buffer */ - ValueLength = swprintf(ValueBuffer, - L"%04lx", - (ULONG)DefaultLocaleId & 0xFFFF); - } + /* Check if we had a profile */ + if (UserProfile) + { + /* Fill in the buffer */ + ValueLength = swprintf(ValueBuffer, + L"%08lx", + (ULONG)DefaultLocaleId); + } + else + { + /* Fill in the buffer */ + ValueLength = swprintf(ValueBuffer, + L"%04lx", + (ULONG)DefaultLocaleId & 0xFFFF); + } - /* Set the length for the registry call */ - ValueLength = (ValueLength + 1) * sizeof(WCHAR); + /* Set the length for the registry call */ + ValueLength = (ValueLength + 1) * sizeof(WCHAR); - /* Now write the actual value */ - Status = ZwSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - ValueBuffer, - ValueLength); + /* Now write the actual value */ + Status = ZwSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueBuffer, + ValueLength); + } } }

10 months, 1 week

[reactos] 02/02: [CMD] Fix missing/misplaced newlines at end of displayed errors and prompts.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db219e45c0d7c720585d4… commit db219e45c0d7c720585d44355f8b23a7f5e11f31 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Nov 15 22:00:59 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 16 17:06:40 2023 +0100 [CMD] Fix missing/misplaced newlines at end of displayed errors and prompts. ConInString() should display a newline when it encounters the terminating carriage-return pressed by the user for ending string output. + Remove the extra \n hacks in FilePromptYN[A]. Improve outputted strings from DATE and TIME commands. + Rename some STRING_***_ERROR defines. CORE-18489 --- base/shell/cmd/console.c | 3 ++- base/shell/cmd/console.h | 1 - base/shell/cmd/date.c | 7 ++++--- base/shell/cmd/lang/cs-CZ.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/de-DE.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/el-GR.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/en-US.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/es-ES.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/fr-FR.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/hu-HU.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/id-ID.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/it-IT.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/ja-JP.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/no-NO.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/pl-PL.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/pt-BR.rc | 42 +++++++++++++++++++++--------------------- base/shell/cmd/lang/pt-PT.rc | 42 +++++++++++++++++++++--------------------- base/shell/cmd/lang/ro-RO.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/ru-RU.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/sk-SK.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/sq-AL.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/sv-SE.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/tr-TR.rc | 36 ++++++++++++++++++------------------ base/shell/cmd/lang/uk-UA.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/zh-CN.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/lang/zh-TW.rc | 38 +++++++++++++++++++------------------- base/shell/cmd/misc.c | 4 +--- base/shell/cmd/ren.c | 2 +- base/shell/cmd/resource.h | 10 +++++----- base/shell/cmd/start.c | 2 +- base/shell/cmd/time.c | 8 ++++---- base/shell/cmd/type.c | 2 +- base/shell/cmd/window.c | 2 +- 33 files changed, 450 insertions(+), 451 deletions(-) diff --git a/base/shell/cmd/console.c b/base/shell/cmd/console.c index a3d6b6c984d..ba718fbc076 100644 --- a/base/shell/cmd/console.c +++ b/base/shell/cmd/console.c @@ -106,9 +106,10 @@ VOID ConInString(LPTSTR lpInput, DWORD dwLength) #endif for (p = lpInput; *p; p++) { - if (*p == _T('\x0d')) + if (*p == _T('\r')) // Terminate at the next carriage-return. { *p = _T('\0'); + ConOutChar(_T('\n')); // Output newline as well. break; } } diff --git a/base/shell/cmd/console.h b/base/shell/cmd/console.h index 9ea070dfe6c..4bca3e3a126 100644 --- a/base/shell/cmd/console.h +++ b/base/shell/cmd/console.h @@ -14,7 +14,6 @@ extern CON_PAGER StdOutPager; // extern BOOL bIgnoreEcho; // extern BOOL bExit; -VOID ConInDummy (VOID); VOID ConInDisable (VOID); VOID ConInEnable (VOID); VOID ConInFlush (VOID); diff --git a/base/shell/cmd/date.c b/base/shell/cmd/date.c index 5f509b28f5b..c562638fc87 100644 --- a/base/shell/cmd/date.c +++ b/base/shell/cmd/date.c @@ -44,7 +44,7 @@ static WORD awMonths[2][13] = static VOID -PrintDateString (VOID) +PromptDateString(VOID) { switch (nDateFormat) { @@ -203,8 +203,9 @@ INT cmd_date(LPTSTR param) nDateString = i; } + // TODO: Should prepend a "Current date is: " prompt, as done with TIME. if (nDateString == -1) - ConOutPrintf(_T("%s"), GetDateString()); + ConOutPrintf(_T("%s\n"), GetDateString()); if (!bPrompt) { @@ -216,7 +217,7 @@ INT cmd_date(LPTSTR param) { if (nDateString == -1) { - PrintDateString(); + PromptDateString(); ConInString(szDate, ARRAYSIZE(szDate)); TRACE("\'%s\'\n", debugstr_aw(szDate)); diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index 2005df0a6c5..301cb262409 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -103,9 +103,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nEnter new date (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nEnter new date (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nEnter new date (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Enter new date (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Enter new date (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Enter new date (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Displays or sets the date.\n\n\ DATE [/T][date]\n\n\ /T display only\n\n\ @@ -249,7 +249,7 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - STRING_LOCALE_HELP1 "Current time is" + STRING_TIME_NOW "Current time is: " STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -403,7 +403,7 @@ for a new one. Press ENTER to keep the same time.\n" STRING_TIME_HELP2 "Enter new time: " STRING_TIMER_HELP1 "Elapsed %d msecs\n" STRING_TIMER_HELP2 "Elapsed %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "allow the use of ten stopwatches.\n\n\ + STRING_TIMER_HELP3 "Allow the use of ten stopwatches.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON set stopwatch ON\n\ OFF set stopwatch OFF\n\ @@ -481,23 +481,23 @@ title new title\n" STRING_CMD_ERROR3 "Nelze přesměrovat do souboru %s\n" STRING_CMD_ERROR4 "Spouští se %s...\n" STRING_CMD_ERROR5 "Spouští se cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Chyba stejných barev! (Pozadí a popředí nemohou mít stejnou barvu)" - STRING_COLOR_ERROR2 "Chyba ve specifikaci barvy" + STRING_COLOR_ERROR1 "Chyba stejných barev! (Pozadí a popředí nemohou mít stejnou barvu)\n" + STRING_COLOR_ERROR2 "Chyba ve specifikaci barvy\n" STRING_CONSOLE_ERROR "Neznámá chyba: %d\n" STRING_COPY_ERROR1 "Chyba: Nelze otevřít zdroj - %s!\n" STRING_COPY_ERROR2 "Chyba: Zdroj a cíl jsou shodné!\n" STRING_COPY_ERROR3 "Chyba při zápisu do cíle!\n" STRING_COPY_ERROR4 "Chyba: Není naimplementováno!\n" - STRING_DATE_ERROR "Neplatné datum." + STRING_DATE_ERROR "Neplatné datum.\n" STRING_DEL_ERROR5 "Soubor %s bude vymazán! " STRING_DEL_ERROR6 "Určitě provést (A/N)? " STRING_DEL_ERROR7 "Mazání: %s\n" STRING_ERROR_ERROR1 "Neznámá chyba! Kód: 0x%lx\n" STRING_ERROR_ERROR2 "Chyba syntaxe" - STRING_FOR_ERROR1 "'in' chybí v příkazu 'for'." - STRING_FOR_ERROR2 "nebyly nalezeny závorky." - STRING_FOR_ERROR3 "chybí 'do'." - STRING_FOR_ERROR4 "žádný příkaz po 'do'." + STRING_FOR_ERROR1 "'in' chybí v příkazu 'for'.\n" + STRING_FOR_ERROR2 "nebyly nalezeny závorky.\n" + STRING_FOR_ERROR3 "chybí 'do'.\n" + STRING_FOR_ERROR4 "žádný příkaz po 'do'.\n" STRING_FREE_ERROR1 "Neplatná jednotka" STRING_FREE_ERROR2 "bez popisku" STRING_GOTO_ERROR1 "Pro GOTO nebyl zadán popisek\n" @@ -506,10 +506,10 @@ title new title\n" STRING_MD_ERROR2 "Cesta do nového adresáře neexistuje.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Chyba]\n" - STRING_REN_ERROR1 "MoveFile() selhalo. Chyba: %lu\n" - STRING_TIME_ERROR1 "Neplatný čas." - STRING_TYPE_ERROR1 "Neplatný parametr '/%s'\n" - STRING_WINDOW_ERROR1 "Okno nenalezeno" + STRING_REN_ERROR "MoveFile() selhalo. Chyba: %lu\n" + STRING_TIME_ERROR "Neplatný čas.\n" + STRING_TYPE_ERROR "Neplatný parametr '/%s'\n" + STRING_WINDOW_ERROR "Okno nenalezeno\n" STRING_ERROR_PARAMETERF_ERROR "Formát parametru je nesprávný - %c\n" STRING_ERROR_INVALID_SWITCH "Neplatný přepínač - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Příliš mnoho parametrů - %s\n" @@ -538,9 +538,9 @@ title new title\n" STRING_VERSION_RUNVER "%s [Verze %d.%d.%d] %s" STRING_COPY_FILE " %d souborů(s) zkopírováno\n" STRING_DELETE_WIPE "vymazáno" - STRING_FOR_ERROR "neplatná specifikace proměnné." - STRING_SCREEN_COL "neplatná hodnota pro col" - STRING_SCREEN_ROW "neplatná hodnota pro row" + STRING_FOR_ERROR "neplatná specifikace proměnné.\n" + STRING_SCREEN_COL "neplatná hodnota pro col\n" + STRING_SCREEN_ROW "neplatná hodnota pro row\n" STRING_TIMER_TIME "Časovač %d je %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolický odkaz vytvořen pro %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link vytvořen pro %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index ea323f28c7a..b6a1b9c0d9a 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -105,9 +105,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nGeben Sie das neue Datum ein (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nGeben Sie das neue Datum ein (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nGeben Sie das neue Datum ein (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Geben Sie das neue Datum ein (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Geben Sie das neue Datum ein (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Geben Sie das neue Datum ein (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Ändert das eingestellte Datum oder zeigt es an.\n\n\ DATE [/T][Datum]\n\n\ /T nur Datum anzeigen\n\n\ @@ -243,7 +243,7 @@ Variable1==Variable2\n\ EXIST Dateiname Bedingung ist erfüllt, wenn die angegebene Datei existiert.\n\ DEFINED Variable Bedingung ist erfüllt, wenn die angegebene Datei definiert\n\ wurde." - STRING_LOCALE_HELP1 "Aktuelle Zeit: " + STRING_TIME_NOW "Aktuelle Zeit: " STRING_MKDIR_HELP "Erzeugt ein Verzeichnis.\n\n\ MKDIR [Laufwerk:]Pfad\nMD [Laufwerk:]Pfad" STRING_MKLINK_HELP "Erzeugt eine Dateisystemverknüpfung.\n\n\ @@ -477,23 +477,23 @@ Titel neuer Titel" STRING_CMD_ERROR3 "%s kann nicht in die Datei umgeleitet werden\n" STRING_CMD_ERROR4 "Ausführend %s...\n" STRING_CMD_ERROR5 "Ausführend cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Fehler: Hinter- und Vordergrund können nicht die selben Farben haben!" - STRING_COLOR_ERROR2 "Fehler in der Farbangabe" + STRING_COLOR_ERROR1 "Fehler: Hinter- und Vordergrund können nicht die selben Farben haben!\n" + STRING_COLOR_ERROR2 "Fehler in der Farbangabe\n" STRING_CONSOLE_ERROR "Unbekannter Fehler: %d\n" STRING_COPY_ERROR1 "Fehler: Quelle kann nicht geöffnet werden - %s!\n" STRING_COPY_ERROR2 "Fehler: Kann nicht über sich selbst kopiert werden.\n" STRING_COPY_ERROR3 "Fehler: Schreibziel!\n" STRING_COPY_ERROR4 "Fehler: Noch nicht implementiert!\n" - STRING_DATE_ERROR "Ungültiges Datum." + STRING_DATE_ERROR "Ungültiges Datum.\n" STRING_DEL_ERROR5 "Die Datei %s wird gelöscht! " STRING_DEL_ERROR6 "Sind Sie sicher (J/N)? " STRING_DEL_ERROR7 "Löschen: %s\n" STRING_ERROR_ERROR1 "Unbekannter Fehler! Fehlernummer: 0x%lx\n" STRING_ERROR_ERROR2 "Syntax-Fehler" - STRING_FOR_ERROR1 "'in' fehlt für ein Statement." - STRING_FOR_ERROR2 "Klammern nicht gefunden." - STRING_FOR_ERROR3 "'do' fehlt." - STRING_FOR_ERROR4 "kein Befehl nach 'do'." + STRING_FOR_ERROR1 "'in' fehlt für ein Statement.\n" + STRING_FOR_ERROR2 "Klammern nicht gefunden.\n" + STRING_FOR_ERROR3 "'do' fehlt.\n" + STRING_FOR_ERROR4 "kein Befehl nach 'do'.\n" STRING_FREE_ERROR1 "Ungültiges Laufwerk" STRING_FREE_ERROR2 "keine Bezeichnung" STRING_GOTO_ERROR1 "Keine Sprungmarke für GOTO gesetzt\n" @@ -502,10 +502,10 @@ Titel neuer Titel" STRING_MD_ERROR2 "Der Pfad zum neuen Ordner existiert nicht.\n"//FIXME STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[FEHLER]\n" - STRING_REN_ERROR1 "MoveFile() ist fehlgeschlagen. Fehler: %lu\n" - STRING_TIME_ERROR1 "Ungültige Zeit." - STRING_TYPE_ERROR1 "Ungültige Option '/%s'\n" - STRING_WINDOW_ERROR1 "Fenster nicht gefunden" + STRING_REN_ERROR "MoveFile() ist fehlgeschlagen. Fehler: %lu\n" + STRING_TIME_ERROR "Ungültige Zeit.\n" + STRING_TYPE_ERROR "Ungültige Option '/%s'\n" + STRING_WINDOW_ERROR "Fenster nicht gefunden\n" STRING_ERROR_PARAMETERF_ERROR "Parameterformat ist nicht korrekt - %c\n" STRING_ERROR_INVALID_SWITCH "Ungültiger Parameter - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Zu viele Parameter - %s\n" @@ -534,9 +534,9 @@ Titel neuer Titel" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d Datei(en) kopiert\n" STRING_DELETE_WIPE "sicher gelöscht" - STRING_FOR_ERROR "ungültige Variablenangabe." - STRING_SCREEN_COL "ungültige Spalten-Angabe" - STRING_SCREEN_ROW "ungültige Zeilen-Angabe" + STRING_FOR_ERROR "ungültige Variablenangabe.\n" + STRING_SCREEN_COL "ungültige Spalten-Angabe\n" + STRING_SCREEN_ROW "ungültige Zeilen-Angabe\n" STRING_TIMER_TIME "Timer %d ist %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolische Verknüpfung erstellt für %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hardlink erstellt für %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index a5fbf33c3fc..f5711d1452c 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -103,9 +103,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nΕισάγετε νέα ημερομηνία (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nΕισάγετε νέα ημερομηνία (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nΕισάγετε νέα ημερομηνία (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Εισάγετε νέα ημερομηνία (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Εισάγετε νέα ημερομηνία (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Εισάγετε νέα ημερομηνία (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Εμφάνιση ή αλλαγή της ημερομηνίας.\n\n\ DATE [/T][ημερομηνία]\n\n\ /T εμφάνιση μόνο\n\n\ @@ -248,7 +248,7 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - STRING_LOCALE_HELP1 "Current time is" + STRING_TIME_NOW "Current time is: " STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -402,7 +402,7 @@ for a new one. Press ENTER to keep the same time.\n" STRING_TIME_HELP2 "Εισάγετε νέα ώρα: " STRING_TIMER_HELP1 "Elapsed %d msecs\n" STRING_TIMER_HELP2 "Elapsed %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "allow the use of ten stopwatches.\n\n\ + STRING_TIMER_HELP3 "Allow the use of ten stopwatches.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON set stopwatch ON\n\ OFF set stopwatch OFF\n\ @@ -480,23 +480,23 @@ title new title\n" STRING_CMD_ERROR3 "Can't redirect to file %s\n" STRING_CMD_ERROR4 "Εκτελείται το %s...\n" STRING_CMD_ERROR5 "Running cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)" - STRING_COLOR_ERROR2 "Error in color specification" + STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)\n" + STRING_COLOR_ERROR2 "Error in color specification\n" STRING_CONSOLE_ERROR "Άγνωστο σφάλμα: %d\n" STRING_COPY_ERROR1 "Σφάλμα: Δεν ήταν δυνατό το άνοιγμα της πηγής - %s!\n" STRING_COPY_ERROR2 "Σφάλμα: Can't copy onto itself!\n" STRING_COPY_ERROR3 "Σφάλμα: writing destination!\n" STRING_COPY_ERROR4 "Σφάλμα: Not implemented yet!\n" - STRING_DATE_ERROR "Μη έγκυρη ημερομηνία." + STRING_DATE_ERROR "Μη έγκυρη ημερομηνία.\n" STRING_DEL_ERROR5 "Το αρχείο %s πρόκειται να διαγραφεί! " STRING_DEL_ERROR6 "Είστε σίγουροι (Y/N)? " STRING_DEL_ERROR7 "Γίνεται διαγραφή: %s\n" STRING_ERROR_ERROR1 "Άγνωστο σφάλμα! Κωδικός λάθους: 0x%lx\n" STRING_ERROR_ERROR2 "Σφάλμα σύνταξης" - STRING_FOR_ERROR1 "'in' missing in for statement." - STRING_FOR_ERROR2 "no brackets found." - STRING_FOR_ERROR3 "'do' λείπει." - STRING_FOR_ERROR4 "καμία εντολή μετά το 'do'." + STRING_FOR_ERROR1 "'in' missing in for statement.\n" + STRING_FOR_ERROR2 "no brackets found.\n" + STRING_FOR_ERROR3 "'do' λείπει.\n" + STRING_FOR_ERROR4 "καμία εντολή μετά το 'do'.\n" STRING_FREE_ERROR1 "Μη έγκυρος δίσκος" STRING_FREE_ERROR2 "unlabeled" STRING_GOTO_ERROR1 "No label specified for GOTO\n" @@ -505,10 +505,10 @@ title new title\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Σφάλμα]\n" - STRING_REN_ERROR1 "MoveFile() failed. Error: %lu\n" - STRING_TIME_ERROR1 "Μη έγκυρη ώρα." - STRING_TYPE_ERROR1 "Μη έγκυρη επιλογή '/%s'\n" - STRING_WINDOW_ERROR1 "Το παράθυρο δε βρέθηκε" + STRING_REN_ERROR "MoveFile() failed. Error: %lu\n" + STRING_TIME_ERROR "Μη έγκυρη ώρα.\n" + STRING_TYPE_ERROR "Μη έγκυρη επιλογή '/%s'\n" + STRING_WINDOW_ERROR "Το παράθυρο δε βρέθηκε\n" STRING_ERROR_PARAMETERF_ERROR "Parameter format not correct - %c\n" STRING_ERROR_INVALID_SWITCH "Invalid switch - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Πολλές παράμετροι - %s\n" @@ -537,9 +537,9 @@ title new title\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(s) copied\n" STRING_DELETE_WIPE "wiped" - STRING_FOR_ERROR "bad variable specification." - STRING_SCREEN_COL "invalid value for col" - STRING_SCREEN_ROW "invalid value for row" + STRING_FOR_ERROR "bad variable specification.\n" + STRING_SCREEN_COL "invalid value for col\n" + STRING_SCREEN_ROW "invalid value for row\n" STRING_TIMER_TIME "Timer %d is %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index e530cda2db9..c48c8c6cdd0 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -98,9 +98,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nEnter new date (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nEnter new date (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nEnter new date (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Enter new date (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Enter new date (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Enter new date (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Displays or sets the date.\n\n\ DATE [/T][date]\n\n\ /T display only\n\n\ @@ -244,7 +244,7 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - STRING_LOCALE_HELP1 "Current time is" + STRING_TIME_NOW "Current time is: " STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -398,7 +398,7 @@ for a new one. Press ENTER to keep the same time.\n" STRING_TIME_HELP2 "Enter new time: " STRING_TIMER_HELP1 "Elapsed %d msecs\n" STRING_TIMER_HELP2 "Elapsed %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "allow the use of ten stopwatches.\n\n\ + STRING_TIMER_HELP3 "Allow the use of ten stopwatches.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON set stopwatch ON\n\ OFF set stopwatch OFF\n\ @@ -476,23 +476,23 @@ title new title\n" STRING_CMD_ERROR3 "Can't redirect to file %s\n" STRING_CMD_ERROR4 "Running %s...\n" STRING_CMD_ERROR5 "Running cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)" - STRING_COLOR_ERROR2 "Error in color specification" + STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)\n" + STRING_COLOR_ERROR2 "Error in color specification\n" STRING_CONSOLE_ERROR "Unknown error: %d\n" STRING_COPY_ERROR1 "Error: Cannot open source - %s!\n" STRING_COPY_ERROR2 "Error: Can't copy onto itself!\n" STRING_COPY_ERROR3 "Error writing destination!\n" STRING_COPY_ERROR4 "Error: Not implemented yet!\n" - STRING_DATE_ERROR "Invalid date." + STRING_DATE_ERROR "Invalid date.\n" STRING_DEL_ERROR5 "The file %s will be deleted! " STRING_DEL_ERROR6 "Are you sure (Y/N)? " STRING_DEL_ERROR7 "Deleting: %s\n" STRING_ERROR_ERROR1 "Unknown error! Error code: 0x%lx\n" STRING_ERROR_ERROR2 "Syntax error" - STRING_FOR_ERROR1 "'in' missing in for statement." - STRING_FOR_ERROR2 "no brackets found." - STRING_FOR_ERROR3 "'do' missing." - STRING_FOR_ERROR4 "no command after 'do'." + STRING_FOR_ERROR1 "'in' missing in for statement.\n" + STRING_FOR_ERROR2 "no brackets found.\n" + STRING_FOR_ERROR3 "'do' missing.\n" + STRING_FOR_ERROR4 "no command after 'do'.\n" STRING_FREE_ERROR1 "Invalid drive" STRING_FREE_ERROR2 "unlabeled" STRING_GOTO_ERROR1 "No label specified for GOTO\n" @@ -501,10 +501,10 @@ title new title\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Error]\n" - STRING_REN_ERROR1 "MoveFile() failed. Error: %lu\n" - STRING_TIME_ERROR1 "Invalid time." - STRING_TYPE_ERROR1 "Invalid option '/%s'\n" - STRING_WINDOW_ERROR1 "Window not found" + STRING_REN_ERROR "MoveFile() failed. Error: %lu\n" + STRING_TIME_ERROR "Invalid time.\n" + STRING_TYPE_ERROR "Invalid option '/%s'\n" + STRING_WINDOW_ERROR "Window not found\n" STRING_ERROR_PARAMETERF_ERROR "Parameter format not correct - %c\n" STRING_ERROR_INVALID_SWITCH "Invalid switch - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Too many parameters - %s\n" @@ -533,9 +533,9 @@ title new title\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(s) copied\n" STRING_DELETE_WIPE "wiped" - STRING_FOR_ERROR "bad variable specification." - STRING_SCREEN_COL "invalid value for col" - STRING_SCREEN_ROW "invalid value for row" + STRING_FOR_ERROR "bad variable specification.\n" + STRING_SCREEN_COL "invalid value for col\n" + STRING_SCREEN_ROW "invalid value for row\n" STRING_TIMER_TIME "Timer %d is %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index 8d10735703d..690cbdf270b 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -101,9 +101,9 @@ CTTY device\n\n\ CON normalmente es el dispositivo estándar de E/S predeterminado.\n\n\ Para devolver el control a la consola estándar, escriba: CTTY CON en el\n\ dispositivo auxiliar." - STRING_DATE_HELP1 "\nIntroduce la nueva fecha (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nIntroduce la nueva fecha (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nIntroduce la nueva fecha (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Introduce la nueva fecha (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Introduce la nueva fecha (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Introduce la nueva fecha (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Muestra o cambia la fecha.\n\n\ DATE [/T][date]\n\n\ /T Sólo la muestra\n\n\ @@ -247,7 +247,7 @@ comando Especifica el comando a ejecutar si se cumple la condición.\n string1==string2 Especifica una condición verdadera si las cadenas de texto coinciden.\n\ EXIST archivo Especifica una condición verdadera si existe el archivo especificado.\n\ DEFINED variable Especifica una condición verdadera si la variable está definida.\n" - STRING_LOCALE_HELP1 "La hora actual es" + STRING_TIME_NOW "La hora actual es: " STRING_MKDIR_HELP "Crea un directorio.\n\n\ MKDIR [unidad:]ruta\nMD [unidad:]ruta" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -484,23 +484,23 @@ title Nuevo título\n" STRING_CMD_ERROR3 "No se puede redirigir el archivo %s\n" STRING_CMD_ERROR4 "Ejecutando %s...\n" STRING_CMD_ERROR5 "Ejecutando cmdexit.bat...\n" - STRING_COLOR_ERROR1 "¡Mismos colores! (El color de frente y de fondo no pueden ser el mismo)" - STRING_COLOR_ERROR2 "Error en la especificación del color" + STRING_COLOR_ERROR1 "¡Mismos colores! (El color de frente y de fondo no pueden ser el mismo)\n" + STRING_COLOR_ERROR2 "Error en la especificación del color\n" STRING_CONSOLE_ERROR "Error desconocido: %d\n" STRING_COPY_ERROR1 "Error: No se puede abrir el origen - %s!\n" STRING_COPY_ERROR2 "Error: ¡No se puede copiar sobre si mismo!\n" STRING_COPY_ERROR3 "¡Error escribiendo destino!\n" STRING_COPY_ERROR4 "Error: ¡No implementado aún!\n" - STRING_DATE_ERROR "Fecha incorrecta." + STRING_DATE_ERROR "Fecha incorrecta.\n" STRING_DEL_ERROR5 "¡El archivo %s va a ser borrado!" STRING_DEL_ERROR6 "¿Estás seguro (S/N)? " STRING_DEL_ERROR7 "Borrando: %s\n" STRING_ERROR_ERROR1 "¡Error desconocido! Códige de error: 0x%lx\n" STRING_ERROR_ERROR2 "Error de sintaxsis" - STRING_FOR_ERROR1 "Falta 'in' para la declaración." - STRING_FOR_ERROR2 "No se encontraron las parénteris." - STRING_FOR_ERROR3 "Falta 'do'." - STRING_FOR_ERROR4 "No hay comando después de 'do'." + STRING_FOR_ERROR1 "Falta 'in' para la declaración.\n" + STRING_FOR_ERROR2 "No se encontraron las parénteris.\n" + STRING_FOR_ERROR3 "Falta 'do'.\n" + STRING_FOR_ERROR4 "No hay comando después de 'do'.\n" STRING_FREE_ERROR1 "Unidad errónea." STRING_FREE_ERROR2 "Sin etiqueta" STRING_GOTO_ERROR1 "No se especifico etiqueta para GOTO\n" @@ -509,10 +509,10 @@ title Nuevo título\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" STRING_MOVE_ERROR1 "[Correcto]\n" STRING_MOVE_ERROR2 "[Error]\n" - STRING_REN_ERROR1 "MoveFile() falló. Error: %lu\n" - STRING_TIME_ERROR1 "Hora incorrecta." - STRING_TYPE_ERROR1 "Opción incorrecta '/%s'\n" - STRING_WINDOW_ERROR1 "Ventana no encontrada" + STRING_REN_ERROR "MoveFile() falló. Error: %lu\n" + STRING_TIME_ERROR "Hora incorrecta.\n" + STRING_TYPE_ERROR "Opción incorrecta '/%s'\n" + STRING_WINDOW_ERROR "Ventana no encontrada\n" STRING_ERROR_PARAMETERF_ERROR "Formato del parámetro incorrecto - %c\n" STRING_ERROR_INVALID_SWITCH "Parámetro incorrecto - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Demasiados parámetros - %s\n" @@ -541,9 +541,9 @@ title Nuevo título\n" STRING_VERSION_RUNVER "%s [Versión %d.%d.%d] %s" STRING_COPY_FILE " %d archivo(s) copiado(s)\n" STRING_DELETE_WIPE "Borrado" - STRING_FOR_ERROR "Se ha especificado una variable errónea." - STRING_SCREEN_COL "Valor de columna no válido" - STRING_SCREEN_ROW "Valor de fila no válido" + STRING_FOR_ERROR "Se ha especificado una variable errónea.\n" + STRING_SCREEN_COL "Valor de columna no válido\n" + STRING_SCREEN_ROW "Valor de fila no válido\n" STRING_TIMER_TIME "El temporizador %d es %s: " STRING_MKLINK_CREATED_SYMBOLIC "Enlace simbólico creado para %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Enlace duro creado para %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index a87e276a888..7968f9ba700 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -105,9 +105,9 @@ CTTY périph\n\n\ CON est habituellement le périphérique d'I/O standard par défaut.\n\n\ Pour restaurer le contrôle vers la console standard, entrez: CTTY CON sur\n\ le périphérique auxiliaire." - STRING_DATE_HELP1 "\nEntrer la nouvelle date (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nEntrer la nouvelle date (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nEntrer la nouvelle date (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Entrer la nouvelle date (mm%cdd%cyyyy) : " + STRING_DATE_HELP2 "Entrer la nouvelle date (dd%cmm%cyyyy) : " + STRING_DATE_HELP3 "Entrer la nouvelle date (yyyy%cmm%cdd) : " STRING_DATE_HELP4 "Affiche ou règle la date.\n\n\ DATE [/T][date]\n\n\ /T affiche seulement\n\n\ @@ -258,7 +258,7 @@ commande Indique la commande à lancer si la condition est vérifiée.\ chaine1==chaine2 La condition sera vraie si les deux chaines sont identiques.\n\ EXIST nomfichier La condition sera vraie si le fichier spécifié existe.\n\ DEFINED variable La condition sera vraie si la variable indiquée est définie." - STRING_LOCALE_HELP1 "L'heure actuelle est " + STRING_TIME_NOW "L'heure actuelle est : " STRING_MKDIR_HELP "Crée un répertoire.\n\n\ MKDIR [lecteur:]chemin\nMD [lecteur:]chemin" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -492,23 +492,23 @@ titre titre de la fenêtre" STRING_CMD_ERROR3 "Ne peut rediriger vers le fichier %s\n" STRING_CMD_ERROR4 "Lance %s...\n" STRING_CMD_ERROR5 "Lance cmdexit.bat...\n" - STRING_COLOR_ERROR1 "L'arrière plan et l'avant plan ne peuvent être de la même couleur" - STRING_COLOR_ERROR2 "Erreur dans la spécification des couleurs" + STRING_COLOR_ERROR1 "L'arrière plan et l'avant plan ne peuvent être de la même couleur\n" + STRING_COLOR_ERROR2 "Erreur dans la spécification des couleurs\n" STRING_CONSOLE_ERROR "Erreur inconnue : %d\n" STRING_COPY_ERROR1 "Erreur : Ne peut ouvrir la source - %s !\n" STRING_COPY_ERROR2 "Erreur : Ne peut copier le fichier sur lui-même !\n" STRING_COPY_ERROR3 "Erreur à l'écriture de la destination !\n" STRING_COPY_ERROR4 "Erreur : Non implémenté actuellement !\n" - STRING_DATE_ERROR "Date invalide." + STRING_DATE_ERROR "Date invalide.\n" STRING_DEL_ERROR5 "Le fichier %s va être effacé ! " STRING_DEL_ERROR6 "Etes vous sûr (O/N) ? " STRING_DEL_ERROR7 "Efface : %s\n" STRING_ERROR_ERROR1 "Erreur inconnue! Code d'erreur : 0x%lx\n" STRING_ERROR_ERROR2 "Erreur de syntaxe" - STRING_FOR_ERROR1 "'in' manquant." - STRING_FOR_ERROR2 "pas de parenthèse trouvée." - STRING_FOR_ERROR3 "'do' manquant." - STRING_FOR_ERROR4 "pas de commande après 'do'." + STRING_FOR_ERROR1 "'in' manquant.\n" + STRING_FOR_ERROR2 "pas de parenthèse trouvée.\n" + STRING_FOR_ERROR3 "'do' manquant.\n" + STRING_FOR_ERROR4 "pas de commande après 'do'.\n" STRING_FREE_ERROR1 "Lecteur invalide" STRING_FREE_ERROR2 "sans nom" STRING_GOTO_ERROR1 "Pas de label indiqué pour GOTO\n" @@ -517,10 +517,10 @@ titre titre de la fenêtre" STRING_MD_ERROR2 "Le chemin vers le nouveau répertoire n'existe pas.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Erreur]\n" - STRING_REN_ERROR1 "MoveFile() a échoué. Erreur : %lu\n" - STRING_TIME_ERROR1 "Heure invalide." - STRING_TYPE_ERROR1 "Option invalide '/%s'\n" - STRING_WINDOW_ERROR1 "Fenêtre introuvable" + STRING_REN_ERROR "MoveFile() a échoué. Erreur : %lu\n" + STRING_TIME_ERROR "Heure invalide.\n" + STRING_TYPE_ERROR "Option invalide '/%s'\n" + STRING_WINDOW_ERROR "Fenêtre introuvable\n" STRING_ERROR_PARAMETERF_ERROR "Format du paramètre incorrect - %c\n" STRING_ERROR_INVALID_SWITCH "Paramètre invalide - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Trop de paramètres - %s\n" @@ -549,9 +549,9 @@ titre titre de la fenêtre" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d fichier(s) copié(s)\n" STRING_DELETE_WIPE "effacé(s)" - STRING_FOR_ERROR "mauvaise variable spécifiée." - STRING_SCREEN_COL "valeur invalide pour col" - STRING_SCREEN_ROW "valeur invalide pour lig" + STRING_FOR_ERROR "mauvaise variable spécifiée.\n" + STRING_SCREEN_COL "valeur invalide pour col\n" + STRING_SCREEN_ROW "valeur invalide pour lig\n" STRING_TIMER_TIME "Le timer n°%d est %s : " STRING_MKLINK_CREATED_SYMBOLIC "Lien symbolique créé pour %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Lien réel créé pour %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc index 9e62549b518..2994170e092 100644 --- a/base/shell/cmd/lang/hu-HU.rc +++ b/base/shell/cmd/lang/hu-HU.rc @@ -97,9 +97,9 @@ CTTY device\n\n\ AUX, COMx (x=1..N), CON, LPTx (x=1..N), PRN, NUL.\n\ A CON általában az alapértelmezett standard I/O eszköz.\n\n\ A vezérlés visszavételéhez gépelje be a távoli terminálon ezt: CTTY CON" - STRING_DATE_HELP1 "\nÚj dátum (hh%cnn%céééé): " - STRING_DATE_HELP2 "\nÚj dátum (nn%chh%céééé): " - STRING_DATE_HELP3 "\nÚj dátum (éééé%chh%cnn): " + STRING_DATE_HELP1 "Új dátum (hh%cnn%céééé): " + STRING_DATE_HELP2 "Új dátum (nn%chh%céééé): " + STRING_DATE_HELP3 "Új dátum (éééé%chh%cnn): " STRING_DATE_HELP4 "Megjeleníti vagy beállítja a rendszerdátumot.\n\n\ DATE [/T][dátum]\n\n\ /T Csak megjeleníti\n\n\ @@ -239,7 +239,7 @@ parancs Ezt a parancsot hajtsa végre, ha igaz a feltétel.\n\ string1==string2 Igaz a feltétel, ha a megadott sztringek egyenlőek.\n\ EXIST fájlnév Igaz a feltétel, ha a megadott fájl létezik.\n\ DEFINED változó Igaz a feltétel, ha a megadott változó definiálva van.\n" - STRING_LOCALE_HELP1 "Az aktuális idő" + STRING_TIME_NOW "Az aktuális idő: " STRING_MKDIR_HELP "Létrehoz egy új mappát.\n\n\ MKDIR [meghajtó:]útvonal\nMD [meghajtó:]útvonal" STRING_MKLINK_HELP "Létrehoz egy fájlrendszer-hivatkozást.\n\n\ @@ -468,23 +468,23 @@ title új cím\n" STRING_CMD_ERROR3 "Nem lehet a(z) %s állományba átirányítani\n" STRING_CMD_ERROR4 "%s futtatása...\n" STRING_CMD_ERROR5 "cmdexit.bat futtatása...\n" - STRING_COLOR_ERROR1 "Ugyanaz a szín nem lehet! (Az elő- és háttérszín nem lehet ugyanolyan)" - STRING_COLOR_ERROR2 "Hibás szín megadás" + STRING_COLOR_ERROR1 "Ugyanaz a szín nem lehet! (Az elő- és háttérszín nem lehet ugyanolyan)\n" + STRING_COLOR_ERROR2 "Hibás szín megadás\n" STRING_CONSOLE_ERROR "Ismeretlen hiba: %d\n" STRING_COPY_ERROR1 "Hiba: a forrás nem nyitható meg - %s!\n" STRING_COPY_ERROR2 "Hiba: nem másolhatja önmagára az állományt!\n" STRING_COPY_ERROR3 "Hiba a cél írása közben!\n" STRING_COPY_ERROR4 "Hiba: ez még nem működik!\n" - STRING_DATE_ERROR "Érvénytelen dátum." + STRING_DATE_ERROR "Érvénytelen dátum.\n" STRING_DEL_ERROR5 "A(z) %s állomány törölve lesz! " STRING_DEL_ERROR6 "Biztos benne (I/N)? " STRING_DEL_ERROR7 "Törlés: %s\n" STRING_ERROR_ERROR1 "Ismeretlen hiba! Hiba kód: 0x%lx\n" STRING_ERROR_ERROR2 "Szintaxis hiba" - STRING_FOR_ERROR1 "az 'in' hiányzik a FOR parancsból." - STRING_FOR_ERROR2 "nincs zárójel megadva." - STRING_FOR_ERROR3 "a 'do' hiányzik." - STRING_FOR_ERROR4 "nincs parancs a 'do' után." + STRING_FOR_ERROR1 "az 'in' hiányzik a FOR parancsból.\n" + STRING_FOR_ERROR2 "nincs zárójel megadva.\n" + STRING_FOR_ERROR3 "a 'do' hiányzik.\n" + STRING_FOR_ERROR4 "nincs parancs a 'do' után.\n" STRING_FREE_ERROR1 "Érvénytelen meghajtó" STRING_FREE_ERROR2 "nincs címkézve" STRING_GOTO_ERROR1 "Nem lett címke megadva a GOTO után\n" @@ -493,10 +493,10 @@ title új cím\n" STRING_MD_ERROR2 "Az útvonal az új mappához nem létezik.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[HIBA]\n" - STRING_REN_ERROR1 "MoveFile() sikertelen. Hiba: %lu\n" - STRING_TIME_ERROR1 "Érvénytelen idő." - STRING_TYPE_ERROR1 "Érvénytelen opció '/%s'\n" - STRING_WINDOW_ERROR1 "Az ablak nem található" + STRING_REN_ERROR "MoveFile() sikertelen. Hiba: %lu\n" + STRING_TIME_ERROR "Érvénytelen idő.\n" + STRING_TYPE_ERROR "Érvénytelen opció '/%s'\n" + STRING_WINDOW_ERROR "Az ablak nem található\n" STRING_ERROR_PARAMETERF_ERROR "A paraméter megadás hibás - %c\n" STRING_ERROR_INVALID_SWITCH "Érvénytelen kapcsoló - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Túl sok paraméter - %s\n" @@ -525,9 +525,9 @@ title új cím\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d állomány másolva\n" STRING_DELETE_WIPE "biztonságosan törölve" - STRING_FOR_ERROR "Hibás változó megadás." - STRING_SCREEN_COL "Érvénytelen érték oszlopnak" - STRING_SCREEN_ROW "Érvénytelen érték sornak" + STRING_FOR_ERROR "Hibás változó megadás.\n" + STRING_SCREEN_COL "Érvénytelen érték oszlopnak\n" + STRING_SCREEN_ROW "Érvénytelen érték sornak\n" STRING_TIMER_TIME "Stopper %d állapota %s: " STRING_MKLINK_CREATED_SYMBOLIC "Szimbolikus link létrehozva ehhez: %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link létrehozva ehhez: %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index 2d129e3fadd..6f40cb787ab 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -100,9 +100,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nMasukkan tanggal baru (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nMasukkan tanggal baru (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nMasukkan tanggal baru (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Masukkan tanggal baru (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Masukkan tanggal baru (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Masukkan tanggal baru (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Menampilkan atau menyetel tanggal.\n\n\ DATE [/T][date]\n\n\ /T hanya menampilkan\n\n\ @@ -245,7 +245,7 @@ string1==string2 Menetapkan kondisi benar jika string teks yang ditetapkan\n\ sama.\n\ EXIST filename Menetapkan kondisi benar jika nama file ada.\n\ DEFINED variable Menetapkan kondisi benar jika variabel didefinisikan.\n" - STRING_LOCALE_HELP1 "Waktu saat ini" + STRING_TIME_NOW "Waktu saat ini: " STRING_MKDIR_HELP "Membuat direktori.\n\n\ MKDIR [drive:]path\nMD [drive:]path" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -399,7 +399,7 @@ meminta yang baru. Tekan ENTER untuk membiarkan jam tetap sama.\n" STRING_TIME_HELP2 "Masukkan jam baru: " STRING_TIMER_HELP1 "Berlalu %d mdetik\n" STRING_TIMER_HELP2 "Berlalu %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "mengijinkan penggunaan sepuluh stopwatch.\n\n\ + STRING_TIMER_HELP3 "Mengijinkan penggunaan sepuluh stopwatch.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON menyetel stopwatch ON\n\ OFF menyetel stopwatch OFF\n\ @@ -475,23 +475,23 @@ title judul baru\n" STRING_CMD_ERROR3 "Tidak bisa mengalihkan ke file %s\n" STRING_CMD_ERROR4 "Menjalankan %s...\n" STRING_CMD_ERROR5 "Menjalankan cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Warna sama salah! (Latar belakang dan latar depan tidak bisa berwarna sama)" - STRING_COLOR_ERROR2 "Kesalahan dalam spesifikasi warna" + STRING_COLOR_ERROR1 "Warna sama salah! (Latar belakang dan latar depan tidak bisa berwarna sama)\n" + STRING_COLOR_ERROR2 "Kesalahan dalam spesifikasi warna\n" STRING_CONSOLE_ERROR "Kesalahan tidak dikenal: %d\n" STRING_COPY_ERROR1 "Salah: Tidak dapat membuka sumber - %s!\n" STRING_COPY_ERROR2 "Salah: Tidak dapat mengcopy ke dirinya sendiri!\n" STRING_COPY_ERROR3 "Kesalahan menulis tujuan!\n" STRING_COPY_ERROR4 "Salah: Belum diimplementasikan!\n" - STRING_DATE_ERROR "Tanggal tidak benar." + STRING_DATE_ERROR "Tanggal tidak benar.\n" STRING_DEL_ERROR5 "File %s akan dihapus! " STRING_DEL_ERROR6 "Anda yakin (Y/N)? " STRING_DEL_ERROR7 "Menghapus: %s\n" STRING_ERROR_ERROR1 "Kesalahan tidak dikenal! Kode kesalahan: 0x%lx\n" STRING_ERROR_ERROR2 "Sintaks salah" - STRING_FOR_ERROR1 "'in' kurang dalam pernyataan for." - STRING_FOR_ERROR2 "tidak ada kurung ditemukan." - STRING_FOR_ERROR3 "'do' hilang." - STRING_FOR_ERROR4 "tidak ada perintah setelah 'do'." + STRING_FOR_ERROR1 "'in' kurang dalam pernyataan for.\n" + STRING_FOR_ERROR2 "tidak ada kurung ditemukan.\n" + STRING_FOR_ERROR3 "'do' hilang.\n" + STRING_FOR_ERROR4 "tidak ada perintah setelah 'do'.\n" STRING_FREE_ERROR1 "Drive tidak benar" STRING_FREE_ERROR2 "tak berlabel" STRING_GOTO_ERROR1 "Tidak ada label ditetapkan untuk GOTO\n" @@ -500,10 +500,10 @@ title judul baru\n" STRING_MD_ERROR2 "Path ke folder baru tidak ada.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Salah]\n" - STRING_REN_ERROR1 "MoveFile() gagal. Kesalahan: %lu\n" - STRING_TIME_ERROR1 "Jam tidak benar." - STRING_TYPE_ERROR1 "Opsi tidak benar '/%s'\n" - STRING_WINDOW_ERROR1 "Jendela tidak ditemukan" + STRING_REN_ERROR "MoveFile() gagal. Kesalahan: %lu\n" + STRING_TIME_ERROR "Jam tidak benar.\n" + STRING_TYPE_ERROR "Opsi tidak benar '/%s'\n" + STRING_WINDOW_ERROR "Jendela tidak ditemukan\n" STRING_ERROR_PARAMETERF_ERROR "Format parameter tidak benar - %c\n" STRING_ERROR_INVALID_SWITCH "Saklar tidak benar - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Terlalu banyak parameter - %s\n" @@ -532,9 +532,9 @@ title judul baru\n" STRING_VERSION_RUNVER "%s [Versi %d.%d.%d] %s" STRING_COPY_FILE " %d file di-copy\n" STRING_DELETE_WIPE "dihapus" - STRING_FOR_ERROR "spesifikasi variabel tidak baik." - STRING_SCREEN_COL "Nilai untuk kolom tidak benar" - STRING_SCREEN_ROW "Nilai untuk baris tidak benar" + STRING_FOR_ERROR "spesifikasi variabel tidak baik.\n" + STRING_SCREEN_COL "Nilai untuk kolom tidak benar\n" + STRING_SCREEN_ROW "Nilai untuk baris tidak benar\n" STRING_TIMER_TIME "Timer %d adalah %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc index e39c246abe6..a87f920652f 100644 --- a/base/shell/cmd/lang/it-IT.rc +++ b/base/shell/cmd/lang/it-IT.rc @@ -98,9 +98,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nScrivi la nuova data (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nScrivi la nuova data (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nnScrivi la nuova data (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Scrivi la nuova data (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Scrivi la nuova data (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Scrivi la nuova data (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Visualizza o imposta la nuova data.\n\n\ DATE [/T][data]\n\n\ /T Visualizzazione\n\n\ @@ -245,7 +245,7 @@ command E' il comando da eseguire se la condizione è verificata.\n\ string1==string2 E' verificata se sono uguali le due stringhe\n\ EXIST nomefile E' verificata se il file esiste.\n\ DEFINED variabile E' verificata se la variabile è definita.\n" - STRING_LOCALE_HELP1 "L'ora attuale è" + STRING_TIME_NOW "L'ora attuale è: " STRING_MKDIR_HELP "Crea una cartella.\n\n\ MKDIR [disco:]percorso\nMD [disco:]percorso" STRING_MKLINK_HELP "Crea un oggetto di collegamento nel filesystem.\n\n\ @@ -405,7 +405,7 @@ quella nuova. Premere INVIO per non modificarla.\n" STRING_TIME_HELP2 "Inserisci la nuova ora: " STRING_TIMER_HELP1 "Sono trascorsi %d millisecondi\n" STRING_TIMER_HELP2 "Sono trascorsi %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "permette l'uso di dieci cronometri.\n\n\ + STRING_TIMER_HELP3 "Permette l'uso di dieci cronometri.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON attiva il cronometro\n\ OFF ferma il cronometro\n\ @@ -485,23 +485,23 @@ titolo il nuovo titolo\n" STRING_CMD_ERROR3 "Impossibile ridirigere nel file %s\n" STRING_CMD_ERROR4 "Esecuzione di %s...\n" STRING_CMD_ERROR5 "Esecuzione di cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Il colore di primo piano e sfondo non possono essere uguali" - STRING_COLOR_ERROR2 "Errore nella indicazione dei colori" + STRING_COLOR_ERROR1 "Il colore di primo piano e sfondo non possono essere uguali\n" + STRING_COLOR_ERROR2 "Errore nella indicazione dei colori\n" STRING_CONSOLE_ERROR "Errore sconosciuto: %d\n" STRING_COPY_ERROR1 "Errore: Impossibile aprire il file sorgente - %s!\n" STRING_COPY_ERROR2 "Errore: Impossibile copiare un file su se stesso!\n" STRING_COPY_ERROR3 "Errore durante la scrittura della destinazione!\n" STRING_COPY_ERROR4 "Errore: Non ancora implementato!\n" - STRING_DATE_ERROR "Data non valida." + STRING_DATE_ERROR "Data non valida.\n" STRING_DEL_ERROR5 "Il file %s sarà cancellato! " STRING_DEL_ERROR6 "Sei sicuro (S/N)? " STRING_DEL_ERROR7 "Cancellazione di: %s\n" STRING_ERROR_ERROR1 "Errore sconosciuto! Codice errore: 0x%lx\n" STRING_ERROR_ERROR2 "Errore di sintassi" - STRING_FOR_ERROR1 "'in' mancante nella istruzione for." - STRING_FOR_ERROR2 "Parentesi mancanti." - STRING_FOR_ERROR3 "'do' mancante." - STRING_FOR_ERROR4 "nessuno comando dopo 'do'." + STRING_FOR_ERROR1 "'in' mancante nella istruzione for.\n" + STRING_FOR_ERROR2 "Parentesi mancanti.\n" + STRING_FOR_ERROR3 "'do' mancante.\n" + STRING_FOR_ERROR4 "nessuno comando dopo 'do'.\n" STRING_FREE_ERROR1 "Disco non valido" STRING_FREE_ERROR2 "non etichettato" STRING_GOTO_ERROR1 "Nessuna etichetta indicata per GOTO\n" @@ -510,10 +510,10 @@ titolo il nuovo titolo\n" STRING_MD_ERROR2 "Il percorso della nuova cartella non esiste.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Errore]\n" - STRING_REN_ERROR1 "MoveFile() fallita. Errore: %lu\n" - STRING_TIME_ERROR1 "Ora non valida." - STRING_TYPE_ERROR1 "Opzione '/%s' non valida\n" - STRING_WINDOW_ERROR1 "Finestra non trovata" + STRING_REN_ERROR "MoveFile() fallita. Errore: %lu\n" + STRING_TIME_ERROR "Ora non valida.\n" + STRING_TYPE_ERROR "Opzione '/%s' non valida\n" + STRING_WINDOW_ERROR "Finestra non trovata\n" STRING_ERROR_PARAMETERF_ERROR "Formato del parametro errato - %c\n" STRING_ERROR_INVALID_SWITCH "Selezione non valida - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Troppi parametri - %s\n" @@ -542,9 +542,9 @@ titolo il nuovo titolo\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file copiati\n" STRING_DELETE_WIPE "resi illeggibili" - STRING_FOR_ERROR "variabile non valida." - STRING_SCREEN_COL "valore non valido per colonna" - STRING_SCREEN_ROW "valore non valido per riga" + STRING_FOR_ERROR "variabile non valida.\n" + STRING_SCREEN_COL "valore non valido per colonna\n" + STRING_SCREEN_ROW "valore non valido per riga\n" STRING_TIMER_TIME "Timer %d è %s: " STRING_MKLINK_CREATED_SYMBOLIC "Link simbolico creato per %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link creato per %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc index aa32b46c436..e6fc6fa6fe0 100644 --- a/base/shell/cmd/lang/ja-JP.rc +++ b/base/shell/cmd/lang/ja-JP.rc @@ -100,9 +100,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\n新しい日付を入力してください (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\n新しい日付を入力してください (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\n新しい日付を入力してください (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "新しい日付を入力してください (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "新しい日付を入力してください (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "新しい日付を入力してください (yyyy%cmm%cdd): " STRING_DATE_HELP4 "日付を表示または設定します。\n\n\ DATE [/T][日付]\n\n\ /T 日付の表示のみ行います。\n\n\ @@ -251,7 +251,7 @@ EXIST ファイル名指定したファイル名が存在するときに条件指定します。\n\ DEFINED 変数指定した変数が定義されているときに条件が真になるように\n\ 指定します。\n" - STRING_LOCALE_HELP1 "現在時刻は" + STRING_TIME_NOW "現在時刻は: " STRING_MKDIR_HELP "ディレクトリを作成します。\n\n\ MKDIR [ドライブ:]パス\n\ MD [ドライブ:]パス" @@ -483,23 +483,23 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_CMD_ERROR3 "ファイル %s へとリダイレクトできません。\n" STRING_CMD_ERROR4 "%s を実行しています...\n" STRING_CMD_ERROR5 "cmdexit.bat を実行しています...\n" - STRING_COLOR_ERROR1 "エラー! 同じ色が指定されました。\n (前景色と背景色を同じ色にすることはできません)" - STRING_COLOR_ERROR2 "色の指定に問題があります。" + STRING_COLOR_ERROR1 "エラー! 同じ色が指定されました。\n (前景色と背景色を同じ色にすることはできません)\n" + STRING_COLOR_ERROR2 "色の指定に問題があります。\n" STRING_CONSOLE_ERROR "不明なエラー: %d\n" STRING_COPY_ERROR1 "エラー: 元のファイル %s を開けません!\n" STRING_COPY_ERROR2 "エラー: コピー元とコピー先が一緒です!\n" STRING_COPY_ERROR3 "指定先への書き込みでエラーが発生しました!\n" STRING_COPY_ERROR4 "エラー: まだ実装されていません!\n" - STRING_DATE_ERROR "無効な日付です。" + STRING_DATE_ERROR "無効な日付です。\n" STRING_DEL_ERROR5 "ファイル %s は削除されます! " STRING_DEL_ERROR6 "よろしいですか (Y/N)? " STRING_DEL_ERROR7 "削除しています: %s\n" STRING_ERROR_ERROR1 "不明なエラーです! エラーコード: 0x%lx\n" STRING_ERROR_ERROR2 "構文エラー" - STRING_FOR_ERROR1 "命令文中に 'in' が不足しています。" - STRING_FOR_ERROR2 "括弧が見つかりません。" - STRING_FOR_ERROR3 "'do' が不足しています。" - STRING_FOR_ERROR4 "'do' の後にコマンドがありません。" + STRING_FOR_ERROR1 "命令文中に 'in' が不足しています。\n" + STRING_FOR_ERROR2 "括弧が見つかりません。\n" + STRING_FOR_ERROR3 "'do' が不足しています。\n" + STRING_FOR_ERROR4 "'do' の後にコマンドがありません。\n" STRING_FREE_ERROR1 "無効なドライブです。" STRING_FREE_ERROR2 "ラベルがありません。" STRING_GOTO_ERROR1 "GOTO にラベルが指定されていません。\n" @@ -508,10 +508,10 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_MD_ERROR2 "新しいフォルダへのパスが存在していません。\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[エラー]\n" - STRING_REN_ERROR1 "MoveFile() failed. エラー: %lu\n" - STRING_TIME_ERROR1 "無効な時刻です。" - STRING_TYPE_ERROR1 "'/%s' は無効なオプションです\n" - STRING_WINDOW_ERROR1 "ウィンドウが見つかりません。" + STRING_REN_ERROR "MoveFile() failed. エラー: %lu\n" + STRING_TIME_ERROR "無効な時刻です。\n" + STRING_TYPE_ERROR "'/%s' は無効なオプションです\n" + STRING_WINDOW_ERROR "ウィンドウが見つかりません。\n" STRING_ERROR_PARAMETERF_ERROR "パラメータの書式が間違っています。 - %c\n" STRING_ERROR_INVALID_SWITCH "無効なスイッチです。 - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "パラメータが多すぎます。 - %s\n" @@ -540,9 +540,9 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d 個のファイルがコピーされました\n" STRING_DELETE_WIPE "完全に消去されました。" - STRING_FOR_ERROR "無効な変数が指定されました。" - STRING_SCREEN_COL "行の値が無効です。" - STRING_SCREEN_ROW "列の値が無効です。" + STRING_FOR_ERROR "無効な変数が指定されました。\n" + STRING_SCREEN_COL "行の値が無効です。\n" + STRING_SCREEN_ROW "列の値が無効です。\n" STRING_TIMER_TIME "タイマー %d は %s です。: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc index 9f7183151c1..43513601503 100644 --- a/base/shell/cmd/lang/no-NO.rc +++ b/base/shell/cmd/lang/no-NO.rc @@ -98,9 +98,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nSkriv inn ny dato (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nSkriv inn ny dato (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nSkriv inn ny dato (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Skriv inn ny dato (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Skriv inn ny dato (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Skriv inn ny dato (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Vis eller endre datoen.\n\n\ DATO [/T][dato]\n\n\ /T Vis bare\n\n\ @@ -243,7 +243,7 @@ streng1==streng2 Angir et oppfylt vilkår hvis tekststrengene er like\n\ EXIST filnavn Angir et oppfylt vilkår hvis spesifisert filnavn eksisterer.\n\ DEFINED variabel Angir et oppfylt vilkår hvis spesifisert variabel er\n\ definert.\n" - STRING_LOCALE_HELP1 "gjeldende tid er" + STRING_TIME_NOW "Gjeldende tid er: " STRING_MKDIR_HELP "Oppretter en mappe.\n\n\ MKDIR [stasjon:]mappe\nMD [stasjon:]mappe" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -474,23 +474,23 @@ tittel ny tittel\n" STRING_CMD_ERROR3 "Kan ikke videreføre til fil %s\n" STRING_CMD_ERROR4 "Kjører %s...\n" STRING_CMD_ERROR5 "Kjører cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Samme farge feil! (Bakgrunn og forgrunn kan ikke ha samme farge)" - STRING_COLOR_ERROR2 "Feil i farge spesifikasjon" + STRING_COLOR_ERROR1 "Samme farge feil! (Bakgrunn og forgrunn kan ikke ha samme farge)\n" + STRING_COLOR_ERROR2 "Feil i farge spesifikasjon\n" STRING_CONSOLE_ERROR "Ukjent feil: %d\n" STRING_COPY_ERROR1 "Feil: kan ikke åpne kilden - %s!\n" STRING_COPY_ERROR2 "Feil: kan ikke kopiere til seg selv!\n" STRING_COPY_ERROR3 "Feil ved skriving til destinasjon!\n" STRING_COPY_ERROR4 "Feil: Ikke implementert enda!\n" - STRING_DATE_ERROR "Ugyldig dato." + STRING_DATE_ERROR "Ugyldig dato.\n" STRING_DEL_ERROR5 "Filen %s vil bli slettet! " STRING_DEL_ERROR6 "Er du sikker (J/N)? " STRING_DEL_ERROR7 "Sletter: %s\n" STRING_ERROR_ERROR1 "Ukjent feil! Feilkode: 0x%lx\n" STRING_ERROR_ERROR2 "Syntaks feil" - STRING_FOR_ERROR1 "'in' tapt i FOR kommando." - STRING_FOR_ERROR2 "ingen brakett funnet." - STRING_FOR_ERROR3 "'gjøre' tapt." - STRING_FOR_ERROR4 "ingen kommando etter 'gjøre'." + STRING_FOR_ERROR1 "'in' tapt i FOR kommando.\n" + STRING_FOR_ERROR2 "ingen brakett funnet.\n" + STRING_FOR_ERROR3 "'gjøre' tapt.\n" + STRING_FOR_ERROR4 "ingen kommando etter 'gjøre'.\n" STRING_FREE_ERROR1 "Ugyldig driver" STRING_FREE_ERROR2 "utmerket" STRING_GOTO_ERROR1 "Ingen merke spesifisert for GOTO\n" @@ -499,10 +499,10 @@ tittel ny tittel\n" STRING_MD_ERROR2 "Stien til den nye mappen eksisterer ikke.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Feil]\n" - STRING_REN_ERROR1 "MoveFile() mislykkes. Feil: %lu\n" - STRING_TIME_ERROR1 "Ugyldig tid." - STRING_TYPE_ERROR1 "Ugyldig alternativ '/%s'\n" - STRING_WINDOW_ERROR1 "Vinduet ble ikke funnet" + STRING_REN_ERROR "MoveFile() mislykkes. Feil: %lu\n" + STRING_TIME_ERROR "Ugyldig tid.\n" + STRING_TYPE_ERROR "Ugyldig alternativ '/%s'\n" + STRING_WINDOW_ERROR "Vinduet ble ikke funnet\n" STRING_ERROR_PARAMETERF_ERROR "Parameter format ikke riktig - %c\n" STRING_ERROR_INVALID_SWITCH "Ugyldig bryter - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "For mange parametere - %s\n" @@ -531,9 +531,9 @@ tittel ny tittel\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(r) kopiert\n" STRING_DELETE_WIPE "slettet" - STRING_FOR_ERROR "ugyldig variabel spesifikasjon." - STRING_SCREEN_COL "ugyldig verdi for kolonne" - STRING_SCREEN_ROW "ugyldig verdi for rad" + STRING_FOR_ERROR "ugyldig variabel spesifikasjon.\n" + STRING_SCREEN_COL "ugyldig verdi for kolonne\n" + STRING_SCREEN_ROW "ugyldig verdi for rad\n" STRING_TIMER_TIME "Stoppeklokke %d er %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index 4bbb420d202..24ee8ecacf2 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -108,9 +108,9 @@ urządzenie CTTY\n\n\ CON przeważnie jest domyślnym urządzeniem standardowym I/O.\n\n\ Aby przywrócić kontrolę standardowej konsoli, wpisz: CTTY CON na urządzeniu\n\ pomocniczym." - STRING_DATE_HELP1 "\nPodaj nową datę (mm%cdd%crrrr): " - STRING_DATE_HELP2 "\nPodaj nową datę (dd%cmm%crrrr): " - STRING_DATE_HELP3 "\nPodaj nową datę (rrrr%cmm%cdd): " + STRING_DATE_HELP1 "Podaj nową datę (mm%cdd%crrrr): " + STRING_DATE_HELP2 "Podaj nową datę (dd%cmm%crrrr): " + STRING_DATE_HELP3 "Podaj nową datę (rrrr%cmm%cdd): " STRING_DATE_HELP4 "Wyświetla lub zmienia datę systemową.\n\n\ DATE [/T][data]\n\n\ /T tylko wyświetlenie\n\n\ @@ -251,7 +251,7 @@ komenda Komenda do wykonania, gdy warunek będzie spełniony.\n\ ciąg1==ciąg2 Zwraca PRAWDA, gdy oba ciągi znaków są identyczne\n\ EXIST plik Zwraca PRAWDA, jeśli podany plik istnieje.\n\ DEFINED zmienna Zwraca PRAWDA, jeśli podana zmienna została zdefiniowana\n" - STRING_LOCALE_HELP1 "Czas bieżący" + STRING_TIME_NOW "Czas bieżący: " STRING_MKDIR_HELP "Tworzy katalog.\n\n\ MKDIR [napęd:]ścieżka\nMD [napęd:]ścieżka" STRING_MKLINK_HELP "Tworzy dowiązanie obiektu w systemie plików.\n\n\ @@ -481,23 +481,23 @@ title nowy tytuł okna\n" STRING_CMD_ERROR3 "Nie można przekierować do pliku %s\n" STRING_CMD_ERROR4 "Wykonywanie %s...\n" STRING_CMD_ERROR5 "Wykonywanie cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Błąd! Kolor tła i tekstu nie może być taki sam" - STRING_COLOR_ERROR2 "Błąd w oznaczeniu kolorów." + STRING_COLOR_ERROR1 "Błąd! Kolor tła i tekstu nie może być taki sam\n" + STRING_COLOR_ERROR2 "Błąd w oznaczeniu kolorów.\n" STRING_CONSOLE_ERROR "Nieznany błąd: %d\n" STRING_COPY_ERROR1 "Błąd: Nie można otworzyć źródła - %s!\n" STRING_COPY_ERROR2 "Błąd: Nie można przekopiować pliku na niego samego!\n" STRING_COPY_ERROR3 "Błąd zapisu na miejscu docelowym!\n" STRING_COPY_ERROR4 "Błąd: Nie zaimplementowano!\n" - STRING_DATE_ERROR "Data nieprawidłowa." + STRING_DATE_ERROR "Data nieprawidłowa.\n" STRING_DEL_ERROR5 "Plik %s zostanie skasowany! " STRING_DEL_ERROR6 "Czy jesteś pewien (T/N)? " STRING_DEL_ERROR7 "Kasowanie: %s\n" STRING_ERROR_ERROR1 "Nieznany błąd! Kod błędu: 0x%lx\n" STRING_ERROR_ERROR2 "Błąd składni" - STRING_FOR_ERROR1 "Brak 'in' dla twierdzenia." - STRING_FOR_ERROR2 "Nawias nie został znaleziony." - STRING_FOR_ERROR3 "Brakuje 'do'." - STRING_FOR_ERROR4 "Brak komendy po 'do'." + STRING_FOR_ERROR1 "Brak 'in' dla twierdzenia.\n" + STRING_FOR_ERROR2 "Nawias nie został znaleziony.\n" + STRING_FOR_ERROR3 "Brakuje 'do'.\n" + STRING_FOR_ERROR4 "Brak komendy po 'do'.\n" STRING_FREE_ERROR1 "Nieprawidłowa litera napędu" STRING_FREE_ERROR2 "brak" STRING_GOTO_ERROR1 "Brak etykiety dla GOTO\n" @@ -506,10 +506,10 @@ title nowy tytuł okna\n" STRING_MD_ERROR2 "Ścieżka do nowego katalogu nie jest prawidłowa.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Błąd]\n" - STRING_REN_ERROR1 "MoveFile() nieudane. Błąd: %lu\n" - STRING_TIME_ERROR1 "Nieprawidłowy czas." - STRING_TYPE_ERROR1 "Nieprawidłowa opcja '/%s'\n" - STRING_WINDOW_ERROR1 "Okno nie zostało odnalezione" + STRING_REN_ERROR "MoveFile() nieudane. Błąd: %lu\n" + STRING_TIME_ERROR "Nieprawidłowy czas.\n" + STRING_TYPE_ERROR "Nieprawidłowa opcja '/%s'\n" + STRING_WINDOW_ERROR "Okno nie zostało odnalezione\n" STRING_ERROR_PARAMETERF_ERROR "Format parametrów nieprawidłowy - %c\n" STRING_ERROR_INVALID_SWITCH "Niewłaściwy argument - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Zbyt wiele parametrów - %s\n" @@ -538,9 +538,9 @@ title nowy tytuł okna\n" STRING_VERSION_RUNVER "%s [Wersja %d.%d.%d] %s" STRING_COPY_FILE " %d plik(ów) skopiowano\n" STRING_DELETE_WIPE "skasowano" - STRING_FOR_ERROR "złe określenie zmiennej." - STRING_SCREEN_COL "nieprawidłowy numer kolumny" - STRING_SCREEN_ROW "nieprawidłowy numer rzędu" + STRING_FOR_ERROR "złe określenie zmiennej.\n" + STRING_SCREEN_COL "nieprawidłowy numer kolumny\n" + STRING_SCREEN_ROW "nieprawidłowy numer rzędu\n" STRING_TIMER_TIME "Stoper %d czas - %s: " STRING_MKLINK_CREATED_SYMBOLIC "Dowiązanie symboliczne utworzone dla %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Dowiązanie twarde utworzone dla %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/pt-BR.rc b/base/shell/cmd/lang/pt-BR.rc index 4cc11ed42c9..cf2373aad90 100644 --- a/base/shell/cmd/lang/pt-BR.rc +++ b/base/shell/cmd/lang/pt-BR.rc @@ -107,9 +107,9 @@ Dispositivo CTTY\n\n\ CON geralmente é o dispositivo de E/S predefinido.\n\n\ Para atribuir o controle ao console predefinido, digite: CTTY CON no dispositivo\n\ auxiliar." - STRING_DATE_HELP1 "\nInsira uma nova data (mm%cdd%cyyyy):" - STRING_DATE_HELP2 "\nInsira uma nova data (dd%cmm%cyyyy):" - STRING_DATE_HELP3 "\nInsira uma nova data (aaaa%cmm%cdd):" + STRING_DATE_HELP1 "Insira uma nova data (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Insira uma nova data (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Insira uma nova data (aaaa%cmm%cdd): " STRING_DATE_HELP4 "Apresenta ou define a data.\n\n\ DATE [/T][data]\n\n\ /T Apresenta a data atual\n\n\ @@ -267,7 +267,7 @@ EXIST arquivo Especifica uma condição verdadeira se o nome do arquivo\n\ especificado existir.\n\ DEFINED variável Especifica uma condição verdadeira se a variável especificada\n\ for definida.\n" - STRING_LOCALE_HELP1 "A hora atual é" + STRING_TIME_NOW "A hora atual é: " STRING_MKDIR_HELP "Cria um diretório.\n\n\ MKDIR [unidade:] caminho\nMD [unidade:] caminho" STRING_MKLINK_HELP "Cria uma ligação simbólica.\n\n\ @@ -425,10 +425,10 @@ TIME [/ T] [hora]\n\n\ /T Apenas apresenta a hora\n\n\ Digite TIME sem parâmetros para apresentar a definição de hora atual e um prompt\n\ para digitar nova hora. Pressione ENTER para manter a mesma hora.\n" - STRING_TIME_HELP2 "Digite o novo horário:" + STRING_TIME_HELP2 "Digite o novo horário: " STRING_TIMER_HELP1 "Tempo Decorrido %d msegs\n" STRING_TIMER_HELP2 "Decorrido %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "permite o uso de dez cronômetros.\n\n\ + STRING_TIMER_HELP3 "Permite o uso de dez cronômetros.\n\n\ TIMER [ON|OFF] [/S][/n][/Fn]\n\n\ ON inicia a contagem do cronômetro (LIGADO)\n\ OFF termina a contagem do cronômetro (DESLIGADO)\n\ @@ -504,23 +504,23 @@ título Novo título\n" STRING_CMD_ERROR3 "Não é possível redirecionar para o arquivo %s\n" STRING_CMD_ERROR4 "A executar %s ...\n" STRING_CMD_ERROR5 "A executar cmdexit.bat ...\n" - STRING_COLOR_ERROR1 "Erro nas mesmas cores! (O fundo e o primeiro plano não podem ser da mesma cor)" - STRING_COLOR_ERROR2 "Erro na especificação da cor" + STRING_COLOR_ERROR1 "Erro nas mesmas cores! (O fundo e o primeiro plano não podem ser da mesma cor)\n" + STRING_COLOR_ERROR2 "Erro na especificação da cor\n" STRING_CONSOLE_ERROR "Erro desconhecido: %d\n" STRING_COPY_ERROR1 "Erro: Não é possível abrir o código - %s!\n" STRING_COPY_ERROR2 "Erro: Não é possível copiar para si mesmo!\n" STRING_COPY_ERROR3 "Erro ao escrever destino!\n" STRING_COPY_ERROR4 "Erro: ainda não implementado!\n" - STRING_DATE_ERROR "Data inválida." + STRING_DATE_ERROR "Data inválida.\n" STRING_DEL_ERROR5 "O arquivo %s será eliminado!" STRING_DEL_ERROR6 "Tem a certeza? (S/N)" STRING_DEL_ERROR7 "Excluindo: %s\n" STRING_ERROR_ERROR1 "Erro desconhecido! Código do erro: 0x%lx\n" STRING_ERROR_ERROR2 "Erro de sintaxe" - STRING_FOR_ERROR1 "Falta 'em' na declaração." - STRING_FOR_ERROR2 "nenhum colchete encontrado." - STRING_FOR_ERROR3 "falta 'do'." - STRING_FOR_ERROR4 "nenhum comando depois de 'do'." + STRING_FOR_ERROR1 "Falta 'em' na declaração.\n" + STRING_FOR_ERROR2 "nenhum colchete encontrado.\n" + STRING_FOR_ERROR3 "falta 'do'.\n" + STRING_FOR_ERROR4 "nenhum comando depois de 'do'.\n" STRING_FREE_ERROR1 "Unidade inválida" STRING_FREE_ERROR2 "sem etiqueta" STRING_GOTO_ERROR1 "Nenhum rótulo especificado para GOTO\n" @@ -529,10 +529,10 @@ título Novo título\n" STRING_MD_ERROR2 "O caminho para a nova pasta não existe.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Erro]\n" - STRING_REN_ERROR1 "MoveFile () falhou. Erro: %lu\n" - STRING_TIME_ERROR1 "Horário inválido." - STRING_TYPE_ERROR1 "Opção inválida '/%s'\n" - STRING_WINDOW_ERROR1 "Janela não encontrada" + STRING_REN_ERROR "MoveFile () falhou. Erro: %lu\n" + STRING_TIME_ERROR "Horário inválido.\n" + STRING_TYPE_ERROR "Opção inválida '/%s'\n" + STRING_WINDOW_ERROR "Janela não encontrada\n" STRING_ERROR_PARAMETERF_ERROR "Formato de parâmetro incorreto - %c\n" STRING_ERROR_INVALID_SWITCH "Chave inválida - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Muitos parâmetros - %s\n" @@ -561,10 +561,10 @@ título Novo título\n" STRING_VERSION_RUNVER "%s [Versão %d.%d.%d] %s" STRING_COPY_FILE "%d arquivo(s) copiado(s)\n" STRING_DELETE_WIPE "eliminado" - STRING_FOR_ERROR "especificação de variável incorreta." - STRING_SCREEN_COL "valor inválido para col" - STRING_SCREEN_ROW "valor inválido para linha" - STRING_TIMER_TIME "Timer %d é %s:" + STRING_FOR_ERROR "especificação de variável incorreta.\n" + STRING_SCREEN_COL "valor inválido para col\n" + STRING_SCREEN_ROW "valor inválido para linha\n" + STRING_TIMER_TIME "Timer %d é %s: " STRING_MKLINK_CREATED_SYMBOLIC "Link simbólico criado para %s << === >> %s\n" STRING_MKLINK_CREATED_HARD "Hard link criado para %s << === >> %s\n" STRING_MKLINK_CREATED_JUNCTION "Junção criada para %s << === >> %s\n" diff --git a/base/shell/cmd/lang/pt-PT.rc b/base/shell/cmd/lang/pt-PT.rc index 9cbe01d818a..f67a8febcb6 100644 --- a/base/shell/cmd/lang/pt-PT.rc +++ b/base/shell/cmd/lang/pt-PT.rc @@ -100,9 +100,9 @@ Dispositivo CTTY\n\n\ CON geralmente é o dispositivo de E/S predefinido.\n\n\ Para atribuir o controle à consola predefinida, digite: CTTY CON no dispositivo\n\ auxiliar." - STRING_DATE_HELP1 "\nInsira uma nova data (mm%cdd%cyyyy):" - STRING_DATE_HELP2 "\nInsira uma nova data (dd%cmm%cyyyy):" - STRING_DATE_HELP3 "\nInsira uma nova data (aaaa%cmm%cdd):" + STRING_DATE_HELP1 "Insira uma nova data (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Insira uma nova data (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Insira uma nova data (aaaa%cmm%cdd): " STRING_DATE_HELP4 "Apresenta ou define a data.\n\n\ DATE [/T][data]\n\n\ /T Apresenta a data actual\n\n\ @@ -260,7 +260,7 @@ EXIST ficheiro Especifica uma condição verdadeira se o nome do ficheiro\n\ especificado existir.\n\ DEFINED variável Especifica uma condição verdadeira se a variável especificada\n\ for definida.\n" - STRING_LOCALE_HELP1 "A hora actual é" + STRING_TIME_NOW "A hora actual é: " STRING_MKDIR_HELP "Cria um directório.\n\n\ MKDIR [unidade:] caminho\nMD [unidade:] caminho" STRING_MKLINK_HELP "Cria uma ligação simbólica.\n\n\ @@ -418,10 +418,10 @@ TIME [/ T] [hora]\n\n\ /T Apenas apresenta a hora\n\n\ Digite TIME sem parâmetros para apresentar a definição de hora actual e um prompt\n\ para digitar nova hora. Pressione ENTER para manter a mesma hora.\n" - STRING_TIME_HELP2 "Digite o novo horário:" + STRING_TIME_HELP2 "Digite o novo horário: " STRING_TIMER_HELP1 "Tempo Decorrido %d msegs\n" STRING_TIMER_HELP2 "Decorrido %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "permite o uso de dez cronômetros.\n\n\ + STRING_TIMER_HELP3 "Permite o uso de dez cronômetros.\n\n\ TIMER [ON|OFF] [/S][/n][/Fn]\n\n\ ON inicia a contagem do cronômetro (LIGADO)\n\ OFF termina a contagem do cronômetro (DESLIGADO)\n\ @@ -497,23 +497,23 @@ título Novo título\n" STRING_CMD_ERROR3 "Não é possível redirecionar para o ficheiro %s\n" STRING_CMD_ERROR4 "A executar %s ...\n" STRING_CMD_ERROR5 "A executar cmdexit.bat ...\n" - STRING_COLOR_ERROR1 "Erro nas mesmas cores! (O fundo e o primeiro plano não podem ser da mesma cor)" - STRING_COLOR_ERROR2 "Erro na especificação da cor" + STRING_COLOR_ERROR1 "Erro nas mesmas cores! (O fundo e o primeiro plano não podem ser da mesma cor)\n" + STRING_COLOR_ERROR2 "Erro na especificação da cor\n" STRING_CONSOLE_ERROR "Erro desconhecido: %d\n" STRING_COPY_ERROR1 "Erro: Não é possível abrir o código - %s!\n" STRING_COPY_ERROR2 "Erro: Não é possível copiar para si mesmo!\n" STRING_COPY_ERROR3 "Erro ao escrever destino!\n" STRING_COPY_ERROR4 "Erro: ainda não implementado!\n" - STRING_DATE_ERROR "Data inválida." + STRING_DATE_ERROR "Data inválida.\n" STRING_DEL_ERROR5 "O ficheiro %s será eliminado!" STRING_DEL_ERROR6 "Tem a certeza? (S/N)" STRING_DEL_ERROR7 "Excluindo: %s\n" STRING_ERROR_ERROR1 "Erro desconhecido! Código do erro: 0x%lx\n" STRING_ERROR_ERROR2 "Erro de sintaxe" - STRING_FOR_ERROR1 "Falta 'em' na declaração." - STRING_FOR_ERROR2 "nenhum colchete encontrado." - STRING_FOR_ERROR3 "falta 'do'." - STRING_FOR_ERROR4 "nenhum comando depois de 'do'." + STRING_FOR_ERROR1 "Falta 'em' na declaração.\n" + STRING_FOR_ERROR2 "nenhum colchete encontrado.\n" + STRING_FOR_ERROR3 "falta 'do'.\n" + STRING_FOR_ERROR4 "nenhum comando depois de 'do'.\n" STRING_FREE_ERROR1 "Unidade inválida" STRING_FREE_ERROR2 "sem etiqueta" STRING_GOTO_ERROR1 "Nenhum rótulo especificado para GOTO\n" @@ -522,10 +522,10 @@ título Novo título\n" STRING_MD_ERROR2 "O caminho para a nova pasta não existe.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Erro]\n" - STRING_REN_ERROR1 "MoveFile () falhou. Erro: %lu\n" - STRING_TIME_ERROR1 "Horário inválido." - STRING_TYPE_ERROR1 "Opção inválida '/%s'\n" - STRING_WINDOW_ERROR1 "Janela não encontrada" + STRING_REN_ERROR "MoveFile () falhou. Erro: %lu\n" + STRING_TIME_ERROR "Horário inválido.\n" + STRING_TYPE_ERROR "Opção inválida '/%s'\n" + STRING_WINDOW_ERROR "Janela não encontrada\n" STRING_ERROR_PARAMETERF_ERROR "Formato de parâmetro incorrecto - %c\n" STRING_ERROR_INVALID_SWITCH "Chave inválida - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Muitos parâmetros - %s\n" @@ -554,10 +554,10 @@ título Novo título\n" STRING_VERSION_RUNVER "%s [Versão %d.%d.%d] %s" STRING_COPY_FILE "%d ficheiro(s) copiado(s)\n" STRING_DELETE_WIPE "eliminado" - STRING_FOR_ERROR "especificação de variável incorrecta." - STRING_SCREEN_COL "valor inválido para col" - STRING_SCREEN_ROW "valor inválido para linha" - STRING_TIMER_TIME "Timer %d é %s:" + STRING_FOR_ERROR "especificação de variável incorrecta.\n" + STRING_SCREEN_COL "valor inválido para col\n" + STRING_SCREEN_ROW "valor inválido para linha\n" + STRING_TIMER_TIME "Timer %d é %s: " STRING_MKLINK_CREATED_SYMBOLIC "Link simbólico criado para %s << === >> %s\n" STRING_MKLINK_CREATED_HARD "Hard link criado para %s << === >> %s\n" STRING_MKLINK_CREATED_JUNCTION "Junção criada para %s << === >> %s\n" diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc index e2b57adb494..4726739ff7b 100644 --- a/base/shell/cmd/lang/ro-RO.rc +++ b/base/shell/cmd/lang/ro-RO.rc @@ -119,9 +119,9 @@ CTTY dispozitiv\n\n\ CON este de obicei dispozitivul standard implicit de In/Ex.\n\n\ Pentru a restitui controlul la consola standard, tastați: CTTY CON la\n\ dispozitivul auxiliar." - STRING_DATE_HELP1 "\nIntroduceți o nouă dată (ll%czz%caaaa): " - STRING_DATE_HELP2 "\nIntroduceți o nouă dată (zz%cll%caaaa): " - STRING_DATE_HELP3 "\nIntroduceți o nouă dată (aaaa%cll%czz): " + STRING_DATE_HELP1 "Introduceți o nouă dată (ll%czz%caaaa): " + STRING_DATE_HELP2 "Introduceți o nouă dată (zz%cll%caaaa): " + STRING_DATE_HELP3 "Introduceți o nouă dată (aaaa%cll%czz): " STRING_DATE_HELP4 "Afișează sau stabilește data.\n\n\ DATE [/T][dată]\n\n\ /T doar afișează\n\n\ @@ -280,7 +280,7 @@ O etichetă va fi definită pe un rând întreg, începând cu două puncte (:). fișierului specificat.\n\ DEFINED variablă Determină o condiție satisfăcută dacă «variabilă»\n\ a fost anterior definită.\n" - STRING_LOCALE_HELP1 "Ora curentă este" + STRING_TIME_NOW "Ora curentă este: " STRING_MKDIR_HELP "Crează un director.\n\n\ MD [unitate:]cale\nMKDIR [unitate:]cale\n" STRING_MKLINK_HELP "Creată o legătură obiect al sistemului de fișiere.\n\n\ @@ -515,23 +515,23 @@ titlu Noul titlu.\n" STRING_CMD_ERROR3 "Redirecționarea către fișierul %s nu a fost posibilă\n" STRING_CMD_ERROR4 "«%s» în execuție...\n" STRING_CMD_ERROR5 "«cmdexit.bat» în execuție...\n" - STRING_COLOR_ERROR1 "Eroare de culoare identică! (Culorile nu trebuie să fie identice)" - STRING_COLOR_ERROR2 "Eroare la specificarea culorii" + STRING_COLOR_ERROR1 "Eroare de culoare identică! (Culorile nu trebuie să fie identice)\n" + STRING_COLOR_ERROR2 "Eroare la specificarea culorii\n" STRING_CONSOLE_ERROR "Eroare necunoscută: %d\n" STRING_COPY_ERROR1 "Eroare: Fișierul - «%s» nu a putut fi deschis!\n" STRING_COPY_ERROR2 "Eroare: Nu poate fi copiat peste el însuși!\n" STRING_COPY_ERROR3 "Eroare de scriere în destinație!\n" STRING_COPY_ERROR4 "Eroare: Încă nu a fost implementat!\n" - STRING_DATE_ERROR "Dată nevalidă." + STRING_DATE_ERROR "Dată nevalidă.\n" STRING_DEL_ERROR5 "Fișierul «%s» va fi șters!\n" STRING_DEL_ERROR6 "Confirmați (Da|Nu)? " STRING_DEL_ERROR7 "Ștergere: %s\n" STRING_ERROR_ERROR1 "Eroare necunoscută! Codul de eroare: 0x%lx\n" STRING_ERROR_ERROR2 "Eroare de sintaxă" - STRING_FOR_ERROR1 "Lipsește «IN» din formularea lui «FOR»." - STRING_FOR_ERROR2 "Nu au fost găsite paranteze." - STRING_FOR_ERROR3 "Lipsește «DO»." - STRING_FOR_ERROR4 "Nici o comandă după «DO»." + STRING_FOR_ERROR1 "Lipsește «IN» din formularea lui «FOR».\n" + STRING_FOR_ERROR2 "Nu au fost găsite paranteze.\n" + STRING_FOR_ERROR3 "Lipsește «DO».\n" + STRING_FOR_ERROR4 "Nici o comandă după «DO».\n" STRING_FREE_ERROR1 "Unitate nevalidă" STRING_FREE_ERROR2 "neetichetat" STRING_GOTO_ERROR1 "Nu a fost specificată nici o etichetă pentru «GOTO»\n" @@ -540,10 +540,10 @@ titlu Noul titlu.\n" STRING_MD_ERROR2 "Calea către noul director nu există.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Eroare]\n" - STRING_REN_ERROR1 "A eșuat MoveFile(). Eroarea: %lu\n" - STRING_TIME_ERROR1 "Oră nevalidă." - STRING_TYPE_ERROR1 "Opțiune eronată «/%s»\n" - STRING_WINDOW_ERROR1 "Fereastra nu a fost găsită" + STRING_REN_ERROR "A eșuat MoveFile(). Eroarea: %lu\n" + STRING_TIME_ERROR "Oră nevalidă.\n" + STRING_TYPE_ERROR "Opțiune eronată «/%s»\n" + STRING_WINDOW_ERROR "Fereastra nu a fost găsită\n" STRING_ERROR_PARAMETERF_ERROR "Formatul argumentului nu este corect - %c\n" STRING_ERROR_INVALID_SWITCH "Argument eronat - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Prea multe argumente - %s\n" @@ -572,9 +572,9 @@ titlu Noul titlu.\n" STRING_VERSION_RUNVER "%s [Versiunea %d.%d.%d] %s" STRING_COPY_FILE " %d fișier(e) copiat(e)\n" STRING_DELETE_WIPE "șters" - STRING_FOR_ERROR "specificație de variabilă eronată." - STRING_SCREEN_COL "valoarea pentru «coloană» este nevalidă" - STRING_SCREEN_ROW "valoarea pentru «rând» este nevalidă" + STRING_FOR_ERROR "specificație de variabilă eronată.\n" + STRING_SCREEN_COL "valoarea pentru «coloană» este nevalidă\n" + STRING_SCREEN_ROW "valoarea pentru «rând» este nevalidă\n" STRING_TIMER_TIME "Cronometrul %d: %s: " STRING_MKLINK_CREATED_SYMBOLIC "A fost creată o legătură simbolică pentru %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "A fost creată o legătură permanentă pentru %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc index a08ed2db272..0cea72229f8 100644 --- a/base/shell/cmd/lang/ru-RU.rc +++ b/base/shell/cmd/lang/ru-RU.rc @@ -107,9 +107,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nВведите новую дату (мм%cдд%cгггг): " - STRING_DATE_HELP2 "\nВведите новую дату (дд%cмм%cгггг): " - STRING_DATE_HELP3 "\nВведите новую дату (гггг%cмм%cдд): " + STRING_DATE_HELP1 "Введите новую дату (мм%cдд%cгггг): " + STRING_DATE_HELP2 "Введите новую дату (дд%cмм%cгггг): " + STRING_DATE_HELP3 "Введите новую дату (гггг%cмм%cдд): " STRING_DATE_HELP4 "Вывод или изменение даты.\n\n\ DATE [/T][дата]\n\n\ /T Не запрашивать ввод новой даты\n\n\ @@ -257,7 +257,7 @@ GOTO метка\n\n\ За этой командой может следовать ключевое слово ELSE,\n\ служащее для указания команды, которая должна\n\ выполняться в том случае, если условие ложно.\n" - STRING_LOCALE_HELP1 "Текущее время: " + STRING_TIME_NOW "Текущее время: " STRING_MKDIR_HELP "Создание каталога.\n\n\ MKDIR [диск:]путь\nMD [диск:]путь" STRING_MKLINK_HELP "Создание символической ссылки.\n\n\ @@ -493,23 +493,23 @@ RESTORE восстанавливает окно\n\ STRING_CMD_ERROR3 "Невозможно перенаправить в файл %s\n" STRING_CMD_ERROR4 "Запуск %s...\n" STRING_CMD_ERROR5 "Запуск cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Одинаковые цвета! (Цвета фона и текста не могут быть одинаковыми)" - STRING_COLOR_ERROR2 "Ошибка в указании цвета" + STRING_COLOR_ERROR1 "Одинаковые цвета! (Цвета фона и текста не могут быть одинаковыми)\n" + STRING_COLOR_ERROR2 "Ошибка в указании цвета\n" STRING_CONSOLE_ERROR "Неизвестная ошибка: %d\n" STRING_COPY_ERROR1 "Ошибка: Невозможно открыть источник - %s!\n" STRING_COPY_ERROR2 "Ошибка: Невозможно копировать в себя!\n" STRING_COPY_ERROR3 "Ошибка записи!\n" STRING_COPY_ERROR4 "Ошибка: В данный момент не реализовано!\n" - STRING_DATE_ERROR "Неправильная дата." + STRING_DATE_ERROR "Неправильная дата.\n" STRING_DEL_ERROR5 "Файл %s будет удален! " STRING_DEL_ERROR6 "Вы уверены (Y/N)? " STRING_DEL_ERROR7 "Удаление: %s\n" STRING_ERROR_ERROR1 "Неизвестная ошибка! Код ошибки: 0x%lx\n" STRING_ERROR_ERROR2 "Синтаксическая ошибка" - STRING_FOR_ERROR1 "'in' отсутствует в команде for." - STRING_FOR_ERROR2 "скобок не обнаружено." - STRING_FOR_ERROR3 "'do' отсутствует." - STRING_FOR_ERROR4 "нет команды после 'do'." + STRING_FOR_ERROR1 "'in' отсутствует в команде for.\n" + STRING_FOR_ERROR2 "скобок не обнаружено.\n" + STRING_FOR_ERROR3 "'do' отсутствует.\n" + STRING_FOR_ERROR4 "нет команды после 'do'.\n" STRING_FREE_ERROR1 "Неверное имя диска" STRING_FREE_ERROR2 "не отмечено" STRING_GOTO_ERROR1 "Не определена метка для GOTO\n" @@ -518,10 +518,10 @@ RESTORE восстанавливает окно\n\ STRING_MD_ERROR2 "Путь к новому каталогу не существует.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Ошибка]\n" - STRING_REN_ERROR1 "Выполнение MoveFile() было неудачным. Ошибка: %lu\n" - STRING_TIME_ERROR1 "Неверное время." - STRING_TYPE_ERROR1 "Неверный параметр '/%s'\n" - STRING_WINDOW_ERROR1 "Окно не найдено" + STRING_REN_ERROR "Выполнение MoveFile() было неудачным. Ошибка: %lu\n" + STRING_TIME_ERROR "Неверное время.\n" + STRING_TYPE_ERROR "Неверный параметр '/%s'\n" + STRING_WINDOW_ERROR "Окно не найдено\n" STRING_ERROR_PARAMETERF_ERROR "Некорректный формат параметра - %c\n" STRING_ERROR_INVALID_SWITCH "Неверный параметр - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Слишком много параметров - %s\n" @@ -550,9 +550,9 @@ RESTORE восстанавливает окно\n\ STRING_VERSION_RUNVER "%s [Версия %d.%d.%d] %s" STRING_COPY_FILE " %d файл(ов) скопировано\n" STRING_DELETE_WIPE "очищено" - STRING_FOR_ERROR "неправильное задание переменной." - STRING_SCREEN_COL "неправильное значение для колонок" - STRING_SCREEN_ROW "неправильное значение для строк" + STRING_FOR_ERROR "неправильное задание переменной.\n" + STRING_SCREEN_COL "неправильное значение для колонок\n" + STRING_SCREEN_ROW "неправильное значение для строк\n" STRING_TIMER_TIME "Таймер %d на %s: " STRING_MKLINK_CREATED_SYMBOLIC "Символьная ссылка создана для %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Жесткая ссылка создана для %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index 75955a903db..12a60f88e71 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -104,9 +104,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nZadajte nový dátum (mm%cdd%crrrr): " - STRING_DATE_HELP2 "\nZadajte nový dátum (dd%cmm%crrrr): " - STRING_DATE_HELP3 "\nZadajte nový dátum (rrrr%cmm%cdd): " + STRING_DATE_HELP1 "Zadajte nový dátum (mm%cdd%crrrr): " + STRING_DATE_HELP2 "Zadajte nový dátum (dd%cmm%crrrr): " + STRING_DATE_HELP3 "Zadajte nový dátum (rrrr%cmm%cdd): " STRING_DATE_HELP4 "Zobrazí alebo nastaví dátum.\n\n\ DATE [/T][date]\n\n\ /T display only\n\n\ @@ -250,7 +250,7 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - STRING_LOCALE_HELP1 "Aktuálny čas je" + STRING_TIME_NOW "Aktuálny čas je: " STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ @@ -404,7 +404,7 @@ for a new one. Press ENTER to keep the same time.\n" STRING_TIME_HELP2 "Zadajte nový čas: " STRING_TIMER_HELP1 "Elapsed %d msecs\n" STRING_TIMER_HELP2 "Elapsed %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "allow the use of ten stopwatches.\n\n\ + STRING_TIMER_HELP3 "Allow the use of ten stopwatches.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON set stopwatch ON\n\ OFF set stopwatch OFF\n\ @@ -482,23 +482,23 @@ title new title\n" STRING_CMD_ERROR3 "Can't redirect to file %s\n" STRING_CMD_ERROR4 "Running %s...\n" STRING_CMD_ERROR5 "Running cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)" - STRING_COLOR_ERROR2 "Error in color specification" + STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)\n" + STRING_COLOR_ERROR2 "Error in color specification\n" STRING_CONSOLE_ERROR "Neznáma chyba: %d\n" STRING_COPY_ERROR1 "Chyba: Cannot open source - %s!\n" STRING_COPY_ERROR2 "Chyba: Can't copy onto itself!\n" STRING_COPY_ERROR3 "Error writing destination!\n" STRING_COPY_ERROR4 "Chyba: Zatiaľ neimplementované!\n" - STRING_DATE_ERROR "Neplatný dátum." + STRING_DATE_ERROR "Neplatný dátum.\n" STRING_DEL_ERROR5 "The file %s will be deleted! " STRING_DEL_ERROR6 "Ste si istý (Y/N)? " STRING_DEL_ERROR7 "Deleting: %s\n" STRING_ERROR_ERROR1 "Neznáma chyba! Kód chyby: 0x%lx\n" STRING_ERROR_ERROR2 "Syntax error" - STRING_FOR_ERROR1 "'in' missing in for statement." - STRING_FOR_ERROR2 "no brackets found." - STRING_FOR_ERROR3 "'do' missing." - STRING_FOR_ERROR4 "no command after 'do'." + STRING_FOR_ERROR1 "'in' missing in for statement.\n" + STRING_FOR_ERROR2 "no brackets found.\n" + STRING_FOR_ERROR3 "'do' missing.\n" + STRING_FOR_ERROR4 "no command after 'do'.\n" STRING_FREE_ERROR1 "Invalid drive" STRING_FREE_ERROR2 "unlabeled" STRING_GOTO_ERROR1 "No label specified for GOTO\n" @@ -507,10 +507,10 @@ title new title\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Chyba]\n" - STRING_REN_ERROR1 "MoveFile() failed. Error: %lu\n" - STRING_TIME_ERROR1 "Neplatný čas." - STRING_TYPE_ERROR1 "Invalid option '/%s'\n" - STRING_WINDOW_ERROR1 "Okno sa nenašlo" + STRING_REN_ERROR "MoveFile() failed. Error: %lu\n" + STRING_TIME_ERROR "Neplatný čas.\n" + STRING_TYPE_ERROR "Invalid option '/%s'\n" + STRING_WINDOW_ERROR "Okno sa nenašlo\n" STRING_ERROR_PARAMETERF_ERROR "Parameter format not correct - %c\n" STRING_ERROR_INVALID_SWITCH "Neplatný prepínač - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Príliš veľa parametrov - %s\n" @@ -539,9 +539,9 @@ title new title\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d súbor(ov) skopírovaný(ch)\n" STRING_DELETE_WIPE "wiped" - STRING_FOR_ERROR "bad variable specification." - STRING_SCREEN_COL "neplatná hodnota pre stĺpec" - STRING_SCREEN_ROW "neplatná hodnota pre riadok" + STRING_FOR_ERROR "bad variable specification.\n" + STRING_SCREEN_COL "neplatná hodnota pre stĺpec\n" + STRING_SCREEN_ROW "neplatná hodnota pre riadok\n" STRING_TIMER_TIME "Timer %d is %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index 65a852dac54..25b9fcef88e 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -102,9 +102,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nShkruani datën e re (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nShkruani datën e re (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nShkruani datën e re (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Shkruani datën e re (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Shkruani datën e re (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Shkruani datën e re (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Shfaq ose ndrysho datën.\n\n\ DATE [/T][datë]\n\n\ /T vetëm shfaq\n\n\ @@ -248,7 +248,7 @@ string1==string2 Përcakton një kusht të vërtetë nëse vargjet e specifikua EXIST filename Përcakton një kusht të vërtetë, nëse ekziston dokumenti i specifikuar.\n\ DEFINED variable Përcakton një kusht të vërtetë nëse variabli është specifikuar\n\ dhe karakterizuar.\n" - STRING_LOCALE_HELP1 "Koha e tanishme është" + STRING_TIME_NOW "Koha e tanishme është: " STRING_MKDIR_HELP "Krijon një skedë.\n\n\ MKDIR [drive:]rrugë\nMD [drive:]rrugë" STRING_MKLINK_HELP "Krijon një lidhje objekti në dokumentat e sistemit.\n\n\ @@ -402,7 +402,7 @@ për një të re. Kliko ENTER të mbash të njëjtë orë.\n" STRING_TIME_HELP2 "Shkruaj orën e re: " STRING_TIMER_HELP1 "Kaluar %d milisekonda\n" STRING_TIMER_HELP2 "Kaluar %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "të lejojë përdorimin e dhjetë kronometrave.\n\n\ + STRING_TIMER_HELP3 "Të lejojë përdorimin e dhjetë kronometrave.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON Nis kronometrin\n\ OFF Ndalo kronometrin\n\ @@ -480,23 +480,23 @@ title titull i ri\n" STRING_CMD_ERROR3 "Nuk mund të përcjellim në dokument %s\n" STRING_CMD_ERROR4 "Fillo %s...\n" STRING_CMD_ERROR5 "Fillo cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Error i njëta ngjyra! (Historiku dhe prioritetit nuk mund të jetë ngjyrë të njëjtë)" - STRING_COLOR_ERROR2 "Gabim në specifikim ngjyra" + STRING_COLOR_ERROR1 "Error i njëta ngjyra! (Historiku dhe prioritetit nuk mund të jetë ngjyrë të njëjtë)\n" + STRING_COLOR_ERROR2 "Gabim në specifikim ngjyra\n" STRING_CONSOLE_ERROR "Error i paditur: %d\n" STRING_COPY_ERROR1 "Error: Nuk mund të hapni burim - %s!\n" STRING_COPY_ERROR2 "Error: Nuk mund të kopjoni mbi veten!\n" STRING_COPY_ERROR3 "Gabim gjatë shkrimit në destinacion!\n" STRING_COPY_ERROR4 "Error: Akoma nuk është implementuar!\n" - STRING_DATE_ERROR "Date Invalid." + STRING_DATE_ERROR "Date Invalid.\n" STRING_DEL_ERROR5 "Dokumenti %s do të fshihet! " STRING_DEL_ERROR6 "Jeni të sigurtë (P/J)? " STRING_DEL_ERROR7 "Fshini: %s\n" STRING_ERROR_ERROR1 "Error i paditur! Kodi error: 0x%lx\n" STRING_ERROR_ERROR2 "Error sintaksi" - STRING_FOR_ERROR1 "'Në' humbur për në deklaratë." - STRING_FOR_ERROR2 "Nuk gjenden kllapat." - STRING_FOR_ERROR3 "'bëj' i humbur." - STRING_FOR_ERROR4 "asnjë komandë pas 'do'." + STRING_FOR_ERROR1 "'Në' humbur për në deklaratë.\n" + STRING_FOR_ERROR2 "Nuk gjenden kllapat.\n" + STRING_FOR_ERROR3 "'bëj' i humbur.\n" + STRING_FOR_ERROR4 "asnjë komandë pas 'do'.\n" STRING_FREE_ERROR1 "Drive Invalid" STRING_FREE_ERROR2 "E paetiketuar" STRING_GOTO_ERROR1 "Nuk ka etiketa specifikuar për GOTO\n" @@ -505,10 +505,10 @@ title titull i ri\n" STRING_MD_ERROR2 "Rruga për tek skeda e re nuk ekziston.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Error]\n" - STRING_REN_ERROR1 "MoveFile() dështoj. Error: %lu\n" - STRING_TIME_ERROR1 "Ora invalide." - STRING_TYPE_ERROR1 "Opsion invalid '/%s'\n" - STRING_WINDOW_ERROR1 "Dritaria nuk i gjend" + STRING_REN_ERROR "MoveFile() dështoj. Error: %lu\n" + STRING_TIME_ERROR "Ora invalide.\n" + STRING_TYPE_ERROR "Opsion invalid '/%s'\n" + STRING_WINDOW_ERROR "Dritaria nuk i gjend\n" STRING_ERROR_PARAMETERF_ERROR "Parametrat e formanit nuk jane te sakta - %c\n" STRING_ERROR_INVALID_SWITCH "Qeles invalid - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Shumë parametra - %s\n" @@ -537,9 +537,9 @@ title titull i ri\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(s) copied\n" STRING_DELETE_WIPE "spastruar" - STRING_FOR_ERROR "specifikimi i varibleve i keq." - STRING_SCREEN_COL "vlere invalide për col" - STRING_SCREEN_ROW "vlere invalide për row" + STRING_FOR_ERROR "specifikimi i varibleve i keq.\n" + STRING_SCREEN_COL "vlere invalide për col\n" + STRING_SCREEN_ROW "vlere invalide për row\n" STRING_TIMER_TIME "kohëmatës %d is %s: " STRING_MKLINK_CREATED_SYMBOLIC "Link i krijuar simbolik për %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Krijus linku i forte për %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc index 91653be0023..6a64655894f 100644 --- a/base/shell/cmd/lang/sv-SE.rc +++ b/base/shell/cmd/lang/sv-SE.rc @@ -98,9 +98,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nSkriv in nytt datum (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nSkriv in nytt datum (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nSkriv in nytt datum (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Skriv in nytt datum (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Skriv in nytt datum (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Skriv in nytt datum (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Visa eller ändra datumet.\n\n\ DATE [/T][datum]\n\n\ /T Endast visa\n\n\ @@ -243,7 +243,7 @@ sträng1==sträng2 Anger ett uppfyllt villkor om textsträngarna är lika\n\ EXIST filnamn Anger ett uppfyllt villkor om angivet filnamn existerar.\n\ DEFINED variabel Anger ett uppfyllt villkor om angiven variabel är\n\ definerad.\n" - STRING_LOCALE_HELP1 "aktuell tid är" + STRING_TIME_NOW "Aktuell tid är: " STRING_MKDIR_HELP "Skapar en mapp.\n\n\ MKDIR [enhet:]mapp\nMD [enhet:]mapp" STRING_MKLINK_HELP "Skapar en filesystemslänk.\n\n\ @@ -474,23 +474,23 @@ tittel ny tittel\n" STRING_CMD_ERROR3 "Kan inte videreføre till fil %s\n" STRING_CMD_ERROR4 "Kör %s...\n" STRING_CMD_ERROR5 "Kör cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Samma färg fel! (Bakgrunn och forgrunn kan inte ha samme farge)" - STRING_COLOR_ERROR2 "Fel i färgspecifikation" + STRING_COLOR_ERROR1 "Samma färg fel! (Bakgrunn och forgrunn kan inte ha samme farge)\n" + STRING_COLOR_ERROR2 "Fel i färgspecifikation\n" STRING_CONSOLE_ERROR "Okänt fel: %d\n" STRING_COPY_ERROR1 "Fel: kan inte öppna källan - %s!\n" STRING_COPY_ERROR2 "Fel: kan inte kopiera till sig själv!\n" STRING_COPY_ERROR3 "Fel vid skriving till destinationen!\n" STRING_COPY_ERROR4 "Fel: Inte implementert!\n" - STRING_DATE_ERROR "Ogiltuft datum." + STRING_DATE_ERROR "Ogiltuft datum.\n" STRING_DEL_ERROR5 "Filen %s vill bli slettet! " STRING_DEL_ERROR6 "Är du säker (J/N)? " STRING_DEL_ERROR7 "Sletter: %s\n" STRING_ERROR_ERROR1 "Okänt fel! Felkod: 0x%lx\n" STRING_ERROR_ERROR2 "Syntaxfel" - STRING_FOR_ERROR1 "'in' tapt i FOR kommando." - STRING_FOR_ERROR2 "ingen brakett funnet." - STRING_FOR_ERROR3 "'do' tapt." - STRING_FOR_ERROR4 "inget kommando etter 'gjøre'." + STRING_FOR_ERROR1 "'in' tapt i FOR kommando.\n" + STRING_FOR_ERROR2 "ingen brakett funnet.\n" + STRING_FOR_ERROR3 "'do' tapt.\n" + STRING_FOR_ERROR4 "inget kommando etter 'gjøre'.\n" STRING_FREE_ERROR1 "Ogiltig drivrutin" STRING_FREE_ERROR2 "utmärkt" STRING_GOTO_ERROR1 "Inget märke specifiserat för GOTO\n" @@ -499,10 +499,10 @@ tittel ny tittel\n" STRING_MD_ERROR2 "Stien till den nye mappen exsisterar inte.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Fel]\n" - STRING_REN_ERROR1 "MoveFile() mislyckades. Fel: %lu\n" - STRING_TIME_ERROR1 "Ogiltig tid." - STRING_TYPE_ERROR1 "Ogiltigt alternativ '/%s'\n" - STRING_WINDOW_ERROR1 "Fönstret hittades inte" + STRING_REN_ERROR "MoveFile() mislyckades. Fel: %lu\n" + STRING_TIME_ERROR "Ogiltig tid.\n" + STRING_TYPE_ERROR "Ogiltigt alternativ '/%s'\n" + STRING_WINDOW_ERROR "Fönstret hittades inte\n" STRING_ERROR_PARAMETERF_ERROR "Parameter format inte riktig - %c\n" STRING_ERROR_INVALID_SWITCH "Ogiltig växel - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "For mange parametere - %s\n" @@ -531,9 +531,9 @@ tittel ny tittel\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(r) kopierades\n" STRING_DELETE_WIPE "slettet" - STRING_FOR_ERROR "ogiltig variabelspecifikastion." - STRING_SCREEN_COL "ogiltigt värde för kolumn" - STRING_SCREEN_ROW "ogiltigr värde för rad" + STRING_FOR_ERROR "ogiltig variabelspecifikastion.\n" + STRING_SCREEN_COL "ogiltigt värde för kolumn\n" + STRING_SCREEN_ROW "ogiltigr värde för rad\n" STRING_TIMER_TIME "Stoppeklokke %d är %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc index 0cbc3a72e2f..77e9663e2d3 100644 --- a/base/shell/cmd/lang/tr-TR.rc +++ b/base/shell/cmd/lang/tr-TR.rc @@ -102,9 +102,9 @@ CTTY [cihaz]\n\n\ AUX, COMx (x=1..N), CON, LPTx (x=1..N), PRN, NUL.\n\ CON genellikle varsayılan standart G/Ç cihazıdır..\n\n\ Kontrolü standart konsola geri döndürmek için, yardımcı cihazda CTTY CON yazın." - STRING_DATE_HELP1 "\nYeni tarihi giriniz (ay%cgün%cyıl): " - STRING_DATE_HELP2 "\nYeni tarihi giriniz (gün%cay%cyıl): " - STRING_DATE_HELP3 "\nYeni tarihi giriniz (yıl%cay%cgün): " + STRING_DATE_HELP1 "Yeni tarihi giriniz (ay%cgün%cyıl): " + STRING_DATE_HELP2 "Yeni tarihi giriniz (gün%cay%cyıl): " + STRING_DATE_HELP3 "Yeni tarihi giriniz (yıl%cay%cgün): " STRING_DATE_HELP4 "Tarihi görüntüler veya ayarlar.\n\n\ DATE [/T][tarih]\n\n\ /T sadece tarihi gösterir\n\n\ @@ -244,7 +244,7 @@ command Koşul karşılanırsa yürütülecek komutu belirtir.\n\ dizi1==dizi2 Belirtilen metin dizeleri eşleşirse doğru bir koşul belirtir\n\ EXIST dosya_adi Belirtilen dosya adı mevcutsa doğru bir koşul belirtir.\n\ DEFINED variable Belirtilen değişken tanımlanmışsa doğru bir koşul belirtir\n" - STRING_LOCALE_HELP1 "Şimdiki zaman: " + STRING_TIME_NOW "Şimdiki zaman: " STRING_MKDIR_HELP "Bir dizin oluşturur.\n\n\ MKDIR [sürücü:]yol\nMD [sürücü:]yol" STRING_MKLINK_HELP "Bir dosya sistemi bağlantı nesnesi oluşturur.\n\n\ @@ -469,23 +469,23 @@ başlık pencere için yeni başlık\n" STRING_CMD_ERROR3 "%s dosyasına yönlendirilemedi\n" STRING_CMD_ERROR4 "%s çalışıtırılıyor...\n" STRING_CMD_ERROR5 "cmdexit.bat çalıştırılıyor...\n" - STRING_COLOR_ERROR1 "Aynı renk hatası! (Arka plan ve ön plan aynı renk olamaz)" - STRING_COLOR_ERROR2 "Renk özelliklerinde hata" + STRING_COLOR_ERROR1 "Aynı renk hatası! (Arka plan ve ön plan aynı renk olamaz)\n" + STRING_COLOR_ERROR2 "Renk özelliklerinde hata\n" STRING_CONSOLE_ERROR "Bilinmeyen Hata: %d\n" STRING_COPY_ERROR1 "Hata: Kaynak açılamadı - %s!\n" STRING_COPY_ERROR2 "Hata: Kendi üzerine kopyalanamaz!\n" STRING_COPY_ERROR3 "Hata: Hedefe yazılırken hata oluştu!\n" STRING_COPY_ERROR4 "Hata: Henüz eklenmedi/geliştirilmedi!\n" - STRING_DATE_ERROR "Geçersiz tarih." + STRING_DATE_ERROR "Geçersiz tarih.\n" STRING_DEL_ERROR5 "%s dosyası silinecek! " STRING_DEL_ERROR6 "Emin misiniz (E/H)? " STRING_DEL_ERROR7 "Siliniyor: %s\n" STRING_ERROR_ERROR1 "Bilinmeyen hata! Hata kodu: 0x%lx\n" STRING_ERROR_ERROR2 "Sözdizimi hatası" - STRING_FOR_ERROR1 "'for' döngüsü içerisinde 'in' ifadesi eksik." - STRING_FOR_ERROR2 "parantez bulunamadı." - STRING_FOR_ERROR3 "'do' eksik." - STRING_FOR_ERROR4 "'do' ifadesinin ardından herhangi bir komut girilmedi." + STRING_FOR_ERROR1 "'for' döngüsü içerisinde 'in' ifadesi eksik.\n" + STRING_FOR_ERROR2 "parantez bulunamadı.\n" + STRING_FOR_ERROR3 "'do' eksik.\n" + STRING_FOR_ERROR4 "'do' ifadesinin ardından herhangi bir komut girilmedi.\n" STRING_FREE_ERROR1 "Geçersiz sürücü" STRING_FREE_ERROR2 "etiketsiz" STRING_GOTO_ERROR1 "GOTO için bir etiket bulunamadı.\n" @@ -494,10 +494,10 @@ başlık pencere için yeni başlık\n" STRING_MD_ERROR2 "Yeni dizinin yolu mevcut değil.\n" STRING_MOVE_ERROR1 "[TAMAM]\n" STRING_MOVE_ERROR2 "[Hata]\n" - STRING_REN_ERROR1 "MoveFile() hatayla sonuçlandı. Hata: %lu\n" - STRING_TIME_ERROR1 "Yanlış tarih." - STRING_TYPE_ERROR1 "Yanlış ayar '/%s'\n" - STRING_WINDOW_ERROR1 "Pencere bulunamadı" + STRING_REN_ERROR "MoveFile() hatayla sonuçlandı. Hata: %lu\n" + STRING_TIME_ERROR "Yanlış tarih.\n" + STRING_TYPE_ERROR "Yanlış ayar '/%s'\n" + STRING_WINDOW_ERROR "Pencere bulunamadı\n" STRING_ERROR_PARAMETERF_ERROR "Parametre biçimi hatalı - %c\n" STRING_ERROR_INVALID_SWITCH "Geçersiz anahtar - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Çok fazla parametre girildi - %s\n" @@ -526,9 +526,9 @@ başlık pencere için yeni başlık\n" STRING_VERSION_RUNVER "%s [Sürüm %d.%d.%d] %s" STRING_COPY_FILE " %d adet dosya(lar) kopyalandı\n" STRING_DELETE_WIPE "temizlendi" - STRING_FOR_ERROR "hatalı değişken belirtimi." - STRING_SCREEN_COL "sütun için geçersiz değer" - STRING_SCREEN_ROW "satır için geçersiz değer" + STRING_FOR_ERROR "hatalı değişken belirtimi.\n" + STRING_SCREEN_COL "sütun için geçersiz değer\n" + STRING_SCREEN_ROW "satır için geçersiz değer\n" STRING_TIMER_TIME "Sayaç %d, %s'dır: " STRING_MKLINK_CREATED_SYMBOLIC "%s <<===>> %s için sembolik bağlantı oluşturuldu.\n" STRING_MKLINK_CREATED_HARD "%s <<===>> %s için sabit bağlantı oluşturuldu.\n" diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index ece8cafbed2..c903a9615df 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -106,9 +106,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\nВведiть нову дату (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nВведiть нову дату (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nВведiть нову дату (yyyy%cmm%cdd): " + STRING_DATE_HELP1 "Введiть нову дату (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "Введiть нову дату (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "Введiть нову дату (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Вiдображення чи змiна дати.\n\n\ DATE [/T][дата]\n\n\ /T лише вiдображення\n\n\ @@ -255,7 +255,7 @@ ERRORLEVEL число Ця умова є iстинною, якщо код, що EXIST iм'я_файлу Умова є iстинною, якщо файл з вказаним iменем iснує.\n\ DEFINED змiнна Ця умова є iстинною, якщо вказана змiнна\n\ задана.\n" - STRING_LOCALE_HELP1 "Поточний час: " + STRING_TIME_NOW "Поточний час: " STRING_MKDIR_HELP "Створення каталогу.\n\n\ MKDIR [диск:]шлях\nMD [диск:]шлях" STRING_MKLINK_HELP "Створення об'єкту-посилання файлової системи.\n\n\ @@ -408,7 +408,7 @@ TIME без параметрiв виводить поточний час та з STRING_TIME_HELP2 "Введiть новий час: " STRING_TIMER_HELP1 "Минуло %d мсек\n" STRING_TIMER_HELP2 "Минуло %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "дозволяє використати десять секундомiрiв.\n\n\ + STRING_TIMER_HELP3 "Дозволяє використати десять секундомiрiв.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON ввiмкнути секундомiр (ON)\n\ OFF вимкнути секундомiр (OFF)\n\ @@ -486,23 +486,23 @@ title новий заголовок\n" STRING_CMD_ERROR3 "Не можу перенаправити в файл %s\n" STRING_CMD_ERROR4 "Запуск %s...\n" STRING_CMD_ERROR5 "Запуск cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Помилка - однаковi кольори! (тло та текст не можуть бути однакового кольору)" - STRING_COLOR_ERROR2 "Помилка при вказаннi кольору" + STRING_COLOR_ERROR1 "Помилка - однаковi кольори! (тло та текст не можуть бути однакового кольору)\n" + STRING_COLOR_ERROR2 "Помилка при вказаннi кольору\n" STRING_CONSOLE_ERROR "Невiдома помилка: %d\n" STRING_COPY_ERROR1 "Помилка: Неможливо вiдкрити джерело - %s!\n" STRING_COPY_ERROR2 "Помилка: Неможливо копiювати в себе!\n" STRING_COPY_ERROR3 "Помилка запису призначення!\n" STRING_COPY_ERROR4 "Помилка: Ще не реалiзовано!\n" - STRING_DATE_ERROR "Невiрна дата." + STRING_DATE_ERROR "Невiрна дата.\n" STRING_DEL_ERROR5 "Файл %s буде видалений! " STRING_DEL_ERROR6 "Ви впевненi (Y/N)? " STRING_DEL_ERROR7 "Видалення: %s\n" STRING_ERROR_ERROR1 "Невiдома помилка! Код помилки: 0x%lx\n" STRING_ERROR_ERROR2 "Синтаксична помилка" - STRING_FOR_ERROR1 "'in' вiдсутнє в команді for." - STRING_FOR_ERROR2 "дужок не знайдено." - STRING_FOR_ERROR3 "'do' вiдсутнє." - STRING_FOR_ERROR4 "немає команди пiсля 'do'." + STRING_FOR_ERROR1 "'in' вiдсутнє в команді for.\n" + STRING_FOR_ERROR2 "дужок не знайдено.\n" + STRING_FOR_ERROR3 "'do' вiдсутнє.\n" + STRING_FOR_ERROR4 "немає команди пiсля 'do'.\n" STRING_FREE_ERROR1 "Невiрний диск" STRING_FREE_ERROR2 "не вiдмiчено" STRING_GOTO_ERROR1 "Не визначена мiтка для GOTO\n" @@ -511,10 +511,10 @@ title новий заголовок\n" STRING_MD_ERROR2 "Шлях до нового каталогу не iснує.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Помилка]\n" - STRING_REN_ERROR1 "Невдачне виконання MoveFile(). Помилка: %lu\n" - STRING_TIME_ERROR1 "Невiрний час." - STRING_TYPE_ERROR1 "Невiрний параметр '/%s'\n" - STRING_WINDOW_ERROR1 "Вiкно не знайдено" + STRING_REN_ERROR "Невдачне виконання MoveFile(). Помилка: %lu\n" + STRING_TIME_ERROR "Невiрний час.\n" + STRING_TYPE_ERROR "Невiрний параметр '/%s'\n" + STRING_WINDOW_ERROR "Вiкно не знайдено\n" STRING_ERROR_PARAMETERF_ERROR "Неправильний формат параметра - %c\n" STRING_ERROR_INVALID_SWITCH "Невірна опцiя - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "Забагато параметрiв - %s\n" @@ -543,9 +543,9 @@ title новий заголовок\n" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d файл(iв) скопiйовано\n" STRING_DELETE_WIPE "витерто" - STRING_FOR_ERROR "невiрна специфiкацiя змiнної." - STRING_SCREEN_COL "неправильне значення col" - STRING_SCREEN_ROW "неправильне значення row" + STRING_FOR_ERROR "невiрна специфiкацiя змiнної.\n" + STRING_SCREEN_COL "неправильне значення col\n" + STRING_SCREEN_ROW "неправильне значення row\n" STRING_TIMER_TIME "Таймер %d - %s: " STRING_MKLINK_CREATED_SYMBOLIC "Створено символiчне посилання для %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Створено жорстке посилання для %s <<===>> %s\n" diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc index 0d002218656..c3a6572b9f8 100644 --- a/base/shell/cmd/lang/zh-CN.rc +++ b/base/shell/cmd/lang/zh-CN.rc @@ -103,9 +103,9 @@ CTTY device\n\n\ CON 一般是默认的标准 I/O 设备名。\n\n\ 想要把控制权交还给默认终端，在外置设备上输入：CTTY CON\n\ device." - STRING_DATE_HELP1 "\n输入新的日期 (mm%cdd%cyyyy)：" - STRING_DATE_HELP2 "\n输入新的日期 (dd%cmm%cyyyy)：" - STRING_DATE_HELP3 "\n输入新的日期 (yyyy%cmm%cdd)：" + STRING_DATE_HELP1 "输入新的日期 (mm%cdd%cyyyy)： " + STRING_DATE_HELP2 "输入新的日期 (dd%cmm%cyyyy)： " + STRING_DATE_HELP3 "输入新的日期 (yyyy%cmm%cdd)： " STRING_DATE_HELP4 "显示或者设置日期。\n\n\ DATE [/T][日期]\n\n\ /T 仅显示\n\n\ @@ -237,7 +237,7 @@ ERRORLEVEL 数字当上一个程序返回一个大于或等于指定数字字符串1==字符串2 当所指定的字符串相匹配时为真。\n\ EXIST 文件名当指定的文件名存在时为真。\n\ DEFINED 变量当指定的变量已被定义时为真。\n" - STRING_LOCALE_HELP1 "当前时间是" + STRING_TIME_NOW "当前时间是： " STRING_MKDIR_HELP "创建一个目录。\n\n\ MKDIR [驱动器:]路径\nMD [驱动器:]路径" STRING_MKLINK_HELP "创建一个文件系统链接对象。\n\n\ @@ -376,7 +376,7 @@ TITLE [字符串]\n\n\ TIME [/T][时间]\n\n\ /T 仅显示\n\n\ 执行不带参数的 TIME 将会显示当前时间设置并且提示设置新的时间。按下 ENTER 键来保持原有设置。\n" - STRING_TIME_HELP2 "输入新的时间：" + STRING_TIME_HELP2 "输入新的时间： " STRING_TIMER_HELP1 "已过去 %d 毫秒\n" STRING_TIMER_HELP2 "已过去 %02d%c%02d%c%02d%c%02d\n" STRING_TIMER_HELP3 "允许使用最多十个停表。\n\n\ @@ -449,23 +449,23 @@ RESTORE 恢复窗口\n\ STRING_CMD_ERROR3 "无法重定向到文件 %s\n" STRING_CMD_ERROR4 "正在运行 %s...\n" STRING_CMD_ERROR5 "正在运行 cmdexit.bat...\n" - STRING_COLOR_ERROR1 "同样颜色错误！ (背景和前景不能同色)" - STRING_COLOR_ERROR2 "颜色指定错误" + STRING_COLOR_ERROR1 "同样颜色错误！ (背景和前景不能同色)\n" + STRING_COLOR_ERROR2 "颜色指定错误\n" STRING_CONSOLE_ERROR "未知错误：%d\n" STRING_COPY_ERROR1 "错误：无法打开源文件 - %s！\n" STRING_COPY_ERROR2 "错误：无法复制到自身！\n" STRING_COPY_ERROR3 "写入目标文件时出错！\n" STRING_COPY_ERROR4 "错误：尚未实现！\n" - STRING_DATE_ERROR "无效日期。" + STRING_DATE_ERROR "无效日期。\n" STRING_DEL_ERROR5 "文件 %s 将会被删除！" STRING_DEL_ERROR6 "您确定吗（Y/N）？ " STRING_DEL_ERROR7 "正在删除：%s\n" STRING_ERROR_ERROR1 "未知错误！错误码：0x%lx\n" STRING_ERROR_ERROR2 "语法错误" - STRING_FOR_ERROR1 "语句中缺少“in”。" - STRING_FOR_ERROR2 "没有发现括号。" - STRING_FOR_ERROR3 "缺少“do”。" - STRING_FOR_ERROR4 "“do”后没有命令。" + STRING_FOR_ERROR1 "语句中缺少“in”。\n" + STRING_FOR_ERROR2 "没有发现括号。\n" + STRING_FOR_ERROR3 "缺少“do”。\n" + STRING_FOR_ERROR4 "“do”后没有命令。\n" STRING_FREE_ERROR1 "无效驱动器" STRING_FREE_ERROR2 "未标记" STRING_GOTO_ERROR1 "没有为 GOTO 指定标签\n" @@ -474,10 +474,10 @@ RESTORE 恢复窗口\n\ STRING_MD_ERROR2 "到新文件夹的路径不存在。\n" STRING_MOVE_ERROR1 "[成功]\n" STRING_MOVE_ERROR2 "[错误]\n" - STRING_REN_ERROR1 "MoveFile() 失败。错误码：%lu\n" - STRING_TIME_ERROR1 "无效时间。" - STRING_TYPE_ERROR1 "无效选项“/%s”\n" - STRING_WINDOW_ERROR1 "未找到窗口" + STRING_REN_ERROR "MoveFile() 失败。错误码：%lu\n" + STRING_TIME_ERROR "无效时间。\n" + STRING_TYPE_ERROR "无效选项“/%s”\n" + STRING_WINDOW_ERROR "未找到窗口\n" STRING_ERROR_PARAMETERF_ERROR "参数格式不正确 - %c\n" STRING_ERROR_INVALID_SWITCH "无效开关 - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "参数过多 - %s\n" @@ -506,9 +506,9 @@ RESTORE 恢复窗口\n\ STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d 个文件已复制\n" STRING_DELETE_WIPE "已擦除" - STRING_FOR_ERROR "无效的变量指定。" - STRING_SCREEN_COL "无效的列值" - STRING_SCREEN_ROW "无效的行值" + STRING_FOR_ERROR "无效的变量指定。\n" + STRING_SCREEN_COL "无效的列值\n" + STRING_SCREEN_ROW "无效的行值\n" STRING_TIMER_TIME "计时器 %d 是 %s：" STRING_MKLINK_CREATED_SYMBOLIC "已为 %s <<===>> %s 创建符号链接\n" STRING_MKLINK_CREATED_HARD "已为 %s <<===>> %s 创建硬链接\n" diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc index bc32ae71020..913295e16c8 100644 --- a/base/shell/cmd/lang/zh-TW.rc +++ b/base/shell/cmd/lang/zh-TW.rc @@ -103,9 +103,9 @@ CTTY device\n\n\ CON is usually the default standard I/O device.\n\n\ To return control to the standard console, type: CTTY CON on the auxiliary\n\ device." - STRING_DATE_HELP1 "\n輸入新的日期 (mm%cdd%cyyyy)：" - STRING_DATE_HELP2 "\n輸入新的日期 (dd%cmm%cyyyy)：" - STRING_DATE_HELP3 "\n輸入新的日期 (yyyy%cmm%cdd)：" + STRING_DATE_HELP1 "輸入新的日期 (mm%cdd%cyyyy)： " + STRING_DATE_HELP2 "輸入新的日期 (dd%cmm%cyyyy)： " + STRING_DATE_HELP3 "輸入新的日期 (yyyy%cmm%cdd)： " STRING_DATE_HELP4 "顯示或者設定日期。\n\n\ DATE [/T][日期]\n\n\ /T 僅顯示\n\n\ @@ -237,7 +237,7 @@ ERRORLEVEL 數字當上一個程式返回一個大於或等於指定數字字元串1==字元串2 當所指定的字元串相匹配時為 TRUE。\n\ EXIST 檔案名稱當指定的檔案名稱存在時為 TRUE。\n\ DEFINED 變數當指定的變數已被定義時為 TRUE。\n" - STRING_LOCALE_HELP1 "目前的時間是" + STRING_TIME_NOW "目前的時間是： " STRING_MKDIR_HELP "建立一個目錄。\n\n\ MKDIR [磁碟機:]路徑\nMD [磁碟機:]路徑" STRING_MKLINK_HELP "建立一個檔案系統連結物件。\n\n\ @@ -377,7 +377,7 @@ TITLE [字串]\n\n\ TIME [/T][時間]\n\n\ /T 僅顯示\n\n\ 執行不帶參數的 TIME 將會顯示目前的時間設定並且提示設定新的時間。按下 ENTER 鍵來保持原有設定。\n" - STRING_TIME_HELP2 "輸入新的時間：" + STRING_TIME_HELP2 "輸入新的時間： " STRING_TIMER_HELP1 "已過去 %d 毫秒\n" STRING_TIMER_HELP2 "已過去 %02d%c%02d%c%02d%c%02d\n" STRING_TIMER_HELP3 "允許使用最多十個計時器。\n\n\ @@ -453,23 +453,23 @@ RESTORE 恢復視窗\n\ STRING_CMD_ERROR3 "無法重定向到檔案 %s\n" STRING_CMD_ERROR4 "正在運行 %s...\n" STRING_CMD_ERROR5 "正在運行 cmdexit.bat...\n" - STRING_COLOR_ERROR1 "同樣顏色錯誤！ (背景和前景不能同色)" - STRING_COLOR_ERROR2 "顏色指定錯誤" + STRING_COLOR_ERROR1 "同樣顏色錯誤！ (背景和前景不能同色)\n" + STRING_COLOR_ERROR2 "顏色指定錯誤\n" STRING_CONSOLE_ERROR "未知錯誤：%d\n" STRING_COPY_ERROR1 "錯誤：無法開啟來源 - %s！\n" STRING_COPY_ERROR2 "錯誤：無法複製到自身！\n" STRING_COPY_ERROR3 "寫入目的時出錯！\n" STRING_COPY_ERROR4 "錯誤：尚未實現！\n" - STRING_DATE_ERROR "無效的日期。" + STRING_DATE_ERROR "無效的日期。\n" STRING_DEL_ERROR5 "檔案 %s 將會被刪除！" STRING_DEL_ERROR6 "您確定嗎 (Y/N)？ " STRING_DEL_ERROR7 "正在刪除：%s\n" STRING_ERROR_ERROR1 "未知錯誤！錯誤碼：0x%lx\n" STRING_ERROR_ERROR2 "語法錯誤" - STRING_FOR_ERROR1 "語句中缺少 'in'。" - STRING_FOR_ERROR2 "沒有發現括號。" - STRING_FOR_ERROR3 "缺少 'do'。" - STRING_FOR_ERROR4 "'do' 後沒有命令。" + STRING_FOR_ERROR1 "語句中缺少 'in'。\n" + STRING_FOR_ERROR2 "沒有發現括號。\n" + STRING_FOR_ERROR3 "缺少 'do'。\n" + STRING_FOR_ERROR4 "'do' 後沒有命令。\n" STRING_FREE_ERROR1 "無效的磁碟機" STRING_FREE_ERROR2 "未標記" STRING_GOTO_ERROR1 "沒有為 GOTO 指定標籤\n" @@ -478,10 +478,10 @@ RESTORE 恢復視窗\n\ STRING_MD_ERROR2 "新資料夾的路徑不存在。\n" STRING_MOVE_ERROR1 "[成功]\n" STRING_MOVE_ERROR2 "[錯誤]\n" - STRING_REN_ERROR1 "MoveFile() 失敗。錯誤碼：%lu\n" - STRING_TIME_ERROR1 "無效的時間。" - STRING_TYPE_ERROR1 "無效的選項 '/%s'\n" - STRING_WINDOW_ERROR1 "找不到視窗" + STRING_REN_ERROR "MoveFile() 失敗。錯誤碼：%lu\n" + STRING_TIME_ERROR "無效的時間。\n" + STRING_TYPE_ERROR "無效的選項 '/%s'\n" + STRING_WINDOW_ERROR "找不到視窗\n" STRING_ERROR_PARAMETERF_ERROR "參數格式不正確 - %c\n" STRING_ERROR_INVALID_SWITCH "無效的開關 - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "太多參數 - %s\n" @@ -510,9 +510,9 @@ RESTORE 恢復視窗\n\ STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d 個檔案已複製\n" STRING_DELETE_WIPE "已擦除" - STRING_FOR_ERROR "無效的變數指定。" - STRING_SCREEN_COL "無效的行值" - STRING_SCREEN_ROW "無效的列值" + STRING_FOR_ERROR "無效的變數指定。\n" + STRING_SCREEN_COL "無效的行值\n" + STRING_SCREEN_ROW "無效的列值\n" STRING_TIMER_TIME "計時器 %d 是 %s：" STRING_MKLINK_CREATED_SYMBOLIC "已為 %s <<===>> %s 建立符號連結\n" STRING_MKLINK_CREATED_HARD "已為 %s <<===>> %s 建立硬連結\n" diff --git a/base/shell/cmd/misc.c b/base/shell/cmd/misc.c index 97b252e50ed..13403f9f2d0 100644 --- a/base/shell/cmd/misc.c +++ b/base/shell/cmd/misc.c @@ -570,7 +570,6 @@ INT FilePromptYN (UINT resID) /* preliminary fix */ ConInString(szIn, 10); - ConOutChar(_T('\n')); _tcsupr (szIn); for (p = szIn; _istspace (*p); p++) @@ -634,13 +633,12 @@ INT FilePromptYNA (UINT resID) /* preliminary fix */ ConInString(szIn, 10); - ConOutChar(_T('\n')); _tcsupr (szIn); for (p = szIn; _istspace (*p); p++) ; - LoadString( CMD_ModuleHandle, STRING_COPY_OPTION, szMsg, ARRAYSIZE(szMsg)); + LoadString(CMD_ModuleHandle, STRING_COPY_OPTION, szMsg, ARRAYSIZE(szMsg)); if (_tcsncmp(p, &szMsg[0], 1) == 0) return PROMPT_YES; diff --git a/base/shell/cmd/ren.c b/base/shell/cmd/ren.c index 7a19e4ad379..76864274c11 100644 --- a/base/shell/cmd/ren.c +++ b/base/shell/cmd/ren.c @@ -314,7 +314,7 @@ INT cmd_rename (LPTSTR param) else { if (!(dwFlags & REN_ERROR)) - ConErrResPrintf(STRING_REN_ERROR1, GetLastError()); + ConErrResPrintf(STRING_REN_ERROR, GetLastError()); } } } diff --git a/base/shell/cmd/resource.h b/base/shell/cmd/resource.h index 7836cfb96b8..8024eeb2ad1 100644 --- a/base/shell/cmd/resource.h +++ b/base/shell/cmd/resource.h @@ -53,10 +53,10 @@ #define STRING_MOVE_ERROR1 342 #define STRING_MOVE_ERROR2 343 #define STRING_SET_ENV_ERROR 345 -#define STRING_REN_ERROR1 346 -#define STRING_TIME_ERROR1 348 -#define STRING_TYPE_ERROR1 349 -#define STRING_WINDOW_ERROR1 350 +#define STRING_REN_ERROR 346 +#define STRING_TIME_ERROR 348 +#define STRING_TYPE_ERROR 349 +#define STRING_WINDOW_ERROR 350 #define STRING_REPLACE_ERROR1 351 #define STRING_REPLACE_ERROR2 352 #define STRING_REPLACE_ERROR3 353 @@ -134,7 +134,7 @@ #define STRING_GOTO_HELP1 659 -#define STRING_LOCALE_HELP1 666 +#define STRING_TIME_NOW 666 #define STRING_MKDIR_HELP 667 diff --git a/base/shell/cmd/start.c b/base/shell/cmd/start.c index aec8aa8c853..34bef7dbf84 100644 --- a/base/shell/cmd/start.c +++ b/base/shell/cmd/start.c @@ -164,7 +164,7 @@ INT cmd_start (LPTSTR Rest) } else { - ConErrResPrintf(STRING_TYPE_ERROR1, option); + ConErrResPrintf(STRING_TYPE_ERROR, option); return 0; } } diff --git a/base/shell/cmd/time.c b/base/shell/cmd/time.c index c53abbf11bf..f8fa5d6a282 100644 --- a/base/shell/cmd/time.c +++ b/base/shell/cmd/time.c @@ -157,7 +157,7 @@ INT cmd_time(LPTSTR param) SYSTEMTIME st; GetLocalTime(&st); FormatTime(szTime, &st); - ConOutPuts(szTime); + ConOutPrintf(_T("%s\n"), szTime); freep(arg); return 0; } @@ -168,8 +168,8 @@ INT cmd_time(LPTSTR param) if (nTimeString == -1) { - ConOutResPrintf(STRING_LOCALE_HELP1); - ConOutPrintf(_T(": %s\n"), GetTimeString()); + ConOutResPuts(STRING_TIME_NOW); + ConOutPrintf(_T("%s\n"), GetTimeString()); } while (TRUE) @@ -202,7 +202,7 @@ INT cmd_time(LPTSTR param) nTimeString = -1; } - ConErrResPuts(STRING_TIME_ERROR1); + ConErrResPuts(STRING_TIME_ERROR); nErrorLevel = 1; } diff --git a/base/shell/cmd/type.c b/base/shell/cmd/type.c index 450f2e49240..6d061824f05 100644 --- a/base/shell/cmd/type.c +++ b/base/shell/cmd/type.c @@ -267,7 +267,7 @@ INT cmd_type(LPTSTR param) } // error_invalid_switch(argv[i] + 1); - ConErrResPrintf(STRING_TYPE_ERROR1, argv[i] + 1); + ConErrResPrintf(STRING_TYPE_ERROR, argv[i] + 1); nErrorLevel = 1; goto Quit; } diff --git a/base/shell/cmd/window.c b/base/shell/cmd/window.c index 45a7d758471..324a5cf84c1 100644 --- a/base/shell/cmd/window.c +++ b/base/shell/cmd/window.c @@ -213,7 +213,7 @@ INT CommandActivate (LPTSTR param) { if (arg != NULL) freep(arg); - ConErrResPuts(STRING_WINDOW_ERROR1); + ConErrResPuts(STRING_WINDOW_ERROR); return 1; } if (arg != NULL)

10 months, 1 week

[reactos] 01/02: [RTL] Minor formatting, remove redundant 'return'.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cef9f5c4a6997601bf74a… commit cef9f5c4a6997601bf74a65e20b07242585e039f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Nov 15 21:12:05 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 16 17:06:40 2023 +0100 [RTL] Minor formatting, remove redundant 'return'. --- dll/ntdll/rtl/libsupp.c | 1 - ntoskrnl/rtl/libsupp.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dll/ntdll/rtl/libsupp.c b/dll/ntdll/rtl/libsupp.c index 7053bf401d7..18bac9a7b25 100644 --- a/dll/ntdll/rtl/libsupp.c +++ b/dll/ntdll/rtl/libsupp.c @@ -338,7 +338,6 @@ RtlpGetStackLimits( { *LowLimit = (ULONG_PTR)NtCurrentTeb()->NtTib.StackLimit; *HighLimit = (ULONG_PTR)NtCurrentTeb()->NtTib.StackBase; - return; } BOOLEAN diff --git a/ntoskrnl/rtl/libsupp.c b/ntoskrnl/rtl/libsupp.c index 1a6ac697a7c..462bea20fa0 100644 --- a/ntoskrnl/rtl/libsupp.c +++ b/ntoskrnl/rtl/libsupp.c @@ -513,13 +513,13 @@ RtlpGetStackLimits( OUT PULONG_PTR HighLimit) { PKTHREAD CurrentThread = KeGetCurrentThread(); + *LowLimit = (ULONG_PTR)CurrentThread->StackLimit; #ifdef _M_IX86 - * HighLimit = (ULONG_PTR)CurrentThread->InitialStack - + *HighLimit = (ULONG_PTR)CurrentThread->InitialStack - sizeof(FX_SAVE_AREA); #else *HighLimit = (ULONG_PTR)CurrentThread->InitialStack; #endif - *LowLimit = (ULONG_PTR)CurrentThread->StackLimit; } /* RTL Atom Tables ************************************************************/

10 months, 1 week

[reactos] 01/01: [INF] Update Romanian (ro-RO) translation (#5969)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a6b5ec22c4f5f29d83c5… commit 6a6b5ec22c4f5f29d83c55db33085e65202f4489 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Thu Nov 16 14:34:43 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 16 13:34:43 2023 +0100 [INF] Update Romanian (ro-RO) translation (#5969) --- media/inf/legcydrv.inf | 2 +- media/inf/wdmaudio.inf | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/media/inf/legcydrv.inf b/media/inf/legcydrv.inf index 76cf3d27a24..b02bb3670ec 100644 --- a/media/inf/legcydrv.inf +++ b/media/inf/legcydrv.inf @@ -41,7 +41,7 @@ LegacyDriverClassName = "Controladores incompatibles con PnP" LegacyDriverClassName = "Sterowniki niezgodne z Plug and Play" [Strings.0418] -LegacyDriverClassName = "Modúle pilot de cuplare statică (non-PnP)" +LegacyDriverClassName = "Drivere de dispozitiv ce nu sunt Plug and Play" [Strings.0419] LegacyDriverClassName = "Драйверы устройств не Plug and Play" diff --git a/media/inf/wdmaudio.inf b/media/inf/wdmaudio.inf index 91e9f844923..50f177423e2 100644 --- a/media/inf/wdmaudio.inf +++ b/media/inf/wdmaudio.inf @@ -225,13 +225,13 @@ kmixer.SvcDesc = "Dispozitiv de mixaj audio Wave al ReactOS" WDM_SYSAUDIO.DeviceDesc = "Dispozitiv audio de sistem al ReactOS" WDM_SYSAUDIO.FriendlyName = "Dispozitiv audio de sistem al ReactOS" sysaudio.SvcDesc = "Dispozitiv audio de sistem al ReactOS" -WDM_DRMKAUD.DeviceDesc = "Modúle-pilot audio certificate ale ReactOS" -WDM_DRMKAUD.FriendlyName = "Modúle-pilot audio certificate ale ReactOS" -drmkaud.SvcDesc = "Modúle-pilot audio certificate ale ReactOS" -WDMAUDIO_CopyFilesOnlyId.DeviceDesc = "Modúle-pilot audio WDM ale ReactOS" -WDM_WDMAUD.DeviceDesc = "Modúl-pilot pentru WINMM-WDM-Audio ReactOS" -WDM_WDMAUD.FriendlyName = "Modúl-pilot pentru WINMM-WDM-Audio ReactOS" -wdmaud.SvcDesc = "Modúl-pilot pentru WINMM-WDM-Audio ReactOS" +WDM_DRMKAUD.DeviceDesc = "Drivere audio certificate ale ReactOS" +WDM_DRMKAUD.FriendlyName = "Drivere audio certificate ale ReactOS" +drmkaud.SvcDesc = "Drivere audio certificate ale ReactOS" +WDMAUDIO_CopyFilesOnlyId.DeviceDesc = "Drivere audio WDM ale ReactOS" +WDM_WDMAUD.DeviceDesc = "Driver pentru WINMM-WDM-Audio ReactOS" +WDM_WDMAUD.FriendlyName = "Driver pentru WINMM-WDM-Audio ReactOS" +wdmaud.SvcDesc = "Driver pentru WINMM-WDM-Audio ReactOS" [Strings.041f] WDM_KMIXER.DeviceDesc = "ReactOS Dalga Ses Karıştırıcısı"

10 months, 1 week

[reactos] 01/01: [TASKKILL] Update Romanian (ro-RO) translation (#5954)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f61f3b0b001386682e7ef… commit f61f3b0b001386682e7ef5f7de71c1a553b3e550 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Thu Nov 16 14:33:55 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 16 13:33:55 2023 +0100 [TASKKILL] Update Romanian (ro-RO) translation (#5954) --- base/applications/cmdutils/taskkill/lang/ro-RO.rc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/base/applications/cmdutils/taskkill/lang/ro-RO.rc b/base/applications/cmdutils/taskkill/lang/ro-RO.rc index 649dfc47ed2..445601f02d0 100644 --- a/base/applications/cmdutils/taskkill/lang/ro-RO.rc +++ b/base/applications/cmdutils/taskkill/lang/ro-RO.rc @@ -1,4 +1,10 @@ -/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* + * PROJECT: ReactOS Taskkill Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -18,6 +24,6 @@ STRINGTABLE STRING_ENUM_FAILED, "Eroare: Procesele nu au putut fi enumerate.\n" STRING_TERMINATE_FAILED, "Eroare: Procesul «%1» nu poate fi oprit.\n" STRING_SELF_TERMINATION, "Eroare: Auto-terminarea nu este permisă.\n" - STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" - STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n" + STRING_PARAM_TOO_MUCH, "Eroare: Sintaxă nevalidă. Opțiunea '%1' nu este permisă mai mult de '%2!d!' dată(dăți).\n" + STRING_INVALID_SYNTAX, "Eroare: Sintaxă nevalidă.\n" }

10 months, 1 week

[reactos] 01/01: [MSPAINT] s/AirBrushWidth/AirBrushRadius/

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=157739a658ad4c31acb51… commit 157739a658ad4c31acb51d65d8040cfe894dc1b3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 16 15:45:06 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 16 15:45:06 2023 +0900 [MSPAINT] s/AirBrushWidth/AirBrushRadius/ Fix logical error. CORE-19094 --- base/applications/mspaint/mouse.cpp | 2 +- base/applications/mspaint/toolsettings.cpp | 4 ++-- base/applications/mspaint/toolsmodel.cpp | 14 +++++++------- base/applications/mspaint/toolsmodel.h | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index ad709d9c3db..d650259f6cb 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -654,7 +654,7 @@ struct AirBrushTool : SmoothDrawTool void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; - Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushWidth()); + Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushRadius()); } void OnSpecialTweak(BOOL bMinus) override diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index e8bd61f1b7e..d1a501728a2 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -219,7 +219,7 @@ VOID CToolSettingsWindow::drawAirBrush(HDC hdc, LPCRECT prc) RECT& rc = rects[i]; INT x = (rc.left + rc.right) / 2; INT y = (rc.top + rc.bottom) / 2; - BOOL bHigh = (s_AirRadius[i] == toolsModel.GetAirBrushWidth()); + BOOL bHigh = (s_AirRadius[i] == toolsModel.GetAirBrushRadius()); if (bHigh) { ::FillRect(hdc, &rc, ::GetSysColorBrush(COLOR_HIGHLIGHT)); @@ -438,7 +438,7 @@ LRESULT CToolSettingsWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lPar case TOOL_AIRBRUSH: iItem = getAirBrushRects(rects, &rect1, &pt); if (iItem != -1) - toolsModel.SetAirBrushWidth(s_AirRadius[iItem]); + toolsModel.SetAirBrushRadius(s_AirRadius[iItem]); break; case TOOL_LINE: case TOOL_BEZIER: diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 884b92d7d6c..42ee980c2b3 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -18,7 +18,7 @@ ToolsModel::ToolsModel() m_shapeStyle = 0; m_brushStyle = BrushStyleRound; m_oldActiveTool = m_activeTool = TOOL_PEN; - m_airBrushWidth = 5; + m_airBrushRadius = 5; m_rubberRadius = 4; m_transpBg = FALSE; m_zoom = 1000; @@ -99,8 +99,8 @@ void ToolsModel::MakeBrushThickerOrThinner(BOOL bThinner) void ToolsModel::MakeAirBrushThickerOrThinner(BOOL bThinner) { - INT thickness = GetAirBrushWidth(); - SetAirBrushWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); + INT thickness = GetAirBrushRadius(); + SetAirBrushRadius(bThinner ? max(1, thickness - 1) : (thickness + 1)); } void ToolsModel::MakeRubberThickerOrThinner(BOOL bThinner) @@ -180,14 +180,14 @@ void ToolsModel::SetActiveTool(TOOLTYPE nActiveTool) NotifyToolChanged(); } -int ToolsModel::GetAirBrushWidth() const +INT ToolsModel::GetAirBrushRadius() const { - return m_airBrushWidth; + return m_airBrushRadius; } -void ToolsModel::SetAirBrushWidth(int nAirBrushWidth) +void ToolsModel::SetAirBrushRadius(INT nAirBrushRadius) { - m_airBrushWidth = nAirBrushWidth; + m_airBrushRadius = nAirBrushRadius; NotifyToolSettingsChanged(); } diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index 9af67a501c7..a5737010d9b 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -80,7 +80,7 @@ private: BrushStyle m_brushStyle; TOOLTYPE m_activeTool; TOOLTYPE m_oldActiveTool; - int m_airBrushWidth; + INT m_airBrushRadius; int m_rubberRadius; BOOL m_transpBg; int m_zoom; @@ -116,8 +116,8 @@ public: TOOLTYPE GetOldActiveTool() const; void SetActiveTool(TOOLTYPE nActiveTool); - int GetAirBrushWidth() const; - void SetAirBrushWidth(int nAirBrushWidth); + INT GetAirBrushRadius() const; + void SetAirBrushRadius(INT nAirBrushRadius); void MakeAirBrushThickerOrThinner(BOOL bThinner); int GetRubberRadius() const;

10 months, 1 week

[reactos] 01/01: [CRYPTUI] Let image list be automatically deleted (#5891)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3faa56d2c7eff8330dc57… commit 3faa56d2c7eff8330dc57cbb6beab808ba60ba04 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 16 14:58:49 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 16 14:58:49 2023 +0900 [CRYPTUI] Let image list be automatically deleted (#5891) Based on KRosUser's cryptui.patch. - Don't delete the image list because the list view will delete the image list automatically. CORE-17290 --- dll/win32/cryptui/main.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dll/win32/cryptui/main.c b/dll/win32/cryptui/main.c index f4dee4aded1..75f55df1c17 100644 --- a/dll/win32/cryptui/main.c +++ b/dll/win32/cryptui/main.c @@ -789,11 +789,15 @@ static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, { case IDOK: save_cert_mgr_usages(hwnd); +#ifndef __REACTOS__ ImageList_Destroy((HIMAGELIST)GetWindowLongPtrW(hwnd, DWLP_USER)); +#endif EndDialog(hwnd, IDOK); break; case IDCANCEL: +#ifndef __REACTOS__ ImageList_Destroy((HIMAGELIST)GetWindowLongPtrW(hwnd, DWLP_USER)); +#endif EndDialog(hwnd, IDCANCEL); break; } @@ -1153,6 +1157,14 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, show_store_certs(hwnd, cert_mgr_index_to_store(tab, 0)); break; } +#ifdef __REACTOS__ + case WM_DESTROY: + free_certs(GetDlgItem(hwnd, IDC_MGR_CERTS)); + close_stores(GetDlgItem(hwnd, IDC_MGR_STORES)); + data = (struct CertMgrData *)GetWindowLongPtrW(hwnd, DWLP_USER); + HeapFree(GetProcessHeap(), 0, data); + break; +#endif case WM_NOTIFY: { NMHDR *hdr = (NMHDR *)lp; @@ -1278,11 +1290,13 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, cert_mgr_do_remove(hwnd); break; case IDCANCEL: +#ifndef __REACTOS__ free_certs(GetDlgItem(hwnd, IDC_MGR_CERTS)); close_stores(GetDlgItem(hwnd, IDC_MGR_STORES)); data = (struct CertMgrData *)GetWindowLongPtrW(hwnd, DWLP_USER); ImageList_Destroy(data->imageList); HeapFree(GetProcessHeap(), 0, data); +#endif EndDialog(hwnd, IDCANCEL); break; } @@ -3717,7 +3731,9 @@ static UINT CALLBACK cert_properties_general_callback(HWND hwnd, UINT msg, data = (struct edit_cert_data *)GetWindowLongPtrW(hwnd, DWLP_USER); if (data) { +#ifndef __REACTOS__ ImageList_Destroy(data->imageList); +#endif HeapFree(GetProcessHeap(), 0, data); } break; @@ -4219,7 +4235,9 @@ static UINT CALLBACK hierarchy_callback(HWND hwnd, UINT msg, { case PSPCB_RELEASE: data = (struct hierarchy_data *)page->lParam; +#ifndef __REACTOS__ ImageList_Destroy(data->imageList); +#endif HeapFree(GetProcessHeap(), 0, data); break; } @@ -7321,6 +7339,13 @@ static LRESULT CALLBACK select_cert_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPA select_cert_update_view_button(hwnd); break; } +#ifdef __REACTOS__ + case WM_DESTROY: + free_certs(GetDlgItem(hwnd, IDC_SELECT_CERTS)); + data = (struct SelectCertData *)GetWindowLongPtrW(hwnd, DWLP_USER); + HeapFree(GetProcessHeap(), 0, data); + break; +#endif case WM_NOTIFY: { NMHDR *hdr = (NMHDR *)lp; @@ -7378,17 +7403,21 @@ static LRESULT CALLBACK select_cert_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPA break; } *data->cert = CertDuplicateCertificateContext(cert); +#ifndef __REACTOS__ free_certs(GetDlgItem(hwnd, IDC_SELECT_CERTS)); ImageList_Destroy(data->imageList); HeapFree(GetProcessHeap(), 0, data); +#endif EndDialog(hwnd, IDOK); break; } case IDCANCEL: +#ifndef __REACTOS__ data = (struct SelectCertData *)GetWindowLongPtrW(hwnd, DWLP_USER); free_certs(GetDlgItem(hwnd, IDC_SELECT_CERTS)); ImageList_Destroy(data->imageList); HeapFree(GetProcessHeap(), 0, data); +#endif EndDialog(hwnd, IDCANCEL); break; case IDC_SELECT_VIEW_CERT:

10 months, 1 week

[reactos] 01/01: [NTDDRAW][NTGDI][VGADDI] Add missing \n to DPRINT() calls (#5952)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24757e30e9f26f2ff5237… commit 24757e30e9f26f2ff52371f29178f2a01b97a316 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Nov 15 21:07:27 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 15 21:07:27 2023 +0100 [NTDDRAW][NTGDI][VGADDI] Add missing \n to DPRINT() calls (#5952) Add missing \n to DPRINT() calls and demote some DPRINT1(). --- win32ss/drivers/displays/vga/main/enable.c | 9 +-- win32ss/gdi/ntgdi/dibobj.c | 6 +- win32ss/gdi/ntgdi/region.c | 21 +----- win32ss/reactx/ntddraw/d3d.c | 73 ++++++++++----------- win32ss/reactx/ntddraw/d3dkmt.c | 13 ++-- win32ss/reactx/ntddraw/dd.c | 26 ++++---- win32ss/reactx/ntddraw/ddraw.c | 64 +++++++----------- win32ss/reactx/ntddraw/ddsurf.c | 61 +++++++++-------- win32ss/reactx/ntddraw/dvp.c | 102 +++++++++++++---------------- win32ss/reactx/ntddraw/dxeng.c | 97 +++++++++++++-------------- win32ss/reactx/ntddraw/eng.c | 22 +++---- win32ss/reactx/ntddraw/mocomp.c | 58 ++++++++-------- 12 files changed, 237 insertions(+), 315 deletions(-) diff --git a/win32ss/drivers/displays/vga/main/enable.c b/win32ss/drivers/displays/vga/main/enable.c index 8a644b2280c..58f829aff30 100644 --- a/win32ss/drivers/displays/vga/main/enable.c +++ b/win32ss/drivers/displays/vga/main/enable.c @@ -281,7 +281,6 @@ DrvEnablePDEV(IN DEVMODEW *DM, return (DHPDEV) PDev; } - // DrvCompletePDEV // DESCRIPTION // Called after initialization of PDEV is complete. Supplies @@ -294,7 +293,6 @@ DrvCompletePDEV(IN DHPDEV PDev, ((PPDEV) PDev)->GDIDevHandle = Dev; // Handle to the DC } - BOOL APIENTRY DrvAssertMode(IN DHPDEV DPev, IN BOOL Enable) @@ -324,7 +322,7 @@ DrvAssertMode(IN DHPDEV DPev, else { /* Go back to last known mode */ - DPRINT( "ppdev: %x, KMDriver: %x", ppdev, ppdev->KMDriver ); + DPRINT("ppdev: %p, KMDriver: %p\n", ppdev, ppdev->KMDriver); if (EngDeviceIoControl(ppdev->KMDriver, IOCTL_VIDEO_RESET_DEVICE, NULL, 0, NULL, 0, &returnedDataLength)) { /* Failed to go back to mode */ @@ -335,7 +333,6 @@ DrvAssertMode(IN DHPDEV DPev, return TRUE; } - VOID APIENTRY DrvDisablePDEV(IN DHPDEV PDev) { @@ -352,7 +349,6 @@ DrvDisablePDEV(IN DHPDEV PDev) EngFreeMem(PDev); } - VOID APIENTRY DrvDisableSurface(IN DHPDEV PDev) { @@ -389,7 +385,6 @@ DrvDisableSurface(IN DHPDEV PDev) /* EngFreeMem(pdsurf); */ /* free the surface */ } - static VOID InitSavedBits(IN PPDEV ppdev) { @@ -429,7 +424,6 @@ InitSavedBits(IN PPDEV ppdev) ppdev->BitsSaved = FALSE; } - HSURF APIENTRY DrvEnableSurface(IN DHPDEV PDev) { @@ -516,7 +510,6 @@ error_done: return NULL; } - ULONG APIENTRY DrvGetModes(IN HANDLE Driver, IN ULONG DataSize, diff --git a/win32ss/gdi/ntgdi/dibobj.c b/win32ss/gdi/ntgdi/dibobj.c index 456210d880a..60eb419ca20 100644 --- a/win32ss/gdi/ntgdi/dibobj.c +++ b/win32ss/gdi/ntgdi/dibobj.c @@ -275,7 +275,7 @@ IntSetDIBits( else { /* Compressed format without a size. This is invalid. */ - DPRINT1("Compressed format without a size!"); + DPRINT1("Compressed format without a size\n"); return 0; } @@ -711,7 +711,6 @@ Exit: return ret; } - /* Converts a device-dependent bitmap to a DIB */ INT APIENTRY @@ -1218,7 +1217,6 @@ cleanup: return iResult; } - W32KAPI INT APIENTRY @@ -1537,7 +1535,6 @@ NtGdiStretchDIBitsInternal( return LinesCopied; } - HBITMAP FASTCALL IntCreateDIBitmap( @@ -2019,7 +2016,6 @@ DIB_CreateDIBSection( // hSecure = MmSecureVirtualMemory(bm.bmBits, totalSize, PAGE_READWRITE); hSecure = (HANDLE)0x1; // HACK OF UNIMPLEMENTED KERNEL STUFF !!!! - // Create Device Dependent Bitmap and add DIB pointer //Size.cx = bm.bmWidth; //Size.cy = abs(bm.bmHeight); diff --git a/win32ss/gdi/ntgdi/region.c b/win32ss/gdi/ntgdi/region.c index 2edf76d4a9f..ff18100f2dd 100644 --- a/win32ss/gdi/ntgdi/region.c +++ b/win32ss/gdi/ntgdi/region.c @@ -120,7 +120,6 @@ SOFTWARE. // // - #include <win32k.h> #include <suppress.h> @@ -252,7 +251,6 @@ typedef struct INT incr1, incr2; /* Error increments */ } BRESINFO; - #define BRESINITPGONSTRUCT(dmaj, min1, min2, bres) \ BRESINITPGON(dmaj, min1, min2, bres.minor_axis, bres.d, \ bres.m, bres.m1, bres.incr1, bres.incr2) @@ -260,8 +258,6 @@ typedef struct #define BRESINCRPGONSTRUCT(bres) \ BRESINCRPGON(bres.d, bres.minor_axis, bres.m, bres.m1, bres.incr1, bres.incr2) - - /* * These are the data structures needed to scan * convert regions. Two different scan conversion @@ -324,7 +320,6 @@ typedef struct _EDGE_TABLE_ENTRY INT ClockWise; /* Flag for winding number rule */ } EDGE_TABLE_ENTRY; - typedef struct _SCANLINE_LIST { INT scanline; /* The scanline represented */ @@ -332,7 +327,6 @@ typedef struct _SCANLINE_LIST struct _SCANLINE_LIST *next; /* Next in the list */ } SCANLINE_LIST; - typedef struct { INT ymax; /* ymax for the polygon */ @@ -340,7 +334,6 @@ typedef struct SCANLINE_LIST scanlines; /* Header node */ } EDGE_TABLE; - /* * Here is a struct to help with storage allocation * so we can allocate a big chunk at a time, and then take @@ -354,7 +347,6 @@ typedef struct _SCANLINE_LISTBLOCK struct _SCANLINE_LISTBLOCK *next; } SCANLINE_LISTBLOCK; - /* * A few macros for the inner loops of the fill code where * performance considerations don't allow a procedure call. @@ -382,7 +374,6 @@ typedef struct _SCANLINE_LISTBLOCK } \ } - /* * Evaluate the given edge at the given scanline. * If the edge has expired, then we leave it and fix up @@ -561,7 +552,6 @@ IntDumpRegion(HRGN hRgn) } #endif /* Not NDEBUG */ - INT FASTCALL REGION_Complexity(PREGION prgn) @@ -569,7 +559,7 @@ REGION_Complexity(PREGION prgn) if (prgn == NULL) return NULLREGION; - DPRINT("Region Complexity -> %lu", prgn->rdh.nCount); + DPRINT("Region Complexity: %lu\n", prgn->rdh.nCount); switch (prgn->rdh.nCount) { case 0: @@ -801,7 +791,6 @@ empty: return NULLREGION; } - /*! * Attempt to merge the rects in the current band with those in the * previous one. Used only by REGION_RegionOp. @@ -1597,7 +1586,6 @@ REGION_SubtractNonO1( return TRUE; } - /*! * Overlapping band subtraction. x1 is the left-most point not yet * checked. @@ -1803,7 +1791,6 @@ REGION_XorRegion( return ret; } - /*! * Adds a rectangle to a REGION */ @@ -2210,10 +2197,8 @@ REGION_bXformRgn( return bResult; } - } - PREGION FASTCALL REGION_AllocRgnWithHandle( @@ -2304,7 +2289,6 @@ REGION_bAllocRgnAttr( return TRUE; } - // // Allocate User Space Region Handle. // @@ -2596,7 +2580,6 @@ IntGdiGetRgnBox( return ret; } - BOOL FASTCALL REGION_PtInRegion( @@ -3051,7 +3034,6 @@ REGION_FreeStorage( } } - /*********************************************************************** * REGION_PtsToRegion * @@ -3524,7 +3506,6 @@ IntRectInRegion( return Ret; } - // // NtGdi Exported Functions // diff --git a/win32ss/reactx/ntddraw/d3d.c b/win32ss/reactx/ntddraw/d3d.c index 8eb87a5879f..d41565a54b6 100644 --- a/win32ss/reactx/ntddraw/d3d.c +++ b/win32ss/reactx/ntddraw/d3d.c @@ -14,8 +14,9 @@ */ #include <win32k.h> -#include <debug.h> +// #define NDEBUG +#include <debug.h> /*++ * @name NtGdiDdCanCreateD3DBuffer @@ -54,7 +55,6 @@ * the correct struct is LPDDHAL_CANCREATESURFACEDATA. * *--*/ - DWORD APIENTRY NtGdiDdCanCreateD3DBuffer(HANDLE hDirectDraw, @@ -64,11 +64,11 @@ NtGdiDdCanCreateD3DBuffer(HANDLE hDirectDraw, if (pfnDdCanCreateD3DBuffer == NULL) { - DPRINT1("Warring no pfnDdCanCreateD3DBuffer"); + DPRINT1("Warning: no pfnDdCanCreateD3DBuffer\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdCanCreateD3DBuffer"); + DPRINT("Calling dxg.sys pfnDdCanCreateD3DBuffer\n"); return pfnDdCanCreateD3DBuffer(hDirectDraw,puCanCreateSurfaceData); } @@ -112,7 +112,7 @@ NtGdiDdCanCreateD3DBuffer(HANDLE hDirectDraw, * Do not forget LPD3DNTHAL_CONTEXTCREATEDATA is typecast of LPD3DHAL_CONTEXTCREATEDATA and thuse two struct are different size, * the correct struct is LPD3DHAL_CONTEXTCREATEDATA. *--*/ -BOOL +BOOL APIENTRY NtGdiD3dContextCreate(HANDLE hDirectDrawLocal, HANDLE hSurfColor, @@ -123,11 +123,11 @@ NtGdiD3dContextCreate(HANDLE hDirectDrawLocal, if (pfnD3dContextCreate == NULL) { - DPRINT1("Warning: no pfnD3dContextCreate"); + DPRINT1("Warning: no pfnD3dContextCreate\n"); return FALSE; } - DPRINT1("Calling dxg.sys D3dContextCreate"); + DPRINT("Calling dxg.sys pfnD3dContextCreate\n"); return pfnD3dContextCreate(hDirectDrawLocal, hSurfColor, hSurfZ, pdcci); } @@ -158,11 +158,11 @@ NtGdiD3dContextDestroy(LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData) if ( pfnD3dContextDestroy == NULL) { - DPRINT1("Warning: no pfnD3dContextDestroy"); + DPRINT1("Warning: no pfnD3dContextDestroy\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys D3dContextDestroy"); + DPRINT("Calling dxg.sys pfnD3dContextDestroy\n"); return pfnD3dContextDestroy(pContextDestroyData); } @@ -196,11 +196,11 @@ NtGdiD3dContextDestroyAll(LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcad) if (pfnD3dContextDestroyAll == NULL) { - DPRINT1("Warning: no pfnD3dContextDestroyAll"); + DPRINT1("Warning: no pfnD3dContextDestroyAll\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys D3dContextDestroyAll"); + DPRINT("Calling dxg.sys pfnD3dContextDestroyAll\n"); return pfnD3dContextDestroyAll(pdcad); } @@ -271,11 +271,11 @@ NtGdiDdCreateD3DBuffer(HANDLE hDirectDraw, if (pfnDdCreateD3DBuffer == NULL) { - DPRINT1("Warning: no pfnDdCreateD3DBuffer"); + DPRINT1("Warning: no pfnDdCreateD3DBuffer\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DdCreateD3DBuffer"); + DPRINT("Calling dxg.sys pfnDdCreateD3DBuffer\n"); return pfnDdCreateD3DBuffer(hDirectDraw, hSurface, puSurfaceDescription, puSurfaceGlobalData, puSurfaceLocalData, puSurfaceMoreData, @@ -289,15 +289,16 @@ DWORD APIENTRY NtGdiDdDestroyD3DBuffer(HANDLE hSurface) { - PGD_DXDDDESTROYD3DBUFFER pfnDdDestroyD3DBuffer = (PGD_DXDDDESTROYD3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdDestroyD3DBuffer].pfn; - + PGD_DXDDDESTROYD3DBUFFER pfnDdDestroyD3DBuffer = + (PGD_DXDDDESTROYD3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdDestroyD3DBuffer].pfn; + if (pfnDdDestroyD3DBuffer == NULL) { - DPRINT1("Warning: no pfnDdDestroyD3DBuffer"); + DPRINT1("Warning: no pfnDdDestroyD3DBuffer\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdDestroyD3DBuffer"); + DPRINT("Calling dxg.sys pfnDdDestroyD3DBuffer\n"); return pfnDdDestroyD3DBuffer(hSurface); } @@ -314,19 +315,19 @@ NtGdiD3dDrawPrimitives2(HANDLE hCmdBuf, FLATPTR *pfpVidMemVtx, DWORD *pdwSizeVtx) { - PGD_D3DDRAWPRIMITIVES2 pfnD3dDrawPrimitives2 = (PGD_D3DDRAWPRIMITIVES2)gpDxFuncs[DXG_INDEX_DxD3dDrawPrimitives2].pfn; - + PGD_D3DDRAWPRIMITIVES2 pfnD3dDrawPrimitives2 = + (PGD_D3DDRAWPRIMITIVES2)gpDxFuncs[DXG_INDEX_DxD3dDrawPrimitives2].pfn; + if (pfnD3dDrawPrimitives2 == NULL) { - DPRINT1("Warning: no pfnD3dDrawPrimitives2"); + DPRINT1("Warning: no pfnD3dDrawPrimitives2\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys D3dDrawPrimitives2"); + DPRINT("Calling dxg.sys pfnD3dDrawPrimitives2\n"); return pfnD3dDrawPrimitives2(hCmdBuf,hVBuf,pded,pfpVidMemCmd,pdwSizeCmd,pfpVidMemVtx,pdwSizeVtx); } - /************************************************************************/ /* NtGdiD3dValidateTextureStageState */ /************************************************************************/ @@ -335,15 +336,15 @@ APIENTRY NtGdiDdLockD3D(HANDLE hSurface, PDD_LOCKDATA puLockData) { - PGD_DXDDLOCKD3D pfnDdLockD3D = (PGD_DXDDLOCKD3D)gpDxFuncs[DXG_INDEX_DxDdLockD3D].pfn; - + PGD_DXDDLOCKD3D pfnDdLockD3D = (PGD_DXDDLOCKD3D)gpDxFuncs[DXG_INDEX_DxDdLockD3D].pfn; + if (pfnDdLockD3D == NULL) { - DPRINT1("Warning: no pfnDdLockD3D"); + DPRINT1("Warning: no pfnDdLockD3D\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdLockD3D"); + DPRINT("Calling dxg.sys pfnDdLockD3D\n"); return pfnDdLockD3D(hSurface, puLockData); } @@ -354,15 +355,16 @@ DWORD APIENTRY NtGdiD3dValidateTextureStageState(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData) { - PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState = (PGD_D3DVALIDATETEXTURESTAGESTATE)gpDxFuncs[DXG_INDEX_DxD3dValidateTextureStageState].pfn; - + PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState = + (PGD_D3DVALIDATETEXTURESTAGESTATE)gpDxFuncs[DXG_INDEX_DxD3dValidateTextureStageState].pfn; + if (pfnD3dValidateTextureStageState == NULL) { - DPRINT1("Warning: no pfnD3dValidateTextureStageState"); + DPRINT1("Warning: no pfnD3dValidateTextureStageState\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys D3dValidateTextureStageState"); + DPRINT("Calling dxg.sys pfnD3dValidateTextureStageState\n"); return pfnD3dValidateTextureStageState(pData); } @@ -375,18 +377,13 @@ NtGdiDdUnlockD3D(HANDLE hSurface, PDD_UNLOCKDATA puUnlockData) { PGD_DXDDUNLOCKD3D pfnDdUnlockD3D = (PGD_DXDDUNLOCKD3D)gpDxFuncs[DXG_INDEX_DxDdUnlockD3D].pfn; - + if (pfnDdUnlockD3D == NULL) { - DPRINT1("Warning: no pfnDdUnlockD3D"); + DPRINT1("Warning: no pfnDdUnlockD3D\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdUnlockD3D"); + DPRINT("Calling dxg.sys pfnDdUnlockD3D\n"); return pfnDdUnlockD3D(hSurface, puUnlockData); - } - - - - diff --git a/win32ss/reactx/ntddraw/d3dkmt.c b/win32ss/reactx/ntddraw/d3dkmt.c index cc0852e854d..93365364efc 100644 --- a/win32ss/reactx/ntddraw/d3dkmt.c +++ b/win32ss/reactx/ntddraw/d3dkmt.c @@ -7,7 +7,6 @@ */ #include <win32k.h> -#include <debug.h> DWORD APIENTRY @@ -39,10 +38,10 @@ NtGdiDdDDICreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc) { D3DDDIFMT_P8, 8, BI_RGB, 256, 0x00000000, 0x00000000, 0x00000000 }, }; - if (!desc) + if (!desc) return STATUS_INVALID_PARAMETER; - if (!desc->pMemory) + if (!desc->pMemory) return STATUS_INVALID_PARAMETER; for (i = 0; i < sizeof(format_info) / sizeof(*format_info); ++i) @@ -54,7 +53,7 @@ NtGdiDdDDICreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc) } } - if (!format) + if (!format) return STATUS_INVALID_PARAMETER; if (desc->Width > (UINT_MAX & ~3) / (format->bit_count / 8) || @@ -109,11 +108,11 @@ DWORD APIENTRY NtGdiDdDDIDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc) { - if (!desc) + if (!desc) return STATUS_INVALID_PARAMETER; - if (GDI_HANDLE_GET_TYPE(desc->hDc) != GDI_OBJECT_TYPE_DC || - GDI_HANDLE_GET_TYPE(desc->hBitmap) != GDI_OBJECT_TYPE_BITMAP) + if (GDI_HANDLE_GET_TYPE(desc->hDc) != GDI_OBJECT_TYPE_DC || + GDI_HANDLE_GET_TYPE(desc->hBitmap) != GDI_OBJECT_TYPE_BITMAP) return STATUS_INVALID_PARAMETER; NtGdiDeleteObjectApp(desc->hBitmap); diff --git a/win32ss/reactx/ntddraw/dd.c b/win32ss/reactx/ntddraw/dd.c index 152daecf0d9..f5a9c683af5 100644 --- a/win32ss/reactx/ntddraw/dd.c +++ b/win32ss/reactx/ntddraw/dd.c @@ -9,6 +9,8 @@ */ #include <win32k.h> + +// #define NDEBUG #include <debug.h> /************************************************************************/ @@ -26,14 +28,14 @@ NtGdiDdCreateSurface(HANDLE hDirectDrawLocal, HANDLE *puhSurface) { PGD_DDCREATESURFACE pfnDdCreateSurface = (PGD_DDCREATESURFACE)gpDxFuncs[DXG_INDEX_DxDdCreateSurface].pfn; - + if (pfnDdCreateSurface == NULL) { DPRINT1("Warning: no pfnDdCreateSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdCreateSurface\n"); + DPRINT("Calling dxg.sys pfnDdCreateSurface\n"); return pfnDdCreateSurface(hDirectDrawLocal,hSurface,puSurfaceDescription,puSurfaceGlobalData, puSurfaceLocalData,puSurfaceMoreData,puCreateSurfaceData,puhSurface); } @@ -47,14 +49,14 @@ NtGdiDdWaitForVerticalBlank(HANDLE hDirectDraw, PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData) { PGD_DXDDWAITFORVERTICALBLANK pfnDdWaitForVerticalBlank = (PGD_DXDDWAITFORVERTICALBLANK)gpDxFuncs[DXG_INDEX_DxDdWaitForVerticalBlank].pfn; - + if (pfnDdWaitForVerticalBlank == NULL) { DPRINT1("Warning: no pfnDdWaitForVerticalBlank\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdWaitForVerticalBlank\n"); + DPRINT("Calling dxg.sys pfnDdWaitForVerticalBlank\n"); return pfnDdWaitForVerticalBlank(hDirectDraw, puWaitForVerticalBlankData); } @@ -67,14 +69,14 @@ NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal, PDD_CANCREATESURFACEDATA puCanCreateSurfaceData) { PGD_DDCANCREATESURFACE pfnDdCanCreateSurface = (PGD_DDCANCREATESURFACE)gpDxFuncs[DXG_INDEX_DxDdCanCreateSurface].pfn; - + if (pfnDdCanCreateSurface == NULL) { DPRINT1("Warning: no pfnDdCanCreateSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DdCanCreateSurface\n"); + DPRINT("Calling dxg.sys pfnDdCanCreateSurface\n"); return pfnDdCanCreateSurface(hDirectDrawLocal,puCanCreateSurfaceData); } @@ -83,19 +85,19 @@ NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal, /* NtGdiDdGetScanLine */ /************************************************************************/ DWORD -APIENTRY +APIENTRY NtGdiDdGetScanLine(HANDLE hDirectDrawLocal, PDD_GETSCANLINEDATA puGetScanLineData) { PGD_DXDDGETSCANLINE pfnDdGetScanLine = (PGD_DXDDGETSCANLINE)gpDxFuncs[DXG_INDEX_DxDdGetScanLine].pfn; - + if (pfnDdGetScanLine == NULL) { DPRINT1("Warning: no pfnDdGetScanLine\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetScanLine\n"); + DPRINT("Calling dxg.sys pfnDdGetScanLine\n"); return pfnDdGetScanLine(hDirectDrawLocal,puGetScanLineData); } @@ -116,15 +118,13 @@ NtGdiDdCreateSurfaceEx(HANDLE hDirectDraw, DWORD dwSurfaceHandle) { PGD_DXDDCREATESURFACEEX pfnDdCreateSurfaceEx = (PGD_DXDDCREATESURFACEEX)gpDxFuncs[DXG_INDEX_DxDdCreateSurfaceEx].pfn; - + if (pfnDdCreateSurfaceEx == NULL) { DPRINT1("Warning: no pfnDdCreateSurfaceEx\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdCreateSurfaceEx\n"); + DPRINT("Calling dxg.sys pfnDdCreateSurfaceEx\n"); return pfnDdCreateSurfaceEx(hDirectDraw,hSurface,dwSurfaceHandle); - } - diff --git a/win32ss/reactx/ntddraw/ddraw.c b/win32ss/reactx/ntddraw/ddraw.c index 76e32179182..8197c727a4f 100644 --- a/win32ss/reactx/ntddraw/ddraw.c +++ b/win32ss/reactx/ntddraw/ddraw.c @@ -9,6 +9,8 @@ */ #include <win32k.h> + +// #define NDEBUG #include <debug.h> PGD_DXDDSTARTUPDXGRAPHICS gpfnStartupDxGraphics = NULL; @@ -19,7 +21,6 @@ extern DRVFN gaEngFuncs[]; extern ULONG gcEngFuncs; extern EDD_DIRECTDRAW_GLOBAL edd_DdirectDraw_Global; - DRVFN gpDxFuncs[DXG_INDEX_DxDdIoctl + 1]; HANDLE ghDxGraphics = NULL; ULONG gdwDirectDrawContext = 0; @@ -48,7 +49,6 @@ DxDdStartupDxGraphics( ULONG ulc1, * no code have been writen for it yet */ - /* FIXME: ReactOS does not loading the dxapi.sys or import functions from it yet */ // DxApiGetVersion() @@ -109,12 +109,11 @@ DxDdStartupDxGraphics( ULONG ulc1, gpDxFuncs[lstDrvFN[t].iFunc].pfn =lstDrvFN[t].pfn; } - DPRINT1("DirectX interface is activated\n"); - + DPRINT("DirectX interface is activated\n"); } - /* Return the status */ } + /* Return the status */ return Status; } @@ -146,7 +145,7 @@ NtGdiDdCreateDirectDrawObject(HDC hdc) return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DdCreateDirectDrawObject\n"); + DPRINT("Calling dxg.sys pfnDdCreateDirectDrawObject\n"); return pfnDdCreateDirectDrawObject(hdc); } @@ -201,7 +200,7 @@ NtGdiDxgGenericThunk(ULONG_PTR ulIndex, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDxgGenericThunk\n"); + DPRINT("Calling dxg.sys pfnDxgGenericThunk\n"); return pfnDxgGenericThunk(ulIndex, ulHandle, pdwSizeOfPtr1, pvPtr1, pdwSizeOfPtr2, pvPtr2); } @@ -220,7 +219,7 @@ NtGdiDdGetDriverState(PDD_GETDRIVERSTATEDATA pdata) return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DdGetDriverState\n"); + DPRINT("Calling dxg.sys pfnDdGetDriverState\n"); return pfnDdGetDriverState(pdata); } @@ -240,7 +239,7 @@ NtGdiDdColorControl(HANDLE hSurface, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DdColorControl\n"); + DPRINT("Calling dxg.sys pfnDdColorControl\n"); return pfnDdColorControl(hSurface,puColorControlData); } @@ -265,7 +264,7 @@ NtGdiDdCreateSurfaceObject(HANDLE hDirectDrawLocal, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdCreateSurfaceObject\n"); + DPRINT("Calling dxg.sys pfnDdCreateSurfaceObject\n"); return pfnDdCreateSurfaceObject(hDirectDrawLocal, hSurface, puSurfaceLocal, puSurfaceMore, puSurfaceGlobal, bComplete); } @@ -290,9 +289,7 @@ NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal) return FALSE; } - DPRINT1("hDirectDrawLocal = %p \n", hDirectDrawLocal); - DPRINT1("Calling dxg.sys pfnDdDeleteDirectDrawObject\n"); - + DPRINT("Calling dxg.sys pfnDdDeleteDirectDrawObject(%p)\n", hDirectDrawLocal); return pfnDdDeleteDirectDrawObject(hDirectDrawLocal); } @@ -312,7 +309,7 @@ NtGdiDdDeleteSurfaceObject(HANDLE hSurface) } /* Try and see if the handle is valid */ - DPRINT1("Calling dxg.sys DdDeleteSurfaceObject\n"); + DPRINT("Calling dxg.sys pfnDdDeleteSurfaceObject\n"); return pfnDdDeleteSurfaceObject(hSurface); } @@ -341,15 +338,11 @@ NtGdiDdQueryDirectDrawObject(HANDLE hDirectDrawLocal, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdQueryDirectDrawObject\n"); - - + DPRINT("Calling dxg.sys pfnDdQueryDirectDrawObject\n"); return pfnDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC); - } - /************************************************************************/ /* NtGdiDdReenableDirectDrawObject */ /************************************************************************/ @@ -359,7 +352,7 @@ NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal, BOOL *pubNewMode) { #if DXDBG - BOOL status = FALSE; + BOOL status; #endif PGD_DXDDREENABLEDIRECTDRAWOBJECT pfnDdReenableDirectDrawObject = (PGD_DXDDREENABLEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdReenableDirectDrawObject].pfn; @@ -369,19 +362,16 @@ NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdReenableDirectDrawObject\n"); - + DPRINT("Calling dxg.sys pfnDdReenableDirectDrawObject\n"); #if DXDBG status = pfnDdReenableDirectDrawObject(hDirectDrawLocal, pubNewMode); - DPRINT1("end Calling dxg.sys pfnDdReenableDirectDrawObject\n"); - DPRINT1("return value : 0x%08x\n", status); + DPRINT1("end Calling dxg.sys pfnDdReenableDirectDrawObject, status: 0x%08x\n", status); return status; #else return pfnDdReenableDirectDrawObject(hDirectDrawLocal, pubNewMode); #endif } - /************************************************************************/ /* NtGdiDdGetDriverInfo */ /************************************************************************/ @@ -399,11 +389,10 @@ NtGdiDdGetDriverInfo(HANDLE hDirectDrawLocal, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetDriverInfo\n"); + DPRINT("Calling dxg.sys pfnDdGetDriverInfo\n"); return pfnDdGetDriverInfo(hDirectDrawLocal, puGetDriverInfoData); } - /************************************************************************/ /* NtGdiDdGetAvailDriverMemory */ /************************************************************************/ @@ -420,11 +409,10 @@ NtGdiDdGetAvailDriverMemory(HANDLE hDirectDrawLocal, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetAvailDriverMemory\n"); + DPRINT("Calling dxg.sys pfnDdGetAvailDriverMemory\n"); return pfnDdGetAvailDriverMemory(hDirectDrawLocal, puGetAvailDriverMemoryData); } - /************************************************************************/ /* NtGdiDdSetExclusiveMode */ /************************************************************************/ @@ -442,12 +430,10 @@ NtGdiDdSetExclusiveMode(HANDLE hDirectDraw, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdSetExclusiveMode\n"); + DPRINT("Calling dxg.sys pfnDdSetExclusiveMode\n"); return pfnDdSetExclusiveMode(hDirectDraw, puSetExclusiveModeData); - } - /************************************************************************/ /* NtGdiDdFlipToGDISurface */ /************************************************************************/ @@ -464,9 +450,8 @@ NtGdiDdFlipToGDISurface(HANDLE hDirectDraw, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdFlipToGDISurface\n"); + DPRINT("Calling dxg.sys pfnDdFlipToGDISurface\n"); return pfnDdFlipToGDISurface(hDirectDraw, puFlipToGDISurfaceData); - } /************************************************************************/ @@ -485,7 +470,7 @@ NtGdiDdGetDC(HANDLE hSurface, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetDC\n"); + DPRINT("Calling dxg.sys pfnDdGetDC\n"); return pfnDdGetDC(hSurface, puColorTable); } @@ -506,11 +491,10 @@ NtGdiDdGetDxHandle(HANDLE hDirectDraw, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetDxHandle\n"); + DPRINT("Calling dxg.sys pfnDdGetDxHandle\n"); return pfnDdGetDxHandle(hDirectDraw, hSurface, bRelease); } - /************************************************************************/ /* NtGdiDdReleaseDC */ /************************************************************************/ @@ -526,7 +510,7 @@ NtGdiDdReleaseDC(HANDLE hSurface) return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdReleaseDC\n"); + DPRINT("Calling dxg.sys pfnDdReleaseDC\n"); return pfnDdReleaseDC(hSurface); } @@ -547,7 +531,7 @@ NtGdiDdResetVisrgn(HANDLE hSurface, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdResetVisrgn\n"); + DPRINT("Calling dxg.sys pfnDdResetVisrgn\n"); return pfnDdResetVisrgn(hSurface, hwnd); } @@ -568,6 +552,6 @@ NtGdiDdSetGammaRamp(HANDLE hDirectDraw, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdSetGammaRamp\n"); + DPRINT("Calling dxg.sys pfnDdSetGammaRamp\n"); return pfnDdSetGammaRamp(hDirectDraw, hdc, lpGammaRamp); } diff --git a/win32ss/reactx/ntddraw/ddsurf.c b/win32ss/reactx/ntddraw/ddsurf.c index aacde0c03da..d2af6f86da4 100644 --- a/win32ss/reactx/ntddraw/ddsurf.c +++ b/win32ss/reactx/ntddraw/ddsurf.c @@ -9,6 +9,8 @@ */ #include <win32k.h> + +// #define NDEBUG #include <debug.h> /************************************************************************/ @@ -22,11 +24,11 @@ NtGdiDdDestroySurface(HANDLE hSurface, BOOL bRealDestroy) if (pfnDdDestroySurface == NULL) { - DPRINT1("Warning: no pfnDdDestroySurface"); + DPRINT1("Warning: no pfnDdDestroySurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdDestroySurface"); + DPRINT("Calling dxg.sys pfnDdDestroySurface\n"); return pfnDdDestroySurface(hSurface, bRealDestroy); } @@ -45,11 +47,11 @@ NtGdiDdFlip(HANDLE hSurfaceCurrent, if (pfnDdDdFlip == NULL) { - DPRINT1("Warning: no pfnDdDdFlip"); + DPRINT1("Warning: no pfnDdDdFlip\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdDdFlip"); + DPRINT("Calling dxg.sys pfnDdDdFlip\n"); return pfnDdDdFlip(hSurfaceCurrent, hSurfaceTarget, hSurfaceCurrentLeft, hSurfaceTargetLeft, puFlipData); } @@ -66,11 +68,11 @@ NtGdiDdLock(HANDLE hSurface, if (pfnDdLock == NULL) { - DPRINT1("Warning: no pfnDdLock"); + DPRINT1("Warning: no pfnDdLock\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdLock"); + DPRINT("Calling dxg.sys pfnDdLock\n"); return pfnDdLock(hSurface, puLockData, hdcClip); } @@ -86,11 +88,11 @@ NtGdiDdUnlock(HANDLE hSurface, if (pfnDdUnlock == NULL) { - DPRINT1("Warning: no pfnDdUnlock"); + DPRINT1("Warning: no pfnDdUnlock\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdUnlock"); + DPRINT("Calling dxg.sys pfnDdUnlock\n"); return pfnDdUnlock(hSurface, puUnlockData); } @@ -107,11 +109,11 @@ NtGdiDdBlt(HANDLE hSurfaceDest, if (pfnDdBlt == NULL) { - DPRINT1("Warning: no pfnDdBlt"); + DPRINT1("Warning: no pfnDdBlt\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdBlt"); + DPRINT("Calling dxg.sys pfnDdBlt\n"); return pfnDdBlt(hSurfaceDest,hSurfaceSrc,puBltData); } @@ -127,19 +129,17 @@ NtGdiDdSetColorKey(HANDLE hSurface, if (pfnDdSetColorKey == NULL) { - DPRINT1("Warning: no pfnDdSetColorKey"); + DPRINT1("Warning: no pfnDdSetColorKey\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdSetColorKey"); + DPRINT("Calling dxg.sys pfnDdSetColorKey\n"); return pfnDdSetColorKey(hSurface,puSetColorKeyData); - } /************************************************************************/ /* NtGdiDdAddAttachedSurface */ /************************************************************************/ - DWORD APIENTRY NtGdiDdAddAttachedSurface(HANDLE hSurface, @@ -150,11 +150,11 @@ NtGdiDdAddAttachedSurface(HANDLE hSurface, if (pfnDdAddAttachedSurface == NULL) { - DPRINT1("Warning: no pfnDdAddAttachedSurface"); + DPRINT1("Warning: no pfnDdAddAttachedSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdAddAttachedSurface"); + DPRINT("Calling dxg.sys pfnDdAddAttachedSurface\n"); return pfnDdAddAttachedSurface(hSurface,hSurfaceAttached,puAddAttachedSurfaceData); } @@ -170,11 +170,11 @@ NtGdiDdGetBltStatus(HANDLE hSurface, if (pfnDdGetBltStatus == NULL) { - DPRINT1("Warning: no pfnDdGetBltStatus"); + DPRINT1("Warning: no pfnDdGetBltStatus\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdGetBltStatus"); + DPRINT("Calling dxg.sys pfnDdGetBltStatus\n"); return pfnDdGetBltStatus(hSurface,puGetBltStatusData); } @@ -190,11 +190,11 @@ NtGdiDdGetFlipStatus(HANDLE hSurface, if (pfnDdGetFlipStatus == NULL) { - DPRINT1("Warning: no pfnDdGetFlipStatus"); + DPRINT1("Warning: no pfnDdGetFlipStatus\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdGetFlipStatus"); + DPRINT("Calling dxg.sys pfnDdGetFlipStatus\n"); return pfnDdGetFlipStatus(hSurface,puGetFlipStatusData); } @@ -211,18 +211,17 @@ NtGdiDdUpdateOverlay(HANDLE hSurfaceDestination, if (pfnDdUpdateOverlay == NULL) { - DPRINT1("Warning: no pfnDdUpdateOverlay"); + DPRINT1("Warning: no pfnDdUpdateOverlay\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdUpdateOverlay"); + DPRINT("Calling dxg.sys pfnDdUpdateOverlay\n"); return pfnDdUpdateOverlay(hSurfaceDestination,hSurfaceSource,puUpdateOverlayData); } /************************************************************************/ /* NtGdiDdSetOverlayPosition */ /************************************************************************/ - DWORD APIENTRY NtGdiDdSetOverlayPosition(HANDLE hSurfaceSource, @@ -233,11 +232,11 @@ NtGdiDdSetOverlayPosition(HANDLE hSurfaceSource, if (pfnDdSetOverlayPosition == NULL) { - DPRINT1("Warning: no pfnDdSetOverlayPosition"); + DPRINT1("Warning: no pfnDdSetOverlayPosition\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdSetOverlayPosition"); + DPRINT("Calling dxg.sys pfnDdSetOverlayPosition\n"); return pfnDdSetOverlayPosition(hSurfaceSource,hSurfaceDestination,puSetOverlayPositionData); } @@ -260,11 +259,11 @@ NtGdiDdAlphaBlt(HANDLE hSurfaceDest, if (pfnDdAlphaBlt == NULL) { - DPRINT1("Warning: no pfnDdAlphaBlt"); + DPRINT1("Warning: no pfnDdAlphaBlt\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdAlphaBlt"); + DPRINT("Calling dxg.sys pfnDdAlphaBlt\n"); return pfnDdAlphaBlt(hSurfaceDest,hSurfaceSrc,puBltData); } @@ -281,11 +280,11 @@ NtGdiDdAttachSurface(HANDLE hSurfaceFrom, if (pfnDdAttachSurface == NULL) { - DPRINT1("Warning: no pfnDdAttachSurface"); + DPRINT1("Warning: no pfnDdAttachSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdAttachSurface"); + DPRINT("Calling dxg.sys pfnDdAttachSurface\n"); return pfnDdAttachSurface(hSurfaceFrom,hSurfaceTo); } @@ -304,11 +303,11 @@ NtGdiDdUnattachSurface(HANDLE hSurface, PGD_DXDDUNATTACHSURFACE pfnDdUnattachSurface = (PGD_DXDDUNATTACHSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnattachSurface].pfn; if (pfnDdUnattachSurface == NULL) { - DPRINT1("Warning: no pfnDdUnattachSurface"); + DPRINT1("Warning: no pfnDdUnattachSurface\n"); //return DDHAL_DRIVER_NOTHANDLED; return STATUS_NOT_IMPLEMENTED; } - DPRINT1("Calling on dxg.sys pfnDdUnattachSurface"); + DPRINT("Calling dxg.sys pfnDdUnattachSurface\n"); return pfnDdUnattachSurface(hSurface,hSurfaceAttached); } diff --git a/win32ss/reactx/ntddraw/dvp.c b/win32ss/reactx/ntddraw/dvp.c index f6d92053137..467390f0345 100644 --- a/win32ss/reactx/ntddraw/dvp.c +++ b/win32ss/reactx/ntddraw/dvp.c @@ -8,8 +8,9 @@ * 19/1-2006 Magnus Olsen */ - #include <win32k.h> + +// #define NDEBUG #include <debug.h> /************************************************************************/ @@ -21,14 +22,14 @@ NtGdiDvpCanCreateVideoPort(HANDLE hDirectDraw, PDD_CANCREATEVPORTDATA puCanCreateVPortData) { PGD_DVPCANCREATEVIDEOPORT pfnDvpCanCreateVideoPort = (PGD_DVPCANCREATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpCanCreateVideoPort].pfn; - + if (pfnDvpCanCreateVideoPort == NULL) { - DPRINT1("Warning: no pfnDvpCanCreateVideoPort"); + DPRINT1("Warning: no pfnDvpCanCreateVideoPort\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpCanCreateVideoPort"); + DPRINT("Calling dxg.sys pfnDvpCanCreateVideoPort\n"); return pfnDvpCanCreateVideoPort(hDirectDraw, puCanCreateVPortData); } @@ -41,14 +42,14 @@ NtGdiDvpColorControl(HANDLE hVideoPort, PDD_VPORTCOLORDATA puVPortColorData) { PGD_DVPCOLORCONTROL pfnDvpColorControl = (PGD_DVPCOLORCONTROL)gpDxFuncs[DXG_INDEX_DxDvpColorControl].pfn; - + if (pfnDvpColorControl == NULL) { - DPRINT1("Warning: no pfnDvpColorControl"); + DPRINT1("Warning: no pfnDvpColorControl\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpColorControl"); + DPRINT("Calling dxg.sys pfnDvpColorControl\n"); return pfnDvpColorControl(hVideoPort, puVPortColorData); } @@ -61,14 +62,14 @@ NtGdiDvpCreateVideoPort(HANDLE hDirectDraw, PDD_CREATEVPORTDATA puCreateVPortData) { PGD_DVPCREATEVIDEOPORT pfnDvpCreateVideoPort = (PGD_DVPCREATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpCreateVideoPort].pfn; - + if (pfnDvpCreateVideoPort == NULL) { - DPRINT1("Warning: no pfnDvpCreateVideoPort"); + DPRINT1("Warning: no pfnDvpCreateVideoPort\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpCreateVideoPort"); + DPRINT("Calling dxg.sys pfnDvpCreateVideoPort\n"); return pfnDvpCreateVideoPort(hDirectDraw, puCreateVPortData); } @@ -80,15 +81,16 @@ APIENTRY NtGdiDvpDestroyVideoPort(HANDLE hVideoPort, PDD_DESTROYVPORTDATA puDestroyVPortData) { - PGD_DVPDESTROYVIDEOPORT pfnDvpDestroyVideoPort = (PGD_DVPDESTROYVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpDestroyVideoPort].pfn; - + PGD_DVPDESTROYVIDEOPORT pfnDvpDestroyVideoPort = + (PGD_DVPDESTROYVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpDestroyVideoPort].pfn; + if (pfnDvpDestroyVideoPort == NULL) { - DPRINT1("Warning: no pfnDvpDestroyVideoPort"); + DPRINT1("Warning: no pfnDvpDestroyVideoPort\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpDestroyVideoPort"); + DPRINT("Calling dxg.sys pfnDvpDestroyVideoPort\n"); return pfnDvpDestroyVideoPort(hVideoPort, puDestroyVPortData); } @@ -102,19 +104,19 @@ NtGdiDvpFlipVideoPort(HANDLE hVideoPort, HANDLE hDDSurfaceTarget, PDD_FLIPVPORTDATA puFlipVPortData) { - PGD_DVPFLIPVIDEOPORT pfnDvpFlipVideoPort = (PGD_DVPFLIPVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpFlipVideoPort].pfn; + PGD_DVPFLIPVIDEOPORT pfnDvpFlipVideoPort = + (PGD_DVPFLIPVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpFlipVideoPort].pfn; if (pfnDvpFlipVideoPort == NULL) { - DPRINT1("Warning: no pfnDvpFlipVideoPort"); + DPRINT1("Warning: no pfnDvpFlipVideoPort\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpFlipVideoPort"); + DPRINT("Calling dxg.sys pfnDvpFlipVideoPort\n"); return pfnDvpFlipVideoPort(hVideoPort, hDDSurfaceCurrent, hDDSurfaceTarget, puFlipVPortData); } - /************************************************************************/ /* NtGdiDvpGetVideoPortBandwidth */ /************************************************************************/ @@ -127,15 +129,14 @@ NtGdiDvpGetVideoPortBandwidth(HANDLE hVideoPort, if (pfnDvpGetVideoPortBandwidth == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoPortBandwidth"); + DPRINT1("Warning: no pfnDvpGetVideoPortBandwidth\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoPortBandwidth"); + DPRINT("Calling dxg.sys pfnDvpGetVideoPortBandwidth\n"); return pfnDvpGetVideoPortBandwidth(hVideoPort, puGetVPortBandwidthData); } - /************************************************************************/ /* NtGdiDvpGetVideoPortFlipStatus */ /************************************************************************/ @@ -148,15 +149,14 @@ NtGdiDvpGetVideoPortFlipStatus(HANDLE hDirectDraw, if (pfnDvpGetVideoPortFlipStatus == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoPortFlipStatus"); + DPRINT1("Warning: no pfnDvpGetVideoPortFlipStatus\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoPortFlipStatus"); + DPRINT("Calling dxg.sys pfnDvpGetVideoPortFlipStatus\n"); return pfnDvpGetVideoPortFlipStatus(hDirectDraw, puGetVPortFlipStatusData); } - /************************************************************************/ /* NtGdiDvpGetVideoPortInputFormats */ /************************************************************************/ @@ -169,15 +169,14 @@ NtGdiDvpGetVideoPortInputFormats(HANDLE hVideoPort, if (pfnDvpGetVideoPortInputFormats == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoPortInputFormats"); + DPRINT1("Warning: no pfnDvpGetVideoPortInputFormats\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoPortInputFormats"); + DPRINT("Calling dxg.sys pfnDvpGetVideoPortInputFormats\n"); return pfnDvpGetVideoPortInputFormats(hVideoPort, puGetVPortInputFormatData); } - /************************************************************************/ /* NtGdiDvpGetVideoPortLine */ /************************************************************************/ @@ -190,15 +189,14 @@ NtGdiDvpGetVideoPortLine(HANDLE hVideoPort, if (pfnDvpGetVideoPortLine == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoPortLine"); + DPRINT1("Warning: no pfnDvpGetVideoPortLine\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoPortLine"); + DPRINT("Calling dxg.sys pfnDvpGetVideoPortLine\n"); return pfnDvpGetVideoPortLine(hVideoPort, puGetVPortLineData); } - /************************************************************************/ /* NtGdiDvpGetVideoPortOutputFormats */ /************************************************************************/ @@ -211,16 +209,14 @@ NtGdiDvpGetVideoPortOutputFormats(HANDLE hVideoPort, if (pfnDvpGetVideoPortOutputFormats == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoPortOutputFormats"); + DPRINT1("Warning: no pfnDvpGetVideoPortOutputFormats\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoPortOutputFormats"); + DPRINT("Calling dxg.sys pfnDvpGetVideoPortOutputFormats\n"); return pfnDvpGetVideoPortOutputFormats(hVideoPort, puGetVPortOutputFormatData); - } - /************************************************************************/ /* NtGdiDvpGetVideoPortConnectInfo */ /************************************************************************/ @@ -233,15 +229,14 @@ NtGdiDvpGetVideoPortConnectInfo(HANDLE hDirectDraw, if (pfnDvpGetVideoPortConnectInfo == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoPortConnectInfo"); + DPRINT1("Warning: no pfnDvpGetVideoPortConnectInfo\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoPortConnectInfo"); + DPRINT("Calling dxg.sys pfnDvpGetVideoPortConnectInfo\n"); return pfnDvpGetVideoPortConnectInfo(hDirectDraw, puGetVPortConnectData); } - /************************************************************************/ /* NtGdiDvpGetVideoSignalStatus */ /************************************************************************/ @@ -254,16 +249,14 @@ NtGdiDvpGetVideoSignalStatus(HANDLE hVideoPort, if (pfnDvpGetVideoSignalStatus == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoSignalStatus"); + DPRINT1("Warning: no pfnDvpGetVideoSignalStatus\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoSignalStatus"); + DPRINT("Calling dxg.sys pfnDvpGetVideoSignalStatus\n"); return pfnDvpGetVideoSignalStatus(hVideoPort, puGetVPortSignalData); - } - /************************************************************************/ /* NtGdiDvpUpdateVideoPort */ /************************************************************************/ @@ -278,16 +271,14 @@ NtGdiDvpUpdateVideoPort(HANDLE hVideoPort, if (pfnDvpUpdateVideoPort == NULL) { - DPRINT1("Warning: no pfnDvpUpdateVideoPort"); + DPRINT1("Warning: no pfnDvpUpdateVideoPort\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpUpdateVideoPort"); + DPRINT("Calling dxg.sys pfnDvpUpdateVideoPort\n"); return pfnDvpUpdateVideoPort(hVideoPort, phSurfaceVideo, phSurfaceVbi, puUpdateVPortData); - } - /************************************************************************/ /* NtGdiDvpWaitForVideoPortSync */ /************************************************************************/ @@ -300,15 +291,14 @@ NtGdiDvpWaitForVideoPortSync(HANDLE hVideoPort, if (pfnDvpWaitForVideoPortSync == NULL) { - DPRINT1("Warning: no pfnDvpWaitForVideoPortSync"); + DPRINT1("Warning: no pfnDvpWaitForVideoPortSync\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpWaitForVideoPortSync"); + DPRINT("Calling dxg.sys pfnDvpWaitForVideoPortSync\n"); return pfnDvpWaitForVideoPortSync(hVideoPort, puWaitForVPortSyncData); } - /************************************************************************/ /* NtGdiDvpAcquireNotification */ /************************************************************************/ @@ -322,15 +312,14 @@ NtGdiDvpAcquireNotification(HANDLE hVideoPort, if (pfnDvpAcquireNotification == NULL) { - DPRINT1("Warning: no pfnDvpAcquireNotification"); + DPRINT1("Warning: no pfnDvpAcquireNotification\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpAcquireNotification"); + DPRINT("Calling dxg.sys pfnDvpAcquireNotification\n"); return pfnDvpAcquireNotification(hVideoPort, hEvent, pNotify); } - /************************************************************************/ /* NtGdiDvpReleaseNotification */ /************************************************************************/ @@ -343,16 +332,14 @@ NtGdiDvpReleaseNotification(HANDLE hVideoPort, if (pfnDvpReleaseNotification == NULL) { - DPRINT1("Warning: no pfnDvpReleaseNotification"); + DPRINT1("Warning: no pfnDvpReleaseNotification\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpReleaseNotification"); + DPRINT("Calling dxg.sys pfnDvpReleaseNotification\n"); return pfnDvpReleaseNotification(hVideoPort, hEvent); - } - /************************************************************************/ /* NtGdiDvpGetVideoPortField */ /************************************************************************/ @@ -365,11 +352,10 @@ NtGdiDvpGetVideoPortField(HANDLE hVideoPort, if (pfnDvpGetVideoPortField == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoPortField"); + DPRINT1("Warning: no pfnDvpGetVideoPortField\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoPortField"); + DPRINT("Calling dxg.sys pfnDvpGetVideoPortField\n"); return pfnDvpGetVideoPortField(hVideoPort, puGetVPortFieldData); - } diff --git a/win32ss/reactx/ntddraw/dxeng.c b/win32ss/reactx/ntddraw/dxeng.c index bcd0db67e26..10c4b9937cb 100644 --- a/win32ss/reactx/ntddraw/dxeng.c +++ b/win32ss/reactx/ntddraw/dxeng.c @@ -8,6 +8,8 @@ */ #include <win32k.h> + +// #define NDEBUG #include <debug.h> HSEMAPHORE ghsemShareDevLock = NULL; @@ -60,7 +62,6 @@ DRVFN gaEngFuncs[] = {DXENG_INDEX_DxEngLoadImage, (PFN)DxEngLoadImage} }; - /*++ * @name DxEngDispUniq * @implemented @@ -78,7 +79,7 @@ ULONG APIENTRY DxEngDispUniq(VOID) { - DPRINT1("ReactX Calling : DxEngDispUniq\n"); + DPRINT("ReactX Calling : DxEngDispUniq\n"); return GdiHandleTable->flDeviceUniq; } @@ -105,11 +106,10 @@ BOOL APIENTRY DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp) { - DPRINT1("ReactX Calling : DxEngGetDeviceGammaRamp\n"); + DPRINT("ReactX Calling : DxEngGetDeviceGammaRamp\n"); return IntGetDeviceGammaRamp(hPDev, Ramp); } - /*++ * @name DxEngLockDC * @implemented @@ -130,11 +130,10 @@ PDC APIENTRY DxEngLockDC(HDC hDC) { - DPRINT1("ReactX Calling : DxEngLockDC\n"); + DPRINT("ReactX Calling : DxEngLockDC\n"); return DC_LockDc(hDC); } - /*++ * @name DxEngUnlockDC * @implemented @@ -155,7 +154,7 @@ BOOLEAN APIENTRY DxEngUnlockDC(PDC pDC) { - DPRINT1("ReactX Calling : DxEngUnlockDC\n"); + DPRINT("ReactX Calling : DxEngUnlockDC\n"); DC_UnlockDc(pDC); return TRUE; } @@ -179,7 +178,7 @@ BOOLEAN APIENTRY DxEngLockShareSem(VOID) { - DPRINT1("ReactX Calling : DxEngLockShareSem\n"); + DPRINT("ReactX Calling : DxEngLockShareSem\n"); if(!ghsemShareDevLock) ghsemShareDevLock = EngCreateSemaphore(); // Hax, should be in dllmain.c EngAcquireSemaphore(ghsemShareDevLock); return TRUE; @@ -202,7 +201,7 @@ BOOLEAN APIENTRY DxEngUnlockShareSem(VOID) { - DPRINT1("ReactX Calling : DxEngUnlockShareSem\n"); + DPRINT("ReactX Calling : DxEngUnlockShareSem\n"); EngReleaseSemaphore(ghsemShareDevLock); return TRUE; } @@ -233,7 +232,7 @@ BOOLEAN APIENTRY DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test) { - DPRINT1("ReactX Calling : DxEngSetDeviceGammaRamp\n"); + DPRINT("ReactX Calling : DxEngSetDeviceGammaRamp\n"); return IntSetDeviceGammaRamp(hPDev, Ramp, Test); } @@ -284,101 +283,100 @@ DxEngGetHdevData(HDEV hDev, DWORD_PTR retVal = 0; PPDEVOBJ PDev = (PPDEVOBJ)hDev; - DPRINT1("ReactX Calling : DxEngGetHdevData DXEGSHDEVDATA : %ld\n", Type); + DPRINT("ReactX Calling : DxEngGetHdevData, Type: %d\n", Type); #if 1 - DPRINT1("HDEV hDev %p\n", hDev); + DPRINT("hDev: %p\n", hDev); #endif switch ( Type ) { case DxEGShDevData_Surface: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_Surface\n"); + DPRINT("requested DxEGShDevData_Surface\n"); retVal = (DWORD_PTR) PDev->pSurface; // ptr to Surface handle. break; case DxEGShDevData_hSpooler: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_hSpooler\n"); + DPRINT("requested DxEGShDevData_hSpooler\n"); retVal = (DWORD_PTR) PDev->hSpooler; break; case DxEGShDevData_DitherFmt: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DitherFmt\n"); + DPRINT("requested DxEGShDevData_DitherFmt\n"); retVal = (DWORD_PTR) PDev->devinfo.iDitherFormat; break; case DxEGShDevData_FxCaps: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps\n"); + DPRINT("requested DxEGShDevData_FxCaps\n"); retVal = (DWORD_PTR) PDev->devinfo.flGraphicsCaps; break; case DxEGShDevData_FxCaps2: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps2\n"); + DPRINT("requested DxEGShDevData_FxCaps2\n"); retVal = (DWORD_PTR) PDev->devinfo.flGraphicsCaps2; break; case DxEGShDevData_DrvFuncs: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DrvFuncs\n"); + DPRINT("requested DxEGShDevData_DrvFuncs\n"); retVal = (DWORD_PTR) &PDev->DriverFunctions; break; case DxEGShDevData_dhpdev: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dhpdev\n"); + DPRINT("requested DxEGShDevData_dhpdev\n"); retVal = (DWORD_PTR) PDev->dhpdev; // DHPDEV break; case DxEGShDevData_eddg: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_eddg\n"); + DPRINT("requested DxEGShDevData_eddg\n"); retVal = (DWORD_PTR) PDev->pEDDgpl; break; case DxEGShDevData_dd_locks: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_locks\n"); + DPRINT("requested DxEGShDevData_dd_locks\n"); retVal = (DWORD_PTR) PDev->cDirectDrawDisableLocks; break; case DxEGShDevData_dd_flags: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_flags\n"); + DPRINT("requested DxEGShDevData_dd_flags\n"); retVal = (DWORD_PTR) PDev->DxDd_Flags; break; case DxEGShDevData_disable: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_disable\n"); + DPRINT("requested DxEGShDevData_disable\n"); retVal = (DWORD_PTR) PDev->flFlags & PDEV_DISABLED; break; case DxEGShDevData_metadev: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_metadev\n"); + DPRINT("requested DxEGShDevData_metadev\n"); retVal = (DWORD_PTR) PDev->flFlags & PDEV_META_DEVICE; break; case DxEGShDevData_display: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_display\n"); + DPRINT("requested DxEGShDevData_display\n"); retVal = (DWORD_PTR) PDev->flFlags & PDEV_DISPLAY; break; case DxEGShDevData_Parent: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_Parent\n"); + DPRINT("requested DxEGShDevData_Parent\n"); retVal = (DWORD_PTR) PDev->ppdevParent; break; case DxEGShDevData_OpenRefs: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_OpenRefs\n"); + DPRINT("requested DxEGShDevData_OpenRefs\n"); retVal = (DWORD_PTR) PDev->cPdevOpenRefs != 0; break; case DxEGShDevData_palette: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_palette\n"); + DPRINT("requested DxEGShDevData_palette\n"); retVal = (DWORD_PTR) PDev->gdiinfo.flRaster & RC_PALETTE; break; case DxEGShDevData_ldev: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_ldev\n"); + DPRINT("requested DxEGShDevData_ldev\n"); retVal = (DWORD_PTR) PDev->pldev; break; case DxEGShDevData_GDev: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_GDev\n"); + DPRINT("requested DxEGShDevData_GDev\n"); retVal = (DWORD_PTR) PDev->pGraphicsDevice; // P"GRAPHICS_DEVICE" break; case DxEGShDevData_clonedev: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_clonedev\n"); + DPRINT("requested DxEGShDevData_clonedev\n"); retVal = (DWORD_PTR) PDev->flFlags & PDEV_CLONE_DEVICE; break; - default: + // TODO: Make this default a bit more useful. break; } #if 1 - DPRINT1("return value %08lx\n", retVal); + DPRINT("retVal: %08Ix\n", retVal); #endif return retVal; - } /*++ @@ -411,11 +409,11 @@ DxEngSetHdevData(HDEV hDev, { BOOLEAN retVal = FALSE; // Default, no set. - DPRINT1("ReactX Calling : DxEngSetHdevData DXEGSHDEVDATA : %ld\n", Type); + DPRINT("ReactX Calling : DxEngSetHdevData, Type: %d\n", Type); if (Type == DxEGShDevData_dd_locks) { - DPRINT1("Assigning value %d\n", Data); + DPRINT("Assigning value: %Iu\n", Data); ((PPDEVOBJ)hDev)->cDirectDrawDisableLocks = Data; retVal = TRUE; // Set } @@ -455,7 +453,7 @@ DxEngGetDCState(HDC hDC, PDC pDC = DC_LockDc(hDC); DWORD_PTR retVal = 0; - DPRINT1("ReactX Calling : DxEngGetDCState type : %lu\n", type); + DPRINT("ReactX Calling : DxEngGetDCState, type: %lu\n", type); if (pDC) { @@ -482,7 +480,7 @@ DxEngGetDCState(HDC hDC, DC_UnlockDc(pDC); } - DPRINT1("Return value %08lx\n", retVal); + DPRINT("retVal: %08Ix\n", retVal); return retVal; } @@ -504,7 +502,7 @@ BOOLEAN APIENTRY DxEngIncDispUniq(VOID) { - DPRINT1("ReactX Calling : DxEngIncDispUniq \n"); + DPRINT("ReactX Calling : DxEngIncDispUniq\n"); InterlockedIncrement((LONG*)&GdiHandleTable->flDeviceUniq); return TRUE; @@ -533,9 +531,9 @@ DxEngLockHdev(HDEV hDev) PPDEVOBJ ppdev = (PPDEVOBJ)hDev; PERESOURCE Resource; - DPRINT1("ReactX Calling : DxEngLockHdev \n"); + DPRINT("ReactX Calling : DxEngLockHdev\n"); - DPRINT1("hDev : 0x%p\n",hDev); + DPRINT("hDev: %p\n", hDev); Resource = (PERESOURCE)ppdev->hsemDevLock; @@ -570,7 +568,7 @@ DxEngUnlockHdev(HDEV hDev) PPDEVOBJ ppdev = (PPDEVOBJ)hDev; PERESOURCE Resource = (PERESOURCE)ppdev->hsemDevLock; - DPRINT1("ReactX Calling : DxEngUnlockHdev \n"); + DPRINT("ReactX Calling : DxEngUnlockHdev\n"); if (Resource) { @@ -580,7 +578,6 @@ DxEngUnlockHdev(HDEV hDev) return TRUE; } - /************************************************************************/ /* DxEngReferenceHdev */ /************************************************************************/ @@ -621,7 +618,6 @@ DxEngRedrawDesktop(VOID) return TRUE; } - ULONG gulVisRgnUniqueness; // Increase count everytime client region is updated. /************************************************************************/ @@ -632,7 +628,7 @@ ULONG APIENTRY DxEngVisRgnUniq(VOID) { - DPRINT1("ReactX Calling : DxEngVisRgnUniq \n"); + DPRINT("ReactX Calling : DxEngVisRgnUniq\n"); return gulVisRgnUniqueness; } @@ -682,7 +678,6 @@ DxEngIsHdevLockedByCurrentThread(HDEV hDev) return pSem->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)PsGetCurrentThread(); } - /************************************************************************/ /* DxEngUnreferenceHdev */ /************************************************************************/ @@ -729,7 +724,7 @@ DxEngCleanDC(HDC hdc) /************************************************************************/ BOOL APIENTRY DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask) { - DPRINT1("ReactX Calling : DxEngSetDCOwner \n"); + DPRINT("ReactX Calling : DxEngSetDCOwner\n"); return GreSetDCOwner(hObject, OwnerMask); } @@ -765,7 +760,7 @@ DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set) /************************************************************************/ HBITMAP APIENTRY DxEngSelectBitmap(HDC hdc, HBITMAP hbmp) { - DPRINT1("ReactX Calling : DxEngSelectBitmap \n"); + DPRINT("ReactX Calling : DxEngSelectBitmap\n"); return NtGdiSelectBitmap(hdc, hbmp); } @@ -775,7 +770,7 @@ HBITMAP APIENTRY DxEngSelectBitmap(HDC hdc, HBITMAP hbmp) /************************************************************************/ BOOLEAN APIENTRY DxEngSetBitmapOwner(HBITMAP hbmp, ULONG ulOwner) { - DPRINT1("ReactX Calling : DxEngSetBitmapOwner \n"); + DPRINT("ReactX Calling : DxEngSetBitmapOwner\n"); return GreSetBitmapOwner(hbmp, ulOwner); } @@ -785,7 +780,7 @@ BOOLEAN APIENTRY DxEngSetBitmapOwner(HBITMAP hbmp, ULONG ulOwner) /************************************************************************/ BOOLEAN APIENTRY DxEngDeleteSurface(HSURF hsurf) { - DPRINT1("ReactX Calling : DxEngDeleteSurface \n"); + DPRINT("ReactX Calling : DxEngDeleteSurface\n"); return EngDeleteSurface(hsurf); } @@ -804,7 +799,7 @@ DWORD APIENTRY DxEngGetSurfaceData(DWORD x1, DWORD x2) /************************************************************************/ SURFOBJ * APIENTRY DxEngAltLockSurface(HSURF hsurf) { - DPRINT1("ReactX Calling : DxEngAltLockSurface \n"); + DPRINT("ReactX Calling : DxEngAltLockSurface\n"); return EngLockSurface(hsurf); } diff --git a/win32ss/reactx/ntddraw/eng.c b/win32ss/reactx/ntddraw/eng.c index 426ea70a9e5..6e5a50611e5 100644 --- a/win32ss/reactx/ntddraw/eng.c +++ b/win32ss/reactx/ntddraw/eng.c @@ -8,8 +8,9 @@ * 19/1-2006 Magnus Olsen */ - #include <win32k.h> + +// #define NDEBUG #include <debug.h> /************************************************************************/ @@ -31,7 +32,7 @@ HeapVidMemAllocAligned(LPVIDMEM lpVidMem, return 0; } - DPRINT1("Calling dxg.sys pfnHeapVidMemAllocAligned\n"); + DPRINT("Calling dxg.sys pfnHeapVidMemAllocAligned\n"); return pfnHeapVidMemAllocAligned(lpVidMem, dwWidth, dwHeight, lpAlignment, lpNewPitch); } @@ -51,7 +52,7 @@ VidMemFree(LPVMEMHEAP pvmh, } else { - DPRINT1("Calling dxg.sys pfnVidMemFree\n"); + DPRINT("Calling dxg.sys pfnVidMemFree\n"); pfnVidMemFree(pvmh, ptr); } } @@ -78,7 +79,7 @@ EngAllocPrivateUserMem( return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnEngAllocPrivateUserMem\n"); + DPRINT("Calling dxg.sys pfnEngAllocPrivateUserMem\n"); return pfnEngAllocPrivateUserMem(psl, cjMemSize, ulTag); } @@ -98,7 +99,7 @@ EngFreePrivateUserMem(PDD_SURFACE_LOCAL psl, } else { - DPRINT1("Calling dxg.sys pfnEngFreePrivateUserMem\n"); + DPRINT("Calling dxg.sys pfnEngFreePrivateUserMem\n"); pfnEngFreePrivateUserMem(psl, pv); } } @@ -136,8 +137,7 @@ EngDxIoctl(ULONG ulIoctl, PGD_ENGDXIOCTL pfnEngDxIoctl = (PGD_ENGDXIOCTL)gpDxFuncs[DXG_INDEX_DxDdIoctl].pfn; DWORD retVal = DDERR_UNSUPPORTED; - DPRINT1("Calling dxg.sys pfnEngDxIoctl\n"); - + DPRINT("Calling dxg.sys pfnEngDxIoctl\n"); if (pfnEngDxIoctl != NULL) { retVal = pfnEngDxIoctl(ulIoctl, pBuffer, ulBufferSize); @@ -169,8 +169,7 @@ EngLockDirectDrawSurface(HANDLE hSurface) PGD_ENGLOCKDIRECTDRAWSURFACE pfnEngLockDirectDrawSurface = (PGD_ENGLOCKDIRECTDRAWSURFACE)gpDxFuncs[DXG_INDEX_DxDdLockDirectDrawSurface].pfn; PDD_SURFACE_LOCAL retVal = NULL; - DPRINT1("Calling dxg.sys pfnEngLockDirectDrawSurface\n"); - + DPRINT("Calling dxg.sys pfnEngLockDirectDrawSurface\n"); if (pfnEngLockDirectDrawSurface != NULL) { retVal = pfnEngLockDirectDrawSurface(hSurface); @@ -179,7 +178,6 @@ EngLockDirectDrawSurface(HANDLE hSurface) return retVal; } - /*++ * @name EngUnlockDirectDrawSurface * @implemented @@ -203,8 +201,7 @@ EngUnlockDirectDrawSurface(PDD_SURFACE_LOCAL pSurface) PGD_ENGUNLOCKDIRECTDRAWSURFACE pfnEngUnlockDirectDrawSurface = (PGD_ENGUNLOCKDIRECTDRAWSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnlockDirectDrawSurface].pfn; BOOL retVal = FALSE; - DPRINT1("Calling dxg.sys pfnEngUnlockDirectDrawSurface\n"); - + DPRINT("Calling dxg.sys pfnEngUnlockDirectDrawSurface\n"); if (pfnEngUnlockDirectDrawSurface != NULL) { retVal = pfnEngUnlockDirectDrawSurface(pSurface); @@ -212,4 +209,3 @@ EngUnlockDirectDrawSurface(PDD_SURFACE_LOCAL pSurface) return retVal; } - diff --git a/win32ss/reactx/ntddraw/mocomp.c b/win32ss/reactx/ntddraw/mocomp.c index ead4cfee453..e6a4879c960 100644 --- a/win32ss/reactx/ntddraw/mocomp.c +++ b/win32ss/reactx/ntddraw/mocomp.c @@ -8,8 +8,9 @@ * 19/1-2006 Magnus Olsen */ - #include <win32k.h> + +// #define NDEBUG #include <debug.h> /************************************************************************/ @@ -24,11 +25,11 @@ NtGdiDdBeginMoCompFrame(HANDLE hMoComp, if (pfnDdBeginMoCompFrame == NULL) { - DPRINT1("Warning: no pfnDdBeginMoCompFrame"); + DPRINT1("Warning: no pfnDdBeginMoCompFrame\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DdBeginMoCompFrame"); + DPRINT("Calling dxg.sys pfnDdBeginMoCompFrame\n"); return pfnDdBeginMoCompFrame(hMoComp,puBeginFrameData); } @@ -43,32 +44,33 @@ NtGdiDdCreateMoComp(HANDLE hDirectDraw, PDD_CREATEMOCOMPDATA puCreateMoCompData) if (pfnDdCreateMoComp == NULL) { - DPRINT1("Warning: no pfnDdCreateMoComp"); + DPRINT1("Warning: no pfnDdCreateMoComp\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DdCreateMoComp"); + DPRINT("Calling dxg.sys pfnDdCreateMoComp\n"); return pfnDdCreateMoComp(hDirectDraw, puCreateMoCompData); } /************************************************************************/ /* NtGdiDdDestroyMoComp */ /************************************************************************/ -DWORD +DWORD APIENTRY NtGdiDdDestroyMoComp(HANDLE hMoComp, PDD_DESTROYMOCOMPDATA puBeginFrameData) { - PGD_DXDDDESTROYMOCOMP pfnDxDdDestroyMoComp = (PGD_DXDDDESTROYMOCOMP)gpDxFuncs[DXG_INDEX_DxDdDestroyMoComp].pfn; + PGD_DXDDDESTROYMOCOMP pfnDdDestroyMoComp = + (PGD_DXDDDESTROYMOCOMP)gpDxFuncs[DXG_INDEX_DxDdDestroyMoComp].pfn; - if (pfnDxDdDestroyMoComp == NULL) + if (pfnDdDestroyMoComp == NULL) { - DPRINT1("Warning: no pfnDxDdDestroyMoComp"); + DPRINT1("Warning: no pfnDdDestroyMoComp\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DxDdDestroyMoComp"); - return pfnDxDdDestroyMoComp(hMoComp, puBeginFrameData); + DPRINT("Calling dxg.sys pfnDdDestroyMoComp\n"); + return pfnDdDestroyMoComp(hMoComp, puBeginFrameData); } /************************************************************************/ @@ -83,11 +85,11 @@ NtGdiDdEndMoCompFrame(HANDLE hMoComp, if (pfnDdEndMoCompFrame == NULL) { - DPRINT1("Warning: no pfnDdEndMoCompFrame"); + DPRINT1("Warning: no pfnDdEndMoCompFrame\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdEndMoCompFrame"); + DPRINT("Calling dxg.sys pfnDdEndMoCompFrame\n"); return pfnDdEndMoCompFrame(hMoComp, puEndFrameData); } @@ -103,15 +105,14 @@ NtGdiDdGetInternalMoCompInfo(HANDLE hDirectDraw, if (pfnDdGetInternalMoCompInfo == NULL) { - DPRINT1("Warning: no pfnDdGetInternalMoCompInfo"); + DPRINT1("Warning: no pfnDdGetInternalMoCompInfo\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetInternalMoCompInfo"); + DPRINT("Calling dxg.sys pfnDdGetInternalMoCompInfo\n"); return pfnDdGetInternalMoCompInfo(hDirectDraw, puGetInternalData); } - /************************************************************************/ /* NtGdiDdGetMoCompBuffInfo */ /************************************************************************/ @@ -124,11 +125,11 @@ NtGdiDdGetMoCompBuffInfo(HANDLE hDirectDraw, if (pfnDdGetMoCompBuffInfo == NULL) { - DPRINT1("Warning: no pfnDdGetMoCompBuffInfo"); + DPRINT1("Warning: no pfnDdGetMoCompBuffInfo\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetMoCompBuffInfo"); + DPRINT("Calling dxg.sys pfnDdGetMoCompBuffInfo\n"); return pfnDdGetMoCompBuffInfo(hDirectDraw, puGetBuffData); } @@ -144,15 +145,14 @@ NtGdiDdGetMoCompFormats(HANDLE hDirectDraw, if (pfnDdGetMoCompFormats == NULL) { - DPRINT1("Warning: no pfnDdGetMoCompFormats"); + DPRINT1("Warning: no pfnDdGetMoCompFormats\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetMoCompFormats"); + DPRINT("Calling dxg.sys pfnDdGetMoCompFormats\n"); return pfnDdGetMoCompFormats(hDirectDraw, puGetMoCompFormatsData); } - /************************************************************************/ /* NtGdiDdGetMoCompGuids */ /************************************************************************/ @@ -165,16 +165,14 @@ NtGdiDdGetMoCompGuids(HANDLE hDirectDraw, if (pfnDdGetMoCompGuids == NULL) { - DPRINT1("Warning: no pfnDdGetMoCompGuids"); + DPRINT1("Warning: no pfnDdGetMoCompGuids\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetMoCompGuids"); + DPRINT("Calling dxg.sys pfnDdGetMoCompGuids\n"); return pfnDdGetMoCompGuids(hDirectDraw, puGetMoCompGuidsData); } - - /************************************************************************/ /* NtGdiDdQueryMoCompStatus */ /************************************************************************/ @@ -187,15 +185,14 @@ NtGdiDdQueryMoCompStatus(HANDLE hMoComp, if (pfnDdQueryMoCompStatus == NULL) { - DPRINT1("Warning: no pfnDdQueryMoCompStatus"); + DPRINT1("Warning: no pfnDdQueryMoCompStatus\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdQueryMoCompStatus"); + DPRINT("Calling dxg.sys pfnDdQueryMoCompStatus\n"); return pfnDdQueryMoCompStatus(hMoComp, puQueryMoCompStatusData); } - /************************************************************************/ /* NtGdiDdRenderMoComp */ /************************************************************************/ @@ -208,11 +205,10 @@ NtGdiDdRenderMoComp(HANDLE hMoComp, if (pfnDdRenderMoComp == NULL) { - DPRINT1("Warning: no pfnDdRenderMoComp"); + DPRINT1("Warning: no pfnDdRenderMoComp\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdRenderMoComp"); + DPRINT("Calling dxg.sys pfnDdRenderMoComp\n"); return pfnDdRenderMoComp(hMoComp, puRenderMoCompData); } -

10 months, 1 week

[reactos] 01/01: [NTDLL:LDR] Little fixes about SAL annotation and behavior (#5793)

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd0a5498b04cf77e611cb… commit bd0a5498b04cf77e611cb6526fd88459be2a7b19 Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Thu Nov 16 03:59:32 2023 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 15 20:59:32 2023 +0100 [NTDLL:LDR] Little fixes about SAL annotation and behavior (#5793) - Uniform function declarations in .c and .h with fixes and SAL2 improvements. - Use LDR_[UN]LOCK_LOADER_LOCK_FLAG_XXX correctly. - Fix incorrect UsedSize calculation in LdrQueryProcessModuleInformationEx (caught by ThFabba). - Whatever the callback request stop the enumeration or not in LdrEnumerateLoadedModules, the following operations should be the same. - Fix 2 incorrect DPRINT1 that printed incorrect parameter. - Return error if RtlAllocateHeap failed in LdrpGetProcedureAddress, and add comments about NT6.2 new changes. --- dll/ntdll/ldr/ldrapi.c | 103 ++++++++++++++++++++----------------- dll/ntdll/ldr/ldrinit.c | 54 ++++++++++--------- dll/ntdll/ldr/ldrutils.c | 7 ++- dll/win32/kernel32/client/loader.c | 2 +- sdk/include/ndk/ldrfuncs.h | 8 +-- sdk/include/ndk/ldrtypes.h | 2 +- sdk/include/ndk/rtlfuncs.h | 5 +- sdk/include/ndk/umfuncs.h | 18 +++---- sdk/lib/rtl/image.c | 24 +++++---- 9 files changed, 120 insertions(+), 103 deletions(-) diff --git a/dll/ntdll/ldr/ldrapi.c b/dll/ntdll/ldr/ldrapi.c index f850ce6ddca..34517b1a251 100644 --- a/dll/ntdll/ldr/ldrapi.c +++ b/dll/ntdll/ldr/ldrapi.c @@ -309,10 +309,11 @@ LdrLockLoaderLock( NTSTATUS NTAPI DECLSPEC_HOTPATCH -LdrLoadDll(IN PWSTR SearchPath OPTIONAL, - IN PULONG DllCharacteristics OPTIONAL, - IN PUNICODE_STRING DllName, - OUT PVOID *BaseAddress) +LdrLoadDll( + _In_opt_ PWSTR SearchPath, + _In_opt_ PULONG DllCharacteristics, + _In_ PUNICODE_STRING DllName, + _Out_ PVOID *BaseAddress) { WCHAR StringBuffer[MAX_PATH]; UNICODE_STRING DllString1, DllString2; @@ -426,7 +427,7 @@ LdrLoadDll(IN PWSTR SearchPath OPTIONAL, LdrpTopLevelDllBeingLoaded = OldTldDll; /* Release the lock */ - LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); + LdrUnlockLoaderLock(LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); } _SEH2_END; @@ -793,7 +794,7 @@ Quickie: /* Release lock */ if (Locked) { - LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, + LdrUnlockLoaderLock(LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); } @@ -840,10 +841,11 @@ LdrGetProcedureAddress( */ NTSTATUS NTAPI -LdrVerifyImageMatchesChecksum(IN HANDLE FileHandle, - IN PLDR_CALLBACK Callback, - IN PVOID CallbackContext, - OUT PUSHORT ImageCharacteristics) +LdrVerifyImageMatchesChecksum( + _In_ HANDLE FileHandle, + _In_ PLDR_CALLBACK Callback, + _In_ PVOID CallbackContext, + _Out_ PUSHORT ImageCharacteristics) { FILE_STANDARD_INFORMATION FileStandardInfo; PIMAGE_IMPORT_DESCRIPTOR ImportData; @@ -982,18 +984,19 @@ LdrVerifyImageMatchesChecksum(IN HANDLE FileHandle, NTSTATUS NTAPI -LdrQueryProcessModuleInformationEx(IN ULONG ProcessId, - IN ULONG Reserved, - OUT PRTL_PROCESS_MODULES ModuleInformation, - IN ULONG Size, - OUT PULONG ReturnedSize OPTIONAL) +LdrQueryProcessModuleInformationEx( + _In_opt_ ULONG ProcessId, + _Reserved_ ULONG Reserved, + _Out_writes_bytes_to_(Size, *ReturnedSize) PRTL_PROCESS_MODULES ModuleInformation, + _In_ ULONG Size, + _Out_opt_ PULONG ReturnedSize) { PLIST_ENTRY ModuleListHead, InitListHead; PLIST_ENTRY Entry, InitEntry; PLDR_DATA_TABLE_ENTRY Module, InitModule; PRTL_PROCESS_MODULE_INFORMATION ModulePtr = NULL; NTSTATUS Status = STATUS_SUCCESS; - ULONG UsedSize = sizeof(ULONG); + ULONG UsedSize = FIELD_OFFSET(RTL_PROCESS_MODULES, Modules); ANSI_STRING AnsiString; PCHAR p; @@ -1110,9 +1113,10 @@ LdrQueryProcessModuleInformationEx(IN ULONG ProcessId, */ NTSTATUS NTAPI -LdrQueryProcessModuleInformation(IN PRTL_PROCESS_MODULES ModuleInformation, - IN ULONG Size, - OUT PULONG ReturnedSize OPTIONAL) +LdrQueryProcessModuleInformation( + _Out_writes_bytes_to_(Size, *ReturnedSize) PRTL_PROCESS_MODULES ModuleInformation, + _In_ ULONG Size, + _Out_opt_ PULONG ReturnedSize) { /* Call Ex version of the API */ return LdrQueryProcessModuleInformationEx(0, 0, ModuleInformation, Size, ReturnedSize); @@ -1123,9 +1127,10 @@ LdrQueryProcessModuleInformation(IN PRTL_PROCESS_MODULES ModuleInformation, */ NTSTATUS NTAPI -LdrEnumerateLoadedModules(IN BOOLEAN ReservedFlag, - IN PLDR_ENUM_CALLBACK EnumProc, - IN PVOID Context) +LdrEnumerateLoadedModules( + _Reserved_ ULONG ReservedFlag, + _In_ PLDR_ENUM_CALLBACK EnumProc, + _In_opt_ PVOID Context) { PLIST_ENTRY ListHead, ListEntry; PLDR_DATA_TABLE_ENTRY LdrEntry; @@ -1161,28 +1166,24 @@ LdrEnumerateLoadedModules(IN BOOLEAN ReservedFlag, /* Break if we were asked to stop enumeration */ if (Stop) { - /* Release loader lock */ - Status = LdrUnlockLoaderLock(0, Cookie); - - /* Reset any successful status to STATUS_SUCCESS, but leave - failure to the caller */ - if (NT_SUCCESS(Status)) - Status = STATUS_SUCCESS; - - /* Return any possible failure status */ - return Status; + break; } /* Advance to the next module */ ListEntry = ListEntry->Flink; } - /* Release loader lock, it must succeed this time */ + /* Release loader lock */ Status = LdrUnlockLoaderLock(0, Cookie); ASSERT(NT_SUCCESS(Status)); - /* Return success */ - return STATUS_SUCCESS; + /* Reset any successful status to STATUS_SUCCESS, + * but leave failure to the caller */ + if (NT_SUCCESS(Status)) + Status = STATUS_SUCCESS; + + /* Return any possible failure status */ + return Status; } /* @@ -1190,7 +1191,8 @@ LdrEnumerateLoadedModules(IN BOOLEAN ReservedFlag, */ NTSTATUS NTAPI -LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress) +LdrDisableThreadCalloutsForDll( + _In_ PVOID BaseAddress) { PLDR_DATA_TABLE_ENTRY LdrEntry; NTSTATUS Status; @@ -1240,8 +1242,9 @@ LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress) */ NTSTATUS NTAPI -LdrAddRefDll(IN ULONG Flags, - IN PVOID BaseAddress) +LdrAddRefDll( + _In_ ULONG Flags, + _In_ PVOID BaseAddress) { PLDR_DATA_TABLE_ENTRY LdrEntry; NTSTATUS Status = STATUS_SUCCESS; @@ -1316,7 +1319,7 @@ quickie: } /* Release the lock if needed */ - if (Locked) LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); + if (Locked) LdrUnlockLoaderLock(LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); return Status; } @@ -1325,7 +1328,8 @@ quickie: */ NTSTATUS NTAPI -LdrUnloadDll(IN PVOID BaseAddress) +LdrUnloadDll( + _In_ PVOID BaseAddress) { NTSTATUS Status = STATUS_SUCCESS; PPEB Peb = NtCurrentPeb(); @@ -1601,10 +1605,11 @@ RtlDllShutdownInProgress(VOID) */ PIMAGE_BASE_RELOCATION NTAPI -LdrProcessRelocationBlock(IN ULONG_PTR Address, - IN ULONG Count, - IN PUSHORT TypeOffset, - IN LONG_PTR Delta) +LdrProcessRelocationBlock( + _In_ ULONG_PTR Address, + _In_ ULONG Count, + _In_ PUSHORT TypeOffset, + _In_ LONG_PTR Delta) { return LdrProcessRelocationBlockLongLong(Address, Count, TypeOffset, Delta); } @@ -1617,8 +1622,9 @@ LdrProcessRelocationBlock(IN ULONG_PTR Address, */ NTSTATUS NTAPI -LdrLoadAlternateResourceModule(IN PVOID Module, - IN PWSTR Buffer) +LdrLoadAlternateResourceModule( + _In_ PVOID Module, + _In_ PWSTR Buffer) { /* Is MUI Support enabled? */ if (!LdrAlternateResourcesEnabled()) return STATUS_SUCCESS; @@ -1632,7 +1638,8 @@ LdrLoadAlternateResourceModule(IN PVOID Module, */ BOOLEAN NTAPI -LdrUnloadAlternateResourceModule(IN PVOID BaseAddress) +LdrUnloadAlternateResourceModule( + _In_ PVOID BaseAddress) { ULONG_PTR Cookie; @@ -1646,7 +1653,7 @@ LdrUnloadAlternateResourceModule(IN PVOID BaseAddress) } /* Release the loader lock */ - LdrUnlockLoaderLock(1, Cookie); + LdrUnlockLoaderLock(LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); /* All done */ return TRUE; diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index 2dc616a4afd..03e80968f3d 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -109,9 +109,10 @@ extern BOOLEAN RtlpUse16ByteSLists; */ NTSTATUS NTAPI -LdrOpenImageFileOptionsKey(IN PUNICODE_STRING SubKey, - IN BOOLEAN Wow64, - OUT PHANDLE NewKeyHandle) +LdrOpenImageFileOptionsKey( + _In_ PUNICODE_STRING SubKey, + _In_ BOOLEAN Wow64, + _Out_ PHANDLE NewKeyHandle) { PHANDLE RootKeyLocation; HANDLE RootKey; @@ -181,12 +182,13 @@ LdrOpenImageFileOptionsKey(IN PUNICODE_STRING SubKey, */ NTSTATUS NTAPI -LdrQueryImageFileKeyOption(IN HANDLE KeyHandle, - IN PCWSTR ValueName, - IN ULONG Type, - OUT PVOID Buffer, - IN ULONG BufferSize, - OUT PULONG ReturnedLength OPTIONAL) +LdrQueryImageFileKeyOption( + _In_ HANDLE KeyHandle, + _In_ PCWSTR ValueName, + _In_ ULONG Type, + _Out_ PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG ReturnedLength) { ULONG KeyInfo[256]; UNICODE_STRING ValueNameString, IntegerString; @@ -345,13 +347,14 @@ LdrQueryImageFileKeyOption(IN HANDLE KeyHandle, */ NTSTATUS NTAPI -LdrQueryImageFileExecutionOptionsEx(IN PUNICODE_STRING SubKey, - IN PCWSTR ValueName, - IN ULONG Type, - OUT PVOID Buffer, - IN ULONG BufferSize, - OUT PULONG ReturnedLength OPTIONAL, - IN BOOLEAN Wow64) +LdrQueryImageFileExecutionOptionsEx( + _In_ PUNICODE_STRING SubKey, + _In_ PCWSTR ValueName, + _In_ ULONG Type, + _Out_ PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG ReturnedLength, + _In_ BOOLEAN Wow64) { NTSTATUS Status; HANDLE KeyHandle; @@ -383,12 +386,13 @@ LdrQueryImageFileExecutionOptionsEx(IN PUNICODE_STRING SubKey, */ NTSTATUS NTAPI -LdrQueryImageFileExecutionOptions(IN PUNICODE_STRING SubKey, - IN PCWSTR ValueName, - IN ULONG Type, - OUT PVOID Buffer, - IN ULONG BufferSize, - OUT PULONG ReturnedLength OPTIONAL) +LdrQueryImageFileExecutionOptions( + _In_ PUNICODE_STRING SubKey, + _In_ PCWSTR ValueName, + _In_ ULONG Type, + _Out_ PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG ReturnedLength) { /* Call the newer function */ return LdrQueryImageFileExecutionOptionsEx(SubKey, @@ -1879,7 +1883,7 @@ LdrpInitializeProcess(IN PCONTEXT Context, HeapParameters.Length = sizeof(HeapParameters); /* Check if we have Configuration Data */ -#define VALID_CONFIG_FIELD(Name) (ConfigSize >= (FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, Name) + sizeof(LoadConfig->Name))) +#define VALID_CONFIG_FIELD(Name) (ConfigSize >= RTL_SIZEOF_THROUGH_FIELD(IMAGE_LOAD_CONFIG_DIRECTORY, Name)) /* The 'original' load config ends after SecurityCookie */ if ((LoadConfig) && ConfigSize && (VALID_CONFIG_FIELD(SecurityCookie) || ConfigSize == LoadConfig->Size)) { @@ -2327,7 +2331,7 @@ LdrpInitializeProcess(IN PCONTEXT Context, if (!NT_SUCCESS(Status)) { if (ShowSnaps) - DPRINT1("LDR: Unable to find post-import process init function, Status=0x%08lx\n", &Kernel32String, Status); + DPRINT1("LDR: Unable to find post-import process init function, Status=0x%08lx\n", Status); return Status; } Kernel32ProcessInitPostImportFunction = FunctionAddress; @@ -2340,7 +2344,7 @@ LdrpInitializeProcess(IN PCONTEXT Context, if (!NT_SUCCESS(Status)) { if (ShowSnaps) - DPRINT1("LDR: Unable to find BaseQueryModuleData, Status=0x%08lx\n", &Kernel32String, Status); + DPRINT1("LDR: Unable to find BaseQueryModuleData, Status=0x%08lx\n", Status); return Status; } Kernel32BaseQueryModuleData = FunctionAddress; diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 632aa83df04..69e2f8c152e 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -2257,7 +2257,7 @@ LdrpGetProcedureAddress( _In_ BOOLEAN ExecuteInit) { NTSTATUS Status = STATUS_SUCCESS; - UCHAR ImportBuffer[64]; + UCHAR ImportBuffer[64]; // 128 since NT6.2 PLDR_DATA_TABLE_ENTRY LdrEntry; IMAGE_THUNK_DATA Thunk; PVOID ImageBase; @@ -2292,6 +2292,11 @@ LdrpGetProcedureAddress( ImportName = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); + if (!ImportName) + { + /* Return STATUS_INSUFFICIENT_RESOURCES since NT6.2 */ + return STATUS_INVALID_PARAMETER; + } } else { diff --git a/dll/win32/kernel32/client/loader.c b/dll/win32/kernel32/client/loader.c index 2934b528699..c3a53eec0bc 100644 --- a/dll/win32/kernel32/client/loader.c +++ b/dll/win32/kernel32/client/loader.c @@ -657,7 +657,7 @@ GetModuleFileNameW(HINSTANCE hModule, } _SEH2_END /* Release the loader lock */ - LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); + LdrUnlockLoaderLock(LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); return Length / sizeof(WCHAR); } diff --git a/sdk/include/ndk/ldrfuncs.h b/sdk/include/ndk/ldrfuncs.h index 9eb891928ca..52e682b57fb 100644 --- a/sdk/include/ndk/ldrfuncs.h +++ b/sdk/include/ndk/ldrfuncs.h @@ -97,8 +97,8 @@ LdrGetProcedureAddress( ULONG NTAPI LdrRelocateImage( - _In_ PVOID NewBase, - _In_ PCCH LoaderName, + _In_ PVOID BaseAddress, + _In_opt_ PCSTR LoaderName, _In_ ULONG Success, _In_ ULONG Conflict, _In_ ULONG Invalid @@ -139,9 +139,9 @@ LdrProcessRelocationBlockLongLong( NTSTATUS NTAPI LdrEnumerateLoadedModules( - _In_ BOOLEAN ReservedFlag, + _Reserved_ ULONG ReservedFlag, _In_ PLDR_ENUM_CALLBACK EnumProc, - _In_ PVOID Context + _In_opt_ PVOID Context ); #endif diff --git a/sdk/include/ndk/ldrtypes.h b/sdk/include/ndk/ldrtypes.h index fcc76cac8dc..3b71d022887 100644 --- a/sdk/include/ndk/ldrtypes.h +++ b/sdk/include/ndk/ldrtypes.h @@ -238,7 +238,7 @@ typedef struct _ALT_RESOURCE_MODULE // // Callback function for LdrEnumerateLoadedModules // -typedef VOID (NTAPI LDR_ENUM_CALLBACK)(_In_ PLDR_DATA_TABLE_ENTRY ModuleInformation, _In_ PVOID Parameter, _Out_ BOOLEAN *Stop); +typedef VOID (NTAPI LDR_ENUM_CALLBACK)(_In_ PLDR_DATA_TABLE_ENTRY ModuleInformation, _In_opt_ PVOID Context, _Out_ BOOLEAN *Stop); typedef LDR_ENUM_CALLBACK *PLDR_ENUM_CALLBACK; // diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index 41aedeb7e2d..29ab006cf25 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -3975,13 +3975,12 @@ RtlImageRvaToSection( _In_ ULONG Rva ); -NTSYSAPI ULONG NTAPI LdrRelocateImageWithBias( - _In_ PVOID NewAddress, + _In_ PVOID BaseAddress, _In_ LONGLONG AdditionalBias, - _In_ PCCH LoaderName, + _In_opt_ PCSTR LoaderName, _In_ ULONG Success, _In_ ULONG Conflict, _In_ ULONG Invalid diff --git a/sdk/include/ndk/umfuncs.h b/sdk/include/ndk/umfuncs.h index 5fa85a1e978..7c6618c45bf 100644 --- a/sdk/include/ndk/umfuncs.h +++ b/sdk/include/ndk/umfuncs.h @@ -158,9 +158,9 @@ NTSTATUS NTAPI LdrLoadDll( _In_opt_ PWSTR SearchPath, - _In_opt_ PULONG LoadFlags, - _In_ PUNICODE_STRING Name, - _Out_opt_ PVOID *BaseAddress + _In_opt_ PULONG DllCharacteristics, + _In_ PUNICODE_STRING DllName, + _Out_ PVOID *BaseAddress ); PIMAGE_BASE_RELOCATION @@ -177,18 +177,18 @@ NTAPI LdrQueryImageFileExecutionOptions( _In_ PUNICODE_STRING SubKey, _In_ PCWSTR ValueName, - _In_ ULONG ValueSize, + _In_ ULONG Type, _Out_ PVOID Buffer, _In_ ULONG BufferSize, - _Out_opt_ PULONG RetunedLength + _Out_opt_ PULONG ReturnedLength ); NTSTATUS NTAPI LdrQueryProcessModuleInformation( - _In_opt_ PRTL_PROCESS_MODULES ModuleInformation, - _In_opt_ ULONG Size, - _Out_ PULONG ReturnedSize + _Out_writes_bytes_to_(Size, *ReturnedSize) PRTL_PROCESS_MODULES ModuleInformation, + _In_ ULONG Size, + _Out_opt_ PULONG ReturnedSize ); VOID @@ -221,7 +221,7 @@ LdrVerifyImageMatchesChecksum( _In_ HANDLE FileHandle, _In_ PLDR_CALLBACK Callback, _In_ PVOID CallbackContext, - _Out_ PUSHORT ImageCharacterstics + _Out_ PUSHORT ImageCharacteristics ); NTSTATUS diff --git a/sdk/lib/rtl/image.c b/sdk/lib/rtl/image.c index 9efb3d19744..334839d0732 100644 --- a/sdk/lib/rtl/image.c +++ b/sdk/lib/rtl/image.c @@ -460,11 +460,11 @@ LdrProcessRelocationBlockLongLong( ULONG NTAPI LdrRelocateImage( - IN PVOID BaseAddress, - IN PCCH LoaderName, - IN ULONG Success, - IN ULONG Conflict, - IN ULONG Invalid) + _In_ PVOID BaseAddress, + _In_opt_ PCSTR LoaderName, + _In_ ULONG Success, + _In_ ULONG Conflict, + _In_ ULONG Invalid) { return LdrRelocateImageWithBias(BaseAddress, 0, LoaderName, Success, Conflict, Invalid); } @@ -472,12 +472,12 @@ LdrRelocateImage( ULONG NTAPI LdrRelocateImageWithBias( - IN PVOID BaseAddress, - IN LONGLONG AdditionalBias, - IN PCCH LoaderName, - IN ULONG Success, - IN ULONG Conflict, - IN ULONG Invalid) + _In_ PVOID BaseAddress, + _In_ LONGLONG AdditionalBias, + _In_opt_ PCSTR LoaderName, + _In_ ULONG Success, + _In_ ULONG Conflict, + _In_ ULONG Invalid) { PIMAGE_NT_HEADERS NtHeaders; PIMAGE_DATA_DIRECTORY RelocationDDir; @@ -487,6 +487,8 @@ LdrRelocateImageWithBias( PUSHORT TypeOffset; LONGLONG Delta; + UNREFERENCED_PARAMETER(LoaderName); + NtHeaders = RtlImageNtHeader(BaseAddress); if (NtHeaders == NULL)

10 months, 1 week

[reactos] 01/01: [FIND] Update Romanian (ro-RO) translation (#5965)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd9e2d6beb50fc4048fb3… commit bd9e2d6beb50fc4048fb33f01c96e3a0372efb4e Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Nov 15 12:27:09 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 15 11:27:09 2023 +0100 [FIND] Update Romanian (ro-RO) translation (#5965) --- base/applications/cmdutils/find/lang/ro-RO.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/cmdutils/find/lang/ro-RO.rc b/base/applications/cmdutils/find/lang/ro-RO.rc index 7dd07f5ba39..607a2813ae4 100644 --- a/base/applications/cmdutils/find/lang/ro-RO.rc +++ b/base/applications/cmdutils/find/lang/ro-RO.rc @@ -16,7 +16,7 @@ FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""șir"" [fișier...]\n\ /C Numără liniile ce conțin șirul.\n\ /N Numără rândurile afișate, începând cu 1.\n\ /I Ignoră diferențele între majuscule și minuscule.\n\ - /OFF[LINE] Nu omite fișierele care care au configurate atributul\n\ + /OFF[LINE] Nu omite fișierele care au configurate atributul\n\ offline (deconectat)." IDS_NO_SUCH_FILE "FIND: Fișierul «%s» nu există!\n" IDS_CANNOT_OPEN "FIND: Fișierul «%s» nu poate fi deschis!\n"

10 months, 1 week

← Newer
1
...
12
13
14
15
16
17
18
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2023