Use MCAutoStringRefAsLPWSTR where mutable buffer may be required

peter-b · peter-b · commit d970d9f15d9c · 2016-07-15T16:35:06.000+01:00
Some Win32 APIs take a `LPWSTR` rather than a `LPCWSTR` argument.
Ensure that if (for some reason) they try to mutate the buffer that
they're passed, it doesn't affect the original LiveCode string.
diff --git a/engine/src/dskw32.cpp b/engine/src/dskw32.cpp
@@ -2821,7 +2821,7 @@ struct MCWindowsDesktop: public MCSystemInterface, public MCWindowsSystemService
         // SN-2014-06-16 [[ Bug 12648 ]] Shell command does not accept spaces despite being quoted (Windows)
         // Fix for 7
 		/* UNCHECKED */ MCStringFormat(t_cmd, "%@ /C \"%@\"", MCshellcmd, p_command);
-		MCAutoStringRefAsWString t_wcmd;
+		MCAutoStringRefAsLPWSTR t_wcmd;
 		t_wcmd . Lock(t_cmd);
         MCU_realloc((char **)&MCprocesses, MCnprocesses,
                     MCnprocesses + 1, sizeof(Streamnode));
@@ -3092,7 +3092,7 @@ struct MCWindowsDesktop: public MCSystemInterface, public MCWindowsSystemService
                     siStartInfo.hStdOutput = hChildStdoutWr;
                     siStartInfo.hStdError = hChildStderrWr;
 
-					MCAutoStringRefAsWString t_cmdline_wstr;
+					MCAutoStringRefAsLPWSTR t_cmdline_wstr;
 					/* UNCHECKED */ t_cmdline_wstr.Lock(*t_cmdline);
 
                     if (CreateProcessW(NULL, *t_cmdline_wstr, NULL, NULL, TRUE, CREATE_NEW_CONSOLE, NULL, NULL, &siStartInfo, &piProcInfo))
diff --git a/engine/src/w32printer.cpp b/engine/src/w32printer.cpp
@@ -138,7 +138,7 @@ static HANDLE Win32OpenPrinter(MCStringRef p_name)
 	t_defaults . pDevMode = NULL;
 	t_defaults . DesiredAccess = PRINTER_ACCESS_USE;
 
-	MCAutoStringRefAsWString t_name_wstr;
+	MCAutoStringRefAsLPWSTR t_name_wstr;
 	/* UNCHECKED */ t_name_wstr.Lock(p_name);
 
 	if (OpenPrinterW(*t_name_wstr, &t_printer, &t_defaults) == 0)
diff --git a/engine/src/w32relaunch.cpp b/engine/src/w32relaunch.cpp
@@ -450,7 +450,7 @@ bool relaunch_startup(MCStringRef p_stack_name)
 	{
 		for(unsigned int t_instance = 0; t_instance < t_existing_instance_count; ++t_instance)
 		{
-			MCAutoStringRefAsWString t_cmdline_wstr;
+			MCAutoStringRefAsLPWSTR t_cmdline_wstr;
 			/* UNCHECKED */ t_cmdline_wstr.Lock(MCcmdline);
 			
 			message_t t_message;

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@ bool relaunch_startup(MCStringRef p_stack_name)`
`450`	`450`	`{`
`451`	`451`	`for(unsigned int t_instance = 0; t_instance < t_existing_instance_count; ++t_instance)`
`452`	`452`	`{`
`453`		`- MCAutoStringRefAsWString t_cmdline_wstr;`
	`453`	`+ MCAutoStringRefAsLPWSTR t_cmdline_wstr;`
`454`	`454`	`/* UNCHECKED */ t_cmdline_wstr.Lock(MCcmdline);`
`455`	`455`
`456`	`456`	`message_t t_message;`