From dc9810341998d37b7c66257cc7f02fd7cfb6ee35 Mon Sep 17 00:00:00 2001 From: Will Xyen Date: Tue, 28 Jan 2020 04:25:25 -0500 Subject: [PATCH] formatting update --- src/main/d3d9exhook/d3d9ex.c | 16 +++++++++------- src/main/hooklib/adapter.c | 29 +++++++++++++++++++++++------ src/main/hooklib/adapter.h | 2 +- src/main/hooklib/config-adapter.c | 3 ++- src/main/hooklib/config-adapter.h | 3 ++- 5 files changed, 37 insertions(+), 16 deletions(-) diff --git a/src/main/d3d9exhook/d3d9ex.c b/src/main/d3d9exhook/d3d9ex.c index 412b0c5..7e6cf3e 100644 --- a/src/main/d3d9exhook/d3d9ex.c +++ b/src/main/d3d9exhook/d3d9ex.c @@ -196,7 +196,6 @@ static HRESULT STDCALL my_CreateDeviceEx( IDirect3D9Ex *real = COM_PROXY_UNWRAP(self); HRESULT hr; - if (d3d9ex_device_adapter >= 0) { log_info("Forcing adapter %d -> %d", adapter, d3d9ex_device_adapter); adapter = d3d9ex_device_adapter; @@ -218,22 +217,25 @@ static HRESULT STDCALL my_CreateDeviceEx( } } - if (d3d9ex_force_orientation >= DMDO_DEFAULT && d3d9ex_force_orientation <= DMDO_270) { + if (d3d9ex_force_orientation >= DMDO_DEFAULT && + d3d9ex_force_orientation <= DMDO_270) { D3DADAPTER_IDENTIFIER9 adapter_ident; - if (IDirect3D9Ex_GetAdapterIdentifier(real, adapter, 0, &adapter_ident) == D3D_OK) { + if (IDirect3D9Ex_GetAdapterIdentifier( + real, adapter, 0, &adapter_ident) == D3D_OK) { // straight outta MSDN DEVMODE dm; // initialize the DEVMODE structure ZeroMemory(&dm, sizeof(dm)); dm.dmSize = sizeof(dm); - if (0 != EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm)) - { - int32_t delta = d3d9ex_force_orientation - dm.dmDisplayOrientation; + if (0 != + EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm)) { + int32_t delta = + d3d9ex_force_orientation - dm.dmDisplayOrientation; if (delta % 2 != 0) { // swap height and width DWORD dwTemp = dm.dmPelsHeight; - dm.dmPelsHeight= dm.dmPelsWidth; + dm.dmPelsHeight = dm.dmPelsWidth; dm.dmPelsWidth = dwTemp; } diff --git a/src/main/hooklib/adapter.c b/src/main/hooklib/adapter.c index 60b79e4..379aed8 100644 --- a/src/main/hooklib/adapter.c +++ b/src/main/hooklib/adapter.c @@ -49,9 +49,19 @@ my_GetAdaptersInfo(PIP_ADAPTER_INFO adapter_info, PULONG out_buf_len) if (use_address_override) { while (info) { // this is well defined to be at most sizeof(IP_ADDRESS_STRING) - // and NULL filled if shorter (hence the memset in adapter_hook_override) - if (!memcmp(info->IpAddressList.IpAddress.String, override_address.String, sizeof(IP_ADDRESS_STRING))) { - log_info("%s: using [override] adapter: %s, %s, %s, %s", __FUNCTION__, info->AdapterName, info->Description, info->IpAddressList.IpAddress.String, info->IpAddressList.IpMask.String); + // and NULL filled if shorter (hence the memset in + // adapter_hook_override) + if (!memcmp( + info->IpAddressList.IpAddress.String, + override_address.String, + sizeof(IP_ADDRESS_STRING))) { + log_info( + "%s: using [override] adapter: %s, %s, %s, %s", + __FUNCTION__, + info->AdapterName, + info->Description, + info->IpAddressList.IpAddress.String, + info->IpAddressList.IpMask.String); // copy only this adapter over memcpy(adapter_info, info, sizeof(*info)); @@ -83,7 +93,13 @@ my_GetAdaptersInfo(PIP_ADAPTER_INFO adapter_info, PULONG out_buf_len) while (info) { if (info->Index == best_adapter) { - log_info("%s: using [best] adapter: %s, %s, %s, %s", __FUNCTION__, info->AdapterName, info->Description, info->IpAddressList.IpAddress.String, info->IpAddressList.IpMask.String); + log_info( + "%s: using [best] adapter: %s, %s, %s, %s", + __FUNCTION__, + info->AdapterName, + info->Description, + info->IpAddressList.IpAddress.String, + info->IpAddressList.IpMask.String); // copy only this adapter over memcpy(adapter_info, info, sizeof(*info)); @@ -102,7 +118,7 @@ void adapter_hook_init(void) NULL, "iphlpapi.dll", adapter_hook_syms, lengthof(adapter_hook_syms)); } -void adapter_hook_override(const char* adapter_address) +void adapter_hook_override(const char *adapter_address) { // starts off false anyways due to static // but in case it gets called multiple times, set it anyways @@ -113,7 +129,8 @@ void adapter_hook_override(const char* adapter_address) return; } if (strlen(adapter_address) > sizeof(IP_ADDRESS_STRING)) { - log_warning("%s: %s is not an ipv4 address", __FUNCTION__, adapter_address); + log_warning( + "%s: %s is not an ipv4 address", __FUNCTION__, adapter_address); return; } diff --git a/src/main/hooklib/adapter.h b/src/main/hooklib/adapter.h index 1f70931..298965a 100644 --- a/src/main/hooklib/adapter.h +++ b/src/main/hooklib/adapter.h @@ -8,6 +8,6 @@ void adapter_hook_init(void); * * @param network ip to match */ -void adapter_hook_override(const char* adapter_address); +void adapter_hook_override(const char *adapter_address); #endif diff --git a/src/main/hooklib/config-adapter.c b/src/main/hooklib/config-adapter.c index e8d2167..49c2450 100644 --- a/src/main/hooklib/config-adapter.c +++ b/src/main/hooklib/config-adapter.c @@ -17,7 +17,8 @@ void hooklib_config_adapter_init(struct cconfig *config) "IP of adapter to force override with"); } -void hooklib_config_adapter_get(struct hooklib_config_adapter *config_adapter, struct cconfig *config) +void hooklib_config_adapter_get( + struct hooklib_config_adapter *config_adapter, struct cconfig *config) { if (!cconfig_util_get_str( config, diff --git a/src/main/hooklib/config-adapter.h b/src/main/hooklib/config-adapter.h index f2013fe..621a0e3 100644 --- a/src/main/hooklib/config-adapter.h +++ b/src/main/hooklib/config-adapter.h @@ -12,6 +12,7 @@ struct hooklib_config_adapter { void hooklib_config_adapter_init(struct cconfig *config); -void hooklib_config_adapter_get(struct hooklib_config_adapter *config_adapter, struct cconfig *config); +void hooklib_config_adapter_get( + struct hooklib_config_adapter *config_adapter, struct cconfig *config); #endif \ No newline at end of file