Ros-diffs June 2019

ros-diffs@reactos.org

28 participants
288 discussions

[reactos] 05/05: [NTOSKRNL] On device map freeing, make directory object temporary again

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=848f7bb687b77de1302b0… commit 848f7bb687b77de1302b013765e486d864ea31c6 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jun 1 13:59:13 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jun 1 13:59:13 2019 +0200 [NTOSKRNL] On device map freeing, make directory object temporary again --- ntoskrnl/ob/devicemap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ob/devicemap.c b/ntoskrnl/ob/devicemap.c index 8cda474a38d..dd501f134f8 100644 --- a/ntoskrnl/ob/devicemap.c +++ b/ntoskrnl/ob/devicemap.c @@ -189,7 +189,8 @@ ObfDereferenceDeviceMap(IN PDEVICE_MAP DeviceMap) KeReleaseGuardedMutex(&ObpDeviceMapLock); /* Dereference the DOS Devices Directory and free the Device Map */ - ObDereferenceObject(DeviceMap->DosDevicesDirectory ); + ObMakeTemporaryObject(DeviceMap->DosDevicesDirectory); + ObDereferenceObject(DeviceMap->DosDevicesDirectory); ExFreePoolWithTag(DeviceMap, 'mDbO'); }

5 years, 6 months

[reactos] 04/05: [NTOSKRNL] De-duplicate code between Ob(f)DereferenceDeviceMap functions

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=221ed8814121e5fb5af5e… commit 221ed8814121e5fb5af5e56a9197d34e9c091824 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jun 1 13:54:15 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jun 1 13:54:34 2019 +0200 [NTOSKRNL] De-duplicate code between Ob(f)DereferenceDeviceMap functions --- ntoskrnl/ob/devicemap.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/ntoskrnl/ob/devicemap.c b/ntoskrnl/ob/devicemap.c index c79838bbabd..8cda474a38d 100644 --- a/ntoskrnl/ob/devicemap.c +++ b/ntoskrnl/ob/devicemap.c @@ -156,33 +156,8 @@ ObDereferenceDeviceMap(IN PEPROCESS Process) KeReleaseGuardedMutex(&ObpDeviceMapLock); /* Continue only if there is a device map */ - if (DeviceMap == NULL) - return; - - /* Acquire the device map lock again */ - KeAcquireGuardedMutex(&ObpDeviceMapLock); - - /* Decrement the reference counter */ - DeviceMap->ReferenceCount--; - DPRINT("ReferenceCount: %lu\n", DeviceMap->ReferenceCount); - - /* Leave, if there are still references to this device map */ - if (DeviceMap->ReferenceCount != 0) - { - /* Release the device map lock and leave */ - KeReleaseGuardedMutex(&ObpDeviceMapLock); - return; - } - - /* Nobody is referencing it anymore, unlink the DOS directory */ - DeviceMap->DosDevicesDirectory->DeviceMap = NULL; - - /* Release the device map lock */ - KeReleaseGuardedMutex(&ObpDeviceMapLock); - - /* Dereference the DOS Devices Directory and free the DeviceMap */ - ObDereferenceObject(DeviceMap->DosDevicesDirectory); - ExFreePoolWithTag(DeviceMap, 'mDbO'); + if (DeviceMap != NULL) + ObfDereferenceDeviceMap(DeviceMap); }

5 years, 6 months

[reactos] 03/05: [NTOSKRNL] Add a few ASSERTs to ObpGetDosDevicesProtection for DBG builds

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b42731dca0df26788dd2… commit 1b42731dca0df26788dd20cb709c216dbc422dc9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jun 1 13:51:40 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jun 1 13:51:40 2019 +0200 [NTOSKRNL] Add a few ASSERTs to ObpGetDosDevicesProtection for DBG builds --- ntoskrnl/ob/obname.c | 118 ++++++++++++++++++++++++++++----------------------- 1 file changed, 66 insertions(+), 52 deletions(-) diff --git a/ntoskrnl/ob/obname.c b/ntoskrnl/ob/obname.c index 866ac748d84..d76ed10a919 100644 --- a/ntoskrnl/ob/obname.c +++ b/ntoskrnl/ob/obname.c @@ -41,9 +41,11 @@ ObpGetDosDevicesProtection(OUT PSECURITY_DESCRIPTOR SecurityDescriptor) { PACL Dacl; ULONG AclSize; + NTSTATUS Status; /* Initialize the SD */ - RtlCreateSecurityDescriptor(SecurityDescriptor, SECURITY_DESCRIPTOR_REVISION); + Status = RtlCreateSecurityDescriptor(SecurityDescriptor, SECURITY_DESCRIPTOR_REVISION); + ASSERT(NT_SUCCESS(Status)); if (ObpProtectionMode & 1) { @@ -63,42 +65,49 @@ ObpGetDosDevicesProtection(OUT PSECURITY_DESCRIPTOR SecurityDescriptor) } /* Initialize the DACL */ - RtlCreateAcl(Dacl, AclSize, ACL_REVISION); + Status = RtlCreateAcl(Dacl, AclSize, ACL_REVISION); + ASSERT(NT_SUCCESS(Status)); /* Add the ACEs */ - RtlAddAccessAllowedAce(Dacl, - ACL_REVISION, - GENERIC_READ | GENERIC_EXECUTE, - SeWorldSid); - - RtlAddAccessAllowedAce(Dacl, - ACL_REVISION, - GENERIC_ALL, - SeLocalSystemSid); - - RtlAddAccessAllowedAceEx(Dacl, - ACL_REVISION, - INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE, - GENERIC_EXECUTE, - SeWorldSid); - - RtlAddAccessAllowedAceEx(Dacl, - ACL_REVISION, - INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE, - GENERIC_ALL, - SeAliasAdminsSid); - - RtlAddAccessAllowedAceEx(Dacl, - ACL_REVISION, - INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE, - GENERIC_ALL, - SeLocalSystemSid); - - RtlAddAccessAllowedAceEx(Dacl, - ACL_REVISION, - INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE, - GENERIC_ALL, - SeCreatorOwnerSid); + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_READ | GENERIC_EXECUTE, + SeWorldSid); + ASSERT(NT_SUCCESS(Status)); + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + SeLocalSystemSid); + ASSERT(NT_SUCCESS(Status)); + + Status = RtlAddAccessAllowedAceEx(Dacl, + ACL_REVISION, + INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE, + GENERIC_EXECUTE, + SeWorldSid); + ASSERT(NT_SUCCESS(Status)); + + Status = RtlAddAccessAllowedAceEx(Dacl, + ACL_REVISION, + INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE, + GENERIC_ALL, + SeAliasAdminsSid); + ASSERT(NT_SUCCESS(Status)); + + Status = RtlAddAccessAllowedAceEx(Dacl, + ACL_REVISION, + INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE, + GENERIC_ALL, + SeLocalSystemSid); + ASSERT(NT_SUCCESS(Status)); + + Status = RtlAddAccessAllowedAceEx(Dacl, + ACL_REVISION, + INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE, + GENERIC_ALL, + SeCreatorOwnerSid); + ASSERT(NT_SUCCESS(Status)); } else { @@ -115,28 +124,33 @@ ObpGetDosDevicesProtection(OUT PSECURITY_DESCRIPTOR SecurityDescriptor) } /* Initialize the DACL */ - RtlCreateAcl(Dacl, AclSize, ACL_REVISION); + Status = RtlCreateAcl(Dacl, AclSize, ACL_REVISION); + ASSERT(NT_SUCCESS(Status)); /* Add the ACEs */ - RtlAddAccessAllowedAce(Dacl, - ACL_REVISION, - GENERIC_READ | GENERIC_EXECUTE | GENERIC_WRITE, - SeWorldSid); - - RtlAddAccessAllowedAce(Dacl, - ACL_REVISION, - GENERIC_ALL, - SeLocalSystemSid); - - RtlAddAccessAllowedAceEx(Dacl, - ACL_REVISION, - INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE, - GENERIC_ALL, - SeWorldSid); + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_READ | GENERIC_EXECUTE | GENERIC_WRITE, + SeWorldSid); + ASSERT(NT_SUCCESS(Status)); + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + SeLocalSystemSid); + ASSERT(NT_SUCCESS(Status)); + + Status = RtlAddAccessAllowedAceEx(Dacl, + ACL_REVISION, + INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE, + GENERIC_ALL, + SeWorldSid); + ASSERT(NT_SUCCESS(Status)); } /* Attach the DACL to the SD */ - RtlSetDaclSecurityDescriptor(SecurityDescriptor, TRUE, Dacl, FALSE); + Status = RtlSetDaclSecurityDescriptor(SecurityDescriptor, TRUE, Dacl, FALSE); + ASSERT(NT_SUCCESS(Status)); return STATUS_SUCCESS; }

5 years, 6 months

[reactos] 02/05: [NTOSKRNL] Implement ObpFreeDosDevicesProtection to free DACL

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f655f9466eca0f0c5d47… commit 8f655f9466eca0f0c5d4719c1cccd032e4a14ae2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jun 1 13:44:55 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jun 1 13:44:55 2019 +0200 [NTOSKRNL] Implement ObpFreeDosDevicesProtection to free DACL --- ntoskrnl/ob/obname.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/ob/obname.c b/ntoskrnl/ob/obname.c index 6c996132d87..866ac748d84 100644 --- a/ntoskrnl/ob/obname.c +++ b/ntoskrnl/ob/obname.c @@ -141,6 +141,22 @@ ObpGetDosDevicesProtection(OUT PSECURITY_DESCRIPTOR SecurityDescriptor) return STATUS_SUCCESS; } +INIT_FUNCTION +VOID +NTAPI +ObpFreeDosDevicesProtection(OUT PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + PACL Dacl; + NTSTATUS Status; + BOOLEAN DaclPresent, DaclDefaulted; + + Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor, &DaclPresent, &Dacl, &DaclDefaulted); + ASSERT(NT_SUCCESS(Status)); + ASSERT(DaclPresent); + ASSERT(Dacl != NULL); + ExFreePoolWithTag(Dacl, 'lcaD'); +} + INIT_FUNCTION NTSTATUS NTAPI @@ -151,8 +167,6 @@ ObpCreateDosDevicesDirectory(VOID) HANDLE Handle, SymHandle; SECURITY_DESCRIPTOR DosDevicesSD; NTSTATUS Status; - PACL Dacl; - BOOLEAN DaclPresent, DaclDefaulted; /* Create a custom security descriptor for the global DosDevices directory */ Status = ObpGetDosDevicesProtection(&DosDevicesSD); @@ -256,8 +270,7 @@ ObpCreateDosDevicesDirectory(VOID) if (NT_SUCCESS(Status)) NtClose(SymHandle); done: - RtlGetDaclSecurityDescriptor(&DosDevicesSD, &DaclPresent, &Dacl, &DaclDefaulted); - ExFreePoolWithTag(Dacl, 'lcaD'); + ObpFreeDosDevicesProtection(&DosDevicesSD); /* Return status */ return Status;

5 years, 6 months

[reactos] 01/05: [NTOSKRNL] Modify ObpCreateDeviceMap so that it can handle any process It is now able to set the newly created device map to any process and will default to current process if none is provided. It also sets system device map if no process is specified. It also deferences existing device map in the process if needed. Finaly, it will make the directory object permanant.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=933dddeb075583e7584ff… commit 933dddeb075583e7584ff4bb8644ae4fb6a31d68 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jun 1 13:35:41 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jun 1 13:35:41 2019 +0200 [NTOSKRNL] Modify ObpCreateDeviceMap so that it can handle any process It is now able to set the newly created device map to any process and will default to current process if none is provided. It also sets system device map if no process is specified. It also deferences existing device map in the process if needed. Finaly, it will make the directory object permanant. --- ntoskrnl/include/internal/ob.h | 6 +-- ntoskrnl/ob/devicemap.c | 85 +++++++++++++++++++++++++++++++++++++++--- ntoskrnl/ob/obname.c | 2 +- 3 files changed, 83 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/include/internal/ob.h b/ntoskrnl/include/internal/ob.h index ce8c5a0dc75..b2d7037d9dc 100644 --- a/ntoskrnl/include/internal/ob.h +++ b/ntoskrnl/include/internal/ob.h @@ -399,9 +399,9 @@ ObReferenceFileObjectForWrite( // NTSTATUS NTAPI -ObpCreateDeviceMap( - IN HANDLE DirectoryHandle -); +ObSetDeviceMap( + IN PEPROCESS Process, + IN HANDLE DirectoryHandle); VOID NTAPI diff --git a/ntoskrnl/ob/devicemap.c b/ntoskrnl/ob/devicemap.c index 32f45fa4a64..c79838bbabd 100644 --- a/ntoskrnl/ob/devicemap.c +++ b/ntoskrnl/ob/devicemap.c @@ -17,11 +17,14 @@ NTSTATUS NTAPI -ObpCreateDeviceMap(IN HANDLE DirectoryHandle) +ObSetDeviceMap(IN PEPROCESS Process, + IN HANDLE DirectoryHandle) { POBJECT_DIRECTORY DirectoryObject = NULL; - PDEVICE_MAP DeviceMap = NULL; + PDEVICE_MAP DeviceMap = NULL, NewDeviceMap = NULL, OldDeviceMap; NTSTATUS Status; + PEPROCESS WorkProcess; + BOOLEAN MakePermanant = FALSE; Status = ObReferenceObjectByHandle(DirectoryHandle, DIRECTORY_TRAVERSE, @@ -36,7 +39,7 @@ ObpCreateDeviceMap(IN HANDLE DirectoryHandle) } /* Allocate and initialize a new device map */ - DeviceMap = ExAllocatePoolWithTag(NonPagedPool, + DeviceMap = ExAllocatePoolWithTag(PagedPool, sizeof(*DeviceMap), 'mDbO'); if (DeviceMap == NULL) @@ -54,15 +57,85 @@ ObpCreateDeviceMap(IN HANDLE DirectoryHandle) KeAcquireGuardedMutex(&ObpDeviceMapLock); /* Attach the device map to the directory object */ - DirectoryObject->DeviceMap = DeviceMap; + if (DirectoryObject->DeviceMap == NULL) + { + DirectoryObject->DeviceMap = DeviceMap; + } + else + { + NewDeviceMap = DeviceMap; + + /* There's already a device map, + so reuse it */ + DeviceMap = DirectoryObject->DeviceMap; + ++DeviceMap->ReferenceCount; + } + + /* Caller gave a process, use it */ + if (Process != NULL) + { + WorkProcess = Process; + } + /* If no process given, use current and + * set system device map */ + else + { + WorkProcess = PsGetCurrentProcess(); + ObSystemDeviceMap = DeviceMap; + } + + /* If current object isn't system one, save system one in current + * device map */ + if (DirectoryObject != ObSystemDeviceMap->DosDevicesDirectory) + { + /* We also need to make the object permanant */ + DeviceMap->GlobalDosDevicesDirectory = ObSystemDeviceMap->DosDevicesDirectory; + MakePermanant = TRUE; + } + /* Save old process device map */ + OldDeviceMap = WorkProcess->DeviceMap; /* Attach the device map to the process */ - ObSystemDeviceMap = DeviceMap; - PsGetCurrentProcess()->DeviceMap = DeviceMap; + WorkProcess->DeviceMap = DeviceMap; /* Release the device map lock */ KeReleaseGuardedMutex(&ObpDeviceMapLock); + /* If we have to make the object permamant, do it now */ + if (MakePermanant) + { + POBJECT_HEADER ObjectHeader; + POBJECT_HEADER_NAME_INFO HeaderNameInfo; + + ObjectHeader = OBJECT_TO_OBJECT_HEADER(DirectoryObject); + HeaderNameInfo = ObpReferenceNameInfo(ObjectHeader); + + ObpEnterObjectTypeMutex(ObjectHeader->Type); + if (HeaderNameInfo != NULL && HeaderNameInfo->Directory != NULL) + { + ObjectHeader->Flags |= OB_FLAG_PERMANENT; + } + ObpLeaveObjectTypeMutex(ObjectHeader->Type); + + if (HeaderNameInfo != NULL) + { + ObpDereferenceNameInfo(HeaderNameInfo); + } + } + + /* Release useless device map if required */ + if (NewDeviceMap != NULL) + { + ObfDereferenceObject(DirectoryObject); + ExFreePoolWithTag(NewDeviceMap, 'mDbO'); + } + + /* And dereference previous process device map */ + if (OldDeviceMap != NULL) + { + ObfDereferenceDeviceMap(OldDeviceMap); + } + return STATUS_SUCCESS; } diff --git a/ntoskrnl/ob/obname.c b/ntoskrnl/ob/obname.c index f9ccb914022..6c996132d87 100644 --- a/ntoskrnl/ob/obname.c +++ b/ntoskrnl/ob/obname.c @@ -173,7 +173,7 @@ ObpCreateDosDevicesDirectory(VOID) goto done; /* Create the system device map */ - Status = ObpCreateDeviceMap(Handle); + Status = ObSetDeviceMap(NULL, Handle); if (!NT_SUCCESS(Status)) goto done;

5 years, 6 months

[reactos] 01/01: [SDK][INCLUDE] msgdump.h registered message support

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5b88ff0aee4cb1629aa0… commit d5b88ff0aee4cb1629aa0e34197c234eb3f837e4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jun 1 16:21:33 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Jun 1 16:21:33 2019 +0900 [SDK][INCLUDE] msgdump.h registered message support --- sdk/include/reactos/msgdump.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h index 209ce545fed..514914a30c9 100644 --- a/sdk/include/reactos/msgdump.h +++ b/sdk/include/reactos/msgdump.h @@ -2,10 +2,10 @@ * PROJECT: ReactOS header files * LICENSE: CC-BY-4.0 (https://spdx.org/licenses/CC-BY-4.0.html) * PURPOSE: Win32API message dumping - * COPYRIGHT: Copyright 2018 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + * COPYRIGHT: Copyright 2018-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #ifndef _INC_MSGDUMP -#define _INC_MSGDUMP 4 /* Version 4 */ +#define _INC_MSGDUMP 5 /* Version 5 */ /* * NOTE: MD_msgdump function in this file provides Win32API message dump feature. @@ -61,6 +61,17 @@ MD_rect_text(TCHAR *buf, size_t bufsize, const RECT *prc) static __inline LRESULT MSGDUMP_API MD_OnUnknown(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + TCHAR szName[64]; + if (0xC000 <= uMsg && uMsg <= 0xFFFF && + GlobalGetAtomName(uMsg, szName, ARRAYSIZE(szName))) + { + // RegisterWindowMessage'd message + MSGDUMP_TPRINTF(TEXT("%s'%s'(%u)(hwnd:%p, wParam:%p, lParam:%p)\n"), + MSGDUMP_PREFIX, szName, uMsg, (void *)hwnd, (void *)wParam, + (void *)lParam); + return 0; + } + MSGDUMP_TPRINTF(TEXT("%sWM_%u(hwnd:%p, wParam:%p, lParam:%p)\n"), MSGDUMP_PREFIX, uMsg, (void *)hwnd, (void *)wParam, (void *)lParam); return 0;

5 years, 6 months

[reactos] 01/01: [User32] Fix Clipboard Meta Test Results

by jimtabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73558e94df8e76bb50fe9… commit 73558e94df8e76bb50fe9b9b45d48d5cabf8e243 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Fri May 31 22:59:29 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Fri May 31 22:59:29 2019 -0500 [User32] Fix Clipboard Meta Test Results Fix meta data handle returns. --- win32ss/user/user32/windows/clipboard.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/win32ss/user/user32/windows/clipboard.c b/win32ss/user/user32/windows/clipboard.c index 95fb87811be..bb51ce76ab1 100644 --- a/win32ss/user/user32/windows/clipboard.c +++ b/win32ss/user/user32/windows/clipboard.c @@ -303,7 +303,7 @@ SetClipboardData(UINT uFormat, HANDLE hMem) DWORD dwSize; HANDLE hGlobal; LPVOID pMem; - HANDLE hRet = NULL; + HANDLE hRet = NULL, hTemp; SETCLIPBDATA scd = {FALSE, FALSE}; /* Check if this is a delayed rendering */ @@ -318,13 +318,15 @@ SetClipboardData(UINT uFormat, HANDLE hMem) /* Meta files are probably checked for validity */ else if (uFormat == CF_DSPMETAFILEPICT || uFormat == CF_METAFILEPICT ) { - hMem = GdiConvertMetaFilePict( hMem ); - hRet = NtUserSetClipboardData(uFormat, hMem, &scd); + hTemp = GdiConvertMetaFilePict( hMem ); + hRet = NtUserSetClipboardData(uFormat, hTemp, &scd); // Note : LOL, it returns a BOOL not a HANDLE!!!! + if (hRet == hTemp) hRet = hMem; // If successful "TRUE", return the original handle. } else if (uFormat == CF_DSPENHMETAFILE || uFormat == CF_ENHMETAFILE) { - hMem = GdiConvertEnhMetaFile( hMem ); - hRet = NtUserSetClipboardData(uFormat, hMem, &scd); + hTemp = GdiConvertEnhMetaFile( hMem ); + hRet = NtUserSetClipboardData(uFormat, hTemp, &scd); + if (hRet == hTemp) hRet = hMem; } else {

5 years, 6 months

[reactos] 01/01: [Win32SS] Support Clipboard Metafile

by jimtabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da264743e1f53d1bb4723… commit da264743e1f53d1bb4723590e47132f73071cf0d Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Fri May 31 21:44:17 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Fri May 31 21:44:17 2019 -0500 [Win32SS] Support Clipboard Metafile Major fix ups and plugging in missing code changes. Handle code is from another project currently being developed for ReactOS. See CORE-12143 --- win32ss/gdi/gdi32/objects/enhmfile.c | 84 +++++++++++++++++++++++++++---- win32ss/gdi/gdi32/objects/metafile.c | 89 ++++++++++++++++++++------------- win32ss/gdi/ntgdi/gdiobj.c | 6 ++- win32ss/gdi/ntgdi/metafile.c | 29 +++-------- win32ss/include/ntgdityp.h | 5 ++ win32ss/user/ntuser/clipboard.c | 9 +++- win32ss/user/user32/windows/clipboard.c | 28 +++++++++-- 7 files changed, 173 insertions(+), 77 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/enhmfile.c b/win32ss/gdi/gdi32/objects/enhmfile.c index bf8a94a947d..a7d168dc20a 100644 --- a/win32ss/gdi/gdi32/objects/enhmfile.c +++ b/win32ss/gdi/gdi32/objects/enhmfile.c @@ -38,27 +38,89 @@ IsValidEnhMetaRecordOffExt( } /* - * @unimplemented + * @implemented */ -HENHMETAFILE +HANDLE WINAPI -GdiConvertEnhMetaFile(HENHMETAFILE hmf) +GdiConvertEnhMetaFile(HENHMETAFILE hemf) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + HANDLE hmo = NULL; + BYTE * Buffer = NULL; + UINT nSize; + + nSize = GetEnhMetaFileBits( hemf, 0, NULL ); + if (nSize == 0) + goto Exit; + + // allocate buffer + Buffer = (BYTE *)LocalAlloc(LPTR, nSize); + if (Buffer == NULL) + goto Exit; + + nSize = GetEnhMetaFileBits( hemf, nSize, Buffer ); + if (nSize == 0) + goto Exit; + + hmo = NtGdiCreateServerMetaFile( GDITAG_TYPE_EMF, nSize, Buffer, 0, 0, 0 ); + +Exit: + // clean up + if (Buffer) + LocalFree(Buffer); + return hmo; } /* - * @unimplemented + * @implemented */ HENHMETAFILE WINAPI -GdiCreateLocalEnhMetaFile(HENHMETAFILE hmo) +GdiCreateLocalEnhMetaFile(HANDLE hmo) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + HENHMETAFILE hEMF; + BYTE * Buffer = NULL; + UINT nSize; + DWORD iType, mm, xExt, yExt; + + nSize = NtGdiGetServerMetaFileBits( hmo, 0, NULL, NULL, NULL, NULL, NULL); + if (nSize == 0) + goto Exit; + + // allocate buffer + Buffer = (BYTE *)LocalAlloc(LPTR, nSize); + if (Buffer == NULL) + goto Exit; + + // store to buffer + nSize = NtGdiGetServerMetaFileBits( hmo, nSize, Buffer, &iType, &mm, &xExt, &yExt); + if (nSize == 0) + goto Exit; + + if ( iType == GDITAG_TYPE_MFP ) // handle conversion to EMF + { + METAFILEPICT Info; + + Info.hMF = NULL; + Info.mm = mm; + Info.xExt = xExt; + Info.yExt = yExt; + + hEMF = SetWinMetaFileBits( nSize, Buffer, NULL, &Info ); // Translate from old style to new style. + if (hEMF == NULL) + goto Exit; + } + else + { + hEMF = SetEnhMetaFileBits(nSize, Buffer); + if (hEMF == NULL) + goto Exit; + } + +Exit: + // clean up + if (Buffer) + LocalFree(Buffer); + return hEMF; } /* diff --git a/win32ss/gdi/gdi32/objects/metafile.c b/win32ss/gdi/gdi32/objects/metafile.c index 44cea8e6739..e1a51fb69f4 100644 --- a/win32ss/gdi/gdi32/objects/metafile.c +++ b/win32ss/gdi/gdi32/objects/metafile.c @@ -6,6 +6,8 @@ * PROGRAMMERS: Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include <precomp.h> + +#define NDEBUG #include <debug.h> /* FUNCTIONS *****************************************************************/ @@ -101,14 +103,16 @@ GdiIsMetaPrintDC(HDC hDC) */ HGLOBAL WINAPI -GdiCreateLocalMetaFilePict(HENHMETAFILE hEMF) +GdiCreateLocalMetaFilePict(HANDLE hmo) { HGLOBAL hMetaFilePict; METAFILEPICT * pInfo; HMETAFILE hMF = NULL; BYTE * Buffer = NULL; + BYTE * BufNew = NULL; HDC hDC = NULL; - UINT nSize; + UINT nSize, cSize; + DWORD iType; // NOTE: On Win32, there is no difference between the local heap and // the global heap. GlobalAlloc and LocalAlloc have same effect. @@ -119,15 +123,7 @@ GdiCreateLocalMetaFilePict(HENHMETAFILE hEMF) if (pInfo == NULL) goto Exit; - // create DC - hDC = CreateCompatibleDC(NULL); - if (hDC == NULL) - goto Exit; - - // get size of dest buffer - nSize = GetWinMetaFileBits(hEMF, 0, NULL, MM_ANISOTROPIC, hDC); - if (nSize == 0) - goto Exit; + nSize = NtGdiGetServerMetaFileBits( hmo, 0, NULL, NULL, NULL, NULL, NULL ); // allocate buffer Buffer = (BYTE *)LocalAlloc(LPTR, nSize); @@ -135,20 +131,54 @@ GdiCreateLocalMetaFilePict(HENHMETAFILE hEMF) goto Exit; // store to buffer - nSize = GetWinMetaFileBits(hEMF, nSize, Buffer, MM_ANISOTROPIC, hDC); + nSize = NtGdiGetServerMetaFileBits( hmo, nSize, Buffer, &iType, (PDWORD)&pInfo->mm, (PDWORD)&pInfo->xExt, (PDWORD)&pInfo->yExt ); if (nSize == 0) goto Exit; + if ( iType == GDITAG_TYPE_EMF ) // handle conversion to MFP + { + static const WCHAR szDisplayW[] = { 'D','I','S','P','L','A','Y','\0' }; + HENHMETAFILE hEMF; + PENHMETAHEADER pemh = (PENHMETAHEADER)Buffer; + + pInfo->mm = MM_ANISOTROPIC; + pInfo->xExt = pemh->rclFrame.right - pemh->rclFrame.left; // Width + pInfo->yExt = pemh->rclFrame.bottom - pemh->rclFrame.top; // Height + + hEMF = SetEnhMetaFileBits(nSize, Buffer); + if (hEMF == NULL) + goto Exit; + + hDC = CreateDCW(szDisplayW, NULL, NULL, NULL); + if (hDC) + { + cSize = GetWinMetaFileBits( hEMF, 0, NULL, MM_ANISOTROPIC, hDC ); + if (cSize) + { + BufNew = (BYTE *)LocalAlloc(LPTR, cSize); + if (BufNew) + { + nSize = GetWinMetaFileBits( hEMF, cSize, (LPBYTE)BufNew, MM_ANISOTROPIC, hDC ); + if (nSize == cSize) + { + if (Buffer) LocalFree(Buffer); + Buffer = BufNew; + } + } + } + DeleteDC(hDC); + } + DeleteEnhMetaFile(hEMF); + + if (Buffer != BufNew) + goto Exit; + } + // create metafile from buffer hMF = SetMetaFileBitsEx(nSize, Buffer); if (hMF == NULL) goto Exit; - // no suggested size is supplied - pInfo->mm = MM_ANISOTROPIC; - pInfo->xExt = 0; - pInfo->yExt = 0; - // set metafile handle pInfo->hMF = hMF; @@ -156,8 +186,6 @@ Exit: // clean up if (Buffer) LocalFree(Buffer); - if (hDC) - DeleteDC(hDC); if (pInfo) GlobalUnlock(hMetaFilePict); if (hMF == NULL) @@ -173,16 +201,15 @@ Exit: /* * @implemented */ -HENHMETAFILE +HANDLE WINAPI GdiConvertMetaFilePict(HGLOBAL hMetaFilePict) { HMETAFILE hMF; UINT nSize; - HENHMETAFILE hEMF = NULL; - BYTE * Buffer = NULL; - HDC hDC = NULL; - METAFILEPICT * pInfo = NULL; + HANDLE hmo = NULL; + BYTE * Buffer = NULL; + METAFILEPICT * pInfo = NULL; // get METAFILEPICT pointer pInfo = (METAFILEPICT *)GlobalLock(hMetaFilePict); @@ -192,8 +219,6 @@ GdiConvertMetaFilePict(HGLOBAL hMetaFilePict) // get metafile handle hMF = pInfo->hMF; - // Missing test for GDILoObjType_LO_METADC16_TYPE (hMF) - // get size of buffer nSize = GetMetaFileBitsEx(hMF, 0, NULL); if (nSize == 0) @@ -209,21 +234,13 @@ GdiConvertMetaFilePict(HGLOBAL hMetaFilePict) if (nSize == 0) goto Exit; - // create DC - hDC = CreateCompatibleDC(NULL); - if (hDC == NULL) - goto Exit; - - // create enhanced metafile from buffer - hEMF = SetWinMetaFileBits(nSize, Buffer, hDC, pInfo); + hmo = NtGdiCreateServerMetaFile( GDITAG_TYPE_MFP, nSize, Buffer, pInfo->mm, pInfo->xExt, pInfo->yExt); Exit: // clean up if (pInfo) GlobalUnlock(hMetaFilePict); - if (hDC) - DeleteDC(hDC); if (Buffer) LocalFree(Buffer); - return hEMF; // success if non-NULL + return hmo; // success if non-NULL } diff --git a/win32ss/gdi/ntgdi/gdiobj.c b/win32ss/gdi/ntgdi/gdiobj.c index 2635aab4576..3a323dc2fb4 100644 --- a/win32ss/gdi/ntgdi/gdiobj.c +++ b/win32ss/gdi/ntgdi/gdiobj.c @@ -115,7 +115,9 @@ ASSERT_LOCK_ORDER( (objt) == GDIObjType_BRUSH_TYPE) #define ASSERT_EXCLUSIVE_OBJECT_TYPE(objt) \ ASSERT((objt) == GDIObjType_DC_TYPE || \ - (objt) == GDIObjType_RGN_TYPE) + (objt) == GDIObjType_RGN_TYPE || \ + (objt) == GDIObjType_UMPD_TYPE || \ + (objt) == GDIObjType_META_TYPE) #define ASSERT_TRYLOCK_OBJECT_TYPE(objt) \ ASSERT((objt) == GDIObjType_DRVOBJ_TYPE) #else @@ -177,7 +179,7 @@ apfnCleanup[] = NULL, /* 12 GDIObjType_UNUSED4_TYPE */ NULL, /* 13 GDIObjType_SPACE_TYPE, unused */ NULL, /* 14 GDIObjType_UNUSED5_TYPE */ - NULL, /* 15 GDIObjType_META_TYPE, unused */ + GDIOBJ_vCleanup, /* 15 GDIObjType_META_TYPE */ NULL, /* 16 GDIObjType_EFSTATE_TYPE, unused */ NULL, /* 17 GDIObjType_BMFD_TYPE, unused */ NULL, /* 18 GDIObjType_VTFD_TYPE, unused */ diff --git a/win32ss/gdi/ntgdi/metafile.c b/win32ss/gdi/ntgdi/metafile.c index 63d5a241d60..e1c3c72e39f 100644 --- a/win32ss/gdi/ntgdi/metafile.c +++ b/win32ss/gdi/ntgdi/metafile.c @@ -13,11 +13,8 @@ #define NDEBUG #include <debug.h> -// Need to move this to NtGdiTyp.h -#define GDITAG_TYPE_EMF 'XEFM' // EnhMetaFile -#define GDITAG_TYPE_MFP '_PFM' // MetaFile Picture -// Internal Use +// Internal Use Only typedef struct _METATYPEOBJ { BASEOBJECT BaseObject; @@ -30,18 +27,6 @@ typedef struct _METATYPEOBJ } METATYPEOBJ, *PMETATYPEOBJ; -// -// Plug Me in Somewhere? Clipboard cleanup? -// -VOID -FASTCALL -METATYPEOBJ__vCleanup(PVOID ObjectBody) -{ - PMETATYPEOBJ pmto = (PMETATYPEOBJ)ObjectBody; - GDIOBJ_hInsertObject(&pmto->BaseObject, GDI_OBJ_HMGR_POWNED); - GDIOBJ_vDeleteObject(&pmto->BaseObject); -} - /* System Service Calls ******************************************************/ /* @@ -79,7 +64,7 @@ NtGdiCreateServerMetaFile( cjData && pjData ) { - pmto = (PMETATYPEOBJ)GDIOBJ_AllocObjWithHandle(GDIObjType_META_TYPE, sizeof(METATYPEOBJ) + cjData); + pmto = (PMETATYPEOBJ)GDIOBJ_AllocObjWithHandle(GDILoObjType_LO_META_TYPE, sizeof(METATYPEOBJ) + cjData); if ( pmto ) { pmto->iType = iType; @@ -90,8 +75,8 @@ NtGdiCreateServerMetaFile( _SEH2_TRY { - ProbeForRead( pjData, cjData, 1 ); - RtlCopyMemory( pmto->pjData, pjData, cjData) ; + ProbeForRead( pjData, cjData, 1 ); + RtlCopyMemory( pmto->pjData, pjData, cjData) ; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -102,7 +87,7 @@ NtGdiCreateServerMetaFile( if (Pass) { GDIOBJ_vSetObjectOwner(&pmto->BaseObject, GDI_OBJ_HMGR_PUBLIC); - GDIOBJ_vDereferenceObject ((POBJ)pmto); + GDIOBJ_vUnlockObject(&pmto->BaseObject); return pmto->BaseObject.hHmgr; } else @@ -132,7 +117,7 @@ NtGdiGetServerMetaFileBits( ULONG cjRet = 0; PMETATYPEOBJ pmto; - pmto = (PMETATYPEOBJ) GDIOBJ_ShareLockObj ((HGDIOBJ) hmo, GDIObjType_META_TYPE); + pmto = (PMETATYPEOBJ) GDIOBJ_LockObject( hmo, GDIObjType_META_TYPE); if (!pmto) return 0; @@ -175,7 +160,7 @@ NtGdiGetServerMetaFileBits( } } - GDIOBJ_vDereferenceObject ((POBJ)pmto); + GDIOBJ_vUnlockObject(&pmto->BaseObject); return cjRet; } diff --git a/win32ss/include/ntgdityp.h b/win32ss/include/ntgdityp.h index 99eed15cc92..3cce9e8afe0 100644 --- a/win32ss/include/ntgdityp.h +++ b/win32ss/include/ntgdityp.h @@ -161,6 +161,8 @@ typedef enum GDILoObjType GDILoObjType_LO_REGION_TYPE = 0x40000, GDILoObjType_LO_ICMLCS_TYPE = 0x90000, GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, + GDILoObjType_LO_UMPD_TYPE = 0x110000, + GDILoObjType_LO_META_TYPE = 0x150000, GDILoObjType_LO_ALTDC_TYPE = 0x210000, GDILoObjType_LO_PEN_TYPE = 0x300000, GDILoObjType_LO_EXTPEN_TYPE = 0x500000, @@ -240,6 +242,9 @@ typedef DWORD LFTYPE; /* Get/SetBounds/Rect support. */ #define DCB_WINDOWMGR 0x8000 /* Queries the Windows bounding rectangle instead of the application's */ +#define GDITAG_TYPE_EMF 'XEFM' // EnhMetaFile +#define GDITAG_TYPE_MFP '_PFM' // MetaFile Picture + /* TYPES *********************************************************************/ typedef PVOID KERNEL_PVOID; diff --git a/win32ss/user/ntuser/clipboard.c b/win32ss/user/ntuser/clipboard.c index 04e5d22291a..28a1844dd6a 100644 --- a/win32ss/user/ntuser/clipboard.c +++ b/win32ss/user/ntuser/clipboard.c @@ -65,8 +65,13 @@ IntFreeElementData(PCLIP pElement) { if (pElement->fGlobalHandle) UserDeleteObject(pElement->hData, TYPE_CLIPDATA); - else if (pElement->fmt == CF_BITMAP || pElement->fmt == CF_PALETTE || - pElement->fmt == CF_DSPBITMAP) + else if (pElement->fmt == CF_BITMAP || + pElement->fmt == CF_PALETTE || + pElement->fmt == CF_DSPBITMAP || + pElement->fmt == CF_METAFILEPICT || + pElement->fmt == CF_DSPMETAFILEPICT || + pElement->fmt == CF_DSPENHMETAFILE || + pElement->fmt == CF_ENHMETAFILE ) { GreSetObjectOwner(pElement->hData, GDI_OBJ_HMGR_POWNED); GreDeleteObject(pElement->hData); diff --git a/win32ss/user/user32/windows/clipboard.c b/win32ss/user/user32/windows/clipboard.c index 66a4217301e..95fb87811be 100644 --- a/win32ss/user/user32/windows/clipboard.c +++ b/win32ss/user/user32/windows/clipboard.c @@ -15,6 +15,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32); +HANDLE WINAPI GdiConvertMetaFilePict(HANDLE); +HANDLE WINAPI GdiConvertEnhMetaFile(HANDLE); +HANDLE WINAPI GdiCreateLocalEnhMetaFile(HANDLE); +HANDLE WINAPI GdiCreateLocalMetaFilePict(HANDLE); + + /* * @implemented */ @@ -202,6 +208,16 @@ GetClipboardData(UINT uFormat) if (!hData) return NULL; + switch (uFormat) + { + case CF_DSPMETAFILEPICT: + case CF_METAFILEPICT: + return GdiCreateLocalMetaFilePict(hData); + case CF_DSPENHMETAFILE: + case CF_ENHMETAFILE: + return GdiCreateLocalEnhMetaFile(hData); + } + if (gcd.fGlobalHandle) { HANDLE hGlobal; @@ -300,11 +316,15 @@ SetClipboardData(UINT uFormat, HANDLE hMem) else if (uFormat == CF_BITMAP || uFormat == CF_DSPBITMAP || uFormat == CF_PALETTE) hRet = NtUserSetClipboardData(uFormat, hMem, &scd); /* Meta files are probably checked for validity */ - else if (uFormat == CF_DSPMETAFILEPICT || uFormat == CF_METAFILEPICT || - uFormat == CF_DSPENHMETAFILE || uFormat == CF_ENHMETAFILE) + else if (uFormat == CF_DSPMETAFILEPICT || uFormat == CF_METAFILEPICT ) { - UNIMPLEMENTED; - hRet = NULL; // not supported yet + hMem = GdiConvertMetaFilePict( hMem ); + hRet = NtUserSetClipboardData(uFormat, hMem, &scd); + } + else if (uFormat == CF_DSPENHMETAFILE || uFormat == CF_ENHMETAFILE) + { + hMem = GdiConvertEnhMetaFile( hMem ); + hRet = NtUserSetClipboardData(uFormat, hMem, &scd); } else {

5 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2019