diff --git a/2.x/trunk/ProcessHacker/ProcessHacker.rc b/2.x/trunk/ProcessHacker/ProcessHacker.rc
index 3f8a43bf6..643d0895b 100644
--- a/2.x/trunk/ProcessHacker/ProcessHacker.rc
+++ b/2.x/trunk/ProcessHacker/ProcessHacker.rc
@@ -163,6 +163,7 @@ BEGIN
BEGIN
MENUITEM "Unload", ID_MODULE_UNLOAD
MENUITEM SEPARATOR
+ MENUITEM "Search Online", ID_MODULE_SEARCHONLINE
MENUITEM "Open Containing Folder", ID_MODULE_OPENCONTAININGFOLDER
MENUITEM "Properties", ID_MODULE_PROPERTIES
END
diff --git a/2.x/trunk/ProcessHacker/ProcessHacker.vcproj b/2.x/trunk/ProcessHacker/ProcessHacker.vcproj
index eb176bc5e..895d2fa30 100644
--- a/2.x/trunk/ProcessHacker/ProcessHacker.vcproj
+++ b/2.x/trunk/ProcessHacker/ProcessHacker.vcproj
@@ -540,6 +540,10 @@
RelativePath=".\support.c"
>
+
+
diff --git a/2.x/trunk/ProcessHacker/include/phgui.h b/2.x/trunk/ProcessHacker/include/phgui.h
index 2b42b1286..76595799e 100644
--- a/2.x/trunk/ProcessHacker/include/phgui.h
+++ b/2.x/trunk/ProcessHacker/include/phgui.h
@@ -548,6 +548,13 @@ FORCEINLINE ULONG PhGetColorBrightness(
return (min + max) / 2;
}
+// support2
+
+VOID PhSearchOnlineString(
+ __in HWND hWnd,
+ __in PWSTR String
+ );
+
// mainwnd
#ifndef MAINWND_PRIVATE
diff --git a/2.x/trunk/ProcessHacker/mainwnd.c b/2.x/trunk/ProcessHacker/mainwnd.c
index 12fdcc40c..1367593f6 100644
--- a/2.x/trunk/ProcessHacker/mainwnd.c
+++ b/2.x/trunk/ProcessHacker/mainwnd.c
@@ -748,26 +748,7 @@ LRESULT CALLBACK PhMainWndProc(
if (processItem)
{
- PPH_STRING searchEngine = PHA_DEREFERENCE(PhGetStringSetting(L"SearchEngine"));
- ULONG indexOfReplacement = PhStringIndexOfString(searchEngine, 0, L"%s");
-
- if (indexOfReplacement != -1)
- {
- PPH_STRING newString;
-
- // Replace "%s" with the process name.
- newString = PhaConcatStrings(
- 3,
- PhaSubstring(searchEngine, 0, indexOfReplacement)->Buffer,
- processItem->ProcessName->Buffer,
- PhaSubstring(
- searchEngine,
- indexOfReplacement + 2,
- searchEngine->Length / 2 - indexOfReplacement - 2
- )->Buffer
- );
- PhShellExecute(hWnd, newString->Buffer, NULL);
- }
+ PhSearchOnlineString(hWnd, processItem->ProcessName->Buffer);
}
}
break;
diff --git a/2.x/trunk/ProcessHacker/mdump.c b/2.x/trunk/ProcessHacker/mdump.c
index 28b2d1338..79ac81504 100644
--- a/2.x/trunk/ProcessHacker/mdump.c
+++ b/2.x/trunk/ProcessHacker/mdump.c
@@ -258,14 +258,20 @@ INT_PTR CALLBACK PhpProcessMiniDumpDlgProc(
{
PPROCESS_MINIDUMP_CONTEXT context = (PPROCESS_MINIDUMP_CONTEXT)lParam;
+ PhCenterWindow(hwndDlg, GetParent(hwndDlg));
SetProp(hwndDlg, L"Context", (HANDLE)context);
SetDlgItemText(hwndDlg, IDC_PROGRESSTEXT, L"Creating the dump file...");
if (WindowsVersion >= WINDOWS_XP)
- SendMessage(GetDlgItem(hwndDlg, IDC_PROGRESS), PBM_SETMARQUEE, TRUE, 250);
+ {
+ PhSetWindowStyle(GetDlgItem(hwndDlg, IDC_PROGRESS), PBS_MARQUEE, PBS_MARQUEE);
+ SendMessage(GetDlgItem(hwndDlg, IDC_PROGRESS), PBM_SETMARQUEE, TRUE, 75);
+ }
else
+ {
ShowWindow(GetDlgItem(hwndDlg, IDC_PROGRESS), SW_HIDE);
+ }
context->WindowHandle = hwndDlg;
context->ThreadHandle = PhCreateThread(0, PhpProcessMiniDumpThreadStart, context);
diff --git a/2.x/trunk/ProcessHacker/procprp.c b/2.x/trunk/ProcessHacker/procprp.c
index 1817be5ed..b15613ded 100644
--- a/2.x/trunk/ProcessHacker/procprp.c
+++ b/2.x/trunk/ProcessHacker/procprp.c
@@ -2032,6 +2032,16 @@ INT_PTR CALLBACK PhpProcessModulesDlgProc(
}
}
break;
+ case ID_MODULE_SEARCHONLINE:
+ {
+ PPH_MODULE_ITEM moduleItem = PhGetSelectedListViewItemParam(lvHandle);
+
+ if (moduleItem)
+ {
+ PhSearchOnlineString(hwndDlg, moduleItem->Name->Buffer);
+ }
+ }
+ break;
case ID_MODULE_OPENCONTAININGFOLDER:
{
PPH_MODULE_ITEM moduleItem = PhGetSelectedListViewItemParam(lvHandle);
diff --git a/2.x/trunk/ProcessHacker/resource.h b/2.x/trunk/ProcessHacker/resource.h
index 23f214d58..f01602250 100644
--- a/2.x/trunk/ProcessHacker/resource.h
+++ b/2.x/trunk/ProcessHacker/resource.h
@@ -33,7 +33,6 @@
#define IDR_FINDOBJ 134
#define IDD_HIDDENPROCESSES 135
#define IDD_RUNAS 136
-#define IDD_DIALOG2 137
#define IDD_PROGRESS 137
#define IDC_TERMINATE 1003
#define IDC_FILEICON 1005
@@ -218,6 +217,7 @@
#define ID_OBJECT_PROPERTIES 40120
#define ID_OBJECT_PROCESSPROPERTIES 40121
#define ID_HELP_DEBUGCONSOLE 40122
+#define ID_MODULE_SEARCHONLINE 40125
#define IDDYNAMIC 50000
// Next default values for new objects
@@ -225,7 +225,7 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 138
-#define _APS_NEXT_COMMAND_VALUE 40125
+#define _APS_NEXT_COMMAND_VALUE 40126
#define _APS_NEXT_CONTROL_VALUE 1078
#define _APS_NEXT_SYMED_VALUE 107
#endif
diff --git a/2.x/trunk/ProcessHacker/support2.c b/2.x/trunk/ProcessHacker/support2.c
new file mode 100644
index 000000000..200f00c6f
--- /dev/null
+++ b/2.x/trunk/ProcessHacker/support2.c
@@ -0,0 +1,63 @@
+/*
+ * Process Hacker -
+ * application support functions
+ *
+ * Copyright (C) 2010 wj32
+ *
+ * This file is part of Process Hacker.
+ *
+ * Process Hacker is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Process Hacker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Process Hacker. If not, see .
+ */
+
+#include
+#include
+
+VOID PhSearchOnlineString(
+ __in HWND hWnd,
+ __in PWSTR String
+ )
+{
+ PPH_STRING searchEngine = PhGetStringSetting(L"SearchEngine");
+ ULONG indexOfReplacement = PhStringIndexOfString(searchEngine, 0, L"%s");
+
+ if (indexOfReplacement != -1)
+ {
+ PPH_STRING stringBefore;
+ PPH_STRING stringAfter;
+ PPH_STRING newString;
+
+ // Replace "%s" with the string.
+
+ stringBefore = PhSubstring(searchEngine, 0, indexOfReplacement);
+ stringAfter = PhSubstring(
+ searchEngine,
+ indexOfReplacement + 2,
+ searchEngine->Length / 2 - indexOfReplacement - 2
+ );
+
+ newString = PhConcatStrings(
+ 3,
+ stringBefore->Buffer,
+ String,
+ stringAfter->Buffer
+ );
+ PhShellExecute(hWnd, newString->Buffer, NULL);
+
+ PhDereferenceObject(newString);
+ PhDereferenceObject(stringAfter);
+ PhDereferenceObject(stringBefore);
+ }
+
+ PhDereferenceObject(searchEngine);
+}