Ros-diffs

ros-diffs@reactos.org

81390 discussions

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

[reactos] 01/01: [SHELL32][SHELL32_APITEST][SDK] Implement SheRemoveQuotesA/W (#5517)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=358e45d33a80a8db86832… commit 358e45d33a80a8db868324cf1f477c9e24408e53 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 5 19:44:13 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 5 19:44:13 2023 +0900 [SHELL32][SHELL32_APITEST][SDK] Implement SheRemoveQuotesA/W (#5517) - Implement SheRemoveQuotesA and SheRemoveQuotesW functions. - Add She testcase into shell32_apitest. - Add SheRemoveQuotesA/W into <undocshell.h>. CORE-9277 --- dll/win32/shell32/stubs.cpp | 42 ++++++++---- modules/rostests/apitests/shell32/CMakeLists.txt | 1 + modules/rostests/apitests/shell32/She.cpp | 87 ++++++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + sdk/include/reactos/undocshell.h | 3 + 5 files changed, 123 insertions(+), 12 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 460a423206c..ec1da6daf41 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -440,26 +440,44 @@ SheSetCurDrive(INT iIndex) return 1; } -/* - * Unimplemented - */ EXTERN_C LPWSTR WINAPI -SheRemoveQuotesW(LPWSTR lpInput) +SheRemoveQuotesW(LPWSTR psz) { - FIXME("SheRemoveQuotesW() stub\n"); - return NULL; + 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; } -/* - * Unimplemented - */ EXTERN_C LPSTR WINAPI -SheRemoveQuotesA(LPSTR lpInput) +SheRemoveQuotesA(LPSTR psz) { - FIXME("SheRemoveQuotesA() stub\n"); - return NULL; + PCHAR pch; + + if (*psz == '"') + { + for (pch = psz + 1; *pch && *pch != '"'; ++pch) + { + *(pch - 1) = *pch; + } + + if (*pch == '"') + *(pch - 1) = ANSI_NULL; + } + + return psz; } /* diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 797e6e5ed1c..602e25ad199 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -25,6 +25,7 @@ list(APPEND SOURCE SHCreateFileDataObject.cpp SHCreateFileExtractIconW.cpp SHParseDisplayName.cpp + She.cpp ShellExecCmdLine.cpp ShellExecuteEx.cpp ShellExecuteW.cpp diff --git a/modules/rostests/apitests/shell32/She.cpp b/modules/rostests/apitests/shell32/She.cpp new file mode 100644 index 00000000000..4c2c9f4e494 --- /dev/null +++ b/modules/rostests/apitests/shell32/She.cpp @@ -0,0 +1,87 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for She* functions + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "shelltest.h" +#include <undocshell.h> + +typedef LPSTR (WINAPI *FN_SheRemoveQuotesA)(LPSTR psz); +typedef LPWSTR (WINAPI *FN_SheRemoveQuotesW)(LPWSTR psz); + +static FN_SheRemoveQuotesA pSheRemoveQuotesA = NULL; +static FN_SheRemoveQuotesW pSheRemoveQuotesW = NULL; + +static void test_SheRemoveQuotesA(void) +{ + CHAR sz0[] = "A\"Test\""; + CHAR sz1[] = "\"Test\""; + CHAR sz2[] = "\"Test\"123"; + + BOOL bGotException = FALSE; + _SEH2_TRY + { + pSheRemoveQuotesA(NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bGotException = TRUE; + } + _SEH2_END; + ok_int(bGotException, TRUE); + + ok_ptr(pSheRemoveQuotesA(sz0), sz0); + ok_str(sz0, "A\"Test\""); + + ok_ptr(pSheRemoveQuotesA(sz1), sz1); + ok_str(sz1, "Test"); + + ok_ptr(pSheRemoveQuotesA(sz2), sz2); + ok_str(sz2, "Test"); +} + +static void test_SheRemoveQuotesW(void) +{ + WCHAR sz0[] = L"A\"Test\""; + WCHAR sz1[] = L"\"Test\""; + WCHAR sz2[] = L"\"Test\"123"; + + BOOL bGotException = FALSE; + _SEH2_TRY + { + pSheRemoveQuotesW(NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bGotException = TRUE; + } + _SEH2_END; + ok_int(bGotException, TRUE); + + ok_ptr(pSheRemoveQuotesW(sz0), sz0); + ok_wstr(sz0, L"A\"Test\""); + + ok_ptr(pSheRemoveQuotesW(sz1), sz1); + ok_wstr(sz1, L"Test"); + + ok_ptr(pSheRemoveQuotesW(sz2), sz2); + ok_wstr(sz2, L"Test"); +} + +START_TEST(She) +{ + HINSTANCE hShell32 = GetModuleHandleW(L"shell32"); + pSheRemoveQuotesA = (FN_SheRemoveQuotesA)GetProcAddress(hShell32, "SheRemoveQuotesA"); + pSheRemoveQuotesW = (FN_SheRemoveQuotesW)GetProcAddress(hShell32, "SheRemoveQuotesW"); + + if (!pSheRemoveQuotesA || !pSheRemoveQuotesW) + { + skip("SheRemoveQuotes not found"); + return; + } + + test_SheRemoveQuotesA(); + test_SheRemoveQuotesW(); +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 5522cb0b659..2d364f19770 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -26,6 +26,7 @@ extern void func_SHChangeNotify(void); extern void func_SHCreateDataObject(void); extern void func_SHCreateFileDataObject(void); extern void func_SHCreateFileExtractIconW(void); +extern void func_She(void); extern void func_ShellExecCmdLine(void); extern void func_ShellExecuteEx(void); extern void func_ShellExecuteW(void); @@ -60,6 +61,7 @@ const struct test winetest_testlist[] = { "SHCreateDataObject", func_SHCreateDataObject }, { "SHCreateFileDataObject", func_SHCreateFileDataObject }, { "SHCreateFileExtractIconW", func_SHCreateFileExtractIconW }, + { "She", func_She }, { "ShellExecCmdLine", func_ShellExecCmdLine }, { "ShellExecuteEx", func_ShellExecuteEx }, { "ShellExecuteW", func_ShellExecuteW }, diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 9196713ef6d..1d87844e1a9 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -653,6 +653,9 @@ BOOL WINAPI GUIDFromStringW( _Out_ LPGUID pguid ); +LPSTR WINAPI SheRemoveQuotesA(LPSTR psz); +LPWSTR WINAPI SheRemoveQuotesW(LPWSTR psz); + /***************************************************************************** * Shell32 resources */

1 year, 11 months

[reactos] 01/01: [SHELL32] Improve CFSDropTarget::CopyItems logic (#5481)

by Huw Campbell

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1273bbe417825fa4d6d01… commit 1273bbe417825fa4d6d012c7d19c58637a02da46 Author: Huw Campbell <huw.campbell(a)gmail.com> AuthorDate: Sat Aug 5 20:12:36 2023 +1000 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 5 13:12:36 2023 +0300 [SHELL32] Improve CFSDropTarget::CopyItems logic (#5481) The previous version resolved the path of the parent then did logic assuming simple pidls. This now resolves each source directly. This change addresses a longstanding TODO in copying and moving to shell folders. It's a simple change, but it removes a bit of code and makes things simpler. Corresponding Wine PR: https://gitlab.winehq.org/wine/wine/-/merge_requests/3360 --- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 99 ++++++++++--------------- 1 file changed, 41 insertions(+), 58 deletions(-) diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index 7dff8fb3885..10aee5e3532 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -24,82 +24,65 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); -/**************************************************************************** - * BuildPathsList - * - * Builds a list of paths like the one used in SHFileOperation from a table of - * PIDLs relative to the given base folder - */ -static WCHAR* BuildPathsList(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls) -{ - WCHAR *pwszPathsList = (WCHAR *)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) * cidl + 1); - WCHAR *pwszListPos = pwszPathsList; - - for (int i = 0; i < cidl; i++) - { - FileStructW* pDataW = _ILGetFileStructW(pidls[i]); - if (!pDataW) - { - ERR("Mistreating a pidl:\n"); - pdump_always(pidls[i]); - continue; - } - - PathCombineW(pwszListPos, wszBasePath, pDataW->wszName); - pwszListPos += wcslen(pwszListPos) + 1; - } - *pwszListPos = 0; - return pwszPathsList; -} /**************************************************************************** * CFSDropTarget::_CopyItems * - * copies items to this folder - * FIXME: We should not ask the parent folder: 'What is your path', and then manually build paths assuming everything is a simple pidl! - * We should be asking the parent folder: Give me a full name for this pidl (for each child!) + * copies or moves items to this folder */ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl, BOOL bCopy) { - LPWSTR pszSrcList; - HRESULT hr; - WCHAR wszTargetPath[MAX_PATH + 1]; + HRESULT ret; + WCHAR wszDstPath[MAX_PATH + 1] = {0}; + PWCHAR pwszSrcPathsList = (PWCHAR) HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) * cidl + 1); + if (!pwszSrcPathsList) + return E_OUTOFMEMORY; - wcscpy(wszTargetPath, m_sPathTarget); - //Double NULL terminate. - wszTargetPath[wcslen(wszTargetPath) + 1] = '\0'; + PWCHAR pwszListPos = pwszSrcPathsList; + STRRET strretFrom; + SHFILEOPSTRUCTW fop; - TRACE ("(%p)->(%p,%u,%p)\n", this, pSFFrom, cidl, apidl); + /* Build a double null terminated list of C strings from source paths */ + for (UINT i = 0; i < cidl; i++) + { + ret = pSFFrom->GetDisplayNameOf(apidl[i], SHGDN_FORPARSING, &strretFrom); + if (FAILED(ret)) + goto cleanup; - STRRET strretFrom; - hr = pSFFrom->GetDisplayNameOf(NULL, SHGDN_FORPARSING, &strretFrom); - if (hr != S_OK) - return hr; + ret = StrRetToBufW(&strretFrom, NULL, pwszListPos, MAX_PATH); + if (FAILED(ret)) + goto cleanup; - pszSrcList = BuildPathsList(strretFrom.pOleStr, cidl, apidl); - TRACE("Source file (just the first) = %s, target path = %s, bCopy: %d\n", debugstr_w(pszSrcList), debugstr_w(m_sPathTarget), bCopy); - CoTaskMemFree(strretFrom.pOleStr); - if (!pszSrcList) - return E_OUTOFMEMORY; + pwszListPos += lstrlenW(pwszListPos) + 1; + } + /* Append the final null. */ + *pwszListPos = L'\0'; - SHFILEOPSTRUCTW op = {0}; - op.pFrom = pszSrcList; - op.pTo = wszTargetPath; - op.hwnd = m_hwndSite; - op.wFunc = bCopy ? FO_COPY : FO_MOVE; - op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; + /* Build a double null terminated target (this path) */ + ret = StringCchCopyW(wszDstPath, MAX_PATH, m_sPathTarget); + if (FAILED(ret)) + goto cleanup; - int res = SHFileOperationW(&op); + wszDstPath[lstrlenW(wszDstPath) + 1] = L'\0'; - HeapFree(GetProcessHeap(), 0, pszSrcList); + ZeroMemory(&fop, sizeof(fop)); + fop.hwnd = m_hwndSite; + fop.wFunc = bCopy ? FO_COPY : FO_MOVE; + fop.pFrom = pwszSrcPathsList; + fop.pTo = wszDstPath; + fop.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; + ret = S_OK; - if (res) + if (SHFileOperationW(&fop)) { - ERR("SHFileOperationW failed with 0x%x\n", res); - return E_FAIL; + ERR("SHFileOperationW failed\n"); + ret = E_FAIL; } - return S_OK; + +cleanup: + HeapFree(GetProcessHeap(), 0, pwszSrcPathsList); + return ret; } CFSDropTarget::CFSDropTarget():

1 year, 11 months

[reactos] 01/01: [NTOS:MM] Fix use-after-free error

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9bc5b8357adc4bc19ffeb… commit 9bc5b8357adc4bc19ffebc46238eac555ed7143a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 29 13:48:46 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 5 11:57:58 2023 +0300 [NTOS:MM] Fix use-after-free error The VAD / memory area can get deleted when calling MmUnmapViewOfSegment, so it must not be used after that. --- ntoskrnl/mm/section.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 653b4759b27..fe07ac03df0 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -3670,13 +3670,16 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, { PMM_SECTION_SEGMENT Segment = MemoryArea->SectionData.Segment; PMMVAD Vad = &MemoryArea->VadNode; + PCONTROL_AREA ControlArea = Vad->ControlArea; PFILE_OBJECT FileObject; SIZE_T ViewSize; LARGE_INTEGER ViewOffset; ViewOffset.QuadPart = MemoryArea->SectionData.ViewOffset; - + InterlockedIncrement64(Segment->ReferenceCount); + ViewSize = PAGE_SIZE + ((Vad->EndingVpn - Vad->StartingVpn) << PAGE_SHIFT); + Status = MmUnmapViewOfSegment(AddressSpace, BaseAddress); if (!NT_SUCCESS(Status)) { @@ -3685,6 +3688,10 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, ASSERT(NT_SUCCESS(Status)); } + /* These might be deleted now */ + Vad = NULL; + MemoryArea = NULL; + if (FlagOn(*Segment->Flags, MM_PHYSICALMEMORY_SEGMENT)) { /* Don't bother */ @@ -3706,11 +3713,10 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, /* * Flush only when last mapping is deleted. - * FIXME: Why Vad->ControlArea == NULL? + * FIXME: Why ControlArea == NULL? Or rather: is ControlArea ever not NULL here? */ - if (Vad->ControlArea == NULL || Vad->ControlArea->NumberOfMappedViews == 1) + if (ControlArea == NULL || ControlArea->NumberOfMappedViews == 1) { - ViewSize = PAGE_SIZE + ((Vad->EndingVpn - Vad->StartingVpn) << PAGE_SHIFT); while (ViewSize > 0) { ULONG FlushSize = min(ViewSize, PAGE_ROUND_DOWN(MAXULONG));

1 year, 11 months

[reactos] 01/01: [MSCAT32] Convert stubs into forwarders

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d7ff7ea334a600959328… commit 2d7ff7ea334a60095932861aa8ff8c7cdfba43c2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 30 12:24:15 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 5 09:00:13 2023 +0300 [MSCAT32] Convert stubs into forwarders --- dll/win32/mscat32/mscat32.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/mscat32/mscat32.spec b/dll/win32/mscat32/mscat32.spec index b0b1788c53d..a1d3384fb3f 100644 --- a/dll/win32/mscat32/mscat32.spec +++ b/dll/win32/mscat32/mscat32.spec @@ -1,5 +1,5 @@ -1 stub CryptCATVerifyMember -#@ stub CatalogCompactHashDatabase +1 stdcall CryptCATVerifyMember(ptr ptr ptr) wintrust.CryptCATVerifyMember +@ stdcall CatalogCompactHashDatabase() wintrust.CatalogCompactHashDatabase @ stdcall CryptCATAdminAcquireContext(long ptr long) wintrust.CryptCATAdminAcquireContext @ stdcall CryptCATAdminAddCatalog(long wstr wstr long) wintrust.CryptCATAdminAddCatalog @ stdcall CryptCATAdminCalcHashFromFileHandle(long ptr ptr long) wintrust.CryptCATAdminCalcHashFromFileHandle @@ -7,10 +7,10 @@ @ stdcall CryptCATAdminReleaseCatalogContext(long long long) wintrust.CryptCATAdminReleaseCatalogContext @ stdcall CryptCATAdminReleaseContext(long long) wintrust.CryptCATAdminReleaseContext @ stdcall CryptCATCDFClose(ptr) wintrust.CryptCATCDFClose -@ stub CryptCATCDFEnumAttributes +@ stdcall CryptCATCDFEnumAttributes(ptr ptr ptr ptr) wintrust.CryptCATCDFEnumAttributes @ stdcall CryptCATCDFEnumAttributesWithCDFTag(ptr wstr ptr ptr ptr) wintrust.CryptCATCDFEnumAttributesWithCDFTag @ stdcall CryptCATCDFEnumCatAttributes(ptr ptr ptr) wintrust.CryptCATCDFEnumCatAttributes -@ stub CryptCATCDFEnumMembers +@ stdcall CryptCATCDFEnumMembers(ptr ptr ptr) wintrust.CryptCATCDFEnumMembers @ stdcall CryptCATCDFEnumMembersByCDFTag(ptr wstr ptr ptr long) wintrust.CryptCATCDFEnumMembersByCDFTag @ stdcall CryptCATCDFEnumMembersByCDFTagEx(ptr wstr ptr ptr long ptr) wintrust.CryptCATCDFEnumMembersByCDFTagEx @ stdcall CryptCATCDFOpen(wstr ptr) wintrust.CryptCATCDFOpen @@ -32,5 +32,5 @@ @ stdcall -private DllRegisterServer() wintrust.mscat32DllRegisterServer @ stdcall -private DllUnregisterServer() wintrust.mscat32DllUnregisterServer @ stdcall IsCatalogFile(ptr wstr) wintrust.IsCatalogFile -@ stub MsCatConstructHashTag -@ stub MsCatFreeHashTag +@ stdcall MsCatConstructHashTag(long ptr ptr) wintrust.MsCatConstructHashTag +@ stdcall MsCatFreeHashTag(ptr) wintrust.MsCatFreeHashTag

1 year, 11 months

[reactos] 01/01: [SHELL32_APITEST] Add test for Control Panel's GetDisplayNameOf (#5495)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21e30f3f67ece980ae488… commit 21e30f3f67ece980ae488780cc3e80e9fc5692d4 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Fri Aug 4 08:54:31 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 4 16:54:31 2023 +0300 [SHELL32_APITEST] Add test for Control Panel's GetDisplayNameOf (#5495) New regression test for shell32!GetDisplayNameOf, showing that the return value of the function will be 'S_FALSE' when the first argument is NULL. Also, the returned STRRET structure data is not modified by this call. CORE-18841 --- modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../rostests/apitests/shell32/GetDisplayNameOf.cpp | 44 ++++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + 3 files changed, 47 insertions(+) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 53c87297d89..797e6e5ed1c 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -15,6 +15,7 @@ list(APPEND SOURCE DragDrop.cpp ExtractIconEx.cpp FindExecutable.cpp + GetDisplayNameOf.cpp IShellFolderViewCB.cpp OpenAs_RunDLL.cpp PathResolve.cpp diff --git a/modules/rostests/apitests/shell32/GetDisplayNameOf.cpp b/modules/rostests/apitests/shell32/GetDisplayNameOf.cpp new file mode 100644 index 00000000000..0211715fb1c --- /dev/null +++ b/modules/rostests/apitests/shell32/GetDisplayNameOf.cpp @@ -0,0 +1,44 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Test for GetDisplayNameOf + * COPYRIGHT: Copyright 2023 Mark Jansen <mark.jansen(a)reactos.org> + * Copyright 2023 Doug Lyons <douglyons(a)douglyons.com> + */ + +#include "shelltest.h" +#include <stdio.h> +#include <shellutils.h> + +START_TEST(GetDisplayNameOf) +{ + HRESULT hr; + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + CComPtr<IShellFolder> spPanel; + + hr = CoCreateInstance(CLSID_ControlPanel, NULL, CLSCTX_ALL, + IID_PPV_ARG(IShellFolder, &spPanel)); + ok_hr(hr, S_OK); + if (SUCCEEDED(hr)) + { + STRRET ret, expected; + + memset(&ret, 'a', sizeof(ret)); + memset(&expected, 'a', sizeof(expected)); + hr = spPanel->GetDisplayNameOf(NULL, SHGDN_NORMAL, &ret); + + /* Return value is expected to be 'S_FALSE', which is out-of-spec behavior. + * The data after function call is expected to be unchanged. */ + ok_hex(hr, S_FALSE); + ok(memcmp(&ret, &expected, sizeof(ret)) == 0, "Data was changed!\n"); + + /* Repeat the same test with SHGDN_FORPARSING */ + memset(&ret, 'a', sizeof(ret)); + memset(&expected, 'a', sizeof(expected)); + hr = spPanel->GetDisplayNameOf(NULL, SHGDN_FORPARSING, &ret); + + ok_hex(hr, S_FALSE); + ok(memcmp(&ret, &expected, sizeof(ret)) == 0, "Data was changed!\n"); + } +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 2c65335551f..5522cb0b659 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -16,6 +16,7 @@ extern void func_CUserNotification(void); extern void func_DragDrop(void); extern void func_ExtractIconEx(void); extern void func_FindExecutable(void); +extern void func_GetDisplayNameOf(void); extern void func_IShellFolderViewCB(void); extern void func_menu(void); extern void func_OpenAs_RunDLL(void); @@ -49,6 +50,7 @@ const struct test winetest_testlist[] = { "DragDrop", func_DragDrop }, { "ExtractIconEx", func_ExtractIconEx }, { "FindExecutable", func_FindExecutable }, + { "GetDisplayNameOf", func_GetDisplayNameOf }, { "IShellFolderViewCB", func_IShellFolderViewCB }, { "menu", func_menu }, { "OpenAs_RunDLL", func_OpenAs_RunDLL },

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