[Scummvm-git-logs] scummvm master -> a4301e50f333be6f77bfc45462bdc1c2ad97a3a2
dreammaster
noreply at scummvm.org
Thu Oct 2 10:49:26 UTC 2025
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
af52a791d8 BAGEL: MINIGAMES: Fix misc minigame Coverity warnings
a4301e50f3 BAGEL: MFC: Fix Coverity warnings
Commit: af52a791d8ab76c5f633787ba5f8ac9bceb33e9a
https://github.com/scummvm/scummvm/commit/af52a791d8ab76c5f633787ba5f8ac9bceb33e9a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-02T03:41:25-07:00
Commit Message:
BAGEL: MINIGAMES: Fix misc minigame Coverity warnings
Changed paths:
engines/bagel/hodjnpodj/poker/dialogs.h
engines/bagel/hodjnpodj/riddles/riddles.cpp
engines/bagel/hodjnpodj/riddles/usercfg.h
engines/bagel/hodjnpodj/wordsearch/c1btndlg.h
engines/bagel/hodjnpodj/wordsearch/clongdlg.h
engines/bagel/hodjnpodj/wordsearch/dialogs.h
engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
diff --git a/engines/bagel/hodjnpodj/poker/dialogs.h b/engines/bagel/hodjnpodj/poker/dialogs.h
index aa535f1c07e..5568d24a799 100644
--- a/engines/bagel/hodjnpodj/poker/dialogs.h
+++ b/engines/bagel/hodjnpodj/poker/dialogs.h
@@ -131,7 +131,7 @@ protected:
//////////////////////////////////////////////////////////////////////////////
class CUserWonDlg : public CBmpDialog {
private:
- int m_nWinPhrase;
+ int m_nWinPhrase = 0;
public:
CUserWonDlg(CWnd *pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_USERWON);
diff --git a/engines/bagel/hodjnpodj/riddles/riddles.cpp b/engines/bagel/hodjnpodj/riddles/riddles.cpp
index 84df0b12e3e..6d099447aea 100644
--- a/engines/bagel/hodjnpodj/riddles/riddles.cpp
+++ b/engines/bagel/hodjnpodj/riddles/riddles.cpp
@@ -292,7 +292,8 @@ CRiddlesWindow::CRiddlesWindow() :
// load the 32 character sprites into masters
//
- errCode = LoadMasterSprites();
+ if (!errCode)
+ errCode = LoadMasterSprites();
// if we are not playing from the metagame
//
@@ -353,7 +354,7 @@ ERROR_CODE CRiddlesWindow::LoadMasterSprites() {
pBmp = ExtractBitmap(pDC, pFontBmp, m_pGamePalette, i * LETTERSIZE_X, 0, LETTERSIZE_X, LETTERSIZE_Y);
- pSprite->LoadSprite(pBmp, m_pGamePalette);
+ (void)pSprite->LoadSprite(pBmp, m_pGamePalette);
pSprite->SetMasked(true);
pSprite->SetMobile(true);
@@ -659,8 +660,7 @@ void CRiddlesWindow::GameReset() {
ReleaseDC(pDC); // release current device context
- if (m_pEditText != nullptr)
- m_pEditText->SetWindowText(""); // erase any text in edit ctrl
+ m_pEditText->SetWindowText(""); // erase any text in edit ctrl
m_bGameActive = false; // there is no current game
@@ -1423,10 +1423,9 @@ void CRiddlesWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
}
} // end if bSuccess
- if (pSprite != nullptr)
- delete pSprite;
-
+ delete pSprite;
ReleaseDC(pDC);
+
} else if ((((((col1Rect.PtInRect(point) || col2Rect.PtInRect(point)) || col3Rect.PtInRect(point)) ||
col4Rect.PtInRect(point)) || col5Rect.PtInRect(point)) || col6Rect.PtInRect(point)) ||
col7Rect.PtInRect(point)) {
diff --git a/engines/bagel/hodjnpodj/riddles/usercfg.h b/engines/bagel/hodjnpodj/riddles/usercfg.h
index 6de4a7a1b8c..c2dac657cd0 100644
--- a/engines/bagel/hodjnpodj/riddles/usercfg.h
+++ b/engines/bagel/hodjnpodj/riddles/usercfg.h
@@ -62,14 +62,14 @@ protected:
void OnLButtonDown(unsigned int, CPoint);
DECLARE_MESSAGE_MAP()
- CText *m_pTxtTimeLimit;
- CText *m_pTxtLimit;
- CText *m_pTxtLevel;
- CScrollBar *m_pScrollBar;
- CScrollBar *m_pLevelScroll;
- unsigned int m_nTimeLimit;
- int m_nDifficultyLevel;
- bool m_bSave; // True if should save theses values
+ CText *m_pTxtTimeLimit = nullptr;
+ CText *m_pTxtLimit = nullptr;
+ CText *m_pTxtLevel = nullptr;
+ CScrollBar *m_pScrollBar = nullptr;
+ CScrollBar *m_pLevelScroll = nullptr;
+ unsigned int m_nTimeLimit = 0;
+ int m_nDifficultyLevel = 0;
+ bool m_bSave = false; // True if should save theses values
};
} // namespace Riddles
diff --git a/engines/bagel/hodjnpodj/wordsearch/c1btndlg.h b/engines/bagel/hodjnpodj/wordsearch/c1btndlg.h
index 1dbf63850d2..51bfc792761 100644
--- a/engines/bagel/hodjnpodj/wordsearch/c1btndlg.h
+++ b/engines/bagel/hodjnpodj/wordsearch/c1btndlg.h
@@ -61,13 +61,13 @@ protected:
DECLARE_MESSAGE_MAP()
private:
- CText *m_cTextMessage1;
- CText *m_cTextMessage2;
- CText *m_cWordList[WORDSPERLIST];
- char *m_pszMessage1;
- char *m_pszMessage2;
- char *m_pszButton1Text;
- CColorButton *m_pButton1;
+ CText *m_cTextMessage1 = nullptr;
+ CText *m_cTextMessage2 = nullptr;
+ CText *m_cWordList[WORDSPERLIST] = {};
+ char *m_pszMessage1 = nullptr;
+ char *m_pszMessage2 = nullptr;
+ char *m_pszButton1Text = nullptr;
+ CColorButton *m_pButton1 = nullptr;
};
} // namespace Poker
diff --git a/engines/bagel/hodjnpodj/wordsearch/clongdlg.h b/engines/bagel/hodjnpodj/wordsearch/clongdlg.h
index 01ca649a80e..e69ff31dd89 100644
--- a/engines/bagel/hodjnpodj/wordsearch/clongdlg.h
+++ b/engines/bagel/hodjnpodj/wordsearch/clongdlg.h
@@ -61,13 +61,13 @@ protected:
DECLARE_MESSAGE_MAP()
private:
- CText *m_cTextMessage1;
- CText *m_cTextMessage2;
- CText *m_cWordList[WORDSPERLIST];
- const char *m_pszMessage1;
- const char *m_pszMessage2;
- const char *m_pszButton1Text;
- CColorButton *m_pButton1;
+ CText *m_cTextMessage1 = nullptr;
+ CText *m_cTextMessage2 = nullptr;
+ CText *m_cWordList[WORDSPERLIST] = {};
+ const char *m_pszMessage1 = nullptr;
+ const char *m_pszMessage2 = nullptr;
+ const char *m_pszButton1Text = nullptr;
+ CColorButton *m_pButton1 = nullptr;
};
} // namespace Poker
diff --git a/engines/bagel/hodjnpodj/wordsearch/dialogs.h b/engines/bagel/hodjnpodj/wordsearch/dialogs.h
index 950fe94ea1c..5ababa0d5fa 100644
--- a/engines/bagel/hodjnpodj/wordsearch/dialogs.h
+++ b/engines/bagel/hodjnpodj/wordsearch/dialogs.h
@@ -34,9 +34,9 @@ namespace WordSearch {
//////////////////////////////////////////////////////////////////////////////
class CWSOptDlg : public CBmpDialog {
private:
- int m_nGameTime;
- bool m_bShowWord;
- bool m_bWordForwardOnly;
+ int m_nGameTime = 0;
+ bool m_bShowWord = false;
+ bool m_bWordForwardOnly = false;
CRect rDisplayTime;
public:
diff --git a/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp b/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
index d45a7ec3e1b..9e8ffb85f09 100644
--- a/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
+++ b/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
@@ -157,7 +157,6 @@ CMainWSWindow::CMainWSWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) :
// load splash screen
pDC = GetDC(); // get a device context for our window
- pbmpSplashScreen = new CBitmap();
pbmpSplashScreen = FetchBitmap(pDC, &pGamePalette, SPLASHSPEC); // get splash screen and game palettte
pOldPal = pDC->SelectPalette(pGamePalette, false); // load game palette
@@ -204,7 +203,6 @@ CMainWSWindow::CMainWSWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) :
pOldOffScreenBmp = pOffScreenDC->SelectObject(pOffScreenBmp); // load in offscreen bitmap
pOffScreenDC->RealizePalette(); // realize palette
- pbmpAllLetters = new CBitmap;
//pbmpAllLetters = FetchBitmap( pDC, nullptr, ALLLETTERS );
pbmpAllLetters = FetchBitmap(pOffScreenDC, nullptr, ALLLETTERS);
ASSERT(pbmpAllLetters != 0);
Commit: a4301e50f333be6f77bfc45462bdc1c2ad97a3a2
https://github.com/scummvm/scummvm/commit/a4301e50f333be6f77bfc45462bdc1c2ad97a3a2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-02T03:48:47-07:00
Commit Message:
BAGEL: MFC: Fix Coverity warnings
Changed paths:
engines/bagel/mfc/gfx/dialog_template.h
engines/bagel/mfc/win_app.cpp
engines/bagel/mfc/wingdi.cpp
diff --git a/engines/bagel/mfc/gfx/dialog_template.h b/engines/bagel/mfc/gfx/dialog_template.h
index a1827a8a988..ca6c0a4c935 100644
--- a/engines/bagel/mfc/gfx/dialog_template.h
+++ b/engines/bagel/mfc/gfx/dialog_template.h
@@ -102,9 +102,9 @@ private:
LOGFONT ParseFontFromTemplate();
public:
- HGLOBAL m_hTemplate;
- uint32 m_dwTemplateSize;
- bool m_bSystemFont;
+ HGLOBAL m_hTemplate = nullptr;
+ uint32 m_dwTemplateSize = 0;
+ bool m_bSystemFont = false;
public:
CDialogTemplate(LPCDLGTEMPLATE pTemplate = NULL);
diff --git a/engines/bagel/mfc/win_app.cpp b/engines/bagel/mfc/win_app.cpp
index 924e2e71333..6d7e82c6c37 100644
--- a/engines/bagel/mfc/win_app.cpp
+++ b/engines/bagel/mfc/win_app.cpp
@@ -427,6 +427,9 @@ int LoadString(HINSTANCE hInstance, unsigned int uID,
int copyLen = MIN((int)length, cchBufferMax - 1);
memcpy(lpBuffer, (const char *)pData, copyLen);
lpBuffer[copyLen] = '\0';
+
+ UnlockResource(hResData);
+ FreeResource(hResData);
return copyLen;
}
@@ -435,6 +438,8 @@ int LoadString(HINSTANCE hInstance, unsigned int uID,
}
// String ID not found (shouldn't happen if resource is valid)
+ UnlockResource(hResData);
+ FreeResource(hResData);
return 0;
}
diff --git a/engines/bagel/mfc/wingdi.cpp b/engines/bagel/mfc/wingdi.cpp
index 8aaaa9c34ed..0a2f7240c9b 100644
--- a/engines/bagel/mfc/wingdi.cpp
+++ b/engines/bagel/mfc/wingdi.cpp
@@ -47,7 +47,6 @@ int GetDeviceCaps(HDC hdc, int index) {
RC_BITMAP64 |
RC_DI_BITMAP |
RC_DIBTODEV |
- RC_PALETTE |
RC_STRETCHBLT;
default:
More information about the Scummvm-git-logs
mailing list