Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [ATL] Add NULL-check in CWindowImplBaseT::WindowProc assertions
by Katayama Hirofumi MZ 11 Mar '21

11 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e076e0576f80d996151c0… commit e076e0576f80d996151c049ba2543c091a3ebd7c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 11 21:20:40 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 11 21:20:40 2021 +0900 [ATL] Add NULL-check in CWindowImplBaseT::WindowProc assertions CORE-17505 --- sdk/lib/atl/atlwin.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index 71d28fe2989..c25fd1404d0 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -1579,8 +1579,8 @@ public: LONG_PTR saveWindowProc; ATLASSERT(pThis != NULL); - ATLASSERT((pThis->m_dwState & WINSTATE_DESTROYED) == 0); - ATLASSERT(pThis->m_hWnd != NULL); + ATLASSERT(pThis != NULL && (pThis->m_dwState & WINSTATE_DESTROYED) == 0); + ATLASSERT(pThis != NULL && pThis->m_hWnd != NULL); if (pThis == NULL || (pThis->m_dwState & WINSTATE_DESTROYED) != 0 || pThis->m_hWnd == NULL) return 0;

1 0

[reactos] 01/01: [ATL][SHELL32][EXPLORER] Disable ATLASSERT (#3527)
by Katayama Hirofumi MZ 11 Mar '21

11 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9259ded8ae36d0f7ab117… commit 9259ded8ae36d0f7ab117ddca02a2e9a9e79bef9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 11 20:26:45 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 11 20:26:45 2021 +0900 [ATL][SHELL32][EXPLORER] Disable ATLASSERT (#3527) We are not ready for enabling ATLASSERT. Enabling ATL assertions takes time to realize. CORE-17505 - Disable ATLASSERT by undefining _DEBUG. - Revert currently non-fixable codes. --- base/applications/rapps/appview.cpp | 1 + base/shell/explorer/syspager.cpp | 6 ++---- base/shell/explorer/taskswnd.cpp | 3 +-- base/shell/explorer/traywnd.cpp | 6 ++---- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 3 ++- sdk/lib/atl/CMakeLists.txt | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 947df04d0bd..57442cd0e80 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -989,6 +989,7 @@ VOID CAppInfoDisplay::ResizeChildren(int Width, int Height) #if DBG ATLASSERT(dwError == ERROR_SUCCESS); #endif + UNREFERENCED_PARAMETER(dwError); UpdateWindow(); } diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index d6f729d2d7b..a71d3cf280a 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -1231,10 +1231,8 @@ void CNotifyToolbar::Initialize(HWND hWndParent, CBalloonQueue * queue) TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | TBSTYLE_TRANSPARENT | CCS_TOP | CCS_NORESIZE | CCS_NOPARENTALIGN | CCS_NODIVIDER; - HWND toolbar = CToolbar::Create(hWndParent, styles); - //HACK: We have not created this toolbar properly, so we need to subclass it now! - m_hWnd = NULL; - SubclassWindow(toolbar); + // HACK & FIXME: CORE-17505 + SubclassWindow(CToolbar::Create(hWndParent, styles)); // Force the toolbar tooltips window to always show tooltips even if not foreground HWND tooltipsWnd = (HWND)SendMessageW(TB_GETTOOLTIPS); diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 03a2b3f02a0..5d90d36ebc3 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -287,8 +287,7 @@ public: HWND toolbar = CToolbar::Create(hWndParent, styles); SetDrawTextFlags(DT_NOPREFIX, DT_NOPREFIX); - //HACK: We have not created this toolbar properly, so we need to subclass it now! - m_hWnd = NULL; + // HACK & FIXME: CORE-17505 return SubclassWindow(toolbar); } }; diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 8dad6c4e2a1..5473e190bfa 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -200,10 +200,8 @@ public: VOID Initialize() { - //HACK: We have not created this button properly, so we need to subclass it now! - HWND button = m_hWnd; - m_hWnd = NULL; - SubclassWindow(button); + // HACK & FIXME: CORE-17505 + SubclassWindow(m_hWnd); SetWindowTheme(m_hWnd, L"Start", NULL); diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index b08097e02b0..274b780b970 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -398,7 +398,8 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags) rc.bottom = 1; } - CToolbar::Create(hwndParent, tbStyles, tbExStyles); + // HACK & FIXME: CORE-17505 + SubclassWindow(CToolbar::Create(hwndParent, tbStyles, tbExStyles)); SetWindowTheme(m_hWnd, L"", L""); diff --git a/sdk/lib/atl/CMakeLists.txt b/sdk/lib/atl/CMakeLists.txt index 000bd02060d..3a0fb3ce0dc 100644 --- a/sdk/lib/atl/CMakeLists.txt +++ b/sdk/lib/atl/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(atl_classes INTERFACE) if(DBG) - target_compile_definitions(atl_classes INTERFACE _DEBUG) + #target_compile_definitions(atl_classes INTERFACE _DEBUG) # HACK & FIXME: CORE-17505 endif() target_include_directories(atl_classes INTERFACE

1 0

[reactos] 01/01: [SHELL32] Fix CMenuToolbarBase
by Katayama Hirofumi MZ 11 Mar '21

11 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4583eae4f7864f9596658… commit 4583eae4f7864f9596658a1156548840249f8908 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 11 17:51:33 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 11 17:51:47 2021 +0900 [SHELL32] Fix CMenuToolbarBase CORE-17505 --- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 2 +- dll/win32/shell32/shellmenu/CMenuToolbars.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index 984be9ecfc7..b08097e02b0 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -263,7 +263,7 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu } CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) : - m_pager(this, 1), + m_pager(WC_PAGESCROLLER, this), m_useFlatMenus(FALSE), m_disableMouseTrack(FALSE), m_timerEnabled(FALSE), diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.h b/dll/win32/shell32/shellmenu/CMenuToolbars.h index a7ecb45b0ed..6463166d258 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.h +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.h @@ -135,8 +135,6 @@ private: MESSAGE_HANDLER(WM_COMMAND, OnWinEventWrap) MESSAGE_HANDLER(WM_NOTIFY, OnWinEventWrap) MESSAGE_HANDLER(WM_TIMER, OnPopupTimer) - ALT_MSG_MAP(1) - // No pager specific handlers yet END_MSG_MAP() };

1 0

[reactos] 01/01: [ATL] Split CWindowImplBaseT::WindowProc asserion
by Katayama Hirofumi MZ 11 Mar '21

11 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f83032a1290fed0c5f11… commit 4f83032a1290fed0c5f11b7a21d1dea0d0570755 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 11 17:18:43 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 11 17:18:43 2021 +0900 [ATL] Split CWindowImplBaseT::WindowProc asserion CORE-9281 --- sdk/lib/atl/atlwin.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index 2df36b612ee..71d28fe2989 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -1578,7 +1578,9 @@ public: BOOL handled; LONG_PTR saveWindowProc; - ATLASSERT(pThis != NULL && (pThis->m_dwState & WINSTATE_DESTROYED) == 0 && pThis->m_hWnd != NULL); + ATLASSERT(pThis != NULL); + ATLASSERT((pThis->m_dwState & WINSTATE_DESTROYED) == 0); + ATLASSERT(pThis->m_hWnd != NULL); if (pThis == NULL || (pThis->m_dwState & WINSTATE_DESTROYED) != 0 || pThis->m_hWnd == NULL) return 0;

1 0

[reactos] 01/01: [BROWSEUI] Fix CACListISF::Next assertion
by Katayama Hirofumi MZ 11 Mar '21

11 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6546ad7700b0c010443bb… commit 6546ad7700b0c010443bb14dfaf0c255ac06022e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 11 17:12:06 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 11 17:12:06 2021 +0900 [BROWSEUI] Fix CACListISF::Next assertion CORE-9281 --- dll/win32/browseui/aclistisf.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/aclistisf.cpp b/dll/win32/browseui/aclistisf.cpp index 533a7af814b..15de181714a 100644 --- a/dll/win32/browseui/aclistisf.cpp +++ b/dll/win32/browseui/aclistisf.cpp @@ -251,7 +251,8 @@ STDMETHODIMP CACListISF::Next(ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) if (m_dwOptions & (ACLO_FILESYSONLY | ACLO_FILESYSDIRS)) { DWORD attrs = SFGAO_FILESYSANCESTOR | SFGAO_FILESYSTEM; - hr = m_pShellFolder->GetAttributesOf(1, const_cast<LPCITEMIDLIST *>(&pidlChild), &attrs); + LPCITEMIDLIST pidlRef = pidlChild; + hr = m_pShellFolder->GetAttributesOf(1, &pidlRef, &attrs); if (SUCCEEDED(hr)) { if (!(attrs & (SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR)))

1 0

[reactos] 01/01: [BROWSEUI] Fix CAutoComplete::OnMeasureItem assertion
by Katayama Hirofumi MZ 11 Mar '21

11 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcba9306227ade497e98b… commit bcba9306227ade497e98b50ff65feac0ae3dca3b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 11 16:55:49 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 11 16:56:01 2021 +0900 [BROWSEUI] Fix CAutoComplete::OnMeasureItem assertion CORE-17505 --- dll/win32/browseui/CAutoComplete.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index 9bb6405d594..b5dfa888abd 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -1781,7 +1781,8 @@ LRESULT CAutoComplete::OnMeasureItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BO ATLASSERT(pMeasure != NULL); if (pMeasure->CtlType != ODT_LISTVIEW) return FALSE; - + if (!m_hwndList) + return FALSE; ATLASSERT(m_hwndList.GetStyle() & LVS_OWNERDRAWFIXED); pMeasure->itemHeight = m_hwndList.m_cyItem; // height of item return TRUE;

1 0

[reactos] 01/01: [BROWSEUI] Fix addreseditbox.h assertion
by Katayama Hirofumi MZ 11 Mar '21

11 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32a9b640515d068448893… commit 32a9b640515d0684488935ad67b4fb61d567ad74 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 11 16:42:29 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 11 16:42:36 2021 +0900 [BROWSEUI] Fix addreseditbox.h assertion CORE-17505 --- dll/win32/browseui/addresseditbox.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/addresseditbox.cpp b/dll/win32/browseui/addresseditbox.cpp index 69e6f25d50c..f1e9131d607 100644 --- a/dll/win32/browseui/addresseditbox.cpp +++ b/dll/win32/browseui/addresseditbox.cpp @@ -31,8 +31,8 @@ TODO: */ CAddressEditBox::CAddressEditBox() : - fCombobox(NULL, this, 1), - fEditWindow(NULL, this, 1), + fCombobox(WC_COMBOBOXEXW, this), + fEditWindow(WC_EDITW, this), fSite(NULL), pidlLastParsed(NULL) {

1 0

[reactos] 01/01: [DESKCPL] Update Polish [pl-PL] translation (#3520)
by Piotr Hetnarowicz 11 Mar '21

11 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31f20137b61abaf9b8eec… commit 31f20137b61abaf9b8eecb1eb855b7534231e79d Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Thu Mar 11 02:36:48 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 11 02:36:48 2021 +0100 [DESKCPL] Update Polish [pl-PL] translation (#3520) --- dll/cpl/desk/lang/pl-PL.rc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index e7f562332a0..b4848b00c4f 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -5,6 +5,7 @@ * Updated by Caemyr - Olaf Siejka (Jan-Feb, 2008) * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (August, 2011) * UTF-8 conversion by Caemyr (May, 2011) + * Updated by Piotr Hetnarowicz <piotrhwz(a)gmail.com> (March, 2021) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -71,11 +72,11 @@ BEGIN LTEXT "Schemat kolorów", IDC_STATIC, 7, 157, 104, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 167, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Rozmiar", IDC_STATIC, 7, 184, 104, 9 + LTEXT "Rozmiar czcionki", IDC_STATIC, 7, 184, 104, 9 COMBOBOX IDC_APPEARANCE_SIZE, 7, 194, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Efekty...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 - PUSHBUTTON "Zaawansowane", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 + PUSHBUTTON "&Efekty...", IDC_APPEARANCE_EFFECTS, 178, 150, 63, 15 + PUSHBUTTON "Zaawansowane...", IDC_APPEARANCE_ADVANCED, 178, 170, 63, 15 END IDD_ADVAPPEARANCE DIALOGEX 0, 0, 250, 239 @@ -85,7 +86,7 @@ CAPTION "Ustawienia zaawansowane" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Jeśli wybierzesz motyw inny niż ReactOS classic, zastąpi on następujące ustawienia, z wyjątkiem niektórych starszych programów.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE + LTEXT "Jeśli wybierzesz motyw inny niż Klasyczny ReactOS, poniższe ustawienia zostaną zastąpione, ale nie we wszystkich starszych programach.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 132, 238, 25, BS_MULTILINE LTEXT "&Element", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP @@ -150,13 +151,13 @@ BEGIN LTEXT "<brak>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Rozdzielczość ekranu", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 - LTEXT "Mniej", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "Więcej", 1816, 93, 137, 21, 9, NOT WS_GROUP + LTEXT "Mniej", 1815, 12, 137, 18, 9, NOT WS_GROUP + LTEXT "Więcej", 1816, 88, 137, 26, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&Ilość kolorów", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "", IDC_SETTINGS_SPECTRUM, "Static", SS_OWNERDRAW | SS_SUNKEN, 131, 155, 103, 9 - PUSHBUTTON "Zaawa&nsowane...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 + PUSHBUTTON "Zaawa&nsowane...", IDC_SETTINGS_ADVANCED, 171, 174, 70, 15 END IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 @@ -169,9 +170,9 @@ BEGIN COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Tryb zgodności", -1, 7, 67, 237, 97 - LTEXT "Niektóre programy mogą działać niepoprawnie, jeśli po zmianie ustawień ekranu nie zrestartujesz systemu.\r\n\nPo zmianie ustawień ekranu", -1, 12, 78, 228, 34 - AUTORADIOBUTTON "&Zrestartuj system przed wprowadzeniem zmian.", IDC_RESTART_RB, 14, 116, 228, 10 - AUTORADIOBUTTON "Zastosuj nowe ustawienia ekranu bez restartu systemu.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 + LTEXT "Niektóre programy mogą działać niewłaściwie, jeśli komputer nie zostanie uruchomiony ponwnie po zmianie ustawień ekranuu.\r\n\nPo zmianie ustawień ekranu", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Uruchom ponownie komputer przed wprowadzeniem zmian.", IDC_RESTART_RB, 14, 116, 220, 10 + AUTORADIOBUTTON "Zastosuj nowe ustawienia ekranu bez ponownego uruchamiania.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Pytaj przed zastosowaniem nowych ustawień ekranu.", IDC_ASKME_RB, 14, 146, 228, 10 END

1 0

[reactos] 01/01: [DESKADP] Update Polish [pl-PL] translation (#3518)
by Piotr Hetnarowicz 11 Mar '21

11 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9b6df917b609ca81405a… commit a9b6df917b609ca81405a1f51bf4e99b2f8b2248 Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Thu Mar 11 02:35:37 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 11 02:35:37 2021 +0100 [DESKADP] Update Polish [pl-PL] translation (#3518) --- dll/shellext/deskadp/lang/pl-PL.rc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dll/shellext/deskadp/lang/pl-PL.rc b/dll/shellext/deskadp/lang/pl-PL.rc index 31bd108d8f4..4d7fb520861 100644 --- a/dll/shellext/deskadp/lang/pl-PL.rc +++ b/dll/shellext/deskadp/lang/pl-PL.rc @@ -1,5 +1,6 @@ /* * Translated by Caemyr - Olaf Siejka (Jan, 2008) + * Updated by Piotr Hetnarowicz <piotrhwz(a)gmail.com> (March, 2021) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -24,21 +25,21 @@ BEGIN LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX LTEXT "Rozmiar pamięci:", -1, 13, 92, 58, 8 LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "Ciąg nazwy:", -1, 13, 104, 58, 8 + LTEXT "Ciąg karty:", -1, 13, 104, 58, 8 LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX LTEXT "Wersja BIOS:", -1, 13, 116, 58, 8 LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX - PUSHBUTTON "&Wyświetl wszystkie tryby...", IDC_LISTALLMODES, 7, 139, 110, 14 + PUSHBUTTON "&Lista wszystkich trybów...", IDC_LISTALLMODES, 7, 139, 110, 14 END IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Wyświetlanie trybów" +CAPTION "Lista wszystkich trybów" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 PUSHBUTTON "Anuluj", IDCANCEL, 167, 115, 50, 15 - GROUPBOX "Wyświetl tylko obsługiwane tryby", -1, 6, 7, 212, 98 + GROUPBOX "Lista prawidłowych trybów", -1, 6, 7, 212, 98 LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL END

1 0

[reactos] 01/01: [ATL] CMakeLists.txt: Use a bare endif() (#3523)
by Serge Gautherie 10 Mar '21

10 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0975c5ef409ef0138f39b… commit 0975c5ef409ef0138f39bd6d9f6de91f00990cfb Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Mar 11 00:38:04 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 11 08:38:04 2021 +0900 [ATL] CMakeLists.txt: Use a bare endif() (#3523) Addendum to 98203ce. --- sdk/lib/atl/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/atl/CMakeLists.txt b/sdk/lib/atl/CMakeLists.txt index d8d4c149ffb..000bd02060d 100644 --- a/sdk/lib/atl/CMakeLists.txt +++ b/sdk/lib/atl/CMakeLists.txt @@ -2,7 +2,7 @@ add_library(atl_classes INTERFACE) if(DBG) target_compile_definitions(atl_classes INTERFACE _DEBUG) -endif(DBG) +endif() target_include_directories(atl_classes INTERFACE $<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}>)

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