Ros-diffs July 2023

ros-diffs@reactos.org

26 participants
189 discussions

[reactos] 01/01: [BROWSEUI] Use details view by default (#5452) CORE-18904

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d70e798977260ac74074d… commit d70e798977260ac74074deb124eb87777cd88914 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Fri Jul 28 13:20:00 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jul 28 21:20:00 2023 +0200 [BROWSEUI] Use details view by default (#5452) CORE-18904 * Detail view by default, except in special folders * Added hack/fixme disclaimer --- dll/win32/browseui/shellbrowser.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index fb4c1ccc59b..0c808c29e25 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -804,14 +804,23 @@ HRESULT CShellBrowser::BrowseToPIDL(LPCITEMIDLIST pidl, long flags) CComPtr<IShellFolder> newFolder; FOLDERSETTINGS newFolderSettings; HRESULT hResult; + CLSID clsid; + BOOL HasIconViewType; // called by shell view to browse to new folder // also called by explorer band to navigate to new folder hResult = SHBindToFolder(pidl, &newFolder); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; + // HACK & FIXME: Get view mode from shellbag when fully implemented. + IUnknown_GetClassID(newFolder, &clsid); + HasIconViewType = clsid == CLSID_MyComputer || clsid == CLSID_ControlPanel || + clsid == CLSID_ShellDesktop; - newFolderSettings.ViewMode = FVM_ICON; + if (HasIconViewType) + newFolderSettings.ViewMode = FVM_ICON; + else + newFolderSettings.ViewMode = FVM_DETAILS; newFolderSettings.fFlags = 0; hResult = BrowseToPath(newFolder, pidl, &newFolderSettings, flags); if (FAILED_UNEXPECTEDLY(hResult))

1 year, 4 months

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST][SDK] Implement SHPropertyBag_ReadBSTR etc. (#5487)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02b65773a3b1a0d2518cf… commit 02b65773a3b1a0d2518cf585f76f3205a6e6680f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 27 11:06:49 2023 +0900 Commit: GitHub <noreply(a)github.com> 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,

1 year, 5 months

[reactos] 01/01: [ADVAPI32] Don't treat a structure pointer as a string pointer (#5478)

by David L Bean

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dcaf5686cedc439f7a0e6… commit dcaf5686cedc439f7a0e604ee99858b3b4a6bdc0 Author: David L Bean <d_bean(a)hotmail.com> AuthorDate: Wed Jul 26 18:58:44 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 27 01:58:44 2023 +0300 [ADVAPI32] Don't treat a structure pointer as a string pointer (#5478) Add a string pointer local variable, assign it and operate on it. This should eliminate an exception and make LsapIsLocalComputer() function operate correctly. CORE-18996 --- dll/win32/advapi32/sec/lsa.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dll/win32/advapi32/sec/lsa.c b/dll/win32/advapi32/sec/lsa.c index f88cc664e66..4b137aaecb9 100644 --- a/dll/win32/advapi32/sec/lsa.c +++ b/dll/win32/advapi32/sec/lsa.c @@ -23,15 +23,17 @@ LsapIsLocalComputer(PLSA_UNICODE_STRING ServerName) DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1; BOOL Result; LPWSTR buf; + PCWSTR pSrvName; if (ServerName == NULL || ServerName->Length == 0 || ServerName->Buffer == NULL) return TRUE; + pSrvName = ServerName->Buffer; buf = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); Result = GetComputerNameW(buf, &dwSize); - if (Result && (ServerName->Buffer[0] == '\\') && (ServerName->Buffer[1] == '\\')) - ServerName += 2; - Result = Result && !lstrcmpW(ServerName->Buffer, buf); + if (Result && (pSrvName[0] == L'\\') && (pSrvName[1] == L'\\')) + pSrvName += 2; + Result = Result && !lstrcmpW(pSrvName, buf); HeapFree(GetProcessHeap(), 0, buf); return Result;

1 year, 5 months

[reactos] 01/01: [EXPLORER] Restore minimized windows with the correct position (#5488)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4511e62b10861b556b81e… commit 4511e62b10861b556b81e4f8b0bb922cb97d25a7 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Wed Jul 26 15:26:42 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 27 00:26:42 2023 +0300 [EXPLORER] Restore minimized windows with the correct position (#5488) Stop storing and setting window positions from the taskbar and rely on the window's existing position instead. Partial revert of e6bced7a353. Windows are now correctly positioned when being restored from the taskbar. This also fixes an issue where minimizing and opening Task Manager causes the window to become blank when running our shell in Windows Server 2003. CORE-19055 CORE-13895 CORE-18350 --- base/shell/explorer/taskswnd.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index e58c99bc6df..abe3f10ae47 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -82,7 +82,6 @@ typedef struct _TASK_ITEM PTASK_GROUP Group; INT Index; INT IconIndex; - WINDOWPLACEMENT wndpl; union { @@ -1113,8 +1112,6 @@ public: TaskItem->hWnd = hWnd; TaskItem->Index = -1; TaskItem->Group = AddToTaskGroup(hWnd); - TaskItem->wndpl.length = sizeof(TaskItem->wndpl); - ::GetWindowPlacement(hWnd, &TaskItem->wndpl); if (!m_IsDestroying) { @@ -1602,16 +1599,12 @@ public: if (!bIsMinimized && bIsActive) { - TaskItem->wndpl.length = sizeof(TaskItem->wndpl); - ::GetWindowPlacement(TaskItem->hWnd, &TaskItem->wndpl); - ::ShowWindowAsync(TaskItem->hWnd, SW_MINIMIZE); TRACE("Valid button clicked. App window Minimized.\n"); } else { ::SwitchToThisWindow(TaskItem->hWnd, TRUE); - ::SetWindowPlacement(TaskItem->hWnd, &TaskItem->wndpl); TRACE("Valid button clicked. App window Restored.\n"); }

1 year, 5 months

[reactos] 01/01: [MSPAINT] Optimize images for help docs (#5486)

by Andrew Dent

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f3a09722ecd98c166645… commit 8f3a09722ecd98c16664527cca611d7cbeb25ee1 Author: Andrew Dent <dent.ace(a)gmail.com> AuthorDate: Wed Jul 26 17:58:29 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 26 19:58:29 2023 +0300 [MSPAINT] Optimize images for help docs (#5486) Lossless optimization of png images using `pngslim`. Saves some bytes. No code changes. --- base/applications/mspaint/help/airbrush.png | Bin 556 -> 416 bytes base/applications/mspaint/help/appwindow.png | Bin 17648 -> 15047 bytes base/applications/mspaint/help/bezier.png | Bin 283 -> 137 bytes base/applications/mspaint/help/brush.png | Bin 567 -> 423 bytes base/applications/mspaint/help/color.png | Bin 497 -> 378 bytes base/applications/mspaint/help/ellipse.png | Bin 561 -> 391 bytes base/applications/mspaint/help/fill.png | Bin 651 -> 489 bytes base/applications/mspaint/help/freesel.png | Bin 401 -> 276 bytes base/applications/mspaint/help/line.png | Bin 181 -> 92 bytes base/applications/mspaint/help/palette.png | Bin 1646 -> 1029 bytes base/applications/mspaint/help/pen.png | Bin 591 -> 394 bytes base/applications/mspaint/help/rect.png | Bin 370 -> 287 bytes base/applications/mspaint/help/rectsel.png | Bin 377 -> 252 bytes base/applications/mspaint/help/rrect.png | Bin 414 -> 326 bytes base/applications/mspaint/help/rubber.png | Bin 569 -> 436 bytes base/applications/mspaint/help/settings1.png | Bin 3284 -> 2548 bytes base/applications/mspaint/help/settings2.png | Bin 850 -> 656 bytes base/applications/mspaint/help/settings3.png | Bin 967 -> 742 bytes base/applications/mspaint/help/settings4.png | Bin 1219 -> 891 bytes base/applications/mspaint/help/settings5.png | Bin 834 -> 657 bytes base/applications/mspaint/help/settings6.png | Bin 864 -> 671 bytes base/applications/mspaint/help/shape.png | Bin 455 -> 325 bytes base/applications/mspaint/help/text.png | Bin 621 -> 429 bytes base/applications/mspaint/help/toolbox.png | Bin 6512 -> 5644 bytes base/applications/mspaint/help/zoom.png | Bin 674 -> 506 bytes 25 files changed, 0 insertions(+), 0 deletions(-) diff --git a/base/applications/mspaint/help/airbrush.png b/base/applications/mspaint/help/airbrush.png index 86aaf3fd527..f98c1ae8356 100644 Binary files a/base/applications/mspaint/help/airbrush.png and b/base/applications/mspaint/help/airbrush.png differ diff --git a/base/applications/mspaint/help/appwindow.png b/base/applications/mspaint/help/appwindow.png index 3552f5911d6..a12a49c911f 100644 Binary files a/base/applications/mspaint/help/appwindow.png and b/base/applications/mspaint/help/appwindow.png differ diff --git a/base/applications/mspaint/help/bezier.png b/base/applications/mspaint/help/bezier.png index d31307673bb..a3d4b3b3307 100644 Binary files a/base/applications/mspaint/help/bezier.png and b/base/applications/mspaint/help/bezier.png differ diff --git a/base/applications/mspaint/help/brush.png b/base/applications/mspaint/help/brush.png index 470d8d72582..99ea8ae2f7d 100644 Binary files a/base/applications/mspaint/help/brush.png and b/base/applications/mspaint/help/brush.png differ diff --git a/base/applications/mspaint/help/color.png b/base/applications/mspaint/help/color.png index 80aed072b37..96652c7c8da 100644 Binary files a/base/applications/mspaint/help/color.png and b/base/applications/mspaint/help/color.png differ diff --git a/base/applications/mspaint/help/ellipse.png b/base/applications/mspaint/help/ellipse.png index f2c8921e7e4..6a8f3a2d751 100644 Binary files a/base/applications/mspaint/help/ellipse.png and b/base/applications/mspaint/help/ellipse.png differ diff --git a/base/applications/mspaint/help/fill.png b/base/applications/mspaint/help/fill.png index 1da4f22b005..f4816cfbeeb 100644 Binary files a/base/applications/mspaint/help/fill.png and b/base/applications/mspaint/help/fill.png differ diff --git a/base/applications/mspaint/help/freesel.png b/base/applications/mspaint/help/freesel.png index 695ba902225..43e84afd93f 100644 Binary files a/base/applications/mspaint/help/freesel.png and b/base/applications/mspaint/help/freesel.png differ diff --git a/base/applications/mspaint/help/line.png b/base/applications/mspaint/help/line.png index bc53d8e344a..564addbceda 100644 Binary files a/base/applications/mspaint/help/line.png and b/base/applications/mspaint/help/line.png differ diff --git a/base/applications/mspaint/help/palette.png b/base/applications/mspaint/help/palette.png index cfa07bd0809..464529fecd1 100644 Binary files a/base/applications/mspaint/help/palette.png and b/base/applications/mspaint/help/palette.png differ diff --git a/base/applications/mspaint/help/pen.png b/base/applications/mspaint/help/pen.png index 70c21277629..0d9fcdc690b 100644 Binary files a/base/applications/mspaint/help/pen.png and b/base/applications/mspaint/help/pen.png differ diff --git a/base/applications/mspaint/help/rect.png b/base/applications/mspaint/help/rect.png index b3e4c025355..ccc831ff5e9 100644 Binary files a/base/applications/mspaint/help/rect.png and b/base/applications/mspaint/help/rect.png differ diff --git a/base/applications/mspaint/help/rectsel.png b/base/applications/mspaint/help/rectsel.png index 72eb64dd9e4..2ba5ebe4377 100644 Binary files a/base/applications/mspaint/help/rectsel.png and b/base/applications/mspaint/help/rectsel.png differ diff --git a/base/applications/mspaint/help/rrect.png b/base/applications/mspaint/help/rrect.png index c1c278931bb..e785cad7288 100644 Binary files a/base/applications/mspaint/help/rrect.png and b/base/applications/mspaint/help/rrect.png differ diff --git a/base/applications/mspaint/help/rubber.png b/base/applications/mspaint/help/rubber.png index 9f123edbe65..ae8bcbabcc1 100644 Binary files a/base/applications/mspaint/help/rubber.png and b/base/applications/mspaint/help/rubber.png differ diff --git a/base/applications/mspaint/help/settings1.png b/base/applications/mspaint/help/settings1.png index ee79d45667a..b3a4fc2e758 100644 Binary files a/base/applications/mspaint/help/settings1.png and b/base/applications/mspaint/help/settings1.png differ diff --git a/base/applications/mspaint/help/settings2.png b/base/applications/mspaint/help/settings2.png index 35ccaa63037..d82b2bd3b1f 100644 Binary files a/base/applications/mspaint/help/settings2.png and b/base/applications/mspaint/help/settings2.png differ diff --git a/base/applications/mspaint/help/settings3.png b/base/applications/mspaint/help/settings3.png index 238ead24ed0..20855da831c 100644 Binary files a/base/applications/mspaint/help/settings3.png and b/base/applications/mspaint/help/settings3.png differ diff --git a/base/applications/mspaint/help/settings4.png b/base/applications/mspaint/help/settings4.png index a90613e268d..3309c9b0042 100644 Binary files a/base/applications/mspaint/help/settings4.png and b/base/applications/mspaint/help/settings4.png differ diff --git a/base/applications/mspaint/help/settings5.png b/base/applications/mspaint/help/settings5.png index 8a7e33a0677..457f70ad1ba 100644 Binary files a/base/applications/mspaint/help/settings5.png and b/base/applications/mspaint/help/settings5.png differ diff --git a/base/applications/mspaint/help/settings6.png b/base/applications/mspaint/help/settings6.png index 564d3cf54bd..c44c99f12b2 100644 Binary files a/base/applications/mspaint/help/settings6.png and b/base/applications/mspaint/help/settings6.png differ diff --git a/base/applications/mspaint/help/shape.png b/base/applications/mspaint/help/shape.png index 5535e1df5bd..586b016d027 100644 Binary files a/base/applications/mspaint/help/shape.png and b/base/applications/mspaint/help/shape.png differ diff --git a/base/applications/mspaint/help/text.png b/base/applications/mspaint/help/text.png index bef563a35ef..d97cd9e97fe 100644 Binary files a/base/applications/mspaint/help/text.png and b/base/applications/mspaint/help/text.png differ diff --git a/base/applications/mspaint/help/toolbox.png b/base/applications/mspaint/help/toolbox.png index 287bd396409..514b3c1faf1 100644 Binary files a/base/applications/mspaint/help/toolbox.png and b/base/applications/mspaint/help/toolbox.png differ diff --git a/base/applications/mspaint/help/zoom.png b/base/applications/mspaint/help/zoom.png index 6233ae09753..4b34b578529 100644 Binary files a/base/applications/mspaint/help/zoom.png and b/base/applications/mspaint/help/zoom.png differ

1 year, 5 months

[reactos] 01/01: [TASKMGR] Process page: Don't hardcode string length (#5490)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41e3badc9a778449c252d… commit 41e3badc9a778449c252df73c1646d640534884c Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Wed Jul 26 23:26:20 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 26 23:26:20 2023 +0700 [TASKMGR] Process page: Don't hardcode string length (#5490) Addendum to 59dcec1 (#4323). --- base/applications/taskmgr/procpage.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/base/applications/taskmgr/procpage.c b/base/applications/taskmgr/procpage.c index 1740e0a2753..e3e791b6182 100644 --- a/base/applications/taskmgr/procpage.c +++ b/base/applications/taskmgr/procpage.c @@ -16,6 +16,8 @@ #define CMP(x1, x2)\ (x1 < x2 ? -1 : (x1 > x2 ? 1 : 0)) +#define CONST_STR_LEN(str) (_countof(str) - 1) + typedef struct { ULONG ProcessId; @@ -994,7 +996,7 @@ DevicePathToDosPath( WCHAR szDeviceName[MAX_PATH]; /* Check if lpDevicePath is a device path */ - if (_wcsnicmp(lpDevicePath, L"\\Device\\", _countof(L"\\Device\\")-1) != 0) + if (_wcsnicmp(lpDevicePath, L"\\Device\\", CONST_STR_LEN(L"\\Device\\")) != 0) { return 0; } @@ -1150,7 +1152,7 @@ GetProcessExecutablePathById( if (GetSystemDirectoryW(pszSystemDir, uLength) != 0) { /* Get the required length, including the NULL terminator */ - dwRet = uLength + _countof(szKernelExe) - 1; + dwRet = uLength + CONST_STR_LEN(szKernelExe); if (lpExePath && (dwLength >= dwRet)) { @@ -1238,11 +1240,11 @@ void ProcessPage_OnOpenFileLocation(void) goto Cleanup; /* Build the shell command line */ - pszCmdLine = HeapAlloc(GetProcessHeap(), 0, (dwLength + 10) * sizeof(WCHAR)); + pszCmdLine = HeapAlloc(GetProcessHeap(), 0, (dwLength + CONST_STR_LEN(L"/select,\"\"")) * sizeof(WCHAR)); if (!pszCmdLine) goto Cleanup; - StringCchPrintfW(pszCmdLine, dwLength + 10, L"/select,\"%s\"", pszExePath); + StringCchPrintfW(pszCmdLine, dwLength + CONST_STR_LEN(L"/select,\"\""), L"/select,\"%s\"", pszExePath); /* Call the shell to open the file location and select it */ ShellExecuteW(NULL, L"open", L"explorer.exe", pszCmdLine, NULL, SW_SHOWNORMAL);

1 year, 5 months

[reactos] 01/01: [IEFRAME][DESK] Update Romanian (ro-RO) translation (#5469)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86e9fa717f893fe8eaf2f… commit 86e9fa717f893fe8eaf2f7a7c6a75866dcd9c9c5 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Jul 26 16:04:13 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 26 16:04:13 2023 +0300 [IEFRAME][DESK] Update Romanian (ro-RO) translation (#5469) --- dll/cpl/desk/lang/ro-RO.rc | 2 +- dll/win32/ieframe/lang/ro-RO.rc | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc index b83d2c2e261..d30f7bd91d0 100644 --- a/dll/cpl/desk/lang/ro-RO.rc +++ b/dll/cpl/desk/lang/ro-RO.rc @@ -173,7 +173,7 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 CONTROL "&Calculatorul meu", IDC_ICONS_MYCOMP, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 - CONTROL "&Navigatorul de internet", IDC_ICONS_INTERNET, "button", + CONTROL "&Navigatorul de Internet", IDC_ICONS_INTERNET, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, diff --git a/dll/win32/ieframe/lang/ro-RO.rc b/dll/win32/ieframe/lang/ro-RO.rc index 04296f436ab..871eedb338b 100644 --- a/dll/win32/ieframe/lang/ro-RO.rc +++ b/dll/win32/ieframe/lang/ro-RO.rc @@ -1,4 +1,10 @@ -/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* + * PROJECT: ReactOS ieframe.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -42,8 +48,8 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { - IDS_INTERNET "Navigatorul de internet" - IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_INTERNET "Navigatorul de Internet" + IDS_INTERNET_DESCRIPTION "Deschide navigatorul de rețea și afișează informații din Internet." IDS_TB_BACK "Înapoi" IDS_TB_FORWARD "Înainte"

1 year, 5 months

[reactos] 01/01: [APPWIZ] Update Romanian (ro-RO) translation (#5464)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9363a6573184bc3e8d40… commit f9363a6573184bc3e8d40c6eb5d5824843f516ae Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Jul 26 16:02:33 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 26 16:02:33 2023 +0300 [APPWIZ] Update Romanian (ro-RO) translation (#5464) --- dll/cpl/appwiz/lang/ro-RO.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc index 1ff04fc7495..7de4688abb6 100644 --- a/dll/cpl/appwiz/lang/ro-RO.rc +++ b/dll/cpl/appwiz/lang/ro-RO.rc @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2022 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2022-2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -94,5 +94,5 @@ BEGIN IDS_NO_DIRECTORY "Nu a fost dat niciun director!" IDS_INVALID_PATH "Calea dată este nevalidă!" IDS_INVALID_NAME "Numele comenzii rapide pe care l-ați introdus conținea fie caractere nevalide pentru numele fișierelor, fie era prea lung." - IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" + IDS_BROWSE_FOR_TARGET "Selectați ținta comenzii rapide de mai jos:" END

1 year, 5 months

[reactos] 01/01: [APPWIZ] Implement InstallCallback_GetBindInfo (#5480)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5965c10f9657cfee0236f… commit 5965c10f9657cfee0236f56438260de2d815a0a9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jul 26 13:32:59 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 26 13:32:59 2023 +0900 [APPWIZ] Implement InstallCallback_GetBindInfo (#5480) - Fix errors on 2nd stage setup epilogue. - Just return E_NOTIMPL in InstallCallback_GetBindInfo function. That's Okay. CORE-15786 --- dll/cpl/appwiz/addons.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dll/cpl/appwiz/addons.c b/dll/cpl/appwiz/addons.c index 5a3c11e9add..d2170688408 100644 --- a/dll/cpl/appwiz/addons.c +++ b/dll/cpl/appwiz/addons.c @@ -321,9 +321,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, static HRESULT WINAPI InstallCallback_GetBindInfo(IBindStatusCallback *iface, DWORD* grfBINDF, BINDINFO* pbindinfo) { - /* FIXME */ - *grfBINDF = 0; - return S_OK; + return E_NOTIMPL; } static HRESULT WINAPI InstallCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF,

1 year, 5 months

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST][SDK] Implement SHPropertyBag_ReadDWORD etc. (#5479)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe440f7514a6eb59f63e3… commit fe440f7514a6eb59f63e368ee4776164ac797d68 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jul 26 08:21:47 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 26 08:21:47 2023 +0900 [SHLWAPI][SHLWAPI_APITEST][SDK] Implement SHPropertyBag_ReadDWORD etc. (#5479) - Add VariantChangeTypeForRead helper function. - Implement SHPropertyBag_ReadType, SHPropertyBag_ReadBOOL, SHPropertyBag_ReadBOOLOld, SHPropertyBag_ReadSHORT, SHPropertyBag_ReadLONG, and SHPropertyBag_ReadDWORD functions. - SHPropertyBag_ReadInt is an alias to SHPropertyBag_ReadLONG. CORE-9283 --- dll/win32/shlwapi/ordinal.c | 187 +++++++++++++++++++++ dll/win32/shlwapi/shlwapi.spec | 12 +- .../rostests/apitests/shlwapi/SHPropertyBag.cpp | 71 +++++++- sdk/include/reactos/shlwapi_undoc.h | 6 + 4 files changed, 265 insertions(+), 11 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index c7ba39c5cee..d8aaf6a7678 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -5289,6 +5289,153 @@ HRESULT WINAPI IUnknown_QueryServiceForWebBrowserApp(IUnknown* lpUnknown, return IUnknown_QueryService(lpUnknown,&IID_IWebBrowserApp,riid,lppOut); } +#ifdef __REACTOS__ +HRESULT VariantChangeTypeForRead(_Inout_ VARIANTARG *pvarg, _In_ VARTYPE vt) +{ + HRESULT hr; + VARIANTARG vargTemp; + VARIANT variTemp; + + if (V_VT(pvarg) == vt || vt == VT_EMPTY) + return S_OK; + + vargTemp = *pvarg; + + if (V_VT(&vargTemp) != VT_BSTR || vt <= VT_NULL) + goto DoDefault; + + if (vt == VT_I1 || vt == VT_I2 || vt == VT_I4) + { + if (!StrToIntExW(V_BSTR(&vargTemp), STIF_SUPPORT_HEX, &V_I4(&variTemp))) + goto DoDefault; + + V_VT(&variTemp) = VT_INT; + VariantInit(pvarg); + hr = VariantChangeType(pvarg, &variTemp, 0, vt); + VariantClear(&vargTemp); + return hr; + } + + if (vt <= VT_DECIMAL) + goto DoDefault; + + if (vt == VT_UI1 || vt == VT_UI2 || vt == VT_UI4) + { + if (!StrToIntExW(V_BSTR(&vargTemp), STIF_SUPPORT_HEX, (LPINT)&V_UI4(&variTemp))) + goto DoDefault; + + V_VT(&variTemp) = VT_UINT; + VariantInit(pvarg); + hr = VariantChangeType(pvarg, &variTemp, 0, vt); + VariantClear(&vargTemp); + return hr; + } + + if (vt == VT_INT || vt == VT_UINT) + { + if (!StrToIntExW(V_BSTR(&vargTemp), STIF_SUPPORT_HEX, &V_INT(&variTemp))) + goto DoDefault; + + V_VT(&variTemp) = VT_UINT; + VariantInit(pvarg); + hr = VariantChangeType(pvarg, &variTemp, 0, vt); + VariantClear(&vargTemp); + return hr; + } + +DoDefault: + VariantInit(pvarg); + hr = VariantChangeType(pvarg, &vargTemp, 0, vt); + VariantClear(&vargTemp); + return hr; +} + +/************************************************************************** + * SHPropertyBag_ReadType (SHLWAPI.493) + */ +HRESULT WINAPI +SHPropertyBag_ReadType(IPropertyBag *ppb, LPCWSTR pszPropName, VARIANTARG *pvarg, VARTYPE vt) +{ + HRESULT hr; + + VariantInit(pvarg); + V_VT(pvarg) = vt; + + hr = IPropertyBag_Read(ppb, pszPropName, pvarg, NULL); + if (FAILED(hr)) + { + ERR("%p %s\n", ppb, debugstr_w(pszPropName)); + VariantInit(pvarg); + return hr; + } + + return VariantChangeTypeForRead(pvarg, vt); +} + +/************************************************************************** + * SHPropertyBag_ReadBOOL (SHLWAPI.534) + */ +HRESULT WINAPI SHPropertyBag_ReadBOOL(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL *pbValue) +{ + HRESULT hr; + VARIANTARG varg; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), pbValue); + + if (!ppb || !pszPropName || !pbValue) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), pbValue); + return E_INVALIDARG; + } + + hr = SHPropertyBag_ReadType(ppb, pszPropName, &varg, VT_BOOL); + if (SUCCEEDED(hr)) + *pbValue = (V_BOOL(&varg) == VARIANT_TRUE); + + return hr; +} + +/************************************************************************** + * SHPropertyBag_ReadBOOLOld (SHLWAPI.498) + */ +BOOL WINAPI SHPropertyBag_ReadBOOLOld(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL bDefValue) +{ + VARIANTARG varg; + HRESULT hr; + + TRACE("%p %s %d\n", ppb, debugstr_w(pszPropName), bDefValue); + + hr = SHPropertyBag_ReadType(ppb, pszPropName, &varg, VT_BOOL); + if (FAILED(hr)) + return bDefValue; + + return V_BOOL(&varg) == VARIANT_TRUE; +} + +/************************************************************************** + * SHPropertyBag_ReadSHORT (SHLWAPI.527) + */ +HRESULT WINAPI SHPropertyBag_ReadSHORT(IPropertyBag *ppb, LPCWSTR pszPropName, SHORT *psValue) +{ + HRESULT hr; + VARIANTARG varg; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), psValue); + + if (!ppb || !pszPropName || !psValue) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), psValue); + return E_INVALIDARG; + } + + hr = SHPropertyBag_ReadType(ppb, pszPropName, &varg, VT_UI2); + if (SUCCEEDED(hr)) + *psValue = V_UI2(&varg); + + return hr; +} +#endif + /************************************************************************** * SHPropertyBag_ReadLONG (SHLWAPI.496) * @@ -5304,6 +5451,22 @@ HRESULT WINAPI IUnknown_QueryServiceForWebBrowserApp(IUnknown* lpUnknown, */ HRESULT WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LPLONG pValue) { +#ifdef __REACTOS__ + HRESULT hr; + VARIANTARG varg; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), pValue); + + if (!ppb || !pszPropName || !pValue) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), pValue); + return E_INVALIDARG; + } + + hr = SHPropertyBag_ReadType(ppb, pszPropName, &varg, VT_I4); + if (SUCCEEDED(hr)) + *pValue = V_I4(&varg); +#else VARIANT var; HRESULT hr; TRACE("%p %s %p\n", ppb,debugstr_w(pszPropName),pValue); @@ -5318,10 +5481,34 @@ HRESULT WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LP else hr = DISP_E_BADVARTYPE; } +#endif return hr; } #ifdef __REACTOS__ +/************************************************************************** + * SHPropertyBag_ReadDWORD (SHLWAPI.507) + */ +HRESULT WINAPI SHPropertyBag_ReadDWORD(IPropertyBag *ppb, LPCWSTR pszPropName, DWORD *pdwValue) +{ + HRESULT hr; + VARIANTARG varg; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), pdwValue); + + if (!ppb || !pszPropName || !pdwValue) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), pdwValue); + return E_INVALIDARG; + } + + hr = SHPropertyBag_ReadType(ppb, pszPropName, &varg, VT_UI4); + if (SUCCEEDED(hr)) + *pdwValue = V_UI4(&varg); + + return hr; +} + /************************************************************************** * SHPropertyBag_Delete (SHLWAPI.535) */ diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 0833bd8f20a..7251262161e 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -490,12 +490,12 @@ 490 stdcall -noname GlobalFindAtomWrapW(wstr) kernel32.GlobalFindAtomW 491 stdcall -noname SHGetShellKey(long long long) 492 stub -noname PrettifyFileDescriptionW -493 stub -noname SHPropertyBag_ReadType +493 stdcall -noname SHPropertyBag_ReadType(ptr wstr ptr long) 494 stub -noname SHPropertyBag_ReadStr 495 stdcall -noname SHPropertyBag_WriteStr(ptr wstr wstr) 496 stdcall -noname SHPropertyBag_ReadLONG(ptr wstr ptr) 497 stdcall -noname SHPropertyBag_WriteLONG(ptr wstr long) -498 stub -noname SHPropertyBag_ReadBOOLOld +498 stdcall -noname SHPropertyBag_ReadBOOLOld(ptr wstr long) 499 stdcall -noname SHPropertyBag_WriteBOOL(ptr wstr long) 500 stdcall AssocGetPerceivedType(wstr ptr ptr ptr) 501 stdcall AssocIsDangerous(wstr) @@ -504,7 +504,7 @@ 504 stdcall AssocQueryStringA(long long str str ptr ptr) 505 stub -noname SHPropertyBag_ReadGUID 506 stdcall -noname SHPropertyBag_WriteGUID(ptr wstr ptr) -507 stdcall -stub -noname SHPropertyBag_ReadDWORD(ptr ptr ptr) +507 stdcall -noname SHPropertyBag_ReadDWORD(ptr wstr ptr) 508 stdcall -noname SHPropertyBag_WriteDWORD(ptr wstr long) 509 stdcall -noname IUnknown_OnFocusChangeIS(ptr ptr long) 510 stdcall -noname SHLockSharedEx(ptr long long) @@ -524,14 +524,14 @@ 524 stdcall -noname SHPropertyBag_WriteRECTL(ptr wstr ptr) 525 stub -noname SHPropertyBag_ReadPOINTS 526 stdcall -noname SHPropertyBag_WritePOINTS(ptr wstr ptr) -527 stub -noname SHPropertyBag_ReadSHORT +527 stdcall -noname SHPropertyBag_ReadSHORT(ptr wstr ptr) 528 stdcall -noname SHPropertyBag_WriteSHORT(ptr wstr long) -529 stub -noname SHPropertyBag_ReadInt +529 stdcall -noname SHPropertyBag_ReadInt(ptr wstr ptr) SHPropertyBag_ReadLONG 530 stdcall -noname SHPropertyBag_WriteInt(ptr wstr long) SHPropertyBag_WriteLONG 531 stub -noname SHPropertyBag_ReadStream 532 stdcall -noname SHPropertyBag_WriteStream(ptr wstr ptr) 533 stub -noname SHGetPerScreenResName -534 stub -noname SHPropertyBag_ReadBOOL +534 stdcall -noname SHPropertyBag_ReadBOOL(ptr wstr ptr) 535 stdcall -noname SHPropertyBag_Delete(ptr wstr) 536 stdcall -stub -noname IUnknown_QueryServicePropertyBag(ptr long ptr ptr) 537 stub -noname SHBoolSystemParametersInfo diff --git a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp index 6291f25d17e..224d66fb43d 100644 --- a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -14,6 +14,7 @@ static LPCWSTR s_pszPropNames[4] = { NULL, NULL, NULL, NULL }; static VARTYPE s_vt; +static INT s_cRead = 0; static INT s_cWrite = 0; static void ResetTest(VARTYPE vt, @@ -21,17 +22,17 @@ static void ResetTest(VARTYPE vt, LPCWSTR pszName2 = NULL, LPCWSTR pszName3 = NULL) { s_vt = vt; - s_cWrite = 0; + s_cRead = s_cWrite = 0; s_pszPropNames[0] = pszName0; s_pszPropNames[1] = pszName1; s_pszPropNames[2] = pszName2; s_pszPropNames[3] = pszName3; } -class CDummyWritePropertyBag : public IPropertyBag +class CDummyPropertyBag : public IPropertyBag { public: - CDummyWritePropertyBag() + CDummyPropertyBag() { } @@ -55,7 +56,19 @@ public: // IPropertyBag STDMETHODIMP Read(LPCWSTR pszPropName, VARIANT *pvari, IErrorLog *pErrorLog) override { + ++s_cRead; + ok_int(s_vt, V_VT(pvari)); + for (size_t i = 0; i < _countof(s_pszPropNames); ++i) + { + if (s_pszPropNames[i]) + { + ok_wstr(pszPropName, s_pszPropNames[i]); + s_pszPropNames[i] = NULL; + goto Skip1; + } + } ok_int(0, 1); +Skip1: return S_OK; } @@ -76,69 +89,115 @@ public: s_pszPropNames[0] = L"RECTL2.right"; return E_FAIL; } - break; + goto Skip2; } } + ok_int(0, 1); +Skip2: return S_OK; } }; +static void SHPropertyBag_ReadTest(void) +{ + HRESULT hr; + CDummyPropertyBag dummy; + BOOL bValue = 0xDEADFACE; + SHORT sValue = 0xDEAD; + LONG lValue = 0xDEADDEAD; + DWORD dwValue = 0xFEEDF00D; + + ResetTest(VT_BOOL, L"BOOL1"); + hr = SHPropertyBag_ReadBOOL(&dummy, s_pszPropNames[0], &bValue); + ok_long(hr, S_OK); + ok_int(s_cRead, 1); + ok_int(s_cWrite, 0); + + ResetTest(VT_UI2, L"SHORT1"); + hr = SHPropertyBag_ReadSHORT(&dummy, s_pszPropNames[0], &sValue); + ok_long(hr, S_OK); + ok_int(s_cRead, 1); + ok_int(s_cWrite, 0); + + ResetTest(VT_I4, L"LONG1"); + hr = SHPropertyBag_ReadLONG(&dummy, s_pszPropNames[0], &lValue); + ok_long(hr, S_OK); + ok_int(s_cRead, 1); + ok_int(s_cWrite, 0); + + ResetTest(VT_UI4, L"DWORD1"); + hr = SHPropertyBag_ReadDWORD(&dummy, s_pszPropNames[0], &dwValue); + ok_long(hr, S_OK); + ok_int(s_cRead, 1); + ok_int(s_cWrite, 0); +} + static void SHPropertyBag_WriteTest(void) { HRESULT hr; - CDummyWritePropertyBag dummy; + CDummyPropertyBag dummy; ResetTest(VT_EMPTY, L"EMPTY1"); hr = SHPropertyBag_Delete(&dummy, s_pszPropNames[0]); ok_long(hr, S_OK); + ok_int(s_cRead, 0); ok_int(s_cWrite, 1); ResetTest(VT_BOOL, L"BOOL1"); hr = SHPropertyBag_WriteBOOL(&dummy, s_pszPropNames[0], TRUE); ok_long(hr, S_OK); + ok_int(s_cRead, 0); ok_int(s_cWrite, 1); ResetTest(VT_UI2, L"SHORT1"); hr = SHPropertyBag_WriteSHORT(&dummy, s_pszPropNames[0], 1); ok_long(hr, S_OK); + ok_int(s_cRead, 0); ok_int(s_cWrite, 1); ResetTest(VT_I4, L"LONG1"); hr = SHPropertyBag_WriteLONG(&dummy, s_pszPropNames[0], 1); ok_long(hr, S_OK); + ok_int(s_cRead, 0); ok_int(s_cWrite, 1); ResetTest(VT_UI4, L"DWORD1"); hr = SHPropertyBag_WriteDWORD(&dummy, s_pszPropNames[0], 1); ok_long(hr, S_OK); + ok_int(s_cRead, 0); ok_int(s_cWrite, 1); ResetTest(VT_BSTR, L"Str1"); hr = SHPropertyBag_WriteStr(&dummy, s_pszPropNames[0], L"1"); ok_long(hr, S_OK); + ok_int(s_cRead, 0); ok_int(s_cWrite, 1); ResetTest(VT_I4, L"POINTL1.x", L"POINTL1.y"); POINTL ptl = { 0xEEEE, 0xDDDD }; hr = SHPropertyBag_WritePOINTL(&dummy, L"POINTL1", &ptl); ok_long(hr, S_OK); + ok_int(s_cRead, 0); ok_int(s_cWrite, 2); ResetTest(VT_I4, L"POINTS1.x", L"POINTS1.y"); POINTS pts = { 0x2222, 0x3333 }; hr = SHPropertyBag_WritePOINTS(&dummy, L"POINTS1", &pts); ok_long(hr, S_OK); + ok_int(s_cRead, 0); ok_int(s_cWrite, 2); ResetTest(VT_I4, L"RECTL1.left", L"RECTL1.top", L"RECTL1.right", L"RECTL1.bottom"); RECTL rcl = { 123, 456, 789, 101112 }; hr = SHPropertyBag_WriteRECTL(&dummy, L"RECTL1", &rcl); ok_long(hr, S_OK); + ok_int(s_cRead, 0); ok_int(s_cWrite, 4); ResetTest(VT_I4, L"RECTL2.left", L"RECTL2.top", L"RECTL2.right", L"RECTL2.bottom"); hr = SHPropertyBag_WriteRECTL(&dummy, L"RECTL2", &rcl); ok_long(hr, S_OK); + ok_int(s_cRead, 0); ok_int(s_cWrite, 5); GUID guid; @@ -146,10 +205,12 @@ static void SHPropertyBag_WriteTest(void) ResetTest(VT_BSTR, L"GUID1"); hr = SHPropertyBag_WriteGUID(&dummy, L"GUID1", &guid); ok_long(hr, S_OK); + ok_int(s_cRead, 0); ok_int(s_cWrite, 1); } START_TEST(SHPropertyBag) { + SHPropertyBag_ReadTest(); SHPropertyBag_WriteTest(); } diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index d584b57df2d..87f7d62d289 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -92,6 +92,12 @@ BOOL WINAPI SHExpandEnvironmentStringsForUserW(HANDLE, LPCWSTR, LPWSTR, DWORD); BOOL WINAPI SHIsEmptyStream(IStream*); HRESULT WINAPI SHInvokeDefaultCommand(HWND,IShellFolder*,LPCITEMIDLIST); +HRESULT WINAPI SHPropertyBag_ReadType(IPropertyBag *ppb, LPCWSTR pszPropName, VARIANTARG *pvarg, VARTYPE vt); +HRESULT WINAPI SHPropertyBag_ReadBOOL(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL *pbValue); +BOOL WINAPI SHPropertyBag_ReadBOOLOld(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL bDefValue); +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 SHGetPerScreenResName(OUT LPWSTR lpResName,

1 year, 5 months

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 July 2023