From: Piotr Caban piotr@codeweavers.com
--- dlls/wineps.drv/driver.c | 89 --------------------------------- dlls/wineps.drv/psdlg.h | 1 - dlls/wineps.drv/wineps.drv.spec | 1 - dlls/wineps.drv/wineps.rc | 1 - 4 files changed, 92 deletions(-)
diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 1c4b6f2bb30..e73272c2079 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -445,95 +445,6 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, return TRUE; }
- -static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPage) (LPCPROPSHEETPAGEW); -static int (WINAPI *pPropertySheet) (LPCPROPSHEETHEADERW); - -/****************************************************************************** - * DrvDocumentProperties (wineps.drv.@) - * - * Retrieves or modifies device-initialization information for the PostScript - * driver, or displays a driver-supplied dialog box for configuring the driver. - * - * RETURNS - * Returns size of DEVMODE structure if wMode is 0. Otherwise, IDOK is returned for success - * for both dialog and non-dialog operations. IDCANCEL is returned if the dialog box was cancelled. - * A return value less than zero is returned if a non-dialog operation fails. - * - * BUGS - * - * Just returns default devmode at the moment. No use of initialization file. - */ -INT WINAPI DrvDocumentProperties(HWND hwnd, const WCHAR *device, DEVMODEW *output, - DEVMODEW *input, DWORD mode) -{ - PRINTERINFO *pi; - - TRACE("(hwnd=%p, Device='%s', devOut=%p, devIn=%p, Mode=%04lx)\n", - hwnd, debugstr_w(device), output, input, mode); - - if (!(pi = PSDRV_FindPrinterInfo(device))) return -1; - - /* If mode == 0, return size of DEVMODE structure */ - if (!mode) - return pi->Devmode->dmPublic.dmSize + pi->Devmode->dmPublic.dmDriverExtra; - - /* If DM_MODIFY is set, change settings in accordance with lpdmInput */ - if ((mode & DM_MODIFY) && input) - { - TRACE("DM_MODIFY set. devIn->dmFields = %08lx\n", input->dmFields); - PSDRV_MergeDevmodes(pi->Devmode, (PSDRV_DEVMODE *)input, pi); - } - - /* If DM_PROMPT is set, present modal dialog box */ - if (mode & DM_PROMPT) { - HINSTANCE hinstComctl32; - HPROPSHEETPAGE hpsp[1]; - PROPSHEETPAGEW psp; - PROPSHEETHEADERW psh; - PSDRV_DLGINFO di; - PSDRV_DEVMODE dlgdm; - WCHAR SetupW[64]; - - LoadStringW(PSDRV_hInstance, IDS_SETUP, SetupW, ARRAY_SIZE(SetupW)); - hinstComctl32 = LoadLibraryA("comctl32.dll"); - pCreatePropertySheetPage = (void*)GetProcAddress(hinstComctl32, - "CreatePropertySheetPageW"); - pPropertySheet = (void*)GetProcAddress(hinstComctl32, "PropertySheetW"); - memset(&psp,0,sizeof(psp)); - dlgdm = *pi->Devmode; - di.pi = pi; - di.dlgdm = &dlgdm; - psp.dwSize = sizeof(psp); - psp.hInstance = PSDRV_hInstance; - psp.pszTemplate = L"PAPER"; - psp.pszIcon = NULL; - psp.pfnDlgProc = PSDRV_PaperDlgProc; - psp.lParam = (LPARAM)&di; - hpsp[0] = pCreatePropertySheetPage(&psp); - - memset(&psh, 0, sizeof(psh)); - psh.dwSize = sizeof(psh); - psh.pszCaption = SetupW; - psh.nPages = 1; - psh.hwndParent = hwnd; - psh.phpage = hpsp; - - pPropertySheet(&psh); - - } - - /* If DM_UPDATE is set, should write settings to environment and initialization file */ - if (mode & DM_UPDATE) - FIXME("Mode DM_UPDATE. Just do the same as DM_COPY\n"); - - /* If DM_COPY is set, should write settings to lpdmOutput */ - if (output && (mode & (DM_COPY | DM_UPDATE))) - memcpy( output, &pi->Devmode->dmPublic, - pi->Devmode->dmPublic.dmSize + pi->Devmode->dmPublic.dmDriverExtra ); - return IDOK; -} - /****************************************************************************** * DrvDocumentPropertySheets (wineps.drv.@) */ diff --git a/dlls/wineps.drv/psdlg.h b/dlls/wineps.drv/psdlg.h index b8f4bc3eed8..09ce9012d50 100644 --- a/dlls/wineps.drv/psdlg.h +++ b/dlls/wineps.drv/psdlg.h @@ -32,6 +32,5 @@ #define IDD_QUALITY 112
#define IDS_DPI 1000 -#define IDS_SETUP 1001
#endif /* __WINE_PSDLG_H */ diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index c5775b0328b..365965c69cf 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -2,5 +2,4 @@
# Printer driver config exports @ stdcall DrvDeviceCapabilities(ptr wstr long ptr ptr) -@ stdcall DrvDocumentProperties(long wstr ptr ptr long) @ stdcall DrvDocumentPropertySheets(ptr long) diff --git a/dlls/wineps.drv/wineps.rc b/dlls/wineps.drv/wineps.rc index 7a657c833e6..35b3e5eb167 100644 --- a/dlls/wineps.drv/wineps.rc +++ b/dlls/wineps.drv/wineps.rc @@ -46,7 +46,6 @@ FONT 8, "MS Shell Dlg" STRINGTABLE { IDS_DPI "#msgctxt#unit: dots/inch#dpi" - IDS_SETUP "Setup" }
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL