2.36.26

Author: nidud

bin/asmc.exe

@@ -15,7 +15,7 @@ Option -pe will make Asmc create a binary in Windows PE format.
 
 You can use the [comment](../directive/dot-pragma.md) pragma to specify some linker options.
 
-Valid options are [/BASE](../tools/linkw/base.md), [/ENTRY](../tools/linkw/entry.md), [/FIXED](../tools/linkw/fixed.md), [/LARGEADDRESSAWARE](../tools/linkw/largeaddressaware.md), [/SUBSYSTEM](../tools/linkw/subsystem.md), and [/DLL](../tools/linkw/dll.md).
+Valid options are [/BASE](../tools/linkw/base.md), [/ENTRY](../tools/linkw/entry.md), [/FIXED](../tools/linkw/fixed.md), [/LARGEADDRESSAWARE](../tools/linkw/largeaddressaware.md), [/MANIFESTDEPENDENCY](../tools/linkw/manifestdependency.md), [/SUBSYSTEM](../tools/linkw/subsystem.md), and [/DLL](../tools/linkw/dll.md).
 
 #### See Also
 

bin/asmc64.exe

@@ -5,6 +5,6 @@ define ASMC_VERSION         236
 
 define ASMC_MAJOR_VER       2
 define ASMC_MINOR_VER       36
-define ASMC_SUBMINOR_VER    25
+define ASMC_SUBMINOR_VER    26
 
 endif

doc/command/option-pe.md

@@ -24,6 +24,8 @@ include expreval.inc
 include pespec.inc
 include qfloat.inc
 
+define ADD_MANIFESTFILE ; Add .pragma comment(linker, "/manifestdependency: ..."
+
 define RAWSIZE_ROUND 1 ;; SectionHeader.SizeOfRawData is multiple FileAlign. Required by MS COFF spec
 define IMGSIZE_ROUND 1 ;; OptionalHeader.SizeOfImage is multiple ObjectAlign. Required by MS COFF spec
 
@@ -1542,6 +1544,60 @@ endif
     assume rbx:nothing
     assume rsi:nothing
 
+ifdef ADD_MANIFESTFILE ; v2.36.26 - add manifest file
+
+AddManifestdependency proc __ccall uses rsi rdi rbx dependency:string_t
+
+   .new cp:string_t
+   .new fp:LPFILE
+   .new file[256]:char_t
+
+    ldr rbx,dependency
+    add rbx,16
+
+    .if tstrrchr( tstrcpy( &file, GetFNamePart( MODULE.curr_fname[ASM*string_t] ) ), '.' )
+        mov byte ptr [rax],0
+    .endif
+
+    .if ( fopen( tstrcat( &file, ".exe.manifest" ), "w" ) != NULL )
+
+        mov fp,rax
+        mov cp,tstrrchr( rbx, '"' )
+        .if ( rax )
+            mov byte ptr [rax],0
+        .endif
+
+        tfprintf( fp,
+            "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n"
+            "<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>\n"
+            "  <trustInfo xmlns=\"urn:schemas-microsoft-com:asm.v3\">\n"
+            "    <security>\n"
+            "      <requestedPrivileges>\n"
+            "        <requestedExecutionLevel level='asInvoker' uiAccess='false' />\n"
+            "      </requestedPrivileges>\n"
+            "    </security>\n"
+            "  </trustInfo>\n"
+            "  <dependency>\n"
+            "    <dependentAssembly>\n"
+            "      <assemblyIdentity %s />\n"
+            "    </dependentAssembly>\n"
+            "  </dependency>\n"
+            "</assembly>\n", rbx )
+
+        mov rax,cp
+        .if ( rax )
+
+            mov byte ptr [rax],'"'
+            lea rbx,[rax+1]
+        .endif
+        fclose(fp)
+    .endif
+    mov rax,rbx
+    ret
+
+AddManifestdependency endp
+endif
+
 pe_scan_linker_directives proc __ccall uses rsi rdi rbx pe:ptr, cmd:string_t, size:int_t
 
    .new num[4]:dword
@@ -1660,6 +1716,13 @@ pe_scan_linker_directives proc __ccall uses rsi rdi rbx pe:ptr, cmd:string_t, si
                     .endif
                 .endif
                 .endc
+ifdef ADD_MANIFESTFILE
+            .case 'inam'
+                sub AddManifestdependency(rsi),rsi
+                sub size,eax
+                add rsi,rax
+               .endc
+endif
             .default
                 and eax,0x00FFFFFF
                 .if eax == 'lld'

source/asmc/inc/version.inc

@@ -0,0 +1,57 @@
+; TASKDIALOG.ASM--
+;
+; https://learn.microsoft.com/en-us/windows/win32/api/commctrl/nf-commctrl-taskdialogindirect
+;
+; v2.36.26 - added manifest file for -pe switch
+;
+; The imported function TaskDialogIndirect (and TaskDialog) from Comctl32.lib needs to
+; be added manually to the 64-bit library (lib/x64/def/Comctl32.def) if LINK[W] used.
+;
+
+include windows.inc
+include commctrl.inc
+include tchar.inc
+
+.pragma comment(linker,
+    "/manifestdependency:\""
+    "type='win32' "
+    "name='Microsoft.Windows.Common-Controls' "
+    "version='6.0.0.0' "
+    "processorArchitecture='*' "
+    "publicKeyToken='6595b64144ccf1df' "
+    "language='*'"
+    "\""
+    )
+
+.code
+
+_tWinMain proc WINAPI hInstance:HINSTANCE, hPrevInstance:HINSTANCE, lpCmdLine:LPTSTR, nShowCmd:SINT
+
+
+   .new nButtonPressed:int_t = 0
+   .new config:TASKDIALOGCONFIG = {0}
+   .new buttons:TASKDIALOG_BUTTON = { IDOK, L"Change password" }
+
+    mov config.cbSize,              sizeof(config)
+    mov config.hInstance,           hInstance
+    mov config.dwCommonButtons,     TDCBF_CANCEL_BUTTON
+    mov config.pszMainIcon,         TD_WARNING_ICON
+    mov config.pszMainInstruction,  &@CStr(L"Change Password")
+    mov config.pszContent,          &@CStr(L"Remember your changed password.")
+    mov config.pButtons,            &buttons
+    mov config.cButtons,            ARRAYSIZE(buttons)
+
+    TaskDialogIndirect(&config, &nButtonPressed, NULL, NULL)
+    .switch (nButtonPressed)
+    .case IDOK
+        .endc   ; the user pressed button 0 (change password).
+    .case IDCANCEL
+        .endc   ; user canceled the dialog
+    .default
+        .endc   ; should never happen
+    .endsw
+    .return( 0 )
+
+_tWinMain endp
+
+end _tstart

source/asmc/src/bin.asm

@@ -0,0 +1,16 @@
+# Makefile for TaskDialog
+# Thu Apr 10 2025
+
+flags = -peg -ws
+
+TaskDialog:
+	asmc64 $(flags) $@.asm
+	$@
+	@pause
+
+clean:
+	del TaskDialog.exe
+	del TaskDialog.obj
+
+vs:
+	project -p -w -u TaskDialog