authorgravatar for alex_naskos@hotmail.comAlexandros Naskos <alex_naskos@hotmail.com> 2020-11-05 09:00:03+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-11-05 09:00:03+02:00
log17837affd22a6055c65a14252fa38610fdeabc3a
treef3e327f1ebdd0e28325a49210a7e932d88442310
parentbb14bd35bd8e7c92d5d1662be391226c4a37fd24
parente5100605e9ba233d04fd46dec58c151239b6d365
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #6982 from Rageoholic/master

Fix CoInitializeEx so it can take a null pointer

2 files changed, 2 insertions(+), 1 deletions(-)

lib/std/os/windows/bits.zig+1
...@@ -60,6 +60,7 @@ pub const SIZE_T = usize;...@@ -60,6 +60,7 @@ pub const SIZE_T = usize;
60pub const TCHAR = if (UNICODE) WCHAR else u8;60pub const TCHAR = if (UNICODE) WCHAR else u8;
61pub const UINT = c_uint;61pub const UINT = c_uint;
62pub const ULONG_PTR = usize;62pub const ULONG_PTR = usize;
63pub const LONG_PTR = isize;
63pub const DWORD_PTR = ULONG_PTR;64pub const DWORD_PTR = ULONG_PTR;
64pub const UNICODE = false;65pub const UNICODE = false;
65pub const WCHAR = u16;66pub const WCHAR = u16;
lib/std/os/windows/ole32.zig+1-1
...@@ -8,4 +8,4 @@ usingnamespace @import("bits.zig");...@@ -8,4 +8,4 @@ usingnamespace @import("bits.zig");
8pub extern "ole32" fn CoTaskMemFree(pv: LPVOID) callconv(.Stdcall) void;8pub extern "ole32" fn CoTaskMemFree(pv: LPVOID) callconv(.Stdcall) void;
9pub extern "ole32" fn CoUninitialize() callconv(.Stdcall) void;9pub extern "ole32" fn CoUninitialize() callconv(.Stdcall) void;
10pub extern "ole32" fn CoGetCurrentProcess() callconv(.Stdcall) DWORD;10pub extern "ole32" fn CoGetCurrentProcess() callconv(.Stdcall) DWORD;
11pub extern "ole32" fn CoInitializeEx(pvReserved: LPVOID, dwCoInit: DWORD) callconv(.Stdcall) HRESULT;11pub extern "ole32" fn CoInitializeEx(pvReserved: ?LPVOID, dwCoInit: DWORD) callconv(.Stdcall) HRESULT;