diff --git a/lib/std/os/windows.zig b/lib/std/os/windows.zig index 3f9a4fda28a6..ed25660edd99 100644 --- a/lib/std/os/windows.zig +++ b/lib/std/os/windows.zig @@ -22,11 +22,8 @@ pub const advapi32 = @import("windows/advapi32.zig"); pub const kernel32 = @import("windows/kernel32.zig"); pub const ntdll = @import("windows/ntdll.zig"); pub const ole32 = @import("windows/ole32.zig"); -pub const psapi = @import("windows/psapi.zig"); pub const shell32 = @import("windows/shell32.zig"); pub const ws2_32 = @import("windows/ws2_32.zig"); -pub const gdi32 = @import("windows/gdi32.zig"); -pub const winmm = @import("windows/winmm.zig"); pub const crypt32 = @import("windows/crypt32.zig"); pub const nls = @import("windows/nls.zig"); diff --git a/lib/std/os/windows/gdi32.zig b/lib/std/os/windows/gdi32.zig deleted file mode 100644 index f7860c2ca196..000000000000 --- a/lib/std/os/windows/gdi32.zig +++ /dev/null @@ -1,53 +0,0 @@ -const std = @import("../../std.zig"); -const windows = std.os.windows; -const BOOL = windows.BOOL; -const DWORD = windows.DWORD; -const WINAPI = windows.WINAPI; -const HDC = windows.HDC; -const HGLRC = windows.HGLRC; -const WORD = windows.WORD; -const BYTE = windows.BYTE; - -pub const PIXELFORMATDESCRIPTOR = extern struct { - nSize: WORD = @sizeOf(PIXELFORMATDESCRIPTOR), - nVersion: WORD, - dwFlags: DWORD, - iPixelType: BYTE, - cColorBits: BYTE, - cRedBits: BYTE, - cRedShift: BYTE, - cGreenBits: BYTE, - cGreenShift: BYTE, - cBlueBits: BYTE, - cBlueShift: BYTE, - cAlphaBits: BYTE, - cAlphaShift: BYTE, - cAccumBits: BYTE, - cAccumRedBits: BYTE, - cAccumGreenBits: BYTE, - cAccumBlueBits: BYTE, - cAccumAlphaBits: BYTE, - cDepthBits: BYTE, - cStencilBits: BYTE, - cAuxBuffers: BYTE, - iLayerType: BYTE, - bReserved: BYTE, - dwLayerMask: DWORD, - dwVisibleMask: DWORD, - dwDamageMask: DWORD, -}; - -pub extern "gdi32" fn SetPixelFormat( - hdc: ?HDC, - format: i32, - ppfd: ?*const PIXELFORMATDESCRIPTOR, -) callconv(WINAPI) bool; - -pub extern "gdi32" fn ChoosePixelFormat( - hdc: ?HDC, - ppfd: ?*const PIXELFORMATDESCRIPTOR, -) callconv(WINAPI) i32; - -pub extern "gdi32" fn SwapBuffers(hdc: ?HDC) callconv(WINAPI) bool; -pub extern "gdi32" fn wglCreateContext(hdc: ?HDC) callconv(WINAPI) ?HGLRC; -pub extern "gdi32" fn wglMakeCurrent(hdc: ?HDC, hglrc: ?HGLRC) callconv(WINAPI) bool; diff --git a/lib/std/os/windows/psapi.zig b/lib/std/os/windows/psapi.zig deleted file mode 100644 index 0ef7429232e8..000000000000 --- a/lib/std/os/windows/psapi.zig +++ /dev/null @@ -1,75 +0,0 @@ -const std = @import("../../std.zig"); -const windows = std.os.windows; -const WINAPI = windows.WINAPI; -const DWORD = windows.DWORD; -const HANDLE = windows.HANDLE; -const PENUM_PAGE_FILE_CALLBACKW = windows.PENUM_PAGE_FILE_CALLBACKW; -const HMODULE = windows.HMODULE; -const BOOL = windows.BOOL; -const BOOLEAN = windows.BOOLEAN; -const CONDITION_VARIABLE = windows.CONDITION_VARIABLE; -const CONSOLE_SCREEN_BUFFER_INFO = windows.CONSOLE_SCREEN_BUFFER_INFO; -const COORD = windows.COORD; -const FILE_INFO_BY_HANDLE_CLASS = windows.FILE_INFO_BY_HANDLE_CLASS; -const HRESULT = windows.HRESULT; -const LARGE_INTEGER = windows.LARGE_INTEGER; -const LPCWSTR = windows.LPCWSTR; -const LPTHREAD_START_ROUTINE = windows.LPTHREAD_START_ROUTINE; -const LPVOID = windows.LPVOID; -const LPWSTR = windows.LPWSTR; -const MODULEINFO = windows.MODULEINFO; -const OVERLAPPED = windows.OVERLAPPED; -const PERFORMANCE_INFORMATION = windows.PERFORMANCE_INFORMATION; -const PROCESS_MEMORY_COUNTERS = windows.PROCESS_MEMORY_COUNTERS; -const PSAPI_WS_WATCH_INFORMATION = windows.PSAPI_WS_WATCH_INFORMATION; -const PSAPI_WS_WATCH_INFORMATION_EX = windows.PSAPI_WS_WATCH_INFORMATION_EX; -const SECURITY_ATTRIBUTES = windows.SECURITY_ATTRIBUTES; -const SIZE_T = windows.SIZE_T; -const SRWLOCK = windows.SRWLOCK; -const UINT = windows.UINT; -const VECTORED_EXCEPTION_HANDLER = windows.VECTORED_EXCEPTION_HANDLER; -const WCHAR = windows.WCHAR; -const WORD = windows.WORD; -const Win32Error = windows.Win32Error; -const va_list = windows.va_list; -const HLOCAL = windows.HLOCAL; -const FILETIME = windows.FILETIME; -const STARTUPINFOW = windows.STARTUPINFOW; -const PROCESS_INFORMATION = windows.PROCESS_INFORMATION; -const OVERLAPPED_ENTRY = windows.OVERLAPPED_ENTRY; -const LPHEAP_SUMMARY = windows.LPHEAP_SUMMARY; -const ULONG_PTR = windows.ULONG_PTR; -const FILE_NOTIFY_INFORMATION = windows.FILE_NOTIFY_INFORMATION; -const HANDLER_ROUTINE = windows.HANDLER_ROUTINE; -const ULONG = windows.ULONG; -const PVOID = windows.PVOID; -const LPSTR = windows.LPSTR; -const PENUM_PAGE_FILE_CALLBACKA = windows.PENUM_PAGE_FILE_CALLBACKA; - -pub extern "psapi" fn EmptyWorkingSet(hProcess: HANDLE) callconv(WINAPI) BOOL; -pub extern "psapi" fn EnumDeviceDrivers(lpImageBase: [*]LPVOID, cb: DWORD, lpcbNeeded: *DWORD) callconv(WINAPI) BOOL; -pub extern "psapi" fn EnumPageFilesA(pCallBackRoutine: PENUM_PAGE_FILE_CALLBACKA, pContext: LPVOID) callconv(WINAPI) BOOL; -pub extern "psapi" fn EnumPageFilesW(pCallBackRoutine: PENUM_PAGE_FILE_CALLBACKW, pContext: LPVOID) callconv(WINAPI) BOOL; -pub extern "psapi" fn EnumProcessModules(hProcess: HANDLE, lphModule: [*]HMODULE, cb: DWORD, lpcbNeeded: *DWORD) callconv(WINAPI) BOOL; -pub extern "psapi" fn EnumProcessModulesEx(hProcess: HANDLE, lphModule: [*]HMODULE, cb: DWORD, lpcbNeeded: *DWORD, dwFilterFlag: DWORD) callconv(WINAPI) BOOL; -pub extern "psapi" fn EnumProcesses(lpidProcess: [*]DWORD, cb: DWORD, cbNeeded: *DWORD) callconv(WINAPI) BOOL; -pub extern "psapi" fn GetDeviceDriverBaseNameA(ImageBase: LPVOID, lpBaseName: LPSTR, nSize: DWORD) callconv(WINAPI) DWORD; -pub extern "psapi" fn GetDeviceDriverBaseNameW(ImageBase: LPVOID, lpBaseName: LPWSTR, nSize: DWORD) callconv(WINAPI) DWORD; -pub extern "psapi" fn GetDeviceDriverFileNameA(ImageBase: LPVOID, lpFilename: LPSTR, nSize: DWORD) callconv(WINAPI) DWORD; -pub extern "psapi" fn GetDeviceDriverFileNameW(ImageBase: LPVOID, lpFilename: LPWSTR, nSize: DWORD) callconv(WINAPI) DWORD; -pub extern "psapi" fn GetMappedFileNameA(hProcess: HANDLE, lpv: ?LPVOID, lpFilename: LPSTR, nSize: DWORD) callconv(WINAPI) DWORD; -pub extern "psapi" fn GetMappedFileNameW(hProcess: HANDLE, lpv: ?LPVOID, lpFilename: LPWSTR, nSize: DWORD) callconv(WINAPI) DWORD; -pub extern "psapi" fn GetModuleBaseNameA(hProcess: HANDLE, hModule: ?HMODULE, lpBaseName: LPSTR, nSize: DWORD) callconv(WINAPI) DWORD; -pub extern "psapi" fn GetModuleBaseNameW(hProcess: HANDLE, hModule: ?HMODULE, lpBaseName: LPWSTR, nSize: DWORD) callconv(WINAPI) DWORD; -pub extern "psapi" fn GetModuleFileNameExA(hProcess: HANDLE, hModule: ?HMODULE, lpFilename: LPSTR, nSize: DWORD) callconv(WINAPI) DWORD; -pub extern "psapi" fn GetModuleFileNameExW(hProcess: HANDLE, hModule: ?HMODULE, lpFilename: LPWSTR, nSize: DWORD) callconv(WINAPI) DWORD; -pub extern "psapi" fn GetModuleInformation(hProcess: HANDLE, hModule: HMODULE, lpmodinfo: *MODULEINFO, cb: DWORD) callconv(WINAPI) BOOL; -pub extern "psapi" fn GetPerformanceInfo(pPerformanceInformation: *PERFORMANCE_INFORMATION, cb: DWORD) callconv(WINAPI) BOOL; -pub extern "psapi" fn GetProcessImageFileNameA(hProcess: HANDLE, lpImageFileName: LPSTR, nSize: DWORD) callconv(WINAPI) DWORD; -pub extern "psapi" fn GetProcessImageFileNameW(hProcess: HANDLE, lpImageFileName: LPWSTR, nSize: DWORD) callconv(WINAPI) DWORD; -pub extern "psapi" fn GetProcessMemoryInfo(Process: HANDLE, ppsmemCounters: *PROCESS_MEMORY_COUNTERS, cb: DWORD) callconv(WINAPI) BOOL; -pub extern "psapi" fn GetWsChanges(hProcess: HANDLE, lpWatchInfo: *PSAPI_WS_WATCH_INFORMATION, cb: DWORD) callconv(WINAPI) BOOL; -pub extern "psapi" fn GetWsChangesEx(hProcess: HANDLE, lpWatchInfoEx: *PSAPI_WS_WATCH_INFORMATION_EX, cb: DWORD) callconv(WINAPI) BOOL; -pub extern "psapi" fn InitializeProcessForWsWatch(hProcess: HANDLE) callconv(WINAPI) BOOL; -pub extern "psapi" fn QueryWorkingSet(hProcess: HANDLE, pv: PVOID, cb: DWORD) callconv(WINAPI) BOOL; -pub extern "psapi" fn QueryWorkingSetEx(hProcess: HANDLE, pv: PVOID, cb: DWORD) callconv(WINAPI) BOOL; diff --git a/lib/std/os/windows/winmm.zig b/lib/std/os/windows/winmm.zig deleted file mode 100644 index f21d4226e74a..000000000000 --- a/lib/std/os/windows/winmm.zig +++ /dev/null @@ -1,73 +0,0 @@ -const std = @import("../../std.zig"); -const windows = std.os.windows; -const WINAPI = windows.WINAPI; -const UINT = windows.UINT; -const BYTE = windows.BYTE; -const DWORD = windows.DWORD; - -pub const MMRESULT = UINT; -pub const MMSYSERR_BASE = 0; -pub const TIMERR_BASE = 96; -pub const MMSYSERR_ERROR = MMSYSERR_BASE + 1; -pub const MMSYSERR_BADDEVICEID = MMSYSERR_BASE + 2; -pub const MMSYSERR_NOTENABLED = MMSYSERR_BASE + 3; -pub const MMSYSERR_ALLOCATED = MMSYSERR_BASE + 4; -pub const MMSYSERR_INVALHANDLE = MMSYSERR_BASE + 5; -pub const MMSYSERR_NODRIVER = MMSYSERR_BASE + 6; -pub const MMSYSERR_NOMEM = MMSYSERR_BASE + 7; -pub const MMSYSERR_NOTSUPPORTED = MMSYSERR_BASE + 8; -pub const MMSYSERR_BADERRNUM = MMSYSERR_BASE + 9; -pub const MMSYSERR_INVALFLAG = MMSYSERR_BASE + 10; -pub const MMSYSERR_INVALPARAM = MMSYSERR_BASE + 11; -pub const MMSYSERR_HANDLEBUSY = MMSYSERR_BASE + 12; -pub const MMSYSERR_INVALIDALIAS = MMSYSERR_BASE + 13; -pub const MMSYSERR_BADDB = MMSYSERR_BASE + 14; -pub const MMSYSERR_KEYNOTFOUND = MMSYSERR_BASE + 15; -pub const MMSYSERR_READERROR = MMSYSERR_BASE + 16; -pub const MMSYSERR_WRITEERROR = MMSYSERR_BASE + 17; -pub const MMSYSERR_DELETEERROR = MMSYSERR_BASE + 18; -pub const MMSYSERR_VALNOTFOUND = MMSYSERR_BASE + 19; -pub const MMSYSERR_NODRIVERCB = MMSYSERR_BASE + 20; -pub const MMSYSERR_MOREDATA = MMSYSERR_BASE + 21; -pub const MMSYSERR_LASTERROR = MMSYSERR_BASE + 21; - -pub const MMTIME = extern struct { - wType: UINT, - u: extern union { - ms: DWORD, - sample: DWORD, - cb: DWORD, - ticks: DWORD, - smpte: extern struct { - hour: BYTE, - min: BYTE, - sec: BYTE, - frame: BYTE, - fps: BYTE, - dummy: BYTE, - pad: [2]BYTE, - }, - midi: extern struct { - songptrpos: DWORD, - }, - }, -}; -pub const LPMMTIME = *MMTIME; -pub const TIME_MS = 0x0001; -pub const TIME_SAMPLES = 0x0002; -pub const TIME_BYTES = 0x0004; -pub const TIME_SMPTE = 0x0008; -pub const TIME_MIDI = 0x0010; -pub const TIME_TICKS = 0x0020; - -// timeapi.h -pub const TIMECAPS = extern struct { wPeriodMin: UINT, wPeriodMax: UINT }; -pub const LPTIMECAPS = *TIMECAPS; -pub const TIMERR_NOERROR = 0; -pub const TIMERR_NOCANDO = TIMERR_BASE + 1; -pub const TIMERR_STRUCT = TIMERR_BASE + 33; -pub extern "winmm" fn timeBeginPeriod(uPeriod: UINT) callconv(WINAPI) MMRESULT; -pub extern "winmm" fn timeEndPeriod(uPeriod: UINT) callconv(WINAPI) MMRESULT; -pub extern "winmm" fn timeGetDevCaps(ptc: LPTIMECAPS, cbtc: UINT) callconv(WINAPI) MMRESULT; -pub extern "winmm" fn timeGetSystemTime(pmmt: LPMMTIME, cbmmt: UINT) callconv(WINAPI) MMRESULT; -pub extern "winmm" fn timeGetTime() callconv(WINAPI) DWORD;