drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syscalls.cc: Merge desktop_ini_ext into desktop_ini

This commit is contained in:
Corinna Vinschen 2015-12-15 21:50:14 +01:00
parent f4aaa21441
commit 7c84bfdb5f
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
winsup/cygwin/syscalls.cc
View File

@ -216,11 +216,9 @@ stop_transaction (NTSTATUS status, HANDLE old_trans, HANDLE &trans)
return status; return status;
} }
static char desktop_ini[] = static const char desktop_ini[] =
"[.ShellClassInfo]\r\n" "[.ShellClassInfo]\r\n"
"CLSID={645FF040-5081-101B-9F08-00AA002F954E}\r\n"; "CLSID={645FF040-5081-101B-9F08-00AA002F954E}\r\n"
static char desktop_ini_ext[] =
"LocalizedResourceName=@%SystemRoot%\\system32\\shell32.dll,-8964\r\n"; "LocalizedResourceName=@%SystemRoot%\\system32\\shell32.dll,-8964\r\n";
enum bin_status enum bin_status
@ -475,12 +473,9 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags)
&recycler, status); &recycler, status);
else else
{ {
status = NtWriteFile (tmp_fh, NULL, NULL, NULL, &io, desktop_ini, status = NtWriteFile (tmp_fh, NULL, NULL, NULL, &io,
sizeof desktop_ini - 1, NULL, NULL); (PVOID) desktop_ini, sizeof desktop_ini - 1,
if (NT_SUCCESS (status)) NULL, NULL);
status = NtWriteFile (tmp_fh, NULL, NULL, NULL, &io,
desktop_ini_ext,
sizeof desktop_ini_ext - 1, NULL, NULL);
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
debug_printf ("NtWriteFile (%S) failed, status = %y", debug_printf ("NtWriteFile (%S) failed, status = %y",
&fname, status); &fname, status);