Ros-diffs August 2021

ros-diffs@reactos.org

16 participants
93 discussions

[reactos] 06/06: [WIN32K:NTUSER] In debug builds, enable free & tail checking when creating heaps

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd6fb80867fc9ac5f7216… commit bd6fb80867fc9ac5f7216f8695803d16d1de9ee9 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jul 30 15:59:40 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Aug 3 23:13:19 2021 +0200 [WIN32K:NTUSER] In debug builds, enable free & tail checking when creating heaps Actually catches bugs --- win32ss/user/ntuser/usrheap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/usrheap.c b/win32ss/user/ntuser/usrheap.c index 69845d4432c..f668331b374 100644 --- a/win32ss/user/ntuser/usrheap.c +++ b/win32ss/user/ntuser/usrheap.c @@ -163,7 +163,11 @@ IntUserHeapCreate(IN PVOID SectionObject, Parameters.InitialReserve = (SIZE_T)HeapSize; Parameters.CommitRoutine = IntUserHeapCommitRoutine; - pHeap = RtlCreateHeap(HEAP_ZERO_MEMORY | HEAP_NO_SERIALIZE, + pHeap = RtlCreateHeap( +#if DBG /* Enable checks on debug builds */ + HEAP_FREE_CHECKING_ENABLED | HEAP_TAIL_CHECKING_ENABLED | +#endif + HEAP_ZERO_MEMORY | HEAP_NO_SERIALIZE, *SystemMappedBase, (SIZE_T)HeapSize, ViewSize,

3 years, 1 month

[reactos] 05/06: [WIN32K:USER] Fix potential use after free when painting child windows

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b783b16cef2e2573b0432… commit b783b16cef2e2573b04327678eac73129bffcf44 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jul 30 15:44:57 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Aug 3 23:13:19 2021 +0200 [WIN32K:USER] Fix potential use after free when painting child windows --- win32ss/user/ntuser/painting.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/win32ss/user/ntuser/painting.c b/win32ss/user/ntuser/painting.c index eb2815c6442..e0e4893a4b0 100644 --- a/win32ss/user/ntuser/painting.c +++ b/win32ss/user/ntuser/painting.c @@ -369,14 +369,26 @@ IntSendNCPaint(PWND pWnd, HRGN hRgn) VOID FASTCALL IntSendChildNCPaint(PWND pWnd) { - for (pWnd = pWnd->spwndChild; pWnd; pWnd = pWnd->spwndNext) + pWnd = pWnd->spwndChild; + while (pWnd) { if ((pWnd->hrgnUpdate == NULL) && (pWnd->state & WNDS_SENDNCPAINT)) { + PWND Next; USER_REFERENCE_ENTRY Ref; + + /* Reference, IntSendNCPaint leaves win32k */ UserRefObjectCo(pWnd, &Ref); IntSendNCPaint(pWnd, HRGN_WINDOW); + + /* Make sure to grab next one before dereferencing/freeing */ + Next = pWnd->spwndNext; UserDerefObjectCo(pWnd); + pWnd = Next; + } + else + { + pWnd = pWnd->spwndNext; } } } @@ -530,7 +542,7 @@ co_IntUpdateWindows(PWND Wnd, ULONG Flags, BOOL Recurse) Wnd->state &= ~WNDS_UPDATEDIRTY; Wnd->state2 |= WNDS2_WMPAINTSENT; - co_IntSendMessage(hWnd, WM_PAINT, 0, 0); + co_IntSendMessage(hWnd, WM_PAINT, 0, 0); if (Wnd->state & WNDS_PAINTNOTPROCESSED) { @@ -548,7 +560,7 @@ co_IntUpdateWindows(PWND Wnd, ULONG Flags, BOOL Recurse) * Update child windows. */ - if (!(Flags & RDW_NOCHILDREN) && + if (!(Flags & RDW_NOCHILDREN) && (Flags & RDW_ALLCHILDREN) && !UserIsDesktopWindow(Wnd)) { @@ -814,7 +826,7 @@ IntInvalidateWindows(PWND Wnd, PREGION Rgn, ULONG Flags) if (!(Flags & RDW_NOCHILDREN) && !(Wnd->style & WS_MINIMIZE) && ((Flags & RDW_ALLCHILDREN) || !(Wnd->style & WS_CLIPCHILDREN))) - { + { PWND Child; for (Child = Wnd->spwndChild; Child; Child = Child->spwndNext) @@ -928,7 +940,7 @@ co_UserRedrawWindow( if (Window == UserGetDesktopWindow()) { TmpRgn = IntSysCreateRectpRgnIndirect(UpdateRect); - } + } else { TmpRgn = IntSysCreateRectpRgn(Window->rcClient.left + UpdateRect->left, @@ -2164,7 +2176,7 @@ UserDrawCaptionText( (RECTL *)&r, DT_END_ELLIPSIS|DT_SINGLELINE|DT_VCENTER|DT_NOPREFIX|DT_LEFT); } - + IntGdiSetTextColor(hDc, OldTextColor); if (hOldFont)

3 years, 1 month

[reactos] 04/06: [WIN32K:NTUSER] Assert global user lock is held exclusively when using global & desktop heaps

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d958dc9bc2bfb818f0604… commit d958dc9bc2bfb818f0604c471e6d9dc84beab4a5 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jul 30 15:42:09 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Aug 3 23:13:19 2021 +0200 [WIN32K:NTUSER] Assert global user lock is held exclusively when using global & desktop heaps They're explicitly not serialized because we count on this. --- win32ss/user/ntuser/desktop.h | 7 +++++++ win32ss/user/ntuser/usrheap.h | 7 +++++++ win32ss/win32kp.h | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/desktop.h b/win32ss/user/ntuser/desktop.h index 3043af678c4..5a7f4bca500 100644 --- a/win32ss/user/ntuser/desktop.h +++ b/win32ss/user/ntuser/desktop.h @@ -230,6 +230,8 @@ static __inline PVOID DesktopHeapAlloc(IN PDESKTOP Desktop, IN SIZE_T Bytes) { + /* Desktop heap has no lock, using global user lock instead. */ + ASSERT(UserIsEnteredExclusive()); return RtlAllocateHeap(Desktop->pheapDesktop, HEAP_NO_SERIALIZE, Bytes); @@ -239,6 +241,8 @@ static __inline BOOL DesktopHeapFree(IN PDESKTOP Desktop, IN PVOID lpMem) { + /* Desktop heap has no lock, using global user lock instead. */ + ASSERT(UserIsEnteredExclusive()); return RtlFreeHeap(Desktop->pheapDesktop, HEAP_NO_SERIALIZE, lpMem); @@ -259,6 +263,9 @@ DesktopHeapReAlloc(IN PDESKTOP Desktop, SIZE_T PrevSize; PVOID pNew; + /* Desktop heap has no lock, using global user lock instead. */ + ASSERT(UserIsEnteredExclusive()); + PrevSize = RtlSizeHeap(Desktop->pheapDesktop, HEAP_NO_SERIALIZE, lpMem); diff --git a/win32ss/user/ntuser/usrheap.h b/win32ss/user/ntuser/usrheap.h index e652b80fa35..fb2051eae09 100644 --- a/win32ss/user/ntuser/usrheap.h +++ b/win32ss/user/ntuser/usrheap.h @@ -33,6 +33,8 @@ MapGlobalUserHeap(IN PEPROCESS Process, static __inline PVOID UserHeapAlloc(SIZE_T Bytes) { + /* User heap has no lock, using global user lock instead. */ + ASSERT(UserIsEnteredExclusive()); return RtlAllocateHeap(GlobalUserHeap, HEAP_NO_SERIALIZE, Bytes); @@ -41,6 +43,8 @@ UserHeapAlloc(SIZE_T Bytes) static __inline BOOL UserHeapFree(PVOID lpMem) { + /* User heap has no lock, using global user lock instead. */ + ASSERT(UserIsEnteredExclusive()); return RtlFreeHeap(GlobalUserHeap, HEAP_NO_SERIALIZE, lpMem); @@ -60,6 +64,9 @@ UserHeapReAlloc(PVOID lpMem, SIZE_T PrevSize; PVOID pNew; + /* User heap has no lock, using global user lock instead. */ + ASSERT(UserIsEnteredExclusive()); + PrevSize = RtlSizeHeap(GlobalUserHeap, HEAP_NO_SERIALIZE, lpMem); diff --git a/win32ss/win32kp.h b/win32ss/win32kp.h index 06ff74638ff..a336c2fe42c 100644 --- a/win32ss/win32kp.h +++ b/win32ss/win32kp.h @@ -58,9 +58,9 @@ typedef struct _DC *PDC; #include "user/ntuser/win32.h" #include "user/ntuser/tags.h" #ifndef __cplusplus +#include "user/ntuser/ntuser.h" #include "user/ntuser/usrheap.h" #include "user/ntuser/object.h" -#include "user/ntuser/ntuser.h" #include "user/ntuser/shutdown.h" #include "user/ntuser/cursoricon.h" #include "user/ntuser/accelerator.h"

3 years, 1 month

[reactos] 03/06: [WIN32K:NTUSER] Make sure to hold User Global Lock before unmapping desktop heap

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c098ee8d2de3c771b934… commit 8c098ee8d2de3c771b934f02cb2f1e0140a398d1 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jul 30 15:58:22 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Aug 3 23:13:19 2021 +0200 [WIN32K:NTUSER] Make sure to hold User Global Lock before unmapping desktop heap --- win32ss/user/ntuser/desktop.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index e9f61c3742e..eae7a8b2ef2 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -215,6 +215,7 @@ NTAPI IntDesktopObjectClose( _In_ PVOID Parameters) { + NTSTATUS Ret; PWIN32_CLOSEMETHOD_PARAMETERS CloseParameters = Parameters; PPROCESSINFO ppi = PsGetProcessWin32Process(CloseParameters->Process); if (ppi == NULL) @@ -224,7 +225,10 @@ IntDesktopObjectClose( return STATUS_SUCCESS; } - return IntUnmapDesktopView((PDESKTOP)CloseParameters->Object); + UserEnterExclusive(); + Ret = IntUnmapDesktopView((PDESKTOP)CloseParameters->Object); + UserLeave(); + return Ret; }

3 years, 1 month

[reactos] 02/06: [WIN32K:NTUSER] Allocate & free timers under global user lock

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ec0420dc6ba17e58ffa9… commit 6ec0420dc6ba17e58ffa9cbb9ab4a190ba5b2e6c Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jul 30 15:40:33 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Aug 3 23:13:19 2021 +0200 [WIN32K:NTUSER] Allocate & free timers under global user lock --- win32ss/user/ntuser/simplecall.c | 9 ++++++++- win32ss/user/ntuser/timer.c | 37 +++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index fdc52c1c478..ce190357db1 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -761,7 +761,14 @@ NtUserCallHwndParam( switch (Routine) { case HWNDPARAM_ROUTINE_KILLSYSTEMTIMER: - return IntKillTimer(UserGetWindowObject(hWnd), (UINT_PTR)Param, TRUE); + { + DWORD ret; + + UserEnterExclusive(); + ret = IntKillTimer(UserGetWindowObject(hWnd), (UINT_PTR)Param, TRUE); + UserLeave(); + return ret; + } case HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID: { diff --git a/win32ss/user/ntuser/timer.c b/win32ss/user/ntuser/timer.c index 3ae4dea0f88..31ec4e256da 100644 --- a/win32ss/user/ntuser/timer.c +++ b/win32ss/user/ntuser/timer.c @@ -635,19 +635,18 @@ NtUserSetTimer ) { PWND Window = NULL; - DECLARE_RETURN(UINT_PTR); + UINT_PTR ret; TRACE("Enter NtUserSetTimer\n"); UserEnterExclusive(); if (hWnd) Window = UserGetWindowObject(hWnd); - UserLeave(); - RETURN(IntSetTimer(Window, nIDEvent, uElapse, lpTimerFunc, TMRF_TIFROMWND)); + ret = IntSetTimer(Window, nIDEvent, uElapse, lpTimerFunc, TMRF_TIFROMWND); -CLEANUP: - TRACE("Leave NtUserSetTimer, ret=%u\n", _ret_); + UserLeave(); + TRACE("Leave NtUserSetTimer, ret=%u\n", ret); - END_CLEANUP; + return ret; } @@ -660,18 +659,18 @@ NtUserKillTimer ) { PWND Window = NULL; - DECLARE_RETURN(BOOL); + BOOL ret; TRACE("Enter NtUserKillTimer\n"); UserEnterExclusive(); if (hWnd) Window = UserGetWindowObject(hWnd); - UserLeave(); - RETURN(IntKillTimer(Window, uIDEvent, FALSE)); + ret = IntKillTimer(Window, uIDEvent, FALSE); -CLEANUP: - TRACE("Leave NtUserKillTimer, ret=%i\n", _ret_); - END_CLEANUP; + UserLeave(); + + TRACE("Leave NtUserKillTimer, ret=%i\n", ret); + return ret; } @@ -684,15 +683,17 @@ NtUserSetSystemTimer( TIMERPROC lpTimerFunc ) { - DECLARE_RETURN(UINT_PTR); + UINT_PTR ret; + + UserEnterExclusive(); + TRACE("Enter NtUserSetSystemTimer\n"); - TRACE("Enter NtUserSetSystemTimer\n"); + ret = IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, NULL, TMRF_SYSTEM); - RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, NULL, TMRF_SYSTEM)); + UserLeave(); -CLEANUP: - TRACE("Leave NtUserSetSystemTimer, ret=%u\n", _ret_); - END_CLEANUP; + TRACE("Leave NtUserSetSystemTimer, ret=%u\n", ret); + return ret; } BOOL

3 years, 1 month

[reactos] 01/06: [WIN32K] On init, start by initializing NtUser stuff

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=515d83a883ae01c8ccaca… commit 515d83a883ae01c8ccaca6d56e47d0ae4bdb0305 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jul 30 15:38:10 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Aug 3 23:13:19 2021 +0200 [WIN32K] On init, start by initializing NtUser stuff Allocate gpsi (Global Server Info) after initializing & grabbing Userlock --- win32ss/user/ntuser/main.c | 12 +----------- win32ss/user/ntuser/ntuser.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index f054021d853..1c8e0c53337 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -968,16 +968,7 @@ DriverEntry( return STATUS_UNSUCCESSFUL; } - /* Allocate global server info structure */ - gpsi = UserHeapAlloc(sizeof(*gpsi)); - if (!gpsi) - { - DPRINT1("Failed allocate server info structure!\n"); - return STATUS_UNSUCCESSFUL; - } - - RtlZeroMemory(gpsi, sizeof(*gpsi)); - DPRINT("Global Server Data -> %p\n", gpsi); + NT_ROF(InitUserImpl()); NT_ROF(InitGdiHandleTable()); NT_ROF(InitPaletteImpl()); @@ -992,7 +983,6 @@ DriverEntry( NT_ROF(InitLDEVImpl()); NT_ROF(InitDeviceImpl()); NT_ROF(InitDcImpl()); - NT_ROF(InitUserImpl()); NT_ROF(InitWindowStationImpl()); NT_ROF(InitDesktopImpl()); NT_ROF(InitInputImpl()); diff --git a/win32ss/user/ntuser/ntuser.c b/win32ss/user/ntuser/ntuser.c index 44fa120c9c6..9ada594c363 100644 --- a/win32ss/user/ntuser/ntuser.c +++ b/win32ss/user/ntuser/ntuser.c @@ -81,6 +81,20 @@ InitUserImpl(VOID) ExInitializeResourceLite(&UserLock); + /* Hold global resource to make sanity checks happy. */ + UserEnterExclusive(); + + /* Allocate global server info structure */ + gpsi = UserHeapAlloc(sizeof(*gpsi)); + if (!gpsi) + { + ERR("Failed allocate server info structure!\n"); + return STATUS_UNSUCCESSFUL; + } + + RtlZeroMemory(gpsi, sizeof(*gpsi)); + TRACE("Global Server Data -> %p\n", gpsi); + if (!UserCreateHandleTable()) { ERR("Failed creating handle table\n"); @@ -108,6 +122,8 @@ InitUserImpl(VOID) InitSysParams(); + UserLeave(); + return STATUS_SUCCESS; }

3 years, 1 month

[reactos] 01/01: [NTOS:MM] Remove dead code

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be6a6b806af7dbd1ff86c… commit be6a6b806af7dbd1ff86c43549d5cb7779a5b8b3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Aug 3 10:57:12 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Aug 3 10:57:12 2021 +0200 [NTOS:MM] Remove dead code --- ntoskrnl/mm/ARM3/pfnlist.c | 10 ---------- ntoskrnl/mm/balance.c | 45 --------------------------------------------- 2 files changed, 55 deletions(-) diff --git a/ntoskrnl/mm/ARM3/pfnlist.c b/ntoskrnl/mm/ARM3/pfnlist.c index bbf4275a9df..5712f22557a 100644 --- a/ntoskrnl/mm/ARM3/pfnlist.c +++ b/ntoskrnl/mm/ARM3/pfnlist.c @@ -598,9 +598,6 @@ MiRemoveZeroPage(IN ULONG Color) return PageIndex; } -/* HACK for keeping legacy Mm alive */ -extern BOOLEAN MmRosNotifyAvailablePage(PFN_NUMBER PageFrameIndex); - VOID NTAPI MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex) @@ -628,13 +625,6 @@ MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex) ASSERT(Pfn1->u4.VerifierAllocation == 0); ASSERT(Pfn1->u3.e2.ReferenceCount == 0); - /* HACK HACK HACK : Feed the page to legacy Mm */ - if (MmRosNotifyAvailablePage(PageFrameIndex)) - { - DPRINT1("Legacy Mm eating ARM3 page!.\n"); - return; - } - /* Get the free page list and increment its count */ ListHead = &MmFreePageListHead; ASSERT_LIST_INVARIANT(ListHead); diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index f8fce014f56..0eec51fbb88 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -29,10 +29,7 @@ MM_ALLOCATION_REQUEST, *PMM_ALLOCATION_REQUEST; MM_MEMORY_CONSUMER MiMemoryConsumers[MC_MAXIMUM]; static ULONG MiMinimumAvailablePages; -static LIST_ENTRY AllocationListHead; -static KSPIN_LOCK AllocationListLock; static ULONG MiMinimumPagesPerRun; - static CLIENT_ID MiBalancerThreadId; static HANDLE MiBalancerThreadHandle = NULL; static KEVENT MiBalancerEvent; @@ -48,8 +45,6 @@ NTAPI MmInitializeBalancer(ULONG NrAvailablePages, ULONG NrSystemPages) { memset(MiMemoryConsumers, 0, sizeof(MiMemoryConsumers)); - InitializeListHead(&AllocationListHead); - KeInitializeSpinLock(&AllocationListLock); /* Set up targets. */ MiMinimumAvailablePages = 256; @@ -350,46 +345,6 @@ MiBalancerThread(PVOID Unused) } } -BOOLEAN MmRosNotifyAvailablePage(PFN_NUMBER Page) -{ - PLIST_ENTRY Entry; - PMM_ALLOCATION_REQUEST Request; - PMMPFN Pfn1; - - /* Make sure the PFN lock is held */ - MI_ASSERT_PFN_LOCK_HELD(); - - if (!MiMinimumAvailablePages) - { - /* Dirty way to know if we were initialized. */ - return FALSE; - } - - Entry = ExInterlockedRemoveHeadList(&AllocationListHead, &AllocationListLock); - if (!Entry) - return FALSE; - - Request = CONTAINING_RECORD(Entry, MM_ALLOCATION_REQUEST, ListEntry); - MiZeroPhysicalPage(Page); - Request->Page = Page; - - Pfn1 = MiGetPfnEntry(Page); - ASSERT(Pfn1->u3.e2.ReferenceCount == 0); - Pfn1->u3.e2.ReferenceCount = 1; - Pfn1->u3.e1.PageLocation = ActiveAndValid; - - /* This marks the PFN as a ReactOS PFN */ - Pfn1->u4.AweAllocation = TRUE; - - /* Allocate the extra ReactOS Data and zero it out */ - Pfn1->u1.SwapEntry = 0; - Pfn1->RmapListHead = NULL; - - KeSetEvent(&Request->Event, IO_NO_INCREMENT, FALSE); - - return TRUE; -} - CODE_SEG("INIT") VOID NTAPI

3 years, 1 month

[reactos] 01/01: [CMAKE] Update DLL base addresses

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6d08c48282b0b610b9e4… commit c6d08c48282b0b610b9e485efe88a1cbe33d3496 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Aug 3 10:36:32 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Aug 3 10:36:32 2021 +0200 [CMAKE] Update DLL base addresses --- sdk/cmake/baseaddress.cmake | 777 ++++++++++++++++++++++---------------------- 1 file changed, 394 insertions(+), 383 deletions(-) diff --git a/sdk/cmake/baseaddress.cmake b/sdk/cmake/baseaddress.cmake index 37538b67e65..c8a2c9a81ca 100644 --- a/sdk/cmake/baseaddress.cmake +++ b/sdk/cmake/baseaddress.cmake @@ -1,387 +1,398 @@ -# Generated from R:\build\master\gcc +# Generated from output-MinGW-i386/ # Generated by sdk/tools/gen_baseaddress.py set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c5b0000) -set(baseaddress_msvcrt 0x7c4e0000) -set(baseaddress_advapi32 0x7c410000) -set(baseaddress_gdi32 0x7c350000) +set(baseaddress_kernel32 0x7c620000) +set(baseaddress_msvcrt 0x7c530000) +set(baseaddress_advapi32 0x7c470000) +set(baseaddress_gdi32 0x7c210000) set(baseaddress_user32 0x77a20000) # reserved -set(baseaddress_dhcpcsvc 0x7c300000) -set(baseaddress_dnsapi 0x7c2a0000) -set(baseaddress_icmp 0x7c270000) -set(baseaddress_iphlpapi 0x7c220000) -set(baseaddress_ws2_32 0x7c1d0000) -set(baseaddress_ws2help 0x7c1a0000) -set(baseaddress_shlwapi 0x7c0e0000) -set(baseaddress_rpcrt4 0x7bff0000) -set(baseaddress_comctl32 0x7bdd0000) -set(baseaddress_ole32 0x7bb80000) -set(baseaddress_winspool 0x7bb30000) -set(baseaddress_winmm 0x7ba70000) -set(baseaddress_comdlg32 0x7b950000) -set(baseaddress_shell32 0x7b020000) -set(baseaddress_lz32 0x7b000000) -set(baseaddress_version 0x7afd0000) -set(baseaddress_oleaut32 0x7adb0000) -set(baseaddress_setupapi 0x7ac20000) -set(baseaddress_mpr 0x7abd0000) -set(baseaddress_crypt32 0x7aaa0000) -set(baseaddress_wininet 0x7a9c0000) -set(baseaddress_urlmon 0x7a890000) -set(baseaddress_psapi 0x7a860000) -set(baseaddress_imm32 0x7a820000) -set(baseaddress_msvfw32 0x7a7d0000) -set(baseaddress_dbghelp 0x7a710000) -set(baseaddress_devmgr 0x7a620000) -set(baseaddress_msacm32 0x7a5d0000) -set(baseaddress_netapi32 0x7a530000) -set(baseaddress_powrprof 0x7a500000) -set(baseaddress_secur32 0x7a4a0000) -set(baseaddress_wintrust 0x7a440000) -set(baseaddress_avicap32 0x7a410000) -set(baseaddress_cabinet 0x7a3b0000) -set(baseaddress_dsound 0x7a320000) -set(baseaddress_glu32 0x7a200000) -set(baseaddress_opengl32 0x7a0b0000) -set(baseaddress_riched20 0x79fe0000) -set(baseaddress_smdll 0x79fc0000) -set(baseaddress_userenv 0x79f60000) -set(baseaddress_uxtheme 0x79ef0000) -set(baseaddress_cryptui 0x79e30000) -set(baseaddress_csrsrv 0x79df0000) -set(baseaddress_basesrv 0x79dc0000) -set(baseaddress_winsrv 0x79d00000) -set(baseaddress_dplayx 0x79c90000) -set(baseaddress_gdiplus 0x79b80000) -set(baseaddress_msimg32 0x79b50000) -set(baseaddress_mswsock 0x79b20000) -set(baseaddress_oledlg 0x79ad0000) -set(baseaddress_rasapi32 0x79aa0000) -set(baseaddress_rsaenh 0x79a30000) -set(baseaddress_samlib 0x799f0000) -set(baseaddress_sensapi 0x799c0000) -set(baseaddress_sfc_os 0x79990000) -set(baseaddress_snmpapi 0x79960000) -set(baseaddress_spoolss 0x79920000) -set(baseaddress_usp10 0x79890000) -set(baseaddress_access 0x79800000) -set(baseaddress_acgenral 0x797d0000) -set(baseaddress_aclayers 0x797a0000) -set(baseaddress_acledit 0x79770000) -set(baseaddress_aclui 0x79730000) -set(baseaddress_acppage 0x796c0000) -set(baseaddress_activeds 0x79690000) -set(baseaddress_actxprxy 0x793b0000) -set(baseaddress_advapi32_vista 0x79380000) -set(baseaddress_advpack 0x79340000) -set(baseaddress_amstream 0x792e0000) -set(baseaddress_apphelp 0x79290000) -set(baseaddress_appwiz 0x79210000) -set(baseaddress_atl 0x791c0000) -set(baseaddress_atl100 0x79170000) -set(baseaddress_atl80 0x79120000) -set(baseaddress_authz 0x790f0000) -set(baseaddress_avifil32 0x79060000) -set(baseaddress_batt 0x79030000) -set(baseaddress_bcrypt 0x79000000) -set(baseaddress_beepmidi 0x78fd0000) -set(baseaddress_browseui 0x78e10000) -set(baseaddress_bthci 0x78de0000) -set(baseaddress_cards 0x78d20000) -set(baseaddress_cfgmgr32 0x78cf0000) -set(baseaddress_clusapi 0x78cb0000) -set(baseaddress_cmicpl 0x78c70000) -set(baseaddress_comcat 0x78c40000) -set(baseaddress_compstui 0x78c10000) -set(baseaddress_console 0x78bb0000) -set(baseaddress_credui 0x78b60000) -set(baseaddress_crtdll 0x78af0000) -set(baseaddress_cryptdlg 0x78ab0000) -set(baseaddress_cryptdll 0x78a80000) -set(baseaddress_cryptext 0x78a50000) -set(baseaddress_cryptnet 0x78a10000) -set(baseaddress_custom 0x789e0000) -set(baseaddress_d3d8 0x78980000) -set(baseaddress_d3d8thk 0x78960000) -set(baseaddress_d3d9 0x788f0000) -set(baseaddress_d3dcompiler_43 0x78820000) -set(baseaddress_d3drm 0x78780000) -set(baseaddress_d3dwine 0x78530000) -set(baseaddress_d3dx9_24 0x78500000) -set(baseaddress_d3dx9_25 0x784c0000) -set(baseaddress_d3dx9_26 0x78490000) -set(baseaddress_d3dx9_27 0x78460000) -set(baseaddress_d3dx9_28 0x78430000) -set(baseaddress_d3dx9_29 0x78400000) -set(baseaddress_d3dx9_30 0x783d0000) -set(baseaddress_d3dx9_31 0x783a0000) -set(baseaddress_d3dx9_32 0x78370000) -set(baseaddress_d3dx9_33 0x78340000) -set(baseaddress_d3dx9_34 0x78310000) -set(baseaddress_d3dx9_35 0x782e0000) -set(baseaddress_d3dx9_36 0x781b0000) -set(baseaddress_d3dx9_37 0x78180000) -set(baseaddress_d3dx9_38 0x78150000) -set(baseaddress_d3dx9_39 0x78120000) -set(baseaddress_d3dx9_40 0x780f0000) -set(baseaddress_d3dx9_41 0x780c0000) -set(baseaddress_d3dx9_42 0x78090000) -set(baseaddress_d3dx9_43 0x78060000) -set(baseaddress_d3dxof 0x78010000) -set(baseaddress_dciman32 0x77fe0000) -set(baseaddress_dcomlaunch 0x77fb0000) -set(baseaddress_ddraw 0x77ee0000) -set(baseaddress_desk 0x77e30000) -set(baseaddress_deskadp 0x77df0000) -set(baseaddress_deskmon 0x77dc0000) -set(baseaddress_devcpux 0x77d90000) -set(baseaddress_devenum 0x77d40000) -set(baseaddress_dinput 0x77cd0000) -set(baseaddress_dinput8 0x77c60000) -set(baseaddress_dmusic 0x77c10000) -set(baseaddress_dnsrslvr 0x77be0000) -set(baseaddress_dplay 0x779f0000) -set(baseaddress_dpnhpast 0x779c0000) -set(baseaddress_dxdiagn 0x77970000) -set(baseaddress_dxtn 0x77940000) -set(baseaddress_esent 0x77900000) -set(baseaddress_faultrep 0x778d0000) -set(baseaddress_fltlib 0x778a0000) -set(baseaddress_fmifs 0x77880000) -set(baseaddress_fontext 0x77820000) -set(baseaddress_fontsub 0x777f0000) -set(baseaddress_framedyn 0x777b0000) -set(baseaddress_getuname 0x76d40000) -set(baseaddress_halxbox 0x76bb0000) -set(baseaddress_hdwwiz 0x76b30000) -set(baseaddress_hhctrl 0x76ad0000) -set(baseaddress_hid 0x76a90000) -set(baseaddress_hlink 0x76a50000) -set(baseaddress_hnetcfg 0x76a10000) -set(baseaddress_httpapi 0x769e0000) -set(baseaddress_iccvid 0x769b0000) -set(baseaddress_ieframe 0x768d0000) -set(baseaddress_iernonce 0x768a0000) -set(baseaddress_imaadp32.acm 0x76870000) -set(baseaddress_imagehlp 0x76830000) -set(baseaddress_inetcomm 0x767c0000) -set(baseaddress_inetcpl 0x76760000) -set(baseaddress_inetmib1 0x76730000) -set(baseaddress_initpki 0x76700000) -set(baseaddress_input 0x76690000) -set(baseaddress_inseng 0x76650000) -set(baseaddress_intl 0x765d0000) -set(baseaddress_iologmsg 0x765b0000) -set(baseaddress_itircl 0x76580000) -set(baseaddress_itss 0x76530000) -set(baseaddress_joy 0x764f0000) -set(baseaddress_jscript 0x76370000) -set(baseaddress_jsproxy 0x76340000) -set(baseaddress_kbdeo 0x76320000) -set(baseaddress_kbdrost 0x76300000) -set(baseaddress_kbsdll 0x762d0000) -set(baseaddress_kernel32_vista 0x762b0000) -set(baseaddress_ksuser 0x76280000) -set(baseaddress_libjpeg 0x761e0000) -set(baseaddress_libpng 0x76130000) -set(baseaddress_libtiff 0x76040000) -set(baseaddress_libtirpc 0x75fe0000) -set(baseaddress_libxslt 0x75ca0000) -set(baseaddress_load_notifications 0x75c80000) -set(baseaddress_loadperf 0x75c50000) -set(baseaddress_localmon 0x75c20000) -set(baseaddress_localspl 0x75bd0000) -set(baseaddress_localspl_apitest 0x75ba0000) -set(baseaddress_localui 0x75b70000) -set(baseaddress_lpk 0x75b40000) -set(baseaddress_lsasrv 0x75ac0000) -set(baseaddress_main 0x75a20000) -set(baseaddress_mapi32 0x759d0000) -set(baseaddress_mbedtls 0x75920000) -set(baseaddress_mciavi32 0x758e0000) -set(baseaddress_mcicda 0x758b0000) -set(baseaddress_mciqtz32 0x75870000) -set(baseaddress_mciseq 0x75830000) -set(baseaddress_mciwave 0x757f0000) -set(baseaddress_mgmtapi 0x757c0000) -set(baseaddress_midimap 0x75790000) -set(baseaddress_mlang 0x75750000) -set(baseaddress_mmdrv 0x75720000) -set(baseaddress_mmsys 0x75640000) -set(baseaddress_modemui 0x755c0000) -set(baseaddress_mprapi 0x75580000) -set(baseaddress_msacm32.drv 0x75550000) -set(baseaddress_msadp32.acm 0x75520000) -set(baseaddress_msafd 0x754d0000) -set(baseaddress_mscat32 0x754a0000) -set(baseaddress_mscms 0x75460000) -set(baseaddress_mscoree 0x75400000) -set(baseaddress_msctf 0x753a0000) -set(baseaddress_msdmo 0x75370000) -set(baseaddress_msftedit 0x75340000) -set(baseaddress_msg711.acm 0x75310000) -set(baseaddress_msgina 0x75260000) -set(baseaddress_msgsm32.acm 0x75230000) -set(baseaddress_mshtml 0x74f70000) -set(baseaddress_msi 0x74d90000) -set(baseaddress_msimtf 0x74d60000) -set(baseaddress_msisip 0x74d30000) -set(baseaddress_msisys 0x74d00000) -set(baseaddress_mspatcha 0x74cd0000) -set(baseaddress_msports 0x74c90000) -set(baseaddress_msrle32 0x74c50000) -set(baseaddress_mssign32 0x74c20000) -set(baseaddress_mssip32 0x74bf0000) -set(baseaddress_mstask 0x74bb0000) -set(baseaddress_msv1_0 0x74b80000) -set(baseaddress_msvcrt20 0x74a80000) -set(baseaddress_msvcrt40 0x74980000) -set(baseaddress_msvcrt_crt_dll_startup 0x74950000) -set(baseaddress_msvidc32 0x74920000) -set(baseaddress_msxml 0x748f0000) -set(baseaddress_msxml2 0x748c0000) -set(baseaddress_msxml3 0x74490000) -set(baseaddress_msxml3r 0x74470000) -set(baseaddress_msxml4 0x74430000) -set(baseaddress_msxml6 0x743f0000) -set(baseaddress_mycomput 0x743d0000) -set(baseaddress_ncpa 0x743a0000) -set(baseaddress_nddeapi 0x74370000) -set(baseaddress_netcfgx 0x742c0000) -set(baseaddress_netevent 0x74290000) -set(baseaddress_netid 0x74240000) -set(baseaddress_netlogon 0x74200000) -set(baseaddress_netmsg 0x74080000) -set(baseaddress_netplwiz 0x74050000) -set(baseaddress_netshell 0x73f80000) -set(baseaddress_newdev 0x73f20000) -set(baseaddress_nfs41_np 0x73ef0000) -set(baseaddress_normaliz 0x73ec0000) -set(baseaddress_notifyhook 0x73e90000) -set(baseaddress_npptools 0x73e60000) -set(baseaddress_ntdll_vista 0x73e40000) -set(baseaddress_ntdsapi 0x73e10000) -set(baseaddress_ntlanman 0x73de0000) -set(baseaddress_ntmarta 0x73db0000) -set(baseaddress_ntobjshex 0x73d10000) -set(baseaddress_objsel 0x73ce0000) -set(baseaddress_odbc32 0x73c90000) -set(baseaddress_odbccp32 0x73c50000) -set(baseaddress_odbccp32i 0x73c20000) -set(baseaddress_oleacc 0x73b80000) -set(baseaddress_olecli32 0x73b50000) -set(baseaddress_olepro32 0x73b20000) -set(baseaddress_olesvr32 0x73af0000) -set(baseaddress_olethk32 0x73ac0000) -set(baseaddress_openglcfg 0x73a90000) -set(baseaddress_pdh 0x73a50000) -set(baseaddress_pidgen 0x73a20000) -set(baseaddress_pifmgr 0x739b0000) -set(baseaddress_powercfg 0x73940000) -set(baseaddress_printui 0x73910000) -set(baseaddress_propsys 0x738c0000) -set(baseaddress_pstorec 0x73890000) -set(baseaddress_qedit 0x73840000) -set(baseaddress_qmgr 0x73800000) -set(baseaddress_qmgrprxy 0x73780000) -set(baseaddress_quartz 0x735b0000) -set(baseaddress_query 0x73580000) -set(baseaddress_rasadhlp 0x73550000) -set(baseaddress_rasdlg 0x73380000) -set(baseaddress_rasman 0x73340000) -set(baseaddress_redirtest1 0x73310000) -set(baseaddress_redirtest2 0x732e0000) -set(baseaddress_resutils 0x732b0000) -set(baseaddress_riched32 0x73280000) -set(baseaddress_rsabase 0x73260000) -set(baseaddress_rshell 0x731b0000) -set(baseaddress_samsrv 0x73130000) -set(baseaddress_sccbase 0x73100000) -set(baseaddress_schannel 0x730c0000) -set(baseaddress_schedsvc 0x73090000) -set(baseaddress_scrrun 0x73030000) -set(baseaddress_security 0x73010000) -set(baseaddress_sendmail 0x72fc0000) -set(baseaddress_serialui 0x72f90000) -set(baseaddress_sfc 0x72f60000) -set(baseaddress_shdoclc 0x72f20000) -set(baseaddress_shdocvw 0x72ed0000) -set(baseaddress_shellbtrfs 0x72c90000) -set(baseaddress_shfolder 0x72c70000) -set(baseaddress_shimgvw 0x72c20000) -set(baseaddress_shsvcs 0x72bf0000) -set(baseaddress_slbcsp 0x72bc0000) -set(baseaddress_sndblst 0x72b80000) -set(baseaddress_softpub 0x72b60000) -set(baseaddress_srclient 0x72b30000) -set(baseaddress_srvsvc 0x72b00000) -set(baseaddress_sti 0x72ac0000) -set(baseaddress_stobject 0x72a20000) -set(baseaddress_streamci 0x729f0000) -set(baseaddress_sxs 0x729b0000) -set(baseaddress_sysdm 0x728b0000) -set(baseaddress_syssetup 0x72780000) -set(baseaddress_t2embed 0x72750000) -set(baseaddress_tapi32 0x72710000) -set(baseaddress_tapiui 0x72690000) -set(baseaddress_telephon 0x72660000) -set(baseaddress_testvdd 0x72630000) -set(baseaddress_themeui 0x72610000) -set(baseaddress_timedate 0x72590000) -set(baseaddress_traffic 0x72560000) -set(baseaddress_twain_32 0x72530000) -set(baseaddress_ubtrfs 0x72500000) -set(baseaddress_ucdfs 0x724e0000) -set(baseaddress_uext2 0x724a0000) -set(baseaddress_ufat 0x72460000) -set(baseaddress_ufatx 0x72440000) -set(baseaddress_umpnpmgr 0x723e0000) -set(baseaddress_untfs 0x723c0000) -set(baseaddress_updspapi 0x72390000) -set(baseaddress_url 0x72340000) -set(baseaddress_usrmgr 0x722e0000) -set(baseaddress_vbscript 0x72230000) -set(baseaddress_vdmdbg 0x72200000) -set(baseaddress_verifier 0x721e0000) -set(baseaddress_vfd 0x72180000) -set(baseaddress_vssapi 0x72150000) -set(baseaddress_w32time 0x72120000) -set(baseaddress_wbemdisp 0x720d0000) -set(baseaddress_wbemprox 0x72060000) -set(baseaddress_wdmaud.drv 0x71e90000) -set(baseaddress_win32u 0x71e60000) -set(baseaddress_win32u_2k3sp2 0x71e30000) -set(baseaddress_win32u_xpsp2 0x71e00000) -set(baseaddress_windowscodecs 0x71c80000) -set(baseaddress_windowscodecsext 0x71c50000) -set(baseaddress_wined3dcfg 0x71c20000) -set(baseaddress_winemp3.acm 0x71b80000) -set(baseaddress_winfax 0x71b50000) -set(baseaddress_wing32 0x71b20000) -set(baseaddress_winhttp 0x71ab0000) -set(baseaddress_winprint 0x71a80000) -set(baseaddress_winscard 0x71a50000) -set(baseaddress_winsta 0x71a20000) -set(baseaddress_wkssvc 0x719f0000) -set(baseaddress_wlanapi 0x719c0000) -set(baseaddress_wldap32 0x71980000) -set(baseaddress_wlnotify 0x71950000) -set(baseaddress_wmi 0x71930000) -set(baseaddress_wmisvc 0x71900000) -set(baseaddress_wmiutils 0x718c0000) -set(baseaddress_wmvcore 0x71870000) -set(baseaddress_wshirda 0x71840000) -set(baseaddress_wshom 0x717f0000) -set(baseaddress_wshtcpip 0x717c0000) -set(baseaddress_wsock32 0x71790000) -set(baseaddress_wtsapi32 0x71760000) -set(baseaddress_wuapi 0x71720000) -set(baseaddress_wuauserv 0x716f0000) -set(baseaddress_xinput1_1 0x716c0000) -set(baseaddress_xinput1_2 0x71690000) -set(baseaddress_xinput1_3 0x71660000) -set(baseaddress_xinput9_1_0 0x71630000) -set(baseaddress_xmllite 0x715e0000) -set(baseaddress_xolehlp 0x715b0000) -set(baseaddress_zipfldr 0x714d0000) +set(baseaddress_dhcpcsvc 0x7c1c0000) +set(baseaddress_dnsapi 0x7c160000) +set(baseaddress_icmp 0x7c130000) +set(baseaddress_iphlpapi 0x7c0e0000) +set(baseaddress_ws2_32 0x7c090000) +set(baseaddress_ws2help 0x7c060000) +set(baseaddress_shlwapi 0x7bfa0000) +set(baseaddress_rpcrt4 0x7beb0000) +set(baseaddress_comctl32 0x7bc80000) +set(baseaddress_ole32 0x7ba30000) +set(baseaddress_winspool 0x7b900000) +set(baseaddress_winmm 0x7b840000) +set(baseaddress_comdlg32 0x7b720000) +set(baseaddress_shell32 0x7ad60000) +set(baseaddress_lz32 0x7ad40000) +set(baseaddress_version 0x7ad00000) +set(baseaddress_oleaut32 0x7aae0000) +set(baseaddress_setupapi 0x7a950000) +set(baseaddress_mpr 0x7a900000) +set(baseaddress_crypt32 0x7a7d0000) +set(baseaddress_wininet 0x7a6f0000) +set(baseaddress_urlmon 0x7a5c0000) +set(baseaddress_psapi 0x7a590000) +set(baseaddress_imm32 0x7a540000) +set(baseaddress_msvfw32 0x7a4f0000) +set(baseaddress_dbghelp 0x7a430000) +set(baseaddress_devmgr 0x7a340000) +set(baseaddress_msacm32 0x7a2f0000) +set(baseaddress_netapi32 0x7a250000) +set(baseaddress_powrprof 0x7a220000) +set(baseaddress_secur32 0x7a1c0000) +set(baseaddress_wintrust 0x7a160000) +set(baseaddress_avicap32 0x7a130000) +set(baseaddress_cabinet 0x7a0d0000) +set(baseaddress_dsound 0x7a040000) +set(baseaddress_glu32 0x79f20000) +set(baseaddress_opengl32 0x79dc0000) +set(baseaddress_riched20 0x79cf0000) +set(baseaddress_smdll 0x79cd0000) +set(baseaddress_userenv 0x79c70000) +set(baseaddress_uxtheme 0x79c00000) +set(baseaddress_cryptui 0x79b40000) +set(baseaddress_csrsrv 0x79b00000) +set(baseaddress_basesrv 0x79ad0000) +set(baseaddress_winsrv 0x798e0000) +set(baseaddress_dplayx 0x79870000) +set(baseaddress_gdiplus 0x79760000) +set(baseaddress_msimg32 0x79730000) +set(baseaddress_mswsock 0x79700000) +set(baseaddress_oledlg 0x796b0000) +set(baseaddress_rasapi32 0x79680000) +set(baseaddress_rsaenh 0x79600000) +set(baseaddress_samlib 0x795c0000) +set(baseaddress_sensapi 0x79590000) +set(baseaddress_sfc_os 0x79560000) +set(baseaddress_snmpapi 0x79530000) +set(baseaddress_spoolss 0x794b0000) +set(baseaddress_usp10 0x79420000) +set(baseaddress_access 0x79390000) +set(baseaddress_acgenral 0x79370000) +set(baseaddress_aclayers 0x79340000) +set(baseaddress_acledit 0x79310000) +set(baseaddress_aclui 0x792d0000) +set(baseaddress_acppage 0x79260000) +set(baseaddress_activeds 0x79230000) +set(baseaddress_actxprxy 0x78f60000) +set(baseaddress_advapi32_vista 0x78f40000) +set(baseaddress_advpack 0x78f00000) +set(baseaddress_amstream 0x78ea0000) +set(baseaddress_apphelp 0x78e50000) +set(baseaddress_appwiz 0x78dc0000) +set(baseaddress_atl 0x78d70000) +set(baseaddress_atl100 0x78d30000) +set(baseaddress_atl80 0x78ce0000) +set(baseaddress_authz 0x78cb0000) +set(baseaddress_avifil32 0x78c20000) +set(baseaddress_batt 0x78bf0000) +set(baseaddress_bcrypt 0x78bc0000) +set(baseaddress_beepmidi 0x78b90000) +set(baseaddress_browser 0x78b60000) +set(baseaddress_browseui 0x78970000) +set(baseaddress_bthci 0x78940000) +set(baseaddress_cards 0x78880000) +set(baseaddress_cfgmgr32 0x78850000) +set(baseaddress_clusapi 0x78820000) +set(baseaddress_cmicpl 0x787e0000) +set(baseaddress_comcat 0x787b0000) +set(baseaddress_compstui 0x78780000) +set(baseaddress_console 0x78720000) +set(baseaddress_credui 0x786d0000) +set(baseaddress_crtdll 0x78600000) +set(baseaddress_cryptdlg 0x785c0000) +set(baseaddress_cryptdll 0x78590000) +set(baseaddress_cryptext 0x78560000) +set(baseaddress_cryptnet 0x78520000) +set(baseaddress_custom 0x784f0000) +set(baseaddress_d3d8 0x78490000) +set(baseaddress_d3d8thk 0x78470000) +set(baseaddress_d3d9 0x78400000) +set(baseaddress_d3dcompiler_43 0x78330000) +set(baseaddress_d3drm 0x78290000) +set(baseaddress_d3dwine 0x78040000) +set(baseaddress_d3dx9_24 0x77f00000) +set(baseaddress_d3dx9_25 0x778e0000) +set(baseaddress_d3dx9_26 0x777a0000) +set(baseaddress_d3dx9_27 0x77660000) +set(baseaddress_d3dx9_28 0x77520000) +set(baseaddress_d3dx9_29 0x773e0000) +set(baseaddress_d3dx9_30 0x772a0000) +set(baseaddress_d3dx9_31 0x77160000) +set(baseaddress_d3dx9_32 0x77020000) +set(baseaddress_d3dx9_33 0x76ee0000) +set(baseaddress_d3dx9_34 0x76da0000) +set(baseaddress_d3dx9_35 0x76c60000) +set(baseaddress_d3dx9_36 0x76b20000) +set(baseaddress_d3dx9_37 0x769e0000) +set(baseaddress_d3dx9_38 0x768a0000) +set(baseaddress_d3dx9_39 0x76760000) +set(baseaddress_d3dx9_40 0x76620000) +set(baseaddress_d3dx9_41 0x764e0000) +set(baseaddress_d3dx9_42 0x763a0000) +set(baseaddress_d3dx9_43 0x76260000) +set(baseaddress_d3dxof 0x76210000) +set(baseaddress_dbgeng 0x761c0000) +set(baseaddress_dciman32 0x76190000) +set(baseaddress_dcomlaunch 0x76160000) +set(baseaddress_ddraw 0x76090000) +set(baseaddress_desk 0x75fe0000) +set(baseaddress_deskadp 0x75fa0000) +set(baseaddress_deskmon 0x75f70000) +set(baseaddress_devcpux 0x75f40000) +set(baseaddress_devenum 0x75ef0000) +set(baseaddress_dinput 0x75e90000) +set(baseaddress_dinput8 0x75e30000) +set(baseaddress_dmusic 0x75de0000) +set(baseaddress_dnsrslvr 0x75db0000) +set(baseaddress_dplay 0x75d80000) +set(baseaddress_dpnhpast 0x75d50000) +set(baseaddress_dxdiagn 0x75d00000) +set(baseaddress_dxtn 0x75ce0000) +set(baseaddress_esent 0x75cb0000) +set(baseaddress_faultrep 0x75c80000) +set(baseaddress_fltlib 0x75c50000) +set(baseaddress_fmifs 0x75c30000) +set(baseaddress_fontext 0x75bd0000) +set(baseaddress_fontsub 0x75ba0000) +set(baseaddress_framedyn 0x75b70000) +set(baseaddress_getuname 0x74fb0000) +set(baseaddress_halpc98 0x74e10000) +set(baseaddress_halxbox 0x74c70000) +set(baseaddress_hdwwiz 0x74bf0000) +set(baseaddress_hhctrl 0x74b90000) +set(baseaddress_hid 0x74b60000) +set(baseaddress_hlink 0x74b20000) +set(baseaddress_hnetcfg 0x74ae0000) +set(baseaddress_hotplug 0x74ab0000) +set(baseaddress_httpapi 0x74a80000) +set(baseaddress_iccvid 0x74a50000) +set(baseaddress_ieframe 0x74970000) +set(baseaddress_iernonce 0x74940000) +set(baseaddress_imaadp32.acm 0x74910000) +set(baseaddress_imagehlp 0x748e0000) +set(baseaddress_inetcomm 0x74870000) +set(baseaddress_inetcpl 0x74810000) +set(baseaddress_inetmib1 0x747e0000) +set(baseaddress_initpki 0x747b0000) +set(baseaddress_input 0x74740000) +set(baseaddress_inseng 0x74700000) +set(baseaddress_intl 0x74680000) +set(baseaddress_iologmsg 0x74660000) +set(baseaddress_itircl 0x74630000) +set(baseaddress_itss 0x745e0000) +set(baseaddress_joy 0x745a0000) +set(baseaddress_jscript 0x74400000) +set(baseaddress_jsproxy 0x743d0000) +set(baseaddress_kbdeo 0x743b0000) +set(baseaddress_kbdrost 0x74390000) +set(baseaddress_kbdsf 0x74370000) +set(baseaddress_kbsdll 0x74340000) +set(baseaddress_kernel32_vista 0x74320000) +set(baseaddress_ksuser 0x742f0000) +set(baseaddress_libjpeg 0x74240000) +set(baseaddress_libpng 0x74190000) +set(baseaddress_libtiff 0x74090000) +set(baseaddress_libtirpc 0x74030000) +set(baseaddress_libxslt 0x73cf0000) +set(baseaddress_load_notifications 0x73cd0000) +set(baseaddress_loadperf 0x73ca0000) +set(baseaddress_localmon 0x73c40000) +set(baseaddress_localspl 0x73b50000) +set(baseaddress_localspl_apitest 0x73b20000) +set(baseaddress_localui 0x73ad0000) +set(baseaddress_lpk 0x73aa0000) +set(baseaddress_lsasrv 0x73a20000) +set(baseaddress_main 0x73980000) +set(baseaddress_mapi32 0x73930000) +set(baseaddress_mbedtls 0x73870000) +set(baseaddress_mciavi32 0x73830000) +set(baseaddress_mcicda 0x73800000) +set(baseaddress_mciqtz32 0x737c0000) +set(baseaddress_mciseq 0x73790000) +set(baseaddress_mciwave 0x73750000) +set(baseaddress_mgmtapi 0x73720000) +set(baseaddress_midimap 0x736f0000) +set(baseaddress_mlang 0x736b0000) +set(baseaddress_mmdrv 0x73680000) +set(baseaddress_mmsys 0x73590000) +set(baseaddress_modemui 0x73510000) +set(baseaddress_mprapi 0x734d0000) +set(baseaddress_msacm32.drv 0x73490000) +set(baseaddress_msadp32.acm 0x73460000) +set(baseaddress_msafd 0x73410000) +set(baseaddress_mscat32 0x733e0000) +set(baseaddress_mscms 0x733a0000) +set(baseaddress_mscoree 0x73340000) +set(baseaddress_msctf 0x732e0000) +set(baseaddress_msdmo 0x732b0000) +set(baseaddress_msftedit 0x73280000) +set(baseaddress_msg711.acm 0x73250000) +set(baseaddress_msgina 0x73170000) +set(baseaddress_msgsm32.acm 0x73140000) +set(baseaddress_mshtml 0x72e70000) +set(baseaddress_msi 0x72c80000) +set(baseaddress_msimtf 0x72c50000) +set(baseaddress_msisip 0x72c20000) +set(baseaddress_msisys 0x72bf0000) +set(baseaddress_mspatcha 0x72bc0000) +set(baseaddress_msports 0x72b80000) +set(baseaddress_msrle32 0x72b40000) +set(baseaddress_mssign32 0x72b10000) +set(baseaddress_mssip32 0x72ae0000) +set(baseaddress_mstask 0x72aa0000) +set(baseaddress_msv1_0 0x72a70000) +set(baseaddress_msvcrt20 0x72960000) +set(baseaddress_msvcrt40 0x72850000) +set(baseaddress_msvcrt_crt_dll_startup 0x72820000) +set(baseaddress_msvidc32 0x727f0000) +set(baseaddress_msxml 0x727c0000) +set(baseaddress_msxml2 0x72790000) +set(baseaddress_msxml3 0x72360000) +set(baseaddress_msxml3r 0x72340000) +set(baseaddress_msxml4 0x72300000) +set(baseaddress_msxml6 0x722c0000) +set(baseaddress_mycomput 0x722a0000) +set(baseaddress_mydocs 0x72250000) +set(baseaddress_ncpa 0x72220000) +set(baseaddress_nddeapi 0x721f0000) +set(baseaddress_netcfgx 0x72140000) +set(baseaddress_netevent 0x72110000) +set(baseaddress_netid 0x720b0000) +set(baseaddress_netlogon 0x72080000) +set(baseaddress_netmsg 0x71f00000) +set(baseaddress_netplwiz 0x71ed0000) +set(baseaddress_netshell 0x71e10000) +set(baseaddress_newdev 0x71db0000) +set(baseaddress_nfs41_np 0x71d80000) +set(baseaddress_normaliz 0x71d50000) +set(baseaddress_npptools 0x71d20000) +set(baseaddress_ntdll_vista 0x71d00000) +set(baseaddress_ntdsapi 0x71cd0000) +set(baseaddress_ntlanman 0x71ca0000) +set(baseaddress_ntmarta 0x71c70000) +set(baseaddress_ntobjshex 0x71bd0000) +set(baseaddress_ntprint 0x71b80000) +set(baseaddress_objsel 0x71b50000) +set(baseaddress_odbc32 0x71b00000) +set(baseaddress_odbccp32 0x71ac0000) +set(baseaddress_odbccp32i 0x71a90000) +set(baseaddress_oleacc 0x719f0000) +set(baseaddress_olecli32 0x719c0000) +set(baseaddress_olepro32 0x71990000) +set(baseaddress_olesvr32 0x71960000) +set(baseaddress_olethk32 0x71930000) +set(baseaddress_openglcfg 0x71900000) +set(baseaddress_pdh 0x718c0000) +set(baseaddress_pidgen 0x71890000) +set(baseaddress_pifmgr 0x71820000) +set(baseaddress_powercfg 0x717b0000) +set(baseaddress_printui 0x71760000) +set(baseaddress_profmap 0x71730000) +set(baseaddress_propsys 0x716e0000) +set(baseaddress_pstorec 0x716b0000) +set(baseaddress_qcap 0x71640000) +set(baseaddress_qedit 0x715f0000) +set(baseaddress_qmgr 0x715b0000) +set(baseaddress_qmgrprxy 0x71540000) +set(baseaddress_quartz 0x71370000) +set(baseaddress_query 0x71340000) +set(baseaddress_rasadhlp 0x71310000) +set(baseaddress_rasdlg 0x71140000) +set(baseaddress_rasman 0x71100000) +set(baseaddress_redirtest1 0x710d0000) +set(baseaddress_redirtest2 0x710a0000) +set(baseaddress_regapi 0x71070000) +set(baseaddress_resutils 0x71040000) +set(baseaddress_riched32 0x71010000) +set(baseaddress_rsabase 0x70ff0000) +set(baseaddress_rshell 0x70f90000) +set(baseaddress_samsrv 0x70f00000) +set(baseaddress_sccbase 0x70ed0000) +set(baseaddress_schannel 0x70e90000) +set(baseaddress_schedsvc 0x70e60000) +set(baseaddress_scrrun 0x70e00000) +set(baseaddress_security 0x70de0000) +set(baseaddress_sendmail 0x70d90000) +set(baseaddress_serialui 0x70d60000) +set(baseaddress_sfc 0x70d30000) +set(baseaddress_shdoclc 0x70cf0000) +set(baseaddress_shdocvw 0x70ca0000) +set(baseaddress_shellbtrfs 0x70a60000) +set(baseaddress_shfolder 0x70a40000) +set(baseaddress_shimgvw 0x709e0000) +set(baseaddress_shlwapi_resource_dll 0x709c0000) +set(baseaddress_shsvcs 0x70990000) +set(baseaddress_slbcsp 0x70960000) +set(baseaddress_sndblst 0x70930000) +set(baseaddress_softpub 0x70910000) +set(baseaddress_srclient 0x708e0000) +set(baseaddress_srvsvc 0x708b0000) +set(baseaddress_sti 0x70870000) +set(baseaddress_stobject 0x707e0000) +set(baseaddress_storprop 0x707b0000) +set(baseaddress_streamci 0x70780000) +set(baseaddress_sxs 0x70740000) +set(baseaddress_sysdm 0x70650000) +set(baseaddress_syssetup 0x704f0000) +set(baseaddress_t2embed 0x704c0000) +set(baseaddress_tapi32 0x70480000) +set(baseaddress_tapiui 0x703f0000) +set(baseaddress_telephon 0x703c0000) +set(baseaddress_testvdd 0x70380000) +set(baseaddress_themeui 0x70360000) +set(baseaddress_timedate 0x702e0000) +set(baseaddress_traffic 0x702b0000) +set(baseaddress_twain_32 0x70280000) +set(baseaddress_ubtrfs 0x70240000) +set(baseaddress_ucdfs 0x70220000) +set(baseaddress_uext2 0x701e0000) +set(baseaddress_ufat 0x701a0000) +set(baseaddress_ufatx 0x70180000) +set(baseaddress_uffs 0x70160000) +set(baseaddress_umandlg 0x70130000) +set(baseaddress_umpnpmgr 0x700f0000) +set(baseaddress_untfs 0x700d0000) +set(baseaddress_updspapi 0x700a0000) +set(baseaddress_ureiserfs 0x70080000) +set(baseaddress_url 0x70050000) +set(baseaddress_usrmgr 0x6fff0000) +set(baseaddress_vbscript 0x6ff40000) +set(baseaddress_vdmdbg 0x6ff10000) +set(baseaddress_verifier 0x6fef0000) +set(baseaddress_vssapi 0x6fec0000) +set(baseaddress_w32time 0x6fe90000) +set(baseaddress_wbemdisp 0x6fe40000) +set(baseaddress_wbemprox 0x6fdc0000) +set(baseaddress_wdmaud.drv 0x6fc00000) +set(baseaddress_win32u 0x6fbd0000) +set(baseaddress_windowscodecs 0x6fa50000) +set(baseaddress_windowscodecsext 0x6fa20000) +set(baseaddress_wined3dcfg 0x6f9f0000) +set(baseaddress_winemp3.acm 0x6f940000) +set(baseaddress_winfax 0x6f910000) +set(baseaddress_wing32 0x6f8e0000) +set(baseaddress_winhttp 0x6f870000) +set(baseaddress_winprint 0x6f820000) +set(baseaddress_winscard 0x6f7f0000) +set(baseaddress_winsta 0x6f7c0000) +set(baseaddress_wkssvc 0x6f790000) +set(baseaddress_wlanapi 0x6f760000) +set(baseaddress_wldap32 0x6f720000) +set(baseaddress_wlnotify 0x6f6f0000) +set(baseaddress_wmi 0x6f6d0000) +set(baseaddress_wmisvc 0x6f6a0000) +set(baseaddress_wmiutils 0x6f660000) +set(baseaddress_wmvcore 0x6f610000) +set(baseaddress_wshirda 0x6f5e0000) +set(baseaddress_wshom 0x6f590000) +set(baseaddress_wshtcpip 0x6f560000) +set(baseaddress_wsock32 0x6f530000) +set(baseaddress_wtsapi32 0x6f500000) +set(baseaddress_wuapi 0x6f4c0000) +set(baseaddress_wuauserv 0x6f490000) +set(baseaddress_xinput1_1 0x6f460000) +set(baseaddress_xinput1_2 0x6f430000) +set(baseaddress_xinput1_3 0x6f400000) +set(baseaddress_xinput9_1_0 0x6f3d0000) +set(baseaddress_xmllite 0x6f380000) +set(baseaddress_xolehlp 0x6f350000) +set(baseaddress_zipfldr 0x6f200000)

3 years, 1 month

[reactos] 03/03: [GITHUB] Build Release configuration for all compilers

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f777e6bd24f1776d531f2… commit f777e6bd24f1776d531f2a0abab308837318d3b5 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Aug 2 00:26:51 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Aug 2 20:23:23 2021 +0300 [GITHUB] Build Release configuration for all compilers --- .github/workflows/build.yml | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fbf6e3964f8..0d96b52c09c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,7 @@ jobs: matrix: compiler: [gcc, clang] arch: [i386, amd64] + config: [Debug, Release] fail-fast: false runs-on: ubuntu-latest steps: @@ -46,7 +47,7 @@ jobs: uses: actions/cache@v2 with: path: ccache - key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{github.sha}} + key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} restore-keys: | ccache-${{matrix.compiler}}-${{matrix.arch}}- - name: Set ccache settings @@ -59,7 +60,7 @@ jobs: if: ${{ matrix.compiler == 'gcc' }} run: echo "CCACHE_COMPILERCHECK=string:${{steps.get_rosbe_spec.outputs.git-sha}}-${{hashfiles('./build_rosbe_ci.sh')}}" >> $GITHUB_ENV - name: Configure - run: echo 'cmake -S ${{github.workspace}}/src -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{env.D_CLANG_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} + run: echo 'cmake -S ${{github.workspace}}/src -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{env.D_CLANG_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} - name: Build run: echo 'cmake --build ${{github.workspace}}/build -- -k0' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} - name: Generate ISOs @@ -69,7 +70,7 @@ jobs: - name: Upload ISOs uses: actions/upload-artifact@v2 with: - name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{github.sha}} + name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} path: | build/bootcd.iso build/livecd.iso @@ -77,9 +78,9 @@ jobs: build-msvc: strategy: matrix: - arch: [i386, amd64] - buildtype: [Debug,Release] toolset: ['14.2', '14.1'] # VS 2019, 2017 + arch: [i386, amd64] + config: [Debug, Release] include: - arch: i386 # Not compiling on amd64 prompt toolset: '14.0' # VS 2015 @@ -112,7 +113,7 @@ jobs: with: path: src - name: Configure - run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCMAKE_BUILD_TYPE=${{matrix.buildtype}} + run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 - name: Build run: cmake --build build -- -k0 - name: Generate ISOs @@ -120,21 +121,22 @@ jobs: - name: Upload ISOs uses: actions/upload-artifact@v2 with: - name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{github.sha}} + name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} path: | build/bootcd.iso build/livecd.iso - name: Upload debug symbols + if: ${{ matrix.config == 'Debug' }} uses: actions/upload-artifact@v2 with: - name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{github.sha}} + name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} path: build/msvc_pdb build-msvc-arm: strategy: matrix: - arch: [arm] toolset: ['14.2', '14.1'] # VS 2019, 2017 + arch: [arm] fail-fast: false runs-on: windows-latest steps: @@ -165,6 +167,7 @@ jobs: strategy: matrix: arch: [i386, amd64] + config: [Debug, Release] fail-fast: false runs-on: windows-latest steps: @@ -206,7 +209,7 @@ jobs: with: path: src - name: Configure - run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DUSE_CLANG_CL:BOOL=TRUE + run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DUSE_CLANG_CL:BOOL=TRUE - name: Build run: cmake --build build -- -k0 - name: Generate ISOs @@ -214,14 +217,15 @@ jobs: - name: Upload ISOs uses: actions/upload-artifact@v2 with: - name: reactos-clang-cl-${{matrix.arch}}-${{github.sha}} + name: reactos-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} path: | build/bootcd.iso build/livecd.iso - name: Upload debug symbols + if: ${{ matrix.config == 'Debug' }} uses: actions/upload-artifact@v2 with: - name: reactos-syms-clang-cl-${{matrix.arch}}-${{github.sha}} + name: reactos-syms-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} path: build/msvc_pdb build-msbuild-i386:

3 years, 1 month

[reactos] 02/03: [CMAKE] Add memcmp to libntoskrnl for both clang and clang-cl

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5176f580e575068f788bf… commit 5176f580e575068f788bfbce7d28a333a2c85b55 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Aug 2 00:23:10 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Aug 2 20:23:22 2021 +0300 [CMAKE] Add memcmp to libntoskrnl for both clang and clang-cl --- ntoskrnl/CMakeLists.txt | 2 +- sdk/cmake/msvc.cmake | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index 6849bcf0099..a359482aad8 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -28,7 +28,7 @@ endif() add_asm_files(ntoskrnl_asm ${NTOSKRNL_ASM_SOURCE}) -if (GCC AND CLANG) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") # Clang optimises strcmp calls to memcmp. target_sources(libntoskrnl PRIVATE $<TARGET_OBJECTS:memcmp>) endif() diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index f32f88cf786..139a886f30f 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -1,6 +1,10 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release") - add_compile_options(/Ox /Ob2 /Ot /Oy /GT) + add_compile_options(/Ox /Ob2 /Ot /Oy) + # Avoid spam in clang-cl as it doesn't support /GT + if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") + add_compile_options(/GT) + endif() elseif(OPTIMIZE STREQUAL "1") add_compile_options(/O1) elseif(OPTIMIZE STREQUAL "2")

3 years, 1 month

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2021