Tera TermRevision: 9038
https://osdn.net/projects/ttssh2/scm/svn/commits/9038
Author: zmatsuo
Date: 2020-11-30 00:26:19 +0900 (Mon, 30 Nov 2020)
Log Message:
-----------
グローバル変数削除
- PrnDlg
- PrnBox()内でグローバル変数 PrintDC にセットしないようにした
- Prnlf
Modified Paths:
--------------
trunk/teraterm/teraterm/teraprn.cpp
-------------- next part --------------
Modified: trunk/teraterm/teraterm/teraprn.cpp
===================================================================
--- trunk/teraterm/teraterm/teraprn.cpp 2020-11-29 15:26:08 UTC (rev 9037)
+++ trunk/teraterm/teraterm/teraprn.cpp 2020-11-29 15:26:19 UTC (rev 9038)
@@ -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 @@
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 @@
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,16 +211,14 @@
AttrDefaultFG,
AttrDefaultBG
};
+ LOGFONTA Prnlf;
Sel = (PrnFlag & IdPrnSelectedText)!=0;
- if (PrnBox(HVTWin,&Sel)==NULL) {
+ PrintDC = PrnBox(HVTWin,&Sel);
+ if (PrintDC == NULL) {
return (IdPrnCancel);
}
- if (PrintDC==0) {
- return (IdPrnCancel);
- }
-
/* start printing */
if (! PrnStart(ts.Title)) {
return (IdPrnCancel);