Work with Visual Studio and Bug Fixes

CMakeLists.txt

@@ -0,0 +1,120 @@
+cmake_minimum_required (VERSION 2.8.1)
+
+############################################################
+# Project
+############################################################
+project (libhid)
+set (name hid)
+
+############################################################
+# Sources
+############################################################
+set (file_inc_common 
+    include/device.h
+    include/element.h
+    include/enumerator.h
+    include/filter.h
+    include/hid.h
+    ) 
+set (file_src_win
+    win32/device.cc
+    win32/enumerator.cc
+    win32/hid.cc
+    )
+set (file_inc_win
+    win32/auto_free.h
+    win32/button.h
+    win32/collection.h
+    win32/common.h
+    win32/device.h
+    win32/element.h
+    win32/enumerator.h
+    win32/value.h
+    )
+set (file_src_macos 
+    macos/device.cc
+    macos/element.cc
+    macos/enumerator.cc
+    macos/hid.cc
+    macos/util.cc
+    )
+set (file_inc_macos
+    macos/common.h
+    macos/device.h
+    macos/element.h
+    macos/enumerator.h
+    macos/util.h
+    ) 
+set (file_src_linux
+    )
+set (file_inc_linux
+    ) 
+
+set (file_inc ${file_inc_common})
+if (WIN32)
+    set (file_src ${file_src} ${file_src_win})
+    set (file_inc ${file_inc} ${file_inc_win})
+elseif (APPLE)
+    set (file_src ${file_src} ${file_src_macos})
+    set (file_inc ${file_inc} ${file_inc_macos})
+elseif (UNIX)
+    set (file_src ${file_src} ${file_src_linux})
+    set (file_inc ${file_inc} ${file_inc_linux})
+endif ()
+
+if (WIN32)
+    source_group ("common" FILES ${file_inc_common})
+endif ()
+
+############################################################
+# Build
+############################################################
+set (dir_inc
+    include)
+set (dir_lib
+    )
+
+include_directories (${dir_inc})
+
+link_directories (${dir_lib})
+
+add_definitions (-DUNICODE)
+set (CMAKE_MODULE_LINKER_FLAGS "-static-libstdc++")
+
+############################################################
+# Target
+############################################################
+set (target_static lib${name}-static)
+
+add_library (${target_static} STATIC ${file_src} ${file_inc})
+
+if (WIN32)
+    set (file_name_static lib${name})
+else ()
+    set (file_name_static ${name})
+endif ()
+
+set_target_properties (${target_static} PROPERTIES
+    OUTPUT_NAME ${file_name_static}
+    OUTPUT_NAME_DEBUG ${file_name_static}d
+    )
+
+#target_link_libraries (${target_shared} )
+
+############################################################
+# Install
+############################################################
+if (WIN32)
+    set (CMAKE_INSTALL_LIBDIR lib)
+    set (CMAKE_INSTALL_INCLUDEDIR include)
+else (WIN32)
+    #include (GNUInstallDirs)
+    if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
+        set (CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
+    endif ()
+    if (NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
+        set (CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include)
+    endif ()
+endif (WIN32)
+
+install (TARGETS ${target_static} DESTINATION ${CMAKE_INSTALL_LIBDIR})

include/element.h

@@ -7,6 +7,17 @@
 #include <string>
 #include <vector>
 
+// workaround for no 'stdint.h' support before msvc 10
+#if defined(_MSC_VER) && _MSC_VER < 1600
+#   include "stdint.h"
+#else
+#   include <stdint.h>
+#endif
+
+#if defined(_MSC_VER)
+    typedef int ssize_t;
+#endif
+
 namespace HID
 {
     class device_type;

include/filter.h

@@ -47,7 +47,7 @@ class HID::filter_set : public filter_type
     void push_back(filter_type* f)  { children.push_back(f); }
 };
 
-struct HID::filter::And : public filter_set
+class HID::filter::And : public filter_set
 {
     bool accept(device_type& device)
     {
@@ -74,7 +74,7 @@ class HID::filter::Not : public filter_type
     }
 };
 
-struct HID::filter::Or : public filter_set
+class HID::filter::Or : public filter_set
 {
     bool accept(device_type& device)
     {

include/stdint.h

@@ -0,0 +1,199 @@
+/* stdint.h standard header */
+#pragma once
+#ifndef _STDINT
+#define _STDINT
+#ifndef RC_INVOKED
+#include <yvals.h>
+
+/* NB: assumes
+	byte has 8 bits
+	long is 32 bits
+	pointer can convert to and from long long
+	long long is longest type
+ */
+
+_C_STD_BEGIN
+		/* TYPE DEFINITIONS */
+typedef signed char int8_t;
+typedef short int16_t;
+typedef int int32_t;
+
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+
+typedef signed char int_least8_t;
+typedef short int_least16_t;
+typedef int int_least32_t;
+
+typedef unsigned char uint_least8_t;
+typedef unsigned short uint_least16_t;
+typedef unsigned int uint_least32_t;
+
+typedef char int_fast8_t;
+typedef int int_fast16_t;
+typedef int int_fast32_t;
+
+typedef unsigned char uint_fast8_t;
+typedef unsigned int uint_fast16_t;
+typedef unsigned int uint_fast32_t;
+
+#ifndef _INTPTR_T_DEFINED
+ #define _INTPTR_T_DEFINED
+ #ifdef _WIN64
+typedef __int64 intptr_t;
+ #else /* _WIN64 */
+typedef _W64 int intptr_t;
+ #endif /* _WIN64 */
+#endif /* _INTPTR_T_DEFINED */
+
+#ifndef _UINTPTR_T_DEFINED
+ #define _UINTPTR_T_DEFINED
+ #ifdef _WIN64
+typedef unsigned __int64 uintptr_t;
+ #else /* _WIN64 */
+typedef _W64 unsigned int uintptr_t;
+ #endif /* _WIN64 */
+#endif /* _UINTPTR_T_DEFINED */
+
+typedef _Longlong int64_t;
+typedef _ULonglong uint64_t;
+
+typedef _Longlong int_least64_t;
+typedef _ULonglong uint_least64_t;
+
+typedef _Longlong int_fast64_t;
+typedef _ULonglong uint_fast64_t;
+
+typedef _Longlong intmax_t;
+typedef _ULonglong uintmax_t;
+
+		/* LIMIT MACROS */
+#define INT8_MIN	(-0x7f - _C2)
+#define INT16_MIN	(-0x7fff - _C2)
+#define INT32_MIN	(-0x7fffffff - _C2)
+
+#define INT8_MAX	0x7f
+#define INT16_MAX	0x7fff
+#define INT32_MAX	0x7fffffff
+#define UINT8_MAX	0xff
+#define UINT16_MAX	0xffff
+#define UINT32_MAX	0xffffffff
+
+#define INT_LEAST8_MIN		(-0x7f - _C2)
+#define INT_LEAST16_MIN		(-0x7fff - _C2)
+#define INT_LEAST32_MIN		(-0x7fffffff - _C2)
+
+#define INT_LEAST8_MAX		0x7f
+#define INT_LEAST16_MAX		0x7fff
+#define INT_LEAST32_MAX		0x7fffffff
+#define UINT_LEAST8_MAX		0xff
+#define UINT_LEAST16_MAX	0xffff
+#define UINT_LEAST32_MAX	0xffffffff
+
+#define INT_FAST8_MIN		(-0x7f - _C2)
+#define INT_FAST16_MIN		(-0x7fff - _C2)
+#define INT_FAST32_MIN		(-0x7fffffff - _C2)
+
+#define INT_FAST8_MAX		0x7f
+#define INT_FAST16_MAX		0x7fff
+#define INT_FAST32_MAX		0x7fffffff
+#define UINT_FAST8_MAX		0xff
+#define UINT_FAST16_MAX		0xffff
+#define UINT_FAST32_MAX		0xffffffff
+
+ #if _INTPTR == 0 || _INTPTR == 1
+#define INTPTR_MAX			0x7fffffff
+#define INTPTR_MIN			(-INTPTR_MAX - _C2)
+#define UINTPTR_MAX			0xffffffff
+
+ #else /* _INTPTR == 2 */
+#define INTPTR_MIN			(-_LLONG_MAX - _C2)
+#define INTPTR_MAX			_LLONG_MAX
+#define UINTPTR_MAX			_ULLONG_MAX
+#endif /* _INTPTR */
+
+#define INT8_C(x)	(x)
+#define INT16_C(x)	(x)
+#define INT32_C(x)	((x) + (INT32_MAX - INT32_MAX))
+
+#define UINT8_C(x)	(x)
+#define UINT16_C(x)	(x)
+#define UINT32_C(x)	((x) + (UINT32_MAX - UINT32_MAX))
+
+#ifdef _WIN64
+ #define PTRDIFF_MIN		INT64_MIN
+ #define PTRDIFF_MAX		INT64_MAX
+#else /* _WIN64 */
+ #define PTRDIFF_MIN		INT32_MIN
+ #define PTRDIFF_MAX		INT32_MAX
+#endif /* _WIN64 */
+
+#define SIG_ATOMIC_MIN	INT32_MIN
+#define SIG_ATOMIC_MAX	INT32_MAX
+
+#ifndef SIZE_MAX
+ #ifdef _WIN64
+  #define SIZE_MAX		UINT64_MAX
+ #else /* _WIN64 */
+  #define SIZE_MAX		UINT32_MAX
+ #endif /* _WIN64 */
+#endif /* SIZE_MAX */
+
+#define WCHAR_MIN	0x0000
+#define WCHAR_MAX	0xffff
+
+#define WINT_MIN	0x0000
+#define WINT_MAX	0xffff
+
+ #define INT64_MIN	(-0x7fffffffffffffff - _C2)
+ #define INT64_MAX	0x7fffffffffffffff
+ #define UINT64_MAX	0xffffffffffffffffU
+
+ #define INT_LEAST64_MIN	(-0x7fffffffffffffff - _C2)
+ #define INT_LEAST64_MAX	0x7fffffffffffffff
+ #define UINT_LEAST64_MAX	0xffffffffffffffffU
+
+ #define INT_FAST64_MIN		(-0x7fffffffffffffff - _C2)
+ #define INT_FAST64_MAX		0x7fffffffffffffff
+ #define UINT_FAST64_MAX	0xffffffffffffffffU
+
+ #define INTMAX_MIN		(-0x7fffffffffffffff - _C2)
+ #define INTMAX_MAX		0x7fffffffffffffff
+ #define UINTMAX_MAX	0xffffffffffffffffU
+
+#define INT64_C(x)		((x) + (INT64_MAX - INT64_MAX))
+#define UINT64_C(x)		((x) + (UINT64_MAX - UINT64_MAX))
+#define INTMAX_C(x)		INT64_C(x)
+#define UINTMAX_C(x)	UINT64_C(x)
+_C_STD_END
+#endif /* RC_INVOKED */
+#endif /* _STDINT */
+
+ #if defined(_STD_USING)
+using _CSTD int8_t; using _CSTD int16_t;
+using _CSTD int32_t; using _CSTD int64_t;
+
+using _CSTD uint8_t; using _CSTD uint16_t;
+using _CSTD uint32_t; using _CSTD uint64_t;
+
+using _CSTD int_least8_t; using _CSTD int_least16_t;
+using _CSTD int_least32_t;  using _CSTD int_least64_t;
+using _CSTD uint_least8_t; using _CSTD uint_least16_t;
+using _CSTD uint_least32_t; using _CSTD uint_least64_t;
+
+using _CSTD intmax_t; using _CSTD uintmax_t;
+
+using _CSTD uintptr_t;
+using _CSTD intptr_t;
+
+using _CSTD int_fast8_t; using _CSTD int_fast16_t;
+using _CSTD int_fast32_t; using _CSTD int_fast64_t;
+using _CSTD uint_fast8_t; using _CSTD uint_fast16_t;
+using _CSTD uint_fast32_t; using _CSTD uint_fast64_t;
+ #endif /* defined(_STD_USING) */
+
+/*
+ * Copyright (c) 1992-2009 by P.J. Plauger.  ALL RIGHTS RESERVED.
+ * Consult your license regarding permissions and restrictions.
+V5.20:0009 */

win32/common.h

@@ -13,6 +13,7 @@ extern "C"
 #include <stdlib.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <hidusage.h>
 #include <hidpi.h>
 #include <hidsdi.h>
 #endif