| author |  LemonBoy <thatlemon@gmail.com> 2020-02-01 15:18:11+01:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2020-02-01 13:43:46-05:00 |
| log | 0bf91cce5855b72e0bddfb94912dcfaa9d77417f |
| tree | 3b4760c0bb74c70ce55beebcfcfc9b21742489fd |
| parent | e6a812c8279defd192fa78f031eb952b9b78a7ed |
windows: Minor changes to psapi prototypes
3 files changed, 38 insertions(+), 30 deletions(-)
lib- std
- os
lib/std/os/windows/bits.zig+18-10
| ... | ... | @@ -1251,12 +1251,14 @@ pub const MODULEINFO = extern struct { |
| 1251 | 1251 | SizeOfImage: DWORD, |
| 1252 | 1252 | EntryPoint: LPVOID, |
| 1253 | 1253 | }; |
| 1254 | pub const LPMODULEINFO = [*c]MODULEINFO; | |
| 1254 | pub const LPMODULEINFO = *MODULEINFO; | |
| 1255 | ||
| 1255 | 1256 | pub const PSAPI_WS_WATCH_INFORMATION = extern struct { |
| 1256 | 1257 | FaultingPc: LPVOID, |
| 1257 | 1258 | FaultingVa: LPVOID, |
| 1258 | 1259 | }; |
| 1259 | pub const PPSAPI_WS_WATCH_INFORMATION = [*c]PSAPI_WS_WATCH_INFORMATION; | |
| 1260 | pub const PPSAPI_WS_WATCH_INFORMATION = *PSAPI_WS_WATCH_INFORMATION; | |
| 1261 | ||
| 1260 | 1262 | pub const PROCESS_MEMORY_COUNTERS = extern struct { |
| 1261 | 1263 | cb: DWORD, |
| 1262 | 1264 | PageFaultCount: DWORD, |
| ... | ... | @@ -1269,7 +1271,8 @@ pub const PROCESS_MEMORY_COUNTERS = extern struct { |
| 1269 | 1271 | PagefileUsage: SIZE_T, |
| 1270 | 1272 | PeakPagefileUsage: SIZE_T, |
| 1271 | 1273 | }; |
| 1272 | pub const PPROCESS_MEMORY_COUNTERS = [*c]PROCESS_MEMORY_COUNTERS; | |
| 1274 | pub const PPROCESS_MEMORY_COUNTERS = *PROCESS_MEMORY_COUNTERS; | |
| 1275 | ||
| 1273 | 1276 | pub const PROCESS_MEMORY_COUNTERS_EX = extern struct { |
| 1274 | 1277 | cb: DWORD, |
| 1275 | 1278 | PageFaultCount: DWORD, |
| ... | ... | @@ -1283,7 +1286,8 @@ pub const PROCESS_MEMORY_COUNTERS_EX = extern struct { |
| 1283 | 1286 | PeakPagefileUsage: SIZE_T, |
| 1284 | 1287 | PrivateUsage: SIZE_T, |
| 1285 | 1288 | }; |
| 1286 | pub const PPROCESS_MEMORY_COUNTERS_EX = [*c]PROCESS_MEMORY_COUNTERS_EX; | |
| 1289 | pub const PPROCESS_MEMORY_COUNTERS_EX = *PROCESS_MEMORY_COUNTERS_EX; | |
| 1290 | ||
| 1287 | 1291 | pub const PERFORMANCE_INFORMATION = extern struct { |
| 1288 | 1292 | cb: DWORD, |
| 1289 | 1293 | CommitTotal: SIZE_T, |
| ... | ... | @@ -1300,9 +1304,11 @@ pub const PERFORMANCE_INFORMATION = extern struct { |
| 1300 | 1304 | ProcessCount: DWORD, |
| 1301 | 1305 | ThreadCount: DWORD, |
| 1302 | 1306 | }; |
| 1303 | pub const PPERFORMANCE_INFORMATION = [*c]PERFORMANCE_INFORMATION; | |
| 1307 | pub const PPERFORMANCE_INFORMATION = *PERFORMANCE_INFORMATION; | |
| 1308 | ||
| 1304 | 1309 | pub const PERFORMACE_INFORMATION = PERFORMANCE_INFORMATION; |
| 1305 | pub const PPERFORMACE_INFORMATION = [*c]PERFORMANCE_INFORMATION; | |
| 1310 | pub const PPERFORMACE_INFORMATION = *PERFORMANCE_INFORMATION; | |
| 1311 | ||
| 1306 | 1312 | pub const ENUM_PAGE_FILE_INFORMATION = extern struct { |
| 1307 | 1313 | cb: DWORD, |
| 1308 | 1314 | Reserved: DWORD, |
| ... | ... | @@ -1310,12 +1316,14 @@ pub const ENUM_PAGE_FILE_INFORMATION = extern struct { |
| 1310 | 1316 | TotalInUse: SIZE_T, |
| 1311 | 1317 | PeakUsage: SIZE_T, |
| 1312 | 1318 | }; |
| 1313 | pub const PENUM_PAGE_FILE_INFORMATION = [*c]ENUM_PAGE_FILE_INFORMATION; | |
| 1314 | pub const PENUM_PAGE_FILE_CALLBACKW = ?fn (LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCWSTR) callconv(.C) BOOL; | |
| 1315 | pub const PENUM_PAGE_FILE_CALLBACKA = ?fn (LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCSTR) callconv(.C) BOOL; | |
| 1319 | pub const PENUM_PAGE_FILE_INFORMATION = *ENUM_PAGE_FILE_INFORMATION; | |
| 1320 | ||
| 1321 | pub const PENUM_PAGE_FILE_CALLBACKW = ?fn (?LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCWSTR) callconv(.C) BOOL; | |
| 1322 | pub const PENUM_PAGE_FILE_CALLBACKA = ?fn (?LPVOID, PENUM_PAGE_FILE_INFORMATION, LPCSTR) callconv(.C) BOOL; | |
| 1323 | ||
| 1316 | 1324 | pub const PSAPI_WS_WATCH_INFORMATION_EX = extern struct { |
| 1317 | 1325 | BasicInfo: PSAPI_WS_WATCH_INFORMATION, |
| 1318 | 1326 | FaultingThreadId: ULONG_PTR, |
| 1319 | 1327 | Flags: ULONG_PTR, |
| 1320 | 1328 | }; |
| 1321 | pub const PPSAPI_WS_WATCH_INFORMATION_EX = [*c]PSAPI_WS_WATCH_INFORMATION_EX; | |
| 1329 | pub const PPSAPI_WS_WATCH_INFORMATION_EX = *PSAPI_WS_WATCH_INFORMATION_EX; |
lib/std/os/windows/kernel32.zig+10-10
| ... | ... | @@ -250,22 +250,22 @@ pub extern "kernel32" fn DeleteCriticalSection(lpCriticalSection: *CRITICAL_SECT |
| 250 | 250 | pub extern "kernel32" fn InitOnceExecuteOnce(InitOnce: *INIT_ONCE, InitFn: INIT_ONCE_FN, Parameter: ?*c_void, Context: ?*c_void) callconv(.Stdcall) BOOL; |
| 251 | 251 | |
| 252 | 252 | pub extern "kernel32" fn K32EmptyWorkingSet(hProcess: HANDLE) callconv(.Stdcall) BOOL; |
| 253 | pub extern "kernel32" fn K32EnumDeviceDrivers(lpImageBase: [*c]LPVOID, cb: DWORD, lpcbNeeded: LPDWORD) callconv(.Stdcall) BOOL; | |
| 253 | pub extern "kernel32" fn K32EnumDeviceDrivers(lpImageBase: [*]LPVOID, cb: DWORD, lpcbNeeded: LPDWORD) callconv(.Stdcall) BOOL; | |
| 254 | 254 | pub extern "kernel32" fn K32EnumPageFilesA(pCallBackRoutine: PENUM_PAGE_FILE_CALLBACKA, pContext: LPVOID) callconv(.Stdcall) BOOL; |
| 255 | 255 | pub extern "kernel32" fn K32EnumPageFilesW(pCallBackRoutine: PENUM_PAGE_FILE_CALLBACKW, pContext: LPVOID) callconv(.Stdcall) BOOL; |
| 256 | pub extern "kernel32" fn K32EnumProcessModules(hProcess: HANDLE, lphModule: [*c]HMODULE, cb: DWORD, lpcbNeeded: LPDWORD) callconv(.Stdcall) BOOL; | |
| 257 | pub extern "kernel32" fn K32EnumProcessModulesEx(hProcess: HANDLE, lphModule: [*c]HMODULE, cb: DWORD, lpcbNeeded: LPDWORD, dwFilterFlag: DWORD) callconv(.Stdcall) BOOL; | |
| 258 | pub extern "kernel32" fn K32EnumProcesses(lpidProcess: [*c]DWORD, cb: DWORD, cbNeeded: [*c]DWORD) callconv(.Stdcall) BOOL; | |
| 256 | pub extern "kernel32" fn K32EnumProcessModules(hProcess: HANDLE, lphModule: [*]HMODULE, cb: DWORD, lpcbNeeded: LPDWORD) callconv(.Stdcall) BOOL; | |
| 257 | pub extern "kernel32" fn K32EnumProcessModulesEx(hProcess: HANDLE, lphModule: [*]HMODULE, cb: DWORD, lpcbNeeded: LPDWORD, dwFilterFlag: DWORD) callconv(.Stdcall) BOOL; | |
| 258 | pub extern "kernel32" fn K32EnumProcesses(lpidProcess: [*]DWORD, cb: DWORD, cbNeeded: LPDWORD) callconv(.Stdcall) BOOL; | |
| 259 | 259 | pub extern "kernel32" fn K32GetDeviceDriverBaseNameA(ImageBase: LPVOID, lpBaseName: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; |
| 260 | 260 | pub extern "kernel32" fn K32GetDeviceDriverBaseNameW(ImageBase: LPVOID, lpBaseName: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; |
| 261 | 261 | pub extern "kernel32" fn K32GetDeviceDriverFileNameA(ImageBase: LPVOID, lpFilename: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; |
| 262 | 262 | pub extern "kernel32" fn K32GetDeviceDriverFileNameW(ImageBase: LPVOID, lpFilename: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; |
| 263 | pub extern "kernel32" fn K32GetMappedFileNameA(hProcess: HANDLE, lpv: LPVOID, lpFilename: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 264 | pub extern "kernel32" fn K32GetMappedFileNameW(hProcess: HANDLE, lpv: LPVOID, lpFilename: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 265 | pub extern "kernel32" fn K32GetModuleBaseNameA(hProcess: HANDLE, hModule: HMODULE, lpBaseName: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 266 | pub extern "kernel32" fn K32GetModuleBaseNameW(hProcess: HANDLE, hModule: HMODULE, lpBaseName: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 267 | pub extern "kernel32" fn K32GetModuleFileNameExA(hProcess: HANDLE, hModule: HMODULE, lpFilename: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 268 | pub extern "kernel32" fn K32GetModuleFileNameExW(hProcess: HANDLE, hModule: HMODULE, lpFilename: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 263 | pub extern "kernel32" fn K32GetMappedFileNameA(hProcess: HANDLE, lpv: ?LPVOID, lpFilename: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 264 | pub extern "kernel32" fn K32GetMappedFileNameW(hProcess: HANDLE, lpv: ?LPVOID, lpFilename: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 265 | pub extern "kernel32" fn K32GetModuleBaseNameA(hProcess: HANDLE, hModule: ?HMODULE, lpBaseName: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 266 | pub extern "kernel32" fn K32GetModuleBaseNameW(hProcess: HANDLE, hModule: ?HMODULE, lpBaseName: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 267 | pub extern "kernel32" fn K32GetModuleFileNameExA(hProcess: HANDLE, hModule: ?HMODULE, lpFilename: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 268 | pub extern "kernel32" fn K32GetModuleFileNameExW(hProcess: HANDLE, hModule: ?HMODULE, lpFilename: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 269 | 269 | pub extern "kernel32" fn K32GetModuleInformation(hProcess: HANDLE, hModule: HMODULE, lpmodinfo: LPMODULEINFO, cb: DWORD) callconv(.Stdcall) BOOL; |
| 270 | 270 | pub extern "kernel32" fn K32GetPerformanceInfo(pPerformanceInformation: PPERFORMACE_INFORMATION, cb: DWORD) callconv(.Stdcall) BOOL; |
| 271 | 271 | pub extern "kernel32" fn K32GetProcessImageFileNameA(hProcess: HANDLE, lpImageFileName: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; |
lib/std/os/windows/psapi.zig+10-10
| ... | ... | @@ -1,22 +1,22 @@ |
| 1 | 1 | usingnamespace @import("bits.zig"); |
| 2 | 2 | |
| 3 | 3 | pub extern "psapi" fn EmptyWorkingSet(hProcess: HANDLE) callconv(.Stdcall) BOOL; |
| 4 | pub extern "psapi" fn EnumDeviceDrivers(lpImageBase: [*c]LPVOID, cb: DWORD, lpcbNeeded: LPDWORD) callconv(.Stdcall) BOOL; | |
| 4 | pub extern "psapi" fn EnumDeviceDrivers(lpImageBase: [*]LPVOID, cb: DWORD, lpcbNeeded: LPDWORD) callconv(.Stdcall) BOOL; | |
| 5 | 5 | pub extern "psapi" fn EnumPageFilesA(pCallBackRoutine: PENUM_PAGE_FILE_CALLBACKA, pContext: LPVOID) callconv(.Stdcall) BOOL; |
| 6 | 6 | pub extern "psapi" fn EnumPageFilesW(pCallBackRoutine: PENUM_PAGE_FILE_CALLBACKW, pContext: LPVOID) callconv(.Stdcall) BOOL; |
| 7 | pub extern "psapi" fn EnumProcessModules(hProcess: HANDLE, lphModule: [*c]HMODULE, cb: DWORD, lpcbNeeded: LPDWORD) callconv(.Stdcall) BOOL; | |
| 8 | pub extern "psapi" fn EnumProcessModulesEx(hProcess: HANDLE, lphModule: [*c]HMODULE, cb: DWORD, lpcbNeeded: LPDWORD, dwFilterFlag: DWORD) callconv(.Stdcall) BOOL; | |
| 9 | pub extern "psapi" fn EnumProcesses(lpidProcess: [*c]DWORD, cb: DWORD, cbNeeded: [*c]DWORD) callconv(.Stdcall) BOOL; | |
| 7 | pub extern "psapi" fn EnumProcessModules(hProcess: HANDLE, lphModule: [*]HMODULE, cb: DWORD, lpcbNeeded: LPDWORD) callconv(.Stdcall) BOOL; | |
| 8 | pub extern "psapi" fn EnumProcessModulesEx(hProcess: HANDLE, lphModule: [*]HMODULE, cb: DWORD, lpcbNeeded: LPDWORD, dwFilterFlag: DWORD) callconv(.Stdcall) BOOL; | |
| 9 | pub extern "psapi" fn EnumProcesses(lpidProcess: [*]DWORD, cb: DWORD, cbNeeded: LPDWORD) callconv(.Stdcall) BOOL; | |
| 10 | 10 | pub extern "psapi" fn GetDeviceDriverBaseNameA(ImageBase: LPVOID, lpBaseName: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; |
| 11 | 11 | pub extern "psapi" fn GetDeviceDriverBaseNameW(ImageBase: LPVOID, lpBaseName: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; |
| 12 | 12 | pub extern "psapi" fn GetDeviceDriverFileNameA(ImageBase: LPVOID, lpFilename: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; |
| 13 | 13 | pub extern "psapi" fn GetDeviceDriverFileNameW(ImageBase: LPVOID, lpFilename: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; |
| 14 | pub extern "psapi" fn GetMappedFileNameA(hProcess: HANDLE, lpv: LPVOID, lpFilename: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 15 | pub extern "psapi" fn GetMappedFileNameW(hProcess: HANDLE, lpv: LPVOID, lpFilename: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 16 | pub extern "psapi" fn GetModuleBaseNameA(hProcess: HANDLE, hModule: HMODULE, lpBaseName: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 17 | pub extern "psapi" fn GetModuleBaseNameW(hProcess: HANDLE, hModule: HMODULE, lpBaseName: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 18 | pub extern "psapi" fn GetModuleFileNameExA(hProcess: HANDLE, hModule: HMODULE, lpFilename: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 19 | pub extern "psapi" fn GetModuleFileNameExW(hProcess: HANDLE, hModule: HMODULE, lpFilename: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 14 | pub extern "psapi" fn GetMappedFileNameA(hProcess: HANDLE, lpv: ?LPVOID, lpFilename: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 15 | pub extern "psapi" fn GetMappedFileNameW(hProcess: HANDLE, lpv: ?LPVOID, lpFilename: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 16 | pub extern "psapi" fn GetModuleBaseNameA(hProcess: HANDLE, hModule: ?HMODULE, lpBaseName: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 17 | pub extern "psapi" fn GetModuleBaseNameW(hProcess: HANDLE, hModule: ?HMODULE, lpBaseName: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 18 | pub extern "psapi" fn GetModuleFileNameExA(hProcess: HANDLE, hModule: ?HMODULE, lpFilename: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 19 | pub extern "psapi" fn GetModuleFileNameExW(hProcess: HANDLE, hModule: ?HMODULE, lpFilename: LPWSTR, nSize: DWORD) callconv(.Stdcall) DWORD; | |
| 20 | 20 | pub extern "psapi" fn GetModuleInformation(hProcess: HANDLE, hModule: HMODULE, lpmodinfo: LPMODULEINFO, cb: DWORD) callconv(.Stdcall) BOOL; |
| 21 | 21 | pub extern "psapi" fn GetPerformanceInfo(pPerformanceInformation: PPERFORMACE_INFORMATION, cb: DWORD) callconv(.Stdcall) BOOL; |
| 22 | 22 | pub extern "psapi" fn GetProcessImageFileNameA(hProcess: HANDLE, lpImageFileName: LPSTR, nSize: DWORD) callconv(.Stdcall) DWORD; |