Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 54922: [WIN32K] - Simplify BITMAP_CopyBitmap, by using the SURFOBJ members directly instead of calling BITMAP_GetObject. - Use RtlCopyMemory directly in BITMAP_CopyBitmap and remove IntS...
by tkreuzer＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: tkreuzer Date: Thu Jan 12 14:42:59 2012 New Revision: 54922 URL: http://svn.reactos.org/svn/reactos?rev=54922&view=rev Log: [WIN32K] - Simplify BITMAP_CopyBitmap, by using the SURFOBJ members directly instead of calling BITMAP_GetObject. - Use RtlCopyMemory directly in BITMAP_CopyBitmap and remove IntSetBitmapBits - Improve prototype of GreCreateBitmap(Ex) by using ULONG instead of INT for the bitmap dimensions (negative values are invalid) - remove a duplicated type definition Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Thu Jan 12 14:42:59 2012 @@ -4,25 +4,25 @@ HBITMAP FASTCALL BITMAP_CopyBitmap (HBITMAP hBitmap); HBITMAP -APIENTRY +NTAPI GreCreateBitmap( - IN INT nWidth, - IN INT nHeight, - IN UINT cPlanes, - IN UINT cBitsPixel, - IN OPTIONAL PVOID pvBits); + _In_ ULONG nWidth, + _In_ ULONG nHeight, + _In_ ULONG cPlanes, + _In_ ULONG cBitsPixel, + _In_opt_ PVOID pvBits); HBITMAP -APIENTRY +NTAPI GreCreateBitmapEx( - IN INT nWidth, - IN INT nHeight, - IN ULONG cjWidthBytes, - IN ULONG iFormat, - IN USHORT fjBitmap, - IN ULONG cjBits, - IN OPTIONAL PVOID pvBits, - IN FLONG flags); + _In_ ULONG nWidth, + _In_ ULONG nHeight, + _In_ ULONG cjWidthBytes, + _In_ ULONG iFormat, + _In_ USHORT fjBitmap, + _In_ ULONG cjSizeImage, + _In_opt_ PVOID pvBits, + _In_ FLONG flags); HBITMAP FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Thu Jan 12 14:42:59 2012 @@ -3,27 +3,13 @@ * PROJECT: ReactOS kernel * PURPOSE: Bitmap functions * FILE: subsys/win32k/objects/bitmaps.c - * PROGRAMER: Unknown + * PROGRAMER: Timo Kreuzer <timo.kreuzer(a)reactos.org> */ #include <win32k.h> #define NDEBUG #include <debug.h> - -LONG APIENTRY -IntSetBitmapBits( - PSURFACE psurf, - DWORD Bytes, - IN PBYTE Bits) -{ - /* Don't copy more bytes than the buffer has */ - Bytes = min(Bytes, psurf->SurfObj.cjBits); - - RtlCopyMemory(psurf->SurfObj.pvBits, Bits, Bytes); - - return Bytes; -} void NTAPI @@ -57,16 +43,16 @@ } HBITMAP -APIENTRY +NTAPI GreCreateBitmapEx( - IN INT nWidth, - IN INT nHeight, - IN ULONG cjWidthBytes, - IN ULONG iFormat, - IN USHORT fjBitmap, - IN ULONG cjSizeImage, - IN OPTIONAL PVOID pvBits, - IN FLONG flags) + _In_ ULONG nWidth, + _In_ ULONG nHeight, + _In_ ULONG cjWidthBytes, + _In_ ULONG iFormat, + _In_ USHORT fjBitmap, + _In_ ULONG cjSizeImage, + _In_opt_ PVOID pvBits, + _In_ FLONG flags) { PSURFACE psurf; HBITMAP hbmp; @@ -134,13 +120,13 @@ * Note that each scanline must be 32bit aligned! */ HBITMAP -APIENTRY +NTAPI GreCreateBitmap( - IN INT nWidth, - IN INT nHeight, - IN UINT cPlanes, - IN UINT cBitsPixel, - IN OPTIONAL PVOID pvBits) + _In_ ULONG nWidth, + _In_ ULONG nHeight, + _In_ ULONG cPlanes, + _In_ ULONG cBitsPixel, + _In_opt_ PVOID pvBits) { /* Call the extended function */ return GreCreateBitmapEx(nWidth, @@ -433,7 +419,7 @@ psurf = dc->dclevel.pSurface; if (psurf) { - pso = &psurf->SurfObj; + pso = &psurf->SurfObj; EXLATEOBJ_vInitialize(&exlo, psurf->ppal, &gpalRGB, 0, 0xffffff, 0); // Check if this DC has a DIB behind it... if (pso->pvScan0) // STYPE_BITMAP == pso->iType @@ -476,8 +462,6 @@ HBITMAP hBmpOld = (HBITMAP)NtGdiSelectBitmap(hDCTmp, hBmpTmp); if (hBmpOld) { - PSURFACE psurf; - NtGdiBitBlt(hDCTmp, 0, 0, 1, 1, hDC, XPos, YPos, SRCCOPY, 0, 0); NtGdiSelectBitmap(hDCTmp, hBmpOld); @@ -503,10 +487,10 @@ FASTCALL UnsafeGetBitmapBits( PSURFACE psurf, - DWORD Bytes, - OUT PBYTE pvBits) -{ - PUCHAR pjDst, pjSrc; + DWORD Bytes, + OUT PBYTE pvBits) +{ + PUCHAR pjDst, pjSrc; LONG lDeltaDst, lDeltaSrc; ULONG nWidth, nHeight, cBitsPixel; @@ -529,20 +513,24 @@ } } -LONG APIENTRY +LONG +APIENTRY NtGdiGetBitmapBits( HBITMAP hBitmap, - ULONG Bytes, + ULONG cjBuffer, OUT OPTIONAL PBYTE pUnsafeBits) { PSURFACE psurf; - LONG bmSize, ret; - - if (pUnsafeBits != NULL && Bytes == 0) + ULONG cjSize; + LONG ret; + + /* Check parameters */ + if (pUnsafeBits != NULL && cjBuffer == 0) { return 0; } + /* Lock the bitmap */ psurf = SURFACE_ShareLockSurface(hBitmap); if (!psurf) { @@ -550,26 +538,27 @@ return 0; } - bmSize = WIDTH_BYTES_ALIGN16(psurf->SurfObj.sizlBitmap.cx, - BitsPerFormat(psurf->SurfObj.iBitmapFormat)) * - abs(psurf->SurfObj.sizlBitmap.cy); + /* Calculate the size of the bitmap in bytes */ + cjSize = WIDTH_BYTES_ALIGN16(psurf->SurfObj.sizlBitmap.cx, + BitsPerFormat(psurf->SurfObj.iBitmapFormat)) * + abs(psurf->SurfObj.sizlBitmap.cy); /* If the bits vector is null, the function should return the read size */ if (pUnsafeBits == NULL) { SURFACE_ShareUnlockSurface(psurf); - return bmSize; + return cjSize; } /* Don't copy more bytes than the buffer has */ - Bytes = min(Bytes, bmSize); + cjBuffer = min(cjBuffer, cjSize); // FIXME: Use MmSecureVirtualMemory _SEH2_TRY { - ProbeForWrite(pUnsafeBits, Bytes, 1); - UnsafeGetBitmapBits(psurf, Bytes, pUnsafeBits); - ret = Bytes; + ProbeForWrite(pUnsafeBits, cjBuffer, 1); + UnsafeGetBitmapBits(psurf, cjBuffer, pUnsafeBits); + ret = cjBuffer; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -776,63 +765,65 @@ /* Internal Functions */ -HBITMAP FASTCALL +HBITMAP +FASTCALL BITMAP_CopyBitmap(HBITMAP hBitmap) { - HBITMAP res; - BITMAP bm; - SURFACE *Bitmap, *resBitmap; - SIZEL Size; - - if (hBitmap == NULL) + HBITMAP hbmNew; + SURFACE *psurfSrc, *psurfNew; + + /* Fail, if no source bitmap is given */ + if (hBitmap == NULL) return 0; + + /* Lock the source bitmap */ + psurfSrc = SURFACE_ShareLockSurface(hBitmap); + if (psurfSrc == NULL) { return 0; } - Bitmap = SURFACE_ShareLockSurface(hBitmap); - if (Bitmap == NULL) - { - return 0; - } - - BITMAP_GetObject(Bitmap, sizeof(BITMAP), (PVOID)&bm); - bm.bmBits = NULL; - if (Bitmap->SurfObj.lDelta >= 0) - bm.bmHeight = -bm.bmHeight; - - Size.cx = abs(bm.bmWidth); - Size.cy = abs(bm.bmHeight); - res = GreCreateBitmapEx(Size.cx, - Size.cy, - bm.bmWidthBytes, - Bitmap->SurfObj.iBitmapFormat, - Bitmap->SurfObj.fjBitmap, - Bitmap->SurfObj.cjBits, - NULL, - Bitmap->flags); - - - if (res) - { - resBitmap = SURFACE_ShareLockSurface(res); - if (resBitmap) - { - IntSetBitmapBits(resBitmap, Bitmap->SurfObj.cjBits, Bitmap->SurfObj.pvBits); - GDIOBJ_vReferenceObjectByPointer(&Bitmap->ppal->BaseObject); - GDIOBJ_vDereferenceObject(&resBitmap->ppal->BaseObject); - resBitmap->ppal = Bitmap->ppal; - SURFACE_ShareUnlockSurface(resBitmap); + /* Allocate a new bitmap with the same dimensions as the source bmp */ + hbmNew = GreCreateBitmapEx(psurfSrc->SurfObj.sizlBitmap.cx, + psurfSrc->SurfObj.sizlBitmap.cy, + psurfSrc->SurfObj.lDelta, + psurfSrc->SurfObj.iBitmapFormat, + psurfSrc->SurfObj.fjBitmap, + psurfSrc->SurfObj.cjBits, + NULL, + psurfSrc->flags); + + if (hbmNew) + { + /* Lock the new bitmap */ + psurfNew = SURFACE_ShareLockSurface(hbmNew); + if (psurfNew) + { + /* Copy the bitmap bits to the new bitmap buffer */ + RtlCopyMemory(psurfNew->SurfObj.pvBits, + psurfSrc->SurfObj.pvBits, + psurfNew->SurfObj.cjBits); + + /* Dereference the new bitmaps palette, we will use a different */ + GDIOBJ_vDereferenceObject(&psurfNew->ppal->BaseObject); + + /* Reference the palette of the source bitmap and use it */ + GDIOBJ_vReferenceObjectByPointer(&psurfSrc->ppal->BaseObject); + psurfNew->ppal = psurfSrc->ppal; + + /* Unlock the new surface */ + SURFACE_ShareUnlockSurface(psurfNew); } else { - GreDeleteObject(res); - res = NULL; - } - } - - SURFACE_ShareUnlockSurface(Bitmap); - - return res; + /* Failed to lock the bitmap, shouldn't happen */ + GreDeleteObject(hbmNew); + hbmNew = NULL; + } + } + + /* Unlock the source bitmap and return the handle of the new bitmap */ + SURFACE_ShareUnlockSurface(psurfSrc); + return hbmNew; } INT APIENTRY @@ -850,15 +841,15 @@ pBitmap->bmHeight = psurf->SurfObj.sizlBitmap.cy; pBitmap->bmPlanes = 1; pBitmap->bmBitsPixel = BitsPerFormat(psurf->SurfObj.iBitmapFormat); - pBitmap->bmWidthBytes = WIDTH_BYTES_ALIGN16(pBitmap->bmWidth, pBitmap->bmBitsPixel); + pBitmap->bmWidthBytes = WIDTH_BYTES_ALIGN16(pBitmap->bmWidth, pBitmap->bmBitsPixel); /* Check for DIB section */ if (psurf->hSecure) { /* Set bmBits in this case */ pBitmap->bmBits = psurf->SurfObj.pvBits; - /* DIBs data are 32 bits aligned */ - pBitmap->bmWidthBytes = WIDTH_BYTES_ALIGN32(pBitmap->bmWidth, pBitmap->bmBitsPixel); + /* DIBs data are 32 bits aligned */ + pBitmap->bmWidthBytes = WIDTH_BYTES_ALIGN32(pBitmap->bmWidth, pBitmap->bmBitsPixel); if (Count >= sizeof(DIBSECTION)) {

1 0

[tkreuzer] 54921: [PSDK] Remove a deprecated definition from winddi.h
by tkreuzer＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: tkreuzer Date: Thu Jan 12 14:32:43 2012 New Revision: 54921 URL: http://svn.reactos.org/svn/reactos?rev=54921&view=rev Log: [PSDK] Remove a deprecated definition from winddi.h Modified: trunk/reactos/include/psdk/winddi.h Modified: trunk/reactos/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winddi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winddi.h [iso-8859-1] Thu Jan 12 14:32:43 2012 @@ -427,7 +427,6 @@ #define INDEX_DrvReserved11 92L #if (NTDDI_VERSION >= NTDDI_VISTA) #define INDEX_DrvRenderHint 93L -#define INDEX_LAST 93L #if (NTDDI_VERSION >= NTDDI_WIN7) #define INDEX_DrvCreateDeviceBitmapEx 94L #define INDEX_DrvDeleteDeviceBitmapEx 95L

1 0

[tkreuzer] 54920: [PSDK] - Add some missing definitions (Vista+) to winddi.h - Fix and improve annotations in winddi.h
by tkreuzer＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: tkreuzer Date: Thu Jan 12 13:24:32 2012 New Revision: 54920 URL: http://svn.reactos.org/svn/reactos?rev=54920&view=rev Log: [PSDK] - Add some missing definitions (Vista+) to winddi.h - Fix and improve annotations in winddi.h Modified: trunk/reactos/include/psdk/winddi.h Modified: trunk/reactos/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winddi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winddi.h [iso-8859-1] Thu Jan 12 13:24:32 2012 @@ -23,6 +23,7 @@ #ifndef _WINDDI_ #define _WINDDI_ +#pragma once #ifdef __VIDEO_H__ #error video.h cannot be included with winddi.h @@ -48,17 +49,14 @@ #define DDI_DRIVER_VERSION_SP3 0x00020003 #define DDI_DRIVER_VERSION_NT5 0x00030000 #define DDI_DRIVER_VERSION_NT5_01 0x00030100 +#define DDI_DRIVER_VERSION_NT5_01_SP1 0x00030101 #define GDI_DRIVER_VERSION 0x4000 -#ifdef _X86_ - +#if defined(_X86_) && !defined(USERMODE_DRIVER) && !defined(BUILD_WOW6432) typedef DWORD FLOATL; - -#else /* !_X86_ */ - +#else typedef FLOAT FLOATL; - #endif typedef SHORT FWORD; @@ -184,7 +182,7 @@ POINTFIX ptfxB; LONG lStyleState; ULONG c; - RUN arun[1]; + _Field_size_(c) RUN arun[1]; } CLIPLINE, *PCLIPLINE; /* CLIPOBJ.iDComplexity constants */ @@ -427,7 +425,26 @@ #define INDEX_DrvReserved9 90L #define INDEX_DrvReserved10 91L #define INDEX_DrvReserved11 92L +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define INDEX_DrvRenderHint 93L #define INDEX_LAST 93L +#if (NTDDI_VERSION >= NTDDI_WIN7) +#define INDEX_DrvCreateDeviceBitmapEx 94L +#define INDEX_DrvDeleteDeviceBitmapEx 95L +#define INDEX_DrvAssociateSharedSurface 96L +#define INDEX_DrvSynchronizeRedirectionBitmaps 97L +#define INDEX_DrvAccumulateD3DDirtyRect 98L +#define INDEX_DrvStartDxInterop 99L +#define INDEX_DrvEndDxInterop 100L +#define INDEX_DrvLockDisplayArea 101L +#define INDEX_DrvUnlockDisplayArea 102L +#define INDEX_LAST 103L +#else /* (NTDDI_VERSION >= NTDDI_WIN7) */ +#define INDEX_LAST 94L +#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ +#else /* (NTDDI_VERSION >= NTDDI_VISTA) */ +#define INDEX_LAST 93L +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ typedef struct _DRVFN { ULONG iFunc; @@ -462,14 +479,14 @@ } ENGSAFESEMAPHORE; typedef struct _ENG_TIME_FIELDS { - USHORT usYear; - USHORT usMonth; - USHORT usDay; - USHORT usHour; - USHORT usMinute; - USHORT usSecond; - USHORT usMilliseconds; - USHORT usWeekday; + _Field_range_(1601,MAXUSHORT) USHORT usYear; + _Field_range_(1,12) USHORT usMonth; + _Field_range_(1,31) USHORT usDay; + _Field_range_(0,23) USHORT usHour; + _Field_range_(0,59) USHORT usMinute; + _Field_range_(0,59) USHORT usSecond; + _Field_range_(0,999) USHORT usMilliseconds; + _Field_range_(0,6) USHORT usWeekday; // 0 == Sunday } ENG_TIME_FIELDS, *PENG_TIME_FIELDS; typedef struct _ENUMRECTS { @@ -523,7 +540,7 @@ ULONG cjThis; ULONG cGlyphs; ULONG iMode; - BYTE aGlyphAttr[1]; + _Field_size_((cGlyphs+7)/8) BYTE aGlyphAttr[1]; } FD_GLYPHATTR, *PFD_GLYPHATTR; /* FD_GLYPHSET.flAccel */ @@ -542,7 +559,7 @@ FLONG flAccel; ULONG cGlyphsSupported; ULONG cRuns; - WCRUN awcrun[1]; + _Field_size_(cRuns) WCRUN awcrun[1]; } FD_GLYPHSET, *PFD_GLYPHSET; typedef struct _FD_KERNINGPAIR { @@ -561,7 +578,8 @@ typedef FLOAT FLOATOBJ, *PFLOATOBJ; #endif -typedef struct _FLOATOBJ_XFORM { +#ifndef USERMODE_DRIVER +typedef struct tagFLOATOBJ_XFORM { FLOATOBJ eM11; FLOATOBJ eM12; FLOATOBJ eM21; @@ -569,6 +587,9 @@ FLOATOBJ eDx; FLOATOBJ eDy; } FLOATOBJ_XFORM, *PFLOATOBJ_XFORM, FAR *LPFLOATOBJ_XFORM; +#else +typedef XFORML FLOATOBJ_XFORM, *PFLOATOBJ_XFORM, FAR *LPFLOATOBJ_XFORM; +#endif /* FONTDIFF.fsSelection */ #define FM_SEL_ITALIC 0x0001 @@ -1126,6 +1147,9 @@ #define WOC_DRAWN 0x00000040 #define WOC_SPRITE_OVERLAP 0x00000080 #define WOC_SPRITE_NO_OVERLAP 0x00000100 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define WOC_RGN_SPRITE 0x00000200 +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ typedef VOID (APIENTRY CALLBACK *WNDOBJCHANGEPROC)( _In_ WNDOBJ *pwo, @@ -1138,6 +1162,7 @@ BRUSHOBJ_hGetColorTransform( _In_ BRUSHOBJ *pbo); +_Ret_opt_bytecount_(cj) WIN32KAPI PVOID APIENTRY @@ -1193,6 +1218,14 @@ CLIPOBJ_ppoGetPath( _In_ CLIPOBJ *pco); +#if (NTDDI_VERSION >= NTDDI_VISTA) +WIN32KAPI +HANDLE +APIENTRY +CLIPOBJ_GetRgn( + _In_ CLIPOBJ* pco); +#endif + WIN32KAPI VOID APIENTRY @@ -1201,6 +1234,14 @@ #define FL_ZERO_MEMORY 0x00000001 #define FL_NONPAGED_MEMORY 0x00000002 + +#ifdef USERMODE_DRIVER + +#define EngAllocMem(fl, cj, tag) ((PVOID)GlobalAlloc(((fl) & FL_ZERO_MEMORY) ? GPTR : GMEM_FIXED, cj)) +#define EngAllocPrivateUserMem(psl, cj, tag) ((PVOID)GlobalAlloc(GMEM_FIXED, cj)) +#define EngAllocUserMem(cj, tag) ((PVOID)GlobalAlloc(GMEM_FIXED, cj)) + +#else _Must_inspect_result_ _When_(fl & FL_ZERO_MEMORY, _Ret_opt_bytecount_(cjMemSize)) @@ -1232,13 +1273,15 @@ _In_ SIZE_T cjMemSize, _In_ ULONG ulTag); +#endif /* USERMODE_DRIVER */ + WIN32KAPI BOOL APIENTRY EngAlphaBlend( _Inout_ SURFOBJ *psoDest, _In_ SURFOBJ *psoSrc, - _In_ CLIPOBJ *pco, + _In_opt_ CLIPOBJ *pco, _In_opt_ XLATEOBJ *pxlo, _In_ RECTL *prclDest, _In_ RECTL *prclSrc, @@ -1262,7 +1305,11 @@ #define HOOK_TRANSPARENTBLT 0x00008000 #define HOOK_ALPHABLEND 0x00010000 #define HOOK_GRADIENTFILL 0x00020000 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define HOOK_FLAGS 0x0003b5ef +#else #define HOOK_FLAGS 0x0003b5ff +#endif WIN32KAPI BOOL @@ -1279,13 +1326,13 @@ _Inout_ SURFOBJ *psoTrg, _In_opt_ SURFOBJ *psoSrc, _In_opt_ SURFOBJ *psoMask, - _In_ CLIPOBJ *pco, + _In_opt_ CLIPOBJ *pco, _In_opt_ XLATEOBJ *pxlo, _In_ RECTL *prclTrg, _When_(psoSrc, _In_) POINTL *pptlSrc, _When_(psoMask, _In_) POINTL *pptlMask, _In_opt_ BRUSHOBJ *pbo, - _In_opt_ POINTL *pptlBrush, + _When_(pbo, _In_) POINTL *pptlBrush, _In_ ROP4 rop4); WIN32KAPI @@ -1325,8 +1372,8 @@ EngCopyBits( _In_ SURFOBJ *psoDest, _In_ SURFOBJ *psoSrc, - _In_ CLIPOBJ *pco, - _In_ XLATEOBJ *pxlo, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, _In_ RECTL *prclDest, _In_ POINTL *pptlSrc); @@ -1338,13 +1385,14 @@ _In_ LONG lWidth, _In_ ULONG iFormat, _In_ FLONG fl, - _In_ PVOID pvBits); + _In_opt_ PVOID pvBits); WIN32KAPI CLIPOBJ* APIENTRY EngCreateClip(VOID); +_Must_inspect_result_ WIN32KAPI HBITMAP APIENTRY @@ -1416,6 +1464,9 @@ #define WO_DRAW_NOTIFY 0x00000040 #define WO_SPRITE_NOTIFY 0x00000080 #define WO_RGN_DESKTOP_COORD 0x00000100 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define WO_RGN_SPRITE 0x00000200 +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ _Must_inspect_result_ WIN32KAPI @@ -1428,6 +1479,7 @@ _In_ FLONG fl, _In_ INT iPixelFormat); +//_Analysis_noreturn_ WIN32KAPI VOID APIENTRY @@ -1445,13 +1497,13 @@ VOID APIENTRY EngDeleteClip( - _In_ CLIPOBJ *pco); + _In_ _Post_ptr_invalid_ CLIPOBJ *pco); WIN32KAPI BOOL APIENTRY EngDeleteDriverObj( - _In_ HDRVOBJ hdo, + _In_ _Post_ptr_invalid_ HDRVOBJ hdo, _In_ BOOL bCallBack, _In_ BOOL bLocked); @@ -1459,7 +1511,7 @@ BOOL APIENTRY EngDeleteEvent( - _In_ PEVENT pEvent); + _In_ _Post_ptr_invalid_ PEVENT pEvent); WIN32KAPI BOOL @@ -1471,13 +1523,13 @@ BOOL APIENTRY EngDeletePalette( - _In_ HPALETTE hpal); + _In_ _Post_ptr_invalid_ HPALETTE hpal); WIN32KAPI VOID APIENTRY EngDeletePath( - _Inout_ PATHOBJ *ppo); + _Inout_ _Post_ptr_invalid_ PATHOBJ *ppo); WIN32KAPI VOID @@ -1489,19 +1541,19 @@ VOID APIENTRY EngDeleteSemaphore( - _Inout_ HSEMAPHORE hsem); + _Inout_ _Post_ptr_invalid_ HSEMAPHORE hsem); WIN32KAPI BOOL APIENTRY EngDeleteSurface( - _In_ HSURF hsurf); + _In_ _Post_ptr_invalid_ HSURF hsurf); WIN32KAPI VOID APIENTRY EngDeleteWnd( - _Inout_ WNDOBJ *pwo); + _Inout_ _Post_ptr_invalid_ WNDOBJ *pwo); WIN32KAPI DWORD @@ -1600,17 +1652,19 @@ _In_ ULONG FastCheckSum, _Out_ ULONG *pulSize); +#ifdef USERMODE_DRIVER + +#define EngFreeMem(p) GlobalFree((HGLOBAL) (p)) +#define EngFreePrivateUserMem( psl, p) GlobalFree((HGLOBAL) (p)) +#define EngFreeUserMem(p) GlobalFree((HGLOBAL) (p)) + +#else /* !USERMODE_DRIVER */ + WIN32KAPI VOID APIENTRY EngFreeMem( _In_ _Post_ptr_invalid_ PVOID pv); - -WIN32KAPI -VOID -APIENTRY -EngFreeModule( - _In_ HANDLE h); WIN32KAPI VOID @@ -1624,6 +1678,15 @@ APIENTRY EngFreeUserMem( _In_ _Post_ptr_invalid_ PVOID pv); + +#endif /* !USERMODE_DRIVER */ + +WIN32KAPI +VOID +APIENTRY +EngFreeModule( + _In_ HANDLE h); + WIN32KAPI VOID @@ -1674,10 +1737,14 @@ _In_ DWORD cbBuf, _Out_ LPDWORD pcbNeeded); +#ifdef USERMODE_DRIVER +#define EngGetLastError GetLastError +#else WIN32KAPI ULONG APIENTRY EngGetLastError(VOID); +#endif WIN32KAPI BOOL @@ -1908,6 +1975,9 @@ _In_ LONG y, _In_ RECTL *prcl); +#ifdef USERMODE_DRIVER +#define EngMulDiv MulDiv +#else /* !USERMODE_DRIVER */ WIN32KAPI INT APIENTRY @@ -1915,6 +1985,7 @@ _In_ INT a, _In_ INT b, _In_ INT c); +#endif /* !USERMODE_DRIVER */ WIN32KAPI VOID @@ -1954,7 +2025,7 @@ _In_ SURFOBJ *psoSrc, _In_opt_ SURFOBJ *psoMsk, _In_ CLIPOBJ *pco, - _In_ XLATEOBJ *pxlo, + _In_opt_ XLATEOBJ *pxlo, _In_ COLORADJUSTMENT *pca, _In_ POINTL *pptlBrushOrg, _In_ POINTFIX *pptfx, @@ -2091,20 +2162,24 @@ EngSetEvent( _In_ PEVENT pEvent); +#ifdef USERMODE_DRIVER +#define EngSetLastError SetLastError +#else WIN32KAPI VOID APIENTRY EngSetLastError( _In_ ULONG iError); +#endif WIN32KAPI ULONG APIENTRY EngSetPointerShape( _In_ SURFOBJ *pso, - _In_ SURFOBJ *psoMask, - _In_ SURFOBJ *psoColor, - _In_ XLATEOBJ *pxlo, + _In_opt_ SURFOBJ *psoMask, + _In_opt_ SURFOBJ *psoColor, + _In_opt_ XLATEOBJ *pxlo, _In_ LONG xHot, _In_ LONG yHot, _In_ LONG x, @@ -2117,9 +2192,9 @@ APIENTRY EngSetPointerTag( _In_ HDEV hdev, - _In_ SURFOBJ *psoMask, - _In_ SURFOBJ *psoColor, - _In_ XLATEOBJ *pxlo, + _In_opt_ SURFOBJ *psoMask, + _In_opt_ SURFOBJ *psoColor, + _Reserved_ XLATEOBJ *pxlo, _In_ FLONG fl); WIN32KAPI @@ -2150,9 +2225,9 @@ _In_ SURFOBJ *psoDest, _In_ SURFOBJ *psoSrc, _In_opt_ SURFOBJ *psoMask, - _In_ CLIPOBJ *pco, - _In_ XLATEOBJ *pxlo, - _In_ COLORADJUSTMENT *pca, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_opt_ COLORADJUSTMENT *pca, _In_ POINTL *pptlHTOrg, _In_ RECTL *prclDest, _In_ RECTL *prclSrc, @@ -2166,9 +2241,9 @@ _In_ SURFOBJ *psoDest, _In_ SURFOBJ *psoSrc, _In_opt_ SURFOBJ *psoMask, - _In_ CLIPOBJ *pco, - _In_ XLATEOBJ *pxlo, - _In_ COLORADJUSTMENT *pca, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_opt_ COLORADJUSTMENT *pca, _In_ POINTL *pptlHTOrg, _In_ RECTL *prclDest, _In_ RECTL *prclSrc, @@ -2226,8 +2301,8 @@ EngTransparentBlt( _In_ SURFOBJ *psoDst, _In_ SURFOBJ *psoSrc, - _In_ CLIPOBJ *pco, - _In_ XLATEOBJ *pxlo, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, _In_ RECTL *prclDst, _In_ RECTL *prclSrc, _In_ ULONG iTransColor, @@ -2259,13 +2334,13 @@ BOOL APIENTRY EngUnlockDriverObj( - _In_ HDRVOBJ hdo); + _In_ _Post_ptr_invalid_ HDRVOBJ hdo); WIN32KAPI VOID APIENTRY EngUnlockSurface( - _In_ SURFOBJ *pso); + _In_ _Post_ptr_invalid_ SURFOBJ *pso); WIN32KAPI BOOL @@ -2302,7 +2377,7 @@ APIENTRY EngWaitForSingleObject( _In_ PEVENT pEvent, - _In_ PLARGE_INTEGER pTimeOut); + _In_opt_ PLARGE_INTEGER pTimeOut); WIN32KAPI INT @@ -2584,7 +2659,12 @@ _In_ ULONG cjSize, _Out_bytecap_(cjSize) FONTINFO *pfi); - +#if (NTDDI_VERSION <= NTDDI_WINXP) +GAMMA_TABLES* +APIENTRY +FONTOBJ_pGetGammaTables( + _In_ FONTOBJ *pfo); +#endif WIN32KAPI LONG @@ -2666,7 +2746,7 @@ APIENTRY PATHOBJ_bPolyBezierTo( _In_ PATHOBJ *ppo, - _In_ POINTFIX *pptfx, + _In_count_(cptfx) POINTFIX *pptfx, _In_ ULONG cptfx); WIN32KAPI @@ -2674,7 +2754,7 @@ APIENTRY PATHOBJ_bPolyLineTo( _In_ PATHOBJ *ppo, - _In_ POINTFIX *pptfx, + _In_count_(cptfx) POINTFIX *pptfx, _In_ ULONG cptfx); WIN32KAPI @@ -2788,12 +2868,16 @@ _In_reads_bytes_(cPoints * sizeof(POINTL)) PVOID pvIn, _Out_writes_bytes_(cPoints * sizeof(POINTL)) PVOID pvOut); +#if !defined(USERMODE_DRIVER) WIN32KAPI ULONG APIENTRY XFORMOBJ_iGetFloatObjXform( _In_ XFORMOBJ *pxo, _Out_ FLOATOBJ_XFORM *pxfo); +#else +#define XFORMOBJ_iGetFloatObjXform XFORMOBJ_iGetXform +#endif WIN32KAPI ULONG @@ -2867,10 +2951,10 @@ _In_ CLIPOBJ *pco, _In_opt_ XLATEOBJ *pxlo, _In_ RECTL *prclTrg, - _In_opt_ POINTL *pptlSrc, - _In_opt_ POINTL *pptlMask, + _When_(psoSrc, _In_) POINTL *pptlSrc, + _When_(psoMask, _In_) POINTL *pptlMask, _In_opt_ BRUSHOBJ *pbo, - _In_opt_ POINTL *pptlBrush, + _When_(pbo, _In_) POINTL *pptlBrush, _In_ ROP4 rop4); typedef FN_DrvBitBlt *PFN_DrvBitBlt; extern FN_DrvBitBlt DrvBitBlt; @@ -2887,7 +2971,7 @@ _In_ SURFOBJ *psoDest, _In_ SURFOBJ *psoSrc, _In_ CLIPOBJ *pco, - _In_ XLATEOBJ *pxlo, + _In_opt_ XLATEOBJ *pxlo, _In_ RECTL *prclDest, _In_ POINTL *pptlSrc); typedef FN_DrvCopyBits *PFN_DrvCopyBits; @@ -2903,7 +2987,7 @@ typedef VOID (APIENTRY FN_DrvDeleteDeviceBitmap)( - _In_ DHSURF dhsurf); + _In_ _Post_ptr_invalid_ DHSURF dhsurf); typedef FN_DrvDeleteDeviceBitmap *PFN_DrvDeleteDeviceBitmap; extern FN_DrvDeleteDeviceBitmap DrvDeleteDeviceBitmap; @@ -3229,8 +3313,8 @@ _In_ DHPDEV dhpdev, _In_ FONTOBJ *pfo, _In_ ULONG iMode, - _In_count_(cGlyphs) HGLYPH *phg, - _Out_bytecap_(cGlyphs * sizeof(USHORT)) PVOID pvWidths, // CHECKME + _In_reads_(cGlyphs) HGLYPH *phg, + _Out_writes_bytes_(cGlyphs * sizeof(USHORT)) PVOID pvWidths, _In_ ULONG cGlyphs); typedef FN_DrvQueryAdvanceWidths *PFN_DrvQueryAdvanceWidths; extern FN_DrvQueryAdvanceWidths DrvQueryAdvanceWidths; @@ -3379,7 +3463,7 @@ _In_ PTRDIFF dpStart, _In_ ULONG cjBuf, _Out_opt_bytecap_(cjBuf) BYTE *pjBuf, - _Out_opt_ PBYTE *ppjTable, + _Outptr_opt_result_bytebuffer_all_maybenull_(*pcjTable) PBYTE *ppjTable, _Out_opt_ ULONG *pcjTable); typedef FN_DrvQueryTrueTypeTable *PFN_DrvQueryTrueTypeTable; extern FN_DrvQueryTrueTypeTable DrvQueryTrueTypeTable; @@ -3393,9 +3477,9 @@ (APIENTRY FN_DrvRealizeBrush)( _In_ BRUSHOBJ *pbo, _Inout_ SURFOBJ *psoTarget, // CHECKME - _In_ SURFOBJ *psoPattern, - _In_ SURFOBJ *psoMask, - _In_ XLATEOBJ *pxlo, + _In_opt_ SURFOBJ *psoPattern, + _In_opt_ SURFOBJ *psoMask, + _In_opt_ XLATEOBJ *pxlo, _In_ ULONG iHatch); typedef FN_DrvRealizeBrush *PFN_DrvRealizeBrush; extern FN_DrvRealizeBrush DrvRealizeBrush; @@ -3591,6 +3675,8 @@ /* DrvSynchronizeSurface.fl constants */ #define DSS_TIMER_EVENT 0x00000001 #define DSS_FLUSH_EVENT 0x00000002 +#define DSS_RESERVED 0x00000004 +#define DSS_RESERVED1 0x00000008 typedef VOID (APIENTRY FN_DrvSynchronizeSurface)(

1 0

[tkreuzer] 54919: [PSDK] Rewrite sal.h so that it actually works with __desclspec()
by tkreuzer＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: tkreuzer Date: Thu Jan 12 12:52:33 2012 New Revision: 54919 URL: http://svn.reactos.org/svn/reactos?rev=54919&view=rev Log: [PSDK] Rewrite sal.h so that it actually works with __desclspec() Modified: trunk/reactos/include/psdk/sal.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=549…

1 0

[cgutman] 54918: [PCNET] - Remove an incorrect comment
by cgutman＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: cgutman Date: Thu Jan 12 03:16:48 2012 New Revision: 54918 URL: http://svn.reactos.org/svn/reactos?rev=54918&view=rev Log: [PCNET] - Remove an incorrect comment Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/r… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] Thu Jan 12 03:16:48 2012 @@ -136,7 +136,6 @@ case OID_GEN_HARDWARE_STATUS: { GenericULONG = (ULONG)NdisHardwareStatusReady; - /* ((Adapter->MediaState == NdisMediaStateConnected) ? NdisHardwareStatusReady : NdisHardwareStatusNotReady); */ break; }

1 0

[cgutman] 54917: - Merge 54895, 54896, 54899, 54912, 54913, 54915, and 54916 from wlan-bringup
by cgutman＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: cgutman Date: Thu Jan 12 03:12:49 2012 New Revision: 54917 URL: http://svn.reactos.org/svn/reactos?rev=54917&view=rev Log: - Merge 54895, 54896, 54899, 54912, 54913, 54915, and 54916 from wlan-bringup Modified: trunk/reactos/ (props changed) trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c trunk/reactos/dll/win32/dhcpcsvc/dhcp/api.c trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c trunk/reactos/drivers/network/dd/pcnet/requests.c trunk/reactos/drivers/network/ndis/ndis/time.c trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/lib/drivers/ip/network/interface.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 12 03:12:49 2012 @@ -10,3 +10,4 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 /branches/shell32_new-bringup:51893-53652,53661,53700 /branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/branches/wlan-bringup:54895-54896,54899,54912-54913,54915-54916 Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ad… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Thu Jan 12 03:12:49 2012 @@ -1,6 +1,6 @@ #include "rosdhcp.h" -static SOCKET DhcpSocket = INVALID_SOCKET; +SOCKET DhcpSocket = INVALID_SOCKET; static LIST_ENTRY AdapterList; static WSADATA wsd; @@ -209,6 +209,7 @@ PDHCP_ADAPTER Adapter = NULL; HANDLE AdapterStateChangedEvent = (HANDLE)Context; struct interface_info *ifi = NULL; + struct protocol *proto; int i, AdapterCount = 0, Broadcast; /* FIXME: Kill this thread when the service is stopped */ @@ -245,6 +246,10 @@ /* We're still active so we stay in the list */ ifi = &Adapter->DhclientInfo; } else { + proto = find_protocol_by_adapter(&Adapter->DhclientInfo); + if (proto) + remove_protocol(proto); + /* We've lost our link so out we go */ RemoveEntryList(&Adapter->ListEntry); free(Adapter); @@ -330,7 +335,7 @@ Adapter->DhclientInfo.rfdesc, got_one, &Adapter->DhclientInfo); - state_init(&Adapter->DhclientInfo); + state_init(&Adapter->DhclientInfo); } ApiLock(); @@ -345,15 +350,12 @@ DH_DbgPrint(MID_TRACE,("Adapter %d was rejected\n", Table->table[i].dwIndex)); } +#if 0 Error = NotifyAddrChange(NULL, NULL); -#if 0 if (Error != NO_ERROR) break; #else - if (AdapterCount) - break; - else - Sleep(3000); + Sleep(3000); #endif } while (TRUE); @@ -364,14 +366,13 @@ } HANDLE StartAdapterDiscovery(VOID) { - HANDLE /* ThreadHandle, */ EventHandle; + HANDLE ThreadHandle, EventHandle; EventHandle = CreateEvent(NULL, FALSE, FALSE, NULL); -#if 0 ThreadHandle = CreateThread(NULL, 0, AdapterDiscoveryThread, @@ -383,9 +384,6 @@ return NULL; CloseHandle(ThreadHandle); -#else - AdapterDiscoveryThread((LPVOID)EventHandle); -#endif return EventHandle; } Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ap… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/api.c [iso-8859-1] Thu Jan 12 03:12:49 2012 @@ -14,6 +14,8 @@ static CRITICAL_SECTION ApiCriticalSection; +extern HANDLE AdapterStateChangedEvent; + VOID ApiInit() { InitializeCriticalSection( &ApiCriticalSection ); } @@ -35,19 +37,28 @@ DWORD DSLeaseIpAddress( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { COMM_DHCP_REPLY Reply; PDHCP_ADAPTER Adapter; - - ApiLock(); - - Adapter = AdapterFindIndex( Req->AdapterIndex ); - - Reply.Reply = Adapter ? 1 : 0; - - if( Adapter ) { + struct protocol* proto; + + ApiLock(); + + Adapter = AdapterFindIndex( Req->AdapterIndex ); + + Reply.Reply = Adapter ? 1 : 0; + + if( Adapter ) { + proto = find_protocol_by_adapter( &Adapter->DhclientInfo ); + if (proto) + remove_protocol(proto); + add_protocol( Adapter->DhclientInfo.name, Adapter->DhclientInfo.rfdesc, got_one, &Adapter->DhclientInfo ); - Adapter->DhclientInfo.client->state = S_INIT; - state_reboot(&Adapter->DhclientInfo); + + Adapter->DhclientInfo.client->state = S_INIT; + state_reboot(&Adapter->DhclientInfo); + + if (AdapterStateChangedEvent != NULL) + SetEvent(AdapterStateChangedEvent); } ApiUnlock(); @@ -91,10 +102,18 @@ if( Adapter ) { if (Adapter->NteContext) DeleteIPAddress( Adapter->NteContext ); + if (Adapter->RouterMib.dwForwardNextHop) + DeleteIpForwardEntry( &Adapter->RouterMib ); proto = find_protocol_by_adapter( &Adapter->DhclientInfo ); if (proto) remove_protocol(proto); + + Adapter->DhclientInfo.client->active = NULL; + Adapter->DhclientInfo.client->state = S_INIT; + + if (AdapterStateChangedEvent != NULL) + SetEvent(AdapterStateChangedEvent); } ApiUnlock(); @@ -105,6 +124,7 @@ DWORD DSRenewIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { COMM_DHCP_REPLY Reply; PDHCP_ADAPTER Adapter; + struct protocol* proto; ApiLock(); @@ -118,12 +138,20 @@ Reply.Reply = 1; + proto = find_protocol_by_adapter( &Adapter->DhclientInfo ); + if (proto) + remove_protocol(proto); + add_protocol( Adapter->DhclientInfo.name, Adapter->DhclientInfo.rfdesc, got_one, &Adapter->DhclientInfo ); + Adapter->DhclientInfo.client->state = S_INIT; state_reboot(&Adapter->DhclientInfo); + if (AdapterStateChangedEvent != NULL) + SetEvent(AdapterStateChangedEvent); + ApiUnlock(); return Send( &Reply ); @@ -144,6 +172,9 @@ if( Adapter ) { if (Adapter->NteContext) DeleteIPAddress( Adapter->NteContext ); + if (Adapter->RouterMib.dwForwardNextHop) + DeleteIpForwardEntry( &Adapter->RouterMib ); + Adapter->DhclientState.state = S_STATIC; proto = find_protocol_by_adapter( &Adapter->DhclientInfo ); if (proto) @@ -154,6 +185,9 @@ &Adapter->NteContext, &Adapter->NteInstance ); Reply.Reply = NT_SUCCESS(Status); + + if (AdapterStateChangedEvent != NULL) + SetEvent(AdapterStateChangedEvent); } ApiUnlock(); Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/di… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c [iso-8859-1] Thu Jan 12 03:12:49 2012 @@ -47,6 +47,8 @@ //#include <ifaddrs.h> //#include <poll.h> +extern SOCKET DhcpSocket; +HANDLE AdapterStateChangedEvent = NULL; struct protocol *protocols = NULL; struct timeout *timeouts = NULL; static struct timeout *free_timeouts = NULL; @@ -63,17 +65,19 @@ void dispatch(void) { - int count, to_msec, err; + int count, to_msec; struct protocol *l; - fd_set fds; time_t howlong, cur_time; - struct timeval timeval; - HANDLE AdapterStateChangedEvent; - - AdapterStateChangedEvent = StartAdapterDiscovery(); - if (!AdapterStateChangedEvent) + HANDLE Events[2]; + int EventCount = 1; + + Events[0] = StartAdapterDiscovery(); + if (!Events[0]) return; - + AdapterStateChangedEvent = Events[0]; + + Events[1] = WSA_INVALID_EVENT; + ApiLock(); do { @@ -83,7 +87,8 @@ */ time(&cur_time); - if (timeouts) { + if (timeouts) + { struct timeout *t; if (timeouts->when <= cur_time) { @@ -105,55 +110,75 @@ if (howlong > INT_MAX / 1000) howlong = INT_MAX / 1000; to_msec = howlong * 1000; - - /* Set up the descriptors to be polled. */ - FD_ZERO(&fds); - - for (l = protocols; l; l = l->next) - FD_SET(l->fd, &fds); - - /* Wait for a packet or a timeout... XXX */ - timeval.tv_sec = to_msec / 1000; - timeval.tv_usec = to_msec % 1000; - - ApiUnlock(); - - count = select(0, &fds, NULL, NULL, &timeval); - - ApiLock(); } else { - ApiUnlock(); - WaitForSingleObject(AdapterStateChangedEvent, INFINITE); - ApiLock(); - + to_msec = INFINITE; + } + + if (Events[1] == WSA_INVALID_EVENT && DhcpSocket != INVALID_SOCKET) + { + Events[1] = WSACreateEvent(); + if (Events[1] != WSA_INVALID_EVENT) + { + count = WSAEventSelect(DhcpSocket, Events[1], FD_READ | FD_CLOSE); + if (count != NO_ERROR) + { + WSACloseEvent(Events[1]); + Events[1] = WSA_INVALID_EVENT; + } + else + { + EventCount = 2; + } + } + } + else if (Events[1] != WSA_INVALID_EVENT && DhcpSocket == INVALID_SOCKET) + { + WSACloseEvent(Events[1]); + Events[1] = WSA_INVALID_EVENT; + + EventCount = 1; + } + + ApiUnlock(); + count = WaitForMultipleObjects(EventCount, + Events, + FALSE, + to_msec); + ApiLock(); + if (count == WAIT_OBJECT_0) + { + /* Adapter state change */ continue; } - - DH_DbgPrint(MID_TRACE,("Select: %d\n", count)); - - /* Not likely to be transitory... */ - if (count == SOCKET_ERROR) { - err = WSAGetLastError(); - error("poll: %d", err); - break; + else if (count == WAIT_OBJECT_0 + 1) + { + /* Packet received */ + + /* WSA events are manual reset events */ + WSAResetEvent(Events[1]); + } + else + { + /* Timeout */ + continue; } for (l = protocols; l; l = l->next) { struct interface_info *ip; ip = l->local; - if (FD_ISSET(l->fd, &fds)) { - if (ip && (l->handler != got_one || - !ip->dead)) { - DH_DbgPrint(MID_TRACE,("Handling %x\n", l)); - (*(l->handler))(l); - } + if (ip && (l->handler != got_one || + !ip->dead)) { + DH_DbgPrint(MID_TRACE,("Handling %x\n", l)); + (*(l->handler))(l); } } } while (1); - CloseHandle(AdapterStateChangedEvent); + AdapterStateChangedEvent = NULL; + CloseHandle(Events[0]); + WSACloseEvent(Events[1]); ApiUnlock(); } @@ -327,6 +352,41 @@ remove_protocol(struct protocol *proto) { struct protocol *p, *next, *prev; + struct interface_info *ip = proto->local; + struct timeout *t, *q, *u; + + t = NULL; + q = timeouts; + while (q != NULL) + { + /* Remove all timeouts for this protocol */ + if (q->what == ip) + { + /* Unlink the timeout from previous */ + if (t) + t->next = q->next; + else + timeouts = q->next; + + /* Advance to the next timeout */ + u = q->next; + + /* Add it to the free list */ + q->next = free_timeouts; + free_timeouts = q; + } + else + { + /* Advance to the next timeout */ + u = q->next; + + /* Update the previous pointer */ + t = q; + } + + /* Advance */ + q = u; + } prev = NULL; for (p = protocols; p; p = next) { Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/r… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] Thu Jan 12 03:12:49 2012 @@ -266,7 +266,7 @@ case OID_GEN_MEDIA_CONNECT_STATUS: { - GenericULONG = Adapter->MediaState; + GenericULONG = (ULONG)NdisMediaStateConnected; /* Adapter->MediaState */ break; } Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Thu Jan 12 03:12:49 2012 @@ -57,10 +57,9 @@ * ARGUMENTS: * pSystemTime: pointer to the returned system time * NOTES: - * - call at IRQL <= DISPATCH_LEVEL - */ -{ - ASSERT_IRQL(DISPATCH_LEVEL); + * - call at any IRQL + */ +{ ASSERT(pSystemTime); KeQuerySystemTime (pSystemTime); Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Thu Jan 12 03:12:49 2012 @@ -185,7 +185,9 @@ case OID_GEN_HARDWARE_STATUS: *Result = NdisHardwareStatusReady; return STATUS_SUCCESS; - + case OID_GEN_MEDIA_CONNECT_STATUS: + *Result = NdisMediaStateConnected; + return STATUS_SUCCESS; default: return STATUS_INVALID_PARAMETER; } Modified: trunk/reactos/lib/drivers/ip/network/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/int… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] Thu Jan 12 03:12:49 2012 @@ -196,27 +196,26 @@ return NULL; } -NTSTATUS GetInterfaceConnectionStatus -( PIP_INTERFACE Interface, PULONG Result ) { - NTSTATUS Status = TcpipLanGetDwordOid - ( Interface, OID_GEN_HARDWARE_STATUS, Result ); - if( NT_SUCCESS(Status) ) switch( *Result ) { - case NdisHardwareStatusReady: +NTSTATUS GetInterfaceConnectionStatus(PIP_INTERFACE Interface, PULONG Result) +{ + NTSTATUS Status; + + /* Query OID_GEN_MEDIA_CONNECT_STATUS for connection status information */ + Status = TcpipLanGetDwordOid(Interface, OID_GEN_MEDIA_CONNECT_STATUS, Result); + if (!NT_SUCCESS(Status)) + return Status; + + /* Translate the result into MIB_IF_OPER_STATUS_XXX */ + if (*Result == NdisMediaStateConnected) + { + /* Up and running */ *Result = MIB_IF_OPER_STATUS_OPERATIONAL; - break; - case NdisHardwareStatusInitializing: - *Result = MIB_IF_OPER_STATUS_CONNECTING; - break; - case NdisHardwareStatusReset: + } + else + { + /* Down */ *Result = MIB_IF_OPER_STATUS_DISCONNECTED; - break; - case NdisHardwareStatusNotReady: - *Result = MIB_IF_OPER_STATUS_DISCONNECTED; - break; - case NdisHardwareStatusClosing: - default: - *Result = MIB_IF_OPER_STATUS_NON_OPERATIONAL; - break; - } - return Status; -} + } + + return STATUS_SUCCESS; +}

1 0

[cgutman] 54916: - Remove a forgotten debug print
by cgutman＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: cgutman Date: Thu Jan 12 02:25:56 2012 New Revision: 54916 URL: http://svn.reactos.org/svn/reactos?rev=54916&view=rev Log: - Remove a forgotten debug print Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/dispatch.c Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/dhcpcsvc… ============================================================================== --- branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/dispatch.c [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/dispatch.c [iso-8859-1] Thu Jan 12 02:25:56 2012 @@ -367,9 +367,7 @@ t->next = q->next; else timeouts = q->next; - - DbgPrint("Disposing timeout 0x%x\n", q); - + /* Advance to the next timeout */ u = q->next;

1 0

[cgutman] 54915: [DHCPCSVC] - Remove timeouts associated with the protocol in remove_protocol()
by cgutman＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: cgutman Date: Thu Jan 12 02:11:02 2012 New Revision: 54915 URL: http://svn.reactos.org/svn/reactos?rev=54915&view=rev Log: [DHCPCSVC] - Remove timeouts associated with the protocol in remove_protocol() Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/dispatch.c Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/dhcpcsvc… ============================================================================== --- branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/dispatch.c [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/dispatch.c [iso-8859-1] Thu Jan 12 02:11:02 2012 @@ -352,6 +352,43 @@ remove_protocol(struct protocol *proto) { struct protocol *p, *next, *prev; + struct interface_info *ip = proto->local; + struct timeout *t, *q, *u; + + t = NULL; + q = timeouts; + while (q != NULL) + { + /* Remove all timeouts for this protocol */ + if (q->what == ip) + { + /* Unlink the timeout from previous */ + if (t) + t->next = q->next; + else + timeouts = q->next; + + DbgPrint("Disposing timeout 0x%x\n", q); + + /* Advance to the next timeout */ + u = q->next; + + /* Add it to the free list */ + q->next = free_timeouts; + free_timeouts = q; + } + else + { + /* Advance to the next timeout */ + u = q->next; + + /* Update the previous pointer */ + t = q; + } + + /* Advance */ + q = u; + } prev = NULL; for (p = protocols; p; p = next) {

1 0

[cgutman] 54914: [WLANCONF] - Release the current IP address before disconnecting from an AP - Refresh the IP information after connecting to an AP
by cgutman＠svn.reactos.org 12 Jan '12

12 Jan '12

Author: cgutman Date: Thu Jan 12 01:46:15 2012 New Revision: 54914 URL: http://svn.reactos.org/svn/reactos?rev=54914&view=rev Log: [WLANCONF] - Release the current IP address before disconnecting from an AP - Refresh the IP information after connecting to an AP Modified: branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rbuild Modified: branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] (original) +++ branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] Thu Jan 12 01:46:15 2012 @@ -4,5 +4,5 @@ ${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio) add_executable(wlanconf wlanconf.c wlanconf.rc) set_module_type(wlanconf win32cui) -add_importlibs(wlanconf msvcrt kernel32) +add_importlibs(wlanconf msvcrt iphlpapi kernel32) add_cd_file(TARGET wlanconf DESTINATION reactos/system32 FOR all) Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Thu Jan 12 01:46:15 2012 @@ -12,6 +12,7 @@ #include <stdlib.h> #include <ntddndis.h> #include <nuiouser.h> +#include <iphlpapi.h> BOOL bScan = FALSE; @@ -110,26 +111,28 @@ return TRUE; } -HANDLE -OpenAdapterHandle(DWORD Index) +BOOL +OpenAdapterHandle(DWORD Index, HANDLE *hAdapter, IP_ADAPTER_INDEX_MAP *IpInfo) { HANDLE hDriver; BOOL bSuccess; DWORD dwBytesReturned; DWORD QueryBindingSize = sizeof(NDISUIO_QUERY_BINDING) + (1024 * sizeof(WCHAR)); PNDISUIO_QUERY_BINDING QueryBinding; + DWORD dwStatus, dwSize, i; + PIP_INTERFACE_INFO InterfaceInfo = NULL; /* Open the driver handle */ hDriver = OpenDriverHandle(); if (hDriver == INVALID_HANDLE_VALUE) - return INVALID_HANDLE_VALUE; + return FALSE; /* Allocate the binding struct */ QueryBinding = HeapAlloc(GetProcessHeap(), 0, QueryBindingSize); if (!QueryBinding) { CloseHandle(hDriver); - return INVALID_HANDLE_VALUE; + return FALSE; } /* Query the adapter binding information */ @@ -147,7 +150,7 @@ { HeapFree(GetProcessHeap(), 0, QueryBinding); CloseHandle(hDriver); - return INVALID_HANDLE_VALUE; + return FALSE; } /* Bind to the adapter */ @@ -159,48 +162,89 @@ 0, &dwBytesReturned, NULL); + + if (!bSuccess) + { + HeapFree(GetProcessHeap(), 0, QueryBinding); + CloseHandle(hDriver); + return FALSE; + } + + /* Get interface info from the IP helper */ + dwSize = sizeof(IP_INTERFACE_INFO); + do { + if (InterfaceInfo) HeapFree(GetProcessHeap(), 0, InterfaceInfo); + InterfaceInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(IP_INTERFACE_INFO)); + if (!InterfaceInfo) + { + HeapFree(GetProcessHeap(), 0, QueryBinding); + CloseHandle(hDriver); + return FALSE; + } + dwStatus = GetInterfaceInfo(InterfaceInfo, &dwSize); + } while (dwStatus == ERROR_INSUFFICIENT_BUFFER); + + if (dwStatus != NO_ERROR) + { + HeapFree(GetProcessHeap(), 0, QueryBinding); + HeapFree(GetProcessHeap(), 0, InterfaceInfo); + return FALSE; + } + + for (i = 0; i < InterfaceInfo->NumAdapters; i++) + { + if (wcsstr((PWCHAR)((PUCHAR)QueryBinding + QueryBinding->DeviceNameOffset), + InterfaceInfo->Adapter[i].Name)) + { + *IpInfo = InterfaceInfo->Adapter[i]; + *hAdapter = hDriver; + + HeapFree(GetProcessHeap(), 0, QueryBinding); + HeapFree(GetProcessHeap(), 0, InterfaceInfo); + + return TRUE; + } + } + HeapFree(GetProcessHeap(), 0, QueryBinding); - - if (!bSuccess) - { - CloseHandle(hDriver); - return INVALID_HANDLE_VALUE; - } - - return hDriver; + HeapFree(GetProcessHeap(), 0, InterfaceInfo); + CloseHandle(hDriver); + + return FALSE; } /* Only works with the first adapter for now */ -HANDLE -OpenWlanAdapter(VOID) +BOOL +OpenWlanAdapter(HANDLE *hAdapter, IP_ADAPTER_INDEX_MAP *IpInfo) { DWORD dwCurrentIndex; - HANDLE hCurrentAdapter; for (dwCurrentIndex = 0; ; dwCurrentIndex++) { - hCurrentAdapter = OpenAdapterHandle(dwCurrentIndex); - if (hCurrentAdapter == INVALID_HANDLE_VALUE) + if (!OpenAdapterHandle(dwCurrentIndex, hAdapter, IpInfo)) break; - if (IsWlanAdapter(hCurrentAdapter)) - return hCurrentAdapter; + if (IsWlanAdapter(*hAdapter)) + return TRUE; else - CloseHandle(hCurrentAdapter); - } - - return INVALID_HANDLE_VALUE; + CloseHandle(*hAdapter); + } + + return FALSE; } BOOL -WlanDisconnect(HANDLE hAdapter) +WlanDisconnect(HANDLE hAdapter, PIP_ADAPTER_INDEX_MAP IpInfo) { BOOL bSuccess; DWORD dwBytesReturned; NDISUIO_SET_OID SetOid; + /* Release this IP address */ + IpReleaseAddress(IpInfo); + + /* Disassociate from the AP */ SetOid.Oid = OID_802_11_DISASSOCIATE; - bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, &SetOid, @@ -519,7 +563,7 @@ } BOOL -WlanConnect(HANDLE hAdapter) +WlanConnect(HANDLE hAdapter, PIP_ADAPTER_INDEX_MAP IpInfo) { BOOL bSuccess; DWORD dwBytesReturned, SetOidSize; @@ -681,6 +725,10 @@ if (!bSuccess) return FALSE; + + /* Update our IP address */ + IpReleaseAddress(IpInfo); + IpRenewAddress(IpInfo); _tprintf(_T("The operation completed successfully.\n")); return TRUE; @@ -864,12 +912,12 @@ int main(int argc, char* argv[]) { HANDLE hAdapter; + IP_ADAPTER_INDEX_MAP IpInfo; if (!ParseCmdline(argc, argv)) return -1; - hAdapter = OpenWlanAdapter(); - if (hAdapter == INVALID_HANDLE_VALUE) + if (!OpenWlanAdapter(&hAdapter, &IpInfo)) { DoFormatMessage(GetLastError()); return -1; @@ -886,7 +934,7 @@ } else if (bDisconnect) { - if (!WlanDisconnect(hAdapter)) + if (!WlanDisconnect(hAdapter, &IpInfo)) { DoFormatMessage(GetLastError()); CloseHandle(hAdapter); @@ -895,7 +943,7 @@ } else if (bConnect) { - if (!WlanConnect(hAdapter)) + if (!WlanConnect(hAdapter, &IpInfo)) { DoFormatMessage(GetLastError()); CloseHandle(hAdapter); Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rbuild URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rbuild [iso-8859-1] (original) +++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rbuild [iso-8859-1] Thu Jan 12 01:46:15 2012 @@ -3,6 +3,7 @@ <module name="wlanconf" type="win32cui" installbase="system32" installname="wlanconf.exe"> <include base="wlanconf">.</include> <include base="ReactOS">include/reactos/drivers/ndisuio</include> + <library>iphlpapi</library> <file>wlanconf.c</file> <file>wlanconf.rc</file> </module>

1 0

[cgutman] 54913: [DHCPCSVC] - Delete the existing default gateway when releasing DHCP IP or transitioning to static IP - Fixes bug #6205
by cgutman＠svn.reactos.org 11 Jan '12

11 Jan '12

Author: cgutman Date: Wed Jan 11 23:38:48 2012 New Revision: 54913 URL: http://svn.reactos.org/svn/reactos?rev=54913&view=rev Log: [DHCPCSVC] - Delete the existing default gateway when releasing DHCP IP or transitioning to static IP - Fixes bug #6205 Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/api.c Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/api.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/dhcpcsvc… ============================================================================== --- branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/api.c [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/api.c [iso-8859-1] Wed Jan 11 23:38:48 2012 @@ -102,6 +102,8 @@ if( Adapter ) { if (Adapter->NteContext) DeleteIPAddress( Adapter->NteContext ); + if (Adapter->RouterMib.dwForwardNextHop) + DeleteIpForwardEntry( &Adapter->RouterMib ); proto = find_protocol_by_adapter( &Adapter->DhclientInfo ); if (proto) @@ -170,6 +172,9 @@ if( Adapter ) { if (Adapter->NteContext) DeleteIPAddress( Adapter->NteContext ); + if (Adapter->RouterMib.dwForwardNextHop) + DeleteIpForwardEntry( &Adapter->RouterMib ); + Adapter->DhclientState.state = S_STATIC; proto = find_protocol_by_adapter( &Adapter->DhclientInfo ); if (proto)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs