From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Mon, 23 Dec 2019 19:18:40 +0000 (+0900)
Subject: [MSPAINT] Simplify choosecolor initialization
X-Git-Tag: 0.4.14-RC~905
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=a32212d96ac61be5f2132a806d8591f8b390c9b3

[MSPAINT] Simplify choosecolor initialization
---

diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp
index 57857b37954..2b89afe9417 100644
--- a/base/applications/mspaint/main.cpp
+++ b/base/applications/mspaint/main.cpp
@@ -162,6 +162,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument
 
     /* init font for text tool */
     ZeroMemory(&lfTextFont, sizeof(lfTextFont));
+    lfTextFont.lfHeight = 0;
     lfTextFont.lfWeight = FW_NORMAL;
     lfTextFont.lfCharSet = DEFAULT_CHARSET;
     hfontTextFont = CreateFontIndirect(&lfTextFont);
@@ -315,15 +316,11 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument
     }
 
     /* initializing the CHOOSECOLOR structure for use with ChooseColor */
+    ZeroMemory(&choosecolor, sizeof(choosecolor));
     choosecolor.lStructSize    = sizeof(CHOOSECOLOR);
     choosecolor.hwndOwner      = hwnd;
-    choosecolor.hInstance      = NULL;
     choosecolor.rgbResult      = 0x00ffffff;
     choosecolor.lpCustColors   = custColors;
-    choosecolor.Flags          = 0;
-    choosecolor.lCustData      = 0;
-    choosecolor.lpfnHook       = NULL;
-    choosecolor.lpTemplateName = NULL;
 
     /* initializing the OPENFILENAME structure for use with GetOpenFileName and GetSaveFileName */
     CopyMemory(ofnFilename, filepathname, sizeof(filepathname));