Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [USETUP] Use _wcstoui64() instead of atoi() to convert the partition size in order to prevent unexpected misinterpretation of leading zeroes.
by Eric Kohl 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de824808b70cd88a0d04b… commit de824808b70cd88a0d04bf8b13e2f86832eba08c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 19 13:30:20 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 19 13:33:28 2018 +0200 [USETUP] Use _wcstoui64() instead of atoi() to convert the partition size in order to prevent unexpected misinterpretation of leading zeroes. --- base/setup/usetup/usetup.c | 56 +++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index b702815cae..d29f15d57c 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1766,7 +1766,7 @@ ShowPartitionSizeInputBox(SHORT Left, SHORT Right, SHORT Bottom, ULONG MaxSize, - PCHAR InputBuffer, + PWSTR InputBuffer, PBOOLEAN Quit, PBOOLEAN Cancel) { @@ -1774,8 +1774,7 @@ ShowPartitionSizeInputBox(SHORT Left, COORD coPos; DWORD Written; CHAR Buffer[128]; - WCHAR PartitionSizeBuffer[100]; - ULONG Length, Pos; + INT Length, Pos; WCHAR ch; SHORT iLeft; SHORT iTop; @@ -1810,13 +1809,13 @@ ShowPartitionSizeInputBox(SHORT Left, coPos, &Written); - swprintf(PartitionSizeBuffer, L"%lu", MaxSize); - Length = wcslen(PartitionSizeBuffer); + swprintf(InputBuffer, L"%lu", MaxSize); + Length = wcslen(InputBuffer); Pos = Length; CONSOLE_SetInputTextXY(iLeft, iTop, PARTITION_SIZE_INPUT_FIELD_LENGTH, - PartitionSizeBuffer); + InputBuffer); CONSOLE_SetCursorXY(iLeft + Length, iTop); CONSOLE_SetCursorType(TRUE, TRUE); @@ -1830,7 +1829,7 @@ ShowPartitionSizeInputBox(SHORT Left, if (Quit != NULL) *Quit = TRUE; - PartitionSizeBuffer[0] = UNICODE_NULL; + InputBuffer[0] = UNICODE_NULL; CONSOLE_SetCursorType(TRUE, FALSE); break; } @@ -1844,7 +1843,7 @@ ShowPartitionSizeInputBox(SHORT Left, if (Cancel != NULL) *Cancel = TRUE; - PartitionSizeBuffer[0] = UNICODE_NULL; + InputBuffer[0] = UNICODE_NULL; CONSOLE_SetCursorType(TRUE, FALSE); break; } @@ -1883,16 +1882,16 @@ ShowPartitionSizeInputBox(SHORT Left, { if (Pos < Length) { - memmove(&PartitionSizeBuffer[Pos], - &PartitionSizeBuffer[Pos + 1], + memmove(&InputBuffer[Pos], + &InputBuffer[Pos + 1], (Length - Pos - 1) * sizeof(WCHAR)); - PartitionSizeBuffer[Length - 1] = UNICODE_NULL; + InputBuffer[Length - 1] = UNICODE_NULL; Length--; CONSOLE_SetInputTextXY(iLeft, iTop, PARTITION_SIZE_INPUT_FIELD_LENGTH, - PartitionSizeBuffer); + InputBuffer); CONSOLE_SetCursorXY(iLeft + Pos, iTop); } } @@ -1901,17 +1900,17 @@ ShowPartitionSizeInputBox(SHORT Left, if (Pos > 0) { if (Pos < Length) - memmove(&PartitionSizeBuffer[Pos - 1], - &PartitionSizeBuffer[Pos], + memmove(&InputBuffer[Pos - 1], + &InputBuffer[Pos], (Length - Pos) * sizeof(WCHAR)); - PartitionSizeBuffer[Length - 1] = UNICODE_NULL; + InputBuffer[Length - 1] = UNICODE_NULL; Pos--; Length--; CONSOLE_SetInputTextXY(iLeft, iTop, PARTITION_SIZE_INPUT_FIELD_LENGTH, - PartitionSizeBuffer); + InputBuffer); CONSOLE_SetCursorXY(iLeft + Pos, iTop); } } @@ -1924,26 +1923,23 @@ ShowPartitionSizeInputBox(SHORT Left, if ((ch >= L'0') && (ch <= L'9')) { if (Pos < Length) - memmove(&PartitionSizeBuffer[Pos + 1], - &PartitionSizeBuffer[Pos], + memmove(&InputBuffer[Pos + 1], + &InputBuffer[Pos], (Length - Pos) * sizeof(WCHAR)); - PartitionSizeBuffer[Length + 1] = UNICODE_NULL; - PartitionSizeBuffer[Pos] = ch; + InputBuffer[Length + 1] = UNICODE_NULL; + InputBuffer[Pos] = ch; Pos++; Length++; CONSOLE_SetInputTextXY(iLeft, iTop, PARTITION_SIZE_INPUT_FIELD_LENGTH, - PartitionSizeBuffer); + InputBuffer); CONSOLE_SetCursorXY(iLeft + Pos, iTop); } } } } - - /* Convert UNICODE --> ANSI the poor man's way */ - sprintf(InputBuffer, "%S", PartitionSizeBuffer); } @@ -1965,7 +1961,7 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) PPARTENTRY PartEntry; BOOLEAN Quit; BOOLEAN Cancel; - CHAR InputBuffer[50]; + WCHAR InputBuffer[50]; ULONG MaxSize; ULONGLONG PartSize; ULONGLONG DiskSize; @@ -2061,7 +2057,7 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) } else { - PartSize = atoi(InputBuffer); + PartSize = _wcstoui64(InputBuffer, NULL, 10); if (PartSize < 1) { @@ -2122,7 +2118,7 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) PPARTENTRY PartEntry; BOOLEAN Quit; BOOLEAN Cancel; - CHAR InputBuffer[50]; + WCHAR InputBuffer[50]; ULONG MaxSize; ULONGLONG PartSize; ULONGLONG DiskSize; @@ -2218,7 +2214,7 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) } else { - PartSize = atoi(InputBuffer); + PartSize = _wcstoui64(InputBuffer, NULL, 10); if (PartSize < 1) { @@ -2278,7 +2274,7 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) PPARTENTRY PartEntry; BOOLEAN Quit; BOOLEAN Cancel; - CHAR InputBuffer[50]; + WCHAR InputBuffer[50]; ULONG MaxSize; ULONGLONG PartSize; ULONGLONG DiskSize; @@ -2374,7 +2370,7 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) } else { - PartSize = atoi(InputBuffer); + PartSize = _wcstoui64(InputBuffer, NULL, 10); if (PartSize < 1) {

1 0

01/01: [TRANSLATION] Polish translation update (#554)
by Adam Słaboń 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72ad0fe70b4110f6264b2… commit 72ad0fe70b4110f6264b27a084efb32eed953a92 Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Sat May 19 13:17:49 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat May 19 13:17:49 2018 +0200 [TRANSLATION] Polish translation update (#554) - Added translations for cmdutils (at, clip, comp, eventcreate, mode, taskkill, wmic) and zipfldr. - Updated translations for cmdutils (reg), drwtsn32, mmc, eventvwr, shell32 and cpl applets (console, input). --- base/applications/cmdutils/at/at.rc | 3 + base/applications/cmdutils/at/lang/pl-PL.rc | 56 +++++++++++++++++ base/applications/cmdutils/clip/clip.rc | 3 + base/applications/cmdutils/clip/lang/pl-PL.rc | 9 +++ base/applications/cmdutils/comp/comp.rc | 3 + base/applications/cmdutils/comp/lang/pl-PL.rc | 23 +++++++ .../cmdutils/eventcreate/eventcreate.rc | 3 + .../cmdutils/eventcreate/lang/pl-PL.rc | 72 ++++++++++++++++++++++ base/applications/cmdutils/mode/lang/pl-PL.rc | 68 ++++++++++++++++++++ base/applications/cmdutils/mode/mode.rc | 3 + base/applications/cmdutils/reg/lang/pl-PL.rc | 56 ++++++++--------- base/applications/cmdutils/taskkill/lang/pl-PL.rc | 19 ++++++ base/applications/cmdutils/taskkill/taskkill.rc | 3 + base/applications/cmdutils/wmic/lang/pl-PL.rc | 9 +++ base/applications/cmdutils/wmic/wmic.rc | 3 + base/applications/drwtsn32/lang/pl-PL.rc | 2 +- base/applications/mmc/lang/pl-PL.rc | 6 +- base/applications/mscutils/eventvwr/lang/pl-PL.rc | 44 ++++++------- dll/cpl/console/lang/pl-PL.rc | 4 +- dll/cpl/input/lang/pl-PL.rc | 2 +- dll/shellext/zipfldr/lang/pl-PL.rc | 70 +++++++++++++++++++++ dll/shellext/zipfldr/zipfldr.rc | 3 + dll/win32/shell32/lang/pl-PL.rc | 22 +++---- 23 files changed, 418 insertions(+), 68 deletions(-) diff --git a/base/applications/cmdutils/at/at.rc b/base/applications/cmdutils/at/at.rc index 8d6bfd0f8d..f36c371944 100644 --- a/base/applications/cmdutils/at/at.rc +++ b/base/applications/cmdutils/at/at.rc @@ -15,6 +15,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/cmdutils/at/lang/pl-PL.rc b/base/applications/cmdutils/at/lang/pl-PL.rc new file mode 100644 index 0000000000..199c863a98 --- /dev/null +++ b/base/applications/cmdutils/at/lang/pl-PL.rc @@ -0,0 +1,56 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "Polecenia i programy usługi planowania poleceń AT do uruchomienia na\n\ +komputerze o określonej godzinie i dacie. Usługa Harmonogram musi być\n\ +uruchomiona, aby używać poleceń AT.\n\n\ +AT [\\\\nazwa_komputera] [ [id] [/DELETE] | /DELETE [/YES]]\n\ +AT [\\\\nazwa_komputera] godzina [/INTERACTIVE]\n\ + [ /EVERY:data[,...] | /NEXT:data[,...]] ""polecenie""\n\n\ +\\\\nazwa_komputera Określa komputer zdalny. Polecenia są zaplanowane w \n\ + komputerze lokalnym, jeśli ten parametr jest pominięty.\n\ +id Jest numerem identyfikacyjnym przyporządkowanym do\n\ + zaplanowanego polecenia.\n\ +/DELETE Anuluje zaplanowane polecenie. Jeśli jest pominięte,\n\ + wszystkie zaplanowane polecenia w komputerze są anulowane.\n\ +/YES Używa się przy anulowaniu wszystkich zadań, gdy nie jest\n\ + wymagane potwierdzenie.\n\ +time Określa godzinę wykonania polecenia.\n\ +/INTERACTIVE Zezwala, aby zadanie współdziałało z zadaniami użytkownika,\n\ + który jest zalogowany wówczas, gdy jest ono uruchomione.\n\ +/EVERY:date[,...] Uruchamia polecenie w każdym określonym dniu tygodnia lub\n\ + miesiąca. Jeśli data jest pominięta, przyjmowany jest\n\ + bieżący dzień miesiąca.\n\ +/NEXT:date[,...] Uruchamia określone polecenie przy następnym wystąpieniu\n\ + dnia (np. w następny czwartek). Jeśli data jest pominięta, \n\ + przyjmowany jest bieżący dzień miesiąca.\n\ +""command"" Polecenie lub program wsadowy do uruchomienia.\n" + + IDS_DELETE_ALL "Ta operacja usunie wszystkie zaplanowane zadania.\n" + IDS_NEW_JOB "Dodano nowe zadanie o identyfikatorze = %lu\n" + IDS_JOBS_LIST "ID stanu Dzień Godzina Wiersz polecenia\n" + IDS_NO_ENTRIES "Na liście nie ma żadnych wpisów.\n" + + IDS_CONFIRM_QUESTION "Czy chcesz kontynuować wykonwyanie tej operacji? (T/N) [N]: " + IDS_CONFIRM_INVALID "\nNieprawidłowe polecenie.\n" + IDS_CONFIRM_YES "T" + IDS_CONFIRM_NO "N" + + IDS_TODAY "Dzisiaj" + IDS_TOMORROW "Jutro" + IDS_EVERY "Każdy" + IDS_NEXT "Nast." + + IDS_YES "Tak" + IDS_NO "Nie" + IDS_ERROR "BŁĄD" + IDS_OK "OK" + + IDS_TASKID "Identyfikator zadania: %lu\n" + IDS_STATUS "Stan: %s\n" + IDS_SCHEDULE "Harmonogram: %s\n" + IDS_TIME "Pora dnia: %s\n" + IDS_INTERACTIVE "Interaktywne: %s\n" + IDS_COMMAND "Polecenie: %s\n" +END diff --git a/base/applications/cmdutils/clip/clip.rc b/base/applications/cmdutils/clip/clip.rc index f919e7e69d..8fe786e38d 100644 --- a/base/applications/cmdutils/clip/clip.rc +++ b/base/applications/cmdutils/clip/clip.rc @@ -24,6 +24,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/cmdutils/clip/lang/pl-PL.rc b/base/applications/cmdutils/clip/lang/pl-PL.rc new file mode 100644 index 0000000000..63fbd70d0e --- /dev/null +++ b/base/applications/cmdutils/clip/lang/pl-PL.rc @@ -0,0 +1,9 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\nWpisz ""CLIP /?"", aby zobaczyć sposób użycia.\n" + IDS_HELP "\nPrzekierowuje dane wyjściowe aplikacji konsolowych do schowka.\n\n\ +CLIP [/?]\n\n\ + /? Wyświetla tę pomoc/sposób użycia.\n" +END diff --git a/base/applications/cmdutils/comp/comp.rc b/base/applications/cmdutils/comp/comp.rc index 805477c2a4..fd687e93c8 100644 --- a/base/applications/cmdutils/comp/comp.rc +++ b/base/applications/cmdutils/comp/comp.rc @@ -18,6 +18,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/cmdutils/comp/lang/pl-PL.rc b/base/applications/cmdutils/comp/lang/pl-PL.rc new file mode 100644 index 0000000000..05d90fb559 --- /dev/null +++ b/base/applications/cmdutils/comp/lang/pl-PL.rc @@ -0,0 +1,23 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_HELP "Porównuje zawartość dwóch plików lub zestawów plików.\n\n\ +COMP [/L] [/A] [data1] [data2]\n\n\ + data1 Określa lokalizację i nazwę pierwszego pliku do porównania.\n\ + data2 Określa lokalizację i nazwę drugiego pliku do porównania.\n\ + /A Pokazuje różnice w znakach ASCII (domyślnie: szesnastkowo).\n\ + /L Pokazuje numery wierszów dla różnic.\n" + IDS_INVALIDSWITCH "Nieprawidłowy przełącznik - /%c\n" + IDS_BADSYNTAX "Nieprawidłowa składnia.\n" + IDS_FILEERROR "Nie można odnaleźć/otworzyć pliku: %s\n" + IDS_COMPARING "Porównywanie %s i %s...\n" + IDS_FILESIZEERROR "Nie można określić rozmiaru pliku: %s\n" + IDS_SIZEDIFFERS "Pliki mają różne rozmiary.\n" + IDS_READERROR "Błąd odczytu plików.\n" + IDS_MISMATCHLINE "Porównaj błąd w wierszu %d\n" + IDS_MISMATCHOFFSET "Porównaj błąd w offsecie 0x%X\n" + IDS_ASCIIDIFF "plik%d = %c\n" + IDS_HEXADECIMALDIFF "plik%d = %X\n" + IDS_MATCH "Pliki są takie same\n" +END diff --git a/base/applications/cmdutils/eventcreate/eventcreate.rc b/base/applications/cmdutils/eventcreate/eventcreate.rc index d87e9a8ff4..2194aa8037 100644 --- a/base/applications/cmdutils/eventcreate/eventcreate.rc +++ b/base/applications/cmdutils/eventcreate/eventcreate.rc @@ -21,6 +21,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/cmdutils/eventcreate/lang/pl-PL.rc b/base/applications/cmdutils/eventcreate/lang/pl-PL.rc new file mode 100644 index 0000000000..c3bdc170bb --- /dev/null +++ b/base/applications/cmdutils/eventcreate/lang/pl-PL.rc @@ -0,0 +1,72 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "Wpisz ""EVENTCREATE /?"", aby zobaczyć sposób użycia.\n" + IDS_HELP "\n\ +EVENTCREATE [/S komputer [/U [domena\\]użytkownik [/P hasło]]] /ID EventID\n\ + {[/L nazwa_domeny] | [/SO źródło]} /T typ /C kategoria /D opis\n\ +\n\ +Opis:\n\ + To narzędzie wiersza polecenia umożliwia administratorowi tworzenie\n\ + niestandardowego identyfikatora i komunikatu zdarzenia w określonym\n\ + dzienniku zdarzeń.\n\ +\n\ +Lista parametrów:\n\ + /S komputer Określa system komputer do podłączenia.\n\ +\n\ + /U [domena\\]użytk Określa kontekst użytkownika, w którym\n\ + polecenie powinno być wykonane.\n\ +\n\ + /P [hasło] Określa hasło dla danego.\n\ + kontekstu użytkownika. W razie pominięcia monituje\n\ + o podanie danych.\n\ +\n\ + /L nazwa_dziennika Określa dziennik zdarzeń, w którym ma być\n\ + utworzone zdarzenie. Prawidłowe nazwy to:\n\ + Application, System, Security\n\ + (ostatnia jest zarezerwowana tylko dla konta SYSTEM).\n\ +\n\ + /SO źródło Określa nazwę źródła do użycia dla zdarzenia.\n\ + (jeśli nie zostanie określona, domyślną nazwą żródła\n\ + będzie 'eventcreate').\n\ + Prawidłowe źródło może być dowolnym ciągiem\n\ + i powinno reprezentować aplikację lub składnik\n\ + generujący zdarzenie.\n\ +\n\ + /T typ Określa typ zdarzenia do utworzenia.\n\ + Prawidłowe typy: SUCCESS, ERROR, WARNING,\n\ + INFORMATION.\n\ +\n\ + /C kategoria Określa kategorię zdarzenia (liczba całkowita)\n\ + dla zdarzenia.\n\ +\n\ + /ID EventID Określa identyfikator zdarzenia dla zdarzenia. \n\ + Musi to być liczba całkowita z zakresu od 0 do 65535.\n\ +\n\ + /D opis Określa opis, jaki ma być ustawiony\n\ + dla tworzonego zdarzenia.\n\ +\n\ + /? Wyświetla tę pomoc/sposób użycia.\n\ +" + IDS_INVALIDSWITCH "Nieprawidłowy przełącznik - '%s'.\n" + IDS_BADSYNTAX_0 "Nieprawidłowa składnia.\n" + IDS_BADSYNTAX_1 "Nieprawidłowa składnia. Oczekiwano wartości dla '%s'.\n" + IDS_BADSYNTAX_2 "Nieprawidłowa składnia. Wartość dla opcji '%s' nie może być pusta.\n" + IDS_BADSYNTAX_3 "Nieprawidłowa składnia. Wartość '%s' nie jest dozwolona dla opcji '%s'.\n" + IDS_BADSYNTAX_4 "Nieprawidłowa składnia. Wartość nie może być określona dla opcji '%s'.\n" + IDS_BADSYNTAX_5 "Nieprawidłowa składnia. Opcja '%s' nie jest dozwolona więcej niż %lu razy.\n" + IDS_BADSYNTAX_6 "Nieprawidłowa składnia. Brak obowiązkowej opcji '%s'.\n" + // IDS_BADSYNTAX_7 "Nieprawidłowa składnia. Wartość dla opcji '%s' jest poza dozwolonym zakresem.\n" + IDS_BADSYNTAX_7 "Nieprawidłowa składnia. Wartość dla opcji '%s' musi być z zakresu od %d do %d.\n" + + IDS_LOG_NOT_FOUND "Dziennik '%s' nie istnieje. Nie można utworzyć zdarzenia.\n" + IDS_SOURCE_NOCREATE "Nowe źródło można utworzyć tylko wtedy, gdy określona jest także nazwa dziennika.\nUżyj przełącznika /L, aby określić nazwę dziennika.\n" + IDS_SOURCE_EXISTS "Źródło już istnieje w dzienniku '%s'. Źródło nie może duplikowane.\n" + IDS_SOURCE_NOT_CUSTOM "Parametr źródłowy jest używany tylko do identyfikowania niestandardowych aplikacji/skryptów\n(źródła niewbudowane).\n" + + IDS_SUCCESS_1 "Sukces: Zdarzenie typu '%s' jest utworzone w dzienniku '%s'.\n" + IDS_SUCCESS_2 "Sukces: Zdarzenie typu '%s' jest utworzone ze źródłem '%s'.\n" + IDS_SUCCESS_3 "Sukces: Zdarzenie typu '%s' jest utworzone\nw dzienniku '%s' ze źródłem '%s'.\n" + IDS_SWITCH_UNIMPLEMENTED "Opcja '%s' nie jest obecnie obsługiwana, przepraszamy za niedogodności!\n" +END diff --git a/base/applications/cmdutils/mode/lang/pl-PL.rc b/base/applications/cmdutils/mode/lang/pl-PL.rc new file mode 100644 index 0000000000..05dc62c948 --- /dev/null +++ b/base/applications/cmdutils/mode/lang/pl-PL.rc @@ -0,0 +1,68 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "Konfiguruje urządzenia systemowe.\n\n\ +Stan urządzenia: MODE [urządzenie] [/STATUS]\n\ +Port szeregowy: MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n\ + [to=on|off] [xon=on|off] [odsr=on|off]\n\ + [octs=on|off] [dtr=on|off|hs]\n\ + [rts=on|off|hs|tg] [idsr=on|off]\n\ +Readresowanie drukowania: MODE LPTn[:]=COMm[:]\n\ +Wybór strony kodowej: MODE CON[:] CP SELECT=yyy\n\ +Stan strony kodowej: MODE CON[:] CP [/STATUS]\n\ +Tryb wyświetlania: MODE CON[:] [COLS=c] [LINES=n]\n\ +Szybkość powtarzania klawiatury: MODE CON[:] [RATE=r DELAY=d]\n" + + IDS_QUERY_SERIAL_FOUND " Znaleziono urządzenie szeregowe - %s\n" + IDS_QUERY_PRINTER_FOUND " Znaleziono urządzenie drukujące - %s\n" + IDS_QUERY_PARALLEL_FOUND " Znaleziono urządzenie równoległe - %s\n" + IDS_QUERY_DOSDEV_FOUND " Znaleziono urządzenie DOS - %s\n" + // IDS_QUERY_MISC_FOUND " Znaleziono inne urządzenie - %s\n" + + // IDS_QUERY_DEVICE_FOUND " Znaleziono %s urządzenie - %s\n" + // IDS_SERIAL "szeregowe" + // IDS_PRINTER "równoległe" + // IDS_OTHER "inne" +END + +STRINGTABLE +BEGIN + IDS_DEVICE_STATUS_HEADER "Stan urządzenia %s:" + + IDS_COM_STATUS_BAUD " Współczynnik modulacji: %ld\n" + IDS_COM_STATUS_PARITY " Parzystość: %s\n" + IDS_COM_STATUS_DATA_BITS " Bity danych: %d\n" + IDS_COM_STATUS_STOP_BITS " Bity separatora: %s\n" + IDS_COM_STATUS_TIMEOUT " Limit czasu oczekiwania: %s\n" + IDS_COM_STATUS_XON_XOFF " XON/XOFF: %s\n" + IDS_COM_STATUS_CTS_HANDSHAKING " CTS handshaking: %s\n" + IDS_COM_STATUS_DSR_HANDSHAKING " DSR handshaking: %s\n" + IDS_COM_STATUS_DSR_SENSITIVITY " Czułość DSR: %s\n" + IDS_COM_STATUS_DTR_CIRCUIT " Obwód DTR: %s\n" + IDS_COM_STATUS_RTS_CIRCUIT " Obwód RTS: %s\n" + + IDS_CONSOLE_STATUS_LINES " Wiersze: %d\n" + IDS_CONSOLE_STATUS_COLS " Kolumny: %d\n" + IDS_CONSOLE_KBD_RATE " Szybkość powtarzania klawiatury: %ld\n" + IDS_CONSOLE_KBD_DELAY " Opóźnienie klawiatury: %ld\n" + IDS_CONSOLE_CODEPAGE " Strona kodowa: %d\n" + + IDS_PRINTER_OUTPUT_NOT_REROUTED " Dane wyjściowe drukarki nie są przekierowywane.\n" + IDS_PRINTER_OUTPUT_REROUTED_SERIAL " Dane wyjściowe drukarki są przekierowywane na port szeregowy %s.\n" +END + +STRINGTABLE +BEGIN + IDS_ERROR_QUERY_DEVICES "BŁĄD: nie można wysłać zapytania do urządzeń DOS (0x%lx).\n" + IDS_ERROR_QUERY_DEVICES_FORM " QueryDosDeviceW(%s) zwrócił nierozpoznaną formę %s.\n" + IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" + IDS_ERROR_INVALID_PARAMETER "BŁĄD: Nieprawidłowy parametr - %s\n" + IDS_ERROR_ILLEGAL_DEVICE_NAME "BŁĄD: Niedozwolona nazwa urządzenia - %s (0x%lx)\n" + IDS_ERROR_STATUS_GET_DEVICE "BŁĄD: Nie udało się uzyskać stanu urządzenia COM%d:\n" + IDS_ERROR_STATUS_SET_DEVICE "BŁĄD: Nie można ustawić stanu urządzenia COM%d:\n" + IDS_ERROR_INVALID_PARITY_BITS "BŁĄD: Nieprawidłowa wartość dla parzystości bitów %d:\n" + IDS_ERROR_INVALID_STOP_BITS "BŁĄD: Nieprawidłowa wartość dla bitów separatora %d:\n" + IDS_ERROR_NO_MEMORY "BŁĄD: Za mało pamięci.\n" + IDS_ERROR_SCREEN_LINES_COL "BŁĄD: Nie można ustawić ekranu na określoną liczbę wierszy i kolumn.\n" +END diff --git a/base/applications/cmdutils/mode/mode.rc b/base/applications/cmdutils/mode/mode.rc index c278b4186a..bb13a537ad 100644 --- a/base/applications/cmdutils/mode/mode.rc +++ b/base/applications/cmdutils/mode/mode.rc @@ -18,6 +18,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/cmdutils/reg/lang/pl-PL.rc b/base/applications/cmdutils/reg/lang/pl-PL.rc index 117d50ce4b..3f587fc57c 100644 --- a/base/applications/cmdutils/reg/lang/pl-PL.rc +++ b/base/applications/cmdutils/reg/lang/pl-PL.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" + STRING_USAGE, "Sposób użycia:\n REG [operacja] [parametry]\n\nWspierane operacje:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nAby uzyskać pomoc dotyczącą określonej operacji, wpisz:\n REG [operacja] /?\n\n" STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartości | /ve] [/t typ] [/s separator] [/d dane] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartości | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartości | /ve] [/s]\n" @@ -12,32 +12,32 @@ STRINGTABLE STRING_NO_REMOTE, "Błąd: Nie można dodać kluczy do zdalnej maszyny\n" STRING_CANNOT_FIND, "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n" STRING_UNSUPPORTED_TYPE, "Błąd: Nieobsługiwany typ\n" - STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" - STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" - STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" - STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" - STRING_YESNO, " (Yes|No)" - STRING_YES, "Y" + STRING_MISSING_INTEGER, "reg: Opcja [/d] musi poprzedzona poprawną liczbą całkowita\n" + STRING_MISSING_HEXDATA, "reg: Opcja [/d] musi poprzedzona poprawną wartością szesnastkową\n" + STRING_UNHANDLED_TYPE, "reg: Nieobsługiwany typ danych rejestru [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "Wartość rejestru '%1' już istnieje. Czy chcessz ją zastąpić?" + STRING_YESNO, " (Tak|Nie)" + STRING_YES, "T" STRING_NO, "N" - STRING_CANCELLED, "The registry operation was cancelled\n" - STRING_DEFAULT_VALUE, "(Default)" - STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" - STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" - STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" - STRING_INVALID_STRING, "reg: The option [/d] must be followed by a valid string\n" - STRING_VALUEALL_FAILED, "reg: Unable to delete all registry values in '%1'. An unexpected error occurred.\n" - STRING_GENERAL_FAILURE, "reg: Unable to complete the specified operation. An unexpected error occurred.\n" - STRING_MATCHES_FOUND, "Search complete. Number of matches found: %1!d!\n" - STRING_INVALID_SYNTAX, "reg: Invalid syntax. " - STRING_INVALID_OPTION, "reg: Invalid option [%1]. " - STRING_REG_HELP, "Type ""REG /?"" for help.\n" - STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" - STRING_VALUE_NOT_SET, "(value not set)" - STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" - STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" - STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" - STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" - STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" - STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" - STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_CANCELLED, "Operacja rejestru została anulowana\n" + STRING_DEFAULT_VALUE, "(Domyślna)" + STRING_DELETE_VALUE, "Czy na pewno chcesz usunąć wartość rejestru '%1'?" + STRING_DELETE_VALUEALL, "Czy na pewno chcesz usunąć wszystkie wartości rejestru w '%1'?" + STRING_DELETE_SUBKEY, "Czy na pewno chcesz usunąć klucz rejestru '%1'?" + STRING_INVALID_STRING, "reg: Opcja [/d] musi być poprzedzona prawidłowym łańcuchem\n" + STRING_VALUEALL_FAILED, "reg: Nie można usunąć wszystkich wartości rejestru w '%1'. Wystąpił nieoczekiwany błąd.\n" + STRING_GENERAL_FAILURE, "reg: Nie można ukończyć określonej operacji. Wystąpił nieoczekiwany błąd.\n" + STRING_MATCHES_FOUND, "Wyszukiwanie zakończone. Liczba znalezionych elementów: %1!d!\n" + STRING_INVALID_SYNTAX, "reg: Nieprawidłowa składnia. " + STRING_INVALID_OPTION, "reg: Nieprawidłowa opcja [%1]. " + STRING_REG_HELP, "Wpisz ""REG /?"", aby uzyskać pomoc.\n" + STRING_FUNC_HELP, "Wpisz ""REG %1 /?"", aby uzyskać pomoc.\n" + STRING_VALUE_NOT_SET, "(wartość nie ustalona)" + STRING_IMPORT_USAGE, "REG IMPORT plik.reg\n" + STRING_FILE_NOT_FOUND, "reg: Plik '%1' nie został odnaleziony.\n" + STRING_OPEN_KEY_FAILED, "reg: Nie można otworzyć klucza rejestru '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Nierozpoznana sekwencja ucieczki [\\%1!c!]\n" + STRING_EXPORT_USAGE, "REG EXPORT nazwa_klucza plik.reg [/y]\n" + STRING_INVALID_SYSTEM_KEY, "reg: Nieprawidłowy klucz systemowy [%1]\n" + STRING_OVERWRITE_FILE, "Plik '%1' już istnieje. Czy chcesz go zastąpić?" } diff --git a/base/applications/cmdutils/taskkill/lang/pl-PL.rc b/base/applications/cmdutils/taskkill/lang/pl-PL.rc new file mode 100644 index 0000000000..c907dc72b6 --- /dev/null +++ b/base/applications/cmdutils/taskkill/lang/pl-PL.rc @@ -0,0 +1,19 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Sposób użycia: taskkill [/?] [/f] [/im nazwa_procesu | /pid id_procesu]\n" + STRING_INVALID_OPTION, "Błąd: Określono nieznaną lub nieprawidłową opcję.\n" + STRING_INVALID_PARAM, "Błąd: Nieprawidłowy parametr.\n" + STRING_MISSING_OPTION, "Błąd: Nie określono opcji /im ani /pid.\n" + STRING_MISSING_PARAM, "Błąd: Oczekiwano parametru dla opcji %1.\n" + STRING_MUTUAL_EXCLUSIVE, "Błąd: Opcje /im i /pid wzajemnie się wykluczają.\n" + STRING_CLOSE_PID_SEARCH, "Komunikat o zamknięciu został wysłany do okien najwyższego poziomu procesu z identyfikatorem PID %1!u!.\n" + STRING_CLOSE_PROC_SRCH, "Komunikat o zamknięciu został wysłany do okien najwyższego poziomu procesu ""%1"" z identyfikatorem PID %2!u!.\n" + STRING_TERM_PID_SEARCH, "Proces z identyfikatorem PID %1!u! został przymusowo zakończony.\n" + STRING_TERM_PROC_SEARCH, "Proces ""%1"" z identyfikatorem PID %2!u! został przymusowo zakończony.\n" + STRING_SEARCH_FAILED, "Błąd: Nie odnaleziono procesu ""%1"".\n" + STRING_ENUM_FAILED, "Błąd: Nie można wyliczyć listy procesów.\n" + STRING_TERMINATE_FAILED, "Błąd: Nie można zakończyć procesu ""%1"".\n" + STRING_SELF_TERMINATION, "Błąd: Proces nie może zakończyć sam siebie.\n" +} diff --git a/base/applications/cmdutils/taskkill/taskkill.rc b/base/applications/cmdutils/taskkill/taskkill.rc index 950b03b8bd..4e9ca9dbab 100644 --- a/base/applications/cmdutils/taskkill/taskkill.rc +++ b/base/applications/cmdutils/taskkill/taskkill.rc @@ -36,6 +36,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/cmdutils/wmic/lang/pl-PL.rc b/base/applications/cmdutils/wmic/lang/pl-PL.rc new file mode 100644 index 0000000000..6952d05707 --- /dev/null +++ b/base/applications/cmdutils/wmic/lang/pl-PL.rc @@ -0,0 +1,9 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_CMDLINE_NOT_SUPPORTED, "Błąd: Funkcja lub operacja nie jest obsługiwana\n" + STRING_ALIAS_NOT_FOUND, "Błąd: Alias nie został znaleziony\n" + STRING_INVALID_QUERY, "Błąd: Nieprawidłowa kwerenda\n" + STRING_INVALID_PATH, "Błąd: Nieprawidłowa składnia PATH\n" +} diff --git a/base/applications/cmdutils/wmic/wmic.rc b/base/applications/cmdutils/wmic/wmic.rc index a830a7bbe0..1ca447b1e4 100644 --- a/base/applications/cmdutils/wmic/wmic.rc +++ b/base/applications/cmdutils/wmic/wmic.rc @@ -34,6 +34,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/base/applications/drwtsn32/lang/pl-PL.rc b/base/applications/drwtsn32/lang/pl-PL.rc index a5385421e1..d002285b09 100644 --- a/base/applications/drwtsn32/lang/pl-PL.rc +++ b/base/applications/drwtsn32/lang/pl-PL.rc @@ -9,5 +9,5 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_APP_TITLE "Raportowanie błędu ReactOS" - IDS_USER_ALERT_MESSAGE "Aplikacja %ls została zamknięta z powodu błędu. Informacje o tym błędzie zostały zapisne w:\r\n\r\n%ls" + IDS_USER_ALERT_MESSAGE "Aplikacja %ls została zamknięta z powodu błędu. Informacje o tym błędzie zostały zapisane w:\r\n\r\n%ls" END diff --git a/base/applications/mmc/lang/pl-PL.rc b/base/applications/mmc/lang/pl-PL.rc index e61c718dcc..e7acc16cfe 100644 --- a/base/applications/mmc/lang/pl-PL.rc +++ b/base/applications/mmc/lang/pl-PL.rc @@ -18,7 +18,7 @@ BEGIN END POPUP "Pomo&c" BEGIN - MENUITEM "Konsola zarządzania ReactOS - i&nformacje", IDM_HELP_ABOUT + MENUITEM "ReactOS Management Console - i&nformacje", IDM_HELP_ABOUT END END @@ -39,12 +39,12 @@ BEGIN END POPUP "Pomo&c" BEGIN - MENUITEM "Konsola zarządzania ReactOS - i&nformacje", IDM_HELP_ABOUT + MENUITEM "ReactOS Management Console - i&nformacje", IDM_HELP_ABOUT END END STRINGTABLE BEGIN - IDS_APPTITLE "Konsola zarządzania ReactOS" + IDS_APPTITLE "ReactOS Management Console" IDS_CONSOLETITLE "Konsola%1!u!" END diff --git a/base/applications/mscutils/eventvwr/lang/pl-PL.rc b/base/applications/mscutils/eventvwr/lang/pl-PL.rc index 3c125fd323..5727ca8ebd 100644 --- a/base/applications/mscutils/eventvwr/lang/pl-PL.rc +++ b/base/applications/mscutils/eventvwr/lang/pl-PL.rc @@ -29,10 +29,10 @@ BEGIN END POPUP "Op&cje" BEGIN - MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW - MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM "&Pokaż szczegóły zdarzenia", IDM_EVENT_DETAILS_VIEW + MENUITEM "&Linie siatki", IDM_LIST_GRID_LINES MENUITEM SEPARATOR - MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS + MENUITEM "&Zapisz ustawienia przy wyjściu", IDM_SAVE_SETTINGS END POPUP "Po&moc" BEGIN @@ -152,20 +152,20 @@ END STRINGTABLE BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ - IDS_USAGE "ReactOS Event Viewer\n\ + IDS_USAGE "Podgląd zdarzeń ReactOS\n\ \n\ -EventVwr [computer name] [/l:<event log file>] [/?]\n\ +EventVwr [nazwa komputera] [/l:<plik dziennika>] [/?]\n\ \n\ -""computer name"" : Specifies the remote computer where to connect\n\ -\tto retrieve the events to display. If no name is specified, the\n\ -\tlocal computer is used.\n\ +""nazwa kopmutera"" : Określa komputer zdalny, z którym należy się połączyć,\n\ +\taby otrzymać zdarzenia do wyświetlenia. Jeśli nazwa nie jest określona,\n\ +\tzostanie użyty komputer lokalny.\n\ \n\ -/l:<event log file> : Specifies which event log file to open.\n\ -\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +/l:<plik dziennika> : Określa plik dziennika do otwarcia.\n\ +\tObsługiwane są tylko pliki w formacie .evt (NT ≤ 5.2).\n\ \n\ -/? : Displays this help message.\n\ +/? : Wyświetla tę pomoc/sposób użycia.\n\ " - IDS_EVENTLOGFILE "Event Log File" + IDS_EVENTLOGFILE "Plik dziennika" END STRINGTABLE @@ -181,7 +181,7 @@ END STRINGTABLE BEGIN - IDS_BYTES_FORMAT "bytes" // "%s bytes" + IDS_BYTES_FORMAT "bajtów" // "%s bytes" // "%1!ls! (%2!ls! bytes)" END @@ -199,15 +199,15 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ -Event Source: %s\r\n\ -Event Category: %s\r\n\ -Event ID: %s\r\n\ -Date: %s\r\n\ -Time: %s\r\n\ -User: %s\r\n\ -Computer: %s\r\n\ -Description:\r\n%s" + IDS_COPY "Typ zdarzenia: %s\r\n\ +Źródło zdarzenia: %s\r\n\ +Kategoria zdarzenia: %s\r\n\ +Idnetyfikator Zdarzenia: %s\r\n\ +Data: %s\r\n\ +Czas: %s\r\n\ +Użytkownik: %s\r\n\ +Komputer: %s\r\n\ +Opis:\r\n%s" END STRINGTABLE diff --git a/dll/cpl/console/lang/pl-PL.rc b/dll/cpl/console/lang/pl-PL.rc index f9942590e7..9242c751ff 100644 --- a/dll/cpl/console/lang/pl-PL.rc +++ b/dll/cpl/console/lang/pl-PL.rc @@ -134,9 +134,9 @@ BEGIN CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 - GROUPBOX "Preview (Screen)", IDC_STATIC, 10, 110, 200, 40 + GROUPBOX "Wybrane kolory ekranu", IDC_STATIC, 10, 110, 200, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20, WS_EX_CLIENTEDGE - GROUPBOX "Preview (Popup)", IDC_STATIC, 10, 155, 200, 40 + GROUPBOX "Wybrane kolory podręczne", IDC_STATIC, 10, 155, 200, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20, WS_EX_CLIENTEDGE END diff --git a/dll/cpl/input/lang/pl-PL.rc b/dll/cpl/input/lang/pl-PL.rc index c30300005b..c6845d81e6 100644 --- a/dll/cpl/input/lang/pl-PL.rc +++ b/dll/cpl/input/lang/pl-PL.rc @@ -114,7 +114,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Lewy Alt+Shift" IDS_SWITCH_BET_INLANG "Przełącza pomiędzy układami klawiatury" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW, "Uruchomić ponownie system?" END STRINGTABLE diff --git a/dll/shellext/zipfldr/lang/pl-PL.rc b/dll/shellext/zipfldr/lang/pl-PL.rc new file mode 100644 index 0000000000..7d2e2e47fc --- /dev/null +++ b/dll/shellext/zipfldr/lang/pl-PL.rc @@ -0,0 +1,70 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Polish resource translation + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Wybierz miejsce docelowe" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Wybierz katalog docelowy:",IDC_STATIC,6,12,174,8 + EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL + PUSHBUTTON "Przeglądaj...",IDC_BROWSE,174,42,54,14 + PUSHBUTTON "Hasło",IDC_PASSWORD,174,66,54,14 + LTEXT "Trwa wyodrębnianie...",IDC_STATIC,6,114,82,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 +END + +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Wyodrębnianie zakończone" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Pliki zostały pomyślnie wyodrębnione do następującego katalogu:",IDC_STATIC,6,12,222,18 + LTEXT "Ścieżka docelowa",IDC_DESTDIR,6,36,222,8 + CONTROL "Pokaż wyodrębnione pliki",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,121,10 + LTEXT "Aby kontynuować, kliknij przycisk Zakończ.",IDC_STATIC,6,84,174,8 +END + +IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Potwierdzenie zamiany pliku" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Tak",IDYES,6,36,62,14 + PUSHBUTTON "Anuluj",IDCANCEL,204,36,62,14 + PUSHBUTTON "Tak na &wszystkie",IDYESALL,72,36,62,14 + PUSHBUTTON "&Nie",IDNO,138,36,62,14 + ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 + LTEXT "",IDC_MESSAGE,36,6,228,24 +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Nazwa" + IDS_COL_TYPE "Typ" + IDS_COL_COMPRSIZE "Rozmiar po spakowaniu" + IDS_COL_PASSWORD "Hasło" + IDS_COL_SIZE "Rozmiar oryginalny" + IDS_COL_RATIO "Współczynnik kompresji" + IDS_COL_DATE_MOD "Data modyfikacji" + IDS_YES "Tak" + IDS_NO "Nie" + + IDS_WIZ_TITLE "Kreator wyodrębniania" + IDS_WIZ_DEST_TITLE "Wybierz miejsce docelowe" + IDS_WIZ_DEST_SUBTITLE "Pliki znajdujące sie w archiwum ZIP zostaną wyodrębnione do wybranej lokalizacji." + IDS_WIZ_COMPL_TITLE "Wyodrębnianie zakończone" + IDS_WIZ_COMPL_SUBTITLE "Pliki zostały pomyślnie wyodrębnione z archiwum ZIP." + IDS_WIZ_BROWSE_TITLE "Wybierz miejsce, w którym chcesz wyodrębnić wybrane elementy." + + IDS_OVERWRITEFILE_TEXT "Ten folder zawiera już plik o nazwie '%1'.\nCzy chcesz zamienić istniejący plik?" + + IDS_MENUITEM "Wy&odrębnij wszystkie..." + IDS_HELPTEXT "Wyodrębnia zawartość folderów" + IDS_FRIENDLYNAME "Folder skompresowany (zip)" +END diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index 5f39bfd7e1..21f2a4ed70 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -34,6 +34,9 @@ IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 67951958e3..4040c421fe 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -647,17 +647,17 @@ Czy na pewno chcesz otworzyć ten plik?", IDC_STATIC, 35, 5, 230, 60 END IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 -CAPTION "Create New Extension" +CAPTION "Tworzenie nowego rozszerzenia" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&File Extension:", -1, 10, 10, 85, 14 + LTEXT "&Rozszerzenie pliku:", -1, 10, 10, 85, 14 EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 - PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 - LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + PUSHBUTTON "&Zaawansowane >>", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Skojarzony typ pliku:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 190, 55, 60, 14 END STRINGTABLE @@ -898,10 +898,10 @@ BEGIN IDS_ADVANCED_SHOW_COMP_COLOR "Pokaż zaszyfrowane lub skompresowane pliki NTFS w kolorze" IDS_ADVANCED_SHOW_INFO_TIP "Pokaż podręczny opis elementów folderów i pulpitu" - IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" - IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" - IDS_NEWEXT_NEW "<New>" - IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" - IDS_NEWEXT_EXT_IN_USE "Extension is in use" + IDS_NEWEXT_ADVANCED_LEFT "<< &Zaawansowane" + IDS_NEWEXT_ADVANCED_RIGHT "&Zaawansowane >>" + IDS_NEWEXT_NEW "<Nowy>" + IDS_NEWEXT_SPECIFY_EXT "Musisz podać rozszerzenie." + IDS_NEWEXT_ALREADY_ASSOC "Rozszerzenie %s jest już związane z typem plików %s. Czy chcesz usunąć powiązanie %s z %s i utworzyć dla niego nowy typ plików?" + IDS_NEWEXT_EXT_IN_USE "Rozszerzenie jest w użyciu" END

1 0

01/01: [BOOTDATA] Add the (still disabled) faeroese keyboard layout
by Eric Kohl 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76eeb35148cc72b80bc39… commit 76eeb35148cc72b80bc398313a46dc6f153e26c3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 19 12:41:37 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 19 12:41:37 2018 +0200 [BOOTDATA] Add the (still disabled) faeroese keyboard layout CORE-13127 --- boot/bootdata/hivesys.inf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 038beb96a4..0fdd69a32b 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -731,6 +731,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout File", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Text",0x00000000,%GEORGIAN% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5119" +;HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000438","Layout File",0x00000000,"kbdfo.dll" +;HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000438","Layout Text",0x00000000,%FAEROESE% +;HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000438","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5108" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000439","Layout File",0x00000000,"kbdindev.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000439","Layout Text",0x00000000,%DEVANAGARI% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000439","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5096" @@ -2227,6 +2231,7 @@ GERMAN = "German" GREEK = "Greek" GUJARATI = "Gujarati" IRISH = "Irish" +FAEROESE = "Faeroese" FINNISH = "Finnish" FRENCH = "French" GEORGIAN = "Georgian" @@ -2364,6 +2369,7 @@ GERMAN = "Niemiecki" GREEK = "Grecki" GUJARATI = "Gujarati" IRISH = "Irlandzki" +FAEROESE = "Faeroese" FINNISH = "Fiński" FRENCH = "Francuski" GEORGIAN = "Gruziński" @@ -2501,6 +2507,7 @@ GERMAN = "Germană" GREEK = "Greacă" GUJARATI = "Gujarati" IRISH = "Irlandeză" +FAEROESE = "Faeroese" FINNISH = "Finlandeză" FRENCH = "Franceză" GEORGIAN = "Georgiană"

1 0

01/01: [USETUP] Improved entering of partition size
by Eric Kohl 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a2cc3cddab22b10f8238… commit 8a2cc3cddab22b10f82387764426acd47412ac3e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 19 12:09:12 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 19 12:09:58 2018 +0200 [USETUP] Improved entering of partition size Patch by Эдуард. CORE-13249 --- base/setup/usetup/usetup.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 71dc354ae0..b702815cae 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -27,6 +27,7 @@ */ #include <usetup.h> +#include <math.h> #include "bootsup.h" #include "chkdsk.h" @@ -1755,9 +1756,9 @@ SelectPartitionPage(PINPUT_RECORD Ir) } -#define PARTITION_SIZE_INPUT_FIELD_LENGTH 6 -/* Restriction for MaxSize: pow(10, PARTITION_SIZE_INPUT_FIELD_LENGTH)-1 */ -#define PARTITION_MAXSIZE 999999 +#define PARTITION_SIZE_INPUT_FIELD_LENGTH 9 +/* Restriction for MaxSize: pow(10, (PARTITION_SIZE_INPUT_FIELD_LENGTH - 1)) - 1 */ +#define PARTITION_MAXSIZE (pow(10, (PARTITION_SIZE_INPUT_FIELD_LENGTH - 1)) - 1) static VOID ShowPartitionSizeInputBox(SHORT Left, @@ -1916,7 +1917,7 @@ ShowPartitionSizeInputBox(SHORT Left, } else if (Ir.Event.KeyEvent.uChar.AsciiChar != 0x00) { - if (Length < PARTITION_SIZE_INPUT_FIELD_LENGTH) + if (Length < PARTITION_SIZE_INPUT_FIELD_LENGTH - 1) { ch = (WCHAR)Ir.Event.KeyEvent.uChar.AsciiChar;

1 0

01/01: [FASTFAT] Misc. fixes spotted by Thomas.
by Pierre Schweitzer 19 May '18

19 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d69f31848e31cd5acff4b… commit d69f31848e31cd5acff4b6d0acf4471d188d3e51 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat May 19 10:07:14 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat May 19 10:07:14 2018 +0200 [FASTFAT] Misc. fixes spotted by Thomas. --- drivers/filesystems/fastfat/dirwr.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/filesystems/fastfat/dirwr.c b/drivers/filesystems/fastfat/dirwr.c index dc073f9236..4237d01909 100644 --- a/drivers/filesystems/fastfat/dirwr.c +++ b/drivers/filesystems/fastfat/dirwr.c @@ -29,6 +29,7 @@ vfatFCBInitializeCacheFromVolume( PVFATCCB newCCB; NTSTATUS status; BOOLEAN Acquired; + NTSTATUS Status; /* Don't re-initialize if already done */ if (BooleanFlagOn(fcb->Flags, FCB_CACHE_INITIALIZED)) @@ -58,8 +59,9 @@ vfatFCBInitializeCacheFromVolume( newCCB = ExAllocateFromNPagedLookasideList(&VfatGlobalData->CcbLookasideList); if (newCCB == NULL) { + Status = STATUS_INSUFFICIENT_RESOURCES; ObDereferenceObject(fileObject); - return STATUS_INSUFFICIENT_RESOURCES; + goto Quit; } RtlZeroMemory(newCCB, sizeof (VFATCCB)); @@ -83,19 +85,25 @@ vfatFCBInitializeCacheFromVolume( fcb->FileObject = NULL; ExFreeToNPagedLookasideList(&VfatGlobalData->CcbLookasideList, newCCB); ObDereferenceObject(fileObject); + if (Acquired) + { + ExReleaseResourceLite(&vcb->DirResource); + } return status; } _SEH2_END; vfatGrabFCB(vcb, fcb); SetFlag(fcb->Flags, FCB_CACHE_INITIALIZED); + Status = STATUS_SUCCESS; +Quit: if (Acquired) { ExReleaseResourceLite(&vcb->DirResource); } - return STATUS_SUCCESS; + return Status; } /* @@ -682,6 +690,7 @@ FATAddEntry( } /* No need to init cache here, vfatFindDirSpace() will have done it for us */ + ASSERT(BooleanFlagOn(ParentFcb->Flags, FCB_CACHE_INITIALIZED)); i = DeviceExt->FatInfo.BytesPerCluster / sizeof(FAT_DIR_ENTRY); FileOffset.u.HighPart = 0; @@ -768,6 +777,7 @@ FATAddEntry( Status = vfatFCBInitializeCacheFromVolume(DeviceExt, (*Fcb)); if (!NT_SUCCESS(Status)) { + ExFreePoolWithTag(Buffer, TAG_VFAT); return Status; } @@ -898,6 +908,7 @@ FATXAddEntry( } /* No need to init cache here, vfatFindDirSpace() will have done it for us */ + ASSERT(BooleanFlagOn(ParentFcb->Flags, FCB_CACHE_INITIALIZED)); /* add entry into parent directory */ FileOffset.u.HighPart = 0;

1 0

02/02: [FASTFAT] Completely rewrite support for dirty volumes.
by Pierre Schweitzer 18 May '18

18 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c015876805c99d0c2d97… commit 7c015876805c99d0c2d979133d1ce653f9393ed3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri May 18 23:00:13 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri May 18 23:05:05 2018 +0200 [FASTFAT] Completely rewrite support for dirty volumes. Until now, our support for dirty volumes was totally broken to a point where, on FAT32 volume, the dirty couldn't even be written nor read from the disk. This commit totally rewrites its handling, for both FAT16 and FAT32 so that it's now fully functionnal. Furthermore, it also gets totally compatible with our vfatlib, and thus, autochk. Now, on mount, FastFAT will check if the volume is dirty or not, and autochk will be able to ask for a repair if dirty. vfatlib will repair the volume and remove the dirty bit. So that, on next reboot, the volume will be mounted clean. As a reminder, the dirty bit is set immediately after mounting the volume, so that, if you crash or have a powercut, autochk will always attempt to repair your volume (with more or less, that's FAT!). If you want to experience without breaking your FAT volume, just boot, open a cmd prompt and type: fsutil dirty set c: and reboot! CORE-13758 CORE-13760 CORE-13759 --- drivers/filesystems/fastfat/blockdev.c | 83 +++++++ drivers/filesystems/fastfat/fat.c | 398 ++++++++++++++++++++++++++++++++- drivers/filesystems/fastfat/fsctl.c | 51 ++--- drivers/filesystems/fastfat/shutdown.c | 13 +- drivers/filesystems/fastfat/vfat.h | 45 +++- 5 files changed, 550 insertions(+), 40 deletions(-) diff --git a/drivers/filesystems/fastfat/blockdev.c b/drivers/filesystems/fastfat/blockdev.c index 2dc962fb8c..33bbb0b16e 100644 --- a/drivers/filesystems/fastfat/blockdev.c +++ b/drivers/filesystems/fastfat/blockdev.c @@ -248,6 +248,89 @@ again: return Status; } +/* Used by dirty bit code, likely to be killed the day it's properly handle + * This is just a copy paste from VfatReadDisk() + */ +NTSTATUS +VfatWriteDisk( + IN PDEVICE_OBJECT pDeviceObject, + IN PLARGE_INTEGER WriteOffset, + IN ULONG WriteLength, + IN OUT PUCHAR Buffer, + IN BOOLEAN Override) +{ + PIO_STACK_LOCATION Stack; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + KEVENT Event; + NTSTATUS Status; + +again: + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + DPRINT("VfatWriteDisk(pDeviceObject %p, Offset %I64x, Length %u, Buffer %p)\n", + pDeviceObject, WriteOffset->QuadPart, WriteLength, Buffer); + + DPRINT ("Building synchronous FSD Request...\n"); + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_WRITE, + pDeviceObject, + Buffer, + WriteLength, + WriteOffset, + &Event, + &IoStatus); + if (Irp == NULL) + { + DPRINT("IoBuildSynchronousFsdRequest failed\n"); + return STATUS_UNSUCCESSFUL; + } + + if (Override) + { + Stack = IoGetNextIrpStackLocation(Irp); + Stack->Flags |= SL_OVERRIDE_VERIFY_VOLUME; + } + + DPRINT("Calling IO Driver... with irp %p\n", Irp); + Status = IoCallDriver (pDeviceObject, Irp); + + DPRINT("Waiting for IO Operation for %p\n", Irp); + if (Status == STATUS_PENDING) + { + DPRINT("Operation pending\n"); + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + DPRINT("Getting IO Status... for %p\n", Irp); + Status = IoStatus.Status; + } + + if (Status == STATUS_VERIFY_REQUIRED) + { + PDEVICE_OBJECT DeviceToVerify; + + DPRINT1 ("Media change detected!\n"); + + /* Find the device to verify and reset the thread field to empty value again. */ + DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); + IoSetDeviceToVerify(PsGetCurrentThread(), NULL); + Status = IoVerifyVolume(DeviceToVerify, + FALSE); + if (NT_SUCCESS(Status)) + { + DPRINT1("Volume verification successful; Reissuing write request\n"); + goto again; + } + } + + if (!NT_SUCCESS(Status)) + { + DPRINT("IO failed!!! VfatWriteDisk : Error code: %x\n", Status); + DPRINT("(pDeviceObject %p, Offset %I64x, Size %u, Buffer %p\n", + pDeviceObject, WriteOffset->QuadPart, WriteLength, Buffer); + return Status; + } + DPRINT("Block request succeeded for %p\n", Irp); + return STATUS_SUCCESS; +} NTSTATUS VfatWriteDiskPartial( diff --git a/drivers/filesystems/fastfat/fat.c b/drivers/filesystems/fastfat/fat.c index 553d9ee3ef..95ef6958d5 100644 --- a/drivers/filesystems/fastfat/fat.c +++ b/drivers/filesystems/fastfat/fat.c @@ -1,9 +1,10 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/fat.c - * PURPOSE: VFAT Filesystem + * FILE: drivers/filesystems/fastfat/fat.c + * PURPOSE: FastFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) + * Pierre Schweitzer (pierre(a)reactos.org) * */ @@ -19,6 +20,12 @@ #define CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \ (pDeviceExt)->FatInfo.BytesPerCluster : PAGE_SIZE) +/* FIXME: because volume is not cached, we have to perform direct IOs + * The day this is fixed, just comment out that line, and check + * it still works (and delete old code ;-)) + */ +#define VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + /* FUNCTIONS ****************************************************************/ /* @@ -818,4 +825,391 @@ GetNextClusterExtend( return Status; } +/* + * FUNCTION: Retrieve the dirty status + */ +NTSTATUS +GetDirtyStatus( + PDEVICE_EXTENSION DeviceExt, + PBOOLEAN DirtyStatus) +{ + NTSTATUS Status; + + DPRINT("GetDirtyStatus(DeviceExt %p)\n", DeviceExt); + + /* FAT12 has no dirty bit */ + if (DeviceExt->FatInfo.FatType == FAT12) + { + *DirtyStatus = FALSE; + return STATUS_SUCCESS; + } + + /* Not really in the FAT, but share the lock because + * we're really low-level and shouldn't happent that often + * And call the appropriate function + */ + ExAcquireResourceSharedLite(&DeviceExt->FatResource, TRUE); + Status = DeviceExt->GetDirtyStatus(DeviceExt, DirtyStatus); + ExReleaseResourceLite(&DeviceExt->FatResource); + + return Status; +} + +NTSTATUS +FAT16GetDirtyStatus( + PDEVICE_EXTENSION DeviceExt, + PBOOLEAN DirtyStatus) +{ + LARGE_INTEGER Offset; + ULONG Length; +#ifdef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + NTSTATUS Status; +#else + PVOID Context; +#endif + struct _BootSector * Sector; + + /* We'll read the bootsector at 0 */ + Offset.QuadPart = 0; + Length = DeviceExt->FatInfo.BytesPerSector; +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + /* Go through Cc for this */ + _SEH2_TRY + { + CcPinRead(DeviceExt->VolumeFcb->FileObject, &Offset, Length, PIN_WAIT, &Context, (PVOID *)&Sector); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; +#else + /* No Cc, do it the old way: + * - Allocate a big enough buffer + * - And read the disk + */ + Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_VFAT); + if (Sector == NULL) + { + *DirtyStatus = TRUE; + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = VfatReadDisk(DeviceExt->StorageDevice, &Offset, Length, (PUCHAR)Sector, FALSE); + if (!NT_SUCCESS(Status)) + { + *DirtyStatus = TRUE; + ExFreePoolWithTag(Sector, TAG_VFAT); + return Status; + } +#endif + + /* Make sure we have a boot sector... + * FIXME: This check is a bit lame and should be improved + */ + if (Sector->Signatur1 != 0xaa55) + { + /* Set we are dirty so that we don't attempt anything */ + *DirtyStatus = TRUE; +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + CcUnpinData(Context); +#else + ExFreePoolWithTag(Sector, TAG_VFAT); +#endif + return STATUS_DISK_CORRUPT_ERROR; + } + + /* Return the status of the dirty bit */ + if (Sector->Res1 & FAT_DIRTY_BIT) + *DirtyStatus = TRUE; + else + *DirtyStatus = FALSE; + +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + CcUnpinData(Context); +#else + ExFreePoolWithTag(Sector, TAG_VFAT); +#endif + return STATUS_SUCCESS; +} + +NTSTATUS +FAT32GetDirtyStatus( + PDEVICE_EXTENSION DeviceExt, + PBOOLEAN DirtyStatus) +{ + LARGE_INTEGER Offset; + ULONG Length; +#ifdef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + NTSTATUS Status; +#else + PVOID Context; +#endif + struct _BootSector32 * Sector; + + /* We'll read the bootsector at 0 */ + Offset.QuadPart = 0; + Length = DeviceExt->FatInfo.BytesPerSector; +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + /* Go through Cc for this */ + _SEH2_TRY + { + CcPinRead(DeviceExt->VolumeFcb->FileObject, &Offset, Length, PIN_WAIT, &Context, (PVOID *)&Sector); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; +#else + /* No Cc, do it the old way: + * - Allocate a big enough buffer + * - And read the disk + */ + Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_VFAT); + if (Sector == NULL) + { + *DirtyStatus = TRUE; + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = VfatReadDisk(DeviceExt->StorageDevice, &Offset, Length, (PUCHAR)Sector, FALSE); + if (!NT_SUCCESS(Status)) + { + *DirtyStatus = TRUE; + ExFreePoolWithTag(Sector, TAG_VFAT); + return Status; + } +#endif + + /* Make sure we have a boot sector... + * FIXME: This check is a bit lame and should be improved + */ + if (Sector->Signature1 != 0xaa55) + { + /* Set we are dirty so that we don't attempt anything */ + *DirtyStatus = TRUE; +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + CcUnpinData(Context); +#else + ExFreePoolWithTag(Sector, TAG_VFAT); +#endif + return STATUS_DISK_CORRUPT_ERROR; + } + + /* Return the status of the dirty bit */ + if (Sector->Res4 & FAT_DIRTY_BIT) + *DirtyStatus = TRUE; + else + *DirtyStatus = FALSE; + +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + CcUnpinData(Context); +#else + ExFreePoolWithTag(Sector, TAG_VFAT); +#endif + return STATUS_SUCCESS; +} + +/* + * FUNCTION: Set the dirty status + */ +NTSTATUS +SetDirtyStatus( + PDEVICE_EXTENSION DeviceExt, + BOOLEAN DirtyStatus) +{ + NTSTATUS Status; + + DPRINT("SetDirtyStatus(DeviceExt %p, DirtyStatus %d)\n", DeviceExt, DirtyStatus); + + /* FAT12 has no dirty bit */ + if (DeviceExt->FatInfo.FatType == FAT12) + { + return STATUS_SUCCESS; + } + + /* Not really in the FAT, but share the lock because + * we're really low-level and shouldn't happent that often + * And call the appropriate function + * Acquire exclusive because we will modify ondisk value + */ + ExAcquireResourceExclusiveLite(&DeviceExt->FatResource, TRUE); + Status = DeviceExt->SetDirtyStatus(DeviceExt, DirtyStatus); + ExReleaseResourceLite(&DeviceExt->FatResource); + + return Status; +} + +NTSTATUS +FAT16SetDirtyStatus( + PDEVICE_EXTENSION DeviceExt, + BOOLEAN DirtyStatus) +{ + LARGE_INTEGER Offset; + ULONG Length; +#ifdef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + NTSTATUS Status; +#else + PVOID Context; +#endif + struct _BootSector * Sector; + + /* We'll read (and then write) the bootsector at 0 */ + Offset.QuadPart = 0; + Length = DeviceExt->FatInfo.BytesPerSector; +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + /* Go through Cc for this */ + _SEH2_TRY + { + CcPinRead(DeviceExt->VolumeFcb->FileObject, &Offset, Length, PIN_WAIT, &Context, (PVOID *)&Sector); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; +#else + /* No Cc, do it the old way: + * - Allocate a big enough buffer + * - And read the disk + */ + Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_VFAT); + if (Sector == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = VfatReadDisk(DeviceExt->StorageDevice, &Offset, Length, (PUCHAR)Sector, FALSE); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Sector, TAG_VFAT); + return Status; + } +#endif + + /* Make sure we have a boot sector... + * FIXME: This check is a bit lame and should be improved + */ + if (Sector->Signatur1 != 0xaa55) + { +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + CcUnpinData(Context); +#else + ExFreePoolWithTag(Sector, TAG_VFAT); +#endif + return STATUS_DISK_CORRUPT_ERROR; + } + + /* Modify the dirty bit status according + * to caller needs + */ + if (!DirtyStatus) + { + Sector->Res1 &= ~FAT_DIRTY_BIT; + } + else + { + Sector->Res1 |= FAT_DIRTY_BIT; + } + +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + /* Mark boot sector dirty so that it gets written to the disk */ + CcSetDirtyPinnedData(Context, NULL); + CcUnpinData(Context); + return STATUS_SUCCESS; +#else + /* Write back the boot sector to the disk */ + Status = VfatWriteDisk(DeviceExt->StorageDevice, &Offset, Length, (PUCHAR)Sector, FALSE); + ExFreePoolWithTag(Sector, TAG_VFAT); + return Status; +#endif +} + +NTSTATUS +FAT32SetDirtyStatus( + PDEVICE_EXTENSION DeviceExt, + BOOLEAN DirtyStatus) +{ + LARGE_INTEGER Offset; + ULONG Length; +#ifdef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + NTSTATUS Status; +#else + PVOID Context; +#endif + struct _BootSector32 * Sector; + + /* We'll read (and then write) the bootsector at 0 */ + Offset.QuadPart = 0; + Length = DeviceExt->FatInfo.BytesPerSector; +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + /* Go through Cc for this */ + _SEH2_TRY + { + CcPinRead(DeviceExt->VolumeFcb->FileObject, &Offset, Length, PIN_WAIT, &Context, (PVOID *)&Sector); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; +#else + /* No Cc, do it the old way: + * - Allocate a big enough buffer + * - And read the disk + */ + Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_VFAT); + if (Sector == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = VfatReadDisk(DeviceExt->StorageDevice, &Offset, Length, (PUCHAR)Sector, FALSE); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Sector, TAG_VFAT); + return Status; + } +#endif + + /* Make sure we have a boot sector... + * FIXME: This check is a bit lame and should be improved + */ + if (Sector->Signature1 != 0xaa55) + { + ASSERT(FALSE); +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + CcUnpinData(Context); +#else + ExFreePoolWithTag(Sector, TAG_VFAT); +#endif + return STATUS_DISK_CORRUPT_ERROR; + } + + /* Modify the dirty bit status according + * to caller needs + */ + if (!DirtyStatus) + { + Sector->Res4 &= ~FAT_DIRTY_BIT; + } + else + { + Sector->Res4 |= FAT_DIRTY_BIT; + } + +#ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT + /* Mark boot sector dirty so that it gets written to the disk */ + CcSetDirtyPinnedData(Context, NULL); + CcUnpinData(Context); + return STATUS_SUCCESS; +#else + /* Write back the boot sector to the disk */ + Status = VfatWriteDisk(DeviceExt->StorageDevice, &Offset, Length, (PUCHAR)Sector, FALSE); + ExFreePoolWithTag(Sector, TAG_VFAT); + return Status; +#endif +} + /* EOF */ diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/fastfat/fsctl.c index 340115f193..f7eaf0c774 100644 --- a/drivers/filesystems/fastfat/fsctl.c +++ b/drivers/filesystems/fastfat/fsctl.c @@ -531,9 +531,9 @@ VfatMount( UNICODE_STRING VolumeNameU = RTL_CONSTANT_STRING(L"\\$$Volume$$"); UNICODE_STRING VolumeLabelU; ULONG HashTableSize; - ULONG eocMark; ULONG i; FATINFO FatInfo; + BOOLEAN Dirty; DPRINT("VfatMount(IrpContext %p)\n", IrpContext); @@ -617,7 +617,9 @@ VfatMount( DeviceExt->GetNextCluster = FAT12GetNextCluster; DeviceExt->FindAndMarkAvailableCluster = FAT12FindAndMarkAvailableCluster; DeviceExt->WriteCluster = FAT12WriteCluster; - DeviceExt->CleanShutBitMask = 0; + /* We don't define dirty bit functions here + * FAT12 doesn't have such bit and they won't get called + */ break; case FAT16: @@ -625,7 +627,8 @@ VfatMount( DeviceExt->GetNextCluster = FAT16GetNextCluster; DeviceExt->FindAndMarkAvailableCluster = FAT16FindAndMarkAvailableCluster; DeviceExt->WriteCluster = FAT16WriteCluster; - DeviceExt->CleanShutBitMask = 0x8000; + DeviceExt->GetDirtyStatus = FAT16GetDirtyStatus; + DeviceExt->SetDirtyStatus = FAT16SetDirtyStatus; break; case FAT32: @@ -633,7 +636,8 @@ VfatMount( DeviceExt->GetNextCluster = FAT32GetNextCluster; DeviceExt->FindAndMarkAvailableCluster = FAT32FindAndMarkAvailableCluster; DeviceExt->WriteCluster = FAT32WriteCluster; - DeviceExt->CleanShutBitMask = 0x80000000; + DeviceExt->GetDirtyStatus = FAT32GetDirtyStatus; + DeviceExt->SetDirtyStatus = FAT32SetDirtyStatus; break; } @@ -763,17 +767,21 @@ VfatMount( ReadVolumeLabel(DeviceExt, 0, vfatVolumeIsFatX(DeviceExt), &VolumeLabelU); Vpb->VolumeLabelLength = VolumeLabelU.Length; - /* read clean shutdown bit status */ - Status = GetNextCluster(DeviceExt, 1, &eocMark); + /* read dirty bit status */ + Status = GetDirtyStatus(DeviceExt, &Dirty); if (NT_SUCCESS(Status)) { - if (eocMark & DeviceExt->CleanShutBitMask) + /* The volume wasn't dirty, it was properly dismounted */ + if (!Dirty) { - /* unset clean shutdown bit */ - eocMark &= ~DeviceExt->CleanShutBitMask; - WriteCluster(DeviceExt, 1, eocMark); + /* Mark it dirty now! */ + SetDirtyStatus(DeviceExt, TRUE); VolumeFcb->Flags |= VCB_CLEAR_DIRTY; } + else + { + DPRINT1("Mounting a dirty volume\n"); + } } VolumeFcb->Flags |= VCB_IS_DIRTY; @@ -1055,7 +1063,6 @@ NTSTATUS VfatMarkVolumeDirty( PVFAT_IRP_CONTEXT IrpContext) { - ULONG eocMark; PDEVICE_EXTENSION DeviceExt; NTSTATUS Status = STATUS_SUCCESS; @@ -1064,13 +1071,7 @@ VfatMarkVolumeDirty( if (!BooleanFlagOn(DeviceExt->VolumeFcb->Flags, VCB_IS_DIRTY)) { - Status = GetNextCluster(DeviceExt, 1, &eocMark); - if (NT_SUCCESS(Status)) - { - /* unset clean shutdown bit */ - eocMark &= ~DeviceExt->CleanShutBitMask; - Status = WriteCluster(DeviceExt, 1, eocMark); - } + Status = SetDirtyStatus(DeviceExt, TRUE); } DeviceExt->VolumeFcb->Flags &= ~VCB_CLEAR_DIRTY; @@ -1237,8 +1238,6 @@ VfatDismountVolume( PLIST_ENTRY NextEntry; PVFATFCB Fcb; PFILE_OBJECT FileObject; - ULONG eocMark; - NTSTATUS Status; DPRINT("VfatDismountVolume(%p)\n", IrpContext); @@ -1270,16 +1269,12 @@ VfatDismountVolume( ExAcquireResourceExclusiveLite(&DeviceExt->FatResource, TRUE); + /* We're performing a clean shutdown */ if (BooleanFlagOn(DeviceExt->VolumeFcb->Flags, VCB_CLEAR_DIRTY)) { - /* Set clean shutdown bit */ - Status = GetNextCluster(DeviceExt, 1, &eocMark); - if (NT_SUCCESS(Status)) - { - eocMark |= DeviceExt->CleanShutBitMask; - if (NT_SUCCESS(WriteCluster(DeviceExt, 1, eocMark))) - DeviceExt->VolumeFcb->Flags &= ~VCB_IS_DIRTY; - } + /* Drop the dirty bit */ + if (NT_SUCCESS(SetDirtyStatus(DeviceExt, FALSE))) + DeviceExt->VolumeFcb->Flags &= ~VCB_IS_DIRTY; } /* Flush volume & files */ diff --git a/drivers/filesystems/fastfat/shutdown.c b/drivers/filesystems/fastfat/shutdown.c index 93ab2eb4cb..c363aefa16 100644 --- a/drivers/filesystems/fastfat/shutdown.c +++ b/drivers/filesystems/fastfat/shutdown.c @@ -55,7 +55,6 @@ VfatShutdown( NTSTATUS Status; PLIST_ENTRY ListEntry; PDEVICE_EXTENSION DeviceExt; - ULONG eocMark; DPRINT("VfatShutdown(DeviceObject %p, Irp %p)\n",DeviceObject, Irp); @@ -74,16 +73,12 @@ VfatShutdown( ListEntry = ListEntry->Flink; ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); + /* It was a clean volume mounted */ if (DeviceExt->VolumeFcb->Flags & VCB_CLEAR_DIRTY) { - /* set clean shutdown bit */ - Status = GetNextCluster(DeviceExt, 1, &eocMark); - if (NT_SUCCESS(Status)) - { - eocMark |= DeviceExt->CleanShutBitMask; - if (NT_SUCCESS(WriteCluster(DeviceExt, 1, eocMark))) - DeviceExt->VolumeFcb->Flags &= ~VCB_IS_DIRTY; - } + /* So, drop the dirty bit we set */ + if (NT_SUCCESS(SetDirtyStatus(DeviceExt, FALSE))) + DeviceExt->VolumeFcb->Flags &= ~VCB_IS_DIRTY; } Status = VfatFlushVolume(DeviceExt, DeviceExt->VolumeFcb); diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index 1f2939577c..8148d2fc14 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -83,6 +83,8 @@ struct _BootSector32 unsigned short Signature1; // 510 }; +#define FAT_DIRTY_BIT 0x01 + struct _BootSectorFatX { unsigned char SysType[4]; // 0 @@ -285,6 +287,8 @@ typedef BOOLEAN (*PIS_DIRECTORY_EMPTY)(PDEVICE_EXTENSION,struct _VFATFCB*); typedef NTSTATUS (*PADD_ENTRY)(PDEVICE_EXTENSION,PUNICODE_STRING,struct _VFATFCB**,struct _VFATFCB*,ULONG,UCHAR,struct _VFAT_MOVE_CONTEXT*); typedef NTSTATUS (*PDEL_ENTRY)(PDEVICE_EXTENSION,struct _VFATFCB*,struct _VFAT_MOVE_CONTEXT*); typedef NTSTATUS (*PGET_NEXT_DIR_ENTRY)(PVOID*,PVOID*,struct _VFATFCB*,struct _VFAT_DIRENTRY_CONTEXT*,BOOLEAN); +typedef NTSTATUS (*PGET_DIRTY_STATUS)(PDEVICE_EXTENSION,PBOOLEAN); +typedef NTSTATUS (*PSET_DIRTY_STATUS)(PDEVICE_EXTENSION,BOOLEAN); typedef struct _VFAT_DISPATCH { @@ -326,7 +330,8 @@ typedef struct DEVICE_EXTENSION PGET_NEXT_CLUSTER GetNextCluster; PFIND_AND_MARK_AVAILABLE_CLUSTER FindAndMarkAvailableCluster; PWRITE_CLUSTER WriteCluster; - ULONG CleanShutBitMask; + PGET_DIRTY_STATUS GetDirtyStatus; + PSET_DIRTY_STATUS SetDirtyStatus; ULONG BaseDateYear; @@ -654,6 +659,14 @@ VfatReadDiskPartial( IN ULONG BufferOffset, IN BOOLEAN Wait); +NTSTATUS +VfatWriteDisk( + IN PDEVICE_OBJECT pDeviceObject, + IN PLARGE_INTEGER WriteOffset, + IN ULONG WriteLength, + IN OUT PUCHAR Buffer, + IN BOOLEAN Override); + NTSTATUS VfatWriteDiskPartial( IN PVFAT_IRP_CONTEXT IrpContext, @@ -885,6 +898,36 @@ WriteCluster( ULONG ClusterToWrite, ULONG NewValue); +NTSTATUS +GetDirtyStatus( + PDEVICE_EXTENSION DeviceExt, + PBOOLEAN DirtyStatus); + +NTSTATUS +FAT16GetDirtyStatus( + PDEVICE_EXTENSION DeviceExt, + PBOOLEAN DirtyStatus); + +NTSTATUS +FAT32GetDirtyStatus( + PDEVICE_EXTENSION DeviceExt, + PBOOLEAN DirtyStatus); + +NTSTATUS +SetDirtyStatus( + PDEVICE_EXTENSION DeviceExt, + BOOLEAN DirtyStatus); + +NTSTATUS +FAT16SetDirtyStatus( + PDEVICE_EXTENSION DeviceExt, + BOOLEAN DirtyStatus); + +NTSTATUS +FAT32SetDirtyStatus( + PDEVICE_EXTENSION DeviceExt, + BOOLEAN DirtyStatus); + /* fcb.c */ PVFATFCB

1 0

01/02: [FASTFAT] Allow locking system volume on boot.
by Pierre Schweitzer 18 May '18

18 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=efa75dd5b2eaf8f9298e3… commit efa75dd5b2eaf8f9298e30ee8bb01884dc2731e5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri May 18 22:35:03 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri May 18 23:05:05 2018 +0200 [FASTFAT] Allow locking system volume on boot. This is a hack, and totally not the default behavior. But it will allow autochk locking the boot volume in order to verify it on boot, in case it would have been improperly dismounted. CORE-13759 --- drivers/filesystems/fastfat/fsctl.c | 75 +++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/fastfat/fsctl.c index 778a2bce8b..340115f193 100644 --- a/drivers/filesystems/fastfat/fsctl.c +++ b/drivers/filesystems/fastfat/fsctl.c @@ -1121,6 +1121,70 @@ VfatLockOrUnlockVolume( { PLIST_ENTRY ListEntry; +#if 1 + /* FIXME: Hack that allows locking the system volume on + * boot so that autochk can run properly + * That hack is, on purpose, really restrictive + * it will only allow locking with two directories + * open: current directory of smss and autochk. + */ + BOOLEAN ForceLock = TRUE; + ULONG HandleCount = 0; + + /* Only allow boot volume */ + if (BooleanFlagOn(DeviceExt->Flags, VCB_IS_SYS_OR_HAS_PAGE)) + { + /* We'll browse all the FCB */ + ListEntry = DeviceExt->FcbListHead.Flink; + while (ListEntry != &DeviceExt->FcbListHead) + { + Fcb = CONTAINING_RECORD(ListEntry, VFATFCB, FcbListEntry); + ListEntry = ListEntry->Flink; + + /* If no handle: that FCB is no problem for locking + * so ignore it + */ + if (Fcb->OpenHandleCount == 0) + { + continue; + } + + /* Not a dir? We're no longer at boot */ + if (!vfatFCBIsDirectory(Fcb)) + { + ForceLock = FALSE; + break; + } + + /* If we have cached initialized and several handles, we're + not in the boot case + */ + if (Fcb->FileObject != NULL && Fcb->OpenHandleCount > 1) + { + ForceLock = FALSE; + break; + } + + /* Count the handles */ + HandleCount += Fcb->OpenHandleCount; + /* More than two handles? Then, we're not booting anymore */ + if (HandleCount > 2) + { + ForceLock = FALSE; + break; + } + } + } + else + { + ForceLock = FALSE; + } + + /* Here comes the hack, ignore the failure! */ + if (!ForceLock) + { +#endif + DPRINT1("Can't lock: %u opened\n", DeviceExt->OpenHandleCount); ListEntry = DeviceExt->FcbListHead.Flink; @@ -1136,6 +1200,17 @@ VfatLockOrUnlockVolume( } return STATUS_ACCESS_DENIED; + +#if 1 + /* End of the hack: be verbose about its usage, + * just in case we would mess up everything! + */ + } + else + { + DPRINT1("HACK: Using lock-hack!\n"); + } +#endif } /* Finally, proceed */

1 0

01/01: [SHELL32] Fix usage of DeferWindowPos (fix of #544) (#552)
by Katayama Hirofumi MZ 18 May '18

18 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfb19dd25174d1b886909… commit bfb19dd25174d1b8869090e8c3d341bb89e7365f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat May 19 05:27:22 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri May 18 22:27:22 2018 +0200 [SHELL32] Fix usage of DeferWindowPos (fix of #544) (#552) --- dll/win32/shell32/dialogs/folder_options.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dll/win32/shell32/dialogs/folder_options.cpp b/dll/win32/shell32/dialogs/folder_options.cpp index 12af778245..b53dd8ce0d 100644 --- a/dll/win32/shell32/dialogs/folder_options.cpp +++ b/dll/win32/shell32/dialogs/folder_options.cpp @@ -1622,17 +1622,17 @@ NewExtDlg_OnAdvanced(HWND hwndDlg, NEWEXT_DIALOG *pNewExt) HDWP hDWP = BeginDeferWindowPos(3); if (hDWP) - DeferWindowPos(hDWP, GetDlgItem(hwndDlg, IDOK), NULL, - rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, - SWP_NOACTIVATE | SWP_NOZORDER); + hDWP = DeferWindowPos(hDWP, GetDlgItem(hwndDlg, IDOK), NULL, + rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, + SWP_NOACTIVATE | SWP_NOZORDER); if (hDWP) - DeferWindowPos(hDWP, GetDlgItem(hwndDlg, IDCANCEL), NULL, - rc2.left, rc2.top, rc2.right - rc2.left, rc2.bottom - rc2.top, - SWP_NOACTIVATE | SWP_NOZORDER); + hDWP = DeferWindowPos(hDWP, GetDlgItem(hwndDlg, IDCANCEL), NULL, + rc2.left, rc2.top, rc2.right - rc2.left, rc2.bottom - rc2.top, + SWP_NOACTIVATE | SWP_NOZORDER); if (hDWP) - DeferWindowPos(hDWP, hwndDlg, NULL, - rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, - SWP_NOACTIVATE | SWP_NOZORDER); + hDWP = DeferWindowPos(hDWP, hwndDlg, NULL, + rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, + SWP_NOACTIVATE | SWP_NOZORDER); if (hDWP) EndDeferWindowPos(hDWP);

1 0

01/01: [DRWTSN32] Use GetCommandLineW for CommandLineToArgvW. Spotted by Hermès
by Mark Jansen 18 May '18

18 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb5db143f0e0f744571b9… commit bb5db143f0e0f744571b996e47f2c2d528855c33 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun May 13 23:22:56 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri May 18 18:27:36 2018 +0200 [DRWTSN32] Use GetCommandLineW for CommandLineToArgvW. Spotted by Hermès --- base/applications/drwtsn32/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/drwtsn32/main.cpp b/base/applications/drwtsn32/main.cpp index f7cdc3aab0..e67c735006 100644 --- a/base/applications/drwtsn32/main.cpp +++ b/base/applications/drwtsn32/main.cpp @@ -253,7 +253,7 @@ HRESULT WriteMinidump(LPCWSTR LogFilePath, DumpData& data) int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR cmdLine, INT) { int argc; - WCHAR **argv = CommandLineToArgvW(cmdLine, &argc); + WCHAR **argv = CommandLineToArgvW(GetCommandLineW(), &argc); DWORD pid = 0; WCHAR Filename[50];

1 0

01/01: [FASTFAT] Uninit directory cache on last handle close.
by Pierre Schweitzer 18 May '18

18 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a837694518ded3114e59a… commit a837694518ded3114e59ab39028b1f92707664c1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri May 18 14:51:24 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri May 18 14:51:24 2018 +0200 [FASTFAT] Uninit directory cache on last handle close. CORE-14629 CORE-14557 --- drivers/filesystems/fastfat/close.c | 13 +++++++++++++ drivers/filesystems/fastfat/dirwr.c | 1 + 2 files changed, 14 insertions(+) diff --git a/drivers/filesystems/fastfat/close.c b/drivers/filesystems/fastfat/close.c index 992ccac4c2..bb5cfaae78 100644 --- a/drivers/filesystems/fastfat/close.c +++ b/drivers/filesystems/fastfat/close.c @@ -48,6 +48,19 @@ VfatCloseFile( } else { + if (pFcb->OpenHandleCount == 0 && BooleanFlagOn(pFcb->Flags, FCB_CACHE_INITIALIZED)) + { + PFILE_OBJECT tmpFileObject; + tmpFileObject = pFcb->FileObject; + if (tmpFileObject != NULL) + { + pFcb->FileObject = NULL; + CcUninitializeCacheMap(tmpFileObject, NULL, NULL); + ClearFlag(pFcb->Flags, FCB_CACHE_INITIALIZED); + ObDereferenceObject(tmpFileObject); + } + } + #ifdef KDBG pFcb->Flags |= FCB_CLOSED; #endif diff --git a/drivers/filesystems/fastfat/dirwr.c b/drivers/filesystems/fastfat/dirwr.c index e2026b8cd9..dc073f9236 100644 --- a/drivers/filesystems/fastfat/dirwr.c +++ b/drivers/filesystems/fastfat/dirwr.c @@ -37,6 +37,7 @@ vfatFCBInitializeCacheFromVolume( } ASSERT(vfatFCBIsDirectory(fcb)); + ASSERT(fcb->FileObject == NULL); Acquired = FALSE; if (!ExIsResourceAcquiredExclusive(&vcb->DirResource))

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs