aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dcerpc.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2006-03-08 22:42:24 +0000
committerGerald Combs <gerald@wireshark.org>2006-03-08 22:42:24 +0000
commitd2c8d80b339feb903b9e38a1fe0d95ca886feb87 (patch)
tree08c7e33c3e19c8c83fb2ffcdbd122f7df7a35aa4 /epan/dissectors/packet-dcerpc.c
parentf31a402f6b5480f86b1386e38113a630945098a0 (diff)
Fix a couple of compilation warnings.
svn path=/trunk/; revision=17538
Diffstat (limited to 'epan/dissectors/packet-dcerpc.c')
-rw-r--r--epan/dissectors/packet-dcerpc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 85067b3e0b..8c32bfbf51 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -47,6 +47,10 @@
#include <epan/dissectors/packet-dcerpc-nt.h>
#include <epan/expert.h>
+#ifdef _WIN32
+#include <tchar.h>
+#endif
+
#ifndef MIN
#define MIN(x,y) ((x)<(y))?(x):(y)
#endif
@@ -491,13 +495,13 @@ int ResolveWin32UUID(e_uuid_t if_id, char *UUID_NAME, int UUID_NAME_MAX_LEN)
if(UUID_NAME_MAX_LEN < 2)
return 0;
REG_UUID_NAME[0] = '\0';
- _snwprintf(REG_UUID_STR, MAX_PATH, "SOFTWARE\\Classes\\Interface\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
+ _snwprintf(REG_UUID_STR, MAX_PATH, _T("SOFTWARE\\Classes\\Interface\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}"),
if_id.Data1, if_id.Data2, if_id.Data3,
if_id.Data4[0], if_id.Data4[1],
if_id.Data4[2], if_id.Data4[3],
if_id.Data4[4], if_id.Data4[5],
if_id.Data4[6], if_id.Data4[7]);
- if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCSTR)REG_UUID_STR, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
+ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, REG_UUID_STR, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
{
if (RegQueryValueEx(hKey, NULL, NULL, NULL, (LPBYTE)REG_UUID_NAME, &UUID_MAX_SIZE) == ERROR_SUCCESS && UUID_MAX_SIZE <= MAX_PATH)
{