winevt_c 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e72ff331d8ba4dc17ec931ae052992a175e109c80b9354e824dea45cf0d9f62
-  data.tar.gz: dbe0186774a155a29b0437f172c0f5479204d26c6174a6b9240e1eba28a23bd9
+  metadata.gz: 1971f2d9fdcbd76e480acada73e61689c28eda9499c3c4e19170a8465d62cfe4
+  data.tar.gz: a54692008698865f129c84ac206cd5bffc08daa49fee5012d34679d99fdc6080
 SHA512:
-  metadata.gz: 5cc4229d2df4c1f6c66400914844b6b87a375ff6b841ca312351517ca1dd9c4bb30679d0ee1ea21f2b9593121ae3acdc4d4b23e79cf996c50bc5eed20be062cc
-  data.tar.gz: cb59a8e132a07d5628f9c0a1a4b7ffc615b432fc67ec3679a36b82cc94e705f6075b86b1037437a95f277cb4f97163db4fcf1cad30d26e05ed26d2d3c79d296b
+  metadata.gz: a0091ec0d64ba252b39dc927504049c88b648f5c4bec0ce43dd4d00967bf8c0475e872da2286f7e757a9f16889209373c5e30998c534704105a2d973671a49d7
+  data.tar.gz: 65480a5c5d43e484d5755ed1f1935f41bc26c507769563f6c5a181eabf986cf7d7bad376da798150f1215063cc226477efac6f6e3d4007a96e213bbeba1ae874

data/ext/winevt/winevt_c.h

@@ -22,6 +22,11 @@
 #define EventBookMark(object) ((struct WinevtBookmark*)DATA_PTR(object))
 #define EventChannel(object) ((struct WinevtChannel*)DATA_PTR(object))
 
+typedef struct {
+    LANGID langID;
+    CHAR* langCode;
+} LocaleInfo;
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -32,9 +37,10 @@ VALUE wstr_to_rb_str(UINT cp, const WCHAR* wstr, int clen);
 #endif /* __cplusplus */
 void  raise_system_error(VALUE error, DWORD errorCode);
 VALUE render_to_rb_str(EVT_HANDLE handle, DWORD flags);
-WCHAR* get_description(EVT_HANDLE handle);
+WCHAR* get_description(EVT_HANDLE handle, LANGID langID);
 VALUE get_values(EVT_HANDLE handle);
 VALUE render_system_event(EVT_HANDLE handle, BOOL preserve_qualifiers);
+LocaleInfo* get_locale_from_rb_str(VALUE rb_locale_str);
 
 #ifdef __cplusplus
 }
@@ -47,6 +53,8 @@ extern VALUE rb_cBookmark;
 extern VALUE rb_cSubscribe;
 extern VALUE rb_eWinevtQueryError;
 
+extern LocaleInfo default_locale;
+
 struct WinevtChannel
 {
   EVT_HANDLE channels;
@@ -70,6 +78,7 @@ struct WinevtQuery
   LONG timeout;
   BOOL renderAsXML;
   BOOL preserveQualifiers;
+  LocaleInfo *localeInfo;
 };
 
 #define SUBSCRIBE_ARRAY_SIZE 10
@@ -89,6 +98,7 @@ struct WinevtSubscribe
   DWORD currentRate;
   BOOL renderAsXML;
   BOOL preserveQualifiers;
+  LocaleInfo* localeInfo;
 };
 
 void Init_winevt_query(VALUE rb_cEventLog);

data/ext/winevt/winevt_locale.c

@@ -0,0 +1,68 @@
+#include <winevt_c.h>
+
+static LocaleInfo localeInfoTable [] = {
+    { MAKELANGID(LANG_BULGARIAN,  SUBLANG_DEFAULT),              "bg_BG"},
+    { MAKELANGID(LANG_CHINESE,    SUBLANG_CHINESE_SIMPLIFIED),   "zh_CN"},
+    { MAKELANGID(LANG_CHINESE,    SUBLANG_CHINESE_TRADITIONAL),  "zh_TW"},
+    { MAKELANGID(LANG_CHINESE,    SUBLANG_CHINESE_HONGKONG),     "zh_HK"},
+    { MAKELANGID(LANG_CHINESE,    SUBLANG_CHINESE_SINGAPORE),    "zh_SG"},
+    { MAKELANGID(LANG_CROATIAN,   SUBLANG_DEFAULT),              "hr_HR"},
+    { MAKELANGID(LANG_CZECH,      SUBLANG_DEFAULT),              "cs_CZ"},
+    { MAKELANGID(LANG_DANISH,     SUBLANG_DEFAULT),              "da_DK"},
+    { MAKELANGID(LANG_DUTCH,      SUBLANG_DUTCH),                "nl_NL"},
+    { MAKELANGID(LANG_DUTCH,      SUBLANG_DUTCH_BELGIAN),        "nl_BE"},
+    { MAKELANGID(LANG_ENGLISH,    SUBLANG_DEFAULT),              "en_US"},
+    { MAKELANGID(LANG_ENGLISH,    SUBLANG_ENGLISH_UK),           "en_GB"},
+    { MAKELANGID(LANG_ENGLISH,    SUBLANG_ENGLISH_AUS),          "en_AU"},
+    { MAKELANGID(LANG_ENGLISH,    SUBLANG_ENGLISH_CAN),          "en_CA"},
+    { MAKELANGID(LANG_ENGLISH,    SUBLANG_ENGLISH_NZ),           "en_NZ"},
+    { MAKELANGID(LANG_ENGLISH,    SUBLANG_ENGLISH_EIRE),         "en_IE"},
+    { MAKELANGID(LANG_FINNISH,    SUBLANG_DEFAULT),              "fi_FI"},
+    { MAKELANGID(LANG_FRENCH,     SUBLANG_FRENCH),               "fr_FR"},
+    { MAKELANGID(LANG_FRENCH,     SUBLANG_FRENCH_BELGIAN),       "fr_BE"},
+    { MAKELANGID(LANG_FRENCH,     SUBLANG_FRENCH_CANADIAN),      "fr_CA"},
+    { MAKELANGID(LANG_FRENCH,     SUBLANG_FRENCH_SWISS),         "fr_CH"},
+    { MAKELANGID(LANG_GERMAN,     SUBLANG_GERMAN),               "de_DE"},
+    { MAKELANGID(LANG_GERMAN,     SUBLANG_GERMAN_SWISS),         "de_CH"},
+    { MAKELANGID(LANG_GERMAN,     SUBLANG_GERMAN_AUSTRIAN),      "de_AT"},
+    { MAKELANGID(LANG_GREEK,      SUBLANG_DEFAULT),              "el_GR"},
+    { MAKELANGID(LANG_HUNGARIAN,  SUBLANG_DEFAULT),              "hu_HU"},
+    { MAKELANGID(LANG_ICELANDIC,  SUBLANG_DEFAULT),              "is_IS"},
+    { MAKELANGID(LANG_ITALIAN,    SUBLANG_ITALIAN),              "it_IT"},
+    { MAKELANGID(LANG_ITALIAN,    SUBLANG_ITALIAN_SWISS),        "it_CH"},
+    { MAKELANGID(LANG_JAPANESE,   SUBLANG_DEFAULT),              "ja_JP"},
+    { MAKELANGID(LANG_KOREAN,     SUBLANG_DEFAULT),              "ko_KO"},
+    { MAKELANGID(LANG_NORWEGIAN,  SUBLANG_NORWEGIAN_BOKMAL),     "no_NO"},
+    { MAKELANGID(LANG_NORWEGIAN,  SUBLANG_NORWEGIAN_BOKMAL),     "nb_NO"},
+    { MAKELANGID(LANG_NORWEGIAN,  SUBLANG_NORWEGIAN_NYNORSK),    "nn_NO"},
+    { MAKELANGID(LANG_POLISH,     SUBLANG_DEFAULT),              "pl_PL"},
+    { MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE),           "pt_PT"},
+    { MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN), "pt_BR"},
+    { MAKELANGID(LANG_ROMANIAN,   SUBLANG_DEFAULT),              "ro_RO"},
+    { MAKELANGID(LANG_RUSSIAN,    SUBLANG_DEFAULT),              "ru_RU"},
+    { MAKELANGID(LANG_SLOVAK,     SUBLANG_DEFAULT),              "sk_SK"},
+    { MAKELANGID(LANG_SLOVENIAN,  SUBLANG_DEFAULT),              "sl_SI"},
+    { MAKELANGID(LANG_SPANISH,    SUBLANG_SPANISH),              "es_ES"},
+    { MAKELANGID(LANG_SPANISH,    SUBLANG_SPANISH),              "es_ES_T"},
+    { MAKELANGID(LANG_SPANISH,    SUBLANG_SPANISH_MEXICAN),      "es_MX"},
+    { MAKELANGID(LANG_SPANISH,    SUBLANG_SPANISH_MODERN),       "es_ES_M"},
+    { MAKELANGID(LANG_SWEDISH,    SUBLANG_DEFAULT),              "sv_SE"},
+    { MAKELANGID(LANG_TURKISH,    SUBLANG_DEFAULT),              "tr_TR"},
+    { 0, NULL}
+};
+
+LocaleInfo default_locale = {MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), "neutral"};
+
+LocaleInfo*
+get_locale_from_rb_str(VALUE rb_locale_str)
+{
+  CHAR* locale_str = StringValuePtr(rb_locale_str);
+
+  for (int i = 0; localeInfoTable[i].langCode != NULL; i++) {
+    if (stricmp(localeInfoTable[i].langCode, locale_str) == 0) {
+      return &localeInfoTable[i];
+    }
+  }
+
+  rb_raise(rb_eArgError, "Unknown locale: %s", locale_str);
+}

data/ext/winevt/winevt_query.c

@@ -96,6 +96,7 @@ rb_winevt_query_initialize(VALUE self, VALUE channel, VALUE xpath)
   winevtQuery->timeout = 0L;
   winevtQuery->renderAsXML = TRUE;
   winevtQuery->preserveQualifiers = FALSE;
+  winevtQuery->localeInfo = &default_locale;
 
   ALLOCV_END(wchannelBuf);
   ALLOCV_END(wpathBuf);
@@ -219,12 +220,12 @@ rb_winevt_query_render(VALUE self, EVT_HANDLE event)
 }
 
 static VALUE
-rb_winevt_query_message(EVT_HANDLE event)
+rb_winevt_query_message(EVT_HANDLE event, LocaleInfo* localeInfo)
 {
   WCHAR* wResult;
   VALUE utf8str;
 
-  wResult = get_description(event);
+  wResult = get_description(event, localeInfo->langID);
   utf8str = wstr_to_rb_str(CP_UTF8, wResult, -1);
   free(wResult);
 
@@ -336,7 +337,7 @@ rb_winevt_query_each_yield(VALUE self)
   for (int i = 0; i < winevtQuery->count; i++) {
     rb_yield_values(3,
                     rb_winevt_query_render(self, winevtQuery->hEvents[i]),
-                    rb_winevt_query_message(winevtQuery->hEvents[i]),
+                    rb_winevt_query_message(winevtQuery->hEvents[i], winevtQuery->localeInfo),
                     rb_winevt_query_string_inserts(winevtQuery->hEvents[i]));
   }
   return Qnil;
@@ -432,6 +433,48 @@ rb_winevt_query_get_preserve_qualifiers_p(VALUE self)
   return winevtQuery->preserveQualifiers ? Qtrue : Qfalse;
 }
 
+/*
+ * This method specifies locale with [String].
+ *
+ * @since 0.8.0
+ * @param rb_locale_str [String]
+ */
+static VALUE
+rb_winevt_query_set_locale(VALUE self, VALUE rb_locale_str)
+{
+  struct WinevtQuery* winevtQuery;
+  LocaleInfo* locale_info = &default_locale;
+
+  TypedData_Get_Struct(
+    self, struct WinevtQuery, &rb_winevt_query_type, winevtQuery);
+
+  locale_info = get_locale_from_rb_str(rb_locale_str);
+
+  winevtQuery->localeInfo = locale_info;
+
+  return Qnil;
+}
+
+/*
+ * This method obtains specified locale with [String].
+ *
+ * @since 0.8.0
+ */
+static VALUE
+rb_winevt_query_get_locale(VALUE self)
+{
+  struct WinevtQuery* winevtQuery;
+
+  TypedData_Get_Struct(
+    self, struct WinevtQuery, &rb_winevt_query_type, winevtQuery);
+
+  if (winevtQuery->localeInfo->langCode) {
+    return rb_str_new2(winevtQuery->localeInfo->langCode);
+  } else {
+    return rb_str_new2(default_locale.langCode);
+  }
+}
+
 void
 Init_winevt_query(VALUE rb_cEventLog)
 {
@@ -497,4 +540,12 @@ Init_winevt_query(VALUE rb_cEventLog)
    * @since 0.7.3
    */
   rb_define_method(rb_cQuery, "preserve_qualifiers=", rb_winevt_query_set_preserve_qualifiers, 1);
+  /*
+   * @since 0.8.0
+   */
+  rb_define_method(rb_cQuery, "locale", rb_winevt_query_get_locale, 0);
+  /*
+   * @since 0.8.0
+   */
+  rb_define_method(rb_cQuery, "locale=", rb_winevt_query_set_locale, 1);
 }

data/ext/winevt/winevt_subscribe.c

@@ -90,6 +90,7 @@ rb_winevt_subscribe_initialize(VALUE self)
   winevtSubscribe->renderAsXML = TRUE;
   winevtSubscribe->readExistingEvents = TRUE;
   winevtSubscribe->preserveQualifiers = FALSE;
+  winevtSubscribe->localeInfo = &default_locale;
 
   return Qnil;
 }
@@ -345,12 +346,12 @@ rb_winevt_subscribe_render(VALUE self, EVT_HANDLE event)
 }
 
 static VALUE
-rb_winevt_subscribe_message(EVT_HANDLE event)
+rb_winevt_subscribe_message(EVT_HANDLE event, LocaleInfo* localeInfo)
 {
   WCHAR* wResult;
   VALUE utf8str;
 
-  wResult = get_description(event);
+  wResult = get_description(event, localeInfo->langID);
   utf8str = wstr_to_rb_str(CP_UTF8, wResult, -1);
   free(wResult);
 
@@ -393,7 +394,7 @@ rb_winevt_subscribe_each_yield(VALUE self)
   for (int i = 0; i < winevtSubscribe->count; i++) {
     rb_yield_values(3,
                     rb_winevt_subscribe_render(self, winevtSubscribe->hEvents[i]),
-                    rb_winevt_subscribe_message(winevtSubscribe->hEvents[i]),
+                    rb_winevt_subscribe_message(winevtSubscribe->hEvents[i], winevtSubscribe->localeInfo),
                     rb_winevt_subscribe_string_inserts(winevtSubscribe->hEvents[i]));
   }
 
@@ -554,6 +555,48 @@ rb_winevt_subscribe_get_preserve_qualifiers_p(VALUE self)
   return winevtSubscribe->preserveQualifiers ? Qtrue : Qfalse;
 }
 
+/*
+ * This method specifies locale with [String].
+ *
+ * @since 0.8.0
+ * @param rb_locale_str [String]
+ */
+static VALUE
+rb_winevt_subscribe_set_locale(VALUE self, VALUE rb_locale_str)
+{
+  struct WinevtSubscribe* winevtSubscribe;
+  LocaleInfo* locale_info = &default_locale;
+
+  TypedData_Get_Struct(
+    self, struct WinevtSubscribe, &rb_winevt_subscribe_type, winevtSubscribe);
+
+  locale_info = get_locale_from_rb_str(rb_locale_str);
+
+  winevtSubscribe->localeInfo = locale_info;
+
+  return Qnil;
+}
+
+/*
+ * This method obtains specified locale with [String].
+ *
+ * @since 0.8.0
+ */
+static VALUE
+rb_winevt_subscribe_get_locale(VALUE self)
+{
+  struct WinevtSubscribe* winevtSubscribe;
+
+  TypedData_Get_Struct(
+    self, struct WinevtSubscribe, &rb_winevt_subscribe_type, winevtSubscribe);
+
+  if (winevtSubscribe->localeInfo->langCode) {
+    return rb_str_new2(winevtSubscribe->localeInfo->langCode);
+  } else {
+    return rb_str_new2(default_locale.langCode);
+  }
+}
+
 void
 Init_winevt_subscribe(VALUE rb_cEventLog)
 {
@@ -596,4 +639,14 @@ Init_winevt_subscribe(VALUE rb_cEventLog)
    */
   rb_define_method(
     rb_cSubscribe, "preserve_qualifiers=", rb_winevt_subscribe_set_preserve_qualifiers, 1);
+  /*
+   * @since 0.8.0
+   */
+  rb_define_method(
+    rb_cSubscribe, "locale", rb_winevt_subscribe_get_locale, 0);
+  /*
+   * @since 0.8.0
+   */
+  rb_define_method(
+    rb_cSubscribe, "locale=", rb_winevt_subscribe_set_locale, 1);
 }

data/ext/winevt/winevt_utils.cpp

@@ -433,7 +433,7 @@ cleanup:
 }
 
 WCHAR*
-get_description(EVT_HANDLE handle)
+get_description(EVT_HANDLE handle, LANGID langID)
 {
 #define BUFSIZE 4096
   std::vector<WCHAR> buffer(BUFSIZE);
@@ -473,7 +473,7 @@ get_description(EVT_HANDLE handle)
     nullptr,
     values[0].StringVal,
     nullptr,
-    MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), SORT_DEFAULT),
+    MAKELCID(langID, SORT_DEFAULT),
     0);
   if (hMetadata == nullptr) {
     // When winevt_c cannot open metadata, then give up to obtain

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.7.4"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winevt_c
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,6 +128,7 @@ files:
 - ext/winevt/winevt_bookmark.c
 - ext/winevt/winevt_c.h
 - ext/winevt/winevt_channel.c
+- ext/winevt/winevt_locale.c
 - ext/winevt/winevt_query.c
 - ext/winevt/winevt_subscribe.c
 - ext/winevt/winevt_utils.cpp