diff --git a/programs/cmdlgtst/cmdlgtst.c b/programs/cmdlgtst/cmdlgtst.c
index 0e228b2773d..8a80ac143d1 100644
--- a/programs/cmdlgtst/cmdlgtst.c
+++ b/programs/cmdlgtst/cmdlgtst.c
@@ -69,8 +69,6 @@ static OPENFILENAME ofn;
 static HWND findDialogBox = 0;
 static UINT findMessageId = 0;
 
-static int findDialogBoxInit = 0;
-static int findDialogStructInit = 0;
 static FINDREPLACE frS;
 static char fromstring[1024], tostring[1024];
 
@@ -323,9 +321,9 @@ void mw_PrintSetup(HWND hWnd)
 		// Escape(tmp.hDC, NEWFRAME, 0, NULL, NULL);
 		// Escape(tmp.hDC, ENDDOC, 0, NULL, NULL);
 	 //	DeleteDC(tmp.hDC);
-		 if (pd.hDevMode != NULL)
+		 if (pd.hDevMode)
 			 GlobalFree(pd.hDevMode);
-		 if (pd.hDevNames != NULL)
+		 if (pd.hDevNames)
 			 GlobalFree(pd.hDevNames);
 
 		 pd.hDevMode = 0;