WinCommon 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00ebfa266d5c8e6f2605affc423e17dc86dba69f
-  data.tar.gz: 3349af84a6b33f23281e0fc6b0441451a1f279a1
+  metadata.gz: a9a1814af4a4f7c4dc8a69045978139afad8b62e
+  data.tar.gz: 5b99327b4a142f8fb6455df3a75a82d98ed11d34
 SHA512:
-  metadata.gz: 327c266e6cd9c88e4f16e697ac74ad78f7cfa7b877c474861aa8ef662a60923f5cc576718f080f4e81aca55d01d6a65e4f4eafea04e30a6c260ec7f484582632
-  data.tar.gz: 489b7a6cd44d54144e7aca36fd45817c841cbe66683aa4ed3d078ce36f7edad02f96425915c842453ff1a0075bb6069ba39f53c5a090a914d64c005ea4ebec08
+  metadata.gz: c24a5f1951e5521e1e33cf4a4bf6de199ecfc20170b2fee1fbd6eee4d436014fe73aa1667f9438a50099bfa841f374b8a04f8b340d70a640a83a4d53e2830d50
+  data.tar.gz: a1d8b307f7816936b7959043e3ed83eb767b09a82ae0d310accba753fc1a4c4c20ac12bf57d1a2d75d9372e7ab65616fc89d936134d0c77ae64b2d47650acf62

data/lib/win_common.rb

@@ -1,8 +1,10 @@
+require 'fiddle'
+require 'fiddle/import'
+
 require_relative 'win_common/version'
 require_relative 'win_common/constants'
 require_relative 'win_common/errors'
+require_relative 'win_common/libraries'
+require_relative 'win_common/structs'
+require_relative 'win_common/macro'
 require_relative 'win_common/functions'
-
-module WinCommon
-
-end

data/lib/win_common/constants.rb

@@ -2,5 +2,35 @@ module WinCommon
     module Constants
         FALSE = 0
         TRUE  = 1
+        SpecVersion = {
+            :WIN32_WINNT_NT4     => 0x0400,
+            :WIN32_WINNT_WIN2K   => 0x0500,
+            :WIN32_WINNT_WINXP   => 0x0501,
+            :WIN32_WINNT_WS03    => 0x0502,
+            :WIN32_WINNT_VISTA   => 0x0600,
+            :WIN32_WINNT_WIN7    => 0x0601,
+            :WIN32_WINNT_WIN8    => 0x0602,
+            :WIN32_WINNT_WINBLUE => 0x0603
+        }
+        VER_MINORVERSION                = 0x0000001
+        VER_MAJORVERSION                = 0x0000002
+        VER_BUILDNUMBER                 = 0x0000004
+        VER_PLATFORMID                  = 0x0000008
+        VER_SERVICEPACKMINOR            = 0x0000010
+        VER_SERVICEPACKMAJOR            = 0x0000020
+        VER_SUITENAME                   = 0x0000040
+        VER_PRODUCT_TYPE                = 0x0000080
+        VER_PLATFORM_WIN32s             = 0
+        VER_PLATFORM_WIN32_WINDOWS      = 1
+        VER_PLATFORM_WIN32_NT           = 2
+        VER_EQUAL                       = 1
+        VER_GREATER                     = 2
+        VER_GREATER_EQUAL               = 3
+        VER_LESS                        = 4
+        VER_LESS_EQUAL                  = 5
+        VER_AND                         = 6
+        VER_OR                          = 7
+        VER_CONDITION_MASK              = 7
+        VER_NUM_BITS_PER_CONDITION_MASK = 3
     end
 end

data/lib/win_common/errors.rb

@@ -2,6 +2,20 @@ module WinCommon
     module Errors
         class WinCommonError < RuntimeError; end
     end
+
+    module Constants
+        FACILITY_NULL     = 0x00
+        FACILITY_RPC      = 0x01
+        FACILITY_DISPATCH = 0x02
+        FACILITY_STORAGE  = 0x03
+        FACILITY_ITF      = 0x04
+        FACILITY_WIN32    = 0x07
+        FACILITY_WINDOWS  = 0x08
+        FACILITY_SSPI     = 0x09
+        FACILITY_CONTROL  = 0x0A
+        FACILITY_CERT     = 0x0B
+        FACILITY_INTERNET = 0x0C
+    end
 end
 
 require_relative 'errors/hresult'

data/lib/win_common/functions.rb

@@ -1,5 +1,46 @@
 module WinCommon
     module Functions
 
+        GetLastError        = Fiddle::Function.new( Libraries::Kernel32['GetLastError'], [], Fiddle::TYPE_LONG )
+        VerifyVersionInfo   = Fiddle::Function.new( Libraries::Kernel32['VerifyVersionInfoW'],
+        [Fiddle::TYPE_VOIDP, -Fiddle::TYPE_LONG, -Fiddle::TYPE_LONG_LONG], Fiddle::TYPE_INT )
+        VerSetConditionMask = Fiddle::Function.new( Libraries::Kernel32['VerSetConditionMask'],
+        [-Fiddle::TYPE_LONG_LONG, -Fiddle::TYPE_LONG, -Fiddle::TYPE_CHAR], Fiddle::TYPE_LONG_LONG )
+
+        def self.IsWindowsVersionOrGreater?(wMajorVersion, wMinorVersion, wServicePackMajor = 0)
+            osvi = Structs::OSVERSIONINFOEXW.malloc
+            osvi.dwOSVersionInfoSize = Structs::OSVERSIONINFOEXW.size
+            osvi.dwMajorVersion      = wMajorVersion
+            osvi.dwMinorVersion      = wMinorVersion
+            osvi.wServicePackMajor   = wServicePackMajor
+
+            dwlConditionMask = VerSetConditionMask.call(VerSetConditionMask.call(VerSetConditionMask.call(0,
+            Constants::VER_MAJORVERSION, Constants::VER_GREATER_EQUAL),
+            Constants::VER_MINORVERSION, Constants::VER_GREATER_EQUAL),
+            Constants::VER_SERVICEPACKMAJOR, Constants::VER_GREATER_EQUAL)
+
+            dwTypeMask = Constants::VER_MAJORVERSION | Constants::VER_MINORVERSION | Constants::VER_SERVICEPACKMAJOR
+            VerifyVersionInfo.call(osvi, dwTypeMask, dwlConditionMask) != Constants::FALSE
+        end
+
+        def self.IsWindows7OrGreater?
+            win7 = Constants::SpecVersion[:WIN32_WINNT_WIN7]
+            IsWindowsVersionOrGreater?(Macro::HIBYTE(win7), Macro::LOBYTE(win7), 0)
+        end
+
+        def self.IsWindows7SP1OrGreater?
+            win7 = Constants::SpecVersion[:WIN32_WINNT_WIN7]
+            IsWindowsVersionOrGreater?(Macro::HIBYTE(win7), Macro::LOBYTE(win7), 1)
+        end
+
+        def self.IsWindows8OrGreater?
+            win8 = Constants::SpecVersion[:WIN32_WINNT_WIN8]
+            IsWindowsVersionOrGreater?(Macro::HIBYTE(win8), Macro::LOBYTE(win8), 0)
+        end
+
+        def self.IsWindows8Point1OrGreater?
+            winBlue = Constants::SpecVersion[:WIN32_WINNT_WINBLUE]
+            IsWindowsVersionOrGreater?(Macro::HIBYTE(winBlue), Macro::LOBYTE(winBlue), 0)
+        end
     end
 end

data/lib/win_common/libraries.rb

@@ -0,0 +1,6 @@
+module WinCommon
+    module Libraries
+        # Windows Kernel32 library
+        Kernel32 = Fiddle.dlopen('kernel32')
+    end
+end

data/lib/win_common/macro.rb

@@ -0,0 +1,27 @@
+module WinCommon
+    module Macro
+        def self.LOWORD(dword)
+            dword & 0xFFFF
+        end
+
+        def self.HIWORD(dword)
+            (dword >> 16) & 0xFFFF
+        end
+
+        def self.LOBYTE(word)
+            word & 0xFF
+        end
+
+        def self.HIBYTE(word)
+            (word >> 8) & 0xFF
+        end
+
+        def self.SpecVersion(version)
+            Constants::SpecVersion(version)
+        end
+
+        def self.HRESULT_FROM_WIN32(error)
+            error <= 0 ? error : ((error & 0x0000FFFF) | (Constants::FACILITY_WIN32 << 16) | 0x80000000)
+        end
+    end
+end

data/lib/win_common/structs.rb

@@ -1,91 +1,29 @@
 module WinCommon
     module Structs
-        class POINT < FFI::Struct
-            layout({
-                :x => :LONG,
-                :y => :LONG
-            })
-        end
-
-        class SIZE < FFI::Struct
-            layout({
-                :cx => :LONG,
-                :cy => :LONG
-            })
-        end
-
-        class FILETIME < FFI::Struct
-            layout({
-                :dwLowDateTime  => :DWORD,
-                :dwHighDateTime => :DWORD
-            })
-        end
-
-        class GUID < FFI::Struct
-            layout({
-                :data1 => :ulong,
-                :data2 => :ushort,
-                :data3 => :ushort,
-                :data4 => [ :uchar, 8 ]
-            })
-
-            def from_str(guid)
-                data = [guid.gsub(/[{\-}]/, '')].pack('H*').unpack('L>S>2C8')
-                self[:data1] = data[0]
-                self[:data2] = data[1]
-                self[:data3] = data[2]
-                3.upto(data.count - 1) do |i|
-                    self[:data4][i-3] = data[i]
-                end
-            end
-
-            def to_s
-                str = "%08X-%04X-%04X-%02X%02X-" % [self[:data1], self[:data2], self[:data3], self[:data4][0], self[:data4][1]]
-                2.upto(7) do  |i|
-                    str << "%02X" % self[:data4][i]
-                end
-                str
-            end
-
-            def to_ref
-                self.ptr
-            end
-        end
-
-        IID = GUID
-        CLSID = GUID
-        FMTID = GUID
-
-        class WideString
-            extend FFI::DataConverter
-            native_type FFI::Type::POINTER
-            def self.to_native(value, context)
-            end
-
-            def self.from_native(pointer, context)
-            end
-
-            def self.size
-                FFI.type_size(FFI::Type::POINTER)
-            end
-
-            def self.reference_required?
-                false
-            end
-        end
-    end
-
-    module Typedefs
-        FFI.typedef Structs::POINT.ptr,                      :PPOINT
-        FFI.typedef Structs::SIZE.ptr,                       :PSIZE
-        FFI.typedef Structs::FILETIME.ptr,                   :PFILETIME
-        FFI.typedef Structs::GUID.ptr,                       :LPGUID
-        FFI.typedef Structs::GUID.ptr,                       :LPCGUID
-        FFI.typedef Structs::IID.ptr,                        :LPIID
-        FFI.typedef Structs::CLSID.ptr,                      :LPCLSID
-        FFI.typedef Structs::FMTID.ptr,                      :LPFMTID
-        FFI.typedef Structs::GUID.by_ref(:in),               :REFGUID
-        FFI.typedef Structs::IID.by_ref(:in),                :REFIID
-        FFI.typedef Structs::CLSID.by_ref(:in),              :REFCLSID
+        OSVERSIONINFOEXW = Fiddle::CStructBuilder.create(Fiddle::CStruct,
+        [-Fiddle::TYPE_LONG,
+            -Fiddle::TYPE_LONG,
+            -Fiddle::TYPE_LONG,
+            -Fiddle::TYPE_LONG,
+            -Fiddle::TYPE_LONG,
+            [Fiddle::TYPE_SHORT, 128],
+            -Fiddle::TYPE_SHORT,
+            -Fiddle::TYPE_SHORT,
+            -Fiddle::TYPE_SHORT,
+            -Fiddle::TYPE_CHAR,
+            -Fiddle::TYPE_CHAR
+        ],
+        ['dwOSVersionInfoSize',
+            'dwMajorVersion',
+            'dwMinorVersion',
+            'dwBuildNumber',
+            'dwPlatformId',
+            'szCSDVersion',
+            'wServicePackMajor',
+            'wServicePackMinor',
+            'wSuiteMask',
+            'wProductType',
+            'wReserved'
+        ])
     end
 end

data/lib/win_common/structs_ffi.rb

@@ -0,0 +1,91 @@
+module WinCommon
+    module Structs
+        class POINT < FFI::Struct
+            layout({
+                :x => :LONG,
+                :y => :LONG
+            })
+        end
+
+        class SIZE < FFI::Struct
+            layout({
+                :cx => :LONG,
+                :cy => :LONG
+            })
+        end
+
+        class FILETIME < FFI::Struct
+            layout({
+                :dwLowDateTime  => :DWORD,
+                :dwHighDateTime => :DWORD
+            })
+        end
+
+        class GUID < FFI::Struct
+            layout({
+                :data1 => :ulong,
+                :data2 => :ushort,
+                :data3 => :ushort,
+                :data4 => [ :uchar, 8 ]
+            })
+
+            def from_str(guid)
+                data = [guid.gsub(/[{\-}]/, '')].pack('H*').unpack('L>S>2C8')
+                self[:data1] = data[0]
+                self[:data2] = data[1]
+                self[:data3] = data[2]
+                3.upto(data.count - 1) do |i|
+                    self[:data4][i-3] = data[i]
+                end
+            end
+
+            def to_s
+                str = "%08X-%04X-%04X-%02X%02X-" % [self[:data1], self[:data2], self[:data3], self[:data4][0], self[:data4][1]]
+                2.upto(7) do  |i|
+                    str << "%02X" % self[:data4][i]
+                end
+                str
+            end
+
+            def to_ref
+                self.ptr
+            end
+        end
+
+        IID = GUID
+        CLSID = GUID
+        FMTID = GUID
+
+        class WideString
+            extend FFI::DataConverter
+            native_type FFI::Type::POINTER
+            def self.to_native(value, context)
+            end
+
+            def self.from_native(pointer, context)
+            end
+
+            def self.size
+                FFI.type_size(FFI::Type::POINTER)
+            end
+
+            def self.reference_required?
+                false
+            end
+        end
+    end
+
+    module Typedefs
+        FFI.typedef Structs::POINT.ptr,                      :PPOINT
+        FFI.typedef Structs::SIZE.ptr,                       :PSIZE
+        FFI.typedef Structs::FILETIME.ptr,                   :PFILETIME
+        FFI.typedef Structs::GUID.ptr,                       :LPGUID
+        FFI.typedef Structs::GUID.ptr,                       :LPCGUID
+        FFI.typedef Structs::IID.ptr,                        :LPIID
+        FFI.typedef Structs::CLSID.ptr,                      :LPCLSID
+        FFI.typedef Structs::FMTID.ptr,                      :LPFMTID
+        FFI.typedef Structs::GUID.by_ref(:in),               :REFGUID
+        FFI.typedef Structs::IID.by_ref(:in),                :REFIID
+        FFI.typedef Structs::CLSID.by_ref(:in),              :REFCLSID
+    end
+end

data/lib/win_common/version.rb

@@ -1,3 +1,3 @@
 module WinCommon
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: WinCommon
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dāvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Library for commonly used Windows constants, data types, typedefs, structures
@@ -46,9 +46,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .travis.yml
+- .yardopts
 - Gemfile
 - README.md
 - Rakefile
@@ -60,7 +60,10 @@ files:
 - lib/win_common/errors.rb
 - lib/win_common/errors/hresult.rb
 - lib/win_common/functions.rb
+- lib/win_common/libraries.rb
+- lib/win_common/macro.rb
 - lib/win_common/structs.rb
+- lib/win_common/structs_ffi.rb
 - lib/win_common/typedefs.rb
 - lib/win_common/version.rb
 - spec/spec_helper.rb
@@ -76,12 +79,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []