Ros-diffs September 2023

ros-diffs@reactos.org

23 participants
113 discussions

[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, 3 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, 3 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, 3 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, 3 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, 3 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, 3 months

[reactos] 01/01: [WIN32K] Do not try to free a unicode string that is an int-resource

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8650eac76cd554b46e222… commit 8650eac76cd554b46e222ec63dd78698dd51c29d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 9 10:41:27 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 17 10:40:19 2023 +0300 [WIN32K] Do not try to free a unicode string that is an int-resource --- win32ss/user/ntuser/cursoricon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/cursoricon.c b/win32ss/user/ntuser/cursoricon.c index 80a15a39b09..bb72ffcdfba 100644 --- a/win32ss/user/ntuser/cursoricon.c +++ b/win32ss/user/ntuser/cursoricon.c @@ -1665,7 +1665,8 @@ Exit: /* Additional cleanup on failure */ if (bResult == FALSE) { - if (ustrRsrc.Buffer != NULL) + if ((ustrRsrc.Buffer != NULL) && + !IS_INTRESOURCE(ustrRsrc.Buffer)) { ExFreePoolWithTag(ustrRsrc.Buffer, TAG_STRING); }

1 year, 3 months

[reactos] 01/01: [NTOSKRNL/x64] Fix a bug in KeSwitchKernelStack

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26a64324e785ff712bde6… commit 26a64324e785ff712bde6736ed7cbfc92a98925b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Aug 15 22:51:05 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 17 10:37:50 2023 +0300 [NTOSKRNL/x64] Fix a bug in KeSwitchKernelStack Don't safe anything in the callee's home space, because the callee can overwrite it. Use the functions home space instead. --- ntoskrnl/ke/amd64/trap.S | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 082160893b4..93dce4215dc 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -1213,19 +1213,18 @@ EXTERN KiSwitchKernelStack:PROC PUBLIC KeSwitchKernelStack FUNC KeSwitchKernelStack + /* Save rcx and allocate callee home space */ + mov [rsp + P1Home], rcx + .savereg rcx, P1Home sub rsp, 40 .allocstack 40 - - /* Save rcx */ - mov [rsp], rcx - .savereg rcx, 0 .endprolog /* Call the C handler, which returns the old stack in rax */ call KiSwitchKernelStack /* Restore rcx (StackBase) */ - mov rcx, [rsp] + mov rcx, [rsp + 40 + P1Home] /* Switch to new stack: RSP += (StackBase - OldStackBase) */ sub rcx, rax

1 year, 3 months

[reactos] 01/01: [CRT] Import parameter check for fclose from wine

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d41a4030bc326b2e3d9c7… commit d41a4030bc326b2e3d9c76ffa3c93afa0e44a355 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 16 18:49:51 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 17 10:19:15 2023 +0300 [CRT] Import parameter check for fclose from wine Fixes advpack_apitest:DelNode crash. --- sdk/lib/crt/stdio/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/lib/crt/stdio/file.c b/sdk/lib/crt/stdio/file.c index 899eeafe03e..0be80b86b28 100644 --- a/sdk/lib/crt/stdio/file.c +++ b/sdk/lib/crt/stdio/file.c @@ -2784,6 +2784,8 @@ int CDECL fclose(FILE* file) { int r, flag; + if (!MSVCRT_CHECK_PMT(file != NULL)) return EOF; + _lock_file(file); flag = file->_flag; free(file->_tmpfname);

1 year, 3 months

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

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7cbca9ad8a9ecb6f433b3… commit 7cbca9ad8a9ecb6f433b3556f41aaa46498598b9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 15 07:50:20 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 15 07:50:20 2023 +0900 [SHDOCVW] Implement MRU List for Shell Bag, Part 4 (#5686) Follow-up to #5646. Implement CMruNode class. CORE-9283 --- dll/win32/shdocvw/mrulist.cpp | 267 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 248 insertions(+), 19 deletions(-) diff --git a/dll/win32/shdocvw/mrulist.cpp b/dll/win32/shdocvw/mrulist.cpp index 33e91aa0936..f17f4069ff2 100644 --- a/dll/win32/shdocvw/mrulist.cpp +++ b/dll/win32/shdocvw/mrulist.cpp @@ -24,6 +24,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +class CMruBase; + class CMruShortList; + class CMruLongList; + class CMruNode; + class CMruPidlList; +class CMruClassFactory; + extern "C" void __cxa_pure_virtual(void) { ::DebugBreak(); @@ -97,11 +104,11 @@ public: // Non-standard methods virtual BOOL _IsEqual(const SLOTITEMDATA *pItem, LPCVOID pvData, UINT cbData) const; - virtual HRESULT _DeleteValue(LPCWSTR pszValue); + virtual DWORD _DeleteValue(LPCWSTR pszValue); virtual HRESULT _InitSlots() = 0; virtual void _SaveSlots() = 0; virtual UINT _UpdateSlots(UINT iSlot) = 0; - virtual void _SlotString(DWORD dwSlot, LPWSTR psz, DWORD cch) = 0; + virtual void _SlotString(UINT iSlot, LPWSTR psz, DWORD cch) = 0; virtual HRESULT _GetSlot(UINT iSlot, UINT *puSlot) = 0; virtual HRESULT _RemoveSlot(UINT iSlot, UINT *puSlot) = 0; @@ -399,7 +406,7 @@ BOOL CMruBase::_IsEqual(const SLOTITEMDATA *pItem, LPCVOID pvData, UINT cbData) } } -HRESULT CMruBase::_DeleteValue(LPCWSTR pszValue) +DWORD CMruBase::_DeleteValue(LPCWSTR pszValue) { return SHDeleteValueW(m_hKey, NULL, pszValue); } @@ -435,7 +442,7 @@ protected: HRESULT _InitSlots() override; void _SaveSlots() override; UINT _UpdateSlots(UINT iSlot) override; - void _SlotString(DWORD dwSlot, LPWSTR psz, DWORD cch) override; + void _SlotString(UINT iSlot, LPWSTR psz, DWORD cch) override; HRESULT _GetSlot(UINT iSlot, UINT *puSlot) override; HRESULT _RemoveSlot(UINT iSlot, UINT *puSlot) override; friend class CMruLongList; @@ -508,11 +515,11 @@ UINT CMruShortList::_UpdateSlots(UINT iSlot) return iData; } -void CMruShortList::_SlotString(DWORD dwSlot, LPWSTR psz, DWORD cch) +void CMruShortList::_SlotString(UINT iSlot, LPWSTR psz, DWORD cch) { if (cch >= 2) { - psz[0] = (WCHAR)(L'a' + dwSlot); + psz[0] = (WCHAR)(L'a' + iSlot); psz[1] = UNICODE_NULL; } } @@ -556,7 +563,7 @@ protected: HRESULT _InitSlots() override; void _SaveSlots() override; UINT _UpdateSlots(UINT iSlot) override; - void _SlotString(DWORD dwSlot, LPWSTR psz, DWORD cch) override; + void _SlotString(UINT iSlot, LPWSTR psz, DWORD cch) override; HRESULT _GetSlot(UINT iSlot, UINT *puSlot) override; HRESULT _RemoveSlot(UINT iSlot, UINT *puSlot) override; @@ -633,9 +640,9 @@ UINT CMruLongList::_UpdateSlots(UINT iSlot) return uSlotData; } -void CMruLongList::_SlotString(DWORD dwSlot, LPWSTR psz, DWORD cch) +void CMruLongList::_SlotString(UINT iSlot, LPWSTR psz, DWORD cch) { - StringCchPrintfW(psz, cch, L"%d", dwSlot); + StringCchPrintfW(psz, cch, L"%d", iSlot); } HRESULT CMruLongList::_GetSlot(UINT iSlot, UINT *puSlot) @@ -677,20 +684,20 @@ void CMruLongList::_ImportShortList() { for (;;) { - UINT uSlot; - hr = pShortList->_GetSlot(m_cSlots, &uSlot); + UINT iSlot; + hr = pShortList->_GetSlot(m_cSlots, &iSlot); if (FAILED(hr)) break; SLOTITEMDATA *pItem; - hr = pShortList->_GetSlotItem(uSlot, &pItem); + hr = pShortList->_GetSlotItem(iSlot, &pItem); if (FAILED(hr)) break; - _AddItem(uSlot, (const BYTE*)pItem->pvData, pItem->cbData); - pShortList->_DeleteItem(uSlot); + _AddItem(iSlot, (const BYTE*)pItem->pvData, pItem->cbData); + pShortList->_DeleteItem(iSlot); - m_puSlotData[m_cSlots++] = uSlot; + m_puSlotData[m_cSlots++] = iSlot; } m_bNeedSave = TRUE; @@ -722,21 +729,38 @@ class CMruNode : public CMruLongList { protected: - UINT m_uSlotData = 0; // The slot data + UINT m_iSlot = 0; // The slot index CMruNode *m_pParent = NULL; // The parent IShellFolder *m_pShellFolder = NULL; // The shell folder + BOOL _InitLate(); + BOOL _IsEqual(SLOTITEMDATA *pItem, LPCVOID pvData, UINT cbData); + DWORD _DeleteValue(LPCWSTR pszValue) override; + + HRESULT _CreateNode(UINT iSlot, CMruNode **ppNewNode); + HRESULT _AddPidl(UINT iSlot, LPCITEMIDLIST pidl); + HRESULT _FindPidl(LPCITEMIDLIST pidl, UINT *piSlot); + HRESULT _GetPidlSlot(LPCITEMIDLIST pidl, BOOL bAdd, UINT *piSlot); + public: CMruNode() { } - CMruNode(CMruNode *pParent, UINT uSlotData); + CMruNode(CMruNode *pParent, UINT iSlot); ~CMruNode() override; CMruNode *GetParent(); + + HRESULT BindToSlot(UINT iSlot, IShellFolder **ppSF); + HRESULT GetNode(BOOL bAdd, LPCITEMIDLIST pidl, CMruNode **pNewNode); + HRESULT GetNodeSlot(UINT *piSlot); + HRESULT SetNodeSlot(UINT iSlot); + + HRESULT RemoveLeast(UINT *piSlot); + HRESULT Clear(CMruPidlList *pList); }; -CMruNode::CMruNode(CMruNode *pParent, UINT uSlotData) +CMruNode::CMruNode(CMruNode *pParent, UINT iSlot) { - m_uSlotData = uSlotData; + m_iSlot = iSlot; m_pParent = pParent; pParent->AddRef(); } @@ -763,6 +787,183 @@ CMruNode *CMruNode::GetParent() return m_pParent; } +HRESULT CMruNode::_CreateNode(UINT iSlot, CMruNode **ppNewNode) +{ + CMruNode *pNewNode = new CMruNode(this, iSlot); + if (!pNewNode) + return E_OUTOFMEMORY; + + WCHAR szBuff[12]; + _SlotString(iSlot, szBuff, _countof(szBuff)); + + HRESULT hr = pNewNode->InitData(m_cSlotRooms, 0, m_hKey, szBuff, NULL); + if (FAILED(hr)) + pNewNode->Release(); + else + *ppNewNode = pNewNode; + + return hr; +} + +HRESULT CMruNode::GetNode(BOOL bAdd, LPCITEMIDLIST pidl, CMruNode **ppNewNode) +{ + if (!pidl || !pidl->mkid.cb) + { + *ppNewNode = this; + AddRef(); + return S_OK; + } + + if (!_InitLate()) + return E_FAIL; + + UINT iSlot; + HRESULT hr = _GetPidlSlot(pidl, bAdd, &iSlot); + if (FAILED(hr)) + { + if (!bAdd) + { + *ppNewNode = this; + AddRef(); + return S_FALSE; + } + return hr; + } + + CMruNode *pNewNode; + hr = _CreateNode(iSlot, &pNewNode); + if (SUCCEEDED(hr)) + { + _SaveSlots(); + + LPCITEMIDLIST pidl2 = (LPCITEMIDLIST)((LPBYTE)pidl + pidl->mkid.cb); + pNewNode->GetNode(bAdd, pidl2, ppNewNode); + pNewNode->Release(); + } + + return hr; +} + +HRESULT CMruNode::BindToSlot(UINT iSlot, IShellFolder **ppSF) +{ + SLOTITEMDATA *pItem; + HRESULT hr = _GetSlotItem(iSlot, &pItem); + if (FAILED(hr)) + return hr; + + return m_pShellFolder->BindToObject((LPITEMIDLIST)pItem->pvData, + NULL, + IID_IShellFolder, + (void **)ppSF); +} + +BOOL CMruNode::_InitLate() +{ + if (!m_pShellFolder) + { + if (m_pParent) + m_pParent->BindToSlot(m_iSlot, &m_pShellFolder); + else + SHGetDesktopFolder(&m_pShellFolder); + } + return !!m_pShellFolder; +} + +BOOL CMruNode::_IsEqual(SLOTITEMDATA *pItem, LPCVOID pvData, UINT cbData) +{ + return m_pShellFolder->CompareIDs(0x10000000, + (LPITEMIDLIST)pItem->pvData, + (LPCITEMIDLIST)pvData) == 0; +} + +HRESULT CMruNode::GetNodeSlot(UINT *piSlot) +{ + DWORD dwData, cbData = sizeof(dwData); + DWORD error = SHGetValueW(m_hKey, NULL, L"NodeSlot", NULL, &dwData, (piSlot ? &cbData : NULL)); + if (error != ERROR_SUCCESS) + return E_FAIL; + *piSlot = (UINT)dwData; + return S_OK; +} + +HRESULT CMruNode::SetNodeSlot(UINT iSlot) +{ + DWORD dwData = iSlot; + if (SHSetValueW(m_hKey, NULL, L"NodeSlot", REG_DWORD, &dwData, sizeof(dwData)) != ERROR_SUCCESS) + return E_FAIL; + return S_OK; +} + +HRESULT CMruNode::_AddPidl(UINT iSlot, LPCITEMIDLIST pidl) +{ + return CMruBase::_AddItem(iSlot, (const BYTE*)pidl, sizeof(WORD) + pidl->mkid.cb); +} + +DWORD CMruNode::_DeleteValue(LPCWSTR pszValue) +{ + CMruBase::_DeleteValue(pszValue); + return SHDeleteKeyW(m_hKey, pszValue); +} + +HRESULT CMruNode::_FindPidl(LPCITEMIDLIST pidl, UINT *piSlot) +{ + return FindData((const BYTE *)pidl, sizeof(WORD) + pidl->mkid.cb, piSlot); +} + +HRESULT CMruNode::_GetPidlSlot(LPCITEMIDLIST pidl, BOOL bAdd, UINT *piSlot) +{ + LPITEMIDLIST pidlFirst = ILCloneFirst(pidl); + if (!pidlFirst) + return E_OUTOFMEMORY; + + UINT iSlot; + HRESULT hr = _FindPidl(pidlFirst, &iSlot); + if (SUCCEEDED(hr)) + { + *piSlot = _UpdateSlots(iSlot); + hr = S_OK; + } + else if (bAdd) + { + *piSlot = _UpdateSlots(m_cSlots); + hr = _AddPidl(*piSlot, pidlFirst); + } + + ILFree(pidlFirst); + return hr; +} + +HRESULT CMruNode::RemoveLeast(UINT *piSlot) +{ + if (!m_cSlots) + { + CMruNode::GetNodeSlot(piSlot); + return S_FALSE; + } + + UINT uSlot; + HRESULT hr = _GetSlot(m_cSlots - 1, &uSlot); + if (FAILED(hr)) + return hr; + + CMruNode *pNode; + hr = CMruNode::_CreateNode(uSlot, &pNode); + if (SUCCEEDED(hr)) + { + hr = pNode->RemoveLeast(piSlot); + pNode->Release(); + } + + if (hr == S_FALSE) + { + Delete(m_cSlots - 1); + if (m_cSlots || SUCCEEDED(GetNodeSlot(0))) + return S_OK; + } + + return hr; +} + class CMruPidlList : public IMruPidlList , public CMruNode @@ -821,6 +1022,8 @@ public: UINT *puSlots, UINT *pcSlots) override; STDMETHODIMP PruneKids(LPCITEMIDLIST pidl) override; + + void EmptyNodeSlot(UINT iSlot); }; STDMETHODIMP CMruPidlList::QueryInterface(REFIID riid, void **ppvObj) @@ -888,6 +1091,32 @@ 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; + while (SUCCEEDED(_GetSlot(0, &uSlot))) + { + CMruNode *pNode; + if (SUCCEEDED(CMruNode::_CreateNode(uSlot, &pNode))) + { + UINT iSlot; + if (SUCCEEDED(pNode->GetNodeSlot(&iSlot))) + pList->EmptyNodeSlot(iSlot); + + pNode->Clear(pList); + pNode->Release(); + } + Delete(0); + } + return S_OK; +} + class CMruClassFactory : public IClassFactory { protected:

1 year, 3 months

← Newer
1
2
3
4
5
6
7
8
9
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2023