Ros-diffs May 2020

ros-diffs@reactos.org

28 participants
193 discussions

[reactos] 01/01: [MAIN.CPL] PL-pl update

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f05ea59117bb77f6e699… commit 6f05ea59117bb77f6e699382f48c4143669a24ea Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Mon May 11 10:01:17 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon May 11 15:52:17 2020 +0200 [MAIN.CPL] PL-pl update MAIN.CPL - PL-pl -dialogs fix -strings update --- dll/cpl/main/lang/pl-PL.rc | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/dll/cpl/main/lang/pl-PL.rc b/dll/cpl/main/lang/pl-PL.rc index c9bb7b12246..aa34d51b732 100644 --- a/dll/cpl/main/lang/pl-PL.rc +++ b/dll/cpl/main/lang/pl-PL.rc @@ -3,6 +3,7 @@ * xxrogers(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl * UTF-8 conversion by Caemyr (May, 2011) + * Polish translation updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (May, 2020) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -12,20 +13,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Szybkość" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Powtarzanie znaku", -1, 5, 5, 230, 140 + GROUPBOX "Powtarzanie znaku", -1, 5, 5, 230, 146 ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15 - LTEXT "&Opóźnienie powtarzania:", -1, 40, 15, 50, 10 + LTEXT "&Opóźnienie powtarzania:", -1, 40, 15, 78, 10 LTEXT "Duże", -1, 40, 30, 20, 10 LTEXT "Małe", -1, 200, 30, 20, 10 CONTROL "", IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17 ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15 - LTEXT "&Częstotliwość powtarzania", -1, 40, 70, 50, 10 + LTEXT "&Częstotliwość powtarzania:", -1, 40, 70, 86, 10 LTEXT "Mała", -1, 40, 85, 20, 10 LTEXT "Duża", -1, 200, 85, 20, 10 CONTROL "", IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 LTEXT "&Kliknij tutaj i przytrzymaj klawisz, aby sprawdzić szybkość powtarzania:", -1, 15, 108, 200, 20 EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 125, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "Częstotliwość &migania kursora", -1, 5, 145, 230, 50 + GROUPBOX "Częstotliwość &migania kursora", -1, 5, 157, 230, 50 LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 LTEXT "Brak", -1, 40, 165, 30, 10 LTEXT "Duża", -1, 200, 165, 30, 10 @@ -81,14 +82,14 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "&Schemat", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Z&apisz jako...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 - PUSHBUTTON "&Usuń", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 + PUSHBUTTON "Z&apisz jako...", IDC_BUTTON_SAVEAS_SCHEME, 70, 31, 50, 14 + PUSHBUTTON "&Usuń", IDC_BUTTON_DELETE_SCHEME, 125, 31, 40, 14 CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Dostosuj:", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Włącz cień wskaźnika", IDC_CHECK_CURSOR_SHADOW, 5, 200, 100, 10 - PUSHBUTTON "Użyj d&omyślnego", IDC_BUTTON_USE_DEFAULT_CURSOR, 90, 200, 70, 15 - PUSHBUTTON "&Przeglądaj...", IDC_BUTTON_BROWSE_CURSOR, 170, 200, 70, 15 + PUSHBUTTON "Użyj d&omyślnego", IDC_BUTTON_USE_DEFAULT_CURSOR, 90, 200, 70, 14 + PUSHBUTTON "&Przeglądaj...", IDC_BUTTON_BROWSE_CURSOR, 170, 200, 70, 14 END IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 @@ -96,10 +97,10 @@ STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU CAPTION "Zapisz schemat" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Zapisz ten schemat kursorów jako:", -1, 5, 5, 100, 10 + LTEXT "Zapisz ten schemat kursorów jako:", -1, 5, 5, 144, 9 EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP - PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15 - PUSHBUTTON "&Anuluj", IDCANCEL, 115, 45, 50, 15 + PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 14 + PUSHBUTTON "&Anuluj", IDCANCEL, 115, 45, 50, 14 END IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 @@ -113,7 +114,7 @@ BEGIN CONTROL "", IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Szybko", -1, 170, 30, 30, 10 ICON IDI_MOUSE_SPEED, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 - CHECKBOX "Zwiększ pr&ecyzję wskaźnika", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 + CHECKBOX "Zwiększ pr&ecyzję wskaźnika", IDC_CHECK_POINTER_PRECISION, 60, 50, 151, 10 GROUPBOX "Przyciąganie do", -1, 5, 65, 230, 40 CHECKBOX "&Automatycznie przenieś wskaźnik na domyślny przycisk w oknie dialogowym", IDC_CHECK_SNAP_TO, 60, 80, 170, 20, BS_MULTILINE | BS_TOP @@ -137,20 +138,20 @@ CAPTION "Kółko" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Przewijanie", -1, 5, 5, 230, 80 - ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32 - LTEXT "Obrócenie kółkiem o jeden skok powoduje przewinięcie:", -1, 60, 15, 150, 10 - RADIOBUTTON "&O tyle linii naraz:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP - RADIOBUTTON "O jeden &ekran", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 13, 20, 32, 32 + LTEXT "Obrócenie kółkiem o jeden skok powoduje przewinięcie:", -1, 42, 15, 179, 10 + RADIOBUTTON "&O tyle linii naraz:", IDC_RADIO_WHEEL_SCROLL_LINES, 42, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "O jeden &ekran", IDC_RADIO_WHEEL_SCROLL_PAGE, 42, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 69, 45, 37, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 105, 45, 11, 12 END STRINGTABLE BEGIN IDS_CPLNAME_1 "Mysz" - IDS_CPLDESCRIPTION_1 "Dostosowuje ustawienia myszy." + IDS_CPLDESCRIPTION_1 "Dostosowuje ustawienia myszy, takie jak konfiguracja przycisków, szybkość dwukrotnego kliknięcia, wskaźniki myszy i szybkość ruchu." IDS_CPLNAME_2 "Klawiatura" - IDS_CPLDESCRIPTION_2 "Dostosowuje ustawienia klawiatury." + IDS_CPLDESCRIPTION_2 "Dostosowuje ustawienia klawiatury, takie jak częstotliwość migania kursora i częstotliwość powtarzania znaku." IDS_ARROW "Wybór normalny" IDS_HELP "Wybór pomocy" IDS_APPSTARTING "Praca w tle" @@ -164,7 +165,7 @@ BEGIN IDS_SIZENWSE "Zmiana wymiarów po przekątnej 1" IDS_SIZENESW "Zmiana wymiarów po przekątnej 2" IDS_SIZEALL "Przenieś" - IDS_UPARROW "Alternatywny wybór" + IDS_UPARROW "Wybór alternatywny" IDS_HAND "Wybór łącza" IDS_NONE "(brak)" IDS_SYSTEM_SCHEME "(schemat systemu)"

4 years, 7 months

[reactos] 01/01: [INTL.CPL] PL-pl update

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc6dcfb10e65e0da7a1bf… commit cc6dcfb10e65e0da7a1bf43a014549df9ac6a676 Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Mon May 11 10:41:12 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon May 11 15:51:53 2020 +0200 [INTL.CPL] PL-pl update intl.cpl - PL-pl update -dialogs fix -strings update --- dll/cpl/intl/lang/pl-PL.rc | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dll/cpl/intl/lang/pl-PL.rc b/dll/cpl/intl/lang/pl-PL.rc index 29817e01e8e..971b5daf414 100644 --- a/dll/cpl/intl/lang/pl-PL.rc +++ b/dll/cpl/intl/lang/pl-PL.rc @@ -4,6 +4,7 @@ * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) + * Polish translation updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (May, 2020) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -60,7 +61,7 @@ BEGIN GROUPBOX "Tabele konwersji stron kodowych", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Domyślne ustawienia konta użytkownika", -1, 5, 193, 234, 32 - CHECKBOX "Zastosuj wszystkie ustawienia do bieżącego konta użytkownika i do domyślnego profilu użytkownika.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP + CHECKBOX "Zastosuj wszystkie ustawienia do bieżącego konta użytkownika i do domyślnego profilu użytkownika.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 202, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 @@ -99,10 +100,10 @@ CAPTION "Waluta" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Przykład", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE - LTEXT "Dodatnie:", -1, 13, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_CURRENCYPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP - LTEXT "Ujemne:", -1, 120, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "Dodatnie:", -1, 12, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 45, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "Ujemne:", -1, 123, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 156, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP LTEXT "Symbol &waluty:", -1, 10, 51, 111, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYSYMBOL, 134, 49, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "F&ormat liczb dodatnich:", -1, 10, 68, 111, 10, WS_CHILD | WS_VISIBLE | WS_GROUP @@ -147,8 +148,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Data" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Kalendarz", -1, 7, 7, 230, 74 - LTEXT "&Jeżeli wprowadzony zostanie rok w postaci dwóch cyfr, interpretuj go jako rok z zakresu od:", -1, 13, 18, 215, 8 + GROUPBOX "Kalendarz", -1, 7, 2, 230, 80 + LTEXT "&Jeżeli wprowadzony zostanie rok w postaci dwóch cyfr, interpretuj go jako rok z zakresu od:", -1, 13, 11, 215, 16 EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED LTEXT "do", -1, 55, 32, 17, 8 EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP @@ -157,7 +158,7 @@ BEGIN COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED LTEXT "Kalendarz muzułmański:", -1, 13, 62, 60, 16 COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - GROUPBOX "Format daty krótkiej", -1, 7, 83, 230, 81 + GROUPBOX "Data krótka", -1, 7, 83, 230, 81 LTEXT "Przykład:", -1, 13, 95, 63, 10 EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP LTEXT "Przykład - z prawej do lewej:", -1, 13, 109, 60, 16 @@ -166,7 +167,7 @@ BEGIN COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE LTEXT "Separator daty:", -1, 13, 148, 113, 10 COMBOBOX IDC_SHRTDATESEP_COMBO, 180, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - GROUPBOX "Format daty długiej", -1, 7, 167, 230, 64 + GROUPBOX "Data długa", -1, 7, 167, 230, 64 LTEXT "Przykład:", -1, 13, 179, 61, 10 EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP LTEXT "Przykład - z prawej do lewej:", -1, 13, 193, 61, 16 @@ -181,8 +182,8 @@ CAPTION "Sortowanie" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Sortowanie", -1, 7, 7, 230, 74 - LTEXT "Metody sortowania określają porządek znaków, słów, plików i katalogów.", -1, 14, 17, 220, 25 - LTEXT "Wybierz metodę sortowania dla twojego języka:", -1, 14, 37, 220, 22 + LTEXT "Metody sortowania określają porządek, w jaki programy sortują znaki, słowa, pliki i katalogi.", -1, 14, 17, 220, 20 + LTEXT "Wybierz metodę sortowania dla twojego języka:", -1, 14, 46, 220, 8 COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END

4 years, 7 months

[reactos] 01/01: [WIN32SS] Fix DrawTextExWorker extent for Spotify (#2759)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97ccef77616ca2a2c31d8… commit 97ccef77616ca2a2c31d8ea1d46d3a045e13cbf1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon May 11 18:32:47 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 11 18:32:47 2020 +0900 [WIN32SS] Fix DrawTextExWorker extent for Spotify (#2759) CORE-16747 --- win32ss/user/rtl/text.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/rtl/text.c b/win32ss/user/rtl/text.c index 061e49b6d5e..0ab3f00ea31 100644 --- a/win32ss/user/rtl/text.c +++ b/win32ss/user/rtl/text.c @@ -1266,7 +1266,7 @@ INT WINAPI DrawTextExWorker( HDC hdc, if (flags & DT_VCENTER) y = rect->top + (rect->bottom - rect->top + (invert_y ? size.cy : -size.cy)) / 2; else if (flags & DT_BOTTOM) - y = rect->bottom + (invert_y ? 0 : -size.cy); + y = rect->bottom + (invert_y ? size.cy : -size.cy); #else if (flags & DT_VCENTER) y = rect->top + (rect->bottom - rect->top) / 2 - size.cy / 2;

4 years, 7 months

[reactos] 01/01: [SHELL32] Don't hardcode C: drive (#2768)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=711f63184915c2e2f1253… commit 711f63184915c2e2f125325b774f13ccf781887d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon May 11 11:43:07 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 11 11:43:07 2020 +0900 [SHELL32] Don't hardcode C: drive (#2768) CORE-13235 --- dll/win32/shell32/folders/CRecycleBin.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp index a62696a2628..a32c42b621f 100644 --- a/dll/win32/shell32/folders/CRecycleBin.cpp +++ b/dll/win32/shell32/folders/CRecycleBin.cpp @@ -191,13 +191,17 @@ CRecycleBinEnum::~CRecycleBinEnum() HRESULT WINAPI CRecycleBinEnum::Initialize(DWORD dwFlags) { - static LPCWSTR szDrive = L"C:\\"; + WCHAR szDrive[8]; + if (GetEnvironmentVariableW(L"SystemDrive", szDrive, _countof(szDrive))) + PathAddBackslashW(szDrive); + else + StringCbCopyW(szDrive, sizeof(szDrive), L"C:\\"); if (dwFlags & SHCONTF_NONFOLDERS) { TRACE("Starting Enumeration\n"); - if (!EnumerateRecycleBinW(szDrive /* FIXME */ , CBEnumRecycleBin, (PVOID)this)) + if (!EnumerateRecycleBinW(szDrive, CBEnumRecycleBin, this)) { WARN("Error: EnumerateCRecycleBinW failed\n"); return E_FAIL; @@ -354,7 +358,7 @@ HRESULT WINAPI CRecycleBinItemContextMenu::QueryContextMenu(HMENU hMenu, UINT in HRESULT WINAPI CRecycleBinItemContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) { SEARCH_CONTEXT Context; - static LPCWSTR szDrive = L"C:\\"; + WCHAR szDrive[8]; TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n", this, lpcmi, lpcmi->lpVerb, lpcmi->hwnd); @@ -363,6 +367,11 @@ HRESULT WINAPI CRecycleBinItemContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO l Context.pFileDetails = _ILGetRecycleStruct(apidl); Context.bFound = FALSE; + if (GetEnvironmentVariableW(L"SystemDrive", szDrive, _countof(szDrive))) + PathAddBackslashW(szDrive); + else + StringCbCopyW(szDrive, sizeof(szDrive), L"C:\\"); + EnumerateRecycleBinW(szDrive, CBSearchRecycleBin, (PVOID)&Context); if (!Context.bFound) return E_FAIL;

4 years, 7 months

[reactos] 01/01: [CMD] Quick fix for the REM command parser. CORE-17030

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c11be5a3a95a35604f73… commit 9c11be5a3a95a35604f73062719431cf6df1ffb6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 11 04:22:58 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 11 04:27:12 2020 +0200 [CMD] Quick fix for the REM command parser. CORE-17030 --- base/shell/cmd/parser.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/base/shell/cmd/parser.c b/base/shell/cmd/parser.c index cdea54a8f08..abf2353d563 100644 --- a/base/shell/cmd/parser.c +++ b/base/shell/cmd/parser.c @@ -575,9 +575,10 @@ error: /* Parse a REM command */ static PARSED_COMMAND *ParseRem(void) { - /* Just ignore the rest of the line */ - while (CurChar && CurChar != _T('\n')) - ParseChar(); + /* "Ignore" the rest of the line. + * (Line continuations will still be parsed, though.) */ + while (ParseToken(0, NULL) != TOK_END) + ; return NULL; }

4 years, 7 months

[reactos] 01/01: [UMPNPMGR] Implement PNP_GetFirstLogConf and PNP_GetNextLogConf (WIP)

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4246b64dcb8ae6478f516… commit 4246b64dcb8ae6478f516bfe934d5c749b77deb0 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 10 20:45:11 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 10 20:46:41 2020 +0200 [UMPNPMGR] Implement PNP_GetFirstLogConf and PNP_GetNextLogConf (WIP) - PNP_GetFirstLogConf only works for resources lists. - PNP_GetNextLogConf does not return a valid tag yet. --- base/services/umpnpmgr/rpcserver.c | 291 ++++++++++++++++++++++++++++++++++++- 1 file changed, 287 insertions(+), 4 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 313ca1c8076..e88d3cc123d 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -410,6 +410,131 @@ IsRootDeviceInstanceID( } +static +CONFIGRET +OpenConfigurationKey( + _In_ LPCWSTR pszDeviceID, + _Out_ PHKEY phKey) +{ + WCHAR szKeyName[MAX_PATH]; + HKEY hInstanceKey; + DWORD dwError; + + /* Build the full device instance key name */ + wcscpy(szKeyName, L"System\\CurrentControlSet\\Enum\\"); + wcscat(szKeyName, pszDeviceID); + + /* Open the device instance key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + szKeyName, + 0, + KEY_QUERY_VALUE | KEY_SET_VALUE | KEY_CREATE_SUB_KEY, + &hInstanceKey); + if (dwError != ERROR_SUCCESS) + return CR_INVALID_DEVINST; + + /* Create or open the LogConf key */ + dwError = RegCreateKeyExW(hInstanceKey, + L"LogConf", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + phKey, + NULL); + + /* Close the device instance key */ + RegCloseKey(hInstanceKey); + + if (dwError != ERROR_SUCCESS) + return CR_REGISTRY_ERROR; + + return CR_SUCCESS; +} + + +static +CONFIGRET +GetConfigurationData( + _In_ HKEY hKey, + _In_ ULONG ulLogConfType, + _Out_ PULONG pulRegDataType, + _Out_ PULONG pulDataSize, + _Out_ LPBYTE *ppBuffer) +{ + LPCWSTR pszValueName; + + switch (ulLogConfType) + { + case BOOT_LOG_CONF: + pszValueName = L"BootConfig"; + *pulRegDataType = REG_RESOURCE_LIST; + break; + + case ALLOC_LOG_CONF: + pszValueName = L"AllocConfig"; + *pulRegDataType = REG_RESOURCE_LIST; + break; + + case FORCED_LOG_CONF: + pszValueName = L"ForcedConfig"; + *pulRegDataType = REG_RESOURCE_LIST; + break; + + case FILTERED_LOG_CONF: + pszValueName = L"FilteredConfigVector"; + *pulRegDataType = REG_RESOURCE_REQUIREMENTS_LIST; + break; + + case BASIC_LOG_CONF: + pszValueName = L"BasicConfigVector"; + *pulRegDataType = REG_RESOURCE_REQUIREMENTS_LIST; + break; + + case OVERRIDE_LOG_CONF: + pszValueName = L"OverrideConfigVector"; + *pulRegDataType = REG_RESOURCE_REQUIREMENTS_LIST; + break; + + default: + DPRINT1("Unsupported configuration type!\n"); + return CR_FAILURE; + } + + /* Get the configuration data size */ + if (RegQueryValueExW(hKey, + pszValueName, + NULL, + NULL, + NULL, + pulDataSize) != ERROR_SUCCESS) + { + return CR_INVALID_LOG_CONF; + } + + /* Allocate the buffer */ + *ppBuffer = HeapAlloc(GetProcessHeap(), 0, *pulDataSize); + if (*ppBuffer == NULL) + { + return CR_OUT_OF_MEMORY; + } + + /* Retrieve the configuration data */ + if (RegQueryValueExW(hKey, + pszValueName, + NULL, + NULL, + (LPBYTE)*ppBuffer, + pulDataSize) != ERROR_SUCCESS) + { + return CR_INVALID_LOG_CONF; + } + + return CR_SUCCESS; +} + + /* PUBLIC FUNCTIONS **********************************************************/ /* Function 0 */ @@ -3732,8 +3857,92 @@ PNP_GetFirstLogConf( DWORD *pulLogConfTag, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + HKEY hConfigKey = NULL; + DWORD RegDataType = 0; + ULONG ulDataSize = 0; + LPBYTE lpData = NULL; + CONFIGRET ret = CR_SUCCESS; + + DPRINT("PNP_GetFirstLogConf(%p %S %lu %p 0x%08lx)\n", + hBinding, pDeviceID, ulLogConfType, pulLogConfTag, ulFlags); + + if (pulLogConfTag == NULL) + return CR_INVALID_POINTER; + + *pulLogConfTag = (DWORD)0; + + if (ulFlags & ~LOG_CONF_BITS) + return CR_INVALID_FLAG; + + if (!IsValidDeviceInstanceID(pDeviceID)) + return CR_INVALID_DEVINST; + + ret = OpenConfigurationKey(pDeviceID, + &hConfigKey); + if (ret != CR_SUCCESS) + { + DPRINT1("OpenConfigurationKey() failed (Error %lu)\n", ret); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + ret = GetConfigurationData(hConfigKey, + ulLogConfType, + &RegDataType, + &ulDataSize, + &lpData); + if (ret != CR_SUCCESS) + { + DPRINT1("GetConfigurationData() failed (Error %lu)\n", ret); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + DPRINT("Data size %lu\n", ulDataSize); + if (ulDataSize == 0 || lpData == NULL) + { + DPRINT1("No config data available!\n"); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + /* Get the first tag */ + if (RegDataType == REG_RESOURCE_LIST) + { + DPRINT("REG_RESOURCE_LIST\n"); + + DPRINT("ResourceList->Count %lu\n", ((PCM_RESOURCE_LIST)lpData)->Count); + if (((PCM_RESOURCE_LIST)lpData)->Count == 0) + { + DPRINT1("No resource descriptors!\n"); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + DPRINT("lpData %p\n", lpData); + DPRINT("&List[0] %p\n", &(((PCM_RESOURCE_LIST)lpData)->List[0])); + + *pulLogConfTag = (DWORD)((DWORD_PTR)&(((PCM_RESOURCE_LIST)lpData)->List[0]) - (DWORD_PTR)lpData); + DPRINT("Offset (Tag): 0x%08lx\n", *pulLogConfTag); + } + else if (RegDataType == REG_RESOURCE_REQUIREMENTS_LIST) + { + DPRINT1("FIXME: REG_RESOURCE_REQUIREMENTS_LIST\n"); + /* FIXME */ + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + +done: + if (lpData != NULL) + HeapFree(GetProcessHeap(), 0, lpData); + + if (hConfigKey != NULL) + RegCloseKey(hConfigKey); + + DPRINT("PNP_GetFirstLogConf() returns %lu\n", ret); + + return ret; } @@ -3748,8 +3957,82 @@ PNP_GetNextLogConf( DWORD *pulNextTag, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + HKEY hConfigKey = NULL; + DWORD RegDataType = 0; + ULONG ulDataSize = 0; + LPBYTE lpData = NULL; + CONFIGRET ret = CR_SUCCESS; + + DPRINT("PNP_GetNextLogConf(%p %S %lu %ul %p 0x%08lx)\n", + hBinding, pDeviceID, ulLogConfType, ulCurrentTag, pulNextTag, ulFlags); + + if (pulNextTag == NULL) + return CR_INVALID_POINTER; + + *pulNextTag = (DWORD)0; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (!IsValidDeviceInstanceID(pDeviceID)) + return CR_INVALID_DEVINST; + + ret = OpenConfigurationKey(pDeviceID, + &hConfigKey); + if (ret != CR_SUCCESS) + { + DPRINT1("OpenConfigurationKey() failed (Error %lu)\n", ret); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + ret = GetConfigurationData(hConfigKey, + ulLogConfType, + &RegDataType, + &ulDataSize, + &lpData); + if (ret != CR_SUCCESS) + { + DPRINT1("GetConfigurationData() failed (Error %lu)\n", ret); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + DPRINT("Data size %lu\n", ulDataSize); + + if (ulDataSize == 0 || lpData == NULL) + { + DPRINT1("No config data available!\n"); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + /* FIXME: Get the next tag */ + if (RegDataType == REG_RESOURCE_LIST) + { + DPRINT1("FIXME: REG_RESOURCE_LIST\n"); + /* FIXME */ + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + else if (RegDataType == REG_RESOURCE_REQUIREMENTS_LIST) + { + DPRINT1("FIXME: REG_RESOURCE_REQUIREMENTS_LIST\n"); + /* FIXME */ + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + +done: + if (lpData != NULL) + HeapFree(GetProcessHeap(), 0, lpData); + + if (hConfigKey != NULL) + RegCloseKey(hConfigKey); + + DPRINT("PNP_GetNextLogConf() returns %lu\n", ret); + + return ret; }

4 years, 7 months

[reactos] 01/01: [FREELDR] Add vertical screen scrolling for Xbox with console mode (#2745)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98c17d3120b66c6c95074… commit 98c17d3120b66c6c9507474cb5c3db1ca7b36ed3 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sun May 10 22:35:51 2020 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 10 18:35:51 2020 +0200 [FREELDR] Add vertical screen scrolling for Xbox with console mode (#2745) Also turn off debug messages to screen before setting up the CPU (To print a character to the screen on some ports the MMIO access should be executed, so it throws an exception). CORE-16216 --- boot/freeldr/freeldr/arch/i386/pc98/machpc98.c | 1 + boot/freeldr/freeldr/arch/i386/xbox/machxbox.c | 11 +++++++---- boot/freeldr/freeldr/arch/i386/xbox/xboxcons.c | 18 ++++++++++++++---- boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c | 20 +++++++++++++++++++- boot/freeldr/freeldr/include/arch/i386/machxbox.h | 1 + boot/freeldr/freeldr/include/debug.h | 1 + boot/freeldr/freeldr/lib/debug.c | 6 ++++++ 7 files changed, 49 insertions(+), 9 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c b/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c index ca94ea54976..38ddf378378 100644 --- a/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c +++ b/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c @@ -37,6 +37,7 @@ Pc98PrepareForReactOS(VOID) Pc98DiskPrepareForReactOS(); Pc98VideoPrepareForReactOS(); DiskStopFloppyMotor(); + DebugDisableScreenPort(); } ULONG diff --git a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c index b1ed4c94be0..3735f18982b 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c @@ -277,10 +277,6 @@ MachInit(const char *CmdLine) /* Set LEDs to red before anything is initialized */ XboxSetLED("rrrr"); - /* Initialize our stuff */ - XboxMemInit(); - XboxVideoInit(); - /* Setup vtbl */ MachVtbl.ConsPutChar = XboxConsPutChar; MachVtbl.ConsKbHit = XboxConsKbHit; @@ -311,6 +307,10 @@ MachInit(const char *CmdLine) MachVtbl.HwDetect = XboxHwDetect; MachVtbl.HwIdle = XboxHwIdle; + /* Initialize our stuff */ + XboxMemInit(); + XboxVideoInit(); + /* Set LEDs to orange after init */ XboxSetLED("oooo"); @@ -324,6 +324,9 @@ XboxPrepareForReactOS(VOID) XboxVideoPrepareForReactOS(); XboxDiskInit(FALSE); DiskStopFloppyMotor(); + + /* Turn off debug messages to screen */ + DebugDisableScreenPort(); } /* EOF */ diff --git a/boot/freeldr/freeldr/arch/i386/xbox/xboxcons.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxcons.c index 8baba25b5cc..ed5d55c5b09 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/xboxcons.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/xboxcons.c @@ -25,7 +25,17 @@ static unsigned CurrentAttr = 0x0f; VOID XboxConsPutChar(int c) { - ULONG Width, Unused; + ULONG Width, Height, Unused; + BOOLEAN NeedScroll; + + XboxVideoGetDisplaySize(&Width, &Height, &Unused); + + NeedScroll = (CurrentCursorY >= Height); + if (NeedScroll) + { + XboxVideoScrollUp(); + --CurrentCursorY; + } if (c == '\r') { @@ -34,7 +44,9 @@ XboxConsPutChar(int c) else if (c == '\n') { CurrentCursorX = 0; - CurrentCursorY++; + + if (!NeedScroll) + ++CurrentCursorY; } else if (c == '\t') { @@ -46,13 +58,11 @@ XboxConsPutChar(int c) CurrentCursorX++; } - XboxVideoGetDisplaySize(&Width, &Unused, &Unused); if (CurrentCursorX >= Width) { CurrentCursorX = 0; CurrentCursorY++; } - // FIXME: Implement vertical screen scrolling if we are at the end of the screen. } BOOLEAN diff --git a/boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c index 261f4550664..0d6e3b2c70b 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c @@ -20,8 +20,8 @@ */ #include <freeldr.h> -#include <debug.h> +#include <debug.h> DBG_DEFAULT_CHANNEL(UI); PVOID FrameBuffer; @@ -101,6 +101,24 @@ XboxVideoClearScreenColor(ULONG Color, BOOLEAN FullScreen) } } +VOID +XboxVideoScrollUp(VOID) +{ + ULONG BgColor, Dummy; + ULONG PixelCount = ScreenWidth * CHAR_HEIGHT * + (((ScreenHeight - 2 * TOP_BOTTOM_LINES) / CHAR_HEIGHT) - 1); + PULONG Src = (PULONG)((PUCHAR)FrameBuffer + (CHAR_HEIGHT + TOP_BOTTOM_LINES) * Delta); + PULONG Dst = (PULONG)((PUCHAR)FrameBuffer + TOP_BOTTOM_LINES * Delta); + + XboxVideoAttrToColors(ATTR(COLOR_WHITE, COLOR_BLACK), &Dummy, &BgColor); + + while (PixelCount--) + *Dst++ = *Src++; + + for (PixelCount = 0; PixelCount < ScreenWidth * CHAR_HEIGHT; PixelCount++) + *Dst++ = BgColor; +} + VOID XboxVideoClearScreen(UCHAR Attr) { diff --git a/boot/freeldr/freeldr/include/arch/i386/machxbox.h b/boot/freeldr/freeldr/include/arch/i386/machxbox.h index 3f41e848666..d4342de4a0f 100644 --- a/boot/freeldr/freeldr/include/arch/i386/machxbox.h +++ b/boot/freeldr/freeldr/include/arch/i386/machxbox.h @@ -69,6 +69,7 @@ VOID XboxVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); VOID XboxVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); VOID XboxVideoSync(VOID); VOID XboxVideoPrepareForReactOS(VOID); +VOID XboxVideoScrollUp(VOID); VOID XboxPrepareForReactOS(VOID); VOID XboxMemInit(VOID); diff --git a/boot/freeldr/freeldr/include/debug.h b/boot/freeldr/freeldr/include/debug.h index 1862220fb82..3ab9392b28e 100644 --- a/boot/freeldr/freeldr/include/debug.h +++ b/boot/freeldr/freeldr/include/debug.h @@ -44,6 +44,7 @@ ULONG DbgPrint(const char *Format, ...); VOID DbgPrint2(ULONG Mask, ULONG Level, const char *File, ULONG Line, char *Format, ...); VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length); + VOID DebugDisableScreenPort(); VOID DbgParseDebugChannels(PCHAR Value); #define ERR_LEVEL 0x1 diff --git a/boot/freeldr/freeldr/lib/debug.c b/boot/freeldr/freeldr/lib/debug.c index abc2545f7ea..e68df9af9cf 100644 --- a/boot/freeldr/freeldr/lib/debug.c +++ b/boot/freeldr/freeldr/lib/debug.c @@ -327,6 +327,12 @@ DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length) } } +VOID +DebugDisableScreenPort(VOID) +{ + DebugPort &= ~SCREEN; +} + static BOOLEAN DbgAddDebugChannel(CHAR* channel, CHAR* level, CHAR op) {

4 years, 7 months

[reactos] 01/01: [SNDREC32] French translation update (#2761)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2a24cadaeadcb15afa5f… commit a2a24cadaeadcb15afa5faaab28a9217a2fbe728 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun May 10 18:22:13 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 10 18:22:13 2020 +0200 [SNDREC32] French translation update (#2761) And add/fix colliding keyboard accelerators. Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/applications/sndrec32/lang/fr-FR.rc | 50 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/base/applications/sndrec32/lang/fr-FR.rc b/base/applications/sndrec32/lang/fr-FR.rc index 3b37303d23b..b8542d6dbe8 100644 --- a/base/applications/sndrec32/lang/fr-FR.rc +++ b/base/applications/sndrec32/lang/fr-FR.rc @@ -14,50 +14,50 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "Enregistreur de Son ReactOS, version 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 - DEFPUSHBUTTON "Accepter", IDOK, 139, 54, 50, 14, WS_GROUP + DEFPUSHBUTTON "&Accepter", IDOK, 139, 54, 50, 14, WS_GROUP END IDR_MENU1 MENU BEGIN - POPUP "Fichier" + POPUP "&Fichier" BEGIN - MENUITEM "Nouveau", ID_FILE_NEW - MENUITEM "Ouvrir...", ID_FILE_OPEN - MENUITEM "Enregistrer", ID_FILE_SAVE, GRAYED - MENUITEM "Enregistrer sous...", ID_FILE_SAVEAS, GRAYED - MENUITEM "Restorer...", ID_FILE_RESTORE, GRAYED - MENUITEM "Propriétés", ID_FILE_PROPERTIES + MENUITEM "&Nouveau", ID_FILE_NEW + MENUITEM "&Ouvrir...", ID_FILE_OPEN + MENUITEM "&Enregistrer", ID_FILE_SAVE, GRAYED + MENUITEM "Enregistrer &sous...", ID_FILE_SAVEAS, GRAYED + MENUITEM "&Restaurer...", ID_FILE_RESTORE, GRAYED + MENUITEM "&Propriétés", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Sortir", ID_FILE_EXIT + MENUITEM "&Quitter", ID_FILE_EXIT END POPUP "&Edition" BEGIN - MENUITEM "&Copie", ID_EDIT_COPY - MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED - MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM "&Copier", ID_EDIT_COPY + MENUITEM "Coller &Insérer", ID_EDIT_PASTE, GRAYED + MENUITEM "Coller &Mélanger", ID_EDIT_PASTEMIX, GRAYED MENUITEM SEPARATOR - MENUITEM "&Insérer un fichier...", ID_EDIT_INSERTFILE - MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM "Insérer un &fichier...", ID_EDIT_INSERTFILE + MENUITEM "Mé&langer avec un fichier...", ID_EDIT_MIXFILE MENUITEM SEPARATOR - MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED - MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM "Supprimer &avant la position actuelle",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Supprimer a&près la position actuelle",ID_EDIT_DELETEAFTER, GRAYED MENUITEM SEPARATOR MENUITEM "Propriétés A&udio", ID_EDIT_AUDIOPROPS END POPUP "Effet&s" BEGIN - MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL - MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM "&Augmenter le volume (de 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Réduire le volume", ID_EFFECTS_DECVOL MENUITEM SEPARATOR - MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD - MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM "Aug&menter la vitesse (de 100%)", ID_EFFECTS_INCSPD + MENUITEM "Réd&uire la vitesse", ID_EFFECTS_DECSPD MENUITEM SEPARATOR - MENUITEM "&Add Echo", ID_EFFECTS_ECHO - MENUITEM "&Reverse", ID_EFFECTS_REVERSE + MENUITEM "Aj&outer de l'écho", ID_EFFECTS_ECHO + MENUITEM "&Inverser", ID_EFFECTS_REVERSE END - POPUP "?" + POPUP "&?" BEGIN - MENUITEM "À propos", ID_ABOUT + MENUITEM "À &propos", ID_ABOUT END END @@ -71,7 +71,7 @@ STRINGTABLE BEGIN IDS_STRPOS "Position: %.2f s" IDS_STRDUR "Durée : %.2f s" - IDS_STRBUF "Buffer: %.2f kb" + IDS_STRBUF "Buffer: %.2f Ko" IDS_STRFMT "%.1f kHz %u bits" IDS_STRMONO "mono" IDS_STRSTEREO "stéréo"

4 years, 7 months

[reactos] 01/01: [ARP] Print a message when there is no relevant entry to be shown

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=592bafd60a33b82e62174… commit 592bafd60a33b82e62174f124ce80b2e0374a03a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 10 09:04:50 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 10 09:05:52 2020 +0200 [ARP] Print a message when there is no relevant entry to be shown --- base/applications/network/arp/arp.c | 43 +++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/base/applications/network/arp/arp.c b/base/applications/network/arp/arp.c index 2be34b24032..f3e758a0095 100644 --- a/base/applications/network/arp/arp.c +++ b/base/applications/network/arp/arp.c @@ -199,7 +199,7 @@ DWORD PrintEntries(PMIB_IPNETROW pIpAddRow) /* FIXME: allow user to specify an interface address, via pszIfAddr */ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) { - UINT i, k; + DWORD i, k, dwCount; PMIB_IPNETTABLE pIpNetTable = NULL; PMIB_IPADDRTABLE pIpAddrTable = NULL; ULONG Size = 0; @@ -227,7 +227,7 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) dwError = GetIpNetTable(pIpNetTable, &Size, TRUE); if (dwError != NO_ERROR) { - _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + _tprintf(_T("GetIpNetTable failed: %lu\n"), dwError); DoFormatMessage(); goto cleanup; } @@ -246,7 +246,7 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) Size = 0; GetIpAddrTable(pIpAddrTable, &Size, 0); - pIpAddrTable = (MIB_IPADDRTABLE *)HeapAlloc(GetProcessHeap(), 0, Size); + pIpAddrTable = (PMIB_IPADDRTABLE)HeapAlloc(GetProcessHeap(), 0, Size); if (pIpAddrTable == NULL) { PrintMessage(10004); @@ -275,6 +275,34 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) } } + /* Count relevant ARP entries */ + dwCount = 0; + for (i = 0; i < pIpNetTable->dwNumEntries; i++) + { + /* if the user has supplied their own internet address * + * only count the arp entry which matches that */ + if (pszInetAddr) + { + inaddr.S_un.S_addr = pIpNetTable->table[i].dwAddr; + pszIpAddr = inet_ntoa(inaddr); + + /* check if it matches, count it */ + if (strcmp(pszIpAddr, pszInetAddr) == 0) + dwCount++; + } + else + { + /* if an address is not supplied, count all entries */ + dwCount++; + } + } + + /* Print message and leave if there are no relevant ARP entries */ + if (dwCount == 0) + { + PrintMessage(10018); + goto cleanup; + } /* print header, including interface IP address and index number */ PrintMessageV(10003, szIntIpAddr, pIpNetTable->table[0].dwIndex); @@ -378,13 +406,13 @@ DWORD Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) dwError = GetIpNetTable(pIpNetTable, &Size, TRUE); if (dwError != NO_ERROR) { - _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + _tprintf(_T("GetIpNetTable failed: %lu\n"), dwError); DoFormatMessage(); goto cleanup; } /* reserve memory on heap and zero */ - pAddHost = (MIB_IPNETROW *)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); + pAddHost = (PMIB_IPNETROW)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); if (pAddHost == NULL) { PrintMessage(10004); @@ -438,7 +466,8 @@ DWORD Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) /* Add the ARP entry */ - if (SetIpNetEntry(pAddHost) != NO_ERROR) + dwError = SetIpNetEntry(pAddHost); + if (dwError != NO_ERROR) { DoFormatMessage(); goto cleanup; @@ -512,7 +541,7 @@ DWORD Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) dwError = GetIpNetTable(pIpNetTable, &Size, TRUE); if (dwError != NO_ERROR) { - _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + _tprintf(_T("GetIpNetTable failed: %lu\n"), dwError); DoFormatMessage(); goto cleanup; }

4 years, 7 months

[reactos] 01/01: [WINNLS] Fix of GetCurrencyFormatW to handle "32" grouping format (#2719)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1fad34755ccf07663f0d… commit c1fad34755ccf07663f0d962be5f207491eb244a Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun May 10 08:34:35 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 10 08:34:35 2020 +0200 [WINNLS] Fix of GetCurrencyFormatW to handle "32" grouping format (#2719) --- dll/win32/kernel32/winnls/string/lcformat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/win32/kernel32/winnls/string/lcformat.c b/dll/win32/kernel32/winnls/string/lcformat.c index 441c41b2211..5e5b529df9e 100644 --- a/dll/win32/kernel32/winnls/string/lcformat.c +++ b/dll/win32/kernel32/winnls/string/lcformat.c @@ -1762,7 +1762,7 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags, *szOut-- = *lpszDec--; /* Write decimal separator */ } - dwGroupCount = lpFormat->Grouping; + dwGroupCount = lpFormat->Grouping == 32 ? 3 : lpFormat->Grouping; /* Write the remaining whole number digits, including grouping chars */ while (szSrc >= lpszValue && *szSrc >= '0' && *szSrc <= '9') @@ -1791,6 +1791,8 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags, *szOut-- = *lpszGrp--; /* Write grouping char */ dwCurrentGroupCount = 0; + if (lpFormat->Grouping == 32) + dwGroupCount = 2; /* Indic grouping: 3 then 2 */ } } if (dwState & NF_ROUND)

4 years, 7 months

← Newer
1
...
9
10
11
12
13
14
15
...
20
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 May 2020