Victor_VG
Tracker Mod | Редактировать | Профиль | Сообщение | Цитировать | Сообщить модератору
r5523
Update copyrights, Improve error checking
ProcessHacker/ProcessHacker.rc
@@ -635,7 +635,7 @@ BEGIN
ICON IDI_PROCESSHACKER,IDC_STATIC,16,15,20,20
LTEXT "Process Hacker",IDC_ABOUT_NAME,45,14,192,8
LTEXT "Licensed under the GNU GPL, v3.",IDC_STATIC,45,27,193,8
- LTEXT "Copyright (c) 2008-2016 Wen Jia Liu (wj32)",IDC_STATIC,15,40,140,8
+ LTEXT "Copyright (c) 2008-2017 Wen Jia Liu (wj32)",IDC_STATIC,15,40,140,8
CONTROL "Credits.",IDC_CREDITS,"SysLink",WS_TABSTOP,15,55,248,115
CONTROL "<a href=""http://processhacker.sourceforge.net"">Process Hacker on SourceForge.net</a>",IDC_LINK_SF,
"SysLink",WS_TABSTOP,7,177,130,11
phlib/native.c
@@ -3,6 +3,7 @@
* native wrapper and support functions
*
* Copyright (C) 2009-2016 wj32
+ * Copyright (C) 2017 dmex
*
* This file is part of Process Hacker.
*
@@ -6096,13 +6097,13 @@ NTSTATUS PhCreateFileWin32Ex(
if (!FileAttributes)
FileAttributes = FILE_ATTRIBUTE_NORMAL;
- if (!RtlDosPathNameToNtPathName_U(
+ if (!NT_SUCCESS(status = RtlDosPathNameToNtPathName_U_WithStatus(
FileName,
&fileName,
NULL,
NULL
- ))
- return STATUS_OBJECT_NAME_NOT_FOUND;
+ )))
+ return status;
InitializeObjectAttributes(
&oa,
@@ -6126,7 +6127,7 @@ NTSTATUS PhCreateFileWin32Ex(
0
);
- RtlFreeHeap(RtlProcessHeap(), 0, fileName.Buffer);
+ RtlFreeUnicodeString(&fileName);
if (NT_SUCCESS(status))
{
@@ -6154,13 +6155,13 @@ NTSTATUS PhQueryFullAttributesFileWin32(
UNICODE_STRING fileName;
OBJECT_ATTRIBUTES oa;
- if (!RtlDosPathNameToNtPathName_U(
+ if (!NT_SUCCESS(status = RtlDosPathNameToNtPathName_U_WithStatus(
FileName,
&fileName,
NULL,
NULL
- ))
- return STATUS_OBJECT_NAME_NOT_FOUND;
+ )))
+ return status;
InitializeObjectAttributes(
&oa,
@@ -6171,7 +6172,7 @@ NTSTATUS PhQueryFullAttributesFileWin32(
);
status = NtQueryFullAttributesFile(&oa, FileInformation);
- RtlFreeHeap(RtlProcessHeap(), 0, fileName.Buffer);
+ RtlFreeUnicodeString(&fileName);
return status;
}
phlib/util.c
@@ -3,6 +3,7 @@
* general support functions
*
* Copyright (C) 2009-2016 wj32
+ * Copyright (C) 2017 dmex
*
* This file is part of Process Hacker.
*
@@ -2387,13 +2388,13 @@ NTSTATUS PhCreateProcess(
PUNICODE_STRING windowTitle;
PUNICODE_STRING desktopInfo;
- if (!RtlDosPathNameToNtPathName_U(
+ if (!NT_SUCCESS(status = RtlDosPathNameToNtPathName_U_WithStatus(
FileName,
&fileName,
NULL,
NULL
- ))
- return STATUS_OBJECT_NAME_NOT_FOUND;
+ )))
+ return status;
if (CommandLine)
{
@@ -2454,7 +2455,7 @@ NTSTATUS PhCreateProcess(
RtlDestroyProcessParameters(parameters);
}
- RtlFreeHeap(RtlProcessHeap(), 0, fileName.Buffer);
+ RtlFreeUnicodeString(&fileName);
if (NT_SUCCESS(status))
{
@@ -4856,12 +4857,12 @@ BOOLEAN PhpSearchFilePath(
// Make sure this is not a directory.
- if (!RtlDosPathNameToNtPathName_U(
+ if (!NT_SUCCESS(RtlDosPathNameToNtPathName_U_WithStatus(
Buffer,
&fileName,
NULL,
NULL
- ))
+ )))
return FALSE;
InitializeObjectAttributes(
@@ -4873,7 +4874,7 @@ BOOLEAN PhpSearchFilePath(
);
status = NtQueryAttributesFile(&objectAttributes, &basicInfo);
- RtlFreeHeap(RtlProcessHeap(), 0, fileName.Buffer);
+ RtlFreeUnicodeString(&fileName);
if (!NT_SUCCESS(status))
return FALSE;
2 phnt/include/phnt.h
@@ -41,7 +41,7 @@
#endif
#ifndef PHNT_VERSION
-#define PHNT_VERSION PHNT_WINXP
+#define PHNT_VERSION PHNT_WIN7
#endif
// Options
r5517
Updater: Fix setup parameters
plugins/Updater/page5.c
@@ -66,6 +66,7 @@ HRESULT CALLBACK FinalTaskDialogCallbackProc(
break;
info.lpFile = PhGetStringOrEmpty(context->SetupFilePath);
+ info.lpParameters = L"-update";
info.lpVerb = PhGetOwnTokenAttributes().Elevated ? NULL : L"runas";
info.nShow = SW_SHOW;
info.hwnd = hwndDlg; |
Всего записей: 33227 | Зарегистр. 31-07-2002 | Отправлено: 18:54 22-04-2017 | Исправлено: Victor_VG, 18:56 22-04-2017 |
|
