Skip to content

W
wine-cw
Commit ee2d9d58 authored by Huw D M Davies's avatar Huw D M Davies Committed by Alexandre Julliard
Browse files
Options

Implemented AddPrinterA, AddPrinterDriverA and GetPrinterDriverDirectory

Moved some 16bit GDI function declarations from winspool.h -> wingdi16.h
parent 338d3b2d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 17 deletions
include/wine/wingdi16.h
View file @ ee2d9d58
......@@ -278,6 +278,7 @@ BOOL16 WINAPI BeginPath16(HDC16);
BOOL16 WINAPI BitBlt16(HDC16,INT16,INT16,INT16,INT16,HDC16,INT16,INT16,DWORD);
BOOL16 WINAPI Chord16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16,INT16,INT16);
BOOL16 WINAPI CloseFigure16(HDC16);
int WINAPI CloseJob16(HANDLE16);
HMETAFILE16 WINAPI CloseMetaFile16(HDC16);
INT16 WINAPI CombineRgn16(HRGN16,HRGN16,HRGN16,INT16);
HMETAFILE16 WINAPI CopyMetaFile16(HMETAFILE16,LPCSTR);
......@@ -314,12 +315,17 @@ BOOL16 WINAPI CreateScalableFontResource16(UINT16,LPCSTR,LPCSTR,LPCSTR);
HBRUSH16 WINAPI CreateSolidBrush16(COLORREF);
VOID WINAPI Death16(HDC16);
BOOL16 WINAPI DeleteDC16(HDC16);
int WINAPI DeleteJob16(HANDLE16,WORD);
BOOL16 WINAPI DeleteMetaFile16(HMETAFILE16);
BOOL16 WINAPI DeleteObject16(HGDIOBJ16);
BOOL16 WINAPI DPtoLP16(HDC16,LPPOINT16,INT16);
DWORD WINAPI DrvGetPrinterData16(LPSTR,LPSTR,LPDWORD,LPBYTE,int cbData,LPDWORD);
DWORD WINAPI DrvSetPrinterData16(LPSTR,LPSTR,DWORD,LPBYTE,DWORD);
BOOL16 WINAPI Ellipse16(HDC16,INT16,INT16,INT16,INT16);
INT16 WINAPI EndDoc16(HDC16);
INT16 WINAPI EndPage16(HDC16);
BOOL16 WINAPI EndPath16(HDC16);
int WINAPI EndSpoolPage16(HANDLE16);
INT16 WINAPI EnumFontFamilies16(HDC16,LPCSTR,FONTENUMPROC16,LPARAM);
INT16 WINAPI EnumFontFamiliesEx16(HDC16,LPLOGFONT16,FONTENUMPROCEX16,LPARAM,DWORD);
INT16 WINAPI EnumFonts16(HDC16,LPCSTR,FONTENUMPROC16,LPARAM);
......@@ -384,6 +390,7 @@ DWORD WINAPI GetRegionData16(HRGN16,DWORD,LPRGNDATA);
INT16 WINAPI GetRelAbs16(HDC16);
INT16 WINAPI GetRgnBox16(HRGN16,LPRECT16);
INT16 WINAPI GetROP216(HDC16);
DWORD WINAPI GetSpoolJob16(int,LONG);
HGDIOBJ16 WINAPI GetStockObject16(INT16);
INT16 WINAPI GetStretchBltMode16(HDC16);
UINT16 WINAPI GetSystemPaletteEntries16(HDC16,UINT16,UINT16,LPPALETTEENTRY);
......@@ -424,6 +431,7 @@ BOOL16 WINAPI OffsetViewportOrgEx16(HDC16,INT16,INT16,LPPOINT16);
INT16 WINAPI OffsetVisRgn16(HDC16,INT16,INT16);
DWORD WINAPI OffsetWindowOrg16(HDC16,INT16,INT16);
BOOL16 WINAPI OffsetWindowOrgEx16(HDC16,INT16,INT16,LPPOINT16);
HANDLE16 WINAPI OpenJob16(LPSTR,LPSTR,HDC16);
BOOL16 WINAPI PaintRgn16(HDC16,HRGN16);
BOOL16 WINAPI PatBlt16(HDC16,INT16,INT16,INT16,INT16,DWORD);
HRGN16 WINAPI PathToRegion16(HDC16);
......@@ -505,7 +513,7 @@ DWORD WINAPI SetWindowOrg16(HDC16,INT16,INT16);
BOOL16 WINAPI SetWindowOrgEx16(HDC16,INT16,INT16,LPPOINT16);
INT16 WINAPI StartDoc16(HDC16,const DOCINFO16*);
INT16 WINAPI StartPage16(HDC16);
INT16 WINAPI EndPage16(HDC16);
int WINAPI StartSpoolPage16(HANDLE16);
BOOL16 WINAPI StretchBlt16(HDC16,INT16,INT16,INT16,INT16,HDC16,INT16,
INT16,INT16,INT16,DWORD);
INT16 WINAPI StretchDIBits16(HDC16,INT16,INT16,INT16,INT16,INT16,INT16,
......@@ -516,6 +524,8 @@ BOOL16 WINAPI TextOut16(HDC16,INT16,INT16,LPCSTR,INT16);
BOOL16 WINAPI UnrealizeObject16(HGDIOBJ16);
INT16 WINAPI UpdateColors16(HDC16);
BOOL16 WINAPI WidenPath16(HDC16);
int WINAPI WriteDialog16(HANDLE16,LPSTR,WORD);
int WINAPI WriteSpool16(HANDLE16,LPSTR,WORD);
#endif /* __WINE_WINGDI16_H */
include/winerror.h
View file @ ee2d9d58
......@@ -260,7 +260,17 @@ extern int WIN32_LastError;
#define ERROR_CLASS_DOES_NOT_EXIST 1411
#define ERROR_CLASS_HAS_WINDOWS 1412
#define ERROR_COMMITMENT_LIMIT 1455
#define ERROR_INVALID_PRINTER_NAME 1801
#define ERROR_PRINTER_DRIVER_ALREADY_INSTALLED 1795
#define ERROR_UNKNOWN_PORT 1796
#define ERROR_UNKNOWN_PRINTER_DRIVER 1797
#define ERROR_UNKNOWN_PRINTPROCESSOR 1798
#define ERROR_INVALID_SEPARATOR_FILE 1799
#define ERROR_INVALID_PRIORITY 1800
#define ERROR_INVALID_PRINTER_NAME 1801
#define ERROR_PRINTER_ALREADY_EXISTS 1802
#define ERROR_INVALID_PRINTER_COMMAND 1803
#define ERROR_INVALID_DATATYPE 1804
#define ERROR_INVALID_ENVIRONMENT 1805
/* HRESULT values for OLE, SHELL and other Interface stuff */
/* the codes 4000-40ff are reserved for OLE */
......
include/winspool.h
View file @ ee2d9d58
......@@ -105,6 +105,36 @@ DECL_WINELIB_TYPE_AW(DRIVER_INFO_2)
DECL_WINELIB_TYPE_AW(PDRIVER_INFO_2)
DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_2)
typedef struct _DRIVER_INFO_3A {
DWORD cVersion;
LPSTR pName;
LPSTR pEnvironment;
LPSTR pDriverPath;
LPSTR pDataFile;
LPSTR pConfigFile;
LPSTR pHelpFile;
LPSTR pDependentFiles;
LPSTR pMonitorName;
LPSTR pDefaultDataType;
} DRIVER_INFO_3A, *PDRIVER_INFO_3A, *LPDRIVER_INFO_3A;
typedef struct _DRIVER_INFO_3W {
DWORD cVersion;
LPWSTR pName;
LPWSTR pEnvironment;
LPWSTR pDriverPath;
LPWSTR pDataFile;
LPWSTR pConfigFile;
LPWSTR pHelpFile;
LPWSTR pDependentFiles;
LPWSTR pMonitorName;
LPWSTR pDefaultDataType;
} DRIVER_INFO_3W, *PDRIVER_INFO_3W, *LPDRIVER_INFO_3W;
DECL_WINELIB_TYPE_AW(DRIVER_INFO_3)
DECL_WINELIB_TYPE_AW(PDRIVER_INFO_3)
DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_3)
typedef struct _PRINTER_INFO_1A {
DWORD Flags;
LPSTR pDescription;
......@@ -219,19 +249,6 @@ DECL_WINELIB_TYPE_AW(LPPRINTER_INFO_5)
#endif /* Status */
/* DECLARATIONS */
DWORD WINAPI DrvGetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile,
LPDWORD lpType, LPBYTE lpPrinterData, int cbData, LPDWORD lpNeeded);
DWORD WINAPI DrvSetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile,
DWORD lpType, LPBYTE lpPrinterData, DWORD dwSize);
HANDLE16 WINAPI OpenJob16(LPSTR lpOutput, LPSTR lpTitle, HDC16 hDC);
int WINAPI CloseJob16(HANDLE16 hJob);
int WINAPI WriteSpool16(HANDLE16 hJob, LPSTR lpData, WORD cch);
int WINAPI DeleteJob16(HANDLE16 hJob, WORD wNotUsed);
int WINAPI StartSpoolPage16(HANDLE16 hJob);
int WINAPI EndSpoolPage16(HANDLE16 hJob);
DWORD WINAPI GetSpoolJob16(int nOption, LONG param);
int WINAPI WriteDialog16(HANDLE16 hJob, LPSTR lpMsg, WORD cchMsg);
INT WINAPI DeviceCapabilitiesA(LPCSTR pDevice,LPCSTR pPort,WORD fwCapability,
LPSTR pOutput, LPDEVMODEA pDevMode);
INT WINAPI DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort,
......@@ -271,6 +288,10 @@ BOOL WINAPI EnumPrintersW(DWORD dwType, LPWSTR lpszName,
BOOL WINAPI PrinterProperties(HWND hWnd, HANDLE hPrinter);
BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR,LPSTR,DWORD,LPBYTE,DWORD,LPDWORD);
BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR,LPWSTR,DWORD,LPBYTE,DWORD,LPDWORD);
#define GetPrinterDriverDirectory WINELIB_NAME_AW(GetPrinterDriverDirectory)
#ifdef __cplusplus
} /* extern "C" */
#endif
......
relay32/winspool.spec
View file @ ee2d9d58
......@@ -91,8 +91,8 @@ type win32
188 stub GetPrinterDataA
189 stub GetPrinterDataW
190 stdcall GetPrinterDriverA(long str long ptr long ptr) GetPrinterDriverA
191 stub GetPrinterDriverDirectoryA
192 stub GetPrinterDriverDirectoryW
191 stdcall GetPrinterDriverDirectoryA(str str long ptr long ptr) GetPrinterDriverDirectoryA
192 stdcall GetPrinterDriverDirectoryW(wstr wstr long ptr long ptr) GetPrinterDriverDirectoryW
193 stdcall GetPrinterDriverW(long str long ptr long ptr) GetPrinterDriverW
194 stdcall GetPrinterW(long long ptr long ptr) GetPrinterW
195 stub InitializeDll
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment