diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index cf80abab0e6..950d98acf49 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -17,6 +17,10 @@ Signature = "$Windows NT$" ; Directories relative to the installation directory. ; For specifying absolute directories, use the SystemPartitionFiles section, ; or use names starting with \. +; +; WARNING! +; Please keep the numbering in this list in sync with +; sdk/cmake/CMakeMacros.cmake [Directories] 1 = "\" 2 = system32 @@ -26,7 +30,6 @@ Signature = "$Windows NT$" 6 = inf 7 = bin 8 = bin\testdata -80 = bin\suppl 9 = media 10 = Microsoft.NET 11 = Microsoft.NET\Framework @@ -78,7 +81,7 @@ Signature = "$Windows NT$" 57 = winsxs\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef 58 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef 59 = winsxs\x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef -60 = winsxs\x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef +60 = bin\suppl 61 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef 62 = Resources\Themes\Modern 63 = 3rdParty diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 3f9a5486c9e..370673676e0 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -107,8 +107,6 @@ macro(dir_to_num dir var) set(${var} 7) elseif(${dir} STREQUAL reactos/bin/testdata) set(${var} 8) - elseif(${dir} STREQUAL reactos/bin/suppl) - set(${var} 80) elseif(${dir} STREQUAL reactos/media) set(${var} 9) elseif(${dir} STREQUAL reactos/Microsoft.NET) @@ -211,7 +209,7 @@ macro(dir_to_num dir var) set(${var} 58) elseif(${dir} STREQUAL reactos/winsxs/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef) set(${var} 59) - elseif(${dir} STREQUAL reactos/winsxs/x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef) + elseif(${dir} STREQUAL reactos/bin/suppl) set(${var} 60) elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef) set(${var} 61)