Browse Source

post rebase

Thomas la Cour 1 year ago
parent
commit
3291c59728
2 changed files with 6 additions and 29 deletions
  1. 5 25
      core/sys/windows/kernel32.odin
  2. 1 4
      core/sys/windows/user32.odin

+ 5 - 25
core/sys/windows/kernel32.odin

@@ -51,14 +51,10 @@ foreign kernel32 {
 	// https://learn.microsoft.com/en-us/windows/console/getnumberofconsoleinputevents
 	// https://learn.microsoft.com/en-us/windows/console/getnumberofconsoleinputevents
 	GetNumberOfConsoleInputEvents :: proc(hConsoleInput: HANDLE, lpcNumberOfEvents: LPDWORD) -> BOOL ---
 	GetNumberOfConsoleInputEvents :: proc(hConsoleInput: HANDLE, lpcNumberOfEvents: LPDWORD) -> BOOL ---
 
 
-	GetConsoleMode :: proc(hConsoleHandle: HANDLE,
-	                       lpMode: LPDWORD) -> BOOL ---
-	SetConsoleMode :: proc(hConsoleHandle: HANDLE,
-	                       dwMode: DWORD) -> BOOL ---
-	SetConsoleCursorPosition :: proc(hConsoleHandle: HANDLE,
-	                                 dwCursorPosition: COORD) -> BOOL ---
-	SetConsoleTextAttribute :: proc(hConsoleOutput: HANDLE,
-									wAttributes: WORD) -> BOOL ---
+	GetConsoleMode :: proc(hConsoleHandle: HANDLE, lpMode: LPDWORD) -> BOOL ---
+	SetConsoleMode :: proc(hConsoleHandle: HANDLE, dwMode: DWORD) -> BOOL ---
+	SetConsoleCursorPosition :: proc(hConsoleHandle: HANDLE, dwCursorPosition: COORD) -> BOOL ---
+	SetConsoleTextAttribute :: proc(hConsoleOutput: HANDLE, wAttributes: WORD) -> BOOL ---
 	GetConsoleCP :: proc() -> CODEPAGE ---
 	GetConsoleCP :: proc() -> CODEPAGE ---
 	SetConsoleCP :: proc(wCodePageID: CODEPAGE) -> BOOL ---
 	SetConsoleCP :: proc(wCodePageID: CODEPAGE) -> BOOL ---
 	GetConsoleOutputCP :: proc() -> CODEPAGE ---
 	GetConsoleOutputCP :: proc() -> CODEPAGE ---
@@ -446,7 +442,7 @@ foreign kernel32 {
 	AddDllDirectory :: proc(NewDirectory: PCWSTR) -> rawptr ---
 	AddDllDirectory :: proc(NewDirectory: PCWSTR) -> rawptr ---
 	RemoveDllDirectory :: proc(Cookie: rawptr) -> BOOL ---
 	RemoveDllDirectory :: proc(Cookie: rawptr) -> BOOL ---
 	LoadLibraryW :: proc(c_str: LPCWSTR) -> HMODULE ---
 	LoadLibraryW :: proc(c_str: LPCWSTR) -> HMODULE ---
-	LoadLibraryExW :: proc(c_str: LPCWSTR, hFile: HANDLE, dwFlags: LOAD_LIBRARY_FLAGS) -> HMODULE ---
+	LoadLibraryExW :: proc(c_str: LPCWSTR, hFile: HANDLE, dwFlags: LoadLibraryEx_Flags) -> HMODULE ---
 	FreeLibrary :: proc(h: HMODULE) -> BOOL ---
 	FreeLibrary :: proc(h: HMODULE) -> BOOL ---
 	GetProcAddress :: proc(h: HMODULE, c_str: LPCSTR) -> rawptr ---
 	GetProcAddress :: proc(h: HMODULE, c_str: LPCSTR) -> rawptr ---
 
 
@@ -1163,20 +1159,4 @@ GMEM_INVALID_HANDLE :: 0x8000
 GHND                :: (GMEM_MOVEABLE | GMEM_ZEROINIT)
 GHND                :: (GMEM_MOVEABLE | GMEM_ZEROINIT)
 GPTR                :: (GMEM_FIXED | GMEM_ZEROINIT)
 GPTR                :: (GMEM_FIXED | GMEM_ZEROINIT)
 
 
-LOAD_LIBRARY_FLAGS :: enum DWORD {
-	DONT_RESOLVE_DLL_REFERENCES         = 0x00000001,
-	LOAD_LIBRARY_AS_DATAFILE            = 0x00000002,
-	// reserved for internal LOAD_PACKAGED_LIBRARY = 0x00000004,
-	LOAD_WITH_ALTERED_SEARCH_PATH       = 0x00000008,
-	LOAD_IGNORE_CODE_AUTHZ_LEVEL        = 0x00000010,
-	LOAD_LIBRARY_AS_IMAGE_RESOURCE      = 0x00000020,
-	LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE  = 0x00000040,
-	LOAD_LIBRARY_REQUIRE_SIGNED_TARGET  = 0x00000080,
-	LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR    = 0x00000100,
-	LOAD_LIBRARY_SEARCH_APPLICATION_DIR = 0x00000200,
-	LOAD_LIBRARY_SEARCH_USER_DIRS       = 0x00000400,
-	LOAD_LIBRARY_SEARCH_SYSTEM32        = 0x00000800,
-	LOAD_LIBRARY_SEARCH_DEFAULT_DIRS    = 0x00001000,
-}
-
 LPTOP_LEVEL_EXCEPTION_FILTER :: PVECTORED_EXCEPTION_HANDLER
 LPTOP_LEVEL_EXCEPTION_FILTER :: PVECTORED_EXCEPTION_HANDLER

+ 1 - 4
core/sys/windows/user32.odin

@@ -37,10 +37,7 @@ foreign user32 {
 		lpClassName: LPCWSTR,
 		lpClassName: LPCWSTR,
 		lpWindowName: LPCWSTR,
 		lpWindowName: LPCWSTR,
 		dwStyle: DWORD,
 		dwStyle: DWORD,
-		X: INT,
-		Y: INT,
-		nWidth: INT,
-		nHeight: INT,
+		X, Y, nWidth, nHeight: INT,
 		hWndParent: HWND,
 		hWndParent: HWND,
 		hMenu: HMENU,
 		hMenu: HMENU,
 		hInstance: HINSTANCE,
 		hInstance: HINSTANCE,