summaryrefslogtreecommitdiff
path: root/ext/fiddle
diff options
context:
space:
mode:
authorSutou Kouhei <kou@clear-code.com>2020-12-29 05:18:33 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2021-05-18 12:48:40 +0900
commit8758b07b1e4fd636dffb4b442388a3033c63d4b5 (patch)
tree82c51d37a57d875cee233aa04c942a8e42c8508e /ext/fiddle
parent25e56fe374478a2266ac25f22a07bb3c6a423c83 (diff)
[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
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/4506
Diffstat (limited to 'ext/fiddle')
-rw-r--r--ext/fiddle/lib/fiddle/types.rb23
1 files changed, 12 insertions, 11 deletions
diff --git a/ext/fiddle/lib/fiddle/types.rb b/ext/fiddle/lib/fiddle/types.rb
index 298a5e1797..3ea79368da 100644
--- a/ext/fiddle/lib/fiddle/types.rb
+++ b/ext/fiddle/lib/fiddle/types.rb
@@ -27,25 +27,26 @@ module Fiddle
# * 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 "PDWORD", "DWORD *"
+ typealias "DWORD32", "uint32_t"
+ typealias "DWORD64", "uint64_t"
typealias "WORD", "unsigned short"
- typealias "PWORD", "unsigned short *"
+ typealias "PWORD", "WORD *"
typealias "BOOL", "int"
- typealias "ATOM", "int"
+ typealias "ATOM", "WORD"
typealias "BYTE", "unsigned char"
- typealias "PBYTE", "unsigned char *"
+ typealias "PBYTE", "BYTE *"
typealias "UINT", "unsigned int"
typealias "ULONG", "unsigned long"
typealias "UCHAR", "unsigned char"
- typealias "HANDLE", "uintptr_t"
- typealias "PHANDLE", "void*"
- typealias "PVOID", "void*"
- typealias "LPCSTR", "const char*"
- typealias "LPSTR", "char*"
+ typealias "HANDLE", "PVOID"
+ typealias "PHANDLE", "HANDLE *"
+ typealias "PVOID", "void *"
+ typealias "LPCSTR", "const char *"
+ typealias "LPSTR", "char *"
typealias "HINSTANCE", "HANDLE"
typealias "HDC", "HANDLE"
typealias "HWND", "HANDLE"