Ros-diffs

ros-diffs@reactos.org

17 participants
81085 discussions

[reactos] 01/01: [KERNEL32] Little fixes for FindFirstFileExW() behavior (#5592)

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=657f7287675007ac9f08a… commit 657f7287675007ac9f08ad6a0835d926138f95c0 Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Sun Aug 27 07:20:08 2023 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 27 02:20:08 2023 +0300 [KERNEL32] Little fixes for FindFirstFileExW() behavior (#5592) - Don't forget to release RTL_RELATIVE_NAME_U before return - Ignore lpSearchFilter correctly as on Windows Fixes 6 failures in kernel32:FindFiles test in LiveCD. --- dll/win32/kernel32/client/file/find.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dll/win32/kernel32/client/file/find.c b/dll/win32/kernel32/client/file/find.c index 0fa21ae34be..59470e8d7a3 100644 --- a/dll/win32/kernel32/client/file/find.c +++ b/dll/win32/kernel32/client/file/find.c @@ -653,6 +653,8 @@ FindFirstFileExW(IN LPCWSTR lpFileName, LPVOID lpSearchFilter, IN DWORD dwAdditionalFlags) { + UNREFERENCED_PARAMETER(lpSearchFilter); + TRACE("FindFirstFileExW(lpFileName %S)\n", lpFileName); if ((fInfoLevelId != FindExInfoStandard && fInfoLevelId != FindExInfoBasic) || @@ -692,13 +694,6 @@ FindFirstFileExW(IN LPCWSTR lpFileName, DECLSPEC_ALIGN(4) BYTE DirectoryInfo[FIND_DATA_SIZE]; DIR_INFORMATION DirInfo = { .DirInfo = &DirectoryInfo }; - /* The search filter is always unused */ - if (lpSearchFilter) - { - SetLastError(ERROR_INVALID_PARAMETER); - return INVALID_HANDLE_VALUE; - } - RtlInitUnicodeString(&FileName, lpFileName); if (FileName.Length != 0 && FileName.Buffer[FileName.Length / sizeof(WCHAR) - 1] == L'.') { @@ -735,6 +730,7 @@ FindFirstFileExW(IN LPCWSTR lpFileName, DeviceNameInfo = RtlIsDosDeviceName_U(lpFileName); if (DeviceNameInfo != 0) { + RtlReleaseRelativeName(&RelativePath); RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathBuffer); /* OK, it's really a DOS device */ @@ -798,6 +794,7 @@ FindFirstFileExW(IN LPCWSTR lpFileName, if (!NT_SUCCESS(Status)) { + RtlReleaseRelativeName(&RelativePath); RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathBuffer); /* Adjust the last error codes */ @@ -817,6 +814,7 @@ FindFirstFileExW(IN LPCWSTR lpFileName, if (FilePattern.Length == 0) { NtClose(hDirectory); + RtlReleaseRelativeName(&RelativePath); RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathBuffer); SetLastError(ERROR_FILE_NOT_FOUND); @@ -891,6 +889,7 @@ FindFirstFileExW(IN LPCWSTR lpFileName, &FilePattern, TRUE); + RtlReleaseRelativeName(&RelativePath); RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathBuffer); if (!NT_SUCCESS(Status))

1 year, 4 months

[reactos] 01/01: [KERNEL32_APITEST] FindFiles: Add tests for *Ex functions

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=017004a0ac98cfd15cb12… commit 017004a0ac98cfd15cb12c129a9a340a3b1cefb8 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Aug 27 00:48:26 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Aug 27 00:48:26 2023 +0300 [KERNEL32_APITEST] FindFiles: Add tests for *Ex functions Shows that `lpSearchFilter` pointer is being ignored on Windows. This is for @RatinCN's PR #5592. --- modules/rostests/apitests/kernel32/FindFiles.c | 67 ++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 5 deletions(-) diff --git a/modules/rostests/apitests/kernel32/FindFiles.c b/modules/rostests/apitests/kernel32/FindFiles.c index a927d0c5929..7507915a577 100644 --- a/modules/rostests/apitests/kernel32/FindFiles.c +++ b/modules/rostests/apitests/kernel32/FindFiles.c @@ -95,6 +95,28 @@ do { \ FindClose(h); \ } while (0) +#define testType3_A(lpFileName, fInfoLevelId, fSearchOp, lpSearchFilter, dwAdditionalFlags, dwInitialError, hUnexpectedHandleValue, dwExpectedError) \ +do { \ + ZeroMemory(&fd, sizeof(fd)); \ + SetLastError((dwInitialError)); \ + h = FindFirstFileExA((lpFileName), (fInfoLevelId), &fd, (fSearchOp), (lpSearchFilter), (dwAdditionalFlags)); \ + ok(h != (hUnexpectedHandleValue), "FindFirstFileExA returned 0x%p\n", h); \ + ok_err(dwExpectedError); \ + ok(fd.cFileName[0] != 0, "fd.cFileName == \"\"\n"); \ + FindClose(h); \ +} while (0) + +#define testType3_W(lpFileName, fInfoLevelId, fSearchOp, lpSearchFilter, dwAdditionalFlags, dwInitialError, hUnexpectedHandleValue, dwExpectedError) \ +do { \ + ZeroMemory(&fd, sizeof(fd)); \ + SetLastError((dwInitialError)); \ + h = FindFirstFileExW((lpFileName), (fInfoLevelId), &fd, (fSearchOp), (lpSearchFilter), (dwAdditionalFlags)); \ + ok(h != (hUnexpectedHandleValue), "FindFirstFileExW returned 0x%p\n", h); \ + ok_err(dwExpectedError); \ + ok(fd.cFileName[0] != 0, "fd.cFileName == \"\"\n"); \ + FindClose(h); \ +} while (0) + static void Test_FindFirstFileA(void) { @@ -104,7 +126,7 @@ static void Test_FindFirstFileA(void) HANDLE h; /* Save the current directory */ - GetCurrentDirectoryA(sizeof(CurrentDirectory) / sizeof(CHAR), CurrentDirectory); + GetCurrentDirectoryA(_countof(CurrentDirectory), CurrentDirectory); /*** Tests for the root directory - root directory ***/ /* Modify the current directory */ @@ -295,7 +317,7 @@ static void Test_FindFirstFileW(void) HANDLE h; /* Save the current directory */ - GetCurrentDirectoryW(sizeof(CurrentDirectory) / sizeof(WCHAR), CurrentDirectory); + GetCurrentDirectoryW(_countof(CurrentDirectory), CurrentDirectory); /*** Tests for the root directory - root directory ***/ /* Modify the current directory */ @@ -478,6 +500,39 @@ static void Test_FindFirstFileW(void) return; } +static void Test_FindFirstFileExA(void) +{ + CHAR CurrentDirectory[MAX_PATH]; + WIN32_FIND_DATAA fd; + HANDLE h; + + /* Save the current directory */ + GetCurrentDirectoryA(_countof(CurrentDirectory), CurrentDirectory); + SetCurrentDirectoryA(OSDirA); /* We expect here that OSDir is of the form: C:\OSDir */ + + testType3_A(".", FindExInfoStandard, FindExSearchNameMatch, NULL, 0, 0xdeadbeef, INVALID_HANDLE_VALUE, 0xdeadbeef); + testType3_A(".", FindExInfoStandard, FindExSearchNameMatch, "XXX", 0, 0xdeadbeef, INVALID_HANDLE_VALUE, 0xdeadbeef); + + /* Restore the old current directory */ + SetCurrentDirectoryA(CurrentDirectory); +} + +static void Test_FindFirstFileExW(void) +{ + WCHAR CurrentDirectory[MAX_PATH]; + WIN32_FIND_DATAW fd; + HANDLE h; + + /* Save the current directory */ + GetCurrentDirectoryW(_countof(CurrentDirectory), CurrentDirectory); + SetCurrentDirectoryW(OSDirW); /* We expect here that OSDir is of the form: C:\OSDir */ + + testType3_W(L".", FindExInfoStandard, FindExSearchNameMatch, NULL, 0, 0xdeadbeef, INVALID_HANDLE_VALUE, 0xdeadbeef); + testType3_W(L".", FindExInfoStandard, FindExSearchNameMatch, L"XXX", 0, 0xdeadbeef, INVALID_HANDLE_VALUE, 0xdeadbeef); + + /* Restore the old current directory */ + SetCurrentDirectoryW(CurrentDirectory); +} static int init(void) { @@ -485,7 +540,7 @@ static int init(void) size_t i; myARGC = winetest_get_mainargs(&myARGV); - if (!GetCurrentDirectoryA(sizeof(baseA)/sizeof(baseA[0]), baseA)) return 0; + if (!GetCurrentDirectoryA(_countof(baseA), baseA)) return 0; strcpy(selfnameA, myARGV[0]); /* Strip the path of selfname */ @@ -497,7 +552,7 @@ static int init(void) if ((p = strrchr(exenameA, '/')) != NULL) exenameA = p + 1; - if (!GetWindowsDirectoryA(OSDirA, sizeof(OSDirA)/sizeof(OSDirA[0]))) return 0; + if (!GetWindowsDirectoryA(OSDirA, _countof(OSDirA))) return 0; /* Quick-and-dirty conversion ANSI --> UNICODE without the Win32 APIs */ for (i = 0 ; i <= strlen(baseA) ; ++i) @@ -519,10 +574,12 @@ static int init(void) START_TEST(FindFiles) { - int b = init(); + int b = init(); ok(b, "Basic init of FindFiles test\n"); if (!b) return; Test_FindFirstFileA(); Test_FindFirstFileW(); + Test_FindFirstFileExA(); + Test_FindFirstFileExW(); }

1 year, 4 months

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST][SDK] Implement SHGetPerScreenResName (#5616)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32669f6caa0ac0ea8674b… commit 32669f6caa0ac0ea8674bbe92be038fb4381a885 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 26 16:46:51 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 26 16:46:51 2023 +0900 [SHLWAPI][SHLWAPI_APITEST][SDK] Implement SHGetPerScreenResName (#5616) CORE-9283 --- dll/win32/shlwapi/propbag.cpp | 22 ++++++++++++++++++++++ dll/win32/shlwapi/shlwapi.spec | 2 +- .../rostests/apitests/shlwapi/SHPropertyBag.cpp | 16 +++++++++++++++- sdk/include/reactos/shlwapi_undoc.h | 8 +++++--- 4 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index 9faa250cd07..a1cbe199e6c 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -13,6 +13,7 @@ #include <atlsimpcoll.h> // for CSimpleMap #include <atlcomcli.h> // for CComVariant #include <atlconv.h> // for CA2W and CW2A +#include <strsafe.h> // for StringC... functions WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -1806,3 +1807,24 @@ EXTERN_C VOID FreeViewStatePropertyBagCache(VOID) g_pCachedBag.Release(); ::LeaveCriticalSection(&g_csBagCacheLock); } + +/************************************************************************** + * SHGetPerScreenResName (SHLWAPI.533) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/get… + */ +INT WINAPI +SHGetPerScreenResName( + _Out_writes_(cchBuffer) LPWSTR pszBuffer, + _In_ INT cchBuffer, + _In_ DWORD dwReserved) +{ + if (dwReserved) + return 0; + + INT cxWidth = ::GetSystemMetrics(SM_CXFULLSCREEN); + INT cyHeight = ::GetSystemMetrics(SM_CYFULLSCREEN); + INT cMonitors = ::GetSystemMetrics(SM_CMONITORS); + StringCchPrintfW(pszBuffer, cchBuffer, L"%dx%d(%d)", cxWidth, cyHeight, cMonitors); + return lstrlenW(pszBuffer); +} diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 434fb246046..35f1844bf91 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -530,7 +530,7 @@ 530 stdcall -noname SHPropertyBag_WriteInt(ptr wstr long) SHPropertyBag_WriteLONG 531 stdcall -noname SHPropertyBag_ReadStream(ptr wstr ptr) 532 stdcall -noname SHPropertyBag_WriteStream(ptr wstr ptr) -533 stub -noname SHGetPerScreenResName +533 stdcall -noname SHGetPerScreenResName(ptr long long) 534 stdcall -noname SHPropertyBag_ReadBOOL(ptr wstr ptr) 535 stdcall -noname SHPropertyBag_Delete(ptr wstr) 536 stdcall -stub -noname IUnknown_QueryServicePropertyBag(ptr long ptr ptr) diff --git a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp index 57ec8881006..eae457b698e 100644 --- a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -11,6 +11,7 @@ #include <stdio.h> #include <shlwapi_undoc.h> #include <versionhelpers.h> +#include <strsafe.h> #include <pseh/pseh2.h> @@ -688,7 +689,7 @@ static void SHPropertyBag_SHSetIniStringW(void) DeleteFileW(szIniFile); } -void SHPropertyBag_OnIniFile(void) +static void SHPropertyBag_OnIniFile(void) { WCHAR szIniFile[MAX_PATH], szValue[MAX_PATH]; HRESULT hr; @@ -823,6 +824,18 @@ void SHPropertyBag_OnIniFile(void) DeleteFileW(szIniFile); } +static void SHPropertyBag_PerScreenRes(void) +{ + WCHAR szBuff1[64], szBuff2[64]; + StringCchPrintfW(szBuff1, _countof(szBuff1), L"%dx%d(%d)", + GetSystemMetrics(SM_CXFULLSCREEN), GetSystemMetrics(SM_CYFULLSCREEN), + GetSystemMetrics(SM_CMONITORS)); + + szBuff2[0] = UNICODE_NULL; + SHGetPerScreenResName(szBuff2, _countof(szBuff2), 0); + ok_wstr(szBuff1, szBuff2); +} + START_TEST(SHPropertyBag) { SHPropertyBag_ReadTest(); @@ -831,4 +844,5 @@ START_TEST(SHPropertyBag) SHPropertyBag_OnRegKey(); SHPropertyBag_SHSetIniStringW(); SHPropertyBag_OnIniFile(); + SHPropertyBag_PerScreenRes(); } diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 37363db934b..d7f3790d897 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -108,9 +108,11 @@ HRESULT WINAPI SHPropertyBag_ReadRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, R HRESULT WINAPI SHPropertyBag_ReadGUID(IPropertyBag *ppb, LPCWSTR pszPropName, GUID *pguid); HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag *ppb, LPCWSTR pszPropName, IStream **ppStream); -HRESULT WINAPI SHGetPerScreenResName(OUT LPWSTR lpResName, - IN INT cchResName, - IN DWORD dwReserved); +INT WINAPI +SHGetPerScreenResName( + _Out_writes_(cchBuffer) LPWSTR pszBuffer, + _In_ INT cchBuffer, + _In_ DWORD dwReserved); HRESULT WINAPI SHPropertyBag_Delete(IPropertyBag *ppb, LPCWSTR pszPropName); HRESULT WINAPI SHPropertyBag_WriteBOOL(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL bValue);

1 year, 4 months

[reactos] 01/01: [ADVAPI32] Implement AccessCheckByType and AccessCheckByTypeResultList

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=33e6490532bd4d6428868… commit 33e6490532bd4d6428868f08e0d89ebcca1a65ab Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Thu Aug 24 13:01:55 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri Aug 25 14:09:14 2023 +0200 [ADVAPI32] Implement AccessCheckByType and AccessCheckByTypeResultList --- dll/win32/advapi32/advapi32.spec | 2 +- dll/win32/advapi32/wine/security.c | 237 ++++++++++++++++++++++++++++++++++--- sdk/include/psdk/winbase.h | 32 ++++- 3 files changed, 252 insertions(+), 19 deletions(-) diff --git a/dll/win32/advapi32/advapi32.spec b/dll/win32/advapi32/advapi32.spec index 7394948e011..3a02c1362ab 100644 --- a/dll/win32/advapi32/advapi32.spec +++ b/dll/win32/advapi32/advapi32.spec @@ -10,7 +10,7 @@ @ stdcall AccessCheckByType(ptr ptr long long ptr long ptr ptr ptr ptr ptr) @ stdcall AccessCheckByTypeAndAuditAlarmA(str ptr str str ptr ptr long long long ptr long ptr long ptr ptr ptr) @ stdcall AccessCheckByTypeAndAuditAlarmW(wstr ptr wstr wstr ptr ptr long long long ptr long ptr long ptr ptr ptr) -@ stub AccessCheckByTypeResultList +@ stdcall AccessCheckByTypeResultList(ptr ptr long long ptr long ptr ptr ptr ptr ptr) @ stdcall AccessCheckByTypeResultListAndAuditAlarmA(str ptr str str ptr long long long long ptr long ptr long ptr ptr ptr) @ stdcall AccessCheckByTypeResultListAndAuditAlarmByHandleA(str ptr ptr str str ptr long long long long ptr long ptr long ptr ptr ptr) @ stdcall AccessCheckByTypeResultListAndAuditAlarmByHandleW(wstr ptr ptr wstr wstr ptr long long long long ptr long ptr long ptr ptr ptr) diff --git a/dll/win32/advapi32/wine/security.c b/dll/win32/advapi32/wine/security.c index 88f122d6d97..5a86b4d65c6 100644 --- a/dll/win32/advapi32/wine/security.c +++ b/dll/win32/advapi32/wine/security.c @@ -1696,27 +1696,230 @@ AccessCheck(IN PSECURITY_DESCRIPTOR pSecurityDescriptor, return TRUE; } -/* - * @unimplemented +/** + * @brief + * Determines whether security access can be granted to a client + * that requests such access on the object type list. The access + * is either granted or denied for the whole object hierarchy + * in the list. + * + * @param[in] pSecurityDescriptor + * A pointer to a security descriptor that identifies the security + * information of an object being accessed. This function walks + * through this descriptor for any ACLs and respective access + * rights if access can be granted. + * + * @param[in] PrincipalSelfSid + * A pointer to a principal self SID. This parameter can be NULL if + * the associated object being checked for access does not represent + * a principal. + * + * @param[in] ClientToken + * A handle to an access token, that identifies the client of which + * requests access to the target object. + * + * @param[in] DesiredAccess + * The access right bitmask where the client wants to acquire. This + * can be an OR'ed set of multiple access rights or MAXIMUM_ALLOWED + * to request all of possible access rights the target object allows. + * If only some rights were granted but not all the access is deemed + * as denied. + * + * @param[in] ObjectTypeList + * A pointer to a given object type list. If this parameter is not NULL + * the function will perform an access check against the main object + * and sub-objects of this list. If this parameter is NULL and + * ObjectTypeListLength is 0, the function will perform a normal + * access check instead. + * + * @param[in] ObjectTypeListLength + * The length of the object type list array, pointed by ObjectTypeList. + * This length in question represents the number of elements in such array. + * This parameter must be 0 if no array list is provided. + * + * @param[in] GenericMapping + * The generic mapping of access rights of an object type. + * + * @param[out] PrivilegeSet + * A pointer to a set of privileges that were used to perform the + * access check, returned to caller. This function will return no + * privileges (privilege count set to 0) if no privileges were used + * to accomplish the access check. This parameter must not be NULL! + * + * @param[in,out] PrivilegeSetLength + * The total length size of a set of privileges. This length represents + * the count of elements in the privilege set array. + * + * @param[out] GrantedAccess + * A pointer to granted access rights, returned to the caller. + * + * @param[out] AccessStatus + * A pointer to a boolean value that indicates whether access is granted + * or denied to the client that requests access to the entire hierarchy + * of an object type list. If ObjectTypeList is NULL, this value represents + * the access that is granted or denied to the target object, just like + * in AccessCheck. + * + * @return + * The function returns TRUE if the access check operation has completed + * successfully, otherwise it returns FALSE. + */ +BOOL +WINAPI +AccessCheckByType( + _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor, + _In_opt_ PSID PrincipalSelfSid, + _In_ HANDLE ClientToken, + _In_ DWORD DesiredAccess, + _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ DWORD ObjectTypeListLength, + _In_ PGENERIC_MAPPING GenericMapping, + _Out_writes_bytes_(*PrivilegeSetLength) PPRIVILEGE_SET PrivilegeSet, + _Inout_ LPDWORD PrivilegeSetLength, + _Out_ LPDWORD GrantedAccess, + _Out_ LPBOOL AccessStatus) +{ + NTSTATUS Status; + NTSTATUS NtAccessStatus; + + Status = NtAccessCheckByType(pSecurityDescriptor, + PrincipalSelfSid, + ClientToken, + DesiredAccess, + ObjectTypeList, + ObjectTypeListLength, + GenericMapping, + PrivilegeSet, + PrivilegeSetLength, + (PACCESS_MASK)GrantedAccess, + &NtAccessStatus); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + if (!NT_SUCCESS(NtAccessStatus)) + { + SetLastError(RtlNtStatusToDosError(NtAccessStatus)); + *AccessStatus = FALSE; + } + else + { + *AccessStatus = TRUE; + } + + return TRUE; +} + +/** + * @brief + * Determines whether security access can be granted to a client + * that requests such access on the object type list. Unlike the + * AccessCheckByType variant, this function will grant or deny + * access to each individual object and sub-object in the list. + * + * @param[in] pSecurityDescriptor + * A pointer to a security descriptor that identifies the security + * information of an object being accessed. This function walks + * through this descriptor for any ACLs and respective access + * rights if access can be granted. + * + * @param[in] PrincipalSelfSid + * A pointer to a principal self SID. This parameter can be NULL if + * the associated object being checked for access does not represent + * a principal. + * + * @param[in] ClientToken + * A handle to an access token, that identifies the client of which + * requests access to the target object. + * + * @param[in] DesiredAccess + * The access right bitmask where the client wants to acquire. This + * can be an OR'ed set of multiple access rights or MAXIMUM_ALLOWED + * to request all of possible access rights the target object allows. + * If only some rights were granted but not all the access is deemed + * as denied. + * + * @param[in] ObjectTypeList + * A pointer to a given object type list. This function will perform an + * access check against the main object and sub-objects of this list. + * This parameter must not be NULL! + * + * @param[in] ObjectTypeListLength + * The length of the object type list array, pointed by ObjectTypeList. + * This length in question represents the number of elements in such array. + * This parameter must be 0 if no array list is provided. + * + * @param[in] GenericMapping + * The generic mapping of access rights of an object type. + * + * @param[out] PrivilegeSet + * A pointer to a set of privileges that were used to perform the + * access check, returned to caller. This function will return no + * privileges (privilege count set to 0) if no privileges were used + * to accomplish the access check. This parameter must not be NULL! + * + * @param[in,out] PrivilegeSetLength + * The total length size of a set of privileges. This length represents + * the count of elements in the privilege set array. + * + * @param[out] GrantedAccess + * A pointer to granted access rights. This parameter is an array of granted + * rights for the object and each sub-object of an object type list. + * + * @param[out] AccessStatus + * A pointer to a boolean value that indicates whether access is granted + * or denied to the client that requests access to the object and sub-objects + * of an object type list. This parameter is an array of boolean values for the + * object and each individual sub-object of the list. + * + * @return + * The function returns TRUE if the access check operation has completed + * successfully, otherwise it returns FALSE. */ -BOOL WINAPI AccessCheckByType( - PSECURITY_DESCRIPTOR pSecurityDescriptor, - PSID PrincipalSelfSid, - HANDLE ClientToken, - DWORD DesiredAccess, - POBJECT_TYPE_LIST ObjectTypeList, - DWORD ObjectTypeListLength, - PGENERIC_MAPPING GenericMapping, - PPRIVILEGE_SET PrivilegeSet, - LPDWORD PrivilegeSetLength, - LPDWORD GrantedAccess, - LPBOOL AccessStatus) +BOOL +WINAPI +AccessCheckByTypeResultList( + _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor, + _In_opt_ PSID PrincipalSelfSid, + _In_ HANDLE ClientToken, + _In_ DWORD DesiredAccess, + _In_reads_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ DWORD ObjectTypeListLength, + _In_ PGENERIC_MAPPING GenericMapping, + _Out_writes_bytes_(*PrivilegeSetLength) PPRIVILEGE_SET PrivilegeSet, + _Inout_ LPDWORD PrivilegeSetLength, + _Out_writes_(ObjectTypeListLength) LPDWORD GrantedAccess, + _Out_writes_(ObjectTypeListLength) LPBOOL AccessStatus) { - FIXME("stub\n"); + NTSTATUS Status; + DWORD ResultListIndex; + PNTSTATUS NtAccessStatus = NULL; + + Status = NtAccessCheckByTypeResultList(pSecurityDescriptor, + PrincipalSelfSid, + ClientToken, + DesiredAccess, + ObjectTypeList, + ObjectTypeListLength, + GenericMapping, + PrivilegeSet, + PrivilegeSetLength, + (PACCESS_MASK)GrantedAccess, + NtAccessStatus); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } - *AccessStatus = TRUE; + for (ResultListIndex = 0; ResultListIndex < ObjectTypeListLength; ResultListIndex++) + { + AccessStatus[ResultListIndex] = RtlNtStatusToDosError(NtAccessStatus[ResultListIndex]); + } - return !*AccessStatus; + return TRUE; } /* diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index de0cf891c67..4872e40d98b 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -1545,7 +1545,37 @@ void WINAPI AddRefActCtx(_Inout_ HANDLE); _Ret_maybenull_ PVOID WINAPI AddVectoredExceptionHandler(_In_ ULONG, _In_ PVECTORED_EXCEPTION_HANDLER); _Ret_maybenull_ PVOID WINAPI AddVectoredContinueHandler(_In_ ULONG, _In_ PVECTORED_EXCEPTION_HANDLER); #endif -BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); + +BOOL +WINAPI +AccessCheckByType( + _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor, + _In_opt_ PSID PrincipalSelfSid, + _In_ HANDLE ClientToken, + _In_ DWORD DesiredAccess, + _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ DWORD ObjectTypeListLength, + _In_ PGENERIC_MAPPING GenericMapping, + _Out_writes_bytes_(*PrivilegeSetLength)PPRIVILEGE_SET PrivilegeSet, + _Inout_ LPDWORD PrivilegeSetLength, + _Out_ LPDWORD GrantedAccess, + _Out_ LPBOOL AccessStatus); + +BOOL +WINAPI +AccessCheckByTypeResultList( + _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor, + _In_opt_ PSID PrincipalSelfSid, + _In_ HANDLE ClientToken, + _In_ DWORD DesiredAccess, + _In_reads_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ DWORD ObjectTypeListLength, + _In_ PGENERIC_MAPPING GenericMapping, + _Out_writes_bytes_(*PrivilegeSetLength) PPRIVILEGE_SET PrivilegeSet, + _Inout_ LPDWORD PrivilegeSetLength, + _Out_writes_(ObjectTypeListLength) LPDWORD GrantedAccess, + _Out_writes_(ObjectTypeListLength) LPBOOL AccessStatus); + BOOL WINAPI AdjustTokenGroups(HANDLE,BOOL,PTOKEN_GROUPS,DWORD,PTOKEN_GROUPS,PDWORD); BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); BOOL WINAPI AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID*);

1 year, 4 months

[reactos] 01/01: [SHLWAPI] Implement SHGetViewStatePropertyBag Part 2 (#5610)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3e6ae2e8a82a94b0d998… commit a3e6ae2e8a82a94b0d9984463621c20c5b4dab26 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 25 07:57:22 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 25 07:57:22 2023 +0900 [SHLWAPI] Implement SHGetViewStatePropertyBag Part 2 (#5610) CORE-9283 --- dll/win32/shlwapi/propbag.cpp | 321 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 299 insertions(+), 22 deletions(-) diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index 3a937019a51..9faa250cd07 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -130,7 +130,7 @@ protected: ATL::CSimpleMap<ATL::CStringW, ATL::CComVariant, CPropMapEqual> m_PropMap; public: - CMemPropertyBag(DWORD dwFlags) : CBasePropertyBag(dwFlags) { } + CMemPropertyBag(DWORD dwMode) : CBasePropertyBag(dwMode) { } STDMETHODIMP Read(_In_z_ LPCWSTR pszPropName, _Inout_ VARIANT *pvari, _Inout_opt_ IErrorLog *pErrorLog) override; @@ -1007,7 +1007,7 @@ protected: IStream* _NewStreamFromOld(IStream *pOldStream); public: - CDesktopUpgradePropertyBag() : CBasePropertyBag(0) { } + CDesktopUpgradePropertyBag() : CBasePropertyBag(STGM_READ) { } STDMETHODIMP Read( _In_z_ LPCWSTR pszPropName, @@ -1174,7 +1174,7 @@ CDesktopUpgradePropertyBag::Read( } /************************************************************************** - * SHGetDesktopUpgradePropertyBag (Not exported; used in CViewStatePropertyBag) + * SHGetDesktopUpgradePropertyBag (Internal) * * Creates or gets a property bag object for desktop upgrade * @@ -1223,11 +1223,13 @@ protected: HKEY _GetHKey(DWORD dwVspbFlags); + HRESULT _GetMRUSlot(LPCITEMIDLIST pidl, DWORD dwMode, HKEY hKey, UINT *pSlot); + HRESULT _GetRegKey( LPCITEMIDLIST pidl, LPCWSTR pszBagName, DWORD dwFlags, - char unknown, + DWORD dwMode, HKEY hKey, LPWSTR pszDest, INT cchDest); @@ -1238,14 +1240,28 @@ protected: DWORD dwVspbFlags, DWORD dwMode, REFIID riid, - void **ppvObj); + IPropertyBag **pppb); + + HRESULT _FindNearestInheritBag(REFIID riid, IPropertyBag **pppb); void _ResetTryAgainFlag(); + BOOL _EnsureReadBag(DWORD dwMode, REFIID riid); + BOOL _EnsurePidlBag(DWORD dwMode, REFIID riid); + BOOL _EnsureInheritBag(DWORD dwMode, REFIID riid); + BOOL _EnsureUpgradeBag(DWORD dwMode, REFIID riid); + BOOL _EnsureUserDefaultsBag(DWORD dwMode, REFIID riid); + BOOL _EnsureFolderDefaultsBag(DWORD dwMode, REFIID riid); + BOOL _EnsureGlobalDefaultsBag(DWORD dwMode, REFIID riid); + HRESULT _ReadPidlBag(LPCWSTR pszPropName, VARIANT *pvari, IErrorLog *pErrorLog); + HRESULT _ReadInheritBag(LPCWSTR pszPropName, VARIANT *pvari, IErrorLog *pErrorLog); + HRESULT _ReadUpgradeBag(LPCWSTR pszPropName, VARIANT *pvari, IErrorLog *pErrorLog); + HRESULT _ReadUserDefaultsBag(LPCWSTR pszPropName, VARIANT *pvari, IErrorLog *pErrorLog); + HRESULT _ReadFolderDefaultsBag(LPCWSTR pszPropName, VARIANT *pvari, IErrorLog *pErrorLog); + HRESULT _ReadGlobalDefaultsBag(LPCWSTR pszPropName, VARIANT *pvari, IErrorLog *pErrorLog); + public: - CViewStatePropertyBag() : CBasePropertyBag(0) - { - } + CViewStatePropertyBag() : CBasePropertyBag(STGM_READ) { } ~CViewStatePropertyBag() override { @@ -1396,17 +1412,63 @@ HKEY CViewStatePropertyBag::_GetHKey(DWORD dwVspbFlags) return SHGetShellKey(SHKEY_Key_ShellNoRoam | SHKEY_Root_HKCU, NULL, TRUE); } -HRESULT CViewStatePropertyBag::_GetRegKey( +HRESULT +CViewStatePropertyBag::_GetMRUSlot(LPCITEMIDLIST pidl, DWORD dwMode, HKEY hKey, UINT *pSlot) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +HRESULT +CViewStatePropertyBag::_GetRegKey( LPCITEMIDLIST pidl, LPCWSTR pszBagName, DWORD dwFlags, - char unknown, + DWORD dwMode, HKEY hKey, LPWSTR pszDest, INT cchDest) { - FIXME("Stub\n"); - return E_NOTIMPL; + HRESULT hr = S_OK; + UINT nSlot; + + if (dwFlags & (SHGVSPB_INHERIT | SHGVSPB_PERFOLDER)) + { + hr = _GetMRUSlot(pidl, dwMode, hKey, &nSlot); + if (SUCCEEDED(hr)) + { + if (dwFlags & SHGVSPB_INHERIT) + wnsprintfW(pszDest, cchDest, L"Bags\\%d\\%s\\Inherit", nSlot, pszBagName); + else + wnsprintfW(pszDest, cchDest, L"Bags\\%d\\%s", nSlot, pszBagName); + } + } + else + { + wnsprintfW(pszDest, cchDest, L"Bags\\AllFolders\\%s", pszBagName); + } + + return hr; +} + +static HRESULT BindCtx_CreateWithMode(DWORD dwMode, IBindCtx **ppbc) +{ + HRESULT hr = ::CreateBindCtx(0, ppbc); + if (FAILED(hr)) + return hr; + + IBindCtx *pbc = *ppbc; + + BIND_OPTS opts = { sizeof(opts) }; + opts.grfMode = dwMode; + hr = pbc->SetBindOptions(&opts); + if (FAILED(hr)) + { + pbc->Release(); + *ppbc = NULL; + } + + return hr; } HRESULT @@ -1416,20 +1478,235 @@ CViewStatePropertyBag::_CreateBag( DWORD dwVspbFlags, DWORD dwMode, REFIID riid, - void **ppvObj) + IPropertyBag **pppb) +{ + HRESULT hr; + HKEY hKey; + CComPtr<IBindCtx> pBC; + CComPtr<IShellFolder> psf; + WCHAR szBuff[64]; + + if ((dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) != STGM_READ) + dwMode |= STGM_CREATE; + + if ((dwVspbFlags & SHGVSPB_ALLUSERS) && (dwVspbFlags & SHGVSPB_PERFOLDER)) + { + hr = BindCtx_CreateWithMode(dwMode, &pBC); + if (SUCCEEDED(hr)) + { + hr = SHGetDesktopFolder(&psf); + if (SUCCEEDED(hr)) + { + hr = psf->BindToObject(m_pidl, pBC, riid, (void **)pppb); + if (SUCCEEDED(hr) && !*pppb) + hr = E_FAIL; + } + } + } + else + { + hKey = _GetHKey(dwVspbFlags); + if (!hKey) + return E_FAIL; + + hr = _GetRegKey(pidl, pszPath, dwVspbFlags, dwMode, hKey, szBuff, _countof(szBuff)); + if (SUCCEEDED(hr)) + hr = SHCreatePropertyBagOnRegKey(hKey, szBuff, dwMode, riid, (void**)pppb); + + ::RegCloseKey(hKey); + } + + return hr; +} + +HRESULT +CViewStatePropertyBag::_FindNearestInheritBag(REFIID riid, IPropertyBag **pppb) { FIXME("Stub\n"); return E_NOTIMPL; } +BOOL CViewStatePropertyBag::_EnsureReadBag(DWORD dwMode, REFIID riid) +{ + if (!m_pReadBag && !m_bReadBag) + { + m_bReadBag = TRUE; + _CreateBag(m_pidl, m_pszPath, m_dwVspbFlags, dwMode, riid, &m_pReadBag); + } + return (m_pReadBag != NULL); +} + +BOOL CViewStatePropertyBag::_EnsurePidlBag(DWORD dwMode, REFIID riid) +{ + if (!m_pPidlBag && !m_bPidlBag && _CanAccessPidlBag()) + { + m_bPidlBag = TRUE; + _CreateBag(m_pidl, m_pszPath, SHGVSPB_FOLDER, dwMode, riid, &m_pPidlBag); + } + return (m_pPidlBag != NULL); +} + +BOOL CViewStatePropertyBag::_EnsureInheritBag(DWORD dwMode, REFIID riid) +{ + if (!m_pInheritBag && !m_bInheritBag && _CanAccessInheritBag()) + { + m_bInheritBag = TRUE; + _FindNearestInheritBag(riid, &m_pInheritBag); + } + return (m_pInheritBag != NULL); +} + +BOOL CViewStatePropertyBag::_EnsureUpgradeBag(DWORD dwMode, REFIID riid) +{ + if (!m_pUpgradeBag && !m_bUpgradeBag && _CanAccessUpgradeBag()) + { + m_bUpgradeBag = TRUE; + SHGetDesktopUpgradePropertyBag(riid, (void**)&m_pUpgradeBag); + } + return (m_pUpgradeBag != NULL); +} + +BOOL CViewStatePropertyBag::_EnsureUserDefaultsBag(DWORD dwMode, REFIID riid) +{ + if (!m_pUserDefaultsBag && !m_bUserDefaultsBag && _CanAccessUserDefaultsBag()) + { + m_bUserDefaultsBag = TRUE; + _CreateBag(NULL, m_pszPath, SHGVSPB_USERDEFAULTS, dwMode, riid, &m_pUserDefaultsBag); + } + return (m_pUserDefaultsBag != NULL); +} + +BOOL CViewStatePropertyBag::_EnsureFolderDefaultsBag(DWORD dwMode, REFIID riid) +{ + if (!m_pFolderDefaultsBag && !m_bFolderDefaultsBag && _CanAccessFolderDefaultsBag()) + { + m_bFolderDefaultsBag = TRUE; + if (_IsSystemFolder()) + { + _CreateBag(m_pidl, m_pszPath, SHGVSPB_PERFOLDER | SHGVSPB_ALLUSERS, + dwMode, riid, &m_pFolderDefaultsBag); + } + } + return (m_pFolderDefaultsBag != NULL); +} + +BOOL CViewStatePropertyBag::_EnsureGlobalDefaultsBag(DWORD dwMode, REFIID riid) +{ + if (!m_pGlobalDefaultsBag && !m_bGlobalDefaultsBag && _CanAccessGlobalDefaultsBag()) + { + m_bGlobalDefaultsBag = TRUE; + _CreateBag(NULL, m_pszPath, SHGVSPB_GLOBALDEAFAULTS, dwMode, riid, &m_pGlobalDefaultsBag); + } + return (m_pGlobalDefaultsBag != NULL); +} + +HRESULT +CViewStatePropertyBag::_ReadPidlBag( + LPCWSTR pszPropName, + VARIANT *pvari, + IErrorLog *pErrorLog) +{ + if (!_EnsurePidlBag(STGM_READ, IID_IPropertyBag)) + return E_FAIL; + + return m_pPidlBag->Read(pszPropName, pvari, pErrorLog); +} + +HRESULT +CViewStatePropertyBag::_ReadInheritBag( + LPCWSTR pszPropName, + VARIANT *pvari, + IErrorLog *pErrorLog) +{ + if (!_EnsureInheritBag(STGM_READ, IID_IPropertyBag)) + return E_FAIL; + + return m_pInheritBag->Read(pszPropName, pvari, pErrorLog); +} + +HRESULT +CViewStatePropertyBag::_ReadUpgradeBag( + LPCWSTR pszPropName, + VARIANT *pvari, + IErrorLog *pErrorLog) +{ + if (!_EnsureUpgradeBag(STGM_READ, IID_IPropertyBag)) + return E_FAIL; + + return m_pUpgradeBag->Read(pszPropName, pvari, pErrorLog); +} + +HRESULT +CViewStatePropertyBag::_ReadUserDefaultsBag( + LPCWSTR pszPropName, + VARIANT *pvari, + IErrorLog *pErrorLog) +{ + if (!_EnsureUserDefaultsBag(STGM_READ, IID_IPropertyBag)) + return E_FAIL; + + return m_pUserDefaultsBag->Read(pszPropName, pvari, pErrorLog); +} + +HRESULT +CViewStatePropertyBag::_ReadFolderDefaultsBag( + LPCWSTR pszPropName, + VARIANT *pvari, + IErrorLog *pErrorLog) +{ + if (!_EnsureFolderDefaultsBag(STGM_READ, IID_IPropertyBag)) + return E_FAIL; + + return m_pFolderDefaultsBag->Read(pszPropName, pvari, pErrorLog); +} + +HRESULT +CViewStatePropertyBag::_ReadGlobalDefaultsBag( + LPCWSTR pszPropName, + VARIANT *pvari, + IErrorLog *pErrorLog) +{ + if (!_EnsureGlobalDefaultsBag(STGM_READ, IID_IPropertyBag)) + return E_FAIL; + + return m_pGlobalDefaultsBag->Read(pszPropName, pvari, pErrorLog); +} + STDMETHODIMP CViewStatePropertyBag::Read( _In_z_ LPCWSTR pszPropName, _Inout_ VARIANT *pvari, _Inout_opt_ IErrorLog *pErrorLog) { - FIXME("Stub\n"); - return E_NOTIMPL; + if ((m_dwVspbFlags & SHGVSPB_NOAUTODEFAULTS) || (m_dwVspbFlags & SHGVSPB_INHERIT)) + { + if (!_EnsureReadBag(STGM_READ, IID_IPropertyBag)) + return E_FAIL; + + return m_pReadBag->Read(pszPropName, pvari, pErrorLog); + } + + HRESULT hr = _ReadPidlBag(pszPropName, pvari, pErrorLog); + if (SUCCEEDED(hr)) + return hr; + + hr = _ReadInheritBag(pszPropName, pvari, pErrorLog); + if (SUCCEEDED(hr)) + return hr; + + hr = _ReadUpgradeBag(pszPropName, pvari, pErrorLog); + if (SUCCEEDED(hr)) + return hr; + + hr = _ReadUserDefaultsBag(pszPropName, pvari, pErrorLog); + if (SUCCEEDED(hr)) + return hr; + + hr = _ReadFolderDefaultsBag(pszPropName, pvari, pErrorLog); + if (SUCCEEDED(hr)) + return hr; + + return _ReadGlobalDefaultsBag(pszPropName, pvari, pErrorLog); } static BOOL SHIsRemovableDrive(LPCITEMIDLIST pidl) @@ -1508,17 +1785,17 @@ SHGetViewStatePropertyBag( CComPtr<CViewStatePropertyBag> pBag(new CViewStatePropertyBag()); hr = pBag->Init(pidl, bag_name, flags); - if (SUCCEEDED(hr)) - { - g_pCachedBag.Attach(pBag); - - hr = g_pCachedBag->QueryInterface(riid, ppv); - } - else + if (FAILED(hr)) { ERR("0x%08X\n", hr); + ::LeaveCriticalSection(&g_csBagCacheLock); + return hr; } + g_pCachedBag.Attach(pBag); + + hr = g_pCachedBag->QueryInterface(riid, ppv); + ::LeaveCriticalSection(&g_csBagCacheLock); return hr; }

1 year, 4 months

[reactos] 01/01: [TASKMGR] Simplify status-bar display when menus are shown (#5578) CORE-19061

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdba812252d807c8aa64b… commit cdba812252d807c8aa64bc586055c03e9c39ff5a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 16 17:01:13 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 24 16:47:32 2023 +0200 [TASKMGR] Simplify status-bar display when menus are shown (#5578) CORE-19061 Following PR #5571 (commit 2d53e953c), it became apparent that the management of the status-bar when showing the menu hints could be simplified further. Use "simple-text" status-bar display mode when showing menu hints. The original status-bar panes state is "remembered" and are automatically restored when the "simple-text" mode is disabled. --- base/applications/taskmgr/perfpage.c | 10 ++-- base/applications/taskmgr/taskmgr.c | 95 +++++++++++++++--------------------- base/applications/taskmgr/taskmgr.h | 2 - 3 files changed, 43 insertions(+), 64 deletions(-) diff --git a/base/applications/taskmgr/perfpage.c b/base/applications/taskmgr/perfpage.c index 9e601041bd4..c9abb74cd15 100644 --- a/base/applications/taskmgr/perfpage.c +++ b/base/applications/taskmgr/perfpage.c @@ -8,8 +8,6 @@ #include "precomp.h" #include <shlwapi.h> -extern BOOL bInMenuLoop; /* Tells us if we are in the menu loop - from taskmgr.c */ - TM_GRAPH_CONTROL PerformancePageCpuUsageHistoryGraph; TM_GRAPH_CONTROL PerformancePageMemUsageHistoryGraph; @@ -328,6 +326,8 @@ DWORD WINAPI PerformancePageRefreshThread(PVOID Parameter) while (1) { + extern BOOL bTrackMenu; // From taskmgr.c + int nBarsUsed1; int nBarsUsed2; @@ -361,7 +361,7 @@ DWORD WINAPI PerformancePageRefreshThread(PVOID Parameter) szChargeLimitFormat, ARRAYSIZE(szChargeLimitFormat)); - if (!bInMenuLoop) + if (!bTrackMenu) { wsprintfW(Text, szMemUsage, szChargeTotalFormat, szChargeLimitFormat, (CommitChargeLimit ? ((CommitChargeTotal * 100) / CommitChargeLimit) : 0)); @@ -406,7 +406,7 @@ DWORD WINAPI PerformancePageRefreshThread(PVOID Parameter) SetWindowTextW(hTotalsThreadCountEdit, Text); _ultow(TotalProcesses, Text, 10); SetWindowTextW(hTotalsProcessCountEdit, Text); - if (!bInMenuLoop) + if (!bTrackMenu) { wsprintfW(Text, szProcesses, TotalProcesses); SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)Text); @@ -424,7 +424,7 @@ DWORD WINAPI PerformancePageRefreshThread(PVOID Parameter) CpuUsage = PerfDataGetProcessorUsage(); CpuKernelUsage = PerfDataGetProcessorSystemUsage(); - if (!bInMenuLoop) + if (!bTrackMenu) { wsprintfW(Text, szCpuUsage, CpuUsage); SendMessageW(hStatusWnd, SB_SETTEXT, 1, (LPARAM)Text); diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c index 6cbf8c7994e..bf24eef8b39 100644 --- a/base/applications/taskmgr/taskmgr.c +++ b/base/applications/taskmgr/taskmgr.c @@ -31,7 +31,7 @@ int nMinimumHeight; /* Minimum height of the dialog (OnSize()'s cy) int nOldWidth; /* Holds the previous client area width */ int nOldHeight; /* Holds the previous client area height */ -BOOL bInMenuLoop = FALSE; /* Tells us if we are in the menu loop */ +BOOL bTrackMenu = FALSE; /* Signals when we display menu hints */ BOOL bWasKeyboardInput = FALSE; /* TabChange by Keyboard or Mouse ? */ TASKMANAGER_SETTINGS TaskManagerSettings; @@ -482,24 +482,10 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) TrayIcon_UpdateIcon(); break; - case WM_INITMENUPOPUP: - /* Do not disable the status bar if we opened the system menu */ - if (!HIWORD(lParam)) - TaskManager_DisableStatusBar(hDlg); - else - TaskManager_EnableStatusBar(hDlg); - break; - case WM_ENTERMENULOOP: - bInMenuLoop = TRUE; - break; - case WM_EXITMENULOOP: - bInMenuLoop = FALSE; - TaskManager_EnableStatusBar(hDlg); - break; case WM_MENUSELECT: - if (!(HIWORD(wParam) & MF_SYSMENU)) - TaskManager_OnMenuSelect(hDlg, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam); + TaskManager_OnMenuSelect(hDlg, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam); break; + case WM_SYSCOLORCHANGE: /* Forward WM_SYSCOLORCHANGE to common controls */ SendMessage(hApplicationPageListCtrl, WM_SYSCOLORCHANGE, 0, 0); @@ -569,7 +555,7 @@ BOOL OnCreate(HWND hWnd) nParts[0] = STATUS_SIZE1; nParts[1] = STATUS_SIZE2; nParts[2] = STATUS_SIZE3; - SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM) (LPINT) nParts); + SendMessageW(hStatusWnd, SB_SETPARTS, _countof(nParts), (LPARAM)(LPINT)nParts); /* Create tab pages */ hTabWnd = GetDlgItem(hWnd, IDC_TAB); @@ -758,10 +744,8 @@ void OnSize( WPARAM nType, int cx, int cy ) if (nType == SIZE_MINIMIZED) { - if(TaskManagerSettings.HideWhenMinimized) - { - ShowWindow(hMainWnd, SW_HIDE); - } + if (TaskManagerSettings.HideWhenMinimized) + ShowWindow(hMainWnd, SW_HIDE); return; } @@ -775,10 +759,10 @@ void OnSize( WPARAM nType, int cx, int cy ) SendMessageW(hStatusWnd, WM_SIZE, nType, MAKELPARAM(cx,rc.bottom - rc.top)); /* Update the status bar pane sizes */ - nParts[0] = bInMenuLoop ? -1 : STATUS_SIZE1; + nParts[0] = STATUS_SIZE1; nParts[1] = STATUS_SIZE2; nParts[2] = cx; - SendMessageW(hStatusWnd, SB_SETPARTS, bInMenuLoop ? 1 : 3, (LPARAM) (LPINT) nParts); + SendMessageW(hStatusWnd, SB_SETPARTS, _countof(nParts), (LPARAM)(LPINT)nParts); /* Resize the tab control */ GetWindowRect(hTabWnd, &rc); @@ -896,46 +880,43 @@ void TaskManager_OnRestoreMainWindow(void) SetWindowPos(hMainWnd, (OnTop ? HWND_TOPMOST : HWND_TOP), 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW); } -void TaskManager_DisableStatusBar(HWND hWnd) -{ - int nParts; - - /* Update the status bar pane sizes */ - nParts = -1; - SendMessageW(hStatusWnd, SB_SETPARTS, 1, (LPARAM) (LPINT)&nParts); - SendMessageW(hStatusWnd, SB_SETTEXT, (WPARAM)0, (LPARAM)L""); -} - -void TaskManager_EnableStatusBar(HWND hWnd) +void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu) { - RECT rc; - int nParts[3]; + WCHAR str[100] = L""; - /* Update the status bar pane sizes */ - GetClientRect(hWnd, &rc); - nParts[0] = STATUS_SIZE1; - nParts[1] = STATUS_SIZE2; - nParts[2] = rc.right; - SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM) (LPINT) nParts); + /* + * Reset the status bar if we close the current menu, or + * we open the system menu or hover above a menu separator. + * Adapted from comctl32!MenuHelp(). + */ + if ((LOWORD(nFlags) == 0xFFFF && hSysMenu == NULL) || + (nFlags & (MF_SEPARATOR | MF_SYSMENU))) + { + /* Set the status bar for multiple-parts output */ + SendMessageW(hStatusWnd, SB_SIMPLE, (WPARAM)FALSE, (LPARAM)0); + bTrackMenu = FALSE; - /* trigger update of status bar columns and performance page asynchronously */ - RefreshPerformancePage(); -} + /* Trigger update of status bar columns and performance page asynchronously */ + RefreshPerformancePage(); + return; + } -void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu) -{ - WCHAR str[100]; - - wcscpy(str, L""); - if (LoadStringW(hInst, nItemID, str, 100)) { - /* load appropriate string */ - LPWSTR lpsz = str; - /* first newline terminates actual string */ - lpsz = wcschr(lpsz, '\n'); + /* Otherwise, retrieve the appropriate menu hint string */ + if (LoadStringW(hInst, nItemID, str, _countof(str))) + { + /* First newline terminates actual string */ + LPWSTR lpsz = wcschr(str, '\n'); if (lpsz != NULL) *lpsz = '\0'; } - SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)str); + + /* Set the status bar for single-part output, if needed... */ + if (!bTrackMenu) + SendMessageW(hStatusWnd, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0); + bTrackMenu = TRUE; + + /* ... and display the menu hint */ + SendMessageW(hStatusWnd, SB_SETTEXT, SB_SIMPLEID | SBT_NOBORDERS, (LPARAM)str); } void TaskManager_OnViewUpdateSpeed(DWORD dwSpeed) diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h index a3b6220e8b9..e65ef30221f 100644 --- a/base/applications/taskmgr/taskmgr.h +++ b/base/applications/taskmgr/taskmgr.h @@ -94,8 +94,6 @@ void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr); void LoadSettings(void); void SaveSettings(void); void TaskManager_OnRestoreMainWindow(void); -void TaskManager_DisableStatusBar(HWND hWnd); -void TaskManager_EnableStatusBar(HWND hWnd); void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu); void TaskManager_OnViewUpdateSpeed(DWORD); void TaskManager_OnTabWndSelChange(void);

1 year, 4 months

[reactos] 02/02: [NTUSER] Set correct lParam for WM_(UN)INITMENUPOPUP (#5573)

by Egor Ananyin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ae0ccdccb6566ba49ccc… commit 3ae0ccdccb6566ba49ccc803dab7733ce574f820 Author: Egor Ananyin <ananinegor(a)gmail.com> AuthorDate: Sun Aug 13 10:45:30 2023 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 24 16:33:03 2023 +0200 [NTUSER] Set correct lParam for WM_(UN)INITMENUPOPUP (#5573) This is needed to allow apps to detect whether the opened menu is a system menu or a user menu. CORE-19061 --- win32ss/user/ntuser/menu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index ebade16f1b7..869b9bb4cc4 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -58,7 +58,7 @@ BOOL fInEndMenu = FALSE; #define MII_STATE_MASK (MFS_GRAYED|MFS_CHECKED|MFS_HILITE|MFS_DEFAULT) #define IS_SYSTEM_MENU(MenuInfo) \ - (!((MenuInfo)->fFlags & MNF_POPUP) && ((MenuInfo)->fFlags & MNF_SYSMENU)) + (!!((MenuInfo)->fFlags & MNF_SYSMENU)) #define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && ((INT_PTR)(id) >= -1)) #define IS_STRING_ITEM(flags) (MF_STRING == MENU_ITEM_TYPE(flags)) @@ -3292,7 +3292,7 @@ static void FASTCALL MENU_HideSubPopups(PWND pWndOwner, PMENU Menu, if (!(wFlags & TPM_NONOTIFY)) { co_IntSendMessage( UserHMGetHandle(pWndOwner), WM_UNINITMENUPOPUP, (WPARAM)UserHMGetHandle(Item->spSubMenu), - MAKELPARAM(0, IS_SYSTEM_MENU(Item->spSubMenu)) ); + MAKELPARAM(0, IS_SYSTEM_MENU(Item->spSubMenu) ? MF_SYSMENU : 0)); } //// // Call WM_UNINITMENUPOPUP FIRST before destroy!! @@ -4362,7 +4362,7 @@ static INT FASTCALL MENU_TrackMenu(PMENU pmenu, UINT wFlags, INT x, INT y, if (!(wFlags & TPM_NONOTIFY)) { co_IntSendMessage( UserHMGetHandle(mt.OwnerWnd), WM_UNINITMENUPOPUP, (WPARAM)UserHMGetHandle(mt.TopMenu), - MAKELPARAM(0, IS_SYSTEM_MENU(mt.TopMenu)) ); + MAKELPARAM(0, IS_SYSTEM_MENU(mt.TopMenu) ? MF_SYSMENU : 0)); } } MENU_SelectItem( mt.OwnerWnd, mt.TopMenu, NO_SELECTED_ITEM, FALSE, 0 ); @@ -4585,7 +4585,7 @@ BOOL WINAPI IntTrackPopupMenuEx( PMENU menu, UINT wFlags, int x, int y, /* Send WM_INITMENUPOPUP message only if TPM_NONOTIFY flag is not specified */ if (!(wFlags & TPM_NONOTIFY)) { - co_IntSendMessage( UserHMGetHandle(pWnd), WM_INITMENUPOPUP, (WPARAM) UserHMGetHandle(menu), 0); + co_IntSendMessage( UserHMGetHandle(pWnd), WM_INITMENUPOPUP, (WPARAM) UserHMGetHandle(menu), MAKELPARAM(0, IS_SYSTEM_MENU(menu))); } if (menu->fFlags & MNF_SYSMENU) @@ -4615,7 +4615,7 @@ BOOL WINAPI IntTrackPopupMenuEx( PMENU menu, UINT wFlags, int x, int y, if (!(wFlags & TPM_NONOTIFY)) { co_IntSendMessage( UserHMGetHandle(pWnd), WM_UNINITMENUPOPUP, (WPARAM)UserHMGetHandle(menu), - MAKELPARAM(0, IS_SYSTEM_MENU(menu)) ); + MAKELPARAM(0, IS_SYSTEM_MENU(menu) ? MF_SYSMENU : 0)); } } }

1 year, 4 months

[reactos] 01/02: [USER32_APITEST] Add a test for system menu messages (#5573)

by Egor Ananyin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26ffe2f826c9c3e98023d… commit 26ffe2f826c9c3e98023d3274fa681d2f66c988b Author: Egor Ananyin <ananinegor(a)gmail.com> AuthorDate: Sat Aug 19 10:13:43 2023 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 24 16:33:03 2023 +0200 [USER32_APITEST] Add a test for system menu messages (#5573) Based on msg.c Wine test. CORE-19061 --- modules/rostests/apitests/user32/CMakeLists.txt | 1 + modules/rostests/apitests/user32/SystemMenu.c | 777 ++++++++++++++++++++++++ modules/rostests/apitests/user32/testlist.c | 2 + 3 files changed, 780 insertions(+) diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index 4ab323f327c..4ecc693f1ed 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -50,6 +50,7 @@ list(APPEND SOURCE SetScrollRange.c ShowWindow.c SwitchToThisWindow.c + SystemMenu.c SystemParametersInfo.c TrackMouseEvent.c VirtualKey.c diff --git a/modules/rostests/apitests/user32/SystemMenu.c b/modules/rostests/apitests/user32/SystemMenu.c new file mode 100644 index 00000000000..8d07ccf3bf5 --- /dev/null +++ b/modules/rostests/apitests/user32/SystemMenu.c @@ -0,0 +1,777 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Tests for system menu messages, based on msg.c Wine test + * COPYRIGHT: Copyright 1999 Ove Kaaven <ovek(a)transgaming.com> + * Copyright 2003 Dimitrie O. Paun <dimi(a)lattica.com> + * Copyright 2004-2005, 2016 Dmitry Timoshkov <dmitry(a)baikal.ru> + * Copyright 2023 Egor Ananyin <ananinegor(a)gmail.com> + */ + +#include "precomp.h" + +#define WND_PARENT_ID 1 +#define WND_POPUP_ID 2 + +static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); +static BOOL (WINAPI *pQueryActCtxW)(DWORD, HANDLE, void *, ULONG, void *, SIZE_T, SIZE_T *); + +static BOOL test_DestroyWindow_flag; +static HWINEVENTHOOK hEvent_hook; +static HHOOK hKBD_hook; +static HHOOK hCBT_hook; +static DWORD cbt_hook_thread_id; + +typedef enum +{ + sent = 0x1, + posted = 0x2, + parent = 0x4, + wparam = 0x8, + lparam = 0x10, + defwinproc = 0x20, + beginpaint = 0x40, + optional = 0x80, + hook = 0x100, + winevent_hook = 0x200, + kbd_hook = 0x400 +} msg_flags_t; + +struct message +{ + UINT message; /* the WM_* code */ + msg_flags_t flags; /* message props */ + WPARAM wParam; /* expected value of wParam */ + LPARAM lParam; /* expected value of lParam */ + WPARAM wp_mask; /* mask for wParam checks */ + LPARAM lp_mask; /* mask for lParam checks */ +}; + +struct recvd_message +{ + UINT message; /* the WM_* code */ + msg_flags_t flags; /* message props */ + HWND hwnd; /* window that received the message */ + WPARAM wParam; /* expected value of wParam */ + LPARAM lParam; /* expected value of lParam */ + int line; /* source line where logged */ + const char *descr; /* description for trace output */ + char output[512]; /* trace output */ +}; + +static int sequence_cnt, sequence_size; +static struct recvd_message* sequence; +static CRITICAL_SECTION sequence_cs; + +/* user32 functions */ +static HWND (WINAPI *pGetAncestor)(HWND, UINT); +static BOOL (WINAPI *pUnhookWinEvent)(HWINEVENTHOOK); + +static void init_procs(void) +{ + HMODULE user32 = GetModuleHandleA("user32.dll"); + +#define GET_PROC(dll, func) \ + p ## func = (void*)GetProcAddress(dll, #func); \ + if (!p ## func) { \ + trace("GetProcAddress(%s) failed\n", #func); \ + } + + GET_PROC(user32, GetAncestor) + GET_PROC(user32, UnhookWinEvent) + +#undef GET_PROC +} + +static BOOL ignore_message(UINT message) +{ + /* these are always ignored */ + return (message >= 0xc000 || + message == WM_GETICON || + message == WM_GETOBJECT || + message == WM_TIMECHANGE || + message == WM_DISPLAYCHANGE || + message == WM_DEVICECHANGE || + message == WM_DWMNCRENDERINGCHANGED); +} + +#define add_message(msg) add_message_(__LINE__, msg); +static void add_message_(int line, const struct recvd_message *msg) +{ + struct recvd_message *seq; + + EnterCriticalSection(&sequence_cs); + if (!sequence) + { + sequence_size = 10; + sequence = HeapAlloc(GetProcessHeap(), 0, sequence_size * sizeof(*sequence)); + } + if (sequence_cnt == sequence_size) + { + sequence_size *= 2; + sequence = HeapReAlloc(GetProcessHeap(), 0, sequence, sequence_size * sizeof(*sequence)); + } + assert(sequence); + + seq = &sequence[sequence_cnt++]; + seq->hwnd = msg->hwnd; + seq->message = msg->message; + seq->flags = msg->flags; + seq->wParam = msg->wParam; + seq->lParam = msg->lParam; + seq->line = line; + seq->descr = msg->descr; + seq->output[0] = 0; + LeaveCriticalSection(&sequence_cs); + + if (msg->descr) + { + if (msg->flags & hook) + { + static const char * const CBT_code_name[10] = + { + "HCBT_MOVESIZE", + "HCBT_MINMAX", + "HCBT_QS", + "HCBT_CREATEWND", + "HCBT_DESTROYWND", + "HCBT_ACTIVATE", + "HCBT_CLICKSKIPPED", + "HCBT_KEYSKIPPED", + "HCBT_SYSCOMMAND", + "HCBT_SETFOCUS" + }; + const char *code_name = (msg->message <= HCBT_SETFOCUS ? CBT_code_name[msg->message] : "Unknown"); + + sprintf(seq->output, "%s: hook %d (%s) wp %08Ix lp %08Ix", + msg->descr, msg->message, code_name, msg->wParam, msg->lParam); + } + else if (msg->flags & winevent_hook) + { + sprintf(seq->output, "%s: winevent %p %08x %08Ix %08Ix", + msg->descr, msg->hwnd, msg->message, msg->wParam, msg->lParam); + } + else + { + if (msg->message >= 0xc000) + return; /* ignore registered messages */ + sprintf(seq->output, "%s: %p %04x wp %08Ix lp %08Ix", + msg->descr, msg->hwnd, msg->message, msg->wParam, msg->lParam); + if (msg->flags & (sent | posted | parent | defwinproc | beginpaint)) + sprintf(seq->output + strlen(seq->output), " (flags %x)", msg->flags); + } + } +} + +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + +static void flush_sequence(void) +{ + EnterCriticalSection(&sequence_cs); + HeapFree(GetProcessHeap(), 0, sequence); + sequence = 0; + sequence_cnt = sequence_size = 0; + LeaveCriticalSection(&sequence_cs); +} + +static void dump_sequence(const struct message *expected, const char *context, const char *file, int line) +{ + const struct recvd_message *actual = sequence; + unsigned int count = 0; + + trace_(file, line)("Failed sequence %s:\n", context); + + while (expected->message && actual->message) + { + if (actual->output[0]) + { + if (expected->flags & hook) + { + trace_(file, line)(" %u: expected: hook %04x - actual: %s\n", + count, expected->message, actual->output); + } + else if (expected->flags & winevent_hook) + { + trace_(file, line)(" %u: expected: winevent %04x - actual: %s\n", + count, expected->message, actual->output); + } + else if (expected->flags & kbd_hook) + { + trace_(file, line)(" %u: expected: kbd %04x - actual: %s\n", + count, expected->message, actual->output); + } + else + { + trace_(file, line)(" %u: expected: msg %04x - actual: %s\n", + count, expected->message, actual->output); + } + } + + if (expected->message == actual->message) + { + if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && + (expected->flags & optional)) + { + /* don't match messages if their defwinproc status differs */ + expected++; + } + else + { + expected++; + actual++; + } + } + /* silently drop winevent messages if there is no support for them */ + else if ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hEvent_hook)) + expected++; + else + { + expected++; + actual++; + } + + count++; + } + + /* optional trailing messages */ + while (expected->message && ((expected->flags & optional) || + ((expected->flags & winevent_hook) && !hEvent_hook))) + { + trace_(file, line)(" %u: expected: msg %04x - actual: nothing\n", count, expected->message); + expected++; + count++; + } + + if (expected->message) + { + trace_(file, line)(" %u: expected: msg %04x - actual: nothing\n", count, expected->message); + return; + } + + while (actual->message && actual->output[0]) + { + trace_(file, line)(" %u: expected: nothing - actual: %s\n", count, actual->output); + actual++; + count++; + } +} + +#define ok_sequence(exp, contx, todo) \ + ok_sequence_((exp), (contx), (todo), __FILE__, __LINE__) + + +static void ok_sequence_(const struct message *expected_list, const char *context, BOOL todo, + const char *file, int line) +{ + static const struct recvd_message end_of_sequence; + const struct message *expected = expected_list; + const struct recvd_message *actual; + int failcount = 0, dump = 0; + unsigned int count = 0; + + add_message(&end_of_sequence); + + actual = sequence; + + while (expected->message && actual->message) + { + if (expected->message == actual->message && + !((expected->flags ^ actual->flags) & (hook | winevent_hook | kbd_hook))) + { + if (expected->flags & wparam) + { + if (((expected->wParam ^ actual->wParam) & ~expected->wp_mask) && todo) + { + todo_wine + { + failcount++; + if (strcmp(winetest_platform, "wine")) + dump++; + ok_( file, line) (FALSE, + "%s: %u: in msg 0x%04x expecting wParam 0x%x got 0x%x\n", + context, count, expected->message, expected->wParam, actual->wParam); + } + } + else + { + ok_( file, line)(((expected->wParam ^ actual->wParam) & ~expected->wp_mask) == 0, + "%s: %u: in msg 0x%04x expecting wParam 0x%x got 0x%x\n", + context, count, expected->message, expected->wParam, actual->wParam); + if ((expected->wParam ^ actual->wParam) & ~expected->wp_mask) + dump++; + } + } + + if (expected->flags & lparam) + { + if (((expected->lParam ^ actual->lParam) & ~expected->lp_mask) && todo) + { + todo_wine + { + failcount++; + if (strcmp(winetest_platform, "wine")) + dump++; + ok_( file, line) (FALSE, + "%s: %u: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n", + context, count, expected->message, expected->lParam, actual->lParam); + } + } + else + { + ok_( file, line)(((expected->lParam ^ actual->lParam) & ~expected->lp_mask) == 0, + "%s: %u: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n", + context, count, expected->message, expected->lParam, actual->lParam); + if ((expected->lParam ^ actual->lParam) & ~expected->lp_mask) + dump++; + } + } + if ((expected->flags & optional) && + ((expected->flags ^ actual->flags) & (defwinproc | parent))) + { + /* don't match optional messages if their defwinproc or parent status differs */ + expected++; + count++; + continue; + } + if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && todo) + { + todo_wine + { + failcount++; + if (strcmp(winetest_platform, "wine")) + dump++; + ok_(file, line) (FALSE, + "%s: %u: the msg 0x%04x should %shave been sent by DefWindowProc\n", + context, count, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); + } + } + else + { + ok_(file, line) ((expected->flags & defwinproc) == (actual->flags & defwinproc), + "%s: %u: the msg 0x%04x should %shave been sent by DefWindowProc\n", + context, count, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); + if ((expected->flags & defwinproc) != (actual->flags & defwinproc)) + dump++; + } + + ok_(file, line) ((expected->flags & beginpaint) == (actual->flags & beginpaint), + "%s: %u: the msg 0x%04x should %shave been sent by BeginPaint\n", + context, count, expected->message, (expected->flags & beginpaint) ? "" : "NOT "); + if ((expected->flags & beginpaint) != (actual->flags & beginpaint)) + dump++; + + ok_(file, line) ((expected->flags & (sent | posted)) == (actual->flags & (sent | posted)), + "%s: %u: the msg 0x%04x should have been %s\n", + context, count, expected->message, (expected->flags & posted) ? "posted" : "sent"); + if ((expected->flags & (sent | posted)) != (actual->flags & (sent | posted))) + dump++; + + ok_(file, line) ((expected->flags & parent) == (actual->flags & parent), + "%s: %u: the msg 0x%04x was expected in %s\n", + context, count, expected->message, (expected->flags & parent) ? "parent" : "child"); + if ((expected->flags & parent) != (actual->flags & parent)) + dump++; + + ok_(file, line) ((expected->flags & hook) == (actual->flags & hook), + "%s: %u: the msg 0x%04x should have been sent by a hook\n", + context, count, expected->message); + if ((expected->flags & hook) != (actual->flags & hook)) + dump++; + + ok_(file, line) ((expected->flags & winevent_hook) == (actual->flags & winevent_hook), + "%s: %u: the msg 0x%04x should have been sent by a winevent hook\n", + context, count, expected->message); + if ((expected->flags & winevent_hook) != (actual->flags & winevent_hook)) + dump++; + + ok_(file, line) ((expected->flags & kbd_hook) == (actual->flags & kbd_hook), + "%s: %u: the msg 0x%04x should have been sent by a keyboard hook\n", + context, count, expected->message); + if ((expected->flags & kbd_hook) != (actual->flags & kbd_hook)) + dump++; + + expected++; + actual++; + } + /* silently drop hook messages if there is no support for them */ + else if ((expected->flags & optional) || + ((expected->flags & hook) && !hCBT_hook) || + ((expected->flags & winevent_hook) && !hEvent_hook) || + ((expected->flags & kbd_hook) && !hKBD_hook)) + expected++; + else if (todo) + { + failcount++; + todo_wine + { + if (strcmp(winetest_platform, "wine")) + dump++; + ok_(file, line) (FALSE, "%s: %u: the msg 0x%04x was expected, but got msg 0x%04x instead\n", + context, count, expected->message, actual->message); + } + goto done; + } + else + { + ok_(file, line) (FALSE, "%s: %u: the msg 0x%04x was expected, but got msg 0x%04x instead\n", + context, count, expected->message, actual->message); + dump++; + expected++; + actual++; + } + count++; + } + + /* skip all optional trailing messages */ + while (expected->message && ((expected->flags & optional) || + ((expected->flags & hook) && !hCBT_hook) || + ((expected->flags & winevent_hook) && !hEvent_hook))) + expected++; + + if (todo) + { + todo_wine + { + if (expected->message || actual->message) + { + failcount++; + if (strcmp(winetest_platform, "wine")) + dump++; + ok_(file, line) (FALSE, "%s: %u: the msg sequence is not complete: expected %04x - actual %04x\n", + context, count, expected->message, actual->message); + } + } + } + else + { + if (expected->message || actual->message) + { + dump++; + ok_(file, line) (FALSE, "%s: %u: the msg sequence is not complete: expected %04x - actual %04x\n", + context, count, expected->message, actual->message); + } + } + if (todo && !failcount) /* succeeded yet marked todo */ + todo_wine + { + if (!strcmp(winetest_platform, "wine")) + dump++; + ok_(file, line) (TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); + } + +done: + if (dump) dump_sequence(expected_list, context, file, line); + flush_sequence(); +} + +#define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) + +/************* window procedures ********************/ + +static LRESULT MsgCheckProc(BOOL unicode, HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + static LONG beginpaint_counter = 0; + LRESULT ret; + struct recvd_message msg; + + if (ignore_message(message)) return 0; + + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + if (beginpaint_counter) msg.flags |= beginpaint; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "MsgCheckProc"; + add_message(&msg); + + defwndproc_counter++; + ret = unicode ? DefWindowProcW(hwnd, message, wParam, lParam) + : DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static LRESULT WINAPI MsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + return MsgCheckProc(FALSE, hwnd, message, wParam, lParam); +} + +static BOOL RegisterWindowClasses(void) +{ + WNDCLASSA cls; + + cls.style = 0; + cls.lpfnWndProc = MsgCheckProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "TestWindowClass"; + if (!RegisterClassA(&cls)) return FALSE; + + return TRUE; +} + +static BOOL is_our_logged_class(HWND hwnd) +{ + char buf[256]; + + if (GetClassNameA(hwnd, buf, sizeof(buf))) + { + if (!lstrcmpiA(buf, "TestWindowClass") || + !lstrcmpiA(buf, "ShowWindowClass") || + !lstrcmpiA(buf, "RecursiveActivationClass") || + !lstrcmpiA(buf, "TestParentClass") || + !lstrcmpiA(buf, "TestPopupClass") || + !lstrcmpiA(buf, "SimpleWindowClass") || + !lstrcmpiA(buf, "TestDialogClass") || + !lstrcmpiA(buf, "MDI_frame_class") || + !lstrcmpiA(buf, "MDI_client_class") || + !lstrcmpiA(buf, "MDI_child_class") || + !lstrcmpiA(buf, "my_button_class") || + !lstrcmpiA(buf, "my_edit_class") || + !lstrcmpiA(buf, "static") || + !lstrcmpiA(buf, "ListBox") || + !lstrcmpiA(buf, "ComboBox") || + !lstrcmpiA(buf, "MyDialogClass") || + !lstrcmpiA(buf, "#32770") || + !lstrcmpiA(buf, "#32768")) + return TRUE; + } + return FALSE; +} + +static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) +{ + HWND hwnd; + + ok(cbt_hook_thread_id == GetCurrentThreadId(), "we didn't ask for events from other threads\n"); + + if (nCode == HCBT_CLICKSKIPPED) + { + /* ignore this event, XP sends it a lot when switching focus between windows */ + return CallNextHookEx(hCBT_hook, nCode, wParam, lParam); + } + + if (nCode == HCBT_SYSCOMMAND || nCode == HCBT_KEYSKIPPED) + { + struct recvd_message msg; + + msg.hwnd = 0; + msg.message = nCode; + msg.flags = hook | wparam | lparam; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "CBT"; + add_message(&msg); + + return CallNextHookEx(hCBT_hook, nCode, wParam, lParam); + } + + if (nCode == HCBT_DESTROYWND) + { + if (test_DestroyWindow_flag) + { + DWORD style = GetWindowLongA((HWND)wParam, GWL_STYLE); + if (style & WS_CHILD) + lParam = GetWindowLongPtrA((HWND)wParam, GWLP_ID); + else if (style & WS_POPUP) + lParam = WND_POPUP_ID; + else + lParam = WND_PARENT_ID; + } + } + + /* Log also SetFocus(0) calls */ + hwnd = wParam ? (HWND)wParam : (HWND)lParam; + + if (is_our_logged_class(hwnd)) + { + struct recvd_message msg; + + msg.hwnd = hwnd; + msg.message = nCode; + msg.flags = hook | wparam | lparam; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "CBT"; + add_message(&msg); + } + return CallNextHookEx(hCBT_hook, nCode, wParam, lParam); +} + +/*************************** Menu test ******************************/ + +static const struct message wm_popup_menu_4[] = +{ + { HCBT_CREATEWND, hook }, + { WM_ENTERMENULOOP, sent | wparam | lparam, 0, 0 }, + { WM_INITMENU, sent | lparam, 0, 0 }, + { WM_INITMENUPOPUP, sent | lparam, 0, 0x10000 }, + { HCBT_KEYSKIPPED, hook | wparam | lparam | optional, VK_DOWN, 0x10000001 }, + { WM_MENUSELECT, sent, MAKEWPARAM(0,0xffff), 0 }, + { HCBT_KEYSKIPPED, hook | wparam | lparam | optional, VK_DOWN, 0xd0000001 }, + { HCBT_KEYSKIPPED, hook | wparam | lparam | optional, VK_ESCAPE, 0x10000001 }, + { HCBT_DESTROYWND, hook }, + { WM_UNINITMENUPOPUP, sent | lparam, 0, 0x20000000 }, + { WM_MENUSELECT, sent, MAKEWPARAM(0,0xffff), 0 }, + { WM_EXITMENULOOP, sent | wparam | lparam, 0, 0 }, + { HCBT_KEYSKIPPED, hook | wparam | lparam | optional, VK_ESCAPE, 0xc0000001 }, + { WM_KEYUP, sent | wparam | lparam, VK_ESCAPE, 0xc0000001 }, + { 0 } +}; + +static LRESULT WINAPI parent_menu_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) +{ + if (message == WM_ENTERIDLE || + message == WM_INITMENU || + message == WM_INITMENUPOPUP || + message == WM_MENUSELECT || + message == WM_PARENTNOTIFY || + message == WM_ENTERMENULOOP || + message == WM_EXITMENULOOP || + message == WM_UNINITMENUPOPUP || + message == WM_KEYDOWN || + message == WM_KEYUP || + message == WM_CHAR || + message == WM_SYSKEYDOWN || + message == WM_SYSKEYUP || + message == WM_SYSCHAR || + message == WM_COMMAND || + message == WM_MENUCOMMAND) + { + struct recvd_message msg; + + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent | wparam | lparam; + msg.wParam = wp; + msg.lParam = lp; + msg.descr = "parent_menu_proc"; + add_message(&msg); + } + + return DefWindowProcA(hwnd, message, wp, lp); +} + +static void test_menu_messages(void) +{ + MSG msg; + WNDCLASSA cls; + HWND hwnd; + RECT rect; + + cls.style = 0; + cls.lpfnWndProc = parent_menu_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "TestMenuClass"; + UnregisterClassA(cls.lpszClassName, cls.hInstance); + if (!RegisterClassA(&cls)) + assert(0); + + SetLastError(0xdeadbeef); + hwnd = CreateWindowExA(0, "TestMenuClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(hwnd != 0, "LoadMenuA error %lu\n", GetLastError()); + + SetForegroundWindow(hwnd); + flush_events(); + + trace("testing system menu\n"); + GetWindowRect(hwnd, &rect); + SetCursorPos(rect.left + 30, rect.top + 10); + flush_sequence(); + mouse_event(MOUSEEVENTF_RIGHTDOWN, 0, 0, 0, 0); + mouse_event(MOUSEEVENTF_RIGHTUP, 0, 0, 0, 0); + keybd_event(VK_DOWN, 0, 0, 0); + keybd_event(VK_DOWN, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_ESCAPE, 0, 0, 0); + keybd_event(VK_ESCAPE, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + ok_sequence(wm_popup_menu_4, "system menu command", FALSE); + + DestroyWindow(hwnd); +} + +static void init_funcs(void) +{ + HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hKernel32, #f) + X(GetCurrentActCtx); + X(QueryActCtxW); +#undef X +} + +static void init_tests() +{ + init_funcs(); + + InitializeCriticalSection(&sequence_cs); + init_procs(); + + if (!RegisterWindowClasses()) + assert(0); + + cbt_hook_thread_id = GetCurrentThreadId(); + hCBT_hook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); + if (!hCBT_hook) + win_skip("cannot set global hook, will skip hook tests\n"); +} + +static void cleanup_tests() +{ + BOOL ret; + UnhookWindowsHookEx(hCBT_hook); + if (pUnhookWinEvent && hEvent_hook) + { + ret = pUnhookWinEvent(hEvent_hook); + ok(ret, "UnhookWinEvent error %ld\n", GetLastError()); + SetLastError(0xdeadbeef); + ok(!pUnhookWinEvent(hEvent_hook), "UnhookWinEvent succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE || /* Win2k */ + GetLastError() == 0xdeadbeef, /* Win9x */ + "unexpected error %ld\n", GetLastError()); + } + DeleteCriticalSection(&sequence_cs); +} + +START_TEST(SystemMenu) +{ + init_tests(); + test_menu_messages(); + cleanup_tests(); +} diff --git a/modules/rostests/apitests/user32/testlist.c b/modules/rostests/apitests/user32/testlist.c index ee6f6970d76..0ff533691b8 100644 --- a/modules/rostests/apitests/user32/testlist.c +++ b/modules/rostests/apitests/user32/testlist.c @@ -53,6 +53,7 @@ extern void func_SetScrollRange(void); extern void func_ShowWindow(void); extern void func_SwitchToThisWindow(void); extern void func_SystemParametersInfo(void); +extern void func_SystemMenu(void); extern void func_TrackMouseEvent(void); extern void func_VirtualKey(void); extern void func_WndProc(void); @@ -109,6 +110,7 @@ const struct test winetest_testlist[] = { "SetScrollRange", func_SetScrollRange }, { "ShowWindow", func_ShowWindow }, { "SwitchToThisWindow", func_SwitchToThisWindow }, + { "SystemMenu", func_SystemMenu }, { "SystemParametersInfo", func_SystemParametersInfo }, { "TrackMouseEvent", func_TrackMouseEvent }, { "VirtualKey", func_VirtualKey },

1 year, 4 months

[reactos] 01/01: [CPPRT][CRT][MSVCRT] Move __CxxFrameHandler3 to crt and export it on NT6

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce848e5c11f435f045b67… commit ce848e5c11f435f045b6709dac39de496e6e434d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Sep 24 07:49:16 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Aug 23 20:43:53 2023 +0300 [CPPRT][CRT][MSVCRT] Move __CxxFrameHandler3 to crt and export it on NT6 Previously it was in cpprt, which is a support library for C++, containing functions that are not exported by msvcrt. But since Vista __CxxFrameHandler3 is exported by msvcrt. Therefore move it to crt, and to satisfy pre-Vista configurations, also add it to msvcrtex. --- dll/win32/msvcrt/msvcrt.spec | 3 ++- sdk/lib/cpprt/CMakeLists.txt | 1 - sdk/lib/cpprt/amd64/cpprt.s | 3 --- sdk/lib/cpprt/i386/cpprt.s | 17 -------------- sdk/lib/crt/except/amd64/__CxxFrameHandler3.s | 15 +++++++++++++ sdk/lib/crt/except/except.cmake | 4 ++++ .../except/i386/CxxHandleV8Frame.c} | 0 sdk/lib/crt/except/i386/__CxxFrameHandler3.s | 26 ++++++++++++++++++++++ sdk/lib/crt/msvcrtex.cmake | 11 +++++++++ 9 files changed, 58 insertions(+), 22 deletions(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index edff9b16392..0d5ab41eeee 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -241,7 +241,8 @@ @ cdecl -arch=i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -version=0x600+ -arch=x86_64 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -arch=arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) -#@ cdecl -version=0x600+ -arch=i386,x86_64 -norelay -private __CxxFrameHandler3(ptr ptr ptr ptr) # Commented out for now, as it causes linker errors +@ cdecl -version=0x600+ -arch=i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) +@ cdecl -version=0x600+ -arch=x86_64 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386 __CxxQueryExceptionSize() @ cdecl -arch=i386 __CxxRegisterExceptionObject() diff --git a/sdk/lib/cpprt/CMakeLists.txt b/sdk/lib/cpprt/CMakeLists.txt index 7db6f5c1ea4..94632d39ea5 100644 --- a/sdk/lib/cpprt/CMakeLists.txt +++ b/sdk/lib/cpprt/CMakeLists.txt @@ -11,7 +11,6 @@ list(APPEND SOURCE if(ARCH STREQUAL "i386") add_asm_files(cpprt_asm i386/cpprt.s) - list(APPEND SOURCE i386/framehandler.c) elseif(ARCH STREQUAL "amd64") add_asm_files(cpprt_asm amd64/cpprt.s) elseif(ARCH STREQUAL "arm") diff --git a/sdk/lib/cpprt/amd64/cpprt.s b/sdk/lib/cpprt/amd64/cpprt.s index 36c09fb80d8..aaf839ac991 100644 --- a/sdk/lib/cpprt/amd64/cpprt.s +++ b/sdk/lib/cpprt/amd64/cpprt.s @@ -19,9 +19,6 @@ DEFINE_ALIAS ??_M@YAXPEAX_K1P6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@ ; void __cdecl `eh vector destructor iterator'(void * __ptr64,unsigned __int64,int,void (__cdecl*)(void * __ptr64)) DEFINE_ALIAS ??_M@YAXPEAX_KHP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPEAX_KHP6AX0@Z@Z -; These are the same -DEFINE_ALIAS __CxxFrameHandler3, __CxxFrameHandler - ; void __cdecl operator delete(void * __ptr64,struct std::nothrow_t const & __ptr64) DEFINE_ALIAS ??3@YAXPEAXAEBUnothrow_t@std@@@Z, ??3@YAXPEAX@Z diff --git a/sdk/lib/cpprt/i386/cpprt.s b/sdk/lib/cpprt/i386/cpprt.s index eeaf87f5d6a..b2c4832b0da 100644 --- a/sdk/lib/cpprt/i386/cpprt.s +++ b/sdk/lib/cpprt/i386/cpprt.s @@ -7,23 +7,6 @@ EXTERN &orig : PROC ALIAS <&alias> = <&orig> ENDM -EXTERN _CxxHandleV8Frame@20 : PROC -PUBLIC ___CxxFrameHandler3 -___CxxFrameHandler3: - push eax - push dword ptr [esp + 20] - push dword ptr [esp + 20] - push dword ptr [esp + 20] - push dword ptr [esp + 20] - call _CxxHandleV8Frame@20 - ret - -EXTERN ___CxxFrameHandler : PROC -PUBLIC _CallCxxFrameHandler -_CallCxxFrameHandler: - mov eax, dword ptr [esp + 20] - jmp ___CxxFrameHandler - ; void __stdcall `eh vector constructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *),void (__thiscall*)(void *)) DEFINE_ALIAS ??_L@YGXPAXIHP6EX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YGXPAXIHP6EX0@Z1@Z diff --git a/sdk/lib/crt/except/amd64/__CxxFrameHandler3.s b/sdk/lib/crt/except/amd64/__CxxFrameHandler3.s new file mode 100644 index 00000000000..a41cb2b9cdc --- /dev/null +++ b/sdk/lib/crt/except/amd64/__CxxFrameHandler3.s @@ -0,0 +1,15 @@ + +#include <asm.inc> + +.code64 +.align 4 + +MACRO(DEFINE_ALIAS, alias, orig) +EXTERN &orig : PROC +ALIAS <&alias> = <&orig> +ENDM + +; These are the same +DEFINE_ALIAS __CxxFrameHandler3, __CxxFrameHandler + +END diff --git a/sdk/lib/crt/except/except.cmake b/sdk/lib/crt/except/except.cmake index 418bbcdeb9b..656853c097c 100644 --- a/sdk/lib/crt/except/except.cmake +++ b/sdk/lib/crt/except/except.cmake @@ -4,9 +4,13 @@ if(ARCH STREQUAL "i386") except/i386/chkstk_asm.s ) list(APPEND CRT_EXCEPT_ASM_SOURCE + except/i386/__CxxFrameHandler3.s except/i386/chkesp.s except/i386/prolog.s ) + list(APPEND CRT_EXCEPT_SOURCE + except/i386/CxxHandleV8Frame.c + ) if(MSVC) list(APPEND CRT_EXCEPT_ASM_SOURCE except/i386/cpp.s) diff --git a/sdk/lib/cpprt/i386/framehandler.c b/sdk/lib/crt/except/i386/CxxHandleV8Frame.c similarity index 100% rename from sdk/lib/cpprt/i386/framehandler.c rename to sdk/lib/crt/except/i386/CxxHandleV8Frame.c diff --git a/sdk/lib/crt/except/i386/__CxxFrameHandler3.s b/sdk/lib/crt/except/i386/__CxxFrameHandler3.s new file mode 100644 index 00000000000..580fae2ad05 --- /dev/null +++ b/sdk/lib/crt/except/i386/__CxxFrameHandler3.s @@ -0,0 +1,26 @@ + + +#include <asm.inc> + +.code +.align 4 + +EXTERN _CxxHandleV8Frame@20 : PROC +PUBLIC ___CxxFrameHandler3 +___CxxFrameHandler3: + push eax + push dword ptr [esp + 20] + push dword ptr [esp + 20] + push dword ptr [esp + 20] + push dword ptr [esp + 20] + call _CxxHandleV8Frame@20 + ret + +EXTERN ___CxxFrameHandler : PROC +PUBLIC _CallCxxFrameHandler +_CallCxxFrameHandler: + mov eax, dword ptr [esp + 20] + jmp ___CxxFrameHandler + +END + diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index d7a513012b4..4ecfd4db6f8 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -36,9 +36,20 @@ if(ARCH STREQUAL "i386") list(APPEND MSVCRTEX_SOURCE math/i386/sqrtf.c) endif() + if(MSVC AND DLL_EXPORT_VERSION LESS 0x600) + list(APPEND MSVCRTEX_ASM_SOURCE + except/i386/__CxxFrameHandler3.s) + list(APPEND MSVCRTEX_SOURCE + except/i386/CxxHandleV8Frame.c) + endif() elseif(ARCH STREQUAL "amd64") list(APPEND MSVCRTEX_ASM_SOURCE except/amd64/chkstk_ms.s) + if(MSVC AND DLL_EXPORT_VERSION LESS 0x600) + list(APPEND MSVCRTEX_ASM_SOURCE + except/amd64/__CxxFrameHandler3.s + ) + endif() elseif(ARCH STREQUAL "arm") list(APPEND MSVCRTEX_SOURCE math/arm/__rt_sdiv.c

1 year, 4 months

[reactos] 01/01: [NTOS:SE] Let SepGetSidFromAce figure out the ACE type

by unknown

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=310563aece3399ad226d4… commit 310563aece3399ad226d4fb8b8eba9c5fc634c99 Author: unknown <george.bisoc(a)reactos.org> AuthorDate: Tue Aug 22 22:21:13 2023 +0200 Commit: unknown <george.bisoc(a)reactos.org> CommitDate: Wed Aug 23 17:54:47 2023 +0200 [NTOS:SE] Let SepGetSidFromAce figure out the ACE type As the commit title says. Instead of having the caller figuring out what the ACE type should be of the ACE. --- ntoskrnl/include/internal/se.h | 1 - ntoskrnl/se/accesschk.c | 16 ++++++++-------- ntoskrnl/se/debug.c | 2 +- ntoskrnl/se/sid.c | 12 ++---------- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index db32e6bff73..1679d2fe86a 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -634,7 +634,6 @@ SepSidInTokenEx( PSID NTAPI SepGetSidFromAce( - _In_ UCHAR AceType, _In_ PACE Ace); NTSTATUS diff --git a/ntoskrnl/se/accesschk.c b/ntoskrnl/se/accesschk.c index d63e07429e8..eaf159f8ce1 100644 --- a/ntoskrnl/se/accesschk.c +++ b/ntoskrnl/se/accesschk.c @@ -517,7 +517,7 @@ SepAnalyzeAcesFromDacl( if (CurrentAce->Header.AceType == ACCESS_DENIED_ACE_TYPE) { /* Get the SID from this ACE */ - Sid = SepGetSidFromAce(ACCESS_DENIED_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ASSERT(Sid); if (SepSidInTokenEx(AccessToken, PrincipalSelfSid, Sid, TRUE, IsTokenRestricted)) @@ -539,7 +539,7 @@ SepAnalyzeAcesFromDacl( else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE) { /* Get the SID from this ACE */ - Sid = SepGetSidFromAce(ACCESS_ALLOWED_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ASSERT(Sid); if (SepSidInTokenEx(AccessToken, PrincipalSelfSid, Sid, FALSE, IsTokenRestricted)) @@ -561,7 +561,7 @@ SepAnalyzeAcesFromDacl( else if (CurrentAce->Header.AceType == ACCESS_DENIED_OBJECT_ACE_TYPE) { /* Get the SID and object type from this ACE */ - Sid = SepGetSidFromAce(ACCESS_DENIED_OBJECT_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ObjectTypeGuid = SepGetObjectTypeGuidFromAce(CurrentAce, TRUE); ASSERT(Sid); @@ -610,7 +610,7 @@ SepAnalyzeAcesFromDacl( else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_OBJECT_ACE_TYPE) { /* Get the SID and object type from this ACE */ - Sid = SepGetSidFromAce(ACCESS_ALLOWED_OBJECT_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ObjectTypeGuid = SepGetObjectTypeGuidFromAce(CurrentAce, FALSE); ASSERT(Sid); @@ -705,7 +705,7 @@ SepAnalyzeAcesFromDacl( if (CurrentAce->Header.AceType == ACCESS_DENIED_ACE_TYPE) { /* Get the SID from this ACE */ - Sid = SepGetSidFromAce(ACCESS_DENIED_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ASSERT(Sid); if (SepSidInTokenEx(AccessToken, PrincipalSelfSid, Sid, TRUE, IsTokenRestricted)) @@ -735,7 +735,7 @@ SepAnalyzeAcesFromDacl( else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE) { /* Get the SID from this ACE */ - Sid = SepGetSidFromAce(ACCESS_ALLOWED_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ASSERT(Sid); if (SepSidInTokenEx(AccessToken, PrincipalSelfSid, Sid, FALSE, IsTokenRestricted)) @@ -761,7 +761,7 @@ SepAnalyzeAcesFromDacl( else if (CurrentAce->Header.AceType == ACCESS_DENIED_OBJECT_ACE_TYPE) { /* Get the SID and object type from this ACE */ - Sid = SepGetSidFromAce(ACCESS_DENIED_OBJECT_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ObjectTypeGuid = SepGetObjectTypeGuidFromAce(CurrentAce, TRUE); ASSERT(Sid); @@ -811,7 +811,7 @@ SepAnalyzeAcesFromDacl( else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_OBJECT_ACE_TYPE) { /* Get the SID and object type from this ACE */ - Sid = SepGetSidFromAce(ACCESS_ALLOWED_OBJECT_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ObjectTypeGuid = SepGetObjectTypeGuidFromAce(CurrentAce, FALSE); ASSERT(Sid); diff --git a/ntoskrnl/se/debug.c b/ntoskrnl/se/debug.c index 1f038ac0702..bed647b18b8 100644 --- a/ntoskrnl/se/debug.c +++ b/ntoskrnl/se/debug.c @@ -118,7 +118,7 @@ SepDumpAces( DbgPrint("Ace->Header.AceType -> %s\n", SepGetAceTypeString(Ace->Header.AceType)); DbgPrint("Ace->AccessMask -> 0x%08lx\n", Ace->AccessMask); - Sid = SepGetSidFromAce(Ace->Header.AceType, Ace); + Sid = SepGetSidFromAce(Ace); ASSERT(Sid); RtlConvertSidToUnicodeString(&SidString, Sid, TRUE); DbgPrint("Ace SID -> %wZ\n", &SidString); diff --git a/ntoskrnl/se/sid.c b/ntoskrnl/se/sid.c index 033d322d708..6de4b991f3b 100644 --- a/ntoskrnl/se/sid.c +++ b/ntoskrnl/se/sid.c @@ -558,13 +558,6 @@ SepSidInToken( * given access control entry. This identifier * is valid for the whole of its lifetime. * - * @param[in] AceType - * The type of an access control entry. This - * type that is given by the calling thread - * must coincide with the actual ACE that is - * given in the second parameter otherwise this - * can potentially lead to UNDEFINED behavior! - * * @param[in] Ace * A pointer to an access control entry, which * can be obtained from a DACL. @@ -577,7 +570,6 @@ SepSidInToken( PSID NTAPI SepGetSidFromAce( - _In_ UCHAR AceType, _In_ PACE Ace) { PULONG Flags; @@ -589,7 +581,7 @@ SepGetSidFromAce( ASSERT(Ace); /* Obtain the SID based upon ACE type */ - switch (AceType) + switch (Ace->Header.AceType) { case ACCESS_DENIED_ACE_TYPE: case ACCESS_ALLOWED_ACE_TYPE: @@ -620,7 +612,7 @@ SepGetSidFromAce( default: { - DPRINT1("SepGetSidFromAce(): Unknown ACE type (Ace 0x%p, Type %u)\n", Ace, AceType); + DPRINT1("SepGetSidFromAce(): Unknown ACE type (Ace 0x%p, Type %u)\n", Ace, Ace->Header.AceType); break; } }

1 year, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs