marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comdlg32: Rename PRINTDLG_PS_ChangePrinterA to better reflect its function.

oldstable
Huw Davies 2009-01-20 10:35:02 +00:00 committed by Alexandre Julliard
parent bb983c824d
commit 7d996fb739
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/comdlg32/printdlg.c
View File

@ -2783,29 +2783,26 @@ PRINTDLG_PS_ChangeActivePrinterA(LPSTR name, PageSetupDataA *pda){
} }
/**************************************************************************************** /****************************************************************************************
* PRINTDLG_PS_ChangePrinterA * pagesetup_init_combos
* *
* Fills Printers, Paper and Source combo * Fills Printers, Paper and Source combos
* *
* RETURNS
* TRUE
*/ */
static BOOL static void pagesetup_init_combos(HWND hDlg, PageSetupDataA *pda)
PRINTDLG_PS_ChangePrinterA(HWND hDlg, PageSetupDataA *pda) { {
DEVNAMES *dn; DEVNAMES *dn;
DEVMODEA *dm; DEVMODEA *dm;
LPSTR devname,portname; LPSTR devname,portname;
dn = GlobalLock(pda->dlga->hDevNames); dn = GlobalLock(pda->dlga->hDevNames);
dm = GlobalLock(pda->dlga->hDevMode); dm = GlobalLock(pda->dlga->hDevMode);
devname = ((char*)dn)+dn->wDeviceOffset; devname = ((char*)dn)+dn->wDeviceOffset;
portname = ((char*)dn)+dn->wOutputOffset; portname = ((char*)dn)+dn->wOutputOffset;
PRINTDLG_SetUpPrinterListComboA(hDlg, cmb1, devname); PRINTDLG_SetUpPrinterListComboA(hDlg, cmb1, devname);
PRINTDLG_SetUpPaperComboBoxA(hDlg,cmb2,devname,portname,dm); PRINTDLG_SetUpPaperComboBoxA(hDlg,cmb2,devname,portname,dm);
PRINTDLG_SetUpPaperComboBoxA(hDlg,cmb3,devname,portname,dm); PRINTDLG_SetUpPaperComboBoxA(hDlg,cmb3,devname,portname,dm);
GlobalUnlock(pda->dlga->hDevNames); GlobalUnlock(pda->dlga->hDevNames);
GlobalUnlock(pda->dlga->hDevMode); GlobalUnlock(pda->dlga->hDevMode);
return TRUE;
} }
static void PRINTDLG_PS_SetOrientationW(HWND hDlg, PageSetupDataW* pdw) static void PRINTDLG_PS_SetOrientationW(HWND hDlg, PageSetupDataW* pdw)
@ -3048,7 +3045,7 @@ PRINTDLG_PS_WMCommandA(
{ {
pda->dlga->hDevNames = prnt.hDevNames; pda->dlga->hDevNames = prnt.hDevNames;
pda->dlga->hDevMode = prnt.hDevMode; pda->dlga->hDevMode = prnt.hDevMode;
PRINTDLG_PS_ChangePrinterA(hDlg,pda); pagesetup_init_combos(hDlg, pda);
} }
return TRUE; return TRUE;
} }
@ -3069,7 +3066,7 @@ PRINTDLG_PS_WMCommandA(
char crPrinterName[256]; char crPrinterName[256];
GetDlgItemTextA(hDlg, id, crPrinterName, 255); GetDlgItemTextA(hDlg, id, crPrinterName, 255);
PRINTDLG_PS_ChangeActivePrinterA(crPrinterName, pda); PRINTDLG_PS_ChangeActivePrinterA(crPrinterName, pda);
PRINTDLG_PS_ChangePrinterA(hDlg, pda); pagesetup_init_combos(hDlg, pda);
} }
break; break;
case cmb2: /* Paper combo */ case cmb2: /* Paper combo */
@ -3500,7 +3497,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
} }
/* filling combos: printer, paper, source. selecting current printer (from DEVMODEA) */ /* filling combos: printer, paper, source. selecting current printer (from DEVMODEA) */
PRINTDLG_PS_ChangePrinterA(hDlg, pda); pagesetup_init_combos(hDlg, pda);
pagesetup_update_papersize(pda); pagesetup_update_papersize(pda);
pagesetup_set_defaultsource(pda, DMBIN_FORMSOURCE); /* FIXME: This is the auto select bin. Is this correct? */ pagesetup_set_defaultsource(pda, DMBIN_FORMSOURCE); /* FIXME: This is the auto select bin. Is this correct? */