Fix argc/argv parameters for app_main() in Skia/Win port

This commit is contained in:
David Capello 2015-12-28 15:34:00 -03:00
parent 199a3db278
commit 49ad91dd79

View File

@ -8,6 +8,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include "base/memory.h"
#include "gfx/rect.h" #include "gfx/rect.h"
#include "gfx/size.h" #include "gfx/size.h"
#include "she/she.h" #include "she/she.h"
@ -68,8 +69,19 @@ extern int app_main(int argc, char* argv[]);
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
LPSTR lpCmdLine, int nCmdShow) LPSTR lpCmdLine, int nCmdShow)
{ {
int argc = 1; int argc = 0;
char* argv[] = { "" }; LPWSTR* argvW = CommandLineToArgvW(GetCommandLineW(), &argc);
char** argv;
if (argvW && argc > 0) {
argv = new char*[argc];
for (int i=0; i<argc; ++i)
argv[i] = base_strdup(base::to_utf8(std::wstring(argvW[i])).c_str());
LocalFree(argvW);
}
else {
argv = new char*[1];
argv[0] = base_strdup("");
}
#else #else
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {