wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

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/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/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

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

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 : 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: Share more code between the various IShellFolder_GetDetailsOf implementations.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: aef981df621a1caf6aa2245e5046e82e045be814 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aef981df621a1caf6aa2245e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 10 18:50:19 2021 +0200 shell32: Share more code between the various IShellFolder_GetDetailsOf implementations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/cpanelfolder.c | 44 +++++++++++++++++------------------------ dlls/shell32/recyclebin.c | 46 ++++++++++++++----------------------------- dlls/shell32/shfldr.h | 2 ++ dlls/shell32/shfldr_desktop.c | 26 +----------------------- dlls/shell32/shfldr_fs.c | 35 ++------------------------------ dlls/shell32/shfldr_mycomp.c | 10 +++------- dlls/shell32/shfldr_unixfs.c | 20 ++++--------------- dlls/shell32/shlfolder.c | 24 ++++++++++++++++++++++ 8 files changed, 69 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aef981df621a1caf6aa2…

1 0

Nikolay Sivov : ole32: Merge ole2* source files.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 70043501fc03d2452f8e55abdc589f0ad7dfa7d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70043501fc03d2452f8e55ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 10 09:26:43 2021 +0300 ole32: Merge ole2* source files. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 1 - dlls/ole32/ole2.c | 461 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole2impl.c | 514 ------------------------------------------------- dlls/ole32/ole2stubs.c | 2 +- 4 files changed, 462 insertions(+), 516 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70043501fc03d2452f8e…

1 0

Nikolay Sivov : ole32: Remove unused CoGetCallerTID() stub.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: d496fd488f8fc40164ee0ecdd297ce6ba2cf783f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d496fd488f8fc40164ee0ecd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 10 09:26:42 2021 +0300 ole32: Remove unused CoGetCallerTID() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2stubs.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index 49130c51584..74b4e864403 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -81,12 +81,3 @@ HRESULT WINAPI DECLSPEC_HOTPATCH OleRegEnumFormatEtc ( return E_NOTIMPL; } - -/*********************************************************************** - * CoGetCallerTID [OLE32.@] - */ -HRESULT WINAPI CoGetCallerTID(LPDWORD lpdwTID) -{ - FIXME("stub!\n"); - return E_NOTIMPL; -}

1 0

Tim Clem : winemac.drv: Allow cycling of windows with Cmd+`.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: b5deeff860339c214e48f411bda94e456abf03a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5deeff860339c214e48f411… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Sep 9 15:31:56 2021 -0700 winemac.drv: Allow cycling of windows with Cmd+`. We already set up the Window menu and set the relevant bits in collectionBehavior, but windows must respond YES to -canBecomeKeyWindow in order to actually be activated by Cmd+` window cycling. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 0926756c875..80cb2693409 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2358,7 +2358,11 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { if (causing_becomeKeyWindow == self) return YES; if (self.disabled || self.noActivate) return NO; - return [self isKeyWindow]; + if ([self isKeyWindow]) return YES; + + // If a window's collectionBehavior says it participates in cycling, + // it must return YES from this method to actually be eligible. + return ![self isExcludedFromWindowsMenu]; } - (BOOL) canBecomeMainWindow

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2021