Deleted: trunk/reactos/include/GL/
Deleted: trunk/reactos/include/ddentry.h
Deleted: trunk/reactos/include/expat/
Deleted: trunk/reactos/include/tcpmisc.h
Deleted: trunk/reactos/include/tgetopt.h
Modified: trunk/reactos/include/win32k/gdiobj.h
Modified: trunk/reactos/lib/gdi32/include/precomp.h
Modified: trunk/reactos/lib/iphlpapi/iphlpapi_private.h
Added: trunk/reactos/lib/tgetopt/tgetopt.h
Modified: trunk/reactos/w32api/include/ddk/winddi.h
Added: trunk/reactos/w32api/include/ddrawgdi.h
Modified: trunk/reactos/w32api/include/tcpioctl.h
--- trunk/reactos/include/ddentry.h 2005-06-30 12:22:27 UTC (rev 16341)
+++ trunk/reactos/include/ddentry.h 2005-06-30 12:31:36 UTC (rev 16342)
@@ -1,95 +0,0 @@
-/*
- * DirectDraw GDI32.dll interface definitions
- * Copyright (C) 2003 ReactOS Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#include <ddk/ddrawi.h>
-#include <ddk/d3dhal.h>
-#include <ddk/winddi.h>
-BOOL STDCALL DdCreateDirectDrawObject(
-LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
-HDC hdc
-);
-BOOL STDCALL DdQueryDirectDrawObject(
-LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
-LPDDHALINFO pHalInfo,
-LPDDHAL_DDCALLBACKS pDDCallbacks,
-LPDDHAL_DDSURFACECALLBACKS pDDSurfaceCallbacks,
-LPDDHAL_DDPALETTECALLBACKS pDDPaletteCallbacks,
-LPD3DHAL_CALLBACKS pD3dCallbacks,
-LPD3DHAL_GLOBALDRIVERDATA pD3dDriverData,
-LPDDHAL_DDEXEBUFCALLBACKS pD3dBufferCallbacks,
-LPDDSURFACEDESC pD3dTextureFormats,
-LPDWORD pdwFourCC,
-LPVIDMEM pvmList
-);
-BOOL STDCALL DdDeleteDirectDrawObject(
-LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal
-);
-BOOL STDCALL DdCreateSurfaceObject(
-LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
-BOOL bPrimarySurface
-);
-BOOL STDCALL DdDeleteSurfaceObject(
-LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal
-);
-BOOL STDCALL DdResetVisrgn(
-LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
-HWND hWnd
-);
-BOOL STDCALL DdGetDC(
-LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
-LPPALETTEENTRY pColorTable
-);
-BOOL STDCALL DdReleaseDC(
-LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal
-);
-HBITMAP STDCALL DdCreateDIBSection(
-HDC hdc,
-CONST BITMAPINFO *pbmi,
-UINT iUsage,
-VOID **ppvBits,
-HANDLE hSectionApp,
-DWORD dwOffset
-);
-BOOL STDCALL DdReenableDirectDrawObject(
-LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
-BOOL *pbNewMode
-);
-BOOL STDCALL DdAttachSurface(
-LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom,
-LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo
-);
-VOID STDCALL DdUnattachSurface(
-LPDDRAWI_DDRAWSURFACE_LCL pSurface,
-LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached
-);
-ULONG STDCALL DdQueryDisplaySettingsUniqueness(VOID);
-HANDLE STDCALL DdGetDxHandle(
-LPDDRAWI_DIRECTDRAW_LCL pDDraw,
-LPDDRAWI_DDRAWSURFACE_LCL pSurface,
-BOOL bRelease
-);
-BOOL STDCALL DdSetGammaRamp(
-LPDDRAWI_DIRECTDRAW_LCL pDDraw,
-HDC hdc,
-LPVOID lpGammaRamp
-);
-DWORD STDCALL DdSwapTextureHandles(
-LPDDRAWI_DIRECTDRAW_LCL pDDraw,
-LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1,
-LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2
-);
--- trunk/reactos/include/tcpmisc.h 2005-06-30 12:22:27 UTC (rev 16341)
+++ trunk/reactos/include/tcpmisc.h 2005-06-30 12:31:36 UTC (rev 16342)
@@ -1,98 +0,0 @@
-#ifndef TCPMISC_H
-#define TCPMISC_H
-
-#define IF_MIB_STATS_ID 1
-#define MAX_PHYSADDR_SIZE 8
-#define MAX_IFDESCR_LEN 256
-
-/* ID to use for requesting an IFEntry for an interface */
-#define IF_MIB_STATS_ID 1
-
-/* ID to use for requesting an IPSNMPInfo for an interface */
-#define IP_MIB_STATS_ID 1
-
-/* ID to use for requesting the route table */
-#define IP_MIB_ROUTETABLE_ENTRY_ID 0x101
-#define IP_MIB_ADDRTABLE_ENTRY_ID 0x102
-
-typedef struct IFEntry {
- ULONG if_index;
- ULONG if_type;
- ULONG if_mtu;
- ULONG if_speed;
- ULONG if_physaddrlen;
- UCHAR if_physaddr[MAX_PHYSADDR_SIZE];
- ULONG if_adminstatus;
- ULONG if_operstatus;
- ULONG if_lastchange;
- ULONG if_inoctets;
- ULONG if_inucastpkts;
- ULONG if_innucastpkts;
- ULONG if_indiscards;
- ULONG if_inerrors;
- ULONG if_inunknownprotos;
- ULONG if_outoctets;
- ULONG if_outucastpkts;
- ULONG if_outnucastpkts;
- ULONG if_outdiscards;
- ULONG if_outerrors;
- ULONG if_outqlen;
- ULONG if_descrlen;
- UCHAR if_descr[1];
-} IFEntry;
-
-// As in the mib from RFC 1213
-
-typedef struct _IPRouteEntry {
- ULONG ire_dest;
- ULONG ire_index; //matches if_index in IFEntry and iae_index in IPAddrEntry
- ULONG ire_metric1;
- ULONG ire_metric2;
- ULONG ire_metric3;
- ULONG ire_metric4;
- ULONG ire_gw;
- ULONG ire_type;
- ULONG ire_proto;
- ULONG ire_age;
- ULONG ire_mask;
- ULONG ire_metric5;
- ULONG ire_info;
-} IPRouteEntry;
-
-typedef struct _IPAddrEntry {
- ULONG iae_addr;
- ULONG iae_index;
- ULONG iae_mask;
- ULONG iae_bcastaddr;
- ULONG iae_reasmsize;
- ULONG iae_context;
- ULONG iae_pad;
-} IPAddrEntry;
-
-typedef struct _IPSNMPInfo {
- ULONG ipsi_index;
- ULONG ipsi_forwarding;
- ULONG ipsi_defaultttl;
- ULONG ipsi_inreceives;
- ULONG ipsi_inhdrerrors;
- ULONG ipsi_inaddrerrors;
- ULONG ipsi_inunknownprotos;
- ULONG ipsi_indiscards;
- ULONG ipsi_indelivers;
- ULONG ipsi_outrequests;
- ULONG ipsi_routingdiscards;
- ULONG ipsi_outdiscards;
- ULONG ipsi_outnoroutes;
- ULONG ipsi_reasmtimeout;
- ULONG ipsi_reasmreqds;
- ULONG ipsi_reasmoks;
- ULONG ipsi_reasmfails;
- ULONG ipsi_fragoks;
- ULONG ipsi_fragfails;
- ULONG ipsi_fragcreates;
- ULONG ipsi_numif;
- ULONG ipsi_numaddr;
- ULONG ipsi_numroutes;
-} IPSNMPInfo;
-
-#endif /* TCPMISC_H */
--- trunk/reactos/include/tgetopt.h 2005-06-30 12:22:27 UTC (rev 16341)
+++ trunk/reactos/include/tgetopt.h 2005-06-30 12:31:36 UTC (rev 16342)
@@ -1,90 +0,0 @@
-#ifndef _GETOPT_H
-#define _GETOPT_H 1
-
-#include <tchar.h>
-
-#ifdef _UNICODE
-#define _toption _woption
-#define _toptarg _woptarg
-#define _toptind _woptind
-#define _topterr _wopterr
-#define _toptopt _woptopt
-#define _tgetopt _wgetopt
-#define _tgetopt_long _wgetopt_long
-#define _tgetopt_long_only _wgetopt_long_only
-#define _tgetopt_internal _wgetopt_internal
-#else
-#define _toption option
-#define _toptarg optarg
-#define _toptind optind
-#define _topterr opterr
-#define _toptopt optopt
-#define _tgetopt getopt
-#define _tgetopt_long getopt_long
-#define _tgetopt_long_only getopt_long_only
-#define _tgetopt_internal _getopt_internal
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-extern char *optarg;
-extern int optind;
-extern int opterr;
-extern int optopt;
-
-extern wchar_t *_woptarg;
-extern int _woptind;
-extern int _wopterr;
-extern int _woptopt;
-
-struct option
-{
- const char *name;
- int has_arg;
- int *flag;
- int val;
-};
-
-struct _woption
-{
- const wchar_t *name;
- int has_arg;
- int *flag;
- int val;
-};
-
-#define no_argument 0
-#define required_argument 1
-#define optional_argument 2
-
-extern int getopt (int argc, char *const *argv, const char *shortopts);
-extern int getopt_long (int argc, char *const *argv, const char *shortopts,
- const struct option *longopts, int *longind);
-extern int getopt_long_only (int argc, char *const *argv,
- const char *shortopts, const struct option *longopts, int *longind);
-
-extern int _wgetopt (int argc, wchar_t *const *argv, const wchar_t *shortopts);
-extern int _wgetopt_long (int argc, wchar_t *const *argv, const wchar_t *shortopts,
- const struct _woption *longopts, int *longind);
-extern int _wgetopt_long_only (int argc, wchar_t *const *argv,
- const wchar_t *shortopts,
- const struct _woption *longopts, int *longind);
-
-extern int _getopt_internal (int argc, char *const *argv,
- const char *shortopts, const struct option *longopts, int *longind,
- int long_only);
-
-extern int _wgetopt_internal (int argc, wchar_t *const *argv,
- const wchar_t *shortopts,
- const struct _woption *longopts, int *longind,
- int long_only);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GETOPT_H */
-
--- trunk/reactos/include/win32k/gdiobj.h 2005-06-30 12:22:27 UTC (rev 16341)
+++ trunk/reactos/include/win32k/gdiobj.h 2005-06-30 12:31:36 UTC (rev 16342)
@@ -58,7 +58,9 @@
typedef PVOID PGDIOBJ;
+#ifndef NTOS_MODE_USER
typedef BOOL (INTERNAL_CALL *GDICLEANUPPROC)(PVOID ObjectBody);
+#endif
/*!
* GDI object header. This is a part of any GDI object
--- trunk/reactos/lib/gdi32/include/precomp.h 2005-06-30 12:22:27 UTC (rev 16341)
+++ trunk/reactos/lib/gdi32/include/precomp.h 2005-06-30 12:31:36 UTC (rev 16342)
@@ -1,11 +1,26 @@
+/*
+ * COPYRIGHT: See COPYING in the top level directory
+ * PROJECT: ReactOS System Libraries
+ * FILE: lib/gdi32/include/precomp.h
+ * PURPOSE: User-Mode Win32 GDI Library Header
+ * PROGRAMMER: Alex Ionescu (alex@relsoft.net)
+ */
+
+/* INCLUDES ******************************************************************/
+
+/* SDK/DDK/NDK Headers. */
#include <windows.h>
+#include <ddraw.h>
+#include <ddk/winddi.h>
+#include <ddk/prntfont.h>
+#include <ddrawgdi.h>
#define NTOS_MODE_USER
#include <ndk/ntndk.h>
-#include <ddentry.h>
-#include <ddraw.h>
-#include <ddk/prntfont.h>
-#include <string.h>
+
+/* Win32K External Headers */
#include <win32k/kapi.h>
+
+/* FIXME: ROSRTL */
#include <rosrtl/logfont.h>
#include <rosrtl/devmode.h>
@@ -21,7 +36,6 @@
#define NtUserSetDCPenColor(hbr, crColor) \
(COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUTINE_SETDCPENCOLOR)
-#ifdef __USE_W32API
typedef int (CALLBACK* EMFPLAYPROC)( HDC, INT, HANDLE );
typedef DWORD FULLSCREENCONTROL;
typedef DWORD UNIVERSAL_FONT_ID;
@@ -30,7 +44,6 @@
typedef REALIZATION_INFO *PREALIZATION_INFO;
typedef DWORD CHWIDTHINFO;
typedef CHWIDTHINFO *PCHWIDTHINFO;
-#endif
/* == GLOBAL VARIABLES ====================================================== */
--- trunk/reactos/lib/iphlpapi/iphlpapi_private.h 2005-06-30 12:22:27 UTC (rev 16341)
+++ trunk/reactos/lib/iphlpapi/iphlpapi_private.h 2005-06-30 12:31:36 UTC (rev 16342)
@@ -25,7 +25,6 @@
#define NTOS_MODE_USER
#include <ndk/ntndk.h>
#include <rosrtl/string.h>
-#include <tcpmisc.h>
#include <winsock2.h>
#include <nspapi.h>
#include <iptypes.h>
@@ -59,6 +58,26 @@
#define TCP_REQUEST_QUERY_INFORMATION_INIT { { { 0 } } }
#define TCP_REQUEST_SET_INFORMATION_INIT { { 0 } }
+#define IP_MIB_ROUTETABLE_ENTRY_ID 0x101
+
+// As in the mib from RFC 1213
+
+typedef struct _IPRouteEntry {
+ ULONG ire_dest;
+ ULONG ire_index; //matches if_index in IFEntry and iae_index in IPAddrEntry
+ ULONG ire_metric1;
+ ULONG ire_metric2;
+ ULONG ire_metric3;
+ ULONG ire_metric4;
+ ULONG ire_gw;
+ ULONG ire_type;
+ ULONG ire_proto;
+ ULONG ire_age;
+ ULONG ire_mask;
+ ULONG ire_metric5;
+ ULONG ire_info;
+} IPRouteEntry;
+
/* No caddr_t in reactos headers */
typedef char *caddr_t;
--- trunk/reactos/w32api/include/ddk/winddi.h 2005-06-30 12:22:27 UTC (rev 16341)
+++ trunk/reactos/w32api/include/ddk/winddi.h 2005-06-30 12:31:36 UTC (rev 16342)
@@ -31,43 +31,13 @@
#error video.h cannot be included with winddi.h
#else
-#include <wingdi.h>
+#include <ddrawint.h>
+#include <d3dnthal.h>
#ifdef __cplusplus
extern "C" {
#endif
-#ifndef __DD_INCLUDED__
-/* FIXME: Some DirectDraw structures not added yet */
-typedef ULONG_PTR FLATPTR;
-typedef struct _DD_SURFACECALLBACKS {
-} DD_SURFACECALLBACKS, *PDD_SURFACECALLBACKS;
-typedef struct _DD_PALETTECALLBACKS {
-} DD_PALETTECALLBACKS, *PDD_PALETTECALLBACKS;
-typedef struct _DD_CALLBACKS {
-} DD_CALLBACKS, *PDD_CALLBACKS;
-typedef struct _DD_HALINFO {
-} DD_HALINFO, *PDD_HALINFO;
-typedef struct _VIDEOMEMORY {
-} VIDEOMEMORY, *LPVIDEOMEMORY;
-typedef struct _DD_DIRECTDRAW_GLOBAL {
-} DD_DIRECTDRAW_GLOBAL, *LPDD_DIRECTDRAW_GLOBAL;
-typedef struct _DD_SURFACE_LOCAL {
-} DD_SURFACE_LOCAL, *PDD_SURFACE_LOCAL, *LPDD_SURFACE_LOCAL;
-#endif
-
-#ifndef __DDRAWI_INCLUDED__
-typedef PVOID LPVIDMEM;
-#endif
-
-#if !defined(__DD_INCLUDED__) && !defined(__DDRAWI_INCLUDED__)
-typedef struct _DDSCAPS {
-} DDSCAPS, *PDDSCAPS;
-typedef struct _DDSCAPSEX {
-} DDSCAPSEX, *PDDSCAPSEX;
-typedef PVOID LPVMEMHEAP;
-#endif
-
#ifndef DECL_IMPORT
#define DECL_IMPORT __attribute__((dllimport))
#endif
@@ -120,9 +90,6 @@
DECLARE_HANDLE(DHPDEV);
DECLARE_HANDLE(HDRVOBJ);
-
-#define GDI_DRIVER_VERSION 0x4000
-
typedef struct _ENG_EVENT *PEVENT;
#define OPENGL_CMD 4352
--- trunk/reactos/include/ddentry.h 2005-06-29 20:13:51 UTC (rev 16333)
+++ trunk/reactos/w32api/include/ddrawgdi.h 2005-06-30 12:31:36 UTC (rev 16342)
@@ -0,0 +1,163 @@
+/*
+ * DirectDraw GDI32.dll interface definitions
+ * Copyright (C) 2003 ReactOS Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/* Define the real export names */
+#if 0 /* FIXME */
+#define DdCreateDirectDrawObject GdiEntry1
+#define DdQueryDirectDrawObject GdiEntry2
+#define DdDeleteDirectDrawObject GdiEntry3
+#define DdCreateSurfaceObject GdiEntry4
+#define DdDeleteSurfaceObject GdiEntry5
+#define DdResetVisrgn GdiEntry6
+#define DdGetDC GdiEntry7
+#define DdReleaseDC GdiEntry8
+#define DdCreateDIBSection GdiEntry9
+#define DdReenableDirectDrawObject GdiEntry10
+#define DdAttachSurface GdiEntry11
+#define DdUnattachSurface GdiEntry12
+#define DdQueryDisplaySettingsUniqueness GdiEntry13
+#define DdGetDxHandle GdiEntry14
+#define DdSetGammaRamp GdiEntry15
+#define DdSwapTextureHandles GdiEntry16
+#endif
+
+typedef struct _D3DHAL_CALLBACKS FAR *LPD3DHAL_CALLBACKS;
+typedef struct _D3DHAL_GLOBALDRIVERDATA FAR *LPD3DHAL_GLOBALDRIVERDATA;
+
+BOOL
+STDCALL
+DdCreateDirectDrawObject(
+ LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
+ HDC hdc
+);
+
+BOOL
+STDCALL
+DdQueryDirectDrawObject(
+ LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
+ LPDDHALINFO pHalInfo,
+ LPDDHAL_DDCALLBACKS pDDCallbacks,
+ LPDDHAL_DDSURFACECALLBACKS pDDSurfaceCallbacks,
+ LPDDHAL_DDPALETTECALLBACKS pDDPaletteCallbacks,
+ LPD3DHAL_CALLBACKS pD3dCallbacks,
+ LPD3DHAL_GLOBALDRIVERDATA pD3dDriverData,
+ LPDDHAL_DDEXEBUFCALLBACKS pD3dBufferCallbacks,
+ LPDDSURFACEDESC pD3dTextureFormats,
+ LPDWORD pdwFourCC,
+ LPVIDMEM pvmList
+);
+
+BOOL
+STDCALL
+DdDeleteDirectDrawObject(
+ LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal
+);
+
+BOOL
+STDCALL
+DdCreateSurfaceObject(
+ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
+ BOOL bPrimarySurface
+);
+
+BOOL
+STDCALL
+DdDeleteSurfaceObject(
+ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal
+);
+
+BOOL
+STDCALL
+DdResetVisrgn(
+ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
+ HWND hWnd
+);
+
+BOOL
+STDCALL
+DdGetDC(
+ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
+ LPPALETTEENTRY pColorTable
+);
+
+BOOL
+STDCALL
+DdReleaseDC(
+ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal
+);
+
+HBITMAP
+STDCALL
+DdCreateDIBSection(
+ HDC hdc,
+ CONST BITMAPINFO *pbmi,
+ UINT iUsage,
+ VOID **ppvBits,
+ HANDLE hSectionApp,
+ DWORD dwOffset
+);
+
+BOOL
+STDCALL
+DdReenableDirectDrawObject(
+ LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
+ BOOL *pbNewMode
+);
+
+BOOL
+STDCALL
+DdAttachSurface(
+ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom,
+ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo
+);
+
+VOID
+STDCALL
+DdUnattachSurface(
+ LPDDRAWI_DDRAWSURFACE_LCL pSurface,
+ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached
+);
+
+ULONG
+STDCALL
+DdQueryDisplaySettingsUniqueness(VOID);
+
+HANDLE
+STDCALL
+DdGetDxHandle(
+ LPDDRAWI_DIRECTDRAW_LCL pDDraw,
+ LPDDRAWI_DDRAWSURFACE_LCL pSurface,
+ BOOL bRelease
+);
+
+BOOL
+STDCALL
+DdSetGammaRamp(
+ LPDDRAWI_DIRECTDRAW_LCL pDDraw,
+ HDC hdc,
+ LPVOID lpGammaRamp
+);
+
+DWORD
+STDCALL
+DdSwapTextureHandles(
+ LPDDRAWI_DIRECTDRAW_LCL pDDraw,
+ LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1,
+ LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2
+);
--- trunk/reactos/w32api/include/tcpioctl.h 2005-06-30 12:22:27 UTC (rev 16341)
+++ trunk/reactos/w32api/include/tcpioctl.h 2005-06-30 12:31:36 UTC (rev 16342)
@@ -43,4 +43,84 @@
#define IOCTL_DELETE_IP_ADDRESS \
_TCP_CTL_CODE(16, METHOD_BUFFERED, FILE_WRITE_ACCESS)
+#define IF_MIB_STATS_ID 1
+#define IP_MIB_STATS_ID 1
+#define IP_MIB_ADDRTABLE_ENTRY_ID 0x102
+#define IP_INTFC_INFO_ID 0x103
+#define MAX_PHYSADDR_SIZE 8
+
+typedef struct IFEntry
+{
+ ULONG if_index;
+ ULONG if_type;
+ ULONG if_mtu;
+ ULONG if_speed;
+ ULONG if_physaddrlen;
+ UCHAR if_physaddr[MAX_PHYSADDR_SIZE];
+ ULONG if_adminstatus;
+ ULONG if_operstatus;
+ ULONG if_lastchange;
+ ULONG if_inoctets;
+ ULONG if_inucastpkts;
+ ULONG if_innucastpkts;
+ ULONG if_indiscards;
+ ULONG if_inerrors;
+ ULONG if_inunknownprotos;
+ ULONG if_outoctets;
+ ULONG if_outucastpkts;
+ ULONG if_outnucastpkts;
+ ULONG if_outdiscards;
+ ULONG if_outerrors;
+ ULONG if_outqlen;
+ ULONG if_descrlen;
+ UCHAR if_descr[1];
+} IFEntry;
+
+typedef struct IPSNMPInfo
+{
+ ULONG ipsi_forwarding;
+ ULONG ipsi_defaultttl;
+ ULONG ipsi_inreceives;
+ ULONG ipsi_inhdrerrors;
+ ULONG ipsi_inaddrerrors;
+ ULONG ipsi_forwdatagrams;
+ ULONG ipsi_inunknownprotos;
+ ULONG ipsi_indiscards;
+ ULONG ipsi_indelivers;
+ ULONG ipsi_outrequests;
+ ULONG ipsi_routingdiscards;
+ ULONG ipsi_outdiscards;
+ ULONG ipsi_outnoroutes;
+ ULONG ipsi_reasmtimeout;
+ ULONG ipsi_reasmreqds;
+ ULONG ipsi_reasmoks;
+ ULONG ipsi_reasmfails;
+ ULONG ipsi_fragoks;
+ ULONG ipsi_fragfails;
+ ULONG ipsi_fragcreates;
+ ULONG ipsi_numif;
+ ULONG ipsi_numaddr;
+ ULONG ipsi_numroutes;
+} IPSNMPInfo;
+
+typedef struct IPAddrEntry
+{
+ ULONG iae_addr;
+ ULONG iae_index;
+ ULONG iae_mask;
+ ULONG iae_bcastaddr;
+ ULONG iae_reasmsize;
+ USHORT iae_context;
+ USHORT iae_pad;
+} IPAddrEntry;
+
+typedef struct IPInterfaceInfo
+{
+ ULONG iii_flags;
+ ULONG iii_mtu;
+ ULONG iii_speed;
+ ULONG iii_addrlength;
+ UCHAR iii_addr[1];
+} IPInterfaceInfo;
+
#endif/*_TCPIOCTL_H*/