Make ConsoleLogonUI not require au7hui.dll

Added all the bitmaps from Windows 7's authui.dll to ConsoleLogonUI. This way, files from Windows 7 are no longer required for ConsoleLogonUI to function. Also for preparation for a future XP version of ConsoleLogonHook.
wiktorwiktor12 · Jun 30, 2024 · 0807120 · 0807120
1 parent 1041a5c
commit 0807120
Show file tree

Hide file tree

Showing 114 changed files with 316 additions and 162 deletions.
diff --git a/ConsoleLogonHook.sln b/ConsoleLogonHook.sln
@@ -13,8 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConsoleLogonUI", "ConsoleLo
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectUI", "ConsoleLogonUI\dui\DirectUI\DirectUI.vcxproj", "{0B7DE49A-33C6-41B1-A9CE-D353031F8454}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConsoleLogonHookRes", "ConsoleLogonHookRes\ConsoleLogonHookRes.vcxproj", "{B950DCA9-D24F-4A27-8AFE-FD5D96F21E40}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -47,14 +45,6 @@ Global
 		{0B7DE49A-33C6-41B1-A9CE-D353031F8454}.Release|x64.Build.0 = Release|x64
 		{0B7DE49A-33C6-41B1-A9CE-D353031F8454}.Release|x86.ActiveCfg = Release|Win32
 		{0B7DE49A-33C6-41B1-A9CE-D353031F8454}.Release|x86.Build.0 = Release|Win32
-		{B950DCA9-D24F-4A27-8AFE-FD5D96F21E40}.Debug|x64.ActiveCfg = Debug|x64
-		{B950DCA9-D24F-4A27-8AFE-FD5D96F21E40}.Debug|x64.Build.0 = Debug|x64
-		{B950DCA9-D24F-4A27-8AFE-FD5D96F21E40}.Debug|x86.ActiveCfg = Debug|Win32
-		{B950DCA9-D24F-4A27-8AFE-FD5D96F21E40}.Debug|x86.Build.0 = Debug|Win32
-		{B950DCA9-D24F-4A27-8AFE-FD5D96F21E40}.Release|x64.ActiveCfg = Release|x64
-		{B950DCA9-D24F-4A27-8AFE-FD5D96F21E40}.Release|x64.Build.0 = Release|x64
-		{B950DCA9-D24F-4A27-8AFE-FD5D96F21E40}.Release|x86.ActiveCfg = Release|Win32
-		{B950DCA9-D24F-4A27-8AFE-FD5D96F21E40}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/ConsoleLogonUI/resources/11000.bmp b/ConsoleLogonUI/resources/11000.bmp
diff --git a/ConsoleLogonUI/resources/11001.bmp b/ConsoleLogonUI/resources/11001.bmp
diff --git a/ConsoleLogonUI/resources/11002.bmp b/ConsoleLogonUI/resources/11002.bmp
diff --git a/ConsoleLogonUI/resources/11003.bmp b/ConsoleLogonUI/resources/11003.bmp
diff --git a/ConsoleLogonUI/resources/12201.bmp b/ConsoleLogonUI/resources/12201.bmp
diff --git a/ConsoleLogonUI/resources/12202.bmp b/ConsoleLogonUI/resources/12202.bmp
diff --git a/ConsoleLogonUI/resources/12203.bmp b/ConsoleLogonUI/resources/12203.bmp
diff --git a/ConsoleLogonUI/resources/12204.bmp b/ConsoleLogonUI/resources/12204.bmp
diff --git a/ConsoleLogonUI/resources/12205.bmp b/ConsoleLogonUI/resources/12205.bmp
diff --git a/ConsoleLogonUI/resources/12206.bmp b/ConsoleLogonUI/resources/12206.bmp
diff --git a/ConsoleLogonUI/resources/12207.bmp b/ConsoleLogonUI/resources/12207.bmp
diff --git a/ConsoleLogonUI/resources/12208.bmp b/ConsoleLogonUI/resources/12208.bmp
diff --git a/ConsoleLogonUI/resources/12209.bmp b/ConsoleLogonUI/resources/12209.bmp
diff --git a/ConsoleLogonUI/resources/12210.bmp b/ConsoleLogonUI/resources/12210.bmp
diff --git a/ConsoleLogonUI/resources/12211.bmp b/ConsoleLogonUI/resources/12211.bmp
diff --git a/ConsoleLogonUI/resources/12212.bmp b/ConsoleLogonUI/resources/12212.bmp
diff --git a/ConsoleLogonUI/resources/12213.bmp b/ConsoleLogonUI/resources/12213.bmp
diff --git a/ConsoleLogonUI/resources/12214.bmp b/ConsoleLogonUI/resources/12214.bmp
diff --git a/ConsoleLogonUI/resources/12215.bmp b/ConsoleLogonUI/resources/12215.bmp
diff --git a/ConsoleLogonUI/resources/12216.bmp b/ConsoleLogonUI/resources/12216.bmp
diff --git a/ConsoleLogonUI/resources/12217.bmp b/ConsoleLogonUI/resources/12217.bmp
diff --git a/ConsoleLogonUI/resources/12218.bmp b/ConsoleLogonUI/resources/12218.bmp
diff --git a/ConsoleLogonUI/resources/12219.bmp b/ConsoleLogonUI/resources/12219.bmp
diff --git a/ConsoleLogonUI/resources/12220.bmp b/ConsoleLogonUI/resources/12220.bmp
diff --git a/ConsoleLogonUI/resources/12221.bmp b/ConsoleLogonUI/resources/12221.bmp
diff --git a/ConsoleLogonUI/resources/12222.bmp b/ConsoleLogonUI/resources/12222.bmp
diff --git a/ConsoleLogonUI/resources/12223.bmp b/ConsoleLogonUI/resources/12223.bmp
diff --git a/ConsoleLogonUI/resources/12224.bmp b/ConsoleLogonUI/resources/12224.bmp
diff --git a/ConsoleLogonUI/resources/12225.bmp b/ConsoleLogonUI/resources/12225.bmp
diff --git a/ConsoleLogonUI/resources/12226.bmp b/ConsoleLogonUI/resources/12226.bmp
diff --git a/ConsoleLogonUI/resources/12227.bmp b/ConsoleLogonUI/resources/12227.bmp
diff --git a/ConsoleLogonUI/resources/12228.bmp b/ConsoleLogonUI/resources/12228.bmp
diff --git a/ConsoleLogonUI/resources/12229.bmp b/ConsoleLogonUI/resources/12229.bmp
diff --git a/ConsoleLogonUI/resources/12230.bmp b/ConsoleLogonUI/resources/12230.bmp
diff --git a/ConsoleLogonUI/resources/12231.bmp b/ConsoleLogonUI/resources/12231.bmp
diff --git a/ConsoleLogonUI/resources/12232.bmp b/ConsoleLogonUI/resources/12232.bmp
diff --git a/ConsoleLogonUI/resources/12233.bmp b/ConsoleLogonUI/resources/12233.bmp
diff --git a/ConsoleLogonUI/resources/12234.bmp b/ConsoleLogonUI/resources/12234.bmp
diff --git a/ConsoleLogonUI/resources/12235.bmp b/ConsoleLogonUI/resources/12235.bmp
diff --git a/ConsoleLogonUI/resources/12236.bmp b/ConsoleLogonUI/resources/12236.bmp
diff --git a/ConsoleLogonUI/resources/12237.bmp b/ConsoleLogonUI/resources/12237.bmp
diff --git a/ConsoleLogonUI/resources/12238.bmp b/ConsoleLogonUI/resources/12238.bmp
diff --git a/ConsoleLogonUI/resources/12259.bmp b/ConsoleLogonUI/resources/12259.bmp
diff --git a/ConsoleLogonUI/resources/12260.bmp b/ConsoleLogonUI/resources/12260.bmp
diff --git a/ConsoleLogonUI/resources/12261.bmp b/ConsoleLogonUI/resources/12261.bmp
diff --git a/ConsoleLogonUI/resources/12262.bmp b/ConsoleLogonUI/resources/12262.bmp
diff --git a/ConsoleLogonUI/resources/12263.bmp b/ConsoleLogonUI/resources/12263.bmp
diff --git a/ConsoleLogonUI/resources/12264.bmp b/ConsoleLogonUI/resources/12264.bmp
diff --git a/ConsoleLogonUI/resources/12265.bmp b/ConsoleLogonUI/resources/12265.bmp
diff --git a/ConsoleLogonUI/resources/12266.bmp b/ConsoleLogonUI/resources/12266.bmp
diff --git a/ConsoleLogonUI/resources/12267.bmp b/ConsoleLogonUI/resources/12267.bmp
diff --git a/ConsoleLogonUI/resources/12268.bmp b/ConsoleLogonUI/resources/12268.bmp
diff --git a/ConsoleLogonUI/resources/12269.bmp b/ConsoleLogonUI/resources/12269.bmp
diff --git a/ConsoleLogonUI/resources/12270.bmp b/ConsoleLogonUI/resources/12270.bmp
diff --git a/ConsoleLogonUI/resources/12271.bmp b/ConsoleLogonUI/resources/12271.bmp
diff --git a/ConsoleLogonUI/resources/12272.bmp b/ConsoleLogonUI/resources/12272.bmp
diff --git a/ConsoleLogonUI/resources/12273.bmp b/ConsoleLogonUI/resources/12273.bmp
diff --git a/ConsoleLogonUI/resources/12274.bmp b/ConsoleLogonUI/resources/12274.bmp
diff --git a/ConsoleLogonUI/resources/12275.bmp b/ConsoleLogonUI/resources/12275.bmp
diff --git a/ConsoleLogonUI/resources/12276.bmp b/ConsoleLogonUI/resources/12276.bmp
diff --git a/ConsoleLogonUI/resources/12277.bmp b/ConsoleLogonUI/resources/12277.bmp
diff --git a/ConsoleLogonUI/resources/12278.bmp b/ConsoleLogonUI/resources/12278.bmp
diff --git a/ConsoleLogonUI/resources/12279.bmp b/ConsoleLogonUI/resources/12279.bmp
diff --git a/ConsoleLogonUI/resources/12280.bmp b/ConsoleLogonUI/resources/12280.bmp
diff --git a/ConsoleLogonUI/resources/12281.bmp b/ConsoleLogonUI/resources/12281.bmp
diff --git a/ConsoleLogonUI/resources/12282.bmp b/ConsoleLogonUI/resources/12282.bmp
diff --git a/ConsoleLogonUI/resources/12283.bmp b/ConsoleLogonUI/resources/12283.bmp
diff --git a/ConsoleLogonUI/resources/12284.bmp b/ConsoleLogonUI/resources/12284.bmp
diff --git a/ConsoleLogonUI/resources/12285.bmp b/ConsoleLogonUI/resources/12285.bmp
diff --git a/ConsoleLogonUI/resources/12286.bmp b/ConsoleLogonUI/resources/12286.bmp
diff --git a/ConsoleLogonUI/resources/12287.bmp b/ConsoleLogonUI/resources/12287.bmp
diff --git a/ConsoleLogonUI/resources/12288.bmp b/ConsoleLogonUI/resources/12288.bmp
diff --git a/ConsoleLogonUI/resources/12289.bmp b/ConsoleLogonUI/resources/12289.bmp
diff --git a/ConsoleLogonUI/resources/12290.bmp b/ConsoleLogonUI/resources/12290.bmp
diff --git a/ConsoleLogonUI/resources/12291.bmp b/ConsoleLogonUI/resources/12291.bmp
diff --git a/ConsoleLogonUI/resources/12292.bmp b/ConsoleLogonUI/resources/12292.bmp
diff --git a/ConsoleLogonUI/resources/12293.bmp b/ConsoleLogonUI/resources/12293.bmp
diff --git a/ConsoleLogonUI/resources/12294.bmp b/ConsoleLogonUI/resources/12294.bmp
diff --git a/ConsoleLogonUI/resources/12295.bmp b/ConsoleLogonUI/resources/12295.bmp
diff --git a/ConsoleLogonUI/resources/12296.bmp b/ConsoleLogonUI/resources/12296.bmp
diff --git a/ConsoleLogonUI/resources/12298.bmp b/ConsoleLogonUI/resources/12298.bmp
diff --git a/ConsoleLogonUI/resources/12299.bmp b/ConsoleLogonUI/resources/12299.bmp
diff --git a/ConsoleLogonUI/resources/12300.bmp b/ConsoleLogonUI/resources/12300.bmp
diff --git a/ConsoleLogonUI/resources/12301.bmp b/ConsoleLogonUI/resources/12301.bmp
diff --git a/ConsoleLogonUI/resources/12302.bmp b/ConsoleLogonUI/resources/12302.bmp
diff --git a/ConsoleLogonUI/resources/12303.bmp b/ConsoleLogonUI/resources/12303.bmp
diff --git a/ConsoleLogonUI/resources/12304.bmp b/ConsoleLogonUI/resources/12304.bmp
diff --git a/ConsoleLogonUI/resources/12305.bmp b/ConsoleLogonUI/resources/12305.bmp
diff --git a/ConsoleLogonUI/resources/12306.bmp b/ConsoleLogonUI/resources/12306.bmp
diff --git a/ConsoleLogonUI/resources/12307.bmp b/ConsoleLogonUI/resources/12307.bmp
diff --git a/ConsoleLogonUI/resources/12309.bmp b/ConsoleLogonUI/resources/12309.bmp
diff --git a/ConsoleLogonUI/resources/12310.bmp b/ConsoleLogonUI/resources/12310.bmp
diff --git a/ConsoleLogonUI/resources/12311.bmp b/ConsoleLogonUI/resources/12311.bmp
diff --git a/ConsoleLogonUI/resources/12312.bmp b/ConsoleLogonUI/resources/12312.bmp
diff --git a/ConsoleLogonUI/resources/12313.bmp b/ConsoleLogonUI/resources/12313.bmp
diff --git a/ConsoleLogonUI/resources/12314.bmp b/ConsoleLogonUI/resources/12314.bmp
diff --git a/ConsoleLogonUI/resources/12315.bmp b/ConsoleLogonUI/resources/12315.bmp
diff --git a/ConsoleLogonUI/resources/12316.bmp b/ConsoleLogonUI/resources/12316.bmp
diff --git a/ConsoleLogonUI/resources/12317.bmp b/ConsoleLogonUI/resources/12317.bmp
diff --git a/ConsoleLogonUI/resources/12318.bmp b/ConsoleLogonUI/resources/12318.bmp
diff --git a/ConsoleLogonUI/resources/12320.bmp b/ConsoleLogonUI/resources/12320.bmp
diff --git a/ConsoleLogonUI/resources/12321.bmp b/ConsoleLogonUI/resources/12321.bmp
diff --git a/ConsoleLogonUI/resources/12322.bmp b/ConsoleLogonUI/resources/12322.bmp
diff --git a/ConsoleLogonUI/resources/12323.bmp b/ConsoleLogonUI/resources/12323.bmp
diff --git a/ConsoleLogonUI/resources/12324.bmp b/ConsoleLogonUI/resources/12324.bmp
diff --git a/ConsoleLogonUI/resources/ConsoleLogonUI.rc b/ConsoleLogonUI/resources/ConsoleLogonUI.rc
@@ -1,18 +1,100 @@
 #include "resource.h"
 
-IDUIF_MAIN  UIFILE  "Main.xml"
-IDUIF_TEST  UIFILE  "test.xml"
-IDUIF_MESSAGEVIEW UIFILE "messageview.xml"
-IDUIF_SECURITYCONTROL UIFILE "securitycontrol.xml"
-IDUIF_SELECTEDCREDENTIALVIEW UIFILE "selectedcredentialview.xml"
-IDUIF_STATUSVIEW UIFILE "statusview.xml"
-IDUIF_USERSELECT UIFILE "userselect.xml"
-IDB_BRAND               BITMAP                  "Bitmap120.bmp"
-IDB_BRAND2	BITMAP "Bitmap1120.bmp"
-IDB_BRAND3 	BITMAP "Bitmap2120.bmp"
-IDB_SPINNER1 BITMAP "Bitmap5000.bmp"
-IDB_SPINNER2 BITMAP "Bitmap5001.bmp"
-IDB_SPINNER3 BITMAP "Bitmap5002.bmp"
-IDB_SPINNER4 BITMAP "Bitmap5003.bmp"
-IDB_SPINNER5 BITMAP "Bitmap5004.bmp"
-IDB_BG BITMAP "IMAGE5035.bmp"
+IDUIF_MAIN								UIFILE				  "Main.xml"
+IDUIF_MESSAGEVIEW						UIFILE				  "messageview.xml"
+IDUIF_SECURITYCONTROL					UIFILE				  "securitycontrol.xml"
+IDUIF_SELECTEDCREDENTIALVIEW			UIFILE				  "selectedcredentialview.xml"
+IDUIF_STATUSVIEW						UIFILE				  "statusview.xml"
+IDUIF_USERSELECT						UIFILE				  "userselect.xml"
+
+IDB_BRAND								BITMAP                "Bitmap120.bmp"
+IDB_BRAND2								BITMAP				  "Bitmap1120.bmp"
+IDB_BRAND3 								BITMAP				  "Bitmap2120.bmp"
+IDB_SPINNER1							BITMAP				  "Bitmap5000.bmp"
+IDB_SPINNER2							BITMAP				  "Bitmap5001.bmp"
+IDB_SPINNER3							BITMAP				  "Bitmap5002.bmp"
+IDB_SPINNER4							BITMAP				  "Bitmap5003.bmp"
+IDB_SPINNER5							BITMAP				  "Bitmap5004.bmp"
+IDB_BG								    BITMAP				  "IMAGE5035.bmp"
+
+IDB_EDITDISABLED						BITMAP                "11000.bmp"
+IDB_EDITACTIVE							BITMAP                "11001.bmp"
+IDB_EDITHOVER							BITMAP                "11002.bmp"
+IDB_EDIT								BITMAP                "11003.bmp"
+
+IDB_SBTHUMBV							BITMAP				  "12201.bmp"
+IDB_SBTHUMBVHOVER						BITMAP				  "12202.bmp"
+IDB_SBTHUMBVACTIVE						BITMAP				  "12203.bmp"
+
+IDB_SBLINEUPV							BITMAP				  "12204.bmp"
+IDB_SBLINEUPVHOVER						BITMAP				  "12205.bmp"
+IDB_SBLINEUPVACTIVE						BITMAP				  "12206.bmp"
+
+IDB_SBLINEDOWNV							BITMAP				  "12207.bmp"
+IDB_SBLINEDOWNVHOVER					BITMAP				  "12208.bmp"
+IDB_SBLINEDOWNVACTIVE					BITMAP				  "12209.bmp"
+
+IDB_SBGLYPHV							BITMAP				  "12210.bmp"
+IDB_SBGLYPHVHOVER						BITMAP				  "12212.bmp"
+IDB_SBGLYPHVACTIVE						BITMAP				  "12211.bmp"
+
+IDB_EASEOFACCESS						BITMAP				  "12213.bmp"
+IDB_KEYBOARD							BITMAP				  "12214.bmp"
+
+IDB_SHUTDOWN							BITMAP				  "12215.bmp"
+IDB_SHUTDOWNUPDATE						BITMAP				  "12216.bmp"
+IDB_SHUTDOWNDROPDOWNGLYPH				BITMAP				  "12217.bmp"
+
+IDB_USERTILEHOVER						BITMAP				  "12218.bmp"
+IDB_USERTILEFOCUS						BITMAP				  "12219.bmp"
+IDB_USERTILEFOCUSACTIVE					BITMAP				  "12220.bmp"
+IDB_USERTILE							BITMAP				  "12222.bmp"
+IDB_USERTILEHOVERHIGHDPI				BITMAP				  "12233.bmp"
+IDB_USERTILEFOCUSHIGHDPI				BITMAP				  "12234.bmp"
+IDB_USERTILEFOCUSACTIVEHIGHDPI			BITMAP				  "12235.bmp"
+IDB_USERTILEHIGHDPI						BITMAP				  "12237.bmp"
+
+IDB_USERTILELARGE						BITMAP				  "12223.BMP"
+IDB_USERTILELARGEHIGHDPI				BITMAP				  "12238.BMP"
+
+IDB_COMMANDLINK							BITMAP				  "12227.BMP"
+IDB_COMMANDLINKFOCUS					BITMAP				  "12224.BMP"
+IDB_COMMANDLINKHOVER					BITMAP				  "12225.BMP"
+IDB_COMMANDLINKACTIVE					BITMAP				  "12226.BMP"
+
+IDB_COMMANDLINKBGFOCUS					BITMAP				  "12228.bmp"
+IDB_COMMANDLINKBGHOVER					BITMAP				  "12229.bmp"
+IDB_COMMANDLINKBGACTIVE					BITMAP				  "12230.bmp"
+
+IDB_GENERICBUTTON						BITMAP				  "12263.bmp"
+IDB_GENERICBUTTONFOCUS					BITMAP				  "12259.bmp"
+IDB_GENERICBUTTONHOVER					BITMAP				  "12260.bmp"
+IDB_GENERICBUTTONFOCUSHOVER				BITMAP				  "12261.bmp"
+IDB_GENERICBUTTONACTIVE					BITMAP				  "12262.bmp"
+
+IDB_SUBMITVISTAHOVER					BITMAP				  "12274.bmp"
+IDB_SUBMITVISTAACTIVE					BITMAP				  "12275.bmp"
+IDB_SUBMITVISTA							BITMAP				  "12276.bmp"
+IDB_SUBMITVISTAHOVERHIGHDPI				BITMAP				  "12277.bmp"
+IDB_SUBMITVISTAACTIVEHIGHDPI			BITMAP				  "12278.bmp"
+IDB_SUBMITVISTAHIGHDPI					BITMAP				  "12279.bmp"
+
+IDB_SUBMITHOVER							BITMAP				  "12286.bmp"
+IDB_SUBMITACTIVE						BITMAP				  "12287.bmp"
+IDB_SUBMIT								BITMAP				  "12282.bmp"
+IDB_SUBMITALT							BITMAP				  "12288.bmp"
+IDB_SUBMITHOVERHIGHDPI					BITMAP				  "12289.bmp"
+IDB_SUBMITACTIVEHIGHDPI					BITMAP				  "12290.bmp"
+IDB_SUBMITHIGHDPI						BITMAP				  "12291.bmp"
+
+IDB_SHUTDOWNBUTTON						BITMAP				  "12296.bmp"
+IDB_SHUTDOWNBUTTONFOCUS					BITMAP				  "12293.bmp"
+IDB_SHTUDOWNBUTTONHOVER					BITMAP				  "12294.bmp"
+IDB_SHUTDOWNBUTTONFOCUSHOVER			BITMAP				  "12292.bmp"
+IDB_SHUTDOWNBUTTONACTIVE				BITMAP				  "12295.bmp"
+
+IDB_SHUTDOWNDROPDOWNBUTTON			    BITMAP				  "12302.bmp"
+IDB_SHUTDOWNDROPDOWNBUTTONFOCUS		    BITMAP				  "12299.bmp"
+IDB_SHTUDOWNDROPDOWNBUTTONHOVER		    BITMAP				  "12300.bmp"
+IDB_SHUTDOWNDROPDOWNBUTTONFOCUSHOVER    BITMAP				  "12298.bmp"
+IDB_SHUTDOWNDROPDOWNBUTTONACTIVE	    BITMAP				  "12301.bmp"
diff --git a/ConsoleLogonUI/resources/Main.xml b/ConsoleLogonUI/resources/Main.xml
@@ -13,84 +13,84 @@
 
             <if class="passwordBox">
                 <edit width="225rp" height="25rp" font="resstr(11800)" shadowintensity="75" margin = "rect(0rp, 3rp, 0rp, 3rp)" padding="rect(0rp, 1rp, 0rp, 0rp)" borderthickness = "rect(4, 4, 4, 4)"
-				bordercolor="gray" accessible="true" accrole="42" background="resbmp(11003, 7,-1,0,0,1,1,library(au7hui.dll))" passwordcharacter="9679"/>
+				bordercolor="gray" accessible="true" accrole="42" background="resbmp(11003, 7,-1,0,0,1,1)" passwordcharacter="9679"/>
             </if>
 
             <if class="button">
-                <button background="resbmp(12282,7,-1,0,0,1,1,library(au7hui.dll))" width="30rp" height="30rp"/>
+                <button background="resbmp(12282,7,-1,0,0,1,1)" width="30rp" height="30rp"/>
                 <if mousefocused="true">
-                    <button background="resbmp(12286,7,-1,0,0,1,1,library(au7hui.dll))"/>
+                    <button background="resbmp(12286,7,-1,0,0,1,1)"/>
                 </if>
                 <if pressed="true">
-                    <button background="resbmp(12287,7,-1,0,0,1,1,library(au7hui.dll))"/>
+                    <button background="resbmp(12287,7,-1,0,0,1,1)"/>
                 </if>
             </if>
 
             <if id="atom(buttonEaseOfAccess)">
-                <button width="38rp" height="28rp" padding="rect(0,0,0,0)" contentalign="MiddleCenter" content="resbmp(12213,2,-1,0,0,0,1,library(au7hui.dll))" accname="resstr(12122)" accdesc="resstr(12122)" borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12263,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="gray" borderstyle="raised"/>
+                <button width="38rp" height="28rp" padding="rect(0,0,0,0)" contentalign="MiddleCenter" content="resbmp(12213,2,-1,0,0,0,1)" accname="resstr(12122)" accdesc="resstr(12122)" borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12263,7,-1,0,0,1,1)" bordercolor="gray" borderstyle="raised"/>
                 <if keyfocused="true">
-                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12259,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="solid"/>
+                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12259,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if mousefocused="true">
-                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12260,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="solid"/>
+                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12260,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if keyfocused="true" mousefocused="true" pressed="false">
-                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12261,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="solid"/>
+                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12261,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if pressed="true">
-                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12262,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="sunken"/>
+                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12262,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="sunken"/>
                 </if>
             </if>
 
             <if id="atom(ToggleTabletKeyboard)">
-                <button width="45rp" height="28rp" padding="rect(0,0,0,0)" content="resbmp(12214,2,-1,0,0,0,1,library(au7hui.dll))" accname="resstr(12142)" accdesc="resstr(12142)" borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12263,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="gray" borderstyle="raised"/>
+                <button width="45rp" height="28rp" padding="rect(0,0,0,0)" content="resbmp(12214,2,-1,0,0,0,1)" accname="resstr(12142)" accdesc="resstr(12142)" borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12263,7,-1,0,0,1,1)" bordercolor="gray" borderstyle="raised"/>
                 <if keyfocused="true">
-                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12259,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="solid"/>
+                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12259,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if mousefocused="true">
-                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12260,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="solid"/>
+                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12260,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if keyfocused="true" mousefocused="true" pressed="false">
-                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12261,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="solid"/>
+                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12261,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if pressed="true">
-                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12262,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="sunken"/>
+                    <button borderthickness="rect(4rp, 2rp, 4rp, 2rp)" background="resbmp(12262,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="sunken"/>
                 </if>
             </if>
             <if id="atom(ShutdownFrame)">
                 <element margin="rect(6rp, 0rp, 6rp, 0rp)"/>
             </if>
             <if id="atom(Shutdown)">
-                <button width="38rp" height="28rp" borderthickness="rect(4rp, 1rp, 4rp, 1rp)" background="resbmp(12296,7,-1,0,0,1,1,library(au7hui.dll))" contentalign="middlecenter" content="resbmp(12215,2,-1,0,0,1,1,library(au7hui.dll))" margin="rect(0,0,0,0)" accdesc="resstr(12128)" bordercolor="gray" borderstyle="raised"/>
+                <button width="38rp" height="28rp" borderthickness="rect(4rp, 1rp, 4rp, 1rp)" background="resbmp(12296,7,-1,0,0,1,1)" contentalign="middlecenter" content="resbmp(12215,2,-1,0,0,1,1)" margin="rect(0,0,0,0)" accdesc="resstr(12128)" bordercolor="gray" borderstyle="raised"/>
                 <if selected="true">
-                    <button content="resbmp(12216,2,-1,0,0,1,1,library(au7hui.dll))" accdesc="resstr(12133)" bordercolor="windowtext" borderstyle="solid"/>
+                    <button content="resbmp(12216,2,-1,0,0,1,1)" accdesc="resstr(12133)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if keyfocused="true">
-                    <button background="resbmp(12293,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="solid"/>
+                    <button background="resbmp(12293,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if mousefocused="true">
-                    <button background="resbmp(12294,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="solid"/>
+                    <button background="resbmp(12294,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if mousefocused="true" keyfocused="true" pressed="false">
-                    <button background="resbmp(12292,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="solid"/>
+                    <button background="resbmp(12292,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if pressed="true">
-                    <button background="resbmp(12295,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="sunken"/>
+                    <button background="resbmp(12295,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="sunken"/>
                 </if>
             </if>
             <if id="atom(ShutdownOptions)">
-                <button width="20rp" height="28rp" contentalign="middlecenter" content="resbmp(12217,2,-1,0,0,1,1,library(au7hui.dll))" background="resbmp(12302,7,-1,0,0,1,1,library(au7hui.dll))" borderthickness="rect(4rp, 3rp, 4rp, 3rp)" margin="rect(0,0,0,0)" bordercolor="gray" borderstyle="raised"/>
+                <button width="20rp" height="28rp" contentalign="middlecenter" content="resbmp(12217,2,-1,0,0,1,1)" background="resbmp(12302,7,-1,0,0,1,1)" borderthickness="rect(4rp, 3rp, 4rp, 3rp)" margin="rect(0,0,0,0)" bordercolor="gray" borderstyle="raised"/>
                 <if keyfocused="true">
-                    <button background="resbmp(12299,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="solid"/>
+                    <button background="resbmp(12299,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if mousefocused="true">
-                    <button background="resbmp(12300,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="solid"/>
+                    <button background="resbmp(12300,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if mousefocused="true" keyfocused="true" pressed="false">
-                    <button background="resbmp(12298,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="solid"/>
+                    <button background="resbmp(12298,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if pressed="true">
-                    <button background="resbmp(12301,7,-1,0,0,1,1,library(au7hui.dll))" bordercolor="windowtext" borderstyle="sunken"/>
+                    <button background="resbmp(12301,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="sunken"/>
                 </if>
             </if>