From 714502d3737d64d857460e38f4d5aee31d77b9fe Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Mon, 13 Jun 2022 22:15:56 +0300
Subject: [PATCH] minor windows warning fixes.
---
Makefile.w32 | 2 ++
src/joystick/windows/SDL_rawinputjoystick.c | 5 +++--
src/video/windows/SDL_windowskeyboard.c | 4 ++--
src/video/windows/SDL_windowsvideo.c | 2 ++
src/video/windows/SDL_windowswindow.c | 8 ++------
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Makefile.w32 b/Makefile.w32
index ee5c4b10ff7..fe198900439 100644
--- a/Makefile.w32
+++ b/Makefile.w32
@@ -136,6 +136,8 @@ SDL_blendpoint.obj: SDL_blendpoint.c
wcc386 $(CFLAGS_DLL) -wcd=200 -fo=$^@ $<
SDL_RLEaccel.obj: SDL_RLEaccel.c
wcc386 $(CFLAGS_DLL) -wcd=201 -fo=$^@ $<
+SDL_malloc.obj: SDL_malloc.c
+ wcc386 $(CFLAGS_DLL) -wcd=201 -fo=$^@ $<
# SDL2libm
MSRCS= e_atan2.c e_exp.c e_fmod.c e_log10.c e_log.c e_pow.c e_rem_pio2.c e_sqrt.c &
diff --git a/src/joystick/windows/SDL_rawinputjoystick.c b/src/joystick/windows/SDL_rawinputjoystick.c
index d515e2a769d..e6e9831ed8b 100644
--- a/src/joystick/windows/SDL_rawinputjoystick.c
+++ b/src/joystick/windows/SDL_rawinputjoystick.c
@@ -1349,15 +1349,15 @@ RAWINPUT_JoystickRumbleTriggers(SDL_Joystick *joystick, Uint16 left_rumble, Uint
static Uint32
RAWINPUT_JoystickGetCapabilities(SDL_Joystick *joystick)
{
- RAWINPUT_DeviceContext *ctx = joystick->hwdata;
Uint32 result = 0;
+#if defined(SDL_JOYSTICK_RAWINPUT_XINPUT) || defined(SDL_JOYSTICK_RAWINPUT_WGI)
+ RAWINPUT_DeviceContext *ctx = joystick->hwdata;
#ifdef SDL_JOYSTICK_RAWINPUT_XINPUT
if (ctx->is_xinput) {
result |= SDL_JOYCAP_RUMBLE;
}
#endif
-
#ifdef SDL_JOYSTICK_RAWINPUT_WGI
if (ctx->is_xinput) {
result |= SDL_JOYCAP_RUMBLE;
@@ -1367,6 +1367,7 @@ RAWINPUT_JoystickGetCapabilities(SDL_Joystick *joystick)
}
}
#endif
+#endif /**/
return result;
}
diff --git a/src/video/windows/SDL_windowskeyboard.c b/src/video/windows/SDL_windowskeyboard.c
index c71798fa274..f2deadc7bcc 100644
--- a/src/video/windows/SDL_windowskeyboard.c
+++ b/src/video/windows/SDL_windowskeyboard.c
@@ -623,7 +623,7 @@ IME_GetId(SDL_VideoData *videodata, UINT uIndex)
dwRet[0] = dwRet[1] = 0;
return dwRet[0];
}
- if (ImmGetIMEFileNameA(hkl, szTemp, sizeof(szTemp) - 1) <= 0) {
+ if (!ImmGetIMEFileNameA(hkl, szTemp, sizeof(szTemp) - 1)) {
dwRet[0] = dwRet[1] = 0;
return dwRet[0];
}
@@ -689,7 +689,7 @@ IME_SetupAPI(SDL_VideoData *videodata)
return;
hkl = videodata->ime_hkl;
- if (ImmGetIMEFileNameA(hkl, ime_file, sizeof(ime_file) - 1) <= 0)
+ if (!ImmGetIMEFileNameA(hkl, ime_file, sizeof(ime_file) - 1))
return;
hime = SDL_LoadObject(ime_file);
diff --git a/src/video/windows/SDL_windowsvideo.c b/src/video/windows/SDL_windowsvideo.c
index 5358e1d8add..32e21fb1f7a 100644
--- a/src/video/windows/SDL_windowsvideo.c
+++ b/src/video/windows/SDL_windowsvideo.c
@@ -334,6 +334,7 @@ WIN_DeclareDPIAwarePerMonitorV2(_THIS)
}
}
+#ifdef HIGHDPI_DEBUG
static const char*
WIN_GetDPIAwareness(_THIS)
{
@@ -357,6 +358,7 @@ WIN_GetDPIAwareness(_THIS)
return "";
}
+#endif
static void
WIN_InitDPIAwareness(_THIS)
diff --git a/src/video/windows/SDL_windowswindow.c b/src/video/windows/SDL_windowswindow.c
index 00fe3e9f514..49cac881217 100644
--- a/src/video/windows/SDL_windowswindow.c
+++ b/src/video/windows/SDL_windowswindow.c
@@ -118,13 +118,11 @@ GetWindowStyle(SDL_Window * window)
/**
* Returns arguments to pass to SetWindowPos - the window rect, including frame, in Windows coordinates.
- *
* Can be called before we have a HWND.
*/
static void
WIN_AdjustWindowRectWithStyle(SDL_Window *window, DWORD style, BOOL menu, int *x, int *y, int *width, int *height, SDL_bool use_current)
{
- SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
SDL_VideoData* videodata = SDL_GetVideoDevice() ? SDL_GetVideoDevice()->driverdata : NULL;
RECT rect;
int dpi;
@@ -140,12 +138,12 @@ WIN_AdjustWindowRectWithStyle(SDL_Window *window, DWORD style, BOOL menu, int *x
WIN_ScreenPointFromSDL(x, y, &dpi);
/* Note, use the guessed DPI returned from WIN_ScreenPointFromSDL rather than the cached one in
data->scaling_dpi.
-
+
- This is called before the window is created, so we can't rely on data->scaling_dpi
- Bug workaround: when leaving exclusive fullscreen, the cached DPI and window DPI reported
by GetDpiForWindow will be wrong, and would cause windows shrinking slightly when
going from exclusive fullscreen to windowed on a HighDPI monitor with scaling if we used them.
- */
+ */
*width = MulDiv(*width, dpi, 96);
*height = MulDiv(*height, dpi, 96);
@@ -163,7 +161,6 @@ WIN_AdjustWindowRectWithStyle(SDL_Window *window, DWORD style, BOOL menu, int *x
if (WIN_IsPerMonitorV2DPIAware(SDL_GetVideoDevice())) {
/* With per-monitor v2, the window border/titlebar size depend on the DPI, so we need to call AdjustWindowRectExForDpi instead of
AdjustWindowRectEx. */
-
UINT unused;
RECT screen_rect;
HMONITOR mon;
@@ -855,7 +852,6 @@ WIN_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display,
{
SDL_DisplayData *displaydata = (SDL_DisplayData *) display->driverdata;
SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
- SDL_VideoData *videodata = data->videodata;
HWND hwnd = data->hwnd;
MONITORINFO minfo;
DWORD style;