Commit: b8d3ba7d06b39bed6c30f6020a78a1b5652ac827 - Tera_Term_Testing (git)

Tera Termの個人的な作業用リポジトリ

Commit MetaInfo

• Revisão: b8d3ba7d06b39bed6c30f6020a78a1b5652ac827 (tree)
• Hora: 2020-11-30 00:26:19
• Autor: zmatsuo <zmatsuo@user...>
• Commiter: zmatsuo

Mensagem de Log

グローバル変数削除

- PrnDlg
- PrnBox()内でグローバル変数 PrintDC にセットしないようにした
- Prnlf

git-svn-id: svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk@9038 f5f01b69-1e22-0410-acbf-894ab4bd6246

Mudança Sumário

• modified: teraterm/teraterm/teraprn.cpp

Diff

--- a/teraterm/teraterm/teraprn.cpp
+++ b/teraterm/teraterm/teraprn.cpp
@@ -52,10 +52,7 @@
 #endif
 #endif
 
-static PRINTDLG PrnDlg;
-
 static HDC PrintDC;
-static LOGFONTA Prnlf;
 static HFONT PrnFont[AttrFontMask+1];
 static int PrnFW, PrnFH;
 static RECT Margin;
@@ -105,8 +102,8 @@ static UINT_PTR CALLBACK PrintHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPA
 HDC PrnBox(HWND HWin, PBOOL Sel)
 {
 	/* initialize PrnDlg record */
-	memset(&PrnDlg, 0, sizeof(PRINTDLG));
-	PrnDlg.lStructSize = sizeof(PRINTDLG);
+	PRINTDLGW PrnDlg = {};
+	PrnDlg.lStructSize = sizeof(PrnDlg);
 	PrnDlg.hwndOwner = HWin;
 	PrnDlg.Flags = PD_RETURNDC | PD_NOPAGENUMS | PD_SHOWHELP | PD_ENABLEPRINTHOOK;
 	if (! *Sel) {
@@ -122,15 +119,14 @@ HDC PrnBox(HWND HWin, PBOOL Sel)
 	PrnDlg.lpfnPrintHook = PrintHookProc;
 
 	/* 'Print' dialog box */
-	if (! PrintDlg(&PrnDlg)) {
+	if (! PrintDlgW(&PrnDlg)) {
 		return NULL; /* if 'Cancel' button clicked, exit */
 	}
 	if (PrnDlg.hDC == NULL) {
 		return NULL;
 	}
-	PrintDC = PrnDlg.hDC;
 	*Sel = (PrnDlg.Flags & PD_SELECTION) != 0;
-	return PrintDC;
+	return PrnDlg.hDC;
 }
 
 BOOL PrnStart(LPSTR DocumentName)
@@ -215,13 +211,11 @@ int VTPrintInit(int PrnFlag)
 		AttrDefaultFG,
 		AttrDefaultBG
 	};
+	LOGFONTA Prnlf;
 
 	Sel = (PrnFlag & IdPrnSelectedText)!=0;
-	if (PrnBox(HVTWin,&Sel)==NULL) {
-		return (IdPrnCancel);
-	}
-
-	if (PrintDC==0) {
+	PrintDC = PrnBox(HVTWin,&Sel);
+	if (PrintDC == NULL) {
 		return (IdPrnCancel);
 	}