https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02b65773a3b1a0d2518cf585f76f3205a6e6680f
commit 02b65773a3b1a0d2518cf585f76f3205a6e6680f Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Thu Jul 27 11:06:49 2023 +0900 Commit: GitHub <[email protected]> CommitDate: Thu Jul 27 11:06:49 2023 +0900 [SHLWAPI][SHLWAPI_APITEST][SDK] Implement SHPropertyBag_ReadBSTR etc. (#5487) - Implement SHPropertyBag_ReadBSTR, SHPropertyBag_ReadStr, SHPropertyBag_ReadPOINTL, SHPropertyBag_ReadPOINTS, and SHPropertyBag_ReadRECTL functions. - Add link to oleaut32 in shlwapi_apitest. CORE-9283 --- dll/win32/shlwapi/ordinal.c | 161 +++++++++++++++++++++ dll/win32/shlwapi/shlwapi.spec | 10 +- modules/rostests/apitests/shlwapi/CMakeLists.txt | 2 +- .../rostests/apitests/shlwapi/SHPropertyBag.cpp | 38 +++++ sdk/include/reactos/shlwapi_undoc.h | 6 +- 5 files changed, 210 insertions(+), 7 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index d8aaf6a7678..1162e8b720f 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -5509,6 +5509,167 @@ HRESULT WINAPI SHPropertyBag_ReadDWORD(IPropertyBag *ppb, LPCWSTR pszPropName, D return hr; } +/************************************************************************** + * SHPropertyBag_ReadBSTR (SHLWAPI.520) + */ +HRESULT WINAPI SHPropertyBag_ReadBSTR(IPropertyBag *ppb, LPCWSTR pszPropName, BSTR *pbstr) +{ + HRESULT hr; + VARIANTARG varg; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), pbstr); + + if (!ppb || !pszPropName || !pbstr) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), pbstr); + return E_INVALIDARG; + } + + hr = SHPropertyBag_ReadType(ppb, pszPropName, &varg, VT_BSTR); + if (FAILED(hr)) + *pbstr = NULL; + else + *pbstr = V_BSTR(&varg); + + return hr; +} + +/************************************************************************** + * SHPropertyBag_ReadStr (SHLWAPI.494) + */ +HRESULT WINAPI SHPropertyBag_ReadStr(IPropertyBag *ppb, LPCWSTR pszPropName, LPWSTR pszDst, int cchMax) +{ + HRESULT hr; + VARIANTARG varg; + + TRACE("%p %s %p %d\n", ppb, debugstr_w(pszPropName), pszDst, cchMax); + + if (!ppb || !pszPropName || !pszDst) + { + ERR("%p %s %p %d\n", ppb, debugstr_w(pszPropName), pszDst, cchMax); + return E_INVALIDARG; + } + + hr = SHPropertyBag_ReadType(ppb, pszPropName, &varg, VT_BSTR); + if (FAILED(hr)) + return E_FAIL; + + StrCpyNW(pszDst, V_BSTR(&varg), cchMax); + VariantClear(&varg); + return hr; +} + +/************************************************************************** + * SHPropertyBag_ReadPOINTL (SHLWAPI.521) + */ +HRESULT WINAPI SHPropertyBag_ReadPOINTL(IPropertyBag *ppb, LPCWSTR pszPropName, POINTL *pptl) +{ + HRESULT hr; + int cch, cch2; + WCHAR *pch, szBuff[MAX_PATH]; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), pptl); + + if (!ppb || !pszPropName || !pptl) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), pptl); + return E_INVALIDARG; + } + + StrCpyNW(szBuff, pszPropName, _countof(szBuff)); + + cch = lstrlenW(szBuff); + cch2 = _countof(szBuff) - cch; + if (cch2 < _countof(L".x")) + { + ERR("%s is too long\n", debugstr_w(pszPropName)); + return E_FAIL; + } + + pch = &szBuff[cch]; + + StrCpyNW(pch, L".x", cch2); + hr = SHPropertyBag_ReadLONG(ppb, szBuff, &pptl->x); + if (FAILED(hr)) + return hr; + + StrCpyNW(pch, L".y", cch2); + return SHPropertyBag_ReadLONG(ppb, szBuff, &pptl->y); +} + +/************************************************************************** + * SHPropertyBag_ReadPOINTS (SHLWAPI.525) + */ +HRESULT WINAPI SHPropertyBag_ReadPOINTS(IPropertyBag *ppb, LPCWSTR pszPropName, POINTS *ppts) +{ + HRESULT hr; + POINTL ptl; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), ppts); + + if (!ppb || !pszPropName || !ppts) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), ppts); + return E_INVALIDARG; + } + + hr = SHPropertyBag_ReadPOINTL(ppb, pszPropName, &ptl); + if (FAILED(hr)) + return hr; + + ppts->x = ptl.x; + ppts->y = ptl.y; + return hr; +} + +/************************************************************************** + * SHPropertyBag_ReadRECTL (SHLWAPI.523) + */ +HRESULT WINAPI SHPropertyBag_ReadRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, RECTL *prcl) +{ + HRESULT hr; + int cch, cch2; + WCHAR *pch, szBuff[MAX_PATH]; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), prcl); + + if (!ppb || !pszPropName || !prcl) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), prcl); + return E_INVALIDARG; + } + + StrCpyNW(szBuff, pszPropName, _countof(szBuff)); + + cch = lstrlenW(szBuff); + cch2 = _countof(szBuff) - cch; + if (cch2 < _countof(L".bottom")) + { + ERR("%s is too long\n", debugstr_w(pszPropName)); + return E_FAIL; + } + + pch = &szBuff[cch]; + + StrCpyNW(pch, L".left", cch2); + hr = SHPropertyBag_ReadLONG(ppb, szBuff, &prcl->left); + if (FAILED(hr)) + return hr; + + StrCpyNW(pch, L".top", cch2); + hr = SHPropertyBag_ReadLONG(ppb, szBuff, &prcl->top); + if (FAILED(hr)) + return hr; + + StrCpyNW(pch, L".right", cch2); + hr = SHPropertyBag_ReadLONG(ppb, szBuff, &prcl->right); + if (FAILED(hr)) + return hr; + + StrCpyNW(pch, L".bottom", cch2); + return SHPropertyBag_ReadLONG(ppb, szBuff, &prcl->bottom); +} + /************************************************************************** * SHPropertyBag_Delete (SHLWAPI.535) */ diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 7251262161e..001d7b9ab17 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -491,7 +491,7 @@ 491 stdcall -noname SHGetShellKey(long long long) 492 stub -noname PrettifyFileDescriptionW 493 stdcall -noname SHPropertyBag_ReadType(ptr wstr ptr long) -494 stub -noname SHPropertyBag_ReadStr +494 stdcall -noname SHPropertyBag_ReadStr(ptr wstr ptr long) 495 stdcall -noname SHPropertyBag_WriteStr(ptr wstr wstr) 496 stdcall -noname SHPropertyBag_ReadLONG(ptr wstr ptr) 497 stdcall -noname SHPropertyBag_WriteLONG(ptr wstr long) @@ -517,12 +517,12 @@ 517 stdcall -noname SKSetValueW(long wstr wstr long ptr long) 518 stdcall -noname SKDeleteValueW(long wstr wstr) 519 stdcall -noname SKAllocValueW(long wstr wstr ptr ptr ptr) -520 stub -noname SHPropertyBag_ReadBSTR -521 stub -noname SHPropertyBag_ReadPOINTL +520 stdcall -noname SHPropertyBag_ReadBSTR(ptr wstr ptr) +521 stdcall -noname SHPropertyBag_ReadPOINTL(ptr wstr ptr) 522 stdcall -noname SHPropertyBag_WritePOINTL(ptr wstr ptr) -523 stub -noname SHPropertyBag_ReadRECTL +523 stdcall -noname SHPropertyBag_ReadRECTL(ptr wstr ptr) 524 stdcall -noname SHPropertyBag_WriteRECTL(ptr wstr ptr) -525 stub -noname SHPropertyBag_ReadPOINTS +525 stdcall -noname SHPropertyBag_ReadPOINTS(ptr wstr ptr) 526 stdcall -noname SHPropertyBag_WritePOINTS(ptr wstr ptr) 527 stdcall -noname SHPropertyBag_ReadSHORT(ptr wstr ptr) 528 stdcall -noname SHPropertyBag_WriteSHORT(ptr wstr long) diff --git a/modules/rostests/apitests/shlwapi/CMakeLists.txt b/modules/rostests/apitests/shlwapi/CMakeLists.txt index 34fb46fb71e..ef141efc92f 100644 --- a/modules/rostests/apitests/shlwapi/CMakeLists.txt +++ b/modules/rostests/apitests/shlwapi/CMakeLists.txt @@ -25,6 +25,6 @@ add_rc_deps(testdata.rc ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_resource_dll/shlwapi add_executable(shlwapi_apitest ${SOURCE}) set_module_type(shlwapi_apitest win32cui) target_link_libraries(shlwapi_apitest ${PSEH_LIB}) -add_importlibs(shlwapi_apitest shlwapi user32 advapi32 msvcrt kernel32) +add_importlibs(shlwapi_apitest shlwapi oleaut32 user32 advapi32 msvcrt kernel32) add_dependencies(shlwapi_apitest shlwapi_resource_dll) add_rostests_file(TARGET shlwapi_apitest) diff --git a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp index 224d66fb43d..bdf3e6f02e1 100644 --- a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -64,6 +64,9 @@ public: { ok_wstr(pszPropName, s_pszPropNames[i]); s_pszPropNames[i] = NULL; + if (lstrcmpiW(pszPropName, L"RECTL2.top") == 0) + return E_FAIL; + goto Skip1; } } @@ -106,6 +109,10 @@ static void SHPropertyBag_ReadTest(void) SHORT sValue = 0xDEAD; LONG lValue = 0xDEADDEAD; DWORD dwValue = 0xFEEDF00D; + BSTR bstr = NULL; + POINTL ptl = { 0xEEEE, 0xDDDD }; + POINTS pts = { 0x2222, 0x3333 }; + RECTL rcl = { 123, 456, 789, 101112 }; ResetTest(VT_BOOL, L"BOOL1"); hr = SHPropertyBag_ReadBOOL(&dummy, s_pszPropNames[0], &bValue); @@ -130,6 +137,37 @@ static void SHPropertyBag_ReadTest(void) ok_long(hr, S_OK); ok_int(s_cRead, 1); ok_int(s_cWrite, 0); + + ResetTest(VT_BSTR, L"Str1"); + hr = SHPropertyBag_ReadBSTR(&dummy, s_pszPropNames[0], &bstr); + ok_long(hr, S_OK); + ok_int(s_cRead, 1); + ok_int(s_cWrite, 0); + SysFreeString(bstr); + + ResetTest(VT_I4, L"POINTL1.x", L"POINTL1.y"); + hr = SHPropertyBag_ReadPOINTL(&dummy, L"POINTL1", &ptl); + ok_long(hr, S_OK); + ok_int(s_cRead, 2); + ok_int(s_cWrite, 0); + + ResetTest(VT_I4, L"POINTS1.x", L"POINTS1.y"); + hr = SHPropertyBag_ReadPOINTS(&dummy, L"POINTS1", &pts); + ok_long(hr, S_OK); + ok_int(s_cRead, 2); + ok_int(s_cWrite, 0); + + ResetTest(VT_I4, L"RECTL1.left", L"RECTL1.top", L"RECTL1.right", L"RECTL1.bottom"); + hr = SHPropertyBag_ReadRECTL(&dummy, L"RECTL1", &rcl); + ok_long(hr, S_OK); + ok_int(s_cRead, 4); + ok_int(s_cWrite, 0); + + ResetTest(VT_I4, L"RECTL2.left", L"RECTL2.top", L"RECTL2.right", L"RECTL2.bottom"); + hr = SHPropertyBag_ReadRECTL(&dummy, L"RECTL2", &rcl); + ok_long(hr, E_FAIL); + ok_int(s_cRead, 2); + ok_int(s_cWrite, 0); } static void SHPropertyBag_WriteTest(void) diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 87f7d62d289..564a105f5e9 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -98,7 +98,11 @@ BOOL WINAPI SHPropertyBag_ReadBOOLOld(IPropertyBag *ppb, LPCWSTR pszPropName, BO HRESULT WINAPI SHPropertyBag_ReadSHORT(IPropertyBag *ppb, LPCWSTR pszPropName, SHORT *psValue); HRESULT WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LPLONG pValue); HRESULT WINAPI SHPropertyBag_ReadDWORD(IPropertyBag *ppb, LPCWSTR pszPropName, DWORD *pdwValue); -HRESULT WINAPI SHPropertyBag_ReadPOINTL(IPropertyBag*,LPCWSTR,POINTL*); +HRESULT WINAPI SHPropertyBag_ReadBSTR(IPropertyBag *ppb, LPCWSTR pszPropName, BSTR *pbstr); +HRESULT WINAPI SHPropertyBag_ReadStr(IPropertyBag *ppb, LPCWSTR pszPropName, LPWSTR pszDst, int cchMax); +HRESULT WINAPI SHPropertyBag_ReadPOINTL(IPropertyBag *ppb, LPCWSTR pszPropName, POINTL *pptl); +HRESULT WINAPI SHPropertyBag_ReadPOINTS(IPropertyBag *ppb, LPCWSTR pszPropName, POINTS *ppts); +HRESULT WINAPI SHPropertyBag_ReadRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, RECTL *prcl); HRESULT WINAPI SHGetPerScreenResName(OUT LPWSTR lpResName, IN INT cchResName,
