Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 33593: adding 1 new syscall from vista : NtGdiCreateOPMProtectedOutputs Adding 62 new syscall from vista, they are known as D3DKMT for the graphic drv and gdi32.dll, I have not fix the protype for I do not known if it same as the drv prototype or not, yet. NtGdiDdDDICheckExclusiveOwnership, NtGdiDdDDICheckMonitorPowerState, NtGdiDdDDICheckOcclusion, NtGdiDdDDICloseAdapter, NtGdiDdDDICreateAllocation, NtGdiDdDDICreateContext, NtGdiDdDDICreateDCFromMemory, NtGdiDdDDICreateDevice, NtGdiD
by greatlrd＠svn.reactos.org 18 May '08

18 May '08

Author: greatlrd Date: Sun May 18 13:33:27 2008 New Revision: 33593 URL: http://svn.reactos.org/svn/reactos?rev=33593&view=rev Log: adding 1 new syscall from vista : NtGdiCreateOPMProtectedOutputs Adding 62 new syscall from vista, they are known as D3DKMT for the graphic drv and gdi32.dll, I have not fix the protype for I do not known if it same as the drv prototype or not, yet. NtGdiDdDDICheckExclusiveOwnership,NtGdiDdDDICheckMonitorPowerState,NtGdiDdDDICheckOcclusion,NtGdiDdDDICloseAdapter, NtGdiDdDDICreateAllocation, NtGdiDdDDICreateContext, NtGdiDdDDICreateDCFromMemory, NtGdiDdDDICreateDevice, NtGdiDdDDICreateOverlay, NtGdiDdDDICreateSynchronizationObject, NtGdiDdDDIDestroyAllocation, NtGdiDdDDIDestroyContext, NtGdiDdDDIDestroyDCFromMemory, NtGdiDdDDIDestroyDevice, NtGdiDdDDIDestroyOverlay, NtGdiDdDDIDestroySynchronizationObject, NtGdiDdDDIEscape, NtGdiDdDDIFlipOverlay, NtGdiDdDDIGetContextSchedulingPriority, NtGdiDdDDIGetDeviceState, NtGdiDdDDIGetDisplayModeList, NtGdiDdDDIGetMultisampleMethodList, NtGdiDdDDIGetPresentHistory, NtGdiDdDDIGetProcessSchedulingPriorityClass, NtGdiDdDDIGetRuntimeData, NtGdiDdDDIGetScanLine, NtGdiDdDDIGetSharedPrimaryHandle, NtGdiDdDDIInvalidateActiveVidPn, NtGdiDdDDILock, NtGdiDdDDIOpenAdapterFromDeviceName, NtGdiDdDDIOpenAdapterFromHdc, NtGdiDdDDIOpenResource, NtGdiDdDDIPollDisplayChildren, NtGdiDdDDIPresent, NtGdiDdDDIQueryAdapterInfo, NtGdiDdDDIQueryAllocationResidency, NtGdiDdDDIQueryResourceInfo, NtGdiDdDDIQueryStatistics, NtGdiDdDDIReleaseProcessVidPnSourceOwners, NtGdiDdDDIRender, NtGdiDdDDISetAllocationPriority, NtGdiDdDDISetContextSchedulingPriority, NtGdiDdDDISetDisplayMode, NtGdiDdDDISetDisplayPrivateDriverFormat, NtGdiDdDDISetGammaRamp, NtGdiDdDDISetProcessSchedulingPriorityClass, NtGdiDdDDISetQueuedLimit, NtGdiDdDDISetVidPnSourceOwner, NtGdiDdDDISharedPrimaryLockNotification, NtGdiDdDDISharedPrimaryUnLockNotification, NtGdiDdDDISignalSynchronizationObject, NtGdiDdDDIUnlock, NtGdiDdDDIUpdateOverlay, NtGdiDdDDIWaitForIdle, NtGdiDdDDIWaitForSynchronizationObject, NtGdiDdDDIWaitForVerticalBlankEvent, NtGdiDDCCIGetCapabilitiesString, NtGdiDDCCIGetCapabilitiesStringLength, NtGdiDDCCIGetTimingReport, NtGdiDDCCIGetVCPFeature, NtGdiDDCCISaveCurrentSettings, NtGdiDDCCISetVCPFeature, Added: branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c (with props) Modified: branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db Modified: branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/include/reactos/w… ============================================================================== --- branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sun May 18 13:33:27 2008 @@ -1,667 +1,738 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) - * FILE: include/win32k/ntgdityp.h - * PURPOSE: Win32 Shared GDI Types for NtGdi* - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#ifndef _NTGDITYP_ -#define _NTGDITYP_ - -/* ENUMERATIONS **************************************************************/ - -typedef enum _ARCTYPE -{ - GdiTypeArc, - GdiTypeArcTo, - GdiTypeChord, - GdiTypePie, -} ARCTYPE, *PARCTYPE; - -typedef enum _PALFUNCTYPE -{ - GdiPalAnimate, - GdiPalSetEntries, - GdiPalGetEntries, - GdiPalGetSystemEntries, - GdiPalSetColorTable, - GdiPalGetColorTable, -} PALFUNCTYPE, *PPALFUNCTYPE; - -typedef enum _POLYFUNCTYPE -{ - GdiPolyPolygon = 1, - GdiPolyPolyLine, - GdiPolyBezier, - GdiPolyLineTo, - GdiPolyBezierTo, - GdiPolyPolyRgn, -} POLYFUNCTYPE, *PPOLYFUNCTYPE; - -typedef enum _GETDCDWORD -{ - GdiGetJournal, - GdiGetRelAbs, - GdiGetBreakExtra, - GdiGerCharBreak, - GdiGetArcDirection, - GdiGetEMFRestorDc, - GdiGetFontLanguageInfo, - GdiGetIsMemDc, - GdiGetMapMode, - GdiGetTextCharExtra, -} GETDCDWORD, *PGETDCDWORD; - -typedef enum _GETSETDCDWORD -{ - GdiGetSetCopyCount = 2, - GdiGetSetTextAlign, - GdiGetSetRelAbs, - GdiGetSetTextCharExtra, - GdiGetSetSelectFont, - GdiGetSetMapperFlagsInternal, - GdiGetSetMapMode, - GdiGetSetArcDirection, -} GETSETDCDWORD, *PGETSETDCDWORD; - -typedef enum _GETDCPOINT -{ - GdiGetViewPortExt = 1, - GdiGetWindowExt, - GdiGetViewPortOrg, - GdiGetWindowOrg, - GdiGetAspectRatioFilter, - GdiGetDCOrg = 6, -} GETDCPOINT, *PGETDCPOINT; - - -typedef enum _GDIBATCHCMD -{ - GdiBCPatBlt, - GdiBCPolyPatBlt, - GdiBCTextOut, - GdiBCExtTextOut, - GdiBCSetBrushOrg, - GdiBCExtSelClipRgn, - GdiBCSelObj, - GdiBCDelObj, - GdiBCDelRgn, -} GDIBATCHCMD, *PGDIBATCHCMD; - -typedef enum _TRANSFORMTYPE -{ - GdiDpToLp, - GdiLpToDp, -} TRANSFORMTYPE, *PTRANSFORMTYPE; - -typedef enum GDIObjType -{ - GDIObjType_DEF_TYPE = 0x00, - GDIObjType_DC_TYPE = 0x01, - GDIObjType_UNUSED1_TYPE = 0x02, - GDIObjType_UNUSED2_TYPE = 0x03, - GDIObjType_RGN_TYPE = 0x04, - GDIObjType_SURF_TYPE = 0x05, - GDIObjType_CLIENTOBJ_TYPE = 0x06, - GDIObjType_PATH_TYPE = 0x07, - GDIObjType_PAL_TYPE = 0x08, - GDIObjType_ICMLCS_TYPE = 0x09, - GDIObjType_LFONT_TYPE = 0x0a, - GDIObjType_RFONT_TYPE = 0x0b, - GDIObjType_PFE_TYPE = 0x0c, - GDIObjType_PFT_TYPE = 0x0d, - GDIObjType_ICMCXF_TYPE = 0x0e, - GDIObjType_SPRITE_TYPE = 0x0f, - GDIObjType_BRUSH_TYPE = 0x10, - GDIObjType_UMPD_TYPE = 0x11, - GDIObjType_UNUSED4_TYPE = 0x12, - GDIObjType_SPACE_TYPE = 0x13, - GDIObjType_UNUSED5_TYPE = 0x14, - GDIObjType_META_TYPE = 0x15, - GDIObjType_EFSTATE_TYPE = 0x16, - GDIObjType_BMFD_TYPE = 0x17, - GDIObjType_VTFD_TYPE = 0x18, - GDIObjType_TTFD_TYPE = 0x19, - GDIObjType_RC_TYPE = 0x1a, - GDIObjType_TEMP_TYPE = 0x1b, - GDIObjType_DRVOBJ_TYPE = 0x1c, - GDIObjType_DCIOBJ_TYPE = 0x1d, - GDIObjType_SPOOL_TYPE = 0x1e, - GDIObjType_MAX_TYPE = 0x1e, - GDIObjTypeTotal = 0x1f, -} GDIOBJTYPE, *PGDIOBJTYPE; - -typedef enum GDILoObjType -{ - GDILoObjType_LO_BRUSH_TYPE = 0x100000, - GDILoObjType_LO_DC_TYPE = 0x10000, - GDILoObjType_LO_BITMAP_TYPE = 0x50000, - GDILoObjType_LO_PALETTE_TYPE = 0x80000, - GDILoObjType_LO_FONT_TYPE = 0xa0000, - GDILoObjType_LO_REGION_TYPE = 0x40000, - GDILoObjType_LO_ICMLCS_TYPE = 0x90000, - GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, - GDILoObjType_LO_ALTDC_TYPE = 0x210000, - GDILoObjType_LO_PEN_TYPE = 0x300000, - GDILoObjType_LO_EXTPEN_TYPE = 0x500000, - GDILoObjType_LO_DIBSECTION_TYPE = 0x250000, - GDILoObjType_LO_METAFILE16_TYPE = 0x260000, - GDILoObjType_LO_METAFILE_TYPE = 0x460000, - GDILoObjType_LO_METADC16_TYPE = 0x660000 -} GDILOOBJTYPE, *PGDILOOBJTYPE; - -#define GdiWorldSpaceToPageSpace 0x203 - -/* FIXME: Unknown */ -typedef DWORD FULLSCREENCONTROL; -typedef DWORD LFTYPE; - -/* Public LAST_STOCK = 19, plus 2 more internal entries */ -#define NB_STOCK_OBJECTS 22 - -/* extra stock object: default 1x1 bitmap for memory DCs */ -#define DEFAULT_BITMAP (21) - - -/* DEFINES *******************************************************************/ - -#define GDIBATCHBUFSIZE 0x136*4 -#define GDI_BATCH_LIMIT 20 - -// NtGdiGetCharWidthW Flags -#define GCW_WIN32 0x0001 -#define GCW_NOFLOAT 0x0002 -#define GCW_INDICES 0x0008 - -// NtGdiGetCharABCWidthW Flags -#define GCABCW_NOFLOAT 0x0001 -#define GCABCW_INDICES 0x0002 - -/* CAPS1 support */ -//#define C1_TRANSPARENT 0x0001 -#define TC_TT_ABLE 0x0002 -#define C1_TT_CR_ANY 0x0004 -#define C1_EMF_COMPLIANT 0x0008 -#define C1_DIBENGINE 0x0010 -#define C1_GAMMA_RAMP 0x0040 -#define C1_REINIT_ABLE 0x0080 -#define C1_GLYPH_INDEX 0x0100 -#define C1_BIT_PACKED 0x0200 -#define C1_BYTE_PACKED 0x0400 -#define C1_COLORCURSOR 0x0800 -#define C1_CMYK_ABLE 0x1000 -#define C1_SLOW_CARD 0x2000 - -/* TYPES *********************************************************************/ - -typedef PVOID KERNEL_PVOID; -typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; -typedef LONG FIX; - -typedef struct _CHWIDTHINFO -{ - LONG lMaxNegA; - LONG lMaxNegC; - LONG lMinWidthD; -} CHWIDTHINFO, *PCHWIDTHINFO; - -typedef struct _UNIVERSAL_FONT_ID -{ - DWORD dwUfid[2]; -} UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; - -typedef struct _REALIZATION_INFO // Based on LOCALESIGNATURE -{ - DWORD dwCsbDefault[2]; - DWORD dwCsbSupported0; -} REALIZATION_INFO, *PREALIZATION_INFO; - -typedef struct _WIDTHDATA -{ - USHORT sOverhang; - USHORT sHeight; - USHORT sCharInc; - USHORT sBreak; - BYTE jFirst; - BYTE jLast; - BYTE jBreak; - BYTE jDefault; - USHORT sDBCSInc; - USHORT sDefaultInc; -} WIDTHDATA, *PWIDTHDATA; - -typedef struct _DEVCAPS // Very similar to GDIINFO -{ - ULONG ulVersion; - ULONG ulTechnology; - ULONG ulHorzSizeM; - ULONG ulVertSizeM; - ULONG ulHorzSize; - ULONG ulVertSize; - ULONG ulHorzRes; - ULONG ulVertRes; - ULONG ulBitsPixel; - ULONG ulPlanes; - ULONG ulNumPens; - ULONG ulNumFonts; - ULONG ulNumColors; - ULONG ulRasterCaps; - ULONG ulAspectX; - ULONG ulAspectY; - ULONG ulAspectXY; - ULONG ulLogPixelsX; - ULONG ulLogPixelsY; - ULONG ulSizePalette; - ULONG ulColorRes; - ULONG ulPhysicalWidth; - ULONG ulPhysicalHeight; - ULONG ulPhysicalOffsetX; - ULONG ulPhysicalOffsetY; - ULONG ulTextCaps; - ULONG ulVRefresh; - ULONG ulDesktopHorzRes; - ULONG ulDesktopVertRes; - ULONG ulBltAlignment; - ULONG ulReserved[4]; - ULONG ulShadeBlend; - ULONG ulColorMgmtCaps; -} DEVCAPS, *PDEVCAPS; - -/* Gdi Handle Cache Types and Structures */ -#define GDI_CACHED_HADNLE_TYPES 4 -#define CACHE_BRUSH_ENTRIES 10 -#define CACHE_PEN_ENTRIES 8 -#define CACHE_REGION_ENTRIES 8 -#define CACHE_LFONT_ENTRIES 1 - -typedef enum _HANDLECACHETYPE -{ - hctBrushHandle, - hctPenHandle, - hctRegionHandle, - hctLFontHandle -} HANDLECACHETYPE,*PHANDLECACHETYPE; - -typedef struct _GDIHANDLECACHE -{ - ULONG ulLock; - ULONG ulNumHandles[GDI_CACHED_HADNLE_TYPES]; - HANDLE Handle[CACHE_BRUSH_ENTRIES+CACHE_PEN_ENTRIES+CACHE_REGION_ENTRIES+CACHE_LFONT_ENTRIES]; -} GDIHANDLECACHE, *PGDIHANDLECACHE; - -/* Font Structures */ -typedef struct _TMDIFF -{ - ULONG cjotma; - CHAR chFirst; - CHAR chLast; - CHAR ChDefault; - CHAR ChBreak; -} TMDIFF, *PTMDIFF; - -typedef struct _TMW_INTERNAL -{ - TEXTMETRICW TextMetric; - TMDIFF Diff; -} TMW_INTERNAL, *PTMW_INTERNAL; - -typedef struct _NTMW_INTERNAL -{ - TMDIFF tmd; - NEWTEXTMETRICEXW ntmw; -} NTMW_INTERNAL, *PNTMW_INTERNAL; - -typedef struct _ENUMFONTDATAW -{ - ULONG cbSize; - ULONG ulNtmwiOffset; - DWORD dwFontType; - ENUMLOGFONTEXDVW elfexdv; /* variable size! */ - /* NTMW_INTERNAL ntmwi; use ulNtwmOffset */ -} ENUMFONTDATAW, *PENUMFONTDATAW; - -/* Number Representation */ -typedef struct _EFLOAT_S -{ - LONG lMant; - LONG lExp; -} EFLOAT_S; - -/* XFORM Structures */ -typedef struct _MATRIX_S -{ - EFLOAT_S efM11; - EFLOAT_S efM12; - EFLOAT_S efM21; - EFLOAT_S efM22; - EFLOAT_S efDx; - EFLOAT_S efDy; - FIX fxDx; - FIX fxDy; - FLONG flAccel; -} MATRIX_S; - -/* Gdi XForm storage union */ -typedef union -{ - FLOAT f; - ULONG l; -} gxf_long; - -typedef struct _CFONT -{ - struct _CFONT *pcfNext; - HFONT hf; - ULONG cRef; // Count of all pointers to this CFONT. - FLONG fl; - LONG lHeight; // Precomputed logical height. - HDC hdc; // HDC of realization. 0 for display. - EFLOAT_S efM11; // efM11 of WtoD of DC of realization - EFLOAT_S efM22; // efM22 of WtoD of DC of realization - EFLOAT_S efDtoWBaseline; // Precomputed back transform. (FXtoL) - EFLOAT_S efDtoWAscent; // Precomputed back transform. (FXtoL) - WIDTHDATA wd; - FLONG flInfo; - USHORT sWidth[256]; // Widths in pels. - ULONG ulAveWidth; // bogus average used by USER - TMW_INTERNAL tmw; // cached metrics - LOCALESIGNATURE lsLocSig; // font signature information -} CFONT, *PCFONT; - -// -// GDI Batch structures. -// -typedef struct _GDIBATCHHDR -{ - SHORT Size; - SHORT Cmd; -} GDIBATCHHDR, *PGDIBATCHHDR; - -typedef struct _GDIBSPATBLT -{ - GDIBATCHHDR gbHdr; - int nXLeft; - int nYLeft; - int nWidth; - int nHeight; - HANDLE hbrush; - DWORD dwRop; - COLORREF crForegroundClr; - COLORREF crBackgroundClr; - COLORREF crBrushClr; - INT IcmBrushColor; - POINTL ptlViewportOrg; - ULONG ulForegroundClr; - ULONG ulBackgroundClr; - ULONG ulBrushClr; -} GDIBSPATBLT, *PGDIBSPATBLT; - -#ifndef _NTUSRTYP_ -typedef struct _PATRECT -{ - RECT r; - HBRUSH hBrush; -} PATRECT, * PPATRECT; - -typedef struct _W32CLIENTINFO -{ - ULONG CI_flags; - ULONG cSpins; - ULONG ulWindowsVersion; - ULONG ulAppCompatFlags; - ULONG ulAppCompatFlags2; - ULONG W32ClientInfo[57]; -} W32CLIENTINFO, *PW32CLIENTINFO; -#endif - -typedef struct _GDIBSPPATBLT -{ - GDIBATCHHDR gbHdr; - DWORD rop4; - DWORD Mode; - DWORD Count; - COLORREF crForegroundClr; - COLORREF crBackgroundClr; - COLORREF crBrushClr; - ULONG ulForegroundClr; - ULONG ulBackgroundClr; - ULONG ulBrushClr; - POINTL ptlViewportOrg; - PATRECT pRect[1]; // POLYPATBLT -} GDIBSPPATBLT, *PGDIBSPPATBLT; - -typedef struct _GDIBSTEXTOUT -{ - GDIBATCHHDR gbHdr; - COLORREF crForegroundClr; - COLORREF crBackgroundClr; - LONG lmBkMode; - ULONG ulForegroundClr; - ULONG ulBackgroundClr; - int x; - int y; - UINT Options; - RECT Rect; - DWORD iCS_CP; - UINT cbCount; - UINT Size; - HANDLE hlfntNew; - FLONG flTextAlign; - POINTL ptlViewportOrg; - WCHAR String[2]; -} GDIBSTEXTOUT, *PGDIBSTEXTOUT; - -typedef struct _GDIBSEXTTEXTOUT -{ - GDIBATCHHDR gbHdr; - UINT Count; - UINT Options; - RECT Rect; - POINTL ptlViewportOrg; - ULONG ulBackgroundClr; -} GDIBSEXTTEXTOUT, *PGDIBSEXTTEXTOUT; - -typedef struct _GDIBSSETBRHORG -{ - GDIBATCHHDR gbHdr; - POINTL ptlBrushOrigin; -} GDIBSSETBRHORG, *PGDIBSSETBRHORG; - -typedef struct _GDIBSEXTSELCLPRGN -{ - GDIBATCHHDR gbHdr; - int fnMode; - LONG right; - LONG bottom; - LONG left; - LONG top; -} GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; -// -// Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. -typedef struct _GDIBSOBJECT -{ - GDIBATCHHDR gbHdr; - HGDIOBJ hgdiobj; -} GDIBSOBJECT, *PGDIBSOBJECT; - -// -// Driver Functions -// -typedef BOOL (NTAPI *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA); -typedef DHPDEV (NTAPI *PGD_ENABLEPDEV)(DEVMODEW *, LPWSTR, ULONG, HSURF *, ULONG, ULONG *, ULONG, DEVINFO *, LPWSTR, LPWSTR, HANDLE); -typedef VOID (NTAPI *PGD_COMPLETEPDEV)(DHPDEV, HDEV); -typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); -typedef HSURF (NTAPI *PGD_ENABLESURFACE)(DHPDEV); -typedef VOID (NTAPI *PGD_DISABLESURFACE)(DHPDEV); -typedef BOOL (NTAPI *PGD_ASSERTMODE)(DHPDEV, BOOL); -typedef BOOL (NTAPI *PGD_OFFSET)(SURFOBJ*, LONG, LONG, FLONG); -typedef BOOL (NTAPI *PGD_RESETPDEV)(DHPDEV, DHPDEV); -typedef VOID (NTAPI *PGD_DISABLEDRIVER)(VOID); -typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); -typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); -typedef BOOL (NTAPI *PGD_ALPHABLEND)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, BLENDOBJ*); -typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, ULONG); -typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); -typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); -typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX, ULONG); -typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); -typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX); -typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); -typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, ULONG, ULONG); -typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*); -typedef BOOL (NTAPI *PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG); -typedef BOOL (NTAPI *PGD_STRETCHBLTROP)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG, BRUSHOBJ*, DWORD); -typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); -typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, RECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); -typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, PVOID *); -typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, ULONG, PVOID *); -typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); -typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULONG); -typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, GLYPHDATA*, PVOID, ULONG); -typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); -typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); -typedef BOOL (NTAPI *PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG, LONG, LONG, RECTL*, MIX); -typedef BOOL (NTAPI *PGD_SENDPAGE)(SURFOBJ*); -typedef BOOL (NTAPI *PGD_STARTPAGE)(SURFOBJ*); -typedef BOOL (NTAPI *PGD_ENDDOC)(SURFOBJ*, ULONG); -typedef BOOL (NTAPI *PGD_STARTDOC)(SURFOBJ*, PWSTR, DWORD); -typedef ULONG (NTAPI *PGD_GETGLYPHMODE)(DHPDEV, FONTOBJ*); -typedef VOID (NTAPI *PGD_SYNCHRONIZE)(DHPDEV, RECTL*); -typedef ULONG (NTAPI *PGD_SAVESCREENBITS)(SURFOBJ*, ULONG, ULONG, RECTL*); -typedef ULONG (NTAPI *PGD_GETMODES)(HANDLE, ULONG, PDEVMODEW); -typedef VOID (NTAPI *PGD_FREE)(PVOID, ULONG); -typedef VOID (NTAPI *PGD_DESTROYFONT)(FONTOBJ*); -typedef LONG (NTAPI *PGD_QUERYFONTCAPS)(ULONG, PULONG); -typedef ULONG (NTAPI *PGD_LOADFONTFILE)(ULONG, PVOID, ULONG, ULONG); -typedef BOOL (NTAPI *PGD_UNLOADFONTFILE)(ULONG); -typedef ULONG (NTAPI *PGD_FONTMANAGEMENT)(SURFOBJ*, FONTOBJ*, ULONG, ULONG, PVOID, ULONG, PVOID); -typedef LONG (NTAPI *PGD_QUERYTRUETYPETABLE)(ULONG, ULONG, ULONG, PTRDIFF, ULONG, PBYTE); -typedef LONG (NTAPI *PGD_QUERYTRUETYPEOUTLINE)(DHPDEV, FONTOBJ*, HGLYPH, BOOL, GLYPHDATA*, ULONG, TTPOLYGONHEADER*); -typedef PVOID (NTAPI *PGD_GETTRUETYPEFILE)(ULONG, PULONG); -typedef LONG (NTAPI *PGD_QUERYFONTFILE)(ULONG, ULONG, ULONG, PULONG); -typedef BOOL (NTAPI *PGD_QUERYADVANCEWIDTHS)(DHPDEV, FONTOBJ*, ULONG, HGLYPH *, PVOID *, ULONG); -typedef BOOL (NTAPI *PGD_SETPIXELFORMAT)(SURFOBJ*, LONG, ULONG); -typedef LONG (NTAPI *PGD_DESCRIBEPIXELFORMAT)(DHPDEV, LONG, ULONG, PPIXELFORMATDESCRIPTOR); -typedef BOOL (NTAPI *PGD_SWAPBUFFERS)(SURFOBJ*, PWNDOBJ); -typedef BOOL (NTAPI *PGD_STARTBANDING)(SURFOBJ*, POINTL*); -typedef BOOL (NTAPI *PGD_NEXTBAND)(SURFOBJ*, POINTL*); -typedef BOOL (NTAPI *PGD_GETDIRECTDRAWINFO)(DHPDEV, PDD_HALINFO, PDWORD, VIDEOMEMORY*, PDWORD, PDWORD); -typedef BOOL (NTAPI *PGD_ENABLEDIRECTDRAW)(DHPDEV, PDD_CALLBACKS, PDD_SURFACECALLBACKS, PDD_PALETTECALLBACKS); -typedef VOID (NTAPI *PGD_DISABLEDIRECTDRAW)(DHPDEV); -typedef LONG (NTAPI *PGD_QUERYSPOOLTYPE)(DHPDEV, LPWSTR); -typedef BOOL (NTAPI *PGD_GRADIENTFILL)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG); -typedef VOID (NTAPI *PGD_SYNCHRONIZESURFACE)(SURFOBJ*, RECTL *, FLONG); - -// -// Most of these are definded in ddk/winddi.h -// -typedef struct _DRIVER_FUNCTIONS -{ - PGD_ENABLEPDEV EnablePDEV; - PGD_COMPLETEPDEV CompletePDEV; - PGD_DISABLEPDEV DisablePDEV; - PGD_ENABLESURFACE EnableSurface; - PGD_DISABLESURFACE DisableSurface; - PGD_ASSERTMODE AssertMode; - PGD_OFFSET Offset; - PGD_RESETPDEV ResetPDEV; - PGD_DISABLEDRIVER DisableDriver; - PVOID Unknown1; - PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; - PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; - PGD_REALIZEBRUSH RealizeBrush; - PGD_DITHERCOLOR DitherColor; - PGD_STROKEPATH StrokePath; - PGD_FILLPATH FillPath; - PGD_STROKEANDFILLPATH StrokeAndFillPath; - PGD_PAINT Paint; - PGD_BITBLT BitBlt; - PGD_COPYBITS CopyBits; - PGD_STRETCHBLT StretchBlt; - PVOID Unknown2; - PGD_SETPALETTE SetPalette; - PGD_TEXTOUT TextOut; - PGD_ESCAPE Escape; - PGD_DRAWESCAPE DrawEscape; - PGD_QUERYFONT QueryFont; - PGD_QUERYFONTTREE QueryFontTree; - PGD_QUERYFONTDATA QueryFontData; - PGD_SETPOINTERSHAPE SetPointerShape; - PGD_MOVEPOINTER MovePointer; - PGD_LINETO LineTo; - PGD_SENDPAGE SendPage; - PGD_STARTPAGE StartPage; - PGD_ENDDOC EndDoc; - PGD_STARTDOC StartDoc; - PVOID Unknown3; - PGD_GETGLYPHMODE GetGlyphMode; - PGD_SYNCHRONIZE Synchronize; - PVOID Unknown4; - PGD_SAVESCREENBITS SaveScreenBits; - PGD_GETMODES GetModes; - PGD_FREE Free; - PGD_DESTROYFONT DestroyFont; - PGD_QUERYFONTCAPS QueryFontCaps; - PGD_LOADFONTFILE LoadFontFile; - PGD_UNLOADFONTFILE UnloadFontFile; - PGD_FONTMANAGEMENT FontManagement; - PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; - PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; - PGD_GETTRUETYPEFILE GetTrueTypeFile; - PGD_QUERYFONTFILE QueryFontFile; - PFN_DrvMovePanning MovePanning; - PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; - PGD_SETPIXELFORMAT SetPixelFormat; - PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; - PGD_SWAPBUFFERS SwapBuffers; - PGD_STARTBANDING StartBanding; - PGD_NEXTBAND NextBand; - PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; - PGD_ENABLEDIRECTDRAW EnableDirectDraw; - PGD_DISABLEDIRECTDRAW DisableDirectDraw; - PGD_QUERYSPOOLTYPE QuerySpoolType; - PVOID Unknown5; - PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; - PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; - PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; - PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; - PGD_GRADIENTFILL GradientFill; - PGD_STRETCHBLTROP StretchBltROP; - PFN_DrvPlgBlt PlgBlt; - PGD_ALPHABLEND AlphaBlend; - PVOID SynthesizeFont; - PVOID GetSynthesizedFontFiles; - PGD_TRANSPARENTBLT TransparentBlt; - PFN_DrvQueryPerBandInfo QueryPerBandInfo; - PFN_DrvQueryDeviceSupport QueryDeviceSupport; - PVOID Reserved1; - PVOID Reserved2; - PVOID Reserved3; - PVOID Reserved4; - PVOID Reserved5; - PVOID Reserved6; - PVOID Reserved7; - PVOID Reserved8; - PFN_DrvDeriveSurface DeriveSurface; - PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; - PFN_DrvNotify Notify; - PGD_SYNCHRONIZESURFACE SynchronizeSurface; - PFN_DrvResetDevice ResetDevice; - PVOID Reserved9; - PVOID Reserved10; - PVOID Reserved11; /* 92 */ - - /* ReactOS specify */ - PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra -} DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; - -/* FIXME move to more proper place, Vista syscall */ -DWORD -STDCALL -NtGdiConfigureOPMProtectedOutput(DWORD x1, DWORD x2, DWORD x3, DWORD x4); - - -#endif +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) + * FILE: include/win32k/ntgdityp.h + * PURPOSE: Win32 Shared GDI Types for NtGdi* + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#ifndef _NTGDITYP_ +#define _NTGDITYP_ + +/* ENUMERATIONS **************************************************************/ + +typedef enum _ARCTYPE +{ + GdiTypeArc, + GdiTypeArcTo, + GdiTypeChord, + GdiTypePie, +} ARCTYPE, *PARCTYPE; + +typedef enum _PALFUNCTYPE +{ + GdiPalAnimate, + GdiPalSetEntries, + GdiPalGetEntries, + GdiPalGetSystemEntries, + GdiPalSetColorTable, + GdiPalGetColorTable, +} PALFUNCTYPE, *PPALFUNCTYPE; + +typedef enum _POLYFUNCTYPE +{ + GdiPolyPolygon = 1, + GdiPolyPolyLine, + GdiPolyBezier, + GdiPolyLineTo, + GdiPolyBezierTo, + GdiPolyPolyRgn, +} POLYFUNCTYPE, *PPOLYFUNCTYPE; + +typedef enum _GETDCDWORD +{ + GdiGetJournal, + GdiGetRelAbs, + GdiGetBreakExtra, + GdiGerCharBreak, + GdiGetArcDirection, + GdiGetEMFRestorDc, + GdiGetFontLanguageInfo, + GdiGetIsMemDc, + GdiGetMapMode, + GdiGetTextCharExtra, +} GETDCDWORD, *PGETDCDWORD; + +typedef enum _GETSETDCDWORD +{ + GdiGetSetCopyCount = 2, + GdiGetSetTextAlign, + GdiGetSetRelAbs, + GdiGetSetTextCharExtra, + GdiGetSetSelectFont, + GdiGetSetMapperFlagsInternal, + GdiGetSetMapMode, + GdiGetSetArcDirection, +} GETSETDCDWORD, *PGETSETDCDWORD; + +typedef enum _GETDCPOINT +{ + GdiGetViewPortExt = 1, + GdiGetWindowExt, + GdiGetViewPortOrg, + GdiGetWindowOrg, + GdiGetAspectRatioFilter, + GdiGetDCOrg = 6, +} GETDCPOINT, *PGETDCPOINT; + + +typedef enum _GDIBATCHCMD +{ + GdiBCPatBlt, + GdiBCPolyPatBlt, + GdiBCTextOut, + GdiBCExtTextOut, + GdiBCSetBrushOrg, + GdiBCExtSelClipRgn, + GdiBCSelObj, + GdiBCDelObj, + GdiBCDelRgn, +} GDIBATCHCMD, *PGDIBATCHCMD; + +typedef enum _TRANSFORMTYPE +{ + GdiDpToLp, + GdiLpToDp, +} TRANSFORMTYPE, *PTRANSFORMTYPE; + +typedef enum GDIObjType +{ + GDIObjType_DEF_TYPE = 0x00, + GDIObjType_DC_TYPE = 0x01, + GDIObjType_UNUSED1_TYPE = 0x02, + GDIObjType_UNUSED2_TYPE = 0x03, + GDIObjType_RGN_TYPE = 0x04, + GDIObjType_SURF_TYPE = 0x05, + GDIObjType_CLIENTOBJ_TYPE = 0x06, + GDIObjType_PATH_TYPE = 0x07, + GDIObjType_PAL_TYPE = 0x08, + GDIObjType_ICMLCS_TYPE = 0x09, + GDIObjType_LFONT_TYPE = 0x0a, + GDIObjType_RFONT_TYPE = 0x0b, + GDIObjType_PFE_TYPE = 0x0c, + GDIObjType_PFT_TYPE = 0x0d, + GDIObjType_ICMCXF_TYPE = 0x0e, + GDIObjType_SPRITE_TYPE = 0x0f, + GDIObjType_BRUSH_TYPE = 0x10, + GDIObjType_UMPD_TYPE = 0x11, + GDIObjType_UNUSED4_TYPE = 0x12, + GDIObjType_SPACE_TYPE = 0x13, + GDIObjType_UNUSED5_TYPE = 0x14, + GDIObjType_META_TYPE = 0x15, + GDIObjType_EFSTATE_TYPE = 0x16, + GDIObjType_BMFD_TYPE = 0x17, + GDIObjType_VTFD_TYPE = 0x18, + GDIObjType_TTFD_TYPE = 0x19, + GDIObjType_RC_TYPE = 0x1a, + GDIObjType_TEMP_TYPE = 0x1b, + GDIObjType_DRVOBJ_TYPE = 0x1c, + GDIObjType_DCIOBJ_TYPE = 0x1d, + GDIObjType_SPOOL_TYPE = 0x1e, + GDIObjType_MAX_TYPE = 0x1e, + GDIObjTypeTotal = 0x1f, +} GDIOBJTYPE, *PGDIOBJTYPE; + +typedef enum GDILoObjType +{ + GDILoObjType_LO_BRUSH_TYPE = 0x100000, + GDILoObjType_LO_DC_TYPE = 0x10000, + GDILoObjType_LO_BITMAP_TYPE = 0x50000, + GDILoObjType_LO_PALETTE_TYPE = 0x80000, + GDILoObjType_LO_FONT_TYPE = 0xa0000, + GDILoObjType_LO_REGION_TYPE = 0x40000, + GDILoObjType_LO_ICMLCS_TYPE = 0x90000, + GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, + GDILoObjType_LO_ALTDC_TYPE = 0x210000, + GDILoObjType_LO_PEN_TYPE = 0x300000, + GDILoObjType_LO_EXTPEN_TYPE = 0x500000, + GDILoObjType_LO_DIBSECTION_TYPE = 0x250000, + GDILoObjType_LO_METAFILE16_TYPE = 0x260000, + GDILoObjType_LO_METAFILE_TYPE = 0x460000, + GDILoObjType_LO_METADC16_TYPE = 0x660000 +} GDILOOBJTYPE, *PGDILOOBJTYPE; + +#define GdiWorldSpaceToPageSpace 0x203 + +/* FIXME: Unknown */ +typedef DWORD FULLSCREENCONTROL; +typedef DWORD LFTYPE; + +/* Public LAST_STOCK = 19, plus 2 more internal entries */ +#define NB_STOCK_OBJECTS 22 + +/* extra stock object: default 1x1 bitmap for memory DCs */ +#define DEFAULT_BITMAP (21) + + +/* DEFINES *******************************************************************/ + +#define GDIBATCHBUFSIZE 0x136*4 +#define GDI_BATCH_LIMIT 20 + +// NtGdiGetCharWidthW Flags +#define GCW_WIN32 0x0001 +#define GCW_NOFLOAT 0x0002 +#define GCW_INDICES 0x0008 + +// NtGdiGetCharABCWidthW Flags +#define GCABCW_NOFLOAT 0x0001 +#define GCABCW_INDICES 0x0002 + +/* CAPS1 support */ +//#define C1_TRANSPARENT 0x0001 +#define TC_TT_ABLE 0x0002 +#define C1_TT_CR_ANY 0x0004 +#define C1_EMF_COMPLIANT 0x0008 +#define C1_DIBENGINE 0x0010 +#define C1_GAMMA_RAMP 0x0040 +#define C1_REINIT_ABLE 0x0080 +#define C1_GLYPH_INDEX 0x0100 +#define C1_BIT_PACKED 0x0200 +#define C1_BYTE_PACKED 0x0400 +#define C1_COLORCURSOR 0x0800 +#define C1_CMYK_ABLE 0x1000 +#define C1_SLOW_CARD 0x2000 + +/* TYPES *********************************************************************/ + +typedef PVOID KERNEL_PVOID; +typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; +typedef LONG FIX; + +typedef struct _CHWIDTHINFO +{ + LONG lMaxNegA; + LONG lMaxNegC; + LONG lMinWidthD; +} CHWIDTHINFO, *PCHWIDTHINFO; + +typedef struct _UNIVERSAL_FONT_ID +{ + DWORD dwUfid[2]; +} UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; + +typedef struct _REALIZATION_INFO // Based on LOCALESIGNATURE +{ + DWORD dwCsbDefault[2]; + DWORD dwCsbSupported0; +} REALIZATION_INFO, *PREALIZATION_INFO; + +typedef struct _WIDTHDATA +{ + USHORT sOverhang; + USHORT sHeight; + USHORT sCharInc; + USHORT sBreak; + BYTE jFirst; + BYTE jLast; + BYTE jBreak; + BYTE jDefault; + USHORT sDBCSInc; + USHORT sDefaultInc; +} WIDTHDATA, *PWIDTHDATA; + +typedef struct _DEVCAPS // Very similar to GDIINFO +{ + ULONG ulVersion; + ULONG ulTechnology; + ULONG ulHorzSizeM; + ULONG ulVertSizeM; + ULONG ulHorzSize; + ULONG ulVertSize; + ULONG ulHorzRes; + ULONG ulVertRes; + ULONG ulBitsPixel; + ULONG ulPlanes; + ULONG ulNumPens; + ULONG ulNumFonts; + ULONG ulNumColors; + ULONG ulRasterCaps; + ULONG ulAspectX; + ULONG ulAspectY; + ULONG ulAspectXY; + ULONG ulLogPixelsX; + ULONG ulLogPixelsY; + ULONG ulSizePalette; + ULONG ulColorRes; + ULONG ulPhysicalWidth; + ULONG ulPhysicalHeight; + ULONG ulPhysicalOffsetX; + ULONG ulPhysicalOffsetY; + ULONG ulTextCaps; + ULONG ulVRefresh; + ULONG ulDesktopHorzRes; + ULONG ulDesktopVertRes; + ULONG ulBltAlignment; + ULONG ulReserved[4]; + ULONG ulShadeBlend; + ULONG ulColorMgmtCaps; +} DEVCAPS, *PDEVCAPS; + +/* Gdi Handle Cache Types and Structures */ +#define GDI_CACHED_HADNLE_TYPES 4 +#define CACHE_BRUSH_ENTRIES 10 +#define CACHE_PEN_ENTRIES 8 +#define CACHE_REGION_ENTRIES 8 +#define CACHE_LFONT_ENTRIES 1 + +typedef enum _HANDLECACHETYPE +{ + hctBrushHandle, + hctPenHandle, + hctRegionHandle, + hctLFontHandle +} HANDLECACHETYPE,*PHANDLECACHETYPE; + +typedef struct _GDIHANDLECACHE +{ + ULONG ulLock; + ULONG ulNumHandles[GDI_CACHED_HADNLE_TYPES]; + HANDLE Handle[CACHE_BRUSH_ENTRIES+CACHE_PEN_ENTRIES+CACHE_REGION_ENTRIES+CACHE_LFONT_ENTRIES]; +} GDIHANDLECACHE, *PGDIHANDLECACHE; + +/* Font Structures */ +typedef struct _TMDIFF +{ + ULONG cjotma; + CHAR chFirst; + CHAR chLast; + CHAR ChDefault; + CHAR ChBreak; +} TMDIFF, *PTMDIFF; + +typedef struct _TMW_INTERNAL +{ + TEXTMETRICW TextMetric; + TMDIFF Diff; +} TMW_INTERNAL, *PTMW_INTERNAL; + +typedef struct _NTMW_INTERNAL +{ + TMDIFF tmd; + NEWTEXTMETRICEXW ntmw; +} NTMW_INTERNAL, *PNTMW_INTERNAL; + +typedef struct _ENUMFONTDATAW +{ + ULONG cbSize; + ULONG ulNtmwiOffset; + DWORD dwFontType; + ENUMLOGFONTEXDVW elfexdv; /* variable size! */ + /* NTMW_INTERNAL ntmwi; use ulNtwmOffset */ +} ENUMFONTDATAW, *PENUMFONTDATAW; + +/* Number Representation */ +typedef struct _EFLOAT_S +{ + LONG lMant; + LONG lExp; +} EFLOAT_S; + +/* XFORM Structures */ +typedef struct _MATRIX_S +{ + EFLOAT_S efM11; + EFLOAT_S efM12; + EFLOAT_S efM21; + EFLOAT_S efM22; + EFLOAT_S efDx; + EFLOAT_S efDy; + FIX fxDx; + FIX fxDy; + FLONG flAccel; +} MATRIX_S; + +/* Gdi XForm storage union */ +typedef union +{ + FLOAT f; + ULONG l; +} gxf_long; + +typedef struct _CFONT +{ + struct _CFONT *pcfNext; + HFONT hf; + ULONG cRef; // Count of all pointers to this CFONT. + FLONG fl; + LONG lHeight; // Precomputed logical height. + HDC hdc; // HDC of realization. 0 for display. + EFLOAT_S efM11; // efM11 of WtoD of DC of realization + EFLOAT_S efM22; // efM22 of WtoD of DC of realization + EFLOAT_S efDtoWBaseline; // Precomputed back transform. (FXtoL) + EFLOAT_S efDtoWAscent; // Precomputed back transform. (FXtoL) + WIDTHDATA wd; + FLONG flInfo; + USHORT sWidth[256]; // Widths in pels. + ULONG ulAveWidth; // bogus average used by USER + TMW_INTERNAL tmw; // cached metrics + LOCALESIGNATURE lsLocSig; // font signature information +} CFONT, *PCFONT; + +// +// GDI Batch structures. +// +typedef struct _GDIBATCHHDR +{ + SHORT Size; + SHORT Cmd; +} GDIBATCHHDR, *PGDIBATCHHDR; + +typedef struct _GDIBSPATBLT +{ + GDIBATCHHDR gbHdr; + int nXLeft; + int nYLeft; + int nWidth; + int nHeight; + HANDLE hbrush; + DWORD dwRop; + COLORREF crForegroundClr; + COLORREF crBackgroundClr; + COLORREF crBrushClr; + INT IcmBrushColor; + POINTL ptlViewportOrg; + ULONG ulForegroundClr; + ULONG ulBackgroundClr; + ULONG ulBrushClr; +} GDIBSPATBLT, *PGDIBSPATBLT; + +#ifndef _NTUSRTYP_ +typedef struct _PATRECT +{ + RECT r; + HBRUSH hBrush; +} PATRECT, * PPATRECT; + +typedef struct _W32CLIENTINFO +{ + ULONG CI_flags; + ULONG cSpins; + ULONG ulWindowsVersion; + ULONG ulAppCompatFlags; + ULONG ulAppCompatFlags2; + ULONG W32ClientInfo[57]; +} W32CLIENTINFO, *PW32CLIENTINFO; +#endif + +typedef struct _GDIBSPPATBLT +{ + GDIBATCHHDR gbHdr; + DWORD rop4; + DWORD Mode; + DWORD Count; + COLORREF crForegroundClr; + COLORREF crBackgroundClr; + COLORREF crBrushClr; + ULONG ulForegroundClr; + ULONG ulBackgroundClr; + ULONG ulBrushClr; + POINTL ptlViewportOrg; + PATRECT pRect[1]; // POLYPATBLT +} GDIBSPPATBLT, *PGDIBSPPATBLT; + +typedef struct _GDIBSTEXTOUT +{ + GDIBATCHHDR gbHdr; + COLORREF crForegroundClr; + COLORREF crBackgroundClr; + LONG lmBkMode; + ULONG ulForegroundClr; + ULONG ulBackgroundClr; + int x; + int y; + UINT Options; + RECT Rect; + DWORD iCS_CP; + UINT cbCount; + UINT Size; + HANDLE hlfntNew; + FLONG flTextAlign; + POINTL ptlViewportOrg; + WCHAR String[2]; +} GDIBSTEXTOUT, *PGDIBSTEXTOUT; + +typedef struct _GDIBSEXTTEXTOUT +{ + GDIBATCHHDR gbHdr; + UINT Count; + UINT Options; + RECT Rect; + POINTL ptlViewportOrg; + ULONG ulBackgroundClr; +} GDIBSEXTTEXTOUT, *PGDIBSEXTTEXTOUT; + +typedef struct _GDIBSSETBRHORG +{ + GDIBATCHHDR gbHdr; + POINTL ptlBrushOrigin; +} GDIBSSETBRHORG, *PGDIBSSETBRHORG; + +typedef struct _GDIBSEXTSELCLPRGN +{ + GDIBATCHHDR gbHdr; + int fnMode; + LONG right; + LONG bottom; + LONG left; + LONG top; +} GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; +// +// Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. +typedef struct _GDIBSOBJECT +{ + GDIBATCHHDR gbHdr; + HGDIOBJ hgdiobj; +} GDIBSOBJECT, *PGDIBSOBJECT; + +// +// Driver Functions +// +typedef BOOL (NTAPI *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA); +typedef DHPDEV (NTAPI *PGD_ENABLEPDEV)(DEVMODEW *, LPWSTR, ULONG, HSURF *, ULONG, ULONG *, ULONG, DEVINFO *, LPWSTR, LPWSTR, HANDLE); +typedef VOID (NTAPI *PGD_COMPLETEPDEV)(DHPDEV, HDEV); +typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); +typedef HSURF (NTAPI *PGD_ENABLESURFACE)(DHPDEV); +typedef VOID (NTAPI *PGD_DISABLESURFACE)(DHPDEV); +typedef BOOL (NTAPI *PGD_ASSERTMODE)(DHPDEV, BOOL); +typedef BOOL (NTAPI *PGD_OFFSET)(SURFOBJ*, LONG, LONG, FLONG); +typedef BOOL (NTAPI *PGD_RESETPDEV)(DHPDEV, DHPDEV); +typedef VOID (NTAPI *PGD_DISABLEDRIVER)(VOID); +typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); +typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); +typedef BOOL (NTAPI *PGD_ALPHABLEND)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, BLENDOBJ*); +typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, ULONG); +typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); +typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); +typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX, ULONG); +typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); +typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX); +typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); +typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, ULONG, ULONG); +typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*); +typedef BOOL (NTAPI *PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG); +typedef BOOL (NTAPI *PGD_STRETCHBLTROP)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG, BRUSHOBJ*, DWORD); +typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); +typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, RECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); +typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, PVOID *); +typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, ULONG, PVOID *); +typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); +typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULONG); +typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, GLYPHDATA*, PVOID, ULONG); +typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); +typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); +typedef BOOL (NTAPI *PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG, LONG, LONG, RECTL*, MIX); +typedef BOOL (NTAPI *PGD_SENDPAGE)(SURFOBJ*); +typedef BOOL (NTAPI *PGD_STARTPAGE)(SURFOBJ*); +typedef BOOL (NTAPI *PGD_ENDDOC)(SURFOBJ*, ULONG); +typedef BOOL (NTAPI *PGD_STARTDOC)(SURFOBJ*, PWSTR, DWORD); +typedef ULONG (NTAPI *PGD_GETGLYPHMODE)(DHPDEV, FONTOBJ*); +typedef VOID (NTAPI *PGD_SYNCHRONIZE)(DHPDEV, RECTL*); +typedef ULONG (NTAPI *PGD_SAVESCREENBITS)(SURFOBJ*, ULONG, ULONG, RECTL*); +typedef ULONG (NTAPI *PGD_GETMODES)(HANDLE, ULONG, PDEVMODEW); +typedef VOID (NTAPI *PGD_FREE)(PVOID, ULONG); +typedef VOID (NTAPI *PGD_DESTROYFONT)(FONTOBJ*); +typedef LONG (NTAPI *PGD_QUERYFONTCAPS)(ULONG, PULONG); +typedef ULONG (NTAPI *PGD_LOADFONTFILE)(ULONG, PVOID, ULONG, ULONG); +typedef BOOL (NTAPI *PGD_UNLOADFONTFILE)(ULONG); +typedef ULONG (NTAPI *PGD_FONTMANAGEMENT)(SURFOBJ*, FONTOBJ*, ULONG, ULONG, PVOID, ULONG, PVOID); +typedef LONG (NTAPI *PGD_QUERYTRUETYPETABLE)(ULONG, ULONG, ULONG, PTRDIFF, ULONG, PBYTE); +typedef LONG (NTAPI *PGD_QUERYTRUETYPEOUTLINE)(DHPDEV, FONTOBJ*, HGLYPH, BOOL, GLYPHDATA*, ULONG, TTPOLYGONHEADER*); +typedef PVOID (NTAPI *PGD_GETTRUETYPEFILE)(ULONG, PULONG); +typedef LONG (NTAPI *PGD_QUERYFONTFILE)(ULONG, ULONG, ULONG, PULONG); +typedef BOOL (NTAPI *PGD_QUERYADVANCEWIDTHS)(DHPDEV, FONTOBJ*, ULONG, HGLYPH *, PVOID *, ULONG); +typedef BOOL (NTAPI *PGD_SETPIXELFORMAT)(SURFOBJ*, LONG, ULONG); +typedef LONG (NTAPI *PGD_DESCRIBEPIXELFORMAT)(DHPDEV, LONG, ULONG, PPIXELFORMATDESCRIPTOR); +typedef BOOL (NTAPI *PGD_SWAPBUFFERS)(SURFOBJ*, PWNDOBJ); +typedef BOOL (NTAPI *PGD_STARTBANDING)(SURFOBJ*, POINTL*); +typedef BOOL (NTAPI *PGD_NEXTBAND)(SURFOBJ*, POINTL*); +typedef BOOL (NTAPI *PGD_GETDIRECTDRAWINFO)(DHPDEV, PDD_HALINFO, PDWORD, VIDEOMEMORY*, PDWORD, PDWORD); +typedef BOOL (NTAPI *PGD_ENABLEDIRECTDRAW)(DHPDEV, PDD_CALLBACKS, PDD_SURFACECALLBACKS, PDD_PALETTECALLBACKS); +typedef VOID (NTAPI *PGD_DISABLEDIRECTDRAW)(DHPDEV); +typedef LONG (NTAPI *PGD_QUERYSPOOLTYPE)(DHPDEV, LPWSTR); +typedef BOOL (NTAPI *PGD_GRADIENTFILL)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG); +typedef VOID (NTAPI *PGD_SYNCHRONIZESURFACE)(SURFOBJ*, RECTL *, FLONG); + +// +// Most of these are definded in ddk/winddi.h +// +typedef struct _DRIVER_FUNCTIONS +{ + PGD_ENABLEPDEV EnablePDEV; + PGD_COMPLETEPDEV CompletePDEV; + PGD_DISABLEPDEV DisablePDEV; + PGD_ENABLESURFACE EnableSurface; + PGD_DISABLESURFACE DisableSurface; + PGD_ASSERTMODE AssertMode; + PGD_OFFSET Offset; + PGD_RESETPDEV ResetPDEV; + PGD_DISABLEDRIVER DisableDriver; + PVOID Unknown1; + PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; + PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; + PGD_REALIZEBRUSH RealizeBrush; + PGD_DITHERCOLOR DitherColor; + PGD_STROKEPATH StrokePath; + PGD_FILLPATH FillPath; + PGD_STROKEANDFILLPATH StrokeAndFillPath; + PGD_PAINT Paint; + PGD_BITBLT BitBlt; + PGD_COPYBITS CopyBits; + PGD_STRETCHBLT StretchBlt; + PVOID Unknown2; + PGD_SETPALETTE SetPalette; + PGD_TEXTOUT TextOut; + PGD_ESCAPE Escape; + PGD_DRAWESCAPE DrawEscape; + PGD_QUERYFONT QueryFont; + PGD_QUERYFONTTREE QueryFontTree; + PGD_QUERYFONTDATA QueryFontData; + PGD_SETPOINTERSHAPE SetPointerShape; + PGD_MOVEPOINTER MovePointer; + PGD_LINETO LineTo; + PGD_SENDPAGE SendPage; + PGD_STARTPAGE StartPage; + PGD_ENDDOC EndDoc; + PGD_STARTDOC StartDoc; + PVOID Unknown3; + PGD_GETGLYPHMODE GetGlyphMode; + PGD_SYNCHRONIZE Synchronize; + PVOID Unknown4; + PGD_SAVESCREENBITS SaveScreenBits; + PGD_GETMODES GetModes; + PGD_FREE Free; + PGD_DESTROYFONT DestroyFont; + PGD_QUERYFONTCAPS QueryFontCaps; + PGD_LOADFONTFILE LoadFontFile; + PGD_UNLOADFONTFILE UnloadFontFile; + PGD_FONTMANAGEMENT FontManagement; + PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; + PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; + PGD_GETTRUETYPEFILE GetTrueTypeFile; + PGD_QUERYFONTFILE QueryFontFile; + PFN_DrvMovePanning MovePanning; + PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; + PGD_SETPIXELFORMAT SetPixelFormat; + PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; + PGD_SWAPBUFFERS SwapBuffers; + PGD_STARTBANDING StartBanding; + PGD_NEXTBAND NextBand; + PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; + PGD_ENABLEDIRECTDRAW EnableDirectDraw; + PGD_DISABLEDIRECTDRAW DisableDirectDraw; + PGD_QUERYSPOOLTYPE QuerySpoolType; + PVOID Unknown5; + PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; + PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; + PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; + PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; + PGD_GRADIENTFILL GradientFill; + PGD_STRETCHBLTROP StretchBltROP; + PFN_DrvPlgBlt PlgBlt; + PGD_ALPHABLEND AlphaBlend; + PVOID SynthesizeFont; + PVOID GetSynthesizedFontFiles; + PGD_TRANSPARENTBLT TransparentBlt; + PFN_DrvQueryPerBandInfo QueryPerBandInfo; + PFN_DrvQueryDeviceSupport QueryDeviceSupport; + PVOID Reserved1; + PVOID Reserved2; + PVOID Reserved3; + PVOID Reserved4; + PVOID Reserved5; + PVOID Reserved6; + PVOID Reserved7; + PVOID Reserved8; + PFN_DrvDeriveSurface DeriveSurface; + PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; + PFN_DrvNotify Notify; + PGD_SYNCHRONIZESURFACE SynchronizeSurface; + PFN_DrvResetDevice ResetDevice; + PVOID Reserved9; + PVOID Reserved10; + PVOID Reserved11; /* 92 */ + + /* ReactOS specify */ + PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra +} DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; + +/* FIXME move to more proper place, Vista syscall */ +DWORD STDCALL NtGdiConfigureOPMProtectedOutput(DWORD x1, DWORD x2, DWORD x3, DWORD x4); +DWORD STDCALL NtGdiCreateOPMProtectedOutputs(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5); + +/* Doc exists in msdn see ReactOS def file which D3DKMT* it is, rember I have not check if the doc are correct, + * it is for the drv, which api it should export. + * comucate way + * gdi32.dll -- Direcly syscall --> win33k.sys + * win33k.sys -- doing direct call to -->dxkrnl.sys (note dxkrnl doing allot work here) + * dxkrnl.sys (note dxkrnl doing allot work here) -- the drv export function --> graphic drv, + * this api should move to more proper place later. + */ +DWORD STDCALL NtGdiDdDDICheckExclusiveOwnership(); +DWORD STDCALL NtGdiDdDDICheckMonitorPowerState(DWORD x1); +DWORD STDCALL NtGdiDdDDICheckOcclusion(DWORD x1); +DWORD STDCALL NtGdiDdDDICloseAdapter(DWORD x1); +DWORD STDCALL NtGdiDdDDICreateAllocation(DWORD x1); +DWORD STDCALL NtGdiDdDDICreateContext(DWORD x1); +DWORD STDCALL NtGdiDdDDICreateDCFromMemory(DWORD x1); +DWORD STDCALL NtGdiDdDDICreateDevice(DWORD x1); +DWORD STDCALL NtGdiDdDDICreateOverlay(DWORD x1); +DWORD STDCALL NtGdiDdDDICreateSynchronizationObject(DWORD x1); +DWORD STDCALL NtGdiDdDDIDestroyAllocation(DWORD x1); +DWORD STDCALL NtGdiDdDDIDestroyContext(DWORD x1); +DWORD STDCALL NtGdiDdDDIDestroyDCFromMemory(DWORD x1); +DWORD STDCALL NtGdiDdDDIDestroyDevice(DWORD x1); +DWORD STDCALL NtGdiDdDDIDestroyOverlay(DWORD x1); +DWORD STDCALL NtGdiDdDDIDestroySynchronizationObject(DWORD x1); +DWORD STDCALL NtGdiDdDDIEscape(DWORD x1); +DWORD STDCALL NtGdiDdDDIFlipOverlay(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetContextSchedulingPriority(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetDeviceState(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetDisplayModeList(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetMultisampleMethodList(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetPresentHistory(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetProcessSchedulingPriorityClass(DWORD x1, DWORD x2); +DWORD STDCALL NtGdiDdDDIGetRuntimeData(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetScanLine(DWORD x1); +DWORD STDCALL NtGdiDdDDIGetSharedPrimaryHandle(DWORD x1); +DWORD STDCALL NtGdiDdDDIInvalidateActiveVidPn(DWORD x1); +DWORD STDCALL NtGdiDdDDILock(DWORD x1); +DWORD STDCALL NtGdiDdDDIOpenAdapterFromDeviceName(DWORD x1); +DWORD STDCALL NtGdiDdDDIOpenAdapterFromHdc(DWORD x1); +DWORD STDCALL NtGdiDdDDIOpenResource(DWORD x1); +DWORD STDCALL NtGdiDdDDIPollDisplayChildren(DWORD x1); +DWORD STDCALL NtGdiDdDDIPresent(DWORD x1); +DWORD STDCALL NtGdiDdDDIQueryAdapterInfo(DWORD x1); +DWORD STDCALL NtGdiDdDDIQueryAllocationResidency(DWORD x1); +DWORD STDCALL NtGdiDdDDIQueryResourceInfo(DWORD x1); +DWORD STDCALL NtGdiDdDDIQueryStatistics(DWORD x1); +DWORD STDCALL NtGdiDdDDIReleaseProcessVidPnSourceOwners(DWORD x1); +DWORD STDCALL NtGdiDdDDIRender(DWORD x1); +DWORD STDCALL NtGdiDdDDISetAllocationPriority(DWORD x1); +DWORD STDCALL NtGdiDdDDISetContextSchedulingPriority(DWORD x1); +DWORD STDCALL NtGdiDdDDISetDisplayMode(DWORD x1); +DWORD STDCALL NtGdiDdDDISetDisplayPrivateDriverFormat(DWORD x1); +DWORD STDCALL NtGdiDdDDISetGammaRamp(DWORD x1); +DWORD STDCALL NtGdiDdDDISetProcessSchedulingPriorityClass(DWORD x1, x2); +DWORD STDCALL NtGdiDdDDISetQueuedLimit(DWORD x1); +DWORD STDCALL NtGdiDdDDISetVidPnSourceOwner(DWORD x1); +DWORD STDCALL NtGdiDdDDISharedPrimaryLockNotification(DWORD x1); +DWORD STDCALL NtGdiDdDDISharedPrimaryUnLockNotification(DWORD x1); +DWORD STDCALL NtGdiDdDDISignalSynchronizationObject(DWORD x1); +DWORD STDCALL NtGdiDdDDIUnlock(DWORD x1); +DWORD STDCALL NtGdiDdDDIUpdateOverlay(DWORD x1); +DWORD STDCALL NtGdiDdDDIWaitForIdle(DWORD x1); +DWORD STDCALL NtGdiDdDDIWaitForSynchronizationObject(DWORD x1); +DWORD STDCALL NtGdiDdDDIWaitForVerticalBlankEvent(DWORD x1); +DWORD STDCALL NtGdiDDCCIGetCapabilitiesString(DWORD x1, DWORD x2, DWORD x3); +DWORD STDCALL NtGdiDDCCIGetCapabilitiesStringLength(DWORD x1, DWORD x2); +DWORD STDCALL NtGdiDDCCIGetTimingReport(DWORD x1, DWORD x2); +DWORD STDCALL NtGdiDDCCIGetVCPFeature(DWORD x1, DWORD x2, DWORD x3, DWORD x4); +DWORD STDCALL NtGdiDDCCISaveCurrentSettings(DWORD x1); +DWORD STDCALL NtGdiDDCCISetVCPFeature(DWORD x1, DWORD x2, DWORD x3); + + + +#endif Added: branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c (added) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c [iso-8859-1] Sun May 18 13:33:27 2008 @@ -1,0 +1,507 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native DirectDraw implementation + * FILE: subsys/win32k/ntddraw/d3d.c + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * 18/5-2008 Magnus Olsen + */ + + +#include <w32k.h> +#include <debug.h> + +DWORD +STDCALL +NtGdiDdDDICheckExclusiveOwnership() +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICheckMonitorPowerState(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICheckOcclusion(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICloseAdapter(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICreateAllocation(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICreateContext(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICreateDCFromMemory(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICreateDevice(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICreateOverlay(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDICreateSynchronizationObject(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIDestroyAllocation(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +NtGdiDdDDIDestroyContext(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIDestroyDCFromMemory(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIDestroyDevice(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIDestroyOverlay(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIDestroySynchronizationObject(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIEscape(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIFlipOverlay(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetContextSchedulingPriority(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetDeviceState(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetDisplayModeList(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetMultisampleMethodList(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetPresentHistory(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetProcessSchedulingPriorityClass +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetRuntimeData(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetScanLine(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIGetSharedPrimaryHandle(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIInvalidateActiveVidPn(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDILock(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIOpenAdapterFromDeviceName(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIOpenAdapterFromHdc(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIOpenResource(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIPollDisplayChildren(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIPresent(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIQueryAdapterInfo(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIQueryAllocationResidency(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIQueryResourceInfo(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIQueryStatistics(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIReleaseProcessVidPnSourceOwners(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIRender(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetAllocationPriority(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetContextSchedulingPriority(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetDisplayMode(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetDisplayPrivateDriverFormat(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetGammaRamp(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetProcessSchedulingPriorityClass(DWORD x1, x2) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetQueuedLimit(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISetVidPnSourceOwner(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISharedPrimaryLockNotification(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISharedPrimaryUnLockNotification(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDISignalSynchronizationObject(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIUnlock(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIUpdateOverlay(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIWaitForIdle(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIWaitForSynchronizationObject(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDdDDIWaitForVerticalBlankEvent(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDDCCIGetCapabilitiesString(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDDCCIGetCapabilitiesStringLength(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDDCCIGetTimingReport(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDDCCIGetVCPFeature(DWORD x1, DWORD x2, DWORD x3, DWORD x4) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDDCCISaveCurrentSettings(DWORD x1) +{ + UNIMPLEMENTED; + return 0 +} + +DWORD +STDCALL +NtGdiDDCCISetVCPFeature(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return 0 +} Propchange: branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sun May 18 13:33:27 2008 @@ -2974,3 +2974,11 @@ UNIMPLEMENTED; return 0 } + +DWORD +STDCALL +NtGdiCreateOPMProtectedOutputs(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) +{ + UNIMPLEMENTED; + return 0 +} Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sun May 18 13:33:27 2008 @@ -674,7 +674,70 @@ # # # Vista Syscall add on -NtGdiConfigureOPMProtectedOutput 4 +NtGdiConfigureOPMProtectedOutput 4 +NtGdiCreateOPMProtectedOutputs 5 +NtGdiDdDDICheckExclusiveOwnership 0 +NtGdiDdDDICheckMonitorPowerState 1 +NtGdiDdDDICheckOcclusion 1 +NtGdiDdDDICloseAdapter 1 +NtGdiDdDDICreateAllocation 1 +NtGdiDdDDICreateContext 1 +NtGdiDdDDICreateDCFromMemory 1 +NtGdiDdDDICreateDevice 1 +NtGdiDdDDICreateOverlay 1 +NtGdiDdDDICreateSynchronizationObject 1 +NtGdiDdDDIDestroyAllocation 1 +NtGdiDdDDIDestroyContext 1 +NtGdiDdDDIDestroyDCFromMemory 1 +NtGdiDdDDIDestroyDevice 1 +NtGdiDdDDIDestroyOverlay 1 +NtGdiDdDDIDestroySynchronizationObject 1 +NtGdiDdDDIEscape 1 +NtGdiDdDDIFlipOverlay 1 +NtGdiDdDDIGetContextSchedulingPriority 1 +NtGdiDdDDIGetDeviceState 1 +NtGdiDdDDIGetDisplayModeList 1 +NtGdiDdDDIGetMultisampleMethodList 1 +NtGdiDdDDIGetPresentHistory 1 +NtGdiDdDDIGetProcessSchedulingPriorityClass 2 +NtGdiDdDDIGetRuntimeData 1 +NtGdiDdDDIGetScanLine 1 +NtGdiDdDDIGetSharedPrimaryHandle 1 +NtGdiDdDDIInvalidateActiveVidPn 1 +NtGdiDdDDILock 1 +NtGdiDdDDIOpenAdapterFromDeviceName 1 +NtGdiDdDDIOpenAdapterFromHdc 1 +NtGdiDdDDIOpenResource 1 +NtGdiDdDDIPollDisplayChildren 1 +NtGdiDdDDIPresent 1 +NtGdiDdDDIQueryAdapterInfo 1 +NtGdiDdDDIQueryAllocationResidency 1 +NtGdiDdDDIQueryResourceInfo 1 +NtGdiDdDDIQueryStatistics 1 +NtGdiDdDDIReleaseProcessVidPnSourceOwners 1 +NtGdiDdDDIRender 1 +NtGdiDdDDISetAllocationPriority 1 +NtGdiDdDDISetContextSchedulingPriority 1 +NtGdiDdDDISetDisplayMode 1 +NtGdiDdDDISetDisplayPrivateDriverFormat 1 +NtGdiDdDDISetGammaRamp 1 +NtGdiDdDDISetProcessSchedulingPriorityClass 1 +NtGdiDdDDISetQueuedLimit 1 +NtGdiDdDDISetVidPnSourceOwner 1 +NtGdiDdDDISharedPrimaryLockNotification 1 +NtGdiDdDDISharedPrimaryUnLockNotification 1 +NtGdiDdDDISignalSynchronizationObject 1 +NtGdiDdDDIUnlock 1 +NtGdiDdDDIUpdateOverlay 1 +NtGdiDdDDIWaitForIdle 1 +NtGdiDdDDIWaitForSynchronizationObject 1 +NtGdiDdDDIWaitForVerticalBlankEvent 1 +NtGdiDDCCIGetCapabilitiesString 3 +NtGdiDDCCIGetCapabilitiesStringLength 2 +NtGdiDDCCIGetTimingReport 2 +NtGdiDDCCIGetVCPFeature 4 +NtGdiDDCCISaveCurrentSettings 1 +NtGdiDDCCISetVCPFeature 3 # # #ReactOS specific syscalls

1 0

[hpoussin] 33592: Display again the 'New' context menu, which was broken in r30366 See issue #3183 for more details.
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 13:07:00 2008 New Revision: 33592 URL: http://svn.reactos.org/svn/reactos?rev=33592&view=rev Log: Display again the 'New' context menu, which was broken in r30366 See issue #3183 for more details. Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c trunk/reactos/dll/win32/shell32/shv_item_new.c Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c [iso-8859-1] Sun May 18 13:07:00 2008 @@ -170,6 +170,8 @@ * ISVBgCm_fnQueryContextMenu() */ +VOID INewItem_SetParent(LPSHELLFOLDER pSFParent); /* FIXME: remove that, shouldn't be needed */ + static HRESULT WINAPI ISVBgCm_fnQueryContextMenu( IContextMenu2 *iface, HMENU hMenu, @@ -225,8 +227,7 @@ * FIXME * load other shell extensions */ -#if 0 - if (SUCCEEDED(INewItem_Constructor(This->pSFParent, &IID_IContextMenu2, (LPVOID*)&icm))) + if (SUCCEEDED(INewItem_Constructor(NULL, &IID_IContextMenu2, (LPVOID*)&icm))) { if (SUCCEEDED(IContextMenu_QueryContextMenu(icm, hMenu, 10, idCmdFirst, idCmdLast, uFlags))) { @@ -238,7 +239,10 @@ This->icm_new = NULL; } } -#endif + + /* Prepare 'New item' shell extension */ + /* FIXME: shouldn't be needed... */ + INewItem_SetParent(This->pSFParent); if (This->bDesktop) { Modified: trunk/reactos/dll/win32/shell32/shv_item_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_new.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_item_new.c [iso-8859-1] Sun May 18 13:07:00 2008 @@ -756,8 +756,8 @@ LPARAM lParam) { INewMenuImpl *This = impl_from_IContextMenu(iface); - DRAWITEMSTRUCT * lpids = (DRAWITEMSTRUCT*) lParam; - MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*) lParam; + //DRAWITEMSTRUCT * lpids = (DRAWITEMSTRUCT*) lParam; + //MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*) lParam; TRACE("INewItem_IContextMenu_fnHandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); @@ -789,11 +789,11 @@ INewItem_IContextMenu_fnHandleMenuMsg }; +static INewMenuImpl *cached_ow; HRESULT WINAPI INewItem_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv) { INewMenuImpl * ow; HRESULT res; - static INewMenuImpl *cached_ow; if (!cached_ow) { @@ -814,13 +814,17 @@ } TRACE("(%p)->()\n",cached_ow); + + res = INewItem_fnQueryInterface( cached_ow, riid, ppv ); + return res; +} + +VOID INewItem_SetParent(LPSHELLFOLDER pSFParent) +{ if (cached_ow->pSFParent) { IShellFolder_Release(cached_ow->pSFParent); } - // cached_ow->pSFParent = pSFParent; - // IShellFolder_AddRef(pSFParent); - - res = INewItem_fnQueryInterface( cached_ow, riid, ppv ); - return res; -} + cached_ow->pSFParent = pSFParent; + IShellFolder_AddRef(pSFParent); +}

1 0

[greatlrd] 33591: Adding vista syscall NtGdiConfigureOPMProtectedOutput it is stub for now
by greatlrd＠svn.reactos.org 18 May '08

18 May '08

Author: greatlrd Date: Sun May 18 11:33:14 2008 New Revision: 33591 URL: http://svn.reactos.org/svn/reactos?rev=33591&view=rev Log: Adding vista syscall NtGdiConfigureOPMProtectedOutput it is stub for now Modified: branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db Modified: branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/include/reactos/w… ============================================================================== --- branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sun May 18 11:33:14 2008 @@ -658,4 +658,10 @@ PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra } DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; +/* FIXME move to more proper place, Vista syscall */ +DWORD +STDCALL +NtGdiConfigureOPMProtectedOutput(DWORD x1, DWORD x2, DWORD x3, DWORD x4); + + #endif Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sun May 18 11:33:14 2008 @@ -2964,3 +2964,13 @@ UNIMPLEMENTED; return FALSE; } + + +/* Vista Syscall that are stub */ +DWORD +STDCALL +NtGdiConfigureOPMProtectedOutput(DWORD x1, DWORD x2, DWORD x3, DWORD x4) +{ + UNIMPLEMENTED; + return 0 +} Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sun May 18 11:33:14 2008 @@ -673,6 +673,10 @@ NtGdiDrawStream 3 # # +# Vista Syscall add on +NtGdiConfigureOPMProtectedOutput 4 +# +# #ReactOS specific syscalls NtGdiSetDIBits 7 NtGdiSetViewportExtEx 4

1 0

[hpoussin] 33590: Add stub implementation for ElfrOpenELW()
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 11:14:34 2008 New Revision: 33590 URL: http://svn.reactos.org/svn/reactos?rev=33590&view=rev Log: Add stub implementation for ElfrOpenELW() Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sun May 18 11:14:34 2008 @@ -129,7 +129,8 @@ IELF_HANDLE *LogHandle) { UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + *LogHandle = 1; + return STATUS_SUCCESS; }

1 0

[mpiulachs] 33589: - remove now unneeded files
by mpiulachs＠svn.reactos.org 18 May '08

18 May '08

Author: mpiulachs Date: Sun May 18 11:04:19 2008 New Revision: 33589 URL: http://svn.reactos.org/svn/reactos?rev=33589&view=rev Log: - remove now unneeded files Removed: trunk/irc/TechBot/TechBot.Library/Commands/ApiCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/BugCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/HresultCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/NtStatusCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/ReactOSBugUrl.cs trunk/irc/TechBot/TechBot.Library/Commands/SambaBugUrl.cs trunk/irc/TechBot/TechBot.Library/Commands/SvnCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/WineBugUrl.cs trunk/irc/TechBot/TechBot.Library/Commands/WinerrorCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/WmCommand.cs Removed: trunk/irc/TechBot/TechBot.Library/Commands/ApiCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/ApiCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/ApiCommand.cs (removed) @@ -1,333 +1,0 @@ -using System; -using System.IO; -using System.Data; -using System.Text.RegularExpressions; -using HtmlHelp; -using HtmlHelp.ChmDecoding; - -namespace TechBot.Library -{ - [Command("api", Help = "!api <apiname>")] - public class ApiCommand : Command - { - private const bool IsVerbose = false; - - private HtmlHelpSystem chm; - private string chmPath; - private string mainChm; - - public ApiCommand() - { - Run(); - } - - private void WriteIfVerbose(MessageContext context, - string message) - { - if (IsVerbose) - TechBot.ServiceOutput.WriteLine(context, - message); - } - - private void Run() - { - string CHMFilename = Path.Combine(chmPath, mainChm); - chm = new HtmlHelpSystem(); - chm.OpenFile(CHMFilename, null); - - Console.WriteLine(String.Format("Loaded main CHM: {0}", - Path.GetFileName(CHMFilename))); - foreach (string filename in Directory.GetFiles(chmPath)) - { - if (!Path.GetExtension(filename).ToLower().Equals(".chm")) - continue; - if (Path.GetFileName(filename).ToLower().Equals(mainChm)) - continue; - - Console.WriteLine(String.Format("Loading CHM: {0}", - Path.GetFileName(filename))); - try - { - chm.MergeFile(filename); - } - catch (Exception ex) - { - Console.WriteLine(String.Format("Could not load CHM: {0}. Exception {1}", - Path.GetFileName(filename), - ex)); - } - } - Console.WriteLine(String.Format("Loaded {0} CHMs", - chm.FileList.Length)); - } - - public override void Handle(MessageContext context) - { - if (parameters.Trim().Equals(String.Empty)) - DisplayNoKeyword(context); - else - Search(context, - parameters); - } - - private bool SearchIndex(MessageContext context, - string keyword) - { - if (chm.HasIndex) - { - IndexItem item = chm.Index.SearchIndex(keyword, - IndexType.KeywordLinks); - if (item != null && item.Topics.Count > 0) - { - WriteIfVerbose(context, - String.Format("Keyword {0} found in index", - item.KeyWord)); - IndexTopic indexTopic = item.Topics[0] as IndexTopic; - return DisplayResult(context, - keyword, - indexTopic); - } - else - { - WriteIfVerbose(context, - String.Format("Keyword {0} not found in index", - keyword)); - return false; - } - } - else - return false; - } - - private void SearchFullText(MessageContext context, - string keyword) - { - string sort = "Rating ASC"; - WriteIfVerbose(context, - String.Format("Searching fulltext database for {0}", - keyword)); - - bool partialMatches = false; - bool titlesOnly = true; - int maxResults = 100; - DataTable results = chm.PerformSearch(keyword, - maxResults, - partialMatches, - titlesOnly); - WriteIfVerbose(context, - String.Format("results.Rows.Count = {0}", - results != null ? - results.Rows.Count.ToString() : "(none)")); - if (results != null && results.Rows.Count > 0) - { - results.DefaultView.Sort = sort; - if (!DisplayResult(context, - keyword, - results)) - { - DisplayNoResult(context, - keyword); - } - } - else - { - DisplayNoResult(context, - keyword); - } - } - - private void Search(MessageContext context, - string keyword) - { - if (!SearchIndex(context, - keyword)) - SearchFullText(context, - keyword); - } - - private bool DisplayResult(MessageContext context, - string keyword, - IndexTopic indexTopic) - { - keyword = keyword.Trim().ToLower(); - string url = indexTopic.URL; - WriteIfVerbose(context, - String.Format("URL from index search {0}", - url)); - string prototype = ExtractPrototype(context, - url); - if (prototype == null || prototype.Trim().Equals(String.Empty)) - return false; - string formattedPrototype = FormatPrototype(prototype); - TechBot.ServiceOutput.WriteLine(context, - formattedPrototype); - return true; - } - - private bool DisplayResult(MessageContext context, - string keyword, - DataTable results) - { - keyword = keyword.Trim().ToLower(); - for (int i = 0; i < results.DefaultView.Count; i++) - { - DataRowView row = results.DefaultView[i]; - string title = row["Title"].ToString(); - WriteIfVerbose(context, - String.Format("Examining {0}", title)); - if (title.Trim().ToLower().Equals(keyword)) - { - string location = row["Location"].ToString(); - string rating = row["Rating"].ToString(); - string url = row["Url"].ToString(); - string prototype = ExtractPrototype(context, - url); - if (prototype == null || prototype.Trim().Equals(String.Empty)) - continue; - string formattedPrototype = FormatPrototype(prototype); - TechBot.ServiceOutput.WriteLine(context, - formattedPrototype); - return true; - } - } - return false; - } - - private void DisplayNoResult(MessageContext context, - string keyword) - { - TechBot.ServiceOutput.WriteLine(context, - String.Format("I don't know about keyword {0}", - keyword)); - } - - private void DisplayNoKeyword(MessageContext context) - { - TechBot.ServiceOutput.WriteLine(context, - "Please give me a keyword."); - } - - private string ReplaceComments(string s) - { - return Regex.Replace(s, "//(.+)\r\n", ""); - } - - private string ReplaceLineEndings(string s) - { - return Regex.Replace(s, "(\r\n)+", " "); - } - - private string ReplaceSpaces(string s) - { - return Regex.Replace(s, @" +", " "); - } - - private string ReplaceSpacesBeforeLeftParenthesis(string s) - { - return Regex.Replace(s, @"\( ", @"("); - } - - private string ReplaceSpacesBeforeRightParenthesis(string s) - { - return Regex.Replace(s, @" \)", @")"); - } - - private string ReplaceSemicolon(string s) - { - return Regex.Replace(s, @";", @""); - } - - private string FormatPrototype(string prototype) - { - string s = ReplaceComments(prototype); - s = ReplaceLineEndings(s); - s = ReplaceSpaces(s); - s = ReplaceSpacesBeforeLeftParenthesis(s); - s = ReplaceSpacesBeforeRightParenthesis(s); - s = ReplaceSemicolon(s); - return s; - } - - private string ExtractPrototype(MessageContext context, - string url) - { - string page = GetPage(context, - url); - Match match = Regex.Match(page, - "<PRE class=\"?syntax\"?>(.+)</PRE>", - RegexOptions.Multiline | - RegexOptions.Singleline); - if (match.Groups.Count > 1) - { - string prototype = match.Groups[1].ToString(); - return StripHtml(StripAfterSlashPre(prototype)); - } - - return ""; - } - - private string StripAfterSlashPre(string html) - { - int index = html.IndexOf("</PRE>"); - if (index != -1) - { - return html.Substring(0, index); - } - else - return html; - } - - private string StripHtml(string html) - { - return Regex.Replace(html, @"<(.|\n)*?>", String.Empty); - } - - private string GetPage(MessageContext context, - string url) - { - string CHMFileName = ""; - string topicName = ""; - string anchor = ""; - CHMStream.CHMStream baseStream; - if (!chm.BaseStream.GetCHMParts(url, ref CHMFileName, ref topicName, ref anchor)) - { - baseStream = chm.BaseStream; - CHMFileName = baseStream.CHMFileName; - topicName = url; - anchor = ""; - } - else - { - baseStream = GetBaseStreamFromCHMFileName(context, - CHMFileName); - } - - if ((topicName == "") || (CHMFileName == "") || (baseStream == null)) - { - return ""; - } - - return baseStream.ExtractTextFile(topicName); - } - - private CHMStream.CHMStream GetBaseStreamFromCHMFileName(MessageContext context, - string CHMFileName) - { - foreach (CHMFile file in chm.FileList) - { - WriteIfVerbose(context, - String.Format("Compare: {0} <> {1}", - file.ChmFilePath, - CHMFileName)); - if (file.ChmFilePath.ToLower().Equals(CHMFileName.ToLower())) - { - return file.BaseStream; - } - } - WriteIfVerbose(context, - String.Format("Could not find loaded CHM file in list: {0}", - CHMFileName)); - return null; - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/BugCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/BugCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/BugCommand.cs (removed) @@ -1,41 +1,0 @@ -using System; - -namespace TechBot.Library -{ - public abstract class BugCommand : Command - { - private string m_BugID = null; - - public BugCommand() - { - } - - [CommandParameter("id", "The bug ID")] - public string BugID - { - get { return m_BugID; } - set { m_BugID = value; } - } - - public override void ExecuteCommand() - { - if (BugID == null) - { - Say("Please provide a valid bug number."); - } - else - { - try - { - Say(BugUrl, Int32.Parse(BugID)); - } - catch (Exception) - { - Say("{0} is not a valid bug number.", BugID); - } - } - } - - protected abstract string BugUrl { get; } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/HresultCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/HresultCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/HresultCommand.cs (removed) @@ -1,69 +1,0 @@ -using System; -using System.Xml; - -namespace TechBot.Library -{ - [Command("hresult", Help = "!hresult <value>")] - public class HResultCommand : XmlLookupCommand - { - public HResultCommand() - { - } - - public override string XmlFile - { - get { return Settings.Default.HResultXml; } - } - - public override void ExecuteCommand() - { - if (Text.Equals(String.Empty)) - { - TechBot.ServiceOutput.WriteLine(Context, - "Please provide a valid HRESULT value."); - return; - } - - NumberParser np = new NumberParser(); - long hresult = np.Parse(Text); - if (np.Error) - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("{0} is not a valid HRESULT value.", - Text)); - return; - } - - string description = GetHresultDescription(hresult); - if (description != null) - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("{0} is {1}.", - Text, - description)); - } - else - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("I don't know about HRESULT {0}.", - Text)); - } - } - - public string GetHresultDescription(long hresult) - { - XmlElement root = base.m_XmlDocument.DocumentElement; - XmlNode node = root.SelectSingleNode(String.Format("Hresult[@value='{0}']", - hresult.ToString("X8"))); - if (node != null) - { - XmlAttribute text = node.Attributes["text"]; - if (text == null) - throw new Exception("Node has no text attribute."); - return text.Value; - } - else - return null; - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/NtStatusCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/NtStatusCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/NtStatusCommand.cs (removed) @@ -1,69 +1,0 @@ -using System; -using System.Xml; - -namespace TechBot.Library -{ - [Command("ntstatus", Help = "!ntstatus <value>")] - public class NtStatusCommand : XmlLookupCommand - { - public NtStatusCommand() - { - } - - public override string XmlFile - { - get { return Settings.Default.NtStatusXml; } - } - - public override void ExecuteCommand() - { - if (Text.Equals(String.Empty)) - { - TechBot.ServiceOutput.WriteLine(Context, - "Please provide a valid NTSTATUS value."); - return; - } - - NumberParser np = new NumberParser(); - long ntstatus = np.Parse(Text); - if (np.Error) - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("{0} is not a valid NTSTATUS value.", - Text)); - return; - } - - string description = GetNtstatusDescription(ntstatus); - if (description != null) - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("{0} is {1}.", - Text, - description)); - } - else - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("I don't know about NTSTATUS {0}.", - Text)); - } - } - - public string GetNtstatusDescription(long ntstatus) - { - XmlElement root = base.m_XmlDocument.DocumentElement; - XmlNode node = root.SelectSingleNode(String.Format("Ntstatus[@value='{0}']", - ntstatus.ToString("X8"))); - if (node != null) - { - XmlAttribute text = node.Attributes["text"]; - if (text == null) - throw new Exception("Node has no text attribute."); - return text.Value; - } - else - return null; - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/ReactOSBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/ReactOSBugUrl.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/ReactOSBugUrl.cs (removed) @@ -1,19 +1,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace TechBot.Library -{ - [Command("rosbug", Help = "!rosbug <number>")] - class ReactOSBugUrl : BugCommand - { - public ReactOSBugUrl() - { - } - - protected override string BugUrl - { - get { return "http://www.reactos.org/bugzilla/show_bug.cgi?id={0}"; } - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/SambaBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/SambaBugUrl.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/SambaBugUrl.cs (removed) @@ -1,19 +1,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace TechBot.Library -{ - [Command("sambabug", Help = "!sambabug <number>")] - class SambaBugUrl : BugCommand - { - public SambaBugUrl() - { - } - - protected override string BugUrl - { - get { return "https://bugzilla.samba.org/show_bug.cgi?id={0}"; } - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/SvnCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/SvnCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/SvnCommand.cs (removed) @@ -1,20 +1,0 @@ -using System; - -namespace TechBot.Library -{ - [Command("svn", Help = "!svn")] - public class SvnCommand : Command - { - private string m_SvnRoot; - - public SvnCommand() - { - m_SvnRoot = Settings.Default.SVNRoot; - } - - public override void ExecuteCommand() - { - Say("svn co {0}", m_SvnRoot); - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/WineBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/WineBugUrl.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/WineBugUrl.cs (removed) @@ -1,19 +1,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace TechBot.Library -{ - [Command("winebug", Help = "!winebug <number>")] - class WineBugUrl : BugCommand - { - public WineBugUrl() - { - } - - protected override string BugUrl - { - get { return "http://bugs.winehq.org/show_bug.cgi?id={0}"; } - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/WinerrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/WinerrorCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/WinerrorCommand.cs (removed) @@ -1,69 +1,0 @@ -using System; -using System.Xml; - -namespace TechBot.Library -{ - [Command("winerror", Help = "!winerror <value>")] - public class WinErrorCommand : XmlLookupCommand - { - public WinErrorCommand() - { - } - - public override string XmlFile - { - get { return Settings.Default.WinErrorXml; } - } - - public override void ExecuteCommand() - { - if (Text.Equals(String.Empty)) - { - TechBot.ServiceOutput.WriteLine(Context, - "Please provide a valid System Error Code value."); - return; - } - - NumberParser np = new NumberParser(); - long winerror = np.Parse(Text); - if (np.Error) - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("{0} is not a valid System Error Code value.", - Text)); - return; - } - - string description = GetWinerrorDescription(winerror); - if (description != null) - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("{0} is {1}.", - Text, - description)); - } - else - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("I don't know about System Error Code {0}.", - Text)); - } - } - - public string GetWinerrorDescription(long winerror) - { - XmlElement root = base.m_XmlDocument.DocumentElement; - XmlNode node = root.SelectSingleNode(String.Format("Winerror[@value='{0}']", - Text)); - if (node != null) - { - XmlAttribute text = node.Attributes["text"]; - if (text == null) - throw new Exception("Node has no text attribute."); - return text.Value; - } - else - return null; - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/WmCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/WmCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/WmCommand.cs (removed) @@ -1,96 +1,0 @@ -using System; -using System.Xml; - -namespace TechBot.Library -{ - [Command("wm" , Help = "!wm <value> or !wm <name>")] - public class WMCommand : XmlCommand - { - private string m_WMText = null; - - public WMCommand() - { - } - - public override string XmlFile - { - get { return Settings.Default.WMXml; } - } - - [CommandParameter("wm", "The windows message to check")] - public string WMText - { - get { return m_WMText; } - set { m_WMText = value; } - } - - public override void ExecuteCommand() - { - if (WMText.Equals(String.Empty)) - { - TechBot.ServiceOutput.WriteLine(Context, - "Please provide a valid window message value or name."); - return; - } - - NumberParser np = new NumberParser(); - long wm = np.Parse(WMText); - string output; - if (np.Error) - { - // Assume "!wm <name>" form. - output = GetWmNumber(WMText); - } - else - { - output = GetWmDescription(wm); - } - - if (output != null) - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("{0} is {1}.", - WMText, - output)); - } - else - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("I don't know about window message {0}.", - WMText)); - } - } - - private string GetWmDescription(long wm) - { - XmlElement root = base.m_XmlDocument.DocumentElement; - XmlNode node = root.SelectSingleNode(String.Format("WindowMessage[@value='{0}']", - wm)); - if (node != null) - { - XmlAttribute text = node.Attributes["text"]; - if (text == null) - throw new Exception("Node has no text attribute."); - return text.Value; - } - else - return null; - } - - private string GetWmNumber(string wmName) - { - XmlElement root = base.m_XmlDocument.DocumentElement; - XmlNode node = root.SelectSingleNode(String.Format("WindowMessage[@text='{0}']", - wmName)); - if (node != null) - { - XmlAttribute value = node.Attributes["value"]; - if (value == null) - throw new Exception("Node has no value attribute."); - return value.Value; - } - else - return null; - } - } -}

1 0

[mpiulachs] 33588: - small fix
by mpiulachs＠svn.reactos.org 18 May '08

18 May '08

Author: mpiulachs Date: Sun May 18 11:01:34 2008 New Revision: 33588 URL: http://svn.reactos.org/svn/reactos?rev=33588&view=rev Log: - small fix Modified: trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs trunk/irc/TechBot/TechBot.Commands.Common/HResultCommand.cs trunk/irc/TechBot/TechBot.Commands.Common/NtStatusCommand.cs trunk/irc/TechBot/TechBot.Commands.Common/WMCommand.cs trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs Modified: trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs [iso-8859-1] Sun May 18 11:01:34 2008 @@ -20,7 +20,7 @@ public override void ExecuteCommand() { - if (Parameters == null) + if (string.IsNullOrEmpty(BugID)) { Say("Please provide a valid bug number."); } Modified: trunk/irc/TechBot/TechBot.Commands.Common/HResultCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/HResultCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/HResultCommand.cs [iso-8859-1] Sun May 18 11:01:34 2008 @@ -19,7 +19,7 @@ public override void ExecuteCommand() { - if (Text == null) + if (string.IsNullOrEmpty(Text)) { Say("Please provide a valid HRESULT value."); } Modified: trunk/irc/TechBot/TechBot.Commands.Common/NtStatusCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/NtStatusCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/NtStatusCommand.cs [iso-8859-1] Sun May 18 11:01:34 2008 @@ -19,7 +19,7 @@ public override void ExecuteCommand() { - if (Text == null) + if (string.IsNullOrEmpty(Text)) { Say("Please provide a valid NTSTATUS value."); } Modified: trunk/irc/TechBot/TechBot.Commands.Common/WMCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/WMCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/WMCommand.cs [iso-8859-1] Sun May 18 11:01:34 2008 @@ -26,7 +26,7 @@ public override void ExecuteCommand() { - if (WMText == null) + if (string.IsNullOrEmpty(WMText)) { Say("Please provide a valid window message value or name."); Modified: trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs [iso-8859-1] Sun May 18 11:01:34 2008 @@ -19,7 +19,7 @@ public override void ExecuteCommand() { - if (Text == null) + if (string.IsNullOrEmpty(Text)) { Say("Please provide a valid System Error Code value."); } Modified: trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs [iso-8859-1] Sun May 18 11:01:34 2008 @@ -7,8 +7,6 @@ [Command("help", Help = "!help or !help -name:[CommandName]", Description = "Shows this help , type 'help -name:[CommandName]'")] public class HelpCommand : Command { - private string m_CommandName = null; - public HelpCommand() { } @@ -22,7 +20,7 @@ public override void ExecuteCommand() { - if (CommandName == null) + if (string.IsNullOrEmpty(CommandName)) { Say("I support the following commands:");

1 0

[hpoussin] 33587: Send an empty string, as required by the documentation See issue #3202 for more details.
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 11:01:29 2008 New Revision: 33587 URL: http://svn.reactos.org/svn/reactos?rev=33587&view=rev Log: Send an empty string, as required by the documentation See issue #3202 for more details. Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Sun May 18 11:01:29 2008 @@ -33,6 +33,8 @@ IELF_HANDLE LogHandle; BOOL bLocal; } LOG_INFO, *PLOG_INFO; + +static RPC_UNICODE_STRING EmptyString = { 0, 0, L"" }; /****************************************************************************** * BackupEventLogA [ADVAPI32.@] @@ -560,7 +562,7 @@ pLog->BindingHandle, (LPWSTR)lpUNCServerName, &SourceName, - NULL, + &EmptyString, 0, 0, &pLog->LogHandle); @@ -777,7 +779,7 @@ pLog->BindingHandle, (LPWSTR)lpUNCServerName, &SourceName, - NULL, + &EmptyString, 0, 0, &pLog->LogHandle);

1 0

[mpiulachs] 33586: - Moved commands outside TechBot.Library to TechBot.Commands.Common and TechBot.Commands.MSDN except for Command base classes - Made TechBot more configurable through .config files - Code refactoring - Removed automatic parameter parsing support to make everyone happy
by mpiulachs＠svn.reactos.org 18 May '08

18 May '08

Author: mpiulachs Date: Sun May 18 10:54:43 2008 New Revision: 33586 URL: http://svn.reactos.org/svn/reactos?rev=33586&view=rev Log: - Moved commands outside TechBot.Library to TechBot.Commands.Common and TechBot.Commands.MSDN except for Command base classes - Made TechBot more configurable through .config files - Code refactoring - Removed automatic parameter parsing support to make everyone happy Added: trunk/irc/TechBot/TechBot.Commands.Common/ trunk/irc/TechBot/TechBot.Commands.Common/Base/ trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/HResultCommand.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/NtStatusCommand.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/Properties/ trunk/irc/TechBot/TechBot.Commands.Common/Properties/AssemblyInfo.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/ReactOSBugUrl.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/SambaBugUrl.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/Settings.Designer.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/Settings.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/Settings.settings (with props) trunk/irc/TechBot/TechBot.Commands.Common/SvnCommand.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/TechBot.Commands.Common.csproj (with props) trunk/irc/TechBot/TechBot.Commands.Common/WMCommand.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/WineBugUrl.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/app.config (with props) trunk/irc/TechBot/TechBot.Commands.MSDN/ trunk/irc/TechBot/TechBot.Commands.MSDN/ApiCommand.cs (with props) trunk/irc/TechBot/TechBot.Commands.MSDN/Properties/ trunk/irc/TechBot/TechBot.Commands.MSDN/Properties/AssemblyInfo.cs (with props) trunk/irc/TechBot/TechBot.Commands.MSDN/Settings.Designer.cs (with props) trunk/irc/TechBot/TechBot.Commands.MSDN/Settings.settings (with props) trunk/irc/TechBot/TechBot.Commands.MSDN/TechBot.Commands.MSDN.csproj (with props) trunk/irc/TechBot/TechBot.Commands.MSDN/TechBot.Commands.MSDN.csproj.user (with props) trunk/irc/TechBot/TechBot.Commands.MSDN/app.config (with props) trunk/irc/TechBot/TechBot.Console/Settings.Designer.cs (with props) trunk/irc/TechBot/TechBot.Console/Settings.settings (with props) trunk/irc/TechBot/TechBot.IRCLibrary/app.config (with props) trunk/irc/TechBot/TechBot/Settings.Designer.cs (with props) trunk/irc/TechBot/TechBot/Settings.settings (with props) Modified: trunk/irc/TechBot/ (props changed) trunk/irc/TechBot/TechBot.Console/App.config (contents, props changed) trunk/irc/TechBot/TechBot.Console/ConsoleTechBotService.cs trunk/irc/TechBot/TechBot.Console/Main.cs (contents, props changed) trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj trunk/irc/TechBot/TechBot.IRCLibrary/TechBot.IRCLibrary.csproj trunk/irc/TechBot/TechBot.Library/Attributes/CommandParameterAttribute.cs trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlLookupCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs trunk/irc/TechBot/TechBot.Library/Factory/CommandFactory.cs trunk/irc/TechBot/TechBot.Library/Settings.Designer.cs trunk/irc/TechBot/TechBot.Library/Settings.settings trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj trunk/irc/TechBot/TechBot.Library/TechBotIrcService.cs trunk/irc/TechBot/TechBot.Library/TechBotService.cs (contents, props changed) trunk/irc/TechBot/TechBot.Library/app.config trunk/irc/TechBot/TechBot.sln trunk/irc/TechBot/TechBot/App.config (contents, props changed) trunk/irc/TechBot/TechBot/ServiceThread.cs (contents, props changed) trunk/irc/TechBot/TechBot/TechBot.csproj [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/HResultCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/NtStatusCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/ReactOSBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/SambaBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/SvnCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/TechBot.Commands.Common.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/WMCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/WineBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/app.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.MSDN/ApiCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… Added: trunk/irc/TechBot/TechBot.Commands.MSDN/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… Added: trunk/irc/TechBot/TechBot.Commands.MSDN/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… Added: trunk/irc/TechBot/TechBot.Commands.MSDN/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… Added: trunk/irc/TechBot/TechBot.Commands.MSDN/TechBot.Commands.MSDN.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… Added: trunk/irc/TechBot/TechBot.Commands.MSDN/TechBot.Commands.MSDN.csproj.user URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… Added: trunk/irc/TechBot/TechBot.Commands.MSDN/app.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… Modified: trunk/irc/TechBot/TechBot.Console/App.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/App.co… Modified: trunk/irc/TechBot/TechBot.Console/ConsoleTechBotService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/Consol… Modified: trunk/irc/TechBot/TechBot.Console/Main.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/Main.c… Added: trunk/irc/TechBot/TechBot.Console/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/Settin… Added: trunk/irc/TechBot/TechBot.Console/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/Settin… Modified: trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/TechBo… Modified: trunk/irc/TechBot/TechBot.IRCLibrary/TechBot.IRCLibrary.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.IRCLibrary/Tec… Added: trunk/irc/TechBot/TechBot.IRCLibrary/app.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.IRCLibrary/app… Modified: trunk/irc/TechBot/TechBot.Library/Attributes/CommandParameterAttribute.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Attrib… Modified: trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Modified: trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlLookupCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Modified: trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Modified: trunk/irc/TechBot/TechBot.Library/Factory/CommandFactory.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Factor… Modified: trunk/irc/TechBot/TechBot.Library/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Settin… Modified: trunk/irc/TechBot/TechBot.Library/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Settin… Modified: trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… Modified: trunk/irc/TechBot/TechBot.Library/TechBotIrcService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… Modified: trunk/irc/TechBot/TechBot.Library/TechBotService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… Modified: trunk/irc/TechBot/TechBot.Library/app.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/app.co… Modified: trunk/irc/TechBot/TechBot.sln URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.sln?rev=33586&… Modified: trunk/irc/TechBot/TechBot/App.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/App.config?rev… Modified: trunk/irc/TechBot/TechBot/ServiceThread.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/ServiceThread.… Added: trunk/irc/TechBot/TechBot/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/Settings.Desig… Added: trunk/irc/TechBot/TechBot/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/Settings.setti… Modified: trunk/irc/TechBot/TechBot/TechBot.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/TechBot.csproj…

1 0

[hpoussin] 33585: Make eventlog RPC interface more compatible with MS Windows
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 10:29:53 2008 New Revision: 33585 URL: http://svn.reactos.org/svn/reactos?rev=33585&view=rev Log: Make eventlog RPC interface more compatible with MS Windows Modified: trunk/reactos/base/services/eventlog/rpc.c trunk/reactos/dll/win32/advapi32/service/eventlog.c trunk/reactos/include/reactos/idl/eventlogrpc.idl Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sun May 18 10:29:53 2008 @@ -10,15 +10,6 @@ #include "eventlog.h" -#ifdef __GNUC__ -/* HACK as long as idl compiler doesn't support well PUNICODE_STRING args */ -#define PANSI_STRING LPSTR -#define PUNICODE_STRING LPWSTR -#define BINDING_HANDLE handle_t BindingHandle, -#else -#define BINDING_HANDLE -#endif - /* FUNCTIONS ****************************************************************/ DWORD STDCALL RpcThreadRoutine(LPVOID lpParameter) @@ -50,169 +41,168 @@ return 0; } -/* Function 0x00 */ + +/* Function 0 */ NTSTATUS ElfrClearELFW( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ PUNICODE_STRING BackupName) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* Function 0x01 */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + PRPC_UNICODE_STRING BackupFileName) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 1 */ NTSTATUS ElfrBackupELFW( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ PUNICODE_STRING BackupName) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x02 */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + PRPC_UNICODE_STRING BackupFileName) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 2 */ NTSTATUS ElfrCloseEL( - BINDING_HANDLE - /* [out][in] */ PLOGHANDLE Handle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x03 */ + handle_t BindingHandle, + IELF_HANDLE *LogHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 3 */ NTSTATUS ElfrDeregisterEventSource( - BINDING_HANDLE - /* [out][in] */ PLOGHANDLE Handle) + handle_t BindingHandle, + IELF_HANDLE *LogHandle) { UNIMPLEMENTED; return STATUS_SUCCESS; } -/* Function 0x04 */ +/* Function 4 */ NTSTATUS ElfrNumberOfRecords( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [out] */ long __RPC_FAR * NumberOfRecords) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x05 */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD *NumberOfRecords) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 5 */ NTSTATUS ElfrOldestRecord( - BINDING_HANDLE - /* [in] */ LOGHANDLE LogHandle, - /* [out] */ long __RPC_FAR * OldestRecNumber) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x06 */ -NTSTATUS ElfrChangeNotify(void) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x07 */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD *OldestRecordNumber) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 6 */ +NTSTATUS ElfrChangeNotify( + handle_t BindingHandle, + IELF_HANDLE *LogHandle, + RPC_CLIENT_ID ClientId, + DWORD Event) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 7 */ NTSTATUS ElfrOpenELW( - BINDING_HANDLE - /* [unique][in] */ LPWSTR ServerName, - /* [in] */ PUNICODE_STRING FileName, - /* [in] */ PUNICODE_STRING NullStr, - /* [in] */ long MajorVer, - /* [in] */ long MinorVer, - /* [out] */ PLOGHANDLE Handle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x08 */ + handle_t BindingHandle, + EVENTLOG_HANDLE_W UNCServerName, + PRPC_UNICODE_STRING ModuleName, + PRPC_UNICODE_STRING RegModuleName, + DWORD MajorVersion, + DWORD MinorVersion, + IELF_HANDLE *LogHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 8 */ NTSTATUS ElfrRegisterEventSourceW( - BINDING_HANDLE - /* [unique][in] */ LPWSTR ServerName, - /* [in] */ PUNICODE_STRING LogName, - /* [in] */ PUNICODE_STRING NullStr, - /* [in] */ long MajorVer, - /* [in] */ long MinorVer, - /* [out] */ PLOGHANDLE Handle) -{ - UNIMPLEMENTED; - *Handle = 1; + handle_t BindingHandle, + EVENTLOG_HANDLE_W UNCServerName, + PRPC_UNICODE_STRING ModuleName, + PRPC_UNICODE_STRING RegModuleName, + DWORD MajorVersion, + DWORD MinorVersion, + IELF_HANDLE *LogHandle) +{ + UNIMPLEMENTED; + *LogHandle = 1; return STATUS_SUCCESS; } -/* Function 0x09 */ +/* Function 9 */ NTSTATUS ElfrOpenBELW( - BINDING_HANDLE - /* [unique][in] */ LPWSTR ServerName, - /* [in] */ PUNICODE_STRING BackupName, - /* [in] */ long MajorVer, - /* [in] */ long MinorVer, - /* [out] */ PLOGHANDLE Handle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x0a */ + handle_t BindingHandle, + EVENTLOG_HANDLE_W UNCServerName, + PRPC_UNICODE_STRING BackupFileName, + DWORD MajorVersion, + DWORD MinorVersion, + IELF_HANDLE *LogHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 10 */ NTSTATUS ElfrReadELW( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ long Flags, - /* [in] */ long Offset, - /* [in] */ long BufSize, - /* [size_is][out] */unsigned char __RPC_FAR * Buffer, - /* [out] */ long __RPC_FAR * BytesRead, - /* [out] */ long __RPC_FAR * BytesNeeded) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x0b */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD ReadFlags, + DWORD RecordOffset, + RULONG NumberOfBytesToRead, + BYTE *Buffer, + DWORD *NumberOfBytesRead, + DWORD *MinNumberOfBytesNeeded) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 11 */ NTSTATUS ElfrReportEventW( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ long Time, - /* [in] */ short Type, - /* [in] */ short Category, - /* [in] */ long ID, - /* [in] */ short NumStrings, - /* [in] */ long DataSize, - /* [in] */ PUNICODE_STRING ComputerName, - /* [unique][in] */ unsigned char __RPC_FAR * SID, - /* [unique][size_is][in] */ PUNICODE_STRING __RPC_FAR Strings[], - /* [unique][size_is][in] */ unsigned char __RPC_FAR * Data, - /* [in] */ short Flags, - /* [unique][out][in] */ long __RPC_FAR * unknown1, - /* [unique][out][in] */ long __RPC_FAR * unknown2) -{ - short i; + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD Time, + USHORT EventType, + USHORT EventCategory, + DWORD EventID, + USHORT NumStrings, + DWORD DataSize, + PRPC_UNICODE_STRING ComputerName, + PRPC_SID UserSID, + PRPC_UNICODE_STRING Strings[], + BYTE *Data, + USHORT Flags, + DWORD *RecordNumber, + DWORD *TimeWritten) +{ + USHORT i; /* partial stub */ - - if (NumStrings == 0) - return STATUS_SUCCESS; - - if (Strings == NULL) - return STATUS_SUCCESS; - for (i = 0; i < NumStrings; i++) { - switch (Type) + switch (EventType) { case EVENTLOG_SUCCESS: DPRINT1("Success: %S\n", Strings[i]); @@ -231,7 +221,7 @@ break; default: - DPRINT1("Type %hu: %S\n", Type, Strings[i]); + DPRINT1("Type %hu: %S\n", EventType, Strings[i]); break; } } @@ -240,184 +230,236 @@ } -/* Function 0x0c */ +/* Function 12 */ NTSTATUS ElfrClearELFA( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [unique][in] */ PANSI_STRING BackupName) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x0d */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + PRPC_STRING BackupFileName) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 13 */ NTSTATUS ElfrBackupELFA( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ PANSI_STRING BackupName) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x0e */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + PRPC_STRING BackupFileName) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 14 */ NTSTATUS ElfrOpenELA( - BINDING_HANDLE - /* [unique][in] */ LPSTR ServerName, - /* [in] */ PANSI_STRING LogName, - /* [in] */ PANSI_STRING NullStr, - /* [in] */ long MajorVer, - /* [in] */ long MinorVer, - /* [out] */ PLOGHANDLE Handle) -{ - UNICODE_STRING logname = { 0, }, servername = { 0, }, StrNull = { 0, }; - NTSTATUS status; - - if (LogName && !RtlCreateUnicodeStringFromAsciiz(&logname, LogName)) + handle_t BindingHandle, + EVENTLOG_HANDLE_A UNCServerName, + PRPC_STRING ModuleName, + PRPC_STRING RegModuleName, + DWORD MajorVersion, + DWORD MinorVersion, + IELF_HANDLE *LogHandle) +{ + UNICODE_STRING UNCServerNameW = { 0, }; + UNICODE_STRING ModuleNameW = { 0, }; + UNICODE_STRING RegModuleNameW = { 0, }; + NTSTATUS Status; + + if (UNCServerName && + !RtlCreateUnicodeStringFromAsciiz(&UNCServerNameW, UNCServerName)) { return STATUS_NO_MEMORY; } - if (ServerName && - !RtlCreateUnicodeStringFromAsciiz(&servername, ServerName)) - { - RtlFreeUnicodeString(&logname); + if (ModuleName && + !RtlAnsiStringToUnicodeString(&ModuleNameW, (PANSI_STRING)ModuleName, TRUE)) + { + RtlFreeUnicodeString(&UNCServerNameW); return STATUS_NO_MEMORY; } - status = ElfrOpenELW(BindingHandle, servername.Buffer, logname.Buffer, - StrNull.Buffer, MajorVer, MinorVer, Handle); - - RtlFreeUnicodeString(&servername); - RtlFreeUnicodeString(&logname); - - return status; -} - - -/* Function 0x0f */ + if (RegModuleName && + !RtlAnsiStringToUnicodeString(&RegModuleNameW, (PANSI_STRING)RegModuleName, TRUE)) + { + RtlFreeUnicodeString(&UNCServerNameW); + RtlFreeUnicodeString(&ModuleNameW); + return STATUS_NO_MEMORY; + } + + Status = ElfrOpenELW( + BindingHandle, + UNCServerName ? UNCServerNameW.Buffer : NULL, + ModuleName ? (PRPC_UNICODE_STRING)&ModuleNameW : NULL, + RegModuleName ? (PRPC_UNICODE_STRING)&RegModuleNameW : NULL, + MajorVersion, + MinorVersion, + LogHandle); + + RtlFreeUnicodeString(&UNCServerNameW); + RtlFreeUnicodeString(&ModuleNameW); + RtlFreeUnicodeString(&RegModuleNameW); + + return Status; +} + + +/* Function 15 */ NTSTATUS ElfrRegisterEventSourceA( - BINDING_HANDLE - /* [unique][in] */ LPSTR ServerName, - /* [in] */ PANSI_STRING LogName, - /* [in] */ PANSI_STRING NullStr, - /* [in] */ long MajorVer, - /* [in] */ long MinorVer, - /* [out] */ PLOGHANDLE Handle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x10 */ + handle_t BindingHandle, + EVENTLOG_HANDLE_A UNCServerName, + PRPC_STRING ModuleName, + PRPC_STRING RegModuleName, + DWORD MajorVersion, + DWORD MinorVersion, + IELF_HANDLE *LogHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 16 */ NTSTATUS ElfrOpenBELA( - BINDING_HANDLE - /* [unique][in] */ LPSTR ServerName, - /* [in] */ PANSI_STRING BakckupName, - /* [in] */ long MajorVer, - /* [in] */ long MinorVer, - /* [out] */ PLOGHANDLE Handle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x11 */ + handle_t BindingHandle, + EVENTLOG_HANDLE_A UNCServerName, + PRPC_STRING BackupFileName, + DWORD MajorVersion, + DWORD MinorVersion, + IELF_HANDLE *LogHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 17 */ NTSTATUS ElfrReadELA( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ long Flags, - /* [in] */ long Offset, - /* [in] */ long BufSize, - /* [size_is][out] */unsigned char __RPC_FAR * Buffer, - /* [out] */ long __RPC_FAR * BytesRead, - /* [out] */ long __RPC_FAR * BytesNeeded) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x12 */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD ReadFlags, + DWORD RecordOffset, + RULONG NumberOfBytesToRead, + BYTE *Buffer, + DWORD *NumberOfBytesRead, + DWORD *MinNumberOfBytesNeeded) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 18 */ NTSTATUS ElfrReportEventA( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ long Time, - /* [in] */ short Type, - /* [in] */ short Category, - /* [in] */ long ID, - /* [in] */ short NumStrings, - /* [in] */ long DataSize, - /* [in] */ PANSI_STRING ComputerName, - /* [unique][in] */ unsigned char __RPC_FAR * SID, - /* [unique][size_is][in] */ PANSI_STRING __RPC_FAR Strings[], - /* [unique][size_is][in] */ unsigned char __RPC_FAR * Data, - /* [in] */ short Flags, - /* [unique][out][in] */ long __RPC_FAR * unknown1, - /* [unique][out][in] */ long __RPC_FAR * unknown2) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x13 */ -NTSTATUS ElfrRegisterClusterSvc(void) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x14 */ -NTSTATUS ElfrDeregisterClusterSvc(void) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x15 */ -NTSTATUS ElfrWriteClusterEvents(void) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x16 */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD Time, + USHORT EventType, + USHORT EventCategory, + DWORD EventID, + USHORT NumStrings, + DWORD DataSize, + PRPC_STRING ComputerName, + PRPC_SID UserSID, + PRPC_STRING Strings[], + BYTE *Data, + USHORT Flags, + DWORD *RecordNumber, + DWORD *TimeWritten) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 19 */ +NTSTATUS ElfrRegisterClusterSvc( + handle_t BindingHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 20 */ +NTSTATUS ElfrDeregisterClusterSvc( + handle_t BindingHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 21 */ +NTSTATUS ElfrWriteClusterEvents( + handle_t BindingHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 22 */ NTSTATUS ElfrGetLogInformation( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ long InfoLevel, - /* [size_is][out] */unsigned char __RPC_FAR * Buffer, - /* [in] */ long BufSize, - /* [out] */ long __RPC_FAR * BytesNeeded) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x17 */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD InfoLevel, + BYTE *Buffer, + DWORD cbBufSize, + DWORD *pcbBytesNeeded) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 23 */ NTSTATUS ElfrFlushEL( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle) -{ - DbgPrint("EventLogFlush UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} + handle_t BindingHandle, + IELF_HANDLE LogHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 24 */ +NTSTATUS ElfrReportEventAndSourceW( + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD Time, + USHORT EventType, + USHORT EventCategory, + ULONG EventID, + PRPC_UNICODE_STRING SourceName, + USHORT NumStrings, + DWORD DataSize, + PRPC_UNICODE_STRING ComputerName, + PRPC_SID UserSID, + PRPC_UNICODE_STRING Strings[], + BYTE *Data, + USHORT Flags, + DWORD *RecordNumber, + DWORD *TimeWritten) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + void __RPC_FAR *__RPC_USER midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } + void __RPC_USER midl_user_free(void __RPC_FAR * ptr) { HeapFree(GetProcessHeap(), 0, ptr); } + + +void __RPC_USER IELF_HANDLE_rundown(IELF_HANDLE LogHandle) +{ +} Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Sun May 18 10:29:53 2008 @@ -30,7 +30,7 @@ typedef struct _LOG_INFO { RPC_BINDING_HANDLE BindingHandle; - LOGHANDLE LogHandle; + IELF_HANDLE LogHandle; BOOL bLocal; } LOG_INFO, *PLOG_INFO; @@ -44,11 +44,13 @@ { PLOG_INFO pLog; NTSTATUS Status; - ANSI_STRING BackupFileName; + RPC_STRING BackupFileName; TRACE("%p, %s\n", hEventLog, lpBackupFileName); - RtlInitAnsiString(&BackupFileName, lpBackupFileName); + BackupFileName.Buffer = (LPSTR)lpBackupFileName; + BackupFileName.Length = BackupFileName.MaximumLength = + lpBackupFileName ? strlen(lpBackupFileName) : 0; pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -59,7 +61,7 @@ Status = ElfrBackupELFA( pLog->BindingHandle, pLog->LogHandle, - BackupFileName.Buffer); + &BackupFileName); if (!NT_SUCCESS(Status)) { @@ -83,11 +85,51 @@ { PLOG_INFO pLog; NTSTATUS Status; - UNICODE_STRING BackupFileName; + RPC_UNICODE_STRING BackupFileName; + + TRACE("%p, %s\n", hEventLog, debugstr_w(lpBackupFileName)); + + BackupFileName.Buffer = (LPWSTR)lpBackupFileName; + BackupFileName.Length = BackupFileName.MaximumLength = + lpBackupFileName ? wcslen(lpBackupFileName) * sizeof(WCHAR) : 0; + + pLog = (PLOG_INFO)hEventLog; + if (!pLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + Status = ElfrBackupELFW( + pLog->BindingHandle, + pLog->LogHandle, + &BackupFileName); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + return TRUE; +} + + +/****************************************************************************** + * ClearEventLogA [ADVAPI32.@] + */ +BOOL WINAPI +ClearEventLogA( + IN HANDLE hEventLog, + IN LPCSTR lpBackupFileName) +{ + PLOG_INFO pLog; + NTSTATUS Status; + RPC_STRING BackupFileName; TRACE("%p, %s\n", hEventLog, lpBackupFileName); - RtlInitUnicodeString(&BackupFileName, lpBackupFileName); + BackupFileName.Buffer = (LPSTR)lpBackupFileName; + BackupFileName.Length = BackupFileName.MaximumLength = + lpBackupFileName ? strlen(lpBackupFileName) : 0; pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -95,35 +137,37 @@ SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - Status = ElfrBackupELFW( + Status = ElfrClearELFA( pLog->BindingHandle, pLog->LogHandle, - BackupFileName.Buffer); - - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - return TRUE; -} - - -/****************************************************************************** - * ClearEventLogA [ADVAPI32.@] - */ -BOOL WINAPI -ClearEventLogA( - IN HANDLE hEventLog, - IN LPCSTR lpBackupFileName) -{ - PLOG_INFO pLog; - NTSTATUS Status; - ANSI_STRING BackupFileName; - - TRACE("%p, %s\n", hEventLog, lpBackupFileName); - - RtlInitAnsiString(&BackupFileName, lpBackupFileName); + &BackupFileName); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + return TRUE; +} + + +/****************************************************************************** + * ClearEventLogW [ADVAPI32.@] + */ +BOOL WINAPI +ClearEventLogW( + IN HANDLE hEventLog, + IN LPCWSTR lpBackupFileName) +{ + PLOG_INFO pLog; + NTSTATUS Status; + RPC_UNICODE_STRING BackupFileName; + + TRACE("%p, %s\n", hEventLog, debugstr_w(lpBackupFileName)); + + BackupFileName.Buffer = (LPWSTR)lpBackupFileName; + BackupFileName.Length = BackupFileName.MaximumLength = + lpBackupFileName ? wcslen(lpBackupFileName) * sizeof(WCHAR) : 0; pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -131,46 +175,10 @@ SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - Status = ElfrClearELFA( + Status = ElfrClearELFW( pLog->BindingHandle, pLog->LogHandle, - BackupFileName.Buffer); - - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - return TRUE; -} - - -/****************************************************************************** - * ClearEventLogW [ADVAPI32.@] - */ -BOOL WINAPI -ClearEventLogW( - IN HANDLE hEventLog, - IN LPCWSTR lpBackupFileName) -{ - PLOG_INFO pLog; - NTSTATUS Status; - UNICODE_STRING BackupFileName; - - TRACE("%p, %s\n", hEventLog, lpBackupFileName); - - RtlInitUnicodeString(&BackupFileName, lpBackupFileName); - - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - Status = ElfrClearELFW( - pLog->BindingHandle, - pLog->LogHandle, - BackupFileName.Buffer); + &BackupFileName); if (!NT_SUCCESS(Status)) { @@ -191,7 +199,7 @@ PLOG_INFO pLog; NTSTATUS Status; - TRACE("%p", hEventLog); + TRACE("%p\n", hEventLog); pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -271,7 +279,7 @@ { PLOG_INFO pLog; NTSTATUS Status; - long Records; + DWORD Records; TRACE("%p, %p\n", hEventLog, NumberOfRecords); @@ -310,7 +318,7 @@ { PLOG_INFO pLog; NTSTATUS Status; - long Oldest; + DWORD Oldest; TRACE("%p, %p\n", hEventLog, OldestRecord); @@ -405,13 +413,13 @@ { PLOG_INFO pLog; NTSTATUS Status; - UNICODE_STRING UNCServerName; - UNICODE_STRING FileName; - - TRACE("%s, %s\n", lpUNCServerName, lpFileName); - - RtlInitUnicodeString(&UNCServerName, lpUNCServerName); - RtlInitUnicodeString(&FileName, lpFileName); + RPC_UNICODE_STRING FileName; + + TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpFileName)); + + FileName.Buffer = (LPWSTR)lpFileName; + FileName.Length = FileName.MaximumLength = + lpFileName ? wcslen(lpFileName) * sizeof(WCHAR) : 0; pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); if (!pLog) @@ -446,8 +454,8 @@ Status = ElfrOpenBELW( pLog->BindingHandle, - UNCServerName.Buffer, - FileName.Buffer, + (LPWSTR)lpUNCServerName, + &FileName, 0, 0, &pLog->LogHandle); @@ -509,13 +517,13 @@ { PLOG_INFO pLog; NTSTATUS Status; - UNICODE_STRING UNCServerName; - UNICODE_STRING SourceName; - - TRACE("%s, %s\n", lpUNCServerName, lpSourceName); - - RtlInitUnicodeString(&UNCServerName, lpUNCServerName); - RtlInitUnicodeString(&SourceName, lpSourceName); + RPC_UNICODE_STRING SourceName; + + TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpSourceName)); + + SourceName.Buffer = (LPWSTR)lpSourceName; + SourceName.Length = SourceName.MaximumLength = + lpSourceName ? wcslen(lpSourceName) * sizeof(WCHAR) : 0; pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); if (!pLog) @@ -550,8 +558,8 @@ Status = ElfrOpenELW( pLog->BindingHandle, - UNCServerName.Buffer, - SourceName.Buffer, + (LPWSTR)lpUNCServerName, + &SourceName, NULL, 0, 0, @@ -582,7 +590,7 @@ { PLOG_INFO pLog; NTSTATUS Status; - long bytesRead, minNumberOfBytesNeeded; + DWORD bytesRead, minNumberOfBytesNeeded; TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, @@ -639,7 +647,7 @@ { PLOG_INFO pLog; NTSTATUS Status; - long bytesRead, minNumberOfBytesNeeded; + DWORD bytesRead, minNumberOfBytesNeeded; TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, @@ -726,13 +734,13 @@ { PLOG_INFO pLog; NTSTATUS Status; - UNICODE_STRING UNCServerName; - UNICODE_STRING SourceName; - - TRACE("%s, %s\n", lpUNCServerName, lpSourceName); - - RtlInitUnicodeString(&UNCServerName, lpUNCServerName); - RtlInitUnicodeString(&SourceName, lpSourceName); + RPC_UNICODE_STRING SourceName; + + TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpSourceName)); + + SourceName.Buffer = (LPWSTR)lpSourceName; + SourceName.Length = SourceName.MaximumLength = + lpSourceName ? wcslen(lpSourceName) * sizeof(WCHAR) : 0; pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); if (!pLog) @@ -767,9 +775,9 @@ Status = ElfrRegisterEventSourceW( pLog->BindingHandle, - UNCServerName.Buffer, - SourceName.Buffer, - L"", + (LPWSTR)lpUNCServerName, + &SourceName, + NULL, 0, 0, &pLog->LogHandle); Modified: trunk/reactos/include/reactos/idl/eventlogrpc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/eventl… ============================================================================== --- trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] Sun May 18 10:29:53 2008 @@ -1,306 +1,307 @@ /* - * Copyright 2005 Saveliy Tretiakov - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Event Log RPC interface definition */ +#include <ms-dtyp.idl> + +cpp_quote("#if !defined(__EVENTLOG_H__) && !defined(__ADVAPI32_H)") +typedef long NTSTATUS; +cpp_quote("#endif") + +#define MAX_BATCH_BUFF 0x0007FFFF + +typedef [range(0, MAX_BATCH_BUFF)] unsigned long RULONG; +typedef struct _RPC_STRING { + USHORT Length; + USHORT MaximumLength; + [size_is(MaximumLength), length_is(Length)] LPSTR Buffer; +} RPC_STRING, *PRPC_STRING; + +typedef [context_handle] unsigned long IELF_HANDLE; +typedef IELF_HANDLE *PIELF_HANDLE; +typedef [handle, unique] LPWSTR EVENTLOG_HANDLE_W; +typedef [handle, unique] LPSTR EVENTLOG_HANDLE_A; + +typedef struct _RPC_CLIENT_ID { + DWORD UniqueProcess; + DWORD UniqueThread; +} RPC_CLIENT_ID, *PRPC_CLIENT_ID; + [ - uuid(82273FDC-E32A-18C3-3F78-827929DC23EA), - version(0.0), - pointer_default(unique) -#ifndef __midl - ,explicit_handle + uuid(82273FDC-E32A-18C3-3F78-827929DC23EA), + version(0.0), + pointer_default(unique) +#ifndef __midl + ,explicit_handle #endif ] interface eventlog { - cpp_quote("#if 0") -#ifdef __midl - typedef [handle, unique] wchar_t *LPWSTR; - typedef [handle, unique] char *LPSTR; - typedef unsigned int NTSTATUS; -#else - #define LPWSTR wchar_t * - #define LPSTR char * - #define NTSTATUS long -#endif - -#ifdef __midl - typedef struct _UNICODE_STRING { - unsigned short Length; - unsigned short MaximumLength; - [size_is(MaximumLength/2), unique] wchar_t *Buffer; - } UNICODE_STRING, *PUNICODE_STRING; - - typedef struct _ANSI_STRING { - unsigned short Length; - unsigned short MaximumLength; - [size_is(MaximumLength), unique] char *Buffer; - } ANSI_STRING, *PANSI_STRING; -#else - #define PUNICODE_STRING wchar_t * - #define PANSI_STRING char * -#endif - cpp_quote("#endif") - -#ifdef __midl - typedef [context_handle] struct _LOGHANDLE { - int pos; - } *LOGHANDLE; - typedef LOGHANDLE *PLOGHANDLE; -#else - #define LOGHANDLE unsigned int - #define PLOGHANDLE unsigned int* - cpp_quote("typedef unsigned int LOGHANDLE, *PLOGHANDLE;") -#endif - - /* Function 0x00 */ - NTSTATUS ElfrClearELFW( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] PUNICODE_STRING BackupName); - - /* Function 0x01 */ - NTSTATUS ElfrBackupELFW( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] PUNICODE_STRING BackupName); - - /* Function 0x02 */ - NTSTATUS ElfrCloseEL( -#ifndef __midl - handle_t BindingHandle, -#endif - [in,out] PLOGHANDLE Handle); - - /* Function 0x03 */ - NTSTATUS ElfrDeregisterEventSource( -#ifndef __midl - handle_t BindingHandle, -#endif - [in,out] PLOGHANDLE Handle); - - /* Function 0x04 */ - NTSTATUS ElfrNumberOfRecords( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [out] long *NumberOfRecords); - - /* Function 0x05 */ - NTSTATUS ElfrOldestRecord( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE LogHandle, - [out] long *OldestRecNumber); - - /* Function 0x06 */ - //NTSTATUS ElfrChangeNotify(); // FIXME - - /* Function 0x07 */ - NTSTATUS ElfrOpenELW( -#ifndef __midl - handle_t BindingHandle, -#endif - [in, unique] LPWSTR ServerName, - [in] PUNICODE_STRING FileName, - [in] PUNICODE_STRING NullStr, - [in] long MajorVer, - [in] long MinorVer, - [out] PLOGHANDLE Handle ); - - /* Function 0x08 */ - NTSTATUS ElfrRegisterEventSourceW( -#ifndef __midl - handle_t BindingHandle, -#endif - [in, unique] LPWSTR ServerName, - [in] PUNICODE_STRING LogName, - [in] PUNICODE_STRING NullStr, - [in] long MajorVer, - [in] long MinorVer, - [out] PLOGHANDLE Handle); - - /* Function 0x09 */ - NTSTATUS ElfrOpenBELW( -#ifndef __midl - handle_t BindingHandle, -#endif - [in, unique] LPWSTR ServerName, - [in] PUNICODE_STRING BackupName, - [in] long MajorVer, - [in] long MinorVer, - [out] PLOGHANDLE Handle); - - /* Function 0x0a */ - NTSTATUS ElfrReadELW( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] long Flags, - [in] long Offset, - [in] long BufSize, - [out,size_is(BufSize)] unsigned char *Buffer, - [out] long *BytesRead, - [out] long *BytesNeeded); - - /* Function 0x0b */ - NTSTATUS ElfrReportEventW( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] long Time, - [in] short Type, - [in] short Category, - [in] long ID, - [in] short NumStrings, - [in] long DataSize, - [in] PUNICODE_STRING ComputerName, - [in, unique] unsigned char *SID, -#ifdef __midl - [in, size_is(NumStrings), unique] PUNICODE_STRING Strings[*], -#else - [in, size_is(NumStrings), unique] PUNICODE_STRING *Strings, -#endif - [in, size_is(DataSize), unique] unsigned char *Data, - [in] short Flags, - [in,out,unique] long *unknown1, - [in,out,unique] long *unknown2); - - /* Function 0x0c */ - NTSTATUS ElfrClearELFA( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in,unique] PANSI_STRING BackupName); - - /* Function 0x0d */ - NTSTATUS ElfrBackupELFA( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] PANSI_STRING BackupName); - - /* Function 0x0e */ - NTSTATUS ElfrOpenELA( -#ifndef __midl - handle_t BindingHandle, -#endif - [in, unique] LPSTR ServerName, - [in] PANSI_STRING LogName, - [in] PANSI_STRING NullStr, - [in] long MajorVer, - [in] long MinorVer, - [out] PLOGHANDLE Handle); - - /* Function 0x0f */ - NTSTATUS ElfrRegisterEventSourceA( -#ifndef __midl - handle_t BindingHandle, -#endif - [in, unique] LPSTR ServerName, - [in] PANSI_STRING LogName, - [in] PANSI_STRING NullStr, - [in] long MajorVer, - [in] long MinorVer, - [out] PLOGHANDLE Handle); - - /* Function 0x10 */ - NTSTATUS ElfrOpenBELA( -#ifndef __midl - handle_t BindingHandle, -#endif - [in, unique] LPSTR ServerName, - [in] PANSI_STRING BakckupName, - [in] long MajorVer, - [in] long MinorVer, - [out] PLOGHANDLE Handle); - - /* Function 0x11 */ - NTSTATUS ElfrReadELA( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] long Flags, - [in] long Offset, - [in] long BufSize, - [out,size_is(BufSize)] unsigned char *Buffer, - [out] long *BytesRead, - [out] long *BytesNeeded); - - /* Function 0x12 */ - NTSTATUS ElfrReportEventA( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] long Time, - [in] short Type, - [in] short Category, - [in] long ID, - [in] short NumStrings, - [in] long DataSize, - [in] PANSI_STRING ComputerName, - [in, unique] unsigned char *SID, -#ifdef __midl - [in, size_is(NumStrings), unique] PANSI_STRING Strings[*], -#else - [in, size_is(NumStrings), unique] PANSI_STRING *Strings, -#endif - [in, size_is(DataSize), unique] unsigned char *Data, - [in] short Flags, - [in,out,unique] long *unknown1, - [in,out,unique] long *unknown2); - - /* Function 0x13 */ - //NTSTATUS ElfrRegisterClusterSvc(); //FIXME - - /* Function 0x14 */ - //NTSTATUS ElfrDeregisterClusterSvc(); //FIXME - - /* Function 0x15 */ - //NTSTATUS ElfrWriteClusterEvents(); //FIXME - - /* Function 0x16 */ - NTSTATUS ElfrGetLogInformation( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] long InfoLevel, - [out, size_is(BufSize)] unsigned char *Buffer, - [in] long BufSize, - [out] long *BytesNeeded); - - /* Function 0x17 */ - NTSTATUS ElfrFlushEL( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle); - + /* Function 0 */ + NTSTATUS ElfrClearELFW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in, unique] PRPC_UNICODE_STRING BackupFileName); + + /* Function 1 */ + NTSTATUS ElfrBackupELFW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in, unique] PRPC_UNICODE_STRING BackupFileName); + + /* Function 2 */ + NTSTATUS ElfrCloseEL( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in, out] IELF_HANDLE *LogHandle); + + /* Function 3 */ + NTSTATUS ElfrDeregisterEventSource( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in, out] IELF_HANDLE *LogHandle); + + /* Function 4 */ + NTSTATUS ElfrNumberOfRecords( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [out] DWORD *NumberOfRecords); + + /* Function 5 */ + NTSTATUS ElfrOldestRecord( +#ifndef __midl + handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [out] DWORD *OldestRecordNumber); + + /* Function 6 */ + NTSTATUS ElfrChangeNotify( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE *LogHandle, + [in] RPC_CLIENT_ID ClientId, + [in] DWORD Event); + + /* Function 7 */ + NTSTATUS ElfrOpenELW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] EVENTLOG_HANDLE_W UNCServerName, + [in] PRPC_UNICODE_STRING ModuleName, + [in] PRPC_UNICODE_STRING RegModuleName, + [in] DWORD MajorVersion, + [in] DWORD MinorVersion, + [out] IELF_HANDLE* LogHandle); + + /* Function 8 */ + NTSTATUS ElfrRegisterEventSourceW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] EVENTLOG_HANDLE_W UNCServerName, + [in] PRPC_UNICODE_STRING ModuleName, + [in] PRPC_UNICODE_STRING RegModuleName, + [in] DWORD MajorVersion, + [in] DWORD MinorVersion, + [out] IELF_HANDLE* LogHandle); + + /* Function 9 */ + NTSTATUS ElfrOpenBELW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] EVENTLOG_HANDLE_W UNCServerName, + [in] PRPC_UNICODE_STRING BackupFileName, + [in] DWORD MajorVersion, + [in] DWORD MinorVersion, + [out] IELF_HANDLE* LogHandle); + + /* Function 10 */ + NTSTATUS ElfrReadELW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in] DWORD ReadFlags, + [in] DWORD RecordOffset, + [in] RULONG NumberOfBytesToRead, + [out, size_is(NumberOfBytesToRead)] BYTE *Buffer, + [out] DWORD *NumberOfBytesRead, + [out] DWORD *MinNumberOfBytesNeeded); + + /* Function 11 */ + NTSTATUS ElfrReportEventW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in] DWORD Time, + [in] USHORT EventType, + [in] USHORT EventCategory, + [in] DWORD EventID, + [in, range(0, 256)] USHORT NumStrings, + [in, range(0, 61440)] DWORD DataSize, + [in] PRPC_UNICODE_STRING ComputerName, + [in, unique] PRPC_SID UserSID, + [in, size_is(NumStrings), unique] PRPC_UNICODE_STRING Strings[*], + [in, size_is(DataSize), unique] BYTE *Data, + [in] USHORT Flags, + [in, out, unique] DWORD *RecordNumber, + [in, out, unique] DWORD *TimeWritten); + + /* Function 12 */ + NTSTATUS ElfrClearELFA( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in, unique] PRPC_STRING BackupFileName); + + /* Function 13 */ + NTSTATUS ElfrBackupELFA( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in, unique] PRPC_STRING BackupFileName); + + /* Function 14 */ + NTSTATUS ElfrOpenELA( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] EVENTLOG_HANDLE_A UNCServerName, + [in] PRPC_STRING ModuleName, + [in] PRPC_STRING RegModuleName, + [in] DWORD MajorVersion, + [in] DWORD MinorVersion, + [out] IELF_HANDLE* LogHandle); + + /* Function 15 */ + NTSTATUS ElfrRegisterEventSourceA( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] EVENTLOG_HANDLE_A UNCServerName, + [in] PRPC_STRING ModuleName, + [in] PRPC_STRING RegModuleName, + [in] DWORD MajorVersion, + [in] DWORD MinorVersion, + [out] IELF_HANDLE* LogHandle); + + /* Function 16 */ + NTSTATUS ElfrOpenBELA( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] EVENTLOG_HANDLE_A UNCServerName, + [in] PRPC_STRING BackupFileName, + [in] DWORD MajorVersion, + [in] DWORD MinorVersion, + [out] IELF_HANDLE* LogHandle); + + /* Function 17 */ + NTSTATUS ElfrReadELA( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in] DWORD ReadFlags, + [in] DWORD RecordOffset, + [in] RULONG NumberOfBytesToRead, + [out, size_is(NumberOfBytesToRead)] BYTE *Buffer, + [out] DWORD *NumberOfBytesRead, + [out] DWORD *MinNumberOfBytesNeeded); + + /* Function 18 */ + NTSTATUS ElfrReportEventA( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in] DWORD Time, + [in] USHORT EventType, + [in] USHORT EventCategory, + [in] DWORD EventID, + [in, range(0, 256)] USHORT NumStrings, + [in, range(0, 61440)] DWORD DataSize, + [in] PRPC_STRING ComputerName, + [in, unique] PRPC_SID UserSID, + [in, size_is(NumStrings), unique] PRPC_STRING Strings[*], + [in, size_is(DataSize), unique] BYTE *Data, + [in] USHORT Flags, + [in, out, unique] DWORD *RecordNumber, + [in, out, unique] DWORD *TimeWritten); + + /* Function 19 */ + NTSTATUS ElfrRegisterClusterSvc( +#ifndef __midl + [in] handle_t BindingHandle +#endif + ); /* FIXME */ + + /* Function 20 */ + NTSTATUS ElfrDeregisterClusterSvc( +#ifndef __midl + [in] handle_t BindingHandle +#endif + ); /* FIXME */ + + /* Function 21 */ + NTSTATUS ElfrWriteClusterEvents( +#ifndef __midl + [in] handle_t BindingHandle +#endif + ); /* FIXME */ + + /* Function 22 */ + NTSTATUS ElfrGetLogInformation( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in] DWORD InfoLevel, + [out, size_is(cbBufSize)] BYTE *Buffer, + [in, range(0, 1024)] DWORD cbBufSize, + [out] DWORD *pcbBytesNeeded); + + /* Function 23 */ + NTSTATUS ElfrFlushEL( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle); + + /* Function 24 */ + NTSTATUS ElfrReportEventAndSourceW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in] DWORD Time, + [in] USHORT EventType, + [in] USHORT EventCategory, + [in] ULONG EventID, + [in] PRPC_UNICODE_STRING SourceName, + [in, range(0, 256)] USHORT NumStrings, + [in, range(0, 61440)] DWORD DataSize, + [in] PRPC_UNICODE_STRING ComputerName, + [in, unique] PRPC_SID UserSID, + [in, size_is(NumStrings), unique] PRPC_UNICODE_STRING Strings[*], + [in, size_is(DataSize), unique] BYTE *Data, + [in] USHORT Flags, + [in, out, unique] DWORD *RecordNumber, + [in, out, unique] DWORD *TimeWritten); }

1 0

[hpoussin] 33584: Replace ERR() by WARN() on error codes which can be normal
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 10:26:24 2008 New Revision: 33584 URL: http://svn.reactos.org/svn/reactos?rev=33584&view=rev Log: Replace ERR() by WARN() on error codes which can be normal Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun May 18 10:26:24 2008 @@ -1424,7 +1424,10 @@ (SC_RPC_HANDLE *)&hService); if (dwError != ERROR_SUCCESS) { - ERR("ROpenServiceW() failed (Error %lu)\n", dwError); + if (dwError == ERROR_SERVICE_DOES_NOT_EXIST) + WARN("ROpenServiceW() failed (Error %lu)\n", dwError); + else + ERR("ROpenServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1524,7 +1527,10 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - ERR("RQueryServiceConfigW() failed (Error %lu)\n", dwError); + if (dwError == ERROR_INSUFFICIENT_BUFFER) + WARN("RQueryServiceConfigW() failed (Error %lu)\n", dwError); + else + ERR("RQueryServiceConfigW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs