winevt_c 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4231aa8b328c8b400c7a1948fa6a05798cc404146e744b93654321e6c8df2ced
-  data.tar.gz: ebccd019f7c62066840faf7df5b11b27ee8d249816f7a13a3e449f3ff852ccd4
+  metadata.gz: 6f7ef84281eaba15c88529977e4d2d84bca0c66069f89f9c66dd46b992a65cff
+  data.tar.gz: a1cbda6208cecadcd57d130151c15161985f2dbd57ea83599cd546910f23af47
 SHA512:
-  metadata.gz: b6189e52e89878adcfeb09a1e100b50d5da9a053b16626582665d474c407dce402b05beea0dcc7671d27f2396dd993eec7ccce3ffe4a565f27de726fefee623f
-  data.tar.gz: a37df6779a02e6ae99bfd5557b3cef79429c908f3201c8f47794ceb479933f2dbf0c4745ab4cc005abedf9ae27eb4081234ec3a4ccedd6438be618c9f57426fc
+  metadata.gz: 89e04099f849f47445c61005218e080fc21d6fb6a18cb59b51b1e17d8f28e3de85289aae4494793bacc14f08a6545a2b5775bd529dffc5710aa74dbf71b0d2e6
+  data.tar.gz: ade1be36ac7253dae7d72be6bd65a25424d21625da3efb1fff5a619d4e04f015ac3f6da6c6f18cc6252482361ea594cd1aabb6bf41f36894aa510023dfa70c6a

data/.github/workflows/test.yml

@@ -11,17 +11,22 @@ jobs:
     uses: ruby/actions/.github/workflows/ruby_versions.yml@master
     with:
       engine: cruby
-      min_version: 3.1
+      min_version: 3.2
   build:
     needs: ruby-versions
-    runs-on: 'windows-latest'
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
+        os: ['windows-latest', 'windows-11-arm']
         ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         exclude:
           - ruby: head
-    name: Ruby ${{ matrix.ruby }}
+          - os: 'windows-11-arm'
+            ruby: '3.3'
+          - os: 'windows-11-arm'
+            ruby: '3.2'
+    name: Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
     steps:
     - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
     - uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0

data/ext/winevt/winevt_query.c

@@ -143,8 +143,8 @@ rb_winevt_query_initialize(VALUE argc, VALUE *argv, VALUE self)
 
   winevtQuery->query = EvtQuery(
     hRemoteHandle, evtChannel, evtXPath, flags);
-  err = GetLastError();
-  if (err != ERROR_SUCCESS) {
+  if (winevtQuery->query == NULL) {
+    err = GetLastError();
     if (hRemoteHandle != NULL) {
       EvtClose(hRemoteHandle);
     }

data/ext/winevt/winevt_subscribe.c

@@ -175,8 +175,6 @@ rb_winevt_subscribe_subscribe(int argc, VALUE* argv, VALUE self)
   struct WinevtSession* winevtSession;
   struct WinevtSubscribe* winevtSubscribe;
 
-  hSignalEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
-
   TypedData_Get_Struct(
     self, struct WinevtSubscribe, &rb_winevt_subscribe_type, winevtSubscribe);
 
@@ -239,6 +237,7 @@ rb_winevt_subscribe_subscribe(int argc, VALUE* argv, VALUE self)
     flags |= EvtSubscribeToFutureEvents;
   }
 
+  hSignalEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
   hSubscription =
     EvtSubscribe(hRemoteHandle, hSignalEvent, path, query, hBookmark, NULL, NULL, flags);
   if (!hSubscription) {
@@ -263,22 +262,13 @@ rb_winevt_subscribe_subscribe(int argc, VALUE* argv, VALUE self)
     }
   }
 
-  if (winevtSubscribe->subscription != NULL) {
-    // should be disgarded the old event subscription handle.
-    EvtClose(winevtSubscribe->subscription);
-  }
 
   ALLOCV_END(wpathBuf);
   ALLOCV_END(wqueryBuf);
 
-  winevtSubscribe->signalEvent = hSignalEvent;
-  winevtSubscribe->subscription = hSubscription;
-  winevtSubscribe->remoteHandle = hRemoteHandle;
-  if (hBookmark) {
-    winevtSubscribe->bookmark = hBookmark;
-  } else {
-    winevtSubscribe->bookmark = EvtCreateBookmark(NULL);
-    if (winevtSubscribe->bookmark == NULL) {
+  if (!hBookmark) {
+    hBookmark = EvtCreateBookmark(NULL);
+    if (hBookmark == NULL) {
       status = GetLastError();
       if (hSubscription != NULL) {
         EvtClose(hSubscription);
@@ -290,6 +280,20 @@ rb_winevt_subscribe_subscribe(int argc, VALUE* argv, VALUE self)
     }
   }
 
+  if (winevtSubscribe->subscription) {
+      EvtClose(winevtSubscribe->subscription);
+  }
+  if (winevtSubscribe->signalEvent) {
+      CloseHandle(winevtSubscribe->signalEvent);
+  }
+  if (winevtSubscribe->bookmark) {
+      EvtClose(winevtSubscribe->bookmark);
+  }
+  winevtSubscribe->signalEvent = hSignalEvent;
+  winevtSubscribe->subscription = hSubscription;
+  winevtSubscribe->remoteHandle = hRemoteHandle;
+  winevtSubscribe->bookmark = hBookmark;
+
   return Qtrue;
 }
 

data/ext/winevt/winevt_utils.cpp

@@ -132,7 +132,7 @@ guid_to_wstr(const GUID& guid)
 {
   LPOLESTR p = nullptr;
   if (FAILED(StringFromCLSID(guid, &p))) {
-    return nullptr;
+    return std::wstring();
   }
   std::wstring s(p);
   CoTaskMemFree(p);
@@ -252,7 +252,11 @@ extract_user_evt_variants(PEVT_VARIANT pRenderedValues, DWORD propCount)
         if (pRenderedValues[i].GuidVal != nullptr) {
           const GUID guid = *pRenderedValues[i].GuidVal;
           std::wstring wstr = guid_to_wstr(guid);
-          rbObj = wstr_to_rb_str(CP_UTF8, wstr.c_str(), -1);
+          if (!wstr.empty()) {
+              rbObj = wstr_to_rb_str(CP_UTF8, wstr.c_str(), -1);
+          } else {
+              rbObj = rb_utf8_str_new_cstr("?");
+          }
           rb_ary_push(userValues, rbObj);
         } else {
           rb_ary_push(userValues, rb_utf8_str_new_cstr("?"));
@@ -455,6 +459,7 @@ get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
 
           std::wstring ret(reinterpret_cast<WCHAR*>(lpMsgBuf));
           std::copy(ret.begin(), ret.end(), std::back_inserter(result));
+          result.push_back(L'\0');
           LocalFree(lpMsgBuf);
 
           goto cleanup;
@@ -512,6 +517,7 @@ get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
 
               std::wstring ret(reinterpret_cast<WCHAR*>(lpMsgBuf));
               std::copy(ret.begin(), ret.end(), std::back_inserter(result));
+              result.push_back(L'\0');
               LocalFree(lpMsgBuf);
 
               goto cleanup;
@@ -594,6 +600,10 @@ cleanup:
   if (hMetadata)
     EvtClose(hMetadata);
 
+  if (result.empty()) {
+    return _wcsdup(L"");
+  }
+
   return _wcsdup(result.data());
 }
 

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.11.4"
+  VERSION = "0.11.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winevt_c
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Hiroshi Hatake