Fix stuff

ojwb · Dec 23, 2024 · bea0c68 · bea0c68
1 parent 8c5b5c1
commit bea0c68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -64,7 +64,7 @@ avenrc.o: $(srcdir)/aven.rc ../lib/icons/aven.ico
 bin_PROGRAMS += wrapmsw
 
 wrapmsw_SOURCES = wrapmsw.c
-wrapmsw_LDFLAGS = -mwindows
+wrapmsw_LDFLAGS = -mwindows -municode
 endif
 
 AM_CFLAGS += $(PROJ_CFLAGS)

diff --git a/src/wrapmsw.c b/src/wrapmsw.c
@@ -24,14 +24,12 @@
 #include <windows.h>
 
 int APIENTRY
-WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nCmdShow)
+wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR lpCmdLine, int nCmdShow)
 {
    DWORD len = 256;
    wchar_t *buf = NULL;
-   PWSTR cmd_line;
    (void)hInst; /* suppress compiler warning */
    (void)hPrevInst; /* suppress compiler warning */
-   (void)lpCmdLine; /* suppress compiler warning */
    while (1) {
        DWORD got;
        buf = realloc(buf, len * sizeof(wchar_t));
@@ -58,26 +56,16 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nCmdShow)
 	   wcscpy(e, L"OPENSSL_MODULES=");
 	   memcpy(e + strlen("OPENSSL_MODULES="), e_val, e_len * sizeof(wchar_t));
 	   e[strlen("OPENSSL_MODULES=") + e_len] = L'\0';
-	   printf("setenv %ls\n", e);
 	   _wputenv(e);
 	   buf[got - 5] = L'_';
-	   printf("command %ls\n", buf);
 	   break;
        }
        len += len;
    }
-   cmd_line = GetCommandLineW();
-   wchar_t *c = malloc(wcslen(cmd_line) + 1);
-   if (!c) exit(1);
-   wcscpy(c, cmd_line);
-   wchar_t *p = wcsstr(c, L".exe");
-   if (!p) exit(1);
-   p[-1] = '_';
-   printf("commandline %ls\n", c);
    /* ShellExecute returns an HINSTANCE for some strange reason - the docs say
     * the only valid operation is to convert it to "INT_PTR" (which seems to
     * actually be an integer type.  Marvellous. */
-   if ((INT_PTR)ShellExecuteW(NULL, NULL, buf, c, NULL, nCmdShow) <= 32) {
+   if ((INT_PTR)ShellExecuteW(NULL, NULL, buf, lpCmdLine, NULL, nCmdShow) <= 32) {
        return 1;
    }
    return 0;