aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraeme Lunt <graeme.lunt@smhs.co.uk>2007-01-28 10:10:06 +0000
committerGraeme Lunt <graeme.lunt@smhs.co.uk>2007-01-28 10:10:06 +0000
commit197c6c99958453b19f57db530b27ebe4945675b2 (patch)
treeb97caa6ee434ce38a3ac2a85edd98cf7ba46284f
parentb4a656ec1fb861536ba5fb0d0a4dfd523b7fcc14 (diff)
*) Ask the user if they want to install WinPcap.
*) Associate Wireshark with p7s, p7m and p7c files (if not already associated). svn path=/trunk/; revision=20582
-rw-r--r--packaging/u3/win32/u3util.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/packaging/u3/win32/u3util.c b/packaging/u3/win32/u3util.c
index 172d3b2537..9cda4bec54 100644
--- a/packaging/u3/win32/u3util.c
+++ b/packaging/u3/win32/u3util.c
@@ -81,6 +81,9 @@ static char *extensions[] = {
".pfx",
".asn",
".spf",
+ ".p7c",
+ ".p7s",
+ ".p7m",
NULL
};
@@ -477,8 +480,11 @@ void host_configure(void)
RegCloseKey(key);
}
- if(!hasWinPcap) {
- /* XXX: we should ask the user if they want to install - and remember it */
+ if(!hasWinPcap &&
+ (MessageBox(NULL,
+ TEXT("If you want to capture packets from the network you will need to install WinPcap.\nIt will be uninstalled when you remove your U3 device.\n\nDo you want to install WinPcap?"),
+ TEXT("U3 Wireshark: Install WinPcap?"),
+ MB_YESNO|MB_TOPMOST|MB_ICONQUESTION) == IDYES)) {
/* compute the U3 path to the WinPcap installation package - it stays on the device */
u3_device_exec_path = getenv("U3_DEVICE_EXEC_PATH");