authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-10-28 12:57:27-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-10-29 00:58:00-04:00
loge7ead9c5eacde7eda94d39380ec8b6d474d49607
treef4156fefd6439a646de7f5d1e8913b91238d5e1d
parent13c7aa5fefef9b1338951cf0d01c04345201d996

std: delete psapi, gdi32, and winmm

The only remaining Windows APIs now are the ones that the standard library itself depends on for its cross-platform abstractions. closes #4426

4 files changed, 0 insertions(+), 204 deletions(-)

lib/std/os/windows.zig-3
......@@ -22,11 +22,8 @@ pub const advapi32 = @import("windows/advapi32.zig");
2222pub const kernel32 = @import("windows/kernel32.zig");
2323pub const ntdll = @import("windows/ntdll.zig");
2424pub const ole32 = @import("windows/ole32.zig");
25pub const psapi = @import("windows/psapi.zig");
2625pub const shell32 = @import("windows/shell32.zig");
2726pub const ws2_32 = @import("windows/ws2_32.zig");
28pub const gdi32 = @import("windows/gdi32.zig");
29pub const winmm = @import("windows/winmm.zig");
3027pub const crypt32 = @import("windows/crypt32.zig");
3128pub const nls = @import("windows/nls.zig");
3229
lib/std/os/windows/gdi32.zig deleted-53
......@@ -1,53 +0,0 @@
1const std = @import("../../std.zig");
2const windows = std.os.windows;
3const BOOL = windows.BOOL;
4const DWORD = windows.DWORD;
5const WINAPI = windows.WINAPI;
6const HDC = windows.HDC;
7const HGLRC = windows.HGLRC;
8const WORD = windows.WORD;
9const BYTE = windows.BYTE;
10
11pub const PIXELFORMATDESCRIPTOR = extern struct {
12 nSize: WORD = @sizeOf(PIXELFORMATDESCRIPTOR),
13 nVersion: WORD,
14 dwFlags: DWORD,
15 iPixelType: BYTE,
16 cColorBits: BYTE,
17 cRedBits: BYTE,
18 cRedShift: BYTE,
19 cGreenBits: BYTE,
20 cGreenShift: BYTE,
21 cBlueBits: BYTE,
22 cBlueShift: BYTE,
23 cAlphaBits: BYTE,
24 cAlphaShift: BYTE,
25 cAccumBits: BYTE,
26 cAccumRedBits: BYTE,
27 cAccumGreenBits: BYTE,
28 cAccumBlueBits: BYTE,
29 cAccumAlphaBits: BYTE,
30 cDepthBits: BYTE,
31 cStencilBits: BYTE,
32 cAuxBuffers: BYTE,
33 iLayerType: BYTE,
34 bReserved: BYTE,
35 dwLayerMask: DWORD,
36 dwVisibleMask: DWORD,
37 dwDamageMask: DWORD,
38};
39
40pub extern "gdi32" fn SetPixelFormat(
41 hdc: ?HDC,
42 format: i32,
43 ppfd: ?*const PIXELFORMATDESCRIPTOR,
44) callconv(WINAPI) bool;
45
46pub extern "gdi32" fn ChoosePixelFormat(
47 hdc: ?HDC,
48 ppfd: ?*const PIXELFORMATDESCRIPTOR,
49) callconv(WINAPI) i32;
50
51pub extern "gdi32" fn SwapBuffers(hdc: ?HDC) callconv(WINAPI) bool;
52pub extern "gdi32" fn wglCreateContext(hdc: ?HDC) callconv(WINAPI) ?HGLRC;
53pub extern "gdi32" fn wglMakeCurrent(hdc: ?HDC, hglrc: ?HGLRC) callconv(WINAPI) bool;
lib/std/os/windows/psapi.zig deleted-75
......@@ -1,75 +0,0 @@
1const std = @import("../../std.zig");
2const windows = std.os.windows;
3const WINAPI = windows.WINAPI;
4const DWORD = windows.DWORD;
5const HANDLE = windows.HANDLE;
6const PENUM_PAGE_FILE_CALLBACKW = windows.PENUM_PAGE_FILE_CALLBACKW;
7const HMODULE = windows.HMODULE;
8const BOOL = windows.BOOL;
9const BOOLEAN = windows.BOOLEAN;
10const CONDITION_VARIABLE = windows.CONDITION_VARIABLE;
11const CONSOLE_SCREEN_BUFFER_INFO = windows.CONSOLE_SCREEN_BUFFER_INFO;
12const COORD = windows.COORD;
13const FILE_INFO_BY_HANDLE_CLASS = windows.FILE_INFO_BY_HANDLE_CLASS;
14const HRESULT = windows.HRESULT;
15const LARGE_INTEGER = windows.LARGE_INTEGER;
16const LPCWSTR = windows.LPCWSTR;
17const LPTHREAD_START_ROUTINE = windows.LPTHREAD_START_ROUTINE;
18const LPVOID = windows.LPVOID;
19const LPWSTR = windows.LPWSTR;
20const MODULEINFO = windows.MODULEINFO;
21const OVERLAPPED = windows.OVERLAPPED;
22const PERFORMANCE_INFORMATION = windows.PERFORMANCE_INFORMATION;
23const PROCESS_MEMORY_COUNTERS = windows.PROCESS_MEMORY_COUNTERS;
24const PSAPI_WS_WATCH_INFORMATION = windows.PSAPI_WS_WATCH_INFORMATION;
25const PSAPI_WS_WATCH_INFORMATION_EX = windows.PSAPI_WS_WATCH_INFORMATION_EX;
26const SECURITY_ATTRIBUTES = windows.SECURITY_ATTRIBUTES;
27const SIZE_T = windows.SIZE_T;
28const SRWLOCK = windows.SRWLOCK;
29const UINT = windows.UINT;
30const VECTORED_EXCEPTION_HANDLER = windows.VECTORED_EXCEPTION_HANDLER;
31const WCHAR = windows.WCHAR;
32const WORD = windows.WORD;
33const Win32Error = windows.Win32Error;
34const va_list = windows.va_list;
35const HLOCAL = windows.HLOCAL;
36const FILETIME = windows.FILETIME;
37const STARTUPINFOW = windows.STARTUPINFOW;
38const PROCESS_INFORMATION = windows.PROCESS_INFORMATION;
39const OVERLAPPED_ENTRY = windows.OVERLAPPED_ENTRY;
40const LPHEAP_SUMMARY = windows.LPHEAP_SUMMARY;
41const ULONG_PTR = windows.ULONG_PTR;
42const FILE_NOTIFY_INFORMATION = windows.FILE_NOTIFY_INFORMATION;
43const HANDLER_ROUTINE = windows.HANDLER_ROUTINE;
44const ULONG = windows.ULONG;
45const PVOID = windows.PVOID;
46const LPSTR = windows.LPSTR;
47const PENUM_PAGE_FILE_CALLBACKA = windows.PENUM_PAGE_FILE_CALLBACKA;
48
49pub extern "psapi" fn EmptyWorkingSet(hProcess: HANDLE) callconv(WINAPI) BOOL;
50pub extern "psapi" fn EnumDeviceDrivers(lpImageBase: [*]LPVOID, cb: DWORD, lpcbNeeded: *DWORD) callconv(WINAPI) BOOL;
51pub extern "psapi" fn EnumPageFilesA(pCallBackRoutine: PENUM_PAGE_FILE_CALLBACKA, pContext: LPVOID) callconv(WINAPI) BOOL;
52pub extern "psapi" fn EnumPageFilesW(pCallBackRoutine: PENUM_PAGE_FILE_CALLBACKW, pContext: LPVOID) callconv(WINAPI) BOOL;
53pub extern "psapi" fn EnumProcessModules(hProcess: HANDLE, lphModule: [*]HMODULE, cb: DWORD, lpcbNeeded: *DWORD) callconv(WINAPI) BOOL;
54pub extern "psapi" fn EnumProcessModulesEx(hProcess: HANDLE, lphModule: [*]HMODULE, cb: DWORD, lpcbNeeded: *DWORD, dwFilterFlag: DWORD) callconv(WINAPI) BOOL;
55pub extern "psapi" fn EnumProcesses(lpidProcess: [*]DWORD, cb: DWORD, cbNeeded: *DWORD) callconv(WINAPI) BOOL;
56pub extern "psapi" fn GetDeviceDriverBaseNameA(ImageBase: LPVOID, lpBaseName: LPSTR, nSize: DWORD) callconv(WINAPI) DWORD;
57pub extern "psapi" fn GetDeviceDriverBaseNameW(ImageBase: LPVOID, lpBaseName: LPWSTR, nSize: DWORD) callconv(WINAPI) DWORD;
58pub extern "psapi" fn GetDeviceDriverFileNameA(ImageBase: LPVOID, lpFilename: LPSTR, nSize: DWORD) callconv(WINAPI) DWORD;
59pub extern "psapi" fn GetDeviceDriverFileNameW(ImageBase: LPVOID, lpFilename: LPWSTR, nSize: DWORD) callconv(WINAPI) DWORD;
60pub extern "psapi" fn GetMappedFileNameA(hProcess: HANDLE, lpv: ?LPVOID, lpFilename: LPSTR, nSize: DWORD) callconv(WINAPI) DWORD;
61pub extern "psapi" fn GetMappedFileNameW(hProcess: HANDLE, lpv: ?LPVOID, lpFilename: LPWSTR, nSize: DWORD) callconv(WINAPI) DWORD;
62pub extern "psapi" fn GetModuleBaseNameA(hProcess: HANDLE, hModule: ?HMODULE, lpBaseName: LPSTR, nSize: DWORD) callconv(WINAPI) DWORD;
63pub extern "psapi" fn GetModuleBaseNameW(hProcess: HANDLE, hModule: ?HMODULE, lpBaseName: LPWSTR, nSize: DWORD) callconv(WINAPI) DWORD;
64pub extern "psapi" fn GetModuleFileNameExA(hProcess: HANDLE, hModule: ?HMODULE, lpFilename: LPSTR, nSize: DWORD) callconv(WINAPI) DWORD;
65pub extern "psapi" fn GetModuleFileNameExW(hProcess: HANDLE, hModule: ?HMODULE, lpFilename: LPWSTR, nSize: DWORD) callconv(WINAPI) DWORD;
66pub extern "psapi" fn GetModuleInformation(hProcess: HANDLE, hModule: HMODULE, lpmodinfo: *MODULEINFO, cb: DWORD) callconv(WINAPI) BOOL;
67pub extern "psapi" fn GetPerformanceInfo(pPerformanceInformation: *PERFORMANCE_INFORMATION, cb: DWORD) callconv(WINAPI) BOOL;
68pub extern "psapi" fn GetProcessImageFileNameA(hProcess: HANDLE, lpImageFileName: LPSTR, nSize: DWORD) callconv(WINAPI) DWORD;
69pub extern "psapi" fn GetProcessImageFileNameW(hProcess: HANDLE, lpImageFileName: LPWSTR, nSize: DWORD) callconv(WINAPI) DWORD;
70pub extern "psapi" fn GetProcessMemoryInfo(Process: HANDLE, ppsmemCounters: *PROCESS_MEMORY_COUNTERS, cb: DWORD) callconv(WINAPI) BOOL;
71pub extern "psapi" fn GetWsChanges(hProcess: HANDLE, lpWatchInfo: *PSAPI_WS_WATCH_INFORMATION, cb: DWORD) callconv(WINAPI) BOOL;
72pub extern "psapi" fn GetWsChangesEx(hProcess: HANDLE, lpWatchInfoEx: *PSAPI_WS_WATCH_INFORMATION_EX, cb: DWORD) callconv(WINAPI) BOOL;
73pub extern "psapi" fn InitializeProcessForWsWatch(hProcess: HANDLE) callconv(WINAPI) BOOL;
74pub extern "psapi" fn QueryWorkingSet(hProcess: HANDLE, pv: PVOID, cb: DWORD) callconv(WINAPI) BOOL;
75pub extern "psapi" fn QueryWorkingSetEx(hProcess: HANDLE, pv: PVOID, cb: DWORD) callconv(WINAPI) BOOL;
lib/std/os/windows/winmm.zig deleted-73
......@@ -1,73 +0,0 @@
1const std = @import("../../std.zig");
2const windows = std.os.windows;
3const WINAPI = windows.WINAPI;
4const UINT = windows.UINT;
5const BYTE = windows.BYTE;
6const DWORD = windows.DWORD;
7
8pub const MMRESULT = UINT;
9pub const MMSYSERR_BASE = 0;
10pub const TIMERR_BASE = 96;
11pub const MMSYSERR_ERROR = MMSYSERR_BASE + 1;
12pub const MMSYSERR_BADDEVICEID = MMSYSERR_BASE + 2;
13pub const MMSYSERR_NOTENABLED = MMSYSERR_BASE + 3;
14pub const MMSYSERR_ALLOCATED = MMSYSERR_BASE + 4;
15pub const MMSYSERR_INVALHANDLE = MMSYSERR_BASE + 5;
16pub const MMSYSERR_NODRIVER = MMSYSERR_BASE + 6;
17pub const MMSYSERR_NOMEM = MMSYSERR_BASE + 7;
18pub const MMSYSERR_NOTSUPPORTED = MMSYSERR_BASE + 8;
19pub const MMSYSERR_BADERRNUM = MMSYSERR_BASE + 9;
20pub const MMSYSERR_INVALFLAG = MMSYSERR_BASE + 10;
21pub const MMSYSERR_INVALPARAM = MMSYSERR_BASE + 11;
22pub const MMSYSERR_HANDLEBUSY = MMSYSERR_BASE + 12;
23pub const MMSYSERR_INVALIDALIAS = MMSYSERR_BASE + 13;
24pub const MMSYSERR_BADDB = MMSYSERR_BASE + 14;
25pub const MMSYSERR_KEYNOTFOUND = MMSYSERR_BASE + 15;
26pub const MMSYSERR_READERROR = MMSYSERR_BASE + 16;
27pub const MMSYSERR_WRITEERROR = MMSYSERR_BASE + 17;
28pub const MMSYSERR_DELETEERROR = MMSYSERR_BASE + 18;
29pub const MMSYSERR_VALNOTFOUND = MMSYSERR_BASE + 19;
30pub const MMSYSERR_NODRIVERCB = MMSYSERR_BASE + 20;
31pub const MMSYSERR_MOREDATA = MMSYSERR_BASE + 21;
32pub const MMSYSERR_LASTERROR = MMSYSERR_BASE + 21;
33
34pub const MMTIME = extern struct {
35 wType: UINT,
36 u: extern union {
37 ms: DWORD,
38 sample: DWORD,
39 cb: DWORD,
40 ticks: DWORD,
41 smpte: extern struct {
42 hour: BYTE,
43 min: BYTE,
44 sec: BYTE,
45 frame: BYTE,
46 fps: BYTE,
47 dummy: BYTE,
48 pad: [2]BYTE,
49 },
50 midi: extern struct {
51 songptrpos: DWORD,
52 },
53 },
54};
55pub const LPMMTIME = *MMTIME;
56pub const TIME_MS = 0x0001;
57pub const TIME_SAMPLES = 0x0002;
58pub const TIME_BYTES = 0x0004;
59pub const TIME_SMPTE = 0x0008;
60pub const TIME_MIDI = 0x0010;
61pub const TIME_TICKS = 0x0020;
62
63// timeapi.h
64pub const TIMECAPS = extern struct { wPeriodMin: UINT, wPeriodMax: UINT };
65pub const LPTIMECAPS = *TIMECAPS;
66pub const TIMERR_NOERROR = 0;
67pub const TIMERR_NOCANDO = TIMERR_BASE + 1;
68pub const TIMERR_STRUCT = TIMERR_BASE + 33;
69pub extern "winmm" fn timeBeginPeriod(uPeriod: UINT) callconv(WINAPI) MMRESULT;
70pub extern "winmm" fn timeEndPeriod(uPeriod: UINT) callconv(WINAPI) MMRESULT;
71pub extern "winmm" fn timeGetDevCaps(ptc: LPTIMECAPS, cbtc: UINT) callconv(WINAPI) MMRESULT;
72pub extern "winmm" fn timeGetSystemTime(pmmt: LPMMTIME, cbmmt: UINT) callconv(WINAPI) MMRESULT;
73pub extern "winmm" fn timeGetTime() callconv(WINAPI) DWORD;