Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [ATL_APITEST] Simplify code by using ok_int etc. (#1824)
by Katayama Hirofumi MZ 12 Aug '19

12 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14c267a3a3aec09e73a10… commit 14c267a3a3aec09e73a10d78d677e59d70a01dc0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 12 23:10:47 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 12 23:10:47 2019 +0900 [ATL_APITEST] Simplify code by using ok_int etc. (#1824) Simplify the code by using ok_int, ok_long etc. --- modules/rostests/apitests/atl/CAtlArray.cpp | 96 +++++++++--------- modules/rostests/apitests/atl/CAtlList.cpp | 8 +- modules/rostests/apitests/atl/CComQIPtr.cpp | 42 ++++---- modules/rostests/apitests/atl/CSimpleArray.cpp | 102 +++++++++---------- modules/rostests/apitests/atl/CSimpleMap.cpp | 134 ++++++++++++------------- 5 files changed, 191 insertions(+), 191 deletions(-) diff --git a/modules/rostests/apitests/atl/CAtlArray.cpp b/modules/rostests/apitests/atl/CAtlArray.cpp index b1e654bf109..8d4bc70dda0 100644 --- a/modules/rostests/apitests/atl/CAtlArray.cpp +++ b/modules/rostests/apitests/atl/CAtlArray.cpp @@ -61,71 +61,71 @@ 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); + ok_int(CCreature::s_nCtorCount, 0); + ok_int(CCreature::s_nCtorCount_Default, 0); + ok_int(CCreature::s_nCCtorCount, 0); + ok_int(CCreature::s_nDtorCount, 0); + ok_int(CCreature::s_nOpIsCount, 0); 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); + ok_int(CCreature::s_nCtorCount, 2); + ok_int(CCreature::s_nCtorCount_Default, 2); + ok_int(CCreature::s_nCCtorCount, 0); + ok_int(CCreature::s_nDtorCount, 0); + ok_int(CCreature::s_nOpIsCount, 0); 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); + ok_int(CCreature::s_nCtorCount, 2); + ok_int(CCreature::s_nCtorCount_Default, 2); + ok_int(CCreature::s_nCCtorCount, 0); + ok_int(CCreature::s_nDtorCount, 1); + ok_int(CCreature::s_nOpIsCount, 0); 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_int(CCreature::s_nCtorCount, 3); + ok_int(CCreature::s_nCtorCount_Default, 2); + ok_int(CCreature::s_nCCtorCount, 0); + ok_int(CCreature::s_nDtorCount, 1); + ok_int(CCreature::s_nOpIsCount, 0); - 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); + ok_size_t(array1.GetCount(), 1u); + ok_int(array1[0].m_id, 0x123456); + ok_int(array1.GetAt(0).m_id, 0x123456); 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_int(CCreature::s_nCtorCount, 3); + ok_int(CCreature::s_nCtorCount_Default, 2); + ok_int(CCreature::s_nCCtorCount, 1); + ok_int(CCreature::s_nDtorCount, 1); + ok_int(CCreature::s_nOpIsCount, 0); - 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); + ok_size_t(array1.GetCount(), 2u); + ok_int(array1[0].m_id, 0x123456); + ok_int(array1.GetAt(0).m_id, 0x123456); + ok_int(array1[1].m_id, 111); + ok_int(array1.GetAt(1).m_id, 111); 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); + ok_int(CCreature::s_nCtorCount, 3); + ok_int(CCreature::s_nCtorCount_Default, 2); + ok_int(CCreature::s_nCCtorCount, 1); + ok_int(CCreature::s_nDtorCount, 1); + ok_int(CCreature::s_nOpIsCount, 1); // 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); + ok_int(CCreature::s_nCtorCount, 101); + ok_int(CCreature::s_nCtorCount_Default, 100); + ok_int(CCreature::s_nCCtorCount, 1); + ok_int(CCreature::s_nDtorCount, 1); + ok_int(CCreature::s_nOpIsCount, 1); // Does not compile: //CAtlArray<CCreature> array2(array1); @@ -136,9 +136,9 @@ START_TEST(CAtlArray) } // 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); + ok_int(CCreature::s_nCtorCount, 101); + ok_int(CCreature::s_nCtorCount_Default, 100); + ok_int(CCreature::s_nCCtorCount, 1); + ok_int(CCreature::s_nDtorCount, 102); + ok_int(CCreature::s_nOpIsCount, 1); } diff --git a/modules/rostests/apitests/atl/CAtlList.cpp b/modules/rostests/apitests/atl/CAtlList.cpp index 1f5e4c7d789..8f83703b996 100644 --- a/modules/rostests/apitests/atl/CAtlList.cpp +++ b/modules/rostests/apitests/atl/CAtlList.cpp @@ -20,13 +20,13 @@ START_TEST(CAtlList) { CAtlList<int> list1; - ok(list1.GetCount() == 0, "Expected list1's size is zero, was %d\n", list1.GetCount()); + ok_size_t(list1.GetCount(), 0); list1.AddTail(56); - ok(list1.GetCount() == 1, "Expected list1's size is 1, was %d\n", list1.GetCount()); + ok_size_t(list1.GetCount(), 1); POSITION head = list1.AddHead(12); - ok(list1.GetCount() == 2, "Expected list1's size is 2, was %d\n", list1.GetCount()); + ok_size_t(list1.GetCount(), 2); POSITION tail = list1.AddTail(90); - ok(list1.GetCount() == 3, "Expected list1's size is 3, was %d\n", list1.GetCount()); + ok_size_t(list1.GetCount(), 3); list1.InsertBefore(head, -123); list1.InsertAfter(head, 34); // no longer head, but the POSITION should still be valid.. diff --git a/modules/rostests/apitests/atl/CComQIPtr.cpp b/modules/rostests/apitests/atl/CComQIPtr.cpp index f662d15028b..1ab179bb176 100644 --- a/modules/rostests/apitests/atl/CComQIPtr.cpp +++ b/modules/rostests/apitests/atl/CComQIPtr.cpp @@ -88,50 +88,50 @@ START_TEST(CComQIPtr) { CQITestObject testObject; IUnknown* unk = static_cast<IPersist*>(&testObject); - ok(testObject.m_dwRef == 1, "Expected m_dwRef 1, got %lu\n", testObject.m_dwRef); - ok(g_QI == 0, "Expected g_QI 0, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 1); + ok_long(g_QI, 0); { DECLARE_QIPTR(IPersist) ppPersist(unk); - ok(testObject.m_dwRef == 2, "Expected m_dwRef 2, got %lu\n", testObject.m_dwRef); - ok(g_QI == 1, "Expected g_QI 1, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 2); + ok_long(g_QI, 1); DECLARE_QIPTR(IStdMarshalInfo) ppMarshal(ppPersist); - ok(testObject.m_dwRef == 3, "Expected m_dwRef 3, got %lu\n", testObject.m_dwRef); - ok(g_QI == 2, "Expected g_QI 2, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 3); + ok_long(g_QI, 2); } - ok(testObject.m_dwRef == 1, "Expected m_dwRef 1, got %lu\n", testObject.m_dwRef); + ok_long(testObject.m_dwRef, 1); { DECLARE_QIPTR(IStdMarshalInfo) ppMarshal; - ok(testObject.m_dwRef == 1, "Expected m_dwRef 1, got %lu\n", testObject.m_dwRef); - ok(g_QI == 2, "Expected g_QI 2, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 1); + ok_long(g_QI, 2); ppMarshal = unk; - ok(testObject.m_dwRef == 2, "Expected m_dwRef 2, got %lu\n", testObject.m_dwRef); - ok(g_QI == 3, "Expected g_QI 3, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 2); + ok_long(g_QI, 3); ppMarshal = static_cast<IUnknown*>(NULL); - ok(testObject.m_dwRef == 1, "Expected m_dwRef 1, got %lu\n", testObject.m_dwRef); - ok(g_QI == 3, "Expected g_QI 3, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 1); + ok_long(g_QI, 3); CComPtr<IUnknown> spUnk(unk); - ok(testObject.m_dwRef == 2, "Expected m_dwRef 2, got %lu\n", testObject.m_dwRef); - ok(g_QI == 3, "Expected g_QI 3, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 2); + ok_long(g_QI, 3); ppMarshal = spUnk; - ok(testObject.m_dwRef == 3, "Expected m_dwRef 3, got %lu\n", testObject.m_dwRef); - ok(g_QI == 4, "Expected g_QI 4, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 3); + ok_long(g_QI, 4); spUnk.Release(); - ok(testObject.m_dwRef == 2, "Expected m_dwRef 2, got %lu\n", testObject.m_dwRef); - ok(g_QI == 4, "Expected g_QI 4, got %lu\n", g_QI); + ok_long(testObject.m_dwRef, 2); + ok_long(g_QI, 4); spUnk = ppMarshal; - ok(testObject.m_dwRef == 3, "Expected m_dwRef 3, got %lu\n", testObject.m_dwRef); + ok_long(testObject.m_dwRef, 3); #ifdef __REACTOS__ // CORE-12710 todo_if(1) #endif - ok(g_QI == 5, "Expected g_QI 5, got %lu\n", g_QI); + ok_long(g_QI, 5); } } diff --git a/modules/rostests/apitests/atl/CSimpleArray.cpp b/modules/rostests/apitests/atl/CSimpleArray.cpp index dcb6c5661cf..9176feb14ff 100644 --- a/modules/rostests/apitests/atl/CSimpleArray.cpp +++ b/modules/rostests/apitests/atl/CSimpleArray.cpp @@ -45,24 +45,24 @@ START_TEST(CSimpleArray) { CSimpleArray<int> array1; - ok(array1.GetSize() == 0, "Expected array1's size is zero, was %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 0); array1.Add(123); - ok(array1.GetSize() == 1, "Expected array1's size is 1, was %d\n", array1.GetSize()); - ok(array1.GetData()[0] == 123, "Expected array1.GetData()[0] is 123, was %d\n", array1.GetData()[0]); - ok(array1[0] == 123, "Expected array1[0] is 123, was %d\n", array1[0]); + ok_int(array1.GetSize(), 1); + ok_int(array1.GetData()[0], 123); + ok_int(array1[0], 123); array1.Add(456); - ok(array1.GetSize() == 2, "Expected array1's size is 2, was %d\n", array1.GetSize()); - ok(array1.GetData()[0] == 123, "Expected array1.GetData()[0] is 123, was %d\n", array1.GetData()[0]); - ok(array1[0] == 123, "Expected array1[0] is 123, was %d\n", array1[0]); - ok(array1.GetData()[1] == 456, "Expected array1.GetData()[1] is 456, was %d\n", array1.GetData()[1]); - ok(array1[1] == 456, "Expected array1[1] is 456, was %d\n", array1[1]); + ok_int(array1.GetSize(), 2); + ok_int(array1.GetData()[0], 123); + ok_int(array1[0], 123); + ok_int(array1.GetData()[1], 456); + ok_int(array1[1], 456); array1.RemoveAll(); - ok(array1.GetSize() == 0, "Expected array1's size is 0, was %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 0); array1.Add(1); array1.Add(1); @@ -70,92 +70,92 @@ START_TEST(CSimpleArray) array1.Add(2); array1.Add(2); array1.Add(3); - ok(array1.GetSize() == 6, "Expected array1's size is 6, was %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 6); array1.Remove(2); - ok(array1.GetSize() == 5, "Expected array1's size is 5, was %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 5); array1.Remove(1); - ok(array1.GetSize() == 4, "Expected array1's size is 4, was %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 4); - ok(array1[0] == 1, "Expected array1[0] is 1, was %d\n", array1[0]); - ok(array1[1] == 1, "Expected array1[1] is 1, was %d\n", array1[1]); - ok(array1[2] == 2, "Expected array1[2] is 2, was %d\n", array1[2]); - ok(array1[3] == 3, "Expected array1[3] is 3, was %d\n", array1[3]); + ok_int(array1[0], 1); + ok_int(array1[1], 1); + ok_int(array1[2], 2); + ok_int(array1[3], 3); - ok(CCreature::s_nCount == 0, "Expected CCreature::s_nCount is zero, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 0); + ok_int(CCreature::s_nCopyCount, 0); CSimpleArray<CCreature> array2; { CCreature creature1, creature2; - ok(CCreature::s_nCount == 2, "Expected CCreature::s_nCount is 2, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 2); + ok_int(CCreature::s_nCopyCount, 0); array2.Add(creature1); - ok(CCreature::s_nCount == 3, "Expected CCreature::s_nCount is 3, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 3); + ok_int(CCreature::s_nCopyCount, 0); array2.Add(creature2); - ok(CCreature::s_nCount == 4, "Expected CCreature::s_nCount is 4, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 4); + ok_int(CCreature::s_nCopyCount, 0); } - ok(CCreature::s_nCount == 2, "Expected CCreature::s_nCount is 2, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 2); + ok_int(CCreature::s_nCopyCount, 0); { CSimpleArray<CCreature> array3(array2), array4, array5; - ok(CCreature::s_nCount == 4, "Expected CCreature::s_nCount is 4, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 4); + ok_int(CCreature::s_nCopyCount, 0); array4 = array2; - ok(CCreature::s_nCount == 6, "Expected CCreature::s_nCount is 6, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 6); + ok_int(CCreature::s_nCopyCount, 0); CCreature creature1; - ok(CCreature::s_nCount == 7, "Expected CCreature::s_nCount is 7, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 7); + ok_int(CCreature::s_nCopyCount, 0); array4.Add(creature1); - ok(CCreature::s_nCount == 8, "Expected CCreature::s_nCount is 8, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 8); + ok_int(CCreature::s_nCopyCount, 0); array3 = array4; - ok(CCreature::s_nCount == 9, "Expected CCreature::s_nCount is 9, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 9); + ok_int(CCreature::s_nCopyCount, 0); array5 = array2; - ok(CCreature::s_nCount == 11, "Expected CCreature::s_nCount is 11, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 11); + ok_int(CCreature::s_nCopyCount, 0); array5 = array2; - ok(CCreature::s_nCount == 11, "Expected CCreature::s_nCount is 11, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 11); + ok_int(CCreature::s_nCopyCount, 0); } - ok(CCreature::s_nCount == 2, "Expected CCreature::s_nCount is 2, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 2); + ok_int(CCreature::s_nCopyCount, 0); array2.RemoveAll(); - ok(CCreature::s_nCount == 0, "Expected CCreature::s_nCount is zero, was: %d\n", CCreature::s_nCount); - ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount); + ok_int(CCreature::s_nCount, 0); + ok_int(CCreature::s_nCopyCount, 0); array1.RemoveAll(); - ok(array1.GetSize() == 0, "Expected array1.GetSize() is zero, was: %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 0); for (int i = 0; i < 100; ++i) { array1.Add(i); } - ok(array1.GetSize() == 100, "Expected array1.GetSize() is 100, was: %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 100); array1.RemoveAll(); - ok(array1.GetSize() == 0, "Expected array1.GetSize() is zero, was: %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 0); array1.Add(123); array1.Add(321); ok(!!array1.RemoveAt(0), "Expected RemoveAt(0) to succeed\n"); - ok(array1.GetSize() == 1, "Expected array1.GetSize() is 1, was: %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 1); if (array1.GetSize() == 1) { - ok(array1[0] == 321, "Expected array1[0] is 321, was %d\n", array1[0]); + ok_int(array1[0], 321); } ok(!!array1.RemoveAt(0), "Expected RemoveAt(0) to succeed\n"); - ok(array1.GetSize() == 0, "Expected array1.GetSize() is 0, was: %d\n", array1.GetSize()); + ok_int(array1.GetSize(), 0); } diff --git a/modules/rostests/apitests/atl/CSimpleMap.cpp b/modules/rostests/apitests/atl/CSimpleMap.cpp index f21e9831be4..09b22055bf2 100644 --- a/modules/rostests/apitests/atl/CSimpleMap.cpp +++ b/modules/rostests/apitests/atl/CSimpleMap.cpp @@ -45,137 +45,137 @@ START_TEST(CSimpleMap) { CSimpleMap<int, int> map1; - ok(map1.GetSize() == 0, "Expected map1's size is zero, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 0); map1.Add(1, 2); - ok(map1.GetSize() == 1, "Expected map1's size is 1, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 1); map1.Add(2, 3); - ok(map1.GetSize() == 2, "Expected map1's size is 2, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 2); - ok(map1.Lookup(1) == 2, "Expected map1.Lookup(1) is 2, was %d\n", map1.Lookup(1)); - ok(map1.Lookup(2) == 3, "Expected map1.Lookup(2) is 3, was %d\n", map1.Lookup(2)); - ok(map1.Lookup(-1) == 0, "Expected map1.Lookup(-1) is 0, was %d\n", map1.Lookup(-1)); + ok_int(map1.Lookup(1), 2); + ok_int(map1.Lookup(2), 3); + ok_int(map1.Lookup(-1), 0); - ok(map1.ReverseLookup(2) == 1, "Expected map1.ReverseLookup(2) is 1, was %d\n", map1.ReverseLookup(2)); - ok(map1.ReverseLookup(3) == 2, "Expected map1.ReverseLookup(3) is 2, was %d\n", map1.ReverseLookup(3)); + ok_int(map1.ReverseLookup(2), 1); + ok_int(map1.ReverseLookup(3), 2); - ok(map1.GetKeyAt(0) == 1, "Expected map1.GetKeyAt(0) is 1, was %d\n", map1.GetKeyAt(0)); - ok(map1.GetKeyAt(1) == 2, "Expected map1.GetKeyAt(1) is 2, was %d\n", map1.GetKeyAt(1)); + ok_int(map1.GetKeyAt(0), 1); + ok_int(map1.GetKeyAt(1), 2); - ok(map1.GetValueAt(0) == 2, "Expected map1.GetValueAt(0) is 2, was %d\n", map1.GetValueAt(0)); - ok(map1.GetValueAt(1) == 3, "Expected map1.GetValueAt(1) is 3, was %d\n", map1.GetValueAt(1)); + ok_int(map1.GetValueAt(0), 2); + ok_int(map1.GetValueAt(1), 3); map1.SetAt(2, 4); - ok(map1.Lookup(1) == 2, "Expected map1.Lookup(1) is 2, was %d\n", map1.Lookup(1)); - ok(map1.Lookup(2) == 4, "Expected map1.Lookup(2) is 4, was %d\n", map1.Lookup(2)); + ok_int(map1.Lookup(1), 2); + ok_int(map1.Lookup(2), 4); - ok(map1.ReverseLookup(2) == 1, "Expected map1.ReverseLookup(2) is 1, was %d\n", map1.ReverseLookup(2)); - ok(map1.ReverseLookup(4) == 2, "Expected map1.ReverseLookup(4) is 2, was %d\n", map1.ReverseLookup(4)); + ok_int(map1.ReverseLookup(2), 1); + ok_int(map1.ReverseLookup(4), 2); map1.Remove(1); - ok(map1.GetSize() == 1, "Expected map1's size is 1, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 1); map1.Remove(2); - ok(map1.GetSize() == 0, "Expected map1's size is 0, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 0); map1.Add(1, 4); - ok(map1.GetSize() == 1, "Expected map1's size is 1, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 1); map1.Add(2, 8); - ok(map1.GetSize() == 2, "Expected map1's size is 2, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 2); map1.Add(3, 12); - ok(map1.GetSize() == 3, "Expected map1's size is 3, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 3); map1.RemoveAll(); - ok(map1.GetSize() == 0, "Expected map1's size is 0, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 0); - ok(CMonster::s_nCount == 0, "Expected CMonster::s_nCount is 0, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 0); + ok_int(CMonster::s_nCopyCount, 0); CSimpleMap<CMonster, CMonster> map2; - ok(map2.GetSize() == 0, "Expected map2's size is zero, was %d\n", map2.GetSize()); + ok_int(map2.GetSize(), 0); - ok(CMonster::s_nCount == 0, "Expected CMonster::s_nCount is 0, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 0); + ok_int(CMonster::s_nCopyCount, 0); { CMonster m1; - ok(CMonster::s_nCount == 1, "Expected CMonster::s_nCount is 1, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 1); + ok_int(CMonster::s_nCopyCount, 0); CMonster m2; - ok(CMonster::s_nCount == 2, "Expected CMonster::s_nCount is 2, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 2); + ok_int(CMonster::s_nCopyCount, 0); map2.Add(m1, m2); - ok(CMonster::s_nCount == 4, "Expected CMonster::s_nCount is 4, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 4); + ok_int(CMonster::s_nCopyCount, 0); } - ok(map2.GetSize() == 1, "Expected map2's size is 1, was %d\n", map2.GetSize()); - ok(CMonster::s_nCount == 2, "Expected CMonster::s_nCount is 2, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(map2.GetSize(), 1); + ok_int(CMonster::s_nCount, 2); + ok_int(CMonster::s_nCopyCount, 0); { CMonster m1; - ok(CMonster::s_nCount == 3, "Expected CMonster::s_nCount is 3, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 3); + ok_int(CMonster::s_nCopyCount, 0); CMonster m2; - ok(CMonster::s_nCount == 4, "Expected CMonster::s_nCount is 4, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 4); + ok_int(CMonster::s_nCopyCount, 0); map2.Add(m1, m2); - ok(CMonster::s_nCount == 6, "Expected CMonster::s_nCount is 6, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 6); + ok_int(CMonster::s_nCopyCount, 0); } - ok(map2.GetSize() == 2, "Expected map2's size is 2, was %d\n", map2.GetSize()); - ok(CMonster::s_nCount == 4, "Expected CMonster::s_nCount is 4, was %d\n", CMonster::s_nCount); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(map2.GetSize(), 2); + ok_int(CMonster::s_nCount, 4); + ok_int(CMonster::s_nCopyCount, 0); map2.RemoveAt(0); - ok(CMonster::s_nCount == 2, "Expected CMonster::s_nCount is 2, was %d\n", CMonster::s_nCount); - ok(map2.GetSize() == 1, "Expected map2's size is 1, was %d\n", map2.GetSize()); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 2); + ok_int(map2.GetSize(), 1); + ok_int(CMonster::s_nCopyCount, 0); map2.RemoveAt(0); - ok(CMonster::s_nCount == 0, "Expected CMonster::s_nCount is 0, was %d\n", CMonster::s_nCount); - ok(map2.GetSize() == 0, "Expected map2's size is 0, was %d\n", map2.GetSize()); - ok(CMonster::s_nCopyCount == 0, "Expected CMonster::s_nCopyCount is 0, was %d\n", CMonster::s_nCopyCount); + ok_int(CMonster::s_nCount, 0); + ok_int(map2.GetSize(), 0); + ok_int(CMonster::s_nCopyCount, 0); CSimpleMap<int, CMonster> map3; - ok(map3.GetSize() == 0, "Expected map3's size is 0, was %d\n", map3.GetSize()); + ok_int(map3.GetSize(), 0); CMonster m3; - ok(CMonster::s_nCount == 1, "Expected CMonster::s_nCount is 1, was %d\n", CMonster::s_nCount); + ok_int(CMonster::s_nCount, 1); map3.Add(1, m3); - ok(map3.GetSize() == 1, "Expected map3's size is 1, was %d\n", map3.GetSize()); - ok(CMonster::s_nCount == 2, "Expected CMonster::s_nCount is 2, was %d\n", CMonster::s_nCount); + ok_int(map3.GetSize(), 1); + ok_int(CMonster::s_nCount, 2); map3.Add(2, m3); - ok(map3.GetSize() == 2, "Expected map3's size is 2, was %d\n", map3.GetSize()); - ok(CMonster::s_nCount == 3, "Expected CMonster::s_nCount is 3, was %d\n", CMonster::s_nCount); + ok_int(map3.GetSize(), 2); + ok_int(CMonster::s_nCount, 3); map3.Add(3, m3); - ok(map3.GetSize() == 3, "Expected map3's size is 3, was %d\n", map3.GetSize()); - ok(CMonster::s_nCount == 4, "Expected CMonster::s_nCount is 4, was %d\n", CMonster::s_nCount); + ok_int(map3.GetSize(), 3); + ok_int(CMonster::s_nCount, 4); map3.Remove(2); - ok(map3.GetSize() == 2, "Expected map3's size is 2, was %d\n", map3.GetSize()); - ok(CMonster::s_nCount == 3, "Expected CMonster::s_nCount is 3, was %d\n", CMonster::s_nCount); + ok_int(map3.GetSize(), 2); + ok_int(CMonster::s_nCount, 3); map3.RemoveAll(); - ok(map3.GetSize() == 0, "Expected map3's size is 0, was %d\n", map3.GetSize()); - ok(CMonster::s_nCount == 1, "Expected CMonster::s_nCount is 1, was %d\n", CMonster::s_nCount); + ok_int(map3.GetSize(), 0); + ok_int(CMonster::s_nCount, 1); map1.Add(1, 2); - ok(map1.GetSize() == 1, "Expected map1's size is 1, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 1); map1.Add(2, 3); - ok(map1.GetSize() == 2, "Expected map1's size is 2, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 2); ok(!!map1.RemoveAt(0), "Expected RemoveAt(0) to succeed\n"); - ok(map1.GetSize() == 1, "Expected map1's size is 1, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 1); ok(!!map1.RemoveAt(0), "Expected RemoveAt(0) to succeed\n"); - ok(map1.GetSize() == 0, "Expected map1's size is 0, was %d\n", map1.GetSize()); + ok_int(map1.GetSize(), 0); }

1 0

[reactos] 01/01: [MEDIA][FONTS] Total adjustment of MS Sans Serif
by Katayama Hirofumi MZ 12 Aug '19

12 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=211fdcdba733ba5a5471c… commit 211fdcdba733ba5a5471cbb2c5a80f820de9ab10 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 12 22:19:55 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Aug 12 22:19:55 2019 +0900 [MEDIA][FONTS] Total adjustment of MS Sans Serif --- media/fonts/ssee1255.fon | Bin 69152 -> 69168 bytes media/fonts/ssee1256.fon | Bin 71616 -> 71632 bytes media/fonts/sserife.fon | Bin 64576 -> 64560 bytes media/fonts/sserifeg.fon | Bin 65440 -> 65456 bytes media/fonts/sserifer.fon | Bin 68832 -> 68848 bytes media/fonts/sserifet.fon | Bin 64288 -> 64304 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/ssee1255.fon b/media/fonts/ssee1255.fon index c0ecc32bb89..59de17288bb 100644 Binary files a/media/fonts/ssee1255.fon and b/media/fonts/ssee1255.fon differ diff --git a/media/fonts/ssee1256.fon b/media/fonts/ssee1256.fon index 1f71c91f261..7e27d99027c 100644 Binary files a/media/fonts/ssee1256.fon and b/media/fonts/ssee1256.fon differ diff --git a/media/fonts/sserife.fon b/media/fonts/sserife.fon index a17442b55c5..5bcce146c91 100644 Binary files a/media/fonts/sserife.fon and b/media/fonts/sserife.fon differ diff --git a/media/fonts/sserifeg.fon b/media/fonts/sserifeg.fon index ce4a199b808..fad4c7a2172 100644 Binary files a/media/fonts/sserifeg.fon and b/media/fonts/sserifeg.fon differ diff --git a/media/fonts/sserifer.fon b/media/fonts/sserifer.fon index 4aa44ae2cbb..163668f5f62 100644 Binary files a/media/fonts/sserifer.fon and b/media/fonts/sserifer.fon differ diff --git a/media/fonts/sserifet.fon b/media/fonts/sserifet.fon index 51d9919c5b1..25c4c94db85 100644 Binary files a/media/fonts/sserifet.fon and b/media/fonts/sserifet.fon differ

1 0

[reactos] 01/01: [SDK][INCLUDE] Update msgdump.h and winxx.h
by Katayama Hirofumi MZ 12 Aug '19

12 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3dc5f2a739ea190be1f6… commit d3dc5f2a739ea190be1f619a9eb277862512f6f7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 12 19:31:44 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Aug 12 19:31:44 2019 +0900 [SDK][INCLUDE] Update msgdump.h and winxx.h --- sdk/include/reactos/msgdump.h | 585 +++++++++++++++++++++++++++++++++++++++++- sdk/include/reactos/winxx.h | 165 +++++++++++- 2 files changed, 744 insertions(+), 6 deletions(-) diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h index 2284437fc2c..fde8758f66d 100644 --- a/sdk/include/reactos/msgdump.h +++ b/sdk/include/reactos/msgdump.h @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2018-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #ifndef _INC_MSGDUMP -#define _INC_MSGDUMP 11 /* Version 11 */ +#define _INC_MSGDUMP 15 /* Version 15 */ /* * NOTE: MD_msgdump function in this file provides Win32API message dump feature. @@ -490,11 +490,172 @@ MD_OnCopyData(HWND hwnd, HWND hwndFrom, PCOPYDATASTRUCT pcds) return FALSE; } +static __inline LPCTSTR MSGDUMP_API +MD_GetNotifyCode(HWND hwndFrom, UINT code) +{ + TCHAR szClass[24], sz[2]; + static TCHAR s_szText[64]; + + switch (code) + { + case NM_OUTOFMEMORY: return TEXT("NM_OUTOFMEMORY"); + case NM_CLICK: return TEXT("NM_CLICK"); + case NM_DBLCLK: return TEXT("NM_DBLCLK"); + case NM_RETURN: return TEXT("NM_RETURN"); + case NM_RCLICK: return TEXT("NM_RCLICK"); + case NM_RDBLCLK: return TEXT("NM_RDBLCLK"); + case NM_SETFOCUS: return TEXT("NM_SETFOCUS"); + case NM_KILLFOCUS: return TEXT("NM_KILLFOCUS"); +#if (_WIN32_IE >= 0x0300) + case NM_CUSTOMDRAW: return TEXT("NM_CUSTOMDRAW"); + case NM_HOVER: return TEXT("NM_HOVER"); +#endif +#if (_WIN32_IE >= 0x0400) + case NM_NCHITTEST: return TEXT("NM_NCHITTEST"); + case NM_KEYDOWN: return TEXT("NM_KEYDOWN"); + case NM_RELEASEDCAPTURE: return TEXT("NM_RELEASEDCAPTURE"); + case NM_SETCURSOR: return TEXT("NM_SETCURSOR"); + case NM_CHAR: return TEXT("NM_CHAR"); +#endif +#if (_WIN32_IE >= 0x0401) + case NM_TOOLTIPSCREATED: return TEXT("NM_TOOLTIPSCREATED"); +#endif +#if (_WIN32_IE >= 0x0500) + case NM_LDOWN: return TEXT("NM_LDOWN"); + case NM_RDOWN: return TEXT("NM_RDOWN"); +#endif + } + + szClass[0] = 0; + GetClassName(hwndFrom, szClass, ARRAYSIZE(szClass)); + sz[0] = szClass[0]; + sz[1] = 0; + CharUpper(sz); + + if (sz[0] == TEXT('R') && lstrcmpi(szClass, RICHEDIT_CLASS) == 0) + { + switch (code) + { + case EN_MSGFILTER: return TEXT("EN_MSGFILTER"); + case EN_REQUESTRESIZE: return TEXT("EN_REQUESTRESIZE"); + case EN_SELCHANGE: return TEXT("EN_SELCHANGE"); + case EN_DROPFILES: return TEXT("EN_DROPFILES"); + case EN_PROTECTED: return TEXT("EN_PROTECTED"); + case EN_CORRECTTEXT: return TEXT("EN_CORRECTTEXT"); + case EN_STOPNOUNDO: return TEXT("EN_STOPNOUNDO"); + case EN_IMECHANGE: return TEXT("EN_IMECHANGE"); + case EN_SAVECLIPBOARD: return TEXT("EN_SAVECLIPBOARD"); + case EN_OLEOPFAILED: return TEXT("EN_OLEOPFAILED"); + case EN_OBJECTPOSITIONS: return TEXT("EN_OBJECTPOSITIONS"); + case EN_LINK: return TEXT("EN_LINK"); + case EN_DRAGDROPDONE: return TEXT("EN_DRAGDROPDONE"); + case EN_PARAGRAPHEXPANDED: return TEXT("EN_PARAGRAPHEXPANDED"); + case EN_PAGECHANGE: return TEXT("EN_PAGECHANGE"); + case EN_LOWFIRTF: return TEXT("EN_LOWFIRTF"); + case EN_ALIGNLTR: return TEXT("EN_ALIGNLTR"); + case EN_ALIGNRTL: return TEXT("EN_ALIGNRTL"); +#if _RICHEDIT_VER >= 0x0800 + case EN_CLIPFORMAT: return TEXT("EN_CLIPFORMAT"); + case EN_STARTCOMPOSITION: return TEXT("EN_STARTCOMPOSITION"); + case EN_ENDCOMPOSITION: return TEXT("EN_ENDCOMPOSITION"); +#endif + } + } + else if (sz[0] == TEXT('S') && lstrcmpi(szClass, WC_LISTVIEW) == 0) + { + switch (code) + { + case LVN_ITEMCHANGING: return TEXT("LVN_ITEMCHANGING"); + case LVN_ITEMCHANGED: return TEXT("LVN_ITEMCHANGED"); + case LVN_INSERTITEM: return TEXT("LVN_INSERTITEM"); + case LVN_DELETEITEM: return TEXT("LVN_DELETEITEM"); + case LVN_DELETEALLITEMS: return TEXT("LVN_DELETEALLITEMS"); + case LVN_BEGINLABELEDITA: return TEXT("LVN_BEGINLABELEDITA"); + case LVN_BEGINLABELEDITW: return TEXT("LVN_BEGINLABELEDITW"); + case LVN_ENDLABELEDITA: return TEXT("LVN_ENDLABELEDITA"); + case LVN_ENDLABELEDITW: return TEXT("LVN_ENDLABELEDITW"); + case LVN_COLUMNCLICK: return TEXT("LVN_COLUMNCLICK"); + case LVN_BEGINDRAG: return TEXT("LVN_BEGINDRAG"); + case LVN_BEGINRDRAG: return TEXT("LVN_BEGINRDRAG"); + case LVN_ODCACHEHINT: return TEXT("LVN_ODCACHEHINT"); + case LVN_ODFINDITEMA: return TEXT("LVN_ODFINDITEMA"); + case LVN_ODFINDITEMW: return TEXT("LVN_ODFINDITEMW"); + case LVN_ITEMACTIVATE: return TEXT("LVN_ITEMACTIVATE"); + case LVN_ODSTATECHANGED: return TEXT("LVN_ODSTATECHANGED"); + case LVN_HOTTRACK: return TEXT("LVN_HOTTRACK"); + case LVN_GETDISPINFOA: return TEXT("LVN_GETDISPINFOA"); + case LVN_GETDISPINFOW: return TEXT("LVN_GETDISPINFOW"); + case LVN_SETDISPINFOA: return TEXT("LVN_SETDISPINFOA"); + case LVN_SETDISPINFOW: return TEXT("LVN_SETDISPINFOW"); + case LVN_KEYDOWN: return TEXT("LVN_KEYDOWN"); + case LVN_MARQUEEBEGIN: return TEXT("LVN_MARQUEEBEGIN"); + case LVN_GETINFOTIPA: return TEXT("LVN_GETINFOTIPA"); + case LVN_GETINFOTIPW: return TEXT("LVN_GETINFOTIPW"); + case LVN_INCREMENTALSEARCHA: return TEXT("LVN_INCREMENTALSEARCHA"); + case LVN_INCREMENTALSEARCHW: return TEXT("LVN_INCREMENTALSEARCHW"); +#if NTDDI_VERSION >= 0x06000000 + case LVN_COLUMNDROPDOWN: return TEXT("LVN_COLUMNDROPDOWN"); + case LVN_COLUMNOVERFLOWCLICK: return TEXT("LVN_COLUMNOVERFLOWCLICK"); +#endif + case LVN_BEGINSCROLL: return TEXT("LVN_BEGINSCROLL"); + case LVN_ENDSCROLL: return TEXT("LVN_ENDSCROLL"); +#if NTDDI_VERSION >= 0x06000000 + case LVN_LINKCLICK: return TEXT("LVN_LINKCLICK"); + case LVN_GETEMPTYMARKUP: return TEXT("LVN_GETEMPTYMARKUP"); +#endif + } + } + else if (sz[0] == TEXT('S') && lstrcmpi(szClass, WC_TREEVIEW) == 0) + { + switch (code) + { + case TVN_SELCHANGINGA: return TEXT("TVN_SELCHANGINGA"); + case TVN_SELCHANGINGW: return TEXT("TVN_SELCHANGINGW"); + case TVN_SELCHANGEDA: return TEXT("TVN_SELCHANGEDA"); + case TVN_SELCHANGEDW: return TEXT("TVN_SELCHANGEDW"); + case TVN_GETDISPINFOA: return TEXT("TVN_GETDISPINFOA"); + case TVN_GETDISPINFOW: return TEXT("TVN_GETDISPINFOW"); + case TVN_SETDISPINFOA: return TEXT("TVN_SETDISPINFOA"); + case TVN_SETDISPINFOW: return TEXT("TVN_SETDISPINFOW"); + case TVN_ITEMEXPANDINGA: return TEXT("TVN_ITEMEXPANDINGA"); + case TVN_ITEMEXPANDINGW: return TEXT("TVN_ITEMEXPANDINGW"); + case TVN_ITEMEXPANDEDA: return TEXT("TVN_ITEMEXPANDEDA"); + case TVN_ITEMEXPANDEDW: return TEXT("TVN_ITEMEXPANDEDW"); + case TVN_BEGINDRAGA: return TEXT("TVN_BEGINDRAGA"); + case TVN_BEGINDRAGW: return TEXT("TVN_BEGINDRAGW"); + case TVN_BEGINRDRAGA: return TEXT("TVN_BEGINRDRAGA"); + case TVN_BEGINRDRAGW: return TEXT("TVN_BEGINRDRAGW"); + case TVN_DELETEITEMA: return TEXT("TVN_DELETEITEMA"); + case TVN_DELETEITEMW: return TEXT("TVN_DELETEITEMW"); + case TVN_BEGINLABELEDITA: return TEXT("TVN_BEGINLABELEDITA"); + case TVN_BEGINLABELEDITW: return TEXT("TVN_BEGINLABELEDITW"); + case TVN_ENDLABELEDITA: return TEXT("TVN_ENDLABELEDITA"); + case TVN_ENDLABELEDITW: return TEXT("TVN_ENDLABELEDITW"); + case TVN_KEYDOWN: return TEXT("TVN_KEYDOWN"); + case TVN_GETINFOTIPA: return TEXT("TVN_GETINFOTIPA"); + case TVN_GETINFOTIPW: return TEXT("TVN_GETINFOTIPW"); + case TVN_SINGLEEXPAND: return TEXT("TVN_SINGLEEXPAND"); +#ifdef TVN_ITEMCHANGINGA + case TVN_ITEMCHANGINGA: return TEXT("TVN_ITEMCHANGINGA"); + case TVN_ITEMCHANGINGW: return TEXT("TVN_ITEMCHANGINGW"); + case TVN_ITEMCHANGEDA: return TEXT("TVN_ITEMCHANGEDA"); + case TVN_ITEMCHANGEDW: return TEXT("TVN_ITEMCHANGEDW"); + case TVN_ASYNCDRAW: return TEXT("TVN_ASYNCDRAW"); +#endif + } + } + + StringCbPrintf(s_szText, sizeof(s_szText), TEXT("%u"), code); + return s_szText; +} + static __inline LRESULT MSGDUMP_API MD_OnNotify(HWND hwnd, int idFrom, LPNMHDR pnmhdr) { - MSGDUMP_TPRINTF(TEXT("%sWM_NOTIFY(hwnd:%p, idFrom:%d, pnmhdr:%p)\n"), - MSGDUMP_PREFIX, (void *)hwnd, idFrom, (void *)pnmhdr); + MSGDUMP_TPRINTF(TEXT("%sWM_NOTIFY(hwnd:%p, idFrom:%d, pnmhdr:%p, hwndFrom:%p, pnmhdr->idFrom:%d, code:%s)\n"), + MSGDUMP_PREFIX, (void *)hwnd, idFrom, (void *)pnmhdr, + pnmhdr->hwndFrom, pnmhdr->idFrom, + MD_GetNotifyCode(pnmhdr->hwndFrom, pnmhdr->code)); return 0; } @@ -4182,6 +4343,320 @@ MD_TreeView_OnEditLabelW(HWND hwnd, HTREEITEM hitem) } #endif +static __inline LRESULT MSGDUMP_API +MD_RichEdit_OnCanPaste(HWND hwnd, UINT uFormat) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_CANPASTE(hwnd:%p, uFormat:%u)\n"), + MSGDUMP_PREFIX, (void *)hwnd, uFormat); + return 0; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnDisplayBand(HWND hwnd, LPRECT lprc) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_DISPLAYBAND(hwnd:%p, lprc:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)lprc); + return FALSE; +} + +static __inline void MSGDUMP_API +MD_RichEdit_OnExGetSel(HWND hwnd, CHARRANGE *lpchr) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_EXGETSEL(hwnd:%p, lpchr:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpchr); +} + +static __inline void MSGDUMP_API +MD_RichEdit_OnExLimitText(HWND hwnd, DWORD cchTextMax) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_EXLIMITTEXT(hwnd:%p, cchTextMax:%ld)\n"), + MSGDUMP_PREFIX, (void *)hwnd, cchTextMax); +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnExLineFromChar(HWND hwnd, DWORD ichCharPos) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_EXLINEFROMCHAR(hwnd:%p, ichCharPos:0x%08lX)\n"), + MSGDUMP_PREFIX, (void *)hwnd, ichCharPos); + return 0; +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnExSetSel(HWND hwnd, INT ichChar) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_EXSETSEL(hwnd:%p, ichChar:%d)\n"), + MSGDUMP_PREFIX, (void *)hwnd, ichChar); + return 0; +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnFindText(HWND hwnd, UINT fuFlags, FINDTEXT *lpFindText) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_FINDTEXT(hwnd:%p, fuFlags:%u, lpFindText:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, fuFlags, (void *)lpFindText); + return 0; +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnFormatRange(HWND hwnd, BOOL fRender, FORMATRANGE *lpFmt) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_FORMATRANGE(hwnd:%p, fRender:%d, lpFmt:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, fRender, (void *)lpFmt); + return 0; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnGetCharFormat(HWND hwnd, BOOL fSelection, CHARFORMAT *lpFmt) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETCHARFORMAT(hwnd:%p, fSelection:%d, lpFmt:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, fSelection, (void *)lpFmt); + return 0; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnGetEventMask(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETEVENTMASK(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnGetOleInterface(HWND hwnd, LPVOID *ppObject) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETOLEINTERFACE(hwnd:%p, ppObject:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)ppObject); + return FALSE; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnGetParaFormat(HWND hwnd, PARAFORMAT *lpFmt) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETPARAFORMAT(hwnd:%p, lpFmt:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpFmt); + return 0; +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnGetSelText(HWND hwnd, LPTSTR lpBuf) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETSELTEXT(hwnd:%p, lpBuf:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpBuf); + return 0; +} + +static __inline void MSGDUMP_API +MD_RichEdit_OnHideSelection(HWND hwnd, BOOL fHide, BOOL fChangeStyle) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_HIDESELECTION(hwnd:%p, fHide:%d, fChangeStyle:%d)\n"), + MSGDUMP_PREFIX, (void *)hwnd, fHide, fChangeStyle); +} + +static __inline void MSGDUMP_API +MD_RichEdit_OnPasteSpecial(HWND hwnd, UINT uFormat, REPASTESPECIAL *lpRePasteSpecial) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_PASTESPECIAL(hwnd:%p, uFormat:%u, lpRePasteSpecial:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, uFormat, (void *)lpRePasteSpecial); +} + +static __inline void MSGDUMP_API +MD_RichEdit_OnRequestResize(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_REQUESTRESIZE(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnSelectionType(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SELECTIONTYPE(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + +static __inline COLORREF MSGDUMP_API +MD_RichEdit_OnSetBkgndColor(HWND hwnd, BOOL fUseSysColor, COLORREF clr) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETBKGNDCOLOR(hwnd:%p, fUseSysColor:%d, clr:0x%08lX)\n"), + MSGDUMP_PREFIX, (void *)hwnd, fUseSysColor, clr); + return 0; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnSetCharFormat(HWND hwnd, UINT uFlags, CHARFORMAT *lpFmt) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETCHARFORMAT(hwnd:%p, uFlags:%u, lpFmt:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, uFlags, (void *)lpFmt); + return FALSE; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnSetEventMask(HWND hwnd, DWORD dwMask) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETEVENTMASK(hwnd:%p, dwMask:0x%08lX)\n"), + MSGDUMP_PREFIX, (void *)hwnd, dwMask); + return 0; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnSetOleCallback(HWND hwnd, void *pCallback) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETOLECALLBACK(hwnd:%p, pCallback:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, pCallback); + return FALSE; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnSetParaFormat(HWND hwnd, PARAFORMAT *lpFmt) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETPARAFORMAT(hwnd:%p, lpFmt:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpFmt); + return FALSE; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnSetTargetDevice(HWND hwnd, HDC hdcTarget, INT cxLineWidth) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETTARGETDEVICE(hwnd:%p, hdcTarget:%p, cxLineWidth:%d)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)hdcTarget, cxLineWidth); + return FALSE; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnStreamIn(HWND hwnd, UINT uFormat, EDITSTREAM *lpStream) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_STREAMIN(hwnd:%p, uFormat:%u, lpStream:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, uFormat, (void *)lpStream); + return 0; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnStreamOut(HWND hwnd, UINT uFormat, EDITSTREAM *lpStream) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_STREAMOUT(hwnd:%p, uFormat:%u, lpStream:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, uFormat, (void *)lpStream); + return 0; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnGetTextRange(HWND hwnd, TEXTRANGE *lpRange) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETTEXTRANGE(hwnd:%p, lpRange:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpRange); + return 0; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnFindWordBreak(HWND hwnd, UINT code, DWORD ichStart) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_FINDWORDBREAK(hwnd:%p, code:%u, ichStart:0x%08lX)\n"), + MSGDUMP_PREFIX, (void *)hwnd, code, ichStart); + return 0; +} + +static __inline UINT MSGDUMP_API +MD_RichEdit_OnSetOptions(HWND hwnd, UINT fOperation, UINT fOptions) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETOPTIONS(hwnd:%p, fOperation:%u, fOptions:%u)\n"), + MSGDUMP_PREFIX, (void *)hwnd, fOperation, fOptions); + return 0; +} + +static __inline UINT MSGDUMP_API +MD_RichEdit_OnGetOptions(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETOPTIONS(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnFindTextEx(HWND hwnd, UINT fuFlags, FINDTEXTEX *lpFindText) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_FINDTEXTEX(hwnd:%p, fuFlags:%u, lpFindText:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, fuFlags, (void *)lpFindText); + return 0; +} + +static __inline void *MSGDUMP_API +MD_RichEdit_OnGetWordBreakProcEx(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETWORDBREAKPROC(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return NULL; +} + +static __inline void *MSGDUMP_API +MD_RichEdit_OnSetWordBreakProcEx(HWND hwnd, void *pfn) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETWORDBREAKPROC(hwnd:%p, pfn:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, pfn); + return NULL; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnSetUndoLimit(HWND hwnd, DWORD dwMaxUndo) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETUNDOLIMIT(hwnd:%p, dwMaxUndo:%ld)\n"), + MSGDUMP_PREFIX, (void *)hwnd, dwMaxUndo); + return 0; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnRedo(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_REDO(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return FALSE; +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnCanRedo(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_CANREDO(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return FALSE; +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnGetUndoName(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETUNDONAME(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + +static __inline INT MSGDUMP_API +MD_RichEdit_OnGetRedoName(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETREDONAME(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + +static __inline void MSGDUMP_API +MD_RichEdit_OnStopGroupTyping(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_STOPGROUPTYPING(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline BOOL MSGDUMP_API +MD_RichEdit_OnSetTextMode(HWND hwnd, DWORD dwTextMode) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_SETTEXTMODE(hwnd:%p, dwTextMode:0x%08lX)\n"), + MSGDUMP_PREFIX, (void *)hwnd, dwTextMode); + return FALSE; +} + +static __inline DWORD MSGDUMP_API +MD_RichEdit_OnGetTextMode(HWND hwnd) +{ + MSGDUMP_TPRINTF(TEXT("%sEM_GETTEXTMODE(hwnd:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + static __inline LRESULT MSGDUMP_API MD_msgdump(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -4191,7 +4666,56 @@ MD_msgdump(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) sz[0] = szClass[0]; sz[1] = 0; CharUpper(sz); - if (sz[0] == TEXT('E') && lstrcmpi(szClass, TEXT("EDIT")) == 0) + + if (sz[0] == TEXT('R') && lstrcmpi(szClass, RICHEDIT_CLASS) == 0) + { + switch (uMsg) + { + HANDLE_MSG(hwnd, EM_CANPASTE, MD_RichEdit_OnCanPaste); + HANDLE_MSG(hwnd, EM_DISPLAYBAND, MD_RichEdit_OnDisplayBand); + HANDLE_MSG(hwnd, EM_EXGETSEL, MD_RichEdit_OnExGetSel); + HANDLE_MSG(hwnd, EM_EXLIMITTEXT, MD_RichEdit_OnExLimitText); + HANDLE_MSG(hwnd, EM_EXLINEFROMCHAR, MD_RichEdit_OnExLineFromChar); + HANDLE_MSG(hwnd, EM_EXSETSEL, MD_RichEdit_OnExSetSel); + HANDLE_MSG(hwnd, EM_FINDTEXT, MD_RichEdit_OnFindText); + HANDLE_MSG(hwnd, EM_FORMATRANGE, MD_RichEdit_OnFormatRange); + HANDLE_MSG(hwnd, EM_GETCHARFORMAT, MD_RichEdit_OnGetCharFormat); + HANDLE_MSG(hwnd, EM_GETEVENTMASK, MD_RichEdit_OnGetEventMask); + HANDLE_MSG(hwnd, EM_GETOLEINTERFACE, MD_RichEdit_OnGetOleInterface); + HANDLE_MSG(hwnd, EM_GETPARAFORMAT, MD_RichEdit_OnGetParaFormat); + HANDLE_MSG(hwnd, EM_GETSELTEXT, MD_RichEdit_OnGetSelText); + HANDLE_MSG(hwnd, EM_HIDESELECTION, MD_RichEdit_OnHideSelection); + HANDLE_MSG(hwnd, EM_PASTESPECIAL, MD_RichEdit_OnPasteSpecial); + HANDLE_MSG(hwnd, EM_REQUESTRESIZE, MD_RichEdit_OnRequestResize); + HANDLE_MSG(hwnd, EM_SELECTIONTYPE, MD_RichEdit_OnSelectionType); + HANDLE_MSG(hwnd, EM_SETBKGNDCOLOR, MD_RichEdit_OnSetBkgndColor); + HANDLE_MSG(hwnd, EM_SETCHARFORMAT, MD_RichEdit_OnSetCharFormat); + HANDLE_MSG(hwnd, EM_SETEVENTMASK, MD_RichEdit_OnSetEventMask); + HANDLE_MSG(hwnd, EM_SETOLECALLBACK, MD_RichEdit_OnSetOleCallback); + HANDLE_MSG(hwnd, EM_SETPARAFORMAT, MD_RichEdit_OnSetParaFormat); + HANDLE_MSG(hwnd, EM_SETTARGETDEVICE, MD_RichEdit_OnSetTargetDevice); + HANDLE_MSG(hwnd, EM_STREAMIN, MD_RichEdit_OnStreamIn); + HANDLE_MSG(hwnd, EM_STREAMOUT, MD_RichEdit_OnStreamOut); + HANDLE_MSG(hwnd, EM_GETTEXTRANGE, MD_RichEdit_OnGetTextRange); + HANDLE_MSG(hwnd, EM_FINDWORDBREAK, MD_RichEdit_OnFindWordBreak); + HANDLE_MSG(hwnd, EM_SETOPTIONS, MD_RichEdit_OnSetOptions); + HANDLE_MSG(hwnd, EM_GETOPTIONS, MD_RichEdit_OnGetOptions); + HANDLE_MSG(hwnd, EM_FINDTEXTEX, MD_RichEdit_OnFindTextEx); + HANDLE_MSG(hwnd, EM_GETWORDBREAKPROCEX, MD_RichEdit_OnGetWordBreakProcEx); + HANDLE_MSG(hwnd, EM_SETWORDBREAKPROCEX, MD_RichEdit_OnSetWordBreakProcEx); + HANDLE_MSG(hwnd, EM_SETUNDOLIMIT, MD_RichEdit_OnSetUndoLimit); + HANDLE_MSG(hwnd, EM_REDO, MD_RichEdit_OnRedo); + HANDLE_MSG(hwnd, EM_CANREDO, MD_RichEdit_OnCanRedo); + HANDLE_MSG(hwnd, EM_GETUNDONAME, MD_RichEdit_OnGetUndoName); + HANDLE_MSG(hwnd, EM_GETREDONAME, MD_RichEdit_OnGetRedoName); + HANDLE_MSG(hwnd, EM_STOPGROUPTYPING, MD_RichEdit_OnStopGroupTyping); + HANDLE_MSG(hwnd, EM_SETTEXTMODE, MD_RichEdit_OnSetTextMode); + HANDLE_MSG(hwnd, EM_GETTEXTMODE, MD_RichEdit_OnGetTextMode); + } + } + + if ((sz[0] == TEXT('E') && lstrcmpi(szClass, TEXT("EDIT")) == 0) || + (sz[0] == TEXT('R') && lstrcmpi(szClass, RICHEDIT_CLASS) == 0)) { switch (uMsg) { @@ -4567,6 +5091,7 @@ MD_msgdump(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) #endif } } + switch (uMsg) { HANDLE_MSG(hwnd, WM_NULL, MD_OnNull); @@ -4848,7 +5373,56 @@ MD_msgresult(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT lResult sz[0] = szClass[0]; sz[1] = 0; CharUpper(sz); - if (sz[0] == TEXT('E') && lstrcmpi(szClass, TEXT("EDIT")) == 0) + + if (sz[0] == TEXT('R') && lstrcmpi(szClass, RICHEDIT_CLASS) == 0) + { + switch (uMsg) + { + DEFINE_RESULT(EM_CANPASTE); + DEFINE_RESULT(EM_DISPLAYBAND); + DEFINE_RESULT(EM_EXGETSEL); + DEFINE_RESULT(EM_EXLIMITTEXT); + DEFINE_RESULT(EM_EXLINEFROMCHAR); + DEFINE_RESULT(EM_EXSETSEL); + DEFINE_RESULT(EM_FINDTEXT); + DEFINE_RESULT(EM_FORMATRANGE); + DEFINE_RESULT(EM_GETCHARFORMAT); + DEFINE_RESULT(EM_GETEVENTMASK); + DEFINE_RESULT(EM_GETOLEINTERFACE); + DEFINE_RESULT(EM_GETPARAFORMAT); + DEFINE_RESULT(EM_GETSELTEXT); + DEFINE_RESULT(EM_HIDESELECTION); + DEFINE_RESULT(EM_PASTESPECIAL); + DEFINE_RESULT(EM_REQUESTRESIZE); + DEFINE_RESULT(EM_SELECTIONTYPE); + DEFINE_RESULT(EM_SETBKGNDCOLOR); + DEFINE_RESULT(EM_SETCHARFORMAT); + DEFINE_RESULT(EM_SETEVENTMASK); + DEFINE_RESULT(EM_SETOLECALLBACK); + DEFINE_RESULT(EM_SETPARAFORMAT); + DEFINE_RESULT(EM_SETTARGETDEVICE); + DEFINE_RESULT(EM_STREAMIN); + DEFINE_RESULT(EM_STREAMOUT); + DEFINE_RESULT(EM_GETTEXTRANGE); + DEFINE_RESULT(EM_FINDWORDBREAK); + DEFINE_RESULT(EM_SETOPTIONS); + DEFINE_RESULT(EM_GETOPTIONS); + DEFINE_RESULT(EM_FINDTEXTEX); + DEFINE_RESULT(EM_GETWORDBREAKPROCEX); + DEFINE_RESULT(EM_SETWORDBREAKPROCEX); + DEFINE_RESULT(EM_SETUNDOLIMIT); + DEFINE_RESULT(EM_REDO); + DEFINE_RESULT(EM_CANREDO); + DEFINE_RESULT(EM_GETUNDONAME); + DEFINE_RESULT(EM_GETREDONAME); + DEFINE_RESULT(EM_STOPGROUPTYPING); + DEFINE_RESULT(EM_SETTEXTMODE); + DEFINE_RESULT(EM_GETTEXTMODE); + } + } + + if ((sz[0] == TEXT('E') && lstrcmpi(szClass, TEXT("EDIT")) == 0) || + (sz[0] == TEXT('R') && lstrcmpi(szClass, RICHEDIT_CLASS) == 0)) { switch (uMsg) { @@ -5224,6 +5798,7 @@ MD_msgresult(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT lResult #endif } } + switch (uMsg) { DEFINE_RESULT(WM_NULL); diff --git a/sdk/include/reactos/winxx.h b/sdk/include/reactos/winxx.h index 7c662c7816e..e4acbbd8d6c 100644 --- a/sdk/include/reactos/winxx.h +++ b/sdk/include/reactos/winxx.h @@ -6,7 +6,7 @@ */ #ifndef _INC_WINXX -#define _INC_WINXX 6 /* Version 6 */ +#define _INC_WINXX 7 /* Version 7 */ #pragma once @@ -19,6 +19,9 @@ #ifndef _INC_COMMCTRL #include <commctrl.h> #endif +#ifndef _RICHEDIT_ + #include <richedit.h> +#endif /* additional message crackers */ @@ -1882,4 +1885,164 @@ #endif #endif +/* LRESULT RichEdit_OnCanPaste(HWND hwnd, UINT uFormat) */ +#define HANDLE_EM_CANPASTE(hwnd, wParam, lParam, fn) \ + (LRESULT)(fn)((hwnd), (UINT)(wParam)) + +/* BOOL RichEdit_OnDisplayBand(HWND hwnd, LPRECT lprc) */ +#define HANDLE_EM_DISPLAYBAND(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd), (LPRECT)(lParam)) + +/* void RichEdit_OnExGetSel(HWND hwnd, CHARRANGE *lpchr) */ +#define HANDLE_EM_EXGETSEL(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (CHARRANGE *)(lParam)), 0L) + +/* void RichEdit_OnExLimitText(HWND hwnd, DWORD cchTextMax) */ +#define HANDLE_EM_EXLIMITTEXT(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (DWORD)(lParam)), 0L) + +/* INT RichEdit_OnExLineFromChar(HWND hwnd, DWORD ichCharPos) */ +#define HANDLE_EM_EXLINEFROMCHAR(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd), (DWORD)(wParam)) + +/* INT RichEdit_OnExSetSel(HWND hwnd, INT ichChar) */ +#define HANDLE_EM_EXSETSEL(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd), (INT)(INT_PTR)(lParam)) + +/* INT RichEdit_OnFindText(HWND hwnd, UINT fuFlags, FINDTEXT *lpFindText) */ +#define HANDLE_EM_FINDTEXT(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd), (UINT)(wParam), (FINDTEXT *)(lParam)) + +/* INT RichEdit_OnFormatRange(HWND hwnd, BOOL fRender, FORMATRANGE *lpFmt) */ +#define HANDLE_EM_FORMATRANGE(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd), (BOOL)(wParam), (FORMATRANGE *)(lParam)) + +/* DWORD RichEdit_OnGetCharFormat(HWND hwnd, BOOL fSelection, CHARFORMAT *lpFmt) */ +#define HANDLE_EM_GETCHARFORMAT(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (BOOL)(wParam), (CHARFORMAT *)(lParam)) + +/* DWORD RichEdit_OnGetEventMask(HWND hwnd) */ +#define HANDLE_EM_GETEVENTMASK(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd)) + +/* BOOL RichEdit_OnOleInterface(HWND hwnd, LPVOID *ppObject) */ +#define HANDLE_EM_GETOLEINTERFACE(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd), (LPVOID *)(lParam)) + +/* DWORD RichEdit_OnGetParaFormat(HWND hwnd, PARAFORMAT *lpFmt) */ +#define HANDLE_EM_GETPARAFORMAT(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (PARAFORMAT *)(lParam)) + +/* INT RichEdit_OnGetSelText(HWND hwnd, LPTSTR lpBuf) */ +#define HANDLE_EM_GETSELTEXT(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd), (LPTSTR)(lParam)) + +/* void RichEdit_OnHideSelection(HWND hwnd, BOOL fHide, BOOL fChangeStyle) */ +#define HANDLE_EM_HIDESELECTION(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (BOOL)(wParam), (BOOL)(lParam)), 0L) + +/* void RichEdit_OnPasteSpecial(HWND hwnd, UINT uFormat, REPASTESPECIAL *lpRePasteSpecial) */ +#define HANDLE_EM_PASTESPECIAL(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (UINT)(wParam), (REPASTESPECIAL *)(lParam)), 0L) + +/* void RichEdit_OnRequestResize(HWND hwnd) */ +#define HANDLE_EM_REQUESTRESIZE(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) + +/* DWORD RichEdit_OnSelectionType(HWND hwnd) */ +#define HANDLE_EM_SELECTIONTYPE(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd)) + +/* COLORREF RichEdit_OnSetBkgndColor(HWND hwnd, BOOL fUseSysColor, COLORREF clr) */ +#define HANDLE_EM_SETBKGNDCOLOR(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (BOOL)(wParam), (COLORREF)(lParam)) + +/* BOOL RichEdit_OnSetCharFormat(HWND hwnd, UINT uFlags, CHARFORMAT *lpFmt) */ +#define HANDLE_EM_SETCHARFORMAT(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd), (UINT)(wParam), (CHARFORMAT *)(lParam)) + +/* DWORD RichEdit_OnSetEventMask(HWND hwnd, DWORD dwMask) */ +#define HANDLE_EM_SETEVENTMASK(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (DWORD)(lParam)) + +/* BOOL RichEdit_OnSetOleCallback(HWND hwnd, void *pCallback) */ +#define HANDLE_EM_SETOLECALLBACK(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd), (void *)(lParam)) + +/* BOOL RichEdit_OnSetParaFormat(HWND hwnd, PARAFORMAT *lpFmt) */ +#define HANDLE_EM_SETPARAFORMAT(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd), (PARAFORMAT *)(lParam)) + +/* BOOL RichEdit_OnSetTargetDevice(HWND hwnd, HDC hdcTarget, INT cxLineWidth) */ +#define HANDLE_EM_SETTARGETDEVICE(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd), (HDC)(wParam), (INT)(lParam)) + +/* DWORD RichEdit_OnStreamIn(HWND hwnd, UINT uFormat, EDITSTREAM *lpStream) */ +#define HANDLE_EM_STREAMIN(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (UINT)(wParam), (EDITSTREAM *)(lParam)) + +/* DWORD RichEdit_OnStreamOut(HWND hwnd, UINT uFormat, EDITSTREAM *lpStream) */ +#define HANDLE_EM_STREAMOUT(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (UINT)(wParam), (EDITSTREAM *)(lParam)) + +/* DWORD RichEdit_OnGetTextRange(HWND hwnd, TEXTRANGE *lpRange) */ +#define HANDLE_EM_GETTEXTRANGE(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (TEXTRANGE *)(lParam)) + +/* DWORD RichEdit_OnFindWordBreak(HWND hwnd, UINT code, DWORD ichStart) */ +#define HANDLE_EM_FINDWORDBREAK(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (UINT)(wParam), (DWORD)(lParam)) + +/* UINT RichEdit_OnSetOptions(HWND hwnd, UINT fOperation, UINT fOptions) */ +#define HANDLE_EM_SETOPTIONS(hwnd, wParam, lParam, fn) \ + (UINT)(fn)((hwnd), (UINT)(wParam), (UINT)(lParam)) + +/* UINT RichEdit_OnGetOptions(HWND hwnd) */ +#define HANDLE_EM_GETOPTIONS(hwnd, wParam, lParam, fn) \ + (UINT)(fn)((hwnd)) + +/* INT RichEdit_OnFindTextEx(HWND hwnd, UINT fuFlags, FINDTEXTEX *lpFindText) */ +#define HANDLE_EM_FINDTEXTEX(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd), (UINT)(wParam), (FINDTEXTEX *)(lParam)) + +/* void *RichEdit_OnGetWordBreakProcEx(HWND hwnd) */ +#define HANDLE_EM_GETWORDBREAKPROCEX(hwnd, wParam, lParam, fn) \ + (LRESULT)(void *)(fn)((hwnd)) + +/* void *RichEdit_OnSetWordBreakProcEx(HWND hwnd, void *pfn) */ +#define HANDLE_EM_SETWORDBREAKPROCEX(hwnd, wParam, lParam, fn) \ + (LRESULT)(void *)(fn)((hwnd), (void *)(lParam)) + +/* DWORD RichEdit_OnSetUndoLimit(HWND hwnd, DWORD dwMaxUndo) */ +#define HANDLE_EM_SETUNDOLIMIT(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd), (DWORD)(wParam)) + +/* BOOL RichEdit_OnRedo(HWND hwnd) */ +#define HANDLE_EM_REDO(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd)) + +/* BOOL RichEdit_OnCanRedo(HWND hwnd) */ +#define HANDLE_EM_CANREDO(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd)) + +/* INT RichEdit_OnGetUndoName(HWND hwnd) */ +#define HANDLE_EM_GETUNDONAME(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd)) + +/* INT RichEdit_OnGetRedoName(HWND hwnd) */ +#define HANDLE_EM_GETREDONAME(hwnd, wParam, lParam, fn) \ + (INT)(fn)((hwnd)) + +/* void RichEdit_OnStopGroupTyping(HWND hwnd) */ +#define HANDLE_EM_STOPGROUPTYPING(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) + +/* BOOL RichEdit_OnSetTextMode(HWND hwnd, DWORD dwTextMode) */ +#define HANDLE_EM_SETTEXTMODE(hwnd, wParam, lParam, fn) \ + (BOOL)(fn)((hwnd), (DWORD)(wParam)) + +/* DWORD RichEdit_OnGetTextMode(HWND hwnd) */ +#define HANDLE_EM_GETTEXTMODE(hwnd, wParam, lParam, fn) \ + (DWORD)(fn)((hwnd)) + #endif

1 0

[reactos] 01/01: [ATL_APITEST] Add 'atltest.h' and use it (#1822)
by Katayama Hirofumi MZ 12 Aug '19

12 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a800fa7bb2277771be141… commit a800fa7bb2277771be14196f1a0f012776f8b260 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 12 19:24:08 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 12 19:24:08 2019 +0900 [ATL_APITEST] Add 'atltest.h' and use it (#1822) - Add "atltest.h" header file for common use in atl_apitest. - Delete the duplicated and simplify. --- modules/rostests/apitests/atl/CAtlArray.cpp | 27 +---- modules/rostests/apitests/atl/CAtlFileMapping.cpp | 59 +-------- modules/rostests/apitests/atl/CAtlList.cpp | 27 +---- modules/rostests/apitests/atl/CComObject.cpp | 27 +---- modules/rostests/apitests/atl/CComQIPtr.cpp | 27 +---- modules/rostests/apitests/atl/CImage.cpp | 27 +---- modules/rostests/apitests/atl/CSimpleArray.cpp | 27 +---- modules/rostests/apitests/atl/CSimpleMap.cpp | 27 +---- modules/rostests/apitests/atl/CString.cpp | 59 +-------- modules/rostests/apitests/atl/atltest.h | 138 ++++++++++++++++++++++ 10 files changed, 147 insertions(+), 298 deletions(-) diff --git a/modules/rostests/apitests/atl/CAtlArray.cpp b/modules/rostests/apitests/atl/CAtlArray.cpp index 8527c4ac47d..b1e654bf109 100644 --- a/modules/rostests/apitests/atl/CAtlArray.cpp +++ b/modules/rostests/apitests/atl/CAtlArray.cpp @@ -9,27 +9,7 @@ #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) + #include "atltest.h" #endif #include <atlbase.h> @@ -161,9 +141,4 @@ START_TEST(CAtlArray) 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/CAtlFileMapping.cpp b/modules/rostests/apitests/atl/CAtlFileMapping.cpp index 0e0ef5909c9..c0e2348d170 100644 --- a/modules/rostests/apitests/atl/CAtlFileMapping.cpp +++ b/modules/rostests/apitests/atl/CAtlFileMapping.cpp @@ -10,59 +10,7 @@ #ifdef HAVE_APITEST #include <apitest.h> #else - #include <stdlib.h> - #include <stdio.h> - #include <stdarg.h> - #include <windows.h> - int g_tests_executed = 0; - int g_tests_failed = 0; - int g_tests_skipped = 0; - const char *g_file = NULL; - int g_line = 0; - void set_location(const char *file, int line) - { - g_file = file; - g_line = line; - } - void ok_func(int value, const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - if (!value) - { - printf("%s (%d): ", g_file, g_line); - vprintf(fmt, va); - g_tests_failed++; - } - g_tests_executed++; - va_end(va); - } - void skip_func(const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - printf("%s (%d): test skipped: ", g_file, g_line); - vprintf(fmt, va); - g_tests_skipped++; - va_end(va); - } - #undef ok - #define ok(value, ...) do { \ - set_location(__FILE__, __LINE__); \ - ok_func(value, __VA_ARGS__); \ - } while (0) - #define ok_(x1,x2) set_location(x1,x2); ok_func - #define skip(...) do { \ - set_location(__FILE__, __LINE__); \ - skip_func(__VA_ARGS__); \ - } while (0) - #define START_TEST(x) int main() - char *wine_dbgstr_w(const wchar_t *wstr) - { - static char buf[512]; - WideCharToMultiByte(CP_ACP, 0, wstr, -1, buf, _countof(buf), NULL, NULL); - return buf; - } + #include "atltest.h" #endif struct TestData @@ -246,9 +194,4 @@ START_TEST(CAtlFileMapping) { test_SharedMem(); test_FileMapping(); - -#ifndef HAVE_APITEST - printf("CAtlFile: %i tests executed (0 marked as todo, %i failures), %i skipped.\n", g_tests_executed, g_tests_failed, g_tests_skipped); - return g_tests_failed; -#endif } diff --git a/modules/rostests/apitests/atl/CAtlList.cpp b/modules/rostests/apitests/atl/CAtlList.cpp index eb8cb761620..1f5e4c7d789 100644 --- a/modules/rostests/apitests/atl/CAtlList.cpp +++ b/modules/rostests/apitests/atl/CAtlList.cpp @@ -9,27 +9,7 @@ #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) + #include "atltest.h" #endif #include <atlbase.h> @@ -73,9 +53,4 @@ START_TEST(CAtlList) 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/CComObject.cpp b/modules/rostests/apitests/atl/CComObject.cpp index e40e0b8f691..396290dfd5e 100644 --- a/modules/rostests/apitests/atl/CComObject.cpp +++ b/modules/rostests/apitests/atl/CComObject.cpp @@ -12,27 +12,7 @@ #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) + #include "atltest.h" #endif @@ -141,9 +121,4 @@ START_TEST(CComObject) ok(g_DTOR == 1, "Expected 1, got %lu\n", g_DTOR); ok(g_BLIND == 1, "Expected 1, got %lu\n", g_BLIND); } - -#ifndef HAVE_APITEST - printf("CComObject: %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/CComQIPtr.cpp b/modules/rostests/apitests/atl/CComQIPtr.cpp index 677e6231890..f662d15028b 100644 --- a/modules/rostests/apitests/atl/CComQIPtr.cpp +++ b/modules/rostests/apitests/atl/CComQIPtr.cpp @@ -11,27 +11,7 @@ #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) + #include "atltest.h" #endif @@ -154,9 +134,4 @@ START_TEST(CComQIPtr) #endif ok(g_QI == 5, "Expected g_QI 5, got %lu\n", g_QI); } - -#ifndef HAVE_APITEST - printf("CComQIPtr: %i tests executed (0 marked as todo, %i failures), 0 skipped.\n", g_tests_executed, g_tests_failed); - return g_tests_failed; -#endif } diff --git a/modules/rostests/apitests/atl/CImage.cpp b/modules/rostests/apitests/atl/CImage.cpp index 1692cd71a48..f2dd08481ec 100644 --- a/modules/rostests/apitests/atl/CImage.cpp +++ b/modules/rostests/apitests/atl/CImage.cpp @@ -11,27 +11,7 @@ #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) + #include "atltest.h" #endif const TCHAR* szFiles[] = { @@ -331,9 +311,4 @@ START_TEST(CImage) ok(lstrcmpA(psz, "All Image Files|*.BMP;*.DIB;*.RLE;*.JPG;*.JPEG;*.JPE;*.JFIF;*.GIF;*.EMF;*.WMF;*.TIF;*.TIFF;*.PNG;*.ICO|BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|GIF (*.GIF)|*.GIF|EMF (*.EMF)|*.EMF|WMF (*.WMF)|*.WMF|TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|PNG (*.PNG)|*.PNG|ICO (*.ICO)|*.ICO||") == 0, "The exporter filter string is bad, was: %s\n", psz); #endif - -#ifndef HAVE_APITEST - printf("CImage: %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/CSimpleArray.cpp b/modules/rostests/apitests/atl/CSimpleArray.cpp index 80603066440..dcb6c5661cf 100644 --- a/modules/rostests/apitests/atl/CSimpleArray.cpp +++ b/modules/rostests/apitests/atl/CSimpleArray.cpp @@ -8,27 +8,7 @@ #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) + #include "atltest.h" #endif #include <atlbase.h> @@ -178,9 +158,4 @@ START_TEST(CSimpleArray) } ok(!!array1.RemoveAt(0), "Expected RemoveAt(0) to succeed\n"); ok(array1.GetSize() == 0, "Expected array1.GetSize() is 0, was: %d\n", array1.GetSize()); - -#ifndef HAVE_APITEST - printf("CSimpleArray: %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/CSimpleMap.cpp b/modules/rostests/apitests/atl/CSimpleMap.cpp index 2d1afb9c8d7..f21e9831be4 100644 --- a/modules/rostests/apitests/atl/CSimpleMap.cpp +++ b/modules/rostests/apitests/atl/CSimpleMap.cpp @@ -8,27 +8,7 @@ #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) + #include "atltest.h" #endif #include <atlbase.h> @@ -198,9 +178,4 @@ START_TEST(CSimpleMap) ok(map1.GetSize() == 1, "Expected map1's size is 1, was %d\n", map1.GetSize()); ok(!!map1.RemoveAt(0), "Expected RemoveAt(0) to succeed\n"); ok(map1.GetSize() == 0, "Expected map1's size is 0, was %d\n", map1.GetSize()); - -#ifndef HAVE_APITEST - printf("CSimpleMap: %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/CString.cpp b/modules/rostests/apitests/atl/CString.cpp index 22ce8dfc0dc..bb96f3f7d8b 100644 --- a/modules/rostests/apitests/atl/CString.cpp +++ b/modules/rostests/apitests/atl/CString.cpp @@ -12,59 +12,7 @@ #ifdef HAVE_APITEST #include <apitest.h> #else - #include <stdlib.h> - #include <stdio.h> - #include <stdarg.h> - #include <windows.h> - int g_tests_executed = 0; - int g_tests_failed = 0; - int g_tests_skipped = 0; - const char *g_file = NULL; - int g_line = 0; - void set_location(const char *file, int line) - { - g_file = file; - g_line = line; - } - void ok_func(int value, const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - if (!value) - { - printf("%s (%d): ", g_file, g_line); - vprintf(fmt, va); - g_tests_failed++; - } - g_tests_executed++; - va_end(va); - } - void skip_func(const char *fmt, ...) - { - va_list va; - va_start(va, fmt); - printf("%s (%d): test skipped: ", g_file, g_line); - vprintf(fmt, va); - g_tests_skipped++; - va_end(va); - } - #undef ok - #define ok(value, ...) do { \ - set_location(__FILE__, __LINE__); \ - ok_func(value, __VA_ARGS__); \ - } while (0) - #define ok_(x1,x2) set_location(x1,x2); ok_func - #define skip(...) do { \ - set_location(__FILE__, __LINE__); \ - skip_func(__VA_ARGS__); \ - } while (0) - #define START_TEST(x) int main(void) - char *wine_dbgstr_w(const wchar_t *wstr) - { - static char buf[512]; - WideCharToMultiByte(CP_ACP, 0, wstr, -1, buf, _countof(buf), NULL, NULL); - return buf; - } + #include "atltest.h" #endif struct traits_test @@ -256,9 +204,4 @@ START_TEST(CString) test_bstrW(); test_bstrA(); - -#ifndef HAVE_APITEST - printf("CString: %i tests executed (0 marked as todo, %i failures), %i skipped.\n", g_tests_executed, g_tests_failed, g_tests_skipped); - return g_tests_failed; -#endif } diff --git a/modules/rostests/apitests/atl/atltest.h b/modules/rostests/apitests/atl/atltest.h new file mode 100644 index 00000000000..9fb1ede6ac5 --- /dev/null +++ b/modules/rostests/apitests/atl/atltest.h @@ -0,0 +1,138 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Testing + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#ifndef ATLTEST_H_ +#define ATLTEST_H_ + +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <string.h> +#ifndef _INC_WINDOWS + #include <windows.h> +#endif + +int g_atltest_executed = 0; +int g_atltest_failed = 0; +int g_atltest_skipped = 0; + +const char *g_atltest_file = NULL; +int g_atltest_line = 0; + +void atltest_set_location(const char *file, int line) +{ + g_atltest_file = file; + g_atltest_line = line; +} + +void atltest_ok(int value, const char *fmt, ...) +{ + va_list va; + va_start(va, fmt); + if (!value) + { + printf("%s (%d): ", g_atltest_file, g_atltest_line); + vprintf(fmt, va); + g_atltest_failed++; + } + g_atltest_executed++; + va_end(va); +} + +void atltest_skip(const char *fmt, ...) +{ + va_list va; + va_start(va, fmt); + printf("%s (%d): test skipped: ", g_atltest_file, g_atltest_line); + vprintf(fmt, va); + g_atltest_skipped++; + va_end(va); +} + +#undef ok +#define ok(value, ...) do { \ + atltest_set_location(__FILE__, __LINE__); \ + atltest_ok(value, __VA_ARGS__); \ +} while (0) +#define ok_(x1,x2) atltest_set_location(x1,x2); atltest_ok + +#undef skip +#define skip(...) do { \ + atltest_set_location(__FILE__, __LINE__); \ + atltest_skip(__VA_ARGS__); \ +} while (0) + +#undef trace +#define trace printf + +static void atltest_start_test(void); +extern const char *g_atltest_name; + +#define START_TEST(x) \ + const char *g_atltest_name = #x; \ + static void atltest_start_test(void) + +int main(void) +{ + atltest_start_test(); + printf("%s: %d tests executed (0 marked as todo, %d failures), %d skipped.\n", + g_atltest_name, g_atltest_executed, g_atltest_failed, g_atltest_skipped); + return g_atltest_failed; +} + +char *wine_dbgstr_w(const wchar_t *wstr) +{ + static char buf[512]; + WideCharToMultiByte(CP_ACP, 0, wstr, -1, buf, _countof(buf), NULL, NULL); + return buf; +} + +#define ok_hex(expression, result) \ + do { \ + int _value = (expression); \ + ok(_value == (result), "Wrong value for '%s', expected: " #result " (0x%x), got: 0x%x\n", \ + #expression, (int)(result), _value); \ + } while (0) + +#define ok_dec(expression, result) \ + do { \ + int _value = (expression); \ + ok(_value == (result), "Wrong value for '%s', expected: " #result " (%d), got: %d\n", \ + #expression, (int)(result), _value); \ + } while (0) + +#define ok_ptr(expression, result) \ + do { \ + void *_value = (expression); \ + ok(_value == (result), "Wrong value for '%s', expected: " #result " (%p), got: %p\n", \ + #expression, (void*)(result), _value); \ + } while (0) + +#define ok_size_t(expression, result) \ + do { \ + size_t _value = (expression); \ + ok(_value == (result), "Wrong value for '%s', expected: " #result " (%Ix), got: %Ix\n", \ + #expression, (size_t)(result), _value); \ + } while (0) + +#define ok_char(expression, result) ok_hex(expression, result) + +#define ok_err(error) \ + ok(GetLastError() == (error), "Wrong last error. Expected " #error ", got 0x%lx\n", GetLastError()) + +#define ok_str(x, y) \ + ok(strcmp(x, y) == 0, "Wrong string. Expected '%s', got '%s'\n", y, x) + +#define ok_wstr(x, y) \ + ok(wcscmp(x, y) == 0, "Wrong string. Expected '%S', got '%S'\n", y, x) + +#define ok_long(expression, result) ok_hex(expression, result) +#define ok_int(expression, result) ok_dec(expression, result) +#define ok_ntstatus(status, expected) ok_hex(status, expected) +#define ok_hdl ok_ptr + +#endif /* ndef ATLTEST_H_ */

1 0

[reactos] 04/04: [ATL] Add a minimal CAtlArray implementation
by Mark Jansen 11 Aug '19

11 Aug '19

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 {

1 0

[reactos] 03/04: [ATL_APITEST] Add simple test for CAtlArray
by Mark Jansen 11 Aug '19

11 Aug '19

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

1 0

[reactos] 02/04: [ATL_APITEST] Change proj files to have a different intermediate dir
by Mark Jansen 11 Aug '19

11 Aug '19

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>

1 0

[reactos] 01/04: [ATL][ATL_APITEST] Add CAtlList::InsertBefore/After + test
by Mark Jansen 11 Aug '19

11 Aug '19

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() {

1 0

[reactos] 01/01: Addendum to fba4ad4c.
by Hermès Bélusca-Maïto 11 Aug '19

11 Aug '19

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

1 0

[reactos] 01/01: [FREELDR] Move files where they are only used.
by Hermès Bélusca-Maïto 11 Aug '19

11 Aug '19

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

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs