Commit d3bf2671362b1b4550369316b7259d55d98c80cc | zig

author	emekoi <emekankurumeh@outlook.com> 2018-09-27 00:18:47-05:00
committer	emekoi <emekankurumeh@outlook.com> 2018-09-30 01:05:13-05:00
log	d3bf2671362b1b4550369316b7259d55d98c80cc
tree	601801ebc912f95d0eaecb9968a79b3717fcbf62
parent	1428ef3b07eba5a414b30973b117f3c8328c727c

added dynamic library loading for windows

3 files changed, 55 insertions(+), 19 deletions(-)

std
- dynamic_library.zig
- os
  - windows
    index.zig
    kernel32.zig

std/dynamic_library.zig+36-3

...	...	@@ -1,10 +1,19 @@
1		const std = @import("index.zig");
	1	const builtin = @import("builtin");
	2	const Os = builtin.Os;
	3	const std = @import("std");
2	4	const mem = std.mem;
3	5	const elf = std.elf;
4	6	const cstr = std.cstr;
5	7	const linux = std.os.linux;
	8	const windows = std.os.windows;
6	9
7		pub const DynLib = struct {
	10	pub const DynLib = switch (builtin.os) {
	11	Os.linux => LinuxDynLib,
	12	Os.windows => WindowsDynLib,
	13	else => void,
	14	};
	15
	16	pub const LinuxDynLib = struct {
8	17	allocator: *mem.Allocator,
9	18	elf_lib: ElfLib,
10	19	fd: i32,
...	...	@@ -107,7 +116,7 @@ pub const ElfLib = struct {
107	116	}
108	117	}
109	118
110		return ElfLib{
	119	return ElfLib {
111	120	.base = base,
112	121	.strings = maybe_strings orelse return error.ElfStringSectionNotFound,
113	122	.syms = maybe_syms orelse return error.ElfSymSectionNotFound,
...	...	@@ -154,3 +163,27 @@ fn checkver(def_arg: *elf.Verdef, vsym_arg: i32, vername: []const u8, strings: [
154	163	const aux = @intToPtr(*elf.Verdaux, @ptrToInt(def) + def.vd_aux);
155	164	return mem.eql(u8, vername, cstr.toSliceConst(strings + aux.vda_name));
156	165	}
	166
	167	pub const WindowsDynLib = struct {
	168	allocator: *mem.Allocator,
	169	dll: windows.HMODULE,
	170
	171	pub fn open(allocator: *mem.Allocator, path: []const u8) !WindowsDynLib {
	172	const wpath = try std.unicode.utf8ToUtf16LeWithNull(allocator, path);
	173	defer allocator.free(wpath);
	174
	175	return WindowsDynLib {
	176	.allocator = allocator,
	177	.dll = windows.LoadLibraryW(wpath[0..].ptr) orelse return error.FileNotFound
	178	};
	179	}
	180
	181	pub fn close(self: *WindowsDynLib) void {
	182	_ = windows.FreeLibrary(self.dll);
	183	self.* = undefined;
	184	}
	185
	186	pub fn lookup(self: *WindowsDynLib, name: []const u8) ?usize {
	187	return @ptrToInt(windows.GetProcAddress(self.dll, name.ptr));
	188	}
	189	};

std/os/windows/index.zig+1

...	...	@@ -24,6 +24,7 @@ pub const HANDLE = *c_void;
24	24	pub const HCRYPTPROV = ULONG_PTR;
25	25	pub const HINSTANCE = *@OpaqueType();
26	26	pub const HMODULE = *@OpaqueType();
	27	pub const FARPROC = *@OpaqueType();
27	28	pub const INT = c_int;
28	29	pub const LPBYTE = *BYTE;
29	30	pub const LPCH = *CHAR;

std/os/windows/kernel32.zig+18-16

...	...	@@ -4,10 +4,10 @@ pub extern "kernel32" stdcallcc fn CancelIoEx(hFile: HANDLE, lpOverlapped: LPOVE
4	4
5	5	pub extern "kernel32" stdcallcc fn CloseHandle(hObject: HANDLE) BOOL;
6	6
7		pub extern "kernel32" stdcallcc fn CreateDirectoryW(lpPathName: []const u16, lpSecurityAttributes: ?SECURITY_ATTRIBUTES) BOOL;
	7	pub extern "kernel32" stdcallcc fn CreateDirectoryW(lpPathName: LPCWSTR, lpSecurityAttributes: ?*SECURITY_ATTRIBUTES) BOOL;
8	8
9	9	pub extern "kernel32" stdcallcc fn CreateFileW(
10		lpFileName: [*]const u16, // TODO null terminated pointer type
	10	lpFileName: LPCWSTR, // TODO null terminated pointer type
11	11	dwDesiredAccess: DWORD,
12	12	dwShareMode: DWORD,
13	13	lpSecurityAttributes: ?LPSECURITY_ATTRIBUTES,
...	...	@@ -36,21 +36,21 @@ pub extern "kernel32" stdcallcc fn CreateProcessW(
36	36	lpProcessInformation: *PROCESS_INFORMATION,
37	37	) BOOL;
38	38
39		pub extern "kernel32" stdcallcc fn CreateSymbolicLinkW(lpSymlinkFileName: []const u16, lpTargetFileName: []const u16, dwFlags: DWORD) BOOLEAN;
	39	pub extern "kernel32" stdcallcc fn CreateSymbolicLinkW(lpSymlinkFileName: LPCWSTR, lpTargetFileName: LPCWSTR, dwFlags: DWORD) BOOLEAN;
40	40
41	41	pub extern "kernel32" stdcallcc fn CreateIoCompletionPort(FileHandle: HANDLE, ExistingCompletionPort: ?HANDLE, CompletionKey: ULONG_PTR, NumberOfConcurrentThreads: DWORD) ?HANDLE;
42	42
43	43	pub extern "kernel32" stdcallcc fn CreateThread(lpThreadAttributes: ?LPSECURITY_ATTRIBUTES, dwStackSize: SIZE_T, lpStartAddress: LPTHREAD_START_ROUTINE, lpParameter: ?LPVOID, dwCreationFlags: DWORD, lpThreadId: ?LPDWORD) ?HANDLE;
44	44
45		pub extern "kernel32" stdcallcc fn DeleteFileW(lpFileName: [*]const u16) BOOL;
	45	pub extern "kernel32" stdcallcc fn DeleteFileW(lpFileName: LPCWSTR) BOOL;
46	46
47	47	pub extern "kernel32" stdcallcc fn ExitProcess(exit_code: UINT) noreturn;
48	48
49		pub extern "kernel32" stdcallcc fn FindFirstFileW(lpFileName: []const u16, lpFindFileData: WIN32_FIND_DATAW) HANDLE;
	49	pub extern "kernel32" stdcallcc fn FindFirstFileW(lpFileName: LPCWSTR, lpFindFileData: *WIN32_FIND_DATAW) HANDLE;
50	50	pub extern "kernel32" stdcallcc fn FindClose(hFindFile: HANDLE) BOOL;
51	51	pub extern "kernel32" stdcallcc fn FindNextFileW(hFindFile: HANDLE, lpFindFileData: *WIN32_FIND_DATAW) BOOL;
52	52
53		pub extern "kernel32" stdcallcc fn FreeEnvironmentStringsA(penv: [*]u8) BOOL;
	53	pub extern "kernel32" stdcallcc fn FreeEnvironmentStringsA(penv: LPSTR) BOOL;
54	54
55	55	pub extern "kernel32" stdcallcc fn GetCommandLineA() LPSTR;
56	56
...	...	@@ -63,7 +63,7 @@ pub extern "kernel32" stdcallcc fn GetCurrentDirectoryW(nBufferLength: DWORD, lp
63	63	pub extern "kernel32" stdcallcc fn GetCurrentThread() HANDLE;
64	64	pub extern "kernel32" stdcallcc fn GetCurrentThreadId() DWORD;
65	65
66		pub extern "kernel32" stdcallcc fn GetEnvironmentStringsA() ?[*]u8;
	66	pub extern "kernel32" stdcallcc fn GetEnvironmentStringsA() ?LPSTR;
67	67
68	68	pub extern "kernel32" stdcallcc fn GetEnvironmentVariableA(lpName: LPCSTR, lpBuffer: LPSTR, nSize: DWORD) DWORD;
69	69
...	...	@@ -73,7 +73,7 @@ pub extern "kernel32" stdcallcc fn GetFileSizeEx(hFile: HANDLE, lpFileSize: *LAR
73	73
74	74	pub extern "kernel32" stdcallcc fn GetFileAttributesW(lpFileName: [*]const WCHAR) DWORD;
75	75
76		pub extern "kernel32" stdcallcc fn GetModuleFileNameW(hModule: ?HMODULE, lpFilename: [*]u16, nSize: DWORD) DWORD;
	76	pub extern "kernel32" stdcallcc fn GetModuleFileNameW(hModule: ?HMODULE, lpFilename: LPWSTR, nSize: DWORD) DWORD;
77	77
78	78	pub extern "kernel32" stdcallcc fn GetModuleHandleW(lpModuleName: ?[*]const WCHAR) HMODULE;
79	79
...	...	@@ -88,7 +88,7 @@ pub extern "kernel32" stdcallcc fn GetFileInformationByHandleEx(
88	88
89	89	pub extern "kernel32" stdcallcc fn GetFinalPathNameByHandleW(
90	90	hFile: HANDLE,
91		lpszFilePath: [*]u16,
	91	lpszFilePath: LPWSTR,
92	92	cchFilePath: DWORD,
93	93	dwFlags: DWORD,
94	94	) DWORD;
...	...	@@ -117,8 +117,8 @@ pub extern "kernel32" stdcallcc fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem
117	117	pub extern "kernel32" stdcallcc fn HeapValidate(hHeap: HANDLE, dwFlags: DWORD, lpMem: ?*const c_void) BOOL;
118	118
119	119	pub extern "kernel32" stdcallcc fn MoveFileExW(
120		lpExistingFileName: [*]const u16,
121		lpNewFileName: [*]const u16,
	120	lpExistingFileName: LPCWSTR,
	121	lpNewFileName: LPCWSTR,
122	122	dwFlags: DWORD,
123	123	) BOOL;
124	124
...	...	@@ -141,13 +141,13 @@ pub extern "kernel32" stdcallcc fn ReadDirectoryChangesW(
141	141
142	142	pub extern "kernel32" stdcallcc fn ReadFile(
143	143	in_hFile: HANDLE,
144		out_lpBuffer: [*]u8,
	144	out_lpBuffer: LPSTR,
145	145	in_nNumberOfBytesToRead: DWORD,
146	146	out_lpNumberOfBytesRead: ?*DWORD,
147	147	in_out_lpOverlapped: ?*OVERLAPPED,
148	148	) BOOL;
149	149
150		pub extern "kernel32" stdcallcc fn RemoveDirectoryW(lpPathName: [*]const u16) BOOL;
	150	pub extern "kernel32" stdcallcc fn RemoveDirectoryW(lpPathName: LPCWSTR) BOOL;
151	151
152	152	pub extern "kernel32" stdcallcc fn SetConsoleTextAttribute(hConsoleOutput: HANDLE, wAttributes: WORD) BOOL;
153	153
...	...	@@ -168,15 +168,17 @@ pub extern "kernel32" stdcallcc fn WaitForSingleObject(hHandle: HANDLE, dwMillis
168	168
169	169	pub extern "kernel32" stdcallcc fn WriteFile(
170	170	in_hFile: HANDLE,
171		in_lpBuffer: [*]const u8,
	171	in_lpBuffer: LPCSTR,
172	172	in_nNumberOfBytesToWrite: DWORD,
173	173	out_lpNumberOfBytesWritten: ?*DWORD,
174	174	in_out_lpOverlapped: ?*OVERLAPPED,
175	175	) BOOL;
176	176
177		pub extern "kernel32" stdcallcc fn WriteFileEx(hFile: HANDLE, lpBuffer: [*]const u8, nNumberOfBytesToWrite: DWORD, lpOverlapped: LPOVERLAPPED, lpCompletionRoutine: LPOVERLAPPED_COMPLETION_ROUTINE) BOOL;
	177	pub extern "kernel32" stdcallcc fn WriteFileEx(hFile: HANDLE, lpBuffer: LPCSTR, nNumberOfBytesToWrite: DWORD, lpOverlapped: LPOVERLAPPED, lpCompletionRoutine: LPOVERLAPPED_COMPLETION_ROUTINE) BOOL;
178	178
179		pub extern "kernel32" stdcallcc fn LoadLibraryW(lpLibFileName: [*]const u16) ?HMODULE;
	179	pub extern "kernel32" stdcallcc fn LoadLibraryW(lpLibFileName: LPCWSTR) ?HMODULE;
	180
	181	pub extern "kernel32" stdcallcc fn GetProcAddress(hModule: HMODULE, lpProcName: LPCSTR) ?FARPROC;
180	182
181	183	pub extern "kernel32" stdcallcc fn FreeLibrary(hModule: HMODULE) BOOL;
182	184