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,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	const mem = std.mem;	4	const mem = std.mem;
3	const elf = std.elf;	5	const elf = std.elf;
4	const cstr = std.cstr;	6	const cstr = std.cstr;
5	const linux = std.os.linux;	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	allocator: *mem.Allocator,	17	allocator: *mem.Allocator,
9	elf_lib: ElfLib,	18	elf_lib: ElfLib,
10	fd: i32,	19	fd: i32,
...	@@ -107,7 +116,7 @@ pub const ElfLib = struct {	...	@@ -107,7 +116,7 @@ pub const ElfLib = struct {
107	}	116	}
108	}	117	}
109		118
110	return ElfLib{	119	return ElfLib {
111	.base = base,	120	.base = base,
112	.strings = maybe_strings orelse return error.ElfStringSectionNotFound,	121	.strings = maybe_strings orelse return error.ElfStringSectionNotFound,
113	.syms = maybe_syms orelse return error.ElfSymSectionNotFound,	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,3 +163,27 @@ fn checkver(def_arg: *elf.Verdef, vsym_arg: i32, vername: []const u8, strings: [
154	const aux = @intToPtr(*elf.Verdaux, @ptrToInt(def) + def.vd_aux);	163	const aux = @intToPtr(*elf.Verdaux, @ptrToInt(def) + def.vd_aux);
155	return mem.eql(u8, vername, cstr.toSliceConst(strings + aux.vda_name));	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,6 +24,7 @@ pub const HANDLE = *c_void;
24	pub const HCRYPTPROV = ULONG_PTR;	24	pub const HCRYPTPROV = ULONG_PTR;
25	pub const HINSTANCE = *@OpaqueType();	25	pub const HINSTANCE = *@OpaqueType();
26	pub const HMODULE = *@OpaqueType();	26	pub const HMODULE = *@OpaqueType();
		27	pub const FARPROC = *@OpaqueType();
27	pub const INT = c_int;	28	pub const INT = c_int;
28	pub const LPBYTE = *BYTE;	29	pub const LPBYTE = *BYTE;
29	pub const LPCH = *CHAR;	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
 pub extern "kernel32" stdcallcc fn CloseHandle(hObject: HANDLE) BOOL;
-pub extern "kernel32" stdcallcc fn CreateDirectoryW(lpPathName: [*]const u16, lpSecurityAttributes: ?*SECURITY_ATTRIBUTES) BOOL;
+pub extern "kernel32" stdcallcc fn CreateDirectoryW(lpPathName: LPCWSTR, lpSecurityAttributes: ?*SECURITY_ATTRIBUTES) BOOL;
 pub extern "kernel32" stdcallcc fn CreateFileW(
-    lpFileName: [*]const u16, // TODO null terminated pointer type
+    lpFileName: LPCWSTR, // TODO null terminated pointer type
     dwDesiredAccess: DWORD,
     dwShareMode: DWORD,
     lpSecurityAttributes: ?LPSECURITY_ATTRIBUTES,
 @@ -36,21 +36,21 @@ pub extern "kernel32" stdcallcc fn CreateProcessW(
     lpProcessInformation: *PROCESS_INFORMATION,
 ) BOOL;
-pub extern "kernel32" stdcallcc fn CreateSymbolicLinkW(lpSymlinkFileName: [*]const u16, lpTargetFileName: [*]const u16, dwFlags: DWORD) BOOLEAN;
+pub extern "kernel32" stdcallcc fn CreateSymbolicLinkW(lpSymlinkFileName: LPCWSTR, lpTargetFileName: LPCWSTR, dwFlags: DWORD) BOOLEAN;
 pub extern "kernel32" stdcallcc fn CreateIoCompletionPort(FileHandle: HANDLE, ExistingCompletionPort: ?HANDLE, CompletionKey: ULONG_PTR, NumberOfConcurrentThreads: DWORD) ?HANDLE;
 pub extern "kernel32" stdcallcc fn CreateThread(lpThreadAttributes: ?LPSECURITY_ATTRIBUTES, dwStackSize: SIZE_T, lpStartAddress: LPTHREAD_START_ROUTINE, lpParameter: ?LPVOID, dwCreationFlags: DWORD, lpThreadId: ?LPDWORD) ?HANDLE;
-pub extern "kernel32" stdcallcc fn DeleteFileW(lpFileName: [*]const u16) BOOL;
+pub extern "kernel32" stdcallcc fn DeleteFileW(lpFileName: LPCWSTR) BOOL;
 pub extern "kernel32" stdcallcc fn ExitProcess(exit_code: UINT) noreturn;
-pub extern "kernel32" stdcallcc fn FindFirstFileW(lpFileName: [*]const u16, lpFindFileData: *WIN32_FIND_DATAW) HANDLE;
+pub extern "kernel32" stdcallcc fn FindFirstFileW(lpFileName: LPCWSTR, lpFindFileData: *WIN32_FIND_DATAW) HANDLE;
 pub extern "kernel32" stdcallcc fn FindClose(hFindFile: HANDLE) BOOL;
 pub extern "kernel32" stdcallcc fn FindNextFileW(hFindFile: HANDLE, lpFindFileData: *WIN32_FIND_DATAW) BOOL;
-pub extern "kernel32" stdcallcc fn FreeEnvironmentStringsA(penv: [*]u8) BOOL;
+pub extern "kernel32" stdcallcc fn FreeEnvironmentStringsA(penv: LPSTR) BOOL;
 pub extern "kernel32" stdcallcc fn GetCommandLineA() LPSTR;
 @@ -63,7 +63,7 @@ pub extern "kernel32" stdcallcc fn GetCurrentDirectoryW(nBufferLength: DWORD, lp
 pub extern "kernel32" stdcallcc fn GetCurrentThread() HANDLE;
 pub extern "kernel32" stdcallcc fn GetCurrentThreadId() DWORD;
-pub extern "kernel32" stdcallcc fn GetEnvironmentStringsA() ?[*]u8;
+pub extern "kernel32" stdcallcc fn GetEnvironmentStringsA() ?LPSTR;
 pub extern "kernel32" stdcallcc fn GetEnvironmentVariableA(lpName: LPCSTR, lpBuffer: LPSTR, nSize: DWORD) DWORD;
 @@ -73,7 +73,7 @@ pub extern "kernel32" stdcallcc fn GetFileSizeEx(hFile: HANDLE, lpFileSize: *LAR
 pub extern "kernel32" stdcallcc fn GetFileAttributesW(lpFileName: [*]const WCHAR) DWORD;
-pub extern "kernel32" stdcallcc fn GetModuleFileNameW(hModule: ?HMODULE, lpFilename: [*]u16, nSize: DWORD) DWORD;
+pub extern "kernel32" stdcallcc fn GetModuleFileNameW(hModule: ?HMODULE, lpFilename: LPWSTR, nSize: DWORD) DWORD;
 pub extern "kernel32" stdcallcc fn GetModuleHandleW(lpModuleName: ?[*]const WCHAR) HMODULE;
 @@ -88,7 +88,7 @@ pub extern "kernel32" stdcallcc fn GetFileInformationByHandleEx(
 pub extern "kernel32" stdcallcc fn GetFinalPathNameByHandleW(
     hFile: HANDLE,
-    lpszFilePath: [*]u16,
+    lpszFilePath: LPWSTR,
     cchFilePath: DWORD,
     dwFlags: DWORD,
 ) DWORD;
 @@ -117,8 +117,8 @@ pub extern "kernel32" stdcallcc fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem
 pub extern "kernel32" stdcallcc fn HeapValidate(hHeap: HANDLE, dwFlags: DWORD, lpMem: ?*const c_void) BOOL;
 pub extern "kernel32" stdcallcc fn MoveFileExW(
-    lpExistingFileName: [*]const u16,
+    lpExistingFileName: LPCWSTR,
-    lpNewFileName: [*]const u16,
+    lpNewFileName: LPCWSTR,
     dwFlags: DWORD,
 ) BOOL;
 @@ -141,13 +141,13 @@ pub extern "kernel32" stdcallcc fn ReadDirectoryChangesW(
 pub extern "kernel32" stdcallcc fn ReadFile(
     in_hFile: HANDLE,
-    out_lpBuffer: [*]u8,
+    out_lpBuffer: LPSTR,
     in_nNumberOfBytesToRead: DWORD,
     out_lpNumberOfBytesRead: ?*DWORD,
     in_out_lpOverlapped: ?*OVERLAPPED,
 ) BOOL;
-pub extern "kernel32" stdcallcc fn RemoveDirectoryW(lpPathName: [*]const u16) BOOL;
+pub extern "kernel32" stdcallcc fn RemoveDirectoryW(lpPathName: LPCWSTR) BOOL;
 pub extern "kernel32" stdcallcc fn SetConsoleTextAttribute(hConsoleOutput: HANDLE, wAttributes: WORD) BOOL;
 @@ -168,15 +168,17 @@ pub extern "kernel32" stdcallcc fn WaitForSingleObject(hHandle: HANDLE, dwMillis
 pub extern "kernel32" stdcallcc fn WriteFile(
     in_hFile: HANDLE,
-    in_lpBuffer: [*]const u8,
+    in_lpBuffer: LPCSTR,
     in_nNumberOfBytesToWrite: DWORD,
     out_lpNumberOfBytesWritten: ?*DWORD,
     in_out_lpOverlapped: ?*OVERLAPPED,
 ) BOOL;
-pub extern "kernel32" stdcallcc fn WriteFileEx(hFile: HANDLE, lpBuffer: [*]const u8, nNumberOfBytesToWrite: DWORD, lpOverlapped: LPOVERLAPPED, lpCompletionRoutine: LPOVERLAPPED_COMPLETION_ROUTINE) BOOL;
+pub extern "kernel32" stdcallcc fn WriteFileEx(hFile: HANDLE, lpBuffer: LPCSTR, nNumberOfBytesToWrite: DWORD, lpOverlapped: LPOVERLAPPED, lpCompletionRoutine: LPOVERLAPPED_COMPLETION_ROUTINE) BOOL;
-pub extern "kernel32" stdcallcc fn LoadLibraryW(lpLibFileName: [*]const u16) ?HMODULE;
+pub extern "kernel32" stdcallcc fn LoadLibraryW(lpLibFileName: LPCWSTR) ?HMODULE;
+pub extern "kernel32" stdcallcc fn GetProcAddress(hModule: HMODULE, lpProcName: LPCSTR) ?FARPROC;
 pub extern "kernel32" stdcallcc fn FreeLibrary(hModule: HMODULE) BOOL;