wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Connor McAdams : user32/tests: Fix SetParent/SetFocus message sequences to support winevents.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: a526091307c00614c9b6fbfad31955e2386c5c4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a526091307c00614c9b6fbfa… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 10 13:06:37 2021 -0400 user32/tests: Fix SetParent/SetFocus message sequences to support winevents. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 62 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 079d63158c8..9133d76554c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -137,7 +137,8 @@ typedef enum { optional=0x80, hook=0x100, winevent_hook=0x200, - kbd_hook=0x400 + kbd_hook=0x400, + winevent_hook_todo=0x800 } msg_flags_t; struct message { @@ -2690,12 +2691,26 @@ static void ok_sequence_(const struct message *expected_list, const char *contex expected++; actual++; } - /* silently drop hook messages if there is no support for them */ + /* + * silently drop hook messages if there is no support for them, mark + * winevent todo's. + */ else if ((expected->flags & optional) || ((expected->flags & hook) && !hCBT_hook) || ((expected->flags & winevent_hook) && !hEvent_hook) || - ((expected->flags & kbd_hook) && !hKBD_hook)) + ((expected->flags & kbd_hook) && !hKBD_hook) || + ((expected->flags & winevent_hook_todo) && !strcmp(winetest_platform, "wine"))) + { + if ((expected->flags & winevent_hook_todo) && hEvent_hook) + { + todo_wine { + ok_( file, line) (FALSE, + "%s: %u: the msg 0x%04x was expected, but got msg 0x%04x instead\n", + context, count, expected->message, actual->message); + } + } expected++; + } else if (todo) { failcount++; @@ -2717,11 +2732,21 @@ static void ok_sequence_(const struct message *expected_list, const char *contex count++; } - /* skip all optional trailing messages */ + /* skip all optional trailing messages, check for winevent todo's. */ while (expected->message && ((expected->flags & optional) || ((expected->flags & hook) && !hCBT_hook) || - ((expected->flags & winevent_hook) && !hEvent_hook))) + ((expected->flags & winevent_hook) && !hEvent_hook) || + ((expected->flags & winevent_hook_todo) && !strcmp(winetest_platform, "wine")))) + { + if ((expected->flags & winevent_hook_todo) && hEvent_hook) + { + todo_wine { + ok_( file, line) (FALSE, "%s: %u: the msg sequence is not complete: expected 0x%04x - actual 0x%04x\n", + context, count, expected->message, actual->message); + } + } expected++; + } if (todo) { @@ -16671,12 +16696,12 @@ static void test_WaitForInputIdle( char *argv0 ) static const struct message WmSetParentSeq_1[] = { { WM_SHOWWINDOW, sent|wparam, 0 }, - { EVENT_OBJECT_PARENTCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_PARENTCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE }, { WM_CHILDACTIVATE, sent }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOREDRAW|SWP_NOCLIENTSIZE }, { WM_MOVE, sent|defwinproc|wparam, 0 }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SHOWWINDOW, sent|wparam, 1 }, { 0 } }; @@ -16684,14 +16709,15 @@ static const struct message WmSetParentSeq_1[] = { static const struct message WmSetParentSeq_2[] = { { WM_SHOWWINDOW, sent|wparam, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE }, - { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { HCBT_SETFOCUS, hook|optional }, { WM_NCACTIVATE, sent|wparam|optional, 0 }, { WM_ACTIVATE, sent|wparam|optional, 0 }, { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent|wparam, 0 }, - { EVENT_OBJECT_PARENTCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_PARENTCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE }, { HCBT_ACTIVATE, hook|optional }, { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 }, @@ -16703,10 +16729,10 @@ static const struct message WmSetParentSeq_2[] = { { WM_SETFOCUS, sent|optional|defwinproc }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOCLIENTSIZE }, { WM_MOVE, sent|defwinproc|wparam, 0 }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; @@ -17270,6 +17296,7 @@ end: static const struct message WmSetFocus_1[] = { { HCBT_SETFOCUS, hook }, /* child */ { HCBT_ACTIVATE, hook }, /* parent */ + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|parent|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|parent, 0, SWP_NOSIZE|SWP_NOMOVE }, { WM_ACTIVATEAPP, sent|wparam|parent, 1 }, @@ -17278,14 +17305,17 @@ static const struct message WmSetFocus_1[] = { { WM_GETTEXT, sent|defwinproc|parent|optional }, { WM_ACTIVATE, sent|wparam|parent, 1 }, { HCBT_SETFOCUS, hook }, /* parent */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc|parent }, { WM_KILLFOCUS, sent|parent }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent }, { 0 } }; static const struct message WmSetFocus_2[] = { { HCBT_SETFOCUS, hook }, /* parent */ { WM_KILLFOCUS, sent }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|parent }, { 0 } }; @@ -18283,6 +18313,11 @@ START_TEST(msg) if (!hCBT_hook) win_skip( "cannot set global hook, will skip hook tests\n" ); test_winevents(); + test_SendMessage_other_thread(1); + test_SendMessage_other_thread(2); + test_InSendMessage(); + test_SetFocus(); + test_SetParent(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18293,11 +18328,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_SendMessage_other_thread(1); - test_SendMessage_other_thread(2); - test_InSendMessage(); - test_SetFocus(); - test_SetParent(); test_PostMessage(); test_broadcast(); test_ShowWindow();

1 0

Connor McAdams : user32/tests: Mark some winevents optional in the SetParent sequence.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 8ef2f0c9ee00a62f78bb0c191b5f8c889472e337 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ef2f0c9ee00a62f78bb0c19… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 10 13:06:36 2021 -0400 user32/tests: Mark some winevents optional in the SetParent sequence. Earlier patch set messages within the sequence to be optional, update winevents in sequence to match this. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9867e319d58..079d63158c8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16694,12 +16694,12 @@ static const struct message WmSetParentSeq_2[] = { { EVENT_OBJECT_PARENTCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE }, { HCBT_ACTIVATE, hook|optional }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCACTIVATE, sent|wparam|optional, 1 }, { WM_ACTIVATE, sent|wparam|optional, 1 }, { HCBT_SETFOCUS, hook|optional }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|optional|defwinproc }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOCLIENTSIZE }, { WM_MOVE, sent|defwinproc|wparam, 0 },

1 0

Alexandre Julliard : shell32: Don't store the short file name in the PIDL.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 23c3391172e768843e1b515fce197db4af64fa98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23c3391172e768843e1b515f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 14 12:37:53 2021 +0200 shell32: Don't store the short file name in the PIDL. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/pidl.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index c831b6da6f7..41058bda043 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1708,8 +1708,7 @@ LPITEMIDLIST _ILCreateGuidFromStrW(LPCWSTR szGUID) LPITEMIDLIST _ILCreateFromFindDataW( const WIN32_FIND_DATAW *wfd ) { - char buff[MAX_PATH + 14 +1]; /* see WIN32_FIND_DATA */ - DWORD len, len1, wlen, alen; + DWORD wlen, alen; LPITEMIDLIST pidl; PIDLTYPE type; @@ -1718,13 +1717,9 @@ LPITEMIDLIST _ILCreateFromFindDataW( const WIN32_FIND_DATAW *wfd ) TRACE("(%s, %s)\n",debugstr_w(wfd->cAlternateFileName), debugstr_w(wfd->cFileName)); - /* prepare buffer with both names */ - len = WideCharToMultiByte(CP_ACP,0,wfd->cFileName,-1,buff,MAX_PATH,NULL,NULL); - len1 = WideCharToMultiByte(CP_ACP,0,wfd->cAlternateFileName,-1, buff+len, sizeof(buff)-len, NULL, NULL); - alen = len + len1; - type = (wfd->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? PT_FOLDER : PT_VALUE; + alen = WideCharToMultiByte( CP_ACP, 0, wfd->cFileName, -1, NULL, 0, NULL, NULL ); wlen = lstrlenW(wfd->cFileName) + 1; pidl = _ILAlloc(type, FIELD_OFFSET(FileStruct, szNames[alen + (alen & 1)]) + FIELD_OFFSET(FileStructW, wszName[wlen]) + sizeof(WORD)); @@ -1738,7 +1733,7 @@ LPITEMIDLIST _ILCreateFromFindDataW( const WIN32_FIND_DATAW *wfd ) FileTimeToDosDateTime( &wfd->ftLastWriteTime, &fs->uFileDate, &fs->uFileTime); fs->dwFileSize = wfd->nFileSizeLow; fs->uFileAttribs = wfd->dwFileAttributes; - memcpy(fs->szNames, buff, alen); + WideCharToMultiByte( CP_ACP, 0, wfd->cFileName, -1, fs->szNames, alen, NULL, NULL ); fsw = (FileStructW*)(pData->u.file.szNames + alen + (alen & 0x1)); fsw->cbLen = FIELD_OFFSET(FileStructW, wszName[wlen]) + sizeof(WORD);

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

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

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

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

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