Ros-diffs

ros-diffs@reactos.org

17 participants
81080 discussions

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

[reactos] 01/01: [KERNEL32][KERNEL32_APITEST] Implement user-mode UEFI / Firmware API (#5149)

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c8a2a8815c5ac1e92d0c… commit 4c8a2a8815c5ac1e92d0c8cf3c2893a05b567dc9 Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Fri Sep 15 03:14:07 2023 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 14 22:14:07 2023 +0300 [KERNEL32][KERNEL32_APITEST] Implement user-mode UEFI / Firmware API (#5149) - Implement firmware environment variable read/write APIs - Add, fix and improve related definitions and declarations - Add kernel32:UEFIFirmware apitest CORE-11954 --- dll/win32/kernel32/client/sysinfo.c | 299 ++++++++++++++++++---- modules/rostests/apitests/kernel32/CMakeLists.txt | 1 + modules/rostests/apitests/kernel32/UEFIFirmware.c | 253 ++++++++++++++++++ modules/rostests/apitests/kernel32/testlist.c | 2 + ntoskrnl/ex/sysinfo.c | 22 +- sdk/include/ndk/exfuncs.h | 10 +- sdk/include/ndk/extypes.h | 35 ++- sdk/include/psdk/winbase.h | 78 ++++-- sdk/include/xdk/extypes.h | 11 + sdk/include/xdk/winnt.template.h | 1 + 10 files changed, 614 insertions(+), 98 deletions(-) diff --git a/dll/win32/kernel32/client/sysinfo.c b/dll/win32/kernel32/client/sysinfo.c index 3b25a19a1e4..7dbb320c118 100644 --- a/dll/win32/kernel32/client/sysinfo.c +++ b/dll/win32/kernel32/client/sysinfo.c @@ -1,14 +1,14 @@ /* * PROJECT: ReactOS Win32 Base API - * LICENSE: See COPYING in the top level directory - * FILE: dll/win32/kernel32/client/sysinfo.c + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: System Information Functions - * PROGRAMMERS: Emanuele Aliberti + * COPYRIGHT: Emanuele Aliberti * Christoph von Wittich * Thomas Weidenmueller * Gunnar Andre Dalsnes * Stanislav Motylkov (x86corez(a)gmail.com) * Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2023 Ratin Gao <ratin(a)knsoft.org> */ /* INCLUDES *******************************************************************/ @@ -78,11 +78,12 @@ GetSystemInfoInternal(IN PSYSTEM_BASIC_INFORMATION BasicInfo, static UINT -BaseQuerySystemFirmware(IN DWORD FirmwareTableProviderSignature, - IN DWORD FirmwareTableID, - OUT PVOID pFirmwareTableBuffer, - IN DWORD BufferSize, - IN SYSTEM_FIRMWARE_TABLE_ACTION Action) +BaseQuerySystemFirmware( + _In_ DWORD FirmwareTableProviderSignature, + _In_ DWORD FirmwareTableID, + _Out_writes_bytes_to_opt_(BufferSize, return) PVOID pFirmwareTableBuffer, + _In_ DWORD BufferSize, + _In_ SYSTEM_FIRMWARE_TABLE_ACTION Action) { SYSTEM_FIRMWARE_TABLE_INFORMATION* SysFirmwareInfo; ULONG Result = 0, ReturnedSize; @@ -413,60 +414,246 @@ GetNumaAvailableMemoryNode(IN UCHAR Node, return TRUE; } -/* - * @unimplemented - */ +_Success_(return > 0) DWORD WINAPI -GetFirmwareEnvironmentVariableW(IN LPCWSTR lpName, - IN LPCWSTR lpGuid, - IN PVOID pValue, - IN DWORD nSize) +GetFirmwareEnvironmentVariableExW( + _In_ LPCWSTR lpName, + _In_ LPCWSTR lpGuid, + _Out_writes_bytes_to_opt_(nSize, return) PVOID pBuffer, + _In_ DWORD nSize, + _Out_opt_ PDWORD pdwAttribubutes) { - STUB; - return 0; + NTSTATUS Status; + UNICODE_STRING VariableName, Namespace; + GUID VendorGuid; + ULONG Length; + + /* Check input parameters and build NT strings */ + if (!lpName || !lpGuid) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + RtlInitUnicodeString(&VariableName, lpName); + RtlInitUnicodeString(&Namespace, lpGuid); + Status = RtlGUIDFromString(&Namespace, &VendorGuid); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return 0; + } + + /* Query firmware system environment variable value */ + Length = nSize; + Status = NtQuerySystemEnvironmentValueEx(&VariableName, + &VendorGuid, + pBuffer, + &Length, + pdwAttribubutes); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return 0; + } + + return Length; } -/* - * @unimplemented - */ -BOOL +_Success_(return > 0) +DWORD WINAPI -SetFirmwareEnvironmentVariableW(IN LPCWSTR lpName, - IN LPCWSTR lpGuid, - IN PVOID pValue, - IN DWORD nSize) +GetFirmwareEnvironmentVariableExA( + _In_ LPCSTR lpName, + _In_ LPCSTR lpGuid, + _Out_writes_bytes_to_opt_(nSize, return) PVOID pBuffer, + _In_ DWORD nSize, + _Out_opt_ PDWORD pdwAttribubutes) { - STUB; - return 0; + NTSTATUS Status; + DWORD Length; + UNICODE_STRING VariableName, Namespace; + ANSI_STRING AnsiVariableName, AnsiNamespace; + + /* Check input parameters and build NT strings */ + if (!lpName || !lpGuid) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + RtlInitString(&AnsiVariableName, lpName); + Status = RtlAnsiStringToUnicodeString(&VariableName, &AnsiVariableName, TRUE); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return 0; + } + RtlInitString(&AnsiNamespace, lpGuid); + Status = RtlAnsiStringToUnicodeString(&Namespace, &AnsiNamespace, TRUE); + if (!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&VariableName); + BaseSetLastNTError(Status); + return 0; + } + + /* Call unicode version interface */ + Length = GetFirmwareEnvironmentVariableExW(VariableName.Buffer, + Namespace.Buffer, + pBuffer, + nSize, + pdwAttribubutes); + + /* Cleanup and return */ + RtlFreeUnicodeString(&Namespace); + RtlFreeUnicodeString(&VariableName); + return Length; } -/* - * @unimplemented - */ +_Success_(return > 0) DWORD WINAPI -GetFirmwareEnvironmentVariableA(IN LPCSTR lpName, - IN LPCSTR lpGuid, - IN PVOID pValue, - IN DWORD nSize) +GetFirmwareEnvironmentVariableW( + _In_ LPCWSTR lpName, + _In_ LPCWSTR lpGuid, + _Out_writes_bytes_to_opt_(nSize, return) PVOID pBuffer, + _In_ DWORD nSize) { - STUB; - return 0; + return GetFirmwareEnvironmentVariableExW(lpName, lpGuid, pBuffer, nSize, NULL); +} + +_Success_(return > 0) +DWORD +WINAPI +GetFirmwareEnvironmentVariableA( + _In_ LPCSTR lpName, + _In_ LPCSTR lpGuid, + _Out_writes_bytes_to_opt_(nSize, return) PVOID pBuffer, + _In_ DWORD nSize) +{ + return GetFirmwareEnvironmentVariableExA(lpName, lpGuid, pBuffer, nSize, NULL); } -/* - * @unimplemented - */ BOOL WINAPI -SetFirmwareEnvironmentVariableA(IN LPCSTR lpName, - IN LPCSTR lpGuid, - IN PVOID pValue, - IN DWORD nSize) +SetFirmwareEnvironmentVariableExW( + _In_ LPCWSTR lpName, + _In_ LPCWSTR lpGuid, + _In_reads_bytes_opt_(nSize) PVOID pValue, + _In_ DWORD nSize, + _In_ DWORD dwAttributes) { - STUB; - return 0; + NTSTATUS Status; + UNICODE_STRING VariableName, Namespace; + GUID VendorGuid; + + /* Check input parameters and build NT strings */ + if (!lpName || !lpGuid) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + RtlInitUnicodeString(&VariableName, lpName); + RtlInitUnicodeString(&Namespace, lpGuid); + Status = RtlGUIDFromString(&Namespace, &VendorGuid); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + /* Set firmware system environment variable value */ + Status = NtSetSystemEnvironmentValueEx(&VariableName, + &VendorGuid, + pValue, + nSize, + dwAttributes); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; +} + +BOOL +WINAPI +SetFirmwareEnvironmentVariableExA( + _In_ LPCSTR lpName, + _In_ LPCSTR lpGuid, + _In_reads_bytes_opt_(nSize) PVOID pValue, + _In_ DWORD nSize, + _In_ DWORD dwAttributes) +{ + NTSTATUS Status; + BOOL Result; + UNICODE_STRING VariableName, Namespace; + ANSI_STRING AnsiVariableName, AnsiNamespace; + + /* Check input parameters and build NT strings */ + if (!lpName || !lpGuid) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + RtlInitString(&AnsiVariableName, lpName); + Status = RtlAnsiStringToUnicodeString(&VariableName, &AnsiVariableName, TRUE); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + RtlInitString(&AnsiNamespace, lpGuid); + Status = RtlAnsiStringToUnicodeString(&Namespace, &AnsiNamespace, TRUE); + if (!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&VariableName); + BaseSetLastNTError(Status); + return FALSE; + } + + /* Call unicode version interface */ + Result = SetFirmwareEnvironmentVariableExW(VariableName.Buffer, + Namespace.Buffer, + pValue, + nSize, + dwAttributes); + + /* Cleanup and return */ + RtlFreeUnicodeString(&Namespace); + RtlFreeUnicodeString(&VariableName); + return Result; +} + +BOOL +WINAPI +SetFirmwareEnvironmentVariableW( + _In_ LPCWSTR lpName, + _In_ LPCWSTR lpGuid, + _In_reads_bytes_opt_(nSize) PVOID pValue, + _In_ DWORD nSize) +{ + return SetFirmwareEnvironmentVariableExW(lpName, + lpGuid, + pValue, + nSize, + VARIABLE_ATTRIBUTE_NON_VOLATILE); +} + +BOOL +WINAPI +SetFirmwareEnvironmentVariableA( + _In_ LPCSTR lpName, + _In_ LPCSTR lpGuid, + _In_reads_bytes_opt_(nSize) PVOID pValue, + _In_ DWORD nSize) +{ + return SetFirmwareEnvironmentVariableExA(lpName, + lpGuid, + pValue, + nSize, + VARIABLE_ATTRIBUTE_NON_VOLATILE); } /** @@ -474,7 +661,7 @@ SetFirmwareEnvironmentVariableA(IN LPCSTR lpName, * @implemented * * Obtains firmware table identifiers. - * https://msdn.microsoft.com/en-us/library/windows/desktop/ms724259(v=vs.85).… + * https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoap… * * @param FirmwareTableProviderSignature * Can be either ACPI, FIRM, or RSMB. @@ -498,13 +685,14 @@ SetFirmwareEnvironmentVariableA(IN LPCSTR lpName, */ UINT WINAPI -EnumSystemFirmwareTables(IN DWORD FirmwareTableProviderSignature, - OUT PVOID pFirmwareTableBuffer, - IN DWORD BufferSize) +EnumSystemFirmwareTables( + _In_ DWORD FirmwareTableProviderSignature, + _Out_writes_bytes_to_opt_(BufferSize, return) PVOID pFirmwareTableEnumBuffer, + _In_ DWORD BufferSize) { return BaseQuerySystemFirmware(FirmwareTableProviderSignature, 0, - pFirmwareTableBuffer, + pFirmwareTableEnumBuffer, BufferSize, SystemFirmwareTable_Enumerate); } @@ -514,7 +702,7 @@ EnumSystemFirmwareTables(IN DWORD FirmwareTableProviderSignature, * @implemented * * Obtains the firmware table data. - * https://msdn.microsoft.com/en-us/library/windows/desktop/ms724379(v=vs.85).… + * https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoap… * * @param FirmwareTableProviderSignature * Can be either ACPI, FIRM, or RSMB. @@ -545,10 +733,11 @@ EnumSystemFirmwareTables(IN DWORD FirmwareTableProviderSignature, */ UINT WINAPI -GetSystemFirmwareTable(IN DWORD FirmwareTableProviderSignature, - IN DWORD FirmwareTableID, - OUT PVOID pFirmwareTableBuffer, - IN DWORD BufferSize) +GetSystemFirmwareTable( + _In_ DWORD FirmwareTableProviderSignature, + _In_ DWORD FirmwareTableID, + _Out_writes_bytes_to_opt_(BufferSize, return) PVOID pFirmwareTableBuffer, + _In_ DWORD BufferSize) { return BaseQuerySystemFirmware(FirmwareTableProviderSignature, FirmwareTableID, diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index 8c26b340edc..582d3f5627f 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -36,6 +36,7 @@ list(APPEND SOURCE SystemFirmware.c TerminateProcess.c TunnelCache.c + UEFIFirmware.c WideCharToMultiByte.c) list(APPEND PCH_SKIP_SOURCE diff --git a/modules/rostests/apitests/kernel32/UEFIFirmware.c b/modules/rostests/apitests/kernel32/UEFIFirmware.c new file mode 100644 index 00000000000..4ab0ea6ea73 --- /dev/null +++ b/modules/rostests/apitests/kernel32/UEFIFirmware.c @@ -0,0 +1,253 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for UEFI Firmware functions + * COPYRIGHT: Copyright 2023 Ratin Gao <ratin(a)knsoft.org> + */ + +#include "precomp.h" + +#include <ndk/psfuncs.h> +#include <ndk/setypes.h> +#include <ndk/sefuncs.h> +#include <ndk/obfuncs.h> + +#define _A2W(quote) __A2W(quote) +#define __A2W(quote) L##quote + +#define EFI_TEST_GUID_STRING "{8768B7AC-F82F-4120-B093-30DFA27DA3B5}" +#define EFI_TEST_VARIABLE_NAME "RosUefiVarTest" + +#define EFI_DUMMY_NAMESPACE_GUID_STRING "{00000000-0000-0000-0000-000000000000}" +#define EFI_DUMMY_VARIABLE_NAME "" + +static ULONG RandomSeed; +static DWORD EfiVariableValue; + +static VOID test_GetFirmwareType(BOOL bIsUEFI) +{ +#if (_WIN32_WINNT >= 0x0602) + BOOL bResult; + FIRMWARE_TYPE FirmwareType = FirmwareTypeUnknown, FirmwareExpect; + + /* Test GetFirmwareType, should return FirmwareTypeBios or FirmwareTypeUefi */ + bResult = GetFirmwareType(&FirmwareType); + + ok(bResult, + "GetFirmwareType failed with error: 0x%08lX\n", + GetLastError()); + + if (!bResult) + return; + + FirmwareExpect = (bIsUEFI ? FirmwareTypeUefi : FirmwareTypeBios); + ok(FirmwareType == FirmwareExpect, + "FirmwareType is %d, but %d is expected.\n", + FirmwareType, FirmwareExpect); +#else + skip("This test can be run only when compiled for NT >= 6.2.\n"); +#endif +} + +START_TEST(UEFIFirmware) +{ + BOOL bResult, bResultTemp, bIsUEFI; + DWORD dwError, dwErrorTemp, dwLength, dwLengthTemp, dwValue; + HANDLE hToken; + TOKEN_PRIVILEGES Privilege; + NTSTATUS Status; + ULONG ReturnLength; + + /* + * Check whether this test runs on legacy BIOS-based or UEFI system + * by calling GetFirmwareEnvironmentVariable with dummy name and GUID. + * It should fail with ERROR_INVALID_FUNCTION on the former and + * fail with another error on the latter. + */ + dwLength = GetFirmwareEnvironmentVariableW(_A2W(EFI_DUMMY_VARIABLE_NAME), + _A2W(EFI_DUMMY_NAMESPACE_GUID_STRING), + NULL, + 0); + dwError = GetLastError(); + ok(dwLength == 0, "dwLength = %lu, expected 0\n", dwLength); + + bIsUEFI = (dwLength == 0 && dwError != ERROR_INVALID_FUNCTION); + test_GetFirmwareType(bIsUEFI); + if (!bIsUEFI) + { + skip("Skipping tests that require UEFI environment.\n"); + return; + } + + /* Test ANSI function too */ + dwLengthTemp = GetFirmwareEnvironmentVariableA(EFI_DUMMY_VARIABLE_NAME, + EFI_DUMMY_NAMESPACE_GUID_STRING, + NULL, + 0); + dwErrorTemp = GetLastError(); + ok(dwLengthTemp == dwLength && dwErrorTemp == dwError, + "dwLength = %lu, LastError = %lu, expected bResult = %lu, LastError = %lu\n", + dwLengthTemp, + dwErrorTemp, + dwLength, + dwError); + + /* Generate a random variable value to be used in this test */ + RandomSeed = GetTickCount(); + EfiVariableValue = RtlRandom(&RandomSeed); + + /* Try to set firmware variable, should fail with ERROR_PRIVILEGE_NOT_HELD, + * because no SE_SYSTEM_ENVIRONMENT_NAME privilege enabled by default. */ + bResult = SetFirmwareEnvironmentVariableW(_A2W(EFI_TEST_VARIABLE_NAME), + _A2W(EFI_TEST_GUID_STRING), + &EfiVariableValue, + sizeof(EfiVariableValue)); + dwError = GetLastError(); + ok(!bResult && dwError == ERROR_PRIVILEGE_NOT_HELD, + "bResult = %d, LastError = %lu, expected bResult = 0, LastError = ERROR_PRIVILEGE_NOT_HELD\n", + bResult, + dwError); + + /* Test ANSI function too */ + bResultTemp = SetFirmwareEnvironmentVariableA(EFI_TEST_VARIABLE_NAME, + EFI_TEST_GUID_STRING, + &EfiVariableValue, + sizeof(EfiVariableValue)); + dwErrorTemp = GetLastError(); + ok(bResultTemp == bResult && dwErrorTemp == dwError, + "bResult = %d, LastError = %lu, expected bResult = %d, LastError = %lu\n", + bResultTemp, + dwErrorTemp, + bResult, + dwError); + + /* Enable SE_SYSTEM_ENVIRONMENT_NAME privilege required by the following tests */ + bResult = OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken); + if (!bResult) + { + skip("OpenProcessToken failed with error: 0x%08lX, aborting.\n", GetLastError()); + return; + } + Privilege.PrivilegeCount = 1; + Privilege.Privileges[0].Luid = RtlConvertUlongToLuid(SE_SYSTEM_ENVIRONMENT_PRIVILEGE); + Privilege.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + Status = NtAdjustPrivilegesToken(hToken, FALSE, &Privilege, sizeof(Privilege), NULL, &ReturnLength); + if (Status != STATUS_SUCCESS) + { + skip("NtAdjustPrivilegesToken failed with status: 0x%08lX, aborting.\n", Status); + NtClose(hToken); + return; + } + + /* Set our test variable to UEFI firmware */ + bResult = SetFirmwareEnvironmentVariableW(_A2W(EFI_TEST_VARIABLE_NAME), + _A2W(EFI_TEST_GUID_STRING), + &EfiVariableValue, + sizeof(EfiVariableValue)); + ok(bResult, + "SetFirmwareEnvironmentVariableW failed with error: 0x%08lX\n", + GetLastError()); + if (bResult) + { + /* Get the variable back and verify */ + dwLength = GetFirmwareEnvironmentVariableW(_A2W(EFI_TEST_VARIABLE_NAME), + _A2W(EFI_TEST_GUID_STRING), + &dwValue, + sizeof(dwValue)); + ok(dwLength, + "GetFirmwareEnvironmentVariableW failed with error: 0x%08lX\n", + GetLastError()); + if (dwLength) + { + ok(dwLength == sizeof(EfiVariableValue) && dwValue == EfiVariableValue, + "Retrieved variable different from what we set, " + "dwLength = %lu, dwValue = %lu, expected dwLength = %u, dwValue = %lu", + dwLength, + dwValue, + sizeof(EfiVariableValue), + EfiVariableValue); + } + } + + /* Change variable value and test ANSI function */ + EfiVariableValue = RtlRandom(&RandomSeed); + bResult = SetFirmwareEnvironmentVariableA(EFI_TEST_VARIABLE_NAME, + EFI_TEST_GUID_STRING, + &EfiVariableValue, + sizeof(EfiVariableValue)); + ok(bResult, + "SetFirmwareEnvironmentVariableA failed with error: 0x%08lX\n", + GetLastError()); + if (bResult) + { + /* Get the variable back and verify */ + dwLength = GetFirmwareEnvironmentVariableA(EFI_TEST_VARIABLE_NAME, + EFI_TEST_GUID_STRING, + &dwValue, + sizeof(dwValue)); + ok(dwLength, + "GetFirmwareEnvironmentVariableA failed with error: 0x%08lX\n", + GetLastError()); + if (dwLength) + { + ok(dwLength == sizeof(EfiVariableValue) && dwValue == EfiVariableValue, + "Retrieved variable different from what we set, " + "dwLength = %lu, dwValue = %lu, expected dwLength = %u, dwValue = %lu", + dwLength, + dwValue, + sizeof(EfiVariableValue), + EfiVariableValue); + } + } + + /* Delete the variable */ + bResult = SetFirmwareEnvironmentVariableW(_A2W(EFI_TEST_VARIABLE_NAME), + _A2W(EFI_TEST_GUID_STRING), + NULL, + 0); + ok(bResult, + "SetFirmwareEnvironmentVariableW failed with error: 0x%08lX\n", + GetLastError()); + if (bResult) + { + dwLength = GetFirmwareEnvironmentVariableW(_A2W(EFI_TEST_VARIABLE_NAME), + _A2W(EFI_TEST_GUID_STRING), + &dwValue, + sizeof(dwValue)); + ok(dwLength == 0, "SetFirmwareEnvironmentVariableW didn't delete the variable!\n"); + } + + /* Restore variable and test ANSI function */ + bResult = SetFirmwareEnvironmentVariableW(_A2W(EFI_TEST_VARIABLE_NAME), + _A2W(EFI_TEST_GUID_STRING), + &EfiVariableValue, + sizeof(EfiVariableValue)); + if (!bResult) + { + skip("SetFirmwareEnvironmentVariableW failed to restore variable with error: 0x%08lX\n", + GetLastError()); + goto _exit; + } + bResult = SetFirmwareEnvironmentVariableA(EFI_TEST_VARIABLE_NAME, + EFI_TEST_GUID_STRING, + NULL, + 0); + ok(bResult, + "SetFirmwareEnvironmentVariableA failed with error: 0x%08lX\n", + GetLastError()); + if (bResult) + { + dwLength = GetFirmwareEnvironmentVariableA(EFI_TEST_VARIABLE_NAME, + EFI_TEST_GUID_STRING, + &dwValue, + sizeof(dwValue)); + ok(dwLength == 0, "SetFirmwareEnvironmentVariableA didn't delete the variable!\n"); + } + +_exit: + /* Restore the privilege */ + Privilege.Privileges[0].Attributes = 0; + Status = NtAdjustPrivilegesToken(hToken, FALSE, &Privilege, sizeof(Privilege), NULL, &ReturnLength); + ok(Status == STATUS_SUCCESS, "NtAdjustPrivilegesToken failed with status: 0x%08lX\n", Status); + NtClose(hToken); +} diff --git a/modules/rostests/apitests/kernel32/testlist.c b/modules/rostests/apitests/kernel32/testlist.c index 4802d88079c..a0a11a88d1a 100644 --- a/modules/rostests/apitests/kernel32/testlist.c +++ b/modules/rostests/apitests/kernel32/testlist.c @@ -36,6 +36,7 @@ extern void func_SetUnhandledExceptionFilter(void); extern void func_SystemFirmware(void); extern void func_TerminateProcess(void); extern void func_TunnelCache(void); +extern void func_UEFIFirmware(void); extern void func_WideCharToMultiByte(void); const struct test winetest_testlist[] = @@ -72,6 +73,7 @@ const struct test winetest_testlist[] = { "SystemFirmware", func_SystemFirmware }, { "TerminateProcess", func_TerminateProcess }, { "TunnelCache", func_TunnelCache }, + { "UEFIFirmware", func_UEFIFirmware }, { "WideCharToMultiByte", func_WideCharToMultiByte }, { "ActCtxWithXmlNamespaces", func_ActCtxWithXmlNamespaces }, { 0, 0 } diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index d6692bc83f6..58b023466a1 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -564,11 +564,12 @@ NtEnumerateSystemEnvironmentValuesEx(IN ULONG InformationClass, NTSTATUS NTAPI -NtQuerySystemEnvironmentValueEx(IN PUNICODE_STRING VariableName, - IN LPGUID VendorGuid, - IN PVOID Value, - IN OUT PULONG ReturnLength, - IN OUT PULONG Attributes) +NtQuerySystemEnvironmentValueEx( + _In_ PUNICODE_STRING VariableName, + _In_ LPGUID VendorGuid, + _Out_opt_ PVOID Value, + _Inout_ PULONG ReturnLength, + _Out_opt_ PULONG Attributes) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -576,11 +577,12 @@ NtQuerySystemEnvironmentValueEx(IN PUNICODE_STRING VariableName, NTSTATUS NTAPI -NtSetSystemEnvironmentValueEx(IN PUNICODE_STRING VariableName, - IN LPGUID VendorGuid, - IN PVOID Value, - IN OUT PULONG ReturnLength, - IN OUT PULONG Attributes) +NtSetSystemEnvironmentValueEx( + _In_ PUNICODE_STRING VariableName, + _In_ LPGUID VendorGuid, + _In_reads_bytes_opt_(ValueLength) PVOID Value, + _In_ ULONG ValueLength, + _In_ ULONG Attributes) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; diff --git a/sdk/include/ndk/exfuncs.h b/sdk/include/ndk/exfuncs.h index bca4e87010c..d3dd33bb1d7 100644 --- a/sdk/include/ndk/exfuncs.h +++ b/sdk/include/ndk/exfuncs.h @@ -396,9 +396,9 @@ NTAPI NtQuerySystemEnvironmentValueEx( _In_ PUNICODE_STRING VariableName, _In_ LPGUID VendorGuid, - _In_ PVOID Value, + _Out_opt_ PVOID Value, _Inout_ PULONG ReturnLength, - _Inout_ PULONG Attributes + _Out_opt_ PULONG Attributes ); __kernel_entry @@ -550,9 +550,9 @@ NTAPI NtSetSystemEnvironmentValueEx( _In_ PUNICODE_STRING VariableName, _In_ LPGUID VendorGuid, - _In_ PVOID Value, - _Inout_ PULONG ReturnLength, - _Inout_ PULONG Attributes + _In_reads_bytes_opt_(ValueLength) PVOID Value, + _In_ ULONG ValueLength, + _In_ ULONG Attributes ); __kernel_entry diff --git a/sdk/include/ndk/extypes.h b/sdk/include/ndk/extypes.h index 6cc77cb1d7c..2b190f1ca30 100644 --- a/sdk/include/ndk/extypes.h +++ b/sdk/include/ndk/extypes.h @@ -1432,7 +1432,29 @@ typedef struct _SYSTEM_HANDLE_INFORMATION_EX SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX Handle[1]; } SYSTEM_HANDLE_INFORMATION_EX, *PSYSTEM_HANDLE_INFORMATION_EX; -// FIXME: Class 65-97 +// FIXME: Class 65-89 + +// Class 90 +#if (NTDDI_VERSION >= NTDDI_LONGHORN) +typedef struct _SYSTEM_BOOT_ENVIRONMENT_INFORMATION +{ + GUID BootIdentifier; + FIRMWARE_TYPE FirmwareType; +#if (NTDDI_VERSION >= NTDDI_WIN8) + ULONGLONG BootFlags; +#endif +} SYSTEM_BOOT_ENVIRONMENT_INFORMATION, *PSYSTEM_BOOT_ENVIRONMENT_INFORMATION; +#endif + +#if (NTDDI_VERSION >= NTDDI_WIN8) +typedef struct _SYSTEM_BOOT_ENVIRONMENT_V1 +{ + GUID BootIdentifier; + FIRMWARE_TYPE FirmwareType; +} SYSTEM_BOOT_ENVIRONMENT_V1, *PSYSTEM_BOOT_ENVIRONMENT_V1; +#endif + +// FIXME: Class 91-97 // // Hotpatch flags @@ -1540,6 +1562,17 @@ typedef struct _SYSTEM_MEMORY_LIST_INFORMATION SIZE_T ModifiedPageCountPageFile; } SYSTEM_MEMORY_LIST_INFORMATION, *PSYSTEM_MEMORY_LIST_INFORMATION; +// +// Firmware variable attributes +// +#define VARIABLE_ATTRIBUTE_NON_VOLATILE 0x00000001 +#define VARIABLE_ATTRIBUTE_BOOTSERVICE_ACCESS 0x00000002 +#define VARIABLE_ATTRIBUTE_RUNTIME_ACCESS 0x00000004 +#define VARIABLE_ATTRIBUTE_HARDWARE_ERROR_RECORD 0x00000008 +#define VARIABLE_ATTRIBUTE_AUTHENTICATED_WRITE_ACCESS 0x00000010 +#define VARIABLE_ATTRIBUTE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS 0x00000020 +#define VARIABLE_ATTRIBUTE_APPEND_WRITE 0x00000040 + #ifdef __cplusplus }; // extern "C" #endif diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 6b616b07b39..397ad4d92cc 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -2004,25 +2004,7 @@ _Ret_maybenull_ HRSRC WINAPI FindResourceA(_In_opt_ HMODULE,_In_ LPCSTR, _In_ LP _Ret_maybenull_ HRSRC WINAPI FindResourceW(_In_opt_ HMODULE,_In_ LPCWSTR, _In_ LPCWSTR); _Ret_maybenull_ HRSRC WINAPI FindResourceExA(_In_opt_ HMODULE, _In_ LPCSTR, _In_ LPCSTR, _In_ WORD); HRSRC WINAPI FindResourceExW(HINSTANCE,LPCWSTR,LPCWSTR,WORD); -#if (_WIN32_WINNT >= 0x0502) - -DWORD -WINAPI -GetFirmwareEnvironmentVariableA( - _In_ LPCSTR lpName, - _In_ LPCSTR lpGuid, - _Out_writes_bytes_to_opt_(nSize, return) PVOID pBuffer, - _In_ DWORD nSize); - -DWORD -WINAPI -GetFirmwareEnvironmentVariableW( - _In_ LPCWSTR lpName, - _In_ LPCWSTR lpGuid, - _Out_writes_bytes_to_opt_(nSize, return) PVOID pBuffer, - _In_ DWORD nSize); -#endif BOOL WINAPI FlushFileBuffers(HANDLE); BOOL WINAPI FlushInstructionCache(HANDLE,LPCVOID,SIZE_T); BOOL WINAPI FlushViewOfFile(LPCVOID,SIZE_T); @@ -2430,15 +2412,6 @@ HANDLE WINAPI GetStdHandle(_In_ DWORD); UINT WINAPI GetSystemDirectoryA(LPSTR,UINT); UINT WINAPI GetSystemDirectoryW(LPWSTR,UINT); -WINBASEAPI -UINT -WINAPI -GetSystemFirmwareTable( - _In_ DWORD FirmwareTableProviderSignature, - _In_ DWORD FirmwareTableID, - _Out_writes_bytes_to_opt_(BufferSize,return) PVOID pFirmwareTableBuffer, - _In_ DWORD BufferSize); - VOID WINAPI GetSystemInfo(LPSYSTEM_INFO); BOOL WINAPI GetSystemPowerStatus(_Out_ LPSYSTEM_POWER_STATUS); #if (_WIN32_WINNT >= 0x0502) @@ -3170,6 +3143,50 @@ BOOL WINAPI SetFileValidData(HANDLE,LONGLONG); #if (_WIN32_WINNT >= 0x0502) +WINBASEAPI +UINT +WINAPI +EnumSystemFirmwareTables( + _In_ DWORD FirmwareTableProviderSignature, + _Out_writes_bytes_to_opt_(BufferSize, return) PVOID pFirmwareTableEnumBuffer, + _In_ DWORD BufferSize); + +WINBASEAPI +UINT +WINAPI +GetSystemFirmwareTable( + _In_ DWORD FirmwareTableProviderSignature, + _In_ DWORD FirmwareTableID, + _Out_writes_bytes_to_opt_(BufferSize, return) PVOID pFirmwareTableBuffer, + _In_ DWORD BufferSize); + +_Success_(return > 0) +WINBASEAPI +DWORD +WINAPI +GetFirmwareEnvironmentVariableA( + _In_ LPCSTR lpName, + _In_ LPCSTR lpGuid, + _Out_writes_bytes_to_opt_(nSize, return) PVOID pBuffer, + _In_ DWORD nSize); + +_Success_(return > 0) +WINBASEAPI +DWORD +WINAPI +GetFirmwareEnvironmentVariableW( + _In_ LPCWSTR lpName, + _In_ LPCWSTR lpGuid, + _Out_writes_bytes_to_opt_(nSize, return) PVOID pBuffer, + _In_ DWORD nSize); + +#ifdef UNICODE +#define GetFirmwareEnvironmentVariable GetFirmwareEnvironmentVariableW +#else +#define GetFirmwareEnvironmentVariable GetFirmwareEnvironmentVariableA +#endif + +WINBASEAPI BOOL WINAPI SetFirmwareEnvironmentVariableA( @@ -3178,6 +3195,7 @@ SetFirmwareEnvironmentVariableA( _In_reads_bytes_opt_(nSize) PVOID pValue, _In_ DWORD nSize); +WINBASEAPI BOOL WINAPI SetFirmwareEnvironmentVariableW( @@ -3186,8 +3204,14 @@ SetFirmwareEnvironmentVariableW( _In_reads_bytes_opt_(nSize) PVOID pValue, _In_ DWORD nSize); +#ifdef UNICODE +#define SetFirmwareEnvironmentVariable SetFirmwareEnvironmentVariableW +#else +#define SetFirmwareEnvironmentVariable SetFirmwareEnvironmentVariableA #endif +#endif /* _WIN32_WINNT >= 0x0502 */ + UINT WINAPI SetHandleCount(UINT); BOOL WINAPI SetHandleInformation(HANDLE,DWORD,DWORD); diff --git a/sdk/include/xdk/extypes.h b/sdk/include/xdk/extypes.h index a8c5fa87dc2..a5311330872 100644 --- a/sdk/include/xdk/extypes.h +++ b/sdk/include/xdk/extypes.h @@ -346,3 +346,14 @@ $if (_NTIFS_) #define EX_PUSH_LOCK ULONG_PTR #define PEX_PUSH_LOCK PULONG_PTR $endif (_NTIFS_) + +$if (_WINNT_ || _WDMDDK_) +#if (NTDDI_VERSION >= NTDDI_VISTA) +typedef enum _FIRMWARE_TYPE { + FirmwareTypeUnknown, + FirmwareTypeBios, + FirmwareTypeUefi, + FirmwareTypeMax +} FIRMWARE_TYPE, *PFIRMWARE_TYPE; +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ +$endif (_WINNT_ || _WDMDDK_) diff --git a/sdk/include/xdk/winnt.template.h b/sdk/include/xdk/winnt.template.h index dd28aee4238..75a85102e08 100644 --- a/sdk/include/xdk/winnt.template.h +++ b/sdk/include/xdk/winnt.template.h @@ -73,6 +73,7 @@ $define(UCHAR=BYTE) $include(ntbasedef.h) $include(interlocked.h) $include(ketypes.h) +$include(extypes.h) $include(winnt_old.h) #ifdef __cplusplus

1 year, 4 months

[reactos] 01/01: Revert "[DDRAW] Sync the fix for swap_interval from Wine (#4831)" (#5690)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=961893a712a0ba3a508b7… commit 961893a712a0ba3a508b743aac2a769500397d0d Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Thu Sep 14 05:16:42 2023 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 14 05:16:42 2023 -0700 Revert "[DDRAW] Sync the fix for swap_interval from Wine (#4831)" (#5690) This reverts commit 67559215608eaf7338cbc7002ba3b74bf972a3a4. --- dll/directx/wine/ddraw/ddraw_private.h | 2 +- dll/directx/wine/ddraw/palette.c | 2 +- dll/directx/wine/ddraw/surface.c | 59 +++++++++------------------------- media/doc/WINESYNC.txt | 2 +- 4 files changed, 18 insertions(+), 47 deletions(-) diff --git a/dll/directx/wine/ddraw/ddraw_private.h b/dll/directx/wine/ddraw/ddraw_private.h index 433bcd34a3d..cac38c57e92 100644 --- a/dll/directx/wine/ddraw/ddraw_private.h +++ b/dll/directx/wine/ddraw/ddraw_private.h @@ -218,7 +218,7 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, - const RECT *rect, BOOL read, unsigned int swap_interval) DECLSPEC_HIDDEN; + const RECT *rect, BOOL read) DECLSPEC_HIDDEN; static inline struct ddraw_surface *impl_from_IDirect3DTexture(IDirect3DTexture *iface) { diff --git a/dll/directx/wine/ddraw/palette.c b/dll/directx/wine/ddraw/palette.c index 87aec96443a..5148832cab6 100644 --- a/dll/directx/wine/ddraw/palette.c +++ b/dll/directx/wine/ddraw/palette.c @@ -176,7 +176,7 @@ static HRESULT WINAPI ddraw_palette_SetEntries(IDirectDrawPalette *iface, hr = wined3d_palette_set_entries(palette->wined3d_palette, flags, start, count, entries); if (SUCCEEDED(hr) && palette->flags & DDPCAPS_PRIMARYSURFACE) - ddraw_surface_update_frontbuffer(palette->ddraw->primary, NULL, FALSE, 0); + ddraw_surface_update_frontbuffer(palette->ddraw->primary, NULL, FALSE); wined3d_mutex_unlock(); diff --git a/dll/directx/wine/ddraw/surface.c b/dll/directx/wine/ddraw/surface.c index c26cc76baab..11a0e6ba8db 100644 --- a/dll/directx/wine/ddraw/surface.c +++ b/dll/directx/wine/ddraw/surface.c @@ -40,9 +40,8 @@ static inline struct ddraw_surface *impl_from_IDirectDrawGammaControl(IDirectDra * applications from drawing to the screen while we've locked the frontbuffer. * We'd like to do this in wined3d instead, but for that to work wined3d needs * to support windowless rendering first. */ -HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read, unsigned int swap_interval) +HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read) { - struct wined3d_texture *dst_texture; struct ddraw *ddraw = surface->ddraw; HDC surface_dc, screen_dc; int x, y, w, h; @@ -71,18 +70,8 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RE if (read) return DD_OK; - if (swap_interval) - dst_texture = wined3d_swapchain_get_back_buffer(ddraw->wined3d_swapchain, 0); - else - dst_texture = ddraw->wined3d_frontbuffer; - - if (SUCCEEDED(hr = wined3d_texture_blt(dst_texture, 0, rect, - surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT))){ - hr = wined3d_swapchain_present(ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); - ddraw->flags |= DDRAW_GDI_FLIP; - } - - return hr; + return wined3d_texture_blt(ddraw->wined3d_frontbuffer, 0, rect, + surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT); } if (FAILED(hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, &surface_dc))) @@ -485,7 +474,7 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; wined3d_swapchain_set_palette(surface->ddraw->wined3d_swapchain, palette_impl ? palette_impl->wined3d_palette : NULL); - ddraw_surface_update_frontbuffer(surface, NULL, FALSE, 0); + ddraw_surface_update_frontbuffer(surface, NULL, FALSE); } if (palette_impl) IDirectDrawPalette_AddRef(&palette_impl->IDirectDrawPalette_iface); @@ -1001,7 +990,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface, } if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE, 0); + hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE); if (SUCCEEDED(hr)) hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx, &map_desc, rect ? &box : NULL, @@ -1190,7 +1179,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface wined3d_mutex_lock(); hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx); if (SUCCEEDED(hr) && surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, &surface->ddraw->primary_lock, FALSE, 0); + hr = ddraw_surface_update_frontbuffer(surface, &surface->ddraw->primary_lock, FALSE); wined3d_mutex_unlock(); return hr; @@ -1235,24 +1224,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Unlock(IDirectDrawSurface return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); } -static unsigned int ddraw_swap_interval_from_flags(DWORD flags) -{ - if (flags & DDFLIP_NOVSYNC) - return 0; - - switch (flags & (DDFLIP_INTERVAL2 | DDFLIP_INTERVAL3 | DDFLIP_INTERVAL4)) - { - case DDFLIP_INTERVAL2: - return 2; - case DDFLIP_INTERVAL3: - return 3; - case DDFLIP_INTERVAL4: - return 4; - default: - return 1; - } -} - static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDrawSurface7 *src, DWORD flags) { @@ -1376,7 +1347,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 } if (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(dst_impl, NULL, FALSE,ddraw_swap_interval_from_flags(flags)); + hr = ddraw_surface_update_frontbuffer(dst_impl, NULL, FALSE); else hr = DD_OK; @@ -1517,11 +1488,11 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (!dst_surface->clipper) { if (src_surface && src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect, TRUE, 0); + hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect, TRUE); if (SUCCEEDED(hr)) hr = ddraw_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fill_colour, fx, filter); if (SUCCEEDED(hr) && (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) - hr = ddraw_surface_update_frontbuffer(dst_surface, &dst_rect, FALSE, 0); + hr = ddraw_surface_update_frontbuffer(dst_surface, &dst_rect, FALSE); return hr; } @@ -1564,7 +1535,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - if (FAILED(hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect_clipped, TRUE, 0))) + if (FAILED(hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect_clipped, TRUE))) break; } } @@ -1575,7 +1546,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - if (FAILED(hr = ddraw_surface_update_frontbuffer(dst_surface, &clip_rect[i], FALSE, 0))) + if (FAILED(hr = ddraw_surface_update_frontbuffer(dst_surface, &clip_rect[i], FALSE))) break; } } @@ -2248,7 +2219,7 @@ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *dc) if (surface->dc) hr = DDERR_DCALREADYCREATED; else if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE, 0); + hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE); if (SUCCEEDED(hr)) hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, dc); @@ -2352,7 +2323,7 @@ static HRESULT WINAPI ddraw_surface7_ReleaseDC(IDirectDrawSurface7 *iface, HDC h { surface->dc = NULL; if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE, 0); + hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE); } wined3d_mutex_unlock(); @@ -4320,12 +4291,12 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurfac } if (src_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(src_impl, src_rect, TRUE, 0); + hr = ddraw_surface_update_frontbuffer(src_impl, src_rect, TRUE); if (SUCCEEDED(hr)) hr = wined3d_texture_blt(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &dst_rect, src_impl->wined3d_texture, src_impl->sub_resource_idx, src_rect, flags, NULL, WINED3D_TEXF_POINT); if (SUCCEEDED(hr) && (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) - hr = ddraw_surface_update_frontbuffer(dst_impl, &dst_rect, FALSE, 0); + hr = ddraw_surface_update_frontbuffer(dst_impl, &dst_rect, FALSE); wined3d_mutex_unlock(); switch(hr) diff --git a/media/doc/WINESYNC.txt b/media/doc/WINESYNC.txt index 5ae9963f7de..228295cedb1 100644 --- a/media/doc/WINESYNC.txt +++ b/media/doc/WINESYNC.txt @@ -28,7 +28,7 @@ dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-4.18 dll/directx/wine/d3drm # Synced to WineStaging-4.18 dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-6.0-rc5 dll/directx/wine/d3dxof # Synced to WineStaging-4.18 -dll/directx/wine/ddraw # Synced to WineStaging-3.3 (+ partial sync of ddraw_private.h, palette.c, and surface.c to wine-7.19-557-g13cc08e32d6) +dll/directx/wine/ddraw # Synced to WineStaging-3.3 dll/directx/wine/devenum # Synced to WineStaging-4.18 dll/directx/wine/dinput # Synced to WineStaging-4.18 dll/directx/wine/dinput8 # Synced to WineStaging-4.18

1 year, 4 months

[reactos] 01/01: [SHELL32] Check m_ListView on some methods (#5684)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c7a5786fd5e8ddbc9683… commit 5c7a5786fd5e8ddbc9683fd29ec2c15a92966104 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 13 22:41:00 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 13 22:41:00 2023 +0900 [SHELL32] Check m_ListView on some methods (#5684) - comdlg32:filedlg could encounter an assertion error in CWindow::SendMessage. - Assert the existence of the listview control m_ListView in the CDefView::LV_... function. - Actually check the existence of m_ListView outside the CDefView::LV_... function. ROSTESTS-388 --- dll/win32/shell32/CDefView.cpp | 58 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index ebcfa767090..9f12fd09549 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -545,6 +545,9 @@ void CDefView::UpdateStatusbar() WCHAR szPartText[MAX_PATH] = {0}; UINT cSelectedItems; + if (!m_ListView) + return; + cSelectedItems = m_ListView.GetSelectedCount(); if (cSelectedItems) { @@ -884,6 +887,8 @@ PCUITEMID_CHILD CDefView::_PidlByItem(LVITEM& lvItem) */ int CDefView::LV_FindItemByPidl(PCUITEMID_CHILD pidl) { + ASSERT(m_ListView); + int cItems = m_ListView.GetItemCount(); for (int i = 0; i<cItems; i++) @@ -904,6 +909,8 @@ int CDefView::LV_AddItem(PCUITEMID_CHILD pidl) TRACE("(%p)(pidl=%p)\n", this, pidl); + ASSERT(m_ListView); + if (_DoFolderViewCB(SFVM_ADDINGOBJECT, 0, (LPARAM)pidl) == S_FALSE) return -1; @@ -927,7 +934,11 @@ BOOLEAN CDefView::LV_DeleteItem(PCUITEMID_CHILD pidl) TRACE("(%p)(pidl=%p)\n", this, pidl); + ASSERT(m_ListView); + nIndex = LV_FindItemByPidl(pidl); + if (nIndex < 0) + return FALSE; return m_ListView.DeleteItem(nIndex); } @@ -942,6 +953,8 @@ BOOLEAN CDefView::LV_RenameItem(PCUITEMID_CHILD pidlOld, PCUITEMID_CHILD pidlNew TRACE("(%p)(pidlold=%p pidlnew=%p)\n", this, pidlOld, pidlNew); + ASSERT(m_ListView); + nItem = LV_FindItemByPidl(pidlOld); if ( -1 != nItem ) @@ -980,6 +993,8 @@ BOOLEAN CDefView::LV_ProdItem(PCUITEMID_CHILD pidl) TRACE("(%p)(pidl=%p)\n", this, pidl); + ASSERT(m_ListView); + nItem = LV_FindItemByPidl(pidl); if (-1 != nItem) @@ -1009,7 +1024,7 @@ INT CALLBACK CDefView::fill_list(LPVOID ptr, LPVOID arg) CDefView *pThis = static_cast<CDefView *>(arg); /* in a commdlg This works as a filemask*/ - if (pThis->IncludeObject(pidl) == S_OK) + if (pThis->IncludeObject(pidl) == S_OK && pThis->m_ListView) pThis->LV_AddItem(pidl); SHFree(pidl); @@ -1482,6 +1497,8 @@ UINT CDefView::GetSelections() TRACE("-- Items selected =%u\n", m_cidl); + ASSERT(m_ListView); + UINT i = 0; int lvIndex = -1; while ((lvIndex = m_ListView.GetNextItem(lvIndex, LVNI_SELECTED)) > -1) @@ -1734,11 +1751,12 @@ LRESULT CDefView::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled TRACE("%p width=%u height=%u\n", this, wWidth, wHeight); + // WM_SIZE can come before WM_CREATE + if (!m_ListView) + return 0; + /* Resize the ListView to fit our window */ - if (m_ListView) - { - ::MoveWindow(m_ListView, 0, 0, wWidth, wHeight, TRUE); - } + ::MoveWindow(m_ListView, 0, 0, wWidth, wHeight, TRUE); _DoFolderViewCB(SFVM_SIZE, 0, 0); @@ -2313,6 +2331,10 @@ static BOOL ILIsParentOrSpecialParent(PCIDLIST_ABSOLUTE pidl1, PCIDLIST_ABSOLUTE */ LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { + // The change notify can come before WM_CREATE. + if (!m_ListView) + return FALSE; + HANDLE hChange = (HANDLE)wParam; DWORD dwProcID = (DWORD)lParam; PIDLIST_ABSOLUTE *Pidls; @@ -2658,6 +2680,12 @@ HRESULT WINAPI CDefView::SelectItem(PCUITEMID_CHILD pidl, UINT uFlags) TRACE("(%p)->(pidl=%p, 0x%08x) stub\n", this, pidl, uFlags); + if (!m_ListView) + { + ERR("!m_ListView\n"); + return E_FAIL; + } + i = LV_FindItemByPidl(pidl); if (i == -1) return S_OK; @@ -2866,6 +2894,12 @@ HRESULT STDMETHODCALLTYPE CDefView::GetFocusedItem(int *piItem) HRESULT STDMETHODCALLTYPE CDefView::GetItemPosition(PCUITEMID_CHILD pidl, POINT *ppt) { + if (!m_ListView) + { + ERR("!m_ListView\n"); + return E_FAIL; + } + int lvIndex = LV_FindItemByPidl(pidl); if (lvIndex == -1 || ppt == NULL) return E_INVALIDARG; @@ -2879,7 +2913,10 @@ HRESULT STDMETHODCALLTYPE CDefView::GetSpacing(POINT *ppt) TRACE("(%p)->(%p)\n", this, ppt); if (!m_ListView) + { + ERR("!m_ListView\n"); return S_FALSE; + } if (ppt) { @@ -2942,6 +2979,8 @@ HRESULT STDMETHODCALLTYPE CDefView::SelectItem(int iItem, DWORD dwFlags) HRESULT STDMETHODCALLTYPE CDefView::SelectAndPositionItems(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, POINT *apt, DWORD dwFlags) { + ASSERT(m_ListView); + /* Reset the selection */ m_ListView.SetItemState(-1, 0, LVIS_SELECTED); @@ -3099,6 +3138,11 @@ HRESULT STDMETHODCALLTYPE CDefView::AutoArrange() HRESULT STDMETHODCALLTYPE CDefView::AddObject(PITEMID_CHILD pidl, UINT *item) { TRACE("(%p)->(%p %p)\n", this, pidl, item); + if (!m_ListView) + { + ERR("!m_ListView\n"); + return E_FAIL; + } *item = LV_AddItem(pidl); return (int)*item >= 0 ? S_OK : E_OUTOFMEMORY; } @@ -3111,11 +3155,13 @@ HRESULT STDMETHODCALLTYPE CDefView::GetObject(PITEMID_CHILD *pidl, UINT item) HRESULT STDMETHODCALLTYPE CDefView::RemoveObject(PITEMID_CHILD pidl, UINT *item) { - TRACE("(%p)->(%p %p)\n", this, pidl, item); if (!m_ListView) + { + ERR("!m_ListView\n"); return E_FAIL; + } if (pidl) {

1 year, 4 months

[reactos] 01/01: [NTUSER] Error of co_UserCreateWindowEx should display class name (#5682)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcd916bd4e1c713b8f0c1… commit bcd916bd4e1c713b8f0c1d3d17ffe465d8e37282 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 12 06:16:05 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 12 06:16:05 2023 +0900 [NTUSER] Error of co_UserCreateWindowEx should display class name (#5682) The error messsage of co_UserCreateWindowEx was unfriendly to the debugger. Show the window class name by using "%wZ" in co_UserCreateWindowEx. --- win32ss/user/ntuser/window.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index fe05bafac66..e4a7b1affd6 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2194,7 +2194,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, pti = GetW32ThreadInfo(); if (pti == NULL || pti->rpdesk == NULL) { - ERR("Thread is not attached to a desktop! Cannot create window!\n"); + ERR("Thread is not attached to a desktop! Cannot create window (%wZ)\n", ClassName); return NULL; // There is nothing to cleanup. } WinSta = pti->rpdesk->rpwinstaParent; @@ -2229,7 +2229,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, } else if ((Cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD) { - ERR("Cannot create a child window without a parent!\n"); + ERR("Cannot create a child window (%wZ) without a parent\n", ClassName); EngSetLastError(ERROR_TLW_WITH_WSCHILD); goto cleanup; /* WS_CHILD needs a parent, but WS_POPUP doesn't */ } @@ -2249,12 +2249,12 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, if (hWndParent && !ParentWindow) { - ERR("Got invalid parent window handle\n"); + ERR("Got invalid parent window handle for %wZ\n", ClassName); goto cleanup; } else if (hWndOwner && !OwnerWindow) { - ERR("Got invalid owner window handle\n"); + ERR("Got invalid owner window handle for %wZ\n", ClassName); ParentWindow = NULL; goto cleanup; } @@ -2293,7 +2293,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, dwVer ); if(!Window) { - ERR("IntCreateWindow failed!\n"); + ERR("IntCreateWindow(%wZ) failed\n", ClassName); goto cleanup; } @@ -2419,7 +2419,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, Result = co_IntSendMessage(UserHMGetHandle(Window), WM_NCCREATE, 0, (LPARAM) Cs); if (!Result) { - ERR("co_UserCreateWindowEx(): NCCREATE message failed\n"); + ERR("co_UserCreateWindowEx(%wZ): NCCREATE message failed\n", ClassName); goto cleanup; } @@ -2479,7 +2479,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, Result = co_IntSendMessage(UserHMGetHandle(Window), WM_CREATE, 0, (LPARAM) Cs); if (Result == (LRESULT)-1) { - ERR("co_UserCreateWindowEx(): WM_CREATE message failed\n"); + ERR("co_UserCreateWindowEx(%wZ): WM_CREATE message failed\n", ClassName); goto cleanup; } @@ -2570,7 +2570,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, co_IntUserManualGuiCheck(TRUE); } - TRACE("co_UserCreateWindowEx(): Created window %p\n", hWnd); + TRACE("co_UserCreateWindowEx(%wZ): Created window %p\n", ClassName, hWnd); ret = Window; cleanup:

1 year, 4 months

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

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1961d708e750b000f966b… commit 1961d708e750b000f966b0be624dfc07cc314e8e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 12 06:01:09 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 12 06:01:09 2023 +0900 [SHDOCVW][SHDOCVW_APITEST] Implement MRU List for Shell Bag, Part 3 (#5646) Follow-up to #5634. - Implement CMruBase::_UseEmptySlot. - Implement CMruLongList and CMruShortList. - Add CMruClassFactory class and modify DllGetClassObject function by using it. - Add shdocvw_apitest.exe. CORE-9283 --- dll/win32/shdocvw/mrulist.cpp | 386 +++++++++++++++++++++-- dll/win32/shdocvw/shdocvw.h | 13 +- dll/win32/shdocvw/shdocvw_main.c | 29 +- dll/win32/shdocvw/shdocvw_v1.rgs | 4 + modules/rostests/apitests/CMakeLists.txt | 1 + modules/rostests/apitests/shdocvw/CMakeLists.txt | 10 + modules/rostests/apitests/shdocvw/MRUList.cpp | 250 +++++++++++++++ modules/rostests/apitests/shdocvw/testlist.c | 10 + 8 files changed, 675 insertions(+), 28 deletions(-) diff --git a/dll/win32/shdocvw/mrulist.cpp b/dll/win32/shdocvw/mrulist.cpp index b140779cb9c..33e91aa0936 100644 --- a/dll/win32/shdocvw/mrulist.cpp +++ b/dll/win32/shdocvw/mrulist.cpp @@ -17,6 +17,7 @@ #include <shlguid_undoc.h> #include <shlwapi.h> #include <shlwapi_undoc.h> +#include <strsafe.h> #include "shdocvw.h" #include <wine/debug.h> @@ -40,7 +41,7 @@ BOOL IEILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2, BOOL bUnknown) // The flags for SLOTITEMDATA.dwFlags #define SLOT_LOADED 0x1 -#define SLOT_UNKNOWN_FLAG 0x2 +#define SLOT_SET 0x2 // The flags for CMruBase.m_dwFlags #define COMPARE_BY_MEMCMP 0x0 @@ -55,7 +56,7 @@ class CMruBase protected: LONG m_cRefs = 1; // Reference count DWORD m_dwFlags = 0; // The COMPARE_BY_... flags - BOOL m_bFlag1 = FALSE; // ??? + BOOL m_bNeedSave = FALSE; // The flag that indicates whether it needs saving BOOL m_bChecked = FALSE; // The checked flag HKEY m_hKey = NULL; // A registry key DWORD m_cSlotRooms = 0; // Rooms for slots @@ -70,11 +71,10 @@ protected: HRESULT _GetSlotItem(UINT iSlot, SLOTITEMDATA **ppItem); void _CheckUsedSlots(); + HRESULT _UseEmptySlot(UINT *piSlot); public: - CMruBase() - { - } + CMruBase(); virtual ~CMruBase(); // IUnknown methods @@ -103,7 +103,7 @@ public: virtual UINT _UpdateSlots(UINT iSlot) = 0; virtual void _SlotString(DWORD dwSlot, LPWSTR psz, DWORD cch) = 0; virtual HRESULT _GetSlot(UINT iSlot, UINT *puSlot) = 0; - virtual HRESULT _RemoveSlot(UINT iSlot, UINT *uSlot) = 0; + virtual HRESULT _RemoveSlot(UINT iSlot, UINT *puSlot) = 0; static void* operator new(size_t size) { @@ -115,6 +115,11 @@ public: } }; +CMruBase::CMruBase() +{ + ::InterlockedIncrement(&SHDOCVW_refCount); +} + CMruBase::~CMruBase() { if (m_hKey) @@ -133,13 +138,15 @@ CMruBase::~CMruBase() ::LocalFree(m_pSlots); m_pSlots = NULL; } + + ::InterlockedDecrement(&SHDOCVW_refCount); } STDMETHODIMP CMruBase::QueryInterface(REFIID riid, void **ppvObj) { if (!ppvObj) return E_POINTER; - if (IsEqualGUID(riid, IID_IMruDataList)) + if (IsEqualGUID(riid, IID_IMruDataList) || IsEqualGUID(riid, IID_IUnknown)) { *ppvObj = static_cast<IMruDataList*>(this); AddRef(); @@ -247,7 +254,7 @@ HRESULT CMruBase::_AddItem(UINT iSlot, const BYTE *pbData, DWORD cbData) return E_FAIL; pItem->cbData = cbData; - pItem->dwFlags = (SLOT_LOADED | SLOT_UNKNOWN_FLAG); + pItem->dwFlags = (SLOT_LOADED | SLOT_SET); CopyMemory(pItem->pvData, pbData, cbData); return S_OK; } @@ -397,6 +404,147 @@ HRESULT CMruBase::_DeleteValue(LPCWSTR pszValue) return SHDeleteValueW(m_hKey, NULL, pszValue); } +HRESULT CMruBase::_UseEmptySlot(UINT *piSlot) +{ + if (!m_bChecked) + _CheckUsedSlots(); + + if (!m_cSlotRooms) + return E_FAIL; + + UINT iSlot = 0; + for (SLOTITEMDATA *pItem = m_pSlots; (pItem->dwFlags & SLOT_SET); ++pItem) + { + if (++iSlot >= m_cSlotRooms) + return E_FAIL; + } + + m_pSlots[iSlot].dwFlags |= SLOT_SET; + *piSlot = iSlot; + ++m_cSlots; + + return S_OK; +} + +class CMruShortList + : public CMruBase +{ +protected: + LPWSTR m_pszSlotData = NULL; + + HRESULT _InitSlots() override; + void _SaveSlots() override; + UINT _UpdateSlots(UINT iSlot) override; + void _SlotString(DWORD dwSlot, LPWSTR psz, DWORD cch) override; + HRESULT _GetSlot(UINT iSlot, UINT *puSlot) override; + HRESULT _RemoveSlot(UINT iSlot, UINT *puSlot) override; + friend class CMruLongList; + +public: + CMruShortList() + { + } + + ~CMruShortList() override + { + m_pszSlotData = (LPWSTR)::LocalFree(m_pszSlotData); + } +}; + +HRESULT CMruShortList::_InitSlots() +{ + DWORD cbData = (m_cSlotRooms + 1) * sizeof(WCHAR); + m_pszSlotData = (LPWSTR)LocalAlloc(LPTR, cbData); + if (!m_pszSlotData) + return E_OUTOFMEMORY; + + if (SHGetValueW(m_hKey, NULL, L"MRUList", NULL, m_pszSlotData, &cbData) == ERROR_SUCCESS) + m_cSlots = (cbData / sizeof(WCHAR)) - 1; + + m_pszSlotData[m_cSlots] = UNICODE_NULL; + return S_OK; +} + +void CMruShortList::_SaveSlots() +{ + if (m_bNeedSave) + { + DWORD cbData = (m_cSlots + 1) * sizeof(WCHAR); + SHSetValueW(m_hKey, NULL, L"MRUList", REG_SZ, m_pszSlotData, cbData); + m_bNeedSave = FALSE; + } +} + +// NOTE: MRUList uses lowercase alphabet for history of most recently used items. +UINT CMruShortList::_UpdateSlots(UINT iSlot) +{ + UINT iData, cDataToMove = iSlot; + + if (iSlot == m_cSlots) + { + if (SUCCEEDED(_UseEmptySlot(&iData))) + { + ++cDataToMove; + } + else + { + // This code is getting the item index from a lowercase letter. + iData = m_pszSlotData[m_cSlots - 1] - L'a'; + --cDataToMove; + } + } + else + { + iData = m_pszSlotData[iSlot] - L'a'; + } + + if (cDataToMove) + { + MoveMemory(m_pszSlotData + 1, m_pszSlotData, cDataToMove * sizeof(WCHAR)); + m_pszSlotData[0] = (WCHAR)(L'a' + iData); + m_bNeedSave = TRUE; + } + + return iData; +} + +void CMruShortList::_SlotString(DWORD dwSlot, LPWSTR psz, DWORD cch) +{ + if (cch >= 2) + { + psz[0] = (WCHAR)(L'a' + dwSlot); + psz[1] = UNICODE_NULL; + } +} + +HRESULT CMruShortList::_GetSlot(UINT iSlot, UINT *puSlot) +{ + if (iSlot >= m_cSlots) + return E_FAIL; + + UINT iData = m_pszSlotData[iSlot] - L'a'; + if (iData >= m_cSlotRooms) + return E_FAIL; + + *puSlot = iData; + m_pSlots[iData].dwFlags |= SLOT_SET; + return S_OK; +} + +HRESULT CMruShortList::_RemoveSlot(UINT iSlot, UINT *puSlot) +{ + HRESULT hr = _GetSlot(iSlot, puSlot); + if (FAILED(hr)) + return hr; + + MoveMemory(&m_pszSlotData[iSlot], &m_pszSlotData[iSlot + 1], (m_cSlots - iSlot) * sizeof(WCHAR)); + --m_cSlots; + m_pSlots->dwFlags &= ~SLOT_SET; + m_bNeedSave = TRUE; + + return hr; +} + class CMruLongList : public CMruBase { @@ -410,7 +558,7 @@ protected: UINT _UpdateSlots(UINT iSlot) override; void _SlotString(DWORD dwSlot, LPWSTR psz, DWORD cch) override; HRESULT _GetSlot(UINT iSlot, UINT *puSlot) override; - HRESULT _RemoveSlot(UINT iSlot, UINT *uSlot) override; + HRESULT _RemoveSlot(UINT iSlot, UINT *puSlot) override; public: CMruLongList() @@ -429,51 +577,144 @@ public: HRESULT CMruLongList::_InitSlots() { - FIXME("Stub\n"); - return E_NOTIMPL; + DWORD cbData = (m_cSlotRooms + 1) * sizeof(UINT); + m_puSlotData = (UINT*)LocalAlloc(LPTR, cbData); + if (!m_puSlotData) + return E_OUTOFMEMORY; + + if (SHGetValueW(m_hKey, NULL, L"MRUListEx", NULL, m_puSlotData, &cbData) == ERROR_SUCCESS) + m_cSlots = (cbData / sizeof(UINT)) - 1; + else + _ImportShortList(); + + m_puSlotData[m_cSlots] = MAXDWORD; + return S_OK; } void CMruLongList::_SaveSlots() { - FIXME("Stub\n"); + if (m_bNeedSave) + { + SHSetValueW(m_hKey, NULL, L"MRUListEx", REG_BINARY, m_puSlotData, + (m_cSlots + 1) * sizeof(UINT)); + m_bNeedSave = FALSE; + } } UINT CMruLongList::_UpdateSlots(UINT iSlot) { - FIXME("Stub\n"); - return E_NOTIMPL; + UINT cSlotsToMove, uSlotData; + + cSlotsToMove = iSlot; + if (iSlot == m_cSlots) + { + if (SUCCEEDED(_UseEmptySlot(&uSlotData))) + { + ++cSlotsToMove; + } + else + { + uSlotData = m_puSlotData[m_cSlots - 1]; + --cSlotsToMove; + } + } + else + { + uSlotData = m_puSlotData[iSlot]; + } + + if (cSlotsToMove > 0) + { + MoveMemory(m_puSlotData + 1, m_puSlotData, cSlotsToMove * sizeof(UINT)); + m_puSlotData[0] = uSlotData; + m_bNeedSave = TRUE; + } + + return uSlotData; } void CMruLongList::_SlotString(DWORD dwSlot, LPWSTR psz, DWORD cch) { - FIXME("Stub\n"); + StringCchPrintfW(psz, cch, L"%d", dwSlot); } HRESULT CMruLongList::_GetSlot(UINT iSlot, UINT *puSlot) { - FIXME("Stub\n"); - return E_NOTIMPL; + if (iSlot >= m_cSlots) + return E_FAIL; + + UINT uSlotData = m_puSlotData[iSlot]; + if (uSlotData >= m_cSlotRooms) + return E_FAIL; + + *puSlot = uSlotData; + m_pSlots[uSlotData].dwFlags |= SLOT_SET; + return S_OK; } -HRESULT CMruLongList::_RemoveSlot(UINT iSlot, UINT *uSlot) +HRESULT CMruLongList::_RemoveSlot(UINT iSlot, UINT *puSlot) { - FIXME("Stub\n"); - return E_NOTIMPL; + HRESULT hr = _GetSlot(iSlot, puSlot); + if (FAILED(hr)) + return hr; + + MoveMemory(&m_puSlotData[iSlot], &m_puSlotData[iSlot + 1], (m_cSlots - iSlot) * sizeof(UINT)); + --m_cSlots; + m_pSlots[0].dwFlags &= ~SLOT_SET; + m_bNeedSave = TRUE; + + return hr; } void CMruLongList::_ImportShortList() { - FIXME("Stub\n"); + CMruShortList *pShortList = new CMruShortList(); + if (!pShortList) + return; + + HRESULT hr = pShortList->InitData(m_cSlotRooms, 0, m_hKey, NULL, NULL); + if (SUCCEEDED(hr)) + { + for (;;) + { + UINT uSlot; + hr = pShortList->_GetSlot(m_cSlots, &uSlot); + if (FAILED(hr)) + break; + + SLOTITEMDATA *pItem; + hr = pShortList->_GetSlotItem(uSlot, &pItem); + if (FAILED(hr)) + break; + + _AddItem(uSlot, (const BYTE*)pItem->pvData, pItem->cbData); + pShortList->_DeleteItem(uSlot); + + m_puSlotData[m_cSlots++] = uSlot; + } + + m_bNeedSave = TRUE; + } + + SHDeleteValueW(m_hKey, NULL, L"MRUList"); + pShortList->Release(); } EXTERN_C HRESULT -CMruLongList_CreateInstance(DWORD dwUnused1, void **ppv, DWORD dwUnused3) +CMruLongList_CreateInstance(DWORD_PTR dwUnused1, void **ppv, DWORD_PTR dwUnused3) { UNREFERENCED_PARAMETER(dwUnused1); UNREFERENCED_PARAMETER(dwUnused3); + TRACE("%p %p %p\n", dwUnused1, ppv, dwUnused3); + + if (!ppv) + return E_POINTER; + CMruLongList *pMruList = new CMruLongList(); *ppv = static_cast<IMruDataList*>(pMruList); + TRACE("%p\n", *ppv); + return S_OK; } @@ -626,11 +867,16 @@ STDMETHODIMP CMruPidlList::PruneKids(LPCITEMIDLIST pidl) return E_NOTIMPL; } -EXTERN_C HRESULT CMruPidlList_CreateInstance(DWORD dwUnused1, void **ppv, DWORD dwUnused3) +EXTERN_C HRESULT CMruPidlList_CreateInstance(DWORD_PTR dwUnused1, void **ppv, DWORD_PTR dwUnused3) { UNREFERENCED_PARAMETER(dwUnused1); UNREFERENCED_PARAMETER(dwUnused3); + TRACE("%p %p %p\n", dwUnused1, ppv, dwUnused3); + + if (!ppv) + return E_POINTER; + *ppv = NULL; CMruPidlList *pMruList = new CMruPidlList(); @@ -638,5 +884,99 @@ EXTERN_C HRESULT CMruPidlList_CreateInstance(DWORD dwUnused1, void **ppv, DWORD return E_OUTOFMEMORY; *ppv = static_cast<IMruPidlList*>(pMruList); + TRACE("%p\n", *ppv); + return S_OK; +} + +class CMruClassFactory : public IClassFactory +{ +protected: + LONG m_cRefs = 1; + +public: + CMruClassFactory() + { + ::InterlockedIncrement(&SHDOCVW_refCount); + } + virtual ~CMruClassFactory() + { + ::InterlockedDecrement(&SHDOCVW_refCount); + } + + // IUnknown methods + STDMETHODIMP QueryInterface(REFIID riid, void **ppvObj) override; + STDMETHODIMP_(ULONG) AddRef() override + { + return ::InterlockedIncrement(&m_cRefs); + } + STDMETHODIMP_(ULONG) Release() + { + if (::InterlockedDecrement(&m_cRefs) == 0) + { + delete this; + return 0; + } + return m_cRefs; + } + + // IClassFactory methods + STDMETHODIMP CreateInstance(IUnknown *pUnkOuter, REFIID riid, void **ppvObject); + STDMETHODIMP LockServer(BOOL fLock); + + static void* operator new(size_t size) + { + return ::LocalAlloc(LPTR, size); + } + static void operator delete(void *ptr) + { + ::LocalFree(ptr); + } +}; + +STDMETHODIMP CMruClassFactory::QueryInterface(REFIID riid, void **ppvObj) +{ + if (!ppvObj) + return E_POINTER; + if (IsEqualGUID(riid, IID_IClassFactory) || IsEqualGUID(riid, IID_IUnknown)) + { + *ppvObj = static_cast<IClassFactory*>(this); + AddRef(); + return S_OK; + } + ERR("%s: E_NOINTERFACE\n", debugstr_guid(&riid)); + return E_NOINTERFACE; +} + +STDMETHODIMP CMruClassFactory::CreateInstance(IUnknown *pUnkOuter, REFIID riid, void **ppvObject) +{ + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + if (IsEqualGUID(riid, IID_IMruDataList)) + return CMruLongList_CreateInstance(0, ppvObject, 0); + + if (IsEqualGUID(riid, IID_IMruPidlList)) + return CMruPidlList_CreateInstance(0, ppvObject, 0); + + return E_NOINTERFACE; +} + +STDMETHODIMP CMruClassFactory::LockServer(BOOL fLock) +{ + if (fLock) + ::InterlockedIncrement(&SHDOCVW_refCount); + else + ::InterlockedDecrement(&SHDOCVW_refCount); return S_OK; } + +EXTERN_C HRESULT CMruClassFactory_CreateInstance(REFIID riid, void **ppv) +{ + CMruClassFactory *pFactory = new CMruClassFactory(); + if (!pFactory) + return E_OUTOFMEMORY; + + HRESULT hr = pFactory->QueryInterface(riid, ppv); + pFactory->Release(); + return hr; +} diff --git a/dll/win32/shdocvw/shdocvw.h b/dll/win32/shdocvw/shdocvw.h index 1d8f807d8de..d58ee69384f 100644 --- a/dll/win32/shdocvw/shdocvw.h +++ b/dll/win32/shdocvw/shdocvw.h @@ -46,13 +46,22 @@ extern HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, /********************************************************************** * Dll lifetime tracking declaration for shdocvw.dll */ +#ifdef __REACTOS__ +# ifdef __cplusplus +EXTERN_C +# else +extern +# endif +LONG SHDOCVW_refCount; +#else extern LONG SHDOCVW_refCount DECLSPEC_HIDDEN; +#endif static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); } static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); } #ifdef __REACTOS__ -EXTERN_C HRESULT CMruLongList_CreateInstance(DWORD dwUnused1, void **ppv, DWORD dwUnused3); -EXTERN_C HRESULT CMruPidlList_CreateInstance(DWORD dwUnused1, void **ppv, DWORD dwUnused3); +EXTERN_C HRESULT CMruLongList_CreateInstance(DWORD_PTR dwUnused1, void **ppv, DWORD_PTR dwUnused3); +EXTERN_C HRESULT CMruClassFactory_CreateInstance(REFIID riid, void **ppv); #endif #endif /* __WINE_SHDOCVW_H */ diff --git a/dll/win32/shdocvw/shdocvw_main.c b/dll/win32/shdocvw/shdocvw_main.c index 0ca9d5827a5..8cab06cce77 100644 --- a/dll/win32/shdocvw/shdocvw_main.c +++ b/dll/win32/shdocvw/shdocvw_main.c @@ -31,6 +31,7 @@ #ifdef __REACTOS__ #include "winnls.h" #include <shlguid_undoc.h> +#include <rpcproxy.h> /* for __wine_register_resources / __wine_unregister_resources */ #endif #include "shlwapi.h" #include "wininet.h" @@ -44,6 +45,9 @@ LONG SHDOCVW_refCount = 0; static HMODULE SHDOCVW_hshell32 = 0; static HINSTANCE ieframe_instance; +#ifdef __REACTOS__ +static HINSTANCE instance; +#endif static HINSTANCE get_ieframe_instance(void) { @@ -89,10 +93,18 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return get_ieframe_object(rclsid, riid, ppv); #ifdef __REACTOS__ - if (IsEqualGUID(&CLSID_MruLongList, rclsid)) + if (IsEqualGUID(riid, &IID_IClassFactory) || IsEqualGUID(riid, &IID_IUnknown)) + { + if (IsEqualGUID(rclsid, &CLSID_MruLongList) || + IsEqualGUID(rclsid, &CLSID_MruPidlList)) + { + return CMruClassFactory_CreateInstance(riid, ppv); + } + } + else if (IsEqualGUID(riid, &IID_IMruDataList)) + { return CMruLongList_CreateInstance(0, ppv, 0); - if (IsEqualGUID(&CLSID_MruPidlList, rclsid)) - return CMruPidlList_CreateInstance(0, ppv, 0); + } #endif /* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */ @@ -105,7 +117,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) HRESULT WINAPI DllRegisterServer(void) { TRACE("\n"); +#ifdef __REACTOS__ + return __wine_register_resources(instance); +#else return S_OK; +#endif } /*********************************************************************** @@ -114,7 +130,11 @@ HRESULT WINAPI DllRegisterServer(void) HRESULT WINAPI DllUnregisterServer(void) { TRACE("\n"); +#ifdef __REACTOS__ + return __wine_unregister_resources(instance); +#else return S_OK; +#endif } /****************************************************************** @@ -155,6 +175,9 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) switch (fdwReason) { case DLL_PROCESS_ATTACH: +#ifdef __REACTOS__ + instance = hinst; +#endif DisableThreadLibraryCalls(hinst); break; case DLL_PROCESS_DETACH: diff --git a/dll/win32/shdocvw/shdocvw_v1.rgs b/dll/win32/shdocvw/shdocvw_v1.rgs index 160c7e8c6c5..9ad6c4ecd37 100644 --- a/dll/win32/shdocvw/shdocvw_v1.rgs +++ b/dll/win32/shdocvw/shdocvw_v1.rgs @@ -199,6 +199,10 @@ HKCR Version = s '1.1' VersionIndependentProgId = s 'SearchAssistantOC.SearchAssistantOC' } + '{53BD6B4E-3780-4693-AFC3-7161C2F3EE9C}' = s 'MruLongList' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + } } 'Shell.Explorer.1' = s 'Microsoft Web Browser Version 1' { diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index 407b5955964..ebc0bdfd4b5 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -43,6 +43,7 @@ add_subdirectory(powrprof) add_subdirectory(sdk) add_subdirectory(setupapi) add_subdirectory(sfc) +add_subdirectory(shdocvw) add_subdirectory(shell32) add_subdirectory(shlwapi) add_subdirectory(spoolss) diff --git a/modules/rostests/apitests/shdocvw/CMakeLists.txt b/modules/rostests/apitests/shdocvw/CMakeLists.txt new file mode 100644 index 00000000000..72fcc69af22 --- /dev/null +++ b/modules/rostests/apitests/shdocvw/CMakeLists.txt @@ -0,0 +1,10 @@ + +list(APPEND SOURCE + MRUList.cpp + testlist.c) + +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_rostests_file(TARGET shdocvw_apitest) diff --git a/modules/rostests/apitests/shdocvw/MRUList.cpp b/modules/rostests/apitests/shdocvw/MRUList.cpp new file mode 100644 index 00000000000..73c110dc68c --- /dev/null +++ b/modules/rostests/apitests/shdocvw/MRUList.cpp @@ -0,0 +1,250 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Tests for MRU List + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <apitest.h> +#include <winreg.h> +#include <shlwapi.h> +#include <shlobj.h> +#include <shlobj_undoc.h> +#include <shlguid_undoc.h> +#include <stdio.h> +#include <shlwapi_undoc.h> +#include <versionhelpers.h> +#include <strsafe.h> +#include <wine/test.h> +#include <pseh/pseh2.h> + +#define SUBKEY0 L"Software\\MRUListTest" +#define TEXT0 L"This is a test." +#define TEXT1 L"ReactOS rocks!" + +static void MRUList_List0(void) +{ + HRESULT hr; + IMruDataList *pList = NULL; + UINT iSlot1, iSlot2, iSlot3; + DWORD cbText; + WCHAR szText[MAX_PATH]; + + hr = CoCreateInstance(CLSID_MruLongList, NULL, CLSCTX_INPROC_SERVER, + IID_IMruDataList, (LPVOID*)&pList); + ok_hex(hr, S_OK); + if (pList == NULL) + { + skip("pList was NULL\n"); + return; + } + + hr = pList->InitData(26, 0, HKEY_CURRENT_USER, SUBKEY0, NULL); + ok_hex(hr, S_OK); + + cbText = (wcslen(TEXT0) + 1) * sizeof(WCHAR); + hr = pList->AddData((BYTE*)TEXT0, cbText, &iSlot1); + ok_hex(hr, S_OK); + ok_int(iSlot1, 0); + + hr = pList->FindData((BYTE*)TEXT0, cbText, &iSlot2); + ok_hex(hr, S_OK); + ok_int(iSlot1, iSlot2); + + cbText = sizeof(szText); + hr = pList->GetData(iSlot1, (BYTE*)szText, cbText); + ok_hex(hr, S_OK); + ok_wstr(szText, TEXT0); + + cbText = (wcslen(TEXT1) + 1) * sizeof(WCHAR); + hr = pList->AddData((BYTE*)TEXT1, cbText, &iSlot3); + ok_hex(hr, S_OK); + ok_int(iSlot3, 1); + + pList->Release(); +} + +static void MRUList_List0_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\x00\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_List1(void) +{ + HRESULT hr; + IMruDataList *pList = NULL; + UINT iSlot; + + hr = CoCreateInstance(CLSID_MruLongList, NULL, CLSCTX_INPROC_SERVER, + IID_IMruDataList, (LPVOID*)&pList); + ok_hex(hr, S_OK); + if (pList == NULL) + { + skip("pList was NULL\n"); + return; + } + + hr = pList->InitData(26, 0, HKEY_CURRENT_USER, SUBKEY0, NULL); + ok_hex(hr, S_OK); + + DWORD cbText = (wcslen(TEXT0) + 1) * sizeof(WCHAR); + hr = pList->FindData((BYTE*)TEXT0, cbText, &iSlot); + ok_hex(hr, S_OK); + ok_int(iSlot, 1); + + hr = pList->Delete(iSlot); + ok_hex(hr, S_OK); + + iSlot = 0xCAFE; + cbText = (wcslen(TEXT0) + 1) * sizeof(WCHAR); + hr = pList->FindData((BYTE*)TEXT0, cbText, &iSlot); + ok_hex(hr, E_FAIL); + ok_int(iSlot, 0xCAFE); + + 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) +{ + HRESULT hr; + IMruDataList *pList = NULL; + + hr = CoCreateInstance(CLSID_MruLongList, NULL, CLSCTX_INPROC_SERVER, + IID_IMruDataList, (LPVOID*)&pList); + ok_hex(hr, S_OK); + if (pList == NULL) + { + skip("pList was NULL\n"); + return; + } + + hr = pList->InitData(26, 0, HKEY_CURRENT_USER, SUBKEY0, NULL); + ok_hex(hr, S_OK); + + WCHAR szText[MAX_PATH]; + DWORD cbText = sizeof(szText); + StringCchCopyW(szText, _countof(szText), L"===="); + hr = pList->GetData(0, (BYTE*)szText, cbText); + ok_hex(hr, S_OK); + ok_wstr(szText, L"ABC"); + + StringCchCopyW(szText, _countof(szText), L"===="); + cbText = sizeof(szText); + hr = pList->GetData(1, (BYTE*)szText, cbText); + ok_hex(hr, S_OK); + ok_wstr(szText, L"XYZ"); + + 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) +{ + if (IsWindowsVistaOrGreater()) + { + skip("Vista+ doesn't support CLSID_MruLongList\n"); + return; + } + + SHDeleteKeyW(HKEY_CURRENT_USER, SUBKEY0); + + LONG error; + error = SHSetValueW(HKEY_CURRENT_USER, SUBKEY0, NULL, REG_SZ, L"", sizeof(UNICODE_NULL)); + ok_long(error, ERROR_SUCCESS); + + error = SHGetValueW(HKEY_CURRENT_USER, SUBKEY0, NULL, NULL, NULL, NULL); + ok_long(error, ERROR_SUCCESS); + + MRUList_List0(); + MRUList_List0_Check(); + + MRUList_List1(); + MRUList_List1_Check(); + + error = SHDeleteValueW(HKEY_CURRENT_USER, SUBKEY0, L"MRUList"); + ok_long(error, ERROR_FILE_NOT_FOUND); + error = SHDeleteValueW(HKEY_CURRENT_USER, SUBKEY0, L"MRUListEx"); + ok_long(error, ERROR_SUCCESS); + + error = SHSetValueW(HKEY_CURRENT_USER, SUBKEY0, L"MRUList", REG_SZ, L"ab", 3 * sizeof(WCHAR)); + ok_long(error, ERROR_SUCCESS); + error = SHSetValueW(HKEY_CURRENT_USER, SUBKEY0, L"a", REG_BINARY, L"ABC", 4 * sizeof(WCHAR)); + ok_long(error, ERROR_SUCCESS); + 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(); + + error = SHDeleteValueW(HKEY_CURRENT_USER, SUBKEY0, L"MRUList"); + ok_long(error, ERROR_FILE_NOT_FOUND); + error = SHDeleteValueW(HKEY_CURRENT_USER, SUBKEY0, L"MRUListEx"); + ok_long(error, ERROR_SUCCESS); + + SHDeleteKeyW(HKEY_CURRENT_USER, SUBKEY0); +} + +START_TEST(MRUList) +{ + HRESULT hr = CoInitialize(NULL); + ok_hex(hr, S_OK); + + MRUList_List(); + + if (SUCCEEDED(hr)) + CoUninitialize(); +} diff --git a/modules/rostests/apitests/shdocvw/testlist.c b/modules/rostests/apitests/shdocvw/testlist.c new file mode 100644 index 00000000000..1a34744c0df --- /dev/null +++ b/modules/rostests/apitests/shdocvw/testlist.c @@ -0,0 +1,10 @@ +#define STANDALONE +#include <apitest.h> + +extern void func_MRUList(void); + +const struct test winetest_testlist[] = +{ + { "MRUList", func_MRUList }, + { 0, 0 } +};

1 year, 4 months

[reactos] 01/01: [NTGDI] GetPixel's return top byte is zero if valid (#5677)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a16fc5e19b5356d98a3b… commit 2a16fc5e19b5356d98a3bace9be3cf161304024a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 12 05:56:36 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 12 05:56:36 2023 +0900 [NTGDI] GetPixel's return top byte is zero if valid (#5677) According to the results of CImage testcase, the top byte of the GetPixel() return value is zero if the return is a valid color. Do bitwise-AND operation if the color value is valid. CORE-19008 --- win32ss/gdi/ntgdi/bitblt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/win32ss/gdi/ntgdi/bitblt.c b/win32ss/gdi/ntgdi/bitblt.c index 2e3eaeef0b2..c86bbbc53ba 100644 --- a/win32ss/gdi/ntgdi/bitblt.c +++ b/win32ss/gdi/ntgdi/bitblt.c @@ -1598,6 +1598,9 @@ NtGdiGetPixel( /* Delete the surface */ GDIOBJ_vDeleteObject(&psurfDest->BaseObject); + + /* The top byte is zero */ + ulRGBColor &= 0x00FFFFFF; } leave:

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