Merge pull request #12 from ntoskrnl7/env/vs2010

Env/vs2010

Author: ntoskrnl7

README.md

@@ -213,7 +213,7 @@ add_executable(tests tests.cpp)
 
 # add dependencies
 include(cmake/CPM.cmake)
-CPMAddPackage("gh:ntoskrnl7/[email protected].22")
+CPMAddPackage("gh:ntoskrnl7/[email protected].23")
 
 # link dependencies
 target_link_libraries(tests win32ex)

include/Win32Ex/Internal/misc.hpp

@@ -310,6 +310,10 @@ class WaitableObject
     virtual bool Wait(Duration Timeout) = 0;
 };
 
+#if _MSC_VER <= 1600
+#pragma warning(disable : 4512)
+#endif
+
 class Waitable
 {
     friend class WaitableObject;

include/Win32Ex/Internal/version.h

@@ -27,6 +27,6 @@ Module Name:
 
 #define WIN32EX_VERSION_MAJOR 0
 #define WIN32EX_VERSION_MINOR 8
-#define WIN32EX_VERSION_PATCH 22
+#define WIN32EX_VERSION_PATCH 23
 
 #endif // _WIN32EX_VERSION_H_

include/Win32Ex/Security/Token.h

@@ -361,8 +361,8 @@ typedef struct
 
 WIN32EX_ALWAYS_INLINE BOOL __DefaultLookupTokenExCondition(DWORD ProcessId, HANDLE TokenHandle, PVOID Context)
 {
-    UNREFERENCED_PARAMETER(ProcessId);
     __DefaultLookupTokenExConditionContext *ctx = (__DefaultLookupTokenExConditionContext *)Context;
+    UNREFERENCED_PARAMETER(ProcessId);
     return (ctx->TokenCondition) ? ctx->TokenCondition(TokenHandle, ctx->Context) : TRUE;
 }
 

include/Win32Ex/System/Object.h

@@ -55,9 +55,11 @@ WIN32EX_ALWAYS_INLINE BOOL IsTemporaryObject(_In_ HANDLE Handle)
 
 WIN32EX_ALWAYS_INLINE BOOL __IsPrivilegeEnabled(_In_ DWORD ProcessId, _In_ HANDLE hToken, _In_ PVOID Context)
 {
-    UNREFERENCED_PARAMETER(ProcessId);
     BOOL result = FALSE;
     PPRIVILEGE_SET privilegeSet = (PPRIVILEGE_SET)Context;
+    
+    UNREFERENCED_PARAMETER(ProcessId);
+
     privilegeSet->Control = PRIVILEGE_SET_ALL_NECESSARY;
     PrivilegeCheck(hToken, privilegeSet, &result);
     return result;

include/Win32Ex/System/Process.hpp

@@ -29,6 +29,10 @@ Module Name:
 #ifndef _WIN32EX_SYSTEM_PROCESS_HPP_
 #define _WIN32EX_SYSTEM_PROCESS_HPP_
 
+#if _MSC_VER <= 1600
+#pragma warning(disable : 4481 4714)
+#endif
+
 #include "../Internal/version.h"
 #define WIN32EX_SYSTEM_PROCESS_HPP_VERSION_MAJOR WIN32EX_VERSION_MAJOR
 #define WIN32EX_SYSTEM_PROCESS_HPP_VERSION_MINOR WIN32EX_VERSION_MINOR