Skip to content

Commit 01f35c4

Browse files
riverarriverar
committed
Merge branch 'main' into rafael/notifyicon_msgs
2 parents 853e9c4 + 5973a02 commit 01f35c4

File tree

87 files changed

+7289
-1856
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+7289
-1856
lines changed

‎BuildTools/BuildTools.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
<PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="$(LastWin32MetadataReleaseVersion)" GeneratePathProperty="True">
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>
17-
<PackageReference Include="Microsoft.Direct3D.D3D12" Version="1.611.1" GeneratePathProperty="true"/>
17+
<PackageReference Include="Microsoft.Direct3D.D3D12" Version="1.613.1" GeneratePathProperty="true"/>
1818
</ItemGroup>
1919
</Project>

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<OutputPath>$(RepoRootPath)bin\$(Configuration)</OutputPath>
1616
<PackageOutputPath>$(MSBuildThisFileDirectory)bin\Packages\$(Configuration)\NuGet\</PackageOutputPath>
1717

18-
<LocalTaskBinDir>$(RepoRootPath)bin\$(Configuration)\net6.0\</LocalTaskBinDir>
18+
<LocalTaskBinDir>$(RepoRootPath)bin\$(Configuration)\net8.0\</LocalTaskBinDir>
1919

2020
<LangVersion>9</LangVersion>
2121

@@ -25,7 +25,7 @@
2525
<PackageProjectUrl>https://github.com/microsoft/win32metadata</PackageProjectUrl>
2626
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
2727
<PackageIcon>images/windows.png</PackageIcon>
28-
<LastWin32MetadataReleaseVersion>56.0.13-preview</LastWin32MetadataReleaseVersion>
28+
<LastWin32MetadataReleaseVersion>59.0.13-preview</LastWin32MetadataReleaseVersion>
2929
</PropertyGroup>
3030

3131
<ItemGroup>

‎apidocs/Microsoft.Windows.SDK.Win32Docs/Microsoft.Windows.SDK.Win32Docs.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<ProjectReference Include="..\ScrapeDocs\ScrapeDocs.csproj" ReferenceOutputAssembly="false" OutputItemType="ScraperTool" SetTargetFramework="TargetFramework=net6.0" />
26+
<ProjectReference Include="..\ScrapeDocs\ScrapeDocs.csproj" ReferenceOutputAssembly="false" OutputItemType="ScraperTool" SetTargetFramework="TargetFramework=net8.0" />
2727
</ItemGroup>
2828

2929
<Import Project="Microsoft.Windows.SDK.Win32Docs.targets" />

‎apidocs/ScrapeDocs/ScrapeDocs.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<!-- Use plural TargetFrameworks here because we set the singular as a global property in a referencing project. -->
6-
<TargetFrameworks>net6.0</TargetFrameworks>
6+
<TargetFrameworks>net8.0</TargetFrameworks>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99

10-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
10+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
1111
<LangVersion>10.0</LangVersion>
1212
</PropertyGroup>
1313

14-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
14+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
1515
<LangVersion>10.0</LangVersion>
1616
</PropertyGroup>
1717

‎azure-pipelines.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,10 @@ jobs:
219219
condition: and(succeeded(), eq(variables['SignFiles'], 'true'), ne(variables['Build.Reason'], 'PullRequest'))
220220

221221
- task: EsrpCodeSigning@1
222-
displayName: Authenticode sign net6.0 binaries in Generator SDK package
222+
displayName: Authenticode sign net8.0 binaries in Generator SDK package
223223
inputs:
224224
ConnectedServiceName: 'Xlang Code Signing'
225-
FolderPath: '$(Build.SourcesDirectory)\bin\$(BuildConfiguration)\net6.0'
225+
FolderPath: '$(Build.SourcesDirectory)\bin\$(BuildConfiguration)\net8.0'
226226
Pattern: 'ClangSharpSourceToWinmd.dll,ConstantsScraper.dll,CsvHelper.dll,ICSharpCode.Decompiler.dll,MetadataTasks.dll,MetadataUtils.dll,WinmdUtils.dll'
227227
signConfigType: 'inlineSignParams'
228228
inlineOperation: |

‎generation/WinSDK/AdditionalHeaders/calendarapis.h‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
#include <windows.h>
2+
#include <WinNls.h>
3+
4+
#ifdef __cplusplus
5+
extern "C" {
6+
#endif
7+
8+
enum CALDATETIME_DATEUNIT {
9+
EraUnit,
10+
YearUnit,
11+
MonthUnit,
12+
WeekUnit,
13+
DayUnit,
14+
HourUnit,
15+
MinuteUnit,
16+
SecondUnit,
17+
TickUnit
18+
};
19+
20+
typedef struct _caldatetime {
21+
CALID CalId;
22+
UINT Era;
23+
UINT Year;
24+
UINT Month;
25+
UINT Day;
26+
UINT DayOfWeek;
27+
UINT Hour;
28+
UINT Minute;
29+
UINT Second;
30+
ULONG Tick;
31+
} CALDATETIME, *LPCALDATETIME;
32+
33+
BOOL GetCalendarSupportedDateRange(
34+
_In_ CALID Calendar,
35+
_Out_ LPCALDATETIME lpCalMinDateTime,
36+
_Out_ LPCALDATETIME lpCalMaxDateTime
37+
);
38+
39+
BOOL GetCalendarDateFormatEx(
40+
_In_ LPCWSTR lpszLocale,
41+
_In_ DWORD dwFlags,
42+
_In_ const LPCALDATETIME lpCalDateTime,
43+
_In_ LPCWSTR lpFormat,
44+
_Out_ LPWSTR lpDateStr,
45+
_In_ int cchDate
46+
);
47+
48+
BOOL ConvertSystemTimeToCalDateTime(
49+
_In_ const SYSTEMTIME *lpSysTime,
50+
_In_ CALID calId,
51+
_Out_ LPCALDATETIME lpCalDateTime
52+
);
53+
54+
BOOL UpdateCalendarDayOfWeek(
55+
_Inout_ LPCALDATETIME lpCalDateTime
56+
);
57+
58+
BOOL AdjustCalendarDate(
59+
_Inout_ LPCALDATETIME lpCalDateTime,
60+
_In_ CALDATETIME_DATEUNIT calUnit,
61+
_Out_ INT amount
62+
);
63+
64+
BOOL ConvertCalDateTimeToSystemTime(
65+
_In_ const LPCALDATETIME lpCalDateTime,
66+
_Out_ SYSTEMTIME *lpSysTime
67+
);
68+
69+
BOOL IsCalendarLeapYear(
70+
_In_ CALID calId,
71+
_In_ UINT year,
72+
_In_ UINT era
73+
);
74+
75+
#ifdef __cplusplus
76+
}
77+
#endif

‎generation/WinSDK/AdditionalHeaders/consoleapis.h‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#include <windows.h>
2+
3+
#ifdef __cplusplus
4+
extern "C" {
5+
#endif
6+
7+
typedef _Return_type_success_(return >= 0) LONG NTSTATUS;
8+
9+
typedef enum _CONSOLECONTROL
10+
{
11+
Reserved1,
12+
ConsoleNotifyConsoleApplication,
13+
Reserved2,
14+
ConsoleSetCaretInfo,
15+
Reserved3,
16+
ConsoleSetForeground,
17+
ConsoleSetWindowOwner,
18+
ConsoleEndTask,
19+
} CONSOLECONTROL;
20+
21+
typedef struct _CONSOLEENDTASK
22+
{
23+
HANDLE ProcessId;
24+
HWND hwnd;
25+
ULONG ConsoleEventCode;
26+
ULONG ConsoleFlags;
27+
} CONSOLEENDTASK, *PCONSOLEENDTASK;
28+
29+
typedef struct _CONSOLEWINDOWOWNER
30+
{
31+
HWND hwnd;
32+
ULONG ProcessId;
33+
ULONG ThreadId;
34+
} CONSOLEWINDOWOWNER, *PCONSOLEWINDOWOWNER;
35+
36+
typedef struct _CONSOLESETFOREGROUND
37+
{
38+
HANDLE hProcess;
39+
BOOL bForeground;
40+
} CONSOLESETFOREGROUND, *PCONSOLESETFOREGROUND;
41+
42+
typedef struct _CONSOLE_PROCESS_INFO
43+
{
44+
IN DWORD dwProcessID;
45+
IN DWORD dwFlags;
46+
} CONSOLE_PROCESS_INFO, *PCONSOLE_PROCESS_INFO;
47+
48+
typedef struct _CONSOLE_CARET_INFO
49+
{
50+
IN HWND hwnd;
51+
IN RECT rc;
52+
} CONSOLE_CARET_INFO, *PCONSOLE_CARET_INFO;
53+
54+
NTSTATUS ConsoleControl(
55+
_In_ CONSOLECONTROL Command,
56+
_In_reads_bytes_(ConsoleInformationLength) PVOID ConsoleInformation,
57+
_In_ DWORD ConsoleInformationLength
58+
);
59+
60+
#ifdef __cplusplus
61+
}
62+
#endif

‎generation/WinSDK/AdditionalHeaders/getcurrentpackageinfo3.h‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#include <windows.h>
2+
#include <appmodel.h>
3+
4+
#ifdef __cplusplus
5+
extern "C" {
6+
#endif
7+
8+
enum PackageInfo3Type
9+
{
10+
PackageInfo3Type_PackageInfoGeneration = 16,
11+
} PackageInfoType;
12+
13+
HRESULT GetCurrentPackageInfo3(
14+
_In_ UINT32 flags,
15+
_In_ PackageInfo3Type packageInfoType,
16+
_Inout_ UINT32 *bufferLength,
17+
_Out_writes_bytes_opt_(*bufferLength) void *buffer,
18+
_Out_opt_ UINT32 *count
19+
);
20+
21+
#ifdef __cplusplus
22+
}
23+
#endif

‎generation/WinSDK/AdditionalHeaders/iswindowarranged.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#include <windows.h>
2+
3+
#ifdef __cplusplus
4+
extern "C" {
5+
#endif
6+
7+
BOOL IsWindowArranged(
8+
[in] HWND hwnd
9+
);
10+
11+
#ifdef __cplusplus
12+
}
13+
#endif

‎generation/WinSDK/ConstantsScraper.settings.rsp‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,23 @@ WRITE_OWNER=uint
453453
WM_USER=int
454454
XBUTTON1=ushort
455455
XBUTTON2=ushort
456+
WINEVENT_CHANNEL_*=int
457+
WINEVENT_LEVEL_*=int
458+
WINEVENT_OPCODE_*=int
459+
WINEVENT_KEYWORD_*=long
460+
WINEVENT_KEYWORD_RESERVED_5*=long
461+
WINEVENT_KEYWORD_RESERVED_60=long
462+
WINEVENT_KEYWORD_RESERVED_61=long
463+
WINEVENT_KEYWORD_RESERVED_62=long
464+
WINEVENT_KEYWORD_RESERVED_63=ulong
465+
WINEVENT_TASK_NONE=int
466+
WINEVT_KEYWORD_ANY=int
467+
MSG_category_*=int
468+
MSG_channel_*=int
469+
MSG_keyword_*=int
470+
MSG_level_*=int
471+
MSG_opcode_*=int
472+
MSG_task_*=int
456473
--exclude
457474
TRUE
458475
FALSE
@@ -601,4 +618,9 @@ WOW64_CONTEXT_EXCEPTION_ACTIVE
601618
WOW64_CONTEXT_SERVICE_ACTIVE
602619
WOW64_CONTEXT_EXCEPTION_REQUEST
603620
WOW64_CONTEXT_EXCEPTION_REPORTING
604-
HOTKEYF_EXT
621+
HOTKEYF_EXT
622+
RTL_CONDITION_VARIABLE_LOCKMODE_SHARED
623+
RTL_RUN_ONCE_CHECK_ONLY
624+
RTL_RUN_ONCE_ASYNC
625+
RTL_RUN_ONCE_INIT_FAILED
626+
RTL_RUN_ONCE_CTX_RESERVED_BITS

0 commit comments

Comments
 (0)