diff --git a/aimeio/meson.build b/aimeio/meson.build index ddbb66a..46b0beb 100644 --- a/aimeio/meson.build +++ b/aimeio/meson.build @@ -3,7 +3,6 @@ aimeio_lib = static_library( name_prefix : '', include_directories: inc, implicit_include_directories : false, - c_pch : '../precompiled.h', link_with : [ util_lib, ], diff --git a/amex/ds.c b/amex/ds.c index c0f357f..74d1c85 100644 --- a/amex/ds.c +++ b/amex/ds.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include "amex/ds.h" diff --git a/amex/meson.build b/amex/meson.build index 0f4d61e..7476aa4 100644 --- a/amex/meson.build +++ b/amex/meson.build @@ -2,7 +2,6 @@ amex_lib = static_library( 'amex', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), ], diff --git a/board/aime-dll.h b/board/aime-dll.h index 75dba9e..25c52f0 100644 --- a/board/aime-dll.h +++ b/board/aime-dll.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "aimeio/aimeio.h" diff --git a/board/ffb.h b/board/ffb.h index af46fe3..4dbc057 100644 --- a/board/ffb.h +++ b/board/ffb.h @@ -2,6 +2,7 @@ #include #include +#include struct ffb_config { bool enable; diff --git a/board/io3.c b/board/io3.c index 24d1b5e..d61cfdc 100644 --- a/board/io3.c +++ b/board/io3.c @@ -16,6 +16,7 @@ #include #include #include +#include #include "board/io3.h" diff --git a/board/io4.c b/board/io4.c index 5c7d822..e1def19 100644 --- a/board/io4.c +++ b/board/io4.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "board/config.h" #include "board/guid.h" diff --git a/board/io4.h b/board/io4.h index 914c045..09a921b 100644 --- a/board/io4.h +++ b/board/io4.h @@ -3,6 +3,7 @@ #include #include +#include #define IO4_REPORT_OUT_PAYLOAD_LEN 62 diff --git a/board/led15070.c b/board/led15070.c index 6a634e8..c2d62a5 100644 --- a/board/led15070.c +++ b/board/led15070.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -242,7 +243,7 @@ static HRESULT led15070_handle_irp_locked(int board, struct irp *irp) dump_iobuf(&boarduart->written); #endif - req_iobuf.bytes = (byte*)&req; + req_iobuf.bytes = (uint8_t*)&req; req_iobuf.nbytes = sizeof(req.hdr) + sizeof(req.cmd) + sizeof(req.payload); req_iobuf.pos = 0; diff --git a/board/led15093.c b/board/led15093.c index f92a6f2..a070a24 100644 --- a/board/led15093.c +++ b/board/led15093.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include "board/led15093-cmd.h" @@ -272,7 +273,7 @@ static HRESULT led15093_handle_irp_locked(int board, struct irp *irp) dump_iobuf(&boarduart->written); #endif - req_iobuf.bytes = (byte*)&req; + req_iobuf.bytes = (uint8_t*)&req; req_iobuf.nbytes = sizeof(req.hdr) + sizeof(req.payload); req_iobuf.pos = 0; diff --git a/board/meson.build b/board/meson.build index 2a6cf70..a9c24ea 100644 --- a/board/meson.build +++ b/board/meson.build @@ -2,7 +2,6 @@ board_lib = static_library( 'board', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), ], diff --git a/board/vfd.c b/board/vfd.c index abc487a..34b89d4 100644 --- a/board/vfd.c +++ b/board/vfd.c @@ -8,6 +8,7 @@ #include #include +#include #include "board/config.h" #include "board/vfd.h" diff --git a/carolhook/meson.build b/carolhook/meson.build index cba763c..bd7fed2 100644 --- a/carolhook/meson.build +++ b/carolhook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'carolhook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/carolio/meson.build b/carolio/meson.build index dcb81ab..e7a7bb2 100644 --- a/carolio/meson.build +++ b/carolio/meson.build @@ -3,7 +3,6 @@ carolio_lib = static_library( name_prefix : '', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', sources : [ 'carolio.c', 'carolio.h', diff --git a/chunihook/config.c b/chunihook/config.c index dd1497d..2ad959e 100644 --- a/chunihook/config.c +++ b/chunihook/config.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "amex/amex.h" #include "amex/config.h" diff --git a/chunihook/meson.build b/chunihook/meson.build index 3f4a35d..b758676 100644 --- a/chunihook/meson.build +++ b/chunihook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'chunihook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/chuniio/chuniio.c b/chuniio/chuniio.c index 5d87215..614dc47 100644 --- a/chuniio/chuniio.c +++ b/chuniio/chuniio.c @@ -4,6 +4,7 @@ #include #include #include +#include #include "chuniio/chuniio.h" #include "chuniio/config.h" @@ -93,7 +94,7 @@ void chuni_io_jvs_poll(uint8_t *opbtn, uint8_t *beams) } else { // Use actual AIR for (i = 0; i < 6; i++) { - if(GetAsyncKeyState(chuni_io_cfg.vk_ir[i]) & 0x8000) { + if (GetAsyncKeyState(chuni_io_cfg.vk_ir[i]) & 0x8000) { *beams |= (1 << i); } else { *beams &= ~(1 << i); diff --git a/chuniio/config.c b/chuniio/config.c index 0f8b31b..a7b5273 100644 --- a/chuniio/config.c +++ b/chuniio/config.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include "chuniio/config.h" diff --git a/chuniio/config.h b/chuniio/config.h index 8c5bf2c..eac6f7a 100644 --- a/chuniio/config.h +++ b/chuniio/config.h @@ -2,6 +2,7 @@ #include #include +#include struct chuni_io_config { uint8_t vk_test; diff --git a/chuniio/leddata.h b/chuniio/leddata.h index 0764c9f..564455b 100644 --- a/chuniio/leddata.h +++ b/chuniio/leddata.h @@ -13,10 +13,10 @@ // This struct is used to send data related to the slider and billboard LEDs struct _chuni_led_data_buf_t { - byte framing; // Sync byte + uint8_t framing; // Sync byte uint8_t board; // LED output the data is for (0-1: billboard, 2: slider) - byte data[LED_OUTPUT_DATA_SIZE_MAX]; // Buffer for LEDs - byte data_len; // How many bytes to output from the buffer + uint8_t data[LED_OUTPUT_DATA_SIZE_MAX]; // Buffer for LEDs + uint8_t data_len; // How many bytes to output from the buffer }; -static byte chuni_led_board_data_lens[LED_BOARDS_TOTAL] = {53*3, 63*3, 31*3}; \ No newline at end of file +static uint8_t chuni_led_board_data_lens[LED_BOARDS_TOTAL] = {53*3, 63*3, 31*3}; \ No newline at end of file diff --git a/chuniio/ledoutput.c b/chuniio/ledoutput.c index 6052e42..d4660b6 100644 --- a/chuniio/ledoutput.c +++ b/chuniio/ledoutput.c @@ -73,14 +73,14 @@ struct _chuni_led_data_buf_t* escape_led_data(struct _chuni_led_data_buf_t* unes { struct _chuni_led_data_buf_t* out_struct = &led_escaped_buf[unescaped->board]; - byte* in_buf = unescaped->data; - byte* out_buf = out_struct->data; + uint8_t* in_buf = unescaped->data; + uint8_t* out_buf = out_struct->data; int i = 0; int o = 0; while (i < unescaped->data_len) { - byte b = in_buf[i++]; + uint8_t b = in_buf[i++]; if (b == LED_PACKET_FRAMING || b == LED_PACKET_ESCAPE) { out_buf[o++] = LED_PACKET_ESCAPE; @@ -94,7 +94,7 @@ struct _chuni_led_data_buf_t* escape_led_data(struct _chuni_led_data_buf_t* unes return out_struct; } -void led_output_update(uint8_t board, const byte* rgb) +void led_output_update(uint8_t board, const uint8_t* rgb) { if (board < 0 || board > 2 || !any_outputs_enabled) { diff --git a/chuniio/ledoutput.h b/chuniio/ledoutput.h index 33a4180..86642b9 100644 --- a/chuniio/ledoutput.h +++ b/chuniio/ledoutput.h @@ -16,4 +16,4 @@ extern HANDLE led_init_mutex; HRESULT led_output_init(struct chuni_io_config* const cfg); -void led_output_update(uint8_t board, const byte* rgb); +void led_output_update(uint8_t board, const uint8_t* rgb); diff --git a/chuniio/meson.build b/chuniio/meson.build index 8b03dff..eda00f0 100644 --- a/chuniio/meson.build +++ b/chuniio/meson.build @@ -3,7 +3,6 @@ chuniio_lib = static_library( name_prefix : '', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', sources : [ 'chu2to3.c', diff --git a/chuniio/serialimpl.c b/chuniio/serialimpl.c index 7a68435..a111f93 100644 --- a/chuniio/serialimpl.c +++ b/chuniio/serialimpl.c @@ -98,7 +98,7 @@ void led_serial_update(struct _chuni_led_data_buf_t* data) ReleaseMutex(serial_write_mutex); } -void led_serial_update_openithm(const byte* rgb) +void led_serial_update_openithm(const uint8_t* rgb) { if (serial_port != INVALID_HANDLE_VALUE) { diff --git a/chuniio/serialimpl.h b/chuniio/serialimpl.h index 3f37803..b4b6f73 100644 --- a/chuniio/serialimpl.h +++ b/chuniio/serialimpl.h @@ -8,9 +8,10 @@ #pragma once #include +#include #include "chuniio/leddata.h" HRESULT led_serial_init(wchar_t led_com[12], DWORD baud); void led_serial_update(struct _chuni_led_data_buf_t* data); -void led_serial_update_openithm(const byte* rgb); \ No newline at end of file +void led_serial_update_openithm(const uint8_t* rgb); \ No newline at end of file diff --git a/chusanhook/chuni-dll.c b/chusanhook/chuni-dll.c index 0e7c634..574cbe2 100644 --- a/chusanhook/chuni-dll.c +++ b/chusanhook/chuni-dll.c @@ -2,6 +2,7 @@ #include #include +#include #include "chuniio/chu2to3.h" #include "chusanhook/chuni-dll.h" diff --git a/chusanhook/config.c b/chusanhook/config.c index fa6f19f..0ec8c61 100644 --- a/chusanhook/config.c +++ b/chusanhook/config.c @@ -1,5 +1,6 @@ #include #include +#include #include "board/config.h" diff --git a/chusanhook/meson.build b/chusanhook/meson.build index 69250bb..f7c622f 100644 --- a/chusanhook/meson.build +++ b/chusanhook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'chusanhook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/cmhook/config.c b/cmhook/config.c index c0c0bfd..47fcfa8 100644 --- a/cmhook/config.c +++ b/cmhook/config.c @@ -1,5 +1,6 @@ #include #include +#include #include "board/config.h" diff --git a/cmhook/meson.build b/cmhook/meson.build index 6c645c2..8828da9 100644 --- a/cmhook/meson.build +++ b/cmhook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'cmhook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/cmio/meson.build b/cmio/meson.build index 74fadda..d7a5ba6 100644 --- a/cmio/meson.build +++ b/cmio/meson.build @@ -3,7 +3,6 @@ cmio_lib = static_library( name_prefix : '', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', sources : [ 'cmio.c', 'cmio.h', diff --git a/cxbhook/config.c b/cxbhook/config.c index c83694d..98d326d 100644 --- a/cxbhook/config.c +++ b/cxbhook/config.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "amex/amex.h" #include "amex/config.h" diff --git a/cxbhook/led.c b/cxbhook/led.c index b7d4f9b..662f7f9 100644 --- a/cxbhook/led.c +++ b/cxbhook/led.c @@ -1,6 +1,9 @@ #include + +#include #include #include +#include #include "cxbhook/led.h" #include "cxbhook/cxb-dll.h" diff --git a/cxbhook/meson.build b/cxbhook/meson.build index 68f8f76..e69ffff 100644 --- a/cxbhook/meson.build +++ b/cxbhook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'cxbhook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/cxbhook/revio.c b/cxbhook/revio.c index 7b3d25b..84ab016 100644 --- a/cxbhook/revio.c +++ b/cxbhook/revio.c @@ -1,6 +1,9 @@ #include + +#include #include #include +#include #include #include "cxbhook/revio.h" diff --git a/cxbio/meson.build b/cxbio/meson.build index 2ce52d2..5933602 100644 --- a/cxbio/meson.build +++ b/cxbio/meson.build @@ -3,7 +3,6 @@ cxbio_lib = static_library( name_prefix : '', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', sources : [ 'cxbio.c', 'cxbio.h', diff --git a/divahook/meson.build b/divahook/meson.build index e291f3e..4c66c00 100644 --- a/divahook/meson.build +++ b/divahook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'divahook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/divaio/meson.build b/divaio/meson.build index edac3b6..3d4f611 100644 --- a/divaio/meson.build +++ b/divaio/meson.build @@ -3,7 +3,6 @@ divaio_lib = static_library( name_prefix : '', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', sources : [ 'divaio.c', 'divaio.h', diff --git a/fgohook/config.c b/fgohook/config.c index b2bb7f5..30dbf86 100644 --- a/fgohook/config.c +++ b/fgohook/config.c @@ -1,5 +1,6 @@ #include #include +#include #include "board/config.h" diff --git a/fgohook/ftdi.c b/fgohook/ftdi.c index 9a04b71..e39a7c2 100644 --- a/fgohook/ftdi.c +++ b/fgohook/ftdi.c @@ -16,8 +16,10 @@ #include #include -#include + #include +#include +#include #include #include "fgohook/ftdi.h" diff --git a/fgohook/meson.build b/fgohook/meson.build index 257048b..3d3e067 100644 --- a/fgohook/meson.build +++ b/fgohook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'fgohook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/fgoio/meson.build b/fgoio/meson.build index d8a4881..eed2fd3 100644 --- a/fgoio/meson.build +++ b/fgoio/meson.build @@ -3,7 +3,6 @@ fgoio_lib = static_library( name_prefix : '', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ xinput_lib, ], diff --git a/gfxhook/meson.build b/gfxhook/meson.build index 1cf8df3..4f7b1a5 100644 --- a/gfxhook/meson.build +++ b/gfxhook/meson.build @@ -2,7 +2,6 @@ gfxhook_lib = static_library( 'gfxhook', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), dxguid_lib, diff --git a/hooklib/config.c b/hooklib/config.c index d9db805..b7a84cf 100644 --- a/hooklib/config.c +++ b/hooklib/config.c @@ -2,6 +2,7 @@ #include #include +#include #include #include "hooklib/config.h" diff --git a/hooklib/createprocess.c b/hooklib/createprocess.c index e44ebdb..6462394 100644 --- a/hooklib/createprocess.c +++ b/hooklib/createprocess.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include "hook/table.h" diff --git a/hooklib/cursor.c b/hooklib/cursor.c index 8c66412..87e3ca8 100644 --- a/hooklib/cursor.c +++ b/hooklib/cursor.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include "hook/table.h" diff --git a/hooklib/dns.c b/hooklib/dns.c index 7cea522..45b463e 100644 --- a/hooklib/dns.c +++ b/hooklib/dns.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "hook/hr.h" @@ -317,7 +318,7 @@ HRESULT dns_hook_push(const wchar_t *from_src, const wchar_t *to_src) goto end; } - if(to_src != NULL) { + if (to_src != NULL) { to = _wcsdup(to_src); if (to == NULL) { @@ -397,7 +398,7 @@ static DNS_STATUS WINAPI hook_DnsQuery_A( pos = &dns_hook_entries[i]; if (match_domain(wstr, pos->from)) { - if(pos->to == NULL) { + if (pos->to == NULL) { LeaveCriticalSection(&dns_hook_lock); hr = HRESULT_FROM_WIN32(DNS_ERROR_RCODE_NAME_ERROR); @@ -461,7 +462,7 @@ static DNS_STATUS WINAPI hook_DnsQuery_W( pos = &dns_hook_entries[i]; if (match_domain(pszName, pos->from)) { - if(pos->to == NULL) { + if (pos->to == NULL) { LeaveCriticalSection(&dns_hook_lock); return HRESULT_FROM_WIN32(DNS_ERROR_RCODE_NAME_ERROR); } @@ -505,7 +506,7 @@ static DNS_STATUS WINAPI hook_DnsQueryEx( pos = &dns_hook_entries[i]; if (match_domain(pRequest->QueryName, pos->from)) { - if(pos->to == NULL) { + if (pos->to == NULL) { LeaveCriticalSection(&dns_hook_lock); return HRESULT_FROM_WIN32(DNS_ERROR_RCODE_NAME_ERROR); } @@ -572,7 +573,7 @@ static int WSAAPI hook_getaddrinfo( pos = &dns_hook_entries[i]; if (match_domain(wstr, pos->from)) { - if(pos->to == NULL) { + if (pos->to == NULL) { LeaveCriticalSection(&dns_hook_lock); result = EAI_NONAME; @@ -626,7 +627,7 @@ static HINTERNET WINAPI hook_WinHttpConnect( pos = &dns_hook_entries[i]; if (match_domain(pwszServerName, pos->from)) { - if(pos->to == NULL) { + if (pos->to == NULL) { LeaveCriticalSection(&dns_hook_lock); return NULL; } @@ -661,7 +662,7 @@ static bool WINAPI hook_WinHttpCrackUrl( wchar_t* toAddr = pos->to; wchar_t titleBuffer[255]; - if(wcscmp(toAddr, L"title") == 0) { + if (wcscmp(toAddr, L"title") == 0) { size_t wstr_c; mbstowcs_s(&wstr_c, titleBuffer, 255, received_title_url, strlen(received_title_url)); toAddr = titleBuffer; diff --git a/hooklib/meson.build b/hooklib/meson.build index 4a74e05..7d5e7b8 100644 --- a/hooklib/meson.build +++ b/hooklib/meson.build @@ -2,7 +2,6 @@ hooklib_lib = static_library( 'hooklib', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), ], diff --git a/hooklib/spike.c b/hooklib/spike.c index f06166c..007c6ef 100644 --- a/hooklib/spike.c +++ b/hooklib/spike.c @@ -1,5 +1,6 @@ #include +#include #include #include #include diff --git a/iccard/aime.c b/iccard/aime.c index 5d2b1cd..bae12c1 100644 --- a/iccard/aime.c +++ b/iccard/aime.c @@ -1,6 +1,8 @@ #include #include #include +#include +#include #include "iccard/aime.h" #include "iccard/mifare.h" diff --git a/iccard/felica.c b/iccard/felica.c index 64ef897..392f3b2 100644 --- a/iccard/felica.c +++ b/iccard/felica.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "hook/iobuf.h" diff --git a/iccard/meson.build b/iccard/meson.build index e068ae0..72a6f78 100644 --- a/iccard/meson.build +++ b/iccard/meson.build @@ -2,7 +2,6 @@ iccard_lib = static_library( 'iccard', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), ], diff --git a/idachook/config.c b/idachook/config.c index 43455ae..279aba7 100644 --- a/idachook/config.c +++ b/idachook/config.c @@ -1,5 +1,6 @@ #include #include +#include #include "board/config.h" #include "board/sg-reader.h" diff --git a/idachook/indrun.c b/idachook/indrun.c index 1b9eb77..758a677 100644 --- a/idachook/indrun.c +++ b/idachook/indrun.c @@ -1,5 +1,6 @@ #include #include +#include #include "hook/table.h" diff --git a/idachook/meson.build b/idachook/meson.build index 66e8602..2cb6456 100644 --- a/idachook/meson.build +++ b/idachook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'idachook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/idachook/zinput.c b/idachook/zinput.c index 59c77b5..a425307 100644 --- a/idachook/zinput.c +++ b/idachook/zinput.c @@ -1,6 +1,7 @@ #include #include +#include #include #include #include diff --git a/idacio/di.c b/idacio/di.c index 5310774..8a464ed 100644 --- a/idacio/di.c +++ b/idacio/di.c @@ -1,8 +1,10 @@ #include #include +#include #include #include +#include #include #include "idacio/backend.h" diff --git a/idacio/meson.build b/idacio/meson.build index 7c7eddd..b095fdf 100644 --- a/idacio/meson.build +++ b/idacio/meson.build @@ -3,7 +3,6 @@ idacio_lib = static_library( name_prefix : '', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ dinput8_lib, dxguid_lib, diff --git a/idzhook/config.c b/idzhook/config.c index 7948c84..0378cbe 100644 --- a/idzhook/config.c +++ b/idzhook/config.c @@ -1,5 +1,6 @@ #include #include +#include #include "amex/amex.h" #include "amex/config.h" diff --git a/idzhook/meson.build b/idzhook/meson.build index eb9ba6c..6649489 100644 --- a/idzhook/meson.build +++ b/idzhook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'idzhook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/idzhook/zinput.c b/idzhook/zinput.c index dbc3b47..23e0e30 100644 --- a/idzhook/zinput.c +++ b/idzhook/zinput.c @@ -1,6 +1,7 @@ #include #include +#include #include #include #include diff --git a/idzio/di.c b/idzio/di.c index 8d8be41..00968fa 100644 --- a/idzio/di.c +++ b/idzio/di.c @@ -1,8 +1,10 @@ #include #include +#include #include #include +#include #include #include "idzio/backend.h" diff --git a/idzio/meson.build b/idzio/meson.build index bfab168..3a777bb 100644 --- a/idzio/meson.build +++ b/idzio/meson.build @@ -3,7 +3,6 @@ idzio_lib = static_library( name_prefix : '', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ dinput8_lib, dxguid_lib, diff --git a/idzio/xi.c b/idzio/xi.c index 515be2f..da566f0 100644 --- a/idzio/xi.c +++ b/idzio/xi.c @@ -212,7 +212,7 @@ static void idz_xi_jvs_read_analogs(struct idz_io_analog_state *out) left = calculate_norm_steering(left, idz_xi_left_stick_deadzone, idz_xi_linear_steering); right = calculate_norm_steering(right, idz_xi_right_stick_deadzone, idz_xi_linear_steering); - if(idz_xi_single_stick_steering) { + if (idz_xi_single_stick_steering) { out->wheel = left; } else { out->wheel = (left + right) / 2; diff --git a/jvs/jvs-util.c b/jvs/jvs-util.c index 5df33c7..336453e 100644 --- a/jvs/jvs-util.c +++ b/jvs/jvs-util.c @@ -10,6 +10,7 @@ #include "jvs/jvs-util.h" #include "util/dprintf.h" +#include "util/dump.h" typedef HRESULT (*jvs_dispatch_fn_t)( void *ctx, diff --git a/jvs/meson.build b/jvs/meson.build index 49737a0..14a7f66 100644 --- a/jvs/meson.build +++ b/jvs/meson.build @@ -2,7 +2,6 @@ jvs_lib = static_library( 'jvs', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), ], diff --git a/kemonohook/config.c b/kemonohook/config.c index 3eb85c8..ec00aa1 100644 --- a/kemonohook/config.c +++ b/kemonohook/config.c @@ -1,5 +1,6 @@ #include #include +#include #include "amex/config.h" diff --git a/kemonohook/dllmain.c b/kemonohook/dllmain.c index 0fedd5e..83a4290 100644 --- a/kemonohook/dllmain.c +++ b/kemonohook/dllmain.c @@ -1,5 +1,7 @@ #include +#include + #include "board/io4.h" #include "board/sg-reader.h" #include "board/vfd.h" diff --git a/kemonohook/hooks.c b/kemonohook/hooks.c index bdce643..c34302f 100644 --- a/kemonohook/hooks.c +++ b/kemonohook/hooks.c @@ -1,3 +1,5 @@ +#include + #include "hook/iohook.h" #include "hook/procaddr.h" #include "hook/table.h" diff --git a/kemonohook/meson.build b/kemonohook/meson.build index 78538dd..63dc9e1 100644 --- a/kemonohook/meson.build +++ b/kemonohook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'kemonohook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/kemonoio/meson.build b/kemonoio/meson.build index 3dcc27c..5e5c1ac 100644 --- a/kemonoio/meson.build +++ b/kemonoio/meson.build @@ -3,7 +3,6 @@ kemonoio_lib = static_library( name_prefix : '', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', sources : [ 'kemonoio.c', 'kemonoio.h', diff --git a/mai2hook/config.c b/mai2hook/config.c index d41a1d6..27e19ec 100644 --- a/mai2hook/config.c +++ b/mai2hook/config.c @@ -1,5 +1,6 @@ #include #include +#include #include "board/config.h" diff --git a/mai2hook/dllmain.c b/mai2hook/dllmain.c index 0d8b20a..193467f 100644 --- a/mai2hook/dllmain.c +++ b/mai2hook/dllmain.c @@ -19,6 +19,8 @@ #include +#include + #include "board/io4.h" #include "board/sg-reader.h" #include "board/vfd.h" diff --git a/mai2hook/meson.build b/mai2hook/meson.build index f43fccc..eba0c19 100644 --- a/mai2hook/meson.build +++ b/mai2hook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'mai2hook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/mai2io/config.c b/mai2io/config.c index 619b0ef..3578338 100644 --- a/mai2io/config.c +++ b/mai2io/config.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "mai2io/config.h" diff --git a/mai2io/meson.build b/mai2io/meson.build index c448136..cdbfd35 100644 --- a/mai2io/meson.build +++ b/mai2io/meson.build @@ -3,7 +3,6 @@ mai2io_lib = static_library( name_prefix : '', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', sources : [ 'mai2io.c', 'mai2io.h', diff --git a/mercuryhook/config.c b/mercuryhook/config.c index 4038129..d15c305 100644 --- a/mercuryhook/config.c +++ b/mercuryhook/config.c @@ -1,5 +1,6 @@ #include #include +#include #include "board/config.h" diff --git a/mercuryhook/dllmain.c b/mercuryhook/dllmain.c index 43984f9..64b5707 100644 --- a/mercuryhook/dllmain.c +++ b/mercuryhook/dllmain.c @@ -13,6 +13,8 @@ #include +#include + #include "board/io4.h" #include "board/sg-reader.h" #include "board/vfd.h" diff --git a/mercuryhook/elisabeth.h b/mercuryhook/elisabeth.h index 5806c99..32512f3 100644 --- a/mercuryhook/elisabeth.h +++ b/mercuryhook/elisabeth.h @@ -1,5 +1,7 @@ #pragma once + #include +#include struct led_data { DWORD unitCount; diff --git a/mercuryhook/meson.build b/mercuryhook/meson.build index 7a676b2..fd6f46a 100644 --- a/mercuryhook/meson.build +++ b/mercuryhook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'mercuryhook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/mercuryio/config.c b/mercuryio/config.c index 853ed29..1308ac8 100644 --- a/mercuryio/config.c +++ b/mercuryio/config.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "mercuryio/config.h" diff --git a/mercuryio/mercuryio.c b/mercuryio/mercuryio.c index 438c9e6..880349c 100644 --- a/mercuryio/mercuryio.c +++ b/mercuryio/mercuryio.c @@ -2,6 +2,7 @@ #include #include +#include #include #include "mercuryio/mercuryio.h" diff --git a/mercuryio/meson.build b/mercuryio/meson.build index 2970fa9..aa628fb 100644 --- a/mercuryio/meson.build +++ b/mercuryio/meson.build @@ -3,7 +3,6 @@ mercuryio_lib = static_library( name_prefix : '', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', sources : [ 'mercuryio.c', 'mercuryio.h', diff --git a/minihook/meson.build b/minihook/meson.build index 8acbf1e..7de7f6c 100644 --- a/minihook/meson.build +++ b/minihook/meson.build @@ -3,7 +3,6 @@ shared_library( name_prefix : '', include_directories: inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), ], diff --git a/mu3hook/config.c b/mu3hook/config.c index 32d4341..93957ea 100644 --- a/mu3hook/config.c +++ b/mu3hook/config.c @@ -1,5 +1,6 @@ #include #include +#include #include "board/config.h" diff --git a/mu3hook/meson.build b/mu3hook/meson.build index a722428..9f1bfcf 100644 --- a/mu3hook/meson.build +++ b/mu3hook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'mu3hook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/mu3io/config.c b/mu3io/config.c index fd4b0a7..9dbab48 100644 --- a/mu3io/config.c +++ b/mu3io/config.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "mu3io/config.h" diff --git a/mu3io/leddata.h b/mu3io/leddata.h index 1dcf42d..84bc8b7 100644 --- a/mu3io/leddata.h +++ b/mu3io/leddata.h @@ -14,10 +14,10 @@ // This struct is used to send data related to the button and cab LEDs struct _ongeki_led_data_buf_t { - byte framing; // Sync byte + uint8_t framing; // Sync byte uint8_t board; // LED output the data is for (0: cab, 1: control deck) - byte data[LED_OUTPUT_DATA_SIZE_MAX]; // Buffer for LEDs - byte data_len; // How many bytes to output from the buffer + uint8_t data[LED_OUTPUT_DATA_SIZE_MAX]; // Buffer for LEDs + uint8_t data_len; // How many bytes to output from the buffer }; -static byte ongeki_led_board_data_lens[LED_BOARDS_TOTAL] = {9*3, 6*3}; +static uint8_t ongeki_led_board_data_lens[LED_BOARDS_TOTAL] = {9*3, 6*3}; diff --git a/mu3io/ledoutput.c b/mu3io/ledoutput.c index 9c20d1a..83cdc26 100644 --- a/mu3io/ledoutput.c +++ b/mu3io/ledoutput.c @@ -70,14 +70,14 @@ struct _ongeki_led_data_buf_t* escape_led_data(struct _ongeki_led_data_buf_t* un { struct _ongeki_led_data_buf_t* out_struct = &mu3_led_escaped_buf[unescaped->board]; - byte* in_buf = unescaped->data; - byte* out_buf = out_struct->data; + uint8_t* in_buf = unescaped->data; + uint8_t* out_buf = out_struct->data; int i = 0; int o = 0; while (i < unescaped->data_len) { - byte b = in_buf[i++]; + uint8_t b = in_buf[i++]; if (b == LED_PACKET_FRAMING || b == LED_PACKET_ESCAPE) { out_buf[o++] = LED_PACKET_ESCAPE; @@ -91,7 +91,7 @@ struct _ongeki_led_data_buf_t* escape_led_data(struct _ongeki_led_data_buf_t* un return out_struct; } -void mu3_led_output_update(int board, const byte* rgb) +void mu3_led_output_update(int board, const uint8_t* rgb) { if (board < 0 || board > 1 || !mu3_led_any_outputs_enabled) { diff --git a/mu3io/ledoutput.h b/mu3io/ledoutput.h index eb9e810..ab30814 100644 --- a/mu3io/ledoutput.h +++ b/mu3io/ledoutput.h @@ -17,4 +17,4 @@ extern HANDLE mu3_led_init_mutex; HRESULT mu3_led_output_init(struct mu3_io_config* const cfg); -void mu3_led_output_update(int board, const byte* rgb); +void mu3_led_output_update(int board, const uint8_t* rgb); diff --git a/mu3io/meson.build b/mu3io/meson.build index 3a2b571..67df7ca 100644 --- a/mu3io/meson.build +++ b/mu3io/meson.build @@ -3,7 +3,6 @@ mu3io_lib = static_library( name_prefix : '', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ xinput_lib, ], diff --git a/mu3io/mu3io.c b/mu3io/mu3io.c index aaa5687..e5618d9 100644 --- a/mu3io/mu3io.c +++ b/mu3io/mu3io.c @@ -3,6 +3,7 @@ #include #include +#include #include "mu3io/mu3io.h" #include "mu3io/config.h" diff --git a/platform/clock.c b/platform/clock.c index e163961..b7249fa 100644 --- a/platform/clock.c +++ b/platform/clock.c @@ -2,6 +2,7 @@ #include #include +#include #include "hook/table.h" #include "hook/procaddr.h" diff --git a/platform/dns.c b/platform/dns.c index d87d8a4..f5745f0 100644 --- a/platform/dns.c +++ b/platform/dns.c @@ -16,11 +16,11 @@ HRESULT dns_platform_hook_init(const struct dns_config *cfg) return S_FALSE; } - if(cfg->replaceHost){ + if (cfg->replaceHost){ http_hook_init(); } - if(cfg->startupPort || cfg->billingPort || cfg->aimedbPort){ + if (cfg->startupPort || cfg->billingPort || cfg->aimedbPort){ port_hook_init(cfg->startupPort, cfg->billingPort, cfg->aimedbPort); } diff --git a/platform/epay.h b/platform/epay.h index c94eceb..6b5659b 100644 --- a/platform/epay.h +++ b/platform/epay.h @@ -2,6 +2,7 @@ #include #include +#include #pragma pack(push,1) struct epay_config { diff --git a/platform/meson.build b/platform/meson.build index a00df6b..af6555c 100644 --- a/platform/meson.build +++ b/platform/meson.build @@ -2,7 +2,6 @@ platform_lib = static_library( 'platform', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), shlwapi_lib, diff --git a/platform/misc.c b/platform/misc.c index 040a249..31a4d16 100644 --- a/platform/misc.c +++ b/platform/misc.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include "hook/table.h" diff --git a/platform/netenv.c b/platform/netenv.c index 951c4b0..4fb77d2 100644 --- a/platform/netenv.c +++ b/platform/netenv.c @@ -1,9 +1,15 @@ #include +#include #include +#include +#include +#include +#include #include #include #include +#include #include #include diff --git a/platform/nusec.c b/platform/nusec.c index a82a99f..f455ca7 100644 --- a/platform/nusec.c +++ b/platform/nusec.c @@ -2,6 +2,7 @@ #include #include #include +#include #include "hook/iohook.h" diff --git a/platform/opensslpatch.c b/platform/opensslpatch.c index f5532b7..8e2ea72 100644 --- a/platform/opensslpatch.c +++ b/platform/opensslpatch.c @@ -1,7 +1,10 @@ #include + +#include #include #include #include + #include "util/dprintf.h" #include "platform/opensslpatch.h" diff --git a/platform/system.c b/platform/system.c index 49f7999..a82c326 100644 --- a/platform/system.c +++ b/platform/system.c @@ -2,6 +2,8 @@ #include #include +#include +#include #include #include "platform/system.h" diff --git a/precompiled.h b/precompiled.h deleted file mode 100644 index 7c85da7..0000000 --- a/precompiled.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - Making NTSTATUS available is slightly awkward. See: - https://kirkshoop.github.io/2011/09/20/ntstatus.html -*/ - -/* Win32 user-mode API */ -#define WIN32_NO_STATUS -#include -#undef WIN32_NO_STATUS -#include -#include -#include -#include -#include -#include -#include -#include - -/* Win32 kernel-mode definitions */ -#ifdef __GNUC__ -/* MinGW needs to include this for PHYSICAL_ADDRESS to be defined. - The MS SDK throws a bunch of duplicate symbol errors instead. */ -#include -#else -#include -#endif -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/swdchook/config.c b/swdchook/config.c index 269a450..fcfa251 100644 --- a/swdchook/config.c +++ b/swdchook/config.c @@ -1,5 +1,6 @@ #include #include +#include #include "board/config.h" #include "board/sg-reader.h" diff --git a/swdchook/meson.build b/swdchook/meson.build index 786c936..882647a 100644 --- a/swdchook/meson.build +++ b/swdchook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'swdchook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/swdcio/di.c b/swdcio/di.c index db952a0..8012454 100644 --- a/swdcio/di.c +++ b/swdcio/di.c @@ -1,8 +1,10 @@ #include #include +#include #include #include +#include #include #include "swdcio/backend.h" diff --git a/swdcio/meson.build b/swdcio/meson.build index 71e018a..d9de43e 100644 --- a/swdcio/meson.build +++ b/swdcio/meson.build @@ -3,7 +3,6 @@ swdcio_lib = static_library( name_prefix : '', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ dinput8_lib, dxguid_lib, diff --git a/tokyohook/config.c b/tokyohook/config.c index e9735d2..304cbc2 100644 --- a/tokyohook/config.c +++ b/tokyohook/config.c @@ -1,5 +1,6 @@ #include #include +#include #include "board/config.h" diff --git a/tokyohook/meson.build b/tokyohook/meson.build index 1e4b1d8..0bbee19 100644 --- a/tokyohook/meson.build +++ b/tokyohook/meson.build @@ -4,7 +4,6 @@ shared_library( include_directories : inc, implicit_include_directories : false, vs_module_defs : 'tokyohook.def', - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), capnhook.get_variable('hooklib_dep'), diff --git a/tokyoio/config.c b/tokyoio/config.c index 0ae2d26..2522154 100644 --- a/tokyoio/config.c +++ b/tokyoio/config.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "tokyoio/config.h" diff --git a/tokyoio/meson.build b/tokyoio/meson.build index aa4e198..9e9e9fe 100644 --- a/tokyoio/meson.build +++ b/tokyoio/meson.build @@ -3,7 +3,6 @@ tokyoio_lib = static_library( name_prefix : '', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ xinput_lib, ], diff --git a/unityhook/config.c b/unityhook/config.c index 6f0a0cc..fe4e062 100644 --- a/unityhook/config.c +++ b/unityhook/config.c @@ -1,3 +1,5 @@ +#include + #include "config.h" void unity_config_load(struct unity_config *cfg, const wchar_t *filename) { diff --git a/unityhook/doorstop.c b/unityhook/doorstop.c index 1b94ad5..d2cbd5c 100644 --- a/unityhook/doorstop.c +++ b/unityhook/doorstop.c @@ -4,6 +4,8 @@ // SPDX-License-Identifier: CC0 // https://github.com/NeighTools/UnityDoorstop #include +#include +#include #include #include diff --git a/unityhook/hook.c b/unityhook/hook.c index 63816f3..33070a0 100644 --- a/unityhook/hook.c +++ b/unityhook/hook.c @@ -1,5 +1,7 @@ #include #include +#include +#include #include "platform/clock.h" diff --git a/unityhook/meson.build b/unityhook/meson.build index 9fd7a7b..50d0488 100644 --- a/unityhook/meson.build +++ b/unityhook/meson.build @@ -2,7 +2,6 @@ unityhook_lib = static_library( 'unityhook', include_directories: inc, implicit_include_directories: false, - c_pch: '../precompiled.h', dependencies: [ capnhook.get_variable('hook_dep'), pathcch_lib diff --git a/util/async.c b/util/async.c index fd6a1cd..449550c 100644 --- a/util/async.c +++ b/util/async.c @@ -1,4 +1,4 @@ -/* NTSTATUS chicanery. See precompiled.h */ +/* NTSTATUS chicanery. */ #define WIN32_NO_STATUS #include #undef WIN32_NO_STATUS diff --git a/util/get_function_ordinal.h b/util/get_function_ordinal.h index 6bc4b9e..56779c4 100644 --- a/util/get_function_ordinal.h +++ b/util/get_function_ordinal.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include "dprintf.h" diff --git a/util/lib.c b/util/lib.c index bd7a5eb..42f5c66 100644 --- a/util/lib.c +++ b/util/lib.c @@ -1,6 +1,7 @@ #include #include +#include wchar_t *module_file_name(HMODULE module) { diff --git a/util/meson.build b/util/meson.build index 4acae1a..0274ad5 100644 --- a/util/meson.build +++ b/util/meson.build @@ -2,7 +2,6 @@ util_lib = static_library( 'util', include_directories : inc, implicit_include_directories : false, - c_pch : '../precompiled.h', dependencies : [ capnhook.get_variable('hook_dep'), imagehlp_lib,