From 2d09c52647ec2ca6831df42341157432a58dfd2c Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Fri, 11 Mar 2022 01:55:00 +0300
Subject: [PATCH] minor os/2 clean-ups.
---
src/video/os2grop/SDL_grop.c | 2 +-
src/video/os2grop/SDL_os2dive.c | 6 ++++--
src/video/os2grop/SDL_os2grop.c | 13 +++++++++----
src/video/os2grop/SDL_os2grop.h | 1 +
src/video/os2grop/SDL_os2vman.c | 10 +++++++---
5 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/video/os2grop/SDL_grop.c b/src/video/os2grop/SDL_grop.c
index a40a7618b..410f57f83 100644
--- a/src/video/os2grop/SDL_grop.c
+++ b/src/video/os2grop/SDL_grop.c
@@ -204,7 +204,7 @@ static VOID _calcViewRect(PGROPDATA pGrop, BOOL fSendSize)
}
else {
SWP swp;
- POINTL pointl = { 0 };
+ POINTL pointl = { 0,0 };
WinQueryWindowPos(pGrop->hwnd, &swp);
lWinWidth = swp.cx;
diff --git a/src/video/os2grop/SDL_os2dive.c b/src/video/os2grop/SDL_os2dive.c
index f6274bbec..ba614ed3d 100644
--- a/src/video/os2grop/SDL_os2dive.c
+++ b/src/video/os2grop/SDL_os2dive.c
@@ -82,11 +82,13 @@ typedef struct _DIVEData {
static BOOL vsInit(PVIDEOMODESLIST pModes, PVOID *ppVSData)
{
PDIVEData pDIVEData;
- DIVE_CAPS sDiveCaps = { 0 };
- FOURCC fccFormats[100] = { 0 };
+ DIVE_CAPS sDiveCaps;
+ FOURCC fccFormats[100];
PVIDEOMODE pMode;
ULONG ulIdx, cModes;
+ SDL_memset(fccFormats, 0, sizeof(fccFormats));
+ SDL_memset(&sDiveCaps, 0, sizeof(sDiveCaps));
sDiveCaps.pFormatData = fccFormats;
sDiveCaps.ulFormatLength = 100;
sDiveCaps.ulStructLen = sizeof(DIVE_CAPS);
diff --git a/src/video/os2grop/SDL_os2grop.c b/src/video/os2grop/SDL_os2grop.c
index 7773d0269..73a086860 100644
--- a/src/video/os2grop/SDL_os2grop.c
+++ b/src/video/os2grop/SDL_os2grop.c
@@ -104,7 +104,8 @@ static SCAN2SDLKEY aScan2SDLKey[] = {
{0x38, SDLK_LALT}, {0x39, SDLK_SPACE},
{0x5e, SDLK_RALT}, {0x7f, SDLK_RSUPER}, {0x7c, SDLK_MENU}, {0x5b, SDLK_RCTRL},
{0x63, SDLK_LEFT}, {0x66, SDLK_DOWN}, {0x64, SDLK_RIGHT}, {0x52, SDLK_KP0},
- {0x53, SDLK_KP_PERIOD} };
+ {0x53, SDLK_KP_PERIOD}
+};
typedef struct _UNICODESHIFTKEY {
SDLKey enSDLKey;
@@ -750,8 +751,8 @@ static void os2_SetIcon(SDL_VideoDevice *pDevice, SDL_Surface *pSDLSurfaceIcon,
SDL_PrivateVideoData *pPVData = pDevice->hidden;
SDL_Surface *SDLSurfIcon;
HBITMAP hbm;
- BITMAPINFOHEADER2 bmih = { 0 };
- BITMAPINFO bmi = { 0 };
+ BITMAPINFOHEADER2 bmih;
+ BITMAPINFO bmi;
HPS hps;
PULONG pulBitmap;
SDL_Rect sSDLRect;
@@ -836,6 +837,9 @@ static void os2_SetIcon(SDL_VideoDevice *pDevice, SDL_Surface *pSDLSurfaceIcon,
SDL_FreeSurface(SDLSurfIcon);
/* Create system bitmap object */
+ SDL_memset(&bmih, 0, sizeof(bmih));
+ SDL_memset(&bmi, 0, sizeof(bmi));
+
bmih.cbFix = sizeof(BITMAPINFOHEADER2);
bmih.cx = sSDLRect.w;
bmih.cy = 2 * sSDLRect.h;
@@ -900,7 +904,7 @@ static WMcursor *os2_CreateWMCursor(SDL_VideoDevice *pDevice,
int iW, int iH, int iHotX, int iHotY)
{
/*SDL_PrivateVideoData *pPVData = pDevice->hidden;*/
- BITMAPINFOHEADER bmih = { 0 };
+ BITMAPINFOHEADER bmih;
BITMAPINFO bmi;
HPS hps;
PBYTE pcImage;
@@ -965,6 +969,7 @@ static WMcursor *os2_CreateWMCursor(SDL_VideoDevice *pDevice,
bmi.argbColor[1].bGreen = 0x00;
bmi.argbColor[1].bRed = 0xFF;
+ SDL_memset(&bmih, 0, sizeof(bmih));
bmih.cbFix = sizeof(BITMAPINFOHEADER);
bmih.cx = ulMaxX;
bmih.cy = ulMaxY * 2;
diff --git a/src/video/os2grop/SDL_os2grop.h b/src/video/os2grop/SDL_os2grop.h
index fb682e86c..2ca12d5fa 100644
--- a/src/video/os2grop/SDL_os2grop.h
+++ b/src/video/os2grop/SDL_os2grop.h
@@ -19,6 +19,7 @@
Sam Lantinga
slouken@libsdl.org
*/
+
#ifndef SDL_os2grop_h_
#define SDL_os2grop_h_
diff --git a/src/video/os2grop/SDL_os2vman.c b/src/video/os2grop/SDL_os2vman.c
index c284b3e2b..6a1f75d31 100644
--- a/src/video/os2grop/SDL_os2vman.c
+++ b/src/video/os2grop/SDL_os2vman.c
@@ -111,9 +111,9 @@ VOID APIENTRY ExitVMan(VOID)
*/
static VOID _clearScreen(PVIDEOMODE pMode)
{
- LINEINFO sLineInfo = { 0 };
+ LINEINFO sLineInfo;
BMAPINFO bmiDst;
- LINEPACK sLine = { 0 };
+ LINEPACK sLine;
RECTL rclBounds;
HWREQIN sHWReqIn;
ULONG ulIdx;
@@ -141,6 +141,9 @@ static VOID _clearScreen(PVIDEOMODE pMode)
return;
}
+ SDL_memset(&sLine, 0, sizeof(sLine));
+ SDL_memset(&sLineInfo, 0, sizeof(sLineInfo));
+
sLine.ulFlags = LINE_DIR_Y_POSITIVE | LINE_DIR_X_POSITIVE |
LINE_HORIZONTAL | LINE_DO_FIRST_PEL | LINE_DO_LAST_PEL;
sLine.plpkNext = NULL;
@@ -622,7 +625,7 @@ static BOOL vsUpdate(PVOID pVSData, PGROPDATA pGrop, ULONG cRect,
POINTL ptlSrcOrg;
BLTRECT brDst;
HWREQIN sHWReqIn;
- BITBLTINFO sBitbltInfo = { 0 };
+ BITBLTINFO sBitbltInfo;
ULONG ulIdx;
RECTL rectlScreenUpdate;
@@ -787,6 +790,7 @@ static BOOL vsUpdate(PVOID pVSData, PGROPDATA pGrop, ULONG cRect,
rclSrcBounds.yTop = bmiSrc.ulHeight;
rclDstBounds = rectlScreenUpdate;
+ SDL_memset(&sBitbltInfo, 0, sizeof(sBitbltInfo));
sBitbltInfo.ulLength = sizeof(BITBLTINFO);
sBitbltInfo.ulBltFlags = BF_DEFAULT_STATE | BF_ROP_INCL_SRC | BF_PAT_HOLLOW;
sBitbltInfo.cBlits = cRect;