Ros-diffs

ros-diffs@reactos.org

81390 discussions

02/02: [ATL_APITEST] Add test for CComQIPtr (or rather, our gcc hack that slightly looks like it)
by Mark Jansen 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b8f6d5eaba7d55dfd2e3… commit 4b8f6d5eaba7d55dfd2e339d4d4564a62da1353b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 5 11:50:02 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Aug 19 17:35:18 2018 +0200 [ATL_APITEST] Add test for CComQIPtr (or rather, our gcc hack that slightly looks like it) --- modules/rostests/apitests/atl/CComQIPtr.cpp | 160 +++++++++++++++++++++ modules/rostests/apitests/atl/CMakeLists.txt | 1 + modules/rostests/apitests/atl/devenv/ATLTest.sln | 10 ++ .../apitests/atl/devenv/CComObject.vcxproj | 4 - .../{CSimpleMap.vcxproj => CComQIPtr.vcxproj} | 10 +- .../rostests/apitests/atl/devenv/CImage.vcxproj | 4 - .../apitests/atl/devenv/CSimpleArray.vcxproj | 4 - .../apitests/atl/devenv/CSimpleMap.vcxproj | 4 - .../rostests/apitests/atl/devenv/CString.vcxproj | 4 - modules/rostests/apitests/atl/testlist.c | 2 + 10 files changed, 176 insertions(+), 27 deletions(-) diff --git a/modules/rostests/apitests/atl/CComQIPtr.cpp b/modules/rostests/apitests/atl/CComQIPtr.cpp new file mode 100644 index 0000000000..f9fedb6898 --- /dev/null +++ b/modules/rostests/apitests/atl/CComQIPtr.cpp @@ -0,0 +1,160 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for CComQIPtr + * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include <atlbase.h> +#include <atlcom.h> + +#ifdef __REACTOS__ + #include <apitest.h> +#else + #include <stdlib.h> + #include <stdio.h> + #include <stdarg.h> + int g_tests_executed = 0; + int g_tests_failed = 0; + void ok_func(const char *file, int line, BOOL value, const char *fmt, ...) + { + va_list va; + va_start(va, fmt); + if (!value) + { + printf("%s (%d): ", file, line); + vprintf(fmt, va); + g_tests_failed++; + } + g_tests_executed++; + va_end(va); + } + #undef ok + #define ok(value, ...) ok_func(__FILE__, __LINE__, value, __VA_ARGS__) + #define START_TEST(x) int main(void) +#endif + + +static LONG g_QI = 0; + +class CQITestObject : + public IPersist, + public IStdMarshalInfo +{ +public: + LONG m_dwRef; + + CQITestObject() + :m_dwRef(1) + { + } + ~CQITestObject() + { + } + + STDMETHOD_(ULONG, AddRef)() + { + InterlockedIncrement(&m_dwRef); + return 2; + } + + STDMETHOD_(ULONG, Release)() + { + InterlockedDecrement(&m_dwRef); + return 1; + } + + STDMETHOD(QueryInterface)(REFIID iid, void **ppvObject) + { + InterlockedIncrement(&g_QI); + if (iid == IID_IUnknown || iid == IID_IPersist) + { + AddRef(); + *ppvObject = static_cast<IPersist*>(this); + return S_OK; + } + else if (iid == IID_IStdMarshalInfo) + { + AddRef(); + *ppvObject = static_cast<IStdMarshalInfo*>(this); + return S_OK; + } + return E_NOINTERFACE; + } + + // *** IPersist methods *** + STDMETHOD(GetClassID)(CLSID *pClassID) + { + return E_NOTIMPL; + } + + // *** IStdMarshalInfo methods *** + STDMETHOD(GetClassForHandler)(DWORD dwDestContext, void *pvDestContext, CLSID *pClsid) + { + return E_NOTIMPL; + } +}; + +// Yes this sucks, but we have to support GCC. (CORE-12710) +#ifdef __REACTOS__ +#define DECLARE_QIPTR(type) CComQIIDPtr<I_ID(type)> +#else +#define DECLARE_QIPTR(type) CComQIPtr<type> +#endif + +START_TEST(CComQIPtr) +{ + CQITestObject testObject; + IUnknown* unk = static_cast<IPersist*>(&testObject); + ok(testObject.m_dwRef == 1, "Expected m_dwRef 1, got %lu\n", testObject.m_dwRef); + ok(g_QI == 0, "Expected g_QI 0, got %lu\n", g_QI); + + { + DECLARE_QIPTR(IPersist) ppPersist(unk); + ok(testObject.m_dwRef == 2, "Expected m_dwRef 2, got %lu\n", testObject.m_dwRef); + ok(g_QI == 1, "Expected g_QI 1, got %lu\n", g_QI); + + DECLARE_QIPTR(IStdMarshalInfo) ppMarshal(ppPersist); + ok(testObject.m_dwRef == 3, "Expected m_dwRef 3, got %lu\n", testObject.m_dwRef); + ok(g_QI == 2, "Expected g_QI 2, got %lu\n", g_QI); + } + ok(testObject.m_dwRef == 1, "Expected m_dwRef 1, got %lu\n", testObject.m_dwRef); + { + DECLARE_QIPTR(IStdMarshalInfo) ppMarshal; + ok(testObject.m_dwRef == 1, "Expected m_dwRef 1, got %lu\n", testObject.m_dwRef); + ok(g_QI == 2, "Expected g_QI 2, got %lu\n", g_QI); + + ppMarshal = unk; + ok(testObject.m_dwRef == 2, "Expected m_dwRef 2, got %lu\n", testObject.m_dwRef); + ok(g_QI == 3, "Expected g_QI 3, got %lu\n", g_QI); + + ppMarshal = static_cast<IUnknown*>(NULL); + ok(testObject.m_dwRef == 1, "Expected m_dwRef 1, got %lu\n", testObject.m_dwRef); + ok(g_QI == 3, "Expected g_QI 3, got %lu\n", g_QI); + + CComPtr<IUnknown> spUnk(unk); + ok(testObject.m_dwRef == 2, "Expected m_dwRef 2, got %lu\n", testObject.m_dwRef); + ok(g_QI == 3, "Expected g_QI 3, got %lu\n", g_QI); + + ppMarshal = spUnk; + ok(testObject.m_dwRef == 3, "Expected m_dwRef 3, got %lu\n", testObject.m_dwRef); + ok(g_QI == 4, "Expected g_QI 4, got %lu\n", g_QI); + + spUnk.Release(); + ok(testObject.m_dwRef == 2, "Expected m_dwRef 2, got %lu\n", testObject.m_dwRef); + ok(g_QI == 4, "Expected g_QI 4, got %lu\n", g_QI); + + spUnk = ppMarshal; + ok(testObject.m_dwRef == 3, "Expected m_dwRef 3, got %lu\n", testObject.m_dwRef); +#ifdef __REACTOS__ + // CORE-12710 + todo_if(1) +#endif + ok(g_QI == 5, "Expected g_QI 5, got %lu\n", g_QI); + } + +#ifndef __REACTOS__ + printf("CComQIPtr: %i tests executed (0 marked as todo, %i failures), 0 skipped.\n", g_tests_executed, g_tests_failed); + return g_tests_failed; +#endif +} diff --git a/modules/rostests/apitests/atl/CMakeLists.txt b/modules/rostests/apitests/atl/CMakeLists.txt index fbc1420dec..3cbf35bc09 100644 --- a/modules/rostests/apitests/atl/CMakeLists.txt +++ b/modules/rostests/apitests/atl/CMakeLists.txt @@ -9,6 +9,7 @@ list(APPEND SOURCE CComBSTR.cpp CComHeapPtr.cpp CComObject.cpp + CComQIPtr.cpp CImage.cpp CRegKey.cpp CSimpleArray.cpp diff --git a/modules/rostests/apitests/atl/devenv/ATLTest.sln b/modules/rostests/apitests/atl/devenv/ATLTest.sln index d9d18dddb6..b36db07333 100644 --- a/modules/rostests/apitests/atl/devenv/ATLTest.sln +++ b/modules/rostests/apitests/atl/devenv/ATLTest.sln @@ -13,6 +13,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CString", "CString.vcxproj" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CComObject", "CComObject.vcxproj", "{408AEF87-D169-4A2F-A9E3-FF3DD1D59E65}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CComQIPtr", "CComQIPtr.vcxproj", "{907AEF87-D169-4A2F-A9E3-FF3DD1D59E65}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -61,6 +63,14 @@ Global {408AEF87-D169-4A2F-A9E3-FF3DD1D59E65}.Release|x64.Build.0 = Release|x64 {408AEF87-D169-4A2F-A9E3-FF3DD1D59E65}.Release|x86.ActiveCfg = Release|Win32 {408AEF87-D169-4A2F-A9E3-FF3DD1D59E65}.Release|x86.Build.0 = Release|Win32 + {907AEF87-D169-4A2F-A9E3-FF3DD1D59E65}.Debug|x64.ActiveCfg = Debug|x64 + {907AEF87-D169-4A2F-A9E3-FF3DD1D59E65}.Debug|x64.Build.0 = Debug|x64 + {907AEF87-D169-4A2F-A9E3-FF3DD1D59E65}.Debug|x86.ActiveCfg = Debug|Win32 + {907AEF87-D169-4A2F-A9E3-FF3DD1D59E65}.Debug|x86.Build.0 = Debug|Win32 + {907AEF87-D169-4A2F-A9E3-FF3DD1D59E65}.Release|x64.ActiveCfg = Release|x64 + {907AEF87-D169-4A2F-A9E3-FF3DD1D59E65}.Release|x64.Build.0 = Release|x64 + {907AEF87-D169-4A2F-A9E3-FF3DD1D59E65}.Release|x86.ActiveCfg = Release|Win32 + {907AEF87-D169-4A2F-A9E3-FF3DD1D59E65}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/modules/rostests/apitests/atl/devenv/CComObject.vcxproj b/modules/rostests/apitests/atl/devenv/CComObject.vcxproj index ac525e52d9..97903a9250 100644 --- a/modules/rostests/apitests/atl/devenv/CComObject.vcxproj +++ b/modules/rostests/apitests/atl/devenv/CComObject.vcxproj @@ -98,7 +98,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <RegisterOutput>false</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -117,7 +116,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -138,7 +136,6 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -159,7 +156,6 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj b/modules/rostests/apitests/atl/devenv/CComQIPtr.vcxproj similarity index 96% copy from modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj copy to modules/rostests/apitests/atl/devenv/CComQIPtr.vcxproj index f7e7549036..345f1d8ea1 100644 --- a/modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj +++ b/modules/rostests/apitests/atl/devenv/CComQIPtr.vcxproj @@ -19,7 +19,7 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{EC560DE6-6DB3-437D-85CA-582491FE6F95}</ProjectGuid> + <ProjectGuid>{907AEF87-D169-4A2F-A9E3-FF3DD1D59E65}</ProjectGuid> <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> <Keyword>AtlProj</Keyword> </PropertyGroup> @@ -39,8 +39,8 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120_xp</PlatformToolset> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v120_xp</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> @@ -98,7 +98,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <RegisterOutput>false</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -117,7 +116,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -138,7 +136,6 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -159,11 +156,10 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="../CSimpleMap.cpp"> + <ClCompile Include="../CComQIPtr.cpp"> <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MultiThreaded</RuntimeLibrary> <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MultiThreaded</RuntimeLibrary> <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MultiThreadedDebug</RuntimeLibrary> diff --git a/modules/rostests/apitests/atl/devenv/CImage.vcxproj b/modules/rostests/apitests/atl/devenv/CImage.vcxproj index 5c77112862..80984b87c9 100644 --- a/modules/rostests/apitests/atl/devenv/CImage.vcxproj +++ b/modules/rostests/apitests/atl/devenv/CImage.vcxproj @@ -98,7 +98,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <RegisterOutput>false</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -117,7 +116,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -138,7 +136,6 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -159,7 +156,6 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/modules/rostests/apitests/atl/devenv/CSimpleArray.vcxproj b/modules/rostests/apitests/atl/devenv/CSimpleArray.vcxproj index 8053eea219..76b03d7598 100644 --- a/modules/rostests/apitests/atl/devenv/CSimpleArray.vcxproj +++ b/modules/rostests/apitests/atl/devenv/CSimpleArray.vcxproj @@ -98,7 +98,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <RegisterOutput>false</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -117,7 +116,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -138,7 +136,6 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -159,7 +156,6 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj b/modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj index f7e7549036..03862264d7 100644 --- a/modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj +++ b/modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj @@ -98,7 +98,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <RegisterOutput>false</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -117,7 +116,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -138,7 +136,6 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -159,7 +156,6 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/modules/rostests/apitests/atl/devenv/CString.vcxproj b/modules/rostests/apitests/atl/devenv/CString.vcxproj index 82dfc4687b..8772a16814 100644 --- a/modules/rostests/apitests/atl/devenv/CString.vcxproj +++ b/modules/rostests/apitests/atl/devenv/CString.vcxproj @@ -98,7 +98,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <RegisterOutput>false</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -117,7 +116,6 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -138,7 +136,6 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -159,7 +156,6 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <RegisterOutput>true</RegisterOutput> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/modules/rostests/apitests/atl/testlist.c b/modules/rostests/apitests/atl/testlist.c index 0c40c3b140..232785a4b8 100644 --- a/modules/rostests/apitests/atl/testlist.c +++ b/modules/rostests/apitests/atl/testlist.c @@ -5,6 +5,7 @@ extern void func_atltypes(void); extern void func_CComBSTR(void); extern void func_CComHeapPtr(void); extern void func_CComObject(void); +extern void func_CComQIPtr(void); extern void func_CComVariant(void); extern void func_CImage(void); extern void func_CRegKey(void); @@ -18,6 +19,7 @@ const struct test winetest_testlist[] = { "CComBSTR", func_CComBSTR }, { "CComHeapPtr", func_CComHeapPtr }, { "CComObject", func_CComObject }, + { "CComQIPtr", func_CComQIPtr }, { "CComVariant", func_CComVariant }, { "CImage", func_CImage }, { "CRegKey", func_CRegKey },

1 0

01/02: [ATL] Improve the order of operations in CComPtr and CComQIIDPtr
by Mark Jansen 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69893ccf3824da558e75d… commit 69893ccf3824da558e75d376d3f6ac2fb1292711 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 5 11:48:31 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Aug 19 17:35:18 2018 +0200 [ATL] Improve the order of operations in CComPtr and CComQIIDPtr --- sdk/lib/atl/atlcomcli.h | 60 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/sdk/lib/atl/atlcomcli.h b/sdk/lib/atl/atlcomcli.h index 229c585fdd..ad1582a6ca 100644 --- a/sdk/lib/atl/atlcomcli.h +++ b/sdk/lib/atl/atlcomcli.h @@ -87,23 +87,49 @@ public: T *operator = (T *lp) { - if (p != NULL) - p->Release(); + T* pOld = p; + p = lp; if (p != NULL) p->AddRef(); + + if (pOld != NULL) + pOld->Release(); + return *this; } T *operator = (const CComPtr<T> &lp) { - if (p != NULL) - p->Release(); + T* pOld = p; + p = lp.p; if (p != NULL) p->AddRef(); + + if (pOld != NULL) + pOld->Release(); + + return *this; + } + + // We cannot enable this until gcc starts supporting __uuidof + // See CORE-12710 +#if 0 + template <typename Q> + T* operator=(const CComPtr<Q>& lp) + { + T* pOld = p; + + if (!lp.p || FAILED(lp.p->QueryInterface(__uuidof(T), (void**)(IUnknown**)&p))) + p = NULL; + + if (pOld != NULL) + pOld->Release(); + return *this; } +#endif void Release() { @@ -175,38 +201,48 @@ public: { if (lp != NULL) { - if (FAILED(lp->QueryInterface(*piid, reinterpret_cast<void **>(&p)))) + if (FAILED(lp->QueryInterface(*piid, (void**)(IUnknown**)&p))) p = NULL; } } T *operator = (T *lp) { - if (p != NULL) - p->Release(); + T* pOld = p; + p = lp; if (p != NULL) p->AddRef(); + + if (pOld != NULL) + pOld->Release(); + return *this; } T *operator = (const CComQIIDPtr<T,piid> &lp) { - if (p != NULL) - p->Release(); + T* pOld = p; + p = lp.p; if (p != NULL) p->AddRef(); + + if (pOld != NULL) + pOld->Release(); + return *this; } T * operator=(IUnknown* lp) { - if (p != NULL) - p->Release(); + T* pOld = p; - if (FAILED(lp->QueryInterface(*piid, reinterpret_cast<void **>(&p)))) + if (!lp || FAILED(lp->QueryInterface(*piid, (void**)(IUnknown**)&p))) p = NULL; + if (pOld != NULL) + pOld->Release(); + return *this; } };

1 0

01/01: [WSHOM.OCX] Zero-initialize timeout and type if they are not set. This should fix buildbot timeouts
by EUPHORIA-IT\m.jansen 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb5f8cfccb4a716edc2ab… commit bb5f8cfccb4a716edc2ab6e723b95693ec53f2a1 Author: EUPHORIA-IT\m.jansen <m.jansen(a)euphoria-it.nl> AuthorDate: Sun Aug 19 16:13:55 2018 +0200 Commit: EUPHORIA-IT\m.jansen <m.jansen(a)euphoria-it.nl> CommitDate: Sun Aug 19 16:14:08 2018 +0200 [WSHOM.OCX] Zero-initialize timeout and type if they are not set. This should fix buildbot timeouts --- dll/win32/wshom.ocx/shell.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dll/win32/wshom.ocx/shell.c b/dll/win32/wshom.ocx/shell.c index 1aa353a17a..42310e2a7e 100644 --- a/dll/win32/wshom.ocx/shell.c +++ b/dll/win32/wshom.ocx/shell.c @@ -1316,6 +1316,12 @@ static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR text, VARIANT *sec if (FAILED(hr)) return hr; } +#ifdef __REACTOS__ + else + { + VariantChangeType(&timeout, &timeout, 0, VT_I4); + } +#endif VariantInit(&param.type); if (!is_optional_argument(type)) @@ -1324,6 +1330,12 @@ static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR text, VARIANT *sec if (FAILED(hr)) return hr; } +#ifdef __REACTOS__ + else + { + VariantChangeType(&param.type, &param.type, 0, VT_I4); + } +#endif if (is_optional_argument(title)) param.title = *title;

1 0

01/01: [SYSSETUP] SetupStartService: Remove the wait loop
by Eric Kohl 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8cf35d0e4333d1ca0b69… commit a8cf35d0e4333d1ca0b694602629c7dc7408944d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 19 14:31:43 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 19 14:32:29 2018 +0200 [SYSSETUP] SetupStartService: Remove the wait loop CORE-14909 --- dll/win32/syssetup/install.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index e9b5745def..63fa4a28e9 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -1508,9 +1508,7 @@ SetupStartService( { SC_HANDLE hManager = NULL; SC_HANDLE hService = NULL; - SERVICE_STATUS ServiceStatus; DWORD dwError = ERROR_SUCCESS; - DWORD dwRetries = 0; hManager = OpenSCManagerW(NULL, NULL, @@ -1523,7 +1521,7 @@ SetupStartService( hService = OpenServiceW(hManager, lpServiceName, - SERVICE_START | (bWait) ? SERVICE_QUERY_STATUS : 0); + SERVICE_START); if (hService == NULL) { dwError = GetLastError(); @@ -1533,27 +1531,7 @@ SetupStartService( if (!StartService(hService, 0, NULL)) { dwError = GetLastError(); - if (dwError != ERROR_SERVICE_ALREADY_RUNNING) - goto done; - - if (bWait) - { - for (;;) - { - if (!QueryServiceStatus(hService, &ServiceStatus)) - break; - - if (ServiceStatus.dwCurrentState != SERVICE_START_PENDING) - break; - - if (dwRetries == 30) - break; - - dwRetries++; - - Sleep(5000); - } - } + goto done; } done:

1 0

01/01: [NTDLL][NTUSER] Fix unselected text after WM_CBLOSTTEXTFOCUS
by Manuel Bachmann 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71ab0b5d4cb7fe00e0047… commit 71ab0b5d4cb7fe00e0047308a18ae48c734266b9 Author: Manuel Bachmann <tarnyko(a)tarnyko.net> AuthorDate: Thu Nov 2 02:06:50 2017 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Aug 19 14:24:34 2018 +0200 [NTDLL][NTUSER] Fix unselected text after WM_CBLOSTTEXTFOCUS When we unselect text after the WM_CBLOSTTEXTFOCUS message, make sure we also forget we have been focused at all; otherwise the edit may become focused again, but with an empty text selection. CORE-10266 --- win32ss/user/user32/controls/combo.c | 16 +++++++--------- win32ss/user/user32/controls/edit.c | 11 +---------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/win32ss/user/user32/controls/combo.c b/win32ss/user/user32/controls/combo.c index eb9d6fd86d..11537901e5 100644 --- a/win32ss/user/user32/controls/combo.c +++ b/win32ss/user/user32/controls/combo.c @@ -2260,16 +2260,14 @@ LRESULT WINAPI ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPAR } break; - case WM_CBLOSTTEXTFOCUS: /* undocumented message - deselects the text when focus is lost */ + case WM_CBLOSTTEXTFOCUS: /* undocumented message - deselects the text when focus is lost */ + if (lphc->hWndEdit != NULL) { - if (lphc->hWndEdit != NULL) - { - SendMessage(lphc->self, WM_LBUTTONUP, 0, 0xFFFFFFFF); - SendMessage(lphc->hWndEdit, EM_SETSEL, 0, 0); - lphc->wState &= ~CBF_FOCUSED; - CB_NOTIFY(lphc, CBN_KILLFOCUS); - } - } + SendMessage(lphc->self, WM_LBUTTONUP, 0, 0xFFFFFFFF); + SendMessage(lphc->hWndEdit, EM_SETSEL, 0, 0); + lphc->wState &= ~(CBF_FOCUSED | CBF_BEENFOCUSED); + CB_NOTIFY(lphc, CBN_KILLFOCUS); + } return TRUE; #endif diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index f1db16f8e0..70bdd1d40d 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -3626,7 +3626,6 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) */ static LRESULT EDIT_WM_KillFocus(EDITSTATE *es) { -#if 0 // See CORE-10266. HWND hCombo; LONG lStyles; @@ -3647,15 +3646,7 @@ static LRESULT EDIT_WM_KillFocus(EDITSTATE *es) if ((lStyles & CBS_DROPDOWN) || (lStyles & CBS_SIMPLE)) SendMessage(hCombo, WM_CBLOSTTEXTFOCUS, 0, 0); } -#else - es->flags &= ~EF_FOCUSED; - DestroyCaret(); - if(!(es->style & ES_NOHIDESEL)) - EDIT_InvalidateText(es, es->selection_start, es->selection_end); - EDIT_NOTIFY_PARENT(es, EN_KILLFOCUS); - /* throw away left over scroll when we lose focus */ - es->wheelDeltaRemainder = 0; -#endif + return 0; }

1 0

02/02: [WINED3D] Yield CPU to the scheduler in wined3d_pause. CORE-14637 CORE-14534
by Thomas Faber 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c97e9defc157b171d56e3… commit c97e9defc157b171d56e31dd9768c5eee732019d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Aug 19 13:28:06 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 19 13:46:08 2018 +0200 [WINED3D] Yield CPU to the scheduler in wined3d_pause. CORE-14637 CORE-14534 Much like the previous commit, this is a workaround for our buggy Win32k. --- dll/directx/wine/wined3d/wined3d_private.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/directx/wine/wined3d/wined3d_private.h b/dll/directx/wine/wined3d/wined3d_private.h index 3444b52928..3cf6748237 100644 --- a/dll/directx/wine/wined3d/wined3d_private.h +++ b/dll/directx/wine/wined3d/wined3d_private.h @@ -370,9 +370,13 @@ static inline unsigned int wined3d_popcount(unsigned int x) static inline void wined3d_pause(void) { +#ifdef __REACTOS__ + Sleep(0); +#else #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) __asm__ __volatile__( "rep;nop" : : : "memory" ); #endif +#endif } #define ORM_BACKBUFFER 0

1 0

01/02: [WINED3D] Avoid spinning in wined3d_cs_run. CORE-14534
by Thomas Faber 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=adfbefde2b237f757d741… commit adfbefde2b237f757d741e0cf17197e51599d436 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Aug 19 13:27:04 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 19 13:46:02 2018 +0200 [WINED3D] Avoid spinning in wined3d_cs_run. CORE-14534 Spinning here is supposed to improve performance by avoiding scheduling overhead, but because ReactOS's Win32 subsystem does not deal with this well, it causes the system to freeze on ROS. As a workaround, we disable spinning and jump directly to the wait. It should become obvious when this starts actually causing performance issues again and it's time to undo. --- dll/directx/wine/wined3d/wined3d_private.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/directx/wine/wined3d/wined3d_private.h b/dll/directx/wine/wined3d/wined3d_private.h index 7b3731c014..3444b52928 100644 --- a/dll/directx/wine/wined3d/wined3d_private.h +++ b/dll/directx/wine/wined3d/wined3d_private.h @@ -3544,7 +3544,11 @@ enum wined3d_push_constants #define WINED3D_CS_QUERY_POLL_INTERVAL 10u #define WINED3D_CS_QUEUE_SIZE 0x100000u +#ifdef __REACTOS__ +#define WINED3D_CS_SPIN_COUNT 1u +#else #define WINED3D_CS_SPIN_COUNT 10000000u +#endif struct wined3d_cs_queue {

1 0

01/01: [USER32] Log the text of message boxes to help figure out some test bot timeouts.
by Thomas Faber 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9bffdcb6e7e6f6e132488… commit 9bffdcb6e7e6f6e1324886daa0ad6d3afc3b03c2 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Aug 19 12:02:17 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 19 12:02:24 2018 +0200 [USER32] Log the text of message boxes to help figure out some test bot timeouts. --- win32ss/user/user32/windows/messagebox.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/user/user32/windows/messagebox.c b/win32ss/user/user32/windows/messagebox.c index 658ba763b4..57033ad4e6 100644 --- a/win32ss/user/user32/windows/messagebox.c +++ b/win32ss/user/user32/windows/messagebox.c @@ -1045,6 +1045,7 @@ SoftModalMessageBox(IN LPMSGBOXDATA lpMsgBoxData) tpl->cy = RESCALE_Y(btntop, units); /* Finally show the message-box */ + ERR("MessageBox: %s\n", wine_dbgstr_wn(lpMsgBoxParams->lpszText, textlen)); ret = DialogBoxIndirectParamW(lpMsgBoxParams->hInstance, tpl, lpMsgBoxParams->hwndOwner, MessageBoxProc, (LPARAM)&mbd);

1 0

01/01: [CDROM] Set proper status on disk verify
by Pierre Schweitzer 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1ac347825fe4d47ba206… commit c1ac347825fe4d47ba206d94c9f91130e0c78dd8 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Aug 19 11:11:21 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Aug 19 11:11:21 2018 +0200 [CDROM] Set proper status on disk verify This avoids an assert under certain conditions in CDFS. Check cdrom_new for reference. CORE-14873 --- drivers/storage/class/cdrom/cdrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/storage/class/cdrom/cdrom.c b/drivers/storage/class/cdrom/cdrom.c index 69ddd19f9d..a1c477ef9e 100644 --- a/drivers/storage/class/cdrom/cdrom.c +++ b/drivers/storage/class/cdrom/cdrom.c @@ -7156,7 +7156,7 @@ Return Value: // upon completion of the read capacity. // - IrpToComplete->IoStatus.Status = STATUS_VERIFY_REQUIRED; + IrpToComplete->IoStatus.Status = STATUS_IO_DEVICE_ERROR; IoMarkIrpPending(IrpToComplete); IoCallDriver(DeviceExtension->PortDeviceObject, irp);

1 0

02/02: [FASTFAT] Don't delay any other close once shutdown has started
by Pierre Schweitzer 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=901c47ed1405fd7fc2c31… commit 901c47ed1405fd7fc2c31f54e6dc65ec2fb0728e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Aug 19 09:55:38 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Aug 19 09:56:12 2018 +0200 [FASTFAT] Don't delay any other close once shutdown has started --- drivers/filesystems/fastfat/close.c | 3 ++- drivers/filesystems/fastfat/iface.c | 1 + drivers/filesystems/fastfat/shutdown.c | 1 + drivers/filesystems/fastfat/vfat.h | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/fastfat/close.c b/drivers/filesystems/fastfat/close.c index 0c313e6629..d8f85a85a4 100644 --- a/drivers/filesystems/fastfat/close.c +++ b/drivers/filesystems/fastfat/close.c @@ -183,7 +183,8 @@ VfatCloseFile( } /* If we have to close immediately, or if delaying failed, close */ - if (!BooleanFlagOn(pFcb->Flags, FCB_DELAYED_CLOSE) || !NT_SUCCESS(VfatPostCloseFile(DeviceExt, FileObject))) + if (VfatGlobalData->ShutdownStarted || !BooleanFlagOn(pFcb->Flags, FCB_DELAYED_CLOSE) || + !NT_SUCCESS(VfatPostCloseFile(DeviceExt, FileObject))) { VfatCommonCloseFile(DeviceExt, pFcb); } diff --git a/drivers/filesystems/fastfat/iface.c b/drivers/filesystems/fastfat/iface.c index e99409c669..c98e64f02b 100644 --- a/drivers/filesystems/fastfat/iface.c +++ b/drivers/filesystems/fastfat/iface.c @@ -101,6 +101,7 @@ DriverEntry( InitializeListHead(&VfatGlobalData->CloseListHead); VfatGlobalData->CloseCount = 0; VfatGlobalData->CloseWorkerRunning = FALSE; + VfatGlobalData->ShutdownStarted = FALSE; VfatGlobalData->CloseWorkItem = IoAllocateWorkItem(DeviceObject); if (VfatGlobalData->CloseWorkItem == NULL) { diff --git a/drivers/filesystems/fastfat/shutdown.c b/drivers/filesystems/fastfat/shutdown.c index c363aefa16..c9e2bd5431 100644 --- a/drivers/filesystems/fastfat/shutdown.c +++ b/drivers/filesystems/fastfat/shutdown.c @@ -61,6 +61,7 @@ VfatShutdown( FsRtlEnterFileSystem(); /* FIXME: block new mount requests */ + VfatGlobalData->ShutdownStarted = TRUE; if (DeviceObject == VfatGlobalData->DeviceObject) { diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index 834427e1b8..993d5f9fb9 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -417,6 +417,7 @@ typedef struct LIST_ENTRY CloseListHead; BOOLEAN CloseWorkerRunning; PIO_WORKITEM CloseWorkItem; + BOOLEAN ShutdownStarted; } VFAT_GLOBAL_DATA, *PVFAT_GLOBAL_DATA; extern PVFAT_GLOBAL_DATA VfatGlobalData;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs