Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[gvg] 18458: Attach to correct process before messing around with its memory

by gvg＠svn.reactos.com

Attach to correct process before messing around with its memory 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 20:03:18 UTC (rev 18457) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-10-14 20:19:23 UTC (rev 18458) @@ -829,7 +829,7 @@ char Buffer[64]; PEPROCESS Proc; - Proc = (PEPROCESS) ThreadInfo->Tcb.ApcState.Process; + Proc = (PEPROCESS) ThreadInfo->ThreadsProcess; Buffer[0] = '\0'; if (NULL != Proc ) @@ -1104,7 +1104,7 @@ /* reply to host that an exception has occurred */ SigVal = GspComputeSignal(ExceptionRecord->ExceptionCode); - ptr = &GspOutBuffer[0]; + ptr = GspOutBuffer; *ptr++ = 'T'; /* notify gdb with signo, PC, FP and SP */ *ptr++ = HexChars[(SigVal >> 4) & 0xf]; @@ -1213,9 +1213,21 @@ *(ptr++) == ',' && GspHex2Long(&ptr, &Length)) { - ptr = 0; + PEPROCESS DbgProcess = NULL; + + ptr = NULL; + if (NULL != GspDbgThread && + PsGetCurrentProcess() != GspDbgThread->ThreadsProcess) + { + DbgProcess = GspDbgThread->ThreadsProcess; + KeAttachProcess(&DbgProcess->Pcb); + } GspMemoryError = FALSE; GspMem2Hex((PCHAR) Address, GspOutBuffer, Length, 1); + if (NULL != DbgProcess) + { + KeDetachProcess(); + } if (GspMemoryError) { strcpy(GspOutBuffer, "E03"); @@ -1223,7 +1235,7 @@ } } - if (ptr) + if (NULL != ptr) { strcpy(GspOutBuffer, "E01"); } @@ -1238,9 +1250,21 @@ GspHex2Long(&ptr, &Length) && *(ptr++) == ':') { + PEPROCESS DbgProcess = NULL; + + ptr = NULL; + if (NULL != GspDbgThread && + PsGetCurrentProcess() != GspDbgThread->ThreadsProcess) + { + DbgProcess = GspDbgThread->ThreadsProcess; + KeAttachProcess(&DbgProcess->Pcb); + } GspMemoryError = FALSE; GspHex2Mem(ptr, (PCHAR) Address, Length, TRUE); - + if (NULL != DbgProcess) + { + KeDetachProcess(); + } if (GspMemoryError) { strcpy(GspOutBuffer, "E03"); @@ -1250,8 +1274,6 @@ { strcpy(GspOutBuffer, "OK"); } - - ptr = NULL; } }

19 years, 2 months

[greatlrd] 18457: Fixing directx headers from wine, by adding alot of missing struct and some struct was wrong.

by greatlrd＠svn.reactos.com

Fixing directx headers from wine, by adding alot of missing struct and some struct was wrong. Modified: trunk/reactos/w32api/include/ddk/ddrawi.h Modified: trunk/reactos/w32api/include/ddk/ddrawint.h Added: 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 19:48:28 UTC (rev 18456) +++ trunk/reactos/w32api/include/ddk/ddrawi.h 2005-10-14 20:03:18 UTC (rev 18457) @@ -27,9 +27,9 @@ #endif #include <ddraw.h> +#include <dvp.h> #ifndef __DDK_DDRAWINT_H -typedef struct _DDVIDEOPORTCAPS *LPDDVIDEOPORTCAPS; /* should be in dvp.h */ typedef struct _DDKERNELCAPS *LPDDKERNELCAPS; /* should be in ddkernel.h */ typedef struct _VMEMHEAP *LPVMEMHEAP; /* should be in dmemmgr.h */ #endif @@ -38,7 +38,7 @@ /* the DirectDraw versions */ #define DD_VERSION 0x0200 /* compatibility version */ -#define DD_RUNTIME_VERSION 0x0700 /* actual version */ +#define DD_RUNTIME_VERSION 0x0902 /* actual version */ /* the HAL version returned from QUERYESCSUPPORT - DCICOMMAND */ #define DD_HAL_VERSION 0x0100 @@ -49,6 +49,9 @@ #define DDNEWCALLBACKFNS 12 #define DDVERSIONINFO 13 +#ifndef CCHDEVICENAME +#define CCHDEVICENAME 32 +#endif #define MAX_DRIVER_NAME CCHDEVICENAME @@ -125,6 +128,9 @@ DWORD dwAlphaBitMask; } DDHALMODEINFO,*LPDDHALMODEINFO; + + + #define DDMODEINFO_PALETTIZED 0x0001 #define DDMODEINFO_MODEX 0x0002 #define DDMODEINFO_UNSUPPORTED 0x0004 @@ -141,15 +147,17 @@ union { FLATPTR fpEnd; DWORD dwWidth; - } DUMMYUNIONNAME1; + }; DDSCAPS ddsCaps; DDSCAPS ddsCapsAlt; union { LPVMEMHEAP lpHeap; DWORD dwHeight; - } DUMMYUNIONNAME2; + }; } VIDMEM,*LPVIDMEM; + + #ifndef __DDK_DDRAWINT_H #define VIDMEM_ISLINEAR 0x00000001 #define VIDMEM_ISRECTANGULAR 0x00000002 @@ -175,6 +183,8 @@ LPVIDMEM pvmList; } VIDMEMINFO,*LPVIDMEMINFO; + + typedef struct _HEAPALIAS { FLATPTR fpVidMem; LPVOID lpAlias; @@ -257,10 +267,15 @@ DWORD dwNLVBRops[DD_ROP_SPACE]; } DDNONLOCALVIDMEMCAPS,*LPDDNONLOCALVIDMEMCAPS; + + #define DDSCAPS_EXECUTEBUFFER DDSCAPS_RESERVED2 #define DDSCAPS2_VERTEXBUFFER DDSCAPS2_RESERVED1 #define DDSCAPS2_COMMANDBUFFER DDSCAPS2_RESERVED2 + + + /*********************************************************************** ****** * ddraw->driver callbacks */ @@ -290,6 +305,8 @@ typedef DWORD (PASCAL *LPDDHAL_SETEXCLUSIVEMODE) (LPDDHAL_SETEXCLUSIVEMODEDATA); typedef DWORD (PASCAL *LPDDHAL_FLIPTOGDISURFACE) (LPDDHAL_FLIPTOGDISURFACEDATA); + + typedef struct _DDHAL_DDCALLBACKS { DWORD dwSize; DWORD dwFlags; @@ -306,6 +323,8 @@ LPDDHAL_FLIPTOGDISURFACE FlipToGDISurface; } DDHAL_DDCALLBACKS,*LPDDHAL_DDCALLBACKS; + + typedef struct _DDHAL_DESTROYSURFACEDATA *LPDDHAL_DESTROYSURFACEDATA; typedef struct _DDHAL_FLIPDATA *LPDDHAL_FLIPDATA; typedef struct _DDHAL_SETCLIPLISTDATA *LPDDHAL_SETCLIPLISTDATA; @@ -353,6 +372,8 @@ LPDDHALSURFCB_SETPALETTE SetPalette; } DDHAL_DDSURFACECALLBACKS,*LPDDHAL_DDSURFACECALLBACKS; + + typedef struct _DDHAL_DESTROYPALETTEDATA *LPDDHAL_DESTROYPALETTEDATA; typedef struct _DDHAL_SETENTRIESDATA *LPDDHAL_SETENTRIESDATA; @@ -416,8 +437,69 @@ LPDDHAL_DESTROYDDLOCAL DestroyDDLocal; } DDHAL_DDMISCELLANEOUS2CALLBACKS,*LPDDHAL_DDMISCELLANEOUS2CALLBACKS; + +typedef struct _DDHAL_CANCREATEVPORTDATA *LPDDHAL_CANCREATEVPORTDATA; +typedef struct _DDHAL_CREATEVPORTDATA *LPDDHAL_CREATEVPORTDATA; +typedef struct _DDHAL_FLIPVPORTDATA *LPDDHAL_FLIPVPORTDATA; +typedef struct _DDHAL_GETVPORTCONNECTDATA *LPDDHAL_GETVPORTCONNECTDATA; +typedef struct _DDHAL_GETVPORTBANDWIDTHDATA *LPDDHAL_GETVPORTBANDWIDTHDATA; +typedef struct _DDHAL_GETVPORTINPUTFORMATDATA *LPDDHAL_GETVPORTINPUTFORMATDATA; +typedef struct _DDHAL_GETVPORTOUTPUTFORMATDATA *LPDDHAL_GETVPORTOUTPUTFORMATDATA; +typedef struct _DDHAL_GETVPORTFIELDDATA *LPDDHAL_GETVPORTFIELDDATA; +typedef struct _DDHAL_GETVPORTLINEDATA *LPDDHAL_GETVPORTLINEDATA; +typedef struct _DDHAL_DESTROYVPORTDATA *LPDDHAL_DESTROYVPORTDATA; +typedef struct _DDHAL_GETVPORTFLIPSTATUSDATA *LPDDHAL_GETVPORTFLIPSTATUSDATA; +typedef struct _DDHAL_UPDATEVPORTDATA *LPDDHAL_UPDATEVPORTDATA; +typedef struct _DDHAL_WAITFORVPORTSYNCDATA *LPDDHAL_WAITFORVPORTSYNCDATA; +typedef struct _DDHAL_GETVPORTSIGNALDATA *LPDDHAL_GETVPORTSIGNALDATA; +typedef struct _DDHAL_VPORTCOLORDATA *LPDDHAL_VPORTCOLORDATA; + +typedef DWORD (PASCAL *LPDDHALVPORTCB_CANCREATEVIDEOPORT)(LPDDHAL_CANCREATEVPORTDATA); +typedef DWORD (PASCAL *LPDDHALVPORTCB_CREATEVIDEOPORT)(LPDDHAL_CREATEVPORTDATA); +typedef DWORD (PASCAL *LPDDHALVPORTCB_FLIP)(LPDDHAL_FLIPVPORTDATA); +typedef DWORD (PASCAL *LPDDHALVPORTCB_GETBANDWIDTH)(LPDDHAL_GETVPORTBANDWIDTHDATA); +typedef DWORD (PASCAL *LPDDHALVPORTCB_GETINPUTFORMATS)(LPDDHAL_GETVPORTINPUTFORMATDATA); +typedef DWORD (PASCAL *LPDDHALVPORTCB_GETOUTPUTFORMATS)(LPDDHAL_GETVPORTOUTPUTFORMATDATA); +typedef DWORD (PASCAL *LPDDHALVPORTCB_GETFIELD)(LPDDHAL_GETVPORTFIELDDATA); +typedef DWORD (PASCAL *LPDDHALVPORTCB_GETLINE)(LPDDHAL_GETVPORTLINEDATA); +typedef DWORD (PASCAL *LPDDHALVPORTCB_GETVPORTCONNECT)(LPDDHAL_GETVPORTCONNECTDATA); +typedef DWORD (PASCAL *LPDDHALVPORTCB_DESTROYVPORT)(LPDDHAL_DESTROYVPORTDATA); +typedef DWORD (PASCAL *LPDDHALVPORTCB_GETFLIPSTATUS)(LPDDHAL_GETVPORTFLIPSTATUSDATA); +typedef DWORD (PASCAL *LPDDHALVPORTCB_UPDATE)(LPDDHAL_UPDATEVPORTDATA); +typedef DWORD (PASCAL *LPDDHALVPORTCB_WAITFORSYNC)(LPDDHAL_WAITFORVPORTSYNCDATA); +typedef DWORD (PASCAL *LPDDHALVPORTCB_GETSIGNALSTATUS)(LPDDHAL_GETVPORTSIGNALDATA); +typedef DWORD (PASCAL *LPDDHALVPORTCB_COLORCONTROL)(LPDDHAL_VPORTCOLORDATA); + +typedef struct _DDHAL_DDVIDEOPORTCALLBACKS +{ + DWORD dwSize; + DWORD dwFlags; + LPDDHALVPORTCB_CANCREATEVIDEOPORT CanCreateVideoPort; + LPDDHALVPORTCB_CREATEVIDEOPORT CreateVideoPort; + LPDDHALVPORTCB_FLIP FlipVideoPort; + LPDDHALVPORTCB_GETBANDWIDTH GetVideoPortBandwidth; + LPDDHALVPORTCB_GETINPUTFORMATS GetVideoPortInputFormats; + LPDDHALVPORTCB_GETOUTPUTFORMATS GetVideoPortOutputFormats; + LPVOID lpReserved1; + LPDDHALVPORTCB_GETFIELD GetVideoPortField; + LPDDHALVPORTCB_GETLINE GetVideoPortLine; + LPDDHALVPORTCB_GETVPORTCONNECT GetVideoPortConnectInfo; + LPDDHALVPORTCB_DESTROYVPORT DestroyVideoPort; + LPDDHALVPORTCB_GETFLIPSTATUS GetVideoPortFlipStatus; + LPDDHALVPORTCB_UPDATE UpdateVideoPort; + LPDDHALVPORTCB_WAITFORSYNC WaitForVideoPortSync; + LPDDHALVPORTCB_GETSIGNALSTATUS GetVideoSignalStatus; + LPDDHALVPORTCB_COLORCONTROL ColorControl; +} DDHAL_DDVIDEOPORTCALLBACKS; + + + + + typedef HRESULT (WINAPI *LPDDGAMMACALIBRATORPROC)(LPDDGAMMARAMP, LPBYTE); + + /*********************************************************************** ****** * driver info structure * @@ -448,25 +530,37 @@ LPDDHAL_DDEXEBUFCALLBACKS lpDDExeBufCallbacks; } DDHALINFO; + + #define DDHALINFO_ISPRIMARYDISPLAY 0x00000001 #define DDHALINFO_MODEXILLEGAL 0x00000002 #define DDHALINFO_GETDRIVERINFOSET 0x00000004 +#define DDHALINFO_GETDRIVERINFO2 0x00000008 /* where the high-level ddraw implementation stores the callbacks */ typedef struct _DDHAL_CALLBACKS { - DDHAL_DDCALLBACKS cbDDCallbacks; - DDHAL_DDSURFACECALLBACKS cbDDSurfaceCallbacks; - DDHAL_DDPALETTECALLBACKS cbDDPaletteCallbacks; - DDHAL_DDCALLBACKS HALDD; - DDHAL_DDSURFACECALLBACKS HALDDSurface; - DDHAL_DDPALETTECALLBACKS HALDDPalette; - DDHAL_DDCALLBACKS HELDD; - DDHAL_DDSURFACECALLBACKS HELDDSurface; - DDHAL_DDPALETTECALLBACKS HELDDPalette; - DDHAL_DDEXEBUFCALLBACKS cbDDExeBufCallbacks; - DDHAL_DDEXEBUFCALLBACKS HALDDExeBuf; - DDHAL_DDEXEBUFCALLBACKS HELDDExeBuf; - /* there's more... videoport, colorcontrol, misc, and motion compensation callbacks... */ + DDHAL_DDCALLBACKS cbDDCallbacks; + DDHAL_DDSURFACECALLBACKS cbDDSurfaceCallbacks; + DDHAL_DDPALETTECALLBACKS cbDDPaletteCallbacks; + DDHAL_DDCALLBACKS HALDD; + DDHAL_DDSURFACECALLBACKS HALDDSurface; + DDHAL_DDPALETTECALLBACKS HALDDPalette; + DDHAL_DDCALLBACKS HELDD; + DDHAL_DDSURFACECALLBACKS HELDDSurface; + DDHAL_DDPALETTECALLBACKS HELDDPalette; + DDHAL_DDEXEBUFCALLBACKS cbDDExeBufCallbacks; + DDHAL_DDEXEBUFCALLBACKS HALDDExeBuf; + DDHAL_DDEXEBUFCALLBACKS HELDDExeBuf; + DDHAL_DDVIDEOPORTCALLBACKS cbDDVideoPortCallbacks; + DDHAL_DDVIDEOPORTCALLBACKS HALDDVideoPort; +// DDHAL_DDCOLORCONTROLCALLBACKS cbDDColorControlCallbacks; +// DDHAL_DDCOLORCONTROLCALLBACKS HALDDColorControl; + DDHAL_DDMISCELLANEOUSCALLBACKS cbDDMiscellaneousCallbacks; + DDHAL_DDMISCELLANEOUSCALLBACKS HALDDMiscellaneous; +// DDHAL_DDKERNELCALLBACKS cbDDKernelCallbacks; +// DDHAL_DDKERNELCALLBACKS HALDDKernel; +// DDHAL_DDMOTIONCOMPCALLBACKS cbDDMotionCompCallbacks; +// DDHAL_DDMOTIONCOMPCALLBACKS HALDDMotionComp; } DDHAL_CALLBACKS,*LPDDHAL_CALLBACKS; /*********************************************************************** ****** @@ -603,17 +697,138 @@ LPDDHALPALCB_SETENTRIES SetEntries; } DDHAL_SETENTRIESDATA; -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 _DDHAL_CANCREATEVPORTDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDVIDEOPORTDESC lpDDVideoPortDesc; + HRESULT ddRVal; + LPDDHALVPORTCB_CANCREATEVIDEOPORT CanCreateVideoPort; +} DDHAL_CANCREATEVPORTDATA; +typedef struct _DDHAL_CREATEVPORTDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDVIDEOPORTDESC lpDDVideoPortDesc; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + HRESULT ddRVal; + LPDDHALVPORTCB_CREATEVIDEOPORT CreateVideoPort; +} DDHAL_CREATEVPORTDATA; + +typedef struct _DDHAL_GETVPORTBANDWIDTHDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + LPDDPIXELFORMAT lpddpfFormat; + DWORD dwWidth; + DWORD dwHeight; + DWORD dwFlags; + LPDDVIDEOPORTBANDWIDTH lpBandwidth; + HRESULT ddRVal; + LPDDHALVPORTCB_GETBANDWIDTH GetVideoPortBandwidth; +} DDHAL_GETVPORTBANDWIDTHDATA; + +typedef struct _DDHAL_GETVPORTINPUTFORMATDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + DWORD dwFlags; + LPDDPIXELFORMAT lpddpfFormat; + DWORD dwNumFormats; + HRESULT ddRVal; + LPDDHALVPORTCB_GETINPUTFORMATS GetVideoPortInputFormats; +} DDHAL_GETVPORTINPUTFORMATDATA; + +typedef struct _DDHAL_GETVPORTFIELDDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + BOOL bField; + HRESULT ddRVal; + LPDDHALVPORTCB_GETFIELD GetVideoPortField; +} DDHAL_GETVPORTFIELDDATA; + +typedef struct _DDHAL_GETVPORTOUTPUTFORMATDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + DWORD dwFlags; + LPDDPIXELFORMAT lpddpfInputFormat; + LPDDPIXELFORMAT lpddpfOutputFormats; + DWORD dwNumFormats; + HRESULT ddRVal; + LPDDHALVPORTCB_GETOUTPUTFORMATS GetVideoPortOutputFormats; +} DDHAL_GETVPORTOUTPUTFORMATDATA; + +typedef struct _DDHAL_GETVPORTLINEDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + DWORD dwLine; + HRESULT ddRVal; + LPDDHALVPORTCB_GETLINE GetVideoPortLine; +} DDHAL_GETVPORTLINEDATA; + +typedef struct _DDHAL_DESTROYVPORTDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + HRESULT ddRVal; + LPDDHALVPORTCB_DESTROYVPORT DestroyVideoPort; +} DDHAL_DESTROYVPORTDATA; + +typedef struct _DDHAL_GETVPORTFLIPSTATUSDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + FLATPTR fpSurface; + HRESULT ddRVal; + LPDDHALVPORTCB_GETFLIPSTATUS GetVideoPortFlipStatus; +} DDHAL_GETVPORTFLIPSTATUSDATA; + +typedef struct _DDHAL_UPDATEVPORTDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + LPDDRAWI_DDRAWSURFACE_INT *lplpDDSurface; + LPDDRAWI_DDRAWSURFACE_INT *lplpDDVBISurface; + LPDDVIDEOPORTINFO lpVideoInfo; + DWORD dwFlags; + DWORD dwNumAutoflip; + DWORD dwNumVBIAutoflip; + HRESULT ddRVal; + LPDDHALVPORTCB_UPDATE UpdateVideoPort; +} DDHAL_UPDATEVPORTDATA; + +typedef struct _DDHAL_WAITFORVPORTSYNCDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + DWORD dwFlags; + DWORD dwLine; + DWORD dwTimeOut; + HRESULT ddRVal; + LPDDHALVPORTCB_WAITFORSYNC WaitForVideoPortSync; +} DDHAL_WAITFORVPORTSYNCDATA; + +typedef struct _DDHAL_GETVPORTSIGNALDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + DWORD dwStatus; + HRESULT ddRVal; + LPDDHALVPORTCB_GETSIGNALSTATUS GetVideoSignalStatus; +} DDHAL_GETVPORTSIGNALDATA; + +typedef struct _DDHAL_VPORTCOLORDATA +{ + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + DWORD dwFlags; + LPDDCOLORCONTROL lpColorData; + HRESULT ddRVal; + LPDDHALVPORTCB_COLORCONTROL ColorControl; +} DDHAL_VPORTCOLORDATA; + + /*********************************************************************** ****** * high-level ddraw implementation structures */ @@ -1159,6 +1374,8 @@ LPDDHALSURFCB_ADDATTACHEDSURFACE AddAttachedSurface; } DDHAL_ADDATTACHEDSURFACEDATA; + + typedef struct _DDHAL_BEGINMOCOMPFRAMEDATA { LPDDRAWI_DIRECTDRAW_LCL lpDD; _____ Modified: trunk/reactos/w32api/include/ddk/ddrawint.h --- trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-14 19:48:28 UTC (rev 18456) +++ trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-14 20:03:18 UTC (rev 18457) @@ -25,10 +25,6 @@ #endif // FIXME: These should have been defined in other header files! -typedef struct _DDVIDEOPORTDESC *LPDDVIDEOPORTDESC; /* should be in dvp.h */ -typedef struct _DDVIDEOPORTBANDWIDTH *LPDDVIDEOPORTBANDWIDTH; /* should be in dvp.h */ -typedef struct _DDVIDEOPORTCONNECT *LPDDVIDEOPORTCONNECT; /* should be in dvp.h */ -typedef struct _DDVIDEOPORTINFO *LPDDVIDEOPORTINFO; /* should be in dvp.h */ typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL; /* should be defined here once we have dvp.h */ @@ -523,7 +519,7 @@ PVOID GetAvailDriverMemory; } DD_GETAVAILDRIVERMEMORYDATA, *PDD_GETAVAILDRIVERMEMORYDATA; typedef DWORD (STDCALL *PDD_GETAVAILDRIVERMEMORY)(PDD_GETAVAILDRIVERMEMORYDATA); - + DEFINE_GUID(GUID_MiscellaneousCallbacks, 0xEFD60CC0, 0x49E7, 0x11D0, 0x88, 0x9D, 0x00, 0xAA, 0x00, 0xBB, 0xB7, 0x6A); typedef struct _____ Added: trunk/reactos/w32api/include/ddk/dvp.h --- trunk/reactos/w32api/include/ddk/dvp.h 2005-10-14 19:48:28 UTC (rev 18456) +++ trunk/reactos/w32api/include/ddk/dvp.h 2005-10-14 20:03:18 UTC (rev 18457) @@ -0,0 +1,131 @@ + +/* $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; + + + +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

19 years, 2 months

[weiden] 18456: Fixed the declarations of GetFileVersionInfoSizeA/W and GetFileVersionInfoA/W

by weiden＠svn.reactos.com

Fixed the declarations of GetFileVersionInfoSizeA/W and GetFileVersionInfoA/W Modified: trunk/reactos/lib/version/info.c Modified: trunk/reactos/w32api/include/winver.h _____ Modified: trunk/reactos/lib/version/info.c --- trunk/reactos/lib/version/info.c 2005-10-14 19:28:18 UTC (rev 18455) +++ trunk/reactos/lib/version/info.c 2005-10-14 19:48:28 UTC (rev 18456) @@ -345,7 +345,7 @@ */ DWORD WINAPI -GetFileVersionInfoSizeW ( LPWSTR filename, LPDWORD handle ) +GetFileVersionInfoSizeW ( LPCWSTR filename, LPDWORD handle ) { DWORD len; @@ -371,7 +371,7 @@ */ DWORD WINAPI -GetFileVersionInfoSizeA ( LPSTR filename, LPDWORD handle ) +GetFileVersionInfoSizeA ( LPCSTR filename, LPDWORD handle ) { LPWSTR filenameW = VERSION_AllocA2W(filename); DWORD ret = GetFileVersionInfoSizeW ( filenameW, handle ); @@ -385,7 +385,7 @@ BOOL WINAPI GetFileVersionInfoW ( - LPWSTR filename, DWORD handle, + LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { DWORD len, extradata; @@ -411,7 +411,7 @@ BOOL WINAPI GetFileVersionInfoA ( - LPSTR filename, DWORD handle, + LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { LPWSTR filenameW = VERSION_AllocA2W ( filename ); _____ Modified: trunk/reactos/w32api/include/winver.h --- trunk/reactos/w32api/include/winver.h 2005-10-14 19:28:18 UTC (rev 18455) +++ trunk/reactos/w32api/include/winver.h 2005-10-14 19:48:28 UTC (rev 18456) @@ -101,10 +101,10 @@ DWORD WINAPI VerFindFileW(DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT,LPWSTR,PUINT); DWORD WINAPI VerInstallFileA(DWORD,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,PUINT); DWORD WINAPI VerInstallFileW(DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT); -DWORD WINAPI GetFileVersionInfoSizeA(LPSTR,PDWORD); -DWORD WINAPI GetFileVersionInfoSizeW(LPWSTR,PDWORD); -BOOL WINAPI GetFileVersionInfoA(LPSTR,DWORD,DWORD,PVOID); -BOOL WINAPI GetFileVersionInfoW(LPWSTR,DWORD,DWORD,PVOID); +DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,PDWORD); +DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,PDWORD); +BOOL WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,PVOID); +BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,PVOID); DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD); DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD); BOOL WINAPI VerQueryValueA(const LPVOID,LPSTR,LPVOID*,PUINT);

19 years, 2 months

[gvg] 18455: Only whitespace changes, no logic

by gvg＠svn.reactos.com

Only whitespace changes, no logic 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 19:09:45 UTC (rev 18454) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-10-14 19:28:18 UTC (rev 18455) @@ -94,9 +94,6 @@ #define BUFMAX 1000 static BOOLEAN GspInitialized; -#if 0 -static PKINTERRUPT GspInterrupt; -#endif static BOOLEAN GspRemoteDebug; @@ -132,26 +129,27 @@ static CPU_REGISTER GspRegisters[NUMREGS] = { - { 4, FIELD_OFFSET (KTRAP_FRAME, Eax), FIELD_OFFSET (CONTEXT, Eax), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, Ecx), FIELD_OFFSET (CONTEXT, Ecx), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, Edx), FIELD_OFFSET (CONTEXT, Edx), FALSE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, Ebx), FIELD_OFFSET (CONTEXT, Ebx), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, Esp), FIELD_OFFSET (CONTEXT, Esp), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, DebugEbp), FIELD_OFFSET (CONTEXT, Ebp), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, Esi), FIELD_OFFSET (CONTEXT, Esi), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, Edi), FIELD_OFFSET (CONTEXT, Edi), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, DebugEip), FIELD_OFFSET (CONTEXT, Eip), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, Eflags), FIELD_OFFSET (CONTEXT, EFlags), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, Cs), FIELD_OFFSET (CONTEXT, SegCs), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, Ss), FIELD_OFFSET (CONTEXT, SegSs), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, Ds), FIELD_OFFSET (CONTEXT, SegDs), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, Es), FIELD_OFFSET (CONTEXT, SegEs), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, Fs), FIELD_OFFSET (CONTEXT, SegFs), TRUE }, - { 4, FIELD_OFFSET (KTRAP_FRAME, Gs), FIELD_OFFSET (CONTEXT, SegGs), TRUE } + { 4, FIELD_OFFSET(KTRAP_FRAME, Eax), FIELD_OFFSET(CONTEXT, Eax), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Ecx), FIELD_OFFSET(CONTEXT, Ecx), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Edx), FIELD_OFFSET(CONTEXT, Edx), FALSE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Ebx), FIELD_OFFSET(CONTEXT, Ebx), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Esp), FIELD_OFFSET(CONTEXT, Esp), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, DebugEbp), FIELD_OFFSET(CONTEXT, Ebp), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Esi), FIELD_OFFSET(CONTEXT, Esi), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Edi), FIELD_OFFSET(CONTEXT, Edi), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, DebugEip), FIELD_OFFSET(CONTEXT, Eip), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Eflags), FIELD_OFFSET(CONTEXT, EFlags), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Cs), FIELD_OFFSET(CONTEXT, SegCs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Ss), FIELD_OFFSET(CONTEXT, SegSs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Ds), FIELD_OFFSET(CONTEXT, SegDs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Es), FIELD_OFFSET(CONTEXT, SegEs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Fs), FIELD_OFFSET(CONTEXT, SegFs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Gs), FIELD_OFFSET(CONTEXT, SegGs), TRUE } }; static PCHAR GspThreadStates[DeferredReady+1] = -{ "Initialized", +{ + "Initialized", "Ready", "Running", "Standby", @@ -163,12 +161,22 @@ LONG -HexValue (CHAR ch) +HexValue(CHAR ch) { - if ((ch >= '0') && (ch <= '9')) return (ch - '0'); - if ((ch >= 'a') && (ch <= 'f')) return (ch - 'a' + 10); - if ((ch >= 'A') && (ch <= 'F')) return (ch - 'A' + 10); - return (-1); + if ((ch >= '0') && (ch <= '9')) + { + return (ch - '0'); + } + if ((ch >= 'a') && (ch <= 'f')) + { + return (ch - 'a' + 10); + } + if ((ch >= 'A') && (ch <= 'F')) + { + return (ch - 'A' + 10); + } + + return -1; } static CHAR GspInBuffer[BUFMAX]; @@ -177,7 +185,7 @@ VOID GdbPutChar(UCHAR Value) { - KdPortPutByteEx (&GdbPortInfo, Value); + KdPortPutByteEx(&GdbPortInfo, Value); } UCHAR @@ -185,7 +193,8 @@ { UCHAR Value; - while (!KdPortGetByteEx (&GdbPortInfo, &Value)); + while (!KdPortGetByteEx(&GdbPortInfo, &Value)) + ; return Value; } @@ -204,7 +213,8 @@ while (TRUE) { /* wait around for the start character, ignore all other characters */ - while ((ch = GdbGetChar ()) != '$'); + while ((ch = GdbGetChar ()) != '$') + ; retry: Checksum = 0; @@ -214,11 +224,15 @@ /* now, read until a # or end of Buffer is found */ while (Count < BUFMAX) { - ch = GdbGetChar (); + ch = GdbGetChar(); if (ch == '$') - goto retry; + { + goto retry; + } if (ch == '#') - break; + { + break; + } Checksum = Checksum + ch; Buffer[Count] = ch; Count = Count + 1; @@ -227,18 +241,18 @@ if (ch == '#') { - ch = GdbGetChar (); - XmitChecksum = (CHAR)(HexValue (ch) << 4); - ch = GdbGetChar (); - XmitChecksum += (CHAR)(HexValue (ch)); + ch = GdbGetChar(); + XmitChecksum = (CHAR)(HexValue(ch) << 4); + ch = GdbGetChar(); + XmitChecksum += (CHAR)(HexValue(ch)); if (Checksum != XmitChecksum) { - GdbPutChar ('-'); /* failed checksum */ + GdbPutChar('-'); /* failed checksum */ } else { - GdbPutChar ('+'); /* successful transfer */ + GdbPutChar('+'); /* successful transfer */ return &Buffer[0]; } @@ -249,7 +263,7 @@ /* send the packet in Buffer. */ VOID -GspPutPacket (PCHAR Buffer) +GspPutPacket(PCHAR Buffer) { CHAR Checksum; LONG Count; @@ -258,47 +272,47 @@ /* $<packet info>#<Checksum>. */ do { - GdbPutChar ('$'); + GdbPutChar('$'); Checksum = 0; Count = 0; while ((ch = Buffer[Count])) { - GdbPutChar (ch); + GdbPutChar(ch); Checksum += ch; Count += 1; } - GdbPutChar ('#'); - GdbPutChar (HexChars[(Checksum >> 4) & 0xf]); - GdbPutChar (HexChars[Checksum & 0xf]); + GdbPutChar('#'); + GdbPutChar(HexChars[(Checksum >> 4) & 0xf]); + GdbPutChar(HexChars[Checksum & 0xf]); } - while (GdbGetChar () != '+'); + while (GdbGetChar() != '+'); } VOID -GspPutPacketNoWait (PCHAR Buffer) +GspPutPacketNoWait(PCHAR Buffer) { CHAR Checksum; LONG Count; CHAR ch; /* $<packet info>#<Checksum>. */ - GdbPutChar ('$'); + GdbPutChar('$'); Checksum = 0; Count = 0; while ((ch = Buffer[Count])) { - GdbPutChar (ch); + GdbPutChar(ch); Checksum += ch; Count += 1; } - GdbPutChar ('#'); - GdbPutChar (HexChars[(Checksum >> 4) & 0xf]); - GdbPutChar (HexChars[Checksum & 0xf]); + GdbPutChar('#'); + GdbPutChar(HexChars[(Checksum >> 4) & 0xf]); + GdbPutChar(HexChars[Checksum & 0xf]); } /* Indicate to caller of GspMem2Hex or GspHex2Mem that there has been an @@ -312,7 +326,7 @@ /* If MayFault is TRUE, then we should set GspMemoryError in response to a fault; if FALSE treat a fault like any other fault in the stub. */ PCHAR -GspMem2Hex (PCHAR Address, +GspMem2Hex(PCHAR Address, PCHAR Buffer, LONG Count, BOOLEAN MayFault) @@ -329,26 +343,28 @@ for (i = 0; i < (ULONG) Count; i++) { if (MayFault) - GspAccessLocation = Address; + { + GspAccessLocation = Address; + } ch = *Address; GspAccessLocation = NULL; if (MayFault && GspMemoryError) { - return (Buffer); + return Buffer; } *Buffer++ = HexChars[(ch >> 4) & 0xf]; *Buffer++ = HexChars[ch & 0xf]; Address++; } *Buffer = 0; - return (Buffer); + return Buffer; } /* Convert the hex array pointed to by Buffer into binary to be placed at Address */ /* Return a pointer to the character AFTER the last byte read from Buffer */ PCHAR -GspHex2Mem (PCHAR Buffer, +GspHex2Mem(PCHAR Buffer, PCHAR Address, ULONG Count, BOOLEAN MayFault) @@ -363,7 +379,7 @@ current = Address; while ( current < Address + Count ) { - page = (PCHAR)PAGE_ROUND_DOWN (current); + page = (PCHAR)PAGE_ROUND_DOWN(current); if (Address + Count <= page + PAGE_SIZE) { /* Fits in this page */ @@ -376,14 +392,14 @@ } if (MayFault) { - oldprot = MmGetPageProtect (NULL, Address); - MmSetPageProtect (NULL, Address, PAGE_EXECUTE_READWRITE); + oldprot = MmGetPageProtect(NULL, Address); + MmSetPageProtect(NULL, Address, PAGE_EXECUTE_READWRITE); } for (i = 0; i < countinpage && ! GspMemoryError; i++) { - ch = (CHAR)(HexValue (*Buffer++) << 4); - ch = (CHAR)(ch + HexValue (*Buffer++)); + ch = (CHAR)(HexValue(*Buffer++) << 4); + ch = (CHAR)(ch + HexValue(*Buffer++)); GspAccessLocation = current; *current = ch; @@ -392,22 +408,22 @@ } if (MayFault) { - MmSetPageProtect (NULL, page, oldprot); + MmSetPageProtect(NULL, page, oldprot); if (GspMemoryError) { - return (Buffer); + return Buffer; } } } - return (Buffer); + return Buffer; } /* This function takes the 386 exception vector and attempts to translate this number into a unix compatible signal value */ ULONG -GspComputeSignal (NTSTATUS ExceptionCode) +GspComputeSignal(NTSTATUS ExceptionCode) { ULONG SigVal; @@ -427,11 +443,6 @@ case STATUS_ILLEGAL_INSTRUCTION: SigVal = 4; /* Invalid opcode */ break; -#if 0 - case STATUS_FLT_INVALID_OPERATION: - SigVal = 8; - break; -#endif case STATUS_STACK_OVERFLOW: case STATUS_DATATYPE_MISALIGNMENT: case STATUS_ACCESS_VIOLATION: @@ -449,7 +460,7 @@ /* RETURN NUMBER OF CHARS PROCESSED */ /**********************************************/ LONG -GspHex2Long (PCHAR *Address, +GspHex2Long(PCHAR *Address, PLONG Value) { LONG NumChars = 0; @@ -459,7 +470,7 @@ while (**Address) { - Hex = HexValue (**Address); + Hex = HexValue(**Address); if (Hex >= 0) { *Value = (*Value << 4) | Hex; @@ -473,12 +484,12 @@ (*Address)++; } - return (NumChars); + return NumChars; } VOID -GspLong2Hex (PCHAR *Address, +GspLong2Hex(PCHAR *Address, LONG Value) { LONG Save; @@ -487,7 +498,7 @@ (((Value >> 8) & 0xff) << 16) | (((Value >> 16) & 0xff) << 8) | (((Value >> 24) & 0xff) << 0); - *Address = GspMem2Hex ((PCHAR) &Save, *Address, 4, FALSE); + *Address = GspMem2Hex((PCHAR) &Save, *Address, 4, FALSE); } @@ -500,7 +511,6 @@ static LONG GspGetEspFromTrapFrame(PKTRAP_FRAME TrapFrame) { - return KeGetPreviousMode() == KernelMode ? (LONG) &TrapFrame->Esp : (LONG)TrapFrame->Esp; } @@ -517,34 +527,34 @@ DWORD i; Buffer = Address; - for (i = 0; i < sizeof (GspRegisters) / sizeof (GspRegisters[0]); i++) - { - if (TrapFrame) + for (i = 0; i < sizeof(GspRegisters) / sizeof(GspRegisters[0]); i++) { - if (ESP == i) - { - Value = GspGetEspFromTrapFrame (TrapFrame); - } + if (TrapFrame) + { + if (ESP == i) + { + Value = GspGetEspFromTrapFrame(TrapFrame); + } + else + { + p = (PULONG)((ULONG_PTR) TrapFrame + GspRegisters[i].OffsetInTF); + Value = *p; + } + } + else if (i == EIP_REGNO) + { + /* + * 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; + } + Buffer = GspMem2Hex((PCHAR) &Value, Buffer, 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); - } } @@ -559,19 +569,25 @@ DWORD i; if (!TrapFrame) - return; + { + return; + } Buffer = Address; for (i = 0; i < NUMREGS; i++) - { - if (GspRegisters[i].SetInContext) - p = (PULONG) ((ULONG_PTR) Context + GspRegisters[i].OffsetInContext); - else - p = (PULONG) ((ULONG_PTR) TrapFrame + GspRegisters[i].OffsetInTF); - Value = 0; - Buffer = GspHex2Mem (Buffer, (PCHAR) &Value, GspRegisters[i].Size, FALSE); - *p = Value; - } + { + if (GspRegisters[i].SetInContext) + { + p = (PULONG) ((ULONG_PTR) Context + GspRegisters[i].OffsetInContext); + } + else + { + p = (PULONG) ((ULONG_PTR) TrapFrame + GspRegisters[i].OffsetInTF); + } + Value = 0; + Buffer = GspHex2Mem(Buffer, (PCHAR) &Value, GspRegisters[i].Size, FALSE); + *p = Value; + } } @@ -585,14 +601,20 @@ PULONG p; if (!TrapFrame) - return; + { + return; + } if (GspRegisters[Number].SetInContext) - p = (PULONG) ((ULONG_PTR) Context + GspRegisters[Number].OffsetInContext); + { + p = (PULONG) ((ULONG_PTR) Context + GspRegisters[Number].OffsetInContext); + } else - p = (PULONG) ((ULONG_PTR) TrapFrame + GspRegisters[Number].OffsetInTF); + { + p = (PULONG) ((ULONG_PTR) TrapFrame + GspRegisters[Number].OffsetInTF); + } Value = 0; - GspHex2Mem (Address, (PCHAR) &Value, GspRegisters[Number].Size, FALSE); + GspHex2Mem(Address, (PCHAR) &Value, GspRegisters[Number].Size, FALSE); *p = Value; } @@ -608,16 +630,16 @@ /* All threads */ ThreadInfo = NULL; } - else + else { ULONG uThreadId; HANDLE ThreadId; PCHAR ptr = &Data[0]; - GspHex2Long (&ptr, (PLONG) &uThreadId); + GspHex2Long(&ptr, (PLONG) &uThreadId); ThreadId = (HANDLE)uThreadId; - if (!NT_SUCCESS (PsLookupThreadByThreadId (ThreadId, &ThreadInfo))) + if (!NT_SUCCESS(PsLookupThreadByThreadId(ThreadId, &ThreadInfo))) { *Thread = NULL; return FALSE; @@ -658,17 +680,25 @@ } break; case 'g': /* Debug thread */ - if (GspFindThread (ptr, &ThreadInfo)) + if (GspFindThread(ptr, &ThreadInfo)) { GspOutBuffer[0] = 'O'; GspOutBuffer[1] = 'K'; - if (GspDbgThread) + if (NULL != GspDbgThread) { ObDereferenceObject(GspDbgThread); } - GspDbgThread = ThreadInfo; + if (ThreadInfo == PsGetCurrentThread()) + { + GspDbgThread = NULL; + ObDereferenceObject(ThreadInfo); + } + else + { + GspDbgThread = ThreadInfo; + } } else { @@ -687,140 +717,135 @@ ULONG Value; if (strncmp(Request, "C", 1) == 0) - { - PCHAR ptr = &GspOutBuffer[2]; - - /* Get current thread id */ - GspOutBuffer[0] = 'Q'; - GspOutBuffer[1] = 'C'; - if (NULL != GspDbgThread) { - Value = (ULONG) GspDbgThread->Cid.UniqueThread; - } - else - { - Value = (ULONG) PsGetCurrentThread()->Cid.UniqueThread; - } - GspLong2Hex (&ptr, Value); - } - else if (strncmp (Request, "fThreadInfo", 11) == 0) - { - PEPROCESS Process; - PLIST_ENTRY AThread, AProcess; - PCHAR ptr = &GspOutBuffer[1]; + PCHAR ptr = &GspOutBuffer[2]; - /* Get first thread id */ - GspEnumThread = NULL; - AProcess = PsActiveProcessHead.Flink; - while(AProcess != &PsActiveProcessHead) - { - Process = CONTAINING_RECORD(AProcess, EPROCESS, ActiveProcessLinks); - AThread = Process->ThreadListHead.Flink; - if(AThread != &Process->ThreadListHead) - { - GspEnumThread = CONTAINING_RECORD (Process->ThreadListHead.Flink, - ETHREAD, ThreadListEntry); - break; - } - AProcess = AProcess->Flink; + /* Get current thread id */ + GspOutBuffer[0] = 'Q'; + GspOutBuffer[1] = 'C'; + if (NULL != GspDbgThread) + { + Value = (ULONG) GspDbgThread->Cid.UniqueThread; + } + else + { + Value = (ULONG) PsGetCurrentThread()->Cid.UniqueThread; + } + GspLong2Hex(&ptr, Value); } - if(GspEnumThread != NULL) + else if (strncmp(Request, "fThreadInfo", 11) == 0) { - GspOutBuffer[0] = 'm'; - Value = (ULONG) GspEnumThread->Cid.UniqueThread; - GspLong2Hex (&ptr, Value); - } - else - { - /* FIXME - what to do here? This case should never happen though, there - should always be at least one thread on the system... */ - /* GspOutBuffer[0] = 'l'; */ - } - } - else if (strncmp (Request, "sThreadInfo", 11) == 0) - { - PEPROCESS Process; - PLIST_ENTRY AThread, AProcess; - PCHAR ptr = &GspOutBuffer[1]; + PEPROCESS Process; + PLIST_ENTRY AThread, AProcess; + PCHAR ptr = &GspOutBuffer[1]; - /* Get next thread id */ - if (GspEnumThread != NULL) - { - /* find the next thread */ - Process = GspEnumThread->ThreadsProcess; - if(GspEnumThread->ThreadListEntry.Flink != &Process->ThreadListHead) - { - GspEnumThread = CONTAINING_RECORD (GspEnumThread->ThreadListEntry.Flink, - ETHREAD, ThreadListEntry); - } - else - { - PETHREAD Thread = NULL; - AProcess = Process->ActiveProcessLinks.Flink; - while(AProcess != &PsActiveProcessHead) + /* Get first thread id */ + GspEnumThread = NULL; + AProcess = PsActiveProcessHead.Flink; + while(AProcess != &PsActiveProcessHead) { Process = CONTAINING_RECORD(AProcess, EPROCESS, ActiveProcessLinks); AThread = Process->ThreadListHead.Flink; - if(AThread != &Process->ThreadListHead) - { - Thread = CONTAINING_RECORD (Process->ThreadListHead.Flink, - ETHREAD, ThreadListEntry); - break; - } + if (AThread != &Process->ThreadListHead) + { + GspEnumThread = CONTAINING_RECORD(Process->ThreadListHead.Flink, + ETHREAD, ThreadListEntry); + break; + } AProcess = AProcess->Flink; } - GspEnumThread = Thread; - } - if(GspEnumThread != NULL) - { - /* return the ID */ - GspOutBuffer[0] = 'm'; - Value = (ULONG) GspEnumThread->Cid.UniqueThread; - GspLong2Hex (&ptr, Value); - } + { + GspOutBuffer[0] = 'm'; + Value = (ULONG) GspEnumThread->Cid.UniqueThread; + GspLong2Hex(&ptr, Value); + } else - { - GspOutBuffer[0] = 'l'; - } + { + /* FIXME - what to do here? This case should never happen though, there + should always be at least one thread on the system... */ + /* GspOutBuffer[0] = 'l'; */ + } } - else + else if (strncmp(Request, "sThreadInfo", 11) == 0) { - GspOutBuffer[0] = 'l'; + PEPROCESS Process; + PLIST_ENTRY AThread, AProcess; + PCHAR ptr = &GspOutBuffer[1]; + + /* Get next thread id */ + if (GspEnumThread != NULL) + { + /* find the next thread */ + Process = GspEnumThread->ThreadsProcess; + if(GspEnumThread->ThreadListEntry.Flink != &Process->ThreadListHead) + { + GspEnumThread = CONTAINING_RECORD(GspEnumThread->ThreadListEntry.Flink, + ETHREAD, ThreadListEntry); + } + else + { + PETHREAD Thread = NULL; + AProcess = Process->ActiveProcessLinks.Flink; + while(AProcess != &PsActiveProcessHead) + { + Process = CONTAINING_RECORD(AProcess, EPROCESS, ActiveProcessLinks); + AThread = Process->ThreadListHead.Flink; + if (AThread != &Process->ThreadListHead) + { + Thread = CONTAINING_RECORD(Process->ThreadListHead.Flink, + ETHREAD, ThreadListEntry); + break; + } + AProcess = AProcess->Flink; + } + GspEnumThread = Thread; + } + + if (GspEnumThread != NULL) + { + /* return the ID */ + GspOutBuffer[0] = 'm'; + Value = (ULONG) GspEnumThread->Cid.UniqueThread; + GspLong2Hex(&ptr, Value); + } + else + { + GspOutBuffer[0] = 'l'; + } + } + else + { + GspOutBuffer[0] = 'l'; + } } - } - else if (strncmp (Request, "ThreadExtraInfo", 15) == 0) - { - PETHREAD ThreadInfo; - - /* Get thread information */ - if (GspFindThread(Request + 16, &ThreadInfo)) + else if (strncmp(Request, "ThreadExtraInfo", 15) == 0) { - char Buffer[64]; - PEPROCESS Proc; + PETHREAD ThreadInfo; - Proc = (PEPROCESS) ThreadInfo->Tcb.ApcState.Process; + /* Get thread information */ + if (GspFindThread(Request + 16, &ThreadInfo)) + { + char Buffer[64]; + PEPROCESS Proc; - Buffer[0] = '\0'; - if (NULL != Proc ) - { - sprintf(Buffer, "%s [%d:0x%x], ", Proc->ImageFileName, - (int) Proc->UniqueProcessId, - (int) ThreadInfo->Cid.UniqueThread); - } - strcpy(Buffer + strlen(Buffer), GspThreadStates[ThreadInfo->Tcb.State]); + Proc = (PEPROCESS) ThreadInfo->Tcb.ApcState.Process; - ObDereferenceObject(ThreadInfo); + Buffer[0] = '\0'; + if (NULL != Proc ) + { + sprintf(Buffer, "%s [%d:0x%x], ", Proc->ImageFileName, + (int) Proc->UniqueProcessId, + (int) ThreadInfo->Cid.UniqueThread); + } + strcpy(Buffer + strlen(Buffer), + GspThreadStates[ThreadInfo->Tcb.State]); - GspMem2Hex(Buffer, &GspOutBuffer[0], strlen(Buffer), FALSE); + ObDereferenceObject(ThreadInfo); + + GspMem2Hex(Buffer, &GspOutBuffer[0], strlen(Buffer), FALSE); + } } - } -#if 0 - else if (strncmp (Request, "Offsets", 7) == 0) - { - strcpy (GspOutBuffer, "Text=0;Data=0;Bss=0"); - } -#endif } VOID @@ -829,19 +854,19 @@ PETHREAD ThreadInfo; PCHAR ptr = &Request[0]; - if (GspFindThread (ptr, &ThreadInfo)) - { - ObDereferenceObject(ThreadInfo); + if (GspFindThread(ptr, &ThreadInfo)) + { + ObDereferenceObject(ThreadInfo); - GspOutBuffer[0] = 'O'; - GspOutBuffer[1] = 'K'; - GspOutBuffer[2] = '\0'; - } + GspOutBuffer[0] = 'O'; + GspOutBuffer[1] = 'K'; + GspOutBuffer[2] = '\0'; + } else - { - GspOutBuffer[0] = 'E'; - GspOutBuffer[1] = '\0'; - } + { + GspOutBuffer[0] = 'E'; + GspOutBuffer[1] = '\0'; + } } @@ -1061,11 +1086,10 @@ } else { - /* Don't switch threads */ - - /* Always use the current thread when entering the exception handler */ + /* Make sure we're debugging the current thread. */ if (NULL != GspDbgThread) { + DPRINT1("Internal error: entering stub with non-NULL GspDbgThread\n"); ObDereferenceObject(GspDbgThread); GspDbgThread = NULL; } @@ -1078,7 +1102,7 @@ stop_reply: /* reply to host that an exception has occurred */ - SigVal = GspComputeSignal (ExceptionRecord->ExceptionCode); + SigVal = GspComputeSignal(ExceptionRecord->ExceptionCode); ptr = &GspOutBuffer[0]; @@ -1089,13 +1113,13 @@ *ptr++ = HexChars[ESP]; *ptr++ = ':'; - Esp = GspGetEspFromTrapFrame (TrapFrame); /* SP */ - ptr = GspMem2Hex ((PCHAR) &Esp, ptr, 4, 0); + Esp = GspGetEspFromTrapFrame(TrapFrame); /* SP */ + ptr = GspMem2Hex((PCHAR) &Esp, ptr, 4, 0); *ptr++ = ';'; *ptr++ = HexChars[EBP]; *ptr++ = ':'; - ptr = GspMem2Hex ((PCHAR) &TrapFrame->Ebp, ptr, 4, 0); /* FP */ + ptr = GspMem2Hex((PCHAR) &TrapFrame->Ebp, ptr, 4, 0); /* FP */ *ptr++ = ';'; *ptr++ = HexChars[PC]; @@ -1105,7 +1129,7 @@ *ptr = '\0'; - GspPutPacket (&GspOutBuffer[0]); + GspPutPacket(&GspOutBuffer[0]); } else { @@ -1117,10 +1141,10 @@ while (TRUE) { /* Zero the buffer now so we don't have to worry about the terminating zero character */ - memset (GspOutBuffer, 0, sizeof (GspInBuffer)); - ptr = GspGetPacket (); + memset(GspOutBuffer, 0, sizeof(GspInBuffer)); + ptr = GspGetPacket(); - switch (*ptr++) + switch(*ptr++) { case '?': /* a little hack to send more complete status information */ @@ -1136,94 +1160,105 @@ case 'g': /* return the value of the CPU Registers */ if (NULL != GspDbgThread) { - GspGetRegistersFromTrapFrame (&GspOutBuffer[0], Context, GspDbgThread->Tcb.TrapFrame); + GspGetRegistersFromTrapFrame(&GspOutBuffer[0], Context, GspDbgThread->Tcb.TrapFrame); } else { - GspGetRegistersFromTrapFrame (&GspOutBuffer[0], Context, TrapFrame); + GspGetRegistersFromTrapFrame(&GspOutBuffer[0], Context, TrapFrame); } break; case 'G': /* set the value of the CPU Registers - return OK */ if (NULL != GspDbgThread) { - GspSetRegistersInTrapFrame (ptr, Context, GspDbgThread->Tcb.TrapFrame); + GspSetRegistersInTrapFrame(ptr, Context, GspDbgThread->Tcb.TrapFrame); } else { - GspSetRegistersInTrapFrame (ptr, Context, TrapFrame); + GspSetRegistersInTrapFrame(ptr, Context, TrapFrame); } - strcpy (GspOutBuffer, "OK"); + strcpy(GspOutBuffer, "OK"); break; case 'P': /* set the value of a single CPU register - return OK */ { LONG Register; - if ((GspHex2Long (&ptr, &Register)) && (*ptr++ == '=')) - if ((Register >= 0) && (Register < NUMREGS)) - { - if (GspDbgThread) - { - GspSetSingleRegisterInTrapFrame(ptr, Register, - Context, GspDbgThread->Tcb.TrapFrame); - } - else - { - GspSetSingleRegisterInTrapFrame (ptr, Register, Context, TrapFrame); - } - strcpy (GspOutBuffer, "OK"); - break; - } + if ((GspHex2Long(&ptr, &Register)) && (*ptr++ == '=')) + { + if ((Register >= 0) && (Register < NUMREGS)) + { + if (GspDbgThread) + { + GspSetSingleRegisterInTrapFrame(ptr, Register, + Context, + GspDbgThread->Tcb.TrapFrame); + } + else + { + GspSetSingleRegisterInTrapFrame(ptr, Register, + Context, TrapFrame); + } + strcpy(GspOutBuffer, "OK"); + break; + } + } - strcpy (GspOutBuffer, "E01"); + strcpy(GspOutBuffer, "E01"); break; } /* mAA..AA,LLLL Read LLLL bytes at address AA..AA */ case 'm': /* TRY TO READ %x,%x. IF SUCCEED, SET PTR = 0 */ - if (GspHex2Long (&ptr, &Address)) - if (*(ptr++) == ',') - if (GspHex2Long (&ptr, &Length)) + if (GspHex2Long(&ptr, &Address) && + *(ptr++) == ',' && + GspHex2Long(&ptr, &Length)) + { + ptr = 0; + GspMemoryError = FALSE; + GspMem2Hex((PCHAR) Address, GspOutBuffer, Length, 1); + if (GspMemoryError) { - ptr = 0; - GspMemoryError = FALSE; - GspMem2Hex ((PCHAR) Address, GspOutBuffer, Length, 1); - if (GspMemoryError) - { - strcpy (GspOutBuffer, "E03"); - DPRINT ("Fault during memory read\n"); - } + strcpy(GspOutBuffer, "E03"); + DPRINT("Fault during memory read\n"); } + } [truncated at 1000 lines; 306 more skipped]

19 years, 2 months

[hpoussin] 18454: Add missing files to bootcd

by hpoussin＠svn.reactos.com

Add missing files to bootcd Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-10-14 18:38:51 UTC (rev 18453) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-10-14 19:09:45 UTC (rev 18454) @@ -119,6 +119,7 @@ lib\msvideo\msvfw32.dll 1 lib\mswsock\mswsock.dll 1 lib\netapi32\netapi32.dll 1 +lib\netcfgx\netcfgx.dll 1 lib\newdev\newdev.dll 1 lib\ntdll\ntdll.dll 1 lib\ntmarta\ntmarta.dll 1 @@ -285,14 +286,20 @@ media\nls\c_28598.nls 1 media\nls\c_28599.nls 1 media\drivers\etc\services 5 +media\inf\acpi.inf 6 media\inf\cdrom.inf 6 media\inf\NET_NIC.inf 6 media\inf\layout.inf 6 +media\inf\machine.inf 6 media\inf\mouse.inf 6 +media\inf\NET_NIC.inf 6 +media\inf\netamd.inf 6 +media\inf\netisa.inf 6 media\inf\ports.inf 6 media\inf\scsi.inf 6 media\inf\syssetup.inf 6 media\inf\usbport.inf 6 +media\inf\usbstor.inf 6 modules\os2\server\os2srv.dll 1 optional modules\os2\lib\doscalls\doscalls.dll 1 optional modules\posix\server\psxsrv.dll 1 optional

19 years, 2 months

[hpoussin] 18453: Remove entries that are created by netcfgx.dll

by hpoussin＠svn.reactos.com

Remove entries that are created by netcfgx.dll Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-10-14 18:37:10 UTC (rev 18452) +++ trunk/reactos/bootdata/hivesys.inf 2005-10-14 18:38:51 UTC (rev 18453) @@ -549,39 +549,10 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Start",0x00010001,0x00000 000 HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Type",0x00010001,0x000000 01 -; NIC drivers are like any other drivers - but no card-specific info here. -; Comment the networking stuff out if you don't have the card and don't want to see errors -; NE2000 NIC driver -HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","ErrorControl",0x000100 01,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","Group",0x00000000,"NDI S" -HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","ImagePath",0x00020000, "system32\drivers\ne2000.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","Start",0x00010001,0x00 000003 -HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","Type",0x00010001,0x000 00001 -HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","Route",0x00000000,"Ne2 0001" +; NE2000 network card +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP80D6\0000","HardwareID",0x 00010000,"*PNP80D6" +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP80D6\0000","DeviceDesc",0x 00000000,"Network card" -; Configuration Entries for the NE2000 Adapter -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0001","Characteristics",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0001","DriverDesc",0x00000000,"Device Name(from Inffile)" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0001","ProviderName",0x00000000,"Provider Name(from Inffile)" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0001","NetCfgInstanceId",0x00000000,"{RANDOMCFGGUIDFOR_NE20 001}" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0001\Linkage","Export",0x00000000,"\Device\Ne20001" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0001\Linkage","RootDevice",0x00000000,"Ne20001" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0001\Linkage","UpperBind",0x00000000,"Tcpip" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0001","Port",0x00000000,"c100" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0001","Irq",0x00000000,"B" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0001","NetworkAddress",0x00000000,"001122334455" -HKLM,"SYSTEM\CurrentControlSet\Services\Ne20001\Parameters\Tcpip","Defa ultGateway",0x00010000,"0.0.0.0" -HKLM,"SYSTEM\CurrentControlSet\Services\Ne20001\Parameters\Tcpip","IPAd dress",0x00010000,"0.0.0.0" -HKLM,"SYSTEM\CurrentControlSet\Services\Ne20001\Parameters\Tcpip","Subn etMask",0x00010000,"0.0.0.0" - -; one day this will happen automatically; until then we need this since ndis5 drivers -; rely on the fact that their resources are handed to them by ndis, so we have to find -; the driver that goes with the detected cards. this is how. -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\Ne2000\0000","Service",0x00000 000,"Ne2000" -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\Ne2000\0000","Class",0x0000000 0,"Net" -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\Ne2000\0000","ClassGUID",0x000 00000,"{4D36E972-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\Ne2000\0000","Driver",0x000000 00,"{4D36E972-E325-11CE-BFC1-08002BE10318}\0001" - ; PCI driver HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0A03\0000","HardwareID",0x0 0010000,"*PNP0A03" HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0A03\0000","DeviceDesc",0x0 0000000,"PCI bus" @@ -590,48 +561,7 @@ 01,00,00,00,01,00,01,00,01,00,00,00, \ 00,06,00,00,00,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -; ReactOS PCNet NIC driver -; To use the AMD supplied driver change the driver name to pcntn5m.sys -; -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","ErrorControl",0x0001000 1,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","Group",0x00000000,"NDIS " -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","ImagePath",0x00020000," system32\drivers\pcnet.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","Start",0x00010001,0x000 00003 -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","Type",0x00010001,0x0000 0001 -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet\Enum","0",0x00000000,"PCI \VEN_1022&DEV_2000\0000" -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet\Enum","Count",0x00010001, 0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet\Enum","NextInstance",0x00 010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_200010 22&REV_10\0000","Service",0x00000000,"PCNet" -HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_200010 22&REV_10\0000","Class",0x00000000,"Net" -HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_200010 22&REV_10\0000","ClassGUID",0x00000000,"{4D36E972-E325-11CE-BFC1-08002BE 10318}" -HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_200010 22&REV_10\0000","Driver",0x00000000,"{4D36E972-E325-11CE-BFC1-08002BE103 18}\0000" -; Configuration Entries for the PCNet Adapter -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","Characteristics",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","DriverDesc",0x00000000,"Device Name(from Inffile)" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","ProviderName",0x00000000,"Provider Name(from Inffile)" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","NetCfgInstanceId",0x00000000,"{RANDOMCFGGUIDFOR_PCNE T1}" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000\Linkage","Export",0x00000000,"\Device\PCNet1" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000\Linkage","RootDevice",0x00000000,"PCNet1" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000\Linkage","UpperBind",0x00000000,"Tcpip" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","BUS_TO_SCAN",0x00000000,"ALL" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","BUSTIMER",0x00000000,"0" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","BUSTYPE",0x00000000,"5" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","EXTPHY",0x00000000,"0" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","FDUP",0x00000000,"0" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","LED0",0x00000000,"10000" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","LED1",0x00000000,"10000" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","LED2",0x00000000,"10000" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","LED3",0x00000000,"10000" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","MPMODE",0x00000000,"0" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","TP",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","SlotNumber",0x00000000,"10" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0000","BusNumber",0x00000000,"0" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1 -08002BE10318}\{RANDOMCFGGUIDFOR_PCNET1}",,0x00000000,"Network Adapters" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1 -08002BE10318}\{RANDOMCFGGUIDFOR_PCNET1}\Connection","Name",0x00000000," AMD PCNet (static Registry entry)" -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","Defau ltGateway",0x00010000,"0.0.0.0" -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","IPAdd ress",0x00010000,"0.0.0.0" -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","Subne tMask",0x00010000,"0.0.0.0" ; Named Pipe filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001, 0x00000000 @@ -691,12 +621,6 @@ ; These bindings are of the windows 2000 type, and will probably need to be ; twiddled to get 3rd-party network-related software to work. ; NT4 puts additional stuff in the Bind, Export, and Route values. -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Linkage","Bind",0x0001000 0,"\Device\PCNet1", "\Device\Ne20001" -;HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Linkage","Bind",0x000100 00,"\Device\3c90x1" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Linkage","Export",0x00010 000,"\Device\Tcpip_PCNet1", "\Device\Tcpip_Ne20001" -;HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Linkage","Export",0x0001 0000,"\Device\Tcpip_3c90x1" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Linkage","Route",0x000100 00,"PCNet1", "Ne20001" -;HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Linkage","Route",0x00010 000,"3c90x1" HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath" ,0x00010000,"DataBasePath" HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Domain",0x000 10000,"" HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Hostname",0x0 0010000,"ROSHost"

19 years, 2 months

[hpoussin] 18452: Add netcfgx.dll

by hpoussin＠svn.reactos.com

Add netcfgx.dll This .dll contains the class installer for the network cards Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/netcfgx/ Added: trunk/reactos/lib/netcfgx/netcfgx.c Added: trunk/reactos/lib/netcfgx/netcfgx.def Added: trunk/reactos/lib/netcfgx/netcfgx.h Added: trunk/reactos/lib/netcfgx/netcfgx.xml _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-10-14 18:35:05 UTC (rev 18451) +++ trunk/reactos/lib/directory.xml 2005-10-14 18:37:10 UTC (rev 18452) @@ -167,6 +167,9 @@ <directory name="netapi32"> <xi:include href="netapi32/netapi32.xml" /> </directory> +<directory name="netcfgx"> + <xi:include href="netcfgx/netcfgx.xml" /> +</directory> <directory name="newdev"> <xi:include href="newdev/newdev.xml" /> </directory> Property changes on: trunk/reactos/lib/netcfgx ___________________________________________________________________ Name: svn:ignore + GNUmakefile *.bak _____ Added: trunk/reactos/lib/netcfgx/netcfgx.c --- trunk/reactos/lib/netcfgx/netcfgx.c 2005-10-14 18:35:05 UTC (rev 18451) +++ trunk/reactos/lib/netcfgx/netcfgx.c 2005-10-14 18:37:10 UTC (rev 18452) @@ -0,0 +1,298 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Configuration of networkd devices + * FILE: lib/netcfgx/netcfgx.c + * PURPOSE: Network devices installer + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) + */ + +//#define NDEBUG +#include <debug.h> + +#include "netcfgx.h" + +/* Append a REG_SZ to an existing REG_MULTI_SZ string in the registry. + * If the value doesn't exist, create it. + * Returns ERROR_SUCCESS if success. Othewise, returns an error code + */ +static LONG +AppendStringToMultiSZ( + IN HKEY hKey, + IN PCWSTR ValueName, + IN PCWSTR ValueToAppend) + +{ + PWSTR Buffer = NULL; + DWORD dwRegType; + DWORD dwRequired, dwLength; + DWORD dwTmp; + LONG rc; + + rc = RegQueryValueExW( + hKey, + ValueName, + NULL, + &dwRegType, + NULL, + &dwRequired); + if (rc != ERROR_FILE_NOT_FOUND) + { + if (rc != ERROR_SUCCESS) + goto cleanup; + if (dwRegType != REG_MULTI_SZ) + { + rc = ERROR_GEN_FAILURE; + goto cleanup; + } + + dwTmp = dwLength = dwRequired + wcslen(ValueToAppend) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + Buffer = HeapAlloc(GetProcessHeap(), 0, dwLength); + if (!Buffer) + { + rc = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + rc = RegQueryValueExW( + hKey, + ValueName, + NULL, + NULL, + (BYTE*)Buffer, + &dwTmp); + if (rc != ERROR_SUCCESS) + goto cleanup; + } + else + { + dwRequired = sizeof(WCHAR); + dwLength = wcslen(ValueToAppend) * sizeof(WCHAR) + 2 * sizeof(UNICODE_NULL); + Buffer = HeapAlloc(GetProcessHeap(), 0, dwLength); + if (!Buffer) + { + rc = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + } + + /* Append the value */ + wcscpy(&Buffer[dwRequired / sizeof(WCHAR) - 1], ValueToAppend); + /* Terminate the REG_MULTI_SZ string */ + Buffer[dwLength / sizeof(WCHAR) - 1] = UNICODE_NULL; + + rc = RegSetValueExW( + hKey, + ValueName, + 0, + REG_MULTI_SZ, + (const BYTE*)Buffer, + dwLength); + +cleanup: + HeapFree(GetProcessHeap(), 0, Buffer); + return rc; +} + +DWORD WINAPI +NetClassInstaller( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + RPC_STATUS RpcStatus; + UUID Uuid; + LPWSTR UuidRpcString = NULL; + LPWSTR UuidString = NULL; + LPWSTR DeviceName = NULL; + LONG rc; + HKEY hKey = INVALID_HANDLE_VALUE; + HKEY hLinkageKey = INVALID_HANDLE_VALUE; + HKEY hNetworkKey = INVALID_HANDLE_VALUE; + HKEY hConnectionKey = INVALID_HANDLE_VALUE; + + if (InstallFunction != DIF_INSTALLDEVICE) + return ERROR_DI_DO_DEFAULT; + + /* Create a new UUID */ + RpcStatus = UuidCreate(&Uuid); + if (RpcStatus != RPC_S_OK && RpcStatus != RPC_S_UUID_LOCAL_ONLY) + { + DPRINT("UuidCreate() failed with RPC status 0x%lx\n", RpcStatus); + rc = ERROR_GEN_FAILURE; + goto cleanup; + } + RpcStatus = UuidToStringW(&Uuid, &UuidRpcString); + if (RpcStatus != RPC_S_OK) + { + DPRINT("UuidToStringW() failed with RPC status 0x%lx\n", RpcStatus); + rc = ERROR_GEN_FAILURE; + goto cleanup; + } + + /* Add curly braces around Uuid */ + UuidString = HeapAlloc(GetProcessHeap(), 0, (2 + wcslen(UuidRpcString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!UuidString) + { + DPRINT("HeapAlloc() failed\n"); + rc = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + wcscpy(UuidString, L"{"); + wcscat(UuidString, UuidRpcString); + wcscat(UuidString, L"}"); + + /* Create device name */ + DeviceName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\") + wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!DeviceName) + { + DPRINT("HeapAlloc() failed\n"); + rc = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + wcscpy(DeviceName, L"\\Device\\"); + wcscat(DeviceName, 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); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegCreateKeyExW(hKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL, &hNetworkKey, NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + RegCloseKey(hKey); + hKey = INVALID_HANDLE_VALUE; + rc = RegCreateKeyExW(hNetworkKey, L"Parameters\\Tcpip", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + RegCloseKey(hNetworkKey); + hNetworkKey = INVALID_HANDLE_VALUE; + rc = RegSetValueExW(hKey, L"DefaultGateway", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hKey, L"IPAddress", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hKey, L"SubnetMask", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + RegCloseKey(hKey); + hKey = INVALID_HANDLE_VALUE; + + /* Write 'Linkage' key in hardware key */ + hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + if (hKey == INVALID_HANDLE_VALUE) + { + rc = GetLastError(); + DPRINT("SetupDiCreateDevRegKeyW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hKey, L"NetCfgInstanceId", 0, REG_SZ, (const BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegCreateKeyExW(hKey, L"Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hLinkageKey, NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hLinkageKey, L"Export", 0, REG_SZ, (const BYTE*)DeviceName, (wcslen(DeviceName) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hLinkageKey, L"RootDevice", 0, REG_SZ, (const BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hLinkageKey, L"UpperBind", 0, REG_SZ, (const BYTE*)L"Tcpip", (wcslen(L"Tcpip") + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + RegCloseKey(hKey); + hKey = INVALID_HANDLE_VALUE; + + /* Write connection information in network subkey */ + rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1- 08002BE10318}", 0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL, &hNetworkKey, NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegCreateKeyExW(hNetworkKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hKey, L"Name", 0, REG_SZ, (const BYTE*)L"Network connection", (wcslen(L"Network connection") + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + RegCloseKey(hKey); + hKey = INVALID_HANDLE_VALUE; + + /* Write linkage information in Tcpip service */ + rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE | KEY_SET_VALUE, NULL, &hKey, NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = AppendStringToMultiSZ(hKey, L"Bind", DeviceName); + if (rc != ERROR_SUCCESS) + goto cleanup; + rc = AppendStringToMultiSZ(hKey, L"Export", DeviceName); + if (rc != ERROR_SUCCESS) + goto cleanup; + rc = AppendStringToMultiSZ(hKey, L"Route", UuidString); + if (rc != ERROR_SUCCESS) + goto cleanup; + + rc = ERROR_DI_DO_DEFAULT; + +cleanup: + if (UuidRpcString != NULL) + RpcStringFreeW(&UuidRpcString); + if (UuidString != NULL) + HeapFree(GetProcessHeap(), 0, UuidString); + if (DeviceName != NULL) + HeapFree(GetProcessHeap(), 0, DeviceName); + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); + if (hLinkageKey != INVALID_HANDLE_VALUE) + RegCloseKey(hLinkageKey); + if (hNetworkKey != INVALID_HANDLE_VALUE) + RegCloseKey(hNetworkKey); + if (hConnectionKey != INVALID_HANDLE_VALUE) + RegCloseKey(hConnectionKey); + + return rc == ERROR_SUCCESS ? ERROR_DI_DO_DEFAULT : rc; +} Property changes on: trunk/reactos/lib/netcfgx/netcfgx.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/netcfgx/netcfgx.def --- trunk/reactos/lib/netcfgx/netcfgx.def 2005-10-14 18:35:05 UTC (rev 18451) +++ trunk/reactos/lib/netcfgx/netcfgx.def 2005-10-14 18:37:10 UTC (rev 18452) @@ -0,0 +1,6 @@ +LIBRARY netcfgx.dll + +EXPORTS +NetClassInstaller@12 + +;EOF \ No newline at end of file Property changes on: trunk/reactos/lib/netcfgx/netcfgx.def ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/netcfgx/netcfgx.h --- trunk/reactos/lib/netcfgx/netcfgx.h 2005-10-14 18:35:05 UTC (rev 18451) +++ trunk/reactos/lib/netcfgx/netcfgx.h 2005-10-14 18:37:10 UTC (rev 18452) @@ -0,0 +1,5 @@ +#include <windows.h> +#include <setupapi.h> + +ULONG DbgPrint(PCH Format,...); + Property changes on: trunk/reactos/lib/netcfgx/netcfgx.h ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/netcfgx/netcfgx.xml --- trunk/reactos/lib/netcfgx/netcfgx.xml 2005-10-14 18:35:05 UTC (rev 18451) +++ trunk/reactos/lib/netcfgx/netcfgx.xml 2005-10-14 18:37:10 UTC (rev 18452) @@ -0,0 +1,8 @@ +<module name="netcfgx" type="win32dll" installbase="system32" installname="netcfgx.dll"> + <importlibrary definition="netcfgx.def" /> + <define name="__REACTOS__" /> + <file>netcfgx.c</file> + <library>ntdll</library> + <library>rpcrt4</library> + <library>setupapi</library> +</module> Property changes on: trunk/reactos/lib/netcfgx/netcfgx.xml ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native

19 years, 2 months

[gvg] 18451: Merge from trunk. Goplat <mrnobo1024@yahoo.com>:

by gvg＠svn.reactos.com

Merge from trunk. Goplat <mrnobo1024(a)yahoo.com>: SetPixel should return the new color. Bug 909. Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/bitmaps.c _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/bitmaps.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/bitmaps.c 2005-10-14 18:32:38 UTC (rev 18450) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/bitmaps.c 2005-10-14 18:35:05 UTC (rev 18451) @@ -1022,10 +1022,9 @@ INT Y, COLORREF Color) { - COLORREF cr = NtGdiGetPixel(hDC,X,Y); - if(cr != CLR_INVALID && NtGdiSetPixelV(hDC,X,Y,Color)) + if (NtGdiSetPixelV(hDC,X,Y,Color)) { - return(cr); + return NtGdiGetPixel(hDC,X,Y); } return ((COLORREF) -1); }

19 years, 2 months

[gvg] 18450: Goplat <mrnobo1024@yahoo.com>:

by gvg＠svn.reactos.com

Goplat <mrnobo1024(a)yahoo.com>: SetPixel should return the new color. Bug 909. Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c _____ Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-10-14 18:29:55 UTC (rev 18449) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-10-14 18:32:38 UTC (rev 18450) @@ -1022,10 +1022,9 @@ INT Y, COLORREF Color) { - COLORREF cr = NtGdiGetPixel(hDC,X,Y); - if(cr != CLR_INVALID && NtGdiSetPixelV(hDC,X,Y,Color)) + if (NtGdiSetPixelV(hDC,X,Y,Color)) { - return(cr); + return NtGdiGetPixel(hDC,X,Y); } return ((COLORREF) -1); }

19 years, 2 months

[hpoussin] 18449: Transform pci.sys to a Plug-and-Play driver.

by hpoussin＠svn.reactos.com

Transform pci.sys to a Plug-and-Play driver. Simplify most of the PciCreateCompatible*String functions Fix error handling in FdoQueryBusRelations => pci.sys now manages only 1 bus. It is still using HalGetBusDataByOffset/HalGetBusData which are deprecated, but it shouldn't be too hard to remove Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/drivers/bus/pci/fdo.c Modified: trunk/reactos/drivers/bus/pci/pci.c Modified: trunk/reactos/drivers/bus/pci/pci.h Modified: trunk/reactos/drivers/bus/pci/pdo.c _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-10-14 18:24:19 UTC (rev 18448) +++ trunk/reactos/bootdata/hivesys.inf 2005-10-14 18:29:55 UTC (rev 18449) @@ -583,16 +583,12 @@ HKLM,"SYSTEM\CurrentControlSet\Enum\Root\Ne2000\0000","Driver",0x0000000 0,"{4D36E972-E325-11CE-BFC1-08002BE10318}\0001" ; PCI driver -HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001, 0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus Extender" -HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ImagePath",0x00020000,"sy stem32\drivers\pci.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Start",0x00010001,0x00000 000 -HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Tag",0x00010001,0x0000000 2 -HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Type",0x00010001,0x000000 01 -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","Service",0x00000000 ,"Pci" -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","Class",0x00000000," Computer" -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","ClassGUID",0x000000 00,"{4D36E966-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","ParentIdPrefix",0x0 000000,"0000" +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0A03\0000","HardwareID",0x 00010000,"*PNP0A03" +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0A03\0000","DeviceDesc",0x 00000000,"PCI bus" +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0A03\0000\LogConf","BasicC onfigVector",0x000A0001, \ +40,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 ,00,00,00,00, \ +01,00,00,00,01,00,01,00,01,00,00,00, \ +00,06,00,00,00,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 ; ReactOS PCNet NIC driver ; To use the AMD supplied driver change the driver name to pcntn5m.sys _____ Modified: trunk/reactos/drivers/bus/pci/fdo.c --- trunk/reactos/drivers/bus/pci/fdo.c 2005-10-14 18:24:19 UTC (rev 18448) +++ trunk/reactos/drivers/bus/pci/fdo.c 2005-10-14 18:29:55 UTC (rev 18449) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * PROJECT: ReactOS PCI bus driver * FILE: fdo.c * PURPOSE: PCI device object dispatch routines @@ -22,7 +21,6 @@ FdoLocateChildDevice( PPCI_DEVICE *Device, PFDO_DEVICE_EXTENSION DeviceExtension, - ULONG BusNumber, PCI_SLOT_NUMBER SlotNumber, PPCI_COMMON_CONFIG PciConfig) { @@ -38,8 +36,7 @@ /* If both vendor ID and device ID match, it is the same device */ if ((PciConfig->VendorID == CurrentDevice->PciConfig.VendorID) && (PciConfig->DeviceID == CurrentDevice->PciConfig.DeviceID) && - (SlotNumber.u.AsULONG == CurrentDevice->SlotNumber.u.AsULONG) && - (BusNumber == CurrentDevice->BusNumber)) { + (SlotNumber.u.AsULONG == CurrentDevice->SlotNumber.u.AsULONG)) { *Device = CurrentDevice; DPRINT("Done\n"); return STATUS_SUCCESS; @@ -63,7 +60,6 @@ PLIST_ENTRY CurrentEntry; PPCI_DEVICE Device; PCI_SLOT_NUMBER SlotNumber; - ULONG BusNumber; ULONG DeviceNumber; ULONG FunctionNumber; ULONG Size; @@ -85,89 +81,86 @@ DeviceExtension->DeviceListCount = 0; /* Enumerate devices on the PCI bus */ - for (BusNumber = 0; BusNumber < 8; BusNumber++) + SlotNumber.u.AsULONG = 0; + for (DeviceNumber = 0; DeviceNumber < PCI_MAX_DEVICES; DeviceNumber++) { - SlotNumber.u.AsULONG = 0; - for (DeviceNumber = 0; DeviceNumber < PCI_MAX_DEVICES; DeviceNumber++) + SlotNumber.u.bits.DeviceNumber = DeviceNumber; + for (FunctionNumber = 0; FunctionNumber < PCI_MAX_FUNCTION; FunctionNumber++) { - SlotNumber.u.bits.DeviceNumber = DeviceNumber; - for (FunctionNumber = 0; FunctionNumber < PCI_MAX_FUNCTION; FunctionNumber++) - { - SlotNumber.u.bits.FunctionNumber = FunctionNumber; + SlotNumber.u.bits.FunctionNumber = FunctionNumber; - DPRINT("Bus %1lu Device %2lu Func %1lu\n", - BusNumber, - DeviceNumber, - FunctionNumber); + DPRINT("Bus %1lu Device %2lu Func %1lu\n", + DeviceExtension->BusNumber, + DeviceNumber, + FunctionNumber); - RtlZeroMemory(&PciConfig, - sizeof(PCI_COMMON_CONFIG)); + RtlZeroMemory(&PciConfig, + sizeof(PCI_COMMON_CONFIG)); - Size = HalGetBusData(PCIConfiguration, - BusNumber, - SlotNumber.u.AsULONG, - &PciConfig, - PCI_COMMON_HDR_LENGTH); - DPRINT("Size %lu\n", Size); - if (Size < PCI_COMMON_HDR_LENGTH) + Size = HalGetBusData(PCIConfiguration, + DeviceExtension->BusNumber, + SlotNumber.u.AsULONG, + &PciConfig, + PCI_COMMON_HDR_LENGTH); + DPRINT("Size %lu\n", Size); + if (Size < PCI_COMMON_HDR_LENGTH) + { + if (FunctionNumber == 0) { - if (FunctionNumber == 0) - { - break; - } - else - { - continue; - } + break; } + else + { + continue; + } + } - DPRINT("Bus %1lu Device %2lu Func %1lu VenID 0x%04hx DevID 0x%04hx\n", - BusNumber, - DeviceNumber, - FunctionNumber, - PciConfig.VendorID, - PciConfig.DeviceID); + DPRINT("Bus %1lu Device %2lu Func %1lu VenID 0x%04hx DevID 0x%04hx\n", + DeviceExtension->BusNumber, + DeviceNumber, + FunctionNumber, + PciConfig.VendorID, + PciConfig.DeviceID); - Status = FdoLocateChildDevice(&Device, DeviceExtension, BusNumber, SlotNumber, &PciConfig); - if (!NT_SUCCESS(Status)) + Status = FdoLocateChildDevice(&Device, DeviceExtension, SlotNumber, &PciConfig); + if (!NT_SUCCESS(Status)) + { + Device = (PPCI_DEVICE)ExAllocatePool(PagedPool, sizeof(PCI_DEVICE)); + if (!Device) { - Device = (PPCI_DEVICE)ExAllocatePool(PagedPool, sizeof(PCI_DEVICE)); - if (!Device) - { - /* FIXME: Cleanup resources for already discovered devices */ - return STATUS_INSUFFICIENT_RESOURCES; - } + /* FIXME: Cleanup resources for already discovered devices */ + return STATUS_INSUFFICIENT_RESOURCES; + } - RtlZeroMemory(Device, - sizeof(PCI_DEVICE)); + RtlZeroMemory(Device, + sizeof(PCI_DEVICE)); - Device->BusNumber = BusNumber; + Device->BusNumber = DeviceExtension->BusNumber; - RtlCopyMemory(&Device->SlotNumber, - &SlotNumber, - sizeof(PCI_SLOT_NUMBER)); + RtlCopyMemory(&Device->SlotNumber, + &SlotNumber, + sizeof(PCI_SLOT_NUMBER)); - RtlCopyMemory(&Device->PciConfig, - &PciConfig, - sizeof(PCI_COMMON_CONFIG)); + RtlCopyMemory(&Device->PciConfig, + &PciConfig, + sizeof(PCI_COMMON_CONFIG)); - ExInterlockedInsertTailList( - &DeviceExtension->DeviceListHead, - &Device->ListEntry, - &DeviceExtension->DeviceListLock); - } + ExInterlockedInsertTailList( + &DeviceExtension->DeviceListHead, + &Device->ListEntry, + &DeviceExtension->DeviceListLock); + } - /* Don't remove this device */ - Device->RemovePending = FALSE; + /* Don't remove this device */ + Device->RemovePending = FALSE; - DeviceExtension->DeviceListCount++; + DeviceExtension->DeviceListCount++; - /* Skip to next device if the current one is not a multifunction device */ - if ((FunctionNumber == 0) && - ((PciConfig.HeaderType & 0x80) == 0)) - { - break; - } + /* Skip to next device if the current one is not a multifunction device */ + if ((FunctionNumber == 0) && + ((PciConfig.HeaderType & 0x80) == 0)) + { + break; } } } @@ -263,18 +256,13 @@ PdoDeviceExtension->Fdo = DeviceObject; - PdoDeviceExtension->BusNumber = Device->BusNumber; + PdoDeviceExtension->PciDevice = Device; - RtlCopyMemory( - &PdoDeviceExtension->SlotNumber, - &Device->SlotNumber, - sizeof(PCI_SLOT_NUMBER)); - /* Add Device ID string */ - if (!PciCreateDeviceIDString(&PdoDeviceExtension->DeviceID, - Device)) + Status = PciCreateDeviceIDString(&PdoDeviceExtension->DeviceID, Device); + if (!NT_SUCCESS(Status)) { - ErrorStatus = STATUS_INSUFFICIENT_RESOURCES; + ErrorStatus = Status; ErrorOccurred = TRUE; break; } @@ -282,46 +270,46 @@ DPRINT("DeviceID: %S\n", PdoDeviceExtension->DeviceID.Buffer); /* Add Instance ID string */ - if (!PciCreateInstanceIDString(&PdoDeviceExtension->InstanceID, - Device)) + Status = PciCreateInstanceIDString(&PdoDeviceExtension->InstanceID, Device); + if (!NT_SUCCESS(Status)) { - ErrorStatus = STATUS_INSUFFICIENT_RESOURCES; + ErrorStatus = Status; ErrorOccurred = TRUE; break; } /* Add Hardware IDs string */ - if (!PciCreateHardwareIDsString(&PdoDeviceExtension->HardwareIDs, - Device)) + Status = PciCreateHardwareIDsString(&PdoDeviceExtension->HardwareIDs, Device); + if (!NT_SUCCESS(Status)) { - ErrorStatus = STATUS_INSUFFICIENT_RESOURCES; + ErrorStatus = Status; ErrorOccurred = TRUE; break; } /* Add Compatible IDs string */ - if (!PciCreateCompatibleIDsString(&PdoDeviceExtension->CompatibleIDs, - Device)) + Status = PciCreateCompatibleIDsString(&PdoDeviceExtension->CompatibleIDs, Device); + if (!NT_SUCCESS(Status)) { - ErrorStatus = STATUS_INSUFFICIENT_RESOURCES; + ErrorStatus = Status; ErrorOccurred = TRUE; break; } /* Add device description string */ - if (!PciCreateDeviceDescriptionString(&PdoDeviceExtension->DeviceDescriptio n, - Device)) + Status = PciCreateDeviceDescriptionString(&PdoDeviceExtension->DeviceDescription, Device); + if (!NT_SUCCESS(Status)) { - ErrorStatus = STATUS_INSUFFICIENT_RESOURCES; + ErrorStatus = Status; ErrorOccurred = TRUE; break; } /* Add device location string */ - if (!PciCreateDeviceLocationString(&PdoDeviceExtension->DeviceLocation, - Device)) + Status = PciCreateDeviceLocationString(&PdoDeviceExtension->DeviceLocation, Device); + if (!NT_SUCCESS(Status)) { - ErrorStatus = STATUS_INSUFFICIENT_RESOURCES; + ErrorStatus = Status; ErrorOccurred = TRUE; break; } @@ -345,7 +333,11 @@ /* FIXME: Should IoAttachDeviceToDeviceStack() be undone? */ if (PdoDeviceExtension) { RtlFreeUnicodeString(&PdoDeviceExtension->DeviceID); - ExFreePool(PdoDeviceExtension); + RtlFreeUnicodeString(&PdoDeviceExtension->InstanceID); + RtlFreeUnicodeString(&PdoDeviceExtension->HardwareIDs); + RtlFreeUnicodeString(&PdoDeviceExtension->CompatibleIDs); + RtlFreeUnicodeString(&PdoDeviceExtension->DeviceDescription); + RtlFreeUnicodeString(&PdoDeviceExtension->DeviceLocation); } ExFreePool(Relations); @@ -366,19 +358,62 @@ IN PIRP Irp) { PFDO_DEVICE_EXTENSION DeviceExtension; + PCM_RESOURCE_LIST AllocatedResources; + PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; + ULONG FoundBusNumber = FALSE; + ULONG i; DPRINT("Called\n"); DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + AllocatedResources = IoGetCurrentIrpStackLocation(Irp)->Parameters.StartDevice.AllocatedResou rces; + if (!AllocatedResources) + { + DPRINT("PCI: No allocated resources sent to driver\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + if (AllocatedResources->Count < 1) + { + DPRINT("PCI: Not enough allocated resources sent to driver\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + if (AllocatedResources->List[0].PartialResourceList.Version != 1 + || AllocatedResources->List[0].PartialResourceList.Revision != 1) + return STATUS_REVISION_MISMATCH; - assert(DeviceExtension->State == dsStopped); + ASSERT(DeviceExtension->State == dsStopped); + for (i = 0; i < AllocatedResources->List[0].PartialResourceList.Count; i++) + { + ResourceDescriptor = &AllocatedResources->List[0].PartialResourceList.PartialDescriptors[i]; + switch (ResourceDescriptor->Type) + { + case CmResourceTypeBusNumber: + { + if (FoundBusNumber || ResourceDescriptor->u.BusNumber.Length != 1) + return STATUS_INVALID_PARAMETER; + DeviceExtension->BusNumber = ResourceDescriptor->u.BusNumber.Start; + DPRINT("PCI: Found bus number resource: %lu\n", DeviceExtension->BusNumber); + FoundBusNumber = TRUE; + break; + } + default: + DPRINT1("PCI: Unknown resource descriptor type 0x%x\n", ResourceDescriptor->Type); + } + } + if (!FoundBusNumber) + { + DPRINT("PCI: All required resources were not found in allocated resources list\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + InitializeListHead(&DeviceExtension->DeviceListHead); KeInitializeSpinLock(&DeviceExtension->DeviceListLock); DeviceExtension->DeviceListCount = 0; DeviceExtension->State = dsStarted; - //Irp->IoStatus.Information = 0; + Irp->IoStatus.Information = 0; return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/bus/pci/pci.c --- trunk/reactos/drivers/bus/pci/pci.c 2005-10-14 18:24:19 UTC (rev 18448) +++ trunk/reactos/drivers/bus/pci/pci.c 2005-10-14 18:29:55 UTC (rev 18449) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * PROJECT: ReactOS PCI Bus driver * FILE: pci.c * PURPOSE: Driver entry @@ -185,7 +184,7 @@ } -BOOLEAN +NTSTATUS PciCreateDeviceIDString(PUNICODE_STRING DeviceID, PPCI_DEVICE Device) { @@ -199,75 +198,36 @@ Device->PciConfig.u.type0.SubVendorID, Device->PciConfig.RevisionID); - if (!RtlCreateUnicodeString(DeviceID, Buffer)) - { - return FALSE; - } - - return TRUE; + return RtlCreateUnicodeString(DeviceID, Buffer) ? STATUS_SUCCESS : STATUS_INSUFFICIENT_RESOURCES; } -BOOLEAN +NTSTATUS PciCreateInstanceIDString(PUNICODE_STRING InstanceID, PPCI_DEVICE Device) { -#if 0 WCHAR Buffer[32]; - ULONG Length; ULONG Index; - Index = swprintf(Buffer, - L"%lX&%02lX", - Device->BusNumber, - (Device->SlotNumber.u.bits.DeviceNumber << 3) + - Device->SlotNumber.u.bits.FunctionNumber); - Index++; - Buffer[Index] = UNICODE_NULL; - - Length = (Index + 1) * sizeof(WCHAR); - InstanceID->Buffer = ExAllocatePool(PagedPool, Length); - if (InstanceID->Buffer == NULL) + Index = 0; + if (((PPDO_DEVICE_EXTENSION)Device->Pdo->DeviceExtension)->PciDevice->BusNu mber != 0) { - return FALSE; + /* FIXME: Copy InstanceID of parent PCI bus to Buffer */ + // Index += swprintf(Buffer, ....); } - InstanceID->Length = Length - sizeof(WCHAR); - InstanceID->MaximumLength = Length; - RtlCopyMemory(InstanceID->Buffer, Buffer, Length); + swprintf(&Buffer[Index], L"%02X", Device->SlotNumber.u.AsULONG & 0xff); - return TRUE; -#endif - WCHAR Buffer[256]; - - swprintf(Buffer, - L"PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", - Device->PciConfig.VendorID, - Device->PciConfig.DeviceID, - (Device->PciConfig.u.type0.SubSystemID << 16) + - Device->PciConfig.u.type0.SubVendorID, - Device->PciConfig.RevisionID); - - // XBOX HACK - if (!wcscmp(L"PCI\\VEN_10DE&DEV_01C2&SUBSYS_00000000&REV_D4", Buffer)) - { - //DPRINT("xbox ohci controler found at bus 0x%lX, dev num %d, func num %d\n", Device->BusNumber, Device->SlotNumber.u.bits.DeviceNumber, Device->SlotNumber.u.bits.FunctionNumber); - if (Device->SlotNumber.u.bits.DeviceNumber == 2) - return RtlCreateUnicodeString(InstanceID, L"0000"); - else - return RtlCreateUnicodeString(InstanceID, L"0001"); - } - else - return RtlCreateUnicodeString(InstanceID, L""); + return RtlCreateUnicodeString(InstanceID, Buffer) ? STATUS_SUCCESS : STATUS_INSUFFICIENT_RESOURCES; } -BOOLEAN +NTSTATUS PciCreateHardwareIDsString(PUNICODE_STRING HardwareIDs, PPCI_DEVICE Device) { WCHAR Buffer[256]; - ULONG Length; + UNICODE_STRING BufferU; ULONG Index; Index = 0; @@ -306,28 +266,20 @@ Index++; Buffer[Index] = UNICODE_NULL; + + BufferU.Length = BufferU.MaximumLength = Index * sizeof(WCHAR); + BufferU.Buffer = Buffer; - Length = (Index + 1) * sizeof(WCHAR); - HardwareIDs->Buffer = ExAllocatePool(PagedPool, Length); - if (HardwareIDs->Buffer == NULL) - { - return FALSE; - } - - HardwareIDs->Length = Length - sizeof(WCHAR); - HardwareIDs->MaximumLength = Length; - RtlCopyMemory(HardwareIDs->Buffer, Buffer, Length); - - return TRUE; + return RtlDuplicateUnicodeString(0, &BufferU, HardwareIDs); } -BOOLEAN +NTSTATUS PciCreateCompatibleIDsString(PUNICODE_STRING CompatibleIDs, PPCI_DEVICE Device) { WCHAR Buffer[256]; - ULONG Length; + UNICODE_STRING BufferU; ULONG Index; Index = 0; @@ -379,27 +331,18 @@ Buffer[Index] = UNICODE_NULL; - Length = (Index + 1) * sizeof(WCHAR); - CompatibleIDs->Buffer = ExAllocatePool(PagedPool, Length); - if (CompatibleIDs->Buffer == NULL) - { - return FALSE; - } + BufferU.Length = BufferU.MaximumLength = Index * sizeof(WCHAR); + BufferU.Buffer = Buffer; - CompatibleIDs->Length = Length - sizeof(WCHAR); - CompatibleIDs->MaximumLength = Length; - RtlCopyMemory(CompatibleIDs->Buffer, Buffer, Length); - - return TRUE; + return RtlDuplicateUnicodeString(0, &BufferU, CompatibleIDs); } -BOOLEAN +NTSTATUS PciCreateDeviceDescriptionString(PUNICODE_STRING DeviceDescription, PPCI_DEVICE Device) { PWSTR Description; - ULONG Length; switch (Device->PciConfig.BaseClass) { @@ -655,51 +598,23 @@ break; } - Length = (wcslen(Description) + 1) * sizeof(WCHAR); - DeviceDescription->Buffer = ExAllocatePool(PagedPool, Length); - if (DeviceDescription->Buffer == NULL) - { - return FALSE; - } - - DeviceDescription->Length = Length - sizeof(WCHAR); - DeviceDescription->MaximumLength = Length; - RtlCopyMemory(DeviceDescription->Buffer, Description, Length); - - return TRUE; + return RtlCreateUnicodeString(DeviceDescription, Description) ? STATUS_SUCCESS : STATUS_INSUFFICIENT_RESOURCES; } -BOOLEAN +NTSTATUS PciCreateDeviceLocationString(PUNICODE_STRING DeviceLocation, PPCI_DEVICE Device) { WCHAR Buffer[256]; - ULONG Length; - ULONG Index; - Index = 0; - Index += swprintf(&Buffer[Index], - L"PCI-Bus %lu, Device %u, Function %u", - Device->BusNumber, - Device->SlotNumber.u.bits.DeviceNumber, - Device->SlotNumber.u.bits.FunctionNumber); - Index++; + swprintf(Buffer, + L"PCI-Bus %lu, Device %u, Function %u", + Device->BusNumber, + Device->SlotNumber.u.bits.DeviceNumber, + Device->SlotNumber.u.bits.FunctionNumber); - Buffer[Index] = UNICODE_NULL; - - Length = (Index + 1) * sizeof(WCHAR); - DeviceLocation->Buffer = ExAllocatePool(PagedPool, Length); - if (DeviceLocation->Buffer == NULL) - { - return FALSE; - } - - DeviceLocation->Length = Length - sizeof(WCHAR); - DeviceLocation->MaximumLength = Length; - RtlCopyMemory(DeviceLocation->Buffer, Buffer, Length); - - return TRUE; + return RtlCreateUnicodeString(DeviceLocation, Buffer) ? STATUS_SUCCESS : STATUS_INSUFFICIENT_RESOURCES; } /* EOF */ _____ Modified: trunk/reactos/drivers/bus/pci/pci.h --- trunk/reactos/drivers/bus/pci/pci.h 2005-10-14 18:24:19 UTC (rev 18448) +++ trunk/reactos/drivers/bus/pci/pci.h 2005-10-14 18:29:55 UTC (rev 18449) @@ -1,5 +1,3 @@ -/* $Id$ */ - #ifndef __PCI_H #define __PCI_H @@ -47,7 +45,7 @@ BOOLEAN Removed; // Current device power state for the device DEVICE_POWER_STATE DevicePowerState; -} __attribute((packed)) COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; +} COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; /* Physical Device Object device extension for a child device */ typedef struct _PDO_DEVICE_EXTENSION @@ -56,10 +54,8 @@ COMMON_DEVICE_EXTENSION Common; // Functional device object PDEVICE_OBJECT Fdo; - // PCI bus number - ULONG BusNumber; - // PCI slot number - PCI_SLOT_NUMBER SlotNumber; + // Pointer to PCI Device informations + PPCI_DEVICE PciDevice; // Device ID UNICODE_STRING DeviceID; // Instance ID @@ -72,13 +68,15 @@ UNICODE_STRING DeviceDescription; // Textual description of device location UNICODE_STRING DeviceLocation; -} __attribute((packed)) PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; +} PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; /* Functional Device Object device extension for the PCI driver device object */ typedef struct _FDO_DEVICE_EXTENSION { // Common device data COMMON_DEVICE_EXTENSION Common; + // PCI bus number serviced by this FDO + ULONG BusNumber; // Current state of the driver PCI_DEVICE_STATE State; // Namespace device list @@ -89,7 +87,7 @@ KSPIN_LOCK DeviceListLock; // Lower device object PDEVICE_OBJECT Ldo; -} __attribute((packed)) FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; +} FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; /* fdo.c */ @@ -106,38 +104,32 @@ /* pci.c */ -BOOLEAN -PciCreateUnicodeString( - PUNICODE_STRING Destination, - PWSTR Source, - POOL_TYPE PoolType); - -BOOLEAN +NTSTATUS PciCreateDeviceIDString( PUNICODE_STRING DeviceID, PPCI_DEVICE Device); -BOOLEAN +NTSTATUS PciCreateInstanceIDString( PUNICODE_STRING InstanceID, PPCI_DEVICE Device); -BOOLEAN +NTSTATUS PciCreateHardwareIDsString( PUNICODE_STRING HardwareIDs, PPCI_DEVICE Device); -BOOLEAN +NTSTATUS PciCreateCompatibleIDsString( PUNICODE_STRING HardwareIDs, PPCI_DEVICE Device); -BOOLEAN +NTSTATUS PciCreateDeviceDescriptionString( PUNICODE_STRING DeviceDescription, PPCI_DEVICE Device); -BOOLEAN +NTSTATUS PciCreateDeviceLocationString( PUNICODE_STRING DeviceLocation, PPCI_DEVICE Device); _____ Modified: trunk/reactos/drivers/bus/pci/pdo.c --- trunk/reactos/drivers/bus/pci/pdo.c 2005-10-14 18:24:19 UTC (rev 18448) +++ trunk/reactos/drivers/bus/pci/pdo.c 2005-10-14 18:29:55 UTC (rev 18449) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * PROJECT: ReactOS PCI bus driver * FILE: pdo.c * PURPOSE: Child device object dispatch routines @@ -107,11 +106,8 @@ break; case BusQueryInstanceID: - /* FIXME: RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING flag - * needs to be removed once PciCreateInstanceIDString is fixed - */ Status = RtlDuplicateUnicodeString( - RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE | RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING, + RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &DeviceExtension->InstanceID, &String); @@ -149,7 +145,7 @@ { BusInformation->BusTypeGuid = GUID_BUS_TYPE_PCI; BusInformation->LegacyBusType = PCIBus; - BusInformation->BusNumber = DeviceExtension->BusNumber; + BusInformation->BusNumber = DeviceExtension->PciDevice->BusNumber; return STATUS_SUCCESS; } @@ -176,7 +172,7 @@ return STATUS_UNSUCCESSFUL; DeviceCapabilities->UniqueID = FALSE; - DeviceCapabilities->Address = DeviceExtension->SlotNumber.u.AsULONG; + DeviceCapabilities->Address = DeviceExtension->PciDevice->SlotNumber.u.AsULONG; DeviceCapabilities->UINumber = (ULONG)-1; /* FIXME */ return STATUS_SUCCESS; @@ -198,8 +194,8 @@ /* Save original value */ Size= HalGetBusDataByOffset(PCIConfiguration, - DeviceExtension->BusNumber, - DeviceExtension->SlotNumber.u.AsULONG, + DeviceExtension->PciDevice->BusNumber, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, &OrigValue, Offset, sizeof(ULONG)); @@ -216,8 +212,8 @@ /* Set magic value */ NewValue = (ULONG)-1; Size= HalSetBusDataByOffset(PCIConfiguration, - DeviceExtension->BusNumber, - DeviceExtension->SlotNumber.u.AsULONG, + DeviceExtension->PciDevice->BusNumber, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, &NewValue, Offset, sizeof(ULONG)); @@ -229,8 +225,8 @@ /* Get the range length */ Size= HalGetBusDataByOffset(PCIConfiguration, - DeviceExtension->BusNumber, - DeviceExtension->SlotNumber.u.AsULONG, + DeviceExtension->PciDevice->BusNumber, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, &NewValue, Offset, sizeof(ULONG)); @@ -242,8 +238,8 @@ /* Restore original value */ Size= HalSetBusDataByOffset(PCIConfiguration, - DeviceExtension->BusNumber, - DeviceExtension->SlotNumber.u.AsULONG, + DeviceExtension->PciDevice->BusNumber, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, &OrigValue, Offset, sizeof(ULONG)); @@ -328,8 +324,8 @@ /* Get PCI configuration space */ Size= HalGetBusData(PCIConfiguration, - DeviceExtension->BusNumber, - DeviceExtension->SlotNumber.u.AsULONG, + DeviceExtension->PciDevice->BusNumber, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, &PciConfig, sizeof(PCI_COMMON_CONFIG)); DPRINT("Size %lu\n", Size); @@ -377,6 +373,8 @@ if (Length != 0) ResCount += 2; } + if (DeviceExtension->PciDevice->PciConfig.BaseClass == PCI_CLASS_BRIDGE_DEV) + ResCount++; } else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_CARDBUS_BRIDGE_TYPE) { @@ -412,8 +410,8 @@ ResourceList->ListSize = ListSize; ResourceList->InterfaceType = PCIBus; - ResourceList->BusNumber = DeviceExtension->BusNumber, - ResourceList->SlotNumber = DeviceExtension->SlotNumber.u.AsULONG, + ResourceList->BusNumber = DeviceExtension->PciDevice->BusNumber; + ResourceList->SlotNumber = DeviceExtension->PciDevice->SlotNumber.u.AsULONG; ResourceList->AlternativeLists = 1; ResourceList->List[0].Version = 1; @@ -587,6 +585,18 @@ } Descriptor++; } + if (DeviceExtension->PciDevice->PciConfig.BaseClass == PCI_CLASS_BRIDGE_DEV) + { + Descriptor->Option = 0; /* Required */ + Descriptor->Type = CmResourceTypeBusNumber; + Descriptor->ShareDisposition = CmResourceShareShared; + Descriptor->Flags = CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE; + + Descriptor->u.BusNumber.MinBusNumber = + Descriptor->u.BusNumber.MaxBusNumber = DeviceExtension->PciDevice->PciConfig.u.type1.SubordinateBus; + Descriptor->u.BusNumber.Length = 1; + Descriptor->u.BusNumber.Reserved = 0; + } } else if (PCI_CONFIGURATION_TYPE(&PciConfig) == 2) { @@ -624,8 +634,8 @@ /* Get PCI configuration space */ Size= HalGetBusData(PCIConfiguration, - DeviceExtension->BusNumber, - DeviceExtension->SlotNumber.u.AsULONG, + DeviceExtension->PciDevice->BusNumber, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, &PciConfig, sizeof(PCI_COMMON_CONFIG)); DPRINT("Size %lu\n", Size); @@ -703,7 +713,7 @@ ResourceList->Count = 1; ResourceList->List[0].InterfaceType = PCIConfiguration; - ResourceList->List[0].BusNumber = DeviceExtension->BusNumber; + ResourceList->List[0].BusNumber = DeviceExtension->PciDevice->BusNumber; PartialList = &ResourceList->List[0].PartialResourceList; PartialList->Version = 0; @@ -838,8 +848,8 @@ /* Get PCI configuration space */ Size= HalGetBusDataByOffset(PCIConfiguration, - DeviceExtension->BusNumber, - DeviceExtension->SlotNumber.u.AsULONG, + DeviceExtension->PciDevice->BusNumber, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, IrpSp->Parameters.ReadWriteConfig.Buffer, IrpSp->Parameters.ReadWriteConfig.Offset, IrpSp->Parameters.ReadWriteConfig.Length); @@ -876,8 +886,8 @@ /* Get PCI configuration space */ Size= HalSetBusDataByOffset(PCIConfiguration, - DeviceExtension->BusNumber, - DeviceExtension->SlotNumber.u.AsULONG, + DeviceExtension->PciDevice->BusNumber, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, IrpSp->Parameters.ReadWriteConfig.Buffer, IrpSp->Parameters.ReadWriteConfig.Offset, IrpSp->Parameters.ReadWriteConfig.Length);

19 years, 2 months

← Newer
1
...
44
45
46
47
48
49
50
...
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