diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-11-14 22:52:05 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-11-14 22:52:05 +0000 |
| commit | f9542454916dd5a6b248803bded9f23d381fac87 (patch) | |
| tree | 33b6a4e9d4769c5d9048a30ac13bb9cfce074908 | |
| parent | c0c26f8e2a46393912455acd670f0925c94765d8 (diff) | |
Revert some inadvertent changes from the last commit.
svn path=/trunk/; revision=53329
| -rwxr-xr-x | packaging/portableapps/win32/WiresharkPortable.nsi | 10 | ||||
| -rw-r--r-- | wsutil/u3.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/packaging/portableapps/win32/WiresharkPortable.nsi b/packaging/portableapps/win32/WiresharkPortable.nsi index 38ae7ebb65..50538ac646 100755 --- a/packaging/portableapps/win32/WiresharkPortable.nsi +++ b/packaging/portableapps/win32/WiresharkPortable.nsi @@ -213,16 +213,16 @@ Section "Main" EnvironmentVariables: ; set the U3 environment variables StrCpy $PDRIVE $EXEDIR 2 - ;System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_SERIAL", "0000060414068917").r0' + System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_SERIAL", "0000060414068917").r0' System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_PATH", "$PDRIVE").r0' - ;System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DOCUMENT_PATH", "$PDRIVE\Documents").r0' - ;System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_VENDOR", "Wireshark Developers").r0' + System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DOCUMENT_PATH", "$PDRIVE\Documents").r0' + System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_VENDOR", "Wireshark Developers").r0' System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_PRODUCT", "PortableApps").r0' - ;System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_VENDOR_ID", "0000").r0' + System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_VENDOR_ID", "0000").r0' System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_APP_DATA_PATH", "$EXEDIR\Data").r0' System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_HOST_EXEC_PATH", "$EXEDIR\App\Wireshark").r0' System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_DEVICE_EXEC_PATH", "$EXEDIR\App\Wireshark").r0' - ;System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_ENV_VERSION", "1.0").r0' + System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_ENV_VERSION", "1.0").r0' System::Call 'Kernel32::SetEnvironmentVariableA(t,t) i("U3_ENV_LANGUAGE", "1033").r0' StrCmp $SECONDARYLAUNCH "true" LaunchAndExit diff --git a/wsutil/u3.c b/wsutil/u3.c index 73bf80b9bd..217d9f3bac 100644 --- a/wsutil/u3.c +++ b/wsutil/u3.c @@ -89,6 +89,8 @@ void u3_runtime_info(GString *str) g_string_append(str, " from a "); } + g_string_append(str, " U3 device"); + if((u3devicepath_lcl = #ifdef _WIN32 getenv_utf8 |