Mercurial > vim

comparison src/os_mswin.c @ 2215:cccb71c2c5c1 vim73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix uninit memory read in undo code. Fix uint32_t in proto file. A few minor changes.
author Bram Moolenaar <bram@vim.org>
date Mon, 24 May 2010 11:59:29 +0200
parents 85a99ba3eb5a
children 120502692d82
comparison
equal deleted inserted replaced
2214:f8222d1f9a73 2215:cccb71c2c5c1
2075 DEVMODE *mem; 2075 DEVMODE *mem;
2076 DEVNAMES *devname; 2076 DEVNAMES *devname;
2077 int i; 2077 int i;
2078 2078
2079 bUserAbort = &(psettings->user_abort); 2079 bUserAbort = &(psettings->user_abort);
2080 memset(&prt_dlg, 0, sizeof(PRINTDLG)); 2080 vim_memset(&prt_dlg, 0, sizeof(PRINTDLG));
2081 prt_dlg.lStructSize = sizeof(PRINTDLG); 2081 prt_dlg.lStructSize = sizeof(PRINTDLG);
2082 #ifndef FEAT_GUI 2082 #ifndef FEAT_GUI
2083 GetConsoleHwnd(); /* get value of s_hwnd */ 2083 GetConsoleHwnd(); /* get value of s_hwnd */
2084 #endif 2084 #endif
2085 prt_dlg.hwndOwner = s_hwnd; 2085 prt_dlg.hwndOwner = s_hwnd;
2190 GlobalUnlock(prt_dlg.hDevNames); 2190 GlobalUnlock(prt_dlg.hDevNames);
2191 2191
2192 /* 2192 /*
2193 * Initialise the font according to 'printfont' 2193 * Initialise the font according to 'printfont'
2194 */ 2194 */
2195 memset(&fLogFont, 0, sizeof(fLogFont)); 2195 vim_memset(&fLogFont, 0, sizeof(fLogFont));
2196 if (get_logfont(&fLogFont, p_pfn, prt_dlg.hDC, TRUE) == FAIL) 2196 if (get_logfont(&fLogFont, p_pfn, prt_dlg.hDC, TRUE) == FAIL)
2197 { 2197 {
2198 EMSG2(_("E613: Unknown printer font: %s"), p_pfn); 2198 EMSG2(_("E613: Unknown printer font: %s"), p_pfn);
2199 mch_print_cleanup(); 2199 mch_print_cleanup();
2200 return FALSE; 2200 return FALSE;
2283 SetAbortProc(prt_dlg.hDC, AbortProc); 2283 SetAbortProc(prt_dlg.hDC, AbortProc);
2284 #endif 2284 #endif
2285 wsprintf(szBuffer, _("Printing '%s'"), gettail(psettings->jobname)); 2285 wsprintf(szBuffer, _("Printing '%s'"), gettail(psettings->jobname));
2286 SetDlgItemText(hDlgPrint, IDC_PRINTTEXT1, (LPSTR)szBuffer); 2286 SetDlgItemText(hDlgPrint, IDC_PRINTTEXT1, (LPSTR)szBuffer);
2287 2287
2288 memset(&di, 0, sizeof(DOCINFO)); 2288 vim_memset(&di, 0, sizeof(DOCINFO));
2289 di.cbSize = sizeof(DOCINFO); 2289 di.cbSize = sizeof(DOCINFO);
2290 di.lpszDocName = psettings->jobname; 2290 di.lpszDocName = psettings->jobname;
2291 ret = StartDoc(prt_dlg.hDC, &di); 2291 ret = StartDoc(prt_dlg.hDC, &di);
2292 2292
2293 #ifdef FEAT_GUI 2293 #ifdef FEAT_GUI
3360 if (STRCMP(name, "*") == 0) 3360 if (STRCMP(name, "*") == 0)
3361 { 3361 {
3362 #if defined(FEAT_GUI_W32) 3362 #if defined(FEAT_GUI_W32)
3363 CHOOSEFONT cf; 3363 CHOOSEFONT cf;
3364 /* if name is "*", bring up std font dialog: */ 3364 /* if name is "*", bring up std font dialog: */
3365 memset(&cf, 0, sizeof(cf)); 3365 vim_memset(&cf, 0, sizeof(cf));
3366 cf.lStructSize = sizeof(cf); 3366 cf.lStructSize = sizeof(cf);
3367 cf.hwndOwner = s_hwnd; 3367 cf.hwndOwner = s_hwnd;
3368 cf.Flags = CF_SCREENFONTS | CF_FIXEDPITCHONLY | CF_INITTOLOGFONTSTRUCT; 3368 cf.Flags = CF_SCREENFONTS | CF_FIXEDPITCHONLY | CF_INITTOLOGFONTSTRUCT;
3369 if (lastlf != NULL) 3369 if (lastlf != NULL)
3370 *lf = *lastlf; 3370 *lf = *lastlf;