Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[gvg] 18468: Make sure we don't hang forever when activating a window belonging to

by gvg＠svn.reactos.com

Make sure we don't hang forever when activating a window belonging to another thread Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-10-15 09:10:57 UTC (rev 18467) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-10-15 09:53:14 UTC (rev 18468) @@ -596,7 +596,7 @@ if (!(WinPos->flags & SWP_NOSENDCHANGING)) { - co_IntSendMessage(Window->hSelf, WM_WINDOWPOSCHANGING, 0, (LPARAM) WinPos); + co_IntPostOrSendMessage(Window->hSelf, WM_WINDOWPOSCHANGING, 0, (LPARAM) WinPos); } *WindowRect = Window->WindowRect; @@ -1282,7 +1282,7 @@ } if ((WinPos.flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE) - co_IntSendMessage(WinPos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM) &WinPos); + co_IntPostOrSendMessage(WinPos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM) &WinPos); return TRUE; } @@ -1337,28 +1337,39 @@ /* Fall through. */ case SW_MINIMIZE: { - Swp |= SWP_FRAMECHANGED | SWP_NOACTIVATE; + Swp |= SWP_NOACTIVATE; if (!(Window->Style & WS_MINIMIZE)) { - Swp |= co_WinPosMinMaximize(Window, SW_MINIMIZE, &NewPos); + Swp |= co_WinPosMinMaximize(Window, SW_MINIMIZE, &NewPos) | + SWP_FRAMECHANGED; } else { Swp |= SWP_NOSIZE | SWP_NOMOVE; + if (! WasVisible) + { + Swp |= SWP_FRAMECHANGED; + } } break; } case SW_SHOWMAXIMIZED: { - Swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; +//__asm__("int $3\n"); + Swp |= SWP_SHOWWINDOW; if (!(Window->Style & WS_MAXIMIZE)) { - Swp |= co_WinPosMinMaximize(Window, SW_MAXIMIZE, &NewPos); + Swp |= co_WinPosMinMaximize(Window, SW_MAXIMIZE, &NewPos) | + SWP_FRAMECHANGED; } else { Swp |= SWP_NOSIZE | SWP_NOMOVE; + if (! WasVisible) + { + Swp |= SWP_FRAMECHANGED; + } } break; } @@ -1377,14 +1388,19 @@ case SW_SHOWNORMAL: case SW_SHOWDEFAULT: case SW_RESTORE: - Swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; + Swp |= SWP_SHOWWINDOW; if (Window->Style & (WS_MINIMIZE | WS_MAXIMIZE)) { - Swp |= co_WinPosMinMaximize(Window, SW_RESTORE, &NewPos); + Swp |= co_WinPosMinMaximize(Window, SW_RESTORE, &NewPos) | + SWP_FRAMECHANGED; } else { Swp |= SWP_NOSIZE | SWP_NOMOVE; + if (! WasVisible) + { + Swp |= SWP_FRAMECHANGED; + } } break; }

20 years

[greatlrd] 18467: forget remove struct _SURFACEALIGNMENT for it have been move to right header dmemmgr.h

by greatlrd＠svn.reactos.com

forget remove struct _SURFACEALIGNMENT for it have been move to right header dmemmgr.h Modified: trunk/reactos/w32api/include/ddk/winddi.h _____ Modified: trunk/reactos/w32api/include/ddk/winddi.h --- trunk/reactos/w32api/include/ddk/winddi.h 2005-10-15 02:00:56 UTC (rev 18466) +++ trunk/reactos/w32api/include/ddk/winddi.h 2005-10-15 09:10:57 UTC (rev 18467) @@ -1026,23 +1026,8 @@ LPWSTR pwszOrg; } STROBJ; -typedef struct _SURFACEALIGNMENT { - union { - struct { - DWORD dwStartAlignment; - DWORD dwPitchAlignment; - DWORD dwReserved1; - DWORD dwReserved2; - } Linear; - struct { - DWORD dwXAlignment; - DWORD dwYAlignment; - DWORD dwReserved1; - DWORD dwReserved2; - } Rectangular; - }; -} SURFACEALIGNMENT, *LPSURFACEALIGNMENT; + /* SURFOBJ.iType constants */ #define STYPE_BITMAP 0L #define STYPE_DEVICE 1L

20 years

[greatlrd] 18466: Fixing directx headers from wine, by adding alot of missing struct and some struct was wrong. start fixing the header ddkernel.h

by greatlrd＠svn.reactos.com

Fixing directx headers from wine, by adding alot of missing struct and some struct was wrong. start fixing the header ddkernel.h Added: trunk/reactos/w32api/include/ddk/ddkernel.h Modified: trunk/reactos/w32api/include/ddk/ddrawi.h Modified: trunk/reactos/w32api/include/ddk/ddrawint.h _____ Added: trunk/reactos/w32api/include/ddk/ddkernel.h --- trunk/reactos/w32api/include/ddk/ddkernel.h 2005-10-15 00:12:49 UTC (rev 18465) +++ trunk/reactos/w32api/include/ddk/ddkernel.h 2005-10-15 02:00:56 UTC (rev 18466) @@ -0,0 +1,62 @@ +/* $Id: $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: + * PURPOSE: Directx headers + * PROGRAMMER: Magnus Olsen (greatlrd) + * + */ + +#ifndef __DDKM_INCLUDED__ +#define __DDKM_INCLUDED__ + +typedef struct _DDKERNELCAPS +{ + DWORD dwSize; + DWORD dwCaps; + DWORD dwIRQCaps; +} DDKERNELCAPS, *LPDDKERNELCAPS; + +#define DDKERNELCAPS_SKIPFIELDS 0x00000001 +#define DDKERNELCAPS_AUTOFLIP 0x00000002 +#define DDKERNELCAPS_SETSTATE 0x00000004 +#define DDKERNELCAPS_LOCK 0x00000008 +#define DDKERNELCAPS_FLIPVIDEOPORT 0x00000010 +#define DDKERNELCAPS_FLIPOVERLAY 0x00000020 +#define DDKERNELCAPS_CAPTURE_SYSMEM 0x00000040 +#define DDKERNELCAPS_CAPTURE_NONLOCALVIDMEM 0x00000080 +#define DDKERNELCAPS_FIELDPOLARITY 0x00000100 +#define DDKERNELCAPS_CAPTURE_INVERTED 0x00000200 +#define DDIRQ_DISPLAY_VSYNC 0x00000001 +#define DDIRQ_RESERVED1 0x00000002 +#define DDIRQ_VPORT0_VSYNC 0x00000004 +#define DDIRQ_VPORT0_LINE 0x00000008 +#define DDIRQ_VPORT1_VSYNC 0x00000010 +#define DDIRQ_VPORT1_LINE 0x00000020 +#define DDIRQ_VPORT2_VSYNC 0x00000040 +#define DDIRQ_VPORT2_LINE 0x00000080 +#define DDIRQ_VPORT3_VSYNC 0x00000100 +#define DDIRQ_VPORT3_LINE 0x00000200 +#define DDIRQ_VPORT4_VSYNC 0x00000400 +#define DDIRQ_VPORT4_LINE 0x00000800 +#define DDIRQ_VPORT5_VSYNC 0x00001000 +#define DDIRQ_VPORT5_LINE 0x00002000 +#define DDIRQ_VPORT6_VSYNC 0x00004000 +#define DDIRQ_VPORT6_LINE 0x00008000 +#define DDIRQ_VPORT7_VSYNC 0x00010000 +#define DDIRQ_VPORT7_LINE 0x00020000 +#define DDIRQ_VPORT8_VSYNC 0x00040000 +#define DDIRQ_VPORT8_LINE 0x00080000 +#define DDIRQ_VPORT9_VSYNC 0x00010000 +#define DDIRQ_VPORT9_LINE 0x00020000 + +#ifdef __cplusplus +}; +#endif + +#endif + + + + _____ Modified: trunk/reactos/w32api/include/ddk/ddrawi.h --- trunk/reactos/w32api/include/ddk/ddrawi.h 2005-10-15 00:12:49 UTC (rev 18465) +++ trunk/reactos/w32api/include/ddk/ddrawi.h 2005-10-15 02:00:56 UTC (rev 18466) @@ -28,12 +28,9 @@ #include <ddraw.h> #include <dvp.h> -#include "dmemmgr.h" +#include <ddkernel.h> +#include <dmemmgr.h> -#ifndef __DDK_DDRAWINT_H -typedef struct _DDKERNELCAPS *LPDDKERNELCAPS; /* should be in ddkernel.h */ -#endif - #define DDAPI WINAPI /* the DirectDraw versions */ @@ -516,9 +513,46 @@ LPDDHALKERNELCB_SYNCVIDEOPORT SyncVideoPortData; } DDHAL_DDKERNELCALLBACKS, *LPDDHAL_DDKERNELCALLBACKS; +typedef struct _DDHAL_GETMOCOMPGUIDSDATA *LPDDHAL_GETMOCOMPGUIDSDATA; +typedef struct _DDHAL_GETMOCOMPFORMATSDATA *LPDDHAL_GETMOCOMPFORMATSDATA; +typedef struct _DDHAL_CREATEMOCOMPDATA *LPDDHAL_CREATEMOCOMPDATA; +typedef struct _DDHAL_GETMOCOMPCOMPBUFFDATA *LPDDHAL_GETMOCOMPCOMPBUFFDATA; +typedef struct _DDHAL_GETINTERNALMOCOMPDATA *LPDDHAL_GETINTERNALMOCOMPDATA; +typedef struct _DDHAL_BEGINMOCOMPFRAMEDATA *LPDDHAL_BEGINMOCOMPFRAMEDATA; +typedef struct _DDHAL_ENDMOCOMPFRAMEDATA *LPDDHAL_ENDMOCOMPFRAMEDATA; +typedef struct _DDHAL_RENDERMOCOMPDATA *LPDDHAL_RENDERMOCOMPDATA; +typedef struct _DDHAL_QUERYMOCOMPSTATUSDATA *LPDDHAL_QUERYMOCOMPSTATUSDATA; +typedef struct _DDHAL_DESTROYMOCOMPDATA *LPDDHAL_DESTROYMOCOMPDATA; +typedef DWORD (PASCAL *LPDDHALMOCOMPCB_GETGUIDS)( LPDDHAL_GETMOCOMPGUIDSDATA); +typedef DWORD (PASCAL *LPDDHALMOCOMPCB_GETFORMATS)( LPDDHAL_GETMOCOMPFORMATSDATA); +typedef DWORD (PASCAL *LPDDHALMOCOMPCB_CREATE)( LPDDHAL_CREATEMOCOMPDATA); +typedef DWORD (PASCAL *LPDDHALMOCOMPCB_GETCOMPBUFFINFO)( LPDDHAL_GETMOCOMPCOMPBUFFDATA); +typedef DWORD (PASCAL *LPDDHALMOCOMPCB_GETINTERNALINFO)( LPDDHAL_GETINTERNALMOCOMPDATA); +typedef DWORD (PASCAL *LPDDHALMOCOMPCB_BEGINFRAME)( LPDDHAL_BEGINMOCOMPFRAMEDATA); +typedef DWORD (PASCAL *LPDDHALMOCOMPCB_ENDFRAME)( LPDDHAL_ENDMOCOMPFRAMEDATA); +typedef DWORD (PASCAL *LPDDHALMOCOMPCB_RENDER)( LPDDHAL_RENDERMOCOMPDATA); +typedef DWORD (PASCAL *LPDDHALMOCOMPCB_QUERYSTATUS)( LPDDHAL_QUERYMOCOMPSTATUSDATA); +typedef DWORD (PASCAL *LPDDHALMOCOMPCB_DESTROY)( LPDDHAL_DESTROYMOCOMPDATA); +typedef struct _DDHAL_DDMOTIONCOMPCALLBACKS +{ + DWORD dwSize; + DWORD dwFlags; + LPDDHALMOCOMPCB_GETGUIDS GetMoCompGuids; + LPDDHALMOCOMPCB_GETFORMATS GetMoCompFormats; + LPDDHALMOCOMPCB_CREATE CreateMoComp; + LPDDHALMOCOMPCB_GETCOMPBUFFINFO GetMoCompBuffInfo; + LPDDHALMOCOMPCB_GETINTERNALINFO GetInternalMoCompInfo; + LPDDHALMOCOMPCB_BEGINFRAME BeginMoCompFrame; + LPDDHALMOCOMPCB_ENDFRAME EndMoCompFrame; + LPDDHALMOCOMPCB_RENDER RenderMoComp; + LPDDHALMOCOMPCB_QUERYSTATUS QueryMoCompStatus; + LPDDHALMOCOMPCB_DESTROY DestroyMoComp; +} DDHAL_DDMOTIONCOMPCALLBACKS, *LPDDHAL_DDMOTIONCOMPCALLBACKS; + + typedef HRESULT (WINAPI *LPDDGAMMACALIBRATORPROC)(LPDDGAMMARAMP, LPBYTE); @@ -531,6 +565,19 @@ typedef struct _DDHAL_GETDRIVERINFODATA *LPDDHAL_GETDRIVERINFODATA; typedef DWORD (PASCAL *LPDDHAL_GETDRIVERINFO)(LPDDHAL_GETDRIVERINFODATA); + +typedef struct _DDHAL_GETDRIVERINFODATA { + DWORD dwSize; + DWORD dwFlags; + GUID guidInfo; + DWORD dwExpectedSize; + LPVOID lpvData; + DWORD dwActualSize; + HRESULT ddRVal; + ULONG_PTR dwContext; + +} DDHAL_GETDRIVERINFODATA; + typedef struct _DDHALINFO { DWORD dwSize; LPDDHAL_DDCALLBACKS lpDDCallbacks; @@ -555,17 +602,93 @@ -#define DDHALINFO_ISPRIMARYDISPLAY 0x00000001 -#define DDHALINFO_MODEXILLEGAL 0x00000002 -#define DDHALINFO_GETDRIVERINFOSET 0x00000004 -#define DDHALINFO_GETDRIVERINFO2 0x00000008 +#define DDPALETTECALLBACKSSIZE sizeof( DDHAL_DDPALETTECALLBACKS ) +#define DDSURFACECALLBACKSSIZE sizeof( DDHAL_DDSURFACECALLBACKS ) +#define DDMISCELLANEOUSCALLBACKSSIZE sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS) +#define DDMISCELLANEOUS2CALLBACKSSIZE sizeof(DDHAL_DDMISCELLANEOUS2CALLBACKS) +#define DDEXEBUFCALLBACKSSIZE sizeof( DDHAL_DDEXEBUFCALLBACKS ) +#define DDVIDEOPORTCALLBACKSSIZE sizeof( DDHAL_DDVIDEOPORTCALLBACKS ) +#define DDCOLORCONTROLCALLBACKSSIZE sizeof( DDHAL_DDCOLORCONTROLCALLBACKS ) +#define DDKERNELCALLBACKSSIZE sizeof(DDHAL_DDKERNELCALLBACKS) +#define DDMOTIONCOMPCALLBACKSSIZE sizeof( DDHAL_DDMOTIONCOMPCALLBACKS ) -#define DDRAWI_VPORTSTART 0x0001 -#define DDRAWI_VPORTSTOP 0x0002 -#define DDRAWI_VPORTUPDATE 0x0003 +#define DDHAL_CB32_DESTROYDRIVER 0x00000001l +#define DDHAL_CB32_CREATESURFACE 0x00000002l +#define DDHAL_CB32_SETCOLORKEY 0x00000004l +#define DDHAL_CB32_SETMODE 0x00000008l +#define DDHAL_CB32_WAITFORVERTICALBLANK 0x00000010l +#define DDHAL_CB32_CANCREATESURFACE 0x00000020l +#define DDHAL_CB32_CREATEPALETTE 0x00000040l +#define DDHAL_CB32_GETSCANLINE 0x00000080l +#define DDHAL_CB32_SETEXCLUSIVEMODE 0x00000100l +#define DDHAL_CB32_FLIPTOGDISURFACE 0x00000200l +#define DDHAL_PALCB32_DESTROYPALETTE 0x00000001l +#define DDHAL_PALCB32_SETENTRIES 0x00000002l +#define DDHALINFO_ISPRIMARYDISPLAY 0x00000001 +#define DDHALINFO_MODEXILLEGAL 0x00000002 +#define DDHALINFO_GETDRIVERINFOSET 0x00000004 +#define DDHALINFO_GETDRIVERINFO2 0x00000008 +#define DDRAWI_VPORTSTART 0x0001 +#define DDRAWI_VPORTSTOP 0x0002 +#define DDRAWI_VPORTUPDATE 0x0003 +#define DDRAWI_VPORTGETCOLOR 0x0001 +#define DDRAWI_VPORTSETCOLOR 0x0002 +#define DDHAL_SURFCB32_DESTROYSURFACE 0x00000001 +#define DDHAL_SURFCB32_FLIP 0x00000002 +#define DDHAL_SURFCB32_SETCLIPLIST 0x00000004 +#define DDHAL_SURFCB32_LOCK 0x00000008 +#define DDHAL_SURFCB32_UNLOCK 0x00000010 +#define DDHAL_SURFCB32_BLT 0x00000020 +#define DDHAL_SURFCB32_SETCOLORKEY 0x00000040 +#define DDHAL_SURFCB32_ADDATTACHEDSURFACE 0x00000080 +#define DDHAL_SURFCB32_GETBLTSTATUS 0x00000100 +#define DDHAL_SURFCB32_GETFLIPSTATUS 0x00000200 +#define DDHAL_SURFCB32_UPDATEOVERLAY 0x00000400 +#define DDHAL_SURFCB32_SETOVERLAYPOSITION 0x00000800 +#define DDHAL_SURFCB32_RESERVED4 0x00001000 +#define DDHAL_SURFCB32_SETPALETTE 0x00002000 +#define DDHAL_MISCCB32_GETAVAILDRIVERMEMORY 0x00000001 +#define DDHAL_MISCCB32_UPDATENONLOCALHEAP 0x00000002 +#define DDHAL_MISCCB32_GETHEAPALIGNMENT 0x00000004 +#define DDHAL_MISCCB32_GETSYSMEMBLTSTATUS 0x00000008 +#define DDHAL_MISC2CB32_ALPHABLT 0x00000001 +#define DDHAL_MISC2CB32_CREATESURFACEEX 0x00000002 +#define DDHAL_MISC2CB32_GETDRIVERSTATE 0x00000004 +#define DDHAL_MISC2CB32_DESTROYDDLOCAL 0x00000008 +#define DDHAL_EXEBUFCB32_CANCREATEEXEBUF 0x00000001 +#define DDHAL_EXEBUFCB32_CREATEEXEBUF 0x00000002 +#define DDHAL_EXEBUFCB32_DESTROYEXEBUF 0x00000004 +#define DDHAL_EXEBUFCB32_LOCKEXEBUF 0x00000008 +#define DDHAL_EXEBUFCB32_UNLOCKEXEBUF 0x00000010 +#define DDHAL_VPORT32_CANCREATEVIDEOPORT 0x00000001 +#define DDHAL_VPORT32_CREATEVIDEOPORT 0x00000002 +#define DDHAL_VPORT32_FLIP 0x00000004 +#define DDHAL_VPORT32_GETBANDWIDTH 0x00000008 +#define DDHAL_VPORT32_GETINPUTFORMATS 0x00000010 +#define DDHAL_VPORT32_GETOUTPUTFORMATS 0x00000020 +#define DDHAL_VPORT32_GETFIELD 0x00000080 +#define DDHAL_VPORT32_GETLINE 0x00000100 +#define DDHAL_VPORT32_GETCONNECT 0x00000200 +#define DDHAL_VPORT32_DESTROY 0x00000400 +#define DDHAL_VPORT32_GETFLIPSTATUS 0x00000800 +#define DDHAL_VPORT32_UPDATE 0x00001000 +#define DDHAL_VPORT32_WAITFORSYNC 0x00002000 +#define DDHAL_VPORT32_GETSIGNALSTATUS 0x00004000 +#define DDHAL_VPORT32_COLORCONTROL 0x00008000 +#define DDHAL_COLOR_COLORCONTROL 0x00000001 +#define DDHAL_KERNEL_SYNCSURFACEDATA 0x00000001 +#define DDHAL_KERNEL_SYNCVIDEOPORTDATA 0x00000002 +#define DDHAL_MOCOMP32_GETGUIDS 0x00000001 +#define DDHAL_MOCOMP32_GETFORMATS 0x00000002 +#define DDHAL_MOCOMP32_CREATE 0x00000004 +#define DDHAL_MOCOMP32_GETCOMPBUFFINFO 0x00000008 +#define DDHAL_MOCOMP32_GETINTERNALINFO 0x00000010 +#define DDHAL_MOCOMP32_BEGINFRAME 0x00000020 +#define DDHAL_MOCOMP32_ENDFRAME 0x00000040 +#define DDHAL_MOCOMP32_RENDER 0x00000080 +#define DDHAL_MOCOMP32_QUERYSTATUS 0x00000100 +#define DDHAL_MOCOMP32_DESTROY 0x00000200 -#define DDRAWI_VPORTGETCOLOR 0x0001 -#define DDRAWI_VPORTSETCOLOR 0x0002 /* where the high-level ddraw implementation stores the callbacks */ typedef struct _DDHAL_CALLBACKS { @@ -587,10 +710,10 @@ DDHAL_DDCOLORCONTROLCALLBACKS HALDDColorControl; DDHAL_DDMISCELLANEOUSCALLBACKS cbDDMiscellaneousCallbacks; DDHAL_DDMISCELLANEOUSCALLBACKS HALDDMiscellaneous; -// DDHAL_DDKERNELCALLBACKS cbDDKernelCallbacks; -// DDHAL_DDKERNELCALLBACKS HALDDKernel; -// DDHAL_DDMOTIONCOMPCALLBACKS cbDDMotionCompCallbacks; -// DDHAL_DDMOTIONCOMPCALLBACKS HALDDMotionComp; + DDHAL_DDKERNELCALLBACKS cbDDKernelCallbacks; + DDHAL_DDKERNELCALLBACKS HALDDKernel; + DDHAL_DDMOTIONCOMPCALLBACKS cbDDMotionCompCallbacks; + DDHAL_DDMOTIONCOMPCALLBACKS HALDDMotionComp; } DDHAL_CALLBACKS,*LPDDHAL_CALLBACKS; /*********************************************************************** ****** @@ -936,6 +1059,28 @@ } DDHAL_GETHEAPALIGNMENTDATA; +typedef struct _DDMORESURFACECAPS +{ + DWORD dwSize; + DDSCAPSEX ddsCapsMore; + struct tagExtendedHeapRestrictions + { + DDSCAPSEX ddsCapsEx; + DDSCAPSEX ddsCapsExAlt; + } ddsExtendedHeapRestrictions[1]; +} DDMORESURFACECAPS, * LPDDMORESURFACECAPS; + +typedef struct _DDSTEREOMODE +{ + DWORD dwSize; + DWORD dwHeight; + DWORD dwWidth; + DWORD dwBpp; + DWORD dwRefreshRate; + BOOL bSupported; + +} DDSTEREOMODE, * LPDDSTEREOMODE; + /*********************************************************************** ****** * high-level ddraw implementation structures */ @@ -1341,8 +1486,7 @@ DDCOLORKEY ddckCKDestBlt; DDCOLORKEY ddckCKSrcBlt; ULONG_PTR hDC; - ULONG_PTR dwReserved1; /* for display driver use */ - /* overlays only */ + ULONG_PTR dwReserved1; DDCOLORKEY ddckCKSrcOverlay; DDCOLORKEY ddckCKDestOverlay; LPDDRAWI_DDRAWSURFACE_INT lpSurfaceOverlaying; @@ -1405,15 +1549,12 @@ DWORD dwProcessId; LPPALETTEENTRY lpColorTable; union { - ULONG_PTR dwReserved1; /* for display driver use */ + ULONG_PTR dwReserved1; HPALETTE hHELGDIPalette; - } DUMMYUNIONNAME1; - /* DirectX 5.0 */ + }; DWORD dwDriverReserved; DWORD dwContentsStamp; - /* DirectX 6.0 */ DWORD dwSaveStamp; - /* DirectX 7.0 */ DWORD dwHandle; } DDRAWI_DDRAWPALETTE_GBL; @@ -1448,48 +1589,25 @@ } DDRAWI_DDRAWPALETTE_LCL; #endif /* _NO_COM */ -typedef struct _DDHAL_GETMOCOMPGUIDSDATA FAR *LPDDHAL_GETMOCOMPGUIDSDATA; -typedef struct _DDHAL_GETMOCOMPFORMATSDATA FAR *LPDDHAL_GETMOCOMPFORMATSDATA; -typedef struct _DDHAL_CREATEMOCOMPDATA FAR *LPDDHAL_CREATEMOCOMPDATA; -typedef struct _DDHAL_GETMOCOMPCOMPBUFFDATA FAR *LPDDHAL_GETMOCOMPCOMPBUFFDATA; -typedef struct _DDHAL_GETINTERNALMOCOMPDATA FAR *LPDDHAL_GETINTERNALMOCOMPDATA; -typedef struct _DDHAL_BEGINMOCOMPFRAMEDATA FAR *LPDDHAL_BEGINMOCOMPFRAMEDATA; -typedef struct _DDHAL_ENDMOCOMPFRAMEDATA FAR *LPDDHAL_ENDMOCOMPFRAMEDATA; -typedef struct _DDHAL_RENDERMOCOMPDATA FAR *LPDDHAL_RENDERMOCOMPDATA; -typedef struct _DDHAL_QUERYMOCOMPSTATUSDATA FAR *LPDDHAL_QUERYMOCOMPSTATUSDATA; -typedef struct _DDHAL_DESTROYMOCOMPDATA FAR *LPDDHAL_DESTROYMOCOMPDATA; - -typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_GETGUIDS)( LPDDHAL_GETMOCOMPGUIDSDATA); -typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_GETFORMATS)( LPDDHAL_GETMOCOMPFORMATSDATA); -typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_CREATE)( LPDDHAL_CREATEMOCOMPDATA); -typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_GETCOMPBUFFINFO)( LPDDHAL_GETMOCOMPCOMPBUFFDATA); -typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_GETINTERNALINFO)( LPDDHAL_GETINTERNALMOCOMPDATA); -typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_BEGINFRAME)( LPDDHAL_BEGINMOCOMPFRAMEDATA); -typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_ENDFRAME)( LPDDHAL_ENDMOCOMPFRAMEDATA); -typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_RENDER)( LPDDHAL_RENDERMOCOMPDATA); -typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_QUERYSTATUS)( LPDDHAL_QUERYMOCOMPSTATUSDATA); -typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_DESTROY)( LPDDHAL_DESTROYMOCOMPDATA); - - typedef struct _DDMCCOMPBUFFERINFO { - DWORD dwSize; // [in] size of the struct - DWORD dwNumCompBuffers; // [out] number of buffers required for compressed data - DWORD dwWidthToCreate; // [out] Width of surface to create - DWORD dwHeightToCreate; // [out] Height of surface to create - DWORD dwBytesToAllocate; // [out] Total number of bytes used by each surface - DDSCAPS2 ddCompCaps; // [out] caps to create surfaces to store compressed data - DDPIXELFORMAT ddPixelFormat; // [out] format to create surfaces to store compressed data + DWORD dwSize; + DWORD dwNumCompBuffers; + DWORD dwWidthToCreate; + DWORD dwHeightToCreate; + DWORD dwBytesToAllocate; + DDSCAPS2 ddCompCaps; + DDPIXELFORMAT ddPixelFormat; } DDMCCOMPBUFFERINFO, *LPDDMCCOMPBUFFERINFO; typedef struct _DDMCBUFFERINFO { - DWORD dwSize; // [in] size of the struct - LPDDRAWI_DDRAWSURFACE_LCL lpCompSurface; // [in] pointer to buffer containing compressed data - DWORD dwDataOffset; // [in] offset of relevant data from the beginning of buffer - DWORD dwDataSize; // [in] size of relevant data - LPVOID lpPrivate; // Reserved for DirectDraw; + DWORD dwSize; + LPDDRAWI_DDRAWSURFACE_LCL lpCompSurface; + DWORD dwDataOffset; + DWORD dwDataSize; + LPVOID lpPrivate; } DDMCBUFFERINFO, *LPDDMCBUFFERINFO; typedef struct _DDHAL_GETDRIVERSTATEDATA { @@ -1518,23 +1636,23 @@ { LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DDMOTIONCOMP_LCL lpMoComp; - LPDDRAWI_DDRAWSURFACE_LCL lpDestSurface; // [in] destination buffer in which to decoding this frame - DWORD dwInputDataSize; // [in] size of other misc input data to begin frame - LPVOID lpInputData; // [in] pointer to misc input data - DWORD dwOutputDataSize; // [in] size of other misc output data to begin frame - LPVOID lpOutputData; // [in] pointer to output misc data (allocated by client) - HRESULT ddRVal; // [out] + LPDDRAWI_DDRAWSURFACE_LCL lpDestSurface; + DWORD dwInputDataSize; + LPVOID lpInputData; + DWORD dwOutputDataSize; + LPVOID lpOutputData; + HRESULT ddRVal; LPDDHALMOCOMPCB_BEGINFRAME BeginMoCompFrame; } DDHAL_BEGINMOCOMPFRAMEDATA; typedef struct _DDHAL_COLORCONTROLDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; // driver struct - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; // surface - LPDDCOLORCONTROL lpColorData; // color control information - DWORD dwFlags; // DDRAWI_GETCOLOR/DDRAWI_SETCOLOR - HRESULT ddRVal; // return value - LPDDHALCOLORCB_COLORCONTROL ColorControl; // PRIVATE: ptr to callback + LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; + LPDDCOLORCONTROL lpColorData; + DWORD dwFlags; + HRESULT ddRVal; + LPDDHALCOLORCB_COLORCONTROL ColorControl; } DDHAL_COLORCONTROLDATA; typedef struct _DDHAL_CREATEMOCOMPDATA @@ -1571,66 +1689,66 @@ typedef struct _DDHAL_FLIPTOGDISURFACEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; // driver struct - DWORD dwToGDI; // TRUE if flipping to the GDI surface, FALSE if flipping away - DWORD dwReserved; // reserved for future use - HRESULT ddRVal; // return value - LPDDHAL_FLIPTOGDISURFACE FlipToGDISurface; // PRIVATE: ptr to callback + LPDDRAWI_DIRECTDRAW_GBL lpDD; + DWORD dwToGDI; + DWORD dwReserved; + HRESULT ddRVal; + LPDDHAL_FLIPTOGDISURFACE FlipToGDISurface; } DDHAL_FLIPTOGDISURFACEDATA; typedef struct _DDHAL_GETAVAILDRIVERMEMORYDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; // driver struct - DDSCAPS DDSCaps; // caps for type of surface memory - DWORD dwTotal; // total memory for this kind of surface - DWORD dwFree; // free memory for this kind of surface - HRESULT ddRVal; // return value - LPDDHAL_GETAVAILDRIVERMEMORY GetAvailDriverMemory; // PRIVATE: ptr to callback - DDSCAPSEX ddsCapsEx; // Added in V6. Driver should check DDVERSION info - // to see if this field is present. + LPDDRAWI_DIRECTDRAW_GBL lpDD; + DDSCAPS DDSCaps; + DWORD dwTotal; + DWORD dwFree; + HRESULT ddRVal; + LPDDHAL_GETAVAILDRIVERMEMORY GetAvailDriverMemory; + DDSCAPSEX ddsCapsEx; + } DDHAL_GETAVAILDRIVERMEMORYDATA; typedef struct _DDHAL_GETBLTSTATUSDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; // driver struct - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; // surface struct - DWORD dwFlags; // flags - HRESULT ddRVal; // return value - LPDDHALSURFCB_GETBLTSTATUS GetBltStatus; // PRIVATE: ptr to callback + LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; + DWORD dwFlags; + HRESULT ddRVal; + LPDDHALSURFCB_GETBLTSTATUS GetBltStatus; } DDHAL_GETBLTSTATUSDATA; typedef struct _DDHAL_GETFLIPSTATUSDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; // driver struct - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; // surface struct - DWORD dwFlags; // flags - HRESULT ddRVal; // return value - LPDDHALSURFCB_GETFLIPSTATUS GetFlipStatus; // PRIVATE: ptr to callback + LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; + DWORD dwFlags; + HRESULT ddRVal; + LPDDHALSURFCB_GETFLIPSTATUS GetFlipStatus; } DDHAL_GETFLIPSTATUSDATA; typedef struct _DDHAL_GETINTERNALMOCOMPDATA { LPDDRAWI_DIRECTDRAW_LCL lpDD; LPGUID lpGuid; - DWORD dwWidth; // [in] width of uncompressed data - DWORD dwHeight; // [in] height of uncompressed data - DDPIXELFORMAT ddPixelFormat; // [in] pixel-format of uncompressed data - DWORD dwScratchMemAlloc; // [out] amount of scratch memory will the hal allocate for its private use - HRESULT ddRVal; // [out] + DWORD dwWidth; + DWORD dwHeight; + DDPIXELFORMAT ddPixelFormat; + DWORD dwScratchMemAlloc; + HRESULT ddRVal; LPDDHALMOCOMPCB_GETINTERNALINFO GetInternalMoCompInfo; } DDHAL_GETINTERNALMOCOMPDATA; typedef struct _DDHAL_GETMOCOMPCOMPBUFFDATA { - LPDDRAWI_DIRECTDRAW_LCL lpDD; - LPGUID lpGuid; - DWORD dwWidth; // [in] width of uncompressed data - DWORD dwHeight; // [in] height of uncompressed data - DDPIXELFORMAT ddPixelFormat; // [in] pixel-format of uncompressed data - DWORD dwNumTypesCompBuffs;// [in/out] number of memory types required for comp buffers - LPDDMCCOMPBUFFERINFO lpCompBuffInfo; // [in] driver supplied info regarding comp buffers (allocated by client) - HRESULT ddRVal; // [out] - LPDDHALMOCOMPCB_GETCOMPBUFFINFO GetMoCompBuffInfo; + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPGUID lpGuid; + DWORD dwWidth; + DWORD dwHeight; + DDPIXELFORMAT ddPixelFormat; + DWORD dwNumTypesCompBuffs; + LPDDMCCOMPBUFFERINFO lpCompBuffInfo; + HRESULT ddRVal; + LPDDHALMOCOMPCB_GETCOMPBUFFINFO GetMoCompBuffInfo; } DDHAL_GETMOCOMPCOMPBUFFDATA; typedef struct _DDHAL_GETMOCOMPGUIDSDATA @@ -1654,19 +1772,19 @@ typedef struct _DDHAL_GETSCANLINEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; // driver struct - DWORD dwScanLine; // returned scan line - HRESULT ddRVal; // return value - LPDDHAL_GETSCANLINE GetScanLine; // PRIVATE: ptr to callback + LPDDRAWI_DIRECTDRAW_GBL lpDD; + DWORD dwScanLine; + HRESULT ddRVal; + LPDDHAL_GETSCANLINE GetScanLine; } DDHAL_GETSCANLINEDATA; typedef struct _DDHAL_QUERYMOCOMPSTATUSDATA { LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DDMOTIONCOMP_LCL lpMoComp; - LPDDRAWI_DDRAWSURFACE_LCL lpSurface; // [in] Surface being queried - DWORD dwFlags; // [in] DDMCQUERY_XXX falgs - HRESULT ddRVal; // [out] + LPDDRAWI_DDRAWSURFACE_LCL lpSurface; + DWORD dwFlags; + HRESULT ddRVal; LPDDHALMOCOMPCB_QUERYSTATUS QueryMoCompStatus; } DDHAL_QUERYMOCOMPSTATUSDATA; @@ -1674,59 +1792,59 @@ { LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DDMOTIONCOMP_LCL lpMoComp; - DWORD dwNumBuffers; // [in] Number of entries in the lpMacroBlockInfo array - LPDDMCBUFFERINFO lpBufferInfo; // [in] Surfaces containing macro block info - DWORD dwFunction; // [in] Function + DWORD dwNumBuffers; + LPDDMCBUFFERINFO lpBufferInfo; + DWORD dwFunction; LPVOID lpInputData; DWORD dwInputDataSize; LPVOID lpOutputData; DWORD dwOutputDataSize; - HRESULT ddRVal; // [out] + HRESULT ddRVal; LPDDHALMOCOMPCB_RENDER RenderMoComp; } DDHAL_RENDERMOCOMPDATA; typedef struct _DDHAL_SETCOLORKEYDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; // driver struct - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; // surface struct - DWORD dwFlags; // flags - DDCOLORKEY ckNew; // new color key - HRESULT ddRVal; // return value - LPDDHALSURFCB_SETCOLORKEY SetColorKey; // PRIVATE: ptr to callback + LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; + DWORD dwFlags; + DDCOLORKEY ckNew; + HRESULT ddRVal; + LPDDHALSURFCB_SETCOLORKEY SetColorKey; } DDHAL_SETCOLORKEYDATA; typedef struct _DDHAL_SETOVERLAYPOSITIONDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; // driver struct - LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface; // src surface - LPDDRAWI_DDRAWSURFACE_LCL lpDDDestSurface;// dest surface - LONG lXPos; // x position - LONG lYPos; // y position - HRESULT ddRVal; // return value - LPDDHALSURFCB_SETOVERLAYPOSITION SetOverlayPosition; // PRIVATE: ptr to callback + LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface; + LPDDRAWI_DDRAWSURFACE_LCL lpDDDestSurface; + LONG lXPos; + LONG lYPos; + HRESULT ddRVal; + LPDDHALSURFCB_SETOVERLAYPOSITION SetOverlayPosition; } DDHAL_SETOVERLAYPOSITIONDATA; typedef struct _DDHAL_UPDATEOVERLAYDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; // driver struct - LPDDRAWI_DDRAWSURFACE_LCL lpDDDestSurface;// dest surface - RECTL rDest; // dest rect - LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface; // src surface - RECTL rSrc; // src rect - DWORD dwFlags; // flags - DDOVERLAYFX overlayFX; // overlay FX - HRESULT ddRVal; // return value - LPDDHALSURFCB_UPDATEOVERLAY UpdateOverlay; // PRIVATE: ptr to callback + LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DDRAWSURFACE_LCL lpDDDestSurface; + RECTL rDest; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface; + RECTL rSrc; + DWORD dwFlags; + DDOVERLAYFX overlayFX; + HRESULT ddRVal; + LPDDHALSURFCB_UPDATEOVERLAY UpdateOverlay; } DDHAL_UPDATEOVERLAYDATA; typedef struct _DDHAL_WAITFORVERTICALBLANKDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; // driver struct - DWORD dwFlags; // flags - DWORD bIsInVB; // is in vertical blank - ULONG_PTR hEvent; // event - HRESULT ddRVal; // return value - LPDDHAL_WAITFORVERTICALBLANK WaitForVerticalBlank; // PRIVATE: ptr to callback + LPDDRAWI_DIRECTDRAW_GBL lpDD; + DWORD dwFlags; + DWORD bIsInVB; + ULONG_PTR hEvent; + HRESULT ddRVal; + LPDDHAL_WAITFORVERTICALBLANK WaitForVerticalBlank; } DDHAL_WAITFORVERTICALBLANKDATA; #ifdef __cplusplus _____ Modified: trunk/reactos/w32api/include/ddk/ddrawint.h --- trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-15 00:12:49 UTC (rev 18465) +++ trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-15 02:00:56 UTC (rev 18466) @@ -380,23 +380,21 @@ PDD_SURFCB_SETPALETTE SetPalette; } DD_SURFACECALLBACKS, *PDD_SURFACECALLBACKS; -enum -{ - DDHAL_SURFCB32_DESTROYSURFACE = 1<<0, - DDHAL_SURFCB32_FLIP = 1<<1, - DDHAL_SURFCB32_SETCLIPLIST = 1<<2, - DDHAL_SURFCB32_LOCK = 1<<3, - DDHAL_SURFCB32_UNLOCK = 1<<4, - DDHAL_SURFCB32_BLT = 1<<5, - DDHAL_SURFCB32_SETCOLORKEY = 1<<6, - DDHAL_SURFCB32_ADDATTACHEDSURFACE = 1<<7, - DDHAL_SURFCB32_GETBLTSTATUS = 1<<8, - DDHAL_SURFCB32_GETFLIPSTATUS = 1<<9, - DDHAL_SURFCB32_UPDATEOVERLAY = 1<<10, - DDHAL_SURFCB32_SETOVERLAYPOSITION = 1<<11, - DDHAL_SURFCB32_SETPALETTE = 1<<13, -}; +#define DDHAL_SURFCB32_DESTROYSURFACE 0x00000001 +#define DDHAL_SURFCB32_FLIP 0x00000002 +#define DDHAL_SURFCB32_SETCLIPLIST 0x00000004 +#define DDHAL_SURFCB32_LOCK 0x00000008 +#define DDHAL_SURFCB32_UNLOCK 0x00000010 +#define DDHAL_SURFCB32_BLT 0x00000020 +#define DDHAL_SURFCB32_SETCOLORKEY 0x00000040 +#define DDHAL_SURFCB32_ADDATTACHEDSURFACE 0x00000080 +#define DDHAL_SURFCB32_GETBLTSTATUS 0x00000100 +#define DDHAL_SURFCB32_GETFLIPSTATUS 0x00000200 +#define DDHAL_SURFCB32_UPDATEOVERLAY 0x00000400 +#define DDHAL_SURFCB32_SETOVERLAYPOSITION 0x00000800 +#define DDHAL_SURFCB32_RESERVED4 0x00001000 +#define DDHAL_SURFCB32_SETPALETTE 0x00002000 /*********************************************************************** */ /* IDirectDraw callbacks */ /*********************************************************************** */ @@ -529,10 +527,7 @@ PDD_GETAVAILDRIVERMEMORY GetAvailDriverMemory; } DD_MISCELLANEOUSCALLBACKS, *PDD_MISCELLANEOUSCALLBACKS; -enum -{ - DDHAL_MISCCB32_GETAVAILDRIVERMEMORY = 1<<0, -}; +#define DDHAL_MISCCB32_GETAVAILDRIVERMEMORY 0x00000001 typedef DWORD (STDCALL *PDD_ALPHABLT)(PDD_BLTDATA); @@ -579,14 +574,13 @@ PDD_DESTROYDDLOCAL DestroyDDLocal; } DD_MISCELLANEOUS2CALLBACKS, *PDD_MISCELLANEOUS2CALLBACKS; -enum -{ - DDHAL_MISC2CB32_ALPHABLT = 1<<0, - DDHAL_MISC2CB32_CREATESURFACEEX = 1<<1, - DDHAL_MISC2CB32_GETDRIVERSTATE = 1<<2, - DDHAL_MISC2CB32_DESTROYDDLOCAL = 1<<3, -}; +#define DDHAL_MISC2CB32_ALPHABLT 0x00000001 +#define DDHAL_MISC2CB32_CREATESURFACEEX 0x00000002 +#define DDHAL_MISC2CB32_GETDRIVERSTATE 0x00000004 +#define DDHAL_MISC2CB32_DESTROYDDLOCAL 0x00000008 + + typedef struct { PDD_DIRECTDRAW_GLOBAL lpDD; @@ -667,11 +661,8 @@ PDD_PALCB_SETENTRIES SetEntries; } DD_PALETTECALLBACKS, *PDD_PALETTECALLBACKS; -enum -{ - DDHAL_PALCB32_DESTROYPALETTE = 1<<0, - DDHAL_PALCB32_SETENTRIES = 1<<1, -}; +#define DDHAL_PALCB32_DESTROYPALETTE 0x00000001l +#define DDHAL_PALCB32_SETENTRIES 0x00000002l /*********************************************************************** */ /* IDirectDrawVideoport callbacks */ @@ -871,25 +862,23 @@ PDD_VPORTCB_COLORCONTROL ColorControl; } DD_VIDEOPORTCALLBACKS, *PDD_VIDEOPORTCALLBACKS; -enum -{ - DDHAL_VPORT32_CANCREATEVIDEOPORT = 1<<0, - DDHAL_VPORT32_CREATEVIDEOPORT = 1<<1, - DDHAL_VPORT32_FLIP = 1<<2, - DDHAL_VPORT32_GETBANDWIDTH = 1<<3, - DDHAL_VPORT32_GETINPUTFORMATS = 1<<4, - DDHAL_VPORT32_GETOUTPUTFORMATS = 1<<5, - DDHAL_VPORT32_GETFIELD = 1<<7, - DDHAL_VPORT32_GETLINE = 1<<8, - DDHAL_VPORT32_GETCONNECT = 1<<9, - DDHAL_VPORT32_DESTROY = 1<<10, - DDHAL_VPORT32_GETFLIPSTATUS = 1<<11, - DDHAL_VPORT32_UPDATE = 1<<12, - DDHAL_VPORT32_WAITFORSYNC = 1<<13, - DDHAL_VPORT32_GETSIGNALSTATUS = 1<<14, - DDHAL_VPORT32_COLORCONTROL = 1<<15, -}; +#define DDHAL_VPORT32_CANCREATEVIDEOPORT 0x00000001 +#define DDHAL_VPORT32_CREATEVIDEOPORT 0x00000002 +#define DDHAL_VPORT32_FLIP 0x00000004 +#define DDHAL_VPORT32_GETBANDWIDTH 0x00000008 +#define DDHAL_VPORT32_GETINPUTFORMATS 0x00000010 +#define DDHAL_VPORT32_GETOUTPUTFORMATS 0x00000020 +#define DDHAL_VPORT32_GETFIELD 0x00000080 +#define DDHAL_VPORT32_GETLINE 0x00000100 +#define DDHAL_VPORT32_GETCONNECT 0x00000200 +#define DDHAL_VPORT32_DESTROY 0x00000400 +#define DDHAL_VPORT32_GETFLIPSTATUS 0x00000800 +#define DDHAL_VPORT32_UPDATE 0x00001000 +#define DDHAL_VPORT32_WAITFORSYNC 0x00002000 +#define DDHAL_VPORT32_GETSIGNALSTATUS 0x00004000 +#define DDHAL_VPORT32_COLORCONTROL 0x00008000 + /*********************************************************************** */ /* IDirectDrawColorControl callbacks */ /*********************************************************************** */ @@ -917,10 +906,7 @@ PDD_COLORCB_COLORCONTROL ColorControl; } DD_COLORCONTROLCALLBACKS, *PDD_COLORCONTROLCALLBACKS; -enum -{ - DDHAL_COLOR_COLORCONTROL = 1<<0, -}; +#define DDHAL_COLOR_COLORCONTROL 0x00000001 /*********************************************************************** */ /* IDirectDrawVideo callbacks */ @@ -1081,19 +1067,16 @@ } DD_MOTIONCOMPCALLBACKS; typedef DD_MOTIONCOMPCALLBACKS *PDD_MOTIONCOMPCALLBACKS; -enum -{ - DDHAL_MOCOMP32_GETGUIDS = 1<<0, - DDHAL_MOCOMP32_GETFORMATS = 1<<1, - DDHAL_MOCOMP32_CREATE = 1<<2, - DDHAL_MOCOMP32_GETCOMPBUFFINFO = 1<<3, - DDHAL_MOCOMP32_GETINTERNALINFO = 1<<4, - DDHAL_MOCOMP32_BEGINFRAME = 1<<5, - DDHAL_MOCOMP32_ENDFRAME = 1<<6, - DDHAL_MOCOMP32_RENDER = 1<<7, - DDHAL_MOCOMP32_QUERYSTATUS = 1<<8, - DDHAL_MOCOMP32_DESTROY = 1<<9, -}; +#define DDHAL_MOCOMP32_GETGUIDS 0x00000001 +#define DDHAL_MOCOMP32_GETFORMATS 0x00000002 +#define DDHAL_MOCOMP32_CREATE 0x00000004 +#define DDHAL_MOCOMP32_GETCOMPBUFFINFO 0x00000008 +#define DDHAL_MOCOMP32_GETINTERNALINFO 0x00000010 +#define DDHAL_MOCOMP32_BEGINFRAME 0x00000020 +#define DDHAL_MOCOMP32_ENDFRAME 0x00000040 +#define DDHAL_MOCOMP32_RENDER 0x00000080 +#define DDHAL_MOCOMP32_QUERYSTATUS 0x00000100 +#define DDHAL_MOCOMP32_DESTROY 0x00000200 /*********************************************************************** */ /* D3D buffer callbacks */

20 years

[greatlrd] 18465: set eol-style : native

by greatlrd＠svn.reactos.com

set eol-style : native Modified: trunk/reactos/w32api/include/ddk/dmemmgr.h Modified: trunk/reactos/w32api/include/ddk/dvp.h _____ Modified: trunk/reactos/w32api/include/ddk/dmemmgr.h --- trunk/reactos/w32api/include/ddk/dmemmgr.h 2005-10-15 00:09:45 UTC (rev 18464) +++ trunk/reactos/w32api/include/ddk/dmemmgr.h 2005-10-15 00:12:49 UTC (rev 18465) @@ -1,150 +1,150 @@ - -/* $Id: $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: - * PURPOSE: Directx headers - * PROGRAMMER: Magnus Olsen (greatlrd) - * - */ - -#ifndef __DMEMMGR_INCLUDED__ -#define __DMEMMGR_INCLUDED__ - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef __NTDDKCOMP__ -typedef ULONG_PTR FLATPTR; -typedef struct _VIDMEM *LPVIDMEM; -#else -typedef ULONG_PTR FLATPTR; -typedef struct _VIDEOMEMORY *LPVIDMEM; -#endif - -#define SURFACEALIGN_DISCARDABLE 0x00000001 -#define VMEMHEAP_LINEAR 0x00000001 -#define VMEMHEAP_RECTANGULAR 0x00000002 -#define VMEMHEAP_ALIGNMENT 0x00000004 - -typedef struct _VMEML -{ - struct _VMEML *next; - FLATPTR ptr; - DWORD size; - BOOL bDiscardable; -} VMEML, *LPVMEML, *LPLPVMEML; - -typedef struct _VMEMR -{ - struct _VMEMR *next; - struct _VMEMR *prev; - - struct _VMEMR *pUp; - struct _VMEMR *pDown; - struct _VMEMR *pLeft; - struct _VMEMR *pRight; - FLATPTR ptr; - DWORD size; - DWORD x; - DWORD y; - DWORD cx; - DWORD cy; - DWORD flags; - FLATPTR pBits; - BOOL bDiscardable; -} VMEMR, *LPVMEMR, *LPLPVMEMR; - - -typedef struct _SURFACEALIGNMENT -{ - union - { - struct - { - DWORD dwStartAlignment; - DWORD dwPitchAlignment; - DWORD dwFlags; - DWORD dwReserved2; - } Linear; - struct - { - DWORD dwXAlignment; - DWORD dwYAlignment; - DWORD dwFlags; - DWORD dwReserved2; - } Rectangular; - }; -} SURFACEALIGNMENT, *LPSURFACEALIGNMENT; - -typedef struct _HEAPALIGNMENT -{ - DWORD dwSize; - DDSCAPS ddsCaps; - DWORD dwReserved; - SURFACEALIGNMENT ExecuteBuffer; - SURFACEALIGNMENT Overlay; - SURFACEALIGNMENT Texture; - SURFACEALIGNMENT ZBuffer; - SURFACEALIGNMENT AlphaBuffer; - SURFACEALIGNMENT Offscreen; - SURFACEALIGNMENT FlipTarget; -} HEAPALIGNMENT, *LPHEAPALIGNMENT; - - -typedef struct _VMEMHEAP -{ - DWORD dwFlags; - DWORD stride; - LPVOID freeList; - LPVOID allocList; - DWORD dwTotalSize; - FLATPTR fpGARTLin; - FLATPTR fpGARTDev; - DWORD dwCommitedSize; - DWORD dwCoalesceCount; - HEAPALIGNMENT Alignment; - DDSCAPSEX ddsCapsEx; - DDSCAPSEX ddsCapsExAlt; -#ifndef IS_16 - LARGE_INTEGER liPhysAGPBase; -#endif - HANDLE hdevAGP; - LPVOID pvPhysRsrv; - BYTE* pAgpCommitMask; - DWORD dwAgpCommitMaskSize; -} VMEMHEAP; - -typedef VMEMHEAP FAR *LPVMEMHEAP; - -typedef struct _DD_GETHEAPALIGNMENTDATA -{ - ULONG_PTR dwInstance; - DWORD dwHeap; - HRESULT ddRVal; - VOID* GetHeapAlignment; - HEAPALIGNMENT Alignment; -} DD_GETHEAPALIGNMENTDATA, *PDD_GETHEAPALIGNMENTDATA; - -extern void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr); - -extern FLATPTR WINAPI - HeapVidMemAllocAligned( - LPVIDMEM lpVidMem, - DWORD dwWidth, - DWORD dwHeight, - LPSURFACEALIGNMENT lpAlignment , - LPLONG lpNewPitch ); - - -#ifndef __NTDDKCOMP__ -extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height); -#endif - -#ifdef __cplusplus -}; -#endif - -#endif + +/* $Id: $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: + * PURPOSE: Directx headers + * PROGRAMMER: Magnus Olsen (greatlrd) + * + */ + +#ifndef __DMEMMGR_INCLUDED__ +#define __DMEMMGR_INCLUDED__ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef __NTDDKCOMP__ +typedef ULONG_PTR FLATPTR; +typedef struct _VIDMEM *LPVIDMEM; +#else +typedef ULONG_PTR FLATPTR; +typedef struct _VIDEOMEMORY *LPVIDMEM; +#endif + +#define SURFACEALIGN_DISCARDABLE 0x00000001 +#define VMEMHEAP_LINEAR 0x00000001 +#define VMEMHEAP_RECTANGULAR 0x00000002 +#define VMEMHEAP_ALIGNMENT 0x00000004 + +typedef struct _VMEML +{ + struct _VMEML *next; + FLATPTR ptr; + DWORD size; + BOOL bDiscardable; +} VMEML, *LPVMEML, *LPLPVMEML; + +typedef struct _VMEMR +{ + struct _VMEMR *next; + struct _VMEMR *prev; + + struct _VMEMR *pUp; + struct _VMEMR *pDown; + struct _VMEMR *pLeft; + struct _VMEMR *pRight; + FLATPTR ptr; + DWORD size; + DWORD x; + DWORD y; + DWORD cx; + DWORD cy; + DWORD flags; + FLATPTR pBits; + BOOL bDiscardable; +} VMEMR, *LPVMEMR, *LPLPVMEMR; + + +typedef struct _SURFACEALIGNMENT +{ + union + { + struct + { + DWORD dwStartAlignment; + DWORD dwPitchAlignment; + DWORD dwFlags; + DWORD dwReserved2; + } Linear; + struct + { + DWORD dwXAlignment; + DWORD dwYAlignment; + DWORD dwFlags; + DWORD dwReserved2; + } Rectangular; + }; +} SURFACEALIGNMENT, *LPSURFACEALIGNMENT; + +typedef struct _HEAPALIGNMENT +{ + DWORD dwSize; + DDSCAPS ddsCaps; + DWORD dwReserved; + SURFACEALIGNMENT ExecuteBuffer; + SURFACEALIGNMENT Overlay; + SURFACEALIGNMENT Texture; + SURFACEALIGNMENT ZBuffer; + SURFACEALIGNMENT AlphaBuffer; + SURFACEALIGNMENT Offscreen; + SURFACEALIGNMENT FlipTarget; +} HEAPALIGNMENT, *LPHEAPALIGNMENT; + + +typedef struct _VMEMHEAP +{ + DWORD dwFlags; + DWORD stride; + LPVOID freeList; + LPVOID allocList; + DWORD dwTotalSize; + FLATPTR fpGARTLin; + FLATPTR fpGARTDev; + DWORD dwCommitedSize; + DWORD dwCoalesceCount; + HEAPALIGNMENT Alignment; + DDSCAPSEX ddsCapsEx; + DDSCAPSEX ddsCapsExAlt; +#ifndef IS_16 + LARGE_INTEGER liPhysAGPBase; +#endif + HANDLE hdevAGP; + LPVOID pvPhysRsrv; + BYTE* pAgpCommitMask; + DWORD dwAgpCommitMaskSize; +} VMEMHEAP; + +typedef VMEMHEAP FAR *LPVMEMHEAP; + +typedef struct _DD_GETHEAPALIGNMENTDATA +{ + ULONG_PTR dwInstance; + DWORD dwHeap; + HRESULT ddRVal; + VOID* GetHeapAlignment; + HEAPALIGNMENT Alignment; +} DD_GETHEAPALIGNMENTDATA, *PDD_GETHEAPALIGNMENTDATA; + +extern void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr); + +extern FLATPTR WINAPI + HeapVidMemAllocAligned( + LPVIDMEM lpVidMem, + DWORD dwWidth, + DWORD dwHeight, + LPSURFACEALIGNMENT lpAlignment , + LPLONG lpNewPitch ); + + +#ifndef __NTDDKCOMP__ +extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height); +#endif + +#ifdef __cplusplus +}; +#endif + +#endif Property changes on: trunk/reactos/w32api/include/ddk/dmemmgr.h ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/w32api/include/ddk/dvp.h --- trunk/reactos/w32api/include/ddk/dvp.h 2005-10-15 00:09:45 UTC (rev 18464) +++ trunk/reactos/w32api/include/ddk/dvp.h 2005-10-15 00:12:49 UTC (rev 18465) @@ -1,210 +1,210 @@ - -/* $Id: $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: - * PURPOSE: Directx headers - * PROGRAMMER: Magnus Olsen (greatlrd) - * - */ - -#ifndef __DVP_INCLUDED__ -#define __DVP_INCLUDED__ - -DEFINE_GUID( IID_IDDVideoPortContainer, 0x6C142760,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 ); -DEFINE_GUID( IID_IDirectDrawVideoPort, 0xB36D93E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 ); -DEFINE_GUID( IID_IDirectDrawVideoPortNotify, 0xA655FB94,0x0589,0x4E57,0xB3,0x33,0x56,0x7A,0x89,0x46,0x8C,0x88); - -DEFINE_GUID( DDVPTYPE_E_HREFH_VREFH, 0x54F39980L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); -DEFINE_GUID( DDVPTYPE_E_HREFH_VREFL, 0x92783220L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); -DEFINE_GUID( DDVPTYPE_E_HREFL_VREFH, 0xA07A02E0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); -DEFINE_GUID( DDVPTYPE_E_HREFL_VREFL, 0xE09C77E0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); -DEFINE_GUID( DDVPTYPE_CCIR656, 0xFCA326A0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); -DEFINE_GUID( DDVPTYPE_BROOKTREE, 0x1352A560L,0xDA61,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); -DEFINE_GUID( DDVPTYPE_PHILIPS, 0x332CF160L,0xDA61,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); - - -typedef struct _DDVIDEOPORTCONNECT -{ - DWORD dwSize; - DWORD dwPortWidth; - GUID guidTypeID; - DWORD dwFlags; - ULONG_PTR dwReserved1; -} DDVIDEOPORTCONNECT; - -typedef struct _DDVIDEOPORTDESC { - DWORD dwSize; - DWORD dwFieldWidth; - DWORD dwVBIWidth; - DWORD dwFieldHeight; - DWORD dwMicrosecondsPerField; - DWORD dwMaxPixelsPerSecond; - DWORD dwVideoPortID; - DWORD dwReserved1; - DDVIDEOPORTCONNECT VideoPortType; - ULONG_PTR dwReserved2; - ULONG_PTR dwReserved3; -} DDVIDEOPORTDESC; - -typedef struct _DDVIDEOPORTBANDWIDTH -{ - DWORD dwSize; - DWORD dwOverlay; - DWORD dwColorkey; - DWORD dwYInterpolate; - DWORD dwYInterpAndColorkey; - ULONG_PTR dwReserved1; - ULONG_PTR dwReserved2; -} DDVIDEOPORTBANDWIDTH; - -typedef struct _DDVIDEOPORTCAPS -{ - DWORD dwSize; - DWORD dwFlags; - DWORD dwMaxWidth; - DWORD dwMaxVBIWidth; - DWORD dwMaxHeight; - DWORD dwVideoPortID; - DWORD dwCaps; - DWORD dwFX; - DWORD dwNumAutoFlipSurfaces; - DWORD dwAlignVideoPortBoundary; - DWORD dwAlignVideoPortPrescaleWidth; - DWORD dwAlignVideoPortCropBoundary; - DWORD dwAlignVideoPortCropWidth; - DWORD dwPreshrinkXStep; - DWORD dwPreshrinkYStep; - DWORD dwNumVBIAutoFlipSurfaces; - DWORD dwNumPreferredAutoflip; - WORD wNumFilterTapsX; - WORD wNumFilterTapsY; -} DDVIDEOPORTCAPS; - -typedef struct _DDVIDEOPORTINFO -{ - DWORD dwSize; - DWORD dwOriginX; - DWORD dwOriginY; - DWORD dwVPFlags; - RECT rCrop; - DWORD dwPrescaleWidth; - DWORD dwPrescaleHeight; - LPDDPIXELFORMAT lpddpfInputFormat; - LPDDPIXELFORMAT lpddpfVBIInputFormat; - LPDDPIXELFORMAT lpddpfVBIOutputFormat; - DWORD dwVBIHeight; - ULONG_PTR dwReserved1; - ULONG_PTR dwReserved2; -} DDVIDEOPORTINFO; - -typedef struct _DDVIDEOPORTSTATUS -{ - DWORD dwSize; - BOOL bInUse; - DWORD dwFlags; - DWORD dwReserved1; - DDVIDEOPORTCONNECT VideoPortType; - ULONG_PTR dwReserved2; - ULONG_PTR dwReserved3; -} DDVIDEOPORTSTATUS; - -typedef struct _DDVIDEOPORTNOTIFY -{ - LARGE_INTEGER ApproximateTimeStamp; - LONG lField; - UINT dwSurfaceIndex; - LONG lDone; -} DDVIDEOPORTNOTIFY; - - -#define DDVPCONNECT_DOUBLECLOCK 0x00000001 -#define DDVPCONNECT_VACT 0x00000002 -#define DDVPCONNECT_INVERTPOLARITY 0x00000004 -#define DDVPCONNECT_DISCARDSVREFDATA 0x00000008 -#define DDVPCONNECT_HALFLINE 0x00000010 -#define DDVPCONNECT_INTERLACED 0x00000020 -#define DDVPCONNECT_SHAREEVEN 0x00000040 -#define DDVPCONNECT_SHAREODD 0x00000080 -#define DDVPCAPS_AUTOFLIP 0x00000001 -#define DDVPCAPS_INTERLACED 0x00000002 -#define DDVPCAPS_NONINTERLACED 0x00000004 -#define DDVPCAPS_READBACKFIELD 0x00000008 -#define DDVPCAPS_READBACKLINE 0x00000010 -#define DDVPCAPS_SHAREABLE 0x00000020 -#define DDVPCAPS_SKIPEVENFIELDS 0x00000040 -#define DDVPCAPS_SKIPODDFIELDS 0x00000080 -#define DDVPCAPS_SYNCMASTER 0x00000100 -#define DDVPCAPS_VBISURFACE 0x00000200 -#define DDVPCAPS_COLORCONTROL 0x00000400 -#define DDVPCAPS_OVERSAMPLEDVBI 0x00000800 -#define DDVPCAPS_SYSTEMMEMORY 0x00001000 -#define DDVPCAPS_VBIANDVIDEOINDEPENDENT 0x00002000 -#define DDVPCAPS_HARDWAREDEINTERLACE 0x00004000 -#define DDVPFX_CROPTOPDATA 0x00000001 -#define DDVPFX_CROPX 0x00000002 -#define DDVPFX_CROPY 0x00000004 -#define DDVPFX_INTERLEAVE 0x00000008 -#define DDVPFX_MIRRORLEFTRIGHT 0x00000010 -#define DDVPFX_MIRRORUPDOWN 0x00000020 -#define DDVPFX_PRESHRINKX 0x00000040 -#define DDVPFX_PRESHRINKY 0x00000080 -#define DDVPFX_PRESHRINKXB 0x00000100 -#define DDVPFX_PRESHRINKYB 0x00000200 -#define DDVPFX_PRESHRINKXS 0x00000400 -#define DDVPFX_PRESHRINKYS 0x00000800 -#define DDVPFX_PRESTRETCHX 0x00001000 -#define DDVPFX_PRESTRETCHY 0x00002000 -#define DDVPFX_PRESTRETCHXN 0x00004000 -#define DDVPFX_PRESTRETCHYN 0x00008000 -#define DDVPFX_VBICONVERT 0x00010000 -#define DDVPFX_VBINOSCALE 0x00020000 -#define DDVPFX_IGNOREVBIXCROP 0x00040000 -#define DDVPFX_VBINOINTERLEAVE 0x00080000 -#define DDVP_AUTOFLIP 0x00000001 -#define DDVP_CONVERT 0x00000002 -#define DDVP_CROP 0x00000004 -#define DDVP_INTERLEAVE 0x00000008 -#define DDVP_MIRRORLEFTRIGHT 0x00000010 -#define DDVP_MIRRORUPDOWN 0x00000020 -#define DDVP_PRESCALE 0x00000040 -#define DDVP_SKIPEVENFIELDS 0x00000080 -#define DDVP_SKIPODDFIELDS 0x00000100 -#define DDVP_SYNCMASTER 0x00000200 -#define DDVP_VBICONVERT 0x00000400 -#define DDVP_VBINOSCALE 0x00000800 -#define DDVP_OVERRIDEBOBWEAVE 0x00001000 -#define DDVP_IGNOREVBIXCROP 0x00002000 -#define DDVP_VBINOINTERLEAVE 0x00004000 -#define DDVP_HARDWAREDEINTERLACE 0x00008000 -#define DDVPFORMAT_VIDEO 0x00000001 -#define DDVPFORMAT_VBI 0x00000002 -#define DDVPTARGET_VIDEO 0x00000001 -#define DDVPTARGET_VBI 0x00000002 -#define DDVPWAIT_BEGIN 0x00000001 -#define DDVPWAIT_END 0x00000002 -#define DDVPWAIT_LINE 0x00000003 -#define DDVPFLIP_VIDEO 0x00000001 -#define DDVPFLIP_VBI 0x00000002 -#define DDVPSQ_NOSIGNAL 0x00000001 -#define DDVPSQ_SIGNALOK 0x00000002 -#define DDVPB_VIDEOPORT 0x00000001 -#define DDVPB_OVERLAY 0x00000002 -#define DDVPB_TYPE 0x00000004 -#define DDVPBCAPS_SOURCE 0x00000001 -#define DDVPBCAPS_DESTINATION 0x00000002 -#define DDVPCREATE_VBIONLY 0x00000001 -#define DDVPCREATE_VIDEOONLY 0x00000002 -#define DDVPSTATUS_VBIONLY 0x00000001 -#define DDVPSTATUS_VIDEOONLY 0x00000002 - -typedef struct _DDVIDEOPORTCONNECT *LPDDVIDEOPORTCONNECT; -typedef struct _DDVIDEOPORTCAPS *LPDDVIDEOPORTCAPS; -typedef struct _DDVIDEOPORTDESC *LPDDVIDEOPORTDESC; -typedef struct _DDVIDEOPORTINFO *LPDDVIDEOPORTINFO; -typedef struct _DDVIDEOPORTBANDWIDTH *LPDDVIDEOPORTBANDWIDTH; -typedef struct _DDVIDEOPORTSTATUS *LPDDVIDEOPORTSTATUS; -typedef struct _DDVIDEOPORTNOTIFY *LPDDVIDEOPORTNOTIFY; - -#endif + +/* $Id: $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: + * PURPOSE: Directx headers + * PROGRAMMER: Magnus Olsen (greatlrd) + * + */ + +#ifndef __DVP_INCLUDED__ +#define __DVP_INCLUDED__ + +DEFINE_GUID( IID_IDDVideoPortContainer, 0x6C142760,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 ); +DEFINE_GUID( IID_IDirectDrawVideoPort, 0xB36D93E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 ); +DEFINE_GUID( IID_IDirectDrawVideoPortNotify, 0xA655FB94,0x0589,0x4E57,0xB3,0x33,0x56,0x7A,0x89,0x46,0x8C,0x88); + +DEFINE_GUID( DDVPTYPE_E_HREFH_VREFH, 0x54F39980L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); +DEFINE_GUID( DDVPTYPE_E_HREFH_VREFL, 0x92783220L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); +DEFINE_GUID( DDVPTYPE_E_HREFL_VREFH, 0xA07A02E0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); +DEFINE_GUID( DDVPTYPE_E_HREFL_VREFL, 0xE09C77E0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); +DEFINE_GUID( DDVPTYPE_CCIR656, 0xFCA326A0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); +DEFINE_GUID( DDVPTYPE_BROOKTREE, 0x1352A560L,0xDA61,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); +DEFINE_GUID( DDVPTYPE_PHILIPS, 0x332CF160L,0xDA61,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); + + +typedef struct _DDVIDEOPORTCONNECT +{ + DWORD dwSize; + DWORD dwPortWidth; + GUID guidTypeID; + DWORD dwFlags; + ULONG_PTR dwReserved1; +} DDVIDEOPORTCONNECT; + +typedef struct _DDVIDEOPORTDESC { + DWORD dwSize; + DWORD dwFieldWidth; + DWORD dwVBIWidth; + DWORD dwFieldHeight; + DWORD dwMicrosecondsPerField; + DWORD dwMaxPixelsPerSecond; + DWORD dwVideoPortID; + DWORD dwReserved1; + DDVIDEOPORTCONNECT VideoPortType; + ULONG_PTR dwReserved2; + ULONG_PTR dwReserved3; +} DDVIDEOPORTDESC; + +typedef struct _DDVIDEOPORTBANDWIDTH +{ + DWORD dwSize; + DWORD dwOverlay; + DWORD dwColorkey; + DWORD dwYInterpolate; + DWORD dwYInterpAndColorkey; + ULONG_PTR dwReserved1; + ULONG_PTR dwReserved2; +} DDVIDEOPORTBANDWIDTH; + +typedef struct _DDVIDEOPORTCAPS +{ + DWORD dwSize; + DWORD dwFlags; + DWORD dwMaxWidth; + DWORD dwMaxVBIWidth; + DWORD dwMaxHeight; + DWORD dwVideoPortID; + DWORD dwCaps; + DWORD dwFX; + DWORD dwNumAutoFlipSurfaces; + DWORD dwAlignVideoPortBoundary; + DWORD dwAlignVideoPortPrescaleWidth; + DWORD dwAlignVideoPortCropBoundary; + DWORD dwAlignVideoPortCropWidth; + DWORD dwPreshrinkXStep; + DWORD dwPreshrinkYStep; + DWORD dwNumVBIAutoFlipSurfaces; + DWORD dwNumPreferredAutoflip; + WORD wNumFilterTapsX; + WORD wNumFilterTapsY; +} DDVIDEOPORTCAPS; + +typedef struct _DDVIDEOPORTINFO +{ + DWORD dwSize; + DWORD dwOriginX; + DWORD dwOriginY; + DWORD dwVPFlags; + RECT rCrop; + DWORD dwPrescaleWidth; + DWORD dwPrescaleHeight; + LPDDPIXELFORMAT lpddpfInputFormat; + LPDDPIXELFORMAT lpddpfVBIInputFormat; + LPDDPIXELFORMAT lpddpfVBIOutputFormat; + DWORD dwVBIHeight; + ULONG_PTR dwReserved1; + ULONG_PTR dwReserved2; +} DDVIDEOPORTINFO; + +typedef struct _DDVIDEOPORTSTATUS +{ + DWORD dwSize; + BOOL bInUse; + DWORD dwFlags; + DWORD dwReserved1; + DDVIDEOPORTCONNECT VideoPortType; + ULONG_PTR dwReserved2; + ULONG_PTR dwReserved3; +} DDVIDEOPORTSTATUS; + +typedef struct _DDVIDEOPORTNOTIFY +{ + LARGE_INTEGER ApproximateTimeStamp; + LONG lField; + UINT dwSurfaceIndex; + LONG lDone; +} DDVIDEOPORTNOTIFY; + + +#define DDVPCONNECT_DOUBLECLOCK 0x00000001 +#define DDVPCONNECT_VACT 0x00000002 +#define DDVPCONNECT_INVERTPOLARITY 0x00000004 +#define DDVPCONNECT_DISCARDSVREFDATA 0x00000008 +#define DDVPCONNECT_HALFLINE 0x00000010 +#define DDVPCONNECT_INTERLACED 0x00000020 +#define DDVPCONNECT_SHAREEVEN 0x00000040 +#define DDVPCONNECT_SHAREODD 0x00000080 +#define DDVPCAPS_AUTOFLIP 0x00000001 +#define DDVPCAPS_INTERLACED 0x00000002 +#define DDVPCAPS_NONINTERLACED 0x00000004 +#define DDVPCAPS_READBACKFIELD 0x00000008 +#define DDVPCAPS_READBACKLINE 0x00000010 +#define DDVPCAPS_SHAREABLE 0x00000020 +#define DDVPCAPS_SKIPEVENFIELDS 0x00000040 +#define DDVPCAPS_SKIPODDFIELDS 0x00000080 +#define DDVPCAPS_SYNCMASTER 0x00000100 +#define DDVPCAPS_VBISURFACE 0x00000200 +#define DDVPCAPS_COLORCONTROL 0x00000400 +#define DDVPCAPS_OVERSAMPLEDVBI 0x00000800 +#define DDVPCAPS_SYSTEMMEMORY 0x00001000 +#define DDVPCAPS_VBIANDVIDEOINDEPENDENT 0x00002000 +#define DDVPCAPS_HARDWAREDEINTERLACE 0x00004000 +#define DDVPFX_CROPTOPDATA 0x00000001 +#define DDVPFX_CROPX 0x00000002 +#define DDVPFX_CROPY 0x00000004 +#define DDVPFX_INTERLEAVE 0x00000008 +#define DDVPFX_MIRRORLEFTRIGHT 0x00000010 +#define DDVPFX_MIRRORUPDOWN 0x00000020 +#define DDVPFX_PRESHRINKX 0x00000040 +#define DDVPFX_PRESHRINKY 0x00000080 +#define DDVPFX_PRESHRINKXB 0x00000100 +#define DDVPFX_PRESHRINKYB 0x00000200 +#define DDVPFX_PRESHRINKXS 0x00000400 +#define DDVPFX_PRESHRINKYS 0x00000800 +#define DDVPFX_PRESTRETCHX 0x00001000 +#define DDVPFX_PRESTRETCHY 0x00002000 +#define DDVPFX_PRESTRETCHXN 0x00004000 +#define DDVPFX_PRESTRETCHYN 0x00008000 +#define DDVPFX_VBICONVERT 0x00010000 +#define DDVPFX_VBINOSCALE 0x00020000 +#define DDVPFX_IGNOREVBIXCROP 0x00040000 +#define DDVPFX_VBINOINTERLEAVE 0x00080000 +#define DDVP_AUTOFLIP 0x00000001 +#define DDVP_CONVERT 0x00000002 +#define DDVP_CROP 0x00000004 +#define DDVP_INTERLEAVE 0x00000008 +#define DDVP_MIRRORLEFTRIGHT 0x00000010 +#define DDVP_MIRRORUPDOWN 0x00000020 +#define DDVP_PRESCALE 0x00000040 +#define DDVP_SKIPEVENFIELDS 0x00000080 +#define DDVP_SKIPODDFIELDS 0x00000100 +#define DDVP_SYNCMASTER 0x00000200 +#define DDVP_VBICONVERT 0x00000400 +#define DDVP_VBINOSCALE 0x00000800 +#define DDVP_OVERRIDEBOBWEAVE 0x00001000 +#define DDVP_IGNOREVBIXCROP 0x00002000 +#define DDVP_VBINOINTERLEAVE 0x00004000 +#define DDVP_HARDWAREDEINTERLACE 0x00008000 +#define DDVPFORMAT_VIDEO 0x00000001 +#define DDVPFORMAT_VBI 0x00000002 +#define DDVPTARGET_VIDEO 0x00000001 +#define DDVPTARGET_VBI 0x00000002 +#define DDVPWAIT_BEGIN 0x00000001 +#define DDVPWAIT_END 0x00000002 +#define DDVPWAIT_LINE 0x00000003 +#define DDVPFLIP_VIDEO 0x00000001 +#define DDVPFLIP_VBI 0x00000002 +#define DDVPSQ_NOSIGNAL 0x00000001 +#define DDVPSQ_SIGNALOK 0x00000002 +#define DDVPB_VIDEOPORT 0x00000001 +#define DDVPB_OVERLAY 0x00000002 +#define DDVPB_TYPE 0x00000004 +#define DDVPBCAPS_SOURCE 0x00000001 +#define DDVPBCAPS_DESTINATION 0x00000002 +#define DDVPCREATE_VBIONLY 0x00000001 +#define DDVPCREATE_VIDEOONLY 0x00000002 +#define DDVPSTATUS_VBIONLY 0x00000001 +#define DDVPSTATUS_VIDEOONLY 0x00000002 + +typedef struct _DDVIDEOPORTCONNECT *LPDDVIDEOPORTCONNECT; +typedef struct _DDVIDEOPORTCAPS *LPDDVIDEOPORTCAPS; +typedef struct _DDVIDEOPORTDESC *LPDDVIDEOPORTDESC; +typedef struct _DDVIDEOPORTINFO *LPDDVIDEOPORTINFO; +typedef struct _DDVIDEOPORTBANDWIDTH *LPDDVIDEOPORTBANDWIDTH; +typedef struct _DDVIDEOPORTSTATUS *LPDDVIDEOPORTSTATUS; +typedef struct _DDVIDEOPORTNOTIFY *LPDDVIDEOPORTNOTIFY; + +#endif Property changes on: trunk/reactos/w32api/include/ddk/dvp.h ___________________________________________________________________ Name: svn:eol-style + native

20 years

[greatlrd] 18464: Fixing directx headers from wine, by adding alot of missing struct and some struct was wrong. Complete the header dmemmgr.h it was missing and move stuff into that header.

by greatlrd＠svn.reactos.com

Fixing directx headers from wine, by adding alot of missing struct and some struct was wrong. Complete the header dmemmgr.h it was missing and move stuff into that header. Modified: trunk/reactos/w32api/include/ddk/ddrawi.h Modified: trunk/reactos/w32api/include/ddk/ddrawint.h Added: trunk/reactos/w32api/include/ddk/dmemmgr.h Modified: trunk/reactos/w32api/include/ddk/dvp.h _____ Modified: trunk/reactos/w32api/include/ddk/ddrawi.h --- trunk/reactos/w32api/include/ddk/ddrawi.h 2005-10-14 23:13:08 UTC (rev 18463) +++ trunk/reactos/w32api/include/ddk/ddrawi.h 2005-10-15 00:09:45 UTC (rev 18464) @@ -28,10 +28,10 @@ #include <ddraw.h> #include <dvp.h> +#include "dmemmgr.h" #ifndef __DDK_DDRAWINT_H typedef struct _DDKERNELCAPS *LPDDKERNELCAPS; /* should be in ddkernel.h */ -typedef struct _VMEMHEAP *LPVMEMHEAP; /* should be in dmemmgr.h */ #endif #define DDAPI WINAPI @@ -72,11 +72,8 @@ typedef DWORD (PASCAL *LPDD32BITDRIVERINIT)(DWORD dwContext); -#ifndef __DDK_DDRAWINT_H -/* pointer to video memory */ -typedef ULONG_PTR FLATPTR; -#endif + /* predeclare some structures */ typedef struct _DDHALINFO *LPDDHALINFO; typedef struct _DDRAWI_DIRECTDRAW_INT *LPDDRAWI_DIRECTDRAW_INT; @@ -154,7 +151,7 @@ LPVMEMHEAP lpHeap; DWORD dwHeight; }; -} VIDMEM,*LPVIDMEM; +} VIDMEM; @@ -493,9 +490,35 @@ } DDHAL_DDVIDEOPORTCALLBACKS; +typedef struct _DDHAL_COLORCONTROLDATA *LPDDHAL_COLORCONTROLDATA; +typedef DWORD (PASCAL *LPDDHALCOLORCB_COLORCONTROL)(LPDDHAL_COLORCONTROLDATA); +typedef struct _DDHAL_DDCOLORCONTROLCALLBACKS +{ + DWORD dwSize; + DWORD dwFlags; + LPDDHALCOLORCB_COLORCONTROL ColorControl; +} DDHAL_DDCOLORCONTROLCALLBACKS; + +typedef struct _DDHAL_SYNCSURFACEDATA *LPDDHAL_SYNCSURFACEDATA; +typedef struct _DDHAL_SYNCVIDEOPORTDATA *LPDDHAL_SYNCVIDEOPORTDATA; + +typedef DWORD (PASCAL *LPDDHALKERNELCB_SYNCSURFACE)(LPDDHAL_SYNCSURFACEDATA); +typedef DWORD (PASCAL *LPDDHALKERNELCB_SYNCVIDEOPORT)(LPDDHAL_SYNCVIDEOPORTDATA); + +typedef struct _DDHAL_DDKERNELCALLBACKS +{ + DWORD dwSize; + DWORD dwFlags; + LPDDHALKERNELCB_SYNCSURFACE SyncSurfaceData; + LPDDHALKERNELCB_SYNCVIDEOPORT SyncVideoPortData; +} DDHAL_DDKERNELCALLBACKS, *LPDDHAL_DDKERNELCALLBACKS; + + + + typedef HRESULT (WINAPI *LPDDGAMMACALIBRATORPROC)(LPDDGAMMARAMP, LPBYTE); @@ -537,6 +560,13 @@ #define DDHALINFO_GETDRIVERINFOSET 0x00000004 #define DDHALINFO_GETDRIVERINFO2 0x00000008 +#define DDRAWI_VPORTSTART 0x0001 +#define DDRAWI_VPORTSTOP 0x0002 +#define DDRAWI_VPORTUPDATE 0x0003 + +#define DDRAWI_VPORTGETCOLOR 0x0001 +#define DDRAWI_VPORTSETCOLOR 0x0002 + /* where the high-level ddraw implementation stores the callbacks */ typedef struct _DDHAL_CALLBACKS { DDHAL_DDCALLBACKS cbDDCallbacks; @@ -553,8 +583,8 @@ DDHAL_DDEXEBUFCALLBACKS HELDDExeBuf; DDHAL_DDVIDEOPORTCALLBACKS cbDDVideoPortCallbacks; DDHAL_DDVIDEOPORTCALLBACKS HALDDVideoPort; -// DDHAL_DDCOLORCONTROLCALLBACKS cbDDColorControlCallbacks; -// DDHAL_DDCOLORCONTROLCALLBACKS HALDDColorControl; + DDHAL_DDCOLORCONTROLCALLBACKS cbDDColorControlCallbacks; + DDHAL_DDCOLORCONTROLCALLBACKS HALDDColorControl; DDHAL_DDMISCELLANEOUSCALLBACKS cbDDMiscellaneousCallbacks; DDHAL_DDMISCELLANEOUSCALLBACKS HALDDMiscellaneous; // DDHAL_DDKERNELCALLBACKS cbDDKernelCallbacks; @@ -697,6 +727,7 @@ LPDDHALPALCB_SETENTRIES SetEntries; } DDHAL_SETENTRIESDATA; + typedef struct _DDHAL_CANCREATEVPORTDATA { LPDDRAWI_DIRECTDRAW_LCL lpDD; @@ -828,7 +859,83 @@ LPDDHALVPORTCB_COLORCONTROL ColorControl; } DDHAL_VPORTCOLORDATA; +typedef struct _DDHAL_FLIPVPORTDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + LPDDRAWI_DDRAWSURFACE_LCL lpSurfCurr; + LPDDRAWI_DDRAWSURFACE_LCL lpSurfTarg; + HRESULT ddRVal; + LPDDHALVPORTCB_FLIP FlipVideoPort; +} DDHAL_FLIPVPORTDATA; +typedef struct _DDHAL_GETVPORTCONNECTDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + DWORD dwPortId; + LPDDVIDEOPORTCONNECT lpConnect; + DWORD dwNumEntries; + HRESULT ddRVal; + LPDDHALVPORTCB_GETVPORTCONNECT GetVideoPortConnectInfo; +} DDHAL_GETVPORTCONNECTDATA; + +typedef struct _DDHAL_SYNCSURFACEDATA +{ + DWORD dwSize; + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; + DWORD dwSurfaceOffset; + ULONG_PTR fpLockPtr; + LONG lPitch; + DWORD dwOverlayOffset; + DWORD dwOverlaySrcWidth; + DWORD dwOverlaySrcHeight; + DWORD dwOverlayDestWidth; + DWORD dwOverlayDestHeight; + ULONG_PTR dwDriverReserved1; + ULONG_PTR dwDriverReserved2; + ULONG_PTR dwDriverReserved3; + HRESULT ddRVal; +} DDHAL_SYNCSURFACEDATA; + +typedef struct _DDHAL_SYNCVIDEOPORTDATA +{ + DWORD dwSize; + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + DWORD dwOriginOffset; + DWORD dwHeight; + DWORD dwVBIHeight; + ULONG_PTR dwDriverReserved1; + ULONG_PTR dwDriverReserved2; + ULONG_PTR dwDriverReserved3; + HRESULT ddRVal; +} DDHAL_SYNCVIDEOPORTDATA; + +typedef struct _DDHAL_DESTROYDDLOCALDATA +{ + DWORD dwFlags; + LPDDRAWI_DIRECTDRAW_LCL pDDLcl; + HRESULT ddRVal; +} DDHAL_DESTROYDDLOCALDATA; + +typedef struct _DDHAL_CREATESURFACEEXDATA { + DWORD dwFlags; + LPDDRAWI_DIRECTDRAW_LCL lpDDLcl; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSLcl; + HRESULT ddRVal; +} DDHAL_CREATESURFACEEXDATA; + +typedef struct _DDHAL_GETHEAPALIGNMENTDATA +{ + ULONG_PTR dwInstance; + DWORD dwHeap; + HRESULT ddRVal; + LPDDHAL_GETHEAPALIGNMENT GetHeapAlignment; + HEAPALIGNMENT Alignment; +} DDHAL_GETHEAPALIGNMENTDATA; + + /*********************************************************************** ****** * high-level ddraw implementation structures */ @@ -934,12 +1041,15 @@ #define DDRAWILCL_CURSORCLIPPED 0x00001000 #define DDRAWILCL_EXPLICITMONITOR 0x00002000 #define DDRAWILCL_MULTITHREADED 0x00004000 -#define DDRAWILCL_FPUSETUP 0x00008000 +#define DDRAWILCL_FPUSETUP 0x00008000 #define DDRAWILCL_POWEREDDOWN 0x00010000 #define DDRAWILCL_DIRECTDRAW7 0x00020000 #define DDRAWILCL_ATTEMPTEDD3DCONTEXT 0x00040000 #define DDRAWILCL_FPUPRESERVE 0x00080000 +#define DDRAWILCL_DX8DRIVER 0x00100000 +#define DDRAWILCL_DIRECTDRAW8 0x00200000 + typedef struct _DDRAWI_DIRECTDRAW_GBL { DWORD dwRefCnt; DWORD dwFlags; @@ -1017,16 +1127,38 @@ DDSCAPSEX ddsCapsMore; } DDRAWI_DIRECTDRAW_GBL; -#define DDRAWI_VIRTUALDESKTOP 0x00000008 -#define DDRAWI_MODEX 0x00000010 -#define DDRAWI_DISPLAYDRV 0x00000020 -#define DDRAWI_FULLSCREEN 0x00000040 -#define DDRAWI_MODECHANGED 0x00000080 -#define DDRAWI_NOHARDWARE 0x00000100 -#define DDRAWI_PALETTEINIT 0x00000200 -#define DDRAWI_NOEMULATION 0x00000400 -/* more... */ +#define DDRAWI_xxxxxxxxx1 0x00000001 +#define DDRAWI_xxxxxxxxx2 0x00000002 +#define DDRAWI_VIRTUALDESKTOP 0x00000008 +#define DDRAWI_MODEX 0x00000010 +#define DDRAWI_DISPLAYDRV 0x00000020 +#define DDRAWI_FULLSCREEN 0x00000040 +#define DDRAWI_MODECHANGED 0x00000080 +#define DDRAWI_NOHARDWARE 0x00000100 +#define DDRAWI_PALETTEINIT 0x00000200 +#define DDRAWI_NOEMULATION 0x00000400 +#define DDRAWI_HASCKEYDESTOVERLAY 0x00000800 +#define DDRAWI_HASCKEYSRCOVERLAY 0x00001000 +#define DDRAWI_HASGDIPALETTE 0x00002000 +#define DDRAWI_EMULATIONINITIALIZED 0x00004000 +#define DDRAWI_HASGDIPALETTE_EXCLUSIVE 0x00008000 +#define DDRAWI_MODEXILLEGAL 0x00010000 +#define DDRAWI_FLIPPEDTOGDI 0x00020000 +#define DDRAWI_NEEDSWIN16FORVRAMLOCK 0x00040000 +#define DDRAWI_PDEVICEVRAMBITCLEARED 0x00080000 +#define DDRAWI_STANDARDVGA 0x00100000 +#define DDRAWI_EXTENDEDALIGNMENT 0x00200000 +#define DDRAWI_CHANGINGMODE 0x00400000 +#define DDRAWI_GDIDRV 0x00800000 +#define DDRAWI_ATTACHEDTODESKTOP 0x01000000 +#define DDRAWI_UMODELOADED 0x02000000 +#define DDRAWI_DDRAWDATANOTFETCHED 0x04000000 +#define DDRAWI_SECONDARYDRIVERLOADED 0x08000000 +#define DDRAWI_TESTINGMODES 0x10000000 +#define DDRAWI_DRIVERINFO2 0x20000000 +#define DDRAWI_BADPDEV 0x40000000 + /* surfaces */ typedef struct _DDRAWI_DDRAWSURFACE_INT { LPVOID lpVtbl; @@ -1040,55 +1172,58 @@ DWORD dwGlobalFlags; union { LPACCESSRECTLIST lpRectList; - DWORD dwBlockSizeY; - } DUMMYUNIONNAME1; + DWORD dwBlockSizeY; + LONG lSlicePitch; + }; union { LPVMEMHEAP lpVidMemHeap; DWORD dwBlockSizeX; - } DUMMYUNIONNAME2; + }; union { LPDDRAWI_DIRECTDRAW_GBL lpDD; LPVOID lpDDHandle; - } DUMMYUNIONNAME3; + }; FLATPTR fpVidMem; union { LONG lPitch; DWORD dwLinearSize; - } DUMMYUNIONNAME4; + }; WORD wHeight; WORD wWidth; DWORD dwUsageCount; - ULONG_PTR dwReserved1; /* for display driver use */ - /* optional (defaults to primary surface pixelformat) */ + ULONG_PTR dwReserved1; DDPIXELFORMAT ddpfSurface; } DDRAWI_DDRAWSURFACE_GBL; -#define DDRAWISURFGBL_MEMFREE 0x00000001L -#define DDRAWISURFGBL_SYSMEMREQUESTED 0x00000002L -#define DDRAWISURFGBL_ISGDISURFACE 0x00000004L -#define DDRAWISURFGBL_SOFTWAREAUTOFLIP 0x00000008L -#define DDRAWISURFGBL_LOCKNOTHOLDINGWIN16LOCK 0x00000010L -#define DDRAWISURFGBL_LOCKVRAMSTYLE 0x00000020L -#define DDRAWISURFGBL_LOCKBROKEN 0x00000040L -#define DDRAWISURFGBL_IMPLICITHANDLE 0x00000080L -#define DDRAWISURFGBL_ISCLIENTMEM 0x00000100L -#define DDRAWISURFGBL_HARDWAREOPSOURCE 0x00000200L -#define DDRAWISURFGBL_HARDWAREOPDEST 0x00000400L -#define DDRAWISURFGBL_HARDWAREOPSTARTED 0x00000600L -#define DDRAWISURFGBL_VPORTINTERLEAVED 0x00000800L -#define DDRAWISURFGBL_VPORTDATA 0x00001000L -#define DDRAWISURFGBL_LATEALLOCATELINEAR 0x00002000L -#define DDRAWISURFGBL_SYSMEMEXECUTEBUFFER 0x00004000L -#define DDRAWISURFGBL_FASTLOCKHELD 0x00008000L -#define DDRAWISURFGBL_READONLYLOCKHELD 0x00010000L -#define DDRAWISURFGBL_NOTIFYWHENUNLOCKED 0x00200000L +#define DDRAWISURFGBL_MEMFREE 0x00000001L +#define DDRAWISURFGBL_SYSMEMREQUESTED 0x00000002L +#define DDRAWISURFGBL_ISGDISURFACE 0x00000004L +#define DDRAWISURFGBL_SOFTWAREAUTOFLIP 0x00000008L +#define DDRAWISURFGBL_LOCKNOTHOLDINGWIN16LOCK 0x00000010L +#define DDRAWISURFGBL_LOCKVRAMSTYLE 0x00000020L +#define DDRAWISURFGBL_LOCKBROKEN 0x00000040L +#define DDRAWISURFGBL_IMPLICITHANDLE 0x00000080L +#define DDRAWISURFGBL_ISCLIENTMEM 0x00000100L +#define DDRAWISURFGBL_HARDWAREOPSOURCE 0x00000200L +#define DDRAWISURFGBL_HARDWAREOPDEST 0x00000400L +#define DDRAWISURFGBL_HARDWAREOPSTARTED (DDRAWISURFGBL_HARDWAREOPSOURCE|DDRAWISURFGBL_HARDWAREOPDEST) +#define DDRAWISURFGBL_VPORTINTERLEAVED 0x00000800L +#define DDRAWISURFGBL_VPORTDATA 0x00001000L +#define DDRAWISURFGBL_LATEALLOCATELINEAR 0x00002000L +#define DDRAWISURFGBL_SYSMEMEXECUTEBUFFER 0x00004000L +#define DDRAWISURFGBL_FASTLOCKHELD 0x00008000L +#define DDRAWISURFGBL_READONLYLOCKHELD 0x00010000L +#define DDRAWISURFGBL_DX8SURFACE 0x00080000L +#define DDRAWISURFGBL_DDHELDONTFREE 0x00100000L +#define DDRAWISURFGBL_NOTIFYWHENUNLOCKED 0x00200000L +#define DDRAWISURFGBL_RESERVED0 0x80000000L // Reserved flag typedef struct _DDRAWI_DDRAWSURFACE_GBL_MORE { DWORD dwSize; union { DWORD dwPhysicalPageTable; FLATPTR fpPhysicalVidMem; - } DUMMYUNIONNAME1; + }; LPDWORD pPageTable; DWORD cPages; ULONG_PTR dwSavedDCContext; @@ -1114,6 +1249,9 @@ #define GET_LPDDRAWSURFACE_GBL_MORE(psurf_gbl) \ (*(((LPDDRAWI_DDRAWSURFACE_GBL_MORE *)(psurf_gbl)) - 1)) + + + #ifndef _NO_COM typedef struct _DDRAWI_DDRAWSURFACE_MORE { DWORD dwSize; @@ -1241,7 +1379,7 @@ #define DDRAWISURF_HW_CKEYDESTBLT 0x00200000L #define DDRAWISURF_HW_CKEYSRCOVERLAY 0x00400000L #define DDRAWISURF_HW_CKEYSRCBLT 0x00800000L -#define DDRAWISURF_INMASTERSPRITELIST 0x01000000l +#define DDRAWISURF_INMASTERSPRITELIST 0x01000000L #define DDRAWISURF_HELCB 0x02000000L #define DDRAWISURF_FRONTBUFFER 0x04000000L #define DDRAWISURF_BACKBUFFER 0x08000000L @@ -1320,8 +1458,8 @@ typedef struct _DDHAL_RENDERMOCOMPDATA FAR *LPDDHAL_RENDERMOCOMPDATA; typedef struct _DDHAL_QUERYMOCOMPSTATUSDATA FAR *LPDDHAL_QUERYMOCOMPSTATUSDATA; typedef struct _DDHAL_DESTROYMOCOMPDATA FAR *LPDDHAL_DESTROYMOCOMPDATA; -typedef struct _DDHAL_COLORCONTROLDATA FAR *LPDDHAL_COLORCONTROLDATA; + typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_GETGUIDS)( LPDDHAL_GETMOCOMPGUIDSDATA); typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_GETFORMATS)( LPDDHAL_GETMOCOMPFORMATSDATA); typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_CREATE)( LPDDHAL_CREATEMOCOMPDATA); @@ -1332,8 +1470,8 @@ typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_RENDER)( LPDDHAL_RENDERMOCOMPDATA); typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_QUERYSTATUS)( LPDDHAL_QUERYMOCOMPSTATUSDATA); typedef DWORD (FAR PASCAL *LPDDHALMOCOMPCB_DESTROY)( LPDDHAL_DESTROYMOCOMPDATA); -typedef DWORD (FAR PASCAL *LPDDHALCOLORCB_COLORCONTROL)(LPDDHAL_COLORCONTROLDATA); + typedef struct _DDMCCOMPBUFFERINFO { DWORD dwSize; // [in] size of the struct _____ Modified: trunk/reactos/w32api/include/ddk/ddrawint.h --- trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-14 23:13:08 UTC (rev 18463) +++ trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-15 00:09:45 UTC (rev 18464) @@ -795,10 +795,8 @@ } DD_GETVPORTFLIPSTATUSDATA, *PDD_GETVPORTFLIPSTATUSDATA; typedef DWORD (STDCALL *PDD_VPORTCB_GETFLIPSTATUS)(PDD_GETVPORTFLIPSTATUSDATA); -#define DDRAWI_VPORTSTART 1 -#define DDRAWI_VPORTSTOP 2 -#define DDRAWI_VPORTUPDATE 3 + typedef struct { PDD_DIRECTDRAW_LOCAL lpDD; @@ -836,9 +834,8 @@ } DD_GETVPORTSIGNALDATA, *PDD_GETVPORTSIGNALDATA; typedef DWORD (STDCALL *PDD_VPORTCB_GETSIGNALSTATUS)(PDD_GETVPORTSIGNALDATA); -#define DDRAWI_VPORTGETCOLOR 1 -#define DDRAWI_VPORTSETCOLOR 2 + typedef struct { PDD_DIRECTDRAW_LOCAL lpDD; _____ Added: trunk/reactos/w32api/include/ddk/dmemmgr.h --- trunk/reactos/w32api/include/ddk/dmemmgr.h 2005-10-14 23:13:08 UTC (rev 18463) +++ trunk/reactos/w32api/include/ddk/dmemmgr.h 2005-10-15 00:09:45 UTC (rev 18464) @@ -0,0 +1,150 @@ + +/* $Id: $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: + * PURPOSE: Directx headers + * PROGRAMMER: Magnus Olsen (greatlrd) + * + */ + +#ifndef __DMEMMGR_INCLUDED__ +#define __DMEMMGR_INCLUDED__ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef __NTDDKCOMP__ +typedef ULONG_PTR FLATPTR; +typedef struct _VIDMEM *LPVIDMEM; +#else +typedef ULONG_PTR FLATPTR; +typedef struct _VIDEOMEMORY *LPVIDMEM; +#endif + +#define SURFACEALIGN_DISCARDABLE 0x00000001 +#define VMEMHEAP_LINEAR 0x00000001 +#define VMEMHEAP_RECTANGULAR 0x00000002 +#define VMEMHEAP_ALIGNMENT 0x00000004 + +typedef struct _VMEML +{ + struct _VMEML *next; + FLATPTR ptr; + DWORD size; + BOOL bDiscardable; +} VMEML, *LPVMEML, *LPLPVMEML; + +typedef struct _VMEMR +{ + struct _VMEMR *next; + struct _VMEMR *prev; + + struct _VMEMR *pUp; + struct _VMEMR *pDown; + struct _VMEMR *pLeft; + struct _VMEMR *pRight; + FLATPTR ptr; + DWORD size; + DWORD x; + DWORD y; + DWORD cx; + DWORD cy; + DWORD flags; + FLATPTR pBits; + BOOL bDiscardable; +} VMEMR, *LPVMEMR, *LPLPVMEMR; + + +typedef struct _SURFACEALIGNMENT +{ + union + { + struct + { + DWORD dwStartAlignment; + DWORD dwPitchAlignment; + DWORD dwFlags; + DWORD dwReserved2; + } Linear; + struct + { + DWORD dwXAlignment; + DWORD dwYAlignment; + DWORD dwFlags; + DWORD dwReserved2; + } Rectangular; + }; +} SURFACEALIGNMENT, *LPSURFACEALIGNMENT; + +typedef struct _HEAPALIGNMENT +{ + DWORD dwSize; + DDSCAPS ddsCaps; + DWORD dwReserved; + SURFACEALIGNMENT ExecuteBuffer; + SURFACEALIGNMENT Overlay; + SURFACEALIGNMENT Texture; + SURFACEALIGNMENT ZBuffer; + SURFACEALIGNMENT AlphaBuffer; + SURFACEALIGNMENT Offscreen; + SURFACEALIGNMENT FlipTarget; +} HEAPALIGNMENT, *LPHEAPALIGNMENT; + + +typedef struct _VMEMHEAP +{ + DWORD dwFlags; + DWORD stride; + LPVOID freeList; + LPVOID allocList; + DWORD dwTotalSize; + FLATPTR fpGARTLin; + FLATPTR fpGARTDev; + DWORD dwCommitedSize; + DWORD dwCoalesceCount; + HEAPALIGNMENT Alignment; + DDSCAPSEX ddsCapsEx; + DDSCAPSEX ddsCapsExAlt; +#ifndef IS_16 + LARGE_INTEGER liPhysAGPBase; +#endif + HANDLE hdevAGP; + LPVOID pvPhysRsrv; + BYTE* pAgpCommitMask; + DWORD dwAgpCommitMaskSize; +} VMEMHEAP; + +typedef VMEMHEAP FAR *LPVMEMHEAP; + +typedef struct _DD_GETHEAPALIGNMENTDATA +{ + ULONG_PTR dwInstance; + DWORD dwHeap; + HRESULT ddRVal; + VOID* GetHeapAlignment; + HEAPALIGNMENT Alignment; +} DD_GETHEAPALIGNMENTDATA, *PDD_GETHEAPALIGNMENTDATA; + +extern void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr); + +extern FLATPTR WINAPI + HeapVidMemAllocAligned( + LPVIDMEM lpVidMem, + DWORD dwWidth, + DWORD dwHeight, + LPSURFACEALIGNMENT lpAlignment , + LPLONG lpNewPitch ); + + +#ifndef __NTDDKCOMP__ +extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height); +#endif + +#ifdef __cplusplus +}; +#endif + +#endif _____ Modified: trunk/reactos/w32api/include/ddk/dvp.h --- trunk/reactos/w32api/include/ddk/dvp.h 2005-10-14 23:13:08 UTC (rev 18463) +++ trunk/reactos/w32api/include/ddk/dvp.h 2005-10-15 00:09:45 UTC (rev 18464) @@ -119,6 +119,85 @@ } DDVIDEOPORTNOTIFY; +#define DDVPCONNECT_DOUBLECLOCK 0x00000001 +#define DDVPCONNECT_VACT 0x00000002 +#define DDVPCONNECT_INVERTPOLARITY 0x00000004 +#define DDVPCONNECT_DISCARDSVREFDATA 0x00000008 +#define DDVPCONNECT_HALFLINE 0x00000010 +#define DDVPCONNECT_INTERLACED 0x00000020 +#define DDVPCONNECT_SHAREEVEN 0x00000040 +#define DDVPCONNECT_SHAREODD 0x00000080 +#define DDVPCAPS_AUTOFLIP 0x00000001 +#define DDVPCAPS_INTERLACED 0x00000002 +#define DDVPCAPS_NONINTERLACED 0x00000004 +#define DDVPCAPS_READBACKFIELD 0x00000008 +#define DDVPCAPS_READBACKLINE 0x00000010 +#define DDVPCAPS_SHAREABLE 0x00000020 +#define DDVPCAPS_SKIPEVENFIELDS 0x00000040 +#define DDVPCAPS_SKIPODDFIELDS 0x00000080 +#define DDVPCAPS_SYNCMASTER 0x00000100 +#define DDVPCAPS_VBISURFACE 0x00000200 +#define DDVPCAPS_COLORCONTROL 0x00000400 +#define DDVPCAPS_OVERSAMPLEDVBI 0x00000800 +#define DDVPCAPS_SYSTEMMEMORY 0x00001000 +#define DDVPCAPS_VBIANDVIDEOINDEPENDENT 0x00002000 +#define DDVPCAPS_HARDWAREDEINTERLACE 0x00004000 +#define DDVPFX_CROPTOPDATA 0x00000001 +#define DDVPFX_CROPX 0x00000002 +#define DDVPFX_CROPY 0x00000004 +#define DDVPFX_INTERLEAVE 0x00000008 +#define DDVPFX_MIRRORLEFTRIGHT 0x00000010 +#define DDVPFX_MIRRORUPDOWN 0x00000020 +#define DDVPFX_PRESHRINKX 0x00000040 +#define DDVPFX_PRESHRINKY 0x00000080 +#define DDVPFX_PRESHRINKXB 0x00000100 +#define DDVPFX_PRESHRINKYB 0x00000200 +#define DDVPFX_PRESHRINKXS 0x00000400 +#define DDVPFX_PRESHRINKYS 0x00000800 +#define DDVPFX_PRESTRETCHX 0x00001000 +#define DDVPFX_PRESTRETCHY 0x00002000 +#define DDVPFX_PRESTRETCHXN 0x00004000 +#define DDVPFX_PRESTRETCHYN 0x00008000 +#define DDVPFX_VBICONVERT 0x00010000 +#define DDVPFX_VBINOSCALE 0x00020000 +#define DDVPFX_IGNOREVBIXCROP 0x00040000 +#define DDVPFX_VBINOINTERLEAVE 0x00080000 +#define DDVP_AUTOFLIP 0x00000001 +#define DDVP_CONVERT 0x00000002 +#define DDVP_CROP 0x00000004 +#define DDVP_INTERLEAVE 0x00000008 +#define DDVP_MIRRORLEFTRIGHT 0x00000010 +#define DDVP_MIRRORUPDOWN 0x00000020 +#define DDVP_PRESCALE 0x00000040 +#define DDVP_SKIPEVENFIELDS 0x00000080 +#define DDVP_SKIPODDFIELDS 0x00000100 +#define DDVP_SYNCMASTER 0x00000200 +#define DDVP_VBICONVERT 0x00000400 +#define DDVP_VBINOSCALE 0x00000800 +#define DDVP_OVERRIDEBOBWEAVE 0x00001000 +#define DDVP_IGNOREVBIXCROP 0x00002000 +#define DDVP_VBINOINTERLEAVE 0x00004000 +#define DDVP_HARDWAREDEINTERLACE 0x00008000 +#define DDVPFORMAT_VIDEO 0x00000001 +#define DDVPFORMAT_VBI 0x00000002 +#define DDVPTARGET_VIDEO 0x00000001 +#define DDVPTARGET_VBI 0x00000002 +#define DDVPWAIT_BEGIN 0x00000001 +#define DDVPWAIT_END 0x00000002 +#define DDVPWAIT_LINE 0x00000003 +#define DDVPFLIP_VIDEO 0x00000001 +#define DDVPFLIP_VBI 0x00000002 +#define DDVPSQ_NOSIGNAL 0x00000001 +#define DDVPSQ_SIGNALOK 0x00000002 +#define DDVPB_VIDEOPORT 0x00000001 +#define DDVPB_OVERLAY 0x00000002 +#define DDVPB_TYPE 0x00000004 +#define DDVPBCAPS_SOURCE 0x00000001 +#define DDVPBCAPS_DESTINATION 0x00000002 +#define DDVPCREATE_VBIONLY 0x00000001 +#define DDVPCREATE_VIDEOONLY 0x00000002 +#define DDVPSTATUS_VBIONLY 0x00000001 +#define DDVPSTATUS_VIDEOONLY 0x00000002 typedef struct _DDVIDEOPORTCONNECT *LPDDVIDEOPORTCONNECT; typedef struct _DDVIDEOPORTCAPS *LPDDVIDEOPORTCAPS;

20 years

[cwittich] 18463: * add Security.dll (redirects all calls to secur32.dll)

by cwittich＠svn.reactos.com

* add Security.dll (redirects all calls to secur32.dll) Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/security/ Added: trunk/reactos/lib/security/security.def Added: trunk/reactos/lib/security/security.rc Added: trunk/reactos/lib/security/security.xml _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-10-14 22:56:23 UTC (rev 18462) +++ trunk/reactos/baseaddress.xml 2005-10-14 23:13:08 UTC (rev 18463) @@ -28,6 +28,7 @@ <property name="BASEADDRESS_MESA32" value="0x6b380000" /> <property name="BASEADDRESS_OPENGL32" value="0x6b390000" /> <property name="BASEADDRESS_SECUR32" value="0x6b3A0000" /> +<property name="BASEADDRESS_SECURITY" value="0x71F10000" /> <property name="BASEADDRESS_SMDLL" value="0x6b3B0000" /> <property name="BASEADDRESS_URLMON" value="0x6b3C0000" /> <property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-10-14 22:56:23 UTC (rev 18462) +++ trunk/reactos/lib/directory.xml 2005-10-14 23:13:08 UTC (rev 18463) @@ -227,6 +227,9 @@ <directory name="secur32"> <xi:include href="secur32/secur32.xml" /> </directory> +<directory name="security"> + <xi:include href="security/security.xml" /> +</directory> <directory name="serialui"> <xi:include href="serialui/serialui.xml" /> </directory> _____ Added: trunk/reactos/lib/security/security.def --- trunk/reactos/lib/security/security.def 2005-10-14 22:56:23 UTC (rev 18462) +++ trunk/reactos/lib/security/security.def 2005-10-14 23:13:08 UTC (rev 18463) @@ -0,0 +1,78 @@ +LIBRARY SECURITY.DLL +EXPORTS; +LsaRegisterLogonProcess(a)12=SECUR32.LsaRegisterLogonProcess +LsaLogonUser(a)56=SECUR32.LsaLogonUser +LsaDeregisterLogonProcess(a)4=SECUR32.LsaDeregisterLogonProcess +LsaConnectUntrusted(a)4=SECUR32.LsaConnectUntrusted +LsaLookupAuthenticationPackage(a)12=SECUR32.LsaLookupAuthenticationPackag e +LsaFreeReturnBuffer(a)4=SECUR32.LsaFreeReturnBuffer +LsaCallAuthenticationPackage(a)28=SECUR32.LsaCallAuthenticationPackage +;(a)AcceptSecurityContext=SECUR32.AcceptSecurityContext +;(a)AcquireCredentialsHandleA=SECUR32.AcquireCredentialsHandleA +;(a)AcquireCredentialsHandleW=SECUR32.AcquireCredentialsHandleW +;(a)AddCredentialsA=SECUR32.AddCredentialsA +;(a)AddCredentialsW=SECUR32.AddCredentialsW +;(a)AddSecurityPackageA=SECUR32.AddSecurityPackageA +;(a)AddSecurityPackageW=SECUR32.AddSecurityPackageW +;(a)ApplyControlToken=SECUR32.ApplyControlToken +;(a)CompleteAuthToken=SECUR32.CompleteAuthToken +;(a)CredMarshalTargetInfo=SECUR32.CredMarshalTargetInfo +;(a)CredUnmarshalTargetInfo=SECUR32.CredUnmarshalTargetInfo +;(a)DecryptMessage=SECUR32.DecryptMessage +;(a)DeleteSecurityContext=SECUR32.DeleteSecurityContext +;(a)DeleteSecurityPackageA=SECUR32.DeleteSecurityPackageA +;(a)DeleteSecurityPackageW=SECUR32.DeleteSecurityPackageW +;(a)EncryptMessage=SECUR32.EncryptMessage +;EnumerateSecurityPackagesA(a)8=SECUR32.EnumerateSecurityPackagesA +EnumerateSecurityPackagesW(a)8=SECUR32.EnumerateSecurityPackagesW +;(a)ExportSecurityContext=SECUR32.ExportSecurityContext +FreeContextBuffer(a)4=SECUR32.FreeContextBuffer +;(a)FreeCredentialsHandle=SECUR32.FreeCredentialsHandle +GetComputerObjectNameA(a)12=SECUR32.GetComputerObjectNameA +GetComputerObjectNameW(a)12=SECUR32.GetComputerObjectNameW +;GetSecurityUserInfo=SECUR32.GetSecurityUserInfo +GetUserNameExA(a)12=SECUR32.GetUserNameExA +GetUserNameExW(a)12=SECUR32.GetUserNameExW +;(a)ImpersonateSecurityContext=SECUR32.ImpersonateSecurityContext +;(a)ImportSecurityContextA=SECUR32.ImportSecurityContextA +;(a)ImportSecurityContextW=SECUR32.ImportSecurityContextW +;(a)InitSecurityInterfaceA=SECUR32.InitSecurityInterfaceA +;(a)InitSecurityInterfaceW=SECUR32.InitSecurityInterfaceW +;(a)InitializeSecurityContextA=SECUR32.InitializeSecurityContextA +;(a)InitializeSecurityContextW=SECUR32.InitializeSecurityContextW +LsaEnumerateLogonSessions(a)8=SECUR32.LsaEnumerateLogonSessions +LsaGetLogonSessionData(a)8=SECUR32.LsaGetLogonSessionData +LsaRegisterPolicyChangeNotification(a)8=SECUR32.LsaRegisterPolicyChangeNo tification +LsaUnregisterPolicyChangeNotification(a)8=SECUR32.LsaUnregisterPolicyChan geNotification +;(a)MakeSignature=SECUR32.MakeSignature +;(a)QueryContextAttributesA=SECUR32.QueryContextAttributesA +;(a)QueryContextAttributesW=SECUR32.QueryContextAttributesW +;(a)QueryCredentialsAttributesA=SECUR32.QueryCredentialsAttributesA +;(a)QueryCredentialsAttributesW=SECUR32.QueryCredentialsAttributesW +;(a)QuerySecurityContextToken=SECUR32.QuerySecurityContextToken +;(a)QuerySecurityPackageInfoA=SECUR32.QuerySecurityPackageInfoA +;(a)QuerySecurityPackageInfoW=SECUR32.QuerySecurityPackageInfoW +;(a)RevertSecurityContext=SECUR32.RevertSecurityContext +;(a)SaslAcceptSecurityContext=SECUR32.SaslAcceptSecurityContext +;(a)SaslEnumerateProfilesA=SECUR32.SaslEnumerateProfilesA +;(a)SaslEnumerateProfilesW=SECUR32.SaslEnumerateProfilesW +;(a)SaslGetProfilePackageA=SECUR32.SaslGetProfilePackageA +;(a)SaslGetProfilePackageW=SECUR32.SaslGetProfilePackageW +;(a)SaslIdentifyPackageA=SECUR32.SaslIdentifyPackageA +;(a)SaslIdentifyPackageW=SECUR32.SaslIdentifyPackageW +;(a)SaslInitializeSecurityContextA=SECUR32.SaslInitializeSecurityContextA +;(a)SaslInitializeSecurityContextW=SECUR32.SaslInitializeSecurityContextW +;SealMessage=SECUR32.SealMessage +;SecCacheSspiPackages=SECUR32.SecCacheSspiPackages +;SecDeleteUserModeContext=SECUR32.SecDeleteUserModeContext +;SecGetLocaleSpecificEncryptionRules=SECUR32.SecGetLocaleSpecificEncryp tionRules +;SecInitUserModeContext=SECUR32.SecInitUserModeContext +;SecpFreeMemory=SECUR32.SecpFreeMemory +;SecpTranslateName=SECUR32.SecpTranslateName +;SecpTranslateNameEx=SECUR32.SecpTranslateNameEx +;(a)SetContextAttributesA=SECUR32.SetContextAttributesA +;(a)SetContextAttributesW=SECUR32.SetContextAttributesW +;(a)TranslateNameA=SECUR32.TranslateNameA +;(a)TranslateNameW=SECUR32.TranslateNameW +;UnsealMessage=SECUR32.UnsealMessage +;(a)VerifySignature=SECUR32.VerifySignature _____ Added: trunk/reactos/lib/security/security.rc --- trunk/reactos/lib/security/security.rc 2005-10-14 22:56:23 UTC (rev 18462) +++ trunk/reactos/lib/security/security.rc 2005-10-14 23:13:08 UTC (rev 18463) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Security\0" +#define REACTOS_STR_INTERNAL_NAME "security\0" +#define REACTOS_STR_ORIGINAL_FILENAME "security.dll\0" +#include <reactos/version.rc> _____ Added: trunk/reactos/lib/security/security.xml --- trunk/reactos/lib/security/security.xml 2005-10-14 22:56:23 UTC (rev 18462) +++ trunk/reactos/lib/security/security.xml 2005-10-14 23:13:08 UTC (rev 18463) @@ -0,0 +1,11 @@ +<module name="security" type="win32dll" baseaddress="${BASEADDRESS_SECUR32}" installbase="system32" installname="security.dll"> + <importlibrary definition="security.def" /> + <include base="security">.</include> + <define name="__SECURITY__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x501</define> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <file>security.rc</file> +</module>

20 years

[gvg] 18462: Include kernelmode routines in stack backtrace

by gvg＠svn.reactos.com

Include kernelmode routines in stack backtrace Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-10-14 22:31:06 UTC (rev 18461) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-10-14 22:56:23 UTC (rev 18462) @@ -125,8 +125,6 @@ BOOLEAN SetInContext; } CPU_REGISTER, *PCPU_REGISTER; -#define EIP_REGNO 8 - static CPU_REGISTER GspRegisters[NUMREGS] = { { 4, FIELD_OFFSET(KTRAP_FRAME, Eax), FIELD_OFFSET(CONTEXT, Eax), TRUE }, @@ -516,44 +514,97 @@ } -VOID -GspGetRegistersFromTrapFrame(PCHAR Address, - PCONTEXT Context, +static VOID +GspGetRegisters(PCHAR Address, PKTRAP_FRAME TrapFrame) { - ULONG Value; - PCHAR Buffer; + ULONG_PTR Value; PULONG p; DWORD i; + PETHREAD Thread; + ULONG_PTR *KernelStack; - Buffer = Address; - for (i = 0; i < sizeof(GspRegisters) / sizeof(GspRegisters[0]); i++) + if (NULL == GspDbgThread) { - if (TrapFrame) + Thread = PsGetCurrentThread(); + } + else + { + TrapFrame = GspDbgThread->Tcb.TrapFrame; + Thread = GspDbgThread; + } + + if (Waiting == Thread->Tcb.State) + { + KernelStack = Thread->Tcb.KernelStack; + for (i = 0; i < sizeof(GspRegisters) / sizeof(GspRegisters[0]); i++) { - if (ESP == i) + switch(i) { - Value = GspGetEspFromTrapFrame(TrapFrame); + case EBP: + Value = KernelStack[3]; + break; + case EDI: + Value = KernelStack[4]; + break; + case ESI: + Value = KernelStack[5]; + break; + case EBX: + Value = KernelStack[6]; + break; + case PC: + Value = KernelStack[7]; + break; + case ESP: + Value = (ULONG_PTR) (KernelStack + 8); + break; + case CS: + Value = KERNEL_CS; + break; + case DS: + Value = KERNEL_DS; + break; + default: + Value = 0; + break; } + Address = GspMem2Hex((PCHAR) &Value, Address, GspRegisters[i].Size, + FALSE); + } + } + else + { + for (i = 0; i < sizeof(GspRegisters) / sizeof(GspRegisters[0]); i++) + { + if (TrapFrame) + { + if (ESP == i) + { + Value = GspGetEspFromTrapFrame(TrapFrame); + } + else + { + p = (PULONG)((ULONG_PTR) TrapFrame + + GspRegisters[i].OffsetInTF); + Value = *p; + } + } + else if (i == PC) + { + /* + * This thread has not been sheduled yet so assume it + * is still in PsBeginThreadWithContextInternal(). + */ + Value = (ULONG)KiThreadStartup; + } else { - p = (PULONG)((ULONG_PTR) TrapFrame + GspRegisters[i].OffsetInTF); - Value = *p; + Value = 0; } + Address = GspMem2Hex((PCHAR) &Value, Address, + GspRegisters[i].Size, FALSE); } - else if (i == EIP_REGNO) - { - /* - * This thread has not been sheduled yet so assume it - * is still in PsBeginThreadWithContextInternal(). - */ - Value = (ULONG)KiThreadStartup; - } - else - { - Value = 0; - } - Buffer = GspMem2Hex((PCHAR) &Value, Buffer, GspRegisters[i].Size, FALSE); } } @@ -1158,14 +1209,7 @@ GspRemoteDebug = !GspRemoteDebug; /* toggle debug flag */ break; case 'g': /* return the value of the CPU Registers */ - if (NULL != GspDbgThread) - { - GspGetRegistersFromTrapFrame(&GspOutBuffer[0], Context, GspDbgThread->Tcb.TrapFrame); - } - else - { - GspGetRegistersFromTrapFrame(&GspOutBuffer[0], Context, TrapFrame); - } + GspGetRegisters(GspOutBuffer, TrapFrame); break; case 'G': /* set the value of the CPU Registers - return OK */ if (NULL != GspDbgThread)

20 years

[cwittich] 18461: *add some more stubs for Virtual DOS Machine Debug (six still missing)

by cwittich＠svn.reactos.com

*add some more stubs for Virtual DOS Machine Debug (six still missing) Modified: trunk/reactos/lib/vdmdbg/vdmdbg.c Modified: trunk/reactos/lib/vdmdbg/vdmdbg.def Modified: trunk/reactos/lib/vdmdbg/vdmdbg.h _____ Modified: trunk/reactos/lib/vdmdbg/vdmdbg.c --- trunk/reactos/lib/vdmdbg/vdmdbg.c 2005-10-14 22:04:02 UTC (rev 18460) +++ trunk/reactos/lib/vdmdbg/vdmdbg.c 2005-10-14 22:31:06 UTC (rev 18461) @@ -12,39 +12,189 @@ return FALSE; } +DWORD WINAPI VDMGetDbgFlags( HANDLE hProcess ) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +BOOL WINAPI VDMIsModuleLoaded( LPSTR szPath ) +{ + UNIMPLEMENTED; + return FALSE; +} + +ULONG WINAPI VDMGetPointer( HANDLE handle, + HANDLE handle2, + WORD wSelector, + DWORD dwOffset, + BOOL fProtMode ) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +BOOL WINAPI VDMProcessException( LPDEBUG_EVENT lpDebugEvent ) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI VDMGetSegmentInfo( WORD word, + ULONG ulong, + BOOL boolVal, + VDM_SEGINFO *pVDMSegInfo ) +{ + UNIMPLEMENTED; + return FALSE; +} + + +BOOL WINAPI VDMSetDbgFlags( HANDLE hProcess, + DWORD dwFlags ) +{ + UNIMPLEMENTED; + return FALSE; +} + BOOL WINAPI VDMDetectWOW( void ) { UNIMPLEMENTED; return FALSE; } -INT WINAPI VDMEnumProcessWOW( PROCESSENUMPROC fp, - LPARAM lparam ) +INT WINAPI VDMEnumTaskWOW( DWORD dword, + TASKENUMPROC TaskEnumProc, + LPARAM lParam ) { UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +BOOL WINAPI VDMStartTaskInWOW( DWORD dwProcessId, + LPSTR lpCommandLine, + WORD wShow ) +{ + UNIMPLEMENTED; return FALSE; } +BOOL WINAPI VDMKillWOW( VOID ) +{ + UNIMPLEMENTED; + return FALSE; +} +INT WINAPI VDMEnumProcessWOW( PROCESSENUMPROC ProcessEnumProc, + LPARAM lParam ) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + INT WINAPI VDMEnumTaskWOWEx( DWORD dwProcessId, - TASKENUMPROCEX fp, - LPARAM lparam ) + TASKENUMPROCEX TaskEnumProcEx, + LPARAM lParam ) { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } BOOL WINAPI VDMTerminateTaskWOW( DWORD dwProcessId, - WORD htask ) + WORD hTask ) { UNIMPLEMENTED; return FALSE; } +BOOL WINAPI VDMGetContext( HANDLE handle, + HANDLE handle2, + LPVDMCONTEXT lpVDMContext ) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI VDMSetContext( HANDLE handle, + HANDLE handle2, + LPVDMCONTEXT lpVDMContext) +{ + UNIMPLEMENTED; + return FALSE; +} + + +BOOL WINAPI VDMGetSelectorModule( HANDLE handle, + HANDLE handle2, + WORD word, + PUINT punit, + LPSTR lpModuleName, + UINT uInt, + LPSTR lpstr, + UINT uInt2 ) +{ + UNIMPLEMENTED; + return FALSE; +} + + +BOOL WINAPI VDMGetModuleSelector( HANDLE handle, + HANDLE handle2, + UINT uInt, + LPSTR lpModuleName, + LPWORD lpword ) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI VDMModuleFirst( HANDLE handle, + HANDLE handle2, + LPMODULEENTRY lpModuleEntry, + DEBUGEVENTPROC lpDebugEventProc, + LPVOID lpvoid ) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI VDMGlobalFirst( HANDLE handle, + HANDLE handle2, + LPGLOBALENTRY lpGlobalEntry, + WORD word, + DEBUGEVENTPROC lpDebugEventProc, + LPVOID lpvoid ) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI VDMGlobalNext( HANDLE handle, + HANDLE handle2, + LPGLOBALENTRY lpGlobalEntry, + WORD word, + DEBUGEVENTPROC lpDebugEventProc, + LPVOID lpvoid ) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI VDMModuleNext( HANDLE handle, + HANDLE handle2, + LPMODULEENTRY lpModuleEntry, + DEBUGEVENTPROC lpDebugEventProc, + LPVOID lpvoid ) +{ + UNIMPLEMENTED; + return FALSE; +} + BOOL STDCALL -DllMain(IN HINSTANCE hinstDLL, - IN DWORD dwReason, - IN LPVOID lpvReserved) +DllMain( IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved ) { switch (dwReason) { _____ Modified: trunk/reactos/lib/vdmdbg/vdmdbg.def --- trunk/reactos/lib/vdmdbg/vdmdbg.def 2005-10-14 22:04:02 UTC (rev 18460) +++ trunk/reactos/lib/vdmdbg/vdmdbg.def 2005-10-14 22:31:06 UTC (rev 18461) @@ -29,28 +29,28 @@ VDMBreakThread@8 VDMDetectWOW@0 VDMEnumProcessWOW@8 -;VDMEnumTaskWOW@12 +VDMEnumTaskWOW@12 VDMEnumTaskWOWEx@12 ;VDMGetAddrExpression@20 -;VDMGetContext@12 -;VDMGetDbgFlags@4 -;VDMGetModuleSelector@20 -;VDMGetPointer@20 -;VDMGetSegmentInfo@16 +VDMGetContext@12 +VDMGetDbgFlags@4 +VDMGetModuleSelector@20 +VDMGetPointer@20 +VDMGetSegmentInfo@16 ;VDMGetSegtablePointer@0 -;VDMGetSelectorModule@32 +VDMGetSelectorModule@32 ;VDMGetSymbol@28 ;VDMGetThreadContext@8 ;VDMGetThreadSelectorEntry@16 -;VDMGlobalFirst@24 -;VDMGlobalNext@24 -;VDMIsModuleLoaded@4 -;VDMKillWOW@0 -;VDMModuleFirst@20 -;VDMModuleNext@20 -;VDMProcessException@4 -;VDMSetContext@12 -;VDMSetDbgFlags@8 +VDMGlobalFirst@24 +VDMGlobalNext@24 +VDMIsModuleLoaded@4 +VDMKillWOW@0 +VDMModuleFirst@20 +VDMModuleNext@20 +VDMProcessException@4 +VDMSetContext@12 +VDMSetDbgFlags@8 ;VDMSetThreadContext@8 -;VDMStartTaskInWOW@12 +VDMStartTaskInWOW@12 VDMTerminateTaskWOW@8 _____ Modified: trunk/reactos/lib/vdmdbg/vdmdbg.h --- trunk/reactos/lib/vdmdbg/vdmdbg.h 2005-10-14 22:04:02 UTC (rev 18460) +++ trunk/reactos/lib/vdmdbg/vdmdbg.h 2005-10-14 22:31:06 UTC (rev 18461) @@ -1,24 +1,73 @@ #include <windows.h> +#define MAX_PATH16 255 +#define MAX_MODULE_NAME 9 + ULONG DbgPrint(PCH Format,...); +typedef struct _CONTEXT VDMCONTEXT; +typedef VDMCONTEXT *LPVDMCONTEXT; + +typedef struct _VDM_SEGINFO { + WORD Selector; + WORD SegNumber; + DWORD Length; + WORD Type; + CHAR ModuleName[MAX_MODULE_NAME]; + CHAR FileName[MAX_PATH16]; +} VDM_SEGINFO; + +typedef struct { + DWORD dwSize; + char szModule[MAX_MODULE_NAME+1]; + HANDLE hModule; + WORD wcUsage; + char szExePath[MAX_PATH16+1]; + WORD wNext; +} MODULEENTRY, *LPMODULEENTRY; + typedef BOOL ( WINAPI *PROCESSENUMPROC ) ( - DWORD dwProcessId, - DWORD dwAttributes, + DWORD dwProcessId, + DWORD dwAttributes, LPARAM lpUserDefined ); typedef BOOL ( WINAPI *TASKENUMPROCEX ) ( DWORD dwThreadId, - WORD hMod16, - WORD hTask16, - PSZ pszModName, - PSZ pszFileName, + WORD hMod16, + WORD hTask16, + PSZ pszModName, + PSZ pszFileName, LPARAM lpUserDefined ); +typedef struct { + DWORD dwSize; + DWORD dwAddress; + DWORD dwBlockSize; + HANDLE hBlock; + WORD wcLock; + WORD wcPageLock; + WORD wFlags; + BOOL wHeapPresent; + HANDLE hOwner; + WORD wType; + WORD wData; + DWORD dwNext; + DWORD dwNextAlt; +} GLOBALENTRY, *LPGLOBALENTRY; + +typedef DWORD ( CALLBACK* DEBUGEVENTPROC ) + ( LPDEBUG_EVENT, LPVOID ); + +typedef BOOL ( WINAPI *TASKENUMPROC ) + ( DWORD dwThreadId, + WORD hMod16, + WORD hTask16, + LPARAM lpUserDefined ); + extern HINSTANCE hDllInstance; /* EOF */

20 years

[hpoussin] 18460: Fix the HKLM\SYSTEM\CurrentControlSet\Services\Tcpip\Linkage\Export value. The GUID needs to be prepended by "Tcpip_"

by hpoussin＠svn.reactos.com

Fix the HKLM\SYSTEM\CurrentControlSet\Services\Tcpip\Linkage\Export value. The GUID needs to be prepended by "Tcpip_" Modified: trunk/reactos/lib/netcfgx/netcfgx.c _____ Modified: trunk/reactos/lib/netcfgx/netcfgx.c --- trunk/reactos/lib/netcfgx/netcfgx.c 2005-10-14 21:35:03 UTC (rev 18459) +++ trunk/reactos/lib/netcfgx/netcfgx.c 2005-10-14 22:04:02 UTC (rev 18460) @@ -104,6 +104,7 @@ LPWSTR UuidRpcString = NULL; LPWSTR UuidString = NULL; LPWSTR DeviceName = NULL; + LPWSTR ExportName = NULL; LONG rc; HKEY hKey = INVALID_HANDLE_VALUE; HKEY hLinkageKey = INVALID_HANDLE_VALUE; @@ -151,6 +152,17 @@ } wcscpy(DeviceName, L"\\Device\\"); wcscat(DeviceName, UuidString); + + /* Create export name */ + ExportName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\Tcpip_") + wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!ExportName) + { + DPRINT("HeapAlloc() failed\n"); + rc = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + wcscpy(ExportName, L"\\Device\\Tcpip_"); + wcscat(ExportName, UuidString); /* Write Tcpip parameters in new service Key */ rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services", 0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL, &hKey, NULL); @@ -269,22 +281,21 @@ rc = AppendStringToMultiSZ(hKey, L"Bind", DeviceName); if (rc != ERROR_SUCCESS) goto cleanup; - rc = AppendStringToMultiSZ(hKey, L"Export", DeviceName); + rc = AppendStringToMultiSZ(hKey, L"Export", ExportName); if (rc != ERROR_SUCCESS) goto cleanup; rc = AppendStringToMultiSZ(hKey, L"Route", UuidString); if (rc != ERROR_SUCCESS) goto cleanup; - rc = ERROR_DI_DO_DEFAULT; + rc = ERROR_SUCCESS; cleanup: if (UuidRpcString != NULL) RpcStringFreeW(&UuidRpcString); - if (UuidString != NULL) - HeapFree(GetProcessHeap(), 0, UuidString); - if (DeviceName != NULL) - HeapFree(GetProcessHeap(), 0, DeviceName); + HeapFree(GetProcessHeap(), 0, UuidString); + HeapFree(GetProcessHeap(), 0, DeviceName); + HeapFree(GetProcessHeap(), 0, ExportName); if (hKey != INVALID_HANDLE_VALUE) RegCloseKey(hKey); if (hLinkageKey != INVALID_HANDLE_VALUE)

20 years

[gedmurphy] 18459: - Implement -r Calling route.exe for output

by gedmurphy＠svn.reactos.com

- Implement -r Calling route.exe for output - Rewrote DisplayOutput so simulates the MS netstat tool better and is now readable - Fix ShowTcpTable to show correct endpoints on default, and expand it a little so it's easier to follow - expand ShowUdpTable in the same manner - Cleaner formatting in GetPortName Modified: trunk/reactos/apps/utils/net/netstat/netstat.c Modified: trunk/reactos/apps/utils/net/netstat/netstat.h _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.c --- trunk/reactos/apps/utils/net/netstat/netstat.c 2005-10-14 20:19:23 UTC (rev 18458) +++ trunk/reactos/apps/utils/net/netstat/netstat.c 2005-10-14 21:35:03 UTC (rev 18459) @@ -31,10 +31,9 @@ /* * TODO: - * rewrite DisplayOutput - * sort function return values. BOOL is crap + * sort function return values. * implement -b, -o and -v - * clean up GetPortName and GetIpHostName + * clean up GetIpHostName * command line parser needs more work */ @@ -45,9 +44,6 @@ #include <iphlpapi.h> #include "netstat.h" -CHAR localname[HOSTNAMELEN], remotename[HOSTNAMELEN]; -CHAR remoteport[PORTNAMELEN], localport[PORTNAMELEN]; -CHAR localaddr[ADDRESSLEN], remoteaddr[ADDRESSLEN]; enum ProtoType {IP, TCP, UDP, ICMP} Protocol; DWORD Interval; /* time to pause between printing output */ @@ -71,6 +67,37 @@ /* + * format message string and display output + */ +DWORD DoFormatMessage(DWORD ErrorCode) +{ + LPVOID lpMsgBuf; + DWORD RetVal; + + if ((RetVal = FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + ErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ + (LPTSTR) &lpMsgBuf, + 0, + NULL ))) + { + _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); + + LocalFree(lpMsgBuf); + /* return number of TCHAR's stored in output buffer + * excluding '\0' - as FormatMessage does*/ + return RetVal; + } + else + return 0; +} + + +/* * * Parse command line parameters and set any options * @@ -132,7 +159,7 @@ (--argv)[i]; /* move pointer back down to previous argv */ break; case 'r' : - bDoShowRouteTable = FALSE; + bDoShowRouteTable = TRUE; break; case 'v' : _tprintf(_T("got v\n")); @@ -159,12 +186,11 @@ return EXIT_SUCCESS; } -/* Simulate Microsofts netstat utility output. It's a bit - * ugly and over nested, but it is a fairly acurate simulation - * It was easier for testing, I'll rewrite it later with flags - * For now, it works*/ + +/* + * Simulate Microsofts netstat utility output + */ BOOL DisplayOutput() -// FIXME: This whole function needs rewriting { if (bNoOptions) { @@ -173,12 +199,6 @@ return EXIT_SUCCESS; } - if (bDoShowEthStats) - { - ShowEthernetStatistics(); - return EXIT_SUCCESS; - } - if (bDoShowRouteTable) { if (system("route print") == -1) @@ -187,152 +207,72 @@ _tprintf(_T("cannot find 'route.exe'\n")); return EXIT_FAILURE; } + return EXIT_SUCCESS; } - /* output connections: -a */ - if (bDoShowAllCons) + if (bDoShowEthStats) { - /* filter out certain protocols: -p */ - if (bDoShowProtoCons) - { - /* do we want to list the stats: -s */ - if (bDoShowProtoStats) - { - switch (Protocol) - { - case IP : - ShowIpStatistics(); - break; - case ICMP : - ShowIcmpStatistics(); - break; - case TCP : - ShowTcpStatistics(); - _tprintf(_T("\nActive Connections\n")); - _tprintf(_T("\n Proto Local Address Foreign Address State\n")); - ShowTcpTable(); - break; - case UDP : - ShowUdpStatistics(); - _tprintf(_T("\nActive Connections\n")); - _tprintf(_T("\n Proto Local Address Foreign Address State\n")); - ShowUdpTable(); - break; - default : - break; - } - return EXIT_SUCCESS; - } - else - { - switch (Protocol) - { - case IP : - break; - case ICMP : - ShowIcmpStatistics(); - break; - case TCP : - _tprintf(_T("\nActive Connections\n")); - _tprintf(_T("\n Proto Local Address Foreign Address State\n")); - ShowTcpTable(); - break; - case UDP : - _tprintf(_T("\nActive Connections\n")); - _tprintf(_T("\n Proto Local Address Foreign Address State\n")); - ShowUdpTable(); - break; - default : - break; - } - return EXIT_SUCCESS; - } - - } - else - { - _tprintf(_T("\nActive Connections\n")); - _tprintf(_T("\n Proto Local Address Foreign Address State\n")); - ShowTcpTable(); - ShowUdpTable(); - return EXIT_SUCCESS; - } + ShowEthernetStatistics(); + return EXIT_SUCCESS; } - /* do we want to list the stats: -s */ - if (bDoShowProtoStats) + if (bDoShowProtoCons) { - if (bDoShowProtoCons) // -p + switch (Protocol) { - /* show individual protocols only */ - switch (Protocol) - { case IP : - ShowIpStatistics(); + if (bDoShowProtoStats) + { + ShowIpStatistics(); + return EXIT_SUCCESS; + } break; case ICMP : - ShowIcmpStatistics(); + if (bDoShowProtoStats) + { + ShowIcmpStatistics(); + return EXIT_SUCCESS; + } break; case TCP : - ShowTcpStatistics(); + if (bDoShowProtoStats) + ShowTcpStatistics(); _tprintf(_T("\nActive Connections\n")); _tprintf(_T("\n Proto Local Address Foreign Address State\n")); ShowTcpTable(); break; case UDP : - ShowUdpStatistics(); + if (bDoShowProtoStats) + ShowUdpStatistics(); _tprintf(_T("\nActive Connections\n")); _tprintf(_T("\n Proto Local Address Foreign Address State\n")); ShowUdpTable(); break; default : break; - } - return EXIT_SUCCESS; } - else - { - /* list the lot */ - ShowIpStatistics(); - ShowIcmpStatistics(); - ShowTcpStatistics(); - ShowUdpStatistics(); - return EXIT_SUCCESS; - } } + else if (bDoShowProtoStats) + { + ShowIpStatistics(); + ShowIcmpStatistics(); + ShowTcpStatistics(); + ShowUdpStatistics(); + return EXIT_SUCCESS; + } + else //if (bDoShowAllCons) + { + _tprintf(_T("\nActive Connections\n")); + _tprintf(_T("\n Proto Local Address Foreign Address State\n")); + ShowTcpTable(); + ShowUdpTable(); + } return EXIT_SUCCESS; } -/* format message string and display output */ -DWORD DoFormatMessage(DWORD ErrorCode) -{ - LPVOID lpMsgBuf; - DWORD RetVal; - if ((RetVal = FormatMessage( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - ErrorCode, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ - (LPTSTR) &lpMsgBuf, - 0, - NULL ))) - { - _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); - LocalFree(lpMsgBuf); - /* return number of TCHAR's stored in output buffer - * excluding '\0' - as FormatMessage does*/ - return RetVal; - } - else - return 0; -} - - VOID ShowIpStatistics() { PMIB_IPSTATS pIpStats; @@ -490,8 +430,12 @@ PMIB_TCPTABLE tcpTable; DWORD error, dwSize; DWORD i; + CHAR HostIp[HOSTNAMELEN], HostPort[PORTNAMELEN]; + CHAR RemoteIp[HOSTNAMELEN], RemotePort[PORTNAMELEN]; + CHAR Host[ADDRESSLEN]; + CHAR Remote[ADDRESSLEN]; - // Get the table of TCP endpoints + /* Get the table of TCP endpoints */ dwSize = 0; error = GetTcpTable(NULL, &dwSize, TRUE); if (error != ERROR_INSUFFICIENT_BUFFER) @@ -509,21 +453,26 @@ exit(EXIT_FAILURE); } - // Dump the TCP table + /* Dump the TCP table */ for (i = 0; i < tcpTable->dwNumEntries; i++) { - if (bDoShowAllCons || (tcpTable->table[i].dwState == - MIB_TCP_STATE_ESTAB)) + /* If we aren't showing all connections, only display established, close wait + * and time wait. This is the default output for netstat */ + if (bDoShowAllCons || (tcpTable->table[i].dwState == MIB_TCP_STATE_ESTAB) + || (tcpTable->table[i].dwState == MIB_TCP_STATE_CLOSE_WAIT) + || (tcpTable->table[i].dwState == MIB_TCP_STATE_TIME_WAIT)) { - sprintf(localaddr, "%s:%s", - GetIpHostName(TRUE, tcpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN), - GetPortName(tcpTable->table[i].dwLocalPort, "tcp", localport, PORTNAMELEN)); - sprintf(remoteaddr, "%s:%s", - GetIpHostName(FALSE, tcpTable->table[i].dwRemoteAddr, remotename, HOSTNAMELEN), - tcpTable->table[i].dwRemoteAddr ? - GetPortName(tcpTable->table[i].dwRemotePort, "tcp", remoteport, PORTNAMELEN): - "0"); - _tprintf(_T(" %-6s %-22s %-22s %s\n"), _T("TCP"), localaddr, remoteaddr, TcpState[tcpTable->table[i].dwState]); + /* I've split this up so it's easier to follow */ + GetIpHostName(TRUE, tcpTable->table[i].dwLocalAddr, HostIp, HOSTNAMELEN); + GetPortName(tcpTable->table[i].dwLocalPort, "tcp", HostPort, PORTNAMELEN); + GetIpHostName(FALSE, tcpTable->table[i].dwRemoteAddr, RemoteIp, HOSTNAMELEN); + GetPortName(tcpTable->table[i].dwRemotePort, "tcp", RemotePort, PORTNAMELEN); + + sprintf(Host, "%s:%s", HostIp, HostPort); + sprintf(Remote, "%s:%s", RemoteIp, RemotePort); + + _tprintf(_T(" %-6s %-22s %-22s %s\n"), _T("TCP"), + Host, Remote, TcpState[tcpTable->table[i].dwState]); } } } @@ -534,8 +483,10 @@ PMIB_UDPTABLE udpTable; DWORD error, dwSize; DWORD i; + CHAR HostIp[HOSTNAMELEN], HostPort[PORTNAMELEN]; + CHAR Host[ADDRESSLEN]; - // Get the table of UDP endpoints + /* Get the table of UDP endpoints */ dwSize = 0; error = GetUdpTable(NULL, &dwSize, TRUE); if (error != ERROR_INSUFFICIENT_BUFFER) @@ -553,38 +504,40 @@ exit(EXIT_FAILURE); } - // Dump the UDP table + /* Dump the UDP table */ for (i = 0; i < udpTable->dwNumEntries; i++) { - sprintf(localaddr, "%s:%s", - GetIpHostName(TRUE, udpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN), - GetPortName(udpTable->table[i].dwLocalPort, "tcp", localport, PORTNAMELEN)); - _tprintf(_T(" %-6s %-22s %-22s\n"), _T("UDP"), localaddr, _T(":*:")); + + /* I've split this up so it's easier to follow */ + GetIpHostName(TRUE, udpTable->table[i].dwLocalAddr, HostIp, HOSTNAMELEN); + GetPortName(udpTable->table[i].dwLocalPort, "tcp", HostPort, PORTNAMELEN); + + sprintf(Host, "%s:%s", HostIp, HostPort); + + _tprintf(_T(" %-6s %-22s %-22s\n"), _T("UDP"), Host, _T(":*:")); } } -// -// GetPortName -// -// Translate port numbers into their text equivalent if there is one -// +/* + * Translate port numbers into their text equivalent if there is one + */ PCHAR -GetPortName(UINT port, PCHAR proto, PCHAR name, int namelen) +GetPortName(UINT Port, PCHAR Proto, CHAR Name[], INT NameLen) { - struct servent *psrvent; + struct servent *pSrvent; - if (bDoShowNumbers) { - sprintf(name, "%d", htons((WORD)port)); - return name; + if (bDoShowNumbers) + { + sprintf(Name, "%d", htons((WORD)Port)); + return Name; } - // Try to translate to a name - if ((psrvent = getservbyport(port, proto))) { - strcpy(name, psrvent->s_name ); - } else { - sprintf(name, "%d", htons((WORD)port)); - } - return name; + /* Try to translate to a name */ + if ((pSrvent = getservbyport(Port, Proto))) + strcpy(Name, pSrvent->s_name ); + else + sprintf(Name, "%d", htons((WORD)Port)); + return Name; } @@ -594,51 +547,51 @@ // Translate IP addresses into their name-resolved form if possible. // PCHAR -GetIpHostName(BOOL local, UINT ipaddr, PCHAR name, int namelen) +GetIpHostName(BOOL Local, UINT IpAddr, CHAR Name[], int NameLen) { // struct hostent *phostent; - UINT nipaddr; + UINT nIpAddr; // Does the user want raw numbers? - nipaddr = htonl(ipaddr); + nIpAddr = htonl(IpAddr); if (bDoShowNumbers) { - sprintf(name, "%d.%d.%d.%d", - (nipaddr >> 24) & 0xFF, - (nipaddr >> 16) & 0xFF, - (nipaddr >> 8) & 0xFF, - (nipaddr) & 0xFF); - return name; + sprintf(Name, "%d.%d.%d.%d", + (nIpAddr >> 24) & 0xFF, + (nIpAddr >> 16) & 0xFF, + (nIpAddr >> 8) & 0xFF, + (nIpAddr) & 0xFF); + return Name; } - name[0] = _T('\0'); + Name[0] = L'\0'; // Try to translate to a name - if (!ipaddr) { - if (!local) { - sprintf(name, "%d.%d.%d.%d", - (nipaddr >> 24) & 0xFF, - (nipaddr >> 16) & 0xFF, - (nipaddr >> 8) & 0xFF, - (nipaddr) & 0xFF); + if (!IpAddr) { + if (!Local) { + sprintf(Name, "%d.%d.%d.%d", + (nIpAddr >> 24) & 0xFF, + (nIpAddr >> 16) & 0xFF, + (nIpAddr >> 8) & 0xFF, + (nIpAddr) & 0xFF); } else { //gethostname(name, namelen); } - } else if (ipaddr == 0x0100007f) { - if (local) { + } else if (IpAddr == 0x0100007f) { + if (Local) { //gethostname(name, namelen); } else { - strcpy(name, "localhost"); + strcpy(Name, "localhost"); } // } else if (phostent = gethostbyaddr((char*)&ipaddr, sizeof(nipaddr), PF_INET)) { // strcpy(name, phostent->h_name); } else { - sprintf(name, "%d.%d.%d.%d", - ((nipaddr >> 24) & 0x000000FF), - ((nipaddr >> 16) & 0x000000FF), - ((nipaddr >> 8) & 0x000000FF), - ((nipaddr) & 0x000000FF)); + sprintf(Name, "%d.%d.%d.%d", + ((nIpAddr >> 24) & 0x000000FF), + ((nIpAddr >> 16) & 0x000000FF), + ((nIpAddr >> 8) & 0x000000FF), + ((nIpAddr) & 0x000000FF)); } - return name; + return Name; } VOID Usage() _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.h --- trunk/reactos/apps/utils/net/netstat/netstat.h 2005-10-14 20:19:23 UTC (rev 18458) +++ trunk/reactos/apps/utils/net/netstat/netstat.h 2005-10-14 21:35:03 UTC (rev 18459) @@ -1,6 +1,5 @@ -// Maximum string lengths for ASCII ip address and port names -// +/* Maximum string lengths for ASCII ip address and port names */ #define HOSTNAMELEN 256 #define PORTNAMELEN 256 #define ADDRESSLEN HOSTNAMELEN+PORTNAMELEN @@ -55,7 +54,7 @@ VOID ShowEthernetStatistics(VOID); VOID ShowTcpTable(VOID); VOID ShowUdpTable(VOID); -PCHAR GetPortName(UINT port, PCHAR proto, PCHAR name, int namelen); -PCHAR GetIpHostName(BOOL local, UINT ipaddr, PCHAR name, int namelen); +PCHAR GetPortName(UINT Port, PCHAR Proto, CHAR Name[PORTNAMELEN], INT NameLen); +PCHAR GetIpHostName(BOOL local, UINT ipaddr, CHAR name[HOSTNAMELEN], int namelen); VOID Usage(VOID);

20 years

← Newer
1
...
43
44
45
46
47
48
49
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005