winevt_c 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62ac52ac62484de45eb4e077cafbff85c39a60ac5124c2aac2b1fee9773c776a
-  data.tar.gz: 4ff194f6a8d885a66180ca1253a12018581dad3013f63ea12639df70f6c991c3
+  metadata.gz: f8e0f057816ea6023a893cda0b9af765f4f0b47bab15491fb71862114be55e61
+  data.tar.gz: 2dee722cd48e235222fb891106ba4c8fbe80f5141db4fad0237784acd8804704
 SHA512:
-  metadata.gz: 1c3159de91ae1ed7d587d9af614c60ede745a12a7afbe6e77539475c77260cbd716fcfabcc958bc63e5c28dbc67d30668718c628f75642636249fb042c79c512
-  data.tar.gz: 5c2617fd7b079656c511fa26f306665527cf83f9395eaacf1541462f42a5fb7c0860e404f230c21da09ea37ba802f5e0eacad3bebbd21d9a6bbe85772d7a6c80
+  metadata.gz: 442e12311a0ad1f3d26255a4d841174072e4fd1f50ab9b113654231a95f3d779c1b91e04449e1126cd16432f11de9427b4436e9954ac0ae1fa78cfcc45b378a2
+  data.tar.gz: 9f8d8c1d10a1c589514039de18acb0a0c2910f99928d44d90c1a21b523e145e1946f585438f52f1a5a4ddde5c9a4b54503ce1f96aa9d30e9b4d20a5169fc135f

data/ext/winevt/winevt_c.h

@@ -41,7 +41,8 @@ void  raise_system_error(VALUE error, DWORD errorCode);
 VALUE render_to_rb_str(EVT_HANDLE handle, DWORD flags);
 EVT_HANDLE connect_to_remote(LPWSTR computerName, LPWSTR domain,
                              LPWSTR username, LPWSTR password,
-                             EVT_RPC_LOGIN_FLAGS flags);
+                             EVT_RPC_LOGIN_FLAGS flags,
+                             DWORD *error_code);
 WCHAR* get_description(EVT_HANDLE handle, LANGID langID, EVT_HANDLE hRemote);
 VALUE get_values(EVT_HANDLE handle);
 VALUE render_system_event(EVT_HANDLE handle, BOOL preserve_qualifiers);

data/ext/winevt/winevt_query.c

@@ -91,7 +91,7 @@ rb_winevt_query_initialize(VALUE argc, VALUE *argv, VALUE self)
   EVT_HANDLE hRemoteHandle = NULL;
   DWORD len;
   VALUE wchannelBuf, wpathBuf;
-  DWORD err;
+  DWORD err = ERROR_SUCCESS;
 
   rb_scan_args(argc, argv, "21", &channel, &xpath, &session);
   Check_Type(channel, T_STRING);
@@ -104,9 +104,8 @@ rb_winevt_query_initialize(VALUE argc, VALUE *argv, VALUE self)
                                       winevtSession->domain,
                                       winevtSession->username,
                                       winevtSession->password,
-                                      winevtSession->flags);
-
-    err = GetLastError();
+                                      winevtSession->flags,
+                                      &err);
     if (err != ERROR_SUCCESS) {
       raise_system_error(rb_eRuntimeError, err);
     }

data/ext/winevt/winevt_subscribe.c

@@ -208,9 +208,8 @@ rb_winevt_subscribe_subscribe(int argc, VALUE* argv, VALUE self)
                                       winevtSession->domain,
                                       winevtSession->username,
                                       winevtSession->password,
-                                      winevtSession->flags);
-
-    err = GetLastError();
+                                      winevtSession->flags,
+                                      &err);
     if (err != ERROR_SUCCESS) {
       raise_system_error(rb_eRuntimeError, err);
     }
@@ -242,13 +241,13 @@ rb_winevt_subscribe_subscribe(int argc, VALUE* argv, VALUE self)
   hSubscription =
     EvtSubscribe(hRemoteHandle, hSignalEvent, path, query, hBookmark, NULL, NULL, flags);
   if (!hSubscription) {
+    status = GetLastError();
     if (hBookmark != NULL) {
       EvtClose(hBookmark);
     }
     if (hSignalEvent != NULL) {
       CloseHandle(hSignalEvent);
     }
-    status = GetLastError();
     if (rb_obj_is_kind_of(rb_session, rb_cSession)) {
       rb_raise(rb_eRemoteHandlerError, "Remoting subscription is not working. errCode: %ld\n", status);
     } else {
@@ -272,13 +271,13 @@ rb_winevt_subscribe_subscribe(int argc, VALUE* argv, VALUE self)
   } else {
     winevtSubscribe->bookmark = EvtCreateBookmark(NULL);
     if (winevtSubscribe->bookmark == NULL) {
+      status = GetLastError();
       if (hSubscription != NULL) {
         EvtClose(hSubscription);
       }
       if (hSignalEvent != NULL) {
         CloseHandle(hSignalEvent);
       }
-      status = GetLastError();
       raise_system_error(rb_eWinevtQueryError, status);
     }
   }

data/ext/winevt/winevt_utils.cpp

@@ -78,7 +78,7 @@ render_to_rb_str(EVT_HANDLE handle, DWORD flags)
 
 EVT_HANDLE
 connect_to_remote(LPWSTR computerName, LPWSTR domain, LPWSTR username, LPWSTR password,
-                  EVT_RPC_LOGIN_FLAGS flags)
+                  EVT_RPC_LOGIN_FLAGS flags, DWORD *error_code)
 {
   EVT_HANDLE hRemote = NULL;
   EVT_RPC_LOGIN Credentials;
@@ -92,6 +92,10 @@ connect_to_remote(LPWSTR computerName, LPWSTR domain, LPWSTR username, LPWSTR pa
   Credentials.Flags = flags;
 
   hRemote = EvtOpenSession(EvtRpcLogin, &Credentials, 0, 0);
+  if (!hRemote) {
+    *error_code = GetLastError();
+    return hRemote;
+  }
 
   SecureZeroMemory(&Credentials, sizeof(EVT_RPC_LOGIN));
 
@@ -569,13 +573,13 @@ render_system_event(EVT_HANDLE hEvent, BOOL preserve_qualifiers)
                   pRenderedValues,
                   &dwBufferUsed,
                   &dwPropertyCount);
+        status = GetLastError();
       } else {
         EvtClose(hContext);
         rb_raise(rb_eRuntimeError, "Failed to malloc memory with %lu\n", status);
       }
     }
 
-    status = GetLastError();
     if (ERROR_SUCCESS != status) {
       EvtClose(hContext);
       ALLOCV_END(vRenderedValues);

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winevt_c
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Windows Event Log API bindings from winevt.h.