Index: src/OFApplication.m ================================================================== --- src/OFApplication.m +++ src/OFApplication.m @@ -115,22 +115,21 @@ } int OFApplicationMain(int *argc, char **argv[], id delegate) { -#ifdef OF_WINDOWS - wchar_t **wargv, **wenvp; - int wargc, si = 0; -#endif - [[OFLocale alloc] init]; app = [[OFApplication alloc] of_init]; #ifdef OF_WINDOWS if ([OFSystemInfo isWindowsNT]) { + wchar_t **wargv, **wenvp; + int wargc, si = 0; + __wgetmainargs(&wargc, &wargv, &wenvp, _CRT_glob, &si); + [app of_setArgumentCount: argc andArgumentValues: argv andWideArgumentCount: wargc andWideArgumentValues: wargv]; } else