Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 04/04: [ATL] Add a minimal CAtlArray implementation

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=610b85245172f42d812b8… commit 610b85245172f42d812b86fa87129a40b0230a79 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Aug 10 00:22:03 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Aug 11 21:46:07 2019 +0200 [ATL] Add a minimal CAtlArray implementation --- modules/rostests/apitests/atl/CMakeLists.txt | 1 + modules/rostests/apitests/atl/testlist.c | 2 + sdk/lib/atl/atlcoll.h | 249 ++++++++++++++++++++++++++- 3 files changed, 251 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/atl/CMakeLists.txt b/modules/rostests/apitests/atl/CMakeLists.txt index 7ff83d6691d..8bbd802c4a5 100644 --- a/modules/rostests/apitests/atl/CMakeLists.txt +++ b/modules/rostests/apitests/atl/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) list(APPEND SOURCE atltypes.cpp CAtlFileMapping.cpp + CAtlArray.cpp CAtlList.cpp CComBSTR.cpp CComHeapPtr.cpp diff --git a/modules/rostests/apitests/atl/testlist.c b/modules/rostests/apitests/atl/testlist.c index 73546673240..d9a88545f2c 100644 --- a/modules/rostests/apitests/atl/testlist.c +++ b/modules/rostests/apitests/atl/testlist.c @@ -3,6 +3,7 @@ extern void func_atltypes(void); extern void func_CAtlFileMapping(void); +extern void func_CAtlArray(void); extern void func_CAtlList(void); extern void func_CComBSTR(void); extern void func_CComHeapPtr(void); @@ -19,6 +20,7 @@ const struct test winetest_testlist[] = { { "atltypes", func_atltypes }, { "CAtlFileMapping", func_CAtlFileMapping }, + { "CAtlArray", func_CAtlArray }, { "CAtlList", func_CAtlList }, { "CComBSTR", func_CComBSTR }, { "CComHeapPtr", func_CComHeapPtr }, diff --git a/sdk/lib/atl/atlcoll.h b/sdk/lib/atl/atlcoll.h index ae47ff7887f..73feb751645 100644 --- a/sdk/lib/atl/atlcoll.h +++ b/sdk/lib/atl/atlcoll.h @@ -5,6 +5,15 @@ #include "atlbase.h" #include "atlexcept.h" +// FIXME: We need to include <new> for placement new, but that would mean everyone using atl +// would also need to set the option 'WITH_STL'.. +// For now we just copy the definition here, under a guard.. +#ifndef _NEW +inline void* operator new (size_t size, void* ptr) throw() { return ptr; } +inline void operator delete (void* ptr, void* voidptr2) throw() { } +#endif + + struct __POSITION { }; @@ -90,7 +99,7 @@ public: _In_reads_(NumElements) T* Source, _In_ size_t NumElements) { - memmove_s(Dest, NumElements * sizeof(T), Source, NumElements * sizeof(T)); + memmove(Dest, Source, NumElements * sizeof(T)); } }; @@ -136,6 +145,244 @@ class CElementTraits : { }; + +template<typename E, class ETraits = CElementTraits<E> > +class CAtlArray +{ +public: + typedef typename ETraits::INARGTYPE INARGTYPE; + typedef typename ETraits::OUTARGTYPE OUTARGTYPE; + +private: + E* m_pData; + size_t m_Size; + size_t m_AllocatedSize; + size_t m_GrowBy; + + +#pragma push_macro("new") +#undef new + + void CreateItems(E* pData, size_t Size) + { + for (size_t n = 0; n < Size; ++n) + { + ::new (pData + n) E; + } + } + +#pragma pop_macro("new") + + void DestructItems(E* pData, size_t Size) + { + for (size_t n = 0; n < Size; ++n) + { + pData[n].~E(); + } + } + + bool GrowAllocatedData(size_t nNewSize) + { + if (m_pData) + { + size_t addSize = m_GrowBy > 0 ? m_GrowBy : m_AllocatedSize / 2; + size_t allocSize = m_AllocatedSize + addSize; + if (allocSize < nNewSize) + allocSize = nNewSize; + + E* pData = (E*)malloc(nNewSize * sizeof(E)); + + if (pData == NULL) + { + return false; + } + + // Copy the objects over (default implementation will just move them without calling anything + ETraits::RelocateElements(pData, m_pData, m_Size); + + free(m_pData); + m_pData = pData; + m_AllocatedSize = nNewSize; + } + else + { + // We need to allocate a new buffer + size_t allocSize = m_GrowBy > nNewSize ? m_GrowBy : nNewSize; + m_pData = (E*)malloc(allocSize * sizeof(E)); + if (m_pData == NULL) + { + return false; + } + m_AllocatedSize = allocSize; + } + return true; + } + + /* The CAtlArray class does not support construction by copy */ +private: + CAtlArray(_In_ const CAtlArray&); + CAtlArray& operator=(_In_ const CAtlArray&); + +public: + CAtlArray(); + ~CAtlArray(); + + size_t Add(INARGTYPE element); + size_t Add(); + + bool SetCount(size_t nNewSize, int nGrowBy = - 1); + size_t GetCount() const; + + E& operator[](size_t ielement); + const E& operator[](size_t ielement) const; + + E& GetAt(size_t iElement); + const E& GetAt(size_t iElement) const; + + //FIXME: Most of this class is missing! +}; + +// +// CAtlArray public methods +// + +template<typename E, class ETraits> +CAtlArray< E, ETraits >::CAtlArray() + : m_pData(NULL) + , m_Size(0) + , m_AllocatedSize(0) + , m_GrowBy(0) +{ +} + +template<typename E, class ETraits> +CAtlArray< E, ETraits >::~CAtlArray() +{ + // Destroy all items + SetCount(0, -1); +} + +#pragma push_macro("new") +#undef new + +template<typename E, class ETraits> +size_t CAtlArray<E, ETraits>::Add(INARGTYPE element) +{ + if (m_Size >= m_AllocatedSize) + { + if (!GrowAllocatedData(m_Size + 1)) + { + AtlThrow(E_OUTOFMEMORY); + } + } + + ::new (m_pData + m_Size) E(element); + m_Size++; + + return m_Size - 1; +} + +#pragma pop_macro("new") + +template<typename E, class ETraits> +size_t CAtlArray<E, ETraits>::Add() +{ + if (!SetCount(m_Size + 1)) + { + AtlThrow(E_OUTOFMEMORY); + } + + return m_Size - 1; +} + +template<typename E, class ETraits> +bool CAtlArray<E, ETraits>::SetCount(size_t nNewSize, int nGrowBy /*= -1*/) +{ + + if (nGrowBy > -1) + { + m_GrowBy = (size_t)nGrowBy; + } + + if (nNewSize == m_Size) + { + // Do nothing + } + else if (nNewSize == 0) + { + if (m_pData) + { + DestructItems(m_pData, m_Size); + m_pData = NULL; + } + m_Size = m_AllocatedSize = NULL; + } + else if (nNewSize < m_AllocatedSize) + { + if (nNewSize > m_Size) + { + CreateItems(m_pData + m_Size, nNewSize - m_Size); + } + else + { + DestructItems(m_pData + nNewSize, m_Size - nNewSize); + } + m_Size = nNewSize; + } + else + { + if (!GrowAllocatedData(nNewSize)) + { + return false; + } + + CreateItems(m_pData + m_Size, nNewSize - m_Size); + m_Size = nNewSize; + } + + return true; +} + +template<typename E, class ETraits> +size_t CAtlArray<E, ETraits>::GetCount() const +{ + return m_Size; +} + +template<typename E, class ETraits> +E& CAtlArray<E, ETraits>::operator[](size_t iElement) +{ + ATLASSERT(iElement < m_Size); + + return m_pData[iElement]; +} + +template<typename E, class ETraits> +const E& CAtlArray<E, ETraits>::operator[](size_t iElement) const +{ + ATLASSERT(iElement < m_Size); + + return m_pData[iElement]; +} + +template<typename E, class ETraits> +E& CAtlArray<E, ETraits>::GetAt(size_t iElement) +{ + ATLASSERT(iElement < m_Size); + + return m_pData[iElement]; +} + +template<typename E, class ETraits> +const E& CAtlArray<E, ETraits>::GetAt(size_t iElement) const +{ + ATLASSERT(iElement < m_Size); + + return m_pData[iElement]; +} + + + template<typename E, class ETraits = CElementTraits<E> > class CAtlList {

5 years, 4 months

[reactos] 03/04: [ATL_APITEST] Add simple test for CAtlArray

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=300649ba7741f100d1cdc… commit 300649ba7741f100d1cdcffc7e5cbb83db99c86d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Aug 9 21:25:16 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Aug 11 21:46:06 2019 +0200 [ATL_APITEST] Add simple test for CAtlArray --- modules/rostests/apitests/atl/CAtlArray.cpp | 169 +++++++++++++++++++ modules/rostests/apitests/atl/devenv/ATLTest.sln | 10 ++ .../rostests/apitests/atl/devenv/CAtlArray.vcxproj | 180 +++++++++++++++++++++ 3 files changed, 359 insertions(+) diff --git a/modules/rostests/apitests/atl/CAtlArray.cpp b/modules/rostests/apitests/atl/CAtlArray.cpp new file mode 100644 index 00000000000..8527c4ac47d --- /dev/null +++ b/modules/rostests/apitests/atl/CAtlArray.cpp @@ -0,0 +1,169 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for CAtlArray + * COPYRIGHT: Copyright 2016-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + * Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#ifdef HAVE_APITEST + #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 + +#include <atlbase.h> +#include <atlcoll.h> + +struct CCreature +{ + static int s_nCtorCount; + static int s_nCtorCount_Default; + static int s_nCCtorCount; + static int s_nDtorCount; + static int s_nOpIsCount; + + int m_id; + + CCreature(int id = 0x123456) + :m_id(id) + { + CCreature::s_nCtorCount++; + if (id == 0x123456) + s_nCtorCount_Default++; + } + CCreature(const CCreature& c) + :m_id(c.m_id) + { + CCreature::s_nCCtorCount++; + } + ~CCreature() + { + CCreature::s_nDtorCount++; + } + CCreature& operator=(const CCreature& other) + { + m_id = other.m_id; + CCreature::s_nOpIsCount++; + return *this; + } +}; + +int CCreature::s_nCtorCount = 0; +int CCreature::s_nCtorCount_Default = 0; +int CCreature::s_nCCtorCount = 0; +int CCreature::s_nDtorCount = 0; +int CCreature::s_nOpIsCount = 0; + + +START_TEST(CAtlArray) +{ + { + CAtlArray<CCreature> array1; + + ok(CCreature::s_nCtorCount == 0, "Expected CCreature::s_nCtorCount is zero, was: %d\n", CCreature::s_nCtorCount); + ok(CCreature::s_nCtorCount_Default == 0, "Expected CCreature::s_nCtorCount_Default is zero, was: %d\n", CCreature::s_nCtorCount_Default); + ok(CCreature::s_nCCtorCount == 0, "Expected CCreature::s_nCCtorCount is zero, was: %d\n", CCreature::s_nCCtorCount); + ok(CCreature::s_nDtorCount == 0, "Expected CCreature::s_nDtorCount is zero, was: %d\n", CCreature::s_nDtorCount); + ok(CCreature::s_nOpIsCount == 0, "Expected CCreature::s_nOpIsCount is zero, was: %d\n", CCreature::s_nOpIsCount); + + array1.SetCount(2); + + ok(CCreature::s_nCtorCount == 2, "Expected CCreature::s_nCtorCount is 2, was: %d\n", CCreature::s_nCtorCount); + ok(CCreature::s_nCtorCount_Default == 2, "Expected CCreature::s_nCtorCount_Default is 2, was: %d\n", CCreature::s_nCtorCount_Default); + ok(CCreature::s_nCCtorCount == 0, "Expected CCreature::s_nCCtorCount is zero, was: %d\n", CCreature::s_nCCtorCount); + ok(CCreature::s_nDtorCount == 0, "Expected CCreature::s_nDtorCount is zero, was: %d\n", CCreature::s_nDtorCount); + ok(CCreature::s_nOpIsCount == 0, "Expected CCreature::s_nOpIsCount is zero, was: %d\n", CCreature::s_nOpIsCount); + + array1.SetCount(1); + + ok(CCreature::s_nCtorCount == 2, "Expected CCreature::s_nCtorCount is 2, was: %d\n", CCreature::s_nCtorCount); + ok(CCreature::s_nCtorCount_Default == 2, "Expected CCreature::s_nCtorCount_Default is 2, was: %d\n", CCreature::s_nCtorCount_Default); + ok(CCreature::s_nCCtorCount == 0, "Expected CCreature::s_nCCtorCount is zero, was: %d\n", CCreature::s_nCCtorCount); + ok(CCreature::s_nDtorCount == 1, "Expected CCreature::s_nDtorCount is 1, was: %d\n", CCreature::s_nDtorCount); + ok(CCreature::s_nOpIsCount == 0, "Expected CCreature::s_nOpIsCount is zero, was: %d\n", CCreature::s_nOpIsCount); + + CCreature test(111); + + ok(CCreature::s_nCtorCount == 3, "Expected CCreature::s_nCtorCount is 3, was: %d\n", CCreature::s_nCtorCount); + ok(CCreature::s_nCtorCount_Default == 2, "Expected CCreature::s_nCtorCount_Default is 2, was: %d\n", CCreature::s_nCtorCount_Default); + ok(CCreature::s_nCCtorCount == 0, "Expected CCreature::s_nCCtorCount is zero, was: %d\n", CCreature::s_nCCtorCount); + ok(CCreature::s_nDtorCount == 1, "Expected CCreature::s_nDtorCount is 1, was: %d\n", CCreature::s_nDtorCount); + ok(CCreature::s_nOpIsCount == 0, "Expected CCreature::s_nOpIsCount is zero, was: %d\n", CCreature::s_nOpIsCount); + + ok(array1.GetCount() == 1u, "Expected GetCount() to be 1, was %u\n", array1.GetCount()); + ok(array1[0].m_id == 0x123456, "Got %d\n", array1[0].m_id); + ok(array1.GetAt(0).m_id == 0x123456, "Got %d\n", array1.GetAt(0).m_id); + + array1.Add(test); + + ok(CCreature::s_nCtorCount == 3, "Expected CCreature::s_nCtorCount is 3, was: %d\n", CCreature::s_nCtorCount); + ok(CCreature::s_nCtorCount_Default == 2, "Expected CCreature::s_nCtorCount_Default is 2, was: %d\n", CCreature::s_nCtorCount_Default); + ok(CCreature::s_nCCtorCount == 1, "Expected CCreature::s_nCCtorCount is 1, was: %d\n", CCreature::s_nCCtorCount); + ok(CCreature::s_nDtorCount == 1, "Expected CCreature::s_nDtorCount is 1, was: %d\n", CCreature::s_nDtorCount); + ok(CCreature::s_nOpIsCount == 0, "Expected CCreature::s_nOpIsCount is zero, was: %d\n", CCreature::s_nOpIsCount); + + ok(array1.GetCount() == 2u, "Expected GetCount() to be 2, was %u\n", array1.GetCount()); + ok(array1[0].m_id == 0x123456, "Got %d\n", array1[0].m_id); + ok(array1.GetAt(0).m_id == 0x123456, "Got %d\n", array1.GetAt(0).m_id); + ok(array1[1].m_id == 111, "Got %d\n", array1[1].m_id); + ok(array1.GetAt(1).m_id == 111, "Got %d\n", array1.GetAt(1).m_id); + + test.m_id = 222; + array1[0] = test; + + ok(CCreature::s_nCtorCount == 3, "Expected CCreature::s_nCtorCount is 3, was: %d\n", CCreature::s_nCtorCount); + ok(CCreature::s_nCtorCount_Default == 2, "Expected CCreature::s_nCtorCount_Default is 2, was: %d\n", CCreature::s_nCtorCount_Default); + ok(CCreature::s_nCCtorCount == 1, "Expected CCreature::s_nCCtorCount is 1, was: %d\n", CCreature::s_nCCtorCount); + ok(CCreature::s_nDtorCount == 1, "Expected CCreature::s_nDtorCount is 1, was: %d\n", CCreature::s_nDtorCount); + ok(CCreature::s_nOpIsCount == 1, "Expected CCreature::s_nOpIsCount is 1, was: %d\n", CCreature::s_nOpIsCount); + + // Default traits does not call anything when relocating objects! + array1.SetCount(100); + + ok(CCreature::s_nCtorCount == 101, "Expected CCreature::s_nCtorCount is 101, was: %d\n", CCreature::s_nCtorCount); + ok(CCreature::s_nCtorCount_Default == 100, "Expected CCreature::s_nCtorCount_Default is 100, was: %d\n", CCreature::s_nCtorCount_Default); + ok(CCreature::s_nCCtorCount == 1, "Expected CCreature::s_nCCtorCount is 1, was: %d\n", CCreature::s_nCCtorCount); + ok(CCreature::s_nDtorCount == 1, "Expected CCreature::s_nDtorCount is 1, was: %d\n", CCreature::s_nDtorCount); + ok(CCreature::s_nOpIsCount == 1, "Expected CCreature::s_nOpIsCount is 1, was: %d\n", CCreature::s_nOpIsCount); + + // Does not compile: + //CAtlArray<CCreature> array2(array1); + + // Does not compile: + //CAtlArray<CCreature> array2; + //array2 = array1; + } + + // Objects are cleaned up when the list goes away + ok(CCreature::s_nCtorCount == 101, "Expected CCreature::s_nCtorCount is 101, was: %d\n", CCreature::s_nCtorCount); + ok(CCreature::s_nCtorCount_Default == 100, "Expected CCreature::s_nCtorCount_Default is 100, was: %d\n", CCreature::s_nCtorCount_Default); + ok(CCreature::s_nCCtorCount == 1, "Expected CCreature::s_nCCtorCount is 1, was: %d\n", CCreature::s_nCCtorCount); + ok(CCreature::s_nDtorCount == 102, "Expected CCreature::s_nDtorCount is 102, was: %d\n", CCreature::s_nDtorCount); + ok(CCreature::s_nOpIsCount == 1, "Expected CCreature::s_nOpIsCount is 1, was: %d\n", CCreature::s_nOpIsCount); + +#ifndef HAVE_APITEST + printf("CAtlArray: %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/devenv/ATLTest.sln b/modules/rostests/apitests/atl/devenv/ATLTest.sln index 044cdd3c3ad..bfb2408196e 100644 --- a/modules/rostests/apitests/atl/devenv/ATLTest.sln +++ b/modules/rostests/apitests/atl/devenv/ATLTest.sln @@ -17,6 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CComQIPtr", "CComQIPtr.vcxp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CAtlFileMapping", "CAtlFile.vcxproj", "{3AE82A8E-D43D-41F6-8093-9C687283FAB6}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CAtlArray", "CAtlArray.vcxproj", "{E3DB2078-6AE9-463E-830F-36C03FFE5DC3}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CAtlList", "CAtlList.vcxproj", "{00C3325D-0E3D-43F1-92C8-F7D5C32F70C6}" EndProject Global @@ -83,6 +85,14 @@ Global {3AE82A8E-D43D-41F6-8093-9C687283FAB6}.Release|x64.Build.0 = Release|x64 {3AE82A8E-D43D-41F6-8093-9C687283FAB6}.Release|x86.ActiveCfg = Release|Win32 {3AE82A8E-D43D-41F6-8093-9C687283FAB6}.Release|x86.Build.0 = Release|Win32 + {E3DB2078-6AE9-463E-830F-36C03FFE5DC3}.Debug|x64.ActiveCfg = Debug|x64 + {E3DB2078-6AE9-463E-830F-36C03FFE5DC3}.Debug|x64.Build.0 = Debug|x64 + {E3DB2078-6AE9-463E-830F-36C03FFE5DC3}.Debug|x86.ActiveCfg = Debug|Win32 + {E3DB2078-6AE9-463E-830F-36C03FFE5DC3}.Debug|x86.Build.0 = Debug|Win32 + {E3DB2078-6AE9-463E-830F-36C03FFE5DC3}.Release|x64.ActiveCfg = Release|x64 + {E3DB2078-6AE9-463E-830F-36C03FFE5DC3}.Release|x64.Build.0 = Release|x64 + {E3DB2078-6AE9-463E-830F-36C03FFE5DC3}.Release|x86.ActiveCfg = Release|Win32 + {E3DB2078-6AE9-463E-830F-36C03FFE5DC3}.Release|x86.Build.0 = Release|Win32 {00C3325D-0E3D-43F1-92C8-F7D5C32F70C6}.Debug|x64.ActiveCfg = Debug|x64 {00C3325D-0E3D-43F1-92C8-F7D5C32F70C6}.Debug|x64.Build.0 = Debug|x64 {00C3325D-0E3D-43F1-92C8-F7D5C32F70C6}.Debug|x86.ActiveCfg = Debug|Win32 diff --git a/modules/rostests/apitests/atl/devenv/CAtlArray.vcxproj b/modules/rostests/apitests/atl/devenv/CAtlArray.vcxproj new file mode 100644 index 00000000000..665928a42b1 --- /dev/null +++ b/modules/rostests/apitests/atl/devenv/CAtlArray.vcxproj @@ -0,0 +1,180 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{E3DB2078-6AE9-463E-830F-36C03FFE5DC3}</ProjectGuid> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <Keyword>AtlProj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="../CAtlArray.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> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MultiThreadedDebug</RuntimeLibrary> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader> + </ClCompile> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file

5 years, 4 months

[reactos] 02/04: [ATL_APITEST] Change proj files to have a different intermediate dir

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29c0b93a0a0e864521f99… commit 29c0b93a0a0e864521f99f939bcf1cb376ac1804 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Aug 9 21:24:33 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Aug 11 21:46:06 2019 +0200 [ATL_APITEST] Change proj files to have a different intermediate dir --- modules/rostests/apitests/atl/devenv/CAtlFile.vcxproj | 4 ++++ modules/rostests/apitests/atl/devenv/CAtlList.vcxproj | 4 ++++ modules/rostests/apitests/atl/devenv/CComObject.vcxproj | 4 ++++ modules/rostests/apitests/atl/devenv/CComQIPtr.vcxproj | 4 ++++ modules/rostests/apitests/atl/devenv/CImage.vcxproj | 4 ++++ modules/rostests/apitests/atl/devenv/CSimpleArray.vcxproj | 4 ++++ modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj | 4 ++++ modules/rostests/apitests/atl/devenv/CString.vcxproj | 4 ++++ 8 files changed, 32 insertions(+) diff --git a/modules/rostests/apitests/atl/devenv/CAtlFile.vcxproj b/modules/rostests/apitests/atl/devenv/CAtlFile.vcxproj index e6214597f6e..d331954b8a7 100644 --- a/modules/rostests/apitests/atl/devenv/CAtlFile.vcxproj +++ b/modules/rostests/apitests/atl/devenv/CAtlFile.vcxproj @@ -73,18 +73,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> diff --git a/modules/rostests/apitests/atl/devenv/CAtlList.vcxproj b/modules/rostests/apitests/atl/devenv/CAtlList.vcxproj index 7bcb1c8299b..7f1488c935c 100644 --- a/modules/rostests/apitests/atl/devenv/CAtlList.vcxproj +++ b/modules/rostests/apitests/atl/devenv/CAtlList.vcxproj @@ -69,18 +69,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> diff --git a/modules/rostests/apitests/atl/devenv/CComObject.vcxproj b/modules/rostests/apitests/atl/devenv/CComObject.vcxproj index ea8c77d5f19..cede9a5b852 100644 --- a/modules/rostests/apitests/atl/devenv/CComObject.vcxproj +++ b/modules/rostests/apitests/atl/devenv/CComObject.vcxproj @@ -69,18 +69,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> diff --git a/modules/rostests/apitests/atl/devenv/CComQIPtr.vcxproj b/modules/rostests/apitests/atl/devenv/CComQIPtr.vcxproj index ffb3bbcb0da..e9bf1052dfa 100644 --- a/modules/rostests/apitests/atl/devenv/CComQIPtr.vcxproj +++ b/modules/rostests/apitests/atl/devenv/CComQIPtr.vcxproj @@ -69,18 +69,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> diff --git a/modules/rostests/apitests/atl/devenv/CImage.vcxproj b/modules/rostests/apitests/atl/devenv/CImage.vcxproj index 88298e542b7..0195e954a97 100644 --- a/modules/rostests/apitests/atl/devenv/CImage.vcxproj +++ b/modules/rostests/apitests/atl/devenv/CImage.vcxproj @@ -69,18 +69,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> diff --git a/modules/rostests/apitests/atl/devenv/CSimpleArray.vcxproj b/modules/rostests/apitests/atl/devenv/CSimpleArray.vcxproj index 57b074d139f..2a6f932885f 100644 --- a/modules/rostests/apitests/atl/devenv/CSimpleArray.vcxproj +++ b/modules/rostests/apitests/atl/devenv/CSimpleArray.vcxproj @@ -69,18 +69,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> diff --git a/modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj b/modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj index 0926e8c8b10..3459ae3c3ea 100644 --- a/modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj +++ b/modules/rostests/apitests/atl/devenv/CSimpleMap.vcxproj @@ -69,18 +69,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> diff --git a/modules/rostests/apitests/atl/devenv/CString.vcxproj b/modules/rostests/apitests/atl/devenv/CString.vcxproj index 0aa91ae4ee1..91a3ca4f824 100644 --- a/modules/rostests/apitests/atl/devenv/CString.vcxproj +++ b/modules/rostests/apitests/atl/devenv/CString.vcxproj @@ -69,18 +69,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <IgnoreImportLibrary>true</IgnoreImportLibrary> <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile>

5 years, 4 months

[reactos] 01/04: [ATL][ATL_APITEST] Add CAtlList::InsertBefore/After + test

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae69b1fda2a1791fc5c77… commit ae69b1fda2a1791fc5c77bcb30b50a7c8b6fae08 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Aug 9 19:14:43 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Aug 11 21:45:56 2019 +0200 [ATL][ATL_APITEST] Add CAtlList::InsertBefore/After + test --- modules/rostests/apitests/atl/CAtlList.cpp | 81 ++++++++++ modules/rostests/apitests/atl/CMakeLists.txt | 1 + modules/rostests/apitests/atl/devenv/ATLTest.sln | 10 ++ .../rostests/apitests/atl/devenv/CAtlList.vcxproj | 176 +++++++++++++++++++++ modules/rostests/apitests/atl/testlist.c | 2 + sdk/lib/atl/atlcoll.h | 48 ++++++ 6 files changed, 318 insertions(+) diff --git a/modules/rostests/apitests/atl/CAtlList.cpp b/modules/rostests/apitests/atl/CAtlList.cpp new file mode 100644 index 00000000000..eb8cb761620 --- /dev/null +++ b/modules/rostests/apitests/atl/CAtlList.cpp @@ -0,0 +1,81 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for CAtlList + * COPYRIGHT: Copyright 2016-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + * Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#ifdef HAVE_APITEST + #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 + +#include <atlbase.h> +#include <atlcoll.h> + + +START_TEST(CAtlList) +{ + CAtlList<int> list1; + + ok(list1.GetCount() == 0, "Expected list1's size is zero, was %d\n", list1.GetCount()); + list1.AddTail(56); + ok(list1.GetCount() == 1, "Expected list1's size is 1, was %d\n", list1.GetCount()); + POSITION head = list1.AddHead(12); + ok(list1.GetCount() == 2, "Expected list1's size is 2, was %d\n", list1.GetCount()); + POSITION tail = list1.AddTail(90); + ok(list1.GetCount() == 3, "Expected list1's size is 3, was %d\n", list1.GetCount()); + + list1.InsertBefore(head, -123); + list1.InsertAfter(head, 34); // no longer head, but the POSITION should still be valid.. + + list1.InsertBefore(tail, 78); + list1.InsertAfter(tail, -44); + + int expected[] = {-123, 12, 34, 56, 78, 90, -44 }; + int expected_size = sizeof(expected) / sizeof(expected[0]); + int index = 0; + POSITION it = list1.GetHeadPosition(); + while (it != NULL) + { + ok(index < expected_size, "Too many items, expected %d, got %d!\n", expected_size, (index+1)); + int value = list1.GetNext(it); + if (index < expected_size) + { + ok(value == expected[index], "Wrong value, got %d, expected %d\n", value, expected[index]); + } + else + { + ok(0, "Extra value: %d\n", value); + } + index++; + } + ok(it == NULL, "it does still point to something!\n"); + +#ifndef HAVE_APITEST + printf("CAtlList: %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 8055fffc456..7ff83d6691d 100644 --- a/modules/rostests/apitests/atl/CMakeLists.txt +++ b/modules/rostests/apitests/atl/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) list(APPEND SOURCE atltypes.cpp CAtlFileMapping.cpp + CAtlList.cpp CComBSTR.cpp CComHeapPtr.cpp CComObject.cpp diff --git a/modules/rostests/apitests/atl/devenv/ATLTest.sln b/modules/rostests/apitests/atl/devenv/ATLTest.sln index 0244f719801..044cdd3c3ad 100644 --- a/modules/rostests/apitests/atl/devenv/ATLTest.sln +++ b/modules/rostests/apitests/atl/devenv/ATLTest.sln @@ -17,6 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CComQIPtr", "CComQIPtr.vcxp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CAtlFileMapping", "CAtlFile.vcxproj", "{3AE82A8E-D43D-41F6-8093-9C687283FAB6}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CAtlList", "CAtlList.vcxproj", "{00C3325D-0E3D-43F1-92C8-F7D5C32F70C6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -81,6 +83,14 @@ Global {3AE82A8E-D43D-41F6-8093-9C687283FAB6}.Release|x64.Build.0 = Release|x64 {3AE82A8E-D43D-41F6-8093-9C687283FAB6}.Release|x86.ActiveCfg = Release|Win32 {3AE82A8E-D43D-41F6-8093-9C687283FAB6}.Release|x86.Build.0 = Release|Win32 + {00C3325D-0E3D-43F1-92C8-F7D5C32F70C6}.Debug|x64.ActiveCfg = Debug|x64 + {00C3325D-0E3D-43F1-92C8-F7D5C32F70C6}.Debug|x64.Build.0 = Debug|x64 + {00C3325D-0E3D-43F1-92C8-F7D5C32F70C6}.Debug|x86.ActiveCfg = Debug|Win32 + {00C3325D-0E3D-43F1-92C8-F7D5C32F70C6}.Debug|x86.Build.0 = Debug|Win32 + {00C3325D-0E3D-43F1-92C8-F7D5C32F70C6}.Release|x64.ActiveCfg = Release|x64 + {00C3325D-0E3D-43F1-92C8-F7D5C32F70C6}.Release|x64.Build.0 = Release|x64 + {00C3325D-0E3D-43F1-92C8-F7D5C32F70C6}.Release|x86.ActiveCfg = Release|Win32 + {00C3325D-0E3D-43F1-92C8-F7D5C32F70C6}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/modules/rostests/apitests/atl/devenv/CAtlList.vcxproj b/modules/rostests/apitests/atl/devenv/CAtlList.vcxproj new file mode 100644 index 00000000000..7bcb1c8299b --- /dev/null +++ b/modules/rostests/apitests/atl/devenv/CAtlList.vcxproj @@ -0,0 +1,176 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{00C3325D-0E3D-43F1-92C8-F7D5C32F70C6}</ProjectGuid> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <Keyword>AtlProj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="../CAtlList.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> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MultiThreadedDebug</RuntimeLibrary> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader> + </ClCompile> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file diff --git a/modules/rostests/apitests/atl/testlist.c b/modules/rostests/apitests/atl/testlist.c index 0fa460898a5..73546673240 100644 --- a/modules/rostests/apitests/atl/testlist.c +++ b/modules/rostests/apitests/atl/testlist.c @@ -3,6 +3,7 @@ extern void func_atltypes(void); extern void func_CAtlFileMapping(void); +extern void func_CAtlList(void); extern void func_CComBSTR(void); extern void func_CComHeapPtr(void); extern void func_CComObject(void); @@ -18,6 +19,7 @@ const struct test winetest_testlist[] = { { "atltypes", func_atltypes }, { "CAtlFileMapping", func_CAtlFileMapping }, + { "CAtlList", func_CAtlList }, { "CComBSTR", func_CComBSTR }, { "CComHeapPtr", func_CComHeapPtr }, { "CComObject", func_CComObject }, diff --git a/sdk/lib/atl/atlcoll.h b/sdk/lib/atl/atlcoll.h index c8b0e7a0531..ae47ff7887f 100644 --- a/sdk/lib/atl/atlcoll.h +++ b/sdk/lib/atl/atlcoll.h @@ -198,6 +198,10 @@ public: E RemoveHead(); E RemoveTail(); + + POSITION InsertBefore(_In_ POSITION pos, INARGTYPE element); + POSITION InsertAfter(_In_ POSITION pos, INARGTYPE element); + void RemoveAll(); void RemoveAt(_In_ POSITION pos); @@ -389,6 +393,50 @@ E CAtlList<E, ETraits>::RemoveTail() return Element; } +template<typename E, class ETraits> +POSITION CAtlList<E, ETraits >::InsertBefore(_In_ POSITION pos, _In_ INARGTYPE element) +{ + if (pos == NULL) + return AddHead(element); + + CNode* OldNode = (CNode*)pos; + CNode* Node = CreateNode(element, OldNode->m_Prev, OldNode); + + if (OldNode->m_Prev != NULL) + { + OldNode->m_Prev->m_Next = Node; + } + else + { + m_HeadNode = Node; + } + OldNode->m_Prev = Node; + + return (POSITION)Node; +} + +template<typename E, class ETraits> +POSITION CAtlList<E, ETraits >::InsertAfter(_In_ POSITION pos, _In_ INARGTYPE element) +{ + if (pos == NULL) + return AddTail(element); + + CNode* OldNode = (CNode*)pos; + CNode* Node = CreateNode(element, OldNode, OldNode->m_Next); + + if (OldNode->m_Next != NULL) + { + OldNode->m_Next->m_Prev = Node; + } + else + { + m_TailNode = Node; + } + OldNode->m_Next = Node; + + return (POSITION)Node; +} + template<typename E, class ETraits> void CAtlList<E, ETraits >::RemoveAll() {

5 years, 4 months

[reactos] 01/01: Addendum to fba4ad4c.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b5fab40c1a913491bba8… commit 7b5fab40c1a913491bba8e88cf2c92dd531e5aa1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 11 22:06:27 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 11 22:06:27 2019 +0200 Addendum to fba4ad4c. --- boot/freeldr/freeldr/include/fs.h | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/freeldr/freeldr/include/fs.h b/boot/freeldr/freeldr/include/fs.h index 5c5fdd4f425..2d774656df6 100644 --- a/boot/freeldr/freeldr/include/fs.h +++ b/boot/freeldr/freeldr/include/fs.h @@ -19,7 +19,6 @@ #pragma once -// FIXME: This one has nothing to do here!! #define SECTOR_SIZE 512 typedef struct tagDEVVTBL

5 years, 4 months

[reactos] 01/01: [FREELDR] Move files where they are only used.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fba4ad4cebd6ebe377683… commit fba4ad4cebd6ebe3776832f81a4eb8e5d113525b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 11 18:56:40 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 11 22:01:36 2019 +0200 [FREELDR] Move files where they are only used. - Merge fade.c/palette.c/video.c into video.c and move it into UI. - Move inffile.c into NTLDR. --- boot/freeldr/freeldr/CMakeLists.txt | 12 +- boot/freeldr/freeldr/{machine.c => arch/arcemul.c} | 0 boot/freeldr/freeldr/arch/i386/machpc.c | 6 + boot/freeldr/freeldr/include/freeldr.h | 6 +- boot/freeldr/freeldr/include/fs.h | 3 + boot/freeldr/freeldr/include/ntldr/winldr.h | 62 ++++++++++ boot/freeldr/freeldr/include/peloader.h | 41 +++++++ boot/freeldr/freeldr/include/ui/video.h | 29 +++++ boot/freeldr/freeldr/include/video.h | 46 -------- boot/freeldr/freeldr/include/winldr.h | 126 --------------------- boot/freeldr/freeldr/{ => lib}/cache/blocklist.c | 0 boot/freeldr/freeldr/{ => lib}/cache/cache.c | 0 boot/freeldr/freeldr/lib/peloader.c | 30 ++--- boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c | 6 +- boot/freeldr/freeldr/ntldr/arch/arm/winldr.c | 1 + boot/freeldr/freeldr/ntldr/arch/i386/winldr.c | 6 +- .../freeldr/{lib/inffile => ntldr}/inffile.c | 30 +---- boot/freeldr/freeldr/{include => ntldr}/inffile.h | 29 +---- boot/freeldr/freeldr/ntldr/setupldr.c | 27 ++--- boot/freeldr/freeldr/ntldr/winldr.c | 25 +--- boot/freeldr/freeldr/ntldr/winldr.h | 56 ++++----- boot/freeldr/freeldr/{video/fade.c => ui/video.c} | 107 +++++++++++------ boot/freeldr/freeldr/video/palette.c | 42 ------- boot/freeldr/freeldr/video/video.c | 45 -------- 24 files changed, 291 insertions(+), 444 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index d4263050ad4..0f6947b3b0d 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -40,6 +40,8 @@ list(APPEND FREELDR_BOOTLIB_SOURCE lib/arcsupp.c lib/debug.c lib/peloader.c + lib/cache/blocklist.c + lib/cache/cache.c lib/comm/rs232.c ## add KD support lib/fs/btrfs.c @@ -64,10 +66,8 @@ list(APPEND FREELDR_NTLDR_SOURCE list(APPEND FREELDR_ARC_SOURCE arcname.c - machine.c + arch/arcemul.c arch/archwsup.c - cache/blocklist.c - cache/cache.c disk/disk.c disk/partition.c disk/ramdisk.c) @@ -89,9 +89,7 @@ list(APPEND FREELDR_BOOTMGR_SOURCE ui/tui.c ui/tuimenu.c ui/ui.c - video/fade.c - video/palette.c - video/video.c) + ui/video.c) list(APPEND FREELDR_BASE_ASM_SOURCE) @@ -226,7 +224,7 @@ list(APPEND FREELDR_BASE_SOURCE ## even if ${FREELDR_NTLDR_SOURCE} is not added, ## otherwise we get linking errors with Rtl**Bitmap** APIs. ## Do not happen on MSVC builds however... - lib/inffile/inffile.c + ntldr/inffile.c lib/rtl/libsupp.c) if(ARCH STREQUAL "i386") diff --git a/boot/freeldr/freeldr/machine.c b/boot/freeldr/freeldr/arch/arcemul.c similarity index 100% rename from boot/freeldr/freeldr/machine.c rename to boot/freeldr/freeldr/arch/arcemul.c diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c b/boot/freeldr/freeldr/arch/i386/machpc.c index 5ec2195638a..0d17add29c6 100644 --- a/boot/freeldr/freeldr/arch/i386/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/machpc.c @@ -1215,6 +1215,12 @@ DetectPS2Mouse(PCONFIGURATION_COMPONENT_DATA BusKey) } } + +// Implemented in i386vid.c, returns the VESA version +USHORT BiosIsVesaSupported(VOID); +BOOLEAN BiosIsVesaDdcSupported(VOID); +BOOLEAN BiosVesaReadEdid(VOID); + static VOID DetectDisplayController(PCONFIGURATION_COMPONENT_DATA BusKey) { diff --git a/boot/freeldr/freeldr/include/freeldr.h b/boot/freeldr/freeldr/include/freeldr.h index 841fd4c64ee..67966616442 100644 --- a/boot/freeldr/freeldr/include/freeldr.h +++ b/boot/freeldr/freeldr/include/freeldr.h @@ -65,7 +65,6 @@ #include <comm.h> #include <disk.h> #include <fs.h> -#include <inffile.h> #include <inifile.h> #include <keycodes.h> #include <linux.h> @@ -79,11 +78,11 @@ #include <ramdisk.h> #include <ui.h> #include <ver.h> -#include <video.h> /* NTOS loader */ -#include <winldr.h> +#include <include/ntldr/winldr.h> #include <conversion.h> // More-or-less related to MM also... +#include <peloader.h> /* File system headers */ #include <fs/ext2.h> @@ -98,6 +97,7 @@ #include <ui/minitui.h> #include <ui/noui.h> #include <ui/tui.h> +#include <ui/video.h> /* Arch specific includes */ #include <arch/archwsup.h> diff --git a/boot/freeldr/freeldr/include/fs.h b/boot/freeldr/freeldr/include/fs.h index 9c68c791e17..5c5fdd4f425 100644 --- a/boot/freeldr/freeldr/include/fs.h +++ b/boot/freeldr/freeldr/include/fs.h @@ -19,6 +19,9 @@ #pragma once +// FIXME: This one has nothing to do here!! +#define SECTOR_SIZE 512 + typedef struct tagDEVVTBL { ARC_CLOSE Close; diff --git a/boot/freeldr/freeldr/include/ntldr/winldr.h b/boot/freeldr/freeldr/include/ntldr/winldr.h new file mode 100644 index 00000000000..42ee1ba1da1 --- /dev/null +++ b/boot/freeldr/freeldr/include/ntldr/winldr.h @@ -0,0 +1,62 @@ +/* + * PROJECT: FreeLoader + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Windows-compatible NT OS Loader. + * COPYRIGHT: Copyright 2006-2019 Aleksey Bragin <aleksey(a)reactos.org> + */ + +#pragma once + +#include <arc/setupblk.h> + +// See freeldr/ntldr/winldr.h +#define TAG_WLDR_DTE 'eDlW' +#define TAG_WLDR_BDE 'dBlW' +#define TAG_WLDR_NAME 'mNlW' + +// Some definitions + +#include <pshpack1.h> +typedef struct /* Root System Descriptor Pointer */ +{ + CHAR signature [8]; /* contains "RSD PTR " */ + UCHAR checksum; /* to make sum of struct == 0 */ + CHAR oem_id [6]; /* OEM identification */ + UCHAR revision; /* Must be 0 for 1.0, 2 for 2.0 */ + ULONG rsdt_physical_address; /* 32-bit physical address of RSDT */ + ULONG length; /* XSDT Length in bytes including hdr */ + ULONGLONG xsdt_physical_address; /* 64-bit physical address of XSDT */ + UCHAR extended_checksum; /* Checksum of entire table */ + CHAR reserved [3]; /* reserved field must be 0 */ +} RSDP_DESCRIPTOR, *PRSDP_DESCRIPTOR; +#include <poppack.h> + +typedef struct _ARC_DISK_SIGNATURE_EX +{ + ARC_DISK_SIGNATURE DiskSignature; + CHAR ArcName[MAX_PATH]; +} ARC_DISK_SIGNATURE_EX, *PARC_DISK_SIGNATURE_EX; + +//////////////////////////////////////////////////////////////////////////////// +// +// ReactOS Loading Functions +// +//////////////////////////////////////////////////////////////////////////////// + +ARC_STATUS +LoadAndBootWindows( + IN ULONG Argc, + IN PCHAR Argv[], + IN PCHAR Envp[]); + +ARC_STATUS +LoadReactOSSetup( + IN ULONG Argc, + IN PCHAR Argv[], + IN PCHAR Envp[]); + + +// conversion.c and conversion.h +PVOID VaToPa(PVOID Va); +PVOID PaToVa(PVOID Pa); +VOID List_PaToVa(_In_ LIST_ENTRY *ListEntry); diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h new file mode 100644 index 00000000000..9d4b1178819 --- /dev/null +++ b/boot/freeldr/freeldr/include/peloader.h @@ -0,0 +1,41 @@ +/* + * PROJECT: FreeLoader + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Provides routines for loading PE files. + * (Deprecated remark) To be merged with arch/i386/loader.c in future. + * + * COPYRIGHT: Copyright 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright 2006-2019 Aleksey Bragin <aleksey(a)reactos.org> + * + * NOTES: The source code in this file is based on the work of respective + * authors of PE loading code in ReactOS and Brian Palmer and + * Alex Ionescu's arch/i386/loader.c, and my research project + * (creating a native EFI loader for Windows). + * + * This article was very handy during development: + * http://msdn.microsoft.com/msdnmag/issues/02/03/PE2/ + */ + +#pragma once + +BOOLEAN +WinLdrLoadImage(IN PCHAR FileName, + TYPE_OF_MEMORY MemoryType, + OUT PVOID *ImageBasePA); + +BOOLEAN +WinLdrAllocateDataTableEntry(IN OUT PLIST_ENTRY ModuleListHead, + IN PCCH BaseDllName, + IN PCCH FullDllName, + IN PVOID BasePA, + OUT PLDR_DATA_TABLE_ENTRY *NewEntry); + +BOOLEAN +WinLdrScanImportDescriptorTable(IN OUT PLIST_ENTRY ModuleListHead, + IN PCCH DirectoryPath, + IN PLDR_DATA_TABLE_ENTRY ScanDTE); + +BOOLEAN +WinLdrCheckForLoadedDll(IN OUT PLIST_ENTRY ModuleListHead, + IN PCH DllName, + OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry); diff --git a/boot/freeldr/freeldr/include/ui/video.h b/boot/freeldr/freeldr/include/ui/video.h new file mode 100644 index 00000000000..0e0f4ec3828 --- /dev/null +++ b/boot/freeldr/freeldr/include/ui/video.h @@ -0,0 +1,29 @@ +/* + * PROJECT: FreeLoader + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: UI Video helpers for special effects. + * COPYRIGHT: Copyright 1998-2003 Brian Palmer <brianp(a)sginet.com> + */ + +#pragma once + +#include <pshpack1.h> +typedef struct _PALETTE_ENTRY +{ + UCHAR Red; + UCHAR Green; + UCHAR Blue; +} PALETTE_ENTRY, *PPALETTE_ENTRY; +#include <poppack.h> + +// extern PVOID VideoOffScreenBuffer; + +PVOID VideoAllocateOffScreenBuffer(VOID); // Returns a pointer to an off-screen buffer sufficient for the current video mode +VOID VideoCopyOffScreenBufferToVRAM(VOID); + +VOID VideoSavePaletteState(PPALETTE_ENTRY Palette, ULONG ColorCount); +VOID VideoRestorePaletteState(PPALETTE_ENTRY Palette, ULONG ColorCount); + +VOID VideoSetAllColorsToBlack(ULONG ColorCount); +VOID VideoFadeIn(PPALETTE_ENTRY Palette, ULONG ColorCount); +VOID VideoFadeOut(ULONG ColorCount); diff --git a/boot/freeldr/freeldr/include/video.h b/boot/freeldr/freeldr/include/video.h deleted file mode 100644 index 6162a47ecf9..00000000000 --- a/boot/freeldr/freeldr/include/video.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -#include <pshpack1.h> -typedef struct -{ - UCHAR Red; - UCHAR Green; - UCHAR Blue; -} PALETTE_ENTRY, *PPALETTE_ENTRY; -#include <poppack.h> - -extern PVOID VideoOffScreenBuffer; - -USHORT BiosIsVesaSupported(VOID); // Implemented in i386vid.c, returns the VESA version -BOOLEAN BiosIsVesaDdcSupported(VOID); -BOOLEAN BiosVesaReadEdid(VOID); - -PVOID VideoAllocateOffScreenBuffer(VOID); // Returns a pointer to an off-screen buffer sufficient for the current video mode - -VOID VideoCopyOffScreenBufferToVRAM(VOID); - -VOID VideoSavePaletteState(PPALETTE_ENTRY Palette, ULONG ColorCount); -VOID VideoRestorePaletteState(PPALETTE_ENTRY Palette, ULONG ColorCount); - -VOID VideoSetAllColorsToBlack(ULONG ColorCount); -VOID VideoFadeIn(PPALETTE_ENTRY Palette, ULONG ColorCount); -VOID VideoFadeOut(ULONG ColorCount); diff --git a/boot/freeldr/freeldr/include/winldr.h b/boot/freeldr/freeldr/include/winldr.h deleted file mode 100644 index 7bd4b581f05..00000000000 --- a/boot/freeldr/freeldr/include/winldr.h +++ /dev/null @@ -1,126 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * Copyright (C) 2006 Aleksey Bragin <aleksey(a)reactos.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -#include <arc/setupblk.h> - -// See freeldr/ntldr/winldr.h -#define TAG_WLDR_DTE 'eDlW' -#define TAG_WLDR_BDE 'dBlW' -#define TAG_WLDR_NAME 'mNlW' - - -// Some definitions - -// FIXME: This one has nothing to do here!! -#define SECTOR_SIZE 512 - -// Descriptors -#define NUM_GDT 128 // Must be 128 -#define NUM_IDT 0x100 // Only 16 are used though. Must be 0x100 - -#include <pshpack1.h> -typedef struct /* Root System Descriptor Pointer */ -{ - CHAR signature [8]; /* contains "RSD PTR " */ - UCHAR checksum; /* to make sum of struct == 0 */ - CHAR oem_id [6]; /* OEM identification */ - UCHAR revision; /* Must be 0 for 1.0, 2 for 2.0 */ - ULONG rsdt_physical_address; /* 32-bit physical address of RSDT */ - ULONG length; /* XSDT Length in bytes including hdr */ - ULONGLONG xsdt_physical_address; /* 64-bit physical address of XSDT */ - UCHAR extended_checksum; /* Checksum of entire table */ - CHAR reserved [3]; /* reserved field must be 0 */ -} RSDP_DESCRIPTOR, *PRSDP_DESCRIPTOR; -#include <poppack.h> - -typedef struct _ARC_DISK_SIGNATURE_EX -{ - ARC_DISK_SIGNATURE DiskSignature; - CHAR ArcName[MAX_PATH]; -} ARC_DISK_SIGNATURE_EX, *PARC_DISK_SIGNATURE_EX; - -//////////////////////////////////////////////////////////////////////////////// -// -// ReactOS Loading Functions -// -//////////////////////////////////////////////////////////////////////////////// - -ARC_STATUS -LoadAndBootWindows( - IN ULONG Argc, - IN PCHAR Argv[], - IN PCHAR Envp[]); - -ARC_STATUS -LoadReactOSSetup( - IN ULONG Argc, - IN PCHAR Argv[], - IN PCHAR Envp[]); - - -// conversion.c and conversion.h -PVOID VaToPa(PVOID Va); -PVOID PaToVa(PVOID Pa); -VOID List_PaToVa(_In_ LIST_ENTRY *ListEntry); - - -// peloader.c -BOOLEAN -WinLdrLoadImage(IN PCHAR FileName, - TYPE_OF_MEMORY MemoryType, - OUT PVOID *ImageBasePA); - -BOOLEAN -WinLdrAllocateDataTableEntry(IN OUT PLIST_ENTRY ModuleListHead, - IN PCCH BaseDllName, - IN PCCH FullDllName, - IN PVOID BasePA, - OUT PLDR_DATA_TABLE_ENTRY *NewEntry); - -BOOLEAN -WinLdrScanImportDescriptorTable(IN OUT PLIST_ENTRY ModuleListHead, - IN PCCH DirectoryPath, - IN PLDR_DATA_TABLE_ENTRY ScanDTE); - -BOOLEAN -WinLdrCheckForLoadedDll(IN OUT PLIST_ENTRY ModuleListHead, - IN PCH DllName, - OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry); - - -// arch/xxx/winldr.c -BOOLEAN -MempSetupPaging(IN PFN_NUMBER StartPage, - IN PFN_NUMBER NumberOfPages, - IN BOOLEAN KernelMapping); - -VOID -MempUnmapPage(PFN_NUMBER Page); - -VOID -MempDump(VOID); - -VOID -WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock); - -VOID -WinLdrSetProcessorContext(VOID); diff --git a/boot/freeldr/freeldr/cache/blocklist.c b/boot/freeldr/freeldr/lib/cache/blocklist.c similarity index 100% rename from boot/freeldr/freeldr/cache/blocklist.c rename to boot/freeldr/freeldr/lib/cache/blocklist.c diff --git a/boot/freeldr/freeldr/cache/cache.c b/boot/freeldr/freeldr/lib/cache/cache.c similarity index 100% rename from boot/freeldr/freeldr/cache/cache.c rename to boot/freeldr/freeldr/lib/cache/cache.c diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 7f913f1c8d6..cf90eb851e7 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -1,27 +1,30 @@ /* - * PROJECT: FreeLoader - * LICENSE: GPL - See COPYING in the top level directory - * FILE: boot/freeldr/freeldr/windows/peloader.c - * PURPOSE: Provides routines for loading PE files. - * (Deprecated remark) To be merged with arch/i386/loader.c in future. + * PROJECT: FreeLoader + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Provides routines for loading PE files. + * (Deprecated remark) To be merged with arch/i386/loader.c in future. * - * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + * COPYRIGHT: Copyright 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright 2006-2019 Aleksey Bragin <aleksey(a)reactos.org> * - * The source code in this file is based on the work of respective - * authors of PE loading code in ReactOS and Brian Palmer and - * Alex Ionescu's arch/i386/loader.c, and my research project - * (creating a native EFI loader for Windows). + * NOTES: The source code in this file is based on the work of respective + * authors of PE loading code in ReactOS and Brian Palmer and + * Alex Ionescu's arch/i386/loader.c, and my research project + * (creating a native EFI loader for Windows). * - * NOTE: This article was very handy during development: - * http://msdn.microsoft.com/msdnmag/issues/02/03/PE2/ + * This article was very handy during development: + * http://msdn.microsoft.com/msdnmag/issues/02/03/PE2/ */ /* INCLUDES ***************************************************************/ + #include <freeldr.h> #include <debug.h> DBG_DEFAULT_CHANNEL(PELOADER); +/* FUNCTIONS **************************************************************/ + static BOOLEAN WinLdrpCompareDllName(IN PCH DllName, IN PUNICODE_STRING UnicodeName); @@ -50,9 +53,6 @@ WinLdrpScanImportAddressTable(IN OUT PLIST_ENTRY ModuleListHead, IN PCSTR DirectoryPath); - -/* FUNCTIONS **************************************************************/ - /* Returns TRUE if DLL has already been loaded - looks in LoadOrderList in LPB */ BOOLEAN WinLdrCheckForLoadedDll(IN OUT PLIST_ENTRY ModuleListHead, diff --git a/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c b/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c index 784f0e6c5ee..9540c63370a 100644 --- a/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c +++ b/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c @@ -9,14 +9,14 @@ /* INCLUDES ***************************************************************/ #include <freeldr.h> - #include <ndk/asm.h> +#include "../../winldr.h" + #include <debug.h> +DBG_DEFAULT_CHANNEL(WINDOWS); //extern ULONG LoaderPagesSpanned; -DBG_DEFAULT_CHANNEL(WINDOWS); - /* GLOBALS ***************************************************************/ PHARDWARE_PTE PxeBase; diff --git a/boot/freeldr/freeldr/ntldr/arch/arm/winldr.c b/boot/freeldr/freeldr/ntldr/arch/arm/winldr.c index 5ca93f02bd5..0bb69147e37 100644 --- a/boot/freeldr/freeldr/ntldr/arch/arm/winldr.c +++ b/boot/freeldr/freeldr/ntldr/arch/arm/winldr.c @@ -12,6 +12,7 @@ #include <debug.h> #include <internal/arm/mm.h> #include <internal/arm/intrin_i.h> +#include "../../winldr.h" #define PFN_SHIFT 12 #define LARGE_PFN_SHIFT 20 diff --git a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c index 5e289d19dd7..c3917709b32 100644 --- a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c +++ b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c @@ -9,9 +9,11 @@ /* INCLUDES ***************************************************************/ #include <freeldr.h> - #include <ndk/asm.h> +#include "../../winldr.h" + #include <debug.h> +DBG_DEFAULT_CHANNEL(WINDOWS); // This is needed because headers define wrong one for ReactOS #undef KIP0PCRADDRESS @@ -28,8 +30,6 @@ } GDTIDT; #pragma pack(4) -DBG_DEFAULT_CHANNEL(WINDOWS); - /* GLOBALS ***************************************************************/ PHARDWARE_PTE PDE; diff --git a/boot/freeldr/freeldr/lib/inffile/inffile.c b/boot/freeldr/freeldr/ntldr/inffile.c similarity index 96% rename from boot/freeldr/freeldr/lib/inffile/inffile.c rename to boot/freeldr/freeldr/ntldr/inffile.c index 3ca695ee98a..950accbe8a8 100644 --- a/boot/freeldr/freeldr/lib/inffile/inffile.c +++ b/boot/freeldr/freeldr/ntldr/inffile.c @@ -1,33 +1,15 @@ /* - * ReactOS kernel - * Copyright (C) 2002,2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: boot/freeldr/freeldr/lib/inffile/inffile.c - * PURPOSE: INF file parser that caches contents of INF file in memory - * PROGRAMMER: Royce Mitchell III - * Eric Kohl + * PROJECT: FreeLoader + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: INF file parser that caches contents of INF file in memory. + * COPYRIGHT: Copyright 2002-2006 Royce Mitchell III + * Copyright 2003-2019 Eric Kohl */ /* INCLUDES *****************************************************************/ #include <freeldr.h> +#include "inffile.h" #define CONTROL_Z '\x1a' #define MAX_SECTION_NAME_LEN 255 diff --git a/boot/freeldr/freeldr/include/inffile.h b/boot/freeldr/freeldr/ntldr/inffile.h similarity index 64% rename from boot/freeldr/freeldr/include/inffile.h rename to boot/freeldr/freeldr/ntldr/inffile.h index 766f0125c70..be1ae482340 100644 --- a/boot/freeldr/freeldr/include/inffile.h +++ b/boot/freeldr/freeldr/ntldr/inffile.h @@ -1,28 +1,9 @@ /* - * ReactOS kernel - * Copyright (C) 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: boot/freeldr/freeldr/include/inffile.h - * PURPOSE: INF file parser that caches contents of INF file in memory - * PROGRAMMER: Royce Mitchell III - * Eric Kohl + * PROJECT: FreeLoader + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: INF file parser that caches contents of INF file in memory. + * COPYRIGHT: Copyright 2002-2006 Royce Mitchell III + * Copyright 2003-2019 Eric Kohl */ #pragma once diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 95c70acb347..c1836fff223 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -1,32 +1,19 @@ /* - * FreeLoader - * - * Copyright (C) 2009 Aleksey Bragin <aleksey(a)reactos.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: FreeLoader + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Windows-compatible NT OS Setup Loader. + * COPYRIGHT: Copyright 2009-2019 Aleksey Bragin <aleksey(a)reactos.org> */ #include <freeldr.h> -#include "winldr.h" - #include <ndk/ldrtypes.h> #include <arc/setupblk.h> +#include "winldr.h" +#include "inffile.h" #include <debug.h> - DBG_DEFAULT_CHANNEL(WINDOWS); + #define TAG_BOOT_OPTIONS 'pOtB' // TODO: Move to .h diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index e68a6027e86..b114adbef27 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -1,30 +1,15 @@ /* - * FreeLoader - * - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * Copyright (C) 2006 Aleksey Bragin <aleksey(a)reactos.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: FreeLoader + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Windows-compatible NT OS Loader. + * COPYRIGHT: Copyright 2006-2019 Aleksey Bragin <aleksey(a)reactos.org> */ #include <freeldr.h> +#include <ndk/ldrtypes.h> #include "winldr.h" #include "registry.h" -#include <ndk/ldrtypes.h> - #include <debug.h> DBG_DEFAULT_CHANNEL(WINDOWS); diff --git a/boot/freeldr/freeldr/ntldr/winldr.h b/boot/freeldr/freeldr/ntldr/winldr.h index 0471775304c..a2af29ff5a3 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.h +++ b/boot/freeldr/freeldr/ntldr/winldr.h @@ -1,47 +1,23 @@ /* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * Copyright (C) 2006 Aleksey Bragin <aleksey(a)reactos.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: FreeLoader + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Windows-compatible NT OS Loader. + * COPYRIGHT: Copyright 2006-2019 Aleksey Bragin <aleksey(a)reactos.org> */ #pragma once #include <arc/setupblk.h> -#if 0 -// See freeldr/include/winldr.h -#define TAG_WLDR_DTE 'eDlW' -#define TAG_WLDR_BDE 'dBlW' -#define TAG_WLDR_NAME 'mNlW' - -#endif - /* Entry-point to kernel */ typedef VOID (NTAPI *KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock); - -// Some definitions - -#if 0 - -// Descriptors +/* Descriptors */ #define NUM_GDT 128 // Must be 128 #define NUM_IDT 0x100 // Only 16 are used though. Must be 0x100 +#if 0 + #include <pshpack1.h> typedef struct /* Root System Descriptor Pointer */ { @@ -149,3 +125,21 @@ LoadAndBootWindowsCommon( PCSTR BootOptions, PCSTR BootPath, BOOLEAN Setup); + +VOID +WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock); + +VOID +WinLdrSetProcessorContext(VOID); + +// arch/xxx/winldr.c +BOOLEAN +MempSetupPaging(IN PFN_NUMBER StartPage, + IN PFN_NUMBER NumberOfPages, + IN BOOLEAN KernelMapping); + +VOID +MempUnmapPage(PFN_NUMBER Page); + +VOID +MempDump(VOID); diff --git a/boot/freeldr/freeldr/video/fade.c b/boot/freeldr/freeldr/ui/video.c similarity index 56% rename from boot/freeldr/freeldr/video/fade.c rename to boot/freeldr/freeldr/ui/video.c index 439718ab5d4..d44f8ee1eed 100644 --- a/boot/freeldr/freeldr/video/fade.c +++ b/boot/freeldr/freeldr/ui/video.c @@ -1,35 +1,72 @@ /* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: FreeLoader + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: UI Video helpers for special effects. + * COPYRIGHT: Copyright 1998-2003 Brian Palmer <brianp(a)sginet.com> */ + #ifndef _M_ARM #include <freeldr.h> -#define RGB_MAX 64 -#define RGB_MAX_PER_ITERATION 64 -#define TAG_PALETTE_COLORS 'claP' +#define RGB_MAX 64 +#define RGB_MAX_PER_ITERATION 64 +#define TAG_PALETTE_COLORS 'claP' + +static PVOID VideoOffScreenBuffer = NULL; + +PVOID VideoAllocateOffScreenBuffer(VOID) +{ + ULONG BufferSize; + + if (VideoOffScreenBuffer != NULL) + { + MmFreeMemory(VideoOffScreenBuffer); + VideoOffScreenBuffer = NULL; + } + + BufferSize = MachVideoGetBufferSize(); + + VideoOffScreenBuffer = MmAllocateMemoryWithType(BufferSize, LoaderFirmwareTemporary); + + return VideoOffScreenBuffer; +} + +VOID VideoCopyOffScreenBufferToVRAM(VOID) +{ + MachVideoCopyOffScreenBufferToVRAM(VideoOffScreenBuffer); +} + + +VOID VideoSavePaletteState(PPALETTE_ENTRY Palette, ULONG ColorCount) +{ + ULONG Color; + + for (Color = 0; Color < ColorCount; Color++) + { + MachVideoGetPaletteColor((UCHAR)Color, &Palette[Color].Red, &Palette[Color].Green, &Palette[Color].Blue); + } +} + +VOID VideoRestorePaletteState(PPALETTE_ENTRY Palette, ULONG ColorCount) +{ + ULONG Color; + + MachVideoSync(); + + for (Color = 0; Color < ColorCount; Color++) + { + MachVideoSetPaletteColor((UCHAR)Color, Palette[Color].Red, Palette[Color].Green, Palette[Color].Blue); + } +} + VOID VideoSetAllColorsToBlack(ULONG ColorCount) { - UCHAR Color; + UCHAR Color; MachVideoSync(); - for (Color=0; Color<ColorCount; Color++) + for (Color = 0; Color < ColorCount; Color++) { MachVideoSetPaletteColor(Color, 0, 0, 0); } @@ -37,17 +74,16 @@ VOID VideoSetAllColorsToBlack(ULONG ColorCount) VOID VideoFadeIn(PPALETTE_ENTRY Palette, ULONG ColorCount) { - ULONG Index; - UCHAR Color; - PPALETTE_ENTRY PaletteColors; + ULONG Index; + UCHAR Color; + PPALETTE_ENTRY PaletteColors; PaletteColors = FrLdrTempAlloc(sizeof(PALETTE_ENTRY) * ColorCount, TAG_PALETTE_COLORS); if (!PaletteColors) return; - for (Index=0; Index<RGB_MAX; Index++) + for (Index = 0; Index < RGB_MAX; Index++) { - - for (Color=0; Color<ColorCount; Color++) + for (Color = 0; Color < ColorCount; Color++) { MachVideoGetPaletteColor(Color, &PaletteColors[Color].Red, &PaletteColors[Color].Green, &PaletteColors[Color].Blue); @@ -81,7 +117,7 @@ VOID VideoFadeIn(PPALETTE_ENTRY Palette, ULONG ColorCount) } // Set the colors - for (Color=0; Color<ColorCount; Color++) + for (Color = 0; Color < ColorCount; Color++) { if ((Color % RGB_MAX_PER_ITERATION) == 0) { @@ -97,15 +133,15 @@ VOID VideoFadeIn(PPALETTE_ENTRY Palette, ULONG ColorCount) VOID VideoFadeOut(ULONG ColorCount) { - ULONG Index; - UCHAR Color; - UCHAR Red; - UCHAR Green; - UCHAR Blue; + ULONG Index; + UCHAR Color; + UCHAR Red; + UCHAR Green; + UCHAR Blue; - for (Index=0; Index<RGB_MAX; Index++) + for (Index = 0; Index < RGB_MAX; Index++) { - for (Color=0; Color<ColorCount; Color++) + for (Color = 0; Color < ColorCount; Color++) { if ((Color % RGB_MAX_PER_ITERATION) == 0) { @@ -131,4 +167,5 @@ VOID VideoFadeOut(ULONG ColorCount) } } } + #endif diff --git a/boot/freeldr/freeldr/video/palette.c b/boot/freeldr/freeldr/video/palette.c deleted file mode 100644 index 5c9d0edf149..00000000000 --- a/boot/freeldr/freeldr/video/palette.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#ifndef _M_ARM -#include <freeldr.h> -VOID VideoSavePaletteState(PPALETTE_ENTRY Palette, ULONG ColorCount) -{ - ULONG Color; - - for (Color=0; Color<ColorCount; Color++) - { - MachVideoGetPaletteColor((UCHAR)Color, &Palette[Color].Red, &Palette[Color].Green, &Palette[Color].Blue); - } -} - -VOID VideoRestorePaletteState(PPALETTE_ENTRY Palette, ULONG ColorCount) -{ - ULONG Color; - - MachVideoSync(); - - for (Color=0; Color<ColorCount; Color++) - { - MachVideoSetPaletteColor((UCHAR)Color, Palette[Color].Red, Palette[Color].Green, Palette[Color].Blue); - } -} -#endif diff --git a/boot/freeldr/freeldr/video/video.c b/boot/freeldr/freeldr/video/video.c deleted file mode 100644 index ef1203edee2..00000000000 --- a/boot/freeldr/freeldr/video/video.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#ifndef _M_ARM -#include <freeldr.h> - -PVOID VideoOffScreenBuffer = NULL; - -PVOID VideoAllocateOffScreenBuffer(VOID) -{ - ULONG BufferSize; - - if (VideoOffScreenBuffer != NULL) - { - MmFreeMemory(VideoOffScreenBuffer); - VideoOffScreenBuffer = NULL; - } - - BufferSize = MachVideoGetBufferSize(); - - VideoOffScreenBuffer = MmAllocateMemoryWithType(BufferSize, LoaderFirmwareTemporary); - - return VideoOffScreenBuffer; -} - -VOID VideoCopyOffScreenBufferToVRAM(VOID) -{ - MachVideoCopyOffScreenBufferToVRAM(VideoOffScreenBuffer); -} -#endif

5 years, 4 months

[reactos] 01/01: [MEDIA][FONTS] Add Arabic MS Sans Serif (ssee1256.fon)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e125297f7f5a61e1ce6db… commit e125297f7f5a61e1ce6dbf6be5b9da4748d71f91 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 11 09:36:39 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Aug 11 09:36:39 2019 +0900 [MEDIA][FONTS] Add Arabic MS Sans Serif (ssee1256.fon) CORE-16166 --- media/fonts/CMakeLists.txt | 1 + media/fonts/ssee1256.fon | Bin 0 -> 71616 bytes 2 files changed, 1 insertion(+) diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 2d24e46f4d8..bc4a5bf3191 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -150,6 +150,7 @@ list(APPEND FONT_FILES SourceCodePro-Semibold.ttf SourceCodePro-SemiboldIt.ttf #ssee1255.fon + #ssee1256.fon #sserife.fon #sserifeg.fon #sserifer.fon diff --git a/media/fonts/ssee1256.fon b/media/fonts/ssee1256.fon new file mode 100644 index 00000000000..1f71c91f261 Binary files /dev/null and b/media/fonts/ssee1256.fon differ

5 years, 4 months

[reactos] 01/01: [WIN32SS][NTUSER] Fix menu drawing after style change (#1821)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b863ecc33f4ef65a80878… commit b863ecc33f4ef65a80878596438a203d50e8e90f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 11 07:46:14 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 11 07:46:14 2019 +0900 [WIN32SS][NTUSER] Fix menu drawing after style change (#1821) There were menu drawing regression after https://github.com/reactos/reactos/commit/03adec81414abb53e589ecd9061042b9c…. This PR will fix it. CORE-16244 - We don't have to draw the frame manually because of WS_EX_DLGMODALFRAME extended style. - We don't need the margins (MENU_TOP_MARGIN and MENU_BOTTOM_MARGIN) in the client area any more because the client area doesn't contain the frame width. - Use GetSystemMetrics(SM_CXDLGFRAME) and GetSystemMetrics(SM_CYDLGFRAME) for frame width. --- win32ss/user/ntuser/menu.c | 45 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index b2e7efe2d2b..ae98cf0f57c 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -70,10 +70,6 @@ BOOL fInEndMenu = FALSE; /* Space between 2 columns */ #define MENU_COL_SPACE 4 -/* top and bottom margins for popup menus */ -#define MENU_TOP_MARGIN 3 -#define MENU_BOTTOM_MARGIN 2 - #define MENU_ITEM_HBMP_SPACE (5) #define MENU_BAR_ITEMS_SPACE (12) #define SEPARATOR_HEIGHT (5) @@ -2023,7 +2019,7 @@ static void FASTCALL MENU_PopupMenuCalcSize(PMENU Menu, PWND WndOwner) NtGdiSelectFont( hdc, ghMenuFont ); start = 0; - maxX = 2 + 1; + maxX = 0; Menu->cxTextAlign = 0; @@ -2033,7 +2029,7 @@ static void FASTCALL MENU_PopupMenuCalcSize(PMENU Menu, PWND WndOwner) orgX = maxX; if( lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK)) orgX += MENU_COL_SPACE; - orgY = MENU_TOP_MARGIN; + orgY = 0; maxTab = maxTabWidth = 0; /* Parse items until column break or end of menu */ @@ -2072,13 +2068,9 @@ static void FASTCALL MENU_PopupMenuCalcSize(PMENU Menu, PWND WndOwner) * of the bitmaps */ if( !textandbmp) Menu->cxTextAlign = 0; - /* space for 3d border */ - Menu->cyMenu += MENU_BOTTOM_MARGIN; - Menu->cxMenu += 2; - /* Adjust popup height if it exceeds maximum */ maxHeight = MENU_GetMaxPopupHeight(Menu); - Menu->iMaxTop = Menu->cyMenu - MENU_TOP_MARGIN; + Menu->iMaxTop = Menu->cyMenu; if (Menu->cyMenu >= maxHeight) { Menu->cyMenu = maxHeight; @@ -2613,19 +2605,12 @@ static void FASTCALL MENU_DrawPopupMenu(PWND wnd, HDC hdc, PMENU menu ) { HPEN hPrevPen; - NtGdiRectangle( hdc, rect.left, rect.top, rect.right, rect.bottom ); + /* FIXME: Maybe we don't have to fill the background manually */ + FillRect(hdc, &rect, brush); hPrevPen = NtGdiSelectPen( hdc, NtGdiGetStockObject( NULL_PEN ) ); if ( hPrevPen ) { - BOOL flat_menu = FALSE; - - UserSystemParametersInfo (SPI_GETFLATMENU, 0, &flat_menu, 0); - if (flat_menu) - FrameRect(hdc, &rect, IntGetSysColorBrush(COLOR_BTNSHADOW)); - else - DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT); - TRACE("hmenu %p Style %08x\n", UserHMGetHandle(menu), (menu->fFlags & MNS_STYLE_MASK)); /* draw menu items */ if (menu && menu->cItems) @@ -2974,8 +2959,8 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl /* adjust popup menu pos so that it fits within the desktop */ - width = menu->cxMenu + UserGetSystemMetrics(SM_CXBORDER); - height = menu->cyMenu + UserGetSystemMetrics(SM_CYBORDER); + width = menu->cxMenu + UserGetSystemMetrics(SM_CXDLGFRAME) * 2; + height = menu->cyMenu + UserGetSystemMetrics(SM_CYDLGFRAME) * 2; if (flags & TPM_LAYOUTRTL) flags ^= TPM_RIGHTALIGN; @@ -3120,7 +3105,7 @@ void MENU_EnsureMenuItemVisible(PMENU lppop, UINT wIndex, HDC hdc) arrow_bitmap_height = gpsi->oembmi[OBI_DNARROW].cy; rc.top += arrow_bitmap_height; - rc.bottom -= arrow_bitmap_height + MENU_BOTTOM_MARGIN; + rc.bottom -= arrow_bitmap_height; nMaxHeight -= UserGetSystemMetrics(SM_CYBORDER) + 2 * arrow_bitmap_height; UserRefObjectCo(pWnd, &Ref); @@ -3131,9 +3116,9 @@ void MENU_EnsureMenuItemVisible(PMENU lppop, UINT wIndex, HDC hdc) MENU_DrawScrollArrows(lppop, hdc); //ERR("Scroll Down iTop %d iMaxTop %d nMaxHeight %d\n",lppop->iTop,lppop->iMaxTop,nMaxHeight); } - else if (item->yItem - MENU_TOP_MARGIN < lppop->iTop) + else if (item->yItem < lppop->iTop) { - lppop->iTop = item->yItem - MENU_TOP_MARGIN; + lppop->iTop = item->yItem; IntScrollWindow(pWnd, 0, nOldPos - lppop->iTop, &rc, &rc); MENU_DrawScrollArrows(lppop, hdc); //ERR("Scroll Up iTop %d iMaxTop %d nMaxHeight %d\n",lppop->iTop,lppop->iMaxTop,nMaxHeight); @@ -3428,13 +3413,11 @@ static PMENU FASTCALL MENU_ShowSubPopup(PWND WndOwner, PMENU Menu, BOOL SelectFi /* The first item in the popup menu has to be at the same y position as the focused menu item */ if(Flags & TPM_LAYOUTRTL) - Rect.left += UserGetSystemMetrics(SM_CXBORDER); + Rect.left += UserGetSystemMetrics(SM_CXDLGFRAME); else - Rect.left += rc.right /*ItemInfo.Rect.right*/ - UserGetSystemMetrics(SM_CXBORDER); - Rect.top += rc.top - MENU_TOP_MARGIN;//3; - Rect.right = rc.left - rc.right + UserGetSystemMetrics(SM_CXBORDER); - Rect.bottom = rc.top - rc.bottom - MENU_TOP_MARGIN - MENU_BOTTOM_MARGIN/*2*/ - - UserGetSystemMetrics(SM_CYBORDER); + Rect.left += rc.right - UserGetSystemMetrics(SM_CXDLGFRAME); + + Rect.top += rc.top; } else {

5 years, 4 months

[reactos] 01/01: [FREELDR] Addendum to 31a3f317.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8823a0c51eeb8b3d72f1e… commit 8823a0c51eeb8b3d72f1e74a2cabc055d4bdbfb9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Aug 10 19:47:49 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 10 19:47:49 2019 +0200 [FREELDR] Addendum to 31a3f317. --- boot/freeldr/freeldr/include/fs.h | 4 ++-- boot/freeldr/freeldr/lib/fs/fs.c | 2 +- boot/freeldr/freeldr/ntldr/winldr.h | 8 ++++---- boot/freeldr/freeldr/ntldr/wlregistry.c | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/boot/freeldr/freeldr/include/fs.h b/boot/freeldr/freeldr/include/fs.h index fc5ad1e22f0..9c68c791e17 100644 --- a/boot/freeldr/freeldr/include/fs.h +++ b/boot/freeldr/freeldr/include/fs.h @@ -26,7 +26,7 @@ typedef struct tagDEVVTBL ARC_OPEN Open; ARC_READ Read; ARC_SEEK Seek; - LPCWSTR ServiceName; + PCWSTR ServiceName; } DEVVTBL; #define MAX_FDS 60 @@ -43,7 +43,7 @@ ULONG FsGetNumPathParts(PCSTR Path); VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path); VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable); -LPCWSTR FsGetServiceName(ULONG FileId); +PCWSTR FsGetServiceName(ULONG FileId); VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific); VOID* FsGetDeviceSpecific(ULONG FileId); ULONG FsGetDeviceId(ULONG FileId); diff --git a/boot/freeldr/freeldr/lib/fs/fs.c b/boot/freeldr/freeldr/lib/fs/fs.c index b4e3113feca..4000b44bd10 100644 --- a/boot/freeldr/freeldr/lib/fs/fs.c +++ b/boot/freeldr/freeldr/lib/fs/fs.c @@ -385,7 +385,7 @@ VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable) InsertHeadList(&DeviceListHead, &pNewEntry->ListEntry); } -LPCWSTR FsGetServiceName(ULONG FileId) +PCWSTR FsGetServiceName(ULONG FileId) { if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) return NULL; diff --git a/boot/freeldr/freeldr/ntldr/winldr.h b/boot/freeldr/freeldr/ntldr/winldr.h index ede9b6423c7..0471775304c 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.h +++ b/boot/freeldr/freeldr/ntldr/winldr.h @@ -112,7 +112,7 @@ WinLdrInitSystemHive( IN BOOLEAN Setup); BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PCSTR DirectoryPath); + IN PCSTR SystemRoot); // winldr.c VOID @@ -129,9 +129,9 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, IN PCSTR LanguageFileName); BOOLEAN WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, - LPWSTR RegistryPath, - LPWSTR ImagePath, - LPWSTR ServiceName); + PWSTR RegistryPath, + PWSTR ImagePath, + PWSTR ServiceName); VOID WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock); diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index e5c36352d4c..1e39ec78961 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -106,7 +106,7 @@ WinLdrLoadSystemHive( Success = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", NULL, - (LPWSTR)FsService); + (PWSTR)FsService); if (!Success) TRACE(" Failed to add filesystem service\n"); } @@ -490,13 +490,13 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, { LONG rc = 0; HKEY hGroupKey, hOrderKey, hServiceKey, hDriverKey; - LPWSTR GroupNameBuffer; + PWSTR GroupNameBuffer; WCHAR ServiceName[256]; ULONG OrderList[128]; ULONG BufferSize; ULONG Index; ULONG TagIndex; - LPWSTR GroupName; + PWSTR GroupName; ULONG ValueSize; ULONG ValueType; @@ -773,9 +773,9 @@ InsertInBootDriverList( BOOLEAN WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, - LPWSTR RegistryPath, - LPWSTR ImagePath, - LPWSTR ServiceName) + PWSTR RegistryPath, + PWSTR ImagePath, + PWSTR ServiceName) { PBOOT_DRIVER_LIST_ENTRY BootDriverEntry; NTSTATUS Status;

5 years, 4 months

[reactos] 02/02: [PROCESSR] Employ usual casing for CurrentControlSet key.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7d13b32261a5eefaae51… commit d7d13b32261a5eefaae517be023d5df8cdf2bd31 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Aug 10 19:14:04 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 10 19:15:38 2019 +0200 [PROCESSR] Employ usual casing for CurrentControlSet key. --- drivers/processor/processr/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/processor/processr/pnp.c b/drivers/processor/processr/pnp.c index c7ff13f54b9..08bcaf9b429 100644 --- a/drivers/processor/processr/pnp.c +++ b/drivers/processor/processr/pnp.c @@ -105,7 +105,7 @@ ProcessorSetFriendlyName( PWSTR KeyNameBuffer = NULL; PWSTR DeviceId = NULL; PWSTR InstanceId = NULL; - PWSTR pszPrefix = L"\\Registry\\Machine\\System\\CurrentcontrolSet\\Enum"; + PWSTR pszPrefix = L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum"; RtlInitUnicodeString(&HardwareKeyName, L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0");

5 years, 4 months

← Newer
1
...
17
18
19
20
21
22
23
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2019