WinCommon 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c4bfe76872952b47611704aae5087ff318f59ba
-  data.tar.gz: 167b26d4b8e11a5d3118496198d10af51b7f051a
+  metadata.gz: 00ebfa266d5c8e6f2605affc423e17dc86dba69f
+  data.tar.gz: 3349af84a6b33f23281e0fc6b0441451a1f279a1
 SHA512:
-  metadata.gz: 561538be030a9514f8a626536acdf4ff0b7ffd6635eecff0da7345cb7f6a79b4e0adb795ec925634b4b36c874de76ba521d77c1940f823f4d85e80053b5ca647
-  data.tar.gz: f223b600b92b11a654a6248eba569b9c123d33ce9bb8aa76b598c3432af3377f4960241615c7a696be8a3da34d62609f56689ad88f6aea04ffb922c8f81a9d0d
+  metadata.gz: 327c266e6cd9c88e4f16e697ac74ad78f7cfa7b877c474861aa8ef662a60923f5cc576718f080f4e81aca55d01d6a65e4f4eafea04e30a6c260ec7f484582632
+  data.tar.gz: 489b7a6cd44d54144e7aca36fd45817c841cbe66683aa4ed3d078ce36f7edad02f96425915c842453ff1a0075bb6069ba39f53c5a090a914d64c005ea4ebec08

data/lib/win_common/crypt/structs.rb

@@ -0,0 +1,85 @@
+module WinCommon
+    module Crypt
+        module Structs
+            class CRYPT_INTEGER_BLOB < FFI::Struct
+                layout({
+                    :cbData => :DWORD,
+                    :pbData => :PBYTE
+                })
+            end
+
+            CRYPT_OBJID_BLOB = CRYPT_INTEGER_BLOB
+            CERT_NAME_BLOB = CRYPT_INTEGER_BLOB
+
+            class CRYPT_ALGORITHM_IDENTIFIER < FFI::Struct
+                layout({
+                    :pszObjId   => :LPSTR,
+                    :Parameters => CRYPT_OBJID_BLOB
+                })
+            end
+
+            class CRYPT_BIT_BLOB < FFI::Struct
+                layout({
+                    :cbData      => :DWORD,
+                    :pbData      => :PBYTE,
+                    :cUnusedBits => :DWORD
+                })
+            end
+
+            class CERT_PUBLIC_KEY_INFO < FFI::Struct
+                layout({
+                    :Algorithm => CRYPT_ALGORITHM_IDENTIFIER,
+                    :PublicKey => CRYPT_BIT_BLOB
+                })
+            end
+
+            class CERT_EXTENSION < FFI::Struct
+                layout({
+                    :pszObjId  => :LPSTR,
+                    :fCritical => :BOOL,
+                    :Value     => CRYPT_OBJID_BLOB
+                })
+            end
+            FFI.typedef CERT_EXTENSION.ptr, :PCERT_EXTENSION
+
+            class CERT_INFO < FFI::Struct
+                layout({
+                    :dwVersion            => :DWORD,
+                    :SerialNumber         => CRYPT_INTEGER_BLOB,
+                    :SignatureAlgorithm   => CRYPT_ALGORITHM_IDENTIFIER,
+                    :Issuer               => CERT_NAME_BLOB,
+                    :NotBefore            => WinCommon::Structs::FILETIME,
+                    :NotAfter             => WinCommon::Structs::FILETIME,
+                    :Subject              => CERT_NAME_BLOB,
+                    :SubjectPublicKeyInfo => CERT_PUBLIC_KEY_INFO,
+                    :IssuerUniqueId       => CRYPT_BIT_BLOB,
+                    :SubjectUniqueId      => CRYPT_BIT_BLOB,
+                    :cExtension           => :DWORD,
+                    :rgExtension          => :PCERT_EXTENSION
+                })
+            end
+
+            class CERT_CONTEXT < FFI::Struct
+                layout({
+                    :dwCertEncodingType => :DWORD,
+                    :pbCertEncoded => :PBYTE,
+                    :cbCertEncoded => :DWORD,
+                    :pCertInfo => CERT_INFO.ptr,
+                    :hCertStore => :HCERTSTORE
+                })
+            end
+
+        end
+
+        module Typedefs
+            FFI.typedef Structs::CRYPT_INTEGER_BLOB.ptr,         :PCRYPT_INTEGER_BLOB
+            FFI.typedef Structs::CRYPT_OBJID_BLOB.ptr,           :PCRYPT_OBJID_BLOB
+            FFI.typedef Structs::CERT_NAME_BLOB.ptr,             :PCERT_NAME_BLOB
+            FFI.typedef Structs::CRYPT_ALGORITHM_IDENTIFIER.ptr, :PCRYPT_ALGORITHM_IDENTIFIER
+            FFI.typedef Structs::CRYPT_BIT_BLOB.ptr,             :PCRYPT_BIT_BLOB
+            FFI.typedef Structs::CERT_PUBLIC_KEY_INFO.ptr,       :PCERT_PUBLIC_KEY_INFO
+            FFI.typedef Structs::CERT_INFO.ptr,                  :PCERT_INFO
+            FFI.typedef Structs::CERT_CONTEXT.ptr,               :PCERT_CONTEXT
+        end
+    end
+end

data/lib/win_common/errors/hresult.rb

@@ -2,9 +2,6 @@ module WinCommon
     module Errors
         module HRESULT
             # Defined in winerror.h
-            SEVERITY_SUCCESS = 0
-            SEVERITY_ERROR   = 1
-            NOERROR                              = 0x00000000
             S_OK                                 = 0x00000000
             S_FALSE                              = 0x00000001
             E_PENDING                            = 0x8000000A
@@ -41,11 +38,29 @@ module WinCommon
             E_INVALID_DATA                       = 0x8007000D
             E_OUTOFMEMORY                        = 0x8007000E
             E_INVALIDARG                         = 0x80070057
+            module SEVERITY
+                SUCCESS = 0
+                ERROR   = 1
+            end
+
             def self.toUnsigned(hresult)
                 hresult += 0x1_0000_0000 if (hresult < 0)
                 hresult
             end
 
+            def self.Compare(error, code)
+                error = toUnsigned(error)
+                error <=> code
+            end
+
+            def self.Equal?(error, codes)
+                [*codes].include?(toUnsigned(error))
+            end
+
+            def self.ErrorIfEqual(error, code)
+                raise HRESULTError.new(error) if Equal?(error, code)
+            end
+
             def self.GetSeverity(hresult)
                 (toUnsigned(hresult) >> 31) & 0x01
             end
@@ -59,11 +74,11 @@ module WinCommon
             end
 
             def self.IsSuccess?(hresult)
-                GetSeverity(hresult) == SEVERITY_SUCCESS
+                GetSeverity(hresult) == SEVERITY::SUCCESS
             end
 
             def self.IsError?(hresult)
-                GetSeverity(hresult) == SEVERITY_ERROR
+                GetSeverity(hresult) == SEVERITY::ERROR
             end
 
             def self.GetName(hresult)
@@ -79,13 +94,18 @@ module WinCommon
                     'UKNOWN_ERROR'
                 end
             end
+
+            def self.GetNameCode(hresult)
+                code = HRESULT.toUnsigned(hresult)
+                HRESULT.GetName(code) + " [0x%08X]" % code
+            end
         end
 
         class HRESULTError < WinCommonError
             attr_reader :code
             def initialize(hr)
                 @code = HRESULT.toUnsigned(hr)
-                super(HRESULT.GetName(@code) + " [0x%08X]" % @code)
+                super(HRESULT.GetNameCode(@code))
             end
         end
     end

data/lib/win_common/structs.rb

@@ -1,5 +1,26 @@
 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,
@@ -31,14 +52,9 @@ module WinCommon
             end
         end
 
-        class IID < GUID
-        end
-
-        class CLSID < GUID
-        end
-
-        class FMTID < GUID
-        end
+        IID = GUID
+        CLSID = GUID
+        FMTID = GUID
 
         class WideString
             extend FFI::DataConverter
@@ -60,13 +76,16 @@ module WinCommon
     end
 
     module Typedefs
-        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
+        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/typedefs.rb

@@ -45,6 +45,7 @@ module WinCommon
         FFI.typedef :WORD,       :FSHORT
         FFI.typedef :DWORD,      :FLONG
         FFI.typedef :LONG,       :HRESULT
+        FFI.typedef :pointer,    :PHRESULT
         FFI.typedef :char,       :CCHAR
         FFI.typedef :DWORD,      :LCID
         FFI.typedef :PDWORD,     :PLCID
@@ -116,6 +117,7 @@ module WinCommon
         FFI.typedef :HANDLE,     :HICON
         FFI.typedef :HANDLE,     :HMENU
         FFI.typedef :HICON,      :HCURSOR
+        FFI.typedef :HANDLE,     :HCERTSTORE
         FFI.typedef :short,      :WCHAR
         FFI.typedef :pointer,    :PWCHAR
         FFI.typedef :pointer,    :LPWCH

data/lib/win_common/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: WinCommon
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dāvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,6 +55,7 @@ files:
 - UNLICENSE
 - lib/win_common.rb
 - lib/win_common/constants.rb
+- lib/win_common/crypt/structs.rb
 - lib/win_common/enums.rb
 - lib/win_common/errors.rb
 - lib/win_common/errors/hresult.rb