From 3291c59728f298a725c815118311e385a9d1e059 Mon Sep 17 00:00:00 2001 From: Thomas la Cour Date: Thu, 11 Jul 2024 21:37:37 +0200 Subject: [PATCH] post rebase --- core/sys/windows/kernel32.odin | 30 +++++------------------------- core/sys/windows/user32.odin | 5 +---- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/core/sys/windows/kernel32.odin b/core/sys/windows/kernel32.odin index c2f97fff9..bb4cf2619 100755 --- a/core/sys/windows/kernel32.odin +++ b/core/sys/windows/kernel32.odin @@ -51,14 +51,10 @@ foreign kernel32 { // https://learn.microsoft.com/en-us/windows/console/getnumberofconsoleinputevents 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 --- SetConsoleCP :: proc(wCodePageID: CODEPAGE) -> BOOL --- GetConsoleOutputCP :: proc() -> CODEPAGE --- @@ -446,7 +442,7 @@ foreign kernel32 { AddDllDirectory :: proc(NewDirectory: PCWSTR) -> rawptr --- RemoveDllDirectory :: proc(Cookie: rawptr) -> BOOL --- 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 --- GetProcAddress :: proc(h: HMODULE, c_str: LPCSTR) -> rawptr --- @@ -1163,20 +1159,4 @@ GMEM_INVALID_HANDLE :: 0x8000 GHND :: (GMEM_MOVEABLE | 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 diff --git a/core/sys/windows/user32.odin b/core/sys/windows/user32.odin index 0ad479dd8..96ccb7dda 100644 --- a/core/sys/windows/user32.odin +++ b/core/sys/windows/user32.odin @@ -37,10 +37,7 @@ foreign user32 { lpClassName: LPCWSTR, lpWindowName: LPCWSTR, dwStyle: DWORD, - X: INT, - Y: INT, - nWidth: INT, - nHeight: INT, + X, Y, nWidth, nHeight: INT, hWndParent: HWND, hMenu: HMENU, hInstance: HINSTANCE,