Upgrade to upstream 98f5573 (complete oldnames.lib)

Author: kinke

buildsdk.d

@@ -393,12 +393,47 @@ void buildMsvcrt(string outDir)
 
 void buildOldnames(string outDir)
 {
-    const cPrefix = x64 ? "" : "_";
+    static string prependUnderscore(string symbolName)
+    {
+        return symbolName.startsWith("__imp_")
+            ? symbolName[0 .. 6] ~ "_" ~ symbolName[6 .. $] // __imp_name => __imp__name
+            : "_" ~ symbolName;                             // name => _name
+    }
+
+    const lines = std.file.readText("oldnames.list").splitLines;
+    foreach (line; lines)
+    {
+        if (line.length == 0)
+            continue;
+
+        string weakName;
+        string realName;
+
+        const equalsIndex = line.indexOf('=');
+        if (equalsIndex > 0)
+        {
+            weakName = line[0 .. equalsIndex];
+            realName = line[equalsIndex+1 .. $];
+        }
+        else // most real names just feature an additional leading underscore
+        {
+            weakName = line;
+            realName = prependUnderscore(weakName);
+        }
+
+        weakSymbols[weakName] = realName;
+    }
+
+    static string getMangledName(string symbolName)
+    {
+        return x64 ? symbolName : prependUnderscore(symbolName);
+    }
+
     const oldnames_c =
         // access this __ref_oldnames symbol to drag in the generated linker directives (msvcrt_stub.c)
         "int __ref_oldnames;\n" ~
         weakSymbols.byKeyValue.map!(pair =>
-            `__pragma(comment(linker, "/alternatename:` ~ cPrefix ~ pair.key ~ `=` ~ cPrefix ~ pair.value ~ `"));`
+            `__pragma(comment(linker, "/alternatename:` ~ getMangledName(pair.key) ~ `=` ~ getMangledName(pair.value) ~ `"));`
         ).join("\n");
 
     version (verbose)

oldnames.list

@@ -0,0 +1,228 @@
+__imp_utime=__imp__utime32
+utime=_utime32
+__imp_ftime=__imp__ftime32
+ftime=_ftime32
+__imp_stat=__imp__stat32
+stat=_stat32
+__imp_fstat=__imp__fstat32
+fstat=_fstat32
+__imp_fcloseall
+fcloseall
+__imp_control87
+control87
+__imp_sys_errlist
+sys_errlist
+__imp_filelength
+filelength
+__imp_strcmpi=__imp__stricmp
+strcmpi=_stricmp
+__imp_wcsicoll
+__imp_wcsupr
+__imp_wcslwr
+__imp_wcsset
+__imp_wcsrev
+__imp_wcsnset
+__imp_wcsnicmp
+__imp_wcsicmp
+__imp_wcsdup
+__imp_dup
+__imp_tzset
+__imp_tzname
+__imp_timezone
+__imp_strupr
+__imp_strset
+__imp_strrev
+__imp_strnset
+__imp_strnicmp
+__imp_strlwr
+__imp_strdup
+__imp_stricmp
+__imp_tempnam
+__imp_rmtmp
+__imp_putw
+__imp_getw
+__imp_fputchar
+__imp_flushall
+__imp_fileno
+__imp_fgetchar
+__imp_fdopen
+__imp_ultoa
+__imp_swab
+__imp_putenv
+__imp_onexit
+__imp_ltoa
+__imp_itoa
+__imp_yn
+__imp_y1
+__imp_y0
+__imp_jn
+__imp_j1
+__imp_j0
+__imp_cabs
+__imp_HUGE
+__imp_gcvt
+__imp_fcvt
+__imp_ecvt
+__imp_lsearch
+__imp_lfind
+__imp_spawnvpe
+__imp_spawnvp
+__imp_spawnve
+__imp_spawnv
+__imp_spawnlpe
+__imp_spawnlp
+__imp_spawnle
+__imp_spawnl
+__imp_getpid
+__imp_execvpe
+__imp_execvp
+__imp_execve
+__imp_execv
+__imp_execlpe
+__imp_execlp
+__imp_execle
+__imp_execl
+__imp_cwait
+__imp_memicmp
+__imp_memccpy
+__imp_write
+__imp_unlink
+__imp_umask
+__imp_tell
+__imp_sys_nerr
+__imp_sopen
+__imp_setmode
+__imp_read
+__imp_open
+__imp_mktemp
+__imp_lseek
+__imp_locking
+__imp_isatty
+__imp_eof
+__imp_dup2
+__imp_creat
+__imp_close
+__imp_chsize
+__imp_chmod
+__imp_access
+__imp_rmdir
+__imp_mkdir
+__imp_getcwd
+__imp_chdir
+__imp_ungetch
+__imp_putch
+__imp_kbhit
+__imp_getche
+__imp_fpreset
+__imp_getch
+__imp_environ
+__imp_daylight
+__imp_cscanf
+__imp_cputs
+__imp_cprintf
+__imp_cgets
+wcsicoll
+wcsupr
+wcslwr
+wcsset
+wcsrev
+wcsnset
+wcsnicmp
+wcsicmp
+wcsdup
+dup
+tzset
+tzname
+timezone
+strupr
+strset
+strrev
+strnset
+strnicmp
+strlwr
+strdup
+stricmp
+tempnam
+rmtmp
+putw
+getw
+fputchar
+flushall
+fileno
+fgetchar
+fdopen
+ultoa
+swab
+putenv
+onexit
+ltoa
+itoa
+yn
+y1
+y0
+jn
+j1
+j0
+cabs
+HUGE
+gcvt
+fcvt
+ecvt
+lsearch
+lfind
+spawnvpe
+spawnvp
+spawnve
+spawnv
+spawnlpe
+spawnlp
+spawnle
+spawnl
+getpid
+execvpe
+execvp
+execve
+execv
+execlpe
+execlp
+execle
+execl
+cwait
+memicmp
+memccpy
+write
+unlink
+umask
+tell
+sys_nerr
+sopen
+setmode
+read
+open
+mktemp
+lseek
+locking
+isatty
+eof
+dup2
+creat
+close
+chsize
+chmod
+access
+rmdir
+mkdir
+getcwd
+chdir
+ungetch
+putch
+kbhit
+getche
+fpreset
+getch
+environ
+daylight
+cscanf
+cputs
+cprintf
+cgets