More graceful exit on failure.

This commit is contained in:
Bill Medland 2001-09-10 23:14:22 +00:00 committed by Alexandre Julliard
parent ee150c5104
commit 0a64cc6992
1 changed files with 4 additions and 2 deletions

View File

@ -444,7 +444,7 @@ static BOOL PRINTDLG_SetUpPaperComboBox(HWND hDlg,
LPDEVMODEA dm) LPDEVMODEA dm)
{ {
int i; int i;
DWORD NrOfEntries; int NrOfEntries;
char* Names; char* Names;
WORD* Words; WORD* Words;
DWORD Sel; DWORD Sel;
@ -453,7 +453,7 @@ static BOOL PRINTDLG_SetUpPaperComboBox(HWND hDlg,
int fwCapability_Names; int fwCapability_Names;
int fwCapability_Words; int fwCapability_Words;
TRACE(" Printer: %s, ComboID: %d\n",PrinterName,nIDComboBox); TRACE(" Printer: %s, Port: %s, ComboID: %d\n",PrinterName,PortName,nIDComboBox);
/* query the dialog box for the current selected value */ /* query the dialog box for the current selected value */
Sel = SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETCURSEL, 0, 0); Sel = SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETCURSEL, 0, 0);
@ -503,6 +503,8 @@ static BOOL PRINTDLG_SetUpPaperComboBox(HWND hDlg,
fwCapability_Names, NULL, dm); fwCapability_Names, NULL, dm);
if (NrOfEntries == 0) if (NrOfEntries == 0)
WARN("no Name Entries found!\n"); WARN("no Name Entries found!\n");
else if (NrOfEntries < 0)
return FALSE;
if(DeviceCapabilitiesA(PrinterName, PortName, fwCapability_Words, NULL, dm) if(DeviceCapabilitiesA(PrinterName, PortName, fwCapability_Words, NULL, dm)
!= NrOfEntries) { != NrOfEntries) {