Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: Fix Wine Internet Explorer Print hang (#5064)
by Doug Lyons 12 Feb '23

12 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a050be089509335047128… commit a050be0895093350471280c93cf5dd047a25b2c8 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Feb 12 12:17:55 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 12 19:17:55 2023 +0100 Fix Wine Internet Explorer Print hang (#5064) When using wine internet explorer it crashes if you click print even if you click cancel, this fixes that issue. nsIWebBrowserPrint_Print apparently causes issues for unknown reasons. JIRA issue: CORE-16884 By returning S_OK print doesn't cause a crash. Use ERR and S_OK return before hitting nsIWebBrowserPrint_Print --- dll/win32/mshtml/olecmd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/win32/mshtml/olecmd.c b/dll/win32/mshtml/olecmd.c index 96b3f4bb6b7..6c419f8761f 100644 --- a/dll/win32/mshtml/olecmd.c +++ b/dll/win32/mshtml/olecmd.c @@ -241,6 +241,13 @@ static HRESULT exec_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, return S_OK; } +#ifdef __REACTOS__ + // returning here fixes CORE-16884. Maybe use this until printing works. + ERR("Aborting print, to work around CORE-16884\n"); + nsIWebBrowserPrint_Release(nsprint); + return S_OK; +#endif + nsres = nsIWebBrowserPrint_GetGlobalPrintSettings(nsprint, &settings); if(NS_FAILED(nsres)) ERR("GetCurrentPrintSettings failed: %08x\n", nsres);

1 0

[reactos] 01/01: [RAPPS] Fix Installed Apps information display (#4973)
by Rexx J. Larsson 12 Feb '23

12 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b5d917699912194ee71d… commit 3b5d917699912194ee71dc96f2c6a4836cf0c288 Author: Rexx J. Larsson <hello(a)rexx.icu> AuthorDate: Sun Feb 12 16:15:51 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 12 16:15:51 2023 +0100 [RAPPS] Fix Installed Apps information display (#4973) This fixes hyperlinks highlighting the text before it. CORE-18397 --- base/applications/rapps/installed.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/rapps/installed.cpp b/base/applications/rapps/installed.cpp index 7162f471b50..054bcf1736d 100644 --- a/base/applications/rapps/installed.cpp +++ b/base/applications/rapps/installed.cpp @@ -148,7 +148,7 @@ BOOL CInstalledApplicationInfo::GetApplicationRegString(LPCWSTR lpKeyName, ATL:: dwSize = min(dwAllocated, dwSize); // CString takes care of zero-terminating it - String.ReleaseBuffer(dwSize / sizeof(WCHAR)); + String.ReleaseBuffer(); if (Result != ERROR_SUCCESS) { @@ -164,7 +164,7 @@ BOOL CInstalledApplicationInfo::GetApplicationRegString(LPCWSTR lpKeyName, ATL:: if (dwLen > 0) { BOOL bSuccess = ExpandEnvironmentStringsW(String, Tmp.GetBuffer(dwLen), dwLen) == dwLen; - Tmp.ReleaseBuffer(dwLen - 1); + Tmp.ReleaseBuffer(); if (bSuccess) { String = Tmp;

1 0

[reactos] 01/01: [NTUSER] Delete temporary workarounds in co_IntSetScrollInfo() (#4985)
by Joachim Henze 11 Feb '23

11 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ad57373701686876c604… commit 5ad57373701686876c604f3bd58fbb2e449d5d81 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Feb 12 00:35:27 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 12 00:35:27 2023 +0100 [NTUSER] Delete temporary workarounds in co_IntSetScrollInfo() (#4985) fixes JIRA issue: CORE-18050 improves the code by removing ancient hacks (the static variables) reduces testbot failures VBox: https://reactos.org/testman/compare.php?ids=85831,85832 LGTM (-2 failures in user32:scroll for both bots) KVM: https://reactos.org/testman/compare.php?ids=85829,85833 LGTM (-2 failures in user32:scroll for both bots) co-authored by Doug-Lyons --- win32ss/user/ntuser/scrollbar.c | 60 +++++------------------------------------ 1 file changed, 6 insertions(+), 54 deletions(-) diff --git a/win32ss/user/ntuser/scrollbar.c b/win32ss/user/ntuser/scrollbar.c index 3763ac5c494..e52b70a21da 100644 --- a/win32ss/user/ntuser/scrollbar.c +++ b/win32ss/user/ntuser/scrollbar.c @@ -488,20 +488,15 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) UINT new_flags; INT action = 0; PSBDATA pSBData; - DWORD OldPos = 0, CurrentPos = 0; + DWORD OldPos = 0; BOOL bChangeParams = FALSE; /* Don't show/hide scrollbar if params don't change */ UINT MaxPage; int MaxPos; - /* [0] = SB_HORZ, [1] = SB_VERT, [2] = SB_CTL */ - static PWND PrevHwnd[3] = { 0 }; - static DWORD PrevPos[3] = { 0 }; - static DWORD PrevMax[3] = { 0 }; - static INT PrevAction[3] = { 0 }; BOOL bVisible; ASSERT_REFS_CO(Window); - if(!SBID_IS_VALID(nBar)) /* Assures nBar is 0, 1, or 2 */ + if(!SBID_IS_VALID(nBar)) { EngSetLastError(ERROR_INVALID_PARAMETER); ERR("Trying to set scrollinfo for unknown scrollbar type %d\n", nBar); @@ -548,9 +543,9 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) /* Set the scroll pos */ if (lpsi->fMask & SIF_POS) { + OldPos = Info->nPos; if (Info->nPos != lpsi->nPos) { - OldPos = Info->nPos; Info->nPos = lpsi->nPos; pSBData->pos = lpsi->nPos; } @@ -645,16 +640,6 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) } //done: - if ((Window != PrevHwnd[nBar]) || (action != PrevAction[nBar])) - { - if ((action == SA_SSI_SHOW) && (PrevAction[nBar] == SA_SSI_HIDE)) - { - co_UserShowScrollBar(Window, nBar, TRUE, TRUE); - } - } - if ((action != PrevAction[nBar]) && action != 0) - PrevAction[nBar] = action; - if ( action & SA_SSI_HIDE ) { co_UserShowScrollBar(Window, nBar, FALSE, FALSE); @@ -685,7 +670,6 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) { if (!(Info->fMask & SIF_THEMED)) /* Not Using Themes */ { - TRACE("Not using themes.\n"); if (action & SA_SSI_REPAINT_ARROWS) { // Redraw the entire bar. @@ -702,50 +686,18 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) IntRefeshScrollInterior(Window, nBar, psbi); } } - else /* Using Themes */ + else /* Using Themes */ { RECTL UpdateRect = psbi->rcScrollBar; - TRACE("Using themes.\n"); UpdateRect.left -= Window->rcClient.left - Window->rcWindow.left; UpdateRect.right -= Window->rcClient.left - Window->rcWindow.left; UpdateRect.top -= Window->rcClient.top - Window->rcWindow.top; UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top; - /* Just paint the interior and not the arrows. */ - if (!(action & SA_SSI_REPAINT_ARROWS)) - { - if (nBar == SB_HORZ) - { - UpdateRect.left += psbi->dxyLineButton; - UpdateRect.right -= psbi->dxyLineButton; - } - if (nBar == SB_VERT) - { - UpdateRect.top += psbi->dxyLineButton; - UpdateRect.bottom -= psbi->dxyLineButton; - } - } - CurrentPos = lpsi->fMask & SIF_PREVIOUSPOS ? OldPos : pSBData->pos; - /* Check for changes to Window or CurrentPos or lpsi->nMax */ - if ((Window != PrevHwnd[nBar]) || (CurrentPos != PrevPos[nBar]) || - (lpsi->nMax != PrevMax[nBar])) - { + if (bChangeParams || (OldPos != pSBData->pos)) co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME); - PrevHwnd[nBar] = Window; - PrevPos[nBar] = CurrentPos; - PrevMax[nBar] = lpsi->nMax; - } } - } // FIXME: Arrows -/* else if( action & SA_SSI_REPAINT_ARROWS ) - { - RECTL UpdateRect = psbi->rcScrollBar; - UpdateRect.left -= Window->rcClient.left - Window->rcWindow.left; - UpdateRect.right -= Window->rcClient.left - Window->rcWindow.left; - UpdateRect.top -= Window->rcClient.top - Window->rcWindow.top; - UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top; - co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME); } -*/ } + } if (bChangeParams && (nBar == SB_HORZ || nBar == SB_VERT) && (lpsi->fMask & SIF_DISABLENOSCROLL)) {

1 0

[reactos] 01/01: [BROWSEUI] Update de-DE.rc German translation
by Joachim Henze 11 Feb '23

11 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a38d19ebce7eae86a4931… commit a38d19ebce7eae86a49311611115cb4c9de74dcc Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Feb 11 21:35:57 2023 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Feb 11 21:35:57 2023 +0100 [BROWSEUI] Update de-DE.rc German translation German accelerator for "&Datei" collided with "A&dresse". Fix by switching to what MS uses in german XPSP3. see the before-state with the [BROWSEUI] collision here: https://jira.reactos.org/secure/attachment/65116/ros.png Please note that in current master head the accelerators in [BROWSEUI] filebrowser are generally broken for other reasons. So this commit will not entirely fix CORE-18824 Also update to new-style header (inspired by es-ES.rc) and https://reactos.org/wiki/Coding_Style and add a missing translation. --- dll/win32/browseui/lang/de-DE.rc | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index 2670095c0e8..02020fd4843 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -1,19 +1,8 @@ /* - * Copyright 2009 Andrew Hill - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Win32 BrowseUI + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: German resource file + * TRANSLATORS: Copyright 2023 Joachim Henze <Joachim.Henze(a)reactos.org> */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -306,7 +295,7 @@ END STRINGTABLE BEGIN IDS_SEARCHLABEL "Suchen" - IDS_ADDRESSBANDLABEL "A&dresse" + IDS_ADDRESSBANDLABEL "Adre&sse" END STRINGTABLE @@ -360,5 +349,5 @@ END STRINGTABLE BEGIN IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" - IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." + IDS_PARSE_ADDR_ERR_TEXT "'%1' kann nicht gefunden werden." END

1 0

[reactos] 01/01: [SYSSETUP] Fix a space-typo in IDS_WZD_PASSWORDEMPTY for *.rc (#5049)
by Joachim Henze 11 Feb '23

11 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc54ecd779eeb178ceeed… commit cc54ecd779eeb178ceeed1777cb1776f50c43593 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sat Feb 11 21:09:47 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 11 21:09:47 2023 +0100 [SYSSETUP] Fix a space-typo in IDS_WZD_PASSWORDEMPTY for *.rc (#5049) Also update any existing old-school-headers to more compact newstyle. --- dll/win32/syssetup/lang/da-DK.rc | 23 ++++++----------------- dll/win32/syssetup/lang/el-GR.rc | 2 +- dll/win32/syssetup/lang/en-GB.rc | 2 +- dll/win32/syssetup/lang/en-US.rc | 23 ++++++----------------- dll/win32/syssetup/lang/fi-FI.rc | 23 ++++++----------------- dll/win32/syssetup/lang/he-IL.rc | 2 +- dll/win32/syssetup/lang/it-IT.rc | 2 +- dll/win32/syssetup/lang/lt-LT.rc | 23 ++++++----------------- dll/win32/syssetup/lang/nl-NL.rc | 2 +- dll/win32/syssetup/lang/sq-AL.rc | 23 ++++++----------------- dll/win32/syssetup/lang/sv-SE.rc | 23 ++++++----------------- dll/win32/syssetup/lang/th-TH.rc | 23 ++++++----------------- dll/win32/syssetup/lang/uk-UA.rc | 4 ++-- 13 files changed, 49 insertions(+), 126 deletions(-) diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 68dd8941f2a..0c76f80322f 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -1,20 +1,9 @@ /* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Danish resource file + * TRANSLATORS: Copyright 2004 Filip Navara + * Copyright 2004 Eric Kohl */ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT @@ -232,7 +221,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 2bf8ae5c3f6..758afb2ebc2 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -213,7 +213,7 @@ BEGIN IDS_WZD_NAME "Για να συνεχίσει η εγκατάσταση, πρέπει να εισάγετε το όνομά σας." IDS_WZD_SETCOMPUTERNAME "Η εγκατάσταση απέτυχε να ορίσει το όνομα του υπολογιστή σας." IDS_WZD_COMPUTERNAME "Για να συνεχίσει η εγκατάσταση, πρέπει να εισάγετε το όνομά του υπολογιστή." - IDS_WZD_PASSWORDEMPTY "Πρέπει να εισάγετε έναν κωδικό πρόσβασης !" + IDS_WZD_PASSWORDEMPTY "Πρέπει να εισάγετε έναν κωδικό πρόσβασης!" IDS_WZD_PASSWORDMATCH "Οι κωδικοί πρόσβασης που εισαγάγατε δεν είναι ίδιοι. Εισάγετε ξανά τον κωδικό προσβασης." IDS_WZD_PASSWORDCHAR "Ο κωδικός πρόσβασης που εισαγάγατε περιέχει μη έγκυρους χαρακτήρες. Παρακαλώ εισάγετε έναν άλλο κωδικό πρόσβασης." IDS_WZD_LOCALTIME "Η εγκατάσταση απέτυχε να ρυθμίσει την ώρα του υπολογιστή σας." diff --git a/dll/win32/syssetup/lang/en-GB.rc b/dll/win32/syssetup/lang/en-GB.rc index 645db548e77..cac3c294b4f 100644 --- a/dll/win32/syssetup/lang/en-GB.rc +++ b/dll/win32/syssetup/lang/en-GB.rc @@ -213,7 +213,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index 153bb0be53b..c4606839be8 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -1,20 +1,9 @@ /* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: English resource file + * TRANSLATORS: Copyright 2004 Filip Navara + * Copyright 2004 Eric Kohl */ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -232,7 +221,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 3530dac77e2..277d6c66f9f 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -1,20 +1,9 @@ /* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: English resource file + * TRANSLATORS: Copyright 2004 Filip Navara + * Copyright 2004 Eric Kohl */ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT @@ -232,7 +221,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index 42a9e548d6b..88b9575c2e6 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -213,7 +213,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index 0af48b7ad99..d3c16f093e4 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -213,7 +213,7 @@ BEGIN IDS_WZD_NAME "La procedura di installazione non può proseguire se non indicate il vostro nome." IDS_WZD_SETCOMPUTERNAME "La procedura di installazione non ha potuto impostare il nome del computer." IDS_WZD_COMPUTERNAME "La procedura di installazione non può proseguire se non indicate il nome del computer." - IDS_WZD_PASSWORDEMPTY "E' obbligatorio impostare la password !" + IDS_WZD_PASSWORDEMPTY "E' obbligatorio impostare la password!" IDS_WZD_PASSWORDMATCH "Le due password digitate non corrispondono. Digitate di nuovo le password." IDS_WZD_PASSWORDCHAR "La password contiene caratteri non validi. Digitate una password diversa." IDS_WZD_LOCALTIME "La procedura di installazione non ha potuto impostare l'ora locale." diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index 4b91d334e95..a5152697c96 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -1,20 +1,9 @@ /* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Lithuanian resource file + * TRANSLATORS: Copyright 2004 Filip Navara + * Copyright 2004 Eric Kohl */ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT @@ -232,7 +221,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index 19bebcee246..dc68051a598 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -213,7 +213,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index 1bdd0c1242f..7d339527e0f 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -1,20 +1,9 @@ /* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Albanian resource file + * TRANSLATORS: Copyright 2004 Filip Navara + * Copyright 2004 Eric Kohl */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL @@ -232,7 +221,7 @@ BEGIN IDS_WZD_NAME "Ndërtimi nuk mund të vazhdojë deri sa të shkruani emrin tuaj." IDS_WZD_SETCOMPUTERNAME "Ndërtuesi dështoj për të vendosur emrin e kompjuterit." IDS_WZD_COMPUTERNAME "Ndërtuesi nuk mund të vazhdojë deri sa të shkruani emrin e kompjuterit tuaj." - IDS_WZD_PASSWORDEMPTY "Ju duhet të fusni një fjalëkalim !" + IDS_WZD_PASSWORDEMPTY "Ju duhet të fusni një fjalëkalim!" IDS_WZD_PASSWORDMATCH "Fjalëkalimet që shkruat nuk përputhet. Ju lutem shkruani fjalëkalimin e dëshiruar përsëri." IDS_WZD_PASSWORDCHAR "Fjalëkalimi që dhatë përmban shenja të pavlefshme. Ju lutemi shkruani një fjalëkalim të qartë." IDS_WZD_LOCALTIME "Ndërtuesi nuk ishte në gjendje për të vendosur kohën lokale." diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index ada1f682b8e..ca4f4eb697f 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -1,20 +1,9 @@ /* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Swedish resource file + * TRANSLATORS: Copyright 2004 Filip Navara + * Copyright 2004 Eric Kohl */ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL @@ -232,7 +221,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 85e0f6c3d90..33ae67d0d12 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -1,20 +1,9 @@ /* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Thai resource file + * TRANSLATORS: Copyright 2004 Filip Navara + * Copyright 2004 Eric Kohl */ LANGUAGE LANG_THAI, SUBLANG_DEFAULT @@ -232,7 +221,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index b06863d0c87..c3e57b46e63 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS System Setup Library * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Ukraianian resource file + * PURPOSE: Ukrainian resource file * TRANSLATORS: Copyright 2007 Artem Reznikov <temarez(a)yandex.ru> * Copyright 2010-2011 Igor Paliychuk <mansonigor(a)gmail.com> * Copyright 2018-2021 Yaroslav Kibysh <yanet.prod(a)gmail.com> @@ -222,7 +222,7 @@ BEGIN IDS_WZD_NAME "Для продовження встановлення необхідно ввести ваше ім'я." IDS_WZD_SETCOMPUTERNAME "Програмі інсталяції не вдалося встановити ім'я комп'ютера." IDS_WZD_COMPUTERNAME "Для продовження встановлення необхідно ввести ім'я комп'ютера." - IDS_WZD_PASSWORDEMPTY "Ви маєте ввести пароль !" + IDS_WZD_PASSWORDEMPTY "Ви маєте ввести пароль!" IDS_WZD_PASSWORDMATCH "Паролі, які ви ввели, не співпадають. Будь ласка введіть потрібний пароль знову." IDS_WZD_PASSWORDCHAR "Пароль, який ви ввели, містить заборонені символи. Будь ласка введіть інший пароль." IDS_WZD_LOCALTIME "Програмі інсталяції не вдалося встановити місцевий час."

1 0

[reactos] 01/01: [SHLWAPI] No need extension to execute '.bat' files CORE-17612 (#4932)
by Jose Carlos Jesus 10 Feb '23

10 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f691efefc26ef554e9715… commit f691efefc26ef554e9715abfa1916527277599bb Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Fri Feb 10 11:05:11 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 11 00:05:11 2023 +0900 [SHLWAPI] No need extension to execute '.bat' files CORE-17612 (#4932) When no extension is provided, add default extension with correct precedence using PathFileExistsDefExtW. - Use PathFindOnPathExW when searching in current directory and PATH environment variable. - Fix Width String terminator to UNICODE_NULL. - Fix all failed tests on PathFindPathExW KVM test. CORE-17612 --- dll/win32/kernel32/client/path.c | 4 ++-- dll/win32/shell32/shlexec.cpp | 28 +++++----------------------- dll/win32/shlwapi/path.c | 1 + 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/dll/win32/kernel32/client/path.c b/dll/win32/kernel32/client/path.c index 1fa09d530c8..ea014bb512d 100644 --- a/dll/win32/kernel32/client/path.c +++ b/dll/win32/kernel32/client/path.c @@ -2321,7 +2321,7 @@ GetSystemDirectoryW(OUT LPWSTR lpBuffer, RtlCopyMemory(lpBuffer, BaseWindowsSystemDirectory.Buffer, BaseWindowsSystemDirectory.Length); - lpBuffer[BaseWindowsSystemDirectory.Length / sizeof(WCHAR)] = ANSI_NULL; + lpBuffer[BaseWindowsSystemDirectory.Length / sizeof(WCHAR)] = UNICODE_NULL; ReturnLength = BaseWindowsSystemDirectory.Length; } @@ -2405,7 +2405,7 @@ GetSystemWindowsDirectoryW(OUT LPWSTR lpBuffer, RtlCopyMemory(lpBuffer, BaseWindowsDirectory.Buffer, BaseWindowsDirectory.Length); - lpBuffer[BaseWindowsDirectory.Length / sizeof(WCHAR)] = ANSI_NULL; + lpBuffer[BaseWindowsDirectory.Length / sizeof(WCHAR)] = UNICODE_NULL; ReturnLength = BaseWindowsDirectory.Length; } diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 746c92076bb..292c8db8292 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -2531,6 +2531,8 @@ HRESULT WINAPI ShellExecCmdLine( } else { + PCWSTR apPathList[2]; + pchParams = SplitParams(lpCommand, szFile, _countof(szFile)); if (szFile[0] != UNICODE_NULL && szFile[1] == L':' && szFile[2] == UNICODE_NULL) @@ -2551,30 +2553,10 @@ HRESULT WINAPI ShellExecCmdLine( { StringCchCopyW(szFile, _countof(szFile), szFile2); } - else if (SearchPathW(NULL, szFile, NULL, _countof(szFile2), szFile2, NULL) || - SearchPathW(NULL, szFile, L".exe", _countof(szFile2), szFile2, NULL) || - SearchPathW(NULL, szFile, L".com", _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, szFile, NULL, _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, szFile, L".exe", _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, szFile, L".com", _countof(szFile2), szFile2, NULL)) - { - StringCchCopyW(szFile, _countof(szFile), szFile2); - } - else if (SearchPathW(NULL, lpCommand, NULL, _countof(szFile2), szFile2, NULL) || - SearchPathW(NULL, lpCommand, L".exe", _countof(szFile2), szFile2, NULL) || - SearchPathW(NULL, lpCommand, L".com", _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, lpCommand, NULL, _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, lpCommand, L".exe", _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, lpCommand, L".com", _countof(szFile2), szFile2, NULL)) - { - StringCchCopyW(szFile, _countof(szFile), szFile2); - pchParams = NULL; - } - if (pwszStartDir) - { - SetCurrentDirectoryW(szCurDir); - } + apPathList[0] = pwszStartDir; + apPathList[1] = NULL; + PathFindOnPathExW(szFile, apPathList, WHICH_DEFAULT); if (!(dwSeclFlags & SECL_ALLOW_NONEXE)) { diff --git a/dll/win32/shlwapi/path.c b/dll/win32/shlwapi/path.c index fc698251cf2..2966a8bf93b 100644 --- a/dll/win32/shlwapi/path.c +++ b/dll/win32/shlwapi/path.c @@ -1151,6 +1151,7 @@ BOOL WINAPI PathFileExistsDefExtW(LPWSTR lpszPath,DWORD dwWhich) #ifdef __REACTOS__ if (dwWhich & 0x1) { + if (GetFileAttributes(lpszPath) != FILE_ATTRIBUTE_DIRECTORY) #endif lstrcpyW(lpszPath + iLen, pszExts[iChoose]); if (PathFileExistsW(lpszPath))

1 0

[reactos] 01/01: [SHELL32] Remove unused flag SEE_MASK_UNICODE (#5033)
by Ratin Gao 10 Feb '23

10 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c22ce374280c05b4d583… commit 5c22ce374280c05b4d583e4a16192327746f1926 Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Fri Feb 10 22:56:13 2023 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 10 23:56:13 2023 +0900 [SHELL32] Remove unused flag SEE_MASK_UNICODE (#5033) SEE_MASK_UNICODE does nothing, so we needn't mark it as "unsupported flag" and output FIXME --- dll/win32/shell32/shlexec.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 8784bbf4373..746c92076bb 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -1823,7 +1823,7 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) static const DWORD unsupportedFlags = SEE_MASK_ICON | SEE_MASK_HOTKEY | SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT | - SEE_MASK_UNICODE | SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR; + SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR; WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024]; WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd;

1 0

[reactos] 01/01: [TRANSLATION] Improve Simplified Chinese (zh-CN) translation (#4979)
by Ratin Gao 10 Feb '23

10 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f70f79904a480d800e23… commit 2f70f79904a480d800e23f4f47bb8d30a5da913b Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Fri Feb 10 22:15:25 2023 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 10 23:15:25 2023 +0900 [TRANSLATION] Improve Simplified Chinese (zh-CN) translation (#4979) - Add and improve translation - Fix mistakes --- base/applications/cmdutils/help/lang/zh-CN.rc | 2 +- base/services/w32time/lang/zh-CN.rc | 14 ++++++++++ base/services/w32time/w32time.rc | 3 ++ base/shell/explorer/lang/zh-CN.rc | 6 ++-- dll/cpl/desk/lang/zh-CN.rc | 22 +++++++-------- dll/cpl/hotplug/hotplug.rc | 3 ++ dll/cpl/hotplug/lang/zh-CN.rc | 40 +++++++++++++++++++++++++++ dll/cpl/sysdm/lang/zh-CN.rc | 4 +-- dll/shellext/cryptext/cryptext.rc | 3 ++ dll/shellext/cryptext/lang/zh-CN.rc | 14 ++++++++++ dll/shellext/fontext/fontext.rc | 3 ++ dll/shellext/fontext/lang/zh-CN.rc | 32 +++++++++++++++++++++ dll/shellext/netplwiz/lang/zh-CN.rc | 28 +++++++++++++++++++ dll/shellext/netplwiz/netplwiz.rc | 3 ++ dll/win32/browseui/lang/zh-CN.rc | 2 +- dll/win32/msgina/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 16 +++++------ 17 files changed, 170 insertions(+), 27 deletions(-) diff --git a/base/applications/cmdutils/help/lang/zh-CN.rc b/base/applications/cmdutils/help/lang/zh-CN.rc index d0b309779f9..e8f5aa48c70 100644 --- a/base/applications/cmdutils/help/lang/zh-CN.rc +++ b/base/applications/cmdutils/help/lang/zh-CN.rc @@ -56,7 +56,7 @@ POPD 恢复由 PUSHD 存储的前一个当前工作目录的路径。\n\ PROMPT 更改命令提示符。\n\ PUSHD 保存当前工作目录然后更改它。\n\ RD 删除一个目录。\n\ -REM 在批处理文件中记录注释（评论）。\n\ +REM 在批处理文件中记录注释（批注）。\n\ REN 重命名一个或多个文件。\n\ RENAME 重命名一个或多个文件。\n\ REPLACE 替换文件。\n\ diff --git a/base/services/w32time/lang/zh-CN.rc b/base/services/w32time/lang/zh-CN.rc new file mode 100644 index 00000000000..8507d11607d --- /dev/null +++ b/base/services/w32time/lang/zh-CN.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS W32Time Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Chinese (Simplified) resource file + * TRANSLATORS: Copyright 2023 Ratin Gao <ratin(a)knsoft.org> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_DISPLAYNAME "时间服务" + IDS_DESCRIPTION "维护在网络上的所有客户端和服务器的时间和日期同步。" +END diff --git a/base/services/w32time/w32time.rc b/base/services/w32time/w32time.rc index 4177188a782..b03fb863aaf 100644 --- a/base/services/w32time/w32time.rc +++ b/base/services/w32time/w32time.rc @@ -33,6 +33,9 @@ #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif #ifdef LANGUAGE_ZH_HK #include "lang/zh-HK.rc" #endif diff --git a/base/shell/explorer/lang/zh-CN.rc b/base/shell/explorer/lang/zh-CN.rc index d1807953dc0..e6eeccab616 100644 --- a/base/shell/explorer/lang/zh-CN.rc +++ b/base/shell/explorer/lang/zh-CN.rc @@ -202,8 +202,8 @@ END STRINGTABLE BEGIN - IDS_TASKBAR_STARTMENU_PROP_CAPTION "任务栏和开始菜单属性" + IDS_TASKBAR_STARTMENU_PROP_CAPTION "任务栏和开始菜单" IDS_RESTORE_ALL "显示打开的窗口(&S)" - IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" - IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYWND_UNDO_CASCADE "撤销层叠(&U)" + IDS_TRAYWND_UNDO_TILE "撤销平铺(&U)" END diff --git a/dll/cpl/desk/lang/zh-CN.rc b/dll/cpl/desk/lang/zh-CN.rc index 24bc3dff196..623ecdd2c2a 100644 --- a/dll/cpl/desk/lang/zh-CN.rc +++ b/dll/cpl/desk/lang/zh-CN.rc @@ -36,7 +36,7 @@ BEGIN PUSHBUTTON "颜色(&C)...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "位置：", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 + PUSHBUTTON "自定义桌面(&D)...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -164,23 +164,23 @@ END IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" +CAPTION "常规" +FONT 9, "宋体" BEGIN - GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 - CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + GROUPBOX "桌面图标", IDC_STATIC, 6, 4, 212, 40 + CONTROL "我的文档(&D)", IDC_ICONS_MYDOCS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 - CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + CONTROL "网上邻居(&N)", IDC_ICONS_MYNET, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 - CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + CONTROL "我的电脑(&M)", IDC_ICONS_MYCOMP, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 - CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + CONTROL "Internet浏览器(&I)", IDC_ICONS_INTERNET, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, 6, 60, 212, 56 - PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 - PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 + PUSHBUTTON "更改图标(&H)...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "还原默认图标(&S)", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 END IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 @@ -243,7 +243,7 @@ END STRINGTABLE BEGIN - IDS_DESKTOP_ITEMS "Desktop Items" + IDS_DESKTOP_ITEMS "桌面项目" END STRINGTABLE diff --git a/dll/cpl/hotplug/hotplug.rc b/dll/cpl/hotplug/hotplug.rc index 885713aad6b..8979476f923 100644 --- a/dll/cpl/hotplug/hotplug.rc +++ b/dll/cpl/hotplug/hotplug.rc @@ -60,6 +60,9 @@ IDI_HOTPLUG ICON "resources/1.ico" #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif #ifdef LANGUAGE_ZH_HK #include "lang/zh-HK.rc" #endif diff --git a/dll/cpl/hotplug/lang/zh-CN.rc b/dll/cpl/hotplug/lang/zh-CN.rc new file mode 100644 index 00000000000..53c3eacb3bc --- /dev/null +++ b/dll/cpl/hotplug/lang/zh-CN.rc @@ -0,0 +1,40 @@ +/* + * PROJECT: Safely Remove Hardware Applet + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Chinese (Simplified) resource file + * TRANSLATORS: Copyright 2023 Ratin Gao <ratin(a)knsoft.org> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_SAFE_REMOVE_HARDWARE_DIALOG DIALOGEX 0, 0, 278, 245 +CAPTION "" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 9, "宋体" +BEGIN + ICON IDI_HOTPLUG, IDC_SAFE_REMOVE_ICON, 7, 10, 20, 20 + LTEXT "选定要拔出或弹出的设备，然后单击“停止”。当 ReactOS 通知您可以安全从计算机拔出设备时，再这样做。", IDC_STATIC, 36, 10, 234, 24, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "硬件设备(&H)：", IDC_STATIC, 7, 42, 248, 8, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_SAFE_REMOVE_DEVICE_TREE, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 7, 52, 264, 102 + LTEXT "", IDC_SAFE_REMOVE_TEXT, 7, 156, 264, 16, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "属性(&P)", IDC_SAFE_REMOVE_PROPERTIES, 158, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "停止(&S)", IDC_SAFE_REMOVE_STOP, 216, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_STATIC, "static", SS_CENTER | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 200, 264, 1 + AUTOCHECKBOX "显示设备组件(&D)", IDC_SAFE_REMOVE_DISPLAY_COMPONENTS, 7, 208, 140, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "关闭(&C)", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDM_POPUP_DEVICE_TREE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "停止", IDM_STOP + MENUITEM "內容", IDM_PROPERTIES + END +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "安全地移除硬件" + IDS_CPLDESCRIPTION "从您的计算机安全地拔出或弹出设备。" +END diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index e6cb5bd2378..9d9e24eb595 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -365,8 +365,8 @@ BEGIN IDS_MESSAGEBOXTITLE "系统控制面板小程序" IDS_WARNINITIALSIZE "为分页文件的初始大小输入一个数字值。" IDS_WARNMAXIMUMSIZE "为分页文件的最大大小输入一个数字值。" - IDS_WARNINITIALRANGE "The initial paging file size must be between 2 MB and %lu MB on the selected drive." - IDS_WARNMAXIMUMRANGE "The maximum paging file size must be larger than or equal to its initial size, and less than %lu MB on the selected drive." + IDS_WARNINITIALRANGE "在所选驱动器上初始页面文件大小必须介于 2 MB 和 %lu MB 之间。" + IDS_WARNMAXIMUMRANGE "在所选驱动器上页面文件大小最大值必须大于或等于初始页面文件大小，但要小于 %lu MB。" IDS_PAGEFILE_MB "%lu MB" IDS_PAGEFILE_NONE "无" IDS_PAGEFILE_SYSTEM "系统已托管" diff --git a/dll/shellext/cryptext/cryptext.rc b/dll/shellext/cryptext/cryptext.rc index cbeb046d993..9e2e70070da 100644 --- a/dll/shellext/cryptext/cryptext.rc +++ b/dll/shellext/cryptext/cryptext.rc @@ -47,6 +47,9 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif #ifdef LANGUAGE_ZH_HK #include "lang/zh-HK.rc" #endif diff --git a/dll/shellext/cryptext/lang/zh-CN.rc b/dll/shellext/cryptext/lang/zh-CN.rc new file mode 100644 index 00000000000..cbdebebd36f --- /dev/null +++ b/dll/shellext/cryptext/lang/zh-CN.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS CryptExt Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Chinese (Simplified) resource file + * TRANSLATOR: Copyright 2023 Ratin Gao <ratin(a)knsoft.org> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_INVALIDFILE "这不是有效的证书文件" + IDS_CER_FILE "证书文件" +END diff --git a/dll/shellext/fontext/fontext.rc b/dll/shellext/fontext/fontext.rc index 7b555d88730..933e8f56081 100644 --- a/dll/shellext/fontext/fontext.rc +++ b/dll/shellext/fontext/fontext.rc @@ -31,6 +31,9 @@ IDR_FONTEXT REGISTRY "res/fontext.rgs" #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif #ifdef LANGUAGE_ZH_HK #include "lang/zh-HK.rc" #endif diff --git a/dll/shellext/fontext/lang/zh-CN.rc b/dll/shellext/fontext/lang/zh-CN.rc new file mode 100644 index 00000000000..cf537e76f49 --- /dev/null +++ b/dll/shellext/fontext/lang/zh-CN.rc @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS Font Shell Extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Chinese (Simplified) resource file + * TRANSLATORS: Copyright 2023 Ratin Gao <ratin(a)knsoft.org> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_REACTOS_FONTS_FOLDER "ReactOS 字体文件夹" +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "名称" +END + +STRINGTABLE +BEGIN + IDS_COL_FILENAME "文件名" + IDS_COL_SIZE "大小" + IDS_COL_MODIFIED "修改日期" + IDS_COL_ATTR "属性" + IDS_COL_ATTR_LETTERS "RHSAC" +END + +STRINGTABLE +BEGIN + IDS_FONT_PREVIEW "预览" +END diff --git a/dll/shellext/netplwiz/lang/zh-CN.rc b/dll/shellext/netplwiz/lang/zh-CN.rc new file mode 100644 index 00000000000..f4638a26c88 --- /dev/null +++ b/dll/shellext/netplwiz/lang/zh-CN.rc @@ -0,0 +1,28 @@ +/* + * PROJECT: ReactOS Network Places Wizard + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Chinese (Simplified) resource file + * TRANSLATORS: Copyright 2023 Ratin Gao <ratin(a)knsoft.org> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_DISCONNECTDRIVES DIALOGEX 0, 0, 300, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "中断网络驱动器连接" +FONT 9, "宋体" +BEGIN + LTEXT "选择要中断哪些网络驱动器的连接，然后单击“确定”。", -1, 7, 7, 286, 8 + LTEXT "网络驱动器(&N):", -1, 7, 23, 286, 8 + CONTROL "", IDC_CONNECTEDDRIVELIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_SINGLESEL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 7, 31, 286, 140 + PUSHBUTTON "确定", ID_OK, 189, 179, 50, 14 + PUSHBUTTON "取消", IDCANCEL, 243, 179, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_DIALOG_CAPTION "断开网络驱动器" + IDS_DRIVE_LETTER "驱动器盘符" + IDS_NETWORK_PATH "网络路径" + IDS_NO_DRIVES "没有可断开的网络驱动器。" +END diff --git a/dll/shellext/netplwiz/netplwiz.rc b/dll/shellext/netplwiz/netplwiz.rc index 958e305174b..3d843f11bf3 100644 --- a/dll/shellext/netplwiz/netplwiz.rc +++ b/dll/shellext/netplwiz/netplwiz.rc @@ -48,6 +48,9 @@ IDI_DISCONNECT_NET_DRIVES ICON "res/4400.ico" #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif #ifdef LANGUAGE_ZH_HK #include "lang/zh-HK.rc" #endif diff --git a/dll/win32/browseui/lang/zh-CN.rc b/dll/win32/browseui/lang/zh-CN.rc index c6ceb6c4214..198a1b46d10 100644 --- a/dll/win32/browseui/lang/zh-CN.rc +++ b/dll/win32/browseui/lang/zh-CN.rc @@ -320,7 +320,7 @@ END STRINGTABLE BEGIN - IDS_ADDRESSMENUTEXT "&Address" + IDS_ADDRESSMENUTEXT "地址(&A)" IDS_HISTORYTEXT "历史(&H)\tCtrl+H" END diff --git a/dll/win32/msgina/lang/zh-CN.rc b/dll/win32/msgina/lang/zh-CN.rc index 5fc10066efa..6c94954edfb 100644 --- a/dll/win32/msgina/lang/zh-CN.rc +++ b/dll/win32/msgina/lang/zh-CN.rc @@ -248,7 +248,7 @@ END /* Shutdown Dialog Strings */ STRINGTABLE BEGIN - IDS_SHUTDOWN_LOGOFF "注销“%S”" + IDS_SHUTDOWN_LOGOFF "注销 %s" IDS_SHUTDOWN_SHUTDOWN "关闭" IDS_SHUTDOWN_RESTART "重新启动" IDS_SHUTDOWN_SLEEP "睡眠" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index cef2a4582d9..4e0bf96736d 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -149,7 +149,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX - LTEXT "这个 ReactOS 版本注册到：", IDC_ABOUT_REG_TO, 35, 115, 180, 10 + LTEXT "这个 ReactOS 版本授权给：", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10, SS_NOPREFIX LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10, SS_NOPREFIX LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ @@ -233,11 +233,11 @@ BEGIN LTEXT "文件类型：", 14004, 8, 40, 55, 10 CONTROL "文件夹", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10 LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "地点：", 14008, 8, 56, 55, 10 + LTEXT "位置：", 14008, 8, 56, 55, 10 EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "大小：", 14010, 8, 72, 55, 10 EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "在磁盘上的大小：", 140101, 8, 88, 55, 10 + LTEXT "占用空间：", 140101, 8, 88, 55, 10 EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "包含：", 14026, 8, 104, 55, 10 EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -267,11 +267,11 @@ BEGIN PUSHBUTTON "更改(&C)...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "地点：", 14008, 8, 75, 45, 10 + LTEXT "位置：", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "大小：", 14010, 8, 91, 45, 10 EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "在磁盘上的大小：", 140112, 8, 107, 55, 10 + LTEXT "占用空间：", 140112, 8, 107, 55, 10 EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "创建日期：", 14014, 8, 131, 45, 10 @@ -765,7 +765,7 @@ BEGIN IDS_SHV_COLUMN_NETLOCATION "网络位置" IDS_SHV_COLUMN_DOCUMENTS "文件" IDS_SHV_COLUMN_STATUS "状态" - IDS_SHV_COLUMN_COMMENTS "评论" + IDS_SHV_COLUMN_COMMENTS "备注" IDS_SHV_COLUMN_LOCATION "位置" IDS_SHV_COLUMN_MODEL "模型" @@ -992,8 +992,8 @@ BEGIN IDS_TITLE_MYCOMP "我的电脑" IDS_TITLE_MYNET "网上邻居" - IDS_TITLE_BIN_1 "Recycle Bin (full)" - IDS_TITLE_BIN_0 "Recycle Bin (empty)" + IDS_TITLE_BIN_1 "回收站(满)" + IDS_TITLE_BIN_0 "回收站(空)" IDS_ADVANCED_FOLDER "文件和文件夹" IDS_ADVANCED_NET_CRAWLER "自动搜索网络文件夹和打印机"

1 0

[reactos] 01/01: [NOTEPAD] Treat empty file correctly (#5057)
by Katayama Hirofumi MZ 09 Feb '23

09 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b20c7312fa2e03f4fbc1… commit 1b20c7312fa2e03f4fbc11d81415043d5c30a3e2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 9 21:54:20 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 9 21:54:20 2023 +0900 [NOTEPAD] Treat empty file correctly (#5057) #5012 had a regression on opening an empty file. CORE-14641, CORE-18826 --- base/applications/notepad/text.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/base/applications/notepad/text.c b/base/applications/notepad/text.c index 3ce3a889bfe..0025ddf9dac 100644 --- a/base/applications/notepad/text.c +++ b/base/applications/notepad/text.c @@ -179,6 +179,22 @@ ReadText(HANDLE hFile, HLOCAL *phLocal, ENCODING *pencFile, EOLN *piEoln) if (dwSize == INVALID_FILE_SIZE) goto done; + if (dwSize == 0) // If file is empty + { + hNewLocal = LocalReAlloc(*phLocal, sizeof(UNICODE_NULL), LMEM_MOVEABLE); + pszNewText = LocalLock(hNewLocal); + if (hNewLocal == NULL || pszNewText == NULL) + goto done; + + *pszNewText = UNICODE_NULL; + LocalUnlock(hNewLocal); + + *phLocal = hNewLocal; + *piEoln = EOLN_CRLF; + *pencFile = ENCODING_UTF8; + return TRUE; + } + hMapping = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); if (hMapping == NULL) goto done;

1 0

[reactos] 01/01: [EXPLORER][BROWSEUI] de-DE.rc fix 3 german keyboard accelerators
by Joachim Henze 08 Feb '23

08 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06b25bc9dd22060aad79f… commit 06b25bc9dd22060aad79f29a97f8d23dce8227e0 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Feb 8 10:05:04 2023 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Feb 8 10:05:04 2023 +0100 [EXPLORER][BROWSEUI] de-DE.rc fix 3 german keyboard accelerators [BROWSEUI] German accelerator for "F&avoriten" collided with "&Ansicht". [EXPLORER] German accelerator for "F&avoriten" must be "&Favoriten" also in the startmenu. [BROWSEUI] German accelerator for "S&chnellstartleiste" was missing. Fix all 3 by switching to what MS uses in german XPSP3. see the before-state with the [BROWSEUI] collision here: https://jira.reactos.org/secure/attachment/65116/ros.png Please note that in current master head the accelerators in [BROWSEUI] filebrowser are generally broken for other reasons. So this commit will not entirely fix CORE-18824 yet, but just rules out the small related glitches in the german rc-files. --- base/shell/explorer/lang/de-DE.rc | 2 +- dll/win32/browseui/lang/de-DE.rc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/shell/explorer/lang/de-DE.rc b/base/shell/explorer/lang/de-DE.rc index 55a62189cd1..0f582a20a76 100644 --- a/base/shell/explorer/lang/de-DE.rc +++ b/base/shell/explorer/lang/de-DE.rc @@ -30,7 +30,7 @@ BEGIN BEGIN MENUITEM "(Leer)", -1, MFT_STRING, MFS_GRAYED END - POPUP "F&avoriten", IDM_FAVORITES + POPUP "&Favoriten", IDM_FAVORITES BEGIN MENUITEM "(Leer)", -1, MFT_STRING, MFS_GRAYED END diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index eabd07d55b1..2670095c0e8 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -73,7 +73,7 @@ BEGIN END MENUITEM "&Aktualisieren", IDM_VIEW_REFRESH END - POPUP "F&avoriten", FCIDM_MENU_FAVORITES + POPUP "&Favoriten", FCIDM_MENU_FAVORITES BEGIN MENUITEM "&Zu Favoriten hinzufügen...", IDM_FAVORITES_ADDTOFAVORITES MENUITEM "Fav&oriten verwalten...", IDM_FAVORITES_ORGANIZEFAVORITES @@ -99,7 +99,7 @@ BEGIN POPUP "&Symbolleisten", -1, MFT_STRING, MFS_ENABLED, 0 BEGIN MENUITEM "&Desktop", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING - MENUITEM "Schnellstartleiste", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING + MENUITEM "S&chnellstartleiste", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED MENUITEM "&Neue Symbolleiste...", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING END

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