winevt_c 0.11.1 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 236cd5f44b0a13dd198baa83329a340742ae4e9ff618d01671cb48326e4da0c9
-  data.tar.gz: 26cfad4e5eede9d60710672dabe47a61db41cc2d21861704fb94f00ea2c6c51f
+  metadata.gz: bc1b47b4841d2235e4c5629465b47b3eb7c088a6af6c74dfc95dc3962b5dc723
+  data.tar.gz: ab99b355b4f111cdfb048106b89f0d9faa649334a816a6b9d850d47c53bf33a5
 SHA512:
-  metadata.gz: '081e7c41f48447bbb401c5a8483094b3258a521a97a7b301b44ac89d216d888cece8ab1f89406b8fafc694436574c2660f600cec9c053f098cb81e3d05d311d4'
-  data.tar.gz: 4e5eb1006bd0e05d59bdfb361edf02025b1ab86a6f7fc66d9489b27b29cdf530f47a404ae8b8c17f32d167b44cddaa28d5bd89e58cef4a93cec65dfe486c6eb1
+  metadata.gz: 462bd61a7303bd104bb21162ed074aad9ecce63b7bbfca37d8d5ec66c9f05ed85a326a3408df3b38255782fea782d86590de660b61ca542bed27982d0a5c5bb3
+  data.tar.gz: 6091742c0526d238a1e79c35672b3c52775927224bb318c2b9dea13546e5a5e25b1637e2c97dcb09831ea8284ffc026e9c5d88846190194b5048aab37767a16a

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'monthly'

data/.github/workflows/test.yml

@@ -0,0 +1,33 @@
+name: Test
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+  schedule:
+    - cron: '0 0 1 * *'
+jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby
+      min_version: 3.1
+  build:
+    needs: ruby-versions
+    runs-on: 'windows-latest'
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
+        exclude:
+          - ruby: head
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+    - uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 # v1.299.0
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Run tests
+      run: |
+        bundle install --jobs 4 --retry 3
+        bundle exec rake

data/README.md

@@ -1,6 +1,6 @@
 # winevt_c
 
-[![Build status](https://ci.appveyor.com/api/projects/status/o5771b3cb6x3acq0/branch/master?svg=true)](https://ci.appveyor.com/project/cosmo0920/winevt-c-6145k/branch/master)
+[![Test](https://github.com/fluent-plugins-nursery/winevt_c/actions/workflows/test.yml/badge.svg)](https://github.com/fluent-plugins-nursery/winevt_c/actions/workflows/test.yml)
 
 ## Prerequisites
 

data/Rakefile

@@ -1,8 +1,5 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
+require "bundler/gem_tasks"
 require "rake/testtask"
-require 'rake_compiler_dock'
 require 'rake/clean'
 
 Rake::TestTask.new(:test) do |t|
@@ -13,23 +10,9 @@ end
 
 require "rake/extensiontask"
 
-spec = eval File.read("winevt_c.gemspec")
-
-Rake::ExtensionTask.new("winevt", spec) do |ext|
+Rake::ExtensionTask.new("winevt") do |ext|
   ext.ext_dir = 'ext/winevt'
-  ext.cross_compile = true
-  ext.lib_dir = File.join(*['lib', 'winevt', ENV['FAT_DIR']].compact)
-  # cross_platform names are of MRI's platform name
-  ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
-end
-
-desc 'Build gems for Windows per rake-compiler-dock'
-task 'gem:native' do
-  sh "bundle package"
-  # See RUBY_CC_VERSION in https://github.com/rake-compiler/rake-compiler-dock/blob/master/Dockerfile.mri
-  %w[ x86-mingw32 x64-mingw32 ].each do |plat|
-    RakeCompilerDock.sh "bundle --local && bundle exec rake native:#{plat} gem RUBY_CC_VERSION=2.4.0:2.5.0:2.6.0:2.7.0:3.0.0", platform: plat
-  end
+  ext.lib_dir = 'lib/winevt'
 end
 
 CLEAN.include('lib/winevt/winevt.*')

data/ext/winevt/winevt_channel.c

@@ -132,8 +132,6 @@ DWORD is_subscribable_channel_p(EVT_HANDLE hChannel, BOOL force_enumerate)
           EvtGetChannelConfigProperty(hChannel, (EVT_CHANNEL_CONFIG_PROPERTY_ID)Id, 0, dwBufferSize, pProperty, &dwBufferUsed);
           status = GetLastError();
         } else {
-          free(pProperty);
-
           status = ERROR_OUTOFMEMORY;
 
           goto cleanup;
@@ -141,8 +139,6 @@ DWORD is_subscribable_channel_p(EVT_HANDLE hChannel, BOOL force_enumerate)
       }
 
       if (ERROR_SUCCESS != status) {
-        free(pProperty);
-
         goto cleanup;
       }
     }

data/ext/winevt/winevt_query.c

@@ -119,6 +119,9 @@ rb_winevt_query_initialize(VALUE argc, VALUE *argv, VALUE self)
     flags = EvtQueryChannelPath | EvtQueryTolerateQueryErrors;
     break;
   default:
+    if (hRemoteHandle != NULL) {
+      EvtClose(hRemoteHandle);
+    }
     rb_raise(rb_eArgError, "Expected a String, a Symbol, a Fixnum, or a NilClass instance");
   }
 
@@ -142,6 +145,9 @@ rb_winevt_query_initialize(VALUE argc, VALUE *argv, VALUE self)
     hRemoteHandle, evtChannel, evtXPath, flags);
   err = GetLastError();
   if (err != ERROR_SUCCESS) {
+    if (hRemoteHandle != NULL) {
+      EvtClose(hRemoteHandle);
+    }
     if (err == ERROR_EVT_CHANNEL_NOT_FOUND) {
       raise_channel_not_found_error(channel);
     }

data/ext/winevt/winevt_utils.cpp

@@ -562,6 +562,7 @@ get_description(EVT_HANDLE handle, LANGID langID, EVT_HANDLE hRemote)
   }
 
   if (status != ERROR_SUCCESS) {
+    EvtClose(renderContext);
     raise_system_error(rb_eWinevtQueryError, status);
   }
 
@@ -602,6 +603,7 @@ static char* convert_wstr(wchar_t *wstr)
   int len = 0;
   CHAR *ptr = NULL;
   DWORD err = ERROR_SUCCESS;
+  char *dup_str = NULL;
 
   len = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, NULL, 0, NULL, NULL);
   if (len == 0) {
@@ -621,7 +623,10 @@ static char* convert_wstr(wchar_t *wstr)
     raise_system_error(rb_eRuntimeError, err);
   }
 
-  return strdup(ptr);
+  dup_str = strdup(ptr);
+  RB_ALLOCV_END(vstr);
+
+  return dup_str;
 }
 
 static int ExpandSIDWString(PSID sid, CHAR **out_expanded)

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.11.1"
+  VERSION = "0.11.3"
 end

data/winevt_c.gemspec

@@ -25,10 +25,9 @@ Gem::Specification.new do |spec|
   spec.license = "Apache-2.0"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4".freeze)
 
-  spec.add_development_dependency "bundler", [">= 1.16", "< 3"]
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rake-compiler", "~> 1.0"
-  spec.add_development_dependency "rake-compiler-dock", "~> 1.1.0"
   spec.add_development_dependency "test-unit", "~> 3.2"
   spec.add_development_dependency "yard", "~> 0.9"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: winevt_c
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.3
 platform: ruby
 authors:
 - Hiroshi Hatake
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,20 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +51,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -109,13 +88,13 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".clang-format"
-- ".github/workflows/linux.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- appveyor.yml
 - bin/console
 - bin/setup
 - example/bookmark.rb
@@ -141,13 +120,11 @@ files:
 - lib/winevt/session.rb
 - lib/winevt/subscribe.rb
 - lib/winevt/version.rb
-- ruby_install.ps1
 - winevt_c.gemspec
 homepage: https://github.com/fluent-plugins-nursery/winevt_c
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -162,8 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Windows Event Log API bindings from winevt.h.
 test_files: []

data/.github/workflows/linux.yml

@@ -1,26 +0,0 @@
-name: Building fat gem
-on:
-  - push
-  - pull_request
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '3.1', '3.2' ]
-        os:
-          - ubuntu-latest
-    name: Ruby ${{ matrix.ruby }} building fat gem testing on ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: building fat gem
-      env:
-        CI: true
-      run: |
-        gem install bundler rake
-        bundle install --jobs 4 --retry 3
-        bundle exec rake gem:native

data/appveyor.yml

@@ -1,53 +0,0 @@
-version: '{build}'
-
-image: Visual Studio 2019
-
-# init:
-#   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-
-install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - ruby --version
-  - gem --version
-  - bundle --version
-  - bundle install
-  - ridk.cmd exec bundle exec rake compile
-build: off
-test_script:
-  # - bundle exec rake test
-  - bundle exec rake test TESTOPTS=-v
-
-# https://www.appveyor.com/docs/installed-software/#ruby
-environment:
-  matrix:
-    - ruby_version: "31-x64"
-    - ruby_version: "31"
-    - ruby_version: "30-x64"
-    - ruby_version: "30"
-    - ruby_version: "27-x64"
-    - ruby_version: "27"
-    - ruby_version: "26-x64"
-    - ruby_version: "26"
-    - ruby_version: "25-x64"
-    - ruby_version: "25"
-    - ruby_version: "24-x64"
-    - ruby_version: "24"
-
-for:
--
-  matrix:
-    only:
-      - ruby_version: "31-x64"
-      - ruby_version: "27-x64"
-      - ruby_version: "27"
-      - ruby_version: "26-x64"
-      - ruby_version: "26"
-  install:
-    - ps: if ($ENV:ruby_version -ne "31-x64") { .\ruby_install.ps1 }
-    - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-    - ruby --version
-    - gem --version
-    - bundle --version
-    - ps: if ($ENV:ruby_version -eq "31-x64") { ridk.ps1 install 1 3 }
-    - ridk.cmd exec bundle install
-    - ridk.cmd exec bundle exec rake compile

data/ruby_install.ps1

@@ -1,92 +0,0 @@
-$rubies = @(
-    @{
-        "version"      = "Ruby 2.6.9-1"
-        "install_path" = "C:\Ruby26"
-        "download_url" = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.9-1/rubyinstaller-2.6.9-1-x86.exe"
-        "devkit_url"   = ""
-        "devkit_paths" = @()
-        "bundlerV2"    = $true
-    }
-    @{
-        "version"      = "Ruby 2.6.9-1 (x64)"
-        "install_path" = "C:\Ruby26-x64"
-        "download_url" = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.9-1/rubyinstaller-2.6.9-1-x64.exe"
-        "devkit_url"   = ""
-        "devkit_paths" = @()
-        "bundlerV2"    = $true
-    }
-    @{
-        "version"      = "Ruby 2.7.8-1"
-        "install_path" = "C:\Ruby27"
-        "download_url" = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.8-1/rubyinstaller-2.7.8-1-x86.exe"
-        "devkit_url"   = ""
-        "devkit_paths" = @()
-        "bundlerV2"    = $true
-    }
-    @{
-        "version"      = "Ruby 2.7.8-1 (x64)"
-        "install_path" = "C:\Ruby27-x64"
-        "download_url" = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.8-1/rubyinstaller-2.7.8-1-x64.exe"
-        "devkit_url"   = ""
-        "devkit_paths" = @()
-        "bundlerV2"    = $true
-    }
-)
-
-function UpdateRubyPath($rubyPath) {
-    $env:path = ($env:path -split ';' | Where-Object { -not $_.contains('\Ruby') }) -join ';'
-    $env:path = "$rubyPath;$env:path"
-}
-
-function Install-Ruby($ruby) {
-    Write-Host "Installing $($ruby.version)" -ForegroundColor Cyan
-
-    # uninstall existing
-    $rubyUninstallPath = "$ruby.install_path\unins000.exe"
-    if ([IO.File]::Exists($rubyUninstallPath)) {
-        Write-Host "  Uninstalling previous Ruby 2.4..." -ForegroundColor Gray
-        "`"$rubyUninstallPath`" /silent" | out-file "$env:temp\uninstall-ruby.cmd" -Encoding ASCII
-        & "$env:temp\uninstall-ruby.cmd"
-        del "$env:temp\uninstall-ruby.cmd"
-        Start-Sleep -s 5
-    }
-
-    if (Test-Path $ruby.install_path) {
-        Write-Host "  Deleting $($ruby.install_path)" -ForegroundColor Gray
-        Remove-Item $ruby.install_path -Force -Recurse
-    }
-
-    $exePath = "$($env:TEMP)\rubyinstaller.exe"
-
-    Write-Host "  Downloading $($ruby.version) from $($ruby.download_url)" -ForegroundColor Gray
-    (New-Object Net.WebClient).DownloadFile($ruby.download_url, $exePath)
-
-    Write-Host "Installing..." -ForegroundColor Gray
-    cmd /c start /wait $exePath /verysilent /allusers /dir="$($ruby.install_path.replace('\', '/'))" /tasks="noassocfiles,nomodpath,noridkinstall"
-    del $exePath
-    Write-Host "Installed" -ForegroundColor Green
-
-    # setup Ruby
-    UpdateRubyPath "$($ruby.install_path)\bin"
-    Write-Host "ruby --version" -ForegroundColor Gray
-    cmd /c ruby --version
-
-    Write-Host "gem --version" -ForegroundColor Gray
-    cmd /c gem --version
-
-    # list installed gems
-    Write-Host "gem list --local" -ForegroundColor Gray
-    cmd /c gem list --local
-
-    # delete temp path
-    if ($tempPath) {
-        Write-Host "  Cleaning up..." -ForegroundColor Gray
-        Remove-Item $tempPath -Force -Recurse
-    }
-
-    Write-Host "  Done!" -ForegroundColor Green
-}
-
-for ($i = 0; $i -lt $rubies.Count; $i++) {
-  Install-Ruby $rubies[$i]
-}