motiejus/zig

commit 17837affd22a6055c65a14252fa38610fdeabc3a (tree)
parent bb14bd35bd8e7c92d5d1662be391226c4a37fd24
Author: Alexandros Naskos <alex_naskos@hotmail.com>
Date:   Thu,  5 Nov 2020 09:00:03 +0200

Merge pull request #6982 from Rageoholic/master

Fix CoInitializeEx so it can take a null pointer
Diffstat:
M
lib/std/os/windows/bits.zig
 | 
1
+
M
lib/std/os/windows/ole32.zig
 | 
2
+-

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/std/os/windows/bits.zig b/lib/std/os/windows/bits.zig
@@ -60,6 +60,7 @@ pub const SIZE_T = usize;
 pub const TCHAR = if (UNICODE) WCHAR else u8;
 pub const UINT = c_uint;
 pub const ULONG_PTR = usize;
+pub const LONG_PTR = isize;
 pub const DWORD_PTR = ULONG_PTR;
 pub const UNICODE = false;
 pub const WCHAR = u16;
diff --git a/lib/std/os/windows/ole32.zig b/lib/std/os/windows/ole32.zig
@@ -8,4 +8,4 @@ usingnamespace @import("bits.zig");
 pub extern "ole32" fn CoTaskMemFree(pv: LPVOID) callconv(.Stdcall) void;
 pub extern "ole32" fn CoUninitialize() callconv(.Stdcall) void;
 pub extern "ole32" fn CoGetCurrentProcess() callconv(.Stdcall) DWORD;
-pub extern "ole32" fn CoInitializeEx(pvReserved: LPVOID, dwCoInit: DWORD) callconv(.Stdcall) HRESULT;
+pub extern "ole32" fn CoInitializeEx(pvReserved: ?LPVOID, dwCoInit: DWORD) callconv(.Stdcall) HRESULT;