From 9b349f958cd1ee7db7a8457cc73c6f0f8057ca4a Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 8 Dec 2017 00:22:05 +0100 Subject: [PATCH 1/1] [ADVAPI32_APITEST][NTDLL_APITEST][WINDOWSCODECS] Comment out some unused functions and types. Silences some clang-cl warnings. --- dll/win32/windowscodecs/bitmap.c | 3 +++ dll/win32/windowscodecs/converter.c | 2 ++ modules/rostests/apitests/advapi32/ServiceArgs.c | 2 ++ modules/rostests/apitests/ntdll/NtLoadUnloadKey.c | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dll/win32/windowscodecs/bitmap.c b/dll/win32/windowscodecs/bitmap.c index 843c7e73b34..3d5a2bb4963 100644 --- a/dll/win32/windowscodecs/bitmap.c +++ b/dll/win32/windowscodecs/bitmap.c @@ -63,10 +63,13 @@ static inline BitmapImpl *impl_from_IMILUnknown1(IMILUnknown1 *iface) return CONTAINING_RECORD(iface, BitmapImpl, IMILUnknown1_iface); } +#ifndef __REACTOS__ +/* This is currently unused */ static inline BitmapImpl *impl_from_IMILUnknown2(IMILUnknown2 *iface) { return CONTAINING_RECORD(iface, BitmapImpl, IMILUnknown2_iface); } +#endif static inline BitmapLockImpl *impl_from_IWICBitmapLock(IWICBitmapLock *iface) { diff --git a/dll/win32/windowscodecs/converter.c b/dll/win32/windowscodecs/converter.c index 23098756a8b..3fca5b38f6a 100644 --- a/dll/win32/windowscodecs/converter.c +++ b/dll/win32/windowscodecs/converter.c @@ -71,11 +71,13 @@ typedef struct FormatConverter { } FormatConverter; /* https://www.w3.org/Graphics/Color/srgb */ +#ifndef __REACTOS__ static inline float from_sRGB_component(float f) { if (f <= 0.04045f) return f / 12.92f; return powf((f + 0.055f) / 1.055f, 2.4f); } +#endif static inline float to_sRGB_component(float f) { diff --git a/modules/rostests/apitests/advapi32/ServiceArgs.c b/modules/rostests/apitests/advapi32/ServiceArgs.c index 38d19aa97e6..16d675a2978 100644 --- a/modules/rostests/apitests/advapi32/ServiceArgs.c +++ b/modules/rostests/apitests/advapi32/ServiceArgs.c @@ -32,6 +32,7 @@ static void send_msg(const char *type, const char *msg) WriteFile(pipe_handle, buf, strlen(buf)+1, &written, NULL); } +#if 0 static inline void service_trace(const char *msg, ...) { va_list valist; @@ -43,6 +44,7 @@ static inline void service_trace(const char *msg, ...) send_msg("TRACE", buf); } +#endif static void service_ok(int cnd, const char *msg, ...) { diff --git a/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c b/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c index f9bb9c2937e..ac4ec3493ea 100644 --- a/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c +++ b/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c @@ -397,7 +397,7 @@ START_TEST(NtLoadUnloadKey) { PCWSTR HiveName; PCWSTR RegMountPoint; - } HIVE_LIST_ENTRY, *PHIVE_LIST_ENTRY; + } HIVE_LIST_ENTRY; static const HIVE_LIST_ENTRY RegistryHives[] = { -- 2.17.1