Ros-diffs

ros-diffs@reactos.org

17 participants
81085 discussions

[reactos] 01/01: [SHELL32] Rename file on copy-paste path collision (#5462)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=520577a8ecccc6f2954d0… commit 520577a8ecccc6f2954d00b662640011f2800fa7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 6 20:56:45 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 6 20:56:45 2023 +0900 [SHELL32] Rename file on copy-paste path collision (#5462) - If the source and destination of copying file are on the same directory, then enable FOF_RENAMEONCOLLISION flag. End if. - Don't show error message IDS_COPYERRORSUBFOLDER or IDS_MOVEERRORSUBFOLDER if the source and the destination are the same. CORE-18599 --- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 17 ++++++++++++++++- dll/win32/shell32/shlfileop.cpp | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index 10aee5e3532..f480ffa9808 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -42,6 +42,7 @@ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, PWCHAR pwszListPos = pwszSrcPathsList; STRRET strretFrom; SHFILEOPSTRUCTW fop; + BOOL bRenameOnCollision = FALSE; /* Build a double null terminated list of C strings from source paths */ for (UINT i = 0; i < cidl; i++) @@ -64,7 +65,18 @@ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, if (FAILED(ret)) goto cleanup; - wszDstPath[lstrlenW(wszDstPath) + 1] = L'\0'; + wszDstPath[lstrlenW(wszDstPath) + 1] = UNICODE_NULL; + + /* Set bRenameOnCollision to TRUE if necesssary */ + if (bCopy) + { + WCHAR szPath1[MAX_PATH], szPath2[MAX_PATH]; + GetFullPathNameW(pwszSrcPathsList, _countof(szPath1), szPath1, NULL); + GetFullPathNameW(wszDstPath, _countof(szPath2), szPath2, NULL); + PathRemoveFileSpecW(szPath1); + if (_wcsicmp(szPath1, szPath2) == 0) + bRenameOnCollision = TRUE; + } ZeroMemory(&fop, sizeof(fop)); fop.hwnd = m_hwndSite; @@ -72,6 +84,9 @@ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, fop.pFrom = pwszSrcPathsList; fop.pTo = wszDstPath; fop.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; + if (bRenameOnCollision) + fop.fFlags |= FOF_RENAMEONCOLLISION; + ret = S_OK; if (SHFileOperationW(&fop)) diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index 351ee1e4c5c..18956867143 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -1940,7 +1940,7 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT { size_t cchFrom = PathAddBackslashW(szFrom) - szFrom; size_t cchTo = PathAddBackslashW(szTo) - szTo; - if (cchFrom <= cchTo) + if (cchFrom < cchTo) { WCHAR ch = szTo[cchFrom]; szTo[cchFrom] = 0;

1 year, 5 months

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST][SDK] SHCreatePropertyBagOnRegKey (#5531)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4684e9809ba42fa5f5c6… commit b4684e9809ba42fa5f5c644f02aa75893f232324 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 6 20:54:55 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 6 20:54:55 2023 +0900 [SHLWAPI][SHLWAPI_APITEST][SDK] SHCreatePropertyBagOnRegKey (#5531) Follow-up to #5511. - Add CRegPropertyBag class. - Implement SHCreatePropertyBagOnRegKey function by using CRegPropertyBag. - Strengthen SHPropertyBag testcase in shlwapi_apitest. CORE-9283 --- dll/win32/shlwapi/ordinal.c | 2 + dll/win32/shlwapi/precomp.h | 1 - dll/win32/shlwapi/propbag.cpp | 333 ++++++++++++++++++++- dll/win32/shlwapi/shlwapi.spec | 2 +- .../rostests/apitests/shlwapi/SHPropertyBag.cpp | 187 +++++++++++- sdk/include/reactos/shlwapi_undoc.h | 9 + 6 files changed, 528 insertions(+), 6 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index 9053c33b956..f43408d9479 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -5068,6 +5068,7 @@ free_sids: return psd; } +#ifndef __REACTOS__ /* See propbag.cpp */ /*********************************************************************** * SHCreatePropertyBagOnRegKey [SHLWAPI.471] * @@ -5093,6 +5094,7 @@ HRESULT WINAPI SHCreatePropertyBagOnRegKey (HKEY hKey, LPCWSTR subkey, return E_NOTIMPL; } +#endif /*********************************************************************** * SHGetViewStatePropertyBag [SHLWAPI.515] diff --git a/dll/win32/shlwapi/precomp.h b/dll/win32/shlwapi/precomp.h index 86f3ea401fd..2113a5dd967 100644 --- a/dll/win32/shlwapi/precomp.h +++ b/dll/win32/shlwapi/precomp.h @@ -20,7 +20,6 @@ #include <wingdi.h> #include <wincon.h> #include <winternl.h> -#define NO_SHLWAPI_STREAM #define NO_SHLWAPI_USER #include <shlwapi.h> #include <shlobj.h> diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index 27434091fc3..f9951324d0c 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -51,6 +51,8 @@ public: *ppvObject = static_cast<IPropertyBag*>(this); return S_OK; } + + ERR("%p: %s: E_NOTIMPL\n", this, debugstr_guid(&riid)); return E_NOTIMPL; } STDMETHODIMP_(ULONG) AddRef() override @@ -245,9 +247,336 @@ SHCreatePropertyBagOnMemory(_In_ DWORD dwMode, _In_ REFIID riid, _Out_ void **pp CComPtr<CMemPropertyBag> pMemBag(new CMemPropertyBag(dwMode)); - HRESULT hr = pMemBag->QueryInterface(riid, ppvObj); + return pMemBag->QueryInterface(riid, ppvObj); +} + +class CRegPropertyBag : public CBasePropertyBag +{ +protected: + HKEY m_hKey; + + HRESULT _ReadDword(LPCWSTR pszPropName, VARIANT *pvari); + HRESULT _ReadString(LPCWSTR pszPropName, VARIANTARG *pvarg, UINT len); + HRESULT _ReadBinary(LPCWSTR pszPropName, VARIANT *pvari, VARTYPE vt, DWORD uBytes); + HRESULT _ReadStream(VARIANT *pvari, BYTE *pInit, UINT cbInit); + HRESULT _CopyStreamIntoBuff(IStream *pStream, void *pv, ULONG cb); + HRESULT _GetStreamSize(IStream *pStream, LPDWORD pcbSize); + HRESULT _WriteStream(LPCWSTR pszPropName, IStream *pStream); + +public: + CRegPropertyBag(DWORD dwMode) + : CBasePropertyBag(dwMode) + , m_hKey(NULL) + { + } + + ~CRegPropertyBag() override + { + if (m_hKey) + ::RegCloseKey(m_hKey); + } + + HRESULT Init(HKEY hKey, LPCWSTR lpSubKey); + + STDMETHODIMP Read(_In_z_ LPCWSTR pszPropName, _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) override; + STDMETHODIMP Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) override; +}; + +HRESULT CRegPropertyBag::Init(HKEY hKey, LPCWSTR lpSubKey) +{ + REGSAM nAccess = 0; + if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) != STGM_WRITE) + nAccess |= KEY_READ; + if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) != STGM_READ) + nAccess |= KEY_WRITE; + + LONG error; + if (m_dwMode & STGM_CREATE) + error = ::RegCreateKeyExW(hKey, lpSubKey, 0, NULL, 0, nAccess, NULL, &m_hKey, NULL); + else + error = ::RegOpenKeyExW(hKey, lpSubKey, 0, nAccess, &m_hKey); + + if (error != ERROR_SUCCESS) + { + ERR("%p %s 0x%08X\n", hKey, debugstr_w(lpSubKey), error); + return HRESULT_FROM_WIN32(error); + } + + return S_OK; +} + +HRESULT CRegPropertyBag::_ReadDword(LPCWSTR pszPropName, VARIANT *pvari) +{ + DWORD cbData = sizeof(DWORD); + LONG error = SHGetValueW(m_hKey, NULL, pszPropName, NULL, &V_UI4(pvari), &cbData); + if (error) + return E_FAIL; + + V_VT(pvari) = VT_UI4; + return S_OK; +} + +HRESULT CRegPropertyBag::_ReadString(LPCWSTR pszPropName, VARIANTARG *pvarg, UINT len) +{ + BSTR bstr = ::SysAllocStringByteLen(NULL, len); + V_BSTR(pvarg) = bstr; + if (!bstr) + return E_OUTOFMEMORY; + + V_VT(pvarg) = VT_BSTR; + LONG error = SHGetValueW(m_hKey, NULL, pszPropName, NULL, bstr, (LPDWORD)&len); + if (error) + { + ::VariantClear(pvarg); + return E_FAIL; + } + + return S_OK; +} + +HRESULT CRegPropertyBag::_ReadStream(VARIANT *pvari, BYTE *pInit, UINT cbInit) +{ + IStream *pStream = SHCreateMemStream(pInit, cbInit); + V_UNKNOWN(pvari) = pStream; + if (!pStream) + return E_OUTOFMEMORY; + V_VT(pvari) = VT_UNKNOWN; + return S_OK; +} + +HRESULT +CRegPropertyBag::_ReadBinary( + LPCWSTR pszPropName, + VARIANT *pvari, + VARTYPE vt, + DWORD uBytes) +{ + HRESULT hr = E_FAIL; + if (vt != VT_UNKNOWN || uBytes < sizeof(GUID)) + return hr; + + LPBYTE pbData = (LPBYTE)::LocalAlloc(LMEM_ZEROINIT, uBytes); + if (!pbData) + return hr; + + if (!SHGetValueW(m_hKey, NULL, pszPropName, NULL, pbData, &uBytes) && + memcmp(&GUID_NULL, pbData, sizeof(GUID)) == 0) + { + hr = _ReadStream(pvari, pbData + sizeof(GUID), uBytes - sizeof(GUID)); + } + + ::LocalFree(pbData); + + return hr; +} + +HRESULT CRegPropertyBag::_CopyStreamIntoBuff(IStream *pStream, void *pv, ULONG cb) +{ + LARGE_INTEGER li; + li.QuadPart = 0; + HRESULT hr = pStream->Seek(li, 0, NULL); + if (FAILED(hr)) + return hr; + return pStream->Read(pv, cb, NULL); +} + +HRESULT CRegPropertyBag::_GetStreamSize(IStream *pStream, LPDWORD pcbSize) +{ + *pcbSize = 0; + + ULARGE_INTEGER ui; + HRESULT hr = IStream_Size(pStream, &ui); + if (FAILED(hr)) + return hr; + + if (ui.DUMMYSTRUCTNAME.HighPart) + return E_FAIL; /* 64-bit value is not supported */ + + *pcbSize = ui.DUMMYSTRUCTNAME.LowPart; + return hr; +} + +STDMETHODIMP +CRegPropertyBag::Read( + _In_z_ LPCWSTR pszPropName, + _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) +{ + UNREFERENCED_PARAMETER(pErrorLog); + + TRACE("%p: %s %p %p\n", this, debugstr_w(pszPropName), pvari, pErrorLog); + + if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_WRITE) + { + ERR("%p: 0x%X\n", this, m_dwMode); + ::VariantInit(pvari); + return E_ACCESSDENIED; + } + + VARTYPE vt = V_VT(pvari); + VariantInit(pvari); + + HRESULT hr; + DWORD dwType, cbValue; + LONG error = SHGetValueW(m_hKey, NULL, pszPropName, &dwType, NULL, &cbValue); + if (error != ERROR_SUCCESS) + hr = E_FAIL; + else if (dwType == REG_SZ) + hr = _ReadString(pszPropName, pvari, cbValue); + else if (dwType == REG_BINARY) + hr = _ReadBinary(pszPropName, pvari, vt, cbValue); + else if (dwType == REG_DWORD) + hr = _ReadDword(pszPropName, pvari); + else + hr = E_FAIL; + + if (FAILED(hr)) + { + ERR("%p: 0x%08X %ld: %s %p\n", this, hr, dwType, debugstr_w(pszPropName), pvari); + ::VariantInit(pvari); + return hr; + } + + hr = ::VariantChangeTypeForRead(pvari, vt); if (FAILED(hr)) - ERR("0x%08X %s\n", hr, debugstr_guid(&riid)); + { + ERR("%p: 0x%08X %ld: %s %p\n", this, hr, dwType, debugstr_w(pszPropName), pvari); + ::VariantInit(pvari); + } + + return hr; +} + +HRESULT +CRegPropertyBag::_WriteStream(LPCWSTR pszPropName, IStream *pStream) +{ + DWORD cbData; + HRESULT hr = _GetStreamSize(pStream, &cbData); + if (FAILED(hr) || !cbData) + return hr; + + DWORD cbBinary = cbData + sizeof(GUID); + LPBYTE pbBinary = (LPBYTE)::LocalAlloc(LMEM_ZEROINIT, cbBinary); + if (!pbBinary) + return E_OUTOFMEMORY; + + hr = _CopyStreamIntoBuff(pStream, pbBinary + sizeof(GUID), cbData); + if (SUCCEEDED(hr)) + { + if (SHSetValueW(m_hKey, NULL, pszPropName, REG_BINARY, pbBinary, cbBinary)) + hr = E_FAIL; + } + + ::LocalFree(pbBinary); + return hr; +} + +STDMETHODIMP +CRegPropertyBag::Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) +{ + TRACE("%p: %s %p\n", this, debugstr_w(pszPropName), pvari); + + if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_READ) + { + ERR("%p: 0x%X\n", this, m_dwMode); + return E_ACCESSDENIED; + } + + HRESULT hr; + LONG error; + VARIANTARG vargTemp = { 0 }; + switch (V_VT(pvari)) + { + case VT_EMPTY: + SHDeleteValueW(m_hKey, NULL, pszPropName); + hr = S_OK; + break; + + case VT_BOOL: + case VT_I1: + case VT_I2: + case VT_I4: + case VT_UI1: + case VT_UI2: + case VT_UI4: + case VT_INT: + case VT_UINT: + { + hr = ::VariantChangeType(&vargTemp, pvari, 0, VT_UI4); + if (FAILED(hr)) + return hr; + + error = SHSetValueW(m_hKey, NULL, pszPropName, REG_DWORD, &V_UI4(&vargTemp), sizeof(DWORD)); + if (error) + hr = E_FAIL; + + ::VariantClear(&vargTemp); + break; + } + + case VT_UNKNOWN: + { + CComPtr<IStream> pStream; + hr = V_UNKNOWN(pvari)->QueryInterface(IID_IStream, (void **)&pStream); + if (FAILED(hr)) + return hr; + + hr = _WriteStream(pszPropName, pStream); + break; + } + + default: + { + hr = ::VariantChangeType(&vargTemp, pvari, 0, VT_BSTR); + if (FAILED(hr)) + return hr; + + int cch = lstrlenW(V_BSTR(&vargTemp)); + DWORD cb = (cch + 1) * sizeof(WCHAR); + error = SHSetValueW(m_hKey, NULL, pszPropName, REG_SZ, V_BSTR(&vargTemp), cb); + if (error) + hr = E_FAIL; + + ::VariantClear(&vargTemp); + break; + } + } return hr; } + +/************************************************************************** + * SHCreatePropertyBagOnRegKey (SHLWAPI.471) + * + * Creates a property bag object on registry key. + * + * @param hKey The registry key. + * @param pszSubKey The path of the sub-key. + * @param dwMode The combination of STGM_READ, STGM_WRITE, STGM_READWRITE, and STGM_CREATE. + * @param riid Specifies either IID_IUnknown, IID_IPropertyBag or IID_IPropertyBag2. + * @param ppvObj Receives an IPropertyBag pointer. + * @return An HRESULT value. S_OK on success, non-zero on failure. + * @see https://source.winehq.org/WineAPI/SHCreatePropertyBagOnRegKey.html + */ +EXTERN_C HRESULT WINAPI +SHCreatePropertyBagOnRegKey( + _In_ HKEY hKey, + _In_z_ LPCWSTR pszSubKey, + _In_ DWORD dwMode, + _In_ REFIID riid, + _Out_ void **ppvObj) +{ + TRACE("%p, %s, 0x%08X, %s, %p\n", hKey, debugstr_w(pszSubKey), dwMode, + debugstr_guid(&riid), ppvObj); + + *ppvObj = NULL; + + CComPtr<CRegPropertyBag> pRegBag(new CRegPropertyBag(dwMode)); + + HRESULT hr = pRegBag->Init(hKey, pszSubKey); + if (FAILED(hr)) + return hr; + + return pRegBag->QueryInterface(riid, ppvObj); +} diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 0844af03d5d..13cac9b8c7a 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -468,7 +468,7 @@ 468 stub -noname RunIndirectRegCommand 469 stub -noname RunRegCommand 470 stub -noname IUnknown_ProfferServiceOld -471 stdcall -noname SHCreatePropertyBagOnRegKey(long wstr long ptr ptr) +471 stdcall -noname SHCreatePropertyBagOnRegKey(ptr wstr long ptr ptr) 472 stub -noname SHCreatePropertyBagOnProfileSelection 473 stub -noname SHGetIniStringUTF7W 474 stub -noname SHSetIniStringUTF7W diff --git a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp index 2114ceff231..365c4478f19 100644 --- a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -96,7 +96,7 @@ public: if (lstrcmpiW(pszPropName, L"GUID1") == 0) { V_VT(pvari) = (VT_UI1 | VT_ARRAY); - V_ARRAY(pvari) = CreateByteArray(&IID_IShellLink, sizeof(IID)); + V_ARRAY(pvari) = CreateByteArray(&IID_IShellLinkW, sizeof(IID)); return S_OK; } @@ -225,7 +225,7 @@ static void SHPropertyBag_ReadTest(void) ok_long(hr, S_OK); ok_int(s_cRead, 1); ok_int(s_cWrite, 0); - ok_int(IsEqualGUID(guid, IID_IShellLink), TRUE); + ok_int(IsEqualGUID(guid, IID_IShellLinkW), TRUE); ResetTest(VT_EMPTY, L"GUID2"); hr = SHPropertyBag_ReadGUID(&dummy, L"GUID2", &guid); @@ -456,9 +456,192 @@ static void SHPropertyBag_OnMemory(void) } } +static void SHPropertyBag_OnRegKey(void) +{ + HKEY hKey, hSubKey; + LONG error; + VARIANT vari; + WCHAR szText[MAX_PATH]; + IStream *pStream; + GUID guid; + BYTE guid_and_extra[sizeof(GUID) + sizeof(GUID)]; + + // Create HKCU\Software\ReactOS registry key + error = RegCreateKeyW(HKEY_CURRENT_USER, L"Software\\ReactOS", &hKey); + if (error) + { + skip("FAILED to create HKCU\\Software\\ReactOS\n"); + return; + } + + IPropertyBag *pPropBag; + HRESULT hr; + + // Try to create new registry key + RegDeleteKeyW(hKey, L"PropBagTest"); + hr = SHCreatePropertyBagOnRegKey(hKey, L"PropBagTest", 0, + IID_IPropertyBag, (void **)&pPropBag); + ok_long(hr, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)); + + // Try to create new registry key + RegDeleteKeyW(hKey, L"PropBagTest"); + hr = SHCreatePropertyBagOnRegKey(hKey, L"PropBagTest", STGM_READWRITE, + IID_IPropertyBag, (void **)&pPropBag); + ok_long(hr, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)); + + // Create new registry key + RegDeleteKeyW(hKey, L"PropBagTest"); + hr = SHCreatePropertyBagOnRegKey(hKey, L"PropBagTest", STGM_CREATE | STGM_READWRITE, + IID_IPropertyBag, (void **)&pPropBag); + if (FAILED(hr)) + { + skip("SHCreatePropertyBagOnRegKey FAILED\n"); + RegCloseKey(hKey); + return; + } + + // Write UI4 + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + V_UI4(&vari) = 0xDEADFACE; + hr = pPropBag->Write(L"Name1", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + // Read UI4 + VariantInit(&vari); + hr = pPropBag->Read(L"Name1", &vari, NULL); + ok_long(hr, S_OK); + ok_long(V_VT(&vari), VT_UI4); + ok_long(V_UI4(&vari), 0xDEADFACE); + VariantClear(&vari); + + // Write BSTR + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + V_BSTR(&vari) = SysAllocString(L"StrValue"); + hr = pPropBag->Write(L"Name2", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + // Read BSTR + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + hr = pPropBag->Read(L"Name2", &vari, NULL); + ok_long(hr, S_OK); + ok_long(V_VT(&vari), VT_BSTR); + ok_wstr(V_BSTR(&vari), L"StrValue"); + VariantClear(&vari); + + // Write GUID + VariantInit(&vari); + V_VT(&vari) = VT_UNKNOWN; + V_UNKNOWN(&vari) = SHCreateMemStream((BYTE*)&IID_IShellLinkW, sizeof(IID_IShellLinkW)); + hr = pPropBag->Write(L"Name4", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + // Read GUID + VariantInit(&vari); + V_VT(&vari) = VT_EMPTY; + hr = pPropBag->Read(L"Name4", &vari, NULL); + if (IsWindowsVistaOrGreater()) + { + ok_long(hr, S_OK); + ok_long(V_VT(&vari), VT_UNKNOWN); + pStream = (IStream*)V_UNKNOWN(&vari); + FillMemory(&guid, sizeof(guid), 0xEE); + hr = pStream->Read(&guid, sizeof(guid), NULL); + ok_long(hr, S_OK); + ok_int(::IsEqualGUID(guid, IID_IShellLinkW), TRUE); + } + else // XP/2k3 Read is buggy + { + ok_long(hr, E_FAIL); + ok_long(V_VT(&vari), VT_EMPTY); + } + VariantClear(&vari); + + pPropBag->Release(); + + // Check registry + error = RegOpenKeyExW(hKey, L"PropBagTest", 0, KEY_READ, &hSubKey); + ok_long(error, ERROR_SUCCESS); + DWORD dwType, dwValue, cbValue = sizeof(dwValue); + error = RegQueryValueExW(hSubKey, L"Name1", NULL, &dwType, (BYTE*)&dwValue, &cbValue); + ok_long(error, ERROR_SUCCESS); + ok_long(dwType, REG_DWORD); + ok_long(dwValue, 0xDEADFACE); + ok_long(cbValue, sizeof(DWORD)); + cbValue = sizeof(szText); + error = RegQueryValueExW(hSubKey, L"Name2", NULL, &dwType, (BYTE*)szText, &cbValue); + ok_long(error, ERROR_SUCCESS); + ok_long(dwType, REG_SZ); + ok_wstr(szText, L"StrValue"); + cbValue = sizeof(guid_and_extra); + error = RegQueryValueExW(hSubKey, L"Name4", NULL, &dwType, (BYTE*)&guid_and_extra, &cbValue); + ok_long(error, ERROR_SUCCESS); + ok_long(dwType, REG_BINARY); + ok_int(memcmp(&guid_and_extra, &GUID_NULL, sizeof(GUID)), 0); + ok_int(memcmp(&guid_and_extra[sizeof(GUID)], &IID_IShellLinkW, sizeof(GUID)), 0); + RegCloseKey(hSubKey); + + // Create as read-only + hr = SHCreatePropertyBagOnRegKey(hKey, L"PropBagTest", STGM_READ, + IID_IPropertyBag, (void **)&pPropBag); + ok_long(hr, S_OK); + + // Read UI4 + VariantInit(&vari); + hr = pPropBag->Read(L"Name1", &vari, NULL); + ok_long(hr, S_OK); + ok_long(V_VT(&vari), VT_UI4); + ok_long(V_UI4(&vari), 0xDEADFACE); + VariantClear(&vari); + + // Write UI4 + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + V_UI4(&vari) = 0xDEADFACE; + hr = pPropBag->Write(L"Name1", &vari); + ok_long(hr, E_ACCESSDENIED); + VariantClear(&vari); + + pPropBag->Release(); + + // Create as write-only IPropertyBag2 + hr = SHCreatePropertyBagOnRegKey(hKey, L"PropBagTest", STGM_WRITE, + IID_IPropertyBag2, (void **)&pPropBag); + ok_long(hr, S_OK); + + // Write UI4 + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + V_UI4(&vari) = 0xDEADFACE; + hr = pPropBag->Write(L"Name3", &vari); + ok_long(hr, E_NOTIMPL); + VariantClear(&vari); + + // Read UI4 + VariantInit(&vari); + V_UI4(&vari) = 0xFEEDF00D; + hr = pPropBag->Read(L"Name3", &vari, NULL); + ok_long(hr, E_NOTIMPL); + ok_int(V_VT(&vari), VT_EMPTY); + ok_long(V_UI4(&vari), 0xFEEDF00D); + VariantClear(&vari); + + pPropBag->Release(); + + // Clean up + RegDeleteKeyW(hKey, L"PropBagTest"); + RegCloseKey(hKey); +} + START_TEST(SHPropertyBag) { SHPropertyBag_ReadTest(); SHPropertyBag_WriteTest(); SHPropertyBag_OnMemory(); + SHPropertyBag_OnRegKey(); } diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 9ed45b2c8d5..29aae083047 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -91,6 +91,7 @@ BOOL WINAPI SHExpandEnvironmentStringsForUserW(HANDLE, LPCWSTR, LPWSTR, DWORD); BOOL WINAPI SHIsEmptyStream(IStream*); +HRESULT WINAPI IStream_Size(IStream *lpStream, ULARGE_INTEGER* lpulSize); HRESULT WINAPI SHInvokeDefaultCommand(HWND,IShellFolder*,LPCITEMIDLIST); HRESULT WINAPI SHPropertyBag_ReadType(IPropertyBag *ppb, LPCWSTR pszPropName, VARIANTARG *pvarg, VARTYPE vt); HRESULT WINAPI SHPropertyBag_ReadBOOL(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL *pbValue); @@ -126,6 +127,14 @@ HRESULT WINAPI SHPropertyBag_WriteRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, HRESULT WINAPI SHCreatePropertyBagOnMemory(_In_ DWORD dwMode, _In_ REFIID riid, _Out_ void **ppvObj); +HRESULT WINAPI +SHCreatePropertyBagOnRegKey( + _In_ HKEY hKey, + _In_z_ LPCWSTR pszSubKey, + _In_ DWORD dwMode, + _In_ REFIID riid, + _Out_ void **ppvObj); + HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra);

1 year, 5 months

[reactos] 01/01: [SHELL32] Move SheRemoveQuotesA/W to utils.cpp (#5535)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6413024cab03c194830ee… commit 6413024cab03c194830eebfe169b5331fc8eb266 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 6 20:07:39 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 6 13:07:39 2023 +0200 [SHELL32] Move SheRemoveQuotesA/W to utils.cpp (#5535) * [SHELL32] Move SheRemoveQuotesA/W to utils.cpp Follow-up to #5529 (7100fa8). JIRA issue: CORE-9277 --- dll/win32/shell32/CMakeLists.txt | 1 + dll/win32/shell32/iconcache.cpp | 48 --------------------------------- dll/win32/shell32/utils.cpp | 58 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 48 deletions(-) diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 4e1d4f63804..5f972807c8b 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -40,6 +40,7 @@ list(APPEND SOURCE folders.cpp iconcache.cpp shell32.cpp + utils.cpp CShellItem.cpp CShellLink.cpp CFolderOptions.cpp diff --git a/dll/win32/shell32/iconcache.cpp b/dll/win32/shell32/iconcache.cpp index 3da28ecd826..9a55f0f9fc0 100644 --- a/dll/win32/shell32/iconcache.cpp +++ b/dll/win32/shell32/iconcache.cpp @@ -987,54 +987,6 @@ HICON WINAPI ExtractAssociatedIconW(HINSTANCE hInst, LPWSTR lpIconPath, LPWORD l return hIcon; } -/************************************************************************* - * SheRemoveQuotesA (SHELL32.@) - */ -EXTERN_C LPSTR -WINAPI -SheRemoveQuotesA(LPSTR psz) -{ - PCHAR pch; - - if (*psz == '"') - { - for (pch = psz + 1; *pch && *pch != '"'; ++pch) - { - *(pch - 1) = *pch; - } - - if (*pch == '"') - *(pch - 1) = ANSI_NULL; - } - - return psz; -} - -/************************************************************************* - * SheRemoveQuotesW (SHELL32.@) - * - * ExtractAssociatedIconExW uses this function. - */ -EXTERN_C LPWSTR -WINAPI -SheRemoveQuotesW(LPWSTR psz) -{ - PWCHAR pch; - - if (*psz == L'"') - { - for (pch = psz + 1; *pch && *pch != L'"'; ++pch) - { - *(pch - 1) = *pch; - } - - if (*pch == L'"') - *(pch - 1) = UNICODE_NULL; - } - - return psz; -} - /************************************************************************* * ExtractAssociatedIconExW (SHELL32.@) * diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp new file mode 100644 index 00000000000..c2085b9c1e0 --- /dev/null +++ b/dll/win32/shell32/utils.cpp @@ -0,0 +1,58 @@ +/* + * PROJECT: shell32 + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Utility functions + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +/************************************************************************* + * SheRemoveQuotesA (SHELL32.@) + */ +EXTERN_C LPSTR +WINAPI +SheRemoveQuotesA(LPSTR psz) +{ + PCHAR pch; + + if (*psz == '"') + { + for (pch = psz + 1; *pch && *pch != '"'; ++pch) + { + *(pch - 1) = *pch; + } + + if (*pch == '"') + *(pch - 1) = ANSI_NULL; + } + + return psz; +} + +/************************************************************************* + * SheRemoveQuotesW (SHELL32.@) + * + * ExtractAssociatedIconExW uses this function. + */ +EXTERN_C LPWSTR +WINAPI +SheRemoveQuotesW(LPWSTR psz) +{ + PWCHAR pch; + + if (*psz == L'"') + { + for (pch = psz + 1; *pch && *pch != L'"'; ++pch) + { + *(pch - 1) = *pch; + } + + if (*pch == L'"') + *(pch - 1) = UNICODE_NULL; + } + + return psz; +}

1 year, 5 months

[reactos] 02/02: [GITHUB] Build subsystems on ARM

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=365372dc17172d779ded5… commit 365372dc17172d779ded5e808f69446aec77b707 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Mon Jul 31 02:14:31 2023 +0200 Commit: Adam Słaboń <asaillen(a)protonmail.com> CommitDate: Sat Aug 5 16:23:10 2023 +0200 [GITHUB] Build subsystems on ARM CORE-17604 --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 11dbe13ece6..036475fe4ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -182,6 +182,9 @@ jobs: - name: Build rosapps if: ${{ matrix.arch == 'arm' }} run: cmake --build build --target modules/rosapps/all + - name: Build subsystems + if: ${{ matrix.arch == 'arm' }} + run: cmake --build build --target subsystems/all - name: Build some applications (arm64) if: ${{ matrix.arch == 'arm64' }} run: cmake --build build --target calc magnify mstsc notepad osk regedit taskmgr winmine wordpad base/applications/screensavers/all -- -k0 @@ -193,6 +196,7 @@ jobs: build/base build/dll/cpl build/modules/rosapps + build/subsystems !**/CMakeFiles !**/cmake_install.cmake !**/*.asm

1 year, 5 months

[reactos] 01/02: [CMAKE][MVDM] Fix CMAKE_ASM16_COMPILER for non-x86 MSVC builds

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ffcda90b2a42d7dfba78… commit 2ffcda90b2a42d7dfba78133171f5391cf583b3f Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Sun Mar 19 14:47:47 2023 +0100 Commit: Adam Słaboń <asaillen(a)protonmail.com> CommitDate: Sat Aug 5 16:20:22 2023 +0200 [CMAKE][MVDM] Fix CMAKE_ASM16_COMPILER for non-x86 MSVC builds Ensure that CMAKE_ASM16_COMPILER is 32-bit MASM. It is used only for compiling 16-bit x86 ASM code on non-x86 builds. Original patch by serrox. CORE-10452, CORE-17604 Co-authored-by: Sergey Chernov <serrox(a)ya.ru> --- sdk/cmake/msvc.cmake | 18 ++++-------------- subsystems/mvdm/asm16.cmake | 6 +----- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 4e64db9d3aa..3981715190b 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -409,21 +409,15 @@ endmacro() # PSEH workaround set(PSEH_LIB "pseh") -# Use a full path for the x86 version of ml when using x64 VS. -# It's not a problem when using the DDK/WDK because, in x64 mode, -# both the x86 and x64 versions of ml are available. -if(ARCH STREQUAL "amd64") +# Setup MASM/ML for compiling 16-bit x86 ASM code on x86 or non-x86 ports. +if(NOT ARCH STREQUAL "i386") if((MSVC_VERSION LESS_EQUAL 1900) AND (DEFINED ENV{VCINSTALLDIR})) set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe) elseif(DEFINED ENV{VCToolsInstallDir}) - set(CMAKE_ASM16_COMPILER $ENV{VCToolsInstallDir}/bin/HostX86/x86/ml.exe) + set(CMAKE_ASM16_COMPILER $ENV{VCToolsInstallDir}/bin/Host$ENV{VSCMD_ARG_HOST_ARCH}/x86/ml.exe) else() set(CMAKE_ASM16_COMPILER ml.exe) endif() -elseif(ARCH STREQUAL "arm") - set(CMAKE_ASM16_COMPILER armasm.exe) -elseif(ARCH STREQUAL "arm64") - set(CMAKE_ASM16_COMPILER armasm64.exe) else() set(CMAKE_ASM16_COMPILER ml.exe) endif() @@ -446,11 +440,7 @@ function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_addres COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_includes} ${_defines} /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file} DEPENDS ${_asm_file}) - if(ARCH STREQUAL "arm" OR ARCH STREQUAL "arm64") - set(_asm16_command ${CMAKE_ASM16_COMPILER} -nologo -o ${_object_file} ${_temp_file}) - else() - set(_asm16_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file}) - endif() + set(_asm16_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file}) add_custom_command( OUTPUT ${_object_file} diff --git a/subsystems/mvdm/asm16.cmake b/subsystems/mvdm/asm16.cmake index a2df957c080..073314f308b 100644 --- a/subsystems/mvdm/asm16.cmake +++ b/subsystems/mvdm/asm16.cmake @@ -112,11 +112,7 @@ function(add_asm16_bin _target _binary_file _base_address) COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_concatenated_asm_file} > ${_preprocessed_asm_file} DEPENDS ${_concatenated_asm_file}) - if(ARCH STREQUAL "arm") - set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} -nologo -o ${_object_file} ${_preprocessed_asm_file}) - else() - set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file}) - endif() + set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file}) add_custom_command( OUTPUT ${_object_file}

1 year, 5 months

[reactos] 02/02: [FREELDR] Implement bus mouse detection

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ffbc81fdf2f8c203d28cb… commit ffbc81fdf2f8c203d28cb554605a6a099a916265 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Jul 25 22:12:08 2023 +0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Aug 5 16:40:13 2023 +0300 [FREELDR] Implement bus mouse detection This allows to automatically install the inport device driver (it's now possible since 7d5e1591313), which can be used on 86Box. References: - https://raw.githubusercontent.com/86Box/86Box/master/src/device/mouse_bus.c - https://bochs.sourceforge.io/cgi-bin/lxr/source/iodev/busmouse.cc --- boot/freeldr/freeldr/arch/i386/irqsup.S | 33 +++++ boot/freeldr/freeldr/arch/i386/pc/machpc.c | 214 +++++++++++++++++++++++++++++ boot/freeldr/freeldr/pcat.cmake | 1 + 3 files changed, 248 insertions(+) diff --git a/boot/freeldr/freeldr/arch/i386/irqsup.S b/boot/freeldr/freeldr/arch/i386/irqsup.S new file mode 100644 index 00000000000..7c35ef383ec --- /dev/null +++ b/boot/freeldr/freeldr/arch/i386/irqsup.S @@ -0,0 +1,33 @@ +/* + * PROJECT: FreeLoader + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Interrupt handling + * COPYRIGHT: Copyright 2023 Dmitry Borisov <di.sean(a)protonmail.com> + */ + +#include <asm.inc> + +#define PIC1_CONTROL_PORT HEX(20) +#define PIC_EOI HEX(20) + +.code32 + +PUBLIC _HwIrqHandler +_HwIrqHandler: + push ax + + /* Increment the interrupt count */ + inc dword ptr ds:[_HwIrqCount] + + /* Dismiss the interrupt */ + mov al, PIC_EOI + out PIC1_CONTROL_PORT, al + + pop ax + iret + +PUBLIC _HwIrqCount +_HwIrqCount: + .long 0 + +END diff --git a/boot/freeldr/freeldr/arch/i386/pc/machpc.c b/boot/freeldr/freeldr/arch/i386/pc/machpc.c index f20fa2b9a52..4bef802f667 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/pc/machpc.c @@ -38,6 +38,20 @@ DBG_DEFAULT_CHANNEL(HWDETECT); /* Mouse Systems Mouse */ #define MOUSE_TYPE_MOUSESYSTEMS 4 +#define INPORT_REGISTER_CONTROL 0x00 +#define INPORT_REGISTER_DATA 0x01 +#define INPORT_REGISTER_SIGNATURE 0x02 + +#define INPORT_REG_MODE 0x07 +#define INPORT_RESET 0x80 +#define INPORT_MODE_BASE 0x10 +#define INPORT_TEST_IRQ 0x16 +#define INPORT_SIGNATURE 0xDE + +#define PIC1_CONTROL_PORT 0x20 +#define PIC1_DATA_PORT 0x21 +#define PIC2_CONTROL_PORT 0xA0 +#define PIC2_DATA_PORT 0xA1 /* PS2 stuff */ @@ -1291,6 +1305,203 @@ DetectPS2Mouse(PCONFIGURATION_COMPONENT_DATA BusKey) } } +#if defined(_M_IX86) +static VOID +CreateBusMousePeripheralKey( + _Inout_ PCONFIGURATION_COMPONENT_DATA BusKey, + _In_ ULONG IoBase, + _In_ ULONG Irq) +{ + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + PCONFIGURATION_COMPONENT_DATA ControllerKey; + PCONFIGURATION_COMPONENT_DATA PeripheralKey; + ULONG Size; + + /* Set 'Configuration Data' value */ + Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors[2]); + PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); + if (PartialResourceList == NULL) + { + ERR("Failed to allocate resource descriptor\n"); + return; + } + + /* Initialize resource descriptor */ + RtlZeroMemory(PartialResourceList, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 2; + + /* Set IO Port */ + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; + PartialDescriptor->Type = CmResourceTypePort; + PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; + PartialDescriptor->u.Port.Start.LowPart = IoBase; + PartialDescriptor->u.Port.Start.HighPart = 0; + PartialDescriptor->u.Port.Length = 4; + + /* Set Interrupt */ + PartialDescriptor = &PartialResourceList->PartialDescriptors[1]; + PartialDescriptor->Type = CmResourceTypeInterrupt; + PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; + PartialDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; + PartialDescriptor->u.Interrupt.Level = Irq; + PartialDescriptor->u.Interrupt.Vector = Irq; + PartialDescriptor->u.Interrupt.Affinity = (KAFFINITY)-1; + + /* Create controller key */ + FldrCreateComponentKey(BusKey, + ControllerClass, + PointerController, + Input, + 0, + 0xFFFFFFFF, + NULL, + PartialResourceList, + Size, + &ControllerKey); + + /* Set 'Configuration Data' value */ + Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors); + PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); + if (PartialResourceList == NULL) + { + ERR("Failed to allocate resource descriptor\n"); + return; + } + + /* Initialize resource descriptor */ + RtlZeroMemory(PartialResourceList, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 0; + + /* Create peripheral key */ + FldrCreateComponentKey(ControllerKey, + ControllerClass, + PointerPeripheral, + Input, + 0, + 0xFFFFFFFF, + "MICROSOFT INPORT MOUSE", + PartialResourceList, + Size, + &PeripheralKey); +} + +extern KIDTENTRY DECLSPEC_ALIGN(4) i386Idt[32]; +VOID __cdecl HwIrqHandler(VOID); +extern volatile ULONG HwIrqCount; + +static ULONG +DetectBusMouseTestIrq( + _In_ ULONG IoBase, + _In_ ULONG Irq) +{ + USHORT OldOffset, OldExtendedOffset; + ULONG Vector, i; + + HwIrqCount = 0; + + /* Reset the device */ + WRITE_PORT_UCHAR((PUCHAR)IoBase + INPORT_REGISTER_CONTROL, INPORT_RESET); + WRITE_PORT_UCHAR((PUCHAR)IoBase + INPORT_REGISTER_CONTROL, INPORT_REG_MODE); + + Vector = Irq + 8; + + /* Save the old interrupt vector and replace it by ours */ + OldOffset = i386Idt[Vector].Offset; + OldExtendedOffset = i386Idt[Vector].ExtendedOffset; + + i386Idt[Vector].Offset = (ULONG)HwIrqHandler & 0xFFFF; + i386Idt[Vector].ExtendedOffset = (ULONG)HwIrqHandler >> 16; + + /* Enable the requested IRQ on the master PIC */ + WRITE_PORT_UCHAR((PUCHAR)PIC1_DATA_PORT, ~(1 << Irq)); + + _enable(); + + /* Configure the device to generate interrupts */ + for (i = 0; i < 15; i++) + { + WRITE_PORT_UCHAR((PUCHAR)IoBase + INPORT_REGISTER_DATA, INPORT_MODE_BASE); + WRITE_PORT_UCHAR((PUCHAR)IoBase + INPORT_REGISTER_DATA, INPORT_TEST_IRQ); + } + + /* Disable the device */ + WRITE_PORT_UCHAR((PUCHAR)IoBase + INPORT_REGISTER_DATA, 0); + + _disable(); + + i386Idt[Vector].Offset = OldOffset; + i386Idt[Vector].ExtendedOffset = OldExtendedOffset; + + return (HwIrqCount != 0) ? Irq : 0; +} + +static ULONG +DetectBusMouseIrq( + _In_ ULONG IoBase) +{ + UCHAR Mask1, Mask2; + ULONG Irq, Result; + + /* Save the current interrupt mask */ + Mask1 = READ_PORT_UCHAR(PIC1_DATA_PORT); + Mask2 = READ_PORT_UCHAR(PIC2_DATA_PORT); + + /* Mask the interrupts on the slave PIC */ + WRITE_PORT_UCHAR(PIC2_DATA_PORT, 0xFF); + + /* Process IRQ detection: IRQ 5, 4, 3 */ + for (Irq = 5; Irq >= 3; Irq--) + { + Result = DetectBusMouseTestIrq(IoBase, Irq); + if (Result != 0) + break; + } + + /* Restore the mask */ + WRITE_PORT_UCHAR(PIC1_DATA_PORT, Mask1); + WRITE_PORT_UCHAR(PIC2_DATA_PORT, Mask2); + + return Result; +} + +static VOID +DetectBusMouse( + _Inout_ PCONFIGURATION_COMPONENT_DATA BusKey) +{ + ULONG IoBase, Irq, Signature1, Signature2, Signature3; + + /* + * The bus mouse lives at one of these addresses: 0x230, 0x234, 0x238, 0x23C. + * The 0x23C port is the most common I/O setting. + */ + for (IoBase = 0x23C; IoBase >= 0x230; IoBase -= 4) + { + Signature1 = READ_PORT_UCHAR((PUCHAR)IoBase + INPORT_REGISTER_SIGNATURE); + Signature2 = READ_PORT_UCHAR((PUCHAR)IoBase + INPORT_REGISTER_SIGNATURE); + if (Signature1 == Signature2) + continue; + if (Signature1 != INPORT_SIGNATURE && Signature2 != INPORT_SIGNATURE) + continue; + + Signature3 = READ_PORT_UCHAR((PUCHAR)IoBase + INPORT_REGISTER_SIGNATURE); + if (Signature1 != Signature3) + continue; + + Irq = DetectBusMouseIrq(IoBase); + if (Irq == 0) + continue; + + CreateBusMousePeripheralKey(BusKey, IoBase, Irq); + break; + } +} +#endif /* _M_IX86 */ // Implemented in pcvesa.c, returns the VESA version USHORT BiosIsVesaSupported(VOID); @@ -1393,6 +1604,9 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) DetectParallelPorts(BusKey); DetectKeyboardController(BusKey); DetectPS2Mouse(BusKey); +#if defined(_M_IX86) + DetectBusMouse(BusKey); +#endif DetectDisplayController(BusKey); /* FIXME: Detect more ISA devices */ diff --git a/boot/freeldr/freeldr/pcat.cmake b/boot/freeldr/freeldr/pcat.cmake index 24c8e3627f0..5ea6f9b8aa7 100644 --- a/boot/freeldr/freeldr/pcat.cmake +++ b/boot/freeldr/freeldr/pcat.cmake @@ -42,6 +42,7 @@ if(ARCH STREQUAL "i386") arch/i386/drvmap.S arch/i386/entry.S arch/i386/int386.S + arch/i386/irqsup.S arch/i386/pnpbios.S # arch/i386/i386trap.S arch/i386/linux.S)

1 year, 5 months

[reactos] 01/02: [INPORT] Fix swapped buttons for the inport bus mouse

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a14019b219048647871b8… commit a14019b219048647871b88fa0f2d4c66b6f69224 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Jul 25 21:32:13 2023 +0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Aug 5 16:40:07 2023 +0300 [INPORT] Fix swapped buttons for the inport bus mouse Also don't read the delta state when there is no mouse movement. --- drivers/input/inport/hardware.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/drivers/input/inport/hardware.c b/drivers/input/inport/hardware.c index 33103f25311..0cbd9f62800 100644 --- a/drivers/input/inport/hardware.c +++ b/drivers/input/inport/hardware.c @@ -71,12 +71,13 @@ #define INPORT_MODE_IRQ 0x01 #define INPORT_MODE_BASE 0x10 #define INPORT_MODE_HOLD 0x20 + #define INPORT_HAS_MOVED 0x40 #define MS_INPORT_SIGNATURE 0x02 -#define MS_BUTTON_MIDDLE 0x01 -#define MS_BUTTON_LEFT 0x02 -#define MS_BUTTON_RIGHT 0x04 +#define MS_BUTTON_RIGHT 0x01 +#define MS_BUTTON_MIDDLE 0x02 +#define MS_BUTTON_LEFT 0x04 /* * Logitech @@ -270,14 +271,23 @@ InPortIsr( WRITE_MOUSE(DeviceExtension, MS_INPORT_DATA, INPORT_MODE_HOLD | INPORT_MODE_IRQ | INPORT_MODE_BASE); - WRITE_MOUSE(DeviceExtension, MS_INPORT_CONTROL, INPORT_REG_X); - DeltaX = READ_MOUSE(DeviceExtension, MS_INPORT_DATA); - - WRITE_MOUSE(DeviceExtension, MS_INPORT_CONTROL, INPORT_REG_Y); - DeltaY = READ_MOUSE(DeviceExtension, MS_INPORT_DATA); - WRITE_MOUSE(DeviceExtension, MS_INPORT_CONTROL, INPORT_REG_BTNS); Buttons = READ_MOUSE(DeviceExtension, MS_INPORT_DATA); + + if (Buttons & INPORT_HAS_MOVED) + { + WRITE_MOUSE(DeviceExtension, MS_INPORT_CONTROL, INPORT_REG_X); + DeltaX = READ_MOUSE(DeviceExtension, MS_INPORT_DATA); + + WRITE_MOUSE(DeviceExtension, MS_INPORT_CONTROL, INPORT_REG_Y); + DeltaY = READ_MOUSE(DeviceExtension, MS_INPORT_DATA); + } + else + { + DeltaX = 0; + DeltaY = 0; + } + Buttons &= (MS_BUTTON_MIDDLE | MS_BUTTON_LEFT | MS_BUTTON_RIGHT); WRITE_MOUSE(DeviceExtension, MS_INPORT_CONTROL, INPORT_REG_MODE);

1 year, 5 months

[reactos] 01/01: [ATL] CImage: Hack fix for getting filter string (#5528)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36a35ee203e1121a07b89… commit 36a35ee203e1121a07b8960c3566b01882b0d423 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 5 21:23:21 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 5 21:23:21 2023 +0900 [ATL] CImage: Hack fix for getting filter string (#5528) - Fix the crash on opening/saving file. - To get the filename extension info from CODECs, we have to keep gdiplus.dll loaded. - The perfect fix will take time. CORE-19093, CORE-19094 --- sdk/lib/atl/atlimage.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index 236defea834..bbf7dc6a115 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -811,6 +811,7 @@ public: DWORD dwExclude = excludeDefaultLoad, TCHAR chSeparator = TEXT('|')) { + CImage dummy; // HACK: Initialize common UINT cDecoders = 0; Gdiplus::ImageCodecInfo* pDecoders = _getAllDecoders(cDecoders); HRESULT hr = BuildCodecFilterString(pDecoders, @@ -831,6 +832,7 @@ public: DWORD dwExclude = excludeDefaultSave, TCHAR chSeparator = TEXT('|')) { + CImage dummy; // HACK: Initialize common UINT cEncoders = 0; Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders); HRESULT hr = BuildCodecFilterString(pEncoders, @@ -1057,6 +1059,7 @@ protected: // Deprecated. Don't use this static const GUID *FileTypeFromExtension(LPCTSTR dotext) { + CImage dummy; // HACK: Initialize common UINT cEncoders = 0; Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders); @@ -1111,6 +1114,7 @@ protected: // Deprecated. Don't use this static bool GetClsidFromFileType(CLSID *clsid, const GUID *guid) { + CImage dummy; // HACK: Initialize common UINT cEncoders = 0; Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders); *clsid = FindCodecForFileType(*guid, pEncoders, cEncoders); @@ -1120,8 +1124,6 @@ protected: static Gdiplus::ImageCodecInfo* _getAllEncoders(UINT& cEncoders) { - CImage image; // Initialize common - UINT total_size = 0; GetCommon().GetImageEncodersSize(&cEncoders, &total_size); if (total_size == 0) @@ -1141,8 +1143,6 @@ protected: static Gdiplus::ImageCodecInfo* _getAllDecoders(UINT& cDecoders) { - CImage image; // Initialize common - UINT total_size = 0; GetCommon().GetImageDecodersSize(&cDecoders, &total_size); if (total_size == 0)

1 year, 5 months

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST][SDK] SHCreatePropertyBagOnMemory (#5511)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4bc6f0a6a1ea3d6e9aed… commit b4bc6f0a6a1ea3d6e9aed68c28b2b4787dd21fd9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 5 21:20:58 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 5 21:20:58 2023 +0900 [SHLWAPI][SHLWAPI_APITEST][SDK] SHCreatePropertyBagOnMemory (#5511) - Add propbag.cpp. - Add CBasePropertyBag / CMemPropertyBag classes. - Implement SHCreatePropertyBagOnMemory. - Strengthen SHPropertyBag testcase in shlwapi_apitest. CORE-9283 --- dll/win32/shlwapi/CMakeLists.txt | 5 +- dll/win32/shlwapi/precomp.h | 4 + dll/win32/shlwapi/propbag.cpp | 253 +++++++++++++++++++++ dll/win32/shlwapi/shlwapi.spec | 2 +- .../rostests/apitests/shlwapi/SHPropertyBag.cpp | 132 +++++++++++ sdk/include/reactos/shlwapi_undoc.h | 2 + 6 files changed, 396 insertions(+), 2 deletions(-) diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt index fcb03a15c37..87551cd21c5 100644 --- a/dll/win32/shlwapi/CMakeLists.txt +++ b/dll/win32/shlwapi/CMakeLists.txt @@ -24,6 +24,7 @@ list(APPEND SOURCE list(APPEND PCH_SKIP_SOURCE assoc.c + propbag.cpp wsprintf.c ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_stubs.c) @@ -36,7 +37,9 @@ add_library(shlwapi MODULE # our C++ atlbase.h conflicts with the one from wine, so only use wine includes for C # Unfortunately, we can't use different includes for C & C++ in VS generator, so use an object library to achieve this -target_include_directories(shlwapi BEFORE PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +target_include_directories(shlwapi BEFORE PRIVATE + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine + ${REACTOS_SOURCE_DIR}/sdk/lib/atl) add_library(shlwapi_autocomp OBJECT autocomp.cpp) target_link_libraries(shlwapi_autocomp PRIVATE atl_classes) diff --git a/dll/win32/shlwapi/precomp.h b/dll/win32/shlwapi/precomp.h index eff450aa861..86f3ea401fd 100644 --- a/dll/win32/shlwapi/precomp.h +++ b/dll/win32/shlwapi/precomp.h @@ -28,6 +28,10 @@ #include <wine/debug.h> #include <wine/unicode.h> +#ifdef __REACTOS__ +EXTERN_C HRESULT VariantChangeTypeForRead(_Inout_ VARIANTARG *pvarg, _In_ VARTYPE vt); +#endif + #include "resource.h" #endif /* !_SHLWAPI_PCH_ */ diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp new file mode 100644 index 00000000000..27434091fc3 --- /dev/null +++ b/dll/win32/shlwapi/propbag.cpp @@ -0,0 +1,253 @@ +/* + * PROJECT: ReactOS Shell + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Implement shell property bags + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#define _ATL_NO_EXCEPTIONS +#include "precomp.h" +#include <shlwapi.h> +#include <shlwapi_undoc.h> +#include <atlstr.h> // for CStringW +#include <atlsimpcoll.h> // for CSimpleMap +#include <atlcomcli.h> // for CComVariant + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +class CBasePropertyBag + : public IPropertyBag +#if (_WIN32_WINNT < _WIN32_WINNT_VISTA) + , public IPropertyBag2 +#endif +{ +protected: + LONG m_cRefs; // reference count + DWORD m_dwMode; // STGM_* flags + +public: + CBasePropertyBag(DWORD dwMode) + : m_cRefs(0) + , m_dwMode(dwMode) + { + } + + virtual ~CBasePropertyBag() { } + + // IUnknown interface + STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject) override + { +#if (_WIN32_WINNT < _WIN32_WINNT_VISTA) + if (::IsEqualGUID(riid, IID_IPropertyBag2)) + { + AddRef(); + *ppvObject = static_cast<IPropertyBag2*>(this); + return S_OK; + } +#endif + if (::IsEqualGUID(riid, IID_IUnknown) || ::IsEqualGUID(riid, IID_IPropertyBag)) + { + AddRef(); + *ppvObject = static_cast<IPropertyBag*>(this); + return S_OK; + } + return E_NOTIMPL; + } + STDMETHODIMP_(ULONG) AddRef() override + { + return ::InterlockedIncrement(&m_cRefs); + } + STDMETHODIMP_(ULONG) Release() override + { + if (::InterlockedDecrement(&m_cRefs) == 0) + { + delete this; + return 0; + } + return m_cRefs; + } + +#if (_WIN32_WINNT < _WIN32_WINNT_VISTA) + // IPropertyBag2 interface (stubs) + STDMETHODIMP Read( + _In_ ULONG cProperties, + _In_ PROPBAG2 *pPropBag, + _In_opt_ IErrorLog *pErrorLog, + _Out_ VARIANT *pvarValue, + _Out_ HRESULT *phrError) override + { + return E_NOTIMPL; + } + STDMETHODIMP Write( + _In_ ULONG cProperties, + _In_ PROPBAG2 *pPropBag, + _In_ VARIANT *pvarValue) + { + return E_NOTIMPL; + } + STDMETHODIMP CountProperties(_Out_ ULONG *pcProperties) override + { + return E_NOTIMPL; + } + STDMETHODIMP GetPropertyInfo( + _In_ ULONG iProperty, + _In_ ULONG cProperties, + _Out_ PROPBAG2 *pPropBag, + _Out_ ULONG *pcProperties) override + { + return E_NOTIMPL; + } + STDMETHODIMP LoadObject( + _In_z_ LPCWSTR pstrName, + _In_ DWORD dwHint, + _In_ IUnknown *pUnkObject, + _In_opt_ IErrorLog *pErrorLog) override + { + return E_NOTIMPL; + } +#endif +}; + +struct CPropMapEqual +{ + static bool IsEqualKey(const ATL::CStringW& k1, const ATL::CStringW& k2) + { + return k1.CompareNoCase(k2) == 0; + } + + static bool IsEqualValue(const ATL::CComVariant& v1, const ATL::CComVariant& v2) + { + return false; + } +}; + +class CMemPropertyBag : public CBasePropertyBag +{ +protected: + ATL::CSimpleMap<ATL::CStringW, ATL::CComVariant, CPropMapEqual> m_PropMap; + +public: + CMemPropertyBag(DWORD dwFlags) : CBasePropertyBag(dwFlags) { } + + STDMETHODIMP Read(_In_z_ LPCWSTR pszPropName, _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) override; + STDMETHODIMP Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) override; +}; + +STDMETHODIMP +CMemPropertyBag::Read( + _In_z_ LPCWSTR pszPropName, + _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) +{ + UNREFERENCED_PARAMETER(pErrorLog); + + TRACE("%p: %s %p %p\n", this, debugstr_w(pszPropName), pvari, pErrorLog); + + VARTYPE vt = V_VT(pvari); + + ::VariantInit(pvari); + +#if (_WIN32_WINNT < _WIN32_WINNT_VISTA) + if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_WRITE) + { + ERR("%p: 0x%X\n", this, m_dwMode); + return E_ACCESSDENIED; + } +#endif + + if (!pszPropName || !pvari) + { + ERR("%p: %s %p %p\n", this, debugstr_w(pszPropName), pvari, pErrorLog); + return E_INVALIDARG; + } + + INT iItem = m_PropMap.FindKey(pszPropName); + if (iItem == -1) + { + ERR("%p: %s %p %p\n", this, debugstr_w(pszPropName), pvari, pErrorLog); + return E_FAIL; + } + + HRESULT hr = ::VariantCopy(pvari, &m_PropMap.GetValueAt(iItem)); + if (FAILED(hr)) + { + ERR("%p: 0x%08X %p\n", this, hr, pvari); + return hr; + } + + hr = ::VariantChangeTypeForRead(pvari, vt); + if (FAILED(hr)) + { + ERR("%p: 0x%08X %p\n", this, hr, pvari); + return hr; + } + + return hr; +} + +STDMETHODIMP +CMemPropertyBag::Write( + _In_z_ LPCWSTR pszPropName, + _In_ VARIANT *pvari) +{ + TRACE("%p: %s %p\n", this, debugstr_w(pszPropName), pvari); + +#if (_WIN32_WINNT < _WIN32_WINNT_VISTA) + if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_READ) + { + ERR("%p: 0x%X\n", this, m_dwMode); + return E_ACCESSDENIED; + } +#endif + + if (!pszPropName || !pvari) + { + ERR("%p: %s %p\n", this, debugstr_w(pszPropName), pvari); + return E_INVALIDARG; + } + + ATL::CComVariant vari; + HRESULT hr = vari.Copy(pvari); + if (FAILED(hr)) + { + ERR("%p: %s %p: 0x%08X\n", this, debugstr_w(pszPropName), pvari, hr); + return hr; + } + + if (!m_PropMap.SetAt(pszPropName, vari)) + { + ERR("%p: %s %p\n", this, debugstr_w(pszPropName), pvari); + return E_FAIL; + } + + return hr; +} + +/************************************************************************** + * SHCreatePropertyBagOnMemory (SHLWAPI.477) + * + * Creates a property bag object on memory. + * + * @param dwMode Specifies either STGM_READ, STGM_WRITE or STGM_READWRITE. Ignored on Vista+. + * @param riid Specifies either IID_IUnknown, IID_IPropertyBag or IID_IPropertyBag2. + * Vista+ rejects IID_IPropertyBag2. + * @param ppvObj Receives an IPropertyBag pointer. + * @return An HRESULT value. S_OK on success, non-zero on failure. + * @see http://undoc.airesoft.co.uk/shlwapi.dll/SHCreatePropertyBagOnMemory.php + */ +EXTERN_C HRESULT WINAPI +SHCreatePropertyBagOnMemory(_In_ DWORD dwMode, _In_ REFIID riid, _Out_ void **ppvObj) +{ + TRACE("0x%08X, %s, %p\n", dwMode, debugstr_guid(&riid), ppvObj); + + *ppvObj = NULL; + + CComPtr<CMemPropertyBag> pMemBag(new CMemPropertyBag(dwMode)); + + HRESULT hr = pMemBag->QueryInterface(riid, ppvObj); + if (FAILED(hr)) + ERR("0x%08X %s\n", hr, debugstr_guid(&riid)); + + return hr; +} diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 8dc01d454dc..0844af03d5d 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -474,7 +474,7 @@ 474 stub -noname SHSetIniStringUTF7W 475 stdcall -noname GetShellSecurityDescriptor(ptr long) 476 stdcall -noname SHGetObjectCompatFlags(ptr ptr) -477 stub -noname SHCreatePropertyBagOnMemory +477 stdcall -noname SHCreatePropertyBagOnMemory(long ptr ptr) 478 stdcall -noname IUnknown_TranslateAcceleratorIO(ptr ptr) 479 stdcall -noname IUnknown_UIActivateIO(ptr long ptr) 480 stdcall -noname UrlCrackW(wstr long long ptr) wininet.InternetCrackUrlW diff --git a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp index 1aca2d256c0..2114ceff231 100644 --- a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -325,8 +325,140 @@ static void SHPropertyBag_WriteTest(void) ok_int(s_cWrite, 1); } +static void SHPropertyBag_OnMemory(void) +{ + HRESULT hr; + VARIANT vari; + + IPropertyBag *pPropBag = NULL; + hr = SHCreatePropertyBagOnMemory(STGM_READWRITE, IID_IPropertyBag, (void**)&pPropBag); + ok_long(hr, S_OK); + if (pPropBag == NULL) + { + skip("pPropBag was NULL\n"); + return; + } + + VariantInit(&vari); + hr = pPropBag->Read(L"InvalidName", &vari, NULL); + ok_long(hr, E_FAIL); + VariantClear(&vari); + + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + V_UI4(&vari) = 0xDEADFACE; + hr = pPropBag->Write(L"Name1", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + VariantInit(&vari); + hr = pPropBag->Read(L"Name1", &vari, NULL); + ok_long(hr, S_OK); + ok_long(V_VT(&vari), VT_UI4); + ok_long(V_UI4(&vari), 0xDEADFACE); + VariantClear(&vari); + + pPropBag->Release(); + pPropBag = NULL; + + hr = SHCreatePropertyBagOnMemory(STGM_READ, IID_IPropertyBag, (void**)&pPropBag); + ok_long(hr, S_OK); + + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + V_UI4(&vari) = 0xDEADFACE; + hr = pPropBag->Write(L"Name1", &vari); + ok_long(hr, (IsWindowsVistaOrGreater() ? S_OK : E_ACCESSDENIED)); + VariantClear(&vari); + + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + V_UI4(&vari) = 0xFEEDF00D; + hr = pPropBag->Read(L"Name1", &vari, NULL); + if (IsWindowsVistaOrGreater()) + { + ok_long(hr, S_OK); + ok_int(V_VT(&vari), VT_UI4); + ok_long(V_UI4(&vari), 0xDEADFACE); + } + else + { + ok_long(hr, E_FAIL); + ok_int(V_VT(&vari), VT_EMPTY); + ok_long(V_UI4(&vari), 0xFEEDF00D); + } + VariantClear(&vari); + + pPropBag->Release(); + pPropBag = NULL; + + hr = SHCreatePropertyBagOnMemory(STGM_WRITE, IID_IPropertyBag, (void**)&pPropBag); + ok_long(hr, S_OK); + + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + V_UI4(&vari) = 0xDEADFACE; + hr = pPropBag->Write(L"Name1", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + V_UI4(&vari) = 0xFEEDF00D; + hr = pPropBag->Read(L"Name1", &vari, NULL); + if (IsWindowsVistaOrGreater()) + { + ok_long(hr, S_OK); + ok_int(V_VT(&vari), VT_UI4); + ok_long(V_UI4(&vari), 0xDEADFACE); + } + else + { + ok_long(hr, E_ACCESSDENIED); + ok_int(V_VT(&vari), VT_EMPTY); + ok_long(V_UI4(&vari), 0xFEEDF00D); + } + VariantClear(&vari); + + pPropBag->Release(); + + hr = SHCreatePropertyBagOnMemory(STGM_READWRITE, IID_IPropertyBag2, (void**)&pPropBag); + if (IsWindowsVistaOrGreater()) + { + ok_long(hr, E_NOINTERFACE); + } + else + { + ok_long(hr, S_OK); + pPropBag->Release(); + } + + hr = SHCreatePropertyBagOnMemory(STGM_READ, IID_IPropertyBag2, (void**)&pPropBag); + if (IsWindowsVistaOrGreater()) + { + ok_long(hr, E_NOINTERFACE); + } + else + { + ok_long(hr, S_OK); + pPropBag->Release(); + } + + hr = SHCreatePropertyBagOnMemory(STGM_WRITE, IID_IPropertyBag2, (void**)&pPropBag); + if (IsWindowsVistaOrGreater()) + { + ok_long(hr, E_NOINTERFACE); + } + else + { + ok_long(hr, S_OK); + pPropBag->Release(); + } +} + START_TEST(SHPropertyBag) { SHPropertyBag_ReadTest(); SHPropertyBag_WriteTest(); + SHPropertyBag_OnMemory(); } diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index a50900a731e..9ed45b2c8d5 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -124,6 +124,8 @@ HRESULT WINAPI SHPropertyBag_WritePOINTL(IPropertyBag *ppb, LPCWSTR pszPropName, HRESULT WINAPI SHPropertyBag_WritePOINTS(IPropertyBag *ppb, LPCWSTR pszPropName, const POINTS *ppts); HRESULT WINAPI SHPropertyBag_WriteRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, const RECTL *prcl); +HRESULT WINAPI SHCreatePropertyBagOnMemory(_In_ DWORD dwMode, _In_ REFIID riid, _Out_ void **ppvObj); + HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra);

1 year, 5 months

[reactos] 01/01: [SHELL32] Move SheRemoveQuotesA/W to iconcache.cpp (#5529)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7100fa88544611767d100… commit 7100fa88544611767d1006287aec507cf693b7e9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 5 21:17:06 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 5 21:17:06 2023 +0900 [SHELL32] Move SheRemoveQuotesA/W to iconcache.cpp (#5529) Follow-up to #5517 (358e45d). stubs.cpp is for stub functions only. CORE-9277 --- dll/win32/shell32/iconcache.cpp | 48 +++++++++++++++++++++++++++++++++++++++++ dll/win32/shell32/stubs.cpp | 40 ---------------------------------- 2 files changed, 48 insertions(+), 40 deletions(-) diff --git a/dll/win32/shell32/iconcache.cpp b/dll/win32/shell32/iconcache.cpp index 9a55f0f9fc0..3da28ecd826 100644 --- a/dll/win32/shell32/iconcache.cpp +++ b/dll/win32/shell32/iconcache.cpp @@ -987,6 +987,54 @@ HICON WINAPI ExtractAssociatedIconW(HINSTANCE hInst, LPWSTR lpIconPath, LPWORD l return hIcon; } +/************************************************************************* + * SheRemoveQuotesA (SHELL32.@) + */ +EXTERN_C LPSTR +WINAPI +SheRemoveQuotesA(LPSTR psz) +{ + PCHAR pch; + + if (*psz == '"') + { + for (pch = psz + 1; *pch && *pch != '"'; ++pch) + { + *(pch - 1) = *pch; + } + + if (*pch == '"') + *(pch - 1) = ANSI_NULL; + } + + return psz; +} + +/************************************************************************* + * SheRemoveQuotesW (SHELL32.@) + * + * ExtractAssociatedIconExW uses this function. + */ +EXTERN_C LPWSTR +WINAPI +SheRemoveQuotesW(LPWSTR psz) +{ + PWCHAR pch; + + if (*psz == L'"') + { + for (pch = psz + 1; *pch && *pch != L'"'; ++pch) + { + *(pch - 1) = *pch; + } + + if (*pch == L'"') + *(pch - 1) = UNICODE_NULL; + } + + return psz; +} + /************************************************************************* * ExtractAssociatedIconExW (SHELL32.@) * diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index ec1da6daf41..f3c79305971 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -440,46 +440,6 @@ SheSetCurDrive(INT iIndex) return 1; } -EXTERN_C LPWSTR -WINAPI -SheRemoveQuotesW(LPWSTR psz) -{ - PWCHAR pch; - - if (*psz == L'"') - { - for (pch = psz + 1; *pch && *pch != L'"'; ++pch) - { - *(pch - 1) = *pch; - } - - if (*pch == L'"') - *(pch - 1) = UNICODE_NULL; - } - - return psz; -} - -EXTERN_C LPSTR -WINAPI -SheRemoveQuotesA(LPSTR psz) -{ - PCHAR pch; - - if (*psz == '"') - { - for (pch = psz + 1; *pch && *pch != '"'; ++pch) - { - *(pch - 1) = *pch; - } - - if (*pch == '"') - *(pch - 1) = ANSI_NULL; - } - - return psz; -} - /* * Unimplemented */

1 year, 5 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