September 2021 - Wine-commits

Alexandre Julliard : shell32: Merge the drag & drop implementation from the Unix shell folder.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: df9c67d19695dddf5ee63d64a84244649748f94c URL: https://source.winehq.org/git/wine.git/?a=commit;h=df9c67d19695dddf5ee63d64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 10 18:52:37 2021 +0200 shell32: Merge the drag & drop implementation from the Unix shell folder. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_fs.c | 134 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 100 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 52bdccd6c38..55d380ffb1d 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -72,11 +72,11 @@ typedef struct { LPWSTR sPathTarget; /* complete path to target used for enumeration and ChangeNotify */ LPITEMIDLIST pidlRoot; /* absolute pidl */ - - UINT cfShellIDList; /* clipboardformat for IDropTarget */ - BOOL fAcceptFmt; /* flag for pending Drop */ + DWORD drop_effects_mask; } IGenericSFImpl; +static UINT cfShellIDList; + static inline IGenericSFImpl *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, IGenericSFImpl, IUnknown_inner); @@ -102,18 +102,6 @@ static inline IGenericSFImpl *impl_from_ISFHelper(ISFHelper *iface) return CONTAINING_RECORD(iface, IGenericSFImpl, ISFHelper_iface); } -/************************************************************************** -* registers clipboardformat once -*/ -static void SF_RegisterClipFmt (IGenericSFImpl * This) -{ - TRACE ("(%p)\n", This); - - if (!This->cfShellIDList) { - This->cfShellIDList = RegisterClipboardFormatW (CFSTR_SHELLIDLISTW); - } -} - /************************************************************************** * inner IUnknown */ @@ -136,7 +124,7 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, vo *ppvObj = &This->ISFHelper_iface; else if (IsEqualIID (riid, &IID_IDropTarget)) { *ppvObj = &This->IDropTarget_iface; - SF_RegisterClipFmt(This); + if (!cfShellIDList) cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW); } if (*ppvObj) { @@ -1543,22 +1531,42 @@ static ULONG WINAPI ISFDropTarget_Release(IDropTarget *iface) return IUnknown_Release(This->outer_unk); } +#define HIDA_GetPIDLFolder(pida) (LPCITEMIDLIST)(((LPBYTE)pida)+(pida)->aoffset[0]) +#define HIDA_GetPIDLItem(pida, i) (LPCITEMIDLIST)(((LPBYTE)pida)+(pida)->aoffset[i+1]) + static HRESULT WINAPI ISFDropTarget_DragEnter (IDropTarget * iface, IDataObject * pDataObject, DWORD dwKeyState, POINTL pt, DWORD * pdwEffect) { - FORMATETC fmt; - IGenericSFImpl *This = impl_from_IDropTarget(iface); + FORMATETC format; + STGMEDIUM medium; - TRACE ("(%p)->(DataObject=%p)\n", This, pDataObject); + TRACE("(%p)->(%p 0x%08x {.x=%d, .y=%d} %p)\n", This, pDataObject, dwKeyState, pt.x, pt.y, pdwEffect); - InitFormatEtc (fmt, This->cfShellIDList, TYMED_HGLOBAL); - This->fAcceptFmt = IDataObject_QueryGetData (pDataObject, &fmt) == S_OK; - if (This->fAcceptFmt) - *pdwEffect = KeyStateToDropEffect(dwKeyState); - else - *pdwEffect = DROPEFFECT_NONE; + if (!pdwEffect || !pDataObject) + return E_INVALIDARG; + + /* Compute a mask of supported drop-effects for this shellfolder object and the given data + * object. Dropping is only supported on folders, which represent filesystem locations. One + * can't drop on file objects. And the 'move' drop effect is only supported, if the source + * folder is not identical to the target folder. */ + This->drop_effects_mask = DROPEFFECT_NONE; + InitFormatEtc(format, cfShellIDList, TYMED_HGLOBAL); + if (_ILIsFolder(ILFindLastID(This->pidlRoot)) && /* Only drop to folders, not to files */ + SUCCEEDED(IDataObject_GetData(pDataObject, &format, &medium))) /* Only ShellIDList format */ + { + LPIDA pidaShellIDList = GlobalLock(medium.u.hGlobal); + This->drop_effects_mask |= DROPEFFECT_COPY|DROPEFFECT_LINK; + + if (pidaShellIDList) { /* Files can only be moved between two different folders */ + if (!ILIsEqual(HIDA_GetPIDLFolder(pidaShellIDList), This->pidlRoot)) + This->drop_effects_mask |= DROPEFFECT_MOVE; + GlobalUnlock(medium.u.hGlobal); + } + } + + *pdwEffect = KeyStateToDropEffect(dwKeyState) & This->drop_effects_mask; return S_OK; } @@ -1569,15 +1577,12 @@ ISFDropTarget_DragOver (IDropTarget * iface, DWORD dwKeyState, POINTL pt, { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); + TRACE("(%p)->(0x%08x {.x=%d, .y=%d} %p)\n", This, dwKeyState, pt.x, pt.y, pdwEffect); if (!pdwEffect) return E_INVALIDARG; - if (This->fAcceptFmt) - *pdwEffect = KeyStateToDropEffect(dwKeyState); - else - *pdwEffect = DROPEFFECT_NONE; + *pdwEffect = KeyStateToDropEffect(dwKeyState) & This->drop_effects_mask; return S_OK; } @@ -1586,10 +1591,9 @@ static HRESULT WINAPI ISFDropTarget_DragLeave (IDropTarget * iface) { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); - - This->fAcceptFmt = FALSE; + TRACE("(%p)\n", This); + This->drop_effects_mask = DROPEFFECT_NONE; return S_OK; } @@ -1598,8 +1602,70 @@ ISFDropTarget_Drop (IDropTarget * iface, IDataObject * pDataObject, DWORD dwKeyState, POINTL pt, DWORD * pdwEffect) { IGenericSFImpl *This = impl_from_IDropTarget(iface); + FORMATETC format; + STGMEDIUM medium; + HRESULT hr; + + TRACE("(%p)->(%p %d {.x=%d, .y=%d} %p) semi-stub\n", + This, pDataObject, dwKeyState, pt.x, pt.y, pdwEffect); + + InitFormatEtc(format, cfShellIDList, TYMED_HGLOBAL); + hr = IDataObject_GetData(pDataObject, &format, &medium); + if (FAILED(hr)) + return hr; + + if (medium.tymed == TYMED_HGLOBAL) { + IShellFolder *psfSourceFolder, *psfDesktopFolder; + LPIDA pidaShellIDList = GlobalLock(medium.u.hGlobal); + STRRET strret; + UINT i; + + if (!pidaShellIDList) + return HRESULT_FROM_WIN32(GetLastError()); + + hr = SHGetDesktopFolder(&psfDesktopFolder); + if (FAILED(hr)) { + GlobalUnlock(medium.u.hGlobal); + return hr; + } + + hr = IShellFolder_BindToObject(psfDesktopFolder, HIDA_GetPIDLFolder(pidaShellIDList), NULL, + &IID_IShellFolder, (LPVOID*)&psfSourceFolder); + IShellFolder_Release(psfDesktopFolder); + if (FAILED(hr)) { + GlobalUnlock(medium.u.hGlobal); + return hr; + } - FIXME ("(%p) object dropped\n", This); + for (i = 0; i < pidaShellIDList->cidl; i++) { + WCHAR wszSourcePath[MAX_PATH]; + + hr = IShellFolder_GetDisplayNameOf(psfSourceFolder, HIDA_GetPIDLItem(pidaShellIDList, i), + SHGDN_FORPARSING, &strret); + if (FAILED(hr)) + break; + + hr = StrRetToBufW(&strret, NULL, wszSourcePath, MAX_PATH); + if (FAILED(hr)) + break; + + switch (*pdwEffect) { + case DROPEFFECT_MOVE: + FIXME("Move %s to %s!\n", debugstr_w(wszSourcePath), debugstr_w(This->sPathTarget)); + break; + case DROPEFFECT_COPY: + FIXME("Copy %s to %s!\n", debugstr_w(wszSourcePath), debugstr_w(This->sPathTarget)); + break; + case DROPEFFECT_LINK: + FIXME("Link %s from %s!\n", debugstr_w(wszSourcePath), debugstr_w(This->sPathTarget)); + break; + } + } + + IShellFolder_Release(psfSourceFolder); + GlobalUnlock(medium.u.hGlobal); + return hr; + } return E_NOTIMPL; }

1 0

Alexandre Julliard : shell32: Merge the property bag implementation from the Unix shell folder.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: ed5c88297573e389a72e10ccff2cbedcd2304a99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed5c88297573e389a72e10cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 10 18:54:46 2021 +0200 shell32: Merge the property bag implementation from the Unix shell folder. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_fs.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 55d380ffb1d..211b8d47a1a 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -62,6 +62,7 @@ typedef struct { LONG ref; IShellFolder2 IShellFolder2_iface; IPersistFolder3 IPersistFolder3_iface; + IPersistPropertyBag IPersistPropertyBag_iface; IDropTarget IDropTarget_iface; ISFHelper ISFHelper_iface; IUnknown *outer_unk; @@ -92,6 +93,11 @@ static inline IGenericSFImpl *impl_from_IPersistFolder3(IPersistFolder3 *iface) return CONTAINING_RECORD(iface, IGenericSFImpl, IPersistFolder3_iface); } +static inline IGenericSFImpl *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) +{ + return CONTAINING_RECORD(iface, IGenericSFImpl, IPersistPropertyBag_iface); +} + static inline IGenericSFImpl *impl_from_IDropTarget(IDropTarget *iface) { return CONTAINING_RECORD(iface, IGenericSFImpl, IDropTarget_iface); @@ -120,6 +126,8 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, vo else if (IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IPersistFolder) || IsEqualIID(riid, &IID_IPersistFolder2) || IsEqualIID(riid, &IID_IPersistFolder3)) *ppvObj = &This->IPersistFolder3_iface; + else if (IsEqualIID(&IID_IPersistPropertyBag, riid)) + *ppvObj = &This->IPersistPropertyBag_iface; else if (IsEqualIID (riid, &IID_ISFHelper)) *ppvObj = &This->ISFHelper_iface; else if (IsEqualIID (riid, &IID_IDropTarget)) { @@ -1507,6 +1515,90 @@ static const IPersistFolder3Vtbl pfvt = IFSFldr_PersistFolder3_GetFolderTargetInfo }; +/**************************************************************************** + * IPersistPropertyBag implementation + */ +static HRESULT WINAPI PersistPropertyBag_QueryInterface(IPersistPropertyBag* iface, + REFIID riid, void** ppv) +{ + IGenericSFImpl *This = impl_from_IPersistPropertyBag(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} + +static ULONG WINAPI PersistPropertyBag_AddRef(IPersistPropertyBag* iface) +{ + IGenericSFImpl *This = impl_from_IPersistPropertyBag(iface); + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI PersistPropertyBag_Release(IPersistPropertyBag* iface) +{ + IGenericSFImpl *This = impl_from_IPersistPropertyBag(iface); + return IUnknown_Release(This->outer_unk); +} + +static HRESULT WINAPI PersistPropertyBag_GetClassID(IPersistPropertyBag* iface, CLSID* pClassID) +{ + IGenericSFImpl *This = impl_from_IPersistPropertyBag(iface); + return IPersistFolder3_GetClassID(&This->IPersistFolder3_iface, pClassID); +} + +static HRESULT WINAPI PersistPropertyBag_InitNew(IPersistPropertyBag* iface) +{ + IGenericSFImpl *This = impl_from_IPersistPropertyBag(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *iface, + IPropertyBag *pPropertyBag, IErrorLog *pErrorLog) +{ + IGenericSFImpl *This = impl_from_IPersistPropertyBag(iface); + + static const WCHAR wszTarget[] = { 'T','a','r','g','e','t', 0 }; + PERSIST_FOLDER_TARGET_INFO pftiTarget; + VARIANT var; + HRESULT hr; + + TRACE("(%p)->(%p %p)\n", This, pPropertyBag, pErrorLog); + + if (!pPropertyBag) + return E_POINTER; + + /* Get 'Target' property from the property bag. */ + V_VT(&var) = VT_BSTR; + hr = IPropertyBag_Read(pPropertyBag, wszTarget, &var, NULL); + if (FAILED(hr)) + return E_FAIL; + lstrcpyW(pftiTarget.szTargetParsingName, V_BSTR(&var)); + SysFreeString(V_BSTR(&var)); + + pftiTarget.pidlTargetFolder = NULL; + pftiTarget.szNetworkProvider[0] = 0; + pftiTarget.dwAttributes = -1; + pftiTarget.csidl = -1; + + return IPersistFolder3_InitializeEx(&This->IPersistFolder3_iface, NULL, NULL, &pftiTarget); +} + +static HRESULT WINAPI PersistPropertyBag_Save(IPersistPropertyBag *iface, + IPropertyBag *pPropertyBag, BOOL fClearDirty, BOOL fSaveAllProperties) +{ + IGenericSFImpl *This = impl_from_IPersistPropertyBag(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static const IPersistPropertyBagVtbl ppbvt = { + PersistPropertyBag_QueryInterface, + PersistPropertyBag_AddRef, + PersistPropertyBag_Release, + PersistPropertyBag_GetClassID, + PersistPropertyBag_InitNew, + PersistPropertyBag_Load, + PersistPropertyBag_Save +}; + /**************************************************************************** * ISFDropTarget implementation */ @@ -1698,6 +1790,7 @@ HRESULT WINAPI IFSFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **pp sf->IUnknown_inner.lpVtbl = &unkvt; sf->IShellFolder2_iface.lpVtbl = &sfvt; sf->IPersistFolder3_iface.lpVtbl = &pfvt; + sf->IPersistPropertyBag_iface.lpVtbl = &ppbvt; sf->IDropTarget_iface.lpVtbl = &dtvt; sf->ISFHelper_iface.lpVtbl = &shvt; sf->pclsid = (CLSID *) & CLSID_ShellFSFolder;

1 0

Alexandre Julliard : Revert "ntdll: Add a Wine-specific class in NtQueryVirtualMemory to retrieve the init functions of a module."
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: e9cfc97d46aaf39bc9c2a41b319d3b3b358c0f04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9cfc97d46aaf39bc9c2a41b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 10 20:09:38 2021 +0200 Revert "ntdll: Add a Wine-specific class in NtQueryVirtualMemory to retrieve the init functions of a module." This reverts commits e5339ecbc66f20193a0a6b1dfdce98d42d2ad926 and 18408b18f3ebd9630a02f0bd16864f5e5118b71a. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51596 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 29 ++--------------------------- dlls/ntdll/unix/loader.c | 31 ++++++++++++++++--------------- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 17 +---------------- dlls/ntdll/unixlib.h | 3 ++- dlls/wow64/virtual.c | 1 - include/winternl.h | 3 +-- 7 files changed, 23 insertions(+), 63 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 48e826fe888..819cf51b9fc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1338,31 +1338,6 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) } } - -/************************************************************************* - * init_builtin_dll - */ -static void init_builtin_dll( HMODULE module ) -{ - void *buffer[16]; - void (**funcs)(int, char **, char **) = (void *)buffer; - SIZE_T i, size; - NTSTATUS status; - - status = NtQueryVirtualMemory( GetCurrentProcess(), module, MemoryWineImageInitFuncs, - buffer, sizeof(buffer), &size ); - if (status == STATUS_BUFFER_TOO_SMALL) - { - if (!(funcs = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return; - status = NtQueryVirtualMemory( GetCurrentProcess(), module, MemoryWineImageInitFuncs, - funcs, size, &size ); - } - if (!status) for (i = 0; i < size / sizeof(*funcs); i++) funcs[i]( 0, NULL, NULL ); - - if ((void *)funcs != (void *)buffer) RtlFreeHeap( GetProcessHeap(), 0, funcs ); -} - - /************************************************************************* * MODULE_InitDLL */ @@ -1379,7 +1354,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, reason ); if (wm->ldr.Flags & LDR_WINE_INTERNAL && reason == DLL_PROCESS_ATTACH) - init_builtin_dll( wm->ldr.DllBase ); + unix_funcs->init_builtin_dll( wm->ldr.DllBase ); if (!entry) return STATUS_SUCCESS; if (TRACE_ON(relay)) @@ -3917,7 +3892,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR } release_address_space(); if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_PROCESS_ATTACH ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL) init_builtin_dll( wm->ldr.DllBase ); + if (wm->ldr.Flags & LDR_WINE_INTERNAL) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); process_breakpoint(); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index b15824346b7..defa61909a1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1975,21 +1975,26 @@ static BOOL get_relocbase(caddr_t mapbase, caddr_t *relocbase) #endif /************************************************************************* - * get_builtin_init_funcs + * init_builtin_dll */ -NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T *retlen ) +static void CDECL init_builtin_dll( void *module ) { #ifdef HAVE_DLINFO + void *handle = NULL; struct link_map *map; - void *init_func = NULL, **init_array = NULL; - ULONG_PTR i, count, init_arraysz = 0; + void (*init_func)(int, char **, char **) = NULL; + void (**init_array)(int, char **, char **) = NULL; + ULONG_PTR i, init_arraysz = 0; #ifdef _WIN64 const Elf64_Dyn *dyn; #else const Elf32_Dyn *dyn; #endif - if (dlinfo( handle, RTLD_DI_LINKMAP, &map )) return STATUS_INVALID_IMAGE_FORMAT; + if (!(handle = get_builtin_so_handle( module ))) return; + if (dlinfo( handle, RTLD_DI_LINKMAP, &map )) map = NULL; + release_builtin_module( module ); + if (!map) return; for (dyn = map->l_ld; dyn->d_tag; dyn++) { @@ -2009,18 +2014,13 @@ NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T } } - TRACE( "%p: got init_func %p init_array %p %lu\n", handle, init_func, init_array, init_arraysz ); + TRACE( "%p: got init_func %p init_array %p %lu\n", module, init_func, init_array, init_arraysz ); - count = init_arraysz / sizeof(*init_array); - if (init_func) count++; - if (retlen) *retlen = count * sizeof(*funcs); + if (init_func) init_func( main_argc, main_argv, main_envp ); - if (count > len / sizeof(*funcs)) return STATUS_BUFFER_TOO_SMALL; - if (init_func) *funcs++ = init_func; - for (i = 0; i < init_arraysz / sizeof(*init_array); i++) funcs[i] = init_array[i]; - return STATUS_SUCCESS; -#else - return STATUS_NOT_SUPPORTED; + if (init_array) + for (i = 0; i < init_arraysz / sizeof(*init_array); i++) + init_array[i]( main_argc, main_argv, main_envp ); #endif } @@ -2172,6 +2172,7 @@ static struct unix_funcs unix_funcs = ntdll_sqrt, ntdll_tan, load_so_dll, + init_builtin_dll, init_unix_lib, unwind_builtin_dll, }; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index b2bcd423d4b..fb1a4a397e9 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -164,7 +164,6 @@ extern BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) DECLSPE extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, WCHAR **image, void **module ) DECLSPEC_HIDDEN; extern NTSTATUS load_start_exe( WCHAR **image, void **module ) DECLSPEC_HIDDEN; -extern NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T *retlen ) DECLSPEC_HIDDEN; extern void start_server( BOOL debug ) DECLSPEC_HIDDEN; extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; @@ -232,6 +231,7 @@ extern void virtual_set_force_exec( BOOL enable ) DECLSPEC_HIDDEN; extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; extern void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; +extern void release_builtin_module( void *module ) DECLSPEC_HIDDEN; extern void *get_builtin_so_handle( void *module ) DECLSPEC_HIDDEN; extern NTSTATUS get_builtin_unix_info( void *module, const char **name, void **handle, void **entry ) DECLSPEC_HIDDEN; extern NTSTATUS set_builtin_unix_handle( void *module, const char *name, void *handle ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 8a1e35b6387..984af2d4a21 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -615,7 +615,7 @@ static void add_builtin_module( void *module, void *handle ) /*********************************************************************** * release_builtin_module */ -static void release_builtin_module( void *module ) +void release_builtin_module( void *module ) { struct builtin_module *builtin; @@ -4329,21 +4329,6 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, case MemoryMappedFilenameInformation: return get_memory_section_name( process, addr, buffer, len, res_len ); - case MemoryWineImageInitFuncs: - if (process == GetCurrentProcess()) - { - void *module = (void *)addr; - void *handle = get_builtin_so_handle( module ); - - if (handle) - { - status = get_builtin_init_funcs( handle, buffer, len, res_len ); - release_builtin_module( module ); - return status; - } - } - return STATUS_INVALID_HANDLE; - case MemoryWineUnixFuncs: case MemoryWineUnixWow64Funcs: if (len != sizeof(unixlib_handle_t)) return STATUS_INFO_LENGTH_MISMATCH; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index f22e0c12d22..4b7c8b45be7 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 125 +#define NTDLL_UNIXLIB_VERSION 126 struct unix_funcs { @@ -71,6 +71,7 @@ struct unix_funcs /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module ); + void (CDECL *init_builtin_dll)( void *module ); NTSTATUS (CDECL *init_unix_lib)( void *module, DWORD reason, const void *ptr_in, void *ptr_out ); NTSTATUS (CDECL *unwind_builtin_dll)( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ); diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index e5759609974..f4cd50d0ea2 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -369,7 +369,6 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) break; } - case MemoryWineImageInitFuncs: case MemoryWineUnixWow64Funcs: return STATUS_INVALID_INFO_CLASS; diff --git a/include/winternl.h b/include/winternl.h index fea9e9df117..798127aee90 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1919,8 +1919,7 @@ typedef enum _MEMORY_INFORMATION_CLASS { MemoryBasicInformationCapped, MemoryPhysicalContiguityInformation, #ifdef __WINESRC__ - MemoryWineImageInitFuncs = 1000, - MemoryWineUnixFuncs, + MemoryWineUnixFuncs = 1000, MemoryWineUnixWow64Funcs, #endif } MEMORY_INFORMATION_CLASS;

1 0

Eric Pouech : dbghelp/dwarf: Pass dwarf2_cuhead_t to lookuploclist().
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 7bb85884e038113e367fcf67f7e7e2798ab6742e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb85884e038113e367fcf67… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 10 10:37:40 2021 +0200 dbghelp/dwarf: Pass dwarf2_cuhead_t to lookuploclist(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 22350124de7..435b2a0e3b0 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2471,8 +2471,8 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, return ret; } -static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE* start, - ULONG_PTR ip, dwarf2_traverse_context_t* lctx) +static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const dwarf2_cuhead_t* head, + const BYTE* start, ULONG_PTR ip, dwarf2_traverse_context_t* lctx) { DWORD_PTR beg, end; const BYTE* ptr = start; @@ -2480,8 +2480,8 @@ static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE while (ptr < modfmt->u.dwarf2_info->debug_loc.address + modfmt->u.dwarf2_info->debug_loc.size) { - beg = dwarf2_get_addr(ptr, modfmt->u.dwarf2_info->word_size); ptr += modfmt->u.dwarf2_info->word_size; - end = dwarf2_get_addr(ptr, modfmt->u.dwarf2_info->word_size); ptr += modfmt->u.dwarf2_info->word_size; + beg = dwarf2_get_addr(ptr, head->word_size); ptr += head->word_size; + end = dwarf2_get_addr(ptr, head->word_size); ptr += head->word_size; if (!beg && !end) break; len = dwarf2_get_u2(ptr); ptr += 2; @@ -2518,7 +2518,13 @@ static enum location_error loc_compute_frame(struct process* pcs, dwarf2_traverse_context_t lctx; enum location_error err; unsigned int i; + const dwarf2_cuhead_t* head = get_cuhead_from_func(func); + if (!head) + { + FIXME("Shouldn't happen\n"); + return loc_err_internal; + } for (i=0; i<vector_length(&func->vchildren); i++) { psym = vector_at(&func->vchildren, i); @@ -2535,11 +2541,11 @@ static enum location_error loc_compute_frame(struct process* pcs, break; case loc_dwarf2_location_list: WARN("Searching loclist for %s\n", debugstr_a(func->hash_elt.name)); - if (!dwarf2_lookup_loclist(modfmt, + if (!dwarf2_lookup_loclist(modfmt, head, modfmt->u.dwarf2_info->debug_loc.address + pframe->offset, ip, &lctx)) return loc_err_out_of_scope; - if ((err = compute_location(modfmt->module, get_cuhead_from_func(func), + if ((err = compute_location(modfmt->module, head, &lctx, frame, pcs->handle, NULL)) < 0) return err; if (frame->kind >= loc_user) { @@ -3332,10 +3338,12 @@ static void dwarf2_location_compute(struct process* pcs, DWORD_PTR ip; int err; dwarf2_traverse_context_t lctx; + const dwarf2_cuhead_t* head = get_cuhead_from_func(func); - if (!func || !symt_check_tag(func->container, SymTagCompiland)) + if (!head) { - WARN("We'd expect function %s's container to exist and be a compiland\n", debugstr_a(func->hash_elt.name)); + WARN("We'd expect function %s's container to be a valid compiland with dwarf inforamation\n", + debugstr_a(func->hash_elt.name)); err = loc_err_internal; } else @@ -3349,7 +3357,7 @@ static void dwarf2_location_compute(struct process* pcs, { case loc_dwarf2_location_list: /* Then, if the variable has a location list, find it !! */ - if (dwarf2_lookup_loclist(modfmt, + if (dwarf2_lookup_loclist(modfmt, head, modfmt->u.dwarf2_info->debug_loc.address + loc->offset, ip, &lctx)) goto do_compute; @@ -3365,7 +3373,7 @@ static void dwarf2_location_compute(struct process* pcs, } do_compute: /* now get the variable */ - err = compute_location(modfmt->module, get_cuhead_from_func(func), + err = compute_location(modfmt->module, head, &lctx, loc, pcs->handle, &frame); break; case loc_register:

1 0

Eric Pouech : dbghelp/dwarf: Initialize module's word_size at module load time.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 7f2eb08304a23cc759b5df37633f9673418d43f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f2eb08304a23cc759b5df37… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:34:44 2021 +0200 dbghelp/dwarf: Initialize module's word_size at module load time. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 435b2a0e3b0..13f1c0e7d9c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2409,8 +2409,6 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, return FALSE; } - module->format_info[DFI_DWARF]->u.dwarf2_info->word_size = ctx.head.word_size; - pool_init(&ctx.pool, 65536); ctx.sections = sections; ctx.section = section_debug; @@ -3570,7 +3568,7 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->remove = dwarf2_module_remove; dwarf2_modfmt->loc_compute = dwarf2_location_compute; dwarf2_modfmt->u.dwarf2_info = (struct dwarf2_module_info_s*)(dwarf2_modfmt + 1); - dwarf2_modfmt->u.dwarf2_info->word_size = 0; /* will be correctly set later on */ + dwarf2_modfmt->u.dwarf2_info->word_size = fmap->addr_size / 8; /* set the word_size for eh_frame parsing */ dwarf2_modfmt->module->format_info[DFI_DWARF] = dwarf2_modfmt; /* As we'll need later some sections' content, we won't unmap these @@ -3594,9 +3592,6 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->module->module.SourceIndexed = TRUE; dwarf2_modfmt->module->module.Publics = TRUE; - /* set the word_size for eh_frame parsing */ - dwarf2_modfmt->u.dwarf2_info->word_size = fmap->addr_size / 8; - leave: dwarf2_fini_section(&section[section_debug]); dwarf2_fini_section(&section[section_abbrev]);

1 0

Eric Pouech : dbghelp: Use correct parameter name.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: c031d5aa8c68b268742d90b9407ef9fe0aaaa02e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c031d5aa8c68b268742d90b9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 10 15:52:02 2021 +0200 dbghelp: Use correct parameter name. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 23752cfed9f..29d8a5350a5 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -487,13 +487,13 @@ struct enum_types_AtoW PSYM_ENUMERATESYMBOLS_CALLBACKW callback; }; -static BOOL CALLBACK enum_types_AtoW(PSYMBOL_INFO si, ULONG addr, PVOID _et) +static BOOL CALLBACK enum_types_AtoW(PSYMBOL_INFO si, ULONG size, PVOID _et) { struct enum_types_AtoW* et = _et; SYMBOL_INFOW* siW = (SYMBOL_INFOW*)et->buffer; copy_symbolW(siW, si); - return et->callback(siW, addr, et->user); + return et->callback(siW, size, et->user); } /******************************************************************

1 0

Eric Pouech : dbghelp: Ensure all adresses are stored at least in DWORD_PTR.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: f4afcb3f5a99e3090c3aa1f00ce0903f6e8c48a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4afcb3f5a99e3090c3aa1f0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 10 15:52:09 2021 +0200 dbghelp: Ensure all adresses are stored at least in DWORD_PTR. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_arm64.c | 2 +- dlls/dbghelp/pe_module.c | 6 +++--- dlls/dbghelp/symbol.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c index 515294fe95c..2c767e78de4 100644 --- a/dlls/dbghelp/cpu_arm64.c +++ b/dlls/dbghelp/cpu_arm64.c @@ -264,7 +264,7 @@ static BOOL arm64_fetch_minidump_thread(struct dump_context* dc, unsigned index, { /* FIXME: crop values across module boundaries, */ #ifdef __aarch64__ - ULONG base = ctx->Pc <= 0x80 ? 0 : ctx->Pc - 0x80; + ULONG64 base = ctx->Pc <= 0x80 ? 0 : ctx->Pc - 0x80; minidump_add_memory_block(dc, base, ctx->Pc + 0x80 - base, 0); #endif } diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 38829d6e6de..278f3c71c98 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -652,7 +652,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap; unsigned int i; const IMAGE_EXPORT_DIRECTORY* exports; - DWORD base = module->module.BaseOfImage; + DWORD_PTR base = module->module.BaseOfImage; DWORD size; IMAGE_NT_HEADERS* nth; void* mapping; @@ -716,7 +716,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* if ((ordinals[j] == i) && names[j]) break; if (j < exports->NumberOfNames) continue; snprintf(buffer, sizeof(buffer), "%d", i + exports->Base); - symt_new_public(module, NULL, buffer, FALSE, base + (DWORD)functions[i], 1); + symt_new_public(module, NULL, buffer, FALSE, base + functions[i], 1); } } } @@ -906,7 +906,7 @@ struct module* pe_load_builtin_module(struct process* pcs, const WCHAR* name, PVOID WINAPI ImageDirectoryEntryToDataEx( PVOID base, BOOLEAN image, USHORT dir, PULONG size, PIMAGE_SECTION_HEADER *section ) { const IMAGE_NT_HEADERS *nt; - DWORD addr; + DWORD_PTR addr; *size = 0; if (section) *section = NULL; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 28c906c10a3..3b44315eebd 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -929,7 +929,7 @@ static BOOL symt_enum_locals_helper(struct module_pair* pair, struct symt_function* func, const struct vector* v) { struct symt* lsym = NULL; - DWORD pc = pair->pcs->ctx_frame.InstructionOffset; + DWORD_PTR pc = pair->pcs->ctx_frame.InstructionOffset; unsigned int i; WCHAR* nameW; BOOL ret;

1 0

Jacek Caban : gdi32/test: Add tests for recording MaskBlt and PlgBlt in EMFs.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 7b8a9db513a355d5d7fed853ffe60f81af7e0d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b8a9db513a355d5d7fed853… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 10 14:27:20 2021 +0200 gdi32/test: Add tests for recording MaskBlt and PlgBlt in EMFs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 185 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 185 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 693353ea5f2..1040408725a 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1763,6 +1763,117 @@ static const unsigned char mf_palette_brush_bits[] = 0x00, 0x00, 0x00, 0x00 }; +static const unsigned char emf_mask_blit_bits[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x35, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x58, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x77, 0x07, 0x00, 0x00, 0x3b, 0x04, 0x00, 0x00, + 0xfa, 0x01, 0x00, 0x00, 0x1f, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x12, 0xb7, 0x07, 0x00, + 0x4f, 0x5f, 0x04, 0x00, 0x4e, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, + 0xa8, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0c, 0x0d, + 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, + 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, + 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, + 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xf0, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, + 0xf0, 0x00, 0x00, 0x00, 0x4e, 0x00, 0x00, 0x00, + 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, + 0xa8, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0c, 0x0d, + 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, + 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, + 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, + 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, + 0x4f, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x8c, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, + 0xb4, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0xd8, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0c, 0x0d, + 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, + 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, + 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, + 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xf0, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, + 0xf0, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + /* For debugging or dumping the raw metafiles produced by * new test functions. */ @@ -2036,6 +2147,13 @@ static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr if(!diff) diff = memcmp(eto1->aptl, eto2->aptl, eto1->cptl * sizeof(POINTL)); } + else if (emr1->iType == EMR_PLGBLT && emr2->iType == EMR_PLGBLT) + { + EMRPLGBLT *eto1 = (EMRPLGBLT *)emr1; + EMRPLGBLT *eto2 = (EMRPLGBLT *)emr2; + diff = memcmp(emr1, emr2, sizeof(*emr1)) || + memcmp(&eto1->aptlDest, &eto2->aptlDest, emr1->nSize - FIELD_OFFSET(EMRPLGBLT, aptlDest)); + } else diff = memcmp(emr1, emr2, emr1->nSize); @@ -4810,6 +4928,72 @@ static void test_emf_blit(void) ok(ret, "DeleteMetaFile(%p) error %d\n", hmf, GetLastError()); } +static void test_emf_mask_blit(void) +{ + BITMAPINFO bmi = {{ sizeof(bmi) }}; + HBITMAP bitmap, mask_bitmap; + HENHMETAFILE emf; + HDC hdc, dib_hdc; + unsigned int i; + void *bits; + BOOL ret; + + static const POINT plg_points[] = { { 2, 1 }, { 1, 1 }, { 1, 2 } }; + + hdc = CreateEnhMetaFileA(NULL, NULL, NULL, NULL); + ok(hdc != 0, "CreateMetaFileA failed\n"); + + dib_hdc = CreateCompatibleDC(NULL); + ok(!!dib_hdc, "CreateCompatibleDC failed\n"); + + bmi.bmiHeader.biHeight = 3; + bmi.bmiHeader.biWidth = 4; + bmi.bmiHeader.biBitCount = 24; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biCompression = BI_RGB; + bitmap = CreateDIBSection(dib_hdc, &bmi, DIB_RGB_COLORS, &bits, NULL, 0); + ok(!!bitmap, "CreateDIBSection failed, error %d\n", GetLastError()); + for (i = 0; i < bmi.bmiHeader.biHeight * bmi.bmiHeader.biWidth * 3; i++) + ((BYTE *)bits)[i] = i + 10; + + bmi.bmiHeader.biHeight = 3; + bmi.bmiHeader.biWidth = 4; + bmi.bmiHeader.biBitCount = 1; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biCompression = BI_RGB; + mask_bitmap = CreateDIBSection(dib_hdc, &bmi, DIB_RGB_COLORS, &bits, NULL, 0); + ok(!!mask_bitmap, "CreateDIBSection failed, error %d\n", GetLastError()); + memset(bits, ~0, bmi.bmiHeader.biHeight * 4); + + SelectObject(dib_hdc, bitmap); + + ret = MaskBlt(hdc, 0, 0, 3, 4, dib_hdc, 0, 0, mask_bitmap, 0, 0, SRCCOPY); + ok(ret, "MaskBlt failed\n"); + + ret = MaskBlt(hdc, 0, 0, 3, 4, dib_hdc, 0, 0, NULL, 0, 0, SRCCOPY); + ok(ret, "MaskBlt failed\n"); + + ret = PlgBlt(hdc, plg_points, dib_hdc, 0, 0, 3, 4, mask_bitmap, 0, 0); + ok(ret, "PlgBlt failed\n"); + + DeleteDC(dib_hdc); + DeleteObject(bitmap); + DeleteObject(mask_bitmap); + + emf = CloseEnhMetaFile(hdc); + ok(emf != 0, "CloseMetaFile failed\n"); + + if (compare_emf_bits(emf, emf_mask_blit_bits, sizeof(emf_mask_blit_bits), + "emf_mask_blit", FALSE) != 0) + { + dump_emf_bits(emf, "emf_mask_blit"); + dump_emf_records(emf, "emf_mask_blit"); + } + + ret = DeleteEnhMetaFile(emf); + ok(ret, "DeleteMetaFile(%p) error %d\n", emf, GetLastError()); +} + static void test_mf_ExtTextOut_on_path(void) { HDC hdcMetafile; @@ -7621,6 +7805,7 @@ START_TEST(metafile) test_emf_select(); test_emf_blit(); test_emf_pattern_brush(); + test_emf_mask_blit(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC();

1 0

Jacek Caban : gdi32: Use EMR_TRANSPARENTBLT to record GetTransparentBlt.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 953a2190048e56866be5dc7af3711635ed7b9e08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=953a2190048e56866be5dc7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 10 14:27:39 2021 +0200 gdi32: Use EMR_TRANSPARENTBLT to record GetTransparentBlt. And use NtGdiTransparentBlt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 44 +++++++++++++++++++++++++------------------- dlls/gdi32/emfdc.c | 11 ++++++++++- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/gdidc.c | 17 +++++++++++++++++ include/ntgdi.h | 3 +++ 5 files changed, 58 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 33ce6966f87..cff84bc1dce 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -835,11 +835,11 @@ BOOL WINAPI NtGdiMaskBlt( HDC hdcDest, INT nXDest, INT nYDest, INT nWidth, INT n } /****************************************************************************** - * GdiTransparentBlt [GDI32.@] + * NtGdiTransparentBlt (win32u.@) */ -BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, int heightDest, - HDC hdcSrc, int xSrc, int ySrc, int widthSrc, int heightSrc, - UINT crTransparent ) +BOOL WINAPI NtGdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, int heightDest, + HDC hdcSrc, int xSrc, int ySrc, int widthSrc, int heightSrc, + UINT crTransparent ) { BOOL ret = FALSE; HDC hdcWork; @@ -858,8 +858,8 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, return FALSE; } - oldBackground = SetBkColor(hdcDest, RGB(255,255,255)); - oldForeground = SetTextColor(hdcDest, RGB(0,0,0)); + NtGdiGetAndSetDCDword( hdcDest, NtGdiSetBkColor, RGB(255,255,255), &oldBackground ); + NtGdiGetAndSetDCDword( hdcDest, NtGdiSetTextColor, RGB(0,0,0), &oldForeground ); /* Stretch bitmap */ oldStretchMode = GetStretchBltMode(hdcSrc); @@ -867,9 +867,9 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, SetStretchBltMode(hdcSrc, COLORONCOLOR); hdcWork = NtGdiCreateCompatibleDC( hdcDest ); if ((GetObjectType( hdcDest ) != OBJ_MEMDC || - GetObjectW( NtGdiGetDCObject( hdcDest, NTGDI_OBJ_SURF ), - sizeof(dib), &dib ) == sizeof(BITMAP)) && - GetDeviceCaps( hdcDest, BITSPIXEL ) == 32) + NtGdiExtGetObjectW( NtGdiGetDCObject( hdcDest, NTGDI_OBJ_SURF ), + sizeof(dib), &dib ) == sizeof(BITMAP)) && + NtGdiGetDeviceCaps( hdcDest, BITSPIXEL ) == 32) { /* screen DCs or DDBs are not supposed to have an alpha channel, so use a 24-bpp bitmap as copy */ BITMAPINFO info; @@ -883,37 +883,43 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, } else bmpWork = NtGdiCreateCompatibleBitmap( hdcDest, widthDest, heightDest ); oldWork = NtGdiSelectBitmap(hdcWork, bmpWork); - if(!StretchBlt(hdcWork, 0, 0, widthDest, heightDest, hdcSrc, xSrc, ySrc, widthSrc, heightSrc, SRCCOPY)) { + if (!NtGdiStretchBlt( hdcWork, 0, 0, widthDest, heightDest, hdcSrc, xSrc, ySrc, + widthSrc, heightSrc, SRCCOPY, 0 )) + { TRACE("Failed to stretch\n"); goto error; } - SetBkColor(hdcWork, crTransparent); + NtGdiGetAndSetDCDword( hdcWork, NtGdiSetBkColor, crTransparent, NULL ); /* Create mask */ hdcMask = NtGdiCreateCompatibleDC( hdcDest ); bmpMask = NtGdiCreateCompatibleBitmap( hdcMask, widthDest, heightDest ); oldMask = NtGdiSelectBitmap(hdcMask, bmpMask); - if(!BitBlt(hdcMask, 0, 0, widthDest, heightDest, hdcWork, 0, 0, SRCCOPY)) { + if (!NtGdiBitBlt( hdcMask, 0, 0, widthDest, heightDest, hdcWork, 0, 0, SRCCOPY, 0, 0 )) + { TRACE("Failed to create mask\n"); goto error; } /* Replace transparent color with black */ - SetBkColor(hdcWork, RGB(0,0,0)); - SetTextColor(hdcWork, RGB(255,255,255)); - if(!BitBlt(hdcWork, 0, 0, widthDest, heightDest, hdcMask, 0, 0, SRCAND)) { + NtGdiGetAndSetDCDword( hdcWork, NtGdiSetBkColor, RGB(0,0,0), NULL ); + NtGdiGetAndSetDCDword( hdcWork, NtGdiSetTextColor, RGB(255,255,255), NULL ); + if (!NtGdiBitBlt( hdcWork, 0, 0, widthDest, heightDest, hdcMask, 0, 0, SRCAND, 0, 0 )) + { TRACE("Failed to mask out background\n"); goto error; } /* Replace non-transparent area on destination with black */ - if(!BitBlt(hdcDest, xDest, yDest, widthDest, heightDest, hdcMask, 0, 0, SRCAND)) { + if (!NtGdiBitBlt( hdcDest, xDest, yDest, widthDest, heightDest, hdcMask, 0, 0, SRCAND, 0, 0 )) + { TRACE("Failed to clear destination area\n"); goto error; } /* Draw the image */ - if(!BitBlt(hdcDest, xDest, yDest, widthDest, heightDest, hdcWork, 0, 0, SRCPAINT)) { + if (!NtGdiBitBlt( hdcDest, xDest, yDest, widthDest, heightDest, hdcWork, 0, 0, SRCPAINT, 0, 0 )) + { TRACE("Failed to paint image\n"); goto error; } @@ -921,8 +927,8 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, ret = TRUE; error: SetStretchBltMode(hdcSrc, oldStretchMode); - SetBkColor(hdcDest, oldBackground); - SetTextColor(hdcDest, oldForeground); + NtGdiGetAndSetDCDword( hdcDest, NtGdiSetBkColor, oldBackground, NULL ); + NtGdiGetAndSetDCDword( hdcDest, NtGdiSetTextColor, oldForeground, NULL ); if(hdcWork) { NtGdiSelectBitmap(hdcWork, oldWork); NtGdiDeleteObjectApp( hdcWork ); diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 79220a5e1e0..a1c7eb74fd5 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1287,7 +1287,7 @@ static BOOL emfdrv_stretchblt( struct emf *emf, INT x_dst, INT y_dst, INT width_ emr->cyDest = height_dst; emr->xSrc = x_src; emr->ySrc = y_src; - if (type == EMR_STRETCHBLT || type == EMR_ALPHABLEND) + if (type != EMR_BITBLT) { EMRSTRETCHBLT *emr_stretchblt = (EMRSTRETCHBLT *)emr; emr_stretchblt->cxSrc = width_src; @@ -1388,6 +1388,15 @@ BOOL EMFDC_StretchBlt( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, IN height_src, rop, EMR_STRETCHBLT ); } +BOOL EMFDC_TransparentBlt( DC_ATTR *dc_attr, int x_dst, int y_dst, int width_dst, int height_dst, + HDC hdc_src, int x_src, int y_src, int width_src, int height_src, + UINT color ) +{ + return emfdrv_stretchblt( dc_attr->emf, x_dst, y_dst, width_dst, height_dst, + hdc_src, x_src, y_src, width_src, + height_src, color, EMR_TRANSPARENTBLT ); +} + BOOL EMFDC_MaskBlt( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT height_dst, HDC hdc_src, INT x_src, INT y_src, HBITMAP mask, INT x_mask, INT y_mask, DWORD rop ) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index efadf3a7c82..238ae3b7de1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -271,6 +271,9 @@ extern BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT wid UINT coloruse, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL EMFDC_StrokeAndFillPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_StrokePath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_TransparentBlt( DC_ATTR *dc_attr, int x_dst, int y_dst, int width_dst, + int height_dst, HDC hdc_src, int x_src, int y_src, int width_src, + int height_src, UINT color ) DECLSPEC_HIDDEN; extern BOOL EMFDC_WidenPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern HENHMETAFILE EMF_Create_HENHMETAFILE( ENHMETAHEADER *emh, DWORD filesize, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 61b318ce067..b2e673fe581 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1532,6 +1532,23 @@ BOOL WINAPI PlgBlt( HDC hdc, const POINT *points, HDC hdc_src, INT x_src, INT y_ mask, x_mask, y_mask, 0 /* FIXME */ ); } +/****************************************************************************** + * GdiTransparentBlt (GDI32.@) + */ +BOOL WINAPI GdiTransparentBlt( HDC hdc, int x_dst, int y_dst, int width_dst, int height_dst, + HDC hdc_src, int x_src, int y_src, int width_src, int height_src, + UINT color ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_TransparentBlt( dc_attr, x_dst, y_dst, width_dst, height_dst, hdc_src, + x_src, y_src, width_src, height_src, color )) + return FALSE; + return NtGdiTransparentBlt( hdc, x_dst, y_dst, width_dst, height_dst, hdc_src, x_src, y_src, + width_src, height_src, color ); +} + /****************************************************************************** * GdiAlphaBlend (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 44a27878792..4ee02942346 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -417,6 +417,9 @@ INT WINAPI NtGdiStretchDIBitsInternal( HDC hdc, INT x_dst, INT y_dst, INT w HANDLE xform ); BOOL WINAPI NtGdiStrokePath( HDC hdc ); BOOL WINAPI NtGdiStrokeAndFillPath( HDC hdc ); +BOOL WINAPI NtGdiTransparentBlt( HDC hdc, int x_dst, int y_dst, int width_dst, int height_dst, + HDC hdc_src, int x_src, int y_src, int width_src, int height_src, + UINT color ); BOOL WINAPI NtGdiTransformPoints( HDC hdc, const POINT *points_in, POINT *points_out, INT count, UINT mode ); BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj );

1 0

Jacek Caban : gdi32/tests: Add GdiTransparentBlt tests.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 33ecaf357e70c887e8bd6b6b6fdb5e76a35e61a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33ecaf357e70c887e8bd6b6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 10 14:27:48 2021 +0200 gdi32/tests: Add GdiTransparentBlt tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 254 ++++++++++++++++++++++++-------------------- 1 file changed, 140 insertions(+), 114 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33ecaf357e70c887e8bd…

1 0