Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 05/12: [NFSD] Disable a clang warning
by Timo Kreuzer 14 Jan '25

14 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7c6eac60748b6e2e7338… commit e7c6eac60748b6e2e73387ffbc040f916e8eda7d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Nov 29 12:40:03 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 14 13:34:24 2025 +0200 [NFSD] Disable a clang warning --- base/services/nfsd/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/services/nfsd/CMakeLists.txt b/base/services/nfsd/CMakeLists.txt index 77054777c8c..3aeb58722c0 100644 --- a/base/services/nfsd/CMakeLists.txt +++ b/base/services/nfsd/CMakeLists.txt @@ -55,6 +55,9 @@ else() # FIXME: Tons of warnings. target_compile_options(nfsd PRIVATE "-w") endif() +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_compile_options(nfsd PRIVATE -Wno-incompatible-function-pointer-types) +endif() target_link_libraries(nfsd oldnames)

1 0

[reactos] 04/12: [MSXML3] Disable a clang warning
by Timo Kreuzer 14 Jan '25

14 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4eb7ef494db8067e7c8d3… commit 4eb7ef494db8067e7c8d33da7bcbad0919ebd66c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Nov 29 14:21:41 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 14 13:34:24 2025 +0200 [MSXML3] Disable a clang warning --- dll/win32/msxml3/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/msxml3/CMakeLists.txt b/dll/win32/msxml3/CMakeLists.txt index be0ebf4105f..d5efac65459 100644 --- a/dll/win32/msxml3/CMakeLists.txt +++ b/dll/win32/msxml3/CMakeLists.txt @@ -81,6 +81,10 @@ if(MSVC) target_compile_options(msxml3 PRIVATE /wd4090) endif() +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_compile_options(msxml3 PRIVATE -Wno-incompatible-function-pointer-types) +endif() + add_importlibs(msxml3 urlmon ws2_32 shlwapi oleaut32 ole32 user32 msvcrt kernel32 ntdll) add_dependencies(msxml3 xmlparser_idlheader stdole2) # msxml3_v1.tlb needs stdole2.tlb add_pch(msxml3 precomp.h "${PCH_SKIP_SOURCE}")

1 0

[reactos] 03/12: [D3DRM] Disable a clang warning
by Timo Kreuzer 14 Jan '25

14 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3019731cc7b29fcecfff… commit a3019731cc7b29fcecfffb4856e1e51ddd3046d6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Nov 29 15:05:19 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 14 13:34:24 2025 +0200 [D3DRM] Disable a clang warning --- dll/directx/wine/d3drm/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/directx/wine/d3drm/CMakeLists.txt b/dll/directx/wine/d3drm/CMakeLists.txt index cd1eaad8832..b0234641ac2 100644 --- a/dll/directx/wine/d3drm/CMakeLists.txt +++ b/dll/directx/wine/d3drm/CMakeLists.txt @@ -28,3 +28,7 @@ target_link_libraries(d3drm dxguid uuid wine) add_importlibs(d3drm ddraw d3dxof msvcrt kernel32 ntdll) add_pch(d3drm precomp.h SOURCE) add_cd_file(TARGET d3drm DESTINATION reactos/system32 FOR all) + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_compile_options(d3drm PRIVATE -Wno-incompatible-function-pointer-types) +endif()

1 0

[reactos] 02/12: [UDFS] Remove unused file from compilation
by Timo Kreuzer 14 Jan '25

14 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45fc95b667d0eaba20095… commit 45fc95b667d0eaba200958f824ca5fd1ea4774c5 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Nov 29 15:04:36 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 14 13:34:24 2025 +0200 [UDFS] Remove unused file from compilation --- drivers/filesystems/udfs/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/udfs/CMakeLists.txt b/drivers/filesystems/udfs/CMakeLists.txt index b1bfdd9db84..6fcfba012ef 100644 --- a/drivers/filesystems/udfs/CMakeLists.txt +++ b/drivers/filesystems/udfs/CMakeLists.txt @@ -25,7 +25,7 @@ list(APPEND SOURCE mem.cpp misc.cpp namesup.cpp - pnp.cpp + #pnp.cpp read.cpp secursup.cpp shutdown.cpp

1 0

[reactos] 01/12: [CMAKE] Disable a number of warnings for clang
by Timo Kreuzer 14 Jan '25

14 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa7ab16fd09cb1637562d… commit aa7ab16fd09cb1637562dc66248b6fb40ebc53fc Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Nov 29 15:05:56 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 14 13:34:24 2025 +0200 [CMAKE] Disable a number of warnings for clang Also remove the totally useless and stupid -Werror=unknown-warning-option --- sdk/cmake/gcc.cmake | 26 +++++++++++++------------- sdk/cmake/msvc.cmake | 16 ++++++++++++++-- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 860594ef38d..1c994e2c51d 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -115,22 +115,22 @@ add_compile_options(-march=${OARCH} -mtune=${TUNE}) # Warnings, errors if((NOT CMAKE_BUILD_TYPE STREQUAL "Release") AND (NOT CMAKE_C_COMPILER_ID STREQUAL Clang)) add_compile_options(-Werror) -else() - if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Werror=unknown-warning-option>) - endif() endif() add_compile_options(-Wall -Wpointer-arith) -add_compile_options(-Wno-char-subscripts -Wno-multichar -Wno-unused-value) -add_compile_options(-Wno-unused-const-variable) -add_compile_options(-Wno-unused-local-typedefs) -add_compile_options(-Wno-deprecated) -add_compile_options(-Wno-unused-result) # FIXME To be removed when CORE-17637 is resolved - -if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_compile_options(-Wno-maybe-uninitialized) -endif() + +# Disable some overzealous warnings +add_compile_options( + -Wno-unknown-warning-option + -Wno-char-subscripts + -Wno-multichar + -Wno-unused-value + -Wno-unused-const-variable + -Wno-unused-local-typedefs + -Wno-deprecated + -Wno-unused-result # FIXME To be removed when CORE-17637 is resolved + -Wno-maybe-uninitialized +) if(ARCH STREQUAL "amd64") add_compile_options(-Wno-format) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index bf804dd3bfd..eb4973914e0 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -147,8 +147,20 @@ endif() add_compile_options(/w14115) if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Werror=unknown-warning-option>) - add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:-nostdinc;-Wno-multichar;-Wno-char-subscripts;-Wno-microsoft-enum-forward-reference;-Wno-pragma-pack;-Wno-microsoft-anon-tag;-Wno-parentheses-equality;-Wno-unknown-pragmas>") + add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:-nostdinc>") + add_compile_options( + -Wno-unknown-warning-option + -Wno-multichar + -Wno-char-subscripts + -Wno-microsoft-enum-forward-reference + -Wno-pragma-pack + -Wno-microsoft-anon-tag + -Wno-parentheses-equality + -Wno-unknown-pragmas + -Wno-ignored-pragmas + -Wno-ignored-pragma-intrinsic + -Wno-microsoft-exception-spec + ) endif() # Debugging

1 0

[reactos] 01/01: [REGEDIT] Block tree label edit if the delete accelerator has been pressed (#7610)
by Whindmar Saksit 13 Jan '25

13 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=087979eeb9186c8ae6aff… commit 087979eeb9186c8ae6aff76a38ef804eef7e8f50 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Jan 13 13:21:12 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 13 13:21:12 2025 +0100 [REGEDIT] Block tree label edit if the delete accelerator has been pressed (#7610) --- base/applications/regedit/treeview.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/base/applications/regedit/treeview.c b/base/applications/regedit/treeview.c index dcb6ce350df..ca784f12e6c 100644 --- a/base/applications/regedit/treeview.c +++ b/base/applications/regedit/treeview.c @@ -668,6 +668,8 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) case TVN_BEGINLABELEDIT: { LPNMTVDISPINFO ptvdi = (LPNMTVDISPINFO)lParam; + HWND hWndFocus = GetFocus(); + /* cancel label edit for rootkeys */ if (!TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem) || !TreeView_GetParent(g_pChildWnd->hTreeWnd, TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem))) @@ -678,6 +680,12 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) { *Result = FALSE; } + + /* cancel label edit if VK_DELETE accelerator opened a MessageBox */ + if (hWndFocus != g_pChildWnd->hTreeWnd && hWndFocus != TreeView_GetEditControl(g_pChildWnd->hTreeWnd)) + { + *Result = TRUE; + } return TRUE; } case TVN_ENDLABELEDIT:

1 0

[reactos] 01/01: [CMBATT] Minor improvements to estimated battery time code
by George Bișoc 12 Jan '25

12 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a97fcf19ecd2d73def84f… commit a97fcf19ecd2d73def84fc60d206372883599631 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Fri Jan 10 22:23:23 2025 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Jan 12 20:00:14 2025 +0100 [CMBATT] Minor improvements to estimated battery time code - Declare CMBATT_DISCHARGE_TIME and CMBATT_CAPACITY_BOGUS constructs - Determine if the battery was already discharging and if not, update the time when it's being discharged - Fix the condition where it checks if the battery has been discharging for quite some time - Default the time to BATTERY_UNKNOWN_TIME if querying the estimated battery time request fails or if the battery has just started discharging not over 15 seconds CORE-18969 CORE-19452 --- drivers/bus/acpi/cmbatt/cmbatt.c | 21 ++++++++++++++++----- drivers/bus/acpi/cmbatt/cmbatt.h | 12 ++++++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/drivers/bus/acpi/cmbatt/cmbatt.c b/drivers/bus/acpi/cmbatt/cmbatt.c index 407fa149572..dd01f8b22be 100644 --- a/drivers/bus/acpi/cmbatt/cmbatt.c +++ b/drivers/bus/acpi/cmbatt/cmbatt.c @@ -1085,6 +1085,7 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, { ULONG PsrData = 0; NTSTATUS Status; + BOOLEAN WasDischarging; ULONG BstState; ULONG PowerUnit; ULONG DesignVoltage, PresentRate, RemainingCapacity; @@ -1113,6 +1114,9 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, return Status; } + /* Remember if the battery was discharging at the time of querying new status */ + WasDischarging = !!(DeviceExtension->State & BATTERY_DISCHARGING); + /* Clear current BST information */ DeviceExtension->State = 0; DeviceExtension->RemainingCapacity = 0; @@ -1135,9 +1139,9 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, { /* Set power state and check if it just started discharging now */ DeviceExtension->State |= BATTERY_DISCHARGING; - if (!(DeviceExtension->State & ACPI_BATT_STAT_DISCHARG)) + if (!WasDischarging) { - /* Remember the time when the state changed */ + /* The battery is discharging now and not before, remember the time when the state changed */ DeviceExtension->InterruptTime = KeQueryInterruptTime(); } } @@ -1363,8 +1367,8 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, case BatteryEstimatedTime: - /* Check if it's been more than 2 1/2 minutes since the last change */ - if ((KeQueryInterruptTime() - 150000000) > (FdoExtension->InterruptTime)) + /* Check if it's been more than 15 seconds since the last change */ + if (KeQueryInterruptTime() > (FdoExtension->InterruptTime + CMBATT_DISCHARGE_TIME)) { /* Get new battery status */ CmBattGetBatteryStatus(FdoExtension, FdoExtension->Tag); @@ -1379,6 +1383,9 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, /* Grab the remaining capacity */ RemainingCapacity = FdoExtension->RemainingCapacity; + /* Default time to unknown if we fail the request later */ + RemainingTime = BATTERY_UNKNOWN_TIME; + /* See if we don't know one or the other */ if ((Rate == BATTERY_UNKNOWN_RATE) || (RemainingCapacity == BATTERY_UNKNOWN_CAPACITY)) @@ -1410,7 +1417,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, else { /* We have data, but is it valid? */ - if (RemainingCapacity > 0x123456) + if (RemainingCapacity > CMBATT_CAPACITY_BOGUS) { /* The capacity seems bogus, so don't use it */ if (CmBattDebug & CMBATT_ACPI_WARNING) @@ -1423,6 +1430,10 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, } } } + else + { + RemainingTime = BATTERY_UNKNOWN_TIME; + } /* Return the remaining time */ QueryData = &RemainingTime; diff --git a/drivers/bus/acpi/cmbatt/cmbatt.h b/drivers/bus/acpi/cmbatt/cmbatt.h index e6ab5f029bd..4a2ec81acd3 100644 --- a/drivers/bus/acpi/cmbatt/cmbatt.h +++ b/drivers/bus/acpi/cmbatt/cmbatt.h @@ -42,6 +42,18 @@ #define CMBATT_PNP_ENTRY_EXIT 0x200 #define CMBATT_ACPI_ASSERT 0x400 +// +// Constant used to determine if the battery was discharging +// for over 15 seconds since last time the AC adapter got unplugged. +// +#define CMBATT_DISCHARGE_TIME 150000000 + +// +// Bogus constant used to determine if the remaining battery capacity +// overflows which is returned by the hardware. +// +#define CMBATT_CAPACITY_BOGUS 0x100000 + typedef enum _CMBATT_EXTENSION_TYPE { CmBattAcAdapter,

1 0

[reactos] 01/01: [SDK:WINE] Fix get_temp_buffer() call in wine_dbgstr_wn()
by Hermès Bélusca-Maïto 11 Jan '25

11 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37b0646e76b5a78914b90… commit 37b0646e76b5a78914b904727591909bad206267 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jan 10 22:12:24 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 11 21:17:28 2025 +0100 [SDK:WINE] Fix get_temp_buffer() call in wine_dbgstr_wn() Addendum to commit dbc7eeb47e (PR #4303). The argument to get_temp_buffer() should specify the length of the string being buffered + 1 (for the NUL-terminator). The original code wrongly interverted this with specifying the buffer shifted by one character. --- sdk/include/reactos/wine/test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/wine/test.h b/sdk/include/reactos/wine/test.h index 872ab75378a..4399a6f1714 100644 --- a/sdk/include/reactos/wine/test.h +++ b/sdk/include/reactos/wine/test.h @@ -747,7 +747,7 @@ const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n ) } *dst = 0; - res = get_temp_buffer(strlen(buffer + 1)); + res = get_temp_buffer(strlen(buffer) + 1); strcpy(res, buffer); return res; }

1 0

[reactos] 01/01: [RAPPS] Protect database update with a mutex (#7006)
by Whindmar Saksit 11 Jan '25

11 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ff8adc5537f5b0555708… commit 3ff8adc5537f5b0555708d6f72b635744adcf3ca Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Jan 11 19:52:07 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 11 19:52:07 2025 +0100 [RAPPS] Protect database update with a mutex (#7006) --- base/applications/rapps/gui.cpp | 4 ++++ base/applications/rapps/include/misc.h | 29 +++++++++++++++++++++++++++++ base/applications/rapps/include/rapps.h | 9 +++++++++ base/applications/rapps/unattended.cpp | 3 ++- base/applications/rapps/winmain.cpp | 2 +- 5 files changed, 45 insertions(+), 2 deletions(-) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 70cedb28a21..5e8dc85a8ba 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -304,6 +304,7 @@ CMainWindow::CheckAvailable() { if (m_Db->GetAvailableCount() == 0) { + CUpdateDatabaseMutex lock; m_Db->RemoveCached(); m_Db->UpdateAvailable(); } @@ -591,9 +592,12 @@ CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) break; case ID_RESETDB: + { + CUpdateDatabaseMutex lock; m_Db->RemoveCached(); UpdateApplicationsList(SelectedEnumType, bReload); break; + } case ID_HELP: MessageBoxW(L"Help not implemented yet", NULL, MB_OK); diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index 4617050855a..f2f3ea727d9 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -117,3 +117,32 @@ GetProgramFilesPath(CStringW &Path, BOOL PerUser, HWND hwnd = NULL); template <class T> class CLocalPtr : public CHeapPtr<T, CLocalAllocator> { }; + +struct CScopedMutex +{ + HANDLE m_hMutex; + + CScopedMutex(LPCWSTR Name, UINT Timeout = INFINITE, BOOL InitialOwner = FALSE) + { + m_hMutex = CreateMutexW(NULL, InitialOwner, Name); + if (m_hMutex && !InitialOwner) + { + DWORD wait = WaitForSingleObject(m_hMutex, Timeout); + if (wait != WAIT_OBJECT_0 && wait != WAIT_ABANDONED) + { + CloseHandle(m_hMutex); + m_hMutex = NULL; + } + } + } + ~CScopedMutex() + { + if (m_hMutex) + { + ReleaseMutex(m_hMutex); + CloseHandle(m_hMutex); + } + } + + bool Acquired() const { return m_hMutex != NULL; } +}; diff --git a/base/applications/rapps/include/rapps.h b/base/applications/rapps/include/rapps.h index 49bb4691f09..c03a06d092d 100644 --- a/base/applications/rapps/include/rapps.h +++ b/base/applications/rapps/include/rapps.h @@ -17,4 +17,13 @@ extern LONG g_Busy; #define WM_NOTIFY_OPERATIONCOMPLETED (WM_APP + 0) +#define MAINWINDOWCLASSNAME L"ROSAPPMGR2" +#define MAINWINDOWMUTEX szWindowClass +#define UPDATEDBMUTEX ( MAINWINDOWCLASSNAME L":UpDB" ) + +struct CUpdateDatabaseMutex : public CScopedMutex +{ + CUpdateDatabaseMutex() : CScopedMutex(UPDATEDBMUTEX, 1000 * 60 * 10, FALSE) { }; +}; + #endif /* _RAPPS_H */ diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index 12ffe79254a..4967f259de3 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -338,6 +338,7 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) BOOL bAppwizMode = (argc > 1 && MatchCmdOption(argv[1], CMD_KEY_APPWIZ)); if (!bAppwizMode) { + CUpdateDatabaseMutex lock; if (SettingsInfo.bUpdateAtStart || bIsFirstLaunch) db.RemoveCached(); @@ -350,7 +351,7 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) { // Check whether the RAPPS MainWindow is already launched in another process CStringW szWindowText(MAKEINTRESOURCEW(bAppwizMode ? IDS_APPWIZ_TITLE : IDS_APPTITLE)); - LPCWSTR pszMutex = bAppwizMode ? L"RAPPWIZ" : szWindowClass; + LPCWSTR pszMutex = bAppwizMode ? L"RAPPWIZ" : MAINWINDOWMUTEX; HANDLE hMutex = CreateMutexW(NULL, FALSE, pszMutex); if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index 2c5c06a300f..70ce317a468 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -13,7 +13,7 @@ #include <gdiplus.h> #include <conutils.h> -LPCWSTR szWindowClass = L"ROSAPPMGR2"; +LPCWSTR szWindowClass = MAINWINDOWCLASSNAME; LONG g_Busy = 0; HWND hMainWnd;

1 0

[reactos] 01/01: [SHELL32] SHELL_ArgifyW(): don't use SearchPathW() for receiving a path to a file (#7605)
by Oleg Dubinskiy 10 Jan '25

10 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5a6b0f8e572ee1872b98… commit e5a6b0f8e572ee1872b987ad7d10418eac073cdf Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Fri Jan 10 20:45:43 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 10 20:45:43 2025 +0100 [SHELL32] SHELL_ArgifyW(): don't use SearchPathW() for receiving a path to a file (#7605) Get rid from bogus SearchPathW() call, which is marked as most likely not needed in the comment above (by Wine). Simply get a length of the file name and use the file name directly instead, with checking for its validity too. Similarly as it's done for other cases. That call seems actually not needed because it is already done using SearchPathW() in another parts of the code in this file, before calling SHELL_ArgifyW(). Fixes another heap corruption when trying to login via OAuth menthod in SpotifyXP 2.0.3 Beta (nightly build). The previous commit did not fix the bug fully, as I discovered it later. CORE-19953 --- dll/win32/shell32/shlexec.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 85c7feab0ff..f03db3de0e7 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -197,11 +197,9 @@ static void ParseTildeEffect(PWSTR &res, LPCWSTR &args, DWORD &len, DWORD &used, static BOOL SHELL_ArgifyW(WCHAR* out, DWORD len, const WCHAR* fmt, const WCHAR* lpFile, LPITEMIDLIST pidl, LPCWSTR args, DWORD* out_len, const WCHAR* lpDir) { - WCHAR xlpFile[1024]; BOOL done = FALSE; BOOL found_p1 = FALSE; PWSTR res = out; - PCWSTR cmd; DWORD used = 0; bool tildeEffect = false; @@ -279,20 +277,14 @@ static BOOL SHELL_ArgifyW(WCHAR* out, DWORD len, const WCHAR* fmt, const WCHAR* break; case '1': - if (!done || (*fmt == '1')) + if ((!done || (*fmt == '1')) && lpFile) { - /*FIXME Is the call to SearchPathW() really needed? We already have separated out the parameter string in args. */ - if (SearchPathW(lpDir, lpFile, L".exe", ARRAY_SIZE(xlpFile), xlpFile, NULL)) - cmd = xlpFile; - else - cmd = lpFile; - - SIZE_T cmdlen = wcslen(cmd); - used += cmdlen; + SIZE_T filelen = wcslen(lpFile); + used += filelen; if (used < len) { - wcscpy(res, cmd); - res += cmdlen; + wcscpy(res, lpFile); + res += filelen; } } found_p1 = TRUE;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs