Skip to content

Commit db5fa3b

Browse files
committed
[SDK] Add some missing definitions
1 parent dc0433f commit db5fa3b

File tree

5 files changed

+105
-3
lines changed

5 files changed

+105
-3
lines changed

sdk/include/psdk/winnls.h

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@ extern "C" {
2525
#define LOCALE_ILANGUAGE 1
2626
#define LOCALE_SLANGUAGE 2
2727
#define LOCALE_SENGLANGUAGE 0x1001
28+
#define LOCALE_SENGLISHLANGUAGENAME 0x1001
2829
#define LOCALE_SABBREVLANGNAME 3
2930
#define LOCALE_SNATIVELANGNAME 4
3031
#define LOCALE_ICOUNTRY 5
3132
#define LOCALE_SCOUNTRY 6
3233
#define LOCALE_SENGCOUNTRY 0x1002
34+
#define LOCALE_SENGLISHCOUNTRYNAME 0x1002
3335
#define LOCALE_SABBREVCTRYNAME 7
3436
#define LOCALE_SNATIVECTRYNAME 8
3537
#define LOCALE_IDEFAULTLANGUAGE 9
@@ -710,6 +712,18 @@ BOOL WINAPI EnumSystemCodePagesW(_In_ CODEPAGE_ENUMPROCW, _In_ DWORD);
710712
BOOL WINAPI EnumSystemGeoID(_In_ GEOCLASS, _In_ GEOID, _In_ GEO_ENUMPROC);
711713
BOOL WINAPI EnumSystemLocalesA(_In_ LOCALE_ENUMPROCA, _In_ DWORD);
712714
BOOL WINAPI EnumSystemLocalesW(_In_ LOCALE_ENUMPROCW, _In_ DWORD);
715+
716+
typedef BOOL (CALLBACK* LOCALE_ENUMPROCEX)(LPWSTR, DWORD, LPARAM);
717+
718+
WINBASEAPI
719+
BOOL
720+
WINAPI
721+
EnumSystemLocalesEx(
722+
_In_ LOCALE_ENUMPROCEX lpLocaleEnumProcEx,
723+
_In_ DWORD dwFlags,
724+
_In_ LPARAM lParam,
725+
_In_opt_ LPVOID lpReserved);
726+
713727
BOOL WINAPI EnumTimeFormatsA(_In_ TIMEFMT_ENUMPROCA, _In_ LCID, _In_ DWORD);
714728
BOOL WINAPI EnumTimeFormatsW(_In_ TIMEFMT_ENUMPROCW, _In_ LCID, _In_ DWORD);
715729

@@ -888,6 +902,14 @@ int WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,int);
888902
int WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int);
889903
int WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int);
890904
LANGID WINAPI GetUserDefaultLangID(void);
905+
906+
WINBASEAPI
907+
int
908+
WINAPI
909+
GetUserDefaultLocaleName(
910+
_Out_writes_(cchLocaleName) LPWSTR lpLocaleName,
911+
_In_ int cchLocaleName);
912+
891913
LCID WINAPI GetUserDefaultLCID(void);
892914
GEOID WINAPI GetUserGeoID(_In_ GEOCLASS);
893915

@@ -1006,7 +1028,11 @@ GetLocaleInfoEx(
10061028
_Out_writes_opt_(cchData) LPWSTR lpLCData,
10071029
_In_ int cchData);
10081030

1009-
BOOL WINAPI IsValidLocaleName(_In_ LPCWSTR lpLocaleName);
1031+
WINBASEAPI
1032+
BOOL
1033+
WINAPI
1034+
IsValidLocaleName(
1035+
_In_ LPCWSTR lpLocaleName);
10101036

10111037
BOOL
10121038
WINAPI
@@ -1106,11 +1132,41 @@ GetStringScripts(
11061132
BOOL WINAPI SetProcessPreferredUILanguages(_In_ DWORD, _In_opt_ PCZZWSTR, _Out_opt_ PULONG);
11071133
BOOL WINAPI SetThreadPreferredUILanguages(_In_ DWORD, _In_opt_ PCZZWSTR, _Out_opt_ PULONG);
11081134
BOOL WINAPI VerifyScripts(_In_ DWORD, _In_ LPCWSTR, _In_ int, _In_ LPCWSTR, _In_ int);
1109-
INT WINAPI LCMapStringEx(_In_ LPCWSTR, _In_ DWORD, _In_ LPCWSTR, _In_ INT, _Out_opt_ LPWSTR, _In_ INT, _In_ LPNLSVERSIONINFO, _In_ LPVOID, _In_ LPARAM);
1135+
1136+
#if (WINVER >= _WIN32_WINNT_WIN8)
1137+
_When_((dwMapFlags & (LCMAP_SORTKEY | LCMAP_BYTEREV | LCMAP_HASH | LCMAP_SORTHANDLE)) != 0, _At_((LPBYTE) lpDestStr, _Out_writes_bytes_opt_(cchDest)))
1138+
#else
1139+
_When_((dwMapFlags & (LCMAP_SORTKEY | LCMAP_BYTEREV)) != 0, _At_((LPBYTE) lpDestStr, _Out_writes_bytes_opt_(cchDest)))
1140+
#endif
1141+
_When_(cchSrc != -1, _At_((WCHAR *) lpSrcStr, _Out_writes_opt_(cchSrc)))
1142+
_When_(cchDest != -1, _At_((WCHAR *) lpDestStr, _Out_writes_opt_(cchDest)))
1143+
WINBASEAPI
1144+
int
1145+
WINAPI
1146+
LCMapStringEx(
1147+
_In_opt_ LPCWSTR lpLocaleName,
1148+
_In_ DWORD dwMapFlags,
1149+
_In_reads_(cchSrc) LPCWSTR lpSrcStr,
1150+
_In_ int cchSrc,
1151+
_Out_writes_opt_(cchDest) LPWSTR lpDestStr,
1152+
_In_ int cchDest,
1153+
_In_opt_ LPNLSVERSIONINFO lpVersionInformation,
1154+
_In_opt_ LPVOID lpReserved,
1155+
_In_opt_ LPARAM sortHandle);
1156+
11101157
LCID WINAPI LocaleNameToLCID(_In_ LPCWSTR, _In_ DWORD);
11111158

11121159
#endif /* (WINVER >= 0x0600) */
11131160

1161+
WINBASEAPI
1162+
int
1163+
WINAPI
1164+
LCIDToLocaleName(
1165+
_In_ LCID Locale,
1166+
_Out_writes_opt_(cchName) LPWSTR lpName,
1167+
_In_ int cchName,
1168+
_In_ DWORD dwFlags);
1169+
11141170
#ifdef UNICODE
11151171
#define CALINFO_ENUMPROC CALINFO_ENUMPROCW
11161172
#define CALINFO_ENUMPROCEX CALINFO_ENUMPROCEXW
@@ -1207,4 +1263,9 @@ typedef LPNUMBERFMTA LPNUMBERFMT;
12071263
#ifdef __cplusplus
12081264
}
12091265
#endif
1266+
1267+
#ifndef NOAPISET
1268+
#include <stringapiset.h>
1269+
#endif
1270+
12101271
#endif

sdk/include/xdk/ntbasedef.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,14 @@
226226
#endif
227227
#endif /* DECLSPEC_NOINLINE */
228228

229+
#ifndef DECLSPEC_GUARD_SUPPRESS
230+
#if (_MSC_FULL_VER >= 181040116) || defined(_D1VERSIONLKG171_)
231+
#define DECLSPEC_GUARD_SUPPRESS __declspec(guard(suppress))
232+
#else
233+
#define DECLSPEC_GUARD_SUPPRESS
234+
#endif
235+
#endif
236+
229237
#if !defined(_M_CEE_PURE)
230238
#define NTAPI_INLINE NTAPI
231239
#else

sdk/include/xdk/rtlfuncs.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Runtime Library Functions *
33
******************************************************************************/
44

5-
$if (_WDMDDK_)
5+
$if (_WDMDDK_ || _WINNT_)
66
#define FAST_FAIL_LEGACY_GS_VIOLATION 0
77
#define FAST_FAIL_VTGUARD_CHECK_FAILURE 1
88
#define FAST_FAIL_STACK_COOKIE_CHECK_FAILURE 2
@@ -31,6 +31,9 @@ RtlFailFast(
3131
__fastfail(Code);
3232
}
3333

34+
$endif(_WDMDDK_ || _WINNT_)
35+
$if (_WDMDDK_)
36+
3437
#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) && (defined(_M_CEE_PURE) || defined(_M_CEE_SAFE))
3538
#define NO_KERNEL_LIST_ENTRY_CHECKS
3639
#endif

sdk/include/xdk/winnt.template.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ extern "C" {
7575
$include(ketypes.h)
7676
$include(extypes.h)
7777
$include(rtltypes.h)
78+
$include(rtlfuncs.h)
7879
$include(winnt_old.h)
7980

8081
#ifdef __cplusplus

sdk/include/xdk/winnt_old.h

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,30 @@
130130
#define STATUS_USER_APC ((DWORD)0x000000C0)
131131
#define STATUS_TIMEOUT ((DWORD)0x00000102)
132132
#define STATUS_PENDING ((DWORD)0x00000103)
133+
#define DBG_EXCEPTION_HANDLED ((DWORD)0x00010001)
134+
#define DBG_CONTINUE ((DWORD)0x00010002)
133135
#define STATUS_SEGMENT_NOTIFICATION ((DWORD)0x40000005)
136+
#define STATUS_FATAL_APP_EXIT ((DWORD)0x40000015)
137+
#define DBG_REPLY_LATER ((DWORD)0x40010001)
138+
#define DBG_TERMINATE_THREAD ((DWORD)0x40010003)
139+
#define DBG_TERMINATE_PROCESS ((DWORD)0x40010004)
140+
#define DBG_CONTROL_C ((DWORD)0x40010005)
141+
#define DBG_PRINTEXCEPTION_C ((DWORD)0x40010006)
142+
#define DBG_RIPEXCEPTION ((DWORD)0x40010007)
143+
#define DBG_CONTROL_BREAK ((DWORD)0x40010008)
144+
#define DBG_COMMAND_EXCEPTION ((DWORD)0x40010009)
145+
#define DBG_PRINTEXCEPTION_WIDE_C ((DWORD)0x4001000A)
134146
#define STATUS_GUARD_PAGE_VIOLATION ((DWORD)0x80000001)
135147
#define STATUS_DATATYPE_MISALIGNMENT ((DWORD)0x80000002)
136148
#define STATUS_BREAKPOINT ((DWORD)0x80000003)
137149
#define STATUS_SINGLE_STEP ((DWORD)0x80000004)
150+
#define STATUS_LONGJUMP ((DWORD)0x80000026)
151+
#define STATUS_UNWIND_CONSOLIDATE ((DWORD)0x80000029)
152+
#define DBG_EXCEPTION_NOT_HANDLED ((DWORD)0x80010001)
138153
#define STATUS_ACCESS_VIOLATION ((DWORD)0xC0000005)
139154
#define STATUS_IN_PAGE_ERROR ((DWORD)0xC0000006)
140155
#define STATUS_INVALID_HANDLE ((DWORD)0xC0000008)
156+
#define STATUS_INVALID_PARAMETER ((DWORD)0xC000000D)
141157
#define STATUS_NO_MEMORY ((DWORD)0xC0000017)
142158
#define STATUS_ILLEGAL_INSTRUCTION ((DWORD)0xC000001D)
143159
#define STATUS_NONCONTINUABLE_EXCEPTION ((DWORD)0xC0000025)
@@ -154,10 +170,23 @@
154170
#define STATUS_INTEGER_OVERFLOW ((DWORD)0xC0000095)
155171
#define STATUS_PRIVILEGED_INSTRUCTION ((DWORD)0xC0000096)
156172
#define STATUS_STACK_OVERFLOW ((DWORD)0xC00000FD)
173+
#define STATUS_DLL_NOT_FOUND ((DWORD)0xC0000135)
174+
#define STATUS_ORDINAL_NOT_FOUND ((DWORD)0xC0000138)
175+
#define STATUS_ENTRYPOINT_NOT_FOUND ((DWORD)0xC0000139)
157176
#define STATUS_CONTROL_C_EXIT ((DWORD)0xC000013A)
177+
#define STATUS_DLL_INIT_FAILED ((DWORD)0xC0000142)
178+
#define STATUS_CONTROL_STACK_VIOLATION ((DWORD)0xC00001B2)
158179
#define STATUS_FLOAT_MULTIPLE_FAULTS ((DWORD)0xC00002B4)
159180
#define STATUS_FLOAT_MULTIPLE_TRAPS ((DWORD)0xC00002B5)
160181
#define STATUS_REG_NAT_CONSUMPTION ((DWORD)0xC00002C9)
182+
#define STATUS_HEAP_CORRUPTION ((DWORD)0xC0000374)
183+
#define STATUS_STACK_BUFFER_OVERRUN ((DWORD)0xC0000409)
184+
#define STATUS_INVALID_CRUNTIME_PARAMETER ((DWORD)0xC0000417)
185+
#define STATUS_ASSERTION_FAILURE ((DWORD)0xC0000420)
186+
#define STATUS_ENCLAVE_VIOLATION ((DWORD)0xC00004A2)
187+
#define STATUS_INTERRUPTED ((DWORD)0xC0000515)
188+
#define STATUS_THREAD_NOT_RUNNING ((DWORD)0xC0000516)
189+
#define STATUS_ALREADY_REGISTERED ((DWORD)0xC0000718)
161190
#define STATUS_SXS_EARLY_DEACTIVATION ((DWORD)0xC015000F)
162191
#define STATUS_SXS_INVALID_DEACTIVATION ((DWORD)0xC0150010)
163192

0 commit comments

Comments
 (0)