https://git.reactos.org/?p=reactos.git;a=commitdiff;h=deb928c4bceb9a2c6139095f367f63b890b1e81c
commit deb928c4bceb9a2c6139095f367f63b890b1e81c Author: Mark Jansen <[email protected]> AuthorDate: Tue Apr 6 00:54:58 2021 +0200 Commit: GitHub <[email protected]> CommitDate: Tue Apr 6 07:54:58 2021 +0900 [FONTEXT_APITEST] Show that fontext returns absolute paths with SHGDN_FORPARSING (#3585) Add GetDisplayNameOf testcase. CORE-9281, CORE-16444 --- modules/rostests/apitests/fontext/CMakeLists.txt | 3 +- .../rostests/apitests/fontext/GetDisplayNameOf.cpp | 93 ++++++++++++++++++++++ modules/rostests/apitests/fontext/testlist.c | 2 + 3 files changed, 97 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/fontext/CMakeLists.txt b/modules/rostests/apitests/fontext/CMakeLists.txt index 0cb5e6a637a..059506fdc3a 100644 --- a/modules/rostests/apitests/fontext/CMakeLists.txt +++ b/modules/rostests/apitests/fontext/CMakeLists.txt @@ -6,11 +6,12 @@ add_definitions( -D_UNICODE) list(APPEND SOURCE + GetDisplayNameOf.cpp shellext.cpp testlist.c) add_executable(fontext_apitest ${SOURCE}) set_module_type(fontext_apitest win32cui) target_link_libraries(fontext_apitest uuid ${PSEH_LIB} cpprt atl_classes) -add_importlibs(fontext_apitest oleaut32 ole32 shell32 user32 msvcrt kernel32 ntdll) +add_importlibs(fontext_apitest oleaut32 shlwapi ole32 shell32 user32 msvcrt kernel32 ntdll) add_rostests_file(TARGET fontext_apitest) diff --git a/modules/rostests/apitests/fontext/GetDisplayNameOf.cpp b/modules/rostests/apitests/fontext/GetDisplayNameOf.cpp new file mode 100644 index 00000000000..a0c164d6683 --- /dev/null +++ b/modules/rostests/apitests/fontext/GetDisplayNameOf.cpp @@ -0,0 +1,93 @@ +/* + * PROJECT: fontext_apitest + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for fontext GetDisplayNameOf behavior + * COPYRIGHT: Copyright 2021 Mark Jansen <[email protected]> + */ + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windef.h> +#include <ntndk.h> +#include <atlbase.h> +#include <atlcom.h> +#include <shellapi.h> +#include <shlobj.h> +#include <shlwapi.h> +#include <shellutils.h> +#include "wine/test.h" + +static HRESULT Initialize(CComPtr<IShellFolder>& spFolder) +{ + WCHAR Path[MAX_PATH] = {0}; + HRESULT hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, Path); + ok_hex(hr, S_OK); + if (FAILED(hr)) + return hr; + + CComPtr<IShellFolder> desktopFolder; + hr = SHGetDesktopFolder(&desktopFolder); + ok_hex(hr, S_OK); + if (FAILED(hr)) + return hr; + + CComHeapPtr<ITEMIDLIST> pidl; + hr = desktopFolder->ParseDisplayName(NULL, NULL, Path, NULL, &pidl, NULL); + ok_hex(hr, S_OK); + if (FAILED(hr)) + return hr; + + hr = desktopFolder->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &spFolder)); + ok_hex(hr, S_OK); + return hr; +} + +static void Test_GetDisplayNameOf(CComPtr<IShellFolder>& spFolder) +{ + CComPtr<IEnumIDList> fontsEnum; + HRESULT hr = spFolder->EnumObjects(NULL, SHCONTF_NONFOLDERS, &fontsEnum); + + ok_hex(hr, S_OK); + if (FAILED(hr)) + return; + + CComHeapPtr<ITEMIDLIST> fontPidl; + ULONG fetched = 0; + hr = fontsEnum->Next(1, &fontPidl, &fetched); + STRRET strret; + hr = spFolder->GetDisplayNameOf(fontPidl, SHGDN_FORPARSING, &strret); + ok_hex(hr, S_OK); + if (FAILED(hr)) + return; + + WCHAR Buf[MAX_PATH]; + hr = StrRetToBufW(&strret, fontPidl, Buf, _countof(Buf)); + ok_hex(hr, S_OK); + if (FAILED(hr)) + return; + + // On 2k3 where this is not a custom IShellFolder, it will return something like: + // 'C:\\WINDOWS\\Fonts\\arial.ttf' + // On Vista+ this results in something like: + // 'C:\\Windows\\Fonts\\System Bold' + BOOL bRelative = PathIsRelativeW(Buf); + trace("Path: %s\n", wine_dbgstr_w(Buf)); + ok(bRelative == FALSE, "Path not relative? (%s)\n", wine_dbgstr_w(Buf)); +} + + +START_TEST(GetDisplayNameOf) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + { + CComPtr<IShellFolder> spFolder; + HRESULT hr = Initialize(spFolder); + if (SUCCEEDED(hr)) + { + Test_GetDisplayNameOf(spFolder); + } + } + + CoUninitialize(); +} diff --git a/modules/rostests/apitests/fontext/testlist.c b/modules/rostests/apitests/fontext/testlist.c index 08fc9631feb..e8f34141731 100644 --- a/modules/rostests/apitests/fontext/testlist.c +++ b/modules/rostests/apitests/fontext/testlist.c @@ -3,10 +3,12 @@ #define STANDALONE #include <wine/test.h> +extern void func_GetDisplayNameOf(void); extern void func_shellext(void); const struct test winetest_testlist[] = { + { "GetDisplayNameOf", func_GetDisplayNameOf }, { "shellext", func_shellext }, { 0, 0 } };
