September 2021 - Wine-commits

Eric Pouech : dbghelp/dwarf: Don't recompute location when said location is complex.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 92b3f1bf2ad363578587408d40b7eccff82b182d URL: https://source.winehq.org/git/wine.git/?a=commit;h=92b3f1bf2ad363578587408d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Sep 11 10:58:47 2021 +0200 dbghelp/dwarf: Don't recompute location when said location is complex. This was generating a global symbol instead of a local symbol. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 13f1c0e7d9c..476061a62a5 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -947,7 +947,6 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, *ptr = xloc.u.block.size; memcpy(ptr + 1, xloc.u.block.ptr, xloc.u.block.size); loc->offset = (ULONG_PTR)ptr; - compute_location(ctx->module, &ctx->head, &lctx, loc, NULL, frame); } } return TRUE;

1 0

Eric Pouech : dbghelp/dwarf: Properly parse 32 vs bit 64bit entities.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: d78c09aa37d55316e3d2eff8ab2bda4a0cd733de URL: https://source.winehq.org/git/wine.git/?a=commit;h=d78c09aa37d55316e3d2eff8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Sep 11 10:58:53 2021 +0200 dbghelp/dwarf: Properly parse 32 vs bit 64bit entities. Store the offset_size in dwarf2_cuhead_t. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 64 ++++++++++++++++++++++++++++++++++++++-------------- dlls/dbghelp/dwarf.h | 1 + 2 files changed, 48 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 476061a62a5..331739899d8 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -170,6 +170,7 @@ typedef struct dwarf2_cuhead_s { unsigned char word_size; /* size of a word on target machine */ unsigned char version; + unsigned char offset_size; /* size of offset inside DWARF */ } dwarf2_cuhead_t; typedef struct dwarf2_parse_context_s @@ -362,6 +363,25 @@ static inline ULONG_PTR dwarf2_parse_addr_head(dwarf2_traverse_context_t* ctx, c return dwarf2_parse_addr(ctx, head->word_size); } +static ULONG_PTR dwarf2_parse_offset(dwarf2_traverse_context_t* ctx, unsigned char offset_size) +{ + ULONG_PTR ret = dwarf2_get_addr(ctx->data, offset_size); + ctx->data += offset_size; + return ret; +} + +static ULONG_PTR dwarf2_parse_3264(dwarf2_traverse_context_t* ctx, unsigned char* ofsz) +{ + ULONG_PTR ret = dwarf2_parse_u4(ctx); + if (ret == 0xffffffff) + { + ret = dwarf2_parse_u8(ctx); + *ofsz = 8; + } + else *ofsz = 4; + return ret; +} + static const char* dwarf2_debug_traverse_ctx(const dwarf2_traverse_context_t* ctx) { return wine_dbg_sprintf("ctx(%p)", ctx->data); @@ -2159,6 +2179,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, unsigned insn_size, default_stmt; unsigned line_range, opcode_base; int line_base; + unsigned char offset_size; const unsigned char* opcode_len; struct vector dirs; struct vector files; @@ -2174,18 +2195,23 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, return FALSE; } traverse.data = sections[section_line].address + offset; - traverse.end_data = traverse.data + 4; + traverse.end_data = sections[section_line].address + sections[section_line].size; - length = dwarf2_parse_u4(&traverse); - traverse.end_data = sections[section_line].address + offset + length; + length = dwarf2_parse_3264(&traverse, &offset_size); + if (offset_size != ctx->head.offset_size) + { + WARN("Mismatch in 32/64 bit format\n"); + return FALSE; + } + traverse.end_data = traverse.data + length; - if (offset + 4 + length > sections[section_line].size) + if (traverse.end_data > sections[section_line].address + sections[section_line].size) { WARN("out of bounds header\n"); return FALSE; } dwarf2_parse_u2(&traverse); /* version */ - dwarf2_parse_u4(&traverse); /* header_len */ + dwarf2_parse_offset(&traverse, offset_size); /* header_len */ insn_size = dwarf2_parse_byte(&traverse); default_stmt = dwarf2_parse_byte(&traverse); line_base = (signed char)dwarf2_parse_byte(&traverse); @@ -2375,12 +2401,13 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, /* FIXME this is a temporary configuration while adding support for dwarf3&4 bits */ static LONG max_supported_dwarf_version = 0; - cu_length = dwarf2_parse_u4(mod_ctx); + cu_length = dwarf2_parse_3264(mod_ctx, &ctx.head.offset_size); + cu_ctx.data = mod_ctx->data; cu_ctx.end_data = mod_ctx->data + cu_length; mod_ctx->data += cu_length; ctx.head.version = dwarf2_parse_u2(&cu_ctx); - cu_abbrev_offset = dwarf2_parse_u4(&cu_ctx); + cu_abbrev_offset = dwarf2_parse_offset(&cu_ctx, ctx.head.offset_size); ctx.head.word_size = dwarf2_parse_byte(&cu_ctx); TRACE("Compilation Unit Header found at 0x%x:\n", @@ -2389,6 +2416,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, TRACE("- version: %u\n", ctx.head.version); TRACE("- abbrev_offset: %lu\n", cu_abbrev_offset); TRACE("- word_size: %u\n", ctx.head.word_size); + TRACE("- offset_size: %u\n", ctx.head.offset_size); if (max_supported_dwarf_version == 0) { @@ -2727,13 +2755,13 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt const unsigned char* ptr_blk; const unsigned char* cie_ptr; const unsigned char* last_cie_ptr = (const unsigned char*)~0; - unsigned len, id; + ULONG_PTR len, id; ULONG_PTR start, range; - unsigned cie_id; + ULONG_PTR cie_id; const BYTE* start_data = fde_ctx->data; unsigned char word_size = module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; + unsigned char offset_size; - cie_id = in_eh_frame ? 0 : DW_CIE_ID; /* skip 0-padding at beginning of section (alignment) */ while (fde_ctx->data + 2 * 4 < fde_ctx->end_data) { @@ -2745,14 +2773,15 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt } for (; fde_ctx->data + 2 * 4 < fde_ctx->end_data; fde_ctx->data = ptr_blk) { + const unsigned char* st = fde_ctx->data; /* find the FDE for address addr (skip CIE) */ - len = dwarf2_parse_u4(fde_ctx); - if (len == 0xffffffff) FIXME("Unsupported yet 64-bit CIEs\n"); + len = dwarf2_parse_3264(fde_ctx, &offset_size); + cie_id = in_eh_frame ? 0 : (offset_size == 4 ? DW_CIE_ID : (ULONG_PTR)DW64_CIE_ID); ptr_blk = fde_ctx->data + len; - id = dwarf2_parse_u4(fde_ctx); + id = dwarf2_parse_offset(fde_ctx, offset_size); if (id == cie_id) { - last_cie_ptr = fde_ctx->data - 8; + last_cie_ptr = st; /* we need some bits out of the CIE in order to parse all contents */ if (!parse_cie_details(fde_ctx, info, word_size)) return FALSE; cie_ctx->data = fde_ctx->data; @@ -2764,9 +2793,10 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt { last_cie_ptr = cie_ptr; cie_ctx->data = cie_ptr; - cie_ctx->end_data = cie_ptr + 4; - cie_ctx->end_data = cie_ptr + 4 + dwarf2_parse_u4(cie_ctx); - if (dwarf2_parse_u4(cie_ctx) != cie_id) + cie_ctx->end_data = cie_ptr + (offset_size == 4 ? 4 : 4 + 8); + cie_ctx->end_data += dwarf2_parse_3264(cie_ctx, &offset_size); + + if (dwarf2_parse_offset(cie_ctx, in_eh_frame ? word_size : offset_size) != cie_id) { FIXME("wrong CIE pointer at %x from FDE %x\n", (unsigned)(cie_ptr - start_data), diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index d4355d72e80..603c302d136 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -504,6 +504,7 @@ enum dwarf_calling_convention #define DW_LNE_hi_user 0xff #define DW_CIE_ID ~(0x0U) +#define DW64_CIE_ID ~((ULONG64)0x0) enum dwarf_call_frame_info {

1 0

Nikolay Sivov : ole32: Simplify CommonPrefixWith() for class moniker.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: e2f8a3e4ed6dcbcca3471ebcc6a0acfe90b7f815 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2f8a3e4ed6dcbcca3471ebc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 11:47:53 2021 +0300 ole32: Simplify CommonPrefixWith() for class moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index c52aaa9fbcf..1aa008270a1 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -452,39 +452,27 @@ static HRESULT WINAPI ClassMoniker_Inverse(IMoniker* iface,IMoniker** ppmk) return CreateAntiMoniker(ppmk); } -/****************************************************************************** - * ClassMoniker_CommonPrefixWith - ******************************************************************************/ -static HRESULT WINAPI ClassMoniker_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) +static HRESULT WINAPI ClassMoniker_CommonPrefixWith(IMoniker *iface, IMoniker *other, IMoniker **prefix) { - DWORD mkSys; - - TRACE("(%p, %p)\n", pmkOther, ppmkPrefix); + ClassMoniker *moniker = impl_from_IMoniker(iface), *other_moniker; - *ppmkPrefix = NULL; + TRACE("%p, %p, %p\n", iface, other, prefix); - IMoniker_IsSystemMoniker(pmkOther, &mkSys); + *prefix = NULL; - /* If the other moniker is an class moniker that is equal to this moniker, this method sets *ppmkPrefix */ - /* to this moniker and returns MK_S_US */ + other_moniker = unsafe_impl_from_IMoniker(other); - if (mkSys == MKSYS_CLASSMONIKER) + if (other_moniker) { - if (IMoniker_IsEqual(iface, pmkOther) == S_OK) - { - *ppmkPrefix = iface; + if (!IsEqualGUID(&moniker->clsid, &other_moniker->clsid)) return MK_E_NOPREFIX; - IMoniker_AddRef(iface); + *prefix = iface; + IMoniker_AddRef(iface); - return MK_S_US; - } - else - return MK_E_NOPREFIX; + return MK_S_US; } - else - /* otherwise, the method calls the MonikerCommonPrefixWith function. This function correctly handles */ - /* the case where the other moniker is a generic composite. */ - return MonikerCommonPrefixWith(iface, pmkOther, ppmkPrefix); + + return MonikerCommonPrefixWith(iface, other, prefix); } /******************************************************************************

1 0

Nikolay Sivov : ole32: Use single call to read/write serialization header of class moniker.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 04439b7cfc849c25631eeae5a873210365ade94c URL: https://source.winehq.org/git/wine.git/?a=commit;h=04439b7cfc849c25631eeae5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 11:47:54 2021 +0300 ole32: Use single call to read/write serialization header of class moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 73 +++++++++++++++++++++------------------------- dlls/ole32/tests/moniker.c | 33 +++++++++++++++++++-- 2 files changed, 64 insertions(+), 42 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 1aa008270a1..4872014a508 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -43,7 +43,13 @@ typedef struct ClassMoniker IMoniker IMoniker_iface; IROTData IROTData_iface; LONG ref; - CLSID clsid; /* clsid identified by this moniker */ + + struct + { + CLSID clsid; + DWORD data_len; + } header; + IUnknown *pMarshal; /* custom marshaler */ } ClassMoniker; @@ -171,41 +177,33 @@ static HRESULT WINAPI ClassMoniker_IsDirty(IMoniker* iface) return S_FALSE; } -/****************************************************************************** - * ClassMoniker_Load - ******************************************************************************/ -static HRESULT WINAPI ClassMoniker_Load(IMoniker* iface,IStream* pStm) +static HRESULT WINAPI ClassMoniker_Load(IMoniker *iface, IStream *stream) { - ClassMoniker *This = impl_from_IMoniker(iface); + ClassMoniker *moniker = impl_from_IMoniker(iface); + ULONG length; HRESULT hr; - DWORD zero; - TRACE("(%p)\n", pStm); + TRACE("%p, %p\n", iface, stream); - hr = IStream_Read(pStm, &This->clsid, sizeof(This->clsid), NULL); - if (hr != S_OK) return STG_E_READFAULT; + hr = IStream_Read(stream, &moniker->header, sizeof(moniker->header), &length); + if (hr != S_OK || length != sizeof(moniker->header)) return STG_E_READFAULT; - hr = IStream_Read(pStm, &zero, sizeof(zero), NULL); - if ((hr != S_OK) || (zero != 0)) return STG_E_READFAULT; + if (moniker->header.data_len) + { + FIXME("Moniker data of length %u was ignored.\n", moniker->header.data_len); + moniker->header.data_len = 0; + } return S_OK; } -/****************************************************************************** - * ClassMoniker_Save - ******************************************************************************/ -static HRESULT WINAPI ClassMoniker_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) +static HRESULT WINAPI ClassMoniker_Save(IMoniker *iface, IStream *stream, BOOL clear_dirty) { - ClassMoniker *This = impl_from_IMoniker(iface); - HRESULT hr; - DWORD zero = 0; - - TRACE("(%p, %s)\n", pStm, fClearDirty ? "TRUE" : "FALSE"); + ClassMoniker *moniker = impl_from_IMoniker(iface); - hr = IStream_Write(pStm, &This->clsid, sizeof(This->clsid), NULL); - if (FAILED(hr)) return hr; + TRACE("%p, %p, %d\n", iface, stream, clear_dirty); - return IStream_Write(pStm, &zero, sizeof(zero), NULL); + return IStream_Write(stream, &moniker->header, sizeof(moniker->header), NULL); } /****************************************************************************** @@ -230,7 +228,7 @@ static HRESULT WINAPI ClassMoniker_BindToObject(IMoniker* iface, REFIID riid, VOID** ppvResult) { - ClassMoniker *This = impl_from_IMoniker(iface); + ClassMoniker *moniker = impl_from_IMoniker(iface); BIND_OPTS2 bindopts; IClassActivator *pActivator; HRESULT hr; @@ -241,7 +239,7 @@ static HRESULT WINAPI ClassMoniker_BindToObject(IMoniker* iface, IBindCtx_GetBindOptions(pbc, (BIND_OPTS *)&bindopts); if (!pmkToLeft) - return CoGetClassObject(&This->clsid, bindopts.dwClassContext, NULL, + return CoGetClassObject(&moniker->header.clsid, bindopts.dwClassContext, NULL, riid, ppvResult); else { @@ -249,7 +247,7 @@ static HRESULT WINAPI ClassMoniker_BindToObject(IMoniker* iface, (void **)&pActivator); if (FAILED(hr)) return hr; - hr = IClassActivator_GetClassObject(pActivator, &This->clsid, + hr = IClassActivator_GetClassObject(pActivator, &moniker->header.clsid, bindopts.dwClassContext, bindopts.locale, riid, ppvResult); @@ -395,19 +393,16 @@ static HRESULT WINAPI ClassMoniker_IsEqual(IMoniker *iface, IMoniker *other) if (!other_moniker) return S_FALSE; - return IsEqualGUID(&moniker->clsid, &other_moniker->clsid) ? S_OK : S_FALSE; + return IsEqualGUID(&moniker->header.clsid, &other_moniker->header.clsid) ? S_OK : S_FALSE; } -/****************************************************************************** - * ClassMoniker_Hash - ******************************************************************************/ -static HRESULT WINAPI ClassMoniker_Hash(IMoniker* iface,DWORD* pdwHash) +static HRESULT WINAPI ClassMoniker_Hash(IMoniker *iface, DWORD *hash) { - ClassMoniker *This = impl_from_IMoniker(iface); + ClassMoniker *moniker = impl_from_IMoniker(iface); - TRACE("(%p)\n", pdwHash); + TRACE("%p, %p\n", iface, hash); - *pdwHash = This->clsid.Data1; + *hash = moniker->header.clsid.Data1; return S_OK; } @@ -464,7 +459,7 @@ static HRESULT WINAPI ClassMoniker_CommonPrefixWith(IMoniker *iface, IMoniker *o if (other_moniker) { - if (!IsEqualGUID(&moniker->clsid, &other_moniker->clsid)) return MK_E_NOPREFIX; + if (!IsEqualGUID(&moniker->header.clsid, &other_moniker->header.clsid)) return MK_E_NOPREFIX; *prefix = iface; IMoniker_AddRef(iface); @@ -495,7 +490,7 @@ static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker *iface, { ClassMoniker *moniker = impl_from_IMoniker(iface); static const int name_len = CHARS_IN_GUID + 5 /* prefix */; - const GUID *guid = &moniker->clsid; + const GUID *guid = &moniker->header.clsid; TRACE("%p, %p, %p, %p.\n", iface, pbc, pmkToLeft, name); @@ -602,7 +597,7 @@ static HRESULT WINAPI ClassMonikerROTData_GetComparisonData(IROTData* iface, /* write CLSID of the moniker */ memcpy(pbData, &CLSID_ClassMoniker, sizeof(CLSID)); /* write CLSID the moniker represents */ - memcpy(pbData+sizeof(CLSID), &This->clsid, sizeof(CLSID)); + memcpy(pbData+sizeof(CLSID), &This->header.clsid, sizeof(CLSID)); return S_OK; } @@ -659,7 +654,7 @@ HRESULT WINAPI CreateClassMoniker(REFCLSID rclsid, IMoniker **moniker) object->IMoniker_iface.lpVtbl = &ClassMonikerVtbl; object->IROTData_iface.lpVtbl = &ROTDataVtbl; object->ref = 1; - object->clsid = *rclsid; + object->header.clsid = *rclsid; *moniker = &object->IMoniker_iface; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index d8d52295ff2..86b47e28b89 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1774,6 +1774,36 @@ static void test_class_moniker(void) IBindCtx *bindctx; IUnknown *unknown; FILETIME filetime; + ULONG eaten; + + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Extended syntax, handled by class moniker directly, only CLSID is meaningful for equality. */ + hr = MkParseDisplayName(bindctx, L"clsid:11111111-0000-0000-2222-444444444444;extra data:", &eaten, &moniker); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(eaten == 54, "Unexpected length %u.\n", eaten); + + hr = MkParseDisplayName(bindctx, L"clsid:11111111-0000-0000-2222-444444444444;different extra data:", &eaten, &moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + TEST_DISPLAY_NAME(moniker, L"clsid:11111111-0000-0000-2222-444444444444;extra data:"); + TEST_MONIKER_TYPE(moniker, MKSYS_CLASSMONIKER); + + TEST_MONIKER_TYPE(moniker2, MKSYS_CLASSMONIKER); + + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker2, moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMoniker_Release(moniker2); + IMoniker_Release(moniker); + } hr = CreateClassMoniker(&CLSID_StdComponentCategoriesMgr, &moniker); ok_ole_success(hr, CreateClassMoniker); @@ -1801,9 +1831,6 @@ static void test_class_moniker(void) /* IsSystemMoniker test */ TEST_MONIKER_TYPE(moniker, MKSYS_CLASSMONIKER); - hr = CreateBindCtx(0, &bindctx); - ok_ole_success(hr, CreateBindCtx); - /* IsRunning test */ hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); ok(hr == E_NOTIMPL, "IMoniker_IsRunning should return E_NOTIMPL, not 0x%08x\n", hr);

1 0

Nikolay Sivov : ole32: Implement ParseDisplayName() for class moniker.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 7013f068f37c0e1482f7474c024cd2775d8bac02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7013f068f37c0e1482f7474c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 11:47:55 2021 +0300 ole32: Implement ParseDisplayName() for class moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 4872014a508..ac4854347c8 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -512,18 +512,21 @@ static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker *iface, return S_OK; } -/****************************************************************************** - * ClassMoniker_ParseDisplayName - ******************************************************************************/ -static HRESULT WINAPI ClassMoniker_ParseDisplayName(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - LPOLESTR pszDisplayName, - ULONG* pchEaten, - IMoniker** ppmkOut) -{ - FIXME("(%p, %p, %s, %p, %p)\n", pbc, pmkToLeft, debugstr_w(pszDisplayName), pchEaten, ppmkOut); - return E_NOTIMPL; +static HRESULT WINAPI ClassMoniker_ParseDisplayName(IMoniker *iface, IBindCtx *pbc, + IMoniker *pmkToLeft, LPOLESTR display_name, ULONG *eaten, IMoniker **result) +{ + IParseDisplayName *parser; + HRESULT hr; + + TRACE("%p, %p, %p, %s, %p, %p\n", iface, pbc, pmkToLeft, debugstr_w(display_name), eaten, result); + + if (SUCCEEDED(hr = IMoniker_BindToObject(iface, pbc, pmkToLeft, &IID_IParseDisplayName, (void **)&parser))) + { + hr = IParseDisplayName_ParseDisplayName(parser, pbc, display_name, eaten, result); + IParseDisplayName_Release(parser); + } + + return hr; } /******************************************************************************

1 0

Nikolay Sivov : ole32: Handle extra class moniker data on load/save.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 44d57a615f2d2ca16b45f346f868a04b608cccdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=44d57a615f2d2ca16b45f346… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 11:47:56 2021 +0300 ole32: Handle extra class moniker data on load/save. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 60 +++++++++++++++++++++++++++------------------- dlls/ole32/tests/moniker.c | 56 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 25 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index ac4854347c8..86c2639e8ec 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -30,6 +30,7 @@ #include "winbase.h" #include "winuser.h" #include "wine/debug.h" +#include "wine/heap.h" #include "ole2.h" #include "moniker.h" @@ -49,6 +50,7 @@ typedef struct ClassMoniker CLSID clsid; DWORD data_len; } header; + WCHAR *data; IUnknown *pMarshal; /* custom marshaler */ } ClassMoniker; @@ -126,23 +128,18 @@ static ULONG WINAPI ClassMoniker_AddRef(IMoniker* iface) return InterlockedIncrement(&This->ref); } -/****************************************************************************** - * ClassMoniker_Release - ******************************************************************************/ static ULONG WINAPI ClassMoniker_Release(IMoniker* iface) { - ClassMoniker *This = impl_from_IMoniker(iface); - ULONG ref; - - TRACE("(%p)\n",This); + ClassMoniker *moniker = impl_from_IMoniker(iface); + ULONG ref = InterlockedDecrement(&moniker->ref); - ref = InterlockedDecrement(&This->ref); + TRACE("%p refcount %d\n", iface, ref); - /* destroy the object if there are no more references to it */ - if (ref == 0) + if (!ref) { - if (This->pMarshal) IUnknown_Release(This->pMarshal); - HeapFree(GetProcessHeap(),0,This); + if (moniker->pMarshal) IUnknown_Release(moniker->pMarshal); + heap_free(moniker->data); + heap_free(moniker); } return ref; @@ -190,8 +187,15 @@ static HRESULT WINAPI ClassMoniker_Load(IMoniker *iface, IStream *stream) if (moniker->header.data_len) { - FIXME("Moniker data of length %u was ignored.\n", moniker->header.data_len); - moniker->header.data_len = 0; + heap_free(moniker->data); + if (!(moniker->data = heap_alloc(moniker->header.data_len))) + { + WARN("Failed to allocate moniker data of size %u.\n", moniker->header.data_len); + moniker->header.data_len = 0; + return E_OUTOFMEMORY; + } + hr = IStream_Read(stream, moniker->data, moniker->header.data_len, &length); + if (hr != S_OK || length != moniker->header.data_len) return STG_E_READFAULT; } return S_OK; @@ -200,21 +204,25 @@ static HRESULT WINAPI ClassMoniker_Load(IMoniker *iface, IStream *stream) static HRESULT WINAPI ClassMoniker_Save(IMoniker *iface, IStream *stream, BOOL clear_dirty) { ClassMoniker *moniker = impl_from_IMoniker(iface); + HRESULT hr; TRACE("%p, %p, %d\n", iface, stream, clear_dirty); - return IStream_Write(stream, &moniker->header, sizeof(moniker->header), NULL); + hr = IStream_Write(stream, &moniker->header, sizeof(moniker->header), NULL); + + if (SUCCEEDED(hr) && moniker->header.data_len) + hr = IStream_Write(stream, moniker->data, moniker->header.data_len, NULL); + + return hr; } -/****************************************************************************** - * ClassMoniker_GetSizeMax - ******************************************************************************/ -static HRESULT WINAPI ClassMoniker_GetSizeMax(IMoniker* iface, - ULARGE_INTEGER* pcbSize)/* Pointer to size of stream needed to save object */ +static HRESULT WINAPI ClassMoniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *size) { - TRACE("(%p)\n", pcbSize); + ClassMoniker *moniker = impl_from_IMoniker(iface); + + TRACE("%p, %p\n", iface, size); - pcbSize->QuadPart = sizeof(CLSID) + sizeof(DWORD); + size->QuadPart = sizeof(moniker->header) + moniker->header.data_len; return S_OK; } @@ -500,13 +508,17 @@ static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker *iface, if (pmkToLeft) return E_INVALIDARG; - if (!(*name = CoTaskMemAlloc(name_len * sizeof(WCHAR)))) + if (!(*name = CoTaskMemAlloc(name_len * sizeof(WCHAR) + moniker->header.data_len))) return E_OUTOFMEMORY; - swprintf(*name, name_len, L"clsid:%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X:", + swprintf(*name, name_len, L"clsid:%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + if (moniker->header.data_len) + lstrcatW(*name, moniker->data); + lstrcatW(*name, L":"); + TRACE("Returning %s\n", debugstr_w(*name)); return S_OK; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 86b47e28b89..afe40980dd9 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1769,12 +1769,17 @@ static void test_class_moniker(void) { IMoniker *moniker, *moniker2, *inverse, *reduced, *anti; IEnumMoniker *enummoniker; + ULONG length, eaten; + ULARGE_INTEGER size; + LARGE_INTEGER pos; + IROTData *rotdata; HRESULT hr; DWORD hash; IBindCtx *bindctx; IUnknown *unknown; FILETIME filetime; - ULONG eaten; + IStream *stream; + BYTE buffer[100]; hr = CreateBindCtx(0, &bindctx); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1792,6 +1797,9 @@ todo_wine TEST_DISPLAY_NAME(moniker, L"clsid:11111111-0000-0000-2222-444444444444;extra data:"); TEST_MONIKER_TYPE(moniker, MKSYS_CLASSMONIKER); + hr = IMoniker_GetSizeMax(moniker, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.LowPart == 44, "Unexpected size %u.\n", size.LowPart); TEST_MONIKER_TYPE(moniker2, MKSYS_CLASSMONIKER); @@ -1805,9 +1813,55 @@ todo_wine IMoniker_Release(moniker); } + /* From persistent state */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CreateClassMoniker(&GUID_NULL, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetSizeMax(moniker, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.QuadPart == 20, "Unexpected size %u.\n", size.LowPart); + + hr = IStream_Write(stream, &CLSID_StdComponentCategoriesMgr, sizeof(CLSID), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + length = 5 * sizeof(WCHAR); + hr = IStream_Write(stream, &length, sizeof(length), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IStream_Write(stream, L"data", length, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + pos.QuadPart = 0; + hr = IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetSizeMax(moniker, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.QuadPart == 30, "Unexpected size %u.\n", size.LowPart); + TEST_DISPLAY_NAME(moniker, L"clsid:0002E005-0000-0000-C000-000000000046data:"); + + /* Extra data does not affect comparison */ + hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IROTData_GetComparisonData(rotdata, buffer, sizeof(buffer), &length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(length == sizeof(expected_class_moniker_comparison_data), "Unexpected comparison data length %u.\n", length); + ok(!memcmp(buffer, expected_class_moniker_comparison_data, length), "Unexpected data.\n"); + IROTData_Release(rotdata); + + IStream_Release(stream); + IMoniker_Release(moniker); + hr = CreateClassMoniker(&CLSID_StdComponentCategoriesMgr, &moniker); ok_ole_success(hr, CreateClassMoniker); + hr = IMoniker_GetSizeMax(moniker, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.LowPart == 20, "Unexpected size %u.\n", size.LowPart); + hr = IMoniker_QueryInterface(moniker, &CLSID_ClassMoniker, (void **)&unknown); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n");

1 0

Nikolay Sivov : ole32: Improve class moniker display name parsing.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: a5a333572c17684ae39189711ad2d2a9adb68a75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5a333572c17684ae3918971… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 11:47:57 2021 +0300 ole32: Improve class moniker display name parsing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 129 +++++++++++++++++++++------------------------ dlls/ole32/moniker.c | 3 +- dlls/ole32/tests/moniker.c | 89 ++++++++++++++++++++++++------- 3 files changed, 129 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a5a333572c17684ae391…

1 0

Alexandre Julliard : shell32: Create the PIDLs even if IFileSystemBindData::GetFindData returns an error.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 429154a97d064b8647fe69ba9e4165a8423942e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=429154a97d064b8647fe69ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 14 12:38:13 2021 +0200 shell32: Create the PIDLs even if IFileSystemBindData::GetFindData returns an error. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_fs.c | 66 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 211b8d47a1a..e298cc18bd2 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -261,7 +261,7 @@ LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path) IFileSystemBindData_Release( fsbd ); } IUnknown_Release( unk ); - + return pidl; } @@ -300,10 +300,11 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - HRESULT hr = E_INVALIDARG; + HRESULT hr = S_OK; LPCWSTR szNext = NULL; - WCHAR szElement[MAX_PATH]; WCHAR szPath[MAX_PATH]; + WIN32_FIND_DATAW find_data = { 0 }; + IFileSystemBindData *fsbd = NULL; LPITEMIDLIST pidlTemp = NULL; DWORD len; @@ -317,31 +318,55 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, if (pchEaten) *pchEaten = 0; /* strange but like the original */ - pidlTemp = SHELL32_CreatePidlFromBindCtx(pbc, lpszDisplayName); - if (!pidlTemp && *lpszDisplayName) + if (pbc) { - /* get the next element */ - szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); + static WCHAR dataW[] = {'F','i','l','e',' ','S','y','s','t','e','m',' ', + 'B','i','n','d',' ','D','a','t','a',0 }; + IUnknown *unk; + /* see if the caller bound File System Bind Data */ + if (SUCCEEDED( IBindCtx_GetObjectParam( pbc, dataW, &unk ))) + { + IUnknown_QueryInterface( unk, &IID_IFileSystemBindData, (void**)&fsbd ); + IUnknown_Release( unk ); + } + } + + if (*lpszDisplayName) + { /* build the full pathname to the element */ lstrcpynW(szPath, This->sPathTarget, MAX_PATH - 1); PathAddBackslashW(szPath); len = lstrlenW(szPath); - lstrcpynW(szPath + len, szElement, MAX_PATH - len); - - /* get the pidl */ - hr = _ILCreateFromPathW(szPath, &pidlTemp); + /* get the next element */ + szNext = GetNextElementW( lpszDisplayName, szPath + len, MAX_PATH - len ); - if (SUCCEEDED(hr)) { - if (szNext && *szNext) { - /* try to analyse the next element */ - hr = SHELL32_ParseNextElement (iface, hwndOwner, pbc, - &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes); - } else { - /* it's the last element */ - if (pdwAttributes && *pdwAttributes) - hr = SHELL32_GetItemAttributes(&This->IShellFolder2_iface, pidlTemp, pdwAttributes); + if (szNext && *szNext) + { + hr = _ILCreateFromPathW( szPath, &pidlTemp ); + if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) && fsbd) + { + find_data.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY; + strcpyW( find_data.cFileName, szPath + len ); + pidlTemp = _ILCreateFromFindDataW( &find_data ); } + if (pidlTemp) /* try to analyse the next element */ + hr = SHELL32_ParseNextElement( iface, hwndOwner, pbc, &pidlTemp, + (WCHAR *)szNext, pchEaten, pdwAttributes ); + } + else /* it's the last element */ + { + if (fsbd) + { + if (FAILED( IFileSystemBindData_GetFindData( fsbd, &find_data ))) + find_data.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; + strcpyW( find_data.cFileName, szPath + len ); + pidlTemp = _ILCreateFromFindDataW( &find_data ); + } + else hr = _ILCreateFromPathW(szPath, &pidlTemp); + + if (pidlTemp && pdwAttributes && *pdwAttributes) + hr = SHELL32_GetItemAttributes(&This->IShellFolder2_iface, pidlTemp, pdwAttributes); } } @@ -352,6 +377,7 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, TRACE ("(%p)->(-- pidl=%p ret=0x%08x)\n", This, *ppidl, hr); + if (fsbd) IFileSystemBindData_Release( fsbd ); return hr; }

1 0

Alexandre Julliard : shell32: Fix the shell folder file attributes.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 0ecd807ea62d1854a2abc97d1718c616a3ffa3fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ecd807ea62d1854a2abc97d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 14 12:38:52 2021 +0200 shell32: Fix the shell folder file attributes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfolder.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index e663d9486d9..f288b7f7ab1 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -427,9 +427,9 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWO } else if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) { *pdwAttributes = dwAttributes; } else if (_ILGetDataPointer (pidl)) { - dwAttributes = _ILGetFileAttributes (pidl, NULL, 0); + DWORD file_attr = _ILGetFileAttributes (pidl, NULL, 0); - if (!dwAttributes && has_guid) { + if (!file_attr && has_guid) { WCHAR path[MAX_PATH]; STRRET strret; @@ -441,25 +441,28 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWO /* call GetFileAttributes() only for file system paths, not for parsing names like "::{...}" */ if (SUCCEEDED(hr) && path[0]!=':') - dwAttributes = GetFileAttributesW(path); + file_attr = GetFileAttributesW(path); } } /* Set common attributes */ - *pdwAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE | + *pdwAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE | SFGAO_CANRENAME | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANCOPY; - if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) - *pdwAttributes |= (SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); + if (file_attr & FILE_ATTRIBUTE_DIRECTORY) + *pdwAttributes |= (SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR | SFGAO_STORAGEANCESTOR | SFGAO_STORAGE); else - *pdwAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); + { + *pdwAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR | SFGAO_STORAGEANCESTOR | SFGAO_STORAGE); + *pdwAttributes |= SFGAO_STREAM; + } - if (dwAttributes & FILE_ATTRIBUTE_HIDDEN) + if (file_attr & FILE_ATTRIBUTE_HIDDEN) *pdwAttributes |= SFGAO_HIDDEN; else *pdwAttributes &= ~SFGAO_HIDDEN; - if (dwAttributes & FILE_ATTRIBUTE_READONLY) + if (file_attr & FILE_ATTRIBUTE_READONLY) *pdwAttributes |= SFGAO_READONLY; else *pdwAttributes &= ~SFGAO_READONLY;

1 0

Alexandre Julliard : shell32: Validate the destination name in IShellFolder::SetNameOf.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 1dcd1fe613dfaf3d0ca256975b1bf164a009e944 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dcd1fe613dfaf3d0ca25697… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 14 12:39:05 2021 +0200 shell32: Validate the destination name in IShellFolder::SetNameOf. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_fs.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index e298cc18bd2..902910e55bb 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -883,6 +883,7 @@ static HRESULT WINAPI IShellFolder_fnSetNameOf (IShellFolder2 * iface, DWORD dwFlags, LPITEMIDLIST * pPidlOut) { + static const WCHAR invalid_chars[] = { '\\','/',':','*','?','"','<','>','|',0 }; IGenericSFImpl *This = impl_from_IShellFolder2(iface); WCHAR szSrc[MAX_PATH + 1], szDest[MAX_PATH + 1]; LPWSTR ptr; @@ -891,20 +892,20 @@ static HRESULT WINAPI IShellFolder_fnSetNameOf (IShellFolder2 * iface, TRACE ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); + /* pidl has to contain a single non-empty SHITEMID */ + if (_ILIsDesktop(pidl) || !_ILIsPidlSimple(pidl) || !_ILGetTextPointer(pidl)) return E_INVALIDARG; + + if (strpbrkW( lpName, invalid_chars )) return HRESULT_FROM_WIN32(ERROR_CANCELLED); + /* build source path */ lstrcpynW(szSrc, This->sPathTarget, MAX_PATH); ptr = PathAddBackslashW (szSrc); - if (ptr) - _ILSimpleGetTextW (pidl, ptr, MAX_PATH + 1 - (ptr - szSrc)); + _ILSimpleGetTextW (pidl, ptr, MAX_PATH + 1 - (ptr - szSrc)); /* build destination path */ - if (dwFlags == SHGDN_NORMAL || dwFlags & SHGDN_INFOLDER) { - lstrcpynW(szDest, This->sPathTarget, MAX_PATH); - ptr = PathAddBackslashW (szDest); - if (ptr) - lstrcpynW(ptr, lpName, MAX_PATH + 1 - (ptr - szDest)); - } else - lstrcpynW(szDest, lpName, MAX_PATH); + lstrcpynW(szDest, This->sPathTarget, MAX_PATH); + ptr = PathAddBackslashW (szDest); + lstrcpynW(ptr, lpName, MAX_PATH + 1 - (ptr - szDest)); if(!(dwFlags & SHGDN_FORPARSING) && SHELL_FS_HideExtension(szSrc)) { WCHAR *ext = PathFindExtensionW(szSrc);

1 0