Ros-diffs

ros-diffs@reactos.org

17 participants
81080 discussions

[reactos] 01/01: [ATL] Default value of dwInitParam is zero instead of NULL (#5703)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fa90b539e24d44bf8a05… commit 3fa90b539e24d44bf8a0587ffb0d060ad0c6350b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 19 17:28:33 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 19 17:28:33 2023 +0900 [ATL] Default value of dwInitParam is zero instead of NULL (#5703) Fix warnings when dwInitParam was omitted at CDialogImpl::Create and/or CDialogImpl::DoModal. --- sdk/lib/atl/atlwin.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index b970fe7b173..69225fe262c 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -1478,7 +1478,7 @@ public: using CWindowImplRoot<TBase>::m_hWnd; // - Hacks for gcc - HWND Create(HWND hWndParent, LPARAM dwInitParam = NULL) + HWND Create(HWND hWndParent, LPARAM dwInitParam = 0) { BOOL result; HWND hWnd; @@ -1495,7 +1495,7 @@ public: return hWnd; } - INT_PTR DoModal(HWND hWndParent = ::GetActiveWindow(), LPARAM dwInitParam = NULL) + INT_PTR DoModal(HWND hWndParent = ::GetActiveWindow(), LPARAM dwInitParam = 0) { BOOL result; T* pImpl;

1 year, 3 months

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST] Fix SHGetPerScreenResName (#5701)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff5ccb5948b32b46bb4a1… commit ff5ccb5948b32b46bb4a1b4e59255b865dfbbae3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 19 11:02:59 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 19 11:02:59 2023 +0900 [SHLWAPI][SHLWAPI_APITEST] Fix SHGetPerScreenResName (#5701) Use HORZRES and VERTRES instead of SM_CXFULLSCREEN and SM_CYFULLSCREEN. CORE-9283 --- dll/win32/shlwapi/propbag.cpp | 7 +++++-- modules/rostests/apitests/shlwapi/CMakeLists.txt | 2 +- modules/rostests/apitests/shlwapi/SHPropertyBag.cpp | 10 +++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index c355647166e..98d2bc45926 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -1947,9 +1947,12 @@ SHGetPerScreenResName( if (dwReserved) return 0; - INT cxWidth = ::GetSystemMetrics(SM_CXFULLSCREEN); - INT cyHeight = ::GetSystemMetrics(SM_CYFULLSCREEN); + HDC hDC = ::GetDC(NULL); + INT cxWidth = ::GetDeviceCaps(hDC, HORZRES); + INT cyHeight = ::GetDeviceCaps(hDC, VERTRES); INT cMonitors = ::GetSystemMetrics(SM_CMONITORS); + ::ReleaseDC(NULL, hDC); + StringCchPrintfW(pszBuffer, cchBuffer, L"%dx%d(%d)", cxWidth, cyHeight, cMonitors); return lstrlenW(pszBuffer); } diff --git a/modules/rostests/apitests/shlwapi/CMakeLists.txt b/modules/rostests/apitests/shlwapi/CMakeLists.txt index d5c4d32562e..8eeb818902c 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} uuid) -add_importlibs(shlwapi_apitest shlwapi oleaut32 ole32 user32 advapi32 msvcrt kernel32) +add_importlibs(shlwapi_apitest shlwapi oleaut32 ole32 user32 gdi32 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 eae457b698e..c155693e214 100644 --- a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -826,10 +826,14 @@ static void SHPropertyBag_OnIniFile(void) static void SHPropertyBag_PerScreenRes(void) { + HDC hDC = GetDC(NULL); + INT cxWidth = GetDeviceCaps(hDC, HORZRES); + INT cyHeight = GetDeviceCaps(hDC, VERTRES); + INT cMonitors = GetSystemMetrics(SM_CMONITORS); + ReleaseDC(NULL, hDC); + WCHAR szBuff1[64], szBuff2[64]; - StringCchPrintfW(szBuff1, _countof(szBuff1), L"%dx%d(%d)", - GetSystemMetrics(SM_CXFULLSCREEN), GetSystemMetrics(SM_CYFULLSCREEN), - GetSystemMetrics(SM_CMONITORS)); + StringCchPrintfW(szBuff1, _countof(szBuff1), L"%dx%d(%d)", cxWidth, cyHeight, cMonitors); szBuff2[0] = UNICODE_NULL; SHGetPerScreenResName(szBuff2, _countof(szBuff2), 0);

1 year, 4 months

[reactos] 01/01: [ATL_APITEST] atlconv: Disable corner case test of CWAEX

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08cc45eef97e3a96e2747… commit 08cc45eef97e3a96e274703b5ff02c809a93cc41 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 19 10:45:46 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Sep 19 10:45:46 2023 +0900 [ATL_APITEST] atlconv: Disable corner case test of CWAEX --- modules/rostests/apitests/atl/atlconv.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/atl/atlconv.cpp b/modules/rostests/apitests/atl/atlconv.cpp index 96cbac21790..fc622e77c8c 100644 --- a/modules/rostests/apitests/atl/atlconv.cpp +++ b/modules/rostests/apitests/atl/atlconv.cpp @@ -122,7 +122,7 @@ START_TEST(atlconv) CW2AEX<5> w2ax(L"123"); ok_str((LPSTR)w2ax, "123"); ok_str(w2ax.m_psz, "123"); - ok(w2ax.m_psz != w2ax.m_szBuffer, "w2ax.m_psz == w2ax.m_szBuffer\n"); // corner case + //ok(w2ax.m_psz != w2ax.m_szBuffer, "w2ax.m_psz == w2ax.m_szBuffer\n"); // corner case CA2WEX<5> a2wx("123"); ok_wstr((LPWSTR)a2wx, L"123");

1 year, 4 months

[reactos] 01/01: [WINESYNC][SDK][DWMAPI] Import DWMAPI from WINE 8-14 (#5594)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6bbf09b6a5002da661965… commit 6bbf09b6a5002da661965c9106ee079736316a3a Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Mon Sep 18 07:30:44 2023 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 18 07:30:44 2023 -0700 [WINESYNC][SDK][DWMAPI] Import DWMAPI from WINE 8-14 (#5594) --- dll/win32/CMakeLists.txt | 4 + dll/win32/dwmapi/CMakeLists.txt | 19 +++ dll/win32/dwmapi/dwmapi.spec | 67 ++++++++ dll/win32/dwmapi/dwmapi_main.c | 338 ++++++++++++++++++++++++++++++++++++++++ dll/win32/dwmapi/version.rc | 26 ++++ media/doc/WINESYNC.txt | 1 + sdk/include/psdk/dwmapi.h | 85 +++++++++- sdk/include/psdk/winerror.h | 10 ++ 8 files changed, 548 insertions(+), 2 deletions(-) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 50c4080a8ca..da4dfb9162d 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -259,3 +259,7 @@ add_subdirectory(xinput1_3) add_subdirectory(xinput9_1_0) add_subdirectory(xmllite) add_subdirectory(xolehlp) + +if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600) + add_subdirectory(dwmapi) +endif() diff --git a/dll/win32/dwmapi/CMakeLists.txt b/dll/win32/dwmapi/CMakeLists.txt new file mode 100644 index 00000000000..2c5eb4f0eca --- /dev/null +++ b/dll/win32/dwmapi/CMakeLists.txt @@ -0,0 +1,19 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +spec2def(dwmapi.dll dwmapi.spec) + +list(APPEND SOURCE + dwmapi_main.c) + +add_library(dwmapi MODULE + ${SOURCE} + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def + ${CMAKE_CURRENT_BINARY_DIR}/dwmapi_stubs.c) + +set_module_type(dwmapi win32dll UNICODE ENTRYPOINT 0) +target_link_libraries(dwmapi uuid wine) +add_importlibs(dwmapi user32 kernel32 ntdll) +add_cd_file(TARGET dwmapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/dwmapi/dwmapi.spec b/dll/win32/dwmapi/dwmapi.spec new file mode 100644 index 00000000000..8477d9150ad --- /dev/null +++ b/dll/win32/dwmapi/dwmapi.spec @@ -0,0 +1,67 @@ +100 stub DwmpDxGetWindowSharedSurface +101 stub DwmpDxUpdateWindowSharedSurface +102 stdcall DwmEnableComposition(long) +103 stub -noname DwmpRestartComposition +104 stub -noname DwmpSetColorizationColor +105 stub -noname DwmpStartOrStopFlip3D +106 stub -noname DwmpIsCompositionCapable +107 stub -noname DwmpGetGlobalState +108 stub -noname DwmpEnableRedirection +109 stub -noname DwmpOpenGraphicsStream +110 stub -noname DwmpCloseGraphicsStream +112 stub -noname DwmpSetGraphicsStreamTransformHint +113 stub -noname DwmpActivateLivePreview +114 stub -noname DwmpQueryThumbnailType +115 stub -noname DwmpStartupViaUserInit +118 stub -noname DwmpGetAssessment +119 stub -noname DwmpGetAssessmentUsage +120 stub -noname DwmpSetAssessmentUsage +121 stub -noname DwmpIsSessionDWM +124 stub -noname DwmpRegisterThumbnail +125 stub DwmpDxBindSwapChain +126 stub DwmpDxUnbindSwapChain +127 stdcall -noname DwmpGetColorizationParameters(ptr) +128 stub DwmpDxgiIsThreadDesktopComposited +129 stub -noname DwmpDxgiDisableRedirection +130 stub -noname DwmpDxgiEnableRedirection +131 stub -noname DwmpSetColorizationParameters +132 stub -noname DwmpGetCompositionTimingInfoEx +133 stub DwmpDxUpdateWindowRedirectionBltSurface +134 stub -noname DwmpDxSetContentHostingInformation +135 stub DwmpRenderFlick +136 stub DwmpAllocateSecurityDescriptor +137 stub DwmpFreeSecurityDescriptor +143 stub DwmpEnableDDASupport +156 stub DwmTetherTextContact + +# @ stdcall -private DllCanUnloadNow() +# @ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall DwmAttachMilContent(long) +@ stdcall DwmDefWindowProc(long long long long ptr) +@ stdcall DwmDetachMilContent(long) +@ stdcall DwmEnableBlurBehindWindow(ptr ptr) +@ stdcall DwmEnableMMCSS(long) +@ stdcall DwmExtendFrameIntoClientArea(long ptr) +@ stdcall DwmFlush() +@ stdcall DwmGetColorizationColor(ptr ptr) +@ stdcall DwmGetCompositionTimingInfo(long ptr) +@ stdcall DwmGetGraphicsStreamClient(long ptr) +@ stdcall DwmGetGraphicsStreamTransformHint(long ptr) +@ stdcall DwmGetTransportAttributes(ptr ptr ptr) +@ stdcall DwmGetWindowAttribute(ptr long ptr long) +@ stdcall DwmInvalidateIconicBitmaps(ptr) +@ stdcall DwmIsCompositionEnabled(ptr) +@ stub DwmModifyPreviousDxFrameDuration +@ stub DwmQueryThumbnailSourceSize +@ stdcall DwmRegisterThumbnail(long long ptr) +# @ stub DwmRenderGesture +@ stub DwmSetDxFrameDuration +@ stdcall DwmSetIconicLivePreviewBitmap(long long ptr long) +@ stdcall DwmSetIconicThumbnail(long long long) +@ stdcall DwmSetPresentParameters(ptr ptr) +@ stdcall DwmSetWindowAttribute(long long ptr long) +# @ stub DwmShowContact +# @ stub DwmTetherContact +# @ stub DwmTransitionOwnedWindow +@ stdcall DwmUnregisterThumbnail(long) +@ stdcall DwmUpdateThumbnailProperties(ptr ptr) diff --git a/dll/win32/dwmapi/dwmapi_main.c b/dll/win32/dwmapi/dwmapi_main.c new file mode 100644 index 00000000000..2e6a91c7ded --- /dev/null +++ b/dll/win32/dwmapi/dwmapi_main.c @@ -0,0 +1,338 @@ +/* + * Dwmapi + * + * Copyright 2007 Andras Kovacs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> + +#ifdef __REACTOS__ +#include <rtlfuncs.h> +#else +#include "winternl.h" +#endif + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "dwmapi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dwmapi); + + +/********************************************************************** + * DwmIsCompositionEnabled (DWMAPI.@) + */ +HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) +{ + +#ifdef __REACTOS__ + RTL_OSVERSIONINFOW version; +#else + RTL_OSVERSIONINFOEXW version; +#endif + + TRACE("%p\n", enabled); + + if (!enabled) + return E_INVALIDARG; + + *enabled = FALSE; + version.dwOSVersionInfoSize = sizeof(version); + if (!RtlGetVersion(&version)) + *enabled = (version.dwMajorVersion > 6 || (version.dwMajorVersion == 6 && version.dwMinorVersion >= 3)); + + return S_OK; +} + +/********************************************************************** + * DwmEnableComposition (DWMAPI.102) + */ +HRESULT WINAPI DwmEnableComposition(UINT uCompositionAction) +{ + FIXME("(%d) stub\n", uCompositionAction); + + return S_OK; +} + +/********************************************************************** + * DwmExtendFrameIntoClientArea (DWMAPI.@) + */ +HRESULT WINAPI DwmExtendFrameIntoClientArea(HWND hwnd, const MARGINS* margins) +{ + FIXME("(%p, %p) stub\n", hwnd, margins); + + return S_OK; +} + +/********************************************************************** + * DwmGetColorizationColor (DWMAPI.@) + */ +HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL *opaque_blend) +{ + FIXME("(%p, %p) stub\n", colorization, opaque_blend); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmFlush (DWMAPI.@) + */ +HRESULT WINAPI DwmFlush(void) +{ + static BOOL once; + + if (!once++) FIXME("() stub\n"); + + return S_OK; +} + +/********************************************************************** + * DwmInvalidateIconicBitmaps (DWMAPI.@) + */ +HRESULT WINAPI DwmInvalidateIconicBitmaps(HWND hwnd) +{ + static BOOL once; + + if (!once++) FIXME("(%p) stub\n", hwnd); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmSetWindowAttribute (DWMAPI.@) + */ +HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attribute, DWORD size) +{ + static BOOL once; + + if (!once++) FIXME("(%p, %lx, %p, %lx) stub\n", hwnd, attributenum, attribute, size); + + return S_OK; +} + +/********************************************************************** + * DwmGetGraphicsStreamClient (DWMAPI.@) + */ +HRESULT WINAPI DwmGetGraphicsStreamClient(UINT uIndex, UUID *pClientUuid) +{ + FIXME("(%d, %p) stub\n", uIndex, pClientUuid); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmGetTransportAttributes (DWMAPI.@) + */ +HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected, DWORD *pDwGeneration) +{ + FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration); + + return DWM_E_COMPOSITIONDISABLED; +} + +/********************************************************************** + * DwmUnregisterThumbnail (DWMAPI.@) + */ +HRESULT WINAPI DwmUnregisterThumbnail(HTHUMBNAIL thumbnail) +{ + FIXME("(%p) stub\n", thumbnail); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmEnableMMCSS (DWMAPI.@) + */ +HRESULT WINAPI DwmEnableMMCSS(BOOL enableMMCSS) +{ + FIXME("(%d) stub\n", enableMMCSS); + + return S_OK; +} + +/********************************************************************** + * DwmGetGraphicsStreamTransformHint (DWMAPI.@) + */ +HRESULT WINAPI DwmGetGraphicsStreamTransformHint(UINT uIndex, MilMatrix3x2D *pTransform) +{ + FIXME("(%d, %p) stub\n", uIndex, pTransform); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmEnableBlurBehindWindow (DWMAPI.@) + */ +HRESULT WINAPI DwmEnableBlurBehindWindow(HWND hWnd, const DWM_BLURBEHIND *pBlurBuf) +{ + FIXME("%p %p\n", hWnd, pBlurBuf); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmDefWindowProc (DWMAPI.@) + */ +BOOL WINAPI DwmDefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) +{ + static int i; + + if (!i++) FIXME("stub\n"); + + return FALSE; +} + +/********************************************************************** + * DwmGetWindowAttribute (DWMAPI.@) + */ +HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attribute, DWORD size) +{ + FIXME("(%p %ld %p %ld) stub\n", hwnd, attribute, pv_attribute, size); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmRegisterThumbnail (DWMAPI.@) + */ +HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_id) +{ + FIXME("(%p %p %p) stub\n", dest, src, thumbnail_id); + + return E_NOTIMPL; +} + +static int get_display_frequency(void) +{ + DEVMODEW mode; + BOOL ret; + + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + ret = EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &mode, 0); + if (ret && mode.dmFields & DM_DISPLAYFREQUENCY && mode.dmDisplayFrequency) + { + return mode.dmDisplayFrequency; + } + else + { + WARN("Failed to query display frequency, returning a fallback value.\n"); + return 60; + } +} + +/********************************************************************** + * DwmGetCompositionTimingInfo (DWMAPI.@) + */ +HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) +{ + LARGE_INTEGER performance_frequency, qpc; + static int i, display_frequency; + + if (!info) + return E_INVALIDARG; + + if (info->cbSize != sizeof(DWM_TIMING_INFO)) + return MILERR_MISMATCHED_SIZE; + + if(!i++) FIXME("(%p %p)\n", hwnd, info); + + memset(info, 0, info->cbSize); + info->cbSize = sizeof(DWM_TIMING_INFO); + + display_frequency = get_display_frequency(); + info->rateRefresh.uiNumerator = display_frequency; + info->rateRefresh.uiDenominator = 1; + info->rateCompose.uiNumerator = display_frequency; + info->rateCompose.uiDenominator = 1; + + QueryPerformanceFrequency(&performance_frequency); + info->qpcRefreshPeriod = performance_frequency.QuadPart / display_frequency; + + QueryPerformanceCounter(&qpc); + info->qpcVBlank = (qpc.QuadPart / info->qpcRefreshPeriod) * info->qpcRefreshPeriod; + + return S_OK; +} + +/********************************************************************** + * DwmAttachMilContent (DWMAPI.@) + */ +HRESULT WINAPI DwmAttachMilContent(HWND hwnd) +{ + FIXME("(%p) stub\n", hwnd); + return E_NOTIMPL; +} + +/********************************************************************** + * DwmDetachMilContent (DWMAPI.@) + */ +HRESULT WINAPI DwmDetachMilContent(HWND hwnd) +{ + FIXME("(%p) stub\n", hwnd); + return E_NOTIMPL; +} + +/********************************************************************** + * DwmUpdateThumbnailProperties (DWMAPI.@) + */ +HRESULT WINAPI DwmUpdateThumbnailProperties(HTHUMBNAIL thumbnail, const DWM_THUMBNAIL_PROPERTIES *props) +{ + FIXME("(%p, %p) stub\n", thumbnail, props); + return E_NOTIMPL; +} + +/********************************************************************** + * DwmSetPresentParameters (DWMAPI.@) + */ +HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params) +{ + FIXME("(%p %p) stub\n", hwnd, params); + return S_OK; +}; + +/********************************************************************** + * DwmSetIconicLivePreviewBitmap (DWMAPI.@) + */ +HRESULT WINAPI DwmSetIconicLivePreviewBitmap(HWND hwnd, HBITMAP hbmp, POINT *pos, DWORD flags) +{ + FIXME("(%p %p %p %lx) stub\n", hwnd, hbmp, pos, flags); + return S_OK; +}; + +/********************************************************************** + * DwmSetIconicThumbnail (DWMAPI.@) + */ +HRESULT WINAPI DwmSetIconicThumbnail(HWND hwnd, HBITMAP hbmp, DWORD flags) +{ + FIXME("(%p %p %lx) stub\n", hwnd, hbmp, flags); + return S_OK; +}; + +/********************************************************************** + * DwmpGetColorizationParameters (DWMAPI.@) + */ +HRESULT WINAPI DwmpGetColorizationParameters(void *params) +{ + FIXME("(%p) stub\n", params); + return E_NOTIMPL; +} diff --git a/dll/win32/dwmapi/version.rc b/dll/win32/dwmapi/version.rc new file mode 100644 index 00000000000..b76f194dd65 --- /dev/null +++ b/dll/win32/dwmapi/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2007 Andras Kovacs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Desktop Window Manager API" +#define WINE_FILENAME_STR "dwmapi.dll" +#define WINE_FILEVERSION 6,0,6000,16386 +#define WINE_FILEVERSION_STR "6.0.6000.16386" +#define WINE_PRODUCTVERSION 6,0,6000,16386 +#define WINE_PRODUCTVERSION_STR "6.0.6000.16386" + +#include "wine/wine_common_ver.rc" diff --git a/media/doc/WINESYNC.txt b/media/doc/WINESYNC.txt index 228295cedb1..f6614ac83a9 100644 --- a/media/doc/WINESYNC.txt +++ b/media/doc/WINESYNC.txt @@ -68,6 +68,7 @@ dll/win32/cryptui # Synced to WineStaging-4.18 dll/win32/dbgeng # Synced to WineStaging-4.18 dll/win32/dbghelp # Synced to WineStaging-5.16 dll/win32/dciman32 # Synced to WineStaging-3.3 +dll/win32/dwmapi # Synced to Wine-8.14 dll/win32/faultrep # Synced to WineStaging-4.18 dll/win32/fontsub # Synced to WineStaging-2.9 dll/win32/fusion # Synced to WineStaging-4.18 diff --git a/sdk/include/psdk/dwmapi.h b/sdk/include/psdk/dwmapi.h index 035c831a2b3..1b19426ce2d 100644 --- a/sdk/include/psdk/dwmapi.h +++ b/sdk/include/psdk/dwmapi.h @@ -34,9 +34,52 @@ typedef HTHUMBNAIL *PHTHUMBNAIL; #include <pshpack1.h> +static const UINT c_DwmMaxQueuedBuffers = 8; +static const UINT c_DwmMaxMonitors = 16; +static const UINT c_DwmMaxAdapters = 16; + typedef ULONGLONG DWM_FRAME_COUNT; typedef ULONGLONG QPC_TIME; +enum DWMWINDOWATTRIBUTE { + DWMWA_NCRENDERING_ENABLED = 1, + DWMWA_NCRENDERING_POLICY, + DWMWA_TRANSITIONS_FORCEDISABLED, + DWMWA_ALLOW_NCPAINT, + DWMWA_CAPTION_BUTTON_BOUNDS, + DWMWA_NONCLIENT_RTL_LAYOUT, + DWMWA_FORCE_ICONIC_REPRESENTATION, + DWMWA_FLIP3D_POLICY, + DWMWA_EXTENDED_FRAME_BOUNDS, + DWMWA_HAS_ICONIC_BITMAP, + DWMWA_DISALLOW_PEEK, + DWMWA_EXCLUDED_FROM_PEEK, + DWMWA_CLOAK, + DWMWA_CLOAKED, + DWMWA_FREEZE_REPRESENTATION, + DWMWA_LAST +}; + +enum DWMNCRENDERINGPOLICY { + DWMNCRP_USEWINDOWSTYLE, + DWMNCRP_DISABLED, + DWMNCRP_ENABLED, + DWMNCRP_LAST +}; + +enum DWMFLIP3DWINDOWPOLICY { + DWMFLIP3D_DEFAULT, + DWMFLIP3D_EXCLUDEBELOW, + DWMFLIP3D_EXCLUDEABOVE, + DWMFLIP3D_LAST +}; + +typedef enum _DWM_SOURCE_FRAME_SAMPLING { + DWM_SOURCE_FRAME_SAMPLING_POINT, + DWM_SOURCE_FRAME_SAMPLING_COVERAGE, + DWM_SOURCE_FRAME_SAMPLING_LAST +} DWM_SOURCE_FRAME_SAMPLING; + typedef struct _UNSIGNED_RATIO { UINT32 uiNumerator; UINT32 uiDenominator; @@ -95,6 +138,11 @@ typedef struct _MilMatrix3x2D DOUBLE DY; } MilMatrix3x2D; +#define DWM_FRAME_DURATION_DEFAULT -1 + +#define DWM_EC_DISABLECOMPOSITION 0 +#define DWM_EC_ENABLECOMPOSITION 1 + #define DWM_BB_ENABLE 0x00000001 #define DWM_BB_BLURREGION 0x00000002 #define DWM_BB_TRANSITIONONMAXIMIZED 0x00000004 @@ -107,6 +155,18 @@ typedef struct _DWM_BLURBEHIND BOOL fTransitionOnMaximized; } DWM_BLURBEHIND, *PDWM_BLURBEHIND; +#define DWM_SIT_DISPLAYFRAME 0x00000001 + +#define DWM_CLOAKED_APP 0x00000001 +#define DWM_CLOAKED_SHELL 0x00000002 +#define DWM_CLOAKED_INHERITED 0x00000004 + +#define DWM_TNP_RECTDESTINATION 0x00000001 +#define DWM_TNP_RECTSOURCE 0x00000002 +#define DWM_TNP_OPACITY 0x00000004 +#define DWM_TNP_VISIBLE 0x00000008 +#define DWM_TNP_SOURCECLIENTAREAONLY 0x00000010 + typedef struct _DWM_THUMBNAIL_PROPERTIES { DWORD dwFlags; @@ -117,18 +177,39 @@ typedef struct _DWM_THUMBNAIL_PROPERTIES BOOL fSourceClientAreaOnly; } DWM_THUMBNAIL_PROPERTIES, *PDWM_THUMBNAIL_PROPERTIES; +typedef struct _DWM_PRESENT_PARAMETERS { + UINT32 cbSize; + BOOL fQueue; + DWM_FRAME_COUNT cRefreshStart; + UINT cBuffer; + BOOL fUseSourceRate; + UNSIGNED_RATIO rateSource; + UINT cRefreshesPerFrame; + DWM_SOURCE_FRAME_SAMPLING eSampling; +} DWM_PRESENT_PARAMETERS; + #include <poppack.h> -DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); +DWMAPI DwmAttachMilContent(HWND); +DWMAPI_(BOOL) DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); +DWMAPI DwmDetachMilContent(HWND); DWMAPI DwmEnableBlurBehindWindow(HWND, const DWM_BLURBEHIND *); DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); -DWMAPI DwmGetColorizationColor(DWORD*,BOOL); +DWMAPI DwmFlush(void); +DWMAPI DwmGetColorizationColor(DWORD *, BOOL *); DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); +DWMAPI DwmGetGraphicsStreamClient(UINT, UUID *); +DWMAPI DwmGetGraphicsStreamTransformHint(UINT, MilMatrix3x2D *); +DWMAPI DwmGetTransportAttributes(BOOL*, BOOL*, DWORD*); +DWMAPI DwmGetWindowAttribute(HWND, DWORD, PVOID, DWORD); DWMAPI DwmInvalidateIconicBitmaps(HWND); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); +DWMAPI DwmSetIconicLivePreviewBitmap(HWND, HBITMAP, POINT*, DWORD); +DWMAPI DwmSetIconicThumbnail(HWND, HBITMAP, DWORD); +DWMAPI DwmSetPresentParameters(HWND, DWM_PRESENT_PARAMETERS *); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL); DWMAPI DwmUpdateThumbnailProperties(HTHUMBNAIL, const DWM_THUMBNAIL_PROPERTIES *); diff --git a/sdk/include/psdk/winerror.h b/sdk/include/psdk/winerror.h index c3815c27e36..f20c7a9249b 100644 --- a/sdk/include/psdk/winerror.h +++ b/sdk/include/psdk/winerror.h @@ -3270,6 +3270,14 @@ #define WININET_E_NAME_NOT_RESOLVED _HRESULT_TYPEDEF_(0x80072ee7) +#define ERROR_HUNG_DISPLAY_DRIVER_THREAD _HRESULT_TYPEDEF_(0x80260001) +#define DWM_E_COMPOSITIONDISABLED _HRESULT_TYPEDEF_(0x80263001) +#define DWM_E_REMOTING_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80263002) +#define DWM_E_NO_REDIRECTION_SURFACE_AVAILABLE _HRESULT_TYPEDEF_(0x80263003) +#define DWM_E_NOT_QUEUING_PRESENTS _HRESULT_TYPEDEF_(0x80263004) +#define DWM_E_ADAPTER_NOT_FOUND _HRESULT_TYPEDEF_(0x80263005) +#define DWM_S_GDI_REDIRECTION_SURFACE _HRESULT_TYPEDEF_(0x00263005) + #define WINCODEC_ERR_WRONGSTATE _HRESULT_TYPEDEF_(0x88982f04) #define WINCODEC_ERR_VALUEOUTOFRANGE _HRESULT_TYPEDEF_(0x88982f05) #define WINCODEC_ERR_UNKNOWNIMAGEFORMAT _HRESULT_TYPEDEF_(0x88982f07) @@ -3311,6 +3319,8 @@ #define WINCODEC_ERR_WIN32ERROR _HRESULT_TYPEDEF_(0x88982f94) #define WINCODEC_ERR_INVALIDPROGRESSIVELEVEL _HRESULT_TYPEDEF_(0x88982f95) +#define MILERR_MISMATCHED_SIZE _HRESULT_TYPEDEF_(0x88980090) + #define ERROR_AUDITING_DISABLED _HRESULT_TYPEDEF_(0xC0090001L) #define ERROR_ALL_SIDS_FILTERED _HRESULT_TYPEDEF_(0xC0090002L)

1 year, 4 months

[reactos] 01/01: [KBDLAYOUT] Avoid (DLGPROC) cast (#5698)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0eecebb1cc49bc2852ddf… commit 0eecebb1cc49bc2852ddfd600bc760a0c540c080 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Mon Sep 18 13:48:33 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 18 11:48:33 2023 +0000 [KBDLAYOUT] Avoid (DLGPROC) cast (#5698) - Avoid DLGPROC-cast - Bring header-section closer to our coding guidelines - Strip inconsistent empty-lines - Strip useless return at the end of void func Co-authored-by: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> --- .../rostests/win32/user32/kbdlayout/kbdlayout.c | 40 +++++----------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/modules/rostests/win32/user32/kbdlayout/kbdlayout.c b/modules/rostests/win32/user32/kbdlayout/kbdlayout.c index b8fd1800c2d..1853531f9b2 100644 --- a/modules/rostests/win32/user32/kbdlayout/kbdlayout.c +++ b/modules/rostests/win32/user32/kbdlayout/kbdlayout.c @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/testset/user32/kbdlayout/kbdlayout.c - * PURPOSE: Keyboard layout testapp - * COPYRIGHT: Copyright 2007 Saveliy Tretiakov + * PROJECT: ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Keyboard layout testapp + * COPYRIGHT: Copyright 2007 Saveliy Tretiakov */ #define UNICODE @@ -13,7 +12,7 @@ -LRESULT MainDialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK MainDialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); HINSTANCE hInst; @@ -27,11 +26,10 @@ typedef struct { DWORD WINAPI ThreadProc(LPVOID lpParam) { - DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_MAINDIALOG), NULL, - (DLGPROC)MainDialogProc, + MainDialogProc, (LPARAM)NULL); return 0; @@ -42,8 +40,6 @@ INT WINAPI WinMain(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow) { - - hInst = hInstance; ThreadProc(0); @@ -51,7 +47,6 @@ INT WINAPI WinMain(HINSTANCE hInstance, return 0; } - int GetKlList(HKL **list) { HKL *ret; @@ -69,7 +64,6 @@ void FreeKlList(HKL *list) HeapFree(GetProcessHeap(), 0, list); } - void UpdateData(HWND hDlg) { WCHAR buf[KL_NAMELENGTH]; @@ -119,8 +113,7 @@ void FormatBox(HWND hWnd, DWORD Flags, WCHAR *Caption, WCHAR *Format, ...) va_end(argptr); } - -LRESULT CALLBACK WndSubclassProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +LRESULT CALLBACK WndSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { WND_DATA *data = (WND_DATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); @@ -137,7 +130,7 @@ LRESULT CALLBACK WndSubclassProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP //Pass message to defwindowproc } - return ( CallWindowProc( data->OrigProc, hwnd, uMsg, wParam, lParam) ); + return CallWindowProc(data->OrigProc, hwnd, uMsg, wParam, lParam); } void SubclassWnd(HWND hWnd, WCHAR* Name) @@ -146,7 +139,6 @@ void SubclassWnd(HWND hWnd, WCHAR* Name) data->OrigProc = (WNDPROC)SetWindowLongPtr( hWnd, GWLP_WNDPROC, (LONG_PTR)WndSubclassProc); wcsncpy(data->WndName, Name, 25); SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)data); - return; } DWORD GetActivateFlags(HWND hDlg) @@ -166,7 +158,6 @@ DWORD GetActivateFlags(HWND hDlg) ret |= KLF_SETFORPROCESS; return ret; - } DWORD GetLoadFlags(HWND hDlg) @@ -218,22 +209,15 @@ HKL GetSelectedLayout(HWND hDlg) HKL GetActivateHandle(HWND hDlg) { - if(IsDlgButtonChecked(hDlg, IDC_FROMLIST)) return GetSelectedLayout(hDlg); else if(IsDlgButtonChecked(hDlg, IDC_HKL_NEXT)) return (HKL)HKL_NEXT; return (HKL)HKL_PREV; - } - -/*************************************************** - * MainDialogProc * - ***************************************************/ - -LRESULT MainDialogProc(HWND hDlg, +INT_PTR CALLBACK MainDialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) @@ -350,13 +334,11 @@ LRESULT MainDialogProc(HWND hDlg, } break; } - } return TRUE; } /* WM_COMMAND */ - case WM_INPUTLANGCHANGE: { FormatMsg(L"dlg WM_INPUTLANGCHANGE lParam=%x wParam=%x\n", lParam, wParam); @@ -379,9 +361,5 @@ LRESULT MainDialogProc(HWND hDlg, default: return FALSE; } - } - - -

1 year, 4 months

[reactos] 01/01: [SHDOCVW][SHDOCVW_APITEST] Implement MRU List for Shell Bag, Part 6 (#5699)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1da71e25196bbe358b599… commit 1da71e25196bbe358b5997968eb845783f751e12 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 18 20:13:29 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 18 20:13:29 2023 +0900 [SHDOCVW][SHDOCVW_APITEST] Implement MRU List for Shell Bag, Part 6 (#5699) Follow-up to #5691. Strengthen shdocvw_apitest testcase. Fix CLSID_MruPidlList class. CORE-9283 --- dll/win32/shdocvw/mrulist.cpp | 56 ++++-- dll/win32/shdocvw/shdocvw_v1.rgs | 4 + modules/rostests/apitests/shdocvw/CMakeLists.txt | 2 +- modules/rostests/apitests/shdocvw/MRUList.cpp | 218 ++++++++++++++++------- 4 files changed, 204 insertions(+), 76 deletions(-) diff --git a/dll/win32/shdocvw/mrulist.cpp b/dll/win32/shdocvw/mrulist.cpp index a81aa01315a..ba3fcb11fc2 100644 --- a/dll/win32/shdocvw/mrulist.cpp +++ b/dll/win32/shdocvw/mrulist.cpp @@ -34,6 +34,7 @@ class CMruClassFactory; extern "C" void __cxa_pure_virtual(void) { + ERR("__cxa_pure_virtual\n"); ::DebugBreak(); } @@ -129,7 +130,7 @@ public: STDMETHODIMP AddData(LPCVOID pvData, DWORD cbData, UINT *piSlot) override; STDMETHODIMP FindData(LPCVOID pvData, DWORD cbData, UINT *piSlot) override; STDMETHODIMP GetData(UINT iSlot, LPVOID pvData, DWORD cbData) override; - STDMETHODIMP QueryInfo(UINT iSlot, UINT *puSlot, DWORD *pcbData) override; + STDMETHODIMP QueryInfo(UINT iSlot, UINT *piGotSlot, DWORD *pcbData) override; STDMETHODIMP Delete(UINT iSlot) override; // Non-standard methods @@ -172,8 +173,7 @@ CMruBase::~CMruBase() m_pSlots[iSlot].pvData = ::LocalFree(m_pSlots[iSlot].pvData); } - ::LocalFree(m_pSlots); - m_pSlots = NULL; + m_pSlots = (SLOTITEMDATA*)::LocalFree(m_pSlots); } ::InterlockedDecrement(&SHDOCVW_refCount); @@ -371,21 +371,21 @@ STDMETHODIMP CMruBase::GetData(UINT iSlot, LPVOID pvData, DWORD cbData) return hr; if (cbData < pItem->cbData) - return 0x8007007A; // FIXME: Magic number + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); CopyMemory(pvData, pItem->pvData, pItem->cbData); return hr; } -STDMETHODIMP CMruBase::QueryInfo(UINT iSlot, UINT *puSlot, DWORD *pcbData) +STDMETHODIMP CMruBase::QueryInfo(UINT iSlot, UINT *piGotSlot, DWORD *pcbData) { UINT iGotSlot; HRESULT hr = _GetSlot(iSlot, &iGotSlot); if (FAILED(hr)) return hr; - if (puSlot) - *puSlot = iGotSlot; + if (piGotSlot) + *piGotSlot = iGotSlot; if (pcbData) { @@ -604,11 +604,7 @@ public: ~CMruLongList() override { - if (m_puSlotData) - { - ::LocalFree(m_puSlotData); - m_puSlotData = NULL; - } + m_puSlotData = (UINT*)::LocalFree(m_puSlotData); } }; @@ -1067,13 +1063,13 @@ BOOL CMruPidlList::_LoadNodeSlots() DWORD cbNodeSlots = m_cSlotRooms * sizeof(BYTE); if (SHGetValueW(m_hKey, NULL, L"NodeSlots", NULL, m_pbNodeSlots, &cbNodeSlots) != ERROR_SUCCESS) return FALSE; - m_cMaxNodeSlots = m_cSlotRooms; + m_cMaxNodeSlots = cbNodeSlots / sizeof(BYTE); return TRUE; } void CMruPidlList::_SaveNodeSlots() { - DWORD cbNodeSlots = m_cSlotRooms * sizeof(BYTE); + DWORD cbNodeSlots = m_cMaxNodeSlots * sizeof(BYTE); SHSetValueW(m_hKey, NULL, L"NodeSlots", REG_BINARY, m_pbNodeSlots, cbNodeSlots); } @@ -1126,34 +1122,53 @@ HRESULT CMruPidlList::GetEmptySlot(UINT *pnNodeSlot) STDMETHODIMP CMruPidlList::InitList(UINT cMRUSize, HKEY hKey, LPCWSTR pszSubKey) { + TRACE("%p -> %u %p %s\n", this, cMRUSize, hKey, debugstr_w(pszSubKey)); + HRESULT hr = InitData(cMRUSize, 0, hKey, pszSubKey, NULL); if (FAILED(hr)) + { + ERR("0x%08lX\n", hr); return hr; + } hr = _InitNodeSlots(); if (FAILED(hr)) + { + ERR("0x%08lX\n", hr); return hr; + } m_hMutex = ::CreateMutexW(NULL, FALSE, L"Shell.CMruPidlList"); if (!m_hMutex) + { hr = HRESULT_FROM_WIN32(GetLastError()); + ERR("0x%08lX\n", hr); + } return hr; } STDMETHODIMP CMruPidlList::UsePidl(LPCITEMIDLIST pidl, UINT *pnNodeSlot) { + TRACE("%p -> %p %p\n", this, pidl, pnNodeSlot); + CSafeMutex mutex; HRESULT hr = mutex.Enter(m_hMutex); if (FAILED(hr)) + { + ERR("0x%08lX\n", hr); return hr; + } *pnNodeSlot = 0; CMruNode *pNode; hr = GetNode(TRUE, pidl, &pNode); if (FAILED(hr)) + { + ERR("0x%08lX\n", hr); return hr; + } hr = pNode->GetNodeSlot(pnNodeSlot); if (FAILED(hr)) @@ -1175,17 +1190,25 @@ STDMETHODIMP CMruPidlList::QueryPidl( UINT *pnNodeSlots, UINT *pcNodeSlots) { + TRACE("%p -> %p %u %p %p\n", this, pidl, cSlots, pnNodeSlots, pcNodeSlots); + CSafeMutex mutex; HRESULT hr = mutex.Enter(m_hMutex); if (FAILED(hr)) + { + ERR("0x%08lX\n", hr); return hr; + } *pcNodeSlots = 0; CMruNode *pNode; hr = GetNode(FALSE, pidl, &pNode); if (FAILED(hr)) + { + ERR("0x%08lX\n", hr); return hr; + } while (pNode && *pcNodeSlots < cSlots) { @@ -1210,10 +1233,15 @@ STDMETHODIMP CMruPidlList::QueryPidl( STDMETHODIMP CMruPidlList::PruneKids(LPCITEMIDLIST pidl) { + TRACE("%p -> %p\n", this, pidl); + CSafeMutex mutex; HRESULT hr = mutex.Enter(m_hMutex); if (FAILED(hr)) + { + ERR("0x%08lX\n", hr); return hr; + } if (!_LoadNodeSlots()) return hr; diff --git a/dll/win32/shdocvw/shdocvw_v1.rgs b/dll/win32/shdocvw/shdocvw_v1.rgs index 9ad6c4ecd37..24d937e4441 100644 --- a/dll/win32/shdocvw/shdocvw_v1.rgs +++ b/dll/win32/shdocvw/shdocvw_v1.rgs @@ -203,6 +203,10 @@ HKCR { InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } } + '{42AEDC87-2188-41FD-B9A3-0C966FEABEC1}' = s 'MruPidlList' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + } } 'Shell.Explorer.1' = s 'Microsoft Web Browser Version 1' { diff --git a/modules/rostests/apitests/shdocvw/CMakeLists.txt b/modules/rostests/apitests/shdocvw/CMakeLists.txt index 72fcc69af22..3f4c6324b57 100644 --- a/modules/rostests/apitests/shdocvw/CMakeLists.txt +++ b/modules/rostests/apitests/shdocvw/CMakeLists.txt @@ -6,5 +6,5 @@ list(APPEND SOURCE add_executable(shdocvw_apitest ${SOURCE}) set_module_type(shdocvw_apitest win32cui) target_link_libraries(shdocvw_apitest ${PSEH_LIB} uuid) -add_importlibs(shdocvw_apitest shlwapi oleaut32 ole32 user32 advapi32 msvcrt kernel32) +add_importlibs(shdocvw_apitest shlwapi shell32 oleaut32 ole32 user32 advapi32 msvcrt kernel32) add_rostests_file(TARGET shdocvw_apitest) diff --git a/modules/rostests/apitests/shdocvw/MRUList.cpp b/modules/rostests/apitests/shdocvw/MRUList.cpp index 73c110dc68c..a0a1cd6fee2 100644 --- a/modules/rostests/apitests/shdocvw/MRUList.cpp +++ b/modules/rostests/apitests/shdocvw/MRUList.cpp @@ -19,10 +19,11 @@ #include <pseh/pseh2.h> #define SUBKEY0 L"Software\\MRUListTest" +#define SUBSUBKEY0 L"Software\\MRUListTest\\0" #define TEXT0 L"This is a test." #define TEXT1 L"ReactOS rocks!" -static void MRUList_List0(void) +static void MRUList_DataList_0(void) { HRESULT hr; IMruDataList *pList = NULL; @@ -64,27 +65,35 @@ static void MRUList_List0(void) pList->Release(); } -static void MRUList_List0_Check(void) +static INT MRUList_Check(LPCWSTR pszSubKey, LPCWSTR pszValueName, LPCVOID pvData, DWORD cbData) { BYTE abData[512]; - DWORD cbData, dwType; + LONG error; + DWORD dwSize = cbData; - cbData = sizeof(abData); - LONG error = SHGetValueW(HKEY_CURRENT_USER, SUBKEY0, L"MRUListEx", &dwType, abData, &cbData); - ok_long(error, ERROR_SUCCESS); - ok_long(dwType, REG_BINARY); -#if 1 - ok_int(memcmp(abData, "\x01\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFF", 12), 0); -#else - for (DWORD i = 0; i < cbData; ++i) + error = SHGetValueW(HKEY_CURRENT_USER, pszSubKey, pszValueName, NULL, abData, &dwSize); + if (error != ERROR_SUCCESS) + return -999; + +#if 0 + printf("dwSize: %ld\n", dwSize); + for (DWORD i = 0; i < dwSize; ++i) { printf("%02X ", abData[i]); } printf("\n"); #endif + + if (dwSize != cbData) + return +999; + + if (!pvData) + return TRUE; + + return memcmp(abData, pvData, cbData) == 0; } -static void MRUList_List1(void) +static void MRUList_DataList_1(void) { HRESULT hr; IMruDataList *pList = NULL; @@ -119,27 +128,7 @@ static void MRUList_List1(void) pList->Release(); } -static void MRUList_List1_Check(void) -{ - BYTE abData[512]; - DWORD cbData, dwType; - - cbData = sizeof(abData); - LONG error = SHGetValueW(HKEY_CURRENT_USER, SUBKEY0, L"MRUListEx", &dwType, abData, &cbData); - ok_long(error, ERROR_SUCCESS); - ok_long(dwType, REG_BINARY); -#if 1 - ok_int(memcmp(abData, "\x01\x00\x00\x00\xFF\xFF\xFF\xFF", 8), 0); -#else - for (DWORD i = 0; i < cbData; ++i) - { - printf("%02X ", abData[i]); - } - printf("\n"); -#endif -} - -static void MRUList_List2(void) +static void MRUList_DataList_2(void) { HRESULT hr; IMruDataList *pList = NULL; @@ -172,27 +161,7 @@ static void MRUList_List2(void) pList->Release(); } -static void MRUList_List2_Check(void) -{ - BYTE abData[512]; - DWORD cbData, dwType; - - cbData = sizeof(abData); - LONG error = SHGetValueW(HKEY_CURRENT_USER, SUBKEY0, L"MRUListEx", &dwType, abData, &cbData); - ok_long(error, ERROR_SUCCESS); - ok_long(dwType, REG_BINARY); -#if 1 - ok_int(memcmp(abData, "\x00\x00\x00\x00\x01\x00\x00\x00\xFF\xFF\xFF\xFF", 12), 0); -#else - for (DWORD i = 0; i < cbData; ++i) - { - printf("%02X ", abData[i]); - } - printf("\n"); -#endif -} - -static void MRUList_List(void) +static void MRUList_DataList(void) { if (IsWindowsVistaOrGreater()) { @@ -209,11 +178,11 @@ static void MRUList_List(void) error = SHGetValueW(HKEY_CURRENT_USER, SUBKEY0, NULL, NULL, NULL, NULL); ok_long(error, ERROR_SUCCESS); - MRUList_List0(); - MRUList_List0_Check(); + MRUList_DataList_0(); + ok_int(MRUList_Check(SUBKEY0, L"MRUListEx", "\x01\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFF", 12), TRUE); - MRUList_List1(); - MRUList_List1_Check(); + MRUList_DataList_1(); + ok_int(MRUList_Check(SUBKEY0, L"MRUListEx", "\x01\x00\x00\x00\xFF\xFF\xFF\xFF", 8), TRUE); error = SHDeleteValueW(HKEY_CURRENT_USER, SUBKEY0, L"MRUList"); ok_long(error, ERROR_FILE_NOT_FOUND); @@ -227,8 +196,8 @@ static void MRUList_List(void) error = SHSetValueW(HKEY_CURRENT_USER, SUBKEY0, L"b", REG_BINARY, L"XYZ", 4 * sizeof(WCHAR)); ok_long(error, ERROR_SUCCESS); - MRUList_List2(); - MRUList_List2_Check(); + MRUList_DataList_2(); + ok_int(MRUList_Check(SUBKEY0, L"MRUListEx", "\x00\x00\x00\x00\x01\x00\x00\x00\xFF\xFF\xFF\xFF", 12), TRUE); error = SHDeleteValueW(HKEY_CURRENT_USER, SUBKEY0, L"MRUList"); ok_long(error, ERROR_FILE_NOT_FOUND); @@ -238,12 +207,139 @@ static void MRUList_List(void) SHDeleteKeyW(HKEY_CURRENT_USER, SUBKEY0); } +static void MRUList_PidlList_0(void) +{ + HRESULT hr; + IMruPidlList *pList = NULL; + + hr = CoCreateInstance(CLSID_MruPidlList, NULL, CLSCTX_INPROC_SERVER, + IID_IMruPidlList, (LPVOID*)&pList); + ok_hex(hr, S_OK); + if (pList == NULL) + { + skip("pList was NULL\n"); + return; + } + + LONG error; + + error = SHGetValueW(HKEY_CURRENT_USER, SUBKEY0, NULL, NULL, NULL, NULL); + ok_long(error, ERROR_FILE_NOT_FOUND); + + hr = pList->InitList(32, HKEY_CURRENT_USER, SUBKEY0); + ok_hex(hr, S_OK); + + error = SHGetValueW(HKEY_CURRENT_USER, SUBKEY0, NULL, NULL, NULL, NULL); + ok_long(error, ERROR_FILE_NOT_FOUND); + + LPITEMIDLIST pidl1, pidl2; + SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl1); + SHGetSpecialFolderLocation(NULL, CSIDL_PERSONAL, &pidl2); + + UINT uNodeSlot1 = 0xDEADFACE; + hr = pList->UsePidl(pidl1, &uNodeSlot1); + ok_hex(uNodeSlot1, 1); + + // "NodeSlot" value + ok_int(MRUList_Check(SUBKEY0, L"NodeSlot", "\x01\x00\x00\x00", 4), TRUE); + + // "NodeSlots" value (Not "NodeSlot") + ok_int(MRUList_Check(SUBKEY0, L"NodeSlots", "\x02", 1), TRUE); + + UINT uNodeSlot2 = 0xDEADFACE; + hr = pList->UsePidl(pidl2, &uNodeSlot2); + ok_hex(uNodeSlot2, 2); + + // "0" value + ok_int(MRUList_Check(SUBKEY0, L"0", NULL, 22), TRUE); + + // "MRUListEx" value + ok_int(MRUList_Check(SUBKEY0, L"MRUListEx", "\x00\x00\x00\x00\xFF\xFF\xFF\xFF", 8), TRUE); + + // "NodeSlot" value + ok_int(MRUList_Check(SUBKEY0, L"NodeSlot", "\x01\x00\x00\x00", 4), TRUE); + + // "NodeSlots" value + ok_int(MRUList_Check(SUBKEY0, L"NodeSlots", "\x02\x02", 2), TRUE); + + // SUBSUBKEY0: "MRUListEx" value + ok_int(MRUList_Check(SUBSUBKEY0, L"MRUListEx", "\xFF\xFF\xFF\xFF", 4), TRUE); + + // SUBSUBKEY0: "NodeSlot" value + ok_int(MRUList_Check(SUBSUBKEY0, L"NodeSlot", "\x02\x00\x00\x00", 4), TRUE); + + // QueryPidl + UINT anNodeSlot[2], cNodeSlots; + FillMemory(anNodeSlot, sizeof(anNodeSlot), 0xCC); + cNodeSlots = 0xDEAD; + hr = pList->QueryPidl(pidl1, _countof(anNodeSlot), anNodeSlot, &cNodeSlots); + ok_long(hr, S_OK); + ok_int(anNodeSlot[0], 1); + ok_int(anNodeSlot[1], 0xCCCCCCCC); + ok_int(cNodeSlots, 1); + + hr = pList->PruneKids(pidl1); + + // "MRUListEx" value + ok_int(MRUList_Check(SUBKEY0, L"MRUListEx", "\x00\x00\x00\x00\xFF\xFF\xFF\xFF", 8), TRUE); + + // "NodeSlot" value + ok_int(MRUList_Check(SUBKEY0, L"NodeSlot", "\x01\x00\x00\x00", 4), TRUE); + + // "NodeSlots" value + ok_int(MRUList_Check(SUBKEY0, L"NodeSlots", "\x02\x00", 2), TRUE); + + FillMemory(anNodeSlot, sizeof(anNodeSlot), 0xCC); + cNodeSlots = 0xBEEF; + hr = pList->QueryPidl(pidl1, 0, anNodeSlot, &cNodeSlots); + ok_long(hr, E_FAIL); + ok_int(anNodeSlot[0], 0xCCCCCCCC); + ok_int(anNodeSlot[1], 0xCCCCCCCC); + ok_int(cNodeSlots, 0); + + FillMemory(anNodeSlot, sizeof(anNodeSlot), 0xCC); + cNodeSlots = 0xDEAD; + hr = pList->QueryPidl(pidl1, _countof(anNodeSlot), anNodeSlot, &cNodeSlots); + ok_long(hr, S_OK); + ok_int(anNodeSlot[0], 1); + ok_int(anNodeSlot[1], 0xCCCCCCCC); + ok_int(cNodeSlots, 1); + + FillMemory(anNodeSlot, sizeof(anNodeSlot), 0xCC); + cNodeSlots = 0xDEAD; + hr = pList->QueryPidl(pidl2, _countof(anNodeSlot), anNodeSlot, &cNodeSlots); + ok_long(hr, S_FALSE); + ok_int(anNodeSlot[0], 1); + ok_int(anNodeSlot[1], 0xCCCCCCCC); + ok_int(cNodeSlots, 1); + + pList->Release(); + ILFree(pidl1); + ILFree(pidl2); +} + +static void MRUList_PidlList(void) +{ + if (IsWindowsVistaOrGreater()) + { + skip("Vista+ doesn't support CLSID_MruPidlList\n"); + return; + } + + SHDeleteKeyW(HKEY_CURRENT_USER, SUBKEY0); + + MRUList_PidlList_0(); + + SHDeleteKeyW(HKEY_CURRENT_USER, SUBKEY0); +} + START_TEST(MRUList) { HRESULT hr = CoInitialize(NULL); ok_hex(hr, S_OK); - MRUList_List(); + MRUList_DataList(); + MRUList_PidlList(); if (SUCCEEDED(hr)) CoUninitialize();

1 year, 4 months

[reactos] 01/01: [IMAGELISTVIEWER] Avoid (DLGPROC) cast (#5697)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e06be778b9ab9cceacbe… commit 1e06be778b9ab9cceacbe560ac46032524da7e8b Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Mon Sep 18 12:22:59 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 18 10:22:59 2023 +0000 [IMAGELISTVIEWER] Avoid (DLGPROC) cast (#5697) --- modules/rostests/tests/Imagelistviewer/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/rostests/tests/Imagelistviewer/main.c b/modules/rostests/tests/Imagelistviewer/main.c index f2832906894..72510717bdc 100644 --- a/modules/rostests/tests/Imagelistviewer/main.c +++ b/modules/rostests/tests/Imagelistviewer/main.c @@ -88,8 +88,7 @@ DisplayImageList(HWND hwnd, return TRUE; } - -BOOL CALLBACK +INT_PTR CALLBACK DlgProc(HWND hwnd, UINT message, WPARAM wParam, @@ -142,5 +141,5 @@ WinMain(HINSTANCE hThisInstance, return DialogBox(hThisInstance, MAKEINTRESOURCE(IDD_IMGLST), NULL, - (DLGPROC)DlgProc); + DlgProc); }

1 year, 4 months

[reactos] 01/01: [TEMPLATES] Avoid (DLGPROC) casts

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a54e4c9f6d81e3ecc56f… commit 8a54e4c9f6d81e3ecc56f7ffba52d008b49cd0c3 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Sep 17 20:50:04 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Sep 17 20:50:04 2023 +0200 [TEMPLATES] Avoid (DLGPROC) casts The type-system is supposed to be our friend, not our enemy. I pushed this without PR, because the buildbots don't build the templates by default. That requires configure -DENABLE_ROSAPPS=1 -DENABLE_ROSAPPS_TEMPLATES=1 So no gain in running them. Greta Thunberg will appreciate the saved CPU-cycles to fight global warming. I verified it locally to compile without warnings on GCC8.4.0dbg x86 and it follows the same pattern as 0.4.15-dev-6626-g 806da4421c13becf47735ad33f18dafd542497df which passed all the bots successfully. Also the x64 ones. --- modules/rosapps/templates/dialog/dialog.c | 25 +++++++++++-------------- modules/rosapps/templates/dialog/memdlg.c | 8 +++----- modules/rosapps/templates/mdi/about.c | 8 +++----- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/modules/rosapps/templates/dialog/dialog.c b/modules/rosapps/templates/dialog/dialog.c index 0484e1854bd..ee3ec9a32c9 100644 --- a/modules/rosapps/templates/dialog/dialog.c +++ b/modules/rosapps/templates/dialog/dialog.c @@ -1,9 +1,7 @@ /* * ReactOS Standard Dialog Application Template * - * dialog.c - * - * Copyright (C) 2002 Robert Dickenson <robd(a)reactos.org> + * Copyright (C) 2002 Robert Dickenson <robd(a)reactos.org> * * 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 @@ -43,9 +41,9 @@ HWND hPage2; HWND hPage3; LRESULT CreateMemoryDialog(HINSTANCE, HWND hwndOwner, LPSTR lpszMessage); -LRESULT CALLBACK PageWndProc1(HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK PageWndProc2(HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK PageWndProc3(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK PageWndProc1(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK PageWndProc2(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK PageWndProc3(HWND, UINT, WPARAM, LPARAM); //////////////////////////////////////////////////////////////////////////////// @@ -64,9 +62,9 @@ static BOOL OnCreate(HWND hWnd, LONG lData) // Create tab pages hTabWnd = GetDlgItem(hWnd, IDC_TAB); - hPage1 = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PAGE1), hWnd, (DLGPROC)PageWndProc1); - hPage2 = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PAGE2), hWnd, (DLGPROC)PageWndProc2); - hPage3 = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PAGE3), hWnd, (DLGPROC)PageWndProc3); + hPage1 = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PAGE1), hWnd, PageWndProc1); + hPage2 = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PAGE2), hWnd, PageWndProc2); + hPage3 = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PAGE3), hWnd, PageWndProc3); // Insert tabs _tcscpy(szTemp, _T("Page One")); @@ -117,7 +115,7 @@ void OnTabWndSelChange(void) } } -LRESULT CALLBACK DlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK DlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { int idctrl; LPNMHDR pnmh; @@ -181,7 +179,6 @@ LRESULT CALLBACK DlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) return 0; } - int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, @@ -193,7 +190,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, DialogData instData = { NULL, 34 }; hInst = hInstance; - instData.hWnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_TABBED_DIALOG), NULL, (DLGPROC)DlgProc, (LPARAM)&instData); + instData.hWnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_TABBED_DIALOG), NULL, DlgProc, (LPARAM)&instData); ShowWindow(instData.hWnd, SW_SHOW); hAccel = LoadAccelerators(hInst, (LPCTSTR)IDR_ACCELERATOR); while (GetMessage(&msg, NULL, 0, 0)) { @@ -204,8 +201,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, } #else hInst = hInstance; - DialogBox(hInst, (LPCTSTR)IDD_TABBED_DIALOG, NULL, (DLGPROC)DlgProc); + DialogBox(hInst, (LPCTSTR)IDD_TABBED_DIALOG, NULL, DlgProc); //CreateMemoryDialog(hInst, GetDesktopWindow(), "CreateMemoryDialog"); #endif - return 0; + return 0; } diff --git a/modules/rosapps/templates/dialog/memdlg.c b/modules/rosapps/templates/dialog/memdlg.c index dd95e49f425..cba4d349d1d 100644 --- a/modules/rosapps/templates/dialog/memdlg.c +++ b/modules/rosapps/templates/dialog/memdlg.c @@ -1,9 +1,7 @@ /* * ReactOS Standard Dialog Application Template * - * memdlg.c - * - * Copyright (C) 2002 Robert Dickenson <robd(a)reactos.org> + * Copyright (C) 2002 Robert Dickenson <robd(a)reactos.org> * * 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 @@ -33,7 +31,7 @@ extern HINSTANCE hInst; //////////////////////////////////////////////////////////////////////////////// -LRESULT CALLBACK DialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK DialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { return 0; } @@ -144,7 +142,7 @@ LRESULT CreateMemoryDialog(HINSTANCE hinst, HWND hwndOwner, LPSTR lpszMessage) *lpw++ = 0; // no creation data GlobalUnlock(hgbl); - ret = DialogBoxIndirect(hinst, (LPDLGTEMPLATE)hgbl, hwndOwner, (DLGPROC)DialogWndProc); + ret = DialogBoxIndirect(hinst, (LPDLGTEMPLATE)hgbl, hwndOwner, DialogWndProc); if (ret == 0) { TRACE(_T("DialogBoxIndirect() failed due to invalid handle to parent window: 0x%08X"), hwndOwner); } else if (ret == -1) { diff --git a/modules/rosapps/templates/mdi/about.c b/modules/rosapps/templates/mdi/about.c index 84191f02a93..5cb488ec473 100644 --- a/modules/rosapps/templates/mdi/about.c +++ b/modules/rosapps/templates/mdi/about.c @@ -1,9 +1,7 @@ /* * ReactOS About Dialog Box * - * about.c - * - * Copyright (C) 2002 Robert Dickenson <robd(a)reactos.org> + * Copyright (C) 2002 Robert Dickenson <robd(a)reactos.org> * * 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 @@ -41,7 +39,7 @@ extern HINSTANCE hInst; -LRESULT CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { HWND hLicenseEditWnd; TCHAR strLicense[0x1000]; @@ -64,6 +62,6 @@ LRESULT CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPAR void ShowAboutBox(HWND hWnd) { - DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, (DLGPROC)AboutDialogWndProc); + DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, AboutDialogWndProc); }

1 year, 4 months

[reactos] 01/01: [CMICONTROL] Avoid (DLGPROC) cast (#5693)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=806da4421c13becf47735… commit 806da4421c13becf47735ad33f18dafd542497df Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Sep 17 19:47:23 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 17 17:47:23 2023 +0000 [CMICONTROL] Avoid (DLGPROC) cast (#5693) Yes, might slightly improve with x64, but that wasn't even my main motivation. (DLGPROC)-casts are nonsense even for x86 actually. --- drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp | 13 +++---------- drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h | 3 +-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp index 6649e4d4841..e5711703966 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp +++ b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp @@ -210,7 +210,6 @@ BOOL playTestTone() return TRUE; } - BOOL CALLBACK DSEnumProc(LPGUID lpGUID, LPCTSTR lpszDesc, LPCTSTR lpszDrvName, LPVOID lpContext) { LPGUID* pGUID = (LPGUID*)lpContext; @@ -312,7 +311,6 @@ BOOL setCurrentChannelConfig() LocalFree(guid); } - return FALSE; } @@ -414,7 +412,6 @@ BOOL getDeviceInterfaceDetail(const GUID* category, CMIDEV* pDev) } return TRUE; - } BOOL getDriverData(CMIDEV* pDev) @@ -545,7 +542,6 @@ void updateChannelBoxes(HWND hWnd) } } - BOOL setDlgItems(HWND hWnd) { HWND hWndItem; @@ -626,7 +622,6 @@ BOOL setDlgItems(HWND hWnd) SendMessage(GetDlgItem(hWndChild[0], IDC_EN_CENTER2MIC), BM_SETCHECK, (cmiData.enableCenter2Mic ? BST_CHECKED : BST_UNCHECKED), 0); SendMessage(GetDlgItem(hWndChild[0], IDC_NOROUTE_MIC), BM_SETCHECK, (!cmiData.enableCenter2Mic ? BST_CHECKED : BST_UNCHECKED), 0); - return TRUE; } @@ -687,7 +682,7 @@ BOOL initDialog(HWND hWnd) PrintLastError("TabCtrl_InsertItem()"); return FALSE; } - hWndChild[i] = CreateDialogParam(hInst, MAKEINTRESOURCE(tabsResource[i]), hWndTab, (DLGPROC)TabDlgProc, 0); + hWndChild[i] = CreateDialogParam(hInst, MAKEINTRESOURCE(tabsResource[i]), hWndTab, TabDlgProc, 0); } hURLFont = CreateFont(20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, VARIABLE_PITCH | FF_SWISS, "MS Shell Dlg"); @@ -753,7 +748,7 @@ void openURL(int control) ShellExecute(hWndMain, "open", buffer, NULL, NULL, SW_SHOWNORMAL); } -LRESULT CALLBACK TabDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK TabDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { case WM_COMMAND: @@ -777,7 +772,7 @@ LRESULT CALLBACK TabDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) if ( (GetDlgItem(hWndChild[3], IDC_URL1) == (HANDLE)lParam) || (GetDlgItem(hWndChild[3], IDC_URL2) == (HANDLE)lParam) ) { SetTextColor((HDC)wParam, 0xFF0000); SetBkMode((HDC)wParam, TRANSPARENT); - return (LRESULT)GetSysColorBrush(COLOR_BTNFACE); + return (INT_PTR)GetSysColorBrush(COLOR_BTNFACE); } } @@ -823,7 +818,6 @@ void deleteDriverFiles() { } } - void performUninstall() { deleteDriverFiles(); RegDeleteKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\CMIDriver"); @@ -931,7 +925,6 @@ void InitURLControl() if (RegisterClassEx(&wce) == 0) { PrintLastError("RegisterClassEx()"); } - } int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine, int iCmdShow) diff --git a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h index b0edfabf94a..a7f071fd894 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h +++ b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h @@ -64,10 +64,9 @@ typedef struct _CMIDEV { HDEVINFO Info; SP_DEVINFO_DATA InfoData; PSP_DEVICE_INTERFACE_DETAIL_DATA InterfaceDetailData; - } CMIDEV; -static LRESULT CALLBACK TabDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); +static INT_PTR CALLBACK TabDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); HINSTANCE hInst; HWND hWndMain;

1 year, 4 months

[reactos] 01/01: [SHDOCVW] Implement MRU List for Shell Bag, Part 5 (#5691)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd626dc163ce2c5a49385… commit fd626dc163ce2c5a49385bb515c5bdc4c2d93a54 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 17 19:52:50 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 17 19:52:50 2023 +0900 [SHDOCVW] Implement MRU List for Shell Bag, Part 5 (#5691) Follow-up to #5686. Implement CSafeMutex and CMruPidlList classes. CORE-9283 --- dll/win32/shdocvw/mrulist.cpp | 348 +++++++++++++++++++++++++++---------- dll/win32/shdocvw/shdocvw.h | 1 + dll/win32/shdocvw/shdocvw_main.c | 4 + sdk/include/reactos/shlobj_undoc.h | 6 +- 4 files changed, 266 insertions(+), 93 deletions(-) diff --git a/dll/win32/shdocvw/mrulist.cpp b/dll/win32/shdocvw/mrulist.cpp index f17f4069ff2..a81aa01315a 100644 --- a/dll/win32/shdocvw/mrulist.cpp +++ b/dll/win32/shdocvw/mrulist.cpp @@ -24,6 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +class CSafeMutex; class CMruBase; class CMruShortList; class CMruLongList; @@ -57,6 +58,35 @@ BOOL IEILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2, BOOL bUnknown) #define COMPARE_BY_IEILISEQUAL 0x3 #define COMPARE_BY_MASK 0xF +class CSafeMutex +{ +protected: + HANDLE m_hMutex; + +public: + CSafeMutex() : m_hMutex(NULL) + { + } + ~CSafeMutex() + { + if (m_hMutex) + { + ::ReleaseMutex(m_hMutex); + m_hMutex = NULL; + } + } + + HRESULT Enter(HANDLE hMutex) + { + DWORD wait = ::WaitForSingleObject(hMutex, 500); + if (wait != WAIT_OBJECT_0) + return E_FAIL; + + m_hMutex = hMutex; + return S_OK; + } +}; + class CMruBase : public IMruDataList { @@ -72,7 +102,7 @@ protected: SLOTITEMDATA * m_pSlots = NULL; // Slot data HRESULT _LoadItem(UINT iSlot); - HRESULT _AddItem(UINT iSlot, const BYTE *pbData, DWORD cbData); + HRESULT _AddItem(UINT iSlot, LPCVOID pvData, DWORD cbData); HRESULT _GetItem(UINT iSlot, SLOTITEMDATA **ppItem); void _DeleteItem(UINT iSlot); @@ -96,9 +126,9 @@ public: STDMETHODIMP InitData(UINT cCapacity, UINT flags, HKEY hKey, LPCWSTR pszSubKey OPTIONAL, SLOTCOMPARE fnCompare OPTIONAL) override; - STDMETHODIMP AddData(const BYTE *pbData, DWORD cbData, UINT *piSlot) override; - STDMETHODIMP FindData(const BYTE *pbData, DWORD cbData, UINT *piSlot) override; - STDMETHODIMP GetData(UINT iSlot, BYTE *pbData, DWORD cbData) override; + STDMETHODIMP AddData(LPCVOID pvData, DWORD cbData, UINT *piSlot) override; + STDMETHODIMP FindData(LPCVOID pvData, DWORD cbData, UINT *piSlot) override; + STDMETHODIMP GetData(UINT iSlot, LPVOID pvData, DWORD cbData) override; STDMETHODIMP QueryInfo(UINT iSlot, UINT *puSlot, DWORD *pcbData) override; STDMETHODIMP Delete(UINT iSlot) override; @@ -241,14 +271,14 @@ void CMruBase::_CheckUsedSlots() m_bChecked = TRUE; } -HRESULT CMruBase::_AddItem(UINT iSlot, const BYTE *pbData, DWORD cbData) +HRESULT CMruBase::_AddItem(UINT iSlot, LPCVOID pvData, DWORD cbData) { SLOTITEMDATA *pItem = &m_pSlots[iSlot]; WCHAR szBuff[12]; _SlotString(iSlot, szBuff, _countof(szBuff)); - if (SHSetValueW(m_hKey, NULL, szBuff, REG_BINARY, pbData, cbData) != ERROR_SUCCESS) + if (SHSetValueW(m_hKey, NULL, szBuff, REG_BINARY, pvData, cbData) != ERROR_SUCCESS) return E_OUTOFMEMORY; if (cbData >= pItem->cbData || !pItem->pvData) @@ -262,7 +292,7 @@ HRESULT CMruBase::_AddItem(UINT iSlot, const BYTE *pbData, DWORD cbData) pItem->cbData = cbData; pItem->dwFlags = (SLOT_LOADED | SLOT_SET); - CopyMemory(pItem->pvData, pbData, cbData); + CopyMemory(pItem->pvData, pvData, cbData); return S_OK; } @@ -293,14 +323,14 @@ CMruBase::InitData( return _InitSlots(); } -STDMETHODIMP CMruBase::AddData(const BYTE *pbData, DWORD cbData, UINT *piSlot) +STDMETHODIMP CMruBase::AddData(LPCVOID pvData, DWORD cbData, UINT *piSlot) { UINT iSlot; - HRESULT hr = FindData(pbData, cbData, &iSlot); + HRESULT hr = FindData(pvData, cbData, &iSlot); if (FAILED(hr)) { iSlot = _UpdateSlots(m_cSlots); - hr = _AddItem(iSlot, pbData, cbData); + hr = _AddItem(iSlot, pvData, cbData); if (FAILED(hr)) return hr; } @@ -316,14 +346,14 @@ STDMETHODIMP CMruBase::AddData(const BYTE *pbData, DWORD cbData, UINT *piSlot) return hr; } -STDMETHODIMP CMruBase::FindData(const BYTE *pbData, DWORD cbData, UINT *piSlot) +STDMETHODIMP CMruBase::FindData(LPCVOID pvData, DWORD cbData, UINT *piSlot) { if (m_cSlots <= 0) return E_FAIL; UINT iSlot = 0; SLOTITEMDATA *pItem; - while (FAILED(_GetItem(iSlot, &pItem)) || !_IsEqual(pItem, pbData, cbData)) + while (FAILED(_GetItem(iSlot, &pItem)) || !_IsEqual(pItem, pvData, cbData)) { if (++iSlot >= m_cSlots) return E_FAIL; @@ -333,7 +363,7 @@ STDMETHODIMP CMruBase::FindData(const BYTE *pbData, DWORD cbData, UINT *piSlot) return S_OK; } -STDMETHODIMP CMruBase::GetData(UINT iSlot, BYTE *pbData, DWORD cbData) +STDMETHODIMP CMruBase::GetData(UINT iSlot, LPVOID pvData, DWORD cbData) { SLOTITEMDATA *pItem; HRESULT hr = _GetItem(iSlot, &pItem); @@ -343,7 +373,7 @@ STDMETHODIMP CMruBase::GetData(UINT iSlot, BYTE *pbData, DWORD cbData) if (cbData < pItem->cbData) return 0x8007007A; // FIXME: Magic number - CopyMemory(pbData, pItem->pvData, pItem->cbData); + CopyMemory(pvData, pItem->pvData, pItem->cbData); return hr; } @@ -694,7 +724,7 @@ void CMruLongList::_ImportShortList() if (FAILED(hr)) break; - _AddItem(iSlot, (const BYTE*)pItem->pvData, pItem->cbData); + _AddItem(iSlot, pItem->pvData, pItem->cbData); pShortList->_DeleteItem(iSlot); m_puSlotData[m_cSlots++] = iSlot; @@ -751,10 +781,10 @@ public: HRESULT BindToSlot(UINT iSlot, IShellFolder **ppSF); HRESULT GetNode(BOOL bAdd, LPCITEMIDLIST pidl, CMruNode **pNewNode); - HRESULT GetNodeSlot(UINT *piSlot); - HRESULT SetNodeSlot(UINT iSlot); + HRESULT GetNodeSlot(UINT *pnNodeSlot); + HRESULT SetNodeSlot(UINT nNodeSlot); - HRESULT RemoveLeast(UINT *piSlot); + HRESULT RemoveLeast(UINT *pnNodeSlot); HRESULT Clear(CMruPidlList *pList); }; @@ -793,10 +823,10 @@ HRESULT CMruNode::_CreateNode(UINT iSlot, CMruNode **ppNewNode) if (!pNewNode) return E_OUTOFMEMORY; - WCHAR szBuff[12]; - _SlotString(iSlot, szBuff, _countof(szBuff)); + WCHAR szSubKey[12]; + _SlotString(iSlot, szSubKey, _countof(szSubKey)); - HRESULT hr = pNewNode->InitData(m_cSlotRooms, 0, m_hKey, szBuff, NULL); + HRESULT hr = pNewNode->InitData(m_cSlotRooms, 0, m_hKey, szSubKey, NULL); if (FAILED(hr)) pNewNode->Release(); else @@ -876,19 +906,19 @@ BOOL CMruNode::_IsEqual(SLOTITEMDATA *pItem, LPCVOID pvData, UINT cbData) (LPCITEMIDLIST)pvData) == 0; } -HRESULT CMruNode::GetNodeSlot(UINT *piSlot) +HRESULT CMruNode::GetNodeSlot(UINT *pnNodeSlot) { DWORD dwData, cbData = sizeof(dwData); - DWORD error = SHGetValueW(m_hKey, NULL, L"NodeSlot", NULL, &dwData, (piSlot ? &cbData : NULL)); + DWORD error = SHGetValueW(m_hKey, NULL, L"NodeSlot", NULL, &dwData, (pnNodeSlot ? &cbData : NULL)); if (error != ERROR_SUCCESS) return E_FAIL; - *piSlot = (UINT)dwData; + *pnNodeSlot = (UINT)dwData; return S_OK; } -HRESULT CMruNode::SetNodeSlot(UINT iSlot) +HRESULT CMruNode::SetNodeSlot(UINT nNodeSlot) { - DWORD dwData = iSlot; + DWORD dwData = nNodeSlot; if (SHSetValueW(m_hKey, NULL, L"NodeSlot", REG_DWORD, &dwData, sizeof(dwData)) != ERROR_SUCCESS) return E_FAIL; return S_OK; @@ -896,7 +926,7 @@ HRESULT CMruNode::SetNodeSlot(UINT iSlot) HRESULT CMruNode::_AddPidl(UINT iSlot, LPCITEMIDLIST pidl) { - return CMruBase::_AddItem(iSlot, (const BYTE*)pidl, sizeof(WORD) + pidl->mkid.cb); + return CMruBase::_AddItem(iSlot, pidl, sizeof(WORD) + pidl->mkid.cb); } DWORD CMruNode::_DeleteValue(LPCWSTR pszValue) @@ -907,7 +937,7 @@ DWORD CMruNode::_DeleteValue(LPCWSTR pszValue) HRESULT CMruNode::_FindPidl(LPCITEMIDLIST pidl, UINT *piSlot) { - return FindData((const BYTE *)pidl, sizeof(WORD) + pidl->mkid.cb, piSlot); + return FindData(pidl, sizeof(WORD) + pidl->mkid.cb, piSlot); } HRESULT CMruNode::_GetPidlSlot(LPCITEMIDLIST pidl, BOOL bAdd, UINT *piSlot) @@ -933,11 +963,11 @@ HRESULT CMruNode::_GetPidlSlot(LPCITEMIDLIST pidl, BOOL bAdd, UINT *piSlot) return hr; } -HRESULT CMruNode::RemoveLeast(UINT *piSlot) +HRESULT CMruNode::RemoveLeast(UINT *pnNodeSlot) { if (!m_cSlots) { - CMruNode::GetNodeSlot(piSlot); + GetNodeSlot(pnNodeSlot); return S_FALSE; } @@ -947,10 +977,10 @@ HRESULT CMruNode::RemoveLeast(UINT *piSlot) return hr; CMruNode *pNode; - hr = CMruNode::_CreateNode(uSlot, &pNode); + hr = _CreateNode(uSlot, &pNode); if (SUCCEEDED(hr)) { - hr = pNode->RemoveLeast(piSlot); + hr = pNode->RemoveLeast(pnNodeSlot); pNode->Release(); } @@ -965,42 +995,24 @@ HRESULT CMruNode::RemoveLeast(UINT *piSlot) } class CMruPidlList - : public IMruPidlList - , public CMruNode + : public CMruNode + , public IMruPidlList { protected: - LPBYTE m_pbSlots = NULL; // The data - DWORD m_cbSlots = 0; // The data size + LPBYTE m_pbNodeSlots = NULL; // The node slots (contains SLOT_... flags) + DWORD m_cMaxNodeSlots = 0; // The upper bound of the node slot index HANDLE m_hMutex = NULL; // The mutex (for sync) - BOOL _LoadNodeSlots() - { - DWORD cbSlots = m_cbSlots; - if (SHGetValueW(m_hKey, NULL, L"NodeSlots", NULL, m_pbSlots, &cbSlots) != ERROR_SUCCESS) - return FALSE; - m_cbSlots = cbSlots; - return TRUE; - } - - void _SaveNodeSlots() - { - SHSetValueW(m_hKey, NULL, L"NodeSlots", REG_BINARY, m_pbSlots, m_cbSlots); - } + BOOL _LoadNodeSlots(); + void _SaveNodeSlots(); + HRESULT _InitNodeSlots(); public: - CMruPidlList() - { - } + CMruPidlList() { } + ~CMruPidlList() override; - virtual ~CMruPidlList() - { - m_pbSlots = (LPBYTE)::LocalFree(m_pbSlots); - if (m_hMutex) - { - ::CloseHandle(m_hMutex); - m_hMutex = NULL; - } - } + HRESULT GetEmptySlot(UINT *pnNodeSlot); + void EmptyNodeSlot(UINT nNodeSlot); // IUnknown methods STDMETHODIMP QueryInterface(REFIID riid, void **ppvObj) override; @@ -1014,18 +1026,26 @@ public: } // IMruPidlList methods - STDMETHODIMP InitList(UINT cMRUSize, HKEY hKey, LPCWSTR pszName) override; - STDMETHODIMP UsePidl(LPCITEMIDLIST pidl, UINT *puSlots) override; + STDMETHODIMP InitList(UINT cMRUSize, HKEY hKey, LPCWSTR pszSubKey) override; + STDMETHODIMP UsePidl(LPCITEMIDLIST pidl, UINT *pnNodeSlot) override; STDMETHODIMP QueryPidl( LPCITEMIDLIST pidl, UINT cSlots, - UINT *puSlots, - UINT *pcSlots) override; + UINT *pnNodeSlots, + UINT *pcNodeSlots) override; STDMETHODIMP PruneKids(LPCITEMIDLIST pidl) override; - - void EmptyNodeSlot(UINT iSlot); }; +CMruPidlList::~CMruPidlList() +{ + m_pbNodeSlots = (LPBYTE)::LocalFree(m_pbNodeSlots); + if (m_hMutex) + { + ::CloseHandle(m_hMutex); + m_hMutex = NULL; + } +} + STDMETHODIMP CMruPidlList::QueryInterface(REFIID riid, void **ppvObj) { if (!ppvObj) @@ -1042,32 +1062,182 @@ STDMETHODIMP CMruPidlList::QueryInterface(REFIID riid, void **ppvObj) return E_NOINTERFACE; } -STDMETHODIMP CMruPidlList::InitList(UINT cMRUSize, HKEY hKey, LPCWSTR pszName) +BOOL CMruPidlList::_LoadNodeSlots() +{ + DWORD cbNodeSlots = m_cSlotRooms * sizeof(BYTE); + if (SHGetValueW(m_hKey, NULL, L"NodeSlots", NULL, m_pbNodeSlots, &cbNodeSlots) != ERROR_SUCCESS) + return FALSE; + m_cMaxNodeSlots = m_cSlotRooms; + return TRUE; +} + +void CMruPidlList::_SaveNodeSlots() +{ + DWORD cbNodeSlots = m_cSlotRooms * sizeof(BYTE); + SHSetValueW(m_hKey, NULL, L"NodeSlots", REG_BINARY, m_pbNodeSlots, cbNodeSlots); +} + +HRESULT CMruPidlList::_InitNodeSlots() +{ + m_pbNodeSlots = (BYTE*)LocalAlloc(LPTR, m_cSlotRooms * sizeof(BYTE)); + if (!m_pbNodeSlots) + return E_OUTOFMEMORY; + + _LoadNodeSlots(); + m_bNeedSave = TRUE; + _SaveNodeSlots(); + + return S_OK; +} + +HRESULT CMruPidlList::GetEmptySlot(UINT *pnNodeSlot) +{ + *pnNodeSlot = 0; + + if (!_LoadNodeSlots()) + return E_FAIL; + + if (m_cMaxNodeSlots < m_cSlotRooms) + { + m_pbNodeSlots[m_cMaxNodeSlots] = SLOT_SET; + *pnNodeSlot = ++m_cMaxNodeSlots; + _SaveNodeSlots(); + return S_OK; + } + + for (UINT iNodeSlot = 0; iNodeSlot < m_cMaxNodeSlots; ++iNodeSlot) + { + if (m_pbNodeSlots[iNodeSlot] & SLOT_SET) + continue; + + m_pbNodeSlots[iNodeSlot] = SLOT_SET; + *pnNodeSlot = iNodeSlot + 1; // nNodeSlot is 1-base + _SaveNodeSlots(); + return S_OK; + } + + HRESULT hr = E_FAIL; + if (SUCCEEDED(RemoveLeast(pnNodeSlot)) && *pnNodeSlot) + hr = S_OK; + + _SaveNodeSlots(); + return hr; +} + +STDMETHODIMP CMruPidlList::InitList(UINT cMRUSize, HKEY hKey, LPCWSTR pszSubKey) { - FIXME("Stub\n"); - return E_NOTIMPL; + HRESULT hr = InitData(cMRUSize, 0, hKey, pszSubKey, NULL); + if (FAILED(hr)) + return hr; + + hr = _InitNodeSlots(); + if (FAILED(hr)) + return hr; + + m_hMutex = ::CreateMutexW(NULL, FALSE, L"Shell.CMruPidlList"); + if (!m_hMutex) + hr = HRESULT_FROM_WIN32(GetLastError()); + + return hr; } -STDMETHODIMP CMruPidlList::UsePidl(LPCITEMIDLIST pidl, UINT *puSlots) +STDMETHODIMP CMruPidlList::UsePidl(LPCITEMIDLIST pidl, UINT *pnNodeSlot) { - FIXME("Stub\n"); - return E_NOTIMPL; + CSafeMutex mutex; + HRESULT hr = mutex.Enter(m_hMutex); + if (FAILED(hr)) + return hr; + + *pnNodeSlot = 0; + + CMruNode *pNode; + hr = GetNode(TRUE, pidl, &pNode); + if (FAILED(hr)) + return hr; + + hr = pNode->GetNodeSlot(pnNodeSlot); + if (FAILED(hr)) + { + hr = GetEmptySlot(pnNodeSlot); + if (SUCCEEDED(hr)) + { + hr = pNode->SetNodeSlot(*pnNodeSlot); + } + } + + pNode->Release(); + return hr; } STDMETHODIMP CMruPidlList::QueryPidl( LPCITEMIDLIST pidl, UINT cSlots, - UINT *puSlots, - UINT *pcSlots) + UINT *pnNodeSlots, + UINT *pcNodeSlots) { - FIXME("Stub\n"); - return E_NOTIMPL; + CSafeMutex mutex; + HRESULT hr = mutex.Enter(m_hMutex); + if (FAILED(hr)) + return hr; + + *pcNodeSlots = 0; + + CMruNode *pNode; + hr = GetNode(FALSE, pidl, &pNode); + if (FAILED(hr)) + return hr; + + while (pNode && *pcNodeSlots < cSlots) + { + CMruNode *pParent = pNode->GetParent(); + if (SUCCEEDED(pNode->GetNodeSlot(&pnNodeSlots[*pcNodeSlots]))) + ++(*pcNodeSlots); + else if (hr == S_OK && !*pcNodeSlots) + hr = S_FALSE; + + pNode->Release(); + pNode = pParent; + } + + if (pNode) + pNode->Release(); + + if (SUCCEEDED(hr) && !*pcNodeSlots) + hr = E_FAIL; + + return hr; } STDMETHODIMP CMruPidlList::PruneKids(LPCITEMIDLIST pidl) { - FIXME("Stub\n"); - return E_NOTIMPL; + CSafeMutex mutex; + HRESULT hr = mutex.Enter(m_hMutex); + if (FAILED(hr)) + return hr; + + if (!_LoadNodeSlots()) + return hr; + + CMruNode *pNode; + hr = GetNode(FALSE, pidl, &pNode); + if (FAILED(hr)) + return hr; + + if (hr == S_OK) + hr = pNode->Clear(this); + else + hr = E_FAIL; + + pNode->Release(); + + _SaveNodeSlots(); + return hr; +} + +void CMruPidlList::EmptyNodeSlot(UINT nNodeSlot) +{ + m_pbNodeSlots[nNodeSlot - 1] = 0; // nNodeSlot is 1-base + m_bNeedSave = TRUE; } EXTERN_C HRESULT CMruPidlList_CreateInstance(DWORD_PTR dwUnused1, void **ppv, DWORD_PTR dwUnused3) @@ -1091,29 +1261,27 @@ EXTERN_C HRESULT CMruPidlList_CreateInstance(DWORD_PTR dwUnused1, void **ppv, DW return S_OK; } -void CMruPidlList::EmptyNodeSlot(UINT iSlot) -{ - m_pbSlots[iSlot - 1] = 0; - m_bNeedSave = TRUE; -} - HRESULT CMruNode::Clear(CMruPidlList *pList) { - UINT uSlot; + UINT uSlot, nNodeSlot; + HRESULT hr; + while (SUCCEEDED(_GetSlot(0, &uSlot))) { CMruNode *pNode; - if (SUCCEEDED(CMruNode::_CreateNode(uSlot, &pNode))) + hr = _CreateNode(uSlot, &pNode); + if (SUCCEEDED(hr)) { - UINT iSlot; - if (SUCCEEDED(pNode->GetNodeSlot(&iSlot))) - pList->EmptyNodeSlot(iSlot); + hr = pNode->GetNodeSlot(&nNodeSlot); + if (SUCCEEDED(hr)) + pList->EmptyNodeSlot(nNodeSlot); pNode->Clear(pList); pNode->Release(); } Delete(0); } + return S_OK; } diff --git a/dll/win32/shdocvw/shdocvw.h b/dll/win32/shdocvw/shdocvw.h index d58ee69384f..4569fe7e171 100644 --- a/dll/win32/shdocvw/shdocvw.h +++ b/dll/win32/shdocvw/shdocvw.h @@ -61,6 +61,7 @@ static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_r #ifdef __REACTOS__ EXTERN_C HRESULT CMruLongList_CreateInstance(DWORD_PTR dwUnused1, void **ppv, DWORD_PTR dwUnused3); +EXTERN_C HRESULT CMruPidlList_CreateInstance(DWORD_PTR dwUnused1, void **ppv, DWORD_PTR dwUnused3); EXTERN_C HRESULT CMruClassFactory_CreateInstance(REFIID riid, void **ppv); #endif diff --git a/dll/win32/shdocvw/shdocvw_main.c b/dll/win32/shdocvw/shdocvw_main.c index 8cab06cce77..5994e88c58a 100644 --- a/dll/win32/shdocvw/shdocvw_main.c +++ b/dll/win32/shdocvw/shdocvw_main.c @@ -105,6 +105,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { return CMruLongList_CreateInstance(0, ppv, 0); } + else if (IsEqualGUID(riid, &IID_IMruPidlList)) + { + return CMruPidlList_CreateInstance(0, ppv, 0); + } #endif /* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */ diff --git a/sdk/include/reactos/shlobj_undoc.h b/sdk/include/reactos/shlobj_undoc.h index 0601d6fbd7b..40a5a576b88 100644 --- a/sdk/include/reactos/shlobj_undoc.h +++ b/sdk/include/reactos/shlobj_undoc.h @@ -699,9 +699,9 @@ DECLARE_INTERFACE_(IMruDataList, IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IMruDataList ***/ STDMETHOD(InitData)(THIS_ UINT, UINT, HKEY, LPCWSTR, SLOTCOMPARE) PURE; - STDMETHOD(AddData)(THIS_ const BYTE *, DWORD, UINT*) PURE; - STDMETHOD(FindData)(THIS_ const BYTE*, DWORD, UINT*) PURE; - STDMETHOD(GetData)(THIS_ UINT, BYTE*, DWORD) PURE; + STDMETHOD(AddData)(THIS_ LPCVOID , DWORD, UINT*) PURE; + STDMETHOD(FindData)(THIS_ LPCVOID , DWORD, UINT*) PURE; + STDMETHOD(GetData)(THIS_ UINT, LPVOID, DWORD) PURE; STDMETHOD(QueryInfo)(THIS_ UINT, UINT*, DWORD*) PURE; STDMETHOD(Delete)(THIS_ UINT) PURE; };

1 year, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs