Ros-diffs March 2025

ros-diffs@reactos.org

15 participants
66 discussions

[reactos] 01/01: [NTUSER] Handle window update region larger than the current window in clip region (#7731)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c505d9a9b804a5464f34… commit 5c505d9a9b804a5464f348ebc09265f28d4b75b4 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Feb 22 23:31:50 2025 -0600 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Mar 12 12:18:53 2025 +0100 [NTUSER] Handle window update region larger than the current window in clip region (#7731) CORE-18206 CORE-18799 CORE-19371 Fixes infinite loop of: err: Message WM_PAINT count 1 Internal Paint Set? FALSE The symptom appears in the following scenario (as reported in CORE-18799): A program (game) runs at a small resolution (e.g. 640 x 480), but the game window gets invalidated at a larger size (e.g. 1152 x 864 screen resolution) before switching to the smaller (640 x 480) size. Because of this, the window's update region is larger than the current window so only the 640 x 480 region gets validated leaving the remaining region invalid. This causes the recurring WM_PAINT messages because there is no way to invalidate the remaining area. --- win32ss/user/ntuser/winpos.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index d06730112be..da895726b7a 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -2037,7 +2037,17 @@ co_WinPosSetWindowPos( } else if(VisAfter) { - REGION_bOffsetRgn(VisAfter, -Window->rcWindow.left, -Window->rcWindow.top); + /* Clip existing update region to new window size */ + if (Window->hrgnUpdate != NULL) + { + PREGION RgnUpdate = REGION_LockRgn(Window->hrgnUpdate); + if (RgnUpdate) + { + RgnType = IntGdiCombineRgn(RgnUpdate, RgnUpdate, VisAfter, RGN_AND); + REGION_UnlockRgn(RgnUpdate); + } + } + REGION_bOffsetRgn(VisAfter, -Window->rcWindow.left, -Window->rcWindow.top); } /*

2 weeks, 6 days

[reactos] 02/02: [NTOS:OB] Allow ObpCaseInsensitive to be configured via registry (#7751)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f37138ce91973d3bc906e… commit f37138ce91973d3bc906ea3dab4e89d77a9dae71 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 4 21:55:47 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Mar 11 19:15:02 2025 +0100 [NTOS:OB] Allow ObpCaseInsensitive to be configured via registry (#7751) This feature can be controlled by the system policy: "System objects: Require case insensitivity for non-Windows subsystems" https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-… It is also used in conjunction with NTFS to get system-wide filesystem case-sensitivity: https://www.betaarchive.com/wiki/index.php/Microsoft_KB_Archive/929110 This is controlled with a REG_DWORD value named `ObCaseInsensitive` inside the registry key `HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Kernel` . Object case (in)sensitivity check is done in the ObpLookupObjectName() helper. The `ObpCaseInsensitive` variable is used to retrieve the data, hence it needs to be a ULONG. --- ntoskrnl/config/cmdata.c | 7 +++++++ ntoskrnl/include/internal/ob.h | 1 + ntoskrnl/ob/obname.c | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/config/cmdata.c b/ntoskrnl/config/cmdata.c index 47f166f56c2..f53ac05a7cd 100644 --- a/ntoskrnl/config/cmdata.c +++ b/ntoskrnl/config/cmdata.c @@ -542,6 +542,13 @@ DATA_SEG("INITDATA") CM_SYSTEM_CONTROL_VECTOR CmControlVector[] = &ObpUnsecureGlobalNamesLength, NULL }, + { + L"Session Manager\\Kernel", + L"ObCaseInsensitive", + &ObpCaseInsensitive, + NULL, + NULL + }, { L"Session Manager\\I/O System", L"CountOperations", diff --git a/ntoskrnl/include/internal/ob.h b/ntoskrnl/include/internal/ob.h index 9e4497bbff5..9b897392f03 100644 --- a/ntoskrnl/include/internal/ob.h +++ b/ntoskrnl/include/internal/ob.h @@ -648,6 +648,7 @@ extern ALIGNEDNAME ObpDosDevicesShortNameRoot; extern UNICODE_STRING ObpDosDevicesShortName; extern WCHAR ObpUnsecureGlobalNamesBuffer[128]; extern ULONG ObpUnsecureGlobalNamesLength; +extern ULONG ObpCaseInsensitive; extern ULONG ObpObjectSecurityMode; extern ULONG ObpProtectionMode; extern ULONG ObpLUIDDeviceMapsDisabled; diff --git a/ntoskrnl/ob/obname.c b/ntoskrnl/ob/obname.c index 5c829327c14..de0ac79053e 100644 --- a/ntoskrnl/ob/obname.c +++ b/ntoskrnl/ob/obname.c @@ -15,7 +15,7 @@ #define NDEBUG #include <debug.h> -BOOLEAN ObpCaseInsensitive = TRUE; +ULONG ObpCaseInsensitive = TRUE; POBJECT_DIRECTORY ObpRootDirectoryObject; POBJECT_DIRECTORY ObpTypeDirectoryObject;

3 weeks

[reactos] 01/02: [NTOS:OB] ObpLookupEntryDirectory(): SearchShadow is a BOOLEAN

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c71845ee8c69fa6283c2e… commit c71845ee8c69fa6283c2ed427d7fd777b44fd270 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 4 21:47:42 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Mar 11 19:12:36 2025 +0100 [NTOS:OB] ObpLookupEntryDirectory(): SearchShadow is a BOOLEAN --- ntoskrnl/include/internal/ob.h | 2 +- ntoskrnl/ob/obdir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/include/internal/ob.h b/ntoskrnl/include/internal/ob.h index 4aad5a5e253..9e4497bbff5 100644 --- a/ntoskrnl/include/internal/ob.h +++ b/ntoskrnl/include/internal/ob.h @@ -205,7 +205,7 @@ ObpLookupEntryDirectory( IN POBJECT_DIRECTORY Directory, IN PUNICODE_STRING Name, IN ULONG Attributes, - IN UCHAR SearchShadow, + IN BOOLEAN SearchShadow, IN POBP_LOOKUP_CONTEXT Context ); diff --git a/ntoskrnl/ob/obdir.c b/ntoskrnl/ob/obdir.c index 3f3bc492c11..f566c995ee4 100644 --- a/ntoskrnl/ob/obdir.c +++ b/ntoskrnl/ob/obdir.c @@ -158,7 +158,7 @@ NTAPI ObpLookupEntryDirectory(IN POBJECT_DIRECTORY Directory, IN PUNICODE_STRING Name, IN ULONG Attributes, - IN UCHAR SearchShadow, + IN BOOLEAN SearchShadow, IN POBP_LOOKUP_CONTEXT Context) { BOOLEAN CaseInsensitive = FALSE;

3 weeks

[reactos] 01/01: [KERNEL32][NTDLL][NTOS][WIN32K] Fix and sync the exports for RtlUnwindEx and RtlVirtualUnwind (#7749)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc62c17a7f96455419d4d… commit bc62c17a7f96455419d4da4dadb08f537be74d1f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 4 18:07:06 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Mar 11 18:59:22 2025 +0100 [KERNEL32][NTDLL][NTOS][WIN32K] Fix and sync the exports for RtlUnwindEx and RtlVirtualUnwind (#7749) --- dll/ntdll/def/ntdll.spec | 4 ++-- dll/win32/kernel32/kernel32.spec | 2 +- ntoskrnl/ntoskrnl.spec | 4 ++-- win32ss/win32k.spec | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 0066bd352c4..fa2dabbcc93 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -1231,7 +1231,7 @@ @ stdcall -stub -version=0x600+ RtlUnlockMemoryZone(long) @ stdcall -stub -version=0x600+ RtlUnlockModuleSection(long) @ stdcall -register RtlUnwind(ptr ptr ptr ptr) -@ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) +@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) @ stdcall RtlUpcaseUnicodeChar(long) @ stdcall RtlUpcaseUnicodeString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long) @@ -1255,7 +1255,7 @@ @ stdcall RtlValidateProcessHeaps() @ stdcall RtlValidateUnicodeString(long ptr) @ stdcall RtlVerifyVersionInfo(ptr long double) -@ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) +@ stdcall -arch=x86_64 RtlVirtualUnwind(long int64 int64 ptr ptr ptr ptr ptr) @ stdcall -version=0x600+ RtlWakeAllConditionVariable(ptr) @ stdcall -version=0x600+ RtlWakeConditionVariable(ptr) @ stdcall RtlWalkFrameChain(ptr long long) diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 149a4f8f7ba..bed72eb2b99 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -981,7 +981,7 @@ @ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind @ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx -@ stdcall -arch=x86_64 RtlVirtualUnwind(ptr ptr ptr long) ntdll.RtlVirtualUnwind +@ stdcall -arch=x86_64 RtlVirtualUnwind(long int64 int64 ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind @ stdcall RtlZeroMemory(ptr long) ntdll.RtlZeroMemory @ stdcall ScrollConsoleScreenBufferA(long ptr ptr ptr ptr) @ stdcall ScrollConsoleScreenBufferW(long ptr ptr ptr ptr) diff --git a/ntoskrnl/ntoskrnl.spec b/ntoskrnl/ntoskrnl.spec index 4d5bf883c60..6e44fb2c140 100644 --- a/ntoskrnl/ntoskrnl.spec +++ b/ntoskrnl/ntoskrnl.spec @@ -1309,7 +1309,7 @@ @ stdcall RtlUnicodeToOemN(ptr long ptr wstr long) @ stdcall RtlUnlockBootStatusData(ptr) @ stdcall RtlUnwind(ptr ptr ptr ptr) -@ cdecl -arch=x86_64 RtlUnwindEx(double double ptr ptr ptr ptr) +@ stdcall -arch=x86_64,arm RtlUnwindEx(ptr ptr ptr ptr ptr ptr) @ stdcall RtlUpcaseUnicodeChar(long) @ stdcall RtlUpcaseUnicodeString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long) @@ -1325,7 +1325,7 @@ @ stdcall RtlValidSecurityDescriptor(ptr) @ stdcall RtlValidSid(ptr) @ stdcall RtlVerifyVersionInfo(ptr long long long) -@ cdecl -arch=x86_64 RtlVirtualUnwind(long double double ptr ptr ptr ptr ptr) +@ stdcall -arch=x86_64,arm RtlVirtualUnwind(long int64 int64 ptr ptr ptr ptr ptr) @ stdcall RtlVolumeDeviceToDosName(ptr ptr) IoVolumeDeviceToDosName @ stdcall RtlWalkFrameChain(ptr long long) @ stdcall RtlWriteRegistryValue(long wstr wstr long ptr long) diff --git a/win32ss/win32k.spec b/win32ss/win32k.spec index b0555c8e231..4db5c20288e 100644 --- a/win32ss/win32k.spec +++ b/win32ss/win32k.spec @@ -206,10 +206,10 @@ @ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) NTOSKRNL.RtlUnicodeToMultiByteN @ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) NTOSKRNL.RtlUnicodeToMultiByteSize @ stdcall RtlUnwind(ptr ptr ptr ptr) NTOSKRNL.RtlUnwind -@ cdecl -arch=x86_64,arm RtlUnwindEx(double double ptr ptr ptr ptr) NTOSKRNL.RtlUnwindEx +@ stdcall -arch=x86_64,arm RtlUnwindEx(ptr ptr ptr ptr ptr ptr) NTOSKRNL.RtlUnwindEx @ stdcall RtlUpcaseUnicodeChar(long) NTOSKRNL.RtlUpcaseUnicodeChar @ stdcall RtlUpcaseUnicodeToMultiByteN(ptr long ptr ptr long) NTOSKRNL.RtlUpcaseUnicodeToMultiByteN -@ cdecl -arch=x86_64,arm RtlVirtualUnwind(long double double ptr ptr ptr ptr ptr) NTOSKRNL.RtlVirtualUnwind +@ stdcall -arch=x86_64,arm RtlVirtualUnwind(long int64 int64 ptr ptr ptr ptr ptr) NTOSKRNL.RtlVirtualUnwind @ stdcall -arch=x86_64,arm RtlZeroMemory(ptr long) NTOSKRNL.RtlZeroMemory @ stdcall STROBJ_bEnum(ptr ptr ptr) @ stdcall STROBJ_bEnumPositionsOnly(ptr ptr ptr)

3 weeks

[reactos] 01/01: [CRYPT32] Initial implementation of CertEnumSystemStoreLocation() (#7746)

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=275c40d26dfb6a8c123ba… commit 275c40d26dfb6a8c123ba377ef29f8a05a447163 Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Tue Mar 11 21:17:38 2025 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Mar 11 14:17:38 2025 +0100 [CRYPT32] Initial implementation of CertEnumSystemStoreLocation() (#7746) Initial implementation of `CertEnumSystemStoreLocation`, which is required by the latest "VirtualBox Guest Additions". This function returns 8 fixed hard-coded system stores and registered OID system stores, this PR didn't implement the latter because `CryptEnumOIDFunction` is unimplemented, marked as FIXME. --- dll/win32/crypt32/crypt32.spec | 1 + dll/win32/crypt32/store.c | 55 ++++++++++++++++ modules/rostests/apitests/CMakeLists.txt | 1 + modules/rostests/apitests/crypt32/CMakeLists.txt | 10 +++ .../apitests/crypt32/CertEnumSystemStoreLocation.c | 74 ++++++++++++++++++++++ modules/rostests/apitests/crypt32/testlist.c | 13 ++++ 6 files changed, 154 insertions(+) diff --git a/dll/win32/crypt32/crypt32.spec b/dll/win32/crypt32/crypt32.spec index fc32570b52e..9754b0296cd 100644 --- a/dll/win32/crypt32/crypt32.spec +++ b/dll/win32/crypt32/crypt32.spec @@ -39,6 +39,7 @@ @ stdcall CertEnumCertificatesInStore(ptr ptr) @ stdcall CertEnumPhysicalStore(ptr long ptr ptr) @ stdcall CertEnumSystemStore(long ptr ptr ptr) +@ stdcall CertEnumSystemStoreLocation(long ptr ptr) @ stdcall CertFindAttribute(str long ptr) @ stdcall CertFindCRLInStore(ptr long long long ptr ptr) @ stdcall CertFindCTLInStore(ptr long long long ptr ptr) diff --git a/dll/win32/crypt32/store.c b/dll/win32/crypt32/store.c index 2b8ea1d5d82..c89d414a2c0 100644 --- a/dll/win32/crypt32/store.c +++ b/dll/win32/crypt32/store.c @@ -1358,6 +1358,61 @@ BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, return ret; } +#ifdef __REACTOS__ + +typedef struct _CERT_SYSTEM_STORE_LOCATION +{ + DWORD dwFlags; + PCWSTR pwszStoreLocation; +} CERT_SYSTEM_STORE_LOCATION, *PCERT_SYSTEM_STORE_LOCATION; + +static const CERT_SYSTEM_STORE_LOCATION gSystemStoreLocations[] = { + { CERT_SYSTEM_STORE_CURRENT_USER, L"CurrentUser" }, + { CERT_SYSTEM_STORE_LOCAL_MACHINE, L"LocalMachine" }, + { CERT_SYSTEM_STORE_CURRENT_SERVICE, L"CurrentService" }, + { CERT_SYSTEM_STORE_SERVICES, L"Services" }, + { CERT_SYSTEM_STORE_USERS, L"Users" }, + { CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY, L"CurrentUserGroupPolicy" }, + { CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY, L"LocalMachineGroupPolicy" }, + { CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE, L"LocalMachineEnterprise" }, +}; + +BOOL +WINAPI +CertEnumSystemStoreLocation( + _In_ DWORD dwFlags, + _Inout_opt_ void *pvArg, + __callback PFN_CERT_ENUM_SYSTEM_STORE_LOCATION pfnEnum) +{ + DWORD i; + + /* Check input flags */ + if (dwFlags != 0) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + + /* Return fixed system stores */ + for (i = 0; i < ARRAYSIZE(gSystemStoreLocations); i++) + { + if (!pfnEnum(gSystemStoreLocations[i].pwszStoreLocation, + gSystemStoreLocations[i].dwFlags, + NULL, + pvArg)) + { + return FALSE; + } + } + + /* FIXME: Return registered OID system stores by calling CryptEnumOIDFunction */ + FIXME("Registered OID system stores is not enumerated\n"); + + return TRUE; +} + +#endif /* __REACTOS__ */ + BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags, void *pvArg, PFN_CERT_ENUM_PHYSICAL_STORE pfnEnum) { diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index 92ea11342a9..5b29c633dce 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -19,6 +19,7 @@ if (NOT USE_DUMMY_PSEH) add_subdirectory(compiler) endif() add_subdirectory(crt) +add_subdirectory(crypt32) add_subdirectory(dbghelp) add_subdirectory(dciman32) add_subdirectory(dnsapi) diff --git a/modules/rostests/apitests/crypt32/CMakeLists.txt b/modules/rostests/apitests/crypt32/CMakeLists.txt new file mode 100644 index 00000000000..a34bee9de0c --- /dev/null +++ b/modules/rostests/apitests/crypt32/CMakeLists.txt @@ -0,0 +1,10 @@ + +list(APPEND SOURCE + CertEnumSystemStoreLocation.c + testlist.c) + +add_executable(crypt32_apitest ${SOURCE}) +target_link_libraries(crypt32_apitest wine ${PSEH_LIB}) +set_module_type(crypt32_apitest win32cui) +add_importlibs(crypt32_apitest crypt32 msvcrt kernel32 ntdll) +add_rostests_file(TARGET crypt32_apitest) diff --git a/modules/rostests/apitests/crypt32/CertEnumSystemStoreLocation.c b/modules/rostests/apitests/crypt32/CertEnumSystemStoreLocation.c new file mode 100644 index 00000000000..9dbd781b9df --- /dev/null +++ b/modules/rostests/apitests/crypt32/CertEnumSystemStoreLocation.c @@ -0,0 +1,74 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Test for CertEnumSystemStoreLocation + * COPYRIGHT: Copyright 2025 Ratin Gao <ratin(a)knsoft.org> + */ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <apitest.h> +#include <windef.h> +#include <wincrypt.h> + +#define ARG_CONTEXT ((PVOID)(ULONG_PTR)0x12345678) + +typedef struct _CERT_SYSTEM_STORE_LOCATION +{ + DWORD dwFlags; + PCWSTR pwszStoreLocation; +} CERT_SYSTEM_STORE_LOCATION, * PCERT_SYSTEM_STORE_LOCATION; + +static const CERT_SYSTEM_STORE_LOCATION g_SystemStoreLocations[] = { + { CERT_SYSTEM_STORE_CURRENT_USER, L"CurrentUser" }, + { CERT_SYSTEM_STORE_LOCAL_MACHINE, L"LocalMachine" }, + { CERT_SYSTEM_STORE_CURRENT_SERVICE, L"CurrentService" }, + { CERT_SYSTEM_STORE_SERVICES, L"Services" }, + { CERT_SYSTEM_STORE_USERS, L"Users" }, + { CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY, L"CurrentUserGroupPolicy" }, + { CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY, L"LocalMachineGroupPolicy" }, + { CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE, L"LocalMachineEnterprise" }, +}; + +static ULONG g_Index = 0; + +static +BOOL +WINAPI +CertEnumSystemStoreLocationCallback( + _In_ LPCWSTR pwszStoreLocation, + _In_ DWORD dwFlags, + _Reserved_ void* pvReserved, + _Inout_opt_ void* pvArg) +{ + ok(pvReserved == NULL, "pvReserved is not NULL\n"); + ok(pvArg == ARG_CONTEXT, "pvArg incorrect\n"); + + if (g_Index < ARRAYSIZE(g_SystemStoreLocations)) + { + ok(dwFlags == g_SystemStoreLocations[g_Index].dwFlags, "#%lu dwFlags incorrect\n", g_Index); + ok(wcscmp(pwszStoreLocation, g_SystemStoreLocations[g_Index].pwszStoreLocation) == 0, + "#%lu pwszStoreLocation incorrect\n", + g_Index); + } + + g_Index++; + return TRUE; +} + +START_TEST(CertEnumSystemStoreLocation) +{ + BOOL bRet; + + /* dwFlags should be 0, otherwise fail with E_INVALIDARG */ + bRet = CertEnumSystemStoreLocation(1, ARG_CONTEXT, CertEnumSystemStoreLocationCallback); + ok(bRet == FALSE && GetLastError() == E_INVALIDARG, + "CertEnumSystemStoreLocation should failed with E_INVALIDARG when dwFlags is not 0\n"); + + /* Start enumeration */ + bRet = CertEnumSystemStoreLocation(0, ARG_CONTEXT, CertEnumSystemStoreLocationCallback); + ok(bRet != FALSE, "CertEnumSystemStoreLocation failed with 0x%08lX\n", GetLastError()); + ok(g_Index >= ARRAYSIZE(g_SystemStoreLocations), "Count of enumerated item incorrect\n"); +} diff --git a/modules/rostests/apitests/crypt32/testlist.c b/modules/rostests/apitests/crypt32/testlist.c new file mode 100644 index 00000000000..45a8a29d118 --- /dev/null +++ b/modules/rostests/apitests/crypt32/testlist.c @@ -0,0 +1,13 @@ +#define __ROS_LONG64__ + +#define STANDALONE +#include <apitest.h> + +extern void func_CertEnumSystemStoreLocation(void); + +const struct test winetest_testlist[] = +{ + { "CertEnumSystemStoreLocation", func_CertEnumSystemStoreLocation }, + + { 0, 0 } +};

3 weeks

[reactos] 01/01: [COMCTL32] Fix shift-selecting files not working as expected in small/large icons views (#7729)

by Miguel Almeida

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b45debb93aa6a5da07b3d… commit b45debb93aa6a5da07b3d5563194e3d700cfffef Author: Miguel Almeida <miguelbarraalmeida(a)gmail.com> AuthorDate: Tue Mar 11 12:49:39 2025 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Mar 11 13:49:39 2025 +0100 [COMCTL32] Fix shift-selecting files not working as expected in small/large icons views (#7729) CORE-10386 Fixes the behavior when selecting multiple files in a folder with the Shift key, while using either the Large Icons or Small Icons view, so that it is consistent with how it works on Windows. Proposed changes: Disable the specialized code for these views in LISTVIEW_SetGroupSelection, using the same code as for the list and details views, which also works fine for them. --- dll/win32/comctl32/listview.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index c94b85fac64..eb165e835c4 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -3725,8 +3725,10 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; +#ifndef __REACTOS__ if ((infoPtr->uView == LV_VIEW_LIST) || (infoPtr->uView == LV_VIEW_DETAILS)) { +#endif if (infoPtr->nSelectionMark == -1) { infoPtr->nSelectionMark = nItem; @@ -3740,6 +3742,7 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) sel.upper = max(infoPtr->nSelectionMark, nItem) + 1; ranges_add(selection, sel); } +#ifndef __REACTOS__ } else { @@ -3765,6 +3768,7 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) } iterator_destroy(&i); } +#endif /* disable per item notifications on LVS_OWNERDATA style FIXME: single LVN_ODSTATECHANGED should be used */

3 weeks

[reactos] 01/01: [THEMES][MIZU] New bitmaps to replace old Lautus ones (#7775)

by Owen Utley

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14f8f7e3bdf736d2cd9da… commit 14f8f7e3bdf736d2cd9da6e22f238b4b586674c1 Author: Owen Utley <utleyowen(a)gmail.com> AuthorDate: Tue Mar 11 04:04:53 2025 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Mar 11 12:04:53 2025 +0300 [THEMES][MIZU] New bitmaps to replace old Lautus ones (#7775) --- .../Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp | Bin 3574 -> 2630 bytes .../Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp | Bin 12342 -> 3206 bytes .../Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp | Bin 30054 -> 8534 bytes .../bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONS.bmp | Bin 8336 -> 1738 bytes .../NORMAL_EXPLORERBARTOOLBARBUTTONSSPLIT.bmp | Bin 9992 -> 1738 bytes ...NORMAL_EXPLORERBARTOOLBARBUTTONSSPLITDROPDOWN.bmp | Bin 5024 -> 1186 bytes .../mizu.msstyles/bitmaps/NORMAL_LISTVIEWHEADER.bmp | Bin 5096 -> 1182 bytes .../bitmaps/NORMAL_LISTVIEWHEADERBACKGROUND.bmp | Bin 204 -> 134 bytes .../mizu.msstyles/bitmaps/NORMAL_PLACEBARBUTTONS.bmp | Bin 4678 -> 1890 bytes .../mizu.msstyles/bitmaps/NORMAL_PROGRESSTRACK.bmp | Bin 1974 -> 510 bytes .../bitmaps/NORMAL_PROGRESSTRACKVERT.bmp | Bin 2054 -> 550 bytes .../mizu.msstyles/bitmaps/NORMAL_RADIOBUTTON13.bmp | Bin 7254 -> 2142 bytes .../bitmaps/NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp | Bin 1292 -> 598 bytes .../bitmaps/NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp | Bin 1260 -> 598 bytes .../bitmaps/NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp | Bin 1256 -> 598 bytes .../bitmaps/NORMAL_SPINBUTTONBACKGROUNDUP.bmp | Bin 1236 -> 598 bytes .../mizu.msstyles/bitmaps/NORMAL_SPINDOWNGLYPH.bmp | Bin 1270 -> 170 bytes .../mizu.msstyles/bitmaps/NORMAL_SPINLEFTGLYPH.bmp | Bin 1302 -> 186 bytes .../mizu.msstyles/bitmaps/NORMAL_SPINRIGHTGLYPH.bmp | Bin 1302 -> 186 bytes .../mizu.msstyles/bitmaps/NORMAL_SPINUPGLYPH.bmp | Bin 1270 -> 170 bytes .../Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEM.bmp | Bin 5094 -> 1166 bytes .../mizu.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp | Bin 5094 -> 1166 bytes .../mizu.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp | Bin 5094 -> 1166 bytes .../mizu.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp | Bin 5094 -> 1166 bytes .../Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp | Bin 5094 -> 1166 bytes .../mizu.msstyles/bitmaps/NORMAL_TABITEMTOPBOTH.bmp | Bin 5096 -> 1166 bytes .../mizu.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp | Bin 5094 -> 1166 bytes .../mizu.msstyles/bitmaps/NORMAL_TABITEMTOPRIGHT.bmp | Bin 5096 -> 1166 bytes .../bitmaps/NORMAL_TASKBANDBUTTONVERTICAL.bmp | Bin 4390 -> 1730 bytes .../bitmaps/NORMAL_TASKBANDFLASHBUTTON.bmp | Bin 1862 -> 514 bytes .../bitmaps/NORMAL_TASKBANDSCROLLARROWS.bmp | Bin 14200 -> 1998 bytes .../bitmaps/NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL.bmp | Bin 3592 -> 786 bytes .../bitmaps/NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp | Bin 3592 -> 606 bytes .../bitmaps/NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp | Bin 4136 -> 798 bytes .../bitmaps/NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp | Bin 4280 -> 782 bytes .../bitmaps/NORMAL_TASKBARSIZINGBARBOTTOM.bmp | Bin 150 -> 78 bytes .../mizu.msstyles/bitmaps/NORMAL_TOOLBARBUTTONS.bmp | Bin 5038 -> 2458 bytes .../bitmaps/NORMAL_TOOLBARBUTTONSSPLIT.bmp | Bin 5830 -> 2458 bytes .../bitmaps/NORMAL_TOOLBARBUTTONSSPLITDROPDOWN.bmp | Bin 3454 -> 1666 bytes .../mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN13.bmp | Bin 2338 -> 918 bytes .../mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN16.bmp | Bin 3158 -> 1118 bytes .../mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN25.bmp | Bin 6358 -> 2718 bytes .../bitmaps/NORMAL_TRACKBARHORIZONTAL.bmp | Bin 10614 -> 914 bytes .../mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT13.bmp | Bin 2398 -> 738 bytes .../mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT16.bmp | Bin 2898 -> 1118 bytes .../mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT25.bmp | Bin 5698 -> 2598 bytes .../mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT13.bmp | Bin 2398 -> 738 bytes .../mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT16.bmp | Bin 2898 -> 1118 bytes .../mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT25.bmp | Bin 5698 -> 2598 bytes .../mizu.msstyles/bitmaps/NORMAL_TRACKBARUP13.bmp | Bin 2338 -> 918 bytes .../mizu.msstyles/bitmaps/NORMAL_TRACKBARUP16.bmp | Bin 3158 -> 1118 bytes .../mizu.msstyles/bitmaps/NORMAL_TRACKBARUP25.bmp | Bin 6358 -> 2718 bytes .../bitmaps/NORMAL_TRACKBARVERTICAL.bmp | Bin 2398 -> 734 bytes 53 files changed, 0 insertions(+), 0 deletions(-) diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp index 805c1491c04..41defdd95c7 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp index 03c3a5a121f..c38e0efea21 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp index 346bd18b8fc..c2492c3176f 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONS.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONS.bmp index 5888461ebe8..f14d0059322 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONS.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONS.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONSSPLIT.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONSSPLIT.bmp index 4ede86ebe0b..24cced55113 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONSSPLIT.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONSSPLIT.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONSSPLITDROPDOWN.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONSSPLITDROPDOWN.bmp index 55b77ffc388..637d30fcf68 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONSSPLITDROPDOWN.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONSSPLITDROPDOWN.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_LISTVIEWHEADER.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_LISTVIEWHEADER.bmp index 0ef05d968b2..951eda3794b 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_LISTVIEWHEADER.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_LISTVIEWHEADER.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_LISTVIEWHEADERBACKGROUND.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_LISTVIEWHEADERBACKGROUND.bmp index 43135e8bdf6..a885fcb1929 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_LISTVIEWHEADERBACKGROUND.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_LISTVIEWHEADERBACKGROUND.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_PLACEBARBUTTONS.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_PLACEBARBUTTONS.bmp index 1a02a536115..ddf5c5d15d7 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_PLACEBARBUTTONS.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_PLACEBARBUTTONS.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_PROGRESSTRACK.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_PROGRESSTRACK.bmp index 9c7a9531de9..a92ecc31841 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_PROGRESSTRACK.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_PROGRESSTRACK.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_PROGRESSTRACKVERT.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_PROGRESSTRACKVERT.bmp index 599d3884a13..834a5b8df6e 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_PROGRESSTRACKVERT.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_PROGRESSTRACKVERT.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_RADIOBUTTON13.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_RADIOBUTTON13.bmp index fb04f5944d1..34f1839d6ab 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_RADIOBUTTON13.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_RADIOBUTTON13.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp index 7d1af69944d..b0b999ce68e 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp index fcbf995e726..e670ac501f9 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp index d688e83fcee..c9dcc07b3f6 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDUP.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDUP.bmp index 233f1331071..116858b2f3b 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDUP.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDUP.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINDOWNGLYPH.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINDOWNGLYPH.bmp index b8e28c54c8d..f8fe1e1f005 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINDOWNGLYPH.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINDOWNGLYPH.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINLEFTGLYPH.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINLEFTGLYPH.bmp index da3c072d81b..f3576b54d85 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINLEFTGLYPH.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINLEFTGLYPH.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINRIGHTGLYPH.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINRIGHTGLYPH.bmp index 3c924e92d9a..33133af99f8 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINRIGHTGLYPH.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINRIGHTGLYPH.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINUPGLYPH.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINUPGLYPH.bmp index ac976922bd3..0ca8d15b888 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINUPGLYPH.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SPINUPGLYPH.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEM.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEM.bmp index 9e039c70b4c..c8edbfd5ace 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEM.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEM.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp index 9fe7a5f77f2..c8edbfd5ace 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp index 4fa99935b35..2dc212b529e 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp index f7b4a015466..75976016075 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp index 4a6d4049298..c8edbfd5ace 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPBOTH.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPBOTH.bmp index 92473af5aec..c8edbfd5ace 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPBOTH.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPBOTH.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp index b038a795a8d..2dc212b529e 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPRIGHT.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPRIGHT.bmp index 92473af5aec..75976016075 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPRIGHT.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPRIGHT.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDBUTTONVERTICAL.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDBUTTONVERTICAL.bmp index b1b30aac4fd..a6cce18e949 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDBUTTONVERTICAL.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDBUTTONVERTICAL.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDFLASHBUTTON.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDFLASHBUTTON.bmp index 13f8c7eabcf..78ef2df73e1 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDFLASHBUTTON.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDFLASHBUTTON.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWS.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWS.bmp index 28ff67af7cc..4da4c42471c 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWS.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWS.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL.bmp index 269e6ae3043..112873e8b08 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp index 7330949f3a6..c162d591a61 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp index 8ced9314976..885355fe3d0 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp index 0174ac3c4c9..3a600f74889 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBARSIZINGBARBOTTOM.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBARSIZINGBARBOTTOM.bmp index f7d9b90c523..842d2431ef1 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBARSIZINGBARBOTTOM.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TASKBARSIZINGBARBOTTOM.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TOOLBARBUTTONS.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TOOLBARBUTTONS.bmp index d56e2229fe5..b0490900363 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TOOLBARBUTTONS.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TOOLBARBUTTONS.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TOOLBARBUTTONSSPLIT.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TOOLBARBUTTONSSPLIT.bmp index 3f59a20bd48..fdae43feeec 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TOOLBARBUTTONSSPLIT.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TOOLBARBUTTONSSPLIT.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TOOLBARBUTTONSSPLITDROPDOWN.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TOOLBARBUTTONSSPLITDROPDOWN.bmp index 2df902d8459..b41e582d1cb 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TOOLBARBUTTONSSPLITDROPDOWN.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TOOLBARBUTTONSSPLITDROPDOWN.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN13.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN13.bmp index 367fa1bdd95..25fcffe1c16 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN13.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN13.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN16.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN16.bmp index d714c2dce58..c0950feb39e 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN16.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN16.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN25.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN25.bmp index 3b34cde2ed6..b08983adc69 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN25.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARDOWN25.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARHORIZONTAL.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARHORIZONTAL.bmp index c6ea57b81cf..4d2f395100a 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARHORIZONTAL.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARHORIZONTAL.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT13.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT13.bmp index d6d7e610564..bbadab676f8 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT13.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT13.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT16.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT16.bmp index 9f340d109cb..48be61cd2d9 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT16.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT16.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT25.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT25.bmp index 9a47c92f171..b16c575eea6 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT25.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARLEFT25.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT13.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT13.bmp index 6bbfba4415b..82e9671c63e 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT13.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT13.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT16.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT16.bmp index 3c00e7bd5ca..50406eded36 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT16.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT16.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT25.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT25.bmp index e89bb211cdd..1aa7e3e9737 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT25.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARRIGHT25.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARUP13.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARUP13.bmp index d3effbb3d85..98c2ed4bb4e 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARUP13.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARUP13.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARUP16.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARUP16.bmp index 8f9a613cc51..cfeb6522fbb 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARUP16.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARUP16.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARUP25.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARUP25.bmp index 67acb26ba7b..d69d4ff6f5e 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARUP25.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARUP25.bmp differ diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARVERTICAL.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARVERTICAL.bmp index cacb0df37f9..9075a5263ae 100644 Binary files a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARVERTICAL.bmp and b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_TRACKBARVERTICAL.bmp differ

3 weeks, 1 day

[reactos] 01/01: [MINIHAL] Minor improvements (#7398)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=029e53ddb56a5eb4e94d3… commit 029e53ddb56a5eb4e94d30a17ef9bcd40ef7434e Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Mar 11 13:30:14 2025 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Mar 11 10:30:14 2025 +0300 [MINIHAL] Minor improvements (#7398) * [FREELDR] Mark noreturn functions * [FREELDR] Compile hw debugging support code only in debug builds - Make BREAKPOINT() portable * [FREELDR] Consolidate identical names into a single string * [FREELDR] Use intrinsics for string I/O operations on x86 and x64 Stop them being pulled in from a static minihal library * [MINIHAL] Exclude unnecessary portio dependency --- boot/freeldr/freeldr/arch/arm/debug.c | 1 + boot/freeldr/freeldr/arch/i386/i386bug.c | 48 +++++++++++++----------- boot/freeldr/freeldr/arch/i386/i386trap.S | 2 + boot/freeldr/freeldr/arch/uefi/uefildr.c | 1 + boot/freeldr/freeldr/include/arch/arm/hardware.h | 1 + boot/freeldr/freeldr/include/arch/pc/hardware.h | 11 ++++++ boot/freeldr/freeldr/include/arch/pc/pcbios.h | 3 ++ boot/freeldr/freeldr/include/debug.h | 4 +- boot/freeldr/freeldr/include/linux.h | 1 + hal/halx86/include/halp.h | 14 +++++++ hal/halx86/minihal/CMakeLists.txt | 1 - 11 files changed, 64 insertions(+), 23 deletions(-) diff --git a/boot/freeldr/freeldr/arch/arm/debug.c b/boot/freeldr/freeldr/arch/arm/debug.c index f7d65d2bfc5..97fea6e6a31 100644 --- a/boot/freeldr/freeldr/arch/arm/debug.c +++ b/boot/freeldr/freeldr/arch/arm/debug.c @@ -24,6 +24,7 @@ Rs232PortPutByte(UCHAR ByteToSend) *UART0DR = ByteToSend; } +DECLSPEC_NORETURN VOID FrLdrBugCheckWithMessage( ULONG BugCode, diff --git a/boot/freeldr/freeldr/arch/i386/i386bug.c b/boot/freeldr/freeldr/arch/i386/i386bug.c index 1276ddad9bc..0627f1d5d24 100644 --- a/boot/freeldr/freeldr/arch/i386/i386bug.c +++ b/boot/freeldr/freeldr/arch/i386/i386bug.c @@ -12,25 +12,25 @@ typedef struct _FRAME static const CHAR *i386ExceptionDescriptionText[] = { - "Exception 00: DIVIDE BY ZERO", - "Exception 01: DEBUG EXCEPTION", - "Exception 02: NON-MASKABLE INTERRUPT EXCEPTION", - "Exception 03: BREAKPOINT (INT 3)", - "Exception 04: OVERFLOW", - "Exception 05: BOUND EXCEPTION", - "Exception 06: INVALID OPCODE", - "Exception 07: FPU NOT AVAILABLE", - "Exception 08: DOUBLE FAULT", - "Exception 09: COPROCESSOR SEGMENT OVERRUN", - "Exception 0A: INVALID TSS", - "Exception 0B: SEGMENT NOT PRESENT", - "Exception 0C: STACK EXCEPTION", - "Exception 0D: GENERAL PROTECTION FAULT", - "Exception 0E: PAGE FAULT", - "Exception 0F: Reserved", - "Exception 10: COPROCESSOR ERROR", - "Exception 11: ALIGNMENT CHECK", - "Exception 12: MACHINE CHECK" + "DIVIDE BY ZERO", + "DEBUG EXCEPTION", + "NON-MASKABLE INTERRUPT EXCEPTION", + "BREAKPOINT (INT 3)", + "OVERFLOW", + "BOUND EXCEPTION", + "INVALID OPCODE", + "FPU NOT AVAILABLE", + "DOUBLE FAULT", + "COPROCESSOR SEGMENT OVERRUN", + "INVALID TSS", + "SEGMENT NOT PRESENT", + "STACK EXCEPTION", + "GENERAL PROTECTION FAULT", + "PAGE FAULT", + "Reserved", + "COPROCESSOR ERROR", + "ALIGNMENT CHECK", + "MACHINE CHECK" }; #define SCREEN_ATTR 0x1F // Bright white on blue background @@ -118,7 +118,10 @@ i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGIST PrintText("FreeLdr " KERNEL_VERSION_STR " " KERNEL_VERSION_BUILD_STR "\n" "Report this error on the ReactOS Bug Tracker: https://jira.reactos.org\n\n" - "0x%02lx: %s\n\n", TrapIndex, i386ExceptionDescriptionText[TrapIndex]); + "0x%02lx: Exception %02X: %s\n\n", + TrapIndex, + TrapIndex, + i386ExceptionDescriptionText[TrapIndex]); #ifdef _M_IX86 PrintText("EAX: %.8lx ESP: %.8lx CR0: %.8lx DR0: %.8lx\n", @@ -194,6 +197,7 @@ i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGIST InstructionPointer[6], InstructionPointer[7]); } +DECLSPEC_NORETURN VOID FrLdrBugCheckWithMessage( ULONG BugCode, @@ -227,8 +231,9 @@ FrLdrBugCheckWithMessage( for (;;); } +static +DECLSPEC_NORETURN void -NTAPI FrLdrBugCheckEx( ULONG BugCode, PCHAR File, @@ -256,6 +261,7 @@ FrLdrBugCheckEx( for (;;); } +DECLSPEC_NORETURN void NTAPI FrLdrBugCheck(ULONG BugCode) diff --git a/boot/freeldr/freeldr/arch/i386/i386trap.S b/boot/freeldr/freeldr/arch/i386/i386trap.S index bbc5367d70d..95b41ccd80a 100644 --- a/boot/freeldr/freeldr/arch/i386/i386trap.S +++ b/boot/freeldr/freeldr/arch/i386/i386trap.S @@ -142,6 +142,7 @@ TRAP_STUB _i386AlignmentCheck, 17 TRAP_STUB _i386MachineCheck, 18 TRAP_STUB _i386SimdFloatError, 19 +#if DBG /************************************************************************ * DEBUGGING SUPPORT FUNCTIONS ************************************************************************/ @@ -176,5 +177,6 @@ BREAKPOINT_TEMPLATE _MEMORY_WRITE_BREAKPOINT3, HEX(0f0ffffff), HEX(001000330) BREAKPOINT_TEMPLATE _INSTRUCTION_BREAKPOINT4, HEX(00fffffff), HEX(0000003c0) BREAKPOINT_TEMPLATE _MEMORY_READWRITE_BREAKPOINT4, HEX(00fffffff), HEX(0300003c0) BREAKPOINT_TEMPLATE _MEMORY_WRITE_BREAKPOINT4, HEX(00fffffff), HEX(0100003c0) +#endif // DBG END diff --git a/boot/freeldr/freeldr/arch/uefi/uefildr.c b/boot/freeldr/freeldr/arch/uefi/uefildr.c index 69d5041d2ca..e694b7aa2b0 100644 --- a/boot/freeldr/freeldr/arch/uefi/uefildr.c +++ b/boot/freeldr/freeldr/arch/uefi/uefildr.c @@ -80,6 +80,7 @@ ExecuteLoaderCleanly(PVOID PreviousStack) } #ifndef _M_ARM +DECLSPEC_NORETURN VOID __cdecl Reboot(VOID) { //TODO: Replace with a true firmware reboot eventually diff --git a/boot/freeldr/freeldr/include/arch/arm/hardware.h b/boot/freeldr/freeldr/include/arch/arm/hardware.h index 51ed5a8ebcf..a821391265a 100644 --- a/boot/freeldr/freeldr/include/arch/arm/hardware.h +++ b/boot/freeldr/freeldr/include/arch/arm/hardware.h @@ -34,6 +34,7 @@ extern ULONG gDiskReadBuffer, gFileSysBuffer; #define DriveMapGetBiosDriveNumber(DeviceName) 0 +DECLSPEC_NORETURN FORCEINLINE VOID Reboot(VOID) { DbgBreakPoint(); diff --git a/boot/freeldr/freeldr/include/arch/pc/hardware.h b/boot/freeldr/freeldr/include/arch/pc/hardware.h index de408b74cd9..6ca98ed6a0c 100644 --- a/boot/freeldr/freeldr/include/arch/pc/hardware.h +++ b/boot/freeldr/freeldr/include/arch/pc/hardware.h @@ -23,6 +23,17 @@ #define TAG_HW_RESOURCE_LIST 'lRwH' #define TAG_HW_DISK_CONTEXT 'cDwH' +/* + * These aren't defined in the ioaccess.h header. + * Because of that we manually define the symbols we need to make use of I/O ports. + */ +#define READ_PORT_BUFFER_UCHAR(port, buffer, count) __inbytestring(H2I(port), buffer, count) +#define READ_PORT_BUFFER_USHORT(port, buffer, count) __inwordstring(H2I(port), buffer, count) +#define READ_PORT_BUFFER_ULONG(port, buffer, count) __indwordstring(H2I(port), buffer, count) +#define WRITE_PORT_BUFFER_UCHAR(port, buffer, count) __outbytestring(H2I(port), buffer, count) +#define WRITE_PORT_BUFFER_USHORT(port, buffer, count) __outwordstring(H2I(port), buffer, count) +#define WRITE_PORT_BUFFER_ULONG(port, buffer, count) __outdwordstring(H2I(port), buffer, count) + /* PROTOTYPES ***************************************************************/ /* hardware.c */ diff --git a/boot/freeldr/freeldr/include/arch/pc/pcbios.h b/boot/freeldr/freeldr/include/arch/pc/pcbios.h index f3539d21426..5b876d07ae8 100644 --- a/boot/freeldr/freeldr/include/arch/pc/pcbios.h +++ b/boot/freeldr/freeldr/include/arch/pc/pcbios.h @@ -182,6 +182,7 @@ VOID __cdecl ChainLoadBiosBootSectorCode( IN UCHAR BootDrive OPTIONAL, IN ULONG BootPartition OPTIONAL); +DECLSPEC_NORETURN VOID __cdecl Relocator16Boot( IN REGS* In, IN USHORT StackSegment, @@ -189,7 +190,9 @@ VOID __cdecl Relocator16Boot( IN USHORT CodeSegment, IN USHORT CodePointer); +DECLSPEC_NORETURN VOID __cdecl Reboot(VOID); + VOID DetectHardware(VOID); #endif /* ! __ASM__ */ diff --git a/boot/freeldr/freeldr/include/debug.h b/boot/freeldr/freeldr/include/debug.h index 6460cacd2c3..efff30f3954 100644 --- a/boot/freeldr/freeldr/include/debug.h +++ b/boot/freeldr/freeldr/include/debug.h @@ -85,7 +85,7 @@ // // You may have as many BREAKPOINT()'s as you like but you may only // have up to four of any of the others. -#define BREAKPOINT() __asm__ ("int $3"); +#define BREAKPOINT() __debugbreak() void INSTRUCTION_BREAKPOINT1(unsigned long addr); void MEMORY_READWRITE_BREAKPOINT1(unsigned long addr); void MEMORY_WRITE_BREAKPOINT1(unsigned long addr); @@ -125,10 +125,12 @@ void MEMORY_WRITE_BREAKPOINT4(unsigned long addr); #endif // DBG +DECLSPEC_NORETURN void NTAPI FrLdrBugCheck(ULONG BugCode); +DECLSPEC_NORETURN VOID FrLdrBugCheckWithMessage( ULONG BugCode, diff --git a/boot/freeldr/freeldr/include/linux.h b/boot/freeldr/freeldr/include/linux.h index f7591db7410..d55bf8d51da 100644 --- a/boot/freeldr/freeldr/include/linux.h +++ b/boot/freeldr/freeldr/include/linux.h @@ -129,6 +129,7 @@ typedef struct #include <poppack.h> // Implemented in linux.S +DECLSPEC_NORETURN VOID __cdecl BootLinuxKernel( _In_ ULONG KernelSize, diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index ef6111654df..5c323ffbc02 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -588,6 +588,20 @@ HalInitializeBios( #define KiEnterInterruptTrap(TrapFrame) /* We do all neccessary in asm code */ #endif // _M_AMD64 +#ifdef _MINIHAL_ +#if defined(_M_IX86) || defined(_M_AMD64) +/* Use intrinsics for IA-32 and amd64 */ +#include <ioaccess.h> + +#define READ_PORT_BUFFER_UCHAR(port, buffer, count) __inbytestring(H2I(port), buffer, count) +#define READ_PORT_BUFFER_USHORT(port, buffer, count) __inwordstring(H2I(port), buffer, count) +#define READ_PORT_BUFFER_ULONG(port, buffer, count) __indwordstring(H2I(port), buffer, count) +#define WRITE_PORT_BUFFER_UCHAR(port, buffer, count) __outbytestring(H2I(port), buffer, count) +#define WRITE_PORT_BUFFER_USHORT(port, buffer, count) __outwordstring(H2I(port), buffer, count) +#define WRITE_PORT_BUFFER_ULONG(port, buffer, count) __outdwordstring(H2I(port), buffer, count) +#endif +#endif + extern BOOLEAN HalpNMIInProgress; extern ADDRESS_USAGE HalpDefaultIoSpace; diff --git a/hal/halx86/minihal/CMakeLists.txt b/hal/halx86/minihal/CMakeLists.txt index 4a7ca0f9d89..13faf2ee5fc 100644 --- a/hal/halx86/minihal/CMakeLists.txt +++ b/hal/halx86/minihal/CMakeLists.txt @@ -5,7 +5,6 @@ add_definitions(-D_MINIHAL_) list(APPEND MINI_HAL_SOURCE - ../generic/portio.c ../legacy/bus/bushndlr.c ../legacy/bus/cmosbus.c ../legacy/bus/isabus.c

3 weeks, 1 day

[reactos] 01/01: [SHELL32] Don't close icon dialog when selecting from autocomplete (#7766)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0089017d54a601ed317e8… commit 0089017d54a601ed317e885576471a73f96ad56c Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Mar 9 22:00:16 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 9 22:00:16 2025 +0100 [SHELL32] Don't close icon dialog when selecting from autocomplete (#7766) --- dll/win32/shell32/CShellLink.cpp | 2 +- dll/win32/shell32/dialogs/dialogs.cpp | 23 ++++++----------------- dll/win32/shell32/lang/bg-BG.rc | 2 +- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/de-DE.rc | 2 +- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/es-ES.rc | 2 +- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/eu-ES.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hi-IN.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 2 +- dll/win32/shell32/lang/id-ID.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 2 +- dll/win32/shell32/lang/ja-JP.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 2 +- dll/win32/shell32/lang/pl-PL.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/pt-PT.rc | 2 +- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/ru-RU.rc | 2 +- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/uk-UA.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-HK.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- 38 files changed, 43 insertions(+), 54 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 162d91c64d8..edc482f8883 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -2914,7 +2914,7 @@ BOOL CShellLink::OnInitDialog(HWND hwndDlg, HWND hwndFocus, LPARAM lParam) HWND hWndTarget = GetDlgItem(hwndDlg, IDC_SHORTCUT_TARGET_TEXT); EnableWindow(hWndTarget, !disablecontrols); - PostMessage(hWndTarget, EM_SETSEL, 0, -1); // Fix caret bug when first opening the tab + PostMessage(hWndTarget, EM_SETSEL, 0, -1); // Fix caret bug when first opening the tab [CORE-20016] /* auto-completion */ SHAutoComplete(hWndTarget, SHACF_DEFAULT); diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 44f8935211a..2ef69786079 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -151,9 +151,8 @@ DoLoadIcons(HWND hwndDlg, PPICK_ICON_CONTEXT pIconContext, LPCWSTR pszFile) } } - // Set the text and reset the edit control's modification flag SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath); - SendDlgItemMessage(hwndDlg, IDC_EDIT_PATH, EM_SETMODIFY, FALSE, 0); + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); if (pIconContext->nIcons == 0) { @@ -194,9 +193,7 @@ INT_PTR CALLBACK PickIconProc( HICON hIcon; INT index, count; WCHAR szText[MAX_PATH], szFilter[100]; - CStringW strTitle; OPENFILENAMEW ofn; - PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)GetWindowLongPtr(hwndDlg, DWLP_USER); switch(uMsg) @@ -251,18 +248,11 @@ INT_PTR CALLBACK PickIconProc( case IDOK: { /* Check whether the path edit control has been modified; if so load the icons instead of validating */ - if (SendDlgItemMessage(hwndDlg, IDC_EDIT_PATH, EM_GETMODIFY, 0, 0)) + GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText, _countof(szText)); + if (lstrcmpiW(szText, pIconContext->szPath)) { - /* Reset the edit control's modification flag and retrieve the text */ - SendDlgItemMessage(hwndDlg, IDC_EDIT_PATH, EM_SETMODIFY, FALSE, 0); - GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText, _countof(szText)); - - // Load the icons if (!DoLoadIcons(hwndDlg, pIconContext, szText)) NoIconsInFile(hwndDlg, pIconContext); - - // Set the selection - SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); break; } @@ -293,6 +283,7 @@ INT_PTR CALLBACK PickIconProc( case IDC_BUTTON_PATH: { // Choose the module path + CStringW strTitle; szText[0] = 0; szFilter[0] = 0; ZeroMemory(&ofn, sizeof(ofn)); @@ -310,9 +301,6 @@ INT_PTR CALLBACK PickIconProc( // Load the icons if (!DoLoadIcons(hwndDlg, pIconContext, szText)) NoIconsInFile(hwndDlg, pIconContext); - - // Set the selection - SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); break; } @@ -331,8 +319,9 @@ INT_PTR CALLBACK PickIconProc( lpdis = (LPDRAWITEMSTRUCT)lParam; if (lpdis->itemID == (UINT)-1) break; - switch (lpdis->itemAction) + switch (lpdis->itemAction) // FIXME: MSDN says that more than one of these can be set { + // FIXME: ODA_FOCUS case ODA_SELECT: case ODA_DRAWENTIRE: { diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index ffa7fa93d77..36f71419cb5 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -637,8 +637,8 @@ CAPTION "Смяна на значе" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Обзор...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Обзор...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "Добре", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index e8f729c7c9e..7a6815db73a 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -637,8 +637,8 @@ CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 9a2a3ebec95..ad440329838 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -645,8 +645,8 @@ CAPTION "Změnit ikonu" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Vyhledat ikony v souboru:", -1, 7, 7, 179, 10 - PUSHBUTTON "Procházet...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Procházet...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Vyberte ikonu z následujícího seznamu:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 46bc8854b97..bd726f617c3 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -644,8 +644,8 @@ CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 1270e5c1702..ccaeb38024c 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -637,8 +637,8 @@ CAPTION "Anderes Symbol" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Datei nach Symbolen durchsuchen:", -1, 7, 7, 179, 10 - PUSHBUTTON "Durchsuchen...", IDC_BUTTON_PATH, 126, 17, 59, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 114, 14, ES_AUTOHSCROLL + PUSHBUTTON "Durchsuchen...", IDC_BUTTON_PATH, 126, 17, 59, 14 LTEXT "Wählen Sie ein Symbol aus der folgenden Liste:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 906192f80db..9dfb4a8ab8b 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -637,8 +637,8 @@ CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index acc08e4f3bd..62ff8c79d1d 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -637,8 +637,8 @@ CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 46a403aa4d6..a2fd1bf8efa 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -637,8 +637,8 @@ CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 8d515c6cbc0..f780d75264c 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -646,8 +646,8 @@ CAPTION "Cambiar icono" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Buscar íconos en este archivo:", -1, 7, 7, 179, 10 - PUSHBUTTON "Examinar...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Examinar...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Seleccione un ícono de la siguiente lista:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "Aceptar", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 35a11ea9b6e..6190be6c55e 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -644,8 +644,8 @@ CAPTION "Muuda ikooni" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Otsi ikoone sellest failist:", -1, 7, 7, 179, 10 - PUSHBUTTON "Sirvi...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Sirvi...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Vali ikoon alltoodud loendist:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc index 9ce6a760948..5e8f1cdb676 100644 --- a/dll/win32/shell32/lang/eu-ES.rc +++ b/dll/win32/shell32/lang/eu-ES.rc @@ -644,8 +644,8 @@ CAPTION "Aldatu ikonoa" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Bilatu ikonoak fitxategi honetan:", -1, 7, 7, 179, 10 - PUSHBUTTON "&Arakatu...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Arakatu...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "&Hautatu ikono bat beheko zerrendan:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "Ados", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 0743841d7e3..16f5171c978 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -637,8 +637,8 @@ CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index fbd939d7941..235eaace30a 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -637,8 +637,8 @@ CAPTION "Changer l'icône" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Rechercher une icône pour ce fichier :", -1, 7, 7, 179, 10 - PUSHBUTTON "Parcourir...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Parcourir...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Sélectionnez une icône dans la liste ci-dessous :", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 4ae2969e694..4fc4b5e6ca8 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -644,8 +644,8 @@ CAPTION "שינוי סמל" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "עיון...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "עיון...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "אישור", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index fc38faac4f1..1c682de1363 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -644,8 +644,8 @@ CAPTION "आइकॉन बदलें" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "इस फ़ाइल में आइकन देखें:", -1, 7, 7, 179, 10 - PUSHBUTTON "ब्राउज...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "ब्राउज...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "नीचे दी गई सूची में से एक आइकन चुनें:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "ठीक", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 28a7923bb29..8d71dec6e20 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -637,8 +637,8 @@ CAPTION "Ikoncsere" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Ikonok keresése ebben a fájlban:", -1, 7, 7, 179, 10 - PUSHBUTTON "Tallózás...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Tallózás...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Válasszon egy ikont a listából:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 50250ed016b..ebddbcc7bd4 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -637,8 +637,8 @@ CAPTION "Ganti Ikon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Cari ikon di berkas ini:", -1, 7, 7, 179, 10 - PUSHBUTTON "Jelajah...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Jelajah...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Pilih ikon dari daftar di bawah ini:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 889df335f8a..9fb0e5601d0 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -637,8 +637,8 @@ CAPTION "Cambia icona" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Sfoglia...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Sfoglia...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index a186027c5fe..7cc1dd07a19 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -637,8 +637,8 @@ CAPTION "アイコンの変更" FONT 9, "MS UI Gothic", 400, 0, 0x1 BEGIN LTEXT "次のファイルのアイコンを見る:", -1, 7, 7, 185, 10 - PUSHBUTTON "参照...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "参照...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "以下のリストからアイコンを選択:", -1, 7, 36, 185, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index d6a31a17bdb..d6f71216370 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -644,8 +644,8 @@ CAPTION "아이콘 변경" FONT 9, "굴림", 400, 0, 0x1 BEGIN LTEXT "파일에서 아이콘 찾기(&L):", -1, 7, 7, 179, 10 - PUSHBUTTON "찾아보기(&B)...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "찾아보기(&B)...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "아래 목록에서 아이콘 선택:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "확인", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 82d22450c87..d13aceef1ac 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -637,8 +637,8 @@ CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 0321417fb24..5ff56fce943 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -637,8 +637,8 @@ CAPTION "Endre ikon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Utforsk...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Utforsk...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 1614266d238..babdb6d3183 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -646,8 +646,8 @@ CAPTION "Zmienianie Ikony" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Szukaj ikon w pliku:", -1, 7, 7, 179, 10 - PUSHBUTTON "Przeglądaj...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Przeglądaj...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Wybierz ikonę z poniższej listy:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 0b5c46f359f..17337ac6806 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -637,8 +637,8 @@ CAPTION "Alterar Ícone" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index d606c701112..d6aa68921a1 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -647,8 +647,8 @@ CAPTION "Alterar ícone" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Procurar ícones no ficheiro:", -1, 7, 7, 179, 10 - PUSHBUTTON "&Procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Seleccione um ícone na lista abaixo:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index c5109abb36d..a3666ac4eab 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -645,8 +645,8 @@ CAPTION "Modificare pictogramă" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Căutare pictograme în fişierul:", -1, 7, 7, 179, 10 - PUSHBUTTON "&Răsfoire…", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Răsfoire…", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Selectaţi o pictogramă din lista de mai jos:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index f81a82b00da..d9500e3b9df 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -646,8 +646,8 @@ CAPTION "Изменение значка" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Искать значки в этом файле:", -1, 7, 7, 179, 10 - PUSHBUTTON "Обзор...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Обзор...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Выберите значок из списка ниже:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index e17019cd76d..60997c55ed1 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -637,8 +637,8 @@ CAPTION "Zmena ikony" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "&Prehľadávať...", IDC_BUTTON_PATH, 128, 17, 57, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 117, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Prehľadávať...", IDC_BUTTON_PATH, 128, 17, 57, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 17b3d7d9bee..1827162510d 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -637,8 +637,8 @@ CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 6915235b1b3..4b8d98a62b2 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -644,8 +644,8 @@ CAPTION "Ndrysho Ikonë" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Shfleto...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Shfleto...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 9628f301240..0c4df0f3782 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -637,8 +637,8 @@ CAPTION "Ändra ikon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 - PUSHBUTTON "Bläddra...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Bläddra...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 04a16690660..31851af7f46 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -646,8 +646,8 @@ CAPTION "Simge Değiştir" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Bu dosyadaki simgelere bak:", -1, 7, 7, 179, 10 - PUSHBUTTON "Gözat...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "Gözat...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Aşağıdaki listeden bir simge seç:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "Tamam", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 0a943e91999..97fafbfec94 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -637,8 +637,8 @@ CAPTION "Зміна значка" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Значки в цьому файлі:", -1, 7, 7, 179, 10 - PUSHBUTTON "О&гляд...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "О&гляд...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "Виберіть значок зі списку нижче:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 6685c210944..bafd33dfa81 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -647,8 +647,8 @@ CAPTION "更改图标" FONT 9, "宋体", 400, 0, 0x1 BEGIN LTEXT "在这个文件中查找图标：", -1, 7, 7, 179, 10 - PUSHBUTTON "浏览...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "浏览...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "从以下列表选择一个图标：", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "确定", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc index dd7d89bef55..005a2c3d7a1 100644 --- a/dll/win32/shell32/lang/zh-HK.rc +++ b/dll/win32/shell32/lang/zh-HK.rc @@ -645,8 +645,8 @@ CAPTION "變更圖示" FONT 9, "新細明體", 400, 0, 0x1 BEGIN LTEXT "在這個檔案裡尋找圖示：", -1, 7, 7, 179, 10 - PUSHBUTTON "瀏覽...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "瀏覽...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "選擇所列出的圖示：", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "確定", IDOK, 81, 179, 50, 14 diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 7d5a8e2b402..8436d2d0e8c 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -646,8 +646,8 @@ CAPTION "變更圖示" FONT 9, "新細明體", 400, 0, 0x1 BEGIN LTEXT "在這個檔案裡尋找圖示：", -1, 7, 7, 179, 10 - PUSHBUTTON "瀏覽...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + PUSHBUTTON "瀏覽...", IDC_BUTTON_PATH, 135, 17, 50, 14 LTEXT "選擇所列出的圖示：", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "確定", IDOK, 81, 179, 50, 14

3 weeks, 2 days

[reactos] 01/01: [BROWSEUI] Set AddressBand Go button checkbox state correctly in menu (#7771)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5af47c9bafe09b123df40… commit 5af47c9bafe09b123df40c83d78e91438633bb00 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Mar 9 21:59:03 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 9 21:59:03 2025 +0100 [BROWSEUI] Set AddressBand Go button checkbox state correctly in menu (#7771) CORE-20018 --- dll/win32/browseui/addressband.cpp | 23 +++++++++++++++++++++-- dll/win32/browseui/addressband.h | 3 +++ dll/win32/browseui/internettoolbar.cpp | 13 +++++++++++++ dll/win32/browseui/internettoolbar.h | 1 + dll/win32/browseui/settings.cpp | 3 +-- dll/win32/browseui/shellbrowser.cpp | 10 ++++------ 6 files changed, 43 insertions(+), 10 deletions(-) diff --git a/dll/win32/browseui/addressband.cpp b/dll/win32/browseui/addressband.cpp index 25b038655e0..51a80735ec1 100644 --- a/dll/win32/browseui/addressband.cpp +++ b/dll/win32/browseui/addressband.cpp @@ -37,6 +37,9 @@ TODO: Implement Save */ +// Unique GUID of the DLL where this CAddressBand is implemented so we can tell if it's really us +static const GUID THISMODULE_GUID = { 0x60ebab6e, 0x2e4b, 0x42f6, { 0x8a,0xbc,0x80,0x73,0x1c,0xa6,0x42,0x02} }; + CAddressBand::CAddressBand() { fEditControl = NULL; @@ -49,6 +52,20 @@ CAddressBand::~CAddressBand() { } +BOOL CAddressBand::ShouldShowGoButton() +{ + return SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", FALSE, TRUE); +} + +BOOL CAddressBand::IsGoButtonVisible(IUnknown *pUnkBand) +{ + CComPtr<IAddressBand> pAB; + IUnknown_QueryService(pUnkBand, THISMODULE_GUID, IID_PPV_ARG(IAddressBand, &pAB)); + if (pAB) + return static_cast<CAddressBand*>(pAB.p)->fGoButtonShown; + return ShouldShowGoButton(); // We don't know, return the global state +} + void CAddressBand::FocusChange(BOOL bFocus) { // m_bFocus = bFocus; @@ -168,7 +185,7 @@ HRESULT STDMETHODCALLTYPE CAddressBand::SetSite(IUnknown *pUnkSite) if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - fGoButtonShown = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", FALSE, TRUE); + fGoButtonShown = ShouldShowGoButton(); if (fGoButtonShown) CreateGoButton(); @@ -365,7 +382,7 @@ HRESULT STDMETHODCALLTYPE CAddressBand::OnWinEvent( case WM_COMMAND: if (wParam == IDM_TOOLBARS_GOBUTTON) { - fGoButtonShown = !SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", FALSE, TRUE); + fGoButtonShown = !IsGoButtonVisible(static_cast<IAddressBand*>(this)); SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", REG_SZ, fGoButtonShown ? (LPVOID)L"yes" : (LPVOID)L"no", fGoButtonShown ? 8 : 6, SHREGSET_FORCE_HKCU); if (!fGoButton) CreateGoButton(); @@ -421,6 +438,8 @@ HRESULT STDMETHODCALLTYPE CAddressBand::Refresh(long param8) HRESULT STDMETHODCALLTYPE CAddressBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) { + if (guidService == THISMODULE_GUID) + return QueryInterface(riid, ppvObject); return E_NOTIMPL; } diff --git a/dll/win32/browseui/addressband.h b/dll/win32/browseui/addressband.h index 1ffa7cea0d8..52986f1d782 100644 --- a/dll/win32/browseui/addressband.h +++ b/dll/win32/browseui/addressband.h @@ -51,6 +51,9 @@ private: void FocusChange(BOOL bFocus); void CreateGoButton(); public: + static BOOL ShouldShowGoButton(); + static BOOL IsGoButtonVisible(IUnknown *pUnkBand); + // *** IDeskBand methods *** STDMETHOD(GetBandInfo)(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi) override; diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index 2ff27b6a2cb..3ab130dc5cd 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -658,6 +658,16 @@ HRESULT CInternetToolbar::EnumBands(UINT Index, int *pBandId, IUnknown **ppUnkBa return *ppUnkBand ? S_OK : S_FALSE; } +HRESULT CInternetToolbar::QIBand(int BandID, REFIID riid, void **ppv) +{ + IUnknown *pUnk; // Not ref. counted + int temp = (UINT) SendMessageW(fMainReBar, RB_IDTOINDEX, BandID, 0); + if (EnumBands(temp, &temp, &pUnk) == S_OK) + return pUnk->QueryInterface(riid, ppv); + *ppv = NULL; + return E_NOINTERFACE; +} + HRESULT CInternetToolbar::ReserveBorderSpace(LONG maxHeight) { CComPtr<IDockingWindowSite> dockingWindowSite; @@ -1746,6 +1756,7 @@ LRESULT CInternetToolbar::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, RBHITTESTINFO hitTestInfo; REBARBANDINFOW rebarBandInfo; int bandID; + CComPtr<IAddressBand> pAddress; clickLocation.x = LOWORD(lParam); clickLocation.y = HIWORD(lParam); @@ -1780,6 +1791,8 @@ LRESULT CInternetToolbar::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, case ITBBID_ADDRESSBAND: // navigation band DeleteMenu(contextMenu, IDM_TOOLBARS_CUSTOMIZE, MF_BYCOMMAND); DeleteMenu(contextMenu, IDM_TOOLBARS_TEXTLABELS, MF_BYCOMMAND); + QIBand(ITBBID_ADDRESSBAND, IID_PPV_ARG(IAddressBand, &pAddress)); + pSettings->fShowGoButton = CAddressBand::IsGoButtonVisible(pAddress); break; default: break; diff --git a/dll/win32/browseui/internettoolbar.h b/dll/win32/browseui/internettoolbar.h index 7e97608c484..b1e93501e25 100644 --- a/dll/win32/browseui/internettoolbar.h +++ b/dll/win32/browseui/internettoolbar.h @@ -103,6 +103,7 @@ public: virtual ~CInternetToolbar(); void AddDockItem(IUnknown *newItem, int bandID, int flags); HRESULT EnumBands(UINT Index, int *pBandId, IUnknown **ppUnkBand); + HRESULT QIBand(int BandID, REFIID riid, void **ppv); HRESULT ReserveBorderSpace(LONG maxHeight = -1); HRESULT CreateMenuBar(IShellMenu **menuBar); HRESULT CreateToolsBar(IUnknown **toolsBar); diff --git a/dll/win32/browseui/settings.cpp b/dll/win32/browseui/settings.cpp index 89fb28f3666..ceb7a4e91f5 100644 --- a/dll/win32/browseui/settings.cpp +++ b/dll/win32/browseui/settings.cpp @@ -26,8 +26,7 @@ void ShellSettings::Load() fStatusBarVisible = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"StatusBarOther", FALSE, TRUE); - fShowGoButton = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", - L"ShowGoButton", FALSE, TRUE); + fShowGoButton = CAddressBand::ShouldShowGoButton(); fLocked = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", L"Locked", FALSE, TRUE); diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index cd729c02998..bd58da36ab0 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -1196,11 +1196,8 @@ HRESULT CShellBrowser::GetMenuBand(REFIID riid, void **shellMenu) if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = bandSite->QueryBand(1, &deskBand, NULL, NULL, 0); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - - return deskBand->QueryInterface(riid, shellMenu); + hResult = bandSite->QueryBand(ITBBID_MENUBAND, &deskBand, NULL, NULL, 0); + return FAILED(hResult) ? hResult : deskBand->QueryInterface(riid, shellMenu); // It is expected that this might fail during WM_DESTROY } HRESULT CShellBrowser::GetBaseBar(bool vertical, REFIID riid, void **theBaseBar) @@ -2097,7 +2094,7 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::QueryStatus(const GUID *pguidCmdGroup, { case IDM_GOTO_UPONELEVEL: prgCmds->cmdf = OLECMDF_SUPPORTED; - if (fCurrentDirectoryPIDL->mkid.cb != 0) + if (!_ILIsDesktop(fCurrentDirectoryPIDL)) prgCmds->cmdf |= OLECMDF_ENABLED; break; } @@ -3696,6 +3693,7 @@ LRESULT CShellBrowser::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL & fCurrentShellFolder.Release(); ILFree(fCurrentDirectoryPIDL); + fCurrentDirectoryPIDL = NULL; ::DestroyWindow(fStatusBar); DestroyMenu(fCurrentMenuBar); }

3 weeks, 2 days

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2025