From 78d49fadf5839e956fd14b5348747c15acf1fbec Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 17 Aug 2011 16:47:04 +0000
Subject: [PATCH] From Gisle Vanem: Make sure our SetProcessDEPPolicyHandler
 typedef matches the documentation.

I also verified that DEP is still enabled on Win32 using Process Explorer.

svn path=/trunk/; revision=38583
---
 wsutil/privileges.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wsutil/privileges.c b/wsutil/privileges.c
index 7e51101c5d..12282837e1 100644
--- a/wsutil/privileges.c
+++ b/wsutil/privileges.c
@@ -48,7 +48,7 @@ void
 init_process_policies(void)
 {
 	HMODULE kernel32Handle;
-	typedef BOOL (*SetProcessDEPPolicyHandler)(DWORD);
+	typedef BOOL (WINAPI *SetProcessDEPPolicyHandler)(DWORD);
 	SetProcessDEPPolicyHandler PSetProcessDEPPolicy;
 
 #ifndef PROCESS_DEP_ENABLE
@@ -70,7 +70,8 @@ init_process_policies(void)
 	 */
 	kernel32Handle = GetModuleHandle(_T("kernel32.dll"));
 	if (kernel32Handle != NULL) {
-		if (PSetProcessDEPPolicy = (SetProcessDEPPolicyHandler) GetProcAddress(kernel32Handle, "SetProcessDEPPolicy")) {
+		PSetProcessDEPPolicy = (SetProcessDEPPolicyHandler) GetProcAddress(kernel32Handle, "SetProcessDEPPolicy");
+		if (PSetProcessDEPPolicy) {
 			PSetProcessDEPPolicy(PROCESS_DEP_ENABLE);
 		}
 	}