Ros-diffs December 2021

ros-diffs@reactos.org

33 participants
155 discussions

[reactos] 01/01: [MSI] Improve previous msi/dialog.c patch to match code committed to Wine. (#4008)
by Doug Lyons 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00ace73316c4879f56c1e… commit 00ace73316c4879f56c1e9137f53f8d7b37e84ba Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Wed Dec 29 10:06:28 2021 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 29 17:06:28 2021 +0100 [MSI] Improve previous msi/dialog.c patch to match code committed to Wine. (#4008) CORE-17702 Only show the main dialog pane in the taskbar when executing a Cancel dialog. - Improve previous msi/dialog.c patch to match current Wine code. - Remove #ifdef's for already committed Wine Code. In effect, importing Wine's commit 4b88e290521ef9fde9290c9bcbae7420966a6f46: msi: Set dialog as parent in subsequent dialog. Author: Fabian Maurer <dark.shadow4(a)web.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51576 --- dll/win32/msi/dialog.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c index 01da9e048ff..c5f1da508c2 100644 --- a/dll/win32/msi/dialog.c +++ b/dll/win32/msi/dialog.c @@ -171,10 +171,6 @@ static const WCHAR szHyperLink[] = {'H','y','p','e','r','L','i','n','k',0}; static DWORD uiThreadId; static HWND hMsiHiddenWindow; -#ifdef __REACTOS__ -static HANDLE hPrevious = NULL; -#endif - static LPWSTR msi_get_window_text( HWND hwnd ) { UINT sz, r; @@ -3823,9 +3819,6 @@ static LRESULT WINAPI MSIDialog_WndProc( HWND hwnd, UINT msg, case WM_DESTROY: dialog->hwnd = NULL; -#ifdef __REACTOS__ - hPrevious = NULL; -#endif return 0; case WM_NOTIFY: return msi_dialog_onnotify( dialog, lParam ); @@ -3848,7 +3841,7 @@ static void process_pending_messages( HWND hdlg ) static UINT dialog_run_message_loop( msi_dialog *dialog ) { DWORD style; - HWND hwnd; + HWND hwnd, parent; if( uiThreadId != GetCurrentThreadId() ) return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog ); @@ -3861,15 +3854,11 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) if (dialog->parent == NULL && (dialog->attributes & msidbDialogAttributesMinimize)) style |= WS_MINIMIZEBOX; -#ifdef __REACTOS__ - hwnd = CreateWindowW( szMsiDialogClass, dialog->name, style, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - hPrevious, NULL, NULL, dialog ); -#else + parent = dialog->parent ? dialog->parent->hwnd : 0; + hwnd = CreateWindowW( szMsiDialogClass, dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, NULL, dialog ); -#endif + parent, NULL, NULL, dialog ); if( !hwnd ) { @@ -3877,10 +3866,6 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) return ERROR_FUNCTION_FAILED; } -#ifdef __REACTOS__ - hPrevious = hwnd; -#endif - ShowWindow( hwnd, SW_SHOW ); /* UpdateWindow( hwnd ); - and causes the transparent static controls not to paint */

1 0

[reactos] 01/01: [SHELL32] Handle double click on focus manager (#4213)
by Jesús Sanz del Rey 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b94b435a110471a74beb1… commit b94b435a110471a74beb11f6bbd242455deab749 Author: Jesús Sanz del Rey <jesussanz2003(a)gmail.com> AuthorDate: Wed Dec 29 17:00:59 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 29 17:00:59 2021 +0100 [SHELL32] Handle double click on focus manager (#4213) CORE-9943 --- dll/win32/shell32/shellmenu/CMenuFocusManager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp b/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp index c6cb0f25141..615b7091c56 100644 --- a/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp +++ b/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp @@ -577,6 +577,7 @@ LRESULT CMenuFocusManager::GetMsgHook(INT nCode, WPARAM hookWParam, LPARAM hookL break; case WM_NCLBUTTONDOWN: + case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: isLButton = TRUE; TRACE("LB\n");

1 0

[reactos] 01/01: [DRWTSN32] Add Spanish translation (#4201)
by Javier Fernandez 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c77d53bf6ccf3616e93b3… commit c77d53bf6ccf3616e93b37bc6181f0722ea87804 Author: Javier Fernandez <elhoir(a)users.noreply.github.com> AuthorDate: Wed Dec 29 16:55:38 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 29 16:55:38 2021 +0100 [DRWTSN32] Add Spanish translation (#4201) --- base/applications/drwtsn32/drwtsn32.rc | 3 +++ base/applications/drwtsn32/lang/es-ES.rc | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/base/applications/drwtsn32/drwtsn32.rc b/base/applications/drwtsn32/drwtsn32.rc index 7ca58f0f1b3..05301755808 100644 --- a/base/applications/drwtsn32/drwtsn32.rc +++ b/base/applications/drwtsn32/drwtsn32.rc @@ -25,6 +25,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif #ifdef LANGUAGE_ET_EE #include "lang/et-EE.rc" #endif diff --git a/base/applications/drwtsn32/lang/es-ES.rc b/base/applications/drwtsn32/lang/es-ES.rc new file mode 100644 index 00000000000..ab16fd9611b --- /dev/null +++ b/base/applications/drwtsn32/lang/es-ES.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: Dr. Watson crash reporter + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: es-ES resource file + * COPYRIGHT: Copyright 2021 Javier Fernández, aka "Elhoir" <elhoir AT gmail DOT com> + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Informador de fallos de ReactOS" + IDS_USER_ALERT_MESSAGE "La aplicación %ls ha fallado. Información acerca del fallo ha sido guardada en:\n\n%ls" +END

1 0

[reactos] 01/01: [DEVMGR] Ensure clicking on item when opening property sheet (#4196)
by Jesús Sanz del Rey 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5831427ef91804afd2608… commit 5831427ef91804afd2608ebd93d0bce1307f164d Author: Jesús Sanz del Rey <jesussanz2003(a)gmail.com> AuthorDate: Wed Dec 29 16:52:41 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 29 16:52:41 2021 +0100 [DEVMGR] Ensure clicking on item when opening property sheet (#4196) Fix a bug related to the device manager, where double-clicking anywhere when an item is already selected opens the property sheet. CORE-17207 --- dll/win32/devmgr/devmgmt/DeviceView.cpp | 21 +++++++++++++++++++++ dll/win32/devmgr/devmgmt/DeviceView.h | 4 ++++ dll/win32/devmgr/devmgmt/MainWindow.cpp | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dll/win32/devmgr/devmgmt/DeviceView.cpp b/dll/win32/devmgr/devmgmt/DeviceView.cpp index 0f8bebe05e5..8fae7fbb601 100644 --- a/dll/win32/devmgr/devmgmt/DeviceView.cpp +++ b/dll/win32/devmgr/devmgmt/DeviceView.cpp @@ -124,6 +124,27 @@ CDeviceView::OnSize( return 0; } +LRESULT +CDeviceView::OnDoubleClick( + _In_ LPNMHDR NmHdr + ) +{ + TVHITTESTINFO hitInfo; + HTREEITEM hItem; + + GetCursorPos(&hitInfo.pt); + ScreenToClient(m_hTreeView, &hitInfo.pt); + + // Check if we are trying to double click an item + hItem = TreeView_HitTest(m_hTreeView, &hitInfo); + if (hItem != NULL && (hitInfo.flags & (TVHT_ONITEM | TVHT_ONITEMICON))) + { + DisplayPropertySheet(); + } + + return 0; +} + LRESULT CDeviceView::OnRightClick( _In_ LPNMHDR NmHdr diff --git a/dll/win32/devmgr/devmgmt/DeviceView.h b/dll/win32/devmgr/devmgmt/DeviceView.h index 04a69da10a0..7d6fde223ca 100644 --- a/dll/win32/devmgr/devmgmt/DeviceView.h +++ b/dll/win32/devmgr/devmgmt/DeviceView.h @@ -45,6 +45,10 @@ public: _In_ int cy ); + LRESULT OnDoubleClick( + _In_ LPNMHDR NmHdr + ); + LRESULT OnRightClick( _In_ LPNMHDR NmHdr ); diff --git a/dll/win32/devmgr/devmgmt/MainWindow.cpp b/dll/win32/devmgr/devmgmt/MainWindow.cpp index a687d7d9788..a29db2d7576 100644 --- a/dll/win32/devmgr/devmgmt/MainWindow.cpp +++ b/dll/win32/devmgr/devmgmt/MainWindow.cpp @@ -515,7 +515,7 @@ CDeviceManager::OnNotify(_In_ LPARAM lParam) case NM_DBLCLK: { - m_DeviceView->DisplayPropertySheet(); + Ret = m_DeviceView->OnDoubleClick(NmHdr); break; }

1 0

[reactos] 01/01: [WIN32SS:ENG] EngCreateBitmap: mark created bitmaps as API bitmaps (#4146)
by Oleg Dubinskiy 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc483bd700a58a1b42b3d… commit dc483bd700a58a1b42b3dd4e4103793cc5147384 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Dec 29 17:51:23 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 29 16:51:23 2021 +0100 [WIN32SS:ENG] EngCreateBitmap: mark created bitmaps as API bitmaps (#4146) CORE-17561 Set the API_BITMAP flag for bitmaps created by EngCreateBitmap(). This avoids failure when created bitmap is passed to NtGdiSelectBitmap(), since it checks for this flag and fails if it isn't set. Otherwise, if failure occurs, the bitmap is hot handled properly. Setting this flag outside of that function is not an option at all, because it is a public (exported) function, and in many cases it's called directly by the caller (in case with MS DDraw stack, it can be called also by dxg.sys from dxgthk!EngCreateBitmap, which directly calls win32k!EngCreateBitmap). In particular, it allows Windows XP/2003 DirectDraw stack (ddraw.dll & dxg.sys) to properly work in ReactOS (in software emulation mode), even on real hardware. So now, a lot of DirectX 1-7 apps and games (whose can work withoug hardware acceleation), are working properly with ddraw.dll + dxg.sys replacement! Also Justin Miller (DarkFire01) confirmed that even Direct3D software emulation now also works correctly on real hardware! --- win32ss/gdi/eng/surface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/win32ss/gdi/eng/surface.c b/win32ss/gdi/eng/surface.c index 9bce8373692..3bfe6f89276 100644 --- a/win32ss/gdi/eng/surface.c +++ b/win32ss/gdi/eng/surface.c @@ -332,6 +332,9 @@ EngCreateBitmap( /* Get the handle for the bitmap */ hbmp = (HBITMAP)psurf->SurfObj.hsurf; + /* Mark as API bitmap */ + psurf->flags = API_BITMAP; + /* Set public ownership */ GDIOBJ_vSetObjectOwner(&psurf->BaseObject, GDI_OBJ_HMGR_PUBLIC);

1 0

[reactos] 02/02: [ATTRIB] Fix bFound assignment, as it was originally intended by the PR reviewer.
by Hermès Bélusca-Maïto 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0db5fce47d74655c0b689… commit 0db5fce47d74655c0b6896ce402b22e7cbf22d71 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 29 03:17:57 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Dec 29 04:02:35 2021 +0100 [ATTRIB] Fix bFound assignment, as it was originally intended by the PR reviewer. See https://github.com/reactos/reactos/pull/2142#discussion_r360645296 This fixes the two warnings: warning C4552: '!=': result of expression not used --- base/applications/cmdutils/attrib/attrib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index fc53e68dfbc..ff6185a84ea 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -139,7 +139,7 @@ PrintAttribute( wcscpy(pszFileName, findData.cFileName); wcscat(pszFileName, L"\\"); - bFound != PrintAttribute(szFullName, pszFile, bRecurse, bDirectories); + bFound |= PrintAttribute(szFullName, pszFile, bRecurse, bDirectories); } while (FindNextFileW(hFind, &findData)); FindClose(hFind); @@ -243,7 +243,7 @@ ChangeAttribute( wcscpy(pszFileName, findData.cFileName); wcscat(pszFileName, L"\\"); - bFound != ChangeAttribute(szFullName, pszFile, bRecurse, bDirectories, + bFound |= ChangeAttribute(szFullName, pszFile, bRecurse, bDirectories, dwMask, dwAttrib); } while (FindNextFileW(hFind, &findData));

1 0

[reactos] 01/02: [ATTRIB] Formatting only.
by Hermès Bélusca-Maïto 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da699be4c44d9d077355a… commit da699be4c44d9d077355a772ed00a2c822957eb8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 29 03:13:55 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Dec 29 04:02:28 2021 +0100 [ATTRIB] Formatting only. --- base/applications/cmdutils/attrib/attrib.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index 6eaf053b95a..fc53e68dfbc 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -120,7 +120,9 @@ PrintAttribute( Error = GetLastError(); if ((Error != ERROR_DIRECTORY) && (Error != ERROR_SHARING_VIOLATION) && (Error != ERROR_FILE_NOT_FOUND)) + { ErrorMessage(Error, pszFile); + } return FALSE; } @@ -131,7 +133,9 @@ PrintAttribute( if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + { continue; + } wcscpy(pszFileName, findData.cFileName); wcscat(pszFileName, L"\\"); @@ -161,7 +165,9 @@ PrintAttribute( if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + { continue; + } wcscpy(pszFileName, findData.cFileName); @@ -174,7 +180,7 @@ PrintAttribute( szFullName); bFound = TRUE; } - while(FindNextFileW(hFind, &findData)); + while (FindNextFileW(hFind, &findData)); FindClose(hFind); return bFound; @@ -218,7 +224,9 @@ ChangeAttribute( Error = GetLastError(); if ((Error != ERROR_DIRECTORY) && (Error != ERROR_SHARING_VIOLATION) && (Error != ERROR_FILE_NOT_FOUND)) + { ErrorMessage(Error, pszFile); + } return FALSE; } @@ -229,7 +237,9 @@ ChangeAttribute( if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + { continue; + } wcscpy(pszFileName, findData.cFileName); wcscat(pszFileName, L"\\"); @@ -260,7 +270,9 @@ ChangeAttribute( if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + { continue; + } if (bRecurse && bIsDir && !bDirectories) continue; @@ -272,7 +284,7 @@ ChangeAttribute( SetFileAttributes(szFullName, dwAttribute); bFound = TRUE; } - while(FindNextFileW(hFind, &findData)); + while (FindNextFileW(hFind, &findData)); FindClose(hFind); return bFound;

1 0

[reactos] 03/03: [RAPPS] Fix the download dialog not having an icon when RAPPS is started for the first time and the database is downloaded beforehand.
by Hermès Bélusca-Maïto 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a84d295974429fa590393… commit a84d295974429fa59039346c33f81455f3da87e8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 29 01:23:10 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Dec 29 01:28:56 2021 +0100 [RAPPS] Fix the download dialog not having an icon when RAPPS is started for the first time and the database is downloaded beforehand. --- base/applications/rapps/loaddlg.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index d86bdda5131..fbe85205b19 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -406,16 +406,23 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w bCancelled = FALSE; - hIconBg = (HICON) GetClassLongPtrW(hMainWnd, GCLP_HICON); - hIconSm = (HICON) GetClassLongPtrW(hMainWnd, GCLP_HICONSM); + if (hMainWnd) + { + hIconBg = (HICON)GetClassLongPtrW(hMainWnd, GCLP_HICON); + hIconSm = (HICON)GetClassLongPtrW(hMainWnd, GCLP_HICONSM); + } + if (!hMainWnd || (!hIconBg || !hIconSm)) + { + /* Load the default icon */ + hIconBg = hIconSm = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); + } if (hIconBg && hIconSm) { - SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM) hIconBg); - SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSm); + SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM)hIconBg); + SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm); } - SetWindowLongPtrW(Dlg, GWLP_USERDATA, 0); HWND Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS); if (Item) { @@ -448,7 +455,6 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w DownloadParam *param = new DownloadParam(Dlg, AppsDownloadList, szCaption); unsigned int ThreadId; HANDLE Thread = (HANDLE)_beginthreadex(NULL, 0, ThreadFunc, (void *) param, 0, &ThreadId); - if (!Thread) { return FALSE;

1 0

[reactos] 02/03: [RAPPS] Remove some dead code.
by Hermès Bélusca-Maïto 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5a6357d932ea6cc4e319… commit b5a6357d932ea6cc4e3198bb4ad1956b6a235f0c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 29 01:19:49 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Dec 29 01:28:55 2021 +0100 [RAPPS] Remove some dead code. CAvailableApps::GetFolderPath() and friends are unnecessary, since the data they return are public members of the m_Strings global structure, that are already being used directly by other code. --- base/applications/rapps/available.cpp | 15 --------------- base/applications/rapps/include/available.h | 4 ---- 2 files changed, 19 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 3f8e30243df..fcc069b8d0a 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -613,19 +613,4 @@ ATL::CSimpleArray<CAvailableApplicationInfo> CAvailableApps::FindAppsByPkgNameLi } return result; } - -const ATL::CStringW& CAvailableApps::GetFolderPath() const -{ - return m_Strings.szPath; -} - -const ATL::CStringW& CAvailableApps::GetAppPath() const -{ - return m_Strings.szAppsPath; -} - -const ATL::CStringW& CAvailableApps::GetCabPath() const -{ - return m_Strings.szCabPath; -} // CAvailableApps diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index 92a846aa5e9..fa2a13a144f 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -129,8 +129,4 @@ public: CAvailableApplicationInfo* FindAppByPkgName(const ATL::CStringW& szPkgName) const; ATL::CSimpleArray<CAvailableApplicationInfo> FindAppsByPkgNameList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const; //ATL::CSimpleArray<CAvailableApplicationInfo> GetSelected() const; - - const ATL::CStringW& GetFolderPath() const; - const ATL::CStringW& GetAppPath() const; - const ATL::CStringW& GetCabPath() const; };

1 0

[reactos] 01/03: [RAPPS] Minor formatting.
by Hermès Bélusca-Maïto 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35efa2b9c7275df4074a6… commit 35efa2b9c7275df4074a615341bac4980c0a610c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 29 01:16:42 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Dec 29 01:28:53 2021 +0100 [RAPPS] Minor formatting. --- base/applications/rapps/appview.cpp | 16 ++++++++-------- base/applications/rapps/available.cpp | 10 +++++----- base/applications/rapps/misc.cpp | 6 ++---- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index d548504c1cb..09bbb178a9a 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1414,7 +1414,7 @@ BOOL CAppsListView::AddInstalledApplication(CInstalledApplicationInfo *InstAppIn if (!hIcon) { - /* Load default icon */ + /* Load the default icon */ hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); } @@ -1442,17 +1442,17 @@ BOOL CAppsListView::AddAvailableApplication(CAvailableApplicationInfo *AvlbAppIn if (AvlbAppInfo->RetrieveIcon(szIconPath)) { hIcon = (HICON)LoadImageW(NULL, - szIconPath.GetString(), - IMAGE_ICON, - LISTVIEW_ICON_SIZE, - LISTVIEW_ICON_SIZE, - LR_LOADFROMFILE); + szIconPath.GetString(), + IMAGE_ICON, + LISTVIEW_ICON_SIZE, + LISTVIEW_ICON_SIZE, + LR_LOADFROMFILE); } if (!hIcon || GetLastError() != ERROR_SUCCESS) { - /* Load default icon */ - hIcon = (HICON)LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); + /* Load the default icon */ + hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); } int IconIndex = ImageList_AddIcon(m_hImageListView, hIcon); diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index e148a2df4ba..3f8e30243df 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -15,7 +15,7 @@ #include "dialogs.h" - // CAvailableApplicationInfo +// CAvailableApplicationInfo CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam, AvailableStrings& AvlbStrings) : m_LicenseType(LICENSE_NONE), m_SizeBytes(0), m_sFileName(sFileNameParam), m_IsInstalled(FALSE), m_HasLanguageInfo(FALSE), m_HasInstalledVersion(FALSE) @@ -38,7 +38,8 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo(AvailableStrings& AvlbString // TODO: I temporarily use the file name (without suffix) as package name. // It should be better to put this in a field of ini file. - // consider write a converter to do this and write a github action for rapps-db to ensure package_name is unique. + // Consider writing a converter to do this and write a github action for + // rapps-db to ensure package_name is unique. m_szPkgName = m_sFileName; PathRemoveExtensionW(m_szPkgName.GetBuffer(MAX_PATH)); m_szPkgName.ReleaseBuffer(); @@ -72,7 +73,6 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo(AvailableStrings& AvlbString break; } - if (PathIsURLW(ScrnshotLocation.GetString())) { m_szScrnshotLocation.Add(ScrnshotLocation); @@ -416,7 +416,7 @@ BOOL CAvailableApps::UpdateAppsDB() return FALSE; } - //if there are some files in the db folder - we're good + // If there are some files in the db folder, we're good hFind = FindFirstFileW(m_Strings.szSearchPath, &FindFileData); if (hFind != INVALID_HANDLE_VALUE) { @@ -425,7 +425,7 @@ BOOL CAvailableApps::UpdateAppsDB() } DownloadApplicationsDB(SettingsInfo.bUseSource ? SettingsInfo.szSourceURL : APPLICATION_DATABASE_URL, - !SettingsInfo.bUseSource); + !SettingsInfo.bUseSource); if (!ExtractFilesFromCab(m_Strings.szCabName, m_Strings.szCabDir, diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index b5d142828ff..80bd875008a 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -6,8 +6,8 @@ * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ -#include "rapps.h" +#include "rapps.h" #include "misc.h" static HANDLE hLog = NULL; @@ -197,7 +197,7 @@ VOID InitLogs() } dwData = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | - EVENTLOG_INFORMATION_TYPE; + EVENTLOG_INFORMATION_TYPE; if ((key.SetStringValue(L"EventMessageFile", szPath, @@ -215,7 +215,6 @@ VOID InitLogs() } } - VOID FreeLogs() { if (hLog) @@ -224,7 +223,6 @@ VOID FreeLogs() } } - BOOL WriteLogMessage(WORD wType, DWORD dwEventID, LPCWSTR lpMsg) { if (!SettingsInfo.bLogEnabled)

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 December 2021