--- trunk/reactos/w32api/include/ddk/winddi.h 2005-06-20 20:27:10 UTC (rev 16180)
+++ trunk/reactos/w32api/include/ddk/winddi.h 2005-06-20 21:03:41 UTC (rev 16181)
@@ -68,6 +68,10 @@
typedef PVOID LPVMEMHEAP;
#endif
+#ifndef DECL_IMPORT
+#define DECL_IMPORT __attribute__((dllimport))
+#endif
+
#if defined(_WIN32K_)
#define WIN32KAPI DECL_EXPORT
#else
@@ -107,7 +111,7 @@
typedef ULONG HGLYPH;
typedef HGLYPH *PHGLYPH;
-typedef LONG_PTR (DDKAPI *PFN)();
+typedef LONG_PTR (APIENTRY *PFN)();
DECLARE_HANDLE(HBM);
DECLARE_HANDLE(HDEV);
@@ -347,7 +351,7 @@
typedef struct _DRIVEROBJ *PDRIVEROBJ;
-typedef BOOL DDKAPI CALLBACK
+typedef BOOL APIENTRY CALLBACK
(*FREEOBJPROC)(
IN PDRIVEROBJ pDriverObj);
@@ -1147,39 +1151,39 @@
ULONG *pulXlate;
} XLATEOBJ;
-typedef VOID DDKAPI (CALLBACK *WNDOBJCHANGEPROC)(
+typedef VOID APIENTRY (CALLBACK *WNDOBJCHANGEPROC)(
IN WNDOBJ *pwo,
IN FLONG fl);
WIN32KAPI
HANDLE
-DDKAPI
+APIENTRY
BRUSHOBJ_hGetColorTransform(
IN BRUSHOBJ *pbo);
WIN32KAPI
PVOID
-DDKAPI
+APIENTRY
BRUSHOBJ_pvAllocRbrush(
IN BRUSHOBJ *pbo,
IN ULONG cj);
WIN32KAPI
PVOID
-DDKAPI
+APIENTRY
BRUSHOBJ_pvGetRbrush(
IN BRUSHOBJ *pbo);
WIN32KAPI
ULONG
-DDKAPI
+APIENTRY
BRUSHOBJ_ulGetBrushColor(
IN BRUSHOBJ *pbo);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
CLIPOBJ_bEnum(
IN CLIPOBJ *pco,
IN ULONG cj,
@@ -1199,7 +1203,7 @@
WIN32KAPI
ULONG
-DDKAPI
+APIENTRY
CLIPOBJ_cEnumStart(
IN CLIPOBJ *pco,
IN BOOL bAll,
@@ -1209,13 +1213,13 @@
WIN32KAPI
PATHOBJ*
-DDKAPI
+APIENTRY
CLIPOBJ_ppoGetPath(
IN CLIPOBJ *pco);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngAcquireSemaphore(
IN HSEMAPHORE hsem);
@@ -1224,7 +1228,7 @@
WIN32KAPI
PVOID
-DDKAPI
+APIENTRY
EngAllocMem(
IN ULONG Flags,
IN ULONG MemSize,
@@ -1232,7 +1236,7 @@
WIN32KAPI
PVOID
-DDKAPI
+APIENTRY
EngAllocPrivateUserMem(
IN PDD_SURFACE_LOCAL psl,
IN SIZE_T cj,
@@ -1240,14 +1244,14 @@
WIN32KAPI
PVOID
-DDKAPI
+APIENTRY
EngAllocUserMem(
IN SIZE_T cj,
IN ULONG tag);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngAlphaBlend(
IN SURFOBJ *psoDest,
IN SURFOBJ *psoSrc,
@@ -1279,7 +1283,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngAssociateSurface(
IN HSURF hsurf,
IN HDEV hdev,
@@ -1287,7 +1291,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngBitBlt(
IN SURFOBJ *psoTrg,
IN SURFOBJ *psoSrc,
@@ -1303,19 +1307,19 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngCheckAbort(
IN SURFOBJ *pso);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngClearEvent(
IN PEVENT pEvent);
WIN32KAPI
FD_GLYPHSET*
-DDKAPI
+APIENTRY
EngComputeGlyphSet(
IN INT nCodePage,
IN INT nFirstChar,
@@ -1327,14 +1331,14 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngControlSprites(
IN WNDOBJ *pwo,
IN FLONG fl);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngCopyBits(
OUT SURFOBJ *psoDest,
IN SURFOBJ *psoSrc,
@@ -1345,7 +1349,7 @@
WIN32KAPI
HBITMAP
-DDKAPI
+APIENTRY
EngCreateBitmap(
IN SIZEL sizl,
IN LONG lWidth,
@@ -1355,13 +1359,13 @@
WIN32KAPI
CLIPOBJ*
-DDKAPI
+APIENTRY
EngCreateClip(
VOID);
WIN32KAPI
HBITMAP
-DDKAPI
+APIENTRY
EngCreateDeviceBitmap(
IN DHSURF dhsurf,
IN SIZEL sizl,
@@ -1369,7 +1373,7 @@
WIN32KAPI
HSURF
-DDKAPI
+APIENTRY
EngCreateDeviceSurface(
DHSURF dhsurf,
SIZEL sizl,
@@ -1378,7 +1382,7 @@
#if 0
WIN32KAPI
HDRVOBJ
-DDKAPI
+APIENTRY
EngCreateDriverObj(
PVOID pvObj,
FREEOBJPROC pFreeObjProc,
@@ -1387,7 +1391,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngCreateEvent(
OUT PEVENT *ppEvent);
@@ -1400,7 +1404,7 @@
WIN32KAPI
HPALETTE
-DDKAPI
+APIENTRY
EngCreatePalette(
IN ULONG iMode,
IN ULONG cColors,
@@ -1411,13 +1415,13 @@
WIN32KAPI
PATHOBJ*
-DDKAPI
+APIENTRY
EngCreatePath(
VOID);
WIN32KAPI
HSEMAPHORE
-DDKAPI
+APIENTRY
EngCreateSemaphore(
VOID);
@@ -1434,7 +1438,7 @@
WIN32KAPI
WNDOBJ*
-DDKAPI
+APIENTRY
EngCreateWnd(
SURFOBJ *pso,
HWND hwnd,
@@ -1444,13 +1448,13 @@
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngDebugBreak(
VOID);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngDebugPrint(
IN PCHAR StandardPrefix,
IN PCHAR DebugMessage,
@@ -1458,13 +1462,13 @@
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngDeleteClip(
IN CLIPOBJ *pco);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngDeleteDriverObj(
IN HDRVOBJ hdo,
IN BOOL bCallBack,
@@ -1472,55 +1476,55 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngDeleteEvent(
IN PEVENT pEvent);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngDeleteFile(
IN LPWSTR pwszFileName);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngDeletePalette(
IN HPALETTE hpal);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngDeletePath(
IN PATHOBJ *ppo);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngDeleteSafeSemaphore(
IN OUT ENGSAFESEMAPHORE *pssem);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngDeleteSemaphore(
IN OUT HSEMAPHORE hsem);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngDeleteSurface(
IN HSURF hsurf);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngDeleteWnd(
IN WNDOBJ *pwo);
WIN32KAPI
DWORD
-DDKAPI
+APIENTRY
EngDeviceIoControl(
IN HANDLE hDevice,
IN DWORD dwIoControlCode,
@@ -1532,7 +1536,7 @@
WIN32KAPI
ULONG
-DDKAPI
+APIENTRY
EngDitherColor(
IN HDEV hdev,
IN ULONG iMode,
@@ -1541,7 +1545,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngEnumForms(
IN HANDLE hPrinter,
IN DWORD Level,
@@ -1552,7 +1556,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngEraseSurface(
IN SURFOBJ *pso,
IN RECTL *prcl,
@@ -1560,7 +1564,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngFillPath(
IN SURFOBJ *pso,
IN PATHOBJ *ppo,
@@ -1572,14 +1576,14 @@
WIN32KAPI
PVOID
-DDKAPI
+APIENTRY
EngFindImageProcAddress(
IN HANDLE hModule,
IN LPSTR lpProcName);
WIN32KAPI
PVOID
-DDKAPI
+APIENTRY
EngFindResource(
IN HANDLE h,
IN int iName,
@@ -1588,7 +1592,7 @@
WIN32KAPI
PVOID
-DDKAPI
+APIENTRY
EngFntCacheAlloc(
IN ULONG FastCheckSum,
IN ULONG ulSize);
@@ -1599,85 +1603,85 @@
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngFntCacheFault(
IN ULONG ulFastCheckSum,
IN ULONG iFaultMode);
WIN32KAPI
PVOID
-DDKAPI
+APIENTRY
EngFntCacheLookUp(
IN ULONG FastCheckSum,
OUT ULONG *pulSize);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngFreeMem(
IN PVOID Mem);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngFreeModule(
IN HANDLE h);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngFreePrivateUserMem(
IN PDD_SURFACE_LOCAL psl,
IN PVOID pv);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngFreeUserMem(
IN PVOID pv);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngGetCurrentCodePage(
OUT PUSHORT OemCodePage,
OUT PUSHORT AnsiCodePage);
WIN32KAPI
HANDLE
-DDKAPI
+APIENTRY
EngGetCurrentProcessId(
VOID);
WIN32KAPI
HANDLE
-DDKAPI
+APIENTRY
EngGetCurrentThreadId(
VOID);
WIN32KAPI
LPWSTR
-DDKAPI
+APIENTRY
EngGetDriverName(
IN HDEV hdev);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngGetFileChangeTime(
IN HANDLE h,
OUT LARGE_INTEGER *pChangeTime);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngGetFilePath(
IN HANDLE h,
OUT WCHAR (*pDest)[MAX_PATH+1]);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngGetForm(
IN HANDLE hPrinter,
IN LPWSTR pFormName,
@@ -1688,13 +1692,13 @@
WIN32KAPI
ULONG
-DDKAPI
+APIENTRY
EngGetLastError(
VOID);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngGetPrinter(
IN HANDLE hPrinter,
IN DWORD dwLevel,
@@ -1704,7 +1708,7 @@
WIN32KAPI
DWORD
-DDKAPI
+APIENTRY
EngGetPrinterData(
IN HANDLE hPrinter,
IN LPWSTR pValueName,
@@ -1715,13 +1719,13 @@
WIN32KAPI
LPWSTR
-DDKAPI
+APIENTRY
EngGetPrinterDataFileName(
IN HDEV hdev);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngGetPrinterDriver(
IN HANDLE hPrinter,
IN LPWSTR pEnvironment,
@@ -1732,13 +1736,13 @@
WIN32KAPI
HANDLE
-DDKAPI
+APIENTRY
EngGetProcessHandle(
VOID);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngGetType1FontList(
IN HDEV hdev,
OUT TYPE1_FONT *pType1Buffer,
@@ -1749,7 +1753,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngGradientFill(
IN SURFOBJ *psoDest,
IN CLIPOBJ *pco,
@@ -1768,32 +1772,32 @@
WIN32KAPI
ULONG
-DDKAPI
+APIENTRY
EngHangNotification(
IN HDEV hDev,
IN PVOID Reserved);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngInitializeSafeSemaphore(
OUT ENGSAFESEMAPHORE *pssem);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngIsSemaphoreOwned(
IN HSEMAPHORE hsem);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngIsSemaphoreOwnedByCurrentThread(
IN HSEMAPHORE hsem);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngLineTo(
SURFOBJ *pso,
CLIPOBJ *pco,
@@ -1807,50 +1811,50 @@
WIN32KAPI
HANDLE
-DDKAPI
+APIENTRY
EngLoadImage(
IN LPWSTR pwszDriver);
WIN32KAPI
HANDLE
-DDKAPI
+APIENTRY
EngLoadModule(
IN LPWSTR pwsz);
WIN32KAPI
HANDLE
-DDKAPI
+APIENTRY
EngLoadModuleForWrite(
IN LPWSTR pwsz,
IN ULONG cjSizeOfModule);
WIN32KAPI
PDD_SURFACE_LOCAL
-DDKAPI
+APIENTRY
EngLockDirectDrawSurface(
IN HANDLE hSurface);
WIN32KAPI
DRIVEROBJ*
-DDKAPI
+APIENTRY
EngLockDriverObj(
IN HDRVOBJ hdo);
WIN32KAPI
SURFOBJ*
-DDKAPI
+APIENTRY
EngLockSurface(
IN HSURF hsurf);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngLpkInstalled(
VOID);
WIN32KAPI
PEVENT
-DDKAPI
+APIENTRY
EngMapEvent(
IN HDEV hDev,
IN HANDLE hUserObject,
@@ -1860,7 +1864,7 @@
WIN32KAPI
PVOID
-DDKAPI
+APIENTRY
EngMapFile(
IN LPWSTR pwsz,
IN ULONG cjSize,
@@ -1868,7 +1872,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngMapFontFile(
ULONG_PTR iFile,
PULONG *ppjBuf,
@@ -1876,7 +1880,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngMapFontFileFD(
IN ULONG_PTR iFile,
OUT PULONG *ppjBuf,
@@ -1884,14 +1888,14 @@
WIN32KAPI
PVOID
-DDKAPI
+APIENTRY
EngMapModule(
IN HANDLE h,
OUT PULONG pSize);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngMarkBandingSurface(
IN HSURF hsurf);
@@ -1901,7 +1905,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngModifySurface(
IN HSURF hsurf,
IN HDEV hdev,
@@ -1914,7 +1918,7 @@
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngMovePointer(
IN SURFOBJ *pso,
IN LONG x,
@@ -1923,7 +1927,7 @@
WIN32KAPI
int
-DDKAPI
+APIENTRY
EngMulDiv(
IN int a,
IN int b,
@@ -1931,7 +1935,7 @@
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngMultiByteToUnicodeN(
OUT LPWSTR UnicodeString,
IN ULONG MaxBytesInUnicodeString,
@@ -1941,7 +1945,7 @@
WIN32KAPI
INT
-DDKAPI
+APIENTRY
EngMultiByteToWideChar(
IN UINT CodePage,
OUT LPWSTR WideCharString,
@@ -1951,7 +1955,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngPaint(
IN SURFOBJ *pso,
IN CLIPOBJ *pco,
@@ -1961,7 +1965,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngPlgBlt(
IN SURFOBJ *psoTrg,
IN SURFOBJ *psoSrc,
@@ -1977,7 +1981,7 @@
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngProbeForRead(
IN PVOID Address,
IN ULONG Length,
@@ -1985,7 +1989,7 @@
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngProbeForReadAndWrite(
IN PVOID Address,
IN ULONG Length,
@@ -1998,7 +2002,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngQueryDeviceAttribute(
IN HDEV hdev,
IN ENG_DEVICE_ATTRIBUTE devAttr,
@@ -2009,19 +2013,19 @@
WIN32KAPI
LARGE_INTEGER
-DDKAPI
+APIENTRY
EngQueryFileTimeStamp(
IN LPWSTR pwsz);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngQueryLocalTime(
OUT PENG_TIME_FIELDS ptf);
WIN32KAPI
ULONG
-DDKAPI
+APIENTRY
EngQueryPalette(
IN HPALETTE hPal,
OUT ULONG *piMode,
@@ -2030,13 +2034,13 @@
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngQueryPerformanceCounter(
OUT LONGLONG *pPerformanceCount);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngQueryPerformanceFrequency(
OUT LONGLONG *pFrequency);
@@ -2053,58 +2057,58 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngQuerySystemAttribute(
IN ENG_SYSTEM_ATTRIBUTE CapNum,
OUT PDWORD pCapability);
WIN32KAPI
LONG
-DDKAPI
+APIENTRY
EngReadStateEvent(
IN PEVENT pEvent);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngReleaseSemaphore(
IN HSEMAPHORE hsem);
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngRestoreFloatingPointState(
IN VOID *pBuffer);
WIN32KAPI
ULONG
-DDKAPI
+APIENTRY
EngSaveFloatingPointState(
OUT VOID *pBuffer,
IN ULONG cjBufferSize);
WIN32KAPI
HANDLE
-DDKAPI
+APIENTRY
EngSecureMem(
IN PVOID Address,
IN ULONG Length);
WIN32KAPI
LONG
-DDKAPI
+APIENTRY
EngSetEvent(
IN PEVENT pEvent);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngSetLastError(
IN ULONG iError);
WIN32KAPI
ULONG
-DDKAPI
+APIENTRY
EngSetPointerShape(
IN SURFOBJ *pso,
IN SURFOBJ *psoMask,
@@ -2119,7 +2123,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngSetPointerTag(
IN HDEV hdev,
IN SURFOBJ *psoMask,
@@ -2129,7 +2133,7 @@
WIN32KAPI
DWORD
-DDKAPI
+APIENTRY
EngSetPrinterData(
IN HANDLE hPrinter,
IN LPWSTR pType,
@@ -2137,11 +2141,11 @@
IN LPBYTE lpbPrinterData,
IN DWORD cjPrinterData);
-typedef int DDKCDECLAPI (*SORTCOMP)(const void *pv1, const void *pv2);
+typedef int (CDECL *SORTCOMP)(const void *pv1, const void *pv2);
WIN32KAPI
VOID
-DDKAPI
+APIENTRY
EngSort(
IN OUT PBYTE pjBuf,
IN ULONG c,
@@ -2150,7 +2154,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngStretchBlt(
IN SURFOBJ *psoDest,
IN SURFOBJ *psoSrc,
@@ -2166,7 +2170,7 @@
WIN32KAPI
BOOL
-DDKAPI
+APIENTRY
EngStretchBltROP(
IN SURFOBJ *psoDest,
IN SURFOBJ *psoSrc,
@@ -2184,7 +2188,7 @@
WIN32KAPI
BOOL
-DDKAPI
[truncated at 1000 lines; 1838 more skipped]