Skip to content

Commit 2f805d7

Browse files
committed
[PSDK] winuser.h: Add missing (MINIMUM|MAXIMUM)_RESERVED_MANIFEST_RESOURCE_ID define
1 parent a3899d8 commit 2f805d7

File tree

2 files changed

+34
-26
lines changed

2 files changed

+34
-26
lines changed

sdk/include/psdk/winuser.h

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -596,37 +596,45 @@ extern "C" {
596596

597597
#ifndef NORESOURCE
598598

599-
#define RT_CURSOR MAKEINTRESOURCE(1)
600-
#define RT_BITMAP MAKEINTRESOURCE(2)
601-
#define RT_ICON MAKEINTRESOURCE(3)
602-
#define RT_MENU MAKEINTRESOURCE(4)
603-
#define RT_DIALOG MAKEINTRESOURCE(5)
604-
#define RT_STRING MAKEINTRESOURCE(6)
605-
#define RT_FONTDIR MAKEINTRESOURCE(7)
606-
#define RT_FONT MAKEINTRESOURCE(8)
607-
#define RT_ACCELERATOR MAKEINTRESOURCE(9)
608-
#define RT_RCDATA MAKEINTRESOURCE(10)
599+
/* Predefined resource types */
600+
#define RT_CURSOR MAKEINTRESOURCE(1)
601+
#define RT_BITMAP MAKEINTRESOURCE(2)
602+
#define RT_ICON MAKEINTRESOURCE(3)
603+
#define RT_MENU MAKEINTRESOURCE(4)
604+
#define RT_DIALOG MAKEINTRESOURCE(5)
605+
#define RT_STRING MAKEINTRESOURCE(6)
606+
#define RT_FONTDIR MAKEINTRESOURCE(7)
607+
#define RT_FONT MAKEINTRESOURCE(8)
608+
#define RT_ACCELERATOR MAKEINTRESOURCE(9)
609+
#define RT_RCDATA MAKEINTRESOURCE(10)
609610
#define RT_MESSAGETABLE MAKEINTRESOURCE(11)
610611
#define DIFFERENCE 11
611612
#define RT_GROUP_CURSOR MAKEINTRESOURCE((ULONG_PTR)RT_CURSOR+DIFFERENCE)
612-
#define RT_GROUP_ICON MAKEINTRESOURCE((ULONG_PTR)RT_ICON+DIFFERENCE)
613-
#define RT_VERSION MAKEINTRESOURCE(16)
614-
#define RT_DLGINCLUDE MAKEINTRESOURCE(17)
615-
#define RT_PLUGPLAY MAKEINTRESOURCE(19)
616-
#define RT_VXD MAKEINTRESOURCE(20)
617-
#define RT_ANICURSOR MAKEINTRESOURCE(21)
618-
#define RT_ANIICON MAKEINTRESOURCE(22)
619-
#define RT_HTML MAKEINTRESOURCE(23)
613+
#define RT_GROUP_ICON MAKEINTRESOURCE((ULONG_PTR)RT_ICON+DIFFERENCE)
614+
#define RT_VERSION MAKEINTRESOURCE(16)
615+
#define RT_DLGINCLUDE MAKEINTRESOURCE(17)
616+
#if (WINVER >= 0x0400)
617+
#define RT_PLUGPLAY MAKEINTRESOURCE(19)
618+
#define RT_VXD MAKEINTRESOURCE(20)
619+
#define RT_ANICURSOR MAKEINTRESOURCE(21)
620+
#define RT_ANIICON MAKEINTRESOURCE(22)
621+
#endif /* WINVER >= 0x0400 */
622+
#define RT_HTML MAKEINTRESOURCE(23)
623+
620624
#ifndef RC_INVOKED
621-
#define RT_MANIFEST MAKEINTRESOURCE(24)
622-
#define CREATEPROCESS_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(1)
623-
#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(2)
625+
#define RT_MANIFEST MAKEINTRESOURCE(24)
626+
#define CREATEPROCESS_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(1)
627+
#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(2)
624628
#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(3)
629+
#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(1) /* inclusive */
630+
#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(16) /* inclusive */
625631
#else
626-
#define RT_MANIFEST 24
627-
#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
628-
#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2
632+
#define RT_MANIFEST 24
633+
#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
634+
#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2
629635
#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3
636+
#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID 1 /* inclusive */
637+
#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID 16 /* inclusive */
630638
#endif /* !RC_INVOKED */
631639

632640
#endif /* !NORESOURCE */

sdk/include/psdk/winuser.rh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
#define CREATEPROCESS_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(1)
3535
#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(2)
3636
#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(3)
37-
#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(1)
38-
#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(16)
37+
#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(1) /* inclusive */
38+
#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(16) /* inclusive */
3939

4040

4141
/*** ShowWindow() codes ***/

0 commit comments

Comments
 (0)