Implement AbortDoc16, move AbortDoc32 and StartDoc32W to

misc/printdrv.c and fix a few compile warnings.
This commit is contained in:
Huw D M Davies 1998-12-11 10:17:31 +00:00 committed by Alexandre Julliard
parent 7a6228d1e1
commit 5a50273f5b
4 changed files with 37 additions and 26 deletions

View File

@ -1182,17 +1182,6 @@ BOOL32 WINAPI PolyBezierTo32( HDC32 hdc, const POINT32* lppt, DWORD cPoints )
}
/*************************************************************************
* StartDoc32W [GDI32.348]
*
*/
INT32 WINAPI
StartDoc32W(HDC32 hdc ,const DOCINFO32W* doc) {
FIXME(gdi,"stub\n");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0; /* failure*/
}
/******************************************************************************
* PolylineTo32 [GDI32.277]
*/
@ -1201,12 +1190,3 @@ BOOL32 WINAPI PolylineTo32(HDC32 hdc, const POINT32 *lppt, DWORD cCount)
FIXME(gdi, "(%d,%p,%ld): stub\n", hdc, lppt, cCount);
return 1;
}
/******************************************************************************
* AbortDoc32 [GDI32.0]
*/
INT32 WINAPI AbortDoc32(HDC32 hdc)
{
FIXME(gdi, "(%d): stub\n", hdc);
return 1;
}

View File

@ -7252,6 +7252,9 @@ VOID WINAPI WaitMessage(VOID);
/* Declarations for functions that change between Win16 and Win32 */
INT16 WINAPI AbortDoc16(HDC16);
INT32 WINAPI AbortDoc32(HDC32);
#define AbortDoc WINELIB_NAME(AbortDoc)
BOOL16 WINAPI AbortPath16(HDC16);
BOOL32 WINAPI AbortPath32(HDC32);
#define AbortPath WINELIB_NAME(AbortPath)

View File

@ -51,6 +51,16 @@ INT32 WINAPI StartDoc32A(HDC32 hdc ,const DOCINFO32A* doc)
return 0; /* failure*/
}
/*************************************************************************
* StartDoc32W [GDI32.348]
*
*/
INT32 WINAPI StartDoc32W(HDC32 hdc, const DOCINFO32W* doc) {
FIXME(gdi,"stub\n");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0; /* failure*/
}
/******************************************************************
* StartPage32 [GDI32.349]
*
@ -93,6 +103,23 @@ INT32 WINAPI EndDoc32(HDC32 hdc)
return 0; /* failure*/
}
/******************************************************************************
* AbortDoc16 [GDI.382]
*/
INT16 WINAPI AbortDoc16(HDC16 hdc)
{
return Escape16(hdc, ABORTDOC, 0, 0, 0);
}
/******************************************************************************
* AbortDoc32 [GDI32.0]
*/
INT32 WINAPI AbortDoc32(HDC32 hdc)
{
FIXME(gdi, "(%d): stub\n", hdc);
return 1;
}
/******************************************************************
* DrvGetPrinterDataInternal
*
@ -329,7 +356,8 @@ LONG WINAPI DocumentProperties32W(HWND32 hWnd, HANDLE32 hPrinter,
LPDEVMODE32W pDevModeInput, DWORD fMode)
{
FIXME(print,"(%d,%d,%s,%p,%p,%ld): stub\n",
hWnd,hPrinter,pDeviceName,pDevModeOutput,pDevModeInput,fMode);
hWnd,hPrinter,debugstr_w(pDeviceName),pDevModeOutput,pDevModeInput,
fMode);
return -1;
}
@ -516,7 +544,7 @@ BOOL32 WINAPI AddJob32W(HANDLE32 hPrinter, DWORD Level, LPBYTE pData, DWORD cbBu
HANDLE32 WINAPI AddPrinter32A(LPSTR pName, DWORD Level, LPBYTE pPrinter)
{
FIXME(print, "(%s,%ld,%p): stub\n", pName, Level, pPrinter);
return NULL;
return 0;
}
/*****************************************************************************
@ -552,7 +580,7 @@ BOOL32 WINAPI DeleteForm32A(HANDLE32 hPrinter, LPSTR pFormName)
*/
BOOL32 WINAPI DeleteForm32W(HANDLE32 hPrinter, LPWSTR pFormName)
{
FIXME(print, "(%d,%s): stub\n", hPrinter, pFormName);
FIXME(print, "(%d,%s): stub\n", hPrinter, debugstr_w(pFormName));
return 1;
}
@ -614,8 +642,8 @@ BOOL32 WINAPI GetForm32A(HANDLE32 hPrinter, LPSTR pFormName, DWORD Level,
BOOL32 WINAPI GetForm32W(HANDLE32 hPrinter, LPWSTR pFormName, DWORD Level,
LPBYTE pForm, DWORD cbBuf, LPDWORD pcbNeeded)
{
FIXME(print, "(%d,%s,%ld,%p,%ld,%p): stub\n",hPrinter,pFormName,
Level,pForm,cbBuf,pcbNeeded);
FIXME(print, "(%d,%s,%ld,%p,%ld,%p): stub\n",hPrinter,
debugstr_w(pFormName),Level,pForm,cbBuf,pcbNeeded);
return FALSE;
}

View File

@ -45,7 +45,7 @@ HENHMETAFILE32 WINAPI GetEnhMetaFile32W(
LPCWSTR lpszMetaFile) /* filename of enhanced metafile */
{
FIXME(metafile, "(%p): stub\n", lpszMetaFile);
return NULL;
return 0;
}
/*****************************************************************************