admin/mirror-processhacker
1
0
Fork 0
mirror of https://github.com/mirror/processhacker synced 2026-06-08 16:03:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updater: incremented version; OnlineChecks: fixed some crashes (still broken)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/processhacker/code@5194 21ef857c-d57f-4fe0-8362-d861dc6d29cd
This commit is contained in:
dmex
2012-12-12 08:15:01 +00:00
parent 4744464bb9
commit 30893c88ef
6 changed files with 216 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2.x/trunk/plugins/OnlineChecks/OnlineChecks.rc
+3 -3
View File
@@ -68,9 +68,9 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
CAPTION "Online Analysis"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Select a file to upload",IDC_MESSAGE,9,7,235,12
CONTROL "Initializing...",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,10,27,236,8
CONTROL "",IDC_UPLOADPROGRESS,"msctls_progress32",PBS_SMOOTH,9,39,253,11
LTEXT "FILE_NAME",IDC_MESSAGE,9,7,235,12
CONTROL "Initializing...",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,10,31,236,8
CONTROL "",IDC_UPLOADPROGRESS,"msctls_progress32",PBS_SMOOTH,9,43,253,11
PUSHBUTTON "Cancel",IDCANCEL,212,63,50,14
END
2.x/trunk/plugins/OnlineChecks/onlnchk.h
+1
View File
@@ -26,6 +26,7 @@ typedef struct _UPLOAD_CONTEXT
PPH_STRING FileName;
ULONG Service;
HWND WindowHandle;
HWND ParentWindowHandle;
HANDLE ThreadHandle;
PPH_STRING LaunchCommand;
2.x/trunk/plugins/OnlineChecks/upload.c
+201 -79
View File
@@ -23,6 +23,14 @@
#include "onlnchk.h"
#define WM_SHOWDIALOG (WM_APP + 150)
static HANDLE UploadDialogThreadHandle = NULL;
static HWND UploadDialogHandle = NULL;
static PH_EVENT InitializedEvent = PH_EVENT_INIT;
static HFONT FontHandle = NULL;
static SERVICE_INFO UploadServiceInfo[] =
{
{ UPLOAD_SERVICE_VIRUSTOTAL, L"www.virustotal.com", INTERNET_DEFAULT_HTTPS_PORT, WINHTTP_FLAG_SECURE, L"???", L"file" },
@@ -30,28 +38,109 @@ static SERVICE_INFO UploadServiceInfo[] =
{ UPLOAD_SERVICE_CIMA, L"camas.comodo.com", INTERNET_DEFAULT_HTTP_PORT, 0, L"/cgi-bin/submit", L"file" }
};
VOID InitializeFont(
__in HWND hwndDlg
static NTSTATUS ShowUpdateDialogThread(
__in PVOID Parameter
)
{
LOGFONT lFont = { 0 };
BOOL result;
MSG message;
PH_AUTO_POOL autoPool;
PUPLOAD_CONTEXT context;
// TODO: Cache font handle, it doesn't need to be recreated for each page.
HFONT fHandle = NULL;
context = (PUPLOAD_CONTEXT)Parameter;
lFont.lfHeight = 20;
lFont.lfWeight = FW_MEDIUM;
lFont.lfQuality = CLEARTYPE_QUALITY | ANTIALIASED_QUALITY;
PhInitializeAutoPool(&autoPool);
UploadDialogHandle = CreateDialogParam(
(HINSTANCE)PluginInstance->DllBase,
MAKEINTRESOURCE(IDD_PROGRESSDIALOG),
PhMainWndHandle,
UploadDlgProc,
(LPARAM)context
);
PhSetEvent(&InitializedEvent);
while (result = GetMessage(&message, NULL, 0, 0))
{
if (result == -1)
break;
if (!IsDialogMessage(UploadDialogHandle, &message))
{
TranslateMessage(&message);
DispatchMessage(&message);
}
PhDrainAutoPool(&autoPool);
}
PhDeleteAutoPool(&autoPool);
PhResetEvent(&InitializedEvent);
// Ensure global objects are disposed and reset when window closes.
//FreeUpdateContext(context);
//if (IconHandle)
//{
// DestroyIcon(IconHandle);
// IconHandle = NULL;
//}
if (FontHandle)
{
DeleteObject(FontHandle);
FontHandle = NULL;
}
if (UploadDialogThreadHandle)
{
NtClose(UploadDialogThreadHandle);
UploadDialogThreadHandle = NULL;
}
if (UploadDialogHandle)
{
DestroyWindow(UploadDialogHandle);
UploadDialogHandle = NULL;
}
PhFree(context);
return STATUS_SUCCESS;
}
static VOID SetControlFont(
__in HWND ControlHandle,
__in INT ControlID
)
{
LOGFONT headerFont;
memset(&headerFont, 0, sizeof(LOGFONT));
headerFont.lfHeight = -15;
headerFont.lfWeight = FW_MEDIUM;
headerFont.lfQuality = CLEARTYPE_QUALITY | ANTIALIASED_QUALITY;
// We don't check if Segoe exists, CreateFontIndirect does this for us.
wcscpy_s(
lFont.lfFaceName,
_countof(lFont.lfFaceName),
headerFont.lfFaceName,
_countof(headerFont.lfFaceName),
L"Segoe UI"
);
fHandle = CreateFontIndirectW(&lFont);
// Create the font handle
FontHandle = CreateFontIndirect(&headerFont);
SendMessageW(hwndDlg, WM_SETFONT, (WPARAM)fHandle, FALSE);
// Set the font
SendMessage(
GetDlgItem(ControlHandle, ControlID),
WM_SETFONT,
(WPARAM)FontHandle,
FALSE
);
}
VOID UploadToOnlineService(
@@ -60,20 +149,26 @@ VOID UploadToOnlineService(
__in ULONG Service
)
{
UPLOAD_CONTEXT context = { 0 };
INT_PTR windowhandle;
context.Service = Service;
PhSwapReference(&context.FileName, (PVOID)FileName);
windowhandle = DialogBoxParam(
(HINSTANCE)PluginInstance->DllBase,
MAKEINTRESOURCE(IDD_PROGRESSDIALOG),
NULL,
UploadDlgProc,
(LPARAM)&context
PUPLOAD_CONTEXT context = (PUPLOAD_CONTEXT)PhAllocate(
sizeof(UPLOAD_CONTEXT)
);
memset(context, 0, sizeof(UPLOAD_CONTEXT));
PhSwapReference(&context->FileName, (PVOID)FileName);
context->Service = Service;
if (!UploadDialogThreadHandle)
{
if (!(UploadDialogThreadHandle = PhCreateThread(0, (PUSER_THREAD_START_ROUTINE)ShowUpdateDialogThread, context)))
{
PhShowStatus(PhMainWndHandle, L"Unable to create the updater window.", 0, GetLastError());
return;
}
PhWaitForEvent(&InitializedEvent, NULL);
}
SendMessage(UploadDialogHandle, WM_SHOWDIALOG, 0, 0);
}
static VOID RaiseUploadError(
@@ -724,6 +819,7 @@ static NTSTATUS UploadWorkerThreadStart(
time_t time_taken = (time(NULL) - TimeTransferred);
time_t bps = totalFileReadLength / (time_taken ? time_taken : 1);
//time_t remain = (MulDiv((INT)time_taken, totalFileLength, totalFileReadLength) - time_taken);
int percent = MulDiv(100, totalFileReadLength, totalFileLength);
PPH_STRING TotalLength = PhFormatSize(totalFileLength, -1);
PPH_STRING TotalDownloadedLength = PhFormatSize(totalFileReadLength, -1);
@@ -744,7 +840,7 @@ static NTSTATUS UploadWorkerThreadStart(
PhDereferenceObject(TotalDownloadedLength);
// Update the progress bar position
//SendDlgItemMessage(context->WindowHandle, IDC_UPLOADPROGRESS, PBM_SETPOS, MulDiv(100, totalFileReadLength, totalFileLength), 0);
SendDlgItemMessage(context->WindowHandle, IDC_UPLOADPROGRESS, PBM_SETPOS, percent, 0);
}
}
@@ -800,32 +896,36 @@ static NTSTATUS UploadWorkerThreadStart(
{
case UPLOAD_SERVICE_VIRUSTOTAL:
{
PWSTR pwszURL;
DWORD dwSize;
PPH_STRING redirectUrl;
DWORD redirectLength;
// Use WinHttpQueryOption to obtain a buffer size.
WinHttpQueryOption(
requestHandle,
WINHTTP_OPTION_URL,
NULL,
&dwSize
&redirectLength
);
pwszURL = (PWSTR)PhAllocate(dwSize / sizeof(WCHAR));
redirectUrl = PhCreateStringEx(NULL, redirectLength);
// Use WinHttpQueryOption again, this time to retrieve
// the URL in the new buffer
if (WinHttpQueryOption(
requestHandle,
WINHTTP_OPTION_URL,
(void*)pwszURL,
&dwSize
redirectUrl->Buffer,
&redirectLength
))
{
if (*pwszURL != 0)
if (!PhIsNullOrEmptyString(redirectUrl))
{
// Display the retrieved URL
context->LaunchCommand = PhCreateString(pwszURL);
context->LaunchCommand = redirectUrl;
}
else
{
PhDereferenceObject(redirectUrl);
}
}
}
@@ -956,16 +1056,16 @@ static NTSTATUS UploadWorkerThreadStart(
ExitCleanup:
//if (requestHandle)
// WinHttpCloseHandle(requestHandle);
//if (connectHandle)
// WinHttpCloseHandle(connectHandle);
//if (internetHandle)
// WinHttpCloseHandle(internetHandle);
/* if (objectName)
if (requestHandle)
WinHttpCloseHandle(requestHandle);
if (connectHandle)
WinHttpCloseHandle(connectHandle);
if (internetHandle)
WinHttpCloseHandle(internetHandle);
if (objectName)
PhDereferenceObject(objectName);
if (fileHandle)
NtClose(fileHandle);*/
NtClose(fileHandle);
return STATUS_SUCCESS;
}
@@ -982,50 +1082,72 @@ INT_PTR CALLBACK UploadDlgProc(
if (uMsg == WM_INITDIALOG)
{
context = (PUPLOAD_CONTEXT)lParam;
context->WindowHandle = hwndDlg;
InitializeFont(GetDlgItem(context->WindowHandle, IDC_MESSAGE));
// Center the update window on PH if visible and not mimimized else center on desktop.
PhCenterWindow(
context->WindowHandle,
(IsWindowVisible(GetParent(context->WindowHandle)) && !IsIconic(GetParent(context->WindowHandle))) ? GetParent(context->WindowHandle) : NULL
);
if (context->FileName)
{
PPH_STRING baseFileName = PhGetBaseName(
context->FileName
);
PPH_STRING szWindowText = PhFormatString(
L"Uploading: %s",
baseFileName->Buffer
);
SetDlgItemText(hwndDlg, IDC_MESSAGE, szWindowText->Buffer);
//PhDereferenceObject(szWindowText);
//PhDereferenceObject(baseFileName);
SetProp(hwndDlg, L"Context", (HANDLE)context);
context->ThreadHandle = PhCreateThread(
0,
(PUSER_THREAD_START_ROUTINE)UploadWorkerThreadStart,
context
);
}
SetProp(hwndDlg, L"Context", (HANDLE)context);
}
context = (PUPLOAD_CONTEXT)GetProp(hwndDlg, L"Context");
else
{
context = (PUPLOAD_CONTEXT)GetProp(hwndDlg, L"Context");
if (uMsg == WM_DESTROY)
RemoveProp(hwndDlg, L"Context");
}
if (!context)
return FALSE;
switch (uMsg)
{
case WM_INITDIALOG:
{
context->WindowHandle = hwndDlg;
SetControlFont(context->WindowHandle, IDC_MESSAGE);
// Center the update window on PH if visible and not mimimized else center on desktop.
PhCenterWindow(
context->WindowHandle,
(IsWindowVisible(GetParent(context->WindowHandle)) && !IsIconic(GetParent(context->WindowHandle))) ? GetParent(context->WindowHandle) : NULL
);
if (context->FileName)
{
PPH_STRING baseFileName = PhGetBaseName(
context->FileName
);
PPH_STRING messageText = PhFormatString(
L"Uploading: %s",
baseFileName->Buffer
);
SetDlgItemText(hwndDlg, IDC_MESSAGE, messageText->Buffer);
PhDereferenceObject(messageText);
PhDereferenceObject(baseFileName);
context->ThreadHandle = PhCreateThread(
0,
(PUSER_THREAD_START_ROUTINE)UploadWorkerThreadStart,
context
);
}
}
break;
case WM_SHOWDIALOG:
{
if (IsIconic(hwndDlg))
ShowWindow(hwndDlg, SW_RESTORE);
else
ShowWindow(hwndDlg, SW_SHOW);
SetForegroundWindow(hwndDlg);
}
break;
case WM_COMMAND:
{
switch (LOWORD(wParam))
{
case IDCANCEL:
EndDialog(hwndDlg, IDCANCEL);
PostQuitMessage(IDCANCEL);
break;
}
}
@@ -1056,14 +1178,14 @@ INT_PTR CALLBACK UploadDlgProc(
PhShellExecute(hwndDlg, context->LaunchCommand->Buffer, NULL);
}
EndDialog(hwndDlg, IDOK);
PostQuitMessage(IDOK);
}
break;
case UM_ERROR:
{
PhShowError(hwndDlg, L"%s", context->ErrorMessage->Buffer);
EndDialog(hwndDlg, IDCANCEL);
PostQuitMessage(IDCANCEL);
}
break;
}
2.x/trunk/plugins/Updater/Updater.rc
+6 -6
View File
@@ -41,8 +41,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,1,0,0
PRODUCTVERSION 1,1,0,0
FILEVERSION 1,3,0,0
PRODUCTVERSION 1,3,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -55,21 +55,21 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "0c0904b0"
BLOCK "000904b0"
BEGIN
VALUE "CompanyName", "dmex"
VALUE "FileDescription", "Update Checker plugin for Process Hacker"
VALUE "FileVersion", "1.1.0.0"
VALUE "FileVersion", "1.3.0.0"
VALUE "InternalName", "UpdateChecker"
VALUE "LegalCopyright", "Licensed under the GNU GPL, v3."
VALUE "OriginalFilename", "Updater.dll"
VALUE "ProductName", "Update Checker plugin for Process Hacker"
VALUE "ProductVersion", "1.1.0.0"
VALUE "ProductVersion", "1.3.0.0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0xc09, 1200
VALUE "Translation", 0x9, 1200
END
END
2.x/trunk/plugins/Updater/updater.c
+1
View File
@@ -34,6 +34,7 @@
#define PH_UPDATENEWER (WM_APP + 104)
#define PH_HASHSUCCESS (WM_APP + 105)
#define PH_HASHFAILURE (WM_APP + 106)
#define WM_SHOWDIALOG (WM_APP + 150)
static HANDLE UpdateDialogThreadHandle = NULL;
static HWND UpdateDialogHandle = NULL;
2.x/trunk/plugins/Updater/updater.h
+4 -4
View File
@@ -14,11 +14,11 @@
#include "resource.h"
#define Control_Visible(hWnd, visible) ShowWindow(hWnd, visible ? SW_SHOW : SW_HIDE);
#define UPDATE_MENUITEM 101
#define WM_SHOWDIALOG (WM_APP + 150)
#define SETTING_AUTO_CHECK L"ProcessHacker.Updater.PromptStart"
#define Control_Visible(hWnd, visible) \
ShowWindow(hWnd, visible ? SW_SHOW : SW_HIDE);
#define UPDATE_MENUITEM 101
#define SETTING_AUTO_CHECK L"ProcessHacker.Updater.PromptStart"
#define MAKEDLLVERULL(major, minor, build, sp) \
(((ULONGLONG)(major) << 48) | \
((ULONGLONG)(minor) << 32) | \