diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-10-16 22:24:03 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-10-16 22:24:03 +0100 |
| commit | c7747d2a1bba6ac62e9b540a283ae2c9f4bfd221 (patch) | |
| tree | 8c6b6b564b80a0f2b0ad774f64f9fc9a1c50b7d5 /indra/newview/llappviewerwin32.cpp | |
| parent | cc3cf17e5e335b6e78d86755e015161ab92c50db (diff) | |
| parent | 33821bd599d1d9171cc93c38a2bc6c4ab6772c9a (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index fff2653c98..d208e135bb 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -312,12 +312,12 @@ void ll_nvapi_init(NvDRSSessionHandle hSession) #if DEBUGGING_SEH_FILTER # define WINMAIN DebuggingWinMain #else -# define WINMAIN WinMain +# define WINMAIN wWinMain #endif int APIENTRY WINMAIN(HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, + PWSTR pCmdLine, int nCmdShow) { const S32 MAX_HEAPS = 255; @@ -356,8 +356,8 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, // *FIX: global gIconResource = MAKEINTRESOURCE(IDI_LL_ICON); - LLAppViewerWin32* viewer_app_ptr = new LLAppViewerWin32(lpCmdLine); - + LLAppViewerWin32* viewer_app_ptr = new LLAppViewerWin32(ll_convert_wide_to_string(pCmdLine).c_str()); + gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler); viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash); @@ -469,9 +469,9 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, // in a method that uses object destructors. Go figure. // This winmain just calls the real winmain inside __try. // The __except calls our exception filter function. For debugging purposes. -int APIENTRY WinMain(HINSTANCE hInstance, +int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, + PWSTR lpCmdLine, int nCmdShow) { __try |