Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [KMTESTS:SE] Implement initial logon session tests
by George Bișoc 15 Jul '21

15 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32a45ce15cb82f91d0377… commit 32a45ce15cb82f91d0377eff714c5420703b07ff Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Thu Jun 17 18:12:12 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Jul 15 19:31:46 2021 +0200 [KMTESTS:SE] Implement initial logon session tests This implements tests for SeMarkLogonSessionForTerminationNotification exported routine so far. --- modules/rostests/kmtests/CMakeLists.txt | 1 + modules/rostests/kmtests/kmtest_drv/testlist.c | 2 ++ modules/rostests/kmtests/ntos_se/SeLogonSession.c | 35 +++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index 9e3528cdf96..3898b37a6ba 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -96,6 +96,7 @@ list(APPEND KMTEST_DRV_SOURCE ntos_ps/PsNotify.c ntos_se/SeHelpers.c ntos_se/SeInheritance.c + ntos_se/SeLogonSession.c ntos_se/SeQueryInfoToken.c rtl/RtlIsValidOemCharacter.c rtl/RtlRangeList.c diff --git a/modules/rostests/kmtests/kmtest_drv/testlist.c b/modules/rostests/kmtests/kmtest_drv/testlist.c index 99743a26fe8..d486c2e3351 100644 --- a/modules/rostests/kmtests/kmtest_drv/testlist.c +++ b/modules/rostests/kmtests/kmtest_drv/testlist.c @@ -64,6 +64,7 @@ KMT_TESTFUNC Test_ObTypeNoClean; KMT_TESTFUNC Test_ObTypes; KMT_TESTFUNC Test_PsNotify; KMT_TESTFUNC Test_SeInheritance; +KMT_TESTFUNC Test_SeLogonSession; KMT_TESTFUNC Test_SeQueryInfoToken; KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlException; @@ -152,6 +153,7 @@ const KMT_TEST TestList[] = { "RtlStrSafeKM", Test_RtlStrSafe }, { "RtlUnicodeStringKM", Test_RtlUnicodeString }, { "SeInheritance", Test_SeInheritance }, + { "SeLogonSession", Test_SeLogonSession }, { "SeQueryInfoToken", Test_SeQueryInfoToken }, { "ZwAllocateVirtualMemory", Test_ZwAllocateVirtualMemory }, { "ZwCreateSection", Test_ZwCreateSection }, diff --git a/modules/rostests/kmtests/ntos_se/SeLogonSession.c b/modules/rostests/kmtests/ntos_se/SeLogonSession.c new file mode 100644 index 00000000000..726267d01a2 --- /dev/null +++ b/modules/rostests/kmtests/ntos_se/SeLogonSession.c @@ -0,0 +1,35 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Kernel mode tests for logon session manipulation API + * COPYRIGHT: Copyright 2021 George Bișoc <george.bisoc(a)reactos.org> + */ + +#include <kmt_test.h> +#include <ntifs.h> + +#define IMAGINARY_LOGON {0x001, 0} + +static +VOID +LogonMarkTermination(VOID) +{ + NTSTATUS Status; + LUID SystemLogonID = SYSTEM_LUID; + LUID NonExistentLogonID = IMAGINARY_LOGON; + + /* Mark the system authentication logon for termination */ + Status = SeMarkLogonSessionForTerminationNotification(&SystemLogonID); + ok_irql(PASSIVE_LEVEL); + ok_eq_hex(Status, STATUS_SUCCESS); + + /* We give a non existent logon */ + Status = SeMarkLogonSessionForTerminationNotification(&NonExistentLogonID); + ok_irql(PASSIVE_LEVEL); + ok_eq_hex(Status, STATUS_NOT_FOUND); +} + +START_TEST(SeLogonSession) +{ + LogonMarkTermination(); +}

1 0

[reactos] 01/02: [NTOS:SE] Implement logon session termination notification
by George Bișoc 15 Jul '21

15 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=506cee3219f08ee9d7db8… commit 506cee3219f08ee9d7db85ba013088106c0ff062 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Thu Jun 17 18:11:14 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Jul 15 19:31:46 2021 +0200 [NTOS:SE] Implement logon session termination notification Note to SELF and EVERYONE: the commit implements the initial logon session termination notification implementation, the SeMarkLogonSessionForTerminationNotification function, but as it currently stands there are several other tasks to be addressed in the future in order for the logon termination notification to be fully completed. The tasks as of which are. 1. Our SepRmDereferenceLogonSession is not fully implemented, as it doesn't inform the LSA and filesystems of logon deletion notification 2. Implement two worker routines that are actually in charge of such tasks of informing LSA and FSDs 3. Perform logon deletion 4. Do further investigations and check whatever that is left to address, if any --- ntoskrnl/se/srm.c | 60 +++++++++++++++++++++++++++++++++++++++++++---- sdk/include/xdk/setypes.h | 4 ++++ 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/se/srm.c b/ntoskrnl/se/srm.c index 70b7c19470a..fab71aa41d9 100644 --- a/ntoskrnl/se/srm.c +++ b/ntoskrnl/se/srm.c @@ -814,6 +814,8 @@ SepRmDereferenceLogonSession( SepCleanupLUIDDeviceMapDirectory(LogonLuid); ObfDereferenceDeviceMap(DeviceMap); } + + /* FIXME: Alert LSA and filesystems that a logon is about to be deleted */ } return STATUS_SUCCESS; @@ -1226,16 +1228,64 @@ SeGetLogonIdDeviceMap( return Status; } -/* - * @unimplemented +/** + * @brief + * Marks a logon session for future termination, given its logon ID. This triggers + * a callout (the registered callback) when the logon is no longer used by anyone, + * that is, no token is still referencing the speciffied logon session. + * + * @param[in] LogonId + * The ID of the logon session. + * + * @return + * STATUS_SUCCESS if the logon session is marked for termination notification successfully, + * STATUS_NOT_FOUND if the logon session couldn't be found otherwise. */ NTSTATUS NTAPI SeMarkLogonSessionForTerminationNotification( - IN PLUID LogonId) + _In_ PLUID LogonId) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSEP_LOGON_SESSION_REFERENCES SessionToMark; + PAGED_CODE(); + + DPRINT("SeMarkLogonSessionForTerminationNotification(%08lx:%08lx)\n", + LogonId->HighPart, LogonId->LowPart); + + /* Acquire the database lock */ + KeAcquireGuardedMutex(&SepRmDbLock); + + /* Loop over the existing logon sessions */ + for (SessionToMark = SepLogonSessions; + SessionToMark != NULL; + SessionToMark = SessionToMark->Next) + { + /* Does the logon with the given ID exist? */ + if (RtlEqualLuid(&SessionToMark->LogonId, LogonId)) + { + /* We found it */ + break; + } + } + + /* + * We've exhausted all the remaining logon sessions and + * couldn't find one with the provided ID. + */ + if (SessionToMark == NULL) + { + DPRINT1("SeMarkLogonSessionForTerminationNotification(): Logon session couldn't be found!\n"); + KeReleaseGuardedMutex(&SepRmDbLock); + return STATUS_NOT_FOUND; + } + + /* Mark the logon session for termination */ + SessionToMark->Flags |= SEP_LOGON_SESSION_TERMINATION_NOTIFY; + DPRINT("SeMarkLogonSessionForTerminationNotification(): Logon session marked for termination with success!\n"); + + /* Release the database lock */ + KeReleaseGuardedMutex(&SepRmDbLock); + return STATUS_SUCCESS; } diff --git a/sdk/include/xdk/setypes.h b/sdk/include/xdk/setypes.h index 699e71bd7de..c71488ed6a5 100644 --- a/sdk/include/xdk/setypes.h +++ b/sdk/include/xdk/setypes.h @@ -675,6 +675,10 @@ typedef struct _SID_AND_ATTRIBUTES_HASH { #define NETWORKSERVICE_LUID {0x3e4, 0x0} #define IUSER_LUID {0x3e3, 0x0} +/* Logon session reference flags */ + +#define SEP_LOGON_SESSION_TERMINATION_NOTIFY 0x0001 + typedef struct _ACE_HEADER { $UCHAR AceType; $UCHAR AceFlags;

1 0

[reactos] 01/01: [DDRAW] ddraw.c ddraw7_FlipToGDISurface() to Wine-6.8 (#3827) CORE-15128
by Doug Lyons 15 Jul '21

15 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34d5d1dbd43af0d51fa09… commit 34d5d1dbd43af0d51fa09cb4b7b1b5d830e18c6d Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Jul 15 12:04:46 2021 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 15 19:04:46 2021 +0200 [DDRAW] ddraw.c ddraw7_FlipToGDISurface() to Wine-6.8 (#3827) CORE-15128 fixes CORE-15128 "Fall 0.1.3, black controls all over the desktop after exiting the game" which regressed by 0.4.9-dev-155-g 9987f02917539e05268ba2ad11e62d24a3636972 (the sync to Wine Staging 3.3) the patch on top of 0.4.15-dev-2923-g2210d23: KVM: https://reactos.org/testman/compare.php?ids=78290,78295 LGTM VBox: https://reactos.org/testman/compare.php?ids=78291,78294 LGTM --- dll/directx/wine/ddraw/ddraw.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dll/directx/wine/ddraw/ddraw.c b/dll/directx/wine/ddraw/ddraw.c index e5205c0d000..e5acf2caff5 100644 --- a/dll/directx/wine/ddraw/ddraw.c +++ b/dll/directx/wine/ddraw/ddraw.c @@ -2093,15 +2093,31 @@ static HRESULT WINAPI d3d1_Initialize(IDirect3D *iface, REFIID riid) static HRESULT WINAPI ddraw7_FlipToGDISurface(IDirectDraw7 *iface) { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); + IDirectDrawSurface7 *gdi_surface; + struct ddraw_surface *gdi_impl; + HRESULT hr; TRACE("iface %p.\n", iface); - ddraw->flags |= DDRAW_GDI_FLIP; + wined3d_mutex_lock(); - if (ddraw->primary) - ddraw_surface_update_frontbuffer(ddraw->primary, NULL, FALSE); + if (FAILED(hr = IDirectDraw7_GetGDISurface(iface, &gdi_surface))) + { + WARN("Failed to retrieve GDI surface, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } - return DD_OK; + gdi_impl = impl_from_IDirectDrawSurface7(gdi_surface); + if (gdi_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + hr = DD_OK; + else + hr = IDirectDrawSurface7_Flip(&ddraw->primary->IDirectDrawSurface7_iface, gdi_surface, DDFLIP_WAIT); + IDirectDrawSurface7_Release(gdi_surface); + + wined3d_mutex_unlock(); + + return hr; } static HRESULT WINAPI ddraw4_FlipToGDISurface(IDirectDraw4 *iface)

1 0

[reactos] 01/01: [SAMSRV] SamrQueryInformationDomain: Older functions should call new functions
by Eric Kohl 15 Jul '21

15 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=228dab60da7559ce60742… commit 228dab60da7559ce607424517ecfd1d097db0a3c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Jul 15 17:25:06 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Jul 15 17:25:06 2021 +0200 [SAMSRV] SamrQueryInformationDomain: Older functions should call new functions --- dll/win32/samsrv/samrpc.c | 232 +++++++++++++++++++++++----------------------- 1 file changed, 116 insertions(+), 116 deletions(-) diff --git a/dll/win32/samsrv/samrpc.c b/dll/win32/samsrv/samrpc.c index d67c84b7312..5c8bdff6f78 100644 --- a/dll/win32/samsrv/samrpc.c +++ b/dll/win32/samsrv/samrpc.c @@ -1616,122 +1616,12 @@ SamrQueryInformationDomain(IN SAMPR_HANDLE DomainHandle, IN DOMAIN_INFORMATION_CLASS DomainInformationClass, OUT PSAMPR_DOMAIN_INFO_BUFFER *Buffer) { - PSAM_DB_OBJECT DomainObject; - ACCESS_MASK DesiredAccess; - NTSTATUS Status; - TRACE("SamrQueryInformationDomain(%p %lu %p)\n", DomainHandle, DomainInformationClass, Buffer); - switch (DomainInformationClass) - { - case DomainPasswordInformation: - case DomainLockoutInformation: - DesiredAccess = DOMAIN_READ_PASSWORD_PARAMETERS; - break; - - case DomainGeneralInformation: - case DomainLogoffInformation: - case DomainOemInformation: - case DomainNameInformation: - case DomainReplicationInformation: - case DomainServerRoleInformation: - case DomainModifiedInformation: - case DomainStateInformation: - case DomainModifiedInformation2: - DesiredAccess = DOMAIN_READ_OTHER_PARAMETERS; - break; - - case DomainGeneralInformation2: - DesiredAccess = DOMAIN_READ_PASSWORD_PARAMETERS | - DOMAIN_READ_OTHER_PARAMETERS; - break; - - default: - return STATUS_INVALID_INFO_CLASS; - } - - RtlAcquireResourceShared(&SampResource, - TRUE); - - /* Validate the server handle */ - Status = SampValidateDbObject(DomainHandle, - SamDbDomainObject, - DesiredAccess, - &DomainObject); - if (!NT_SUCCESS(Status)) - goto done; - - switch (DomainInformationClass) - { - case DomainPasswordInformation: - Status = SampQueryDomainPassword(DomainObject, - Buffer); - break; - - case DomainGeneralInformation: - Status = SampQueryDomainGeneral(DomainObject, - Buffer); - break; - - case DomainLogoffInformation: - Status = SampQueryDomainLogoff(DomainObject, - Buffer); - break; - - case DomainOemInformation: - Status = SampQueryDomainOem(DomainObject, - Buffer); - break; - - case DomainNameInformation: - Status = SampQueryDomainName(DomainObject, - Buffer); - break; - - case DomainReplicationInformation: - Status = SampQueryDomainReplication(DomainObject, - Buffer); - break; - - case DomainServerRoleInformation: - Status = SampQueryDomainServerRole(DomainObject, - Buffer); - break; - - case DomainModifiedInformation: - Status = SampQueryDomainModified(DomainObject, - Buffer); - break; - - case DomainStateInformation: - Status = SampQueryDomainState(DomainObject, - Buffer); - break; - - case DomainGeneralInformation2: - Status = SampQueryDomainGeneral2(DomainObject, - Buffer); - break; - - case DomainLockoutInformation: - Status = SampQueryDomainLockout(DomainObject, - Buffer); - break; - - case DomainModifiedInformation2: - Status = SampQueryDomainModified2(DomainObject, - Buffer); - break; - - default: - Status = STATUS_NOT_IMPLEMENTED; - } - -done: - RtlReleaseResource(&SampResource); - - return Status; + return SamrQueryInformationDomain2(DomainHandle, + DomainInformationClass, + Buffer); } @@ -8572,12 +8462,122 @@ SamrQueryInformationDomain2(IN SAMPR_HANDLE DomainHandle, IN DOMAIN_INFORMATION_CLASS DomainInformationClass, OUT PSAMPR_DOMAIN_INFO_BUFFER *Buffer) { + PSAM_DB_OBJECT DomainObject; + ACCESS_MASK DesiredAccess; + NTSTATUS Status; + TRACE("SamrQueryInformationDomain2(%p %lu %p)\n", DomainHandle, DomainInformationClass, Buffer); - return SamrQueryInformationDomain(DomainHandle, - DomainInformationClass, - Buffer); + switch (DomainInformationClass) + { + case DomainPasswordInformation: + case DomainLockoutInformation: + DesiredAccess = DOMAIN_READ_PASSWORD_PARAMETERS; + break; + + case DomainGeneralInformation: + case DomainLogoffInformation: + case DomainOemInformation: + case DomainNameInformation: + case DomainReplicationInformation: + case DomainServerRoleInformation: + case DomainModifiedInformation: + case DomainStateInformation: + case DomainModifiedInformation2: + DesiredAccess = DOMAIN_READ_OTHER_PARAMETERS; + break; + + case DomainGeneralInformation2: + DesiredAccess = DOMAIN_READ_PASSWORD_PARAMETERS | + DOMAIN_READ_OTHER_PARAMETERS; + break; + + default: + return STATUS_INVALID_INFO_CLASS; + } + + RtlAcquireResourceShared(&SampResource, + TRUE); + + /* Validate the server handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DesiredAccess, + &DomainObject); + if (!NT_SUCCESS(Status)) + goto done; + + switch (DomainInformationClass) + { + case DomainPasswordInformation: + Status = SampQueryDomainPassword(DomainObject, + Buffer); + break; + + case DomainGeneralInformation: + Status = SampQueryDomainGeneral(DomainObject, + Buffer); + break; + + case DomainLogoffInformation: + Status = SampQueryDomainLogoff(DomainObject, + Buffer); + break; + + case DomainOemInformation: + Status = SampQueryDomainOem(DomainObject, + Buffer); + break; + + case DomainNameInformation: + Status = SampQueryDomainName(DomainObject, + Buffer); + break; + + case DomainReplicationInformation: + Status = SampQueryDomainReplication(DomainObject, + Buffer); + break; + + case DomainServerRoleInformation: + Status = SampQueryDomainServerRole(DomainObject, + Buffer); + break; + + case DomainModifiedInformation: + Status = SampQueryDomainModified(DomainObject, + Buffer); + break; + + case DomainStateInformation: + Status = SampQueryDomainState(DomainObject, + Buffer); + break; + + case DomainGeneralInformation2: + Status = SampQueryDomainGeneral2(DomainObject, + Buffer); + break; + + case DomainLockoutInformation: + Status = SampQueryDomainLockout(DomainObject, + Buffer); + break; + + case DomainModifiedInformation2: + Status = SampQueryDomainModified2(DomainObject, + Buffer); + break; + + default: + Status = STATUS_NOT_IMPLEMENTED; + } + +done: + RtlReleaseResource(&SampResource); + + return Status; }

1 0

[reactos] 01/01: [IMM32] Rewrite ImmGetIMEFileNameA/W (#3822)
by Katayama Hirofumi MZ 15 Jul '21

15 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b06b628f30e2bf616991e… commit b06b628f30e2bf616991e00b9cad13f0228b29fb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 15 23:01:50 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 15 23:01:50 2021 +0900 [IMM32] Rewrite ImmGetIMEFileNameA/W (#3822) - Rewrite ImmGetIMEFileNameA and ImmGetIMEFileNameW functions. CORE-11700 --- dll/win32/imm32/imm.c | 85 +++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 51 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 4bcc133ae66..8c40da91928 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -2195,32 +2195,31 @@ DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBu */ UINT WINAPI ImmGetIMEFileNameA( HKL hKL, LPSTR lpszFileName, UINT uBufLen) { - LPWSTR bufW = NULL; - UINT wBufLen = uBufLen; - UINT rc; + BOOL bDefUsed; + IMEINFOEX info; + size_t cch; - if (uBufLen && lpszFileName) - bufW = HeapAlloc(GetProcessHeap(),0,uBufLen * sizeof(WCHAR)); - else /* We need this to get the number of byte required */ + TRACE("ImmGetIMEFileNameA(%p, %p, %u)\n", hKL, lpszFileName, uBufLen); + + if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL) || !IS_IME_HKL(hKL)) { - bufW = HeapAlloc(GetProcessHeap(),0,MAX_PATH * sizeof(WCHAR)); - wBufLen = MAX_PATH; + if (uBufLen > 0) + lpszFileName[0] = 0; + return 0; } - rc = ImmGetIMEFileNameW(hKL,bufW,wBufLen); + StringCchLengthW(info.wszImeFile, _countof(info.wszImeFile), &cch); - if (rc > 0) - { - if (uBufLen && lpszFileName) - rc = WideCharToMultiByte(CP_ACP, 0, bufW, -1, lpszFileName, - uBufLen, NULL, NULL); - else /* get the length */ - rc = WideCharToMultiByte(CP_ACP, 0, bufW, -1, NULL, 0, NULL, - NULL); - } + cch = WideCharToMultiByte(CP_ACP, 0, info.wszImeFile, (INT)cch, + lpszFileName, uBufLen, NULL, &bDefUsed); + if (uBufLen == 0) + return (UINT)cch; - HeapFree(GetProcessHeap(),0,bufW); - return rc; + if (cch > uBufLen - 1) + cch = uBufLen - 1; + + lpszFileName[cch] = 0; + return (UINT)cch; } /*********************************************************************** @@ -2228,45 +2227,29 @@ UINT WINAPI ImmGetIMEFileNameA( HKL hKL, LPSTR lpszFileName, UINT uBufLen) */ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) { - HKEY hkey; - DWORD length; - DWORD rc; - WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8]; - - wsprintfW( regKey, szImeRegFmt, (ULONG_PTR)hKL ); - rc = RegOpenKeyW( HKEY_LOCAL_MACHINE, regKey, &hkey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - return 0; - } + IMEINFOEX info; + size_t cch; - length = 0; - rc = RegGetValueW(hkey, NULL, szImeFileW, RRF_RT_REG_SZ, NULL, NULL, &length); + TRACE("ImmGetIMEFileNameW(%p, %p, %u)\n", hKL, lpszFileName, uBufLen); - if (rc != ERROR_SUCCESS) + if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL) || !IS_IME_HKL(hKL)) { - RegCloseKey(hkey); - SetLastError(rc); + if (uBufLen > 0) + lpszFileName[0] = 0; return 0; } - if (length > uBufLen * sizeof(WCHAR) || !lpszFileName) - { - RegCloseKey(hkey); - if (lpszFileName) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return 0; - } - else - return length / sizeof(WCHAR); - } - RegGetValueW(hkey, NULL, szImeFileW, RRF_RT_REG_SZ, NULL, lpszFileName, &length); + StringCchLengthW(info.wszImeFile, _countof(info.wszImeFile), &cch); + if (uBufLen == 0) + return (UINT)cch; + + StringCchCopyNW(lpszFileName, uBufLen, info.wszImeFile, cch); - RegCloseKey(hkey); + if (cch > uBufLen - 1) + cch = uBufLen - 1; - return length / sizeof(WCHAR); + lpszFileName[cch] = 0; + return (UINT)cch; } /***********************************************************************

1 0

[reactos] 01/01: [IMM32] Rewrite ImmGetDefaultIMEWnd (#3821)
by Katayama Hirofumi MZ 15 Jul '21

15 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3714ee269b099f9078bea… commit 3714ee269b099f9078bead13aeb2f655787b82c3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 15 21:59:53 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 15 21:59:53 2021 +0900 [IMM32] Rewrite ImmGetDefaultIMEWnd (#3821) - Rewrite ImmGetDefaultIMEWnd function. - Add g_dwImm32Flags global variable. - Add Imm32QueryWindow helper function. - Implement CtfImmIsCiceroEnabled function. - Modify imm32.spec. CORE-11700 --- dll/win32/imm32/imm.c | 31 ++++++++++++++++++++++++------- dll/win32/imm32/imm32.spec | 1 + 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index e68f59c35a1..4bcc133ae66 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -1005,6 +1005,11 @@ LRESULT WINAPI ImmEscapeW( #define ROUNDUP4(n) (((n) + 3) & ~3) /* DWORD alignment */ HANDLE g_hImm32Heap = NULL; +DWORD g_dwImm32Flags = 0; + +/* flags for g_dwImm32Flags */ +#define IMM32_FLAG_UNKNOWN 0x4 +#define IMM32_FLAG_CICERO_ENABLED 0x20 LPVOID APIENTRY Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes) { @@ -1023,6 +1028,11 @@ Imm32GetThreadState(DWORD Routine) return NtUserGetThreadState(Routine); } +static DWORD_PTR APIENTRY Imm32QueryWindow(HWND hWnd, DWORD Index) +{ + return NtUserQueryWindow(hWnd, Index); +} + static DWORD APIENTRY Imm32UpdateInputContext(HIMC hIMC, DWORD Unknown1, PCLIENTIMC pClientImc) { @@ -2096,14 +2106,21 @@ void WINAPI __wine_unregister_window(HWND hwnd) */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { - HWND ret; - IMMThreadData* thread_data = IMM_GetThreadData(hWnd, 0); - if (!thread_data) + if (!(g_dwImm32Flags & IMM32_FLAG_UNKNOWN)) return NULL; - ret = thread_data->hwndDefault; - LeaveCriticalSection(&threaddata_cs); - TRACE("Default is %p\n",ret); - return ret; + + if (hWnd == NULL) + return (HWND)Imm32GetThreadState(THREADSTATE_ACTIVEWINDOW); + + return (HWND)Imm32QueryWindow(hWnd, QUERY_WINDOW_DEFAULT_IME); +} + +/*********************************************************************** + * CtfImmIsCiceroEnabled (IMM32.@) + */ +BOOL WINAPI CtfImmIsCiceroEnabled(VOID) +{ + return !!(g_dwImm32Flags & IMM32_FLAG_CICERO_ENABLED); } /*********************************************************************** diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index b41e2ee2049..43107d4797a 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -1,3 +1,4 @@ +@ stdcall CtfImmIsCiceroEnabled() @ stdcall -stub ImmActivateLayout(long) @ stdcall ImmAssociateContext(ptr ptr) @ stdcall ImmAssociateContextEx(ptr ptr long)

1 0

[reactos] 02/02: [WIN32K] Check if a graphics device already exists before trying to add it
by Timo Kreuzer 15 Jul '21

15 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77e891b8ab93dda5c1a42… commit 77e891b8ab93dda5c1a4264df4427dc99163ac8a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jul 13 22:24:41 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jul 15 08:32:46 2021 +0200 [WIN32K] Check if a graphics device already exists before trying to add it This avoids DPRINTs alleging a failure to open a device. Also improve another DPRINT. --- win32ss/gdi/eng/device.c | 9 +++++++++ win32ss/user/ntuser/display.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index deca6e7a9ff..12fbcd0359b 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -37,6 +37,7 @@ EngpUpdateGraphicsDeviceList(VOID) { ULONG iDevNum, iVGACompatible = -1, ulMaxObjectNumber = 0; WCHAR awcDeviceName[20]; + UNICODE_STRING ustrDeviceName; WCHAR awcBuffer[256]; NTSTATUS Status; PGRAPHICS_DEVICE pGraphicsDevice; @@ -73,6 +74,14 @@ EngpUpdateGraphicsDeviceList(VOID) { /* Create the adapter's key name */ swprintf(awcDeviceName, L"\\Device\\Video%lu", iDevNum); + RtlInitUnicodeString(&ustrDeviceName, awcDeviceName); + + /* Check if the device exists already */ + pGraphicsDevice = EngpFindGraphicsDevice(&ustrDeviceName, iDevNum, 0); + if (pGraphicsDevice != NULL) + { + continue; + } /* Read the reg key name */ cbValue = sizeof(awcBuffer); diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index 676b7d0420c..df00c0e3974 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -257,7 +257,7 @@ UserEnumDisplayDevices( if (!pGraphicsDevice) { /* No device found */ - ERR("No GRAPHICS_DEVICE found\n"); + ERR("No GRAPHICS_DEVICE found for '%wZ', iDevNum %lu\n", pustrDevice, iDevNum); return STATUS_UNSUCCESSFUL; }

1 0

[reactos] 01/02: [WIN32K] Fix detection of multiple display devices on VBox
by Timo Kreuzer 15 Jul '21

15 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=39d8a822d258b9c61faee… commit 39d8a822d258b9c61faee80bdf6d9621976eea59 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jul 13 08:29:11 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jul 15 08:32:46 2021 +0200 [WIN32K] Fix detection of multiple display devices on VBox --- win32ss/gdi/eng/device.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index 46b9716016f..deca6e7a9ff 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -92,14 +92,16 @@ EngpUpdateGraphicsDeviceList(VOID) { /* Save this as the VGA adapter */ if (!gpVgaGraphicsDevice) + { gpVgaGraphicsDevice = pGraphicsDevice; - TRACE("gpVgaGraphicsDevice = %p\n", gpVgaGraphicsDevice); + TRACE("gpVgaGraphicsDevice = %p\n", gpVgaGraphicsDevice); + } } - else + + /* Set the first one as primary device */ + if (!gpPrimaryGraphicsDevice) { - /* Set the first one as primary device */ - if (!gpPrimaryGraphicsDevice) - gpPrimaryGraphicsDevice = pGraphicsDevice; + gpPrimaryGraphicsDevice = pGraphicsDevice; TRACE("gpPrimaryGraphicsDevice = %p\n", gpPrimaryGraphicsDevice); } }

1 0

[reactos] 01/01: [NETAPI32] Return the old values for NetGetJoinInformation() to fix Chrome Installer regression
by Eric Kohl 14 Jul '21

14 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2210d23fc7f3fb939ce47… commit 2210d23fc7f3fb939ce47d8cc3c0ce4c59396c86 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Jul 14 15:22:17 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Jul 14 15:22:17 2021 +0200 [NETAPI32] Return the old values for NetGetJoinInformation() to fix Chrome Installer regression Should fix CORE-17679 --- dll/win32/netapi32/wksta_new.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dll/win32/netapi32/wksta_new.c b/dll/win32/netapi32/wksta_new.c index 0ec1d020a6a..2739a6c86e0 100644 --- a/dll/win32/netapi32/wksta_new.c +++ b/dll/win32/netapi32/wksta_new.c @@ -319,7 +319,7 @@ NetGetJoinInformation( _Out_ LPWSTR *lpNameBuffer, _Out_ PNETSETUP_JOIN_STATUS BufferType) { - NET_API_STATUS status; + NET_API_STATUS status = NERR_Success; TRACE("NetGetJoinInformation(%s %p %p)\n", debugstr_w(lpServer), lpNameBuffer, BufferType); @@ -327,6 +327,8 @@ NetGetJoinInformation( if (lpNameBuffer == NULL || BufferType == NULL) return ERROR_INVALID_PARAMETER; + /* Disabled because of CORE-17679 */ +#if 0 *lpNameBuffer = NULL; RpcTryExcept { @@ -339,6 +341,10 @@ NetGetJoinInformation( status = I_RpcMapWin32Status(RpcExceptionCode()); } RpcEndExcept; +#endif + + *lpNameBuffer = NULL; + *BufferType = NetSetupUnknownStatus; return status; }

1 0

[reactos] 01/01: [IMM32_APITEST] Add clientimc testcase (#3815)
by Katayama Hirofumi MZ 13 Jul '21

13 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a9c77b3be66780ba09a1… commit 5a9c77b3be66780ba09a16cdf273f46f3d59a399 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jul 14 01:19:35 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 14 01:19:35 2021 +0900 [IMM32_APITEST] Add clientimc testcase (#3815) - Add clientimc testcase to imm32_apitest. - Add "precomp.h". CORE-11700 --- modules/rostests/apitests/imm32/CMakeLists.txt | 3 ++ modules/rostests/apitests/imm32/clientimc.c | 53 ++++++++++++++++++++++++++ modules/rostests/apitests/imm32/imcc.c | 6 +-- modules/rostests/apitests/imm32/precomp.h | 15 ++++++++ modules/rostests/apitests/imm32/testlist.c | 2 + sdk/include/reactos/imm32_undoc.h | 3 ++ 6 files changed, 77 insertions(+), 5 deletions(-) diff --git a/modules/rostests/apitests/imm32/CMakeLists.txt b/modules/rostests/apitests/imm32/CMakeLists.txt index 7e5e1223d7b..2edcec8f68f 100644 --- a/modules/rostests/apitests/imm32/CMakeLists.txt +++ b/modules/rostests/apitests/imm32/CMakeLists.txt @@ -1,5 +1,8 @@ +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) + list(APPEND SOURCE + clientimc.c imcc.c testlist.c) diff --git a/modules/rostests/apitests/imm32/clientimc.c b/modules/rostests/apitests/imm32/clientimc.c new file mode 100644 index 00000000000..99ed8423537 --- /dev/null +++ b/modules/rostests/apitests/imm32/clientimc.c @@ -0,0 +1,53 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for imm32 ImmLockClientImc/ImmUnlockClientImc + * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "precomp.h" + +#if 0 +static void DumpBinary(LPCVOID pv, size_t cb) +{ + const BYTE *pb = pv; + while (cb--) + { + printf("%02X ", (BYTE)*pb++); + } + printf("\n"); +} +#endif + +START_TEST(clientimc) +{ + DWORD dwCode; + CLIENTIMC *pClientImc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CLIENTIMC)); + + pClientImc->hImc = (HIMC)ImmCreateIMCC(4); + pClientImc->cLockObj = 2; + pClientImc->dwFlags = 0x40; + RtlInitializeCriticalSection(&pClientImc->cs); + ok_long(ImmGetIMCCSize(pClientImc->hImc), 4); + + ImmUnlockClientImc(pClientImc); + ok_long(pClientImc->cLockObj, 1); + ok_long(ImmGetIMCCSize(pClientImc->hImc), 4); + + dwCode = 0; + _SEH2_TRY + { + ImmUnlockClientImc(pClientImc); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + dwCode = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_long(dwCode, STATUS_ACCESS_VIOLATION); + + ok_long(pClientImc->cLockObj, 0); + ok_long(ImmGetIMCCSize(pClientImc->hImc), 0); + + HeapFree(GetProcessHeap(), 0, pClientImc); +} diff --git a/modules/rostests/apitests/imm32/imcc.c b/modules/rostests/apitests/imm32/imcc.c index 230222be263..59829a4e35b 100644 --- a/modules/rostests/apitests/imm32/imcc.c +++ b/modules/rostests/apitests/imm32/imcc.c @@ -5,11 +5,7 @@ * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ -#include <ntstatus.h> -#define WIN32_NO_STATUS -#include <windows.h> -#include <imm.h> -#include "wine/test.h" +#include "precomp.h" START_TEST(imcc) { diff --git a/modules/rostests/apitests/imm32/precomp.h b/modules/rostests/apitests/imm32/precomp.h new file mode 100644 index 00000000000..aaa4172e358 --- /dev/null +++ b/modules/rostests/apitests/imm32/precomp.h @@ -0,0 +1,15 @@ +#pragma once + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include <imm.h> +#include <ddk/imm.h> +#include <pseh/pseh2.h> +#include <ndk/umtypes.h> +#include <ndk/pstypes.h> +#include "../../../win32ss/include/ntuser.h" +#include <imm32_undoc.h> +#include <ndk/rtlfuncs.h> +#include <wine/test.h> +#include <stdio.h> diff --git a/modules/rostests/apitests/imm32/testlist.c b/modules/rostests/apitests/imm32/testlist.c index 15f00bfca65..a9b8f92a791 100644 --- a/modules/rostests/apitests/imm32/testlist.c +++ b/modules/rostests/apitests/imm32/testlist.c @@ -2,10 +2,12 @@ #define STANDALONE #include <wine/test.h> +extern void func_clientimc(void); extern void func_imcc(void); const struct test winetest_testlist[] = { + { "clientimc", func_clientimc }, { "imcc", func_imcc }, { 0, 0 } }; diff --git a/sdk/include/reactos/imm32_undoc.h b/sdk/include/reactos/imm32_undoc.h index 8332d6bfde9..e207d52bc0e 100644 --- a/sdk/include/reactos/imm32_undoc.h +++ b/sdk/include/reactos/imm32_undoc.h @@ -32,6 +32,9 @@ extern "C" { BOOL WINAPI ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearchKey); +PCLIENTIMC WINAPI ImmLockClientImc(HIMC hImc); +VOID WINAPI ImmUnlockClientImc(PCLIENTIMC pClientImc); + #ifdef __cplusplus } // extern "C" #endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs