Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
c4a879f5
Commit
c4a879f5
authored
5 years ago
by
andreykproductengine
Browse files
Options
Downloads
Patches
Plain Diff
SL-11362 not all special character work in command line parameters
parent
58946f8b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/llappviewerwin32.cpp
+6
-6
6 additions, 6 deletions
indra/newview/llappviewerwin32.cpp
with
6 additions
and
6 deletions
indra/newview/llappviewerwin32.cpp
+
6
−
6
View file @
c4a879f5
...
...
@@ -312,12 +312,12 @@ void ll_nvapi_init(NvDRSSessionHandle hSession)
#if DEBUGGING_SEH_FILTER
# define WINMAIN DebuggingWinMain
#else
# define WINMAIN WinMain
# define WINMAIN
w
WinMain
#endif
int
APIENTRY
WINMAIN
(
HINSTANCE
hInstance
,
HINSTANCE
hPrevInstance
,
L
PSTR
l
pCmdLine
,
P
W
STR
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
(
l
pCmdLine
);
LLAppViewerWin32
*
viewer_app_ptr
=
new
LLAppViewerWin32
(
l
l_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
w
WinMain
(
HINSTANCE
hInstance
,
HINSTANCE
hPrevInstance
,
L
PSTR
lpCmdLine
,
P
W
STR
lpCmdLine
,
int
nCmdShow
)
{
__try
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment