Skip to content

Commit 58092f1

Browse files
authored
Bring back changes required to build conhost-1.24 in Windows (#18856)
1 parent 34b8ed3 commit 58092f1

File tree

13 files changed

+39
-19
lines changed

13 files changed

+39
-19
lines changed

.github/actions/spelling/allow/apis.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ Stubless
222222
Subheader
223223
Subpage
224224
syscall
225+
syscolors
225226
SYSTEMBACKDROP
226227
TABROW
227228
TASKBARCREATED

src/host/sources.inc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ TARGETLIBS = \
132132
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dxgi.lib \
133133
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \
134134
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \
135-
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-imm-l1-1-0.lib \
135+
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-imm-l1.lib \
136136
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
137137
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-dc-l1.lib \
138138
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-dc-create-l1.lib \
@@ -160,12 +160,14 @@ TARGETLIBS = \
160160
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-sysparams-l1.lib \
161161
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-window-ext-l1.lib \
162162
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-winstamin-l1.lib \
163+
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-syscolors-l1.lib \
163164
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-shell-shell32-l1.lib \
164165
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-uxtheme-themes-l1.lib \
165166
$(ONECORESHELL_INTERNAL_LIB_VPATH_L)\api-ms-win-shell-dataobject-l1.lib \
166167
$(ONECORESHELL_INTERNAL_LIB_VPATH_L)\api-ms-win-shell-namespace-l1.lib \
167168
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-uiacore-l1.lib \
168169
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-usp10-l1.lib \
170+
$(ONECORE_EXTERNAL_SDK_LIB_PATH)\ntdll.lib \
169171
$(WINCORE_OBJ_PATH)\console\open\src\host\lib\$(O)\conhostv2.lib \
170172
$(WINCORE_OBJ_PATH)\console\conint\$(O)\conint.lib \
171173
$(WINCORE_OBJ_PATH)\console\open\src\buffer\out\lib\$(O)\conbufferout.lib \
@@ -177,7 +179,6 @@ TARGETLIBS = \
177179
$(WINCORE_OBJ_PATH)\console\open\src\audio\midi\lib\$(O)\ConAudioMidi.lib \
178180
$(WINCORE_OBJ_PATH)\console\open\src\renderer\base\lib\$(O)\ConRenderBase.lib \
179181
$(WINCORE_OBJ_PATH)\console\open\src\renderer\gdi\lib\$(O)\ConRenderGdi.lib \
180-
$(WINCORE_OBJ_PATH)\console\open\src\renderer\vt\lib\$(O)\ConRenderVt.lib \
181182
$(WINCORE_OBJ_PATH)\console\open\src\renderer\wddmcon\lib\$(O)\ConRenderWddmCon.lib \
182183
$(WINCORE_OBJ_PATH)\console\open\src\server\lib\$(O)\ConServer.lib \
183184
$(WINCORE_OBJ_PATH)\console\open\src\interactivity\base\lib\$(O)\ConInteractivityBaseLib.lib \
@@ -196,7 +197,7 @@ DELAYLOAD = \
196197
api-ms-win-core-com-l1.dll; \
197198
api-ms-win-core-registry-l2.dll; \
198199
api-ms-win-mm-playsound-l1.dll; \
199-
ext-ms-win-imm-l1-1-0.lib; \
200+
ext-ms-win-imm-l1.dll; \
200201
api-ms-win-shcore-obsolete-l1.dll; \
201202
api-ms-win-shcore-scaling-l1.dll; \
202203
api-ms-win-shell-dataobject-l1.dll; \
@@ -229,6 +230,7 @@ DELAYLOAD = \
229230
ext-ms-win-rtcore-ntuser-sysparams-l1.dll; \
230231
ext-ms-win-rtcore-ntuser-window-ext-l1.dll; \
231232
ext-ms-win-rtcore-ntuser-winstamin-l1.dll; \
233+
ext-ms-win-rtcore-ntuser-syscolors-l1.dll; \
232234
ext-ms-win-shell-shell32-l1.dll; \
233235
ext-ms-win-uiacore-l1.dll; \
234236
ext-ms-win-uxtheme-themes-l1.dll; \

src/host/sources.test.inc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ INCLUDES = \
2424
..\..\inc\test; \
2525
$(ONECORESDKTOOLS_INTERNAL_INC_PATH_L)\wextest\cue; \
2626

27-
# prepend the ConRenderVt.Unittest.lib, so that it's linked before the non-ut version.
28-
2927
TARGETLIBS = \
30-
$(WINCORE_OBJ_PATH)\console\open\src\renderer\vt\ut_lib\$(O)\ConRenderVt.Unittest.lib \
3128
$(TARGETLIBS) \
3229
$(ONECORESDKTOOLS_INTERNAL_LIB_PATH_L)\WexTest\Cue\Wex.Common.lib \
3330
$(ONECORESDKTOOLS_INTERNAL_LIB_PATH_L)\WexTest\Cue\Wex.Logger.lib \

src/host/ut_host/sources

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ INCLUDES = \
4141
..\..\inc\test; \
4242
$(ONECORESDKTOOLS_INTERNAL_INC_PATH_L)\wextest\cue; \
4343

44-
# prepend the ConRenderVt.Unittest.lib, so that it's linked before the non-ut version.
45-
4644
TARGETLIBS = \
47-
$(WINCORE_OBJ_PATH)\console\open\src\renderer\vt\ut_lib\$(O)\ConRenderVt.Unittest.lib \
4845
$(WINCORE_OBJ_PATH)\console\open\src\host\ut_lib\$(O)\ConhostV2.Unittest.lib \
4946
$(TARGETLIBS) \
5047
$(ONECORESDKTOOLS_INTERNAL_LIB_PATH_L)\WexTest\Cue\Wex.Common.lib \

src/interactivity/win32/ut_interactivity_win32/sources

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ TARGETLIBS = \
5050
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dxgi.lib \
5151
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\propsys.lib \
5252
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \
53-
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-imm-l1-1-0.lib \
53+
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-imm-l1.lib \
5454
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
5555
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-dc-l1.lib \
5656
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-dc-create-l1.lib \
@@ -76,12 +76,14 @@ TARGETLIBS = \
7676
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-sysparams-l1.lib \
7777
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-window-ext-l1.lib \
7878
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-winstamin-l1.lib \
79+
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-syscolors-l1.lib \
7980
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-shell-shell32-l1.lib \
8081
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-uxtheme-themes-l1.lib \
8182
$(ONECORESHELL_INTERNAL_LIB_VPATH_L)\api-ms-win-shell-dataobject-l1.lib \
8283
$(ONECORESHELL_INTERNAL_LIB_VPATH_L)\api-ms-win-shell-namespace-l1.lib \
8384
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-uiacore-l1.lib \
8485
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-usp10-l1.lib \
86+
$(ONECORE_EXTERNAL_SDK_LIB_PATH)\ntdll.lib \
8587
$(WINCORE_OBJ_PATH)\console\conint\$(O)\conint.lib \
8688
$(WINCORE_OBJ_PATH)\console\open\src\buffer\out\lib\$(O)\conbufferout.lib \
8789
$(WINCORE_OBJ_PATH)\console\open\src\host\lib\$(O)\conhostv2.lib \
@@ -93,7 +95,6 @@ TARGETLIBS = \
9395
$(WINCORE_OBJ_PATH)\console\open\src\audio\midi\lib\$(O)\ConAudioMidi.lib \
9496
$(WINCORE_OBJ_PATH)\console\open\src\renderer\base\lib\$(O)\ConRenderBase.lib \
9597
$(WINCORE_OBJ_PATH)\console\open\src\renderer\gdi\lib\$(O)\ConRenderGdi.lib \
96-
$(WINCORE_OBJ_PATH)\console\open\src\renderer\vt\lib\$(O)\ConRenderVt.lib \
9798
$(WINCORE_OBJ_PATH)\console\open\src\renderer\wddmcon\lib\$(O)\ConRenderWddmCon.lib \
9899
$(WINCORE_OBJ_PATH)\console\open\src\server\lib\$(O)\ConServer.lib \
99100
$(WINCORE_OBJ_PATH)\console\open\src\interactivity\base\lib\$(O)\ConInteractivityBaseLib.lib \
@@ -112,7 +113,7 @@ DELAYLOAD = \
112113
OLEAUT32.dll; \
113114
icu.dll; \
114115
api-ms-win-mm-playsound-l1.dll; \
115-
ext-ms-win-imm-l1-1-0.lib; \
116+
ext-ms-win-imm-l1.dll; \
116117
api-ms-win-shcore-scaling-l1.dll; \
117118
api-ms-win-shell-dataobject-l1.dll; \
118119
api-ms-win-shell-namespace-l1.dll; \
@@ -143,6 +144,7 @@ DELAYLOAD = \
143144
ext-ms-win-rtcore-ntuser-sysparams-l1.dll; \
144145
ext-ms-win-rtcore-ntuser-window-ext-l1.dll; \
145146
ext-ms-win-rtcore-ntuser-winstamin-l1.dll; \
147+
ext-ms-win-rtcore-ntuser-syscolors-l1.dll; \
146148
ext-ms-win-shell-shell32-l1.dll; \
147149
ext-ms-win-uiacore-l1.dll; \
148150
ext-ms-win-uxtheme-themes-l1.dll; \

src/project.unittest.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ INCLUDES = \
3232
TARGETLIBS = \
3333
$(TARGETLIBS) \
3434
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \
35+
$(ONECORE_EXTERNAL_SDK_LIB_PATH)\ntdll.lib \
3536
$(ONECORESDKTOOLS_INTERNAL_LIB_PATH_L)\WexTest\Cue\Wex.Common.lib \
3637
$(ONECORESDKTOOLS_INTERNAL_LIB_PATH_L)\WexTest\Cue\Wex.Logger.lib \
3738
$(ONECORESDKTOOLS_INTERNAL_LIB_PATH_L)\WexTest\Cue\Te.Common.lib \

src/terminal/adapter/ut_adapter/sources

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ TARGETLIBS = \
4848
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \
4949
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3dcompiler.lib \
5050
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \
51-
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-imm-l1-1-0.lib \
51+
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-imm-l1.lib \
5252
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
5353
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-dc-l1.lib \
5454
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-dc-create-l1.lib \
@@ -73,12 +73,14 @@ TARGETLIBS = \
7373
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-sysparams-l1.lib \
7474
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-window-ext-l1.lib \
7575
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-winstamin-l1.lib \
76+
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-syscolors-l1.lib \
7677
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-shell-shell32-l1.lib \
7778
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-uxtheme-themes-l1.lib \
7879
$(ONECORESHELL_INTERNAL_LIB_VPATH_L)\api-ms-win-shell-dataobject-l1.lib \
7980
$(ONECORESHELL_INTERNAL_LIB_VPATH_L)\api-ms-win-shell-namespace-l1.lib \
8081
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-uiacore-l1.lib \
8182
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-usp10-l1.lib \
83+
$(ONECORE_EXTERNAL_SDK_LIB_PATH)\ntdll.lib \
8284
$(WINCORE_OBJ_PATH)\console\conint\$(O)\conint.lib \
8385
$(WINCORE_OBJ_PATH)\console\open\src\buffer\out\lib\$(O)\conbufferout.lib \
8486
$(WINCORE_OBJ_PATH)\console\open\src\host\lib\$(O)\conhostv2.lib \
@@ -91,7 +93,6 @@ TARGETLIBS = \
9193
$(WINCORE_OBJ_PATH)\console\open\src\renderer\base\lib\$(O)\ConRenderBase.lib \
9294
$(WINCORE_OBJ_PATH)\console\open\src\renderer\gdi\lib\$(O)\ConRenderGdi.lib \
9395
$(WINCORE_OBJ_PATH)\console\open\src\renderer\wddmcon\lib\$(O)\ConRenderWddmCon.lib \
94-
$(WINCORE_OBJ_PATH)\console\open\src\renderer\vt\lib\$(O)\ConRenderVt.lib \
9596
$(WINCORE_OBJ_PATH)\console\open\src\server\lib\$(O)\ConServer.lib \
9697
$(WINCORE_OBJ_PATH)\console\open\src\interactivity\base\lib\$(O)\ConInteractivityBaseLib.lib \
9798
$(WINCORE_OBJ_PATH)\console\open\src\interactivity\win32\lib\$(O)\ConInteractivityWin32Lib.lib \
@@ -107,7 +108,7 @@ DELAYLOAD = \
107108
OLEAUT32.dll; \
108109
icu.dll; \
109110
api-ms-win-mm-playsound-l1.dll; \
110-
ext-ms-win-imm-l1-1-0.lib; \
111+
ext-ms-win-imm-l1.dll; \
111112
api-ms-win-shcore-scaling-l1.dll; \
112113
api-ms-win-shell-dataobject-l1.dll; \
113114
api-ms-win-shell-namespace-l1.dll; \
@@ -137,6 +138,7 @@ DELAYLOAD = \
137138
ext-ms-win-rtcore-ntuser-sysparams-l1.dll; \
138139
ext-ms-win-rtcore-ntuser-window-ext-l1.dll; \
139140
ext-ms-win-rtcore-ntuser-winstamin-l1.dll; \
141+
ext-ms-win-rtcore-ntuser-syscolors-l1.dll; \
140142
ext-ms-win-shell-shell32-l1.dll; \
141143
ext-ms-win-uiacore-l1.dll; \
142144
ext-ms-win-uxtheme-themes-l1.dll; \

src/terminal/parser/ft_fuzzer/sources

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ TEST_CODE = 1
2727

2828
USE_UNICRT = 1
2929
USE_MSVCRT = 1
30+
NO_WCHAR_T = 1 # use native wchar_t
31+
USE_CXX17_STD_BYTE = 1 # Windows disables std::byte by default...
3032

3133
USE_STL = 1
3234
STL_VER = STL_VER_CURRENT

src/terminal/parser/ft_fuzzwrapper/sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ INCLUDES = \
6060

6161
TARGETLIBS = \
6262
$(TARGETLIBS) \
63+
$(ONECORE_EXTERNAL_SDK_LIB_PATH)\ntdll.lib \
6364
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \
6465
$(OBJ_PATH)\..\lib\$(O)\ConTermParser.lib \
6566
$(OBJ_PATH)\..\..\..\types\lib\$(O)\ConTypes.lib \

src/terminal/parser/ut_parser/sources

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ TARGETLIBS = \
3838
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \
3939
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3dcompiler.lib \
4040
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \
41-
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-imm-l1-1-0.lib \
41+
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-imm-l1.lib \
4242
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
4343
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-dc-l1.lib \
4444
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-dc-create-l1.lib \
@@ -63,12 +63,14 @@ TARGETLIBS = \
6363
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-sysparams-l1.lib \
6464
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-window-ext-l1.lib \
6565
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-winstamin-l1.lib \
66+
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-rtcore-ntuser-syscolors-l1.lib \
6667
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-shell-shell32-l1.lib \
6768
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-uxtheme-themes-l1.lib \
6869
$(ONECORESHELL_INTERNAL_LIB_VPATH_L)\api-ms-win-shell-dataobject-l1.lib \
6970
$(ONECORESHELL_INTERNAL_LIB_VPATH_L)\api-ms-win-shell-namespace-l1.lib \
7071
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-uiacore-l1.lib \
7172
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-usp10-l1.lib \
73+
$(ONECORE_EXTERNAL_SDK_LIB_PATH)\ntdll.lib \
7274
$(WINCORE_OBJ_PATH)\console\conint\$(O)\conint.lib \
7375
$(CONSOLE_OBJ_PATH)\buffer\out\lib\$(O)\conbufferout.lib \
7476
$(CONSOLE_OBJ_PATH)\host\lib\$(O)\conhostv2.lib \
@@ -80,7 +82,6 @@ TARGETLIBS = \
8082
$(CONSOLE_OBJ_PATH)\renderer\base\lib\$(O)\ConRenderBase.lib \
8183
$(CONSOLE_OBJ_PATH)\renderer\gdi\lib\$(O)\ConRenderGdi.lib \
8284
$(CONSOLE_OBJ_PATH)\renderer\wddmcon\lib\$(O)\ConRenderWddmCon.lib \
83-
$(CONSOLE_OBJ_PATH)\renderer\vt\lib\$(O)\ConRenderVt.lib \
8485
$(CONSOLE_OBJ_PATH)\audio\midi\lib\$(O)\ConAudioMidi.lib \
8586
$(CONSOLE_OBJ_PATH)\server\lib\$(O)\ConServer.lib \
8687
$(CONSOLE_OBJ_PATH)\interactivity\base\lib\$(O)\ConInteractivityBaseLib.lib \
@@ -98,7 +99,7 @@ DELAYLOAD = \
9899
OLEAUT32.dll; \
99100
icu.dll; \
100101
api-ms-win-mm-playsound-l1.dll; \
101-
ext-ms-win-imm-l1-1-0.lib; \
102+
ext-ms-win-imm-l1.dll; \
102103
api-ms-win-shcore-scaling-l1.dll; \
103104
api-ms-win-shell-dataobject-l1.dll; \
104105
api-ms-win-shell-namespace-l1.dll; \
@@ -129,6 +130,7 @@ DELAYLOAD = \
129130
ext-ms-win-rtcore-ntuser-sysparams-l1.dll; \
130131
ext-ms-win-rtcore-ntuser-window-ext-l1.dll; \
131132
ext-ms-win-rtcore-ntuser-winstamin-l1.dll; \
133+
ext-ms-win-rtcore-ntuser-syscolors-l1.dll; \
132134
ext-ms-win-shell-shell32-l1.dll; \
133135
ext-ms-win-uiacore-l1.dll; \
134136
ext-ms-win-usp10-l1.dll; \

src/tools/vtpipeterm/main.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
// Copyright (c) Microsoft Corporation.
22
// Licensed under the MIT license.
33

4+
#ifndef WIN32_LEAN_AND_MEAN
45
#define WIN32_LEAN_AND_MEAN
6+
#endif
57
#define NOMINMAX
68
#include <Windows.h>
79

10+
#ifndef __INSIDE_WINDOWS
811
#define CONPTY_IMPEXP
912
#include <conpty-static.h>
13+
#else // Building inside Windows, just use the kernel32 ones.
14+
#define ConptyCreatePseudoConsole CreatePseudoConsole
15+
#define ConptyReleasePseudoConsole ReleasePseudoConsole
16+
#define ConptyResizePseudoConsole ResizePseudoConsole
17+
#endif
1018

1119
#include <wil/win32_helpers.h>
1220

src/tools/vtpipeterm/sources

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
!include $(PROJECT_ROOT)\core\console\vcpkg\consume.inc
2+
3+
USE_STD_CPP20 = 1
14
MSC_WARNING_LEVEL=/W4 /WX
25

36

@@ -20,7 +23,8 @@ C_DEFINES=-DUNICODE -D__INSIDE_WINDOWS
2023
TARGETLIBS=\
2124
$(TARGETLIBS) \
2225
$(MINWIN_EXTERNAL_SDK_LIB_PATH_L)\ntdll.lib \
23-
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib
26+
$(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \
27+
$(WINCORE_OBJ_PATH)\console\open\src\types\lib\$(O)\ConTypes.lib \
2428

2529
SOURCES=main.cpp \
2630

src/types/ut_types/sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ INCLUDES = \
2525

2626
TARGETLIBS = \
2727
$(WINCORE_OBJ_PATH)\console\open\src\types\lib\$(O)\ConTypes.lib \
28+
$(ONECORE_EXTERNAL_SDK_LIB_PATH)\ntdll.lib \
2829
$(TARGETLIBS) \
2930

3031
# -------------------------------------

0 commit comments

Comments
 (0)