Various import fixes caused by clang-format

Added format protection block to avoid re-ordering of header files
according to formatting rules.

src/imports/avs-ea3.h

@@ -1,6 +1,8 @@
 #ifndef IMPORTS_AVS_EA3_H
 #define IMPORTS_AVS_EA3_H
 
+#include "imports/avs.h"
+
 void ea3_boot(struct property_node *conf);
 void ea3_shutdown(void);
 

src/main/acioemu/emu.c

@@ -1,8 +1,11 @@
 #include <windows.h> /* Usermode API */
 
+// clang-format off
+// Don't format because the order is important here
+#include <ntdef.h>
 #include <devioctl.h>
 #include <ntddser.h>
-#include <ntdef.h> /* Kernel-mode API for ioctls */
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/bio2emu/emu.c

@@ -1,8 +1,10 @@
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
-
+#include <ntdef.h>
 #include <devioctl.h>
 #include <ntddser.h>
-#include <ntdef.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/bsthook/acio.c

@@ -1,8 +1,11 @@
 #include <windows.h>
 
+// clang-format off
+// Don't format because the order is important here
+#include <ntdef.h>
 #include <devioctl.h>
 #include <ntddser.h>
-#include <ntdef.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/config/analogs.c

@@ -1,5 +1,8 @@
-#include <commctrl.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <commctrl.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdlib.h>

src/main/config/bind-light.c

@@ -1,5 +1,8 @@
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
 #include <windowsx.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/config/buttons.c

@@ -1,6 +1,9 @@
+// clang-format off
+// Don't format because the order is important here
+#include <windows.h>
 #include <commctrl.h>
 #include <wchar.h>
-#include <windows.h>
+// clang-format on
 
 #include <stdio.h>
 #include <stdlib.h>

src/main/config/eam.c

@@ -1,6 +1,9 @@
+// clang-format off
+// Don't format because the order is important here
+#include <windows.h>
 #include <commctrl.h>
 #include <commdlg.h>
-#include <windows.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdlib.h>

src/main/config/lights.c

@@ -1,7 +1,10 @@
+// clang-format off
+// Don't format because the order is important here
+#include <windows.h>
 #include <commctrl.h>
 #include <wchar.h>
-#include <windows.h>
 #include <windowsx.h>
+// clang-format on
 
 #include <stdint.h>
 #include <stdlib.h>

src/main/config/main.c

@@ -1,5 +1,8 @@
-#include <commctrl.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <commctrl.h>
+// clang-format on
 
 #include <stdio.h>
 #include <stdlib.h>

src/main/ddrhook/_com4.c

@@ -1,8 +1,10 @@
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
-
 #include <devioctl.h>
-#include <ntddser.h>
 #include <ntdef.h>
+#include <ntddser.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/ddrhook/extio.c

@@ -1,8 +1,10 @@
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
-
 #include <devioctl.h>
-#include <ntddser.h>
 #include <ntdef.h>
+#include <ntddser.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/ddrhook/monitor.c

@@ -1,5 +1,8 @@
-#include <setupapi.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <setupapi.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <wchar.h>

src/main/ddrhook/spike.c

@@ -1,10 +1,12 @@
 #define LOG_MODULE "spike"
 
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
-
 #include <devioctl.h>
-#include <ntddser.h>
 #include <ntdef.h>
+#include <ntddser.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/ddrhook/usbmem.c

@@ -1,10 +1,12 @@
 #define LOG_MODULE "usbmem"
 
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
-
 #include <devioctl.h>
-#include <ntddser.h>
 #include <ntdef.h>
+#include <ntddser.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <string.h>

src/main/eamio-icca/eamio-icca.c

@@ -1,5 +1,8 @@
-#include <dbt.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <dbt.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/eamio/eam-api.c

@@ -1,5 +1,8 @@
-#include <dbt.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <dbt.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/ezusb-emu/device.c

@@ -1,8 +1,11 @@
 #define LOG_MODULE "ezusb-emu-device"
 
+// clang-format off
+// Don't format because the order is important here
+#include <windows.h>
 #include <setupapi.h>
 #include <usb100.h>
-#include <windows.h>
+// clang-format on
 
 #include <string.h>
 

src/main/ezusb/ezusb.c

@@ -1,5 +1,8 @@
-#include <setupapi.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <setupapi.h>
+// clang-format on
 
 #include "ezusb/ezusb.h"
 #include "ezusb/ezusbsys2.h"

src/main/ezusb2-dbg-hook/main.c

@@ -1,7 +1,10 @@
 #define LOG_MODULE "ezusb2-dbg"
 
-#include <usb100.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <usb100.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdio.h>

src/main/ezusb2-emu/device.c

@@ -1,8 +1,11 @@
 #define LOG_MODULE "ezusb2-emu-device"
 
+// clang-format off
+// Don't format because the order is important here
+#include <windows.h>
 #include <setupapi.h>
 #include <usb100.h>
-#include <windows.h>
+// clang-format on
 
 #include <string.h>
 

src/main/ezusb2/ezusb2.c

@@ -1,5 +1,8 @@
-#include <setupapi.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <setupapi.h>
+// clang-format on
 
 #include "ezusb/ezusb.h"
 

src/main/geninput/dev-list.c

@@ -1,6 +1,9 @@
-#include <hidsdi.h>
+// clang-format off
-#include <setupapi.h>
+// Don't format because the order is important here
 #include <windows.h>
+#include <setupapi.h>
+#include <hidsdi.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdlib.h>

src/main/geninput/dev-list.h

@@ -1,8 +1,11 @@
 #ifndef GENINPUT_DEV_LIST_H
 #define GENINPUT_DEV_LIST_H
 
-#include <setupapi.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <setupapi.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <wchar.h>

src/main/geninput/hid-generic-strings.c

@@ -1,5 +1,8 @@
-#include <hidsdi.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <hidsdi.h>
+// clang-format on
 
 #include <stdlib.h>
 

src/main/geninput/hid-generic.c

@@ -6,8 +6,11 @@
 #include <string.h>
 #include <wchar.h>
 
-#include <hidsdi.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <hidsdi.h>
+// clang-format on
 
 #include "geninput/hid-generic-strings.h"
 #include "geninput/hid-generic.h"

src/main/geninput/hid-meta-in.c

@@ -1,7 +1,10 @@
 #define LOG_MODULE "hid-generic"
 
-#include <hidsdi.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <hidsdi.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/geninput/hid-meta-out.c

@@ -1,7 +1,10 @@
 #define LOG_MODULE "hid-generic"
 
-#include <hidsdi.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <hidsdi.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stddef.h>

src/main/geninput/hid-report-in.c

@@ -1,7 +1,10 @@
 #define LOG_MODULE "hid-generic"
 
-#include <hidsdi.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <hidsdi.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/geninput/hid-report-out.c

@@ -1,7 +1,10 @@
 #define LOG_MODULE "hid-generic"
 
-#include <hidsdi.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <hidsdi.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/geninput/hotplug.c

@@ -1,5 +1,8 @@
-#include <dbt.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <dbt.h>
+// clang-format on
 
 #include <string.h>
 

src/main/geninput/kbd.c

@@ -1,8 +1,11 @@
 #define LOG_MODULE "kbd"
 
+// clang-format off
+// Don't format because the order is important here
+#include <windows.h>
 #include <hidsdi.h>
 #include <initguid.h>
-#include <windows.h>
+// clang-format on
 
 #include <stddef.h>
 #include <stdint.h>

src/main/geninput/mouse.c

@@ -1,7 +1,10 @@
 #define LOG_MODULE "mouse"
 
-#include <initguid.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <initguid.h>
+// clang-format on
 
 #include <malloc.h>
 #include <stddef.h>

src/main/geninput/msg-thread.c

@@ -1,5 +1,8 @@
-#include <dbt.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <dbt.h>
+// clang-format on
 
 #include <stdint.h>
 

src/main/geninput/pacdrive.c

@@ -1,7 +1,10 @@
 #define LOG_MODULE "pacdrive"
 
-#include <hidsdi.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <hidsdi.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/hooklib/rs232.c

@@ -1,5 +1,12 @@
 #include <windows.h> /* Usermode API */
 
+// clang-format off
+// Don't format because the order is important here
+#include <ntdef.h>
+#include <devioctl.h>
+#include <ntddser.h>
+// clang-format on
+
 #include <devioctl.h>
 #include <ntddser.h>
 #include <ntdef.h> /* Kernel-mode API for ioctls */

src/main/hooklib/setupapi.h

@@ -1,8 +1,11 @@
 #ifndef HOOKLIB_SETUPAPI_H
 #define HOOKLIB_SETUPAPI_H
 
-#include <setupapi.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <setupapi.h>
+// clang-format on
 
 struct hook_setupapi_data {
     GUID device_guid;

src/main/iidx-ezusb-exit-hook/main.c

@@ -1,5 +1,8 @@
-#include <usb100.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <usb100.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdio.h>

src/main/iidx-ezusb2-exit-hook/main.c

@@ -1,5 +1,8 @@
-#include <usb100.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <usb100.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdio.h>

src/main/iidxhook-util/acio.c

@@ -1,8 +1,10 @@
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
-
 #include <devioctl.h>
-#include <ntddser.h>
 #include <ntdef.h>
+#include <ntddser.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/iidxhook8/cam.c

@@ -1,7 +1,10 @@
 #define LOG_MODULE "cam-hook"
 
-#include <initguid.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <initguid.h>
+// clang-format on
 
 #include <mfapi.h>
 #include <mfidl.h>
@@ -513,8 +516,7 @@ char *grab_next_camera_id(char *buffer, size_t bsz)
         pAttributes,
         &MY_MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE,
         &MY_MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID);
-    i f(FAILED(hr))
+    if (FAILED(hr)) {
-    {
         log_info("SetGUID failed: %ld", hr);
         goto done;
     }

src/main/iidxio-ezusb/iidxio.c

@@ -1,5 +1,8 @@
-#include <mmsystem.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <mmsystem.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/iidxio/iidxio.c

@@ -8,8 +8,11 @@
    the "bemanitools" header files included by this source file for detailed
    information about the API you'll need to implement. */
 
-#include <mmsystem.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <mmsystem.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/jbhook/acio.c

@@ -1,8 +1,10 @@
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
-
+#include <ntdef.h>
 #include <devioctl.h>
 #include <ntddser.h>
-#include <ntdef.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/jbhook1/acio.c

@@ -1,8 +1,10 @@
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
-
+#include <ntdef.h>
 #include <devioctl.h>
 #include <ntddser.h>
-#include <ntdef.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/jbio/jbio.c

@@ -8,8 +8,11 @@
    the "bemanitools" header files included by this source file for detailed
    information about the API you'll need to implement. */
 
-#include <mmsystem.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <mmsystem.h>
+// clang-format on
 
 #include "bemanitools/input.h"
 #include "bemanitools/jbio.h"

src/main/p3ioemu/devmgr.c

@@ -1,5 +1,8 @@
-#include <setupapi.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <setupapi.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <string.h>

src/main/p3ioemu/uart.c

@@ -1,10 +1,12 @@
 #define LOG_MODULE "p3ioemu-uart"
 
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
-
 #include <devioctl.h>
-#include <ntddser.h>
 #include <ntdef.h>
+#include <ntddser.h>
+// clang-format on
 
 #include <string.h>
 

src/main/sdvxhook/acio.c

@@ -1,8 +1,10 @@
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
-
+#include <ntdef.h>
 #include <devioctl.h>
 #include <ntddser.h>
-#include <ntdef.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>

src/main/sdvxhook/lcd.c

@@ -1,10 +1,12 @@
 #define LOG_MODULE "lcd"
 
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
-
+#include <ntdef.h>
 #include <devioctl.h>
 #include <ntddser.h>
-#include <ntdef.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <string.h>

src/main/util/crypto.h

@@ -1,8 +1,11 @@
 #ifndef UTIL_CRYPTO_H
 #define UTIL_CRYPTO_H
 
-#include <wincrypt.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <wincrypt.h>
+// clang-format on
 
 #include <stddef.h>
 #include <stdint.h>

src/main/vefxio/vefxio.c

@@ -9,8 +9,11 @@
    provides all of the inputs for IIDX then you should replace IIDXIO.DLL
    instead and not call into this DLL at all. */
 
-#include <mmsystem.h>
+// clang-format off
+// Don't format because the order is important here
 #include <windows.h>
+#include <mmsystem.h>
+// clang-format on
 
 #include <stdbool.h>
 #include <stdint.h>