https://git.ruby-lang.org/ruby.git/commit/?id=c4b602e80f

From c4b602e80fdc1824c68602302a4ed82a0e90d5b7 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Sun, 18 Jul 2021 11:22:50 +0900
Subject: merge revision(s)
 25e56fe374478a2266ac25f22a07bb3c6a423c83,8758b07b1e4fd636dffb4b442388a3033c63d4b5,791e8eec66d3aebcee36c1369b0bf52bc3815e94:
 [Backport #18016]

	[ruby/fiddle] Fix Win32Types for Windows 64-bit (#63)

	https://docs.microsoft.com/en-us/windows/win32/winprog/windows-data-types

	https://github.com/ruby/fiddle/commit/28ee5b1608
	---
	 ext/fiddle/lib/fiddle/types.rb | 8 ++++----
	 1 file changed, 4 insertions(+), 4 deletions(-)

	[ruby/fiddle] Fix more Win32Types definitions

	https://docs.microsoft.com/en-us/windows/win32/winprog/windows-data-types

	https://github.com/ruby/fiddle/commit/805c1a595a
	---
	 ext/fiddle/lib/fiddle/types.rb | 23 ++++++++++++-----------
	 1 file changed, 12 insertions(+), 11 deletions(-)

	[ruby/fiddle] win32types: sort

	https://github.com/ruby/fiddle/commit/35dec6c5a5
	---
	 ext/fiddle/lib/fiddle/types.rb | 30 +++++++++++++++---------------
	 1 file changed, 15 insertions(+), 15 deletions(-)
---
 ext/fiddle/lib/fiddle/types.rb | 35 ++++++++++++++++++-----------------
 version.h                      |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ext/fiddle/lib/fiddle/types.rb b/ext/fiddle/lib/fiddle/types.rb
index 8dc811d..7baf31e 100644
--- a/ext/fiddle/lib/fiddle/types.rb
+++ b/ext/fiddle/lib/fiddle/types.rb
@@ -27,28 +27,29 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/ext/fiddle/lib/fiddle/types.rb#L27
   # * WORD
   module Win32Types
     def included(m) # :nodoc:
+      # https://docs.microsoft.com/en-us/windows/win32/winprog/windows-data-types
       m.module_eval{
-        typealias "DWORD", "unsigned long"
-        typealias "PDWORD", "unsigned long *"
-        typealias "DWORD32", "unsigned long"
-        typealias "DWORD64", "unsigned long long"
-        typealias "WORD", "unsigned short"
-        typealias "PWORD", "unsigned short *"
+        typealias "ATOM", "WORD"
         typealias "BOOL", "int"
-        typealias "ATOM", "int"
         typealias "BYTE", "unsigned char"
-        typealias "PBYTE", "unsigned char *"
+        typealias "DWORD", "unsigned long"
+        typealias "DWORD32", "uint32_t"
+        typealias "DWORD64", "uint64_t"
+        typealias "HANDLE", "PVOID"
+        typealias "HDC", "HANDLE"
+        typealias "HINSTANCE", "HANDLE"
+        typealias "HWND", "HANDLE"
+        typealias "LPCSTR", "const char *"
+        typealias "LPSTR", "char *"
+        typealias "PBYTE", "BYTE *"
+        typealias "PDWORD", "DWORD *"
+        typealias "PHANDLE", "HANDLE *"
+        typealias "PVOID", "void *"
+        typealias "PWORD", "WORD *"
+        typealias "UCHAR", "unsigned char"
         typealias "UINT", "unsigned int"
         typealias "ULONG", "unsigned long"
-        typealias "UCHAR", "unsigned char"
-        typealias "HANDLE", "uintptr_t"
-        typealias "PHANDLE", "void*"
-        typealias "PVOID", "void*"
-        typealias "LPCSTR", "char*"
-        typealias "LPSTR", "char*"
-        typealias "HINSTANCE", "unsigned int"
-        typealias "HDC", "unsigned int"
-        typealias "HWND", "unsigned int"
+        typealias "WORD", "unsigned short"
       }
     end
     module_function :included
diff --git a/version.h b/version.h
index b503513..f23e4a4 100644
--- a/version.h
+++ b/version.h
@@ -12,7 +12,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L12
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 110
+#define RUBY_PATCHLEVEL 111
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 7
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/