Ros-diffs January 2017

ros-diffs@reactos.org

15 participants
160 discussions

[hbelusca] 73583: [SHELL32]: Follow-ups to r73579 and r73580: use PathYetAnotherMakeUniqueName. CORE-12684

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 18 23:47:38 2017 New Revision: 73583 URL: http://svn.reactos.org/svn/reactos?rev=73583&view=rev Log: [SHELL32]: Follow-ups to r73579 and r73580: use PathYetAnotherMakeUniqueName. CORE-12684 Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CNewMenu… ============================================================================== --- trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] Wed Jan 18 23:47:38 2017 @@ -531,25 +531,20 @@ case SHELLNEW_TYPE_NULLFILE: { BOOL bSuccess = TRUE; - LPWSTR pwszFilename = NULL; - size_t cchFilenameMax = 0; - - /* Build new file name */ - LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, wszBuf, _countof(wszBuf)); - // FIXME: PathCchAddBackslashExW(wszPath, _countof(wszPath), &pwszFilename, &cchFilenameMax); - pwszFilename = PathAddBackslashW(wszPath); - cchFilenameMax = _countof(wszBuf) - wcslen(wszPath); - StringCchPrintfW(pwszFilename, cchFilenameMax, L"%s %s%s", wszBuf, pItem->pwszDesc, pItem->pwszExt); - - /* Find unique name */ - for (UINT i = 2; PathFileExistsW(wszPath); ++i) - { - StringCchPrintfW(pwszFilename, cchFilenameMax, L"%s %s (%u)%s", wszBuf, pItem->pwszDesc, i, pItem->pwszExt); - TRACE("New Filename %ls\n", pwszFilename); - } + WCHAR wszName[MAX_PATH]; + WCHAR wszNewFile[MAX_PATH]; + + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, wszBuf, _countof(wszBuf))) + return E_FAIL; + + StringCchPrintfW(wszNewFile, _countof(wszNewFile), L"%s %s%s", wszBuf, pItem->pwszDesc, pItem->pwszExt); + + /* Create the name of the new file */ + if (!PathYetAnotherMakeUniqueName(wszName, wszPath, NULL, wszNewFile)) + return E_FAIL; /* Create new file */ - HANDLE hFile = CreateFileW(wszPath, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE hFile = CreateFileW(wszName, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile != INVALID_HANDLE_VALUE) { if (pItem->Type == SHELLNEW_TYPE_DATA) @@ -570,20 +565,20 @@ if (pItem->Type == SHELLNEW_TYPE_FILENAME) { /* Copy file */ - if (!CopyFileW((LPWSTR)pItem->pData, wszPath, FALSE)) + if (!CopyFileW((LPWSTR)pItem->pData, wszName, FALSE)) ERR("Copy file failed: %ls\n", (LPWSTR)pItem->pData); } /* Show message if we failed */ if (bSuccess) { - TRACE("Notifying fs %s\n", debugstr_w(wszPath)); - SelectNewItem(lpcmi, SHCNE_CREATE, SHCNF_PATHW, wszPath); + TRACE("Notifying fs %s\n", debugstr_w(wszName)); + SelectNewItem(lpcmi, SHCNE_CREATE, SHCNF_PATHW, wszName); } else { - StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create file: %s", pwszFilename); - MessageBoxW(NULL, wszBuf, L"Cannot create file", MB_OK|MB_ICONERROR); // FIXME + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create file: %s", wszName); + MessageBoxW(NULL, wszBuf, L"Cannot create file", MB_OK|MB_ICONERROR); // FIXME load localized error msg } break; }

7 years, 11 months

[hbelusca] 73582: [SHELL32]: Code formatting only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 18 23:44:46 2017 New Revision: 73582 URL: http://svn.reactos.org/svn/reactos?rev=73582&view=rev Log: [SHELL32]: Code formatting only. Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CNewMenu… ============================================================================== --- trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] Wed Jan 18 23:44:46 2017 @@ -463,7 +463,7 @@ return E_FAIL; /* Create the new directory and show the appropriate dialog in case of error */ - if (SHCreateDirectory (lpici->hwnd, wszName) != ERROR_SUCCESS) + if (SHCreateDirectory(lpici->hwnd, wszName) != ERROR_SUCCESS) return E_FAIL; /* Show and select the new item in the def view */ @@ -492,7 +492,7 @@ STARTUPINFOW si; PROCESS_INFORMATION pi; - if (!ExpandEnvironmentStringsW((LPWSTR)pItem->pData, wszBuf, MAX_PATH)) + if (!ExpandEnvironmentStringsW((LPWSTR)pItem->pData, wszBuf, _countof(wszBuf))) { TRACE("ExpandEnvironmentStrings failed\n"); break; @@ -502,12 +502,14 @@ Ptr = wcsstr(wszBuf, L"%1"); if (Ptr) { - Ptr[1] = 's'; + Ptr[1] = L's'; StringCbPrintfW(wszTemp, sizeof(wszTemp), wszBuf, wszPath); pwszCmd = wszTemp; } else + { pwszCmd = wszBuf; + } /* Create process */ ZeroMemory(&si, sizeof(si)); @@ -516,10 +518,14 @@ { CloseHandle(pi.hProcess); CloseHandle(pi.hThread); - } else + } + else + { ERR("Failed to create process\n"); + } break; } + case SHELLNEW_TYPE_DATA: case SHELLNEW_TYPE_FILENAME: case SHELLNEW_TYPE_NULLFILE: @@ -555,8 +561,11 @@ /* Close file now */ CloseHandle(hFile); - } else + } + else + { bSuccess = FALSE; + } if (pItem->Type == SHELLNEW_TYPE_FILENAME) { @@ -578,6 +587,7 @@ } break; } + case SHELLNEW_TYPE_INVALID: ERR("Invalid type\n"); break;

7 years, 11 months

[hbelusca] 73581: [SHELL32]: Remove trailing whitespace.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 18 21:03:46 2017 New Revision: 73581 URL: http://svn.reactos.org/svn/reactos?rev=73581&view=rev Log: [SHELL32]: Remove trailing whitespace. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Wed Jan 18 21:03:46 2017 @@ -41,7 +41,7 @@ { LPCSTR szStringVerb; UINT IntVerb; -} g_StaticInvokeCmdMap[] = +} g_StaticInvokeCmdMap[] = { { "RunAs", 0 }, // Unimplemented { "Print", 0 }, // Unimplemented @@ -566,7 +566,7 @@ LONG res = RegOpenKeyW(pEntry->hkClass, wszKey, &hkVerb); if (res == ERROR_SUCCESS) { - res = RegLoadMUIStringW(hkVerb, + res = RegLoadMUIStringW(hkVerb, NULL, wszVerb, cbVerb, @@ -576,7 +576,7 @@ if (res == ERROR_SUCCESS) { /* use description for the menu entry */ - mii.dwTypeData = wszVerb; + mii.dwTypeData = wszVerb; } RegCloseKey(hkVerb); @@ -954,7 +954,7 @@ return pEntry; } -//FIXME: 260 is correct, but should this be part of the SDK or just MAX_PATH? +// FIXME: 260 is correct, but should this be part of the SDK or just MAX_PATH? #define MAX_VERB 260 BOOL @@ -993,7 +993,7 @@ HRESULT CDefaultContextMenu::DoDynamicShellExtensions( LPCMINVOKECOMMANDINFO lpcmi) -{ +{ TRACE("verb %p first %x last %x", lpcmi->lpVerb, m_iIdSHEFirst, m_iIdSHELast); UINT idCmd = LOWORD(lpcmi->lpVerb); @@ -1132,9 +1132,9 @@ /* Check if we need to browse */ if (wFlags > 0) { - /* In xp if we have browsed, we don't open any more folders . + /* In xp if we have browsed, we don't open any more folders. * In win7 we browse to the first folder we find and - * open new windows fo for each of the rest of the folders */ + * open new windows for each of the rest of the folders */ if (bBrowsed) continue; @@ -1287,12 +1287,12 @@ return S_OK; } -HRESULT -WINAPI +HRESULT +WINAPI CDefaultContextMenu::HandleMenuMsg2( - UINT uMsg, - WPARAM wParam, - LPARAM lParam, + UINT uMsg, + WPARAM wParam, + LPARAM lParam, LRESULT *plResult) { switch (uMsg) @@ -1340,8 +1340,8 @@ return S_OK; } -HRESULT -WINAPI +HRESULT +WINAPI CDefaultContextMenu::GetSite(REFIID riid, void **ppvSite) { if (!m_site)

7 years, 11 months

[hbelusca] 73580: Fix a bug introduced in r73579. CORE-12684

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 18 12:59:35 2017 New Revision: 73580 URL: http://svn.reactos.org/svn/reactos?rev=73580&view=rev Log: Fix a bug introduced in r73579. CORE-12684 Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CNewMenu… ============================================================================== --- trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] Wed Jan 18 12:59:35 2017 @@ -532,7 +532,7 @@ LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, wszBuf, _countof(wszBuf)); // FIXME: PathCchAddBackslashExW(wszPath, _countof(wszPath), &pwszFilename, &cchFilenameMax); pwszFilename = PathAddBackslashW(wszPath); - cchFilenameMax = wcslen(wszPath) + 1; + cchFilenameMax = _countof(wszBuf) - wcslen(wszPath); StringCchPrintfW(pwszFilename, cchFilenameMax, L"%s %s%s", wszBuf, pItem->pwszDesc, pItem->pwszExt); /* Find unique name */

7 years, 11 months

[hbelusca] 73579: [SHELL32]: Fix the "CNewMenu.cpp:432: Unexpected failure 80070002." debug line that appears when one tries to create a new file using the explorer (note: did not happen for new di...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 18 12:48:50 2017 New Revision: 73579 URL: http://svn.reactos.org/svn/reactos?rev=73579&view=rev Log: [SHELL32]: Fix the "CNewMenu.cpp:432: Unexpected failure 80070002." debug line that appears when one tries to create a new file using the explorer (note: did not happen for new directories). CORE-12684 #resolve #comment Fixed in r73579. Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CNewMenu… ============================================================================== --- trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] Wed Jan 18 12:48:50 2017 @@ -530,7 +530,9 @@ /* Build new file name */ LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, wszBuf, _countof(wszBuf)); - StringCchCatExW(wszPath, _countof(wszPath), L"\\", &pwszFilename, &cchFilenameMax, 0); + // FIXME: PathCchAddBackslashExW(wszPath, _countof(wszPath), &pwszFilename, &cchFilenameMax); + pwszFilename = PathAddBackslashW(wszPath); + cchFilenameMax = wcslen(wszPath) + 1; StringCchPrintfW(pwszFilename, cchFilenameMax, L"%s %s%s", wszBuf, pItem->pwszDesc, pItem->pwszExt); /* Find unique name */

7 years, 11 months

[hbelusca] 73578: [SHELL32] - Now that we correctly handle the shell link data block list with APIs, no need to hack an extra zeroed DWORD at the end of shortcut files! - Fix the display of the sho...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 18 11:51:42 2017 New Revision: 73578 URL: http://svn.reactos.org/svn/reactos?rev=73578&view=rev Log: [SHELL32] - Now that we correctly handle the shell link data block list with APIs, no need to hack an extra zeroed DWORD at the end of shortcut files! - Fix the display of the shortcut target location: this typically displays the (last) directory where the target resides. Addendum for r53624, r54957 and CORE-5730 CORE-6104 Modified: trunk/reactos/dll/win32/shell32/CShellLink.cpp Modified: trunk/reactos/dll/win32/shell32/CShellLink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CShellLi… ============================================================================== --- trunk/reactos/dll/win32/shell32/CShellLink.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CShellLink.cpp [iso-8859-1] Wed Jan 18 11:51:42 2017 @@ -750,11 +750,6 @@ m_bRunAs = TRUE; else m_bRunAs = FALSE; - - DWORD dwZero; - hr = stm->Read(&dwZero, sizeof(dwZero), &dwBytesRead); - if (FAILED(hr) || dwZero || dwBytesRead != sizeof(dwZero)) - ERR("Last word was not zero\n"); TRACE("OK\n"); @@ -971,10 +966,6 @@ /* Clear the dirty bit if requested */ if (fClearDirty) m_bDirty = FALSE; - - /* The last field is a single zero dword */ - DWORD dwZero = 0; - hr = stm->Write(&dwZero, sizeof(dwZero), &count); return hr; } @@ -2733,7 +2724,10 @@ StringCchPrintfExW(wszBuf, _countof(wszBuf), &pwszEnd, &cchRemaining, 0, L"%s ", pwszExt + 1); } else - StringCbPrintfW(wszBuf, sizeof(wszBuf), L"%s (%s)", fi.szTypeName, pwszExt); /* Update file type */ + { + /* Update file type */ + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"%s (%s)", fi.szTypeName, pwszExt); + } } return wszBuf; @@ -2768,7 +2762,7 @@ /* Get file information */ // FIXME! FIXME! Shouldn't we use pThis->m_sIcoPath, pThis->m_Header.nIconIndex instead??? SHFILEINFOW fi; - if (!SHGetFileInfoW(pThis->m_sLinkPath, 0, &fi, sizeof(fi), SHGFI_TYPENAME|SHGFI_ICON)) + if (!SHGetFileInfoW(pThis->m_sLinkPath, 0, &fi, sizeof(fi), SHGFI_TYPENAME | SHGFI_ICON)) { ERR("SHGetFileInfoW failed for %ls (%lu)\n", pThis->m_sLinkPath, GetLastError()); fi.szTypeName[0] = L'\0'; @@ -2780,15 +2774,20 @@ else ERR("ExtractIconW failed %ls %u\n", pThis->m_sIcoPath, pThis->m_Header.nIconIndex); - /* target type */ + /* Target type */ if (pThis->m_sPath) SetDlgItemTextW(hwndDlg, 14005, SH_GetTargetTypeByPath(pThis->m_sPath)); - /* target location */ - if (pThis->m_sWorkDir) - SetDlgItemTextW(hwndDlg, 14007, PathFindFileName(pThis->m_sWorkDir)); - - /* target path */ + /* Target location */ + if (pThis->m_sPath) + { + WCHAR target[MAX_PATH]; + StringCchCopyW(target, _countof(target), pThis->m_sPath); + PathRemoveFileSpecW(target); + SetDlgItemTextW(hwndDlg, 14007, PathFindFileNameW(target)); + } + + /* Target path */ if (pThis->m_sPath) { WCHAR newpath[2*MAX_PATH] = L"\0"; @@ -2804,16 +2803,18 @@ } SetDlgItemTextW(hwndDlg, 14009, newpath); } - /* working dir */ + + /* Working dir */ if (pThis->m_sWorkDir) SetDlgItemTextW(hwndDlg, 14011, pThis->m_sWorkDir); - /* description */ + /* Description */ if (pThis->m_sDescription) SetDlgItemTextW(hwndDlg, 14019, pThis->m_sDescription); return TRUE; } + case WM_NOTIFY: { LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam; @@ -2849,7 +2850,7 @@ if (!PathFileExistsW(unquoted)) { - //FIXME load localized error msg + // FIXME load localized error msg MessageBoxW(hwndDlg, L"The specified file name in the target box is invalid", L"Error", MB_ICONERROR); SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); return TRUE; @@ -2870,6 +2871,7 @@ } break; } + case WM_COMMAND: switch(LOWORD(wParam)) { @@ -2880,6 +2882,7 @@ /// open target directory /// return TRUE; + case 14021: { WCHAR wszPath[MAX_PATH] = L""; @@ -2892,6 +2895,7 @@ pThis->SetIconLocation(wszPath, IconIndex); /// /// FIXME redraw icon + /// } return TRUE; } @@ -2914,6 +2918,7 @@ if (HIWORD(wParam) == EN_CHANGE) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; + default: break; }

7 years, 11 months

[hbelusca] 73577: [SYSSETUP][SHORTCUTS.INF]: Follow-up of r71049 and CORE-11020 : - Make more shortcuts start from the user directory; - The desktop shortcut of the ReadMe file should not use an ic...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 18 00:19:12 2017 New Revision: 73577 URL: http://svn.reactos.org/svn/reactos?rev=73577&view=rev Log: [SYSSETUP][SHORTCUTS.INF]: Follow-up of r71049 and CORE-11020 : - Make more shortcuts start from the user directory; - The desktop shortcut of the ReadMe file should not use an icon location, so that the shell correctly retrieves the icon to display from the type of the file (in our case, .txt). - Make the necessary adjustments in syssetup/install.c : * opt-out setting the icon location; * in addition, since we now support shell link targets containing environment variables, don't always expand the target path before setting up the shortcut, but do it just in the case we have to compute a suitable working directory. Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/media/inf/shortcuts.inf Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Wed Jan 18 00:19:12 2017 @@ -1,21 +1,3 @@ -/* - * ReactOS kernel - * Copyright (C) 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -96,24 +78,16 @@ hr = IShellLinkW_SetPath(psl, pszCmd); if (pszArg) - { hr = IShellLinkW_SetArguments(psl, pszArg); - } if (pszDir) - { hr = IShellLinkW_SetWorkingDirectory(psl, pszDir); - } if (pszIconPath) - { hr = IShellLinkW_SetIconLocation(psl, pszIconPath, iIconNr); - } if (pszComment) - { hr = IShellLinkW_SetDescription(psl, pszComment); - } hr = IShellLinkW_QueryInterface(psl, &IID_IPersistFile, (LPVOID*)&ppf); @@ -139,62 +113,59 @@ INT iIconNr, LPCWSTR pszWorkingDir) { - WCHAR szPath[MAX_PATH]; - WCHAR szExeName[MAX_PATH]; - WCHAR szWorkingDirBuf[MAX_PATH]; + DWORD dwLen; LPWSTR Ptr; LPWSTR lpFilePart; - DWORD dwLen; - - if (ExpandEnvironmentStringsW(pszCommand, szPath, ARRAYSIZE(szPath)) == 0) - { - wcscpy(szPath, pszCommand); - } - - if (_waccess(szPath, 0) == -1) - /* Expected error, don't return FALSE */ - return TRUE; - - dwLen = GetFullPathNameW(szPath, - ARRAYSIZE(szWorkingDirBuf), - szWorkingDirBuf, - &lpFilePart); - if (dwLen != 0 && dwLen <= ARRAYSIZE(szWorkingDirBuf)) - { - /* Since those should only be called with (.exe) files, - lpFilePart has not to be NULL */ - ASSERT(lpFilePart != NULL); - - /* Save the file name */ - wcscpy(szExeName, lpFilePart); - - if (pszWorkingDir == NULL || pszWorkingDir[0] == L'\0') - { + WCHAR szPath[MAX_PATH]; + WCHAR szWorkingDirBuf[MAX_PATH]; + + /* If no working directory is provided, try to compute a default one */ + if (pszWorkingDir == NULL || pszWorkingDir[0] == L'\0') + { + if (ExpandEnvironmentStringsW(pszCommand, szPath, ARRAYSIZE(szPath)) == 0) + wcscpy(szPath, pszCommand); + + dwLen = GetFullPathNameW(szPath, + ARRAYSIZE(szWorkingDirBuf), + szWorkingDirBuf, + &lpFilePart); + if (dwLen != 0 && dwLen <= ARRAYSIZE(szWorkingDirBuf)) + { + /* Since those should only be called with (.exe) files, + lpFilePart has not to be NULL */ + ASSERT(lpFilePart != NULL); + /* We're only interested in the path. Cut the file name off. Also remove the trailing backslash unless the working directory - is only going to be a drive, ie. C:\ */ + is only going to be a drive, i.e. C:\ */ *(lpFilePart--) = L'\0'; - if (!(lpFilePart - szWorkingDirBuf == 2 && szWorkingDirBuf[1] == L':' && - szWorkingDirBuf[2] == L'\\')) + if (!(lpFilePart - szWorkingDirBuf == 2 && + szWorkingDirBuf[1] == L':' && szWorkingDirBuf[2] == L'\\')) { *lpFilePart = L'\0'; } pszWorkingDir = szWorkingDirBuf; } } - else if (pszWorkingDir && pszWorkingDir[0] == L'\0') - { + + /* If we failed to compute a working directory, just do not use one */ + if (pszWorkingDir && pszWorkingDir[0] == L'\0') pszWorkingDir = NULL; - } - + + /* Build the shortcut file name */ wcscpy(szPath, pszFolder); - Ptr = PathAddBackslash(szPath); - wcscpy(Ptr, pszName); - // FIXME: we should pass 'command' straight in here, but shell32 doesn't expand it - return SUCCEEDED(CreateShellLink(szPath, szExeName, L"", pszWorkingDir, szExeName, iIconNr, pszDescription)); + /* Create the shortcut */ + return SUCCEEDED(CreateShellLink(szPath, + pszCommand, + L"", + pszWorkingDir, + /* Special value to indicate no icon */ + (iIconNr != -1 ? pszCommand : NULL), + iIconNr, + pszDescription)); } @@ -202,11 +173,11 @@ { INFCONTEXT Context; DWORD dwFieldCount; + INT iIconNr; WCHAR szCommand[MAX_PATH]; WCHAR szName[MAX_PATH]; WCHAR szDescription[MAX_PATH]; WCHAR szDirectory[MAX_PATH]; - INT iIconNr; if (!SetupFindFirstLine(hinf, pszSection, NULL, &Context)) return FALSE; @@ -214,7 +185,7 @@ do { dwFieldCount = SetupGetFieldCount(&Context); - if (dwFieldCount < 4) + if (dwFieldCount < 3) continue; if (!SetupGetStringFieldW(&Context, 1, szCommand, ARRAYSIZE(szCommand), NULL)) @@ -226,8 +197,8 @@ if (!SetupGetStringFieldW(&Context, 3, szDescription, ARRAYSIZE(szDescription), NULL)) continue; - if (!SetupGetIntField(&Context, 4, &iIconNr)) - continue; + if (dwFieldCount < 4 || !SetupGetIntField(&Context, 4, &iIconNr)) + iIconNr = -1; /* Special value to indicate no icon */ if (dwFieldCount < 5 || !SetupGetStringFieldW(&Context, 5, szDirectory, ARRAYSIZE(szDirectory), NULL)) szDirectory[0] = L'\0'; @@ -449,7 +420,7 @@ BOOL -RegisterTypeLibraries (HINF hinf, LPCWSTR szSection) +RegisterTypeLibraries(HINF hinf, LPCWSTR szSection) { INFCONTEXT InfContext; BOOL res; Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Wed Jan 18 00:19:12 2017 @@ -14,12 +14,12 @@ GamesShortcuts=2, %GAMES% [DesktopShortcuts] -%SystemRoot%\readme.txt, %README_TITLE%, %README_DESC%, 0 +%SystemRoot%\readme.txt, %README_TITLE%, %README_DESC% %SystemRoot%\system32\cmd.exe, %CMD_TITLE%, %CMD_DESC%, 0, %HOMEDRIVE%%HOMEPATH% %SystemRoot%\system32\rapps.exe, %RAPPS_TITLE_SHORT%, %RAPPS_DESC%, 0 [ProgramShortcuts] -%SystemRoot%\explorer.exe, %EXPLORER_TITLE%, %EXPLORER_DESC%, 1 +%SystemRoot%\explorer.exe, %EXPLORER_TITLE%, %EXPLORER_DESC%, 1, %HOMEDRIVE%%HOMEPATH% %SystemRoot%\system32\rapps.exe, %RAPPS_TITLE%, %RAPPS_DESC%, 0 [AdminToolsShortcuts] @@ -29,15 +29,15 @@ %SystemRoot%\system32\msconfig.exe, %MSCONFIG_TITLE%, %MSCONFIG_DESC%, 0 [CommunicationsShortcuts] -%SystemRoot%\system32\mstsc.exe, %MSTSC_TITLE%, %MSTSC_DESC%, 0 +%SystemRoot%\system32\mstsc.exe, %MSTSC_TITLE%, %MSTSC_DESC%, 0, %HOMEDRIVE%%HOMEPATH% [AccessoriesShortcuts] -%SystemRoot%\system32\calc.exe, %CALC_TITLE%, %CALC_DESC%, 0 +%SystemRoot%\system32\calc.exe, %CALC_TITLE%, %CALC_DESC%, 0, %HOMEDRIVE%%HOMEPATH% %SystemRoot%\system32\cmd.exe, %CMD_TITLE%, %CMD_DESC%, 0, %HOMEDRIVE%%HOMEPATH% -%SystemRoot%\system32\notepad.exe, %NOTEPAD_TITLE%, %NOTEPAD_DESC%, 0 -%SystemRoot%\system32\screenshot.exe, %SCREENSHOT_TITLE%, %SCREENSHOT_DESC%, 0 -%SystemRoot%\system32\wordpad.exe, %WORDPAD_TITLE%, %WORDPAD_DESC%, 0 -%SystemRoot%\system32\mspaint.exe, %MSPAINT_TITLE%, %MSPAINT_DESC%, 0 +%SystemRoot%\system32\notepad.exe, %NOTEPAD_TITLE%, %NOTEPAD_DESC%, 0, %HOMEDRIVE%%HOMEPATH% +%SystemRoot%\system32\screenshot.exe, %SCREENSHOT_TITLE%, %SCREENSHOT_DESC%, 0, %HOMEDRIVE%%HOMEPATH% +%SystemRoot%\system32\wordpad.exe, %WORDPAD_TITLE%, %WORDPAD_DESC%, 0, %HOMEDRIVE%%HOMEPATH% +%SystemRoot%\system32\mspaint.exe, %MSPAINT_TITLE%, %MSPAINT_DESC%, 0, %HOMEDRIVE%%HOMEPATH% [SystemToolsShortcuts] %SystemRoot%\system32\charmap.exe, %CHARMAP_TITLE%, %CHARMAP_DESC%, 0 @@ -48,13 +48,13 @@ %SystemRoot%\system32\dxdiag.exe, %DXDIAG_TITLE%, %DXDIAG_DESC%, 0 [AccessibilityShortcuts] -%SystemRoot%\system32\magnify.exe, %MAGNIFY_TITLE%, %MAGNIFY_DESC%, 0 -%SystemRoot%\system32\osk.exe, %OSK_TITLE%, %OSK_DESC%, 0 +%SystemRoot%\system32\magnify.exe, %MAGNIFY_TITLE%, %MAGNIFY_DESC%, 0, %HOMEDRIVE%%HOMEPATH% +%SystemRoot%\system32\osk.exe, %OSK_TITLE%, %OSK_DESC%, 0, %HOMEDRIVE%%HOMEPATH% [EntertainmentShortcuts] -%SystemRoot%\system32\mplay32.exe, %MPLAY_TITLE%, %MPLAY_DESC%, 0 +%SystemRoot%\system32\mplay32.exe, %MPLAY_TITLE%, %MPLAY_DESC%, 0, %HOMEDRIVE%%HOMEPATH% %SystemRoot%\system32\sndvol32.exe, %SNDVOL_TITLE%, %SNDVOL_DESC%, 0 -%SystemRoot%\system32\sndrec32.exe, %SNDREC32_TITLE%, %SNDREC32_DESC%, 0 +%SystemRoot%\system32\sndrec32.exe, %SNDREC32_TITLE%, %SNDREC32_DESC%, 0, %HOMEDRIVE%%HOMEPATH% [GamesShortcuts] %SystemRoot%\system32\sol.exe, %SOL_TITLE%, %SOL_DESC%, 0

7 years, 11 months

[hbelusca] 73576: [SHELL32]: CShellLink fixups Part 2: - Add COM inheritance for interfaces IExtractIconA/W, and add in comment the missing other ones, the ordering of which is given by the apitest...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jan 17 23:53:55 2017 New Revision: 73576 URL: http://svn.reactos.org/svn/reactos?rev=73576&view=rev Log: [SHELL32]: CShellLink fixups Part 2: - Add COM inheritance for interfaces IExtractIconA/W, and add in comment the missing other ones, the ordering of which is given by the apitests/com/shell32. - Add proper support for the extra data block list (which is added at the end of the .lnk files), by using the API from shlwapi.dll: SH[Read|Write|Free]DataBlockList, SH[Add|Find|Remove]DataBlock. - Using this support, getting/setting the MSI data block becomes as simple as child's play, and opens the possibility for implementing support for the other types of blocks. - This in particular enables support for paths with environment variables for the link's target and icon: CORE-9236 #resolve - Fix all the "shell32_winetest shelllink" tests: CORE-7158 #resolve Some of the fixes are inspired from a patch by Katayama Hirofumi MZ. - Fix all the "shell32_apitest CShellLink" tests *but* those calling IExtractIcon::GetIconLocation(). - Implement a hackish substitute to the shell32!PathResolve API until someone writes a correct one (see the code & the FIXMEs for some ideas), possibly using the SHELL_xxx helpers in Wine's shellpath.c. - In CFSExtractIcon_CreateInstance: Because IShellLink::GetIconLocation can return no icon location, in case none is specified in the .lnk (proved by apitests), we have to call the shell link's IExtractIcon::GetIconLocation in order to retrieve the icon of its target (yes, some shortcuts are made like that, e.g. Notepad++ 6.9 one...). - More fixes... - ... and a lot of documentation added in the code for you! CORE-12682 Modified: trunk/reactos/dll/win32/shell32/CShellLink.cpp trunk/reactos/dll/win32/shell32/CShellLink.h trunk/reactos/dll/win32/shell32/folders.cpp Modified: trunk/reactos/dll/win32/shell32/CShellLink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CShellLi… ============================================================================== --- trunk/reactos/dll/win32/shell32/CShellLink.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CShellLink.cpp [iso-8859-1] Tue Jan 17 23:53:55 2017 @@ -5,6 +5,7 @@ * Copyright 2005 Mike McCormack * Copyright 2009 Andrew Hill * Copyright 2013 Dominik Hornung + * Copyright 2017 Hermes Belusca-Maito * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,107 @@ * install the program when the shortcut is clicked on. They are * created by passing a special string to SetPath, and the information * in that string is parsed an stored. + */ +/* + * In the following is listed more documentation about the Shell Link file format, + * as well as its interface. + * + * General introduction about "Shell Links" (MSDN): + * https://msdn.microsoft.com/en-us/library/windows/desktop/bb776891(v=vs.85).… + * + * + * Details of the file format: + * + * - Official MSDN documentation "[MS-SHLLINK]: Shell Link (.LNK) Binary File Format": + * https://msdn.microsoft.com/en-us/library/dd871305.aspx + * + * - Forensics: + * http://forensicswiki.org/wiki/LNK + * http://computerforensics.parsonage.co.uk/downloads/TheMeaningofLIFE.pdf + * https://ithreats.files.wordpress.com/2009/05/lnk_the_windows_shortcut_file_… + * https://github.com/libyal/liblnk/blob/master/documentation/Windows%20Shortc… + * + * - List of possible shell link header flags (SHELL_LINK_DATA_FLAGS enumeration): + * https://msdn.microsoft.com/en-us/library/windows/desktop/bb762540(v=vs.85).… + * https://msdn.microsoft.com/en-us/library/dd891314.aspx + * + * + * In addition to storing its target by using a PIDL, a shell link file also + * stores metadata to make the shell able to track the link target, in situations + * where the link target is moved amongst local or network directories, or moved + * to different volumes. For this, two structures are used: + * + * - The first and oldest one (from NewShell/WinNT4) is the "LinkInfo" structure, + * stored in a serialized manner at the beginning of the shell link file: + * https://msdn.microsoft.com/en-us/library/dd871404.aspx + * The official API for manipulating this is located in LINKINFO.DLL . + * + * - The second, more recent one, is an extra binary block appended to the + * extra-data list of the shell link file: this is the "TrackerDataBlock": + * https://msdn.microsoft.com/en-us/library/dd891376.aspx + * Its purpose is for link tracking, and works in coordination with the + * "Distributed Link Tracking" service ('TrkWks' client, 'TrkSvr' server). + * See a detailed explanation at: + * http://www.serverwatch.com/tutorials/article.php/1476701/Searching-for-the-… + * + * + * MSI installations most of the time create so-called "advertised shortcuts". + * They provide an icon for a program that may not be installed yet, and invoke + * MSI to install the program when the shortcut is opened (resolved). + * The philosophy of this approach is explained in detail inside the MSDN article + * "Application Resiliency: Unlock the Hidden Features of Windows Installer" + * (by Michael Sanford), here: + * https://msdn.microsoft.com/en-us/library/aa302344.aspx + * + * This functionality is implemented by adding a binary "Darwin" data block + * of type "EXP_DARWIN_LINK", signature EXP_DARWIN_ID_SIG == 0xA0000006, + * to the shell link file: + * https://msdn.microsoft.com/en-us/library/dd871369.aspx + * or, this could be done more simply by specifying a special link target path + * with the IShellLink::SetPath() function. Defining the following GUID: + * SHELL32_AdvtShortcutComponent = "::{9db1186e-40df-11d1-aa8c-00c04fb67863}:" + * setting a target of the form: + * "::{SHELL32_AdvtShortcutComponent}:<MSI_App_ID>" + * would automatically create the necessary binary block. + * + * With that, the target of the shortcut now becomes the MSI data. The latter + * is parsed from MSI and retrieved by the shell that then can run the program. + * + * This MSI functionality, dubbed "link blessing", actually originates from an + * older technology introduced in Internet Explorer 3 (and now obsolete since + * Internet Explorer 7), called "MS Internet Component Download (MSICD)", see + * this MSDN introductory article: + * https://msdn.microsoft.com/en-us/library/aa741198(v=vs.85).aspx + * and leveraged in Internet Explorer 4 with "Software Update Channels", see: + * https://msdn.microsoft.com/en-us/library/aa740931(v=vs.85).aspx + * Applications supporting this technology could present shell links having + * a special target, see subsection "Modifying the Shortcut" in the article: + * https://msdn.microsoft.com/en-us/library/aa741201(v=vs.85).aspx#pub_shor + * + * Similarly as for the MSI shortcuts, these MSICD shortcuts are created by + * specifying a special link target path with the IShellLink::SetPath() function, + * defining the following GUID: + * SHELL32_AdvtShortcutProduct = "::{9db1186f-40df-11d1-aa8c-00c04fb67863}:" + * and setting a target of the form: + * "::{SHELL32_AdvtShortcutProduct}:<AppName>::<Path>" . + * A tool, called "blesslnk.exe", was also provided for automatizing the process; + * its ReadMe can be found in the (now outdated) MS "Internet Client SDK" (INetSDK, + * for MS Windows 95 and NT), whose contents can be read at: + * http://www.msfn.org/board/topic/145352-new-windows-lnk-vulnerability/?page=… + * The MS INetSDK can be found at: + * https://web.archive.org/web/20100924000013/http://support.microsoft.com/kb/… + * + * Internally the shell link target of these MSICD shortcuts is converted into + * a binary data block of a type similar to Darwin / "EXP_DARWIN_LINK", but with + * a different signature EXP_LOGO3_ID_SIG == 0xA0000007 . Such shell links are + * called "Logo3" shortcuts. They were evoked in this user comment in "The Old + * New Thing" blog: + * https://blogs.msdn.microsoft.com/oldnewthing/20121210-00/?p=5883#comment-10… + * + * The shell exports the API 'SoftwareUpdateMessageBox' (in shdocvw.dll) that + * displays a message when an update for an application supporting this + * technology is available. + * */ #include "precomp.h" @@ -106,411 +208,16 @@ return dest; } -CShellLink::CShellLink() -{ - wHotKey = 0; - memset(&time1, 0, sizeof(time1)); - memset(&time2, 0, sizeof(time2)); - memset(&time3, 0, sizeof(time3)); - iShowCmd = SW_SHOWNORMAL; - iIcoNdx = 0; - +// TODO: Use it for constructor & destructor too +VOID CShellLink::Reset() +{ + ILFree(m_pPidl); m_pPidl = NULL; + HeapFree(GetProcessHeap(), 0, m_sPath); m_sPath = NULL; ZeroMemory(&volume, sizeof(volume)); - m_sDescription = NULL; - m_sPathRel = NULL; - m_sWorkDir = NULL; - m_sArgs = NULL; - m_sIcoPath = NULL; - m_bRunAs = FALSE; - m_bDirty = FALSE; - - m_sLinkPath = NULL; - m_iIdOpen = -1; - - /**/sProduct = sComponent = NULL;/**/ -} - -CShellLink::~CShellLink() -{ - TRACE("-- destroying IShellLink(%p)\n", this); - - ILFree(m_pPidl); - - HeapFree(GetProcessHeap(), 0, m_sPath); - - HeapFree(GetProcessHeap(), 0, m_sDescription); - HeapFree(GetProcessHeap(), 0, m_sPathRel); - HeapFree(GetProcessHeap(), 0, m_sWorkDir); - HeapFree(GetProcessHeap(), 0, m_sArgs); - HeapFree(GetProcessHeap(), 0, m_sIcoPath); - HeapFree(GetProcessHeap(), 0, m_sLinkPath); -} - -HRESULT STDMETHODCALLTYPE CShellLink::GetClassID(CLSID *pclsid) -{ - TRACE("%p %p\n", this, pclsid); - - if (pclsid == NULL) - return E_POINTER; - *pclsid = CLSID_ShellLink; - return S_OK; -} - -/************************************************************************ - * IPersistStream_IsDirty (IPersistStream) - */ -HRESULT STDMETHODCALLTYPE CShellLink::IsDirty() -{ - TRACE("(%p)\n", this); - return (m_bDirty ? S_OK : S_FALSE); -} - -HRESULT STDMETHODCALLTYPE CShellLink::Load(LPCOLESTR pszFileName, DWORD dwMode) -{ - TRACE("(%p, %s, %x)\n", this, debugstr_w(pszFileName), dwMode); - - if (dwMode == 0) - dwMode = STGM_READ | STGM_SHARE_DENY_WRITE; - - CComPtr<IStream> stm; - HRESULT hr = SHCreateStreamOnFileW(pszFileName, dwMode, &stm); - if (SUCCEEDED(hr)) - { - HeapFree(GetProcessHeap(), 0, m_sLinkPath); - m_sLinkPath = strdupW(pszFileName); - hr = Load(stm); - ShellLink_UpdatePath(m_sPathRel, pszFileName, m_sWorkDir, &m_sPath); - m_bDirty = FALSE; - } - TRACE("-- returning hr %08x\n", hr); - return hr; -} - -HRESULT STDMETHODCALLTYPE CShellLink::Save(LPCOLESTR pszFileName, BOOL fRemember) -{ - TRACE("(%p)->(%s)\n", this, debugstr_w(pszFileName)); - - if (!pszFileName) - return E_FAIL; - - CComPtr<IStream> stm; - HRESULT hr = SHCreateStreamOnFileW(pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm); - if (SUCCEEDED(hr)) - { - hr = Save(stm, FALSE); - - if (SUCCEEDED(hr)) - { - if (m_sLinkPath) - HeapFree(GetProcessHeap(), 0, m_sLinkPath); - - m_sLinkPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(pszFileName) + 1) * sizeof(WCHAR)); - if (m_sLinkPath) - wcscpy(m_sLinkPath, pszFileName); - - m_bDirty = FALSE; - } - else - { - DeleteFileW(pszFileName); - WARN("Failed to create shortcut %s\n", debugstr_w(pszFileName)); - } - } - - return hr; -} - -HRESULT STDMETHODCALLTYPE CShellLink::SaveCompleted(LPCOLESTR pszFileName) -{ - FIXME("(%p)->(%s)\n", this, debugstr_w(pszFileName)); - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CShellLink::GetCurFile(LPOLESTR *ppszFileName) -{ - *ppszFileName = NULL; - - if (!m_sLinkPath) - { - /* IPersistFile::GetCurFile called before IPersistFile::Save */ - return S_FALSE; - } - - *ppszFileName = (LPOLESTR)CoTaskMemAlloc((wcslen(m_sLinkPath) + 1) * sizeof(WCHAR)); - if (!*ppszFileName) - { - /* out of memory */ - return E_OUTOFMEMORY; - } - - /* copy last saved filename */ - wcscpy(*ppszFileName, m_sLinkPath); - - return S_OK; -} - -static HRESULT Stream_LoadString(IStream* stm, BOOL unicode, LPWSTR *pstr) -{ - TRACE("%p\n", stm); - - USHORT len; - DWORD count = 0; - HRESULT hr = stm->Read(&len, sizeof(len), &count); - if (FAILED(hr) || count != sizeof(len)) - return E_FAIL; - - if (unicode) - len *= sizeof(WCHAR); - - TRACE("reading %d\n", len); - LPSTR temp = (LPSTR)HeapAlloc(GetProcessHeap(), 0, len + sizeof(WCHAR)); - if (!temp) - return E_OUTOFMEMORY; - count = 0; - hr = stm->Read(temp, len, &count); - if (FAILED(hr) || count != len) - { - HeapFree(GetProcessHeap(), 0, temp); - return E_FAIL; - } - - TRACE("read %s\n", debugstr_an(temp, len)); - - /* convert to unicode if necessary */ - LPWSTR str; - if (!unicode) - { - count = MultiByteToWideChar(CP_ACP, 0, temp, len, NULL, 0); - str = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (count + 1) * sizeof(WCHAR)); - if (!str) - { - HeapFree(GetProcessHeap(), 0, temp); - return E_OUTOFMEMORY; - } - MultiByteToWideChar(CP_ACP, 0, temp, len, str, count); - HeapFree(GetProcessHeap(), 0, temp); - } - else - { - count /= sizeof(WCHAR); - str = (LPWSTR)temp; - } - str[count] = 0; - - *pstr = str; - - return S_OK; -} - - -/* - * NOTE: The following 5 functions are part of LINKINFO.DLL - */ -static BOOL ShellLink_GetVolumeInfo(LPCWSTR path, CShellLink::volume_info *volume) -{ - WCHAR drive[4] = { path[0], ':', '\\', 0 }; - - volume->type = GetDriveTypeW(drive); - BOOL bRet = GetVolumeInformationW(drive, volume->label, _countof(volume->label), &volume->serial, NULL, NULL, NULL, 0); - TRACE("ret = %d type %d serial %08x name %s\n", bRet, - volume->type, volume->serial, debugstr_w(volume->label)); - return bRet; -} - -static HRESULT Stream_ReadChunk(IStream* stm, LPVOID *data) -{ - struct sized_chunk - { - DWORD size; - unsigned char data[1]; - } *chunk; - - TRACE("%p\n", stm); - - DWORD size; - ULONG count; - HRESULT hr = stm->Read(&size, sizeof(size), &count); - if (FAILED(hr) || count != sizeof(size)) - return E_FAIL; - - chunk = static_cast<sized_chunk *>(HeapAlloc(GetProcessHeap(), 0, size)); - if (!chunk) - return E_OUTOFMEMORY; - - chunk->size = size; - hr = stm->Read(chunk->data, size - sizeof(size), &count); - if (FAILED(hr) || count != (size - sizeof(size))) - { - HeapFree(GetProcessHeap(), 0, chunk); - return E_FAIL; - } - - TRACE("Read %d bytes\n", chunk->size); - - *data = chunk; - - return S_OK; -} - -static BOOL Stream_LoadVolume(LOCAL_VOLUME_INFO *vol, CShellLink::volume_info *volume) -{ - volume->serial = vol->dwVolSerial; - volume->type = vol->dwType; - - if (!vol->dwVolLabelOfs) - return FALSE; - if (vol->dwSize <= vol->dwVolLabelOfs) - return FALSE; - INT len = vol->dwSize - vol->dwVolLabelOfs; - - LPSTR label = (LPSTR)vol; - label += vol->dwVolLabelOfs; - MultiByteToWideChar(CP_ACP, 0, label, len, volume->label, _countof(volume->label)); - - return TRUE; -} - -static LPWSTR Stream_LoadPath(LPCSTR p, DWORD maxlen) -{ - UINT len = 0; - - while (p[len] && len < maxlen) - len++; - - UINT wlen = MultiByteToWideChar(CP_ACP, 0, p, len, NULL, 0); - LPWSTR path = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wlen + 1) * sizeof(WCHAR)); - if (!path) - return NULL; - MultiByteToWideChar(CP_ACP, 0, p, len, path, wlen); - path[wlen] = 0; - - return path; -} - -static HRESULT Stream_LoadLocation(IStream *stm, - CShellLink::volume_info *volume, LPWSTR *path) -{ - char *p = NULL; - HRESULT hr = Stream_ReadChunk(stm, (LPVOID*) &p); - if (FAILED(hr)) - return hr; - - LOCATION_INFO *loc = reinterpret_cast<LOCATION_INFO *>(p); - if (loc->dwTotalSize < sizeof(LOCATION_INFO)) - { - HeapFree(GetProcessHeap(), 0, p); - return E_FAIL; - } - - /* if there's valid local volume information, load it */ - if (loc->dwVolTableOfs && - ((loc->dwVolTableOfs + sizeof(LOCAL_VOLUME_INFO)) <= loc->dwTotalSize)) - { - LOCAL_VOLUME_INFO *volume_info; - - volume_info = (LOCAL_VOLUME_INFO*) &p[loc->dwVolTableOfs]; - Stream_LoadVolume(volume_info, volume); - } - - /* if there's a local path, load it */ - DWORD n = loc->dwLocalPathOfs; - if (n && n < loc->dwTotalSize) - *path = Stream_LoadPath(&p[n], loc->dwTotalSize - n); - - TRACE("type %d serial %08x name %s path %s\n", volume->type, - volume->serial, debugstr_w(volume->label), debugstr_w(*path)); - - HeapFree(GetProcessHeap(), 0, p); - return S_OK; -} - -/* - * The format of the advertised shortcut info seems to be: - * - * Offset Description - * ------ ----------- - * - * 0 Length of the block (4 bytes, usually 0x314) - * 4 tag (dword) - * 8 string data in ASCII - * 8+0x104 string data in UNICODE - * - * In the original Win32 implementation the buffers are not initialized - * to zero, so data trailing the string is random garbage. - */ -static HRESULT Stream_LoadAdvertiseInfo(IStream* stm, LPWSTR *str) -{ - TRACE("%p\n", stm); - - ULONG count; - EXP_DARWIN_LINK buffer; - HRESULT hr = stm->Read(&buffer.dbh.cbSize, sizeof (DWORD), &count); - if (FAILED(hr)) - return hr; - - /* make sure that we read the size of the structure even on error */ - DWORD size = sizeof buffer - sizeof (DWORD); - if (buffer.dbh.cbSize != sizeof buffer) - { - ERR("Ooops. This structure is not as expected...\n"); - return E_FAIL; - } - - hr = stm->Read(&buffer.dbh.dwSignature, size, &count); - if (FAILED(hr)) - return hr; - - if (count != size) - return E_FAIL; - - TRACE("magic %08x string = %s\n", buffer.dbh.dwSignature, debugstr_w(buffer.szwDarwinID)); - - if ((buffer.dbh.dwSignature & 0xffff0000) != 0xa0000000) - { - ERR("Unknown magic number %08x in advertised shortcut\n", buffer.dbh.dwSignature); - return E_FAIL; - } - - *str = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, - (wcslen(buffer.szwDarwinID) + 1) * sizeof(WCHAR)); - wcscpy(*str, buffer.szwDarwinID); - - return S_OK; -} - -/************************************************************************ - * IPersistStream_Load (IPersistStream) - */ -HRESULT STDMETHODCALLTYPE CShellLink::Load(IStream *stm) -{ - TRACE("%p %p\n", this, stm); - - if (!stm) - return STG_E_INVALIDPOINTER; - - SHELL_LINK_HEADER ShlLnkHeader; - ULONG dwBytesRead = 0; - HRESULT hr = stm->Read(&ShlLnkHeader, sizeof(ShlLnkHeader), &dwBytesRead); - if (FAILED(hr)) - return hr; - - if (dwBytesRead != sizeof(ShlLnkHeader)) - return E_FAIL; - if (ShlLnkHeader.dwSize != sizeof(ShlLnkHeader)) - return E_FAIL; - if (!IsEqualIID(ShlLnkHeader.clsid, CLSID_ShellLink)) - return E_FAIL; - - /* free all the old stuff */ - ILFree(m_pPidl); - m_pPidl = NULL; - memset(&volume, 0, sizeof volume); - HeapFree(GetProcessHeap(), 0, m_sPath); - m_sPath = NULL; HeapFree(GetProcessHeap(), 0, m_sDescription); m_sDescription = NULL; HeapFree(GetProcessHeap(), 0, m_sPathRel); @@ -521,34 +228,436 @@ m_sArgs = NULL; HeapFree(GetProcessHeap(), 0, m_sIcoPath); m_sIcoPath = NULL; - HeapFree(GetProcessHeap(), 0, sProduct); - sProduct = NULL; - HeapFree(GetProcessHeap(), 0, sComponent); - sComponent = NULL; - - BOOL unicode = FALSE; - iShowCmd = ShlLnkHeader.nShowCommand; - wHotKey = ShlLnkHeader.wHotKey; - iIcoNdx = ShlLnkHeader.nIconIndex; - FileTimeToSystemTime (&ShlLnkHeader.ftCreationTime, &time1); - FileTimeToSystemTime (&ShlLnkHeader.ftLastAccessTime, &time2); - FileTimeToSystemTime (&ShlLnkHeader.ftLastWriteTime, &time3); + + m_bRunAs = FALSE; + m_bDirty = FALSE; + + if (m_pDBList) + SHFreeDataBlockList(m_pDBList); + m_pDBList = NULL; + + /**/sProduct = sComponent = NULL;/**/ +} + +CShellLink::CShellLink() +{ + m_Header.dwSize = sizeof(m_Header); + m_Header.clsid = CLSID_ShellLink; + m_Header.dwFlags = 0; + + m_Header.dwFileAttributes = 0; + ZeroMemory(&m_Header.ftCreationTime, sizeof(m_Header.ftCreationTime)); + ZeroMemory(&m_Header.ftLastAccessTime, sizeof(m_Header.ftLastAccessTime)); + ZeroMemory(&m_Header.ftLastWriteTime, sizeof(m_Header.ftLastWriteTime)); + m_Header.nFileSizeLow = 0; + + m_Header.nIconIndex = 0; + m_Header.nShowCommand = SW_SHOWNORMAL; + m_Header.wHotKey = 0; + + m_pPidl = NULL; + + m_sPath = NULL; + ZeroMemory(&volume, sizeof(volume)); + + m_sDescription = NULL; + m_sPathRel = NULL; + m_sWorkDir = NULL; + m_sArgs = NULL; + m_sIcoPath = NULL; + m_bRunAs = FALSE; + m_bDirty = FALSE; + m_pDBList = NULL; + + m_sLinkPath = NULL; + m_iIdOpen = -1; + + /**/sProduct = sComponent = NULL;/**/ +} + +CShellLink::~CShellLink() +{ + TRACE("-- destroying IShellLink(%p)\n", this); + + ILFree(m_pPidl); + + HeapFree(GetProcessHeap(), 0, m_sPath); + + HeapFree(GetProcessHeap(), 0, m_sDescription); + HeapFree(GetProcessHeap(), 0, m_sPathRel); + HeapFree(GetProcessHeap(), 0, m_sWorkDir); + HeapFree(GetProcessHeap(), 0, m_sArgs); + HeapFree(GetProcessHeap(), 0, m_sIcoPath); + HeapFree(GetProcessHeap(), 0, m_sLinkPath); + SHFreeDataBlockList(m_pDBList); +} + +HRESULT STDMETHODCALLTYPE CShellLink::GetClassID(CLSID *pclsid) +{ + TRACE("%p %p\n", this, pclsid); + + if (pclsid == NULL) + return E_POINTER; + *pclsid = CLSID_ShellLink; + return S_OK; +} + +/************************************************************************ + * IPersistStream_IsDirty (IPersistStream) + */ +HRESULT STDMETHODCALLTYPE CShellLink::IsDirty() +{ + TRACE("(%p)\n", this); + return (m_bDirty ? S_OK : S_FALSE); +} + +HRESULT STDMETHODCALLTYPE CShellLink::Load(LPCOLESTR pszFileName, DWORD dwMode) +{ + TRACE("(%p, %s, %x)\n", this, debugstr_w(pszFileName), dwMode); + + if (dwMode == 0) + dwMode = STGM_READ | STGM_SHARE_DENY_WRITE; + + CComPtr<IStream> stm; + HRESULT hr = SHCreateStreamOnFileW(pszFileName, dwMode, &stm); + if (SUCCEEDED(hr)) + { + HeapFree(GetProcessHeap(), 0, m_sLinkPath); + m_sLinkPath = strdupW(pszFileName); + hr = Load(stm); + ShellLink_UpdatePath(m_sPathRel, pszFileName, m_sWorkDir, &m_sPath); + m_bDirty = FALSE; + } + TRACE("-- returning hr %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CShellLink::Save(LPCOLESTR pszFileName, BOOL fRemember) +{ + TRACE("(%p)->(%s)\n", this, debugstr_w(pszFileName)); + + if (!pszFileName) + return E_FAIL; + + CComPtr<IStream> stm; + HRESULT hr = SHCreateStreamOnFileW(pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm); + if (SUCCEEDED(hr)) + { + hr = Save(stm, FALSE); + + if (SUCCEEDED(hr)) + { + if (m_sLinkPath) + HeapFree(GetProcessHeap(), 0, m_sLinkPath); + + m_sLinkPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(pszFileName) + 1) * sizeof(WCHAR)); + if (m_sLinkPath) + wcscpy(m_sLinkPath, pszFileName); + + m_bDirty = FALSE; + } + else + { + DeleteFileW(pszFileName); + WARN("Failed to create shortcut %s\n", debugstr_w(pszFileName)); + } + } + + return hr; +} + +HRESULT STDMETHODCALLTYPE CShellLink::SaveCompleted(LPCOLESTR pszFileName) +{ + FIXME("(%p)->(%s)\n", this, debugstr_w(pszFileName)); + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CShellLink::GetCurFile(LPOLESTR *ppszFileName) +{ + *ppszFileName = NULL; + + if (!m_sLinkPath) + { + /* IPersistFile::GetCurFile called before IPersistFile::Save */ + return S_FALSE; + } + + *ppszFileName = (LPOLESTR)CoTaskMemAlloc((wcslen(m_sLinkPath) + 1) * sizeof(WCHAR)); + if (!*ppszFileName) + { + /* out of memory */ + return E_OUTOFMEMORY; + } + + /* copy last saved filename */ + wcscpy(*ppszFileName, m_sLinkPath); + + return S_OK; +} + +static HRESULT Stream_LoadString(IStream* stm, BOOL unicode, LPWSTR *pstr) +{ + TRACE("%p\n", stm); + + USHORT len; + DWORD count = 0; + HRESULT hr = stm->Read(&len, sizeof(len), &count); + if (FAILED(hr) || count != sizeof(len)) + return E_FAIL; + + if (unicode) + len *= sizeof(WCHAR); + + TRACE("reading %d\n", len); + LPSTR temp = (LPSTR)HeapAlloc(GetProcessHeap(), 0, len + sizeof(WCHAR)); + if (!temp) + return E_OUTOFMEMORY; + count = 0; + hr = stm->Read(temp, len, &count); + if (FAILED(hr) || count != len) + { + HeapFree(GetProcessHeap(), 0, temp); + return E_FAIL; + } + + TRACE("read %s\n", debugstr_an(temp, len)); + + /* convert to unicode if necessary */ + LPWSTR str; + if (!unicode) + { + count = MultiByteToWideChar(CP_ACP, 0, temp, len, NULL, 0); + str = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (count + 1) * sizeof(WCHAR)); + if (!str) + { + HeapFree(GetProcessHeap(), 0, temp); + return E_OUTOFMEMORY; + } + MultiByteToWideChar(CP_ACP, 0, temp, len, str, count); + HeapFree(GetProcessHeap(), 0, temp); + } + else + { + count /= sizeof(WCHAR); + str = (LPWSTR)temp; + } + str[count] = 0; + + *pstr = str; + + return S_OK; +} + + +/* + * NOTE: The following 5 functions are part of LINKINFO.DLL + */ +static BOOL ShellLink_GetVolumeInfo(LPCWSTR path, CShellLink::volume_info *volume) +{ + WCHAR drive[4] = { path[0], ':', '\\', 0 }; + + volume->type = GetDriveTypeW(drive); + BOOL bRet = GetVolumeInformationW(drive, volume->label, _countof(volume->label), &volume->serial, NULL, NULL, NULL, 0); + TRACE("ret = %d type %d serial %08x name %s\n", bRet, + volume->type, volume->serial, debugstr_w(volume->label)); + return bRet; +} + +static HRESULT Stream_ReadChunk(IStream* stm, LPVOID *data) +{ + struct sized_chunk + { + DWORD size; + unsigned char data[1]; + } *chunk; + + TRACE("%p\n", stm); + + DWORD size; + ULONG count; + HRESULT hr = stm->Read(&size, sizeof(size), &count); + if (FAILED(hr) || count != sizeof(size)) + return E_FAIL; + + chunk = static_cast<sized_chunk *>(HeapAlloc(GetProcessHeap(), 0, size)); + if (!chunk) + return E_OUTOFMEMORY; + + chunk->size = size; + hr = stm->Read(chunk->data, size - sizeof(size), &count); + if (FAILED(hr) || count != (size - sizeof(size))) + { + HeapFree(GetProcessHeap(), 0, chunk); + return E_FAIL; + } + + TRACE("Read %d bytes\n", chunk->size); + + *data = chunk; + + return S_OK; +} + +static BOOL Stream_LoadVolume(LOCAL_VOLUME_INFO *vol, CShellLink::volume_info *volume) +{ + volume->serial = vol->dwVolSerial; + volume->type = vol->dwType; + + if (!vol->dwVolLabelOfs) + return FALSE; + if (vol->dwSize <= vol->dwVolLabelOfs) + return FALSE; + INT len = vol->dwSize - vol->dwVolLabelOfs; + + LPSTR label = (LPSTR)vol; + label += vol->dwVolLabelOfs; + MultiByteToWideChar(CP_ACP, 0, label, len, volume->label, _countof(volume->label)); + + return TRUE; +} + +static LPWSTR Stream_LoadPath(LPCSTR p, DWORD maxlen) +{ + UINT len = 0; + + while (p[len] && len < maxlen) + len++; + + UINT wlen = MultiByteToWideChar(CP_ACP, 0, p, len, NULL, 0); + LPWSTR path = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wlen + 1) * sizeof(WCHAR)); + if (!path) + return NULL; + MultiByteToWideChar(CP_ACP, 0, p, len, path, wlen); + path[wlen] = 0; + + return path; +} + +static HRESULT Stream_LoadLocation(IStream *stm, + CShellLink::volume_info *volume, LPWSTR *path) +{ + char *p = NULL; + HRESULT hr = Stream_ReadChunk(stm, (LPVOID*) &p); + if (FAILED(hr)) + return hr; + + LOCATION_INFO *loc = reinterpret_cast<LOCATION_INFO *>(p); + if (loc->dwTotalSize < sizeof(LOCATION_INFO)) + { + HeapFree(GetProcessHeap(), 0, p); + return E_FAIL; + } + + /* if there's valid local volume information, load it */ + if (loc->dwVolTableOfs && + ((loc->dwVolTableOfs + sizeof(LOCAL_VOLUME_INFO)) <= loc->dwTotalSize)) + { + LOCAL_VOLUME_INFO *volume_info; + + volume_info = (LOCAL_VOLUME_INFO*) &p[loc->dwVolTableOfs]; + Stream_LoadVolume(volume_info, volume); + } + + /* if there's a local path, load it */ + DWORD n = loc->dwLocalPathOfs; + if (n && n < loc->dwTotalSize) + *path = Stream_LoadPath(&p[n], loc->dwTotalSize - n); + + TRACE("type %d serial %08x name %s path %s\n", volume->type, + volume->serial, debugstr_w(volume->label), debugstr_w(*path)); + + HeapFree(GetProcessHeap(), 0, p); + return S_OK; +} + + +/* + * The format of the advertised shortcut info is: + * + * Offset Description + * ------ ----------- + * 0 Length of the block (4 bytes, usually 0x314) + * 4 tag (dword) + * 8 string data in ASCII + * 8+0x104 string data in UNICODE + * + * In the original Win32 implementation the buffers are not initialized + * to zero, so data trailing the string is random garbage. + */ +HRESULT CShellLink::GetAdvertiseInfo(LPWSTR *str, DWORD dwSig) +{ + LPEXP_DARWIN_LINK pInfo; + + *str = NULL; + + pInfo = (LPEXP_DARWIN_LINK)SHFindDataBlock(m_pDBList, dwSig); + if (!pInfo) + return E_FAIL; + + /* Make sure that the size of the structure is valid */ + if (pInfo->dbh.cbSize != sizeof(*pInfo)) + { + ERR("Ooops. This structure is not as expected...\n"); + return E_FAIL; + } + + TRACE("dwSig %08x string = '%s'\n", pInfo->dbh.dwSignature, debugstr_w(pInfo->szwDarwinID)); + + *str = pInfo->szwDarwinID; + return S_OK; +} + +/************************************************************************ + * IPersistStream_Load (IPersistStream) + */ +HRESULT STDMETHODCALLTYPE CShellLink::Load(IStream *stm) +{ + TRACE("%p %p\n", this, stm); + + if (!stm) + return STG_E_INVALIDPOINTER; + + /* Free all the old stuff */ + Reset(); + + ULONG dwBytesRead = 0; + HRESULT hr = stm->Read(&m_Header, sizeof(m_Header), &dwBytesRead); + if (FAILED(hr)) + return hr; + + if (dwBytesRead != sizeof(m_Header)) + return E_FAIL; + if (m_Header.dwSize != sizeof(m_Header)) + return E_FAIL; + if (!IsEqualIID(m_Header.clsid, CLSID_ShellLink)) + return E_FAIL; + + /* Load the new data in order */ + if (TRACE_ON(shell)) { + SYSTEMTIME stCreationTime; + SYSTEMTIME stLastAccessTime; + SYSTEMTIME stLastWriteTime; WCHAR sTemp[MAX_PATH]; - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time1, - NULL, sTemp, sizeof(sTemp) / sizeof(*sTemp)); - TRACE("-- time1: %s\n", debugstr_w(sTemp)); - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time2, - NULL, sTemp, sizeof(sTemp) / sizeof(*sTemp)); - TRACE("-- time2: %s\n", debugstr_w(sTemp)); - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time3, - NULL, sTemp, sizeof(sTemp) / sizeof(*sTemp)); - TRACE("-- time3: %s\n", debugstr_w(sTemp)); + + FileTimeToSystemTime(&m_Header.ftCreationTime, &stCreationTime); + FileTimeToSystemTime(&m_Header.ftLastAccessTime, &stLastAccessTime); + FileTimeToSystemTime(&m_Header.ftLastWriteTime, &stLastWriteTime); + + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &stCreationTime, + NULL, sTemp, _countof(sTemp)); + TRACE("-- stCreationTime: %s\n", debugstr_w(sTemp)); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &stLastAccessTime, + NULL, sTemp, _countof(sTemp)); + TRACE("-- stLastAccessTime: %s\n", debugstr_w(sTemp)); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &stLastWriteTime, + NULL, sTemp, _countof(sTemp)); + TRACE("-- stLastWriteTime: %s\n", debugstr_w(sTemp)); } /* load all the new stuff */ - if (ShlLnkHeader.dwFlags & SLDF_HAS_ID_LIST) + if (m_Header.dwFlags & SLDF_HAS_ID_LIST) { hr = ILLoadFromStream(stm, &m_pPidl); if (FAILED(hr)) @@ -556,82 +665,91 @@ } pdump(m_pPidl); - /* load the location information */ - if (ShlLnkHeader.dwFlags & SLDF_HAS_LINK_INFO) + /* Load the location information... */ + if (m_Header.dwFlags & SLDF_HAS_LINK_INFO) + { hr = Stream_LoadLocation(stm, &volume, &m_sPath); - if (FAILED(hr)) - goto end; - - if (ShlLnkHeader.dwFlags & SLDF_UNICODE) - unicode = TRUE; - - if (ShlLnkHeader.dwFlags & SLDF_HAS_NAME) + if (FAILED(hr)) + return hr; + } + /* ... but if it is required not to use it, clear it */ + if (m_Header.dwFlags & SLDF_FORCE_NO_LINKINFO) + { + HeapFree(GetProcessHeap(), 0, m_sPath); + m_sPath = NULL; + ZeroMemory(&volume, sizeof(volume)); + } + + BOOL unicode = !!(m_Header.dwFlags & SLDF_UNICODE); + + if (m_Header.dwFlags & SLDF_HAS_NAME) { hr = Stream_LoadString(stm, unicode, &m_sDescription); + if (FAILED(hr)) + return hr; TRACE("Description -> %s\n", debugstr_w(m_sDescription)); } - if (FAILED(hr)) - goto end; - - if (ShlLnkHeader.dwFlags & SLDF_HAS_RELPATH) + + if (m_Header.dwFlags & SLDF_HAS_RELPATH) { hr = Stream_LoadString(stm, unicode, &m_sPathRel); + if (FAILED(hr)) + return hr; TRACE("Relative Path-> %s\n", debugstr_w(m_sPathRel)); } - if (FAILED(hr)) - goto end; - - if (ShlLnkHeader.dwFlags & SLDF_HAS_WORKINGDIR) + + if (m_Header.dwFlags & SLDF_HAS_WORKINGDIR) { hr = Stream_LoadString(stm, unicode, &m_sWorkDir); + if (FAILED(hr)) + return hr; PathRemoveBackslash(m_sWorkDir); TRACE("Working Dir -> %s\n", debugstr_w(m_sWorkDir)); } - if (FAILED(hr)) - goto end; - - if (ShlLnkHeader.dwFlags & SLDF_HAS_ARGS) + + if (m_Header.dwFlags & SLDF_HAS_ARGS) { hr = Stream_LoadString(stm, unicode, &m_sArgs); + if (FAILED(hr)) + return hr; TRACE("Arguments -> %s\n", debugstr_w(m_sArgs)); } - if (FAILED(hr)) - goto end; - - if (ShlLnkHeader.dwFlags & SLDF_HAS_ICONLOCATION) + + if (m_Header.dwFlags & SLDF_HAS_ICONLOCATION) { hr = Stream_LoadString(stm, unicode, &m_sIcoPath); + if (FAILED(hr)) + return hr; TRACE("Icon file -> %s\n", debugstr_w(m_sIcoPath)); } - if (FAILED(hr)) - goto end; - + + /* Now load the optional data block list */ + hr = SHReadDataBlockList(stm, &m_pDBList); + if (FAILED(hr)) // FIXME: Should we fail? + return hr; + + if (TRACE_ON(shell)) + { #if (NTDDI_VERSION < NTDDI_LONGHORN) - if (ShlLnkHeader.dwFlags & SLDF_HAS_LOGO3ID) - { - hr = Stream_LoadAdvertiseInfo(stm, &sProduct); - TRACE("Product -> %s\n", debugstr_w(sProduct)); - } - if (FAILED(hr)) - goto end; + if (m_Header.dwFlags & SLDF_HAS_LOGO3ID) + { + hr = GetAdvertiseInfo(&sProduct, EXP_LOGO3_ID_SIG); + if (SUCCEEDED(hr)) + TRACE("Product -> %s\n", debugstr_w(sProduct)); + } #endif - - if (ShlLnkHeader.dwFlags & SLDF_HAS_DARWINID) - { - hr = Stream_LoadAdvertiseInfo(stm, &sComponent); - TRACE("Component -> %s\n", debugstr_w(sComponent)); - } - if (ShlLnkHeader.dwFlags & SLDF_RUNAS_USER) - { + if (m_Header.dwFlags & SLDF_HAS_DARWINID) + { + hr = GetAdvertiseInfo(&sComponent, EXP_DARWIN_ID_SIG); + if (SUCCEEDED(hr)) + TRACE("Component -> %s\n", debugstr_w(sComponent)); + } + } + + if (m_Header.dwFlags & SLDF_RUNAS_USER) m_bRunAs = TRUE; - } else - { m_bRunAs = FALSE; - } - - if (FAILED(hr)) - goto end; DWORD dwZero; hr = stm->Read(&dwZero, sizeof(dwZero), &dwBytesRead); @@ -643,9 +761,6 @@ pdump(m_pPidl); return S_OK; - -end: - return hr; } /************************************************************************ @@ -656,7 +771,7 @@ */ static HRESULT Stream_WriteString(IStream* stm, LPCWSTR str) { - USHORT len = wcslen(str) + 1; + USHORT len = wcslen(str) + 1; // FIXME: Possible overflows? DWORD count; HRESULT hr = stm->Write(&len, sizeof(len), &count); @@ -734,27 +849,6 @@ return hr; } -static EXP_DARWIN_LINK* shelllink_build_darwinid(LPCWSTR string, DWORD magic) -{ - EXP_DARWIN_LINK *buffer = (EXP_DARWIN_LINK *)LocalAlloc(LMEM_ZEROINIT, sizeof * buffer); - buffer->dbh.cbSize = sizeof * buffer; - buffer->dbh.dwSignature = magic; - lstrcpynW(buffer->szwDarwinID, string, MAX_PATH); - WideCharToMultiByte(CP_ACP, 0, string, -1, buffer->szDarwinID, MAX_PATH, NULL, NULL); - - return buffer; -} - -static HRESULT Stream_WriteAdvertiseInfo(IStream* stm, LPCWSTR string, DWORD magic) -{ - TRACE("%p\n", stm); - - EXP_DARWIN_LINK *buffer = shelllink_build_darwinid(string, magic); - - ULONG count; - return stm->Write(buffer, buffer->dbh.cbSize, &count); -} - /************************************************************************ * IPersistStream_Save (IPersistStream) * @@ -764,52 +858,53 @@ { TRACE("%p %p %x\n", this, stm, fClearDirty); - SHELL_LINK_HEADER ShlLnkHeader; - memset(&ShlLnkHeader, 0, sizeof(ShlLnkHeader)); - ShlLnkHeader.dwSize = sizeof(ShlLnkHeader); - ShlLnkHeader.nShowCommand = iShowCmd; - ShlLnkHeader.clsid = CLSID_ShellLink; - - ShlLnkHeader.wHotKey = wHotKey; - ShlLnkHeader.nIconIndex = iIcoNdx; - ShlLnkHeader.dwFlags = SLDF_UNICODE; /* strings are in unicode */ + m_Header.dwSize = sizeof(m_Header); + m_Header.clsid = CLSID_ShellLink; + + /* + * Reset the flags: keep only the flags related to data blocks as they were + * already set in accordance by the different mutator member functions. + * The other flags will be determined now by the presence or absence of data. + */ + m_Header.dwFlags &= (SLDF_RUN_WITH_SHIMLAYER | SLDF_RUNAS_USER | + SLDF_RUN_IN_SEPARATE | SLDF_HAS_DARWINID | +#if (NTDDI_VERSION < NTDDI_LONGHORN) + SLDF_HAS_LOGO3ID | +#endif + SLDF_HAS_EXP_ICON_SZ | SLDF_HAS_EXP_SZ); + // TODO: When we will support Vista+ functionality, add other flags to this list. + + /* The stored strings are in UNICODE */ + m_Header.dwFlags |= SLDF_UNICODE; + if (m_pPidl) - ShlLnkHeader.dwFlags |= SLDF_HAS_ID_LIST; + m_Header.dwFlags |= SLDF_HAS_ID_LIST; if (m_sPath) - ShlLnkHeader.dwFlags |= SLDF_HAS_LINK_INFO; - if (m_sDescription) - ShlLnkHeader.dwFlags |= SLDF_HAS_NAME; - if (m_sWorkDir) - ShlLnkHeader.dwFlags |= SLDF_HAS_WORKINGDIR; - if (m_sArgs) - ShlLnkHeader.dwFlags |= SLDF_HAS_ARGS; - if (m_sIcoPath) - ShlLnkHeader.dwFlags |= SLDF_HAS_ICONLOCATION; -#if (NTDDI_VERSION < NTDDI_LONGHORN) - if (sProduct) - ShlLnkHeader.dwFlags |= SLDF_HAS_LOGO3ID; -#endif - if (sComponent) - ShlLnkHeader.dwFlags |= SLDF_HAS_DARWINID; + m_Header.dwFlags |= SLDF_HAS_LINK_INFO; + if (m_sDescription && *m_sDescription) + m_Header.dwFlags |= SLDF_HAS_NAME; + if (m_sPathRel && *m_sPathRel) + m_Header.dwFlags |= SLDF_HAS_RELPATH; + if (m_sWorkDir && *m_sWorkDir) + m_Header.dwFlags |= SLDF_HAS_WORKINGDIR; + if (m_sArgs && *m_sArgs) + m_Header.dwFlags |= SLDF_HAS_ARGS; + if (m_sIcoPath && *m_sIcoPath) + m_Header.dwFlags |= SLDF_HAS_ICONLOCATION; if (m_bRunAs) - ShlLnkHeader.dwFlags |= SLDF_RUNAS_USER; - - SystemTimeToFileTime (&time1, &ShlLnkHeader.ftCreationTime); - SystemTimeToFileTime (&time2, &ShlLnkHeader.ftLastAccessTime); - SystemTimeToFileTime (&time3, &ShlLnkHeader.ftLastWriteTime); - - /* write the Shortcut header */ + m_Header.dwFlags |= SLDF_RUNAS_USER; + + /* Write the shortcut header */ ULONG count; - HRESULT hr = stm->Write(&ShlLnkHeader, sizeof(ShlLnkHeader), &count); + HRESULT hr = stm->Write(&m_Header, sizeof(m_Header), &count); if (FAILED(hr)) { ERR("Write failed\n"); return hr; } - TRACE("Writing pidl\n"); - - /* write the PIDL to the shortcut */ + /* Save the data in order */ + if (m_pPidl) { hr = ILSaveToStream(stm, m_pPidl); @@ -821,34 +916,67 @@ } if (m_sPath) - Stream_WriteLocationInfo(stm, m_sPath, &volume); - - if (m_sDescription) + { + hr = Stream_WriteLocationInfo(stm, m_sPath, &volume); + if (FAILED(hr)) + return hr; + } + + if (m_Header.dwFlags & SLDF_HAS_NAME) + { hr = Stream_WriteString(stm, m_sDescription); - - if (m_sPathRel) + if (FAILED(hr)) + return hr; + } + + if (m_Header.dwFlags & SLDF_HAS_RELPATH) + { hr = Stream_WriteString(stm, m_sPathRel); - - if (m_sWorkDir) + if (FAILED(hr)) + return hr; + } + + if (m_Header.dwFlags & SLDF_HAS_WORKINGDIR) + { hr = Stream_WriteString(stm, m_sWorkDir); - - if (m_sArgs) + if (FAILED(hr)) + return hr; + } + + if (m_Header.dwFlags & SLDF_HAS_ARGS) + { hr = Stream_WriteString(stm, m_sArgs); - - if (m_sIcoPath) + if (FAILED(hr)) + return hr; + } + + if (m_Header.dwFlags & SLDF_HAS_ICONLOCATION) + { hr = Stream_WriteString(stm, m_sIcoPath); - - if (sProduct) - hr = Stream_WriteAdvertiseInfo(stm, sProduct, EXP_SZ_ICON_SIG); - - if (sComponent) - hr = Stream_WriteAdvertiseInfo(stm, sComponent, EXP_DARWIN_ID_SIG); - - /* the last field is a single zero dword */ - DWORD zero = 0; - hr = stm->Write(&zero, sizeof zero, &count); - - return S_OK; + if (FAILED(hr)) + return hr; + } + + /* + * Now save the data block list. + * + * NOTE that both advertised Product and Component are already saved + * inside Logo3 and Darwin data blocks in the m_pDBList list, and the + * m_Header.dwFlags is suitably initialized. + */ + hr = SHWriteDataBlockList(stm, m_pDBList); + if (FAILED(hr)) + return hr; + + /* Clear the dirty bit if requested */ + if (fClearDirty) + m_bDirty = FALSE; + + /* The last field is a single zero dword */ + DWORD dwZero = 0; + hr = stm->Write(&dwZero, sizeof(dwZero), &count); + + return hr; } /************************************************************************ @@ -926,22 +1054,47 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetPath(LPSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags) { + HRESULT hr; + LPWSTR pszFileW; + WIN32_FIND_DATAW wfd; + TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%u)(%s)\n", this, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(m_sPath)); - if (sComponent || sProduct) - return S_FALSE; - - if (cchMaxPath) - pszFile[0] = 0; - - if (m_sPath) - WideCharToMultiByte(CP_ACP, 0, m_sPath, -1, - pszFile, cchMaxPath, NULL, NULL); - - if (pfd) FIXME("(%p): WIN32_FIND_DATA is not yet filled.\n", this); - - return S_OK; + /* Allocate a temporary UNICODE buffer */ + pszFileW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, cchMaxPath * sizeof(WCHAR)); + if (!pszFileW) + return E_OUTOFMEMORY; + + /* Call the UNICODE function */ + hr = GetPath(pszFileW, cchMaxPath, &wfd, fFlags); + + /* Convert the file path back to ANSI */ + WideCharToMultiByte(CP_ACP, 0, pszFileW, -1, + pszFile, cchMaxPath, NULL, NULL); + + /* Free the temporary buffer */ + HeapFree(GetProcessHeap(), 0, pszFileW); + + if (pfd) + { + ZeroMemory(pfd, sizeof(*pfd)); + + /* Copy the file data if a file path was returned */ + if (*pszFileW) + { + /* Copy the fixed part */ + CopyMemory(pfd, &wfd, FIELD_OFFSET(WIN32_FIND_DATAA, cFileName)); + + /* Convert the file names to ANSI */ + WideCharToMultiByte(CP_ACP, 0, wfd.cFileName, sizeof(wfd.cFileName), + pfd->cFileName, sizeof(pfd->cFileName), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, wfd.cAlternateFileName, sizeof(wfd.cAlternateFileName), + pfd->cAlternateFileName, sizeof(pfd->cAlternateFileName), NULL, NULL); + } + } + + return hr; } HRESULT STDMETHODCALLTYPE CShellLink::GetIDList(LPITEMIDLIST *ppidl) @@ -961,17 +1114,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetIDList(LPCITEMIDLIST pidl) { TRACE("(%p)->(pidl=%p)\n", this, pidl); - - if (m_pPidl) - ILFree(m_pPidl); - - m_pPidl = ILClone(pidl); - if (!m_pPidl) - return E_FAIL; - - m_bDirty = TRUE; - - return S_OK; + return SetTargetFromPIDLOrPath(pidl, NULL); } HRESULT STDMETHODCALLTYPE CShellLink::GetDescription(LPSTR pszName, INT cchMaxName) @@ -1073,8 +1216,8 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetHotkey(WORD *pwHotkey) { - TRACE("(%p)->(%p)(0x%08x)\n", this, pwHotkey, wHotKey); - *pwHotkey = wHotKey; + TRACE("(%p)->(%p)(0x%08x)\n", this, pwHotkey, m_Header.wHotKey); + *pwHotkey = m_Header.wHotKey; return S_OK; } @@ -1082,7 +1225,7 @@ { TRACE("(%p)->(hotkey=%x)\n", this, wHotkey); - wHotKey = wHotkey; + m_Header.wHotKey = wHotkey; m_bDirty = TRUE; return S_OK; @@ -1090,8 +1233,8 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetShowCmd(INT *piShowCmd) { - TRACE("(%p)->(%p) %d\n", this, piShowCmd, iShowCmd); - *piShowCmd = iShowCmd; + TRACE("(%p)->(%p) %d\n", this, piShowCmd, m_Header.nShowCommand); + *piShowCmd = m_Header.nShowCommand; return S_OK; } @@ -1099,7 +1242,7 @@ { TRACE("(%p) %d\n", this, iShowCmd); - this->iShowCmd = iShowCmd; + m_Header.nShowCommand = iShowCmd; m_bDirty = TRUE; return S_OK; @@ -1130,81 +1273,176 @@ return hr; } +HRESULT STDMETHODCALLTYPE CShellLink::GetIconLocation(UINT uFlags, PSTR pszIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) +{ + HRESULT hr; + LPWSTR pszIconFileW; + + TRACE("(%p)->(%u %p len=%u piIndex=%p pwFlags=%p)\n", this, uFlags, pszIconFile, cchMax, piIndex, pwFlags); + + /* Allocate a temporary UNICODE buffer */ + pszIconFileW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, cchMax * sizeof(WCHAR)); + if (!pszIconFileW) + return E_OUTOFMEMORY; + + /* Call the UNICODE function */ + hr = GetIconLocation(uFlags, pszIconFileW, cchMax, piIndex, pwFlags); + + /* Convert the file path back to ANSI */ + WideCharToMultiByte(CP_ACP, 0, pszIconFileW, -1, + pszIconFile, cchMax, NULL, NULL); + + /* Free the temporary buffer */ + HeapFree(GetProcessHeap(), 0, pszIconFileW); + + return hr; +} + +HRESULT STDMETHODCALLTYPE CShellLink::Extract(PCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) +{ + TRACE("(%p)->(path=%s iicon=%u)\n", this, pszFile, nIconIndex); + + LPWSTR str = NULL; + if (pszFile) + { + str = HEAP_strdupAtoW(GetProcessHeap(), 0, pszFile); + if (!str) + return E_OUTOFMEMORY; + } + + HRESULT hr = Extract(str, nIconIndex, phiconLarge, phiconSmall, nIconSize); + + if (str) + HeapFree(GetProcessHeap(), 0, str); + + return hr; +} + HRESULT STDMETHODCALLTYPE CShellLink::SetIconLocation(LPCSTR pszIconPath, INT iIcon) { TRACE("(%p)->(path=%s iicon=%u)\n", this, pszIconPath, iIcon); - HeapFree(GetProcessHeap(), 0, m_sIcoPath); - m_sIcoPath = NULL; - + LPWSTR str = NULL; if (pszIconPath) { - m_sIcoPath = HEAP_strdupAtoW(GetProcessHeap(), 0, pszIconPath); + str = HEAP_strdupAtoW(GetProcessHeap(), 0, pszIconPath); + if (!str) + return E_OUTOFMEMORY; + } + + HRESULT hr = SetIconLocation(str, iIcon); + + if (str) + HeapFree(GetProcessHeap(), 0, str); + + return hr; +} + +HRESULT STDMETHODCALLTYPE CShellLink::SetRelativePath(LPCSTR pszPathRel, DWORD dwReserved) +{ + TRACE("(%p)->(path=%s %x)\n", this, pszPathRel, dwReserved); + + HeapFree(GetProcessHeap(), 0, m_sPathRel); + m_sPathRel = NULL; + + if (pszPathRel) + { + m_sPathRel = HEAP_strdupAtoW(GetProcessHeap(), 0, pszPathRel); + m_bDirty = TRUE; + } + + return ShellLink_UpdatePath(m_sPathRel, m_sPath, m_sWorkDir, &m_sPath); +} + +static LPWSTR +shelllink_get_msi_component_path(LPWSTR component) +{ + DWORD Result, sz = 0; + + Result = CommandLineFromMsiDescriptor(component, NULL, &sz); + if (Result != ERROR_SUCCESS) + return NULL; + + sz++; + LPWSTR path = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR)); + Result = CommandLineFromMsiDescriptor(component, path, &sz); + if (Result != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, path); + path = NULL; + } + + TRACE("returning %s\n", debugstr_w(path)); + + return path; +} + +HRESULT STDMETHODCALLTYPE CShellLink::Resolve(HWND hwnd, DWORD fFlags) +{ + HRESULT hr = S_OK; + BOOL bSuccess; + + TRACE("(%p)->(hwnd=%p flags=%x)\n", this, hwnd, fFlags); + + /* FIXME: use IResolveShellLink interface? */ + + // FIXME: See InvokeCommand(). + +#if (NTDDI_VERSION < NTDDI_LONGHORN) + // NOTE: For Logo3 (EXP_LOGO3_ID_SIG), check also for SHRestricted(REST_NOLOGO3CHANNELNOTIFY) + if (m_Header.dwFlags & SLDF_HAS_LOGO3ID) + { + FIXME("Logo3 links are not supported yet!\n"); + return E_FAIL; + } +#endif + + /* Resolve Darwin (MSI) target */ + if (m_Header.dwFlags & SLDF_HAS_DARWINID) + { + LPWSTR component = NULL; + hr = GetAdvertiseInfo(&component, EXP_DARWIN_ID_SIG); + if (FAILED(hr)) + return E_FAIL; + + /* Clear the cached path */ + HeapFree(GetProcessHeap(), 0, m_sPath); + m_sPath = NULL; + m_sPath = shelllink_get_msi_component_path(component); + if (!m_sPath) + return E_FAIL; + } + + if (!m_sPath && m_pPidl) + { + WCHAR buffer[MAX_PATH]; + + bSuccess = SHGetPathFromIDListW(m_pPidl, buffer); + if (bSuccess && *buffer) + { + m_sPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(buffer) + 1) * sizeof(WCHAR)); + if (!m_sPath) + return E_OUTOFMEMORY; + + wcscpy(m_sPath, buffer); + + m_bDirty = TRUE; + } + else + { + hr = S_OK; /* don't report an error occurred while just caching information */ + } + } + + // FIXME: Strange to do that here... + if (!m_sIcoPath && m_sPath) + { + m_sIcoPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(m_sPath) + 1) * sizeof(WCHAR)); if (!m_sIcoPath) return E_OUTOFMEMORY; - } - - iIcoNdx = iIcon; - m_bDirty = TRUE; - - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CShellLink::SetRelativePath(LPCSTR pszPathRel, DWORD dwReserved) -{ - TRACE("(%p)->(path=%s %x)\n", this, pszPathRel, dwReserved); - - HeapFree(GetProcessHeap(), 0, m_sPathRel); - m_sPathRel = NULL; - - if (pszPathRel) - { - m_sPathRel = HEAP_strdupAtoW(GetProcessHeap(), 0, pszPathRel); - m_bDirty = TRUE; - } - - return ShellLink_UpdatePath(m_sPathRel, m_sPath, m_sWorkDir, &m_sPath); -} - -HRESULT STDMETHODCALLTYPE CShellLink::Resolve(HWND hwnd, DWORD fFlags) -{ - HRESULT hr = S_OK; - BOOL bSuccess; - - TRACE("(%p)->(hwnd=%p flags=%x)\n", this, hwnd, fFlags); - - /*FIXME: use IResolveShellLink interface */ - - if (!m_sPath && m_pPidl) - { - WCHAR buffer[MAX_PATH]; - - bSuccess = SHGetPathFromIDListW(m_pPidl, buffer); - - if (bSuccess && *buffer) - { - m_sPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(buffer) + 1) * sizeof(WCHAR)); - - if (!m_sPath) - return E_OUTOFMEMORY; - - wcscpy(m_sPath, buffer); - - m_bDirty = TRUE; - } - else - hr = S_OK; /* don't report an error occurred while just caching information */ - } - - if (!m_sIcoPath && m_sPath) - { - m_sIcoPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(m_sPath) + 1) * sizeof(WCHAR)); - - if (!m_sIcoPath) - return E_OUTOFMEMORY; wcscpy(m_sIcoPath, m_sPath); - iIcoNdx = 0; + m_Header.nIconIndex = 0; m_bDirty = TRUE; } @@ -1231,21 +1469,83 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetPath(LPWSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAW *pfd, DWORD fFlags) { + WCHAR buffer[MAX_PATH]; + TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%u)(%s)\n", this, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(m_sPath)); - if (sComponent || sProduct) - return S_FALSE; - if (cchMaxPath) *pszFile = 0; - - if (m_sPath) - lstrcpynW(pszFile, m_sPath, cchMaxPath); - - if (pfd) FIXME("(%p): WIN32_FIND_DATA is not yet filled.\n", this); - - return S_OK; + // FIXME: What if cchMaxPath == 0 , or pszFile == NULL ?? + + // FIXME: What about Darwin?? + + /* + * Retrieve the path to the target from the PIDL (if we have one). + * NOTE: Do NOT use the cached path (m_sPath from link info). + */ + if (m_pPidl && SHGetPathFromIDListW(m_pPidl, buffer)) + { + if (fFlags & SLGP_SHORTPATH) + GetShortPathNameW(buffer, buffer, _countof(buffer)); + // FIXME: Add support for SLGP_UNCPRIORITY + } + else + { + *buffer = 0; + } + + /* If we have a FindData structure, initialize it */ + if (pfd) + { + ZeroMemory(pfd, sizeof(*pfd)); + + /* Copy the file data if the target is a file path */ + if (*buffer) + { + pfd->dwFileAttributes = m_Header.dwFileAttributes; + pfd->ftCreationTime = m_Header.ftCreationTime; + pfd->ftLastAccessTime = m_Header.ftLastAccessTime; + pfd->ftLastWriteTime = m_Header.ftLastWriteTime; + pfd->nFileSizeHigh = 0; + pfd->nFileSizeLow = m_Header.nFileSizeLow; + + /* + * Build temporarily a short path in pfd->cFileName (of size MAX_PATH), + * then extract and store the short file name in pfd->cAlternateFileName. + */ + GetShortPathNameW(buffer, pfd->cFileName, _countof(pfd->cFileName)); + lstrcpynW(pfd->cAlternateFileName, + PathFindFileNameW(pfd->cFileName), + _countof(pfd->cAlternateFileName)); + + /* Now extract and store the long file name in pfd->cFileName */ + lstrcpynW(pfd->cFileName, + PathFindFileNameW(buffer), + _countof(pfd->cFileName)); + } + } + + /* Finally check if we have a raw path the user actually wants to retrieve */ + if ((fFlags & SLGP_RAWPATH) && (m_Header.dwFlags & SLDF_HAS_EXP_SZ)) + { + /* Search for a target environment block */ + LPEXP_SZ_LINK pInfo; + pInfo = (LPEXP_SZ_LINK)SHFindDataBlock(m_pDBList, EXP_SZ_LINK_SIG); + if (pInfo && (pInfo->cbSize == sizeof(*pInfo))) + lstrcpynW(buffer, pInfo->szwTarget, cchMaxPath); + } + + /* For diagnostics purposes only... */ + // NOTE: SLGP_UNCPRIORITY is unsupported + fFlags &= ~(SLGP_RAWPATH | SLGP_SHORTPATH); + if (fFlags) FIXME("(%p): Unsupported flags %lu\n", this, fFlags); + + /* Copy the data back to the user */ + if (*buffer) + lstrcpynW(pszFile, buffer, cchMaxPath); + + return (*buffer ? S_OK : S_FALSE); } HRESULT STDMETHODCALLTYPE CShellLink::GetDescription(LPWSTR pszName, INT cchMaxName) @@ -1350,11 +1650,55 @@ return S_OK; } +HRESULT STDMETHODCALLTYPE CShellLink::GetIconLocation(LPWSTR pszIconPath, INT cchIconPath, INT *piIcon) +{ + TRACE("(%p)->(%p len=%u iicon=%p)\n", this, pszIconPath, cchIconPath, piIcon); + + if (cchIconPath) + *pszIconPath = 0; + + *piIcon = 0; + + /* Update the original icon path location */ + if (m_Header.dwFlags & SLDF_HAS_EXP_ICON_SZ) + { + WCHAR szPath[MAX_PATH]; + + /* Search for an icon environment block */ + LPEXP_SZ_LINK pInfo; + pInfo = (LPEXP_SZ_LINK)SHFindDataBlock(m_pDBList, EXP_SZ_ICON_SIG); + if (pInfo && (pInfo->cbSize == sizeof(*pInfo))) + { + m_Header.dwFlags &= ~SLDF_HAS_ICONLOCATION; + HeapFree(GetProcessHeap(), 0, m_sIcoPath); + m_sIcoPath = NULL; + + SHExpandEnvironmentStringsW(pInfo->szwTarget, szPath, _countof(szPath)); + + m_sIcoPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, + (wcslen(szPath) + 1) * sizeof(WCHAR)); + if (!m_sIcoPath) + return E_OUTOFMEMORY; + + wcscpy(m_sIcoPath, szPath); + m_Header.dwFlags |= SLDF_HAS_ICONLOCATION; + + m_bDirty = TRUE; + } + } + + *piIcon = m_Header.nIconIndex; + + if (m_sIcoPath) + lstrcpynW(pszIconPath, m_sIcoPath, cchIconPath); + + return S_OK; +} + static HRESULT SHELL_PidlGetIconLocationW(IShellFolder* psf, LPCITEMIDLIST pidl, - PWSTR pszIconFile, UINT cchMax, int *piIndex) + UINT uFlags, PWSTR pszIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) { LPCITEMIDLIST pidlLast; - UINT wFlags; HRESULT hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &psf), &pidlLast); if (SUCCEEDED(hr)) @@ -1363,7 +1707,7 @@ hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_NULL_PPV_ARG(IExtractIconW, &pei)); if (SUCCEEDED(hr)) - hr = pei->GetIconLocation(0, pszIconFile, cchMax, piIndex, &wFlags); + hr = pei->GetIconLocation(uFlags, pszIconFile, cchMax, piIndex, pwFlags); psf->Release(); } @@ -1371,75 +1715,236 @@ return hr; } -HRESULT STDMETHODCALLTYPE CShellLink::GetIconLocation(LPWSTR pszIconPath, INT cchIconPath, INT *piIcon) -{ - TRACE("(%p)->(%p len=%u iicon=%p)\n", this, pszIconPath, cchIconPath, piIcon); - - if (cchIconPath) - *pszIconPath = 0; - - *piIcon = iIcoNdx; - - if (m_sIcoPath) - { - lstrcpynW(pszIconPath, m_sIcoPath, cchIconPath); - return S_OK; - } +HRESULT STDMETHODCALLTYPE CShellLink::GetIconLocation(UINT uFlags, PWSTR pszIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) +{ + /* + * It is possible for a shell link to point to another shell link, + * and in particular there is the possibility to point to itself. + * Now, suppose we ask such a link to retrieve its associated icon. + * This function would be called, and due to COM would be called again + * recursively. To solve this issue, we forbid calling GetIconLocation() + * with GIL_FORSHORTCUT set in uFlags, as done by Windows (shown by tests). + */ + if (uFlags & GIL_FORSHORTCUT) + return E_INVALIDARG; + + /* + * Now, we set GIL_FORSHORTCUT so that: i) we allow the icon extractor + * of the target to give us a suited icon, and ii) we protect ourselves + * against recursive call. + */ + uFlags |= GIL_FORSHORTCUT; if (m_pPidl || m_sPath) { - CComPtr<IShellFolder> pdsk; + CComPtr<IShellFolder> pdsk; HRESULT hr = SHGetDesktopFolder(&pdsk); - if (SUCCEEDED(hr)) { /* first look for an icon using the PIDL (if present) */ if (m_pPidl) - hr = SHELL_PidlGetIconLocationW(pdsk, m_pPidl, pszIconPath, cchIconPath, piIcon); + hr = SHELL_PidlGetIconLocationW(pdsk, m_pPidl, uFlags, pszIconFile, cchMax, piIndex, pwFlags); else hr = E_FAIL; +#if 0 // FIXME: Analyse further whether this is needed... /* if we couldn't find an icon yet, look for it using the file system path */ if (FAILED(hr) && m_sPath) { LPITEMIDLIST pidl; + /* LPITEMIDLIST pidl = ILCreateFromPathW(sPath); */ hr = pdsk->ParseDisplayName(0, NULL, m_sPath, NULL, &pidl, NULL); - if (SUCCEEDED(hr)) { - hr = SHELL_PidlGetIconLocationW(pdsk, pidl, pszIconPath, cchIconPath, piIcon); - + hr = SHELL_PidlGetIconLocationW(pdsk, pidl, uFlags, pszIconFile, cchMax, piIndex, pwFlags); SHFree(pidl); } } +#endif } return hr; } - return S_OK; -} + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CShellLink::Extract(PCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) +{ + UNIMPLEMENTED; + return E_FAIL; +} + +#if 0 +/* Extends the functionality of PathUnExpandEnvStringsW */ +BOOL PathFullyUnExpandEnvStringsW( + _In_ LPCWSTR pszPath, + _Out_ LPWSTR pszBuf, + _In_ UINT cchBuf) +{ + BOOL Ret = FALSE; // Set to TRUE as soon as PathUnExpandEnvStrings starts unexpanding. + BOOL res; + LPCWSTR p; + + // *pszBuf = L'\0'; + while (*pszPath && cchBuf > 0) + { + /* Attempt unexpanding the path */ + res = PathUnExpandEnvStringsW(pszPath, pszBuf, cchBuf); + if (!res) + { + /* The unexpansion failed. Try to find a path delimiter. */ + p = wcspbrk(pszPath, L" /\\:*?\"<>|%"); + if (!p) /* None found, we will copy the remaining path */ + p = pszPath + wcslen(pszPath); + else /* Found one, we will copy the delimiter and skip it */ + ++p; + /* If we overflow, we cannot unexpand more, so return FALSE */ + if (p - pszPath >= cchBuf) + return FALSE; // *pszBuf = L'\0'; + + /* Copy the untouched portion of path up to the delimiter, included */ + wcsncpy(pszBuf, pszPath, p - pszPath); + pszBuf[p - pszPath] = L'\0'; // NULL-terminate + + /* Advance the pointers and decrease the remaining buffer size */ + cchBuf -= (p - pszPath); + pszBuf += (p - pszPath); + pszPath += (p - pszPath); + } + else + { + /* + * The unexpansion succeeded. Skip the unexpanded part by trying + * to find where the original path and the unexpanded string + * become different. + * NOTE: An alternative(?) would be to stop also at the last + * path delimiter encountered in the loop (i.e. would be the + * first path delimiter in the strings). + */ + LPWSTR q; + + /* + * The algorithm starts at the end of the strings and loops back + * while the characters are equal, until it finds a discrepancy. + */ + p = pszPath + wcslen(pszPath); + q = pszBuf + wcslen(pszBuf); // This wcslen should be < cchBuf + while ((*p == *q) && (p > pszPath) && (q > pszBuf)) + { + --p; --q; + } + /* Skip discrepancy */ + ++p; ++q; + + /* Advance the pointers and decrease the remaining buffer size */ + cchBuf -= (q - pszBuf); + pszBuf = q; + pszPath = p; + + Ret = TRUE; + } + } + + return Ret; +} +#endif HRESULT STDMETHODCALLTYPE CShellLink::SetIconLocation(LPCWSTR pszIconPath, INT iIcon) { + HRESULT hr = E_FAIL; + WCHAR szUnExpIconPath[MAX_PATH]; + TRACE("(%p)->(path=%s iicon=%u)\n", this, debugstr_w(pszIconPath), iIcon); - HeapFree(GetProcessHeap(), 0, m_sIcoPath); if (pszIconPath) { + /* Try to fully unexpand the icon path */ + + /* + * Check whether the user-given file path contains unexpanded + * environment variables. If so, create a target environment block. + * Note that in this block we will store the user-given path. + * It will contain the unexpanded environment variables, but + * it can also contain already expanded path that the user does + * not want to see them unexpanded (e.g. so that they always + * refer to the same place even if the would-be corresponding + * environment variable could change). + */ + // FIXME: http://stackoverflow.com/questions/2976489/ishelllinkseticonlocation-transl… + // if (PathFullyUnExpandEnvStringsW(pszIconPath, szUnExpIconPath, _countof(szUnExpIconPath))) + SHExpandEnvironmentStringsW(pszIconPath, szUnExpIconPath, _countof(szUnExpIconPath)); + if (wcscmp(pszIconPath, szUnExpIconPath) != 0) + { + /* Unexpansion succeeded, so we need an icon environment block */ + EXP_SZ_LINK buffer; + LPEXP_SZ_LINK pInfo; + + pInfo = (LPEXP_SZ_LINK)SHFindDataBlock(m_pDBList, EXP_SZ_ICON_SIG); + if (pInfo) + { + /* Make sure that the size of the structure is valid */ + if (pInfo->cbSize != sizeof(*pInfo)) + { + ERR("Ooops. This structure is not as expected...\n"); + + /* Invalid structure, remove it altogether */ + m_Header.dwFlags &= ~SLDF_HAS_EXP_ICON_SZ; + RemoveDataBlock(EXP_SZ_ICON_SIG); + + /* Reset the pointer and go use the static buffer */ + pInfo = NULL; + } + } + if (!pInfo) + { + /* Use the static buffer */ + pInfo = &buffer; + buffer.cbSize = sizeof(buffer); + buffer.dwSignature = EXP_SZ_ICON_SIG; + } + + lstrcpynW(pInfo->szwTarget, szUnExpIconPath, _countof(pInfo->szwTarget)); + WideCharToMultiByte(CP_ACP, 0, szUnExpIconPath, -1, + pInfo->szTarget, _countof(pInfo->szTarget), NULL, NULL); + + hr = S_OK; + if (pInfo == &buffer) + hr = AddDataBlock(pInfo); + if (hr == S_OK) + m_Header.dwFlags |= SLDF_HAS_EXP_ICON_SZ; + } + else + { + /* Unexpansion failed, so we need to remove any icon environment block */ + m_Header.dwFlags &= ~SLDF_HAS_EXP_ICON_SZ; + RemoveDataBlock(EXP_SZ_ICON_SIG); + } + } + + /* Store the original icon path location (this one may contain unexpanded environment strings) */ + if (pszIconPath) + { + m_Header.dwFlags &= ~SLDF_HAS_ICONLOCATION; + HeapFree(GetProcessHeap(), 0, m_sIcoPath); + m_sIcoPath = NULL; + m_sIcoPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, - (wcslen(pszIconPath) + 1) * sizeof (WCHAR)); + (wcslen(pszIconPath) + 1) * sizeof(WCHAR)); if (!m_sIcoPath) return E_OUTOFMEMORY; + wcscpy(m_sIcoPath, pszIconPath); - } - else - m_sIcoPath = NULL; - - iIcoNdx = iIcon; + m_Header.dwFlags |= SLDF_HAS_ICONLOCATION; + } + + hr = S_OK; + + m_Header.nIconIndex = iIcon; m_bDirty = TRUE; - return S_OK; + return hr; } HRESULT STDMETHODCALLTYPE CShellLink::SetRelativePath(LPCWSTR pszPathRel, DWORD dwReserved) @@ -1482,9 +1987,81 @@ return ret; } +HRESULT CShellLink::WriteAdvertiseInfo(LPCWSTR string, DWORD dwSig) +{ + EXP_DARWIN_LINK buffer; + LPEXP_DARWIN_LINK pInfo; + + if ( (dwSig != EXP_DARWIN_ID_SIG) +#if (NTDDI_VERSION < NTDDI_LONGHORN) + && (dwSig != EXP_LOGO3_ID_SIG) +#endif + ) + { + return E_INVALIDARG; + } + + if (!string) + return S_FALSE; + + pInfo = (LPEXP_DARWIN_LINK)SHFindDataBlock(m_pDBList, dwSig); + if (pInfo) + { + /* Make sure that the size of the structure is valid */ + if (pInfo->dbh.cbSize != sizeof(*pInfo)) + { + ERR("Ooops. This structure is not as expected...\n"); + + /* Invalid structure, remove it altogether */ + if (dwSig == EXP_DARWIN_ID_SIG) + m_Header.dwFlags &= ~SLDF_HAS_DARWINID; +#if (NTDDI_VERSION < NTDDI_LONGHORN) + else if (dwSig == EXP_LOGO3_ID_SIG) + m_Header.dwFlags &= ~SLDF_HAS_LOGO3ID; +#endif + RemoveDataBlock(dwSig); + + /* Reset the pointer and go use the static buffer */ + pInfo = NULL; + } + } + if (!pInfo) + { + /* Use the static buffer */ + pInfo = &buffer; + buffer.dbh.cbSize = sizeof(buffer); + buffer.dbh.dwSignature = dwSig; + } + + lstrcpynW(pInfo->szwDarwinID, string, _countof(pInfo->szwDarwinID)); + WideCharToMultiByte(CP_ACP, 0, string, -1, + pInfo->szDarwinID, _countof(pInfo->szDarwinID), NULL, NULL); + + HRESULT hr = S_OK; + if (pInfo == &buffer) + hr = AddDataBlock(pInfo); + if (hr == S_OK) + { + if (dwSig == EXP_DARWIN_ID_SIG) + m_Header.dwFlags |= SLDF_HAS_DARWINID; +#if (NTDDI_VERSION < NTDDI_LONGHORN) + else if (dwSig == EXP_LOGO3_ID_SIG) + m_Header.dwFlags |= SLDF_HAS_LOGO3ID; +#endif + } + + return hr; +} + HRESULT CShellLink::SetAdvertiseInfo(LPCWSTR str) { - LPCWSTR szComponent = NULL, szProduct = NULL; + HRESULT hr; + LPCWSTR szComponent = NULL, szProduct = NULL, p; + INT len; + GUID guid; + WCHAR szGuid[38+1]; + + /**/sProduct = sComponent = NULL;/**/ while (str[0]) { @@ -1498,29 +2075,27 @@ str += 2; /* there must be a colon straight after a guid */ - LPCWSTR p = wcschr(str, L':'); + p = wcschr(str, L':'); if (!p) return E_FAIL; - INT len = p - str; + len = p - str; if (len != 38) return E_FAIL; /* get the guid, and check if it's validly formatted */ - WCHAR szGuid[39]; memcpy(szGuid, str, sizeof(WCHAR)*len); szGuid[len] = 0; - GUID guid; - HRESULT hr = CLSIDFromString(szGuid, &guid); + hr = CLSIDFromString(szGuid, &guid); if (hr != S_OK) return hr; str = p + 1; /* match it up to a guid that we care about */ if (IsEqualGUID(guid, SHELL32_AdvtShortcutComponent) && !szComponent) - szComponent = str; + szComponent = str; /* Darwin */ else if (IsEqualGUID(guid, SHELL32_AdvtShortcutProduct) && !szProduct) - szProduct = str; + szProduct = str; /* Logo3 */ else return E_FAIL; @@ -1534,13 +2109,206 @@ if (!szComponent) return E_FAIL; - sComponent = GetAdvertisedArg(szComponent); - sProduct = GetAdvertisedArg(szProduct); - - TRACE("Component = %s\n", debugstr_w(sComponent)); - TRACE("Product = %s\n", debugstr_w(sProduct)); - - return S_OK; + szComponent = GetAdvertisedArg(szComponent); + szProduct = GetAdvertisedArg(szProduct); + + hr = WriteAdvertiseInfo(szComponent, EXP_DARWIN_ID_SIG); + // if (FAILED(hr)) + // return hr; +#if (NTDDI_VERSION < NTDDI_LONGHORN) + hr = WriteAdvertiseInfo(szProduct, EXP_LOGO3_ID_SIG); + // if (FAILED(hr)) + // return hr; +#endif + + HeapFree(GetProcessHeap(), 0, (PVOID)szComponent); + HeapFree(GetProcessHeap(), 0, (PVOID)szProduct); + + if (TRACE_ON(shell)) + { + GetAdvertiseInfo(&sComponent, EXP_DARWIN_ID_SIG); + TRACE("Component = %s\n", debugstr_w(sComponent)); +#if (NTDDI_VERSION < NTDDI_LONGHORN) + GetAdvertiseInfo(&sProduct, EXP_LOGO3_ID_SIG); + TRACE("Product = %s\n", debugstr_w(sProduct)); +#endif + } + + return S_OK; +} + +/* + * Since the real PathResolve (from Wine) is unimplemented at the moment, + * we use this local implementation, until a better one is written (using + * code parts of the SHELL_xxx helpers in Wine's shellpath.c). + */ +static BOOL HACKISH_PathResolve( + IN OUT PWSTR pszPath, + IN PZPCWSTR dirs OPTIONAL, + IN UINT fFlags) +{ + // FIXME: This is unimplemented!!! + FIXME("PathResolve() is UNIMPLEMENTED, using HACKISH_PathResolve() instead!\n"); +#if 0 + return PathResolve(pszPath, dirs, fFlags); +#else + BOOL Success = FALSE; + USHORT i; + LPWSTR fname = NULL; + WCHAR szPath[MAX_PATH]; + + /* First, search for a valid existing path */ + + // NOTE: See also: SHELL_FindExecutable() + + /* + * List of extensions searched for, by PathResolve with the flag + * PRF_TRYPROGRAMEXTENSIONS == PRF_EXECUTABLE | PRF_VERIFYEXISTS set, + * according to MSDN: https://msdn.microsoft.com/en-us/library/windows/desktop/bb776478(v=vs.85).… + */ + static PCWSTR Extensions[] = {L".pif", L".com", L".bat", L".cmd", L".lnk", L".exe", NULL}; + #define LNK_EXT_INDEX 4 // ".lnk" has index 4 in the array above + + /* + * Start at the beginning of the list if PRF_EXECUTABLE is set, otherwise + * just use the last element 'NULL' (no extension checking). + */ + i = ((fFlags & PRF_EXECUTABLE) ? 0 : _countof(Extensions) - 1); + for (; i < _countof(Extensions); ++i) + { + /* Ignore shell links ".lnk" if needed */ + if ((fFlags & PRF_DONTFINDLNK) && (i == LNK_EXT_INDEX)) + continue; + + Success = (SearchPathW(NULL, pszPath, Extensions[i], + _countof(szPath), szPath, NULL) != 0); + if (!Success) + { + ERR("SearchPathW(pszPath = '%S') failed\n", pszPath); + } + else + { + ERR("SearchPathW(pszPath = '%S', szPath = '%S') succeeded\n", pszPath, szPath); + break; + } + } + + if (!Success) + { + ERR("SearchPathW(pszPath = '%S') failed\n", pszPath); + + /* We failed, try with PathFindOnPath, as explained by MSDN */ + // Success = PathFindOnPathW(pszPath, dirs); + StringCchCopyW(szPath, _countof(szPath), pszPath); + Success = PathFindOnPathW(szPath, dirs); + if (!Success) + { + ERR("PathFindOnPathW(pszPath = '%S') failed\n", pszPath); + + /* We failed again, fall back to building a possible non-existing path */ + if (!GetFullPathNameW(pszPath, _countof(szPath), szPath, &fname)) + { + ERR("GetFullPathNameW(pszPath = '%S') failed\n", pszPath); + return FALSE; + } + + Success = PathFileExistsW(szPath); + if (!Success) + ERR("PathFileExistsW(szPath = '%S') failed\n", szPath); + + /******************************************************/ + /* Question: Why this line is needed only for files?? */ + if (fname && (_wcsicmp(pszPath, fname) == 0)) + *szPath = L'\0'; + /******************************************************/ + } + else + { + ERR("PathFindOnPathW(pszPath = '%S' ==> '%S') succeeded\n", pszPath, szPath); + } + } + + /* Copy back the results to the caller */ + StringCchCopyW(pszPath, MAX_PATH, szPath); + + /* + * Since the called functions always checked whether the file path existed, + * we do not need to redo a final check: we can use instead the cached + * result in 'Success'. + */ + return ((fFlags & PRF_VERIFYEXISTS) ? Success : TRUE); +#endif +} + +HRESULT CShellLink::SetTargetFromPIDLOrPath(LPCITEMIDLIST pidl, LPCWSTR pszFile) +{ + HRESULT hr = S_OK; + LPITEMIDLIST pidlNew = NULL; + WCHAR szPath[MAX_PATH]; + + /* + * Not both 'pidl' and 'pszFile' should be set. + * But either one or both can be NULL. + */ + if (pidl && pszFile) + return E_FAIL; + + if (pidl) + { + /* Clone the PIDL */ + pidlNew = ILClone(pidl); + if (!pidlNew) + return E_FAIL; + } + else if (pszFile) + { + /* Build a PIDL for this path target */ + hr = SHILCreateFromPathW(pszFile, &pidlNew, NULL); + if (FAILED(hr)) + { + /* This failed, try to resolve the path, then create a simple PIDL */ + + StringCchCopyW(szPath, _countof(szPath), pszFile); + // FIXME: Because PathResolve is unimplemented, we use our hackish implementation! + HACKISH_PathResolve(szPath, NULL, PRF_TRYPROGRAMEXTENSIONS); + + pidlNew = SHSimpleIDListFromPathW(szPath); + /******************************************************/ + /* Question: Why this line is needed only for files?? */ + hr = (*szPath ? S_OK : E_INVALIDARG); // S_FALSE + /******************************************************/ + } + } + // else if (!pidl && !pszFile) { pidlNew = NULL; hr = S_OK; } + + ILFree(m_pPidl); + m_pPidl = pidlNew; + + if (!pszFile) + { + if (SHGetPathFromIDListW(pidlNew, szPath)) + pszFile = szPath; + } + + // TODO: Fully update link info, tracker, file attribs... + + // if (pszFile) + if (!pszFile) + { + *szPath = L'\0'; + pszFile = szPath; + } + + /* Update the cached path (for link info) */ + ShellLink_GetVolumeInfo(pszFile, &volume); + m_sPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, + (wcslen(pszFile) + 1) * sizeof(WCHAR)); + if (!m_sPath) + return E_OUTOFMEMORY; + wcscpy(m_sPath, pszFile); + + m_bDirty = TRUE; + return hr; } HRESULT STDMETHODCALLTYPE CShellLink::SetPath(LPCWSTR pszFile) @@ -1552,6 +2320,13 @@ if (!pszFile) return E_INVALIDARG; + + /* + * Allow upgrading Logo3 shortcuts (m_Header.dwFlags & SLDF_HAS_LOGO3ID), + * but forbid upgrading Darwin ones. + */ + if (m_Header.dwFlags & SLDF_HAS_DARWINID) + return S_FALSE; /* quotes at the ends of the string are stripped */ SIZE_T len = wcslen(pszFile); @@ -1565,120 +2340,167 @@ /* any other quote marks are invalid */ if (wcschr(pszFile, L'"')) { - HeapFree(GetProcessHeap(), 0, unquoted); - return S_FALSE; - } - + hr = S_FALSE; + goto end; + } + + /* Clear the cached path */ HeapFree(GetProcessHeap(), 0, m_sPath); m_sPath = NULL; - HeapFree(GetProcessHeap(), 0, sComponent); - sComponent = NULL; - - if (m_pPidl) - ILFree(m_pPidl); - m_pPidl = NULL; - - if (S_OK != SetAdvertiseInfo(pszFile)) - { - WCHAR buffer[MAX_PATH]; - LPWSTR fname; - - if (*pszFile == '\0') - *buffer = '\0'; - else if (!GetFullPathNameW(pszFile, MAX_PATH, buffer, &fname)) - return E_FAIL; - else if(!PathFileExistsW(buffer) && - !SearchPathW(NULL, pszFile, NULL, MAX_PATH, buffer, NULL)) - hr = S_FALSE; - - m_pPidl = SHSimpleIDListFromPathW(pszFile); - ShellLink_GetVolumeInfo(buffer, &volume); - - m_sPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, - (wcslen(buffer) + 1) * sizeof (WCHAR)); - if (!m_sPath) - return E_OUTOFMEMORY; - - wcscpy(m_sPath, buffer); + /* Check for an advertised target (Logo3 or Darwin) */ + if (SetAdvertiseInfo(pszFile) != S_OK) + { + /* This is not an advertised target, but a regular path */ + WCHAR szPath[MAX_PATH]; + + /* + * Check whether the user-given file path contains unexpanded + * environment variables. If so, create a target environment block. + * Note that in this block we will store the user-given path. + * It will contain the unexpanded environment variables, but + * it can also contain already expanded path that the user does + * not want to see them unexpanded (e.g. so that they always + * refer to the same place even if the would-be corresponding + * environment variable could change). + */ + if (*pszFile) + SHExpandEnvironmentStringsW(pszFile, szPath, _countof(szPath)); + else + *szPath = L'\0'; + + if (*pszFile && (wcscmp(pszFile, szPath) != 0)) + { + /* + * The user-given file path contains unexpanded environment + * variables, so we need a target environment block. + */ + EXP_SZ_LINK buffer; + LPEXP_SZ_LINK pInfo; + + pInfo = (LPEXP_SZ_LINK)SHFindDataBlock(m_pDBList, EXP_SZ_LINK_SIG); + if (pInfo) + { + /* Make sure that the size of the structure is valid */ + if (pInfo->cbSize != sizeof(*pInfo)) + { + ERR("Ooops. This structure is not as expected...\n"); + + /* Invalid structure, remove it altogether */ + m_Header.dwFlags &= ~SLDF_HAS_EXP_SZ; + RemoveDataBlock(EXP_SZ_LINK_SIG); + + /* Reset the pointer and go use the static buffer */ + pInfo = NULL; + } + } + if (!pInfo) + { + /* Use the static buffer */ + pInfo = &buffer; + buffer.cbSize = sizeof(buffer); + buffer.dwSignature = EXP_SZ_LINK_SIG; + } + + lstrcpynW(pInfo->szwTarget, pszFile, _countof(pInfo->szwTarget)); + WideCharToMultiByte(CP_ACP, 0, pszFile, -1, + pInfo->szTarget, _countof(pInfo->szTarget), NULL, NULL); + + hr = S_OK; + if (pInfo == &buffer) + hr = AddDataBlock(pInfo); + if (hr == S_OK) + m_Header.dwFlags |= SLDF_HAS_EXP_SZ; + + /* Now, make pszFile point to the expanded buffer */ + pszFile = szPath; + } + else + { + /* + * The user-given file path does not contain unexpanded environment + * variables, so we need to remove any target environment block. + */ + m_Header.dwFlags &= ~SLDF_HAS_EXP_SZ; + RemoveDataBlock(EXP_SZ_LINK_SIG); + + /* pszFile points to the user path */ + } + + /* Set the target */ + hr = SetTargetFromPIDLOrPath(NULL, pszFile); } m_bDirty = TRUE; + +end: HeapFree(GetProcessHeap(), 0, unquoted); - return hr; } HRESULT STDMETHODCALLTYPE CShellLink::AddDataBlock(void* pDataBlock) { + if (SHAddDataBlock(&m_pDBList, (DATABLOCK_HEADER*)pDataBlock)) + { + m_bDirty = TRUE; + return S_OK; + } + return S_FALSE; +} + +HRESULT STDMETHODCALLTYPE CShellLink::CopyDataBlock(DWORD dwSig, void** ppDataBlock) +{ + DATABLOCK_HEADER* pBlock; + PVOID pDataBlock; + + TRACE("%p %08x %p\n", this, dwSig, ppDataBlock); + + *ppDataBlock = NULL; + + pBlock = SHFindDataBlock(m_pDBList, dwSig); + if (!pBlock) + { + ERR("unknown datablock %08x (not found)\n", dwSig); + return E_FAIL; + } + + pDataBlock = LocalAlloc(LMEM_ZEROINIT, pBlock->cbSize); + if (!pDataBlock) + return E_OUTOFMEMORY; + + CopyMemory(pDataBlock, pBlock, pBlock->cbSize); + + *ppDataBlock = pDataBlock; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CShellLink::RemoveDataBlock(DWORD dwSig) +{ + if (SHRemoveDataBlock(&m_pDBList, dwSig)) + { + m_bDirty = TRUE; + return S_OK; + } + return S_FALSE; +} + +HRESULT STDMETHODCALLTYPE CShellLink::GetFlags(DWORD *pdwFlags) +{ + TRACE("%p %p\n", this, pdwFlags); + *pdwFlags = m_Header.dwFlags; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CShellLink::SetFlags(DWORD dwFlags) +{ +#if 0 // FIXME! + m_Header.dwFlags = dwFlags; + m_bDirty = TRUE; + return S_OK; +#else FIXME("\n"); return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellLink::CopyDataBlock(DWORD dwSig, void** ppDataBlock) -{ - LPVOID block = NULL; - HRESULT hr = E_FAIL; - - TRACE("%p %08x %p\n", this, dwSig, ppDataBlock); - - switch (dwSig) - { - case EXP_DARWIN_ID_SIG: - if (!sComponent) - break; - block = shelllink_build_darwinid(sComponent, dwSig); - hr = S_OK; - break; - case EXP_SZ_LINK_SIG: - case NT_CONSOLE_PROPS_SIG: - case NT_FE_CONSOLE_PROPS_SIG: - case EXP_SPECIAL_FOLDER_SIG: - case EXP_SZ_ICON_SIG: - FIXME("valid but unhandled datablock %08x\n", dwSig); - break; - default: - ERR("unknown datablock %08x\n", dwSig); - } - *ppDataBlock = block; - return hr; -} - -HRESULT STDMETHODCALLTYPE CShellLink::RemoveDataBlock(DWORD dwSig) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellLink::GetFlags(DWORD *pdwFlags) -{ - DWORD flags = 0; - - FIXME("%p %p\n", this, pdwFlags); - - /* FIXME: add more */ - if (m_sArgs) - flags |= SLDF_HAS_ARGS; - if (sComponent) - flags |= SLDF_HAS_DARWINID; - if (m_sIcoPath) - flags |= SLDF_HAS_ICONLOCATION; -#if (NTDDI_VERSION < NTDDI_LONGHORN) - if (sProduct) - flags |= SLDF_HAS_LOGO3ID; #endif - if (m_pPidl) - flags |= SLDF_HAS_ID_LIST; - - *pdwFlags = flags; - - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CShellLink::SetFlags(DWORD dwFlags) -{ - FIXME("\n"); - return E_NOTIMPL; } /************************************************************************** @@ -1753,32 +2575,8 @@ return MAKE_HRESULT(SEVERITY_SUCCESS, 0, id); } -static LPWSTR -shelllink_get_msi_component_path(LPWSTR component) -{ - DWORD Result, sz = 0; - - Result = CommandLineFromMsiDescriptor(component, NULL, &sz); - if (Result != ERROR_SUCCESS) - return NULL; - - sz++; - LPWSTR path = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR)); - Result = CommandLineFromMsiDescriptor(component, path, &sz); - if (Result != ERROR_SUCCESS) - { - HeapFree(GetProcessHeap(), 0, path); - path = NULL; - } - - TRACE("returning %s\n", debugstr_w(path)); - - return path; -} - HRESULT STDMETHODCALLTYPE CShellLink::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { - HWND hwnd = NULL; /* FIXME: get using interface set from IObjectWithSite */ LPWSTR args = NULL; LPWSTR path = NULL; @@ -1787,20 +2585,18 @@ if (lpici->cbSize < sizeof(CMINVOKECOMMANDINFO)) return E_INVALIDARG; - HRESULT hr = Resolve(hwnd, 0); + // NOTE: We could use lpici->hwnd (certainly in case lpici->fMask doesn't contain CMIC_MASK_FLAG_NO_UI) + // as the parent window handle... ? + /* FIXME: get using interface set from IObjectWithSite?? */ + // NOTE: We might need an extended version of Resolve that provides us with paths... + HRESULT hr = Resolve(lpici->hwnd, 0); if (FAILED(hr)) { TRACE("failed to resolve component with error 0x%08x", hr); return hr; } - if (sComponent) - { - path = shelllink_get_msi_component_path(sComponent); - if (!path) - return E_FAIL; - } - else - path = strdupW(m_sPath); + + path = strdupW(m_sPath); if ( lpici->cbSize == sizeof(CMINVOKECOMMANDINFOEX) && (lpici->fMask & CMIC_MASK_UNICODE) ) @@ -1835,7 +2631,7 @@ (lpici->fMask & (SEE_MASK_NOASYNC | SEE_MASK_ASYNCOK | SEE_MASK_FLAG_NO_UI)); sei.lpFile = path; sei.lpClass = m_sLinkPath; - sei.nShow = iShowCmd; + sei.nShow = m_Header.nShowCommand; sei.lpDirectory = m_sWorkDir; sei.lpParameters = args; sei.lpVerb = L"open"; @@ -1970,6 +2766,7 @@ pThis->m_sIcoPath, pThis->m_sPath, pThis->m_sPathRel, pThis->sProduct, pThis->m_sWorkDir); /* Get file information */ + // FIXME! FIXME! Shouldn't we use pThis->m_sIcoPath, pThis->m_Header.nIconIndex instead??? SHFILEINFOW fi; if (!SHGetFileInfoW(pThis->m_sLinkPath, 0, &fi, sizeof(fi), SHGFI_TYPENAME|SHGFI_ICON)) { @@ -1981,7 +2778,7 @@ if (fi.hIcon) // TODO: destroy icon SendDlgItemMessageW(hwndDlg, 14000, STM_SETICON, (WPARAM)fi.hIcon, 0); else - ERR("ExtractIconW failed %ls %u\n", pThis->m_sIcoPath, pThis->iIcoNdx); + ERR("ExtractIconW failed %ls %u\n", pThis->m_sIcoPath, pThis->m_Header.nIconIndex); /* target type */ if (pThis->m_sPath) @@ -1997,9 +2794,9 @@ WCHAR newpath[2*MAX_PATH] = L"\0"; if (wcschr(pThis->m_sPath, ' ')) StringCchPrintfExW(newpath, _countof(newpath), NULL, NULL, 0, L"\"%ls\"", pThis->m_sPath); - else + else StringCchCopyExW(newpath, _countof(newpath), pThis->m_sPath, NULL, NULL, 0); - + if (pThis->m_sArgs && pThis->m_sArgs[0]) { StringCchCatW(newpath, _countof(newpath), L" "); @@ -2031,7 +2828,7 @@ LPWSTR lpszArgs = NULL; LPWSTR unquoted = strdupW(wszBuf); StrTrimW(unquoted, L" "); - if (!PathFileExistsW(unquoted)) + if (!PathFileExistsW(unquoted)) { lpszArgs = PathGetArgsW(unquoted); PathRemoveArgsW(unquoted); @@ -2057,11 +2854,11 @@ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); return TRUE; } - + pThis->SetPath(unquoted); if (lpszArgs) pThis->SetArguments(lpszArgs); - else + else pThis->SetArguments(L"\0"); HeapFree(GetProcessHeap(), 0, unquoted); @@ -2089,7 +2886,7 @@ if (pThis->m_sIcoPath) wcscpy(wszPath, pThis->m_sIcoPath); - INT IconIndex = pThis->iIcoNdx; + INT IconIndex = pThis->m_Header.nIconIndex; if (PickIconDlg(hwndDlg, wszPath, _countof(wszPath), &IconIndex)) { pThis->SetIconLocation(wszPath, IconIndex); @@ -2182,7 +2979,7 @@ if (SUCCEEDED(hr)) hr = m_DropTarget->DragEnter(pDataObject, dwKeyState, pt, pdwEffect); - else + else *pdwEffect = DROPEFFECT_NONE; } else Modified: trunk/reactos/dll/win32/shell32/CShellLink.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CShellLi… ============================================================================== --- trunk/reactos/dll/win32/shell32/CShellLink.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CShellLink.h [iso-8859-1] Tue Jan 17 23:53:55 2017 @@ -4,6 +4,7 @@ * Copyright 1998 Juergen Schmied * Copyright 2005 Mike McCormack * Copyright 2009 Andrew Hill + * Copyright 2017 Hermes Belusca-Maito * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,13 +30,21 @@ public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellLinkA, public IShellLinkW, + public IPersistStream, public IPersistFile, - public IPersistStream, + public IShellExtInit, + public IContextMenu, // Technically it should be IContextMenu3 (inherits from IContextMenu2 and IContextMenu) + public IDropTarget, +// public IQueryInfo, public IShellLinkDataList, - public IShellExtInit, - public IContextMenu, - public IDropTarget, + public IExtractIconA, + public IExtractIconW, +// public IExtractImage2, // Inherits from IExtractImage +// public IPersistPropertyBag, +// public IServiceProvider, +// public IFilter, public IObjectWithSite, +// public ICustomizeInfoTip, public IShellPropSheetExt { public: @@ -53,14 +62,8 @@ #include "poppack.h" private: - /* data structures according to the information in the link */ - WORD wHotKey; - SYSTEMTIME time1; - SYSTEMTIME time2; - SYSTEMTIME time3; - - DWORD iShowCmd; - INT iIcoNdx; + /* Cached link header */ + SHELL_LINK_HEADER m_Header; /* Cached data set according to m_Header.dwFlags (SHELL_LINK_DATA_FLAGS) */ @@ -77,7 +80,9 @@ LPWSTR m_sIcoPath; BOOL m_bRunAs; BOOL m_bDirty; - + LPDBLIST m_pDBList; /* Optional data block list (in the extra data section) */ + + /* Pointers to strings inside Logo3/Darwin info blocks, cached for debug info purposes only */ LPWSTR sProduct; LPWSTR sComponent; @@ -86,11 +91,17 @@ CComPtr<IUnknown> m_site; CComPtr<IDropTarget> m_DropTarget; + + VOID Reset(); + + HRESULT GetAdvertiseInfo(LPWSTR *str, DWORD dwSig); + HRESULT SetAdvertiseInfo(LPCWSTR str); + HRESULT WriteAdvertiseInfo(LPCWSTR string, DWORD dwSig); + HRESULT SetTargetFromPIDLOrPath(LPCITEMIDLIST pidl, LPCWSTR pszFile); public: CShellLink(); ~CShellLink(); - HRESULT SetAdvertiseInfo(LPCWSTR str); static INT_PTR CALLBACK SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); // IPersistFile @@ -155,6 +166,14 @@ virtual HRESULT STDMETHODCALLTYPE GetFlags(DWORD *pdwFlags); virtual HRESULT STDMETHODCALLTYPE SetFlags(DWORD dwFlags); + // IExtractIconA + virtual HRESULT STDMETHODCALLTYPE Extract(PCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); + virtual HRESULT STDMETHODCALLTYPE GetIconLocation(UINT uFlags, PSTR pszIconFile, UINT cchMax, int *piIndex, UINT *pwFlags); + + // IExtractIconW + virtual HRESULT STDMETHODCALLTYPE Extract(PCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); + virtual HRESULT STDMETHODCALLTYPE GetIconLocation(UINT uFlags, PWSTR pszIconFile, UINT cchMax, int *piIndex, UINT *pwFlags); + // IShellExtInit virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); @@ -183,17 +202,25 @@ DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(CShellLink) + COM_INTERFACE_ENTRY_IID(IID_IShellLinkA, IShellLinkA) + COM_INTERFACE_ENTRY_IID(IID_IShellLinkW, IShellLinkW) COM_INTERFACE_ENTRY2_IID(IID_IPersist, IPersist, IPersistFile) COM_INTERFACE_ENTRY_IID(IID_IPersistFile, IPersistFile) COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) - COM_INTERFACE_ENTRY_IID(IID_IShellLinkA, IShellLinkA) - COM_INTERFACE_ENTRY_IID(IID_IShellLinkW, IShellLinkW) + COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) // Technically it should be IContextMenu3 + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) +// COM_INTERFACE_ENTRY_IID(IID_IQueryInfo, IQueryInfo) COM_INTERFACE_ENTRY_IID(IID_IShellLinkDataList, IShellLinkDataList) - COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) + COM_INTERFACE_ENTRY_IID(IID_IExtractIconA, IExtractIconA) + COM_INTERFACE_ENTRY_IID(IID_IExtractIconW, IExtractIconW) +// COM_INTERFACE_ENTRY_IID(IID_IExtractImage2, IExtractImage2) +// COM_INTERFACE_ENTRY_IID(IID_IPersistPropertyBag, IPersistPropertyBag) +// COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) +// COM_INTERFACE_ENTRY_IID(IID_IFilter, IFilter) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) +// COM_INTERFACE_ENTRY_IID(IID_ICustomizeInfoTip, ICustomizeInfoTip) COM_INTERFACE_ENTRY_IID(IID_IShellPropSheetExt, IShellPropSheetExt) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] Tue Jan 17 23:53:55 2017 @@ -19,6 +19,8 @@ #include "precomp.h" +WINE_DEFAULT_DEBUG_CHANNEL(shell); + WCHAR swShell32Name[MAX_PATH]; DWORD NumIconOverlayHandlers = 0; @@ -267,11 +269,21 @@ { /* extract icon from shell shortcut */ CComPtr<IShellLinkW> psl; + CComPtr<IExtractIconW> pei; HRESULT hr = psf->GetUIObjectOf(NULL, 1, &pidl, IID_NULL_PPV_ARG(IShellLinkW, &psl)); if (SUCCEEDED(hr)) { hr = psl->GetIconLocation(wTemp, _countof(wTemp), &icon_idx); + if (FAILED(hr) || !*wTemp) + { + /* The icon was not found directly, try to retrieve it from the shell link target */ + hr = psl->QueryInterface(IID_PPV_ARG(IExtractIconW, &pei)); + if (FAILED(hr) || !pei) + TRACE("No IExtractIconW interface!\n"); + else + hr = pei->GetIconLocation(GIL_FORSHELL, wTemp, _countof(wTemp), &icon_idx, &flags); + } if (SUCCEEDED(hr) && *wTemp) found = TRUE;

7 years, 11 months

[gadamopoulos] 73575: [KERNEL32_APITEST] -Make FindActCtxSectionStringW test less strict.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jan 17 23:11:11 2017 New Revision: 73575 URL: http://svn.reactos.org/svn/reactos?rev=73575&view=rev Log: [KERNEL32_APITEST] -Make FindActCtxSectionStringW test less strict. Modified: trunk/rostests/apitests/kernel32/FindActCtxSectionStringW.c Modified: trunk/rostests/apitests/kernel32/FindActCtxSectionStringW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/FindAct… ============================================================================== --- trunk/rostests/apitests/kernel32/FindActCtxSectionStringW.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/FindActCtxSectionStringW.c [iso-8859-1] Tue Jan 17 23:11:11 2017 @@ -92,9 +92,9 @@ SetLastError(0xdeaddead); h = CreateActCtxW(&ActCtx); - ok_(__FILE__, line)(h != INVALID_HANDLE_VALUE, "CreateActCtx failed\n"); + ok_(__FILE__, line)(h != INVALID_HANDLE_VALUE, "CreateActCtx failed for %S\n", FileName); // In win10 last error is unchanged and in win2k3 it is ERROR_BAD_EXE_FORMAT - ok_(__FILE__, line)(GetLastError() == ERROR_BAD_EXE_FORMAT, "Wrong last error. Expected %d, got %lu\n", ERROR_BAD_EXE_FORMAT, GetLastError()); + ok_(__FILE__, line)(GetLastError() == ERROR_BAD_EXE_FORMAT || GetLastError() == 0xdeaddead, "Wrong last error %lu\n", GetLastError()); return h; } @@ -119,7 +119,7 @@ ok_(__FILE__, line)(GetLastError() == 0xdeaddead, "Wrong last error. Expected %lu, got %lu\n", (DWORD)(0xdeaddead), GetLastError()); } -void TestClassRedirection(HANDLE h, LPCWSTR ClassToTest, LPCWSTR ExpectedClassName, LPCWSTR ExpectedModule, ULONG ExpectedClassCount) +void TestClassRedirection(HANDLE h, LPCWSTR ClassToTest, LPCWSTR ExpectedClassPart, LPCWSTR ExpectedModule, ULONG ExpectedClassCount) { ACTCTX_SECTION_KEYED_DATA KeyedData = { 0 }; BOOL res; @@ -161,10 +161,10 @@ ok(KeyedData.ulLength == data_lenght, "Got lenght %lu instead of %d\n", KeyedData.ulLength, data_lenght); ok(classData->size == sizeof(*classData), "Got %lu instead of %d\n", classData->size, sizeof(*classData)); ok(classData->res == 0, "Got res %lu\n", classData->res); - ok(classData->name_len == wcslen(ExpectedClassName) * 2, "Got name len %lu, expected %d\n", classData->name_len, wcslen(ExpectedClassName) *2); ok(classData->module_len == wcslen(ExpectedModule) * 2, "Got name len %lu, expected %d\n", classData->module_len, wcslen(ExpectedModule) *2); - ok(wcscmp(VersionedClass, ExpectedClassName) == 0, "Got %S, expected %S\n", VersionedClass, ExpectedClassName); ok(wcscmp(ClassLib, ExpectedModule) == 0, "Got %S, expected %S\n", ClassLib, ExpectedModule); + /* compare only if VersionedClass starts with ExpectedClassPart */ + ok(memcmp(VersionedClass, ExpectedClassPart, sizeof(WCHAR) * wcslen(ExpectedClassPart)) == 0, "Expected %S to start with %S\n", VersionedClass, ExpectedClassPart); } } @@ -309,7 +309,7 @@ if (h != INVALID_HANDLE_VALUE) { _ActivateCtx(h, &cookie, __LINE__); - TestClassRedirection(h, L"Button", L"6.0.3790.1830!Button", L"comctl32.dll", 29); + TestClassRedirection(h, L"Button", L"6.0.", L"comctl32.dll", 29); ok( GetModuleHandleW(L"comctl32.dll") == NULL, "Expected comctl32 not to be loaded\n"); ok( GetModuleHandleW(L"user32.dll") == NULL, "Expected user32 not to be loaded\n"); _DeactivateCtx(cookie, __LINE__);

7 years, 11 months

[gadamopoulos] 73574: [KERNEL32_APITEST] -Try to avoid crashes in DefaultActCtx test.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jan 17 22:40:36 2017 New Revision: 73574 URL: http://svn.reactos.org/svn/reactos?rev=73574&view=rev Log: [KERNEL32_APITEST] -Try to avoid crashes in DefaultActCtx test. Modified: trunk/rostests/apitests/kernel32/DefaultActCtx.c Modified: trunk/rostests/apitests/kernel32/DefaultActCtx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/Default… ============================================================================== --- trunk/rostests/apitests/kernel32/DefaultActCtx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/DefaultActCtx.c [iso-8859-1] Tue Jan 17 22:40:36 2017 @@ -44,11 +44,19 @@ &buffer, sizeof(buffer), NULL); - ok(res == TRUE, "\n"); - ok(info->lpRootManifestPath == NULL, "Expected null lpRootManifestPath, got %S\n", info->lpRootManifestPath); - ok(info->lpRootConfigurationPath == NULL, "Expected null lpRootConfigurationPath, got %S\n", info->lpRootConfigurationPath); - ok(info->lpAppDirPath == NULL, "Expected null lpAppDirPath, got %S\n", info->lpAppDirPath); - ok(info->ulAssemblyCount == 0, "\n"); + ok(res == TRUE, "Expected success\n"); + if(res) + { + ok(info->lpRootManifestPath == NULL, "Expected null lpRootManifestPath, got %S\n", info->lpRootManifestPath); + ok(info->lpRootConfigurationPath == NULL, "Expected null lpRootConfigurationPath, got %S\n", info->lpRootConfigurationPath); + ok(info->lpAppDirPath == NULL, "Expected null lpAppDirPath, got %S\n", info->lpAppDirPath); + ok(info->ulAssemblyCount == 0, "Expected 0 assemblies\n"); + } + else + { + skip("ActivationContextDetailedInformation failed\n"); + } + i = 0; res = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, @@ -58,12 +66,19 @@ &buffer, sizeof(buffer), NULL); - ok(res == TRUE, "\n"); - ok(details->lpAssemblyEncodedAssemblyIdentity == NULL, "Expected null lpAssemblyEncodedAssemblyIdentity, got %S\n", details->lpAssemblyEncodedAssemblyIdentity); - ok(details->lpAssemblyManifestPath == NULL, "Expected null lpAssemblyManifestPath, got %S\n", details->lpAssemblyManifestPath); - ok(details->lpAssemblyPolicyPath == NULL, "Expected null lpAssemblyPolicyPath, got %S\n", details->lpAssemblyPolicyPath); - ok(details->lpAssemblyDirectoryName == NULL, "Expected null lpAssemblyDirectoryName, got %S\n", details->lpAssemblyDirectoryName); - + ok(res == TRUE, "Expected success\n"); + if (res) + { + ok(details->lpAssemblyEncodedAssemblyIdentity == NULL, "Expected null lpAssemblyEncodedAssemblyIdentity, got %S\n", details->lpAssemblyEncodedAssemblyIdentity); + ok(details->lpAssemblyManifestPath == NULL, "Expected null lpAssemblyManifestPath, got %S\n", details->lpAssemblyManifestPath); + ok(details->lpAssemblyPolicyPath == NULL, "Expected null lpAssemblyPolicyPath, got %S\n", details->lpAssemblyPolicyPath); + ok(details->lpAssemblyDirectoryName == NULL, "Expected null lpAssemblyDirectoryName, got %S\n", details->lpAssemblyDirectoryName); + } + else + { + skip("AssemblyDetailedInformationInActivationContext failed\n"); + } + i = 1; res = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, @@ -72,15 +87,22 @@ &buffer, sizeof(buffer), NULL); - ok(res == TRUE, "\n"); /* This is FALSE in win10 */ - ok(details->lpAssemblyEncodedAssemblyIdentity == NULL, "Expected null lpAssemblyEncodedAssemblyIdentity, got %S\n", details->lpAssemblyEncodedAssemblyIdentity); - ok(details->lpAssemblyManifestPath == NULL, "Expected null lpAssemblyManifestPath, got %S\n", details->lpAssemblyManifestPath); - ok(details->lpAssemblyPolicyPath == NULL, "Expected null lpAssemblyPolicyPath, got %S\n", details->lpAssemblyPolicyPath); - ok(details->lpAssemblyDirectoryName == NULL, "Expected null lpAssemblyDirectoryName, got %S\n", details->lpAssemblyDirectoryName); + ok(res == TRUE, "Expected success\n"); /* This is FALSE in win10 */ + if (res) + { + ok(details->lpAssemblyEncodedAssemblyIdentity == NULL, "Expected null lpAssemblyEncodedAssemblyIdentity, got %S\n", details->lpAssemblyEncodedAssemblyIdentity); + ok(details->lpAssemblyManifestPath == NULL, "Expected null lpAssemblyManifestPath, got %S\n", details->lpAssemblyManifestPath); + ok(details->lpAssemblyPolicyPath == NULL, "Expected null lpAssemblyPolicyPath, got %S\n", details->lpAssemblyPolicyPath); + ok(details->lpAssemblyDirectoryName == NULL, "Expected null lpAssemblyDirectoryName, got %S\n", details->lpAssemblyDirectoryName); + } + else + { + skip("AssemblyDetailedInformationInActivationContext failed\n"); + } res = GetCurrentActCtx (&h); - ok(res == TRUE, "\n"); - ok(h == NULL, "\n"); + ok(res == TRUE, "Expected success\n"); + ok(h == NULL, "Expected null current context\n"); KeyedData.cbSize = sizeof(KeyedData); res = FindActCtxSectionStringW(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, @@ -88,7 +110,7 @@ ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION, L"Microsoft.Windows.SysyemCompatible", &KeyedData); - ok(res == FALSE, "\n"); + ok(res == FALSE, "Expected failure\n"); KeyedData.cbSize = sizeof(KeyedData); res = FindActCtxSectionStringW(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, @@ -96,7 +118,7 @@ ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION, L"System Default Context", &KeyedData); - ok(res == FALSE, "\n"); + ok(res == FALSE, "Expected failure\n"); KeyedData.cbSize = sizeof(KeyedData); res = FindActCtxSectionStringW(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, @@ -104,9 +126,15 @@ ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION, L"Microsoft.Windows.Common-Controls", &KeyedData); - ok(res == TRUE, "\n"); - ok(KeyedData.hActCtx == NULL, "Expected null handle for common control context\n"); - ok(KeyedData.ulAssemblyRosterIndex != 0, "%lu\n", KeyedData.ulAssemblyRosterIndex); - //ok(wcsstr(details-> , L"SystemCompative" + ok(res == TRUE, "Expected success\n"); + if (res) + { + ok(KeyedData.hActCtx == NULL, "Expected null handle for common control context\n"); + ok(KeyedData.ulAssemblyRosterIndex != 0, "%lu\n", KeyedData.ulAssemblyRosterIndex); + } + else + { + skip("ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION failed\n"); + } }

7 years, 11 months

← Newer
1
...
5
6
7
8
9
10
11
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2017