Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[sserapion] 37351: Declare war, shock and awe, and utterly defeat auto-import in one day.
by sserapion＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sserapion Date: Thu Nov 13 23:49:21 2008 New Revision: 37351 URL: http://svn.reactos.org/svn/reactos?rev=37351&view=rev Log: Declare war, shock and awe, and utterly defeat auto-import in one day. Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h branches/ros-amd64-bringup/reactos/include/crt/stdio.h Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] Thu Nov 13 23:49:21 2008 @@ -22,28 +22,50 @@ #define __stdcall #endif -#ifndef __GNUC__ +#if defined(_MSC_VER) +# ifdef _DLL # ifndef __MINGW_IMPORT # define __MINGW_IMPORT __declspec(dllimport) # endif # ifndef _CRTIMP # define _CRTIMP __declspec(dllimport) # endif +# else +# ifndef __MINGW_IMPORT +# define __MINGW_IMPORT +# endif +# ifndef _CRTIMP +# define _CRTIMP +# endif +#endif # define __DECLSPEC_SUPPORTED # define __attribute__(x) /* nothing */ -#else /* __GNUC__ */ +# define __restrict__/* nothing */ +#elif defined(__GNUC__) # ifdef __declspec # ifndef __MINGW_IMPORT +# ifdef _DLL /* Note the extern. This is needed to work around GCC's limitations in handling dllimport attribute. */ # define __MINGW_IMPORT extern __attribute__ ((__dllimport__)) +# else +# define __MINGW_IMPORT extern +# endif # endif # ifndef _CRTIMP -# ifdef __USE_CRTIMP -# define _CRTIMP __attribute__ ((dllimport)) -# else -# define _CRTIMP -# endif +# undef __USE_CRTIMP +# if !defined (_CRTBLD) && !defined (_SYSCRT) +# define __USE_CRTIMP 1 +# endif +# ifdef __USE_CRTIMP +# ifdef _DLL +# define _CRTIMP __attribute__ ((dllimport)) +# else +# define _CRTIMP +# endif +# else +# define _CRTIMP +# endif # endif # define __DECLSPEC_SUPPORTED # else /* __declspec */ @@ -53,6 +75,15 @@ # define _CRTIMP # endif # endif /* __declspec */ +#else +# ifndef __MINGW_IMPORT +# define __MINGW_IMPORT __declspec(dllimport) +# endif +# ifndef _CRTIMP +# define _CRTIMP __declspec(dllimport) +# endif +# define __DECLSPEC_SUPPORTED +# define __attribute__(x)/* nothing */ #endif #if defined (__GNUC__) && defined (__GNUC_MINOR__) @@ -63,12 +94,22 @@ #define __MINGW_GNUC_PREREQ(major, minor) 0 #endif +#if defined (_MSC_VER) +#define __MINGW_MSC_PREREQ(major,minor) \ + ((_MSC_VER /100) > (major) \ + || ((_MSC)VER /100) == (major) && (_MSC_VER) % 100) >=(minor))) +#else +#define __MINGW_MSC_PREREQ(major, minor) 0 +#endif + #define USE___UUIDOF 0 #ifdef __cplusplus # define __CRT_INLINE inline #else -# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# if defined(_MSC_VER) +# define __CRT_INLINE __inline +# elif __GNUC_STDC_INLINE__ # define __CRT_INLINE extern inline __attribute__((__gnu_inline__)) # else # define __CRT_INLINE extern __inline__ @@ -88,6 +129,9 @@ #ifdef __GNUC__ #define __MINGW_ATTRIB_NORETURN __attribute__ ((__noreturn__)) #define __MINGW_ATTRIB_CONST __attribute__ ((__const__)) +#elif __MINGW_MSC_PREREQ(12, 0) +#define __MINGW_ATTRIB_NORETURN __declspec(noreturn) +#define __MINGW_ATTRIB_CONST #else #define __MINGW_ATTRIB_NORETURN #define __MINGW_ATTRIB_CONST @@ -112,15 +156,22 @@ #if __MINGW_GNUC_PREREQ (3, 1) #define __MINGW_ATTRIB_DEPRECATED __attribute__ ((__deprecated__)) +#elif __MINGW_MSC_PREREQ(12, 0) +#define __MINGW_ATTRIB_DEPRECATED __declspec(deprecated) #else #define __MINGW_ATTRIB_DEPRECATED -#endif /* GNUC >= 3.1 */ +#endif #if __MINGW_GNUC_PREREQ (3, 3) #define __MINGW_NOTHROW __attribute__ ((__nothrow__)) +#elif __MINGW_MSC_PREREQ(12, 0) && defined (__cplusplus) +#define __MINGW_NOTHROW __declspec(nothrow) #else #define __MINGW_NOTHROW -#endif /* GNUC >= 3.3 */ +#endif + +/* TODO: Mark (almost) all CRT functions as __MINGW_NOTHROW. This will +allow GCC to optimize away some EH unwind code, at least in DW2 case. */ #ifndef __MSVCRT_VERSION__ /* High byte is the major version, low byte is the minor. */ Modified: branches/ros-amd64-bringup/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/stdio.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/stdio.h [iso-8859-1] Thu Nov 13 23:49:21 2008 @@ -242,9 +242,10 @@ #if __MINGW_GNUC_PREREQ(4,4) #pragma push_macro("vsnprintf") #pragma push_macro("snprintf") +#endif #undef vsnprintf #undef snprintf -#endif + extern #ifdef gnu_printf __attribute__((format(gnu_printf, 3, 0))) __attribute__((nonnull (3))) @@ -261,14 +262,7 @@ int __cdecl sprintf(char *_Dest,const char *_Format,...); int __cdecl vsprintf(char *_Dest,const char *_Format,va_list _Args); #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ - __CRT_INLINE int __cdecl snprintf(char* s, size_t n, const char* format, ...) { - int r; - va_list a; - __mingw_va_start(a, format); - r = _vsnprintf (s, n, format, a); - __mingw_va_end(a); - return r; - } + int __cdecl snprintf(char* s, size_t n, const char* format, ...); __CRT_INLINE int __cdecl vsnprintf (char* s, size_t n, const char* format,va_list arg) { return _vsnprintf ( s, n, format, arg); }

1 0

[cgutman] 37350: - Fail if we aren't in the right state
by cgutman＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: cgutman Date: Thu Nov 13 20:43:36 2008 New Revision: 37350 URL: http://svn.reactos.org/svn/reactos?rev=37350&view=rev Log: - Fail if we aren't in the right state Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Thu Nov 13 20:43:36 2008 @@ -110,7 +110,7 @@ TDI_QUERY_ADDRESS_INFO, Mdl ); } else { - if( FCB->Connection.Object == NULL ) { + if( FCB->Connection.Object == NULL || (FCB->State != SOCKET_STATE_BOUND && FCB->State != SOCKET_STATE_CONNECTED) ) { return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, NULL ); }

1 0

[cgutman] 37349: - Enable some code that works now
by cgutman＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: cgutman Date: Thu Nov 13 20:31:03 2008 New Revision: 37349 URL: http://svn.reactos.org/svn/reactos?rev=37349&view=rev Log: - Enable some code that works now Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Thu Nov 13 20:31:03 2008 @@ -592,14 +592,9 @@ AdapterBinding->NdisOpenBlock.RequestCompleteHandler = Protocol->Chars.RequestCompleteHandler; -#if 0 - /* XXX this looks fishy */ - /* OK, this really *is* fishy - it bugchecks */ /* Put on protocol's bound adapters list */ ExInterlockedInsertTailList(&Protocol->AdapterListHead, &AdapterBinding->ProtocolListEntry, &Protocol->Lock); -#endif - - /* XXX so does this */ + /* Put protocol on adapter's bound protocols list */ NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); ExInterlockedInsertTailList(&Adapter->ProtocolListHead, &AdapterBinding->AdapterListEntry, &Adapter->NdisMiniportBlock.Lock);

1 0

[cgutman] 37348: - Fix protocol binding
by cgutman＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: cgutman Date: Thu Nov 13 18:54:26 2008 New Revision: 37348 URL: http://svn.reactos.org/svn/reactos?rev=37348&view=rev Log: - Fix protocol binding Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Thu Nov 13 18:54:26 2008 @@ -610,7 +610,8 @@ } VOID -ndisBindMiniportsToProtocol(OUT PNDIS_STATUS Status, IN PPROTOCOL_BINDING Protocol, IN PNDIS_PROTOCOL_CHARACTERISTICS ProtocolCharacteristics) +NTAPI +ndisBindMiniportsToProtocol(OUT PNDIS_STATUS Status, IN PNDIS_PROTOCOL_CHARACTERISTICS ProtocolCharacteristics) { /* * bind the protocol to all of its miniports @@ -845,13 +846,19 @@ InitializeListHead(&Protocol->AdapterListHead); - ndisBindMiniportsToProtocol(Status, Protocol, ProtocolCharacteristics); + /* We must set this before the call to ndisBindMiniportsToProtocol because the protocol's + * BindAdapter handler might need it */ + + *NdisProtocolHandle = Protocol; + + ndisBindMiniportsToProtocol(Status, &Protocol->Chars); if (*Status == NDIS_STATUS_SUCCESS) { ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock); - *NdisProtocolHandle = Protocol; - } else + } else { ExFreePool(Protocol); + *NdisProtocolHandle = NULL; + } } @@ -970,7 +977,7 @@ PPROTOCOL_BINDING Protocol = NdisProtocolHandle; NDIS_STATUS NdisStatus; - ndisBindMiniportsToProtocol(&NdisStatus, Protocol, &Protocol->Chars); + ndisBindMiniportsToProtocol(&NdisStatus, &Protocol->Chars); } /* EOF */

1 0

[sginsberg] 37347: - Remove duplicate define
by sginsberg＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: sginsberg Date: Thu Nov 13 17:59:37 2008 New Revision: 37347 URL: http://svn.reactos.org/svn/reactos?rev=37347&view=rev Log: - Remove duplicate define Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=37… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Thu Nov 13 17:59:37 2008 @@ -2644,8 +2644,6 @@ (_advhdr)->FileContextSupportPointer = NULL; \ } -#define FlagOn(x, f) ((x) & (f)) - NTKERNELAPI VOID NTAPI

1 0

[jimtabor] 37346: - Start the implementation and support for dc attribute dirty bits. See bug 3863.
by jimtabor＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: jimtabor Date: Thu Nov 13 17:12:42 2008 New Revision: 37346 URL: http://svn.reactos.org/svn/reactos?rev=37346&view=rev Log: - Start the implementation and support for dc attribute dirty bits. See bug 3863. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu Nov 13 17:12:42 2008 @@ -268,6 +268,8 @@ HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC); VOID FASTCALL IntvGetDeviceCaps(PGDIDEVICE, PDEVCAPS); +HPEN FASTCALL IntGdiSelectPen(PDC,HPEN); +HBRUSH FASTCALL IntGdiSelectBrush(PDC,HBRUSH); extern PGDIDEVICE pPrimarySurface; Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Thu Nov 13 17:12:42 2008 @@ -199,6 +199,7 @@ int YEndArc) { BOOL Ret; + PDC_ATTR pDc_Attr; DPRINT("StartX: %d, StartY: %d, EndX: %d, EndY: %d\n", XStartArc,YStartArc,XEndArc,YEndArc); @@ -220,6 +221,15 @@ YEndArc, arctype); } + + pDc_Attr = dc->pDc_Attr; + if (!pDc_Attr) pDc_Attr = &dc->Dc_Attr; + + if (pDc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(dc,pDc_Attr->hbrush); + + if (pDc_Attr->ulDirty_ & DC_PEN_DIRTY) + IntGdiSelectPen(dc,pDc_Attr->hpen); if (arctype == GdiTypeArcTo) { Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Thu Nov 13 17:12:42 2008 @@ -508,6 +508,52 @@ return hBrush; } + +HBRUSH +FASTCALL +IntGdiSelectBrush( + PDC pDC, + HBRUSH hBrush) +{ + PDC_ATTR pDc_Attr; + HBRUSH hOrgBrush; + PGDIBRUSHOBJ pBrush; + XLATEOBJ *XlateObj; + BOOLEAN bFailed; + + if (pDC == NULL || hBrush == NULL) return NULL; + + pDc_Attr = pDC->pDc_Attr; + if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; + + pBrush = BRUSHOBJ_LockBrush(hBrush); + if (pBrush == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + + XlateObj = IntGdiCreateBrushXlate(pDC, pBrush, &bFailed); + BRUSHOBJ_UnlockBrush(pBrush); + if(bFailed) + { + return NULL; + } + + hOrgBrush = pDc_Attr->hbrush; + pDc_Attr->hbrush = hBrush; + + if (pDC->XlateBrush != NULL) + { + EngDeleteXlate(pDC->XlateBrush); + } + pDC->XlateBrush = XlateObj; + + pDc_Attr->ulDirty_ &= ~DC_BRUSH_DIRTY; + + return hOrgBrush; +} + /* PUBLIC FUNCTIONS ***********************************************************/ @@ -656,4 +702,31 @@ BRUSHOBJ_UnlockBrush(BrushObject); } + /* + * @implemented + */ +HBRUSH +APIENTRY +NtGdiSelectBrush( + IN HDC hDC, + IN HBRUSH hBrush) +{ + PDC pDC; + HBRUSH hOrgBrush; + + if (hDC == NULL || hBrush == NULL) return NULL; + + pDC = DC_LockDc(hDC); + if (!pDC) + { + return NULL; + } + + hOrgBrush = IntGdiSelectBrush(pDC,hBrush); + + DC_UnlockDc(pDC); + + return hOrgBrush; +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Thu Nov 13 17:12:42 2008 @@ -2142,61 +2142,6 @@ /* * @implemented */ -HBRUSH -APIENTRY -NtGdiSelectBrush( - IN HDC hDC, - IN HBRUSH hBrush) -{ - PDC pDC; - PDC_ATTR pDc_Attr; - HBRUSH hOrgBrush; - PGDIBRUSHOBJ pBrush; - XLATEOBJ *XlateObj; - BOOLEAN bFailed; - - if (hDC == NULL || hBrush == NULL) return NULL; - - pDC = DC_LockDc(hDC); - if (!pDC) - { - return NULL; - } - - pDc_Attr = pDC->pDc_Attr; - if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; - - pBrush = BRUSHOBJ_LockBrush(hBrush); - if (pBrush == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - DC_UnlockDc(pDC); - return NULL; - } - - XlateObj = IntGdiCreateBrushXlate(pDC, pBrush, &bFailed); - BRUSHOBJ_UnlockBrush(pBrush); - if(bFailed) - { - DC_UnlockDc(pDC); - return NULL; - } - - hOrgBrush = pDc_Attr->hbrush; - pDc_Attr->hbrush = hBrush; - if (pDC->XlateBrush != NULL) - { - EngDeleteXlate(pDC->XlateBrush); - } - pDC->XlateBrush = XlateObj; - - DC_UnlockDc(pDC); - return hOrgBrush; -} - - /* - * @implemented - */ HFONT APIENTRY NtGdiSelectFont( @@ -2228,60 +2173,6 @@ DC_UnlockDc(pDC); return hOrgFont; -} - - /* - * @implemented - */ -HPEN -APIENTRY -NtGdiSelectPen( - IN HDC hDC, - IN HPEN hPen) -{ - PDC pDC; - PDC_ATTR pDc_Attr; - HPEN hOrgPen = NULL; - PGDIBRUSHOBJ pPen; - XLATEOBJ *XlateObj; - BOOLEAN bFailed; - - if (hDC == NULL || hPen == NULL) return NULL; - - pDC = DC_LockDc(hDC); - if (!pDC) - { - return NULL; - } - - pDc_Attr = pDC->pDc_Attr; - if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; - - pPen = PENOBJ_LockPen(hPen); - if (pPen == NULL) - { - return NULL; - } - - XlateObj = IntGdiCreateBrushXlate(pDC, pPen, &bFailed); - PENOBJ_UnlockPen(pPen); - if (bFailed) - { - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return NULL; - } - - hOrgPen = pDc_Attr->hpen; - pDc_Attr->hpen = hPen; - if (pDC->XlatePen != NULL) - { - EngDeleteXlate(pDC->XlatePen); - } - pDC->XlatePen = XlateObj; - - DC_UnlockDc(pDC); - - return hOrgPen; } HPALETTE Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Thu Nov 13 17:12:42 2008 @@ -247,6 +247,50 @@ return cbRetCount; } + +HPEN +FASTCALL +IntGdiSelectPen( + PDC pDC, + HPEN hPen) +{ + PDC_ATTR pDc_Attr; + HPEN hOrgPen = NULL; + PGDIBRUSHOBJ pPen; + XLATEOBJ *XlateObj; + BOOLEAN bFailed; + + pDc_Attr = pDC->pDc_Attr; + if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; + + pPen = PENOBJ_LockPen(hPen); + if (pPen == NULL) + { + return NULL; + } + + XlateObj = IntGdiCreateBrushXlate(pDC, pPen, &bFailed); + PENOBJ_UnlockPen(pPen); + if (bFailed) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + return NULL; + } + + hOrgPen = pDc_Attr->hpen; + pDc_Attr->hpen = hPen; + + if (pDC->XlatePen != NULL) + { + EngDeleteXlate(pDC->XlatePen); + } + pDc_Attr->ulDirty_ &= ~DC_PEN_DIRTY; + + pDC->XlatePen = XlateObj; + + return hOrgPen; +} + /* PUBLIC FUNCTIONS ***********************************************************/ HPEN STDCALL @@ -346,5 +390,31 @@ return hPen; } + /* + * @implemented + */ +HPEN +APIENTRY +NtGdiSelectPen( + IN HDC hDC, + IN HPEN hPen) +{ + PDC pDC; + HPEN hOrgPen; + + if (hDC == NULL || hPen == NULL) return NULL; + + pDC = DC_LockDc(hDC); + if (!pDC) + { + return NULL; + } + + hOrgPen = IntGdiSelectPen(pDC,hPen); + + DC_UnlockDc(pDC); + + return hOrgPen; +} /* EOF */

1 0

[jimtabor] 37345: - Add path support for ExtTextOut.
by jimtabor＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: jimtabor Date: Thu Nov 13 16:38:16 2008 New Revision: 37345 URL: http://svn.reactos.org/svn/reactos?rev=37345&view=rev Log: - Add path support for ExtTextOut. Modified: trunk/reactos/subsystems/win32/win32k/include/path.h trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/include/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/path.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/path.h [iso-8859-1] Thu Nov 13 16:38:16 2008 @@ -67,6 +67,7 @@ BOOL FASTCALL PATH_Rectangle (PDC dc, INT x1, INT y1, INT x2, INT y2); BOOL FASTCALL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height); BOOL FASTCALL PATH_PathToRegion (PPATH pPath, INT nPolyFillMode, HRGN *pHrgn); +BOOL FASTCALL PATH_ExtTextOut(PDC dc,INT x,INT y,UINT flags,const RECT *lprc,LPCWSTR str,UINT count,const INT *dx); VOID FASTCALL IntGdiCloseFigure(PPATH pPath); BOOL FASTCALL PATH_Delete(HPATH hPath); Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Thu Nov 13 16:38:16 2008 @@ -3162,36 +3162,51 @@ Status = MmCopyFromCaller(SafeString, UnsafeString, Count * sizeof(WCHAR)); if (! NT_SUCCESS(Status)) { - goto fail; + goto fail; } } String = SafeString; - if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) - { - // At least one of the two flags were specified. Copy lprc. Once. + if (NULL != UnsafeDx && Count > 0) + { + Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); + if (NULL == Dx) + { + goto fail; + } + Status = MmCopyFromCaller(Dx, UnsafeDx, Count * sizeof(INT)); + if (!NT_SUCCESS(Status)) + { + goto fail; + } + } + + if (lprc) + { Status = MmCopyFromCaller(&SpecifiedDestRect, lprc, sizeof(RECT)); if (!NT_SUCCESS(Status)) { - DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } + goto fail; + } + } + + if (PATH_IsPathOpen(dc->DcLevel)) + { + if (!PATH_ExtTextOut( dc, + XStart, + YStart, + fuOptions, + (const RECT *)&SpecifiedDestRect, + SafeString, + Count, + (const INT *)Dx)) goto fail; + goto good; + } + + if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) + { IntLPtoDP(dc, (POINT *) &SpecifiedDestRect, 2); - } - - if (NULL != UnsafeDx && Count > 0) - { - Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); - if (NULL == Dx) - { - goto fail; - } - Status = MmCopyFromCaller(Dx, UnsafeDx, Count * sizeof(INT)); - if (! NT_SUCCESS(Status)) - { - goto fail; - } } BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); @@ -3636,13 +3651,14 @@ } BRUSHOBJ_UnlockBrush(BrushFg); NtGdiDeleteObject(hBrushFg); +good: if (NULL != SafeString) { - ExFreePool((void*)SafeString); + ExFreePoolWithTag((void*)SafeString, TAG_GDITEXT); } if (NULL != Dx) { - ExFreePool(Dx); + ExFreePoolWithTag(Dx, TAG_GDITEXT); } DC_UnlockDc( dc ); @@ -3669,11 +3685,11 @@ } if (NULL != SafeString) { - ExFreePool((void*)SafeString); + ExFreePoolWithTag((void*)SafeString, TAG_GDITEXT); } if (NULL != Dx) { - ExFreePool(Dx); + ExFreePoolWithTag(Dx, TAG_GDITEXT); } DC_UnlockDc(dc); Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Thu Nov 13 16:38:16 2008 @@ -1854,6 +1854,239 @@ return ret; } +static inline INT int_from_fixed(FIXED f) +{ + return (f.fract >= 0x8000) ? (f.value + 1) : f.value; +} + +/********************************************************************** + * PATH_BezierTo + * + * internally used by PATH_add_outline + */ +static +VOID +FASTCALL +PATH_BezierTo(PPATH pPath, POINT *lppt, INT n) +{ + if (n < 2) return; + + if (n == 2) + { + PATH_AddEntry(pPath, &lppt[1], PT_LINETO); + } + else if (n == 3) + { + PATH_AddEntry(pPath, &lppt[0], PT_BEZIERTO); + PATH_AddEntry(pPath, &lppt[1], PT_BEZIERTO); + PATH_AddEntry(pPath, &lppt[2], PT_BEZIERTO); + } + else + { + POINT pt[3]; + INT i = 0; + + pt[2] = lppt[0]; + n--; + + while (n > 2) + { + pt[0] = pt[2]; + pt[1] = lppt[i+1]; + pt[2].x = (lppt[i+2].x + lppt[i+1].x) / 2; + pt[2].y = (lppt[i+2].y + lppt[i+1].y) / 2; + PATH_BezierTo(pPath, pt, 3); + n--; + i++; + } + + pt[0] = pt[2]; + pt[1] = lppt[i+1]; + pt[2] = lppt[i+2]; + PATH_BezierTo(pPath, pt, 3); + } +} + +static +BOOL +FASTCALL +PATH_add_outline(PDC dc, INT x, INT y, TTPOLYGONHEADER *header, DWORD size) +{ + PPATH pPath; + TTPOLYGONHEADER *start; + POINT pt; + + start = header; + + pPath = PATH_LockPath(dc->DcLevel.hPath); + { + return FALSE; + } + + while ((char *)header < (char *)start + size) + { + TTPOLYCURVE *curve; + + if (header->dwType != TT_POLYGON_TYPE) + { + DPRINT1("Unknown header type %d\n", header->dwType); + return FALSE; + } + + pt.x = x + int_from_fixed(header->pfxStart.x); + pt.y = y - int_from_fixed(header->pfxStart.y); + IntLPtoDP(dc, &pt, 1); + PATH_AddEntry(pPath, &pt, PT_MOVETO); + + curve = (TTPOLYCURVE *)(header + 1); + + while ((char *)curve < (char *)header + header->cb) + { + /*DPRINT1("curve->wType %d\n", curve->wType);*/ + + switch(curve->wType) + { + case TT_PRIM_LINE: + { + WORD i; + + for (i = 0; i < curve->cpfx; i++) + { + pt.x = x + int_from_fixed(curve->apfx[i].x); + pt.y = y - int_from_fixed(curve->apfx[i].y); + IntLPtoDP(dc, &pt, 1); + PATH_AddEntry(pPath, &pt, PT_LINETO); + } + break; + } + + case TT_PRIM_QSPLINE: + case TT_PRIM_CSPLINE: + { + WORD i; + POINTFX ptfx; + POINT *pts = ExAllocatePoolWithTag(PagedPool, (curve->cpfx + 1) * sizeof(POINT), TAG_PATH); + + if (!pts) return FALSE; + + ptfx = *(POINTFX *)((char *)curve - sizeof(POINTFX)); + + pts[0].x = x + int_from_fixed(ptfx.x); + pts[0].y = y - int_from_fixed(ptfx.y); + IntLPtoDP(dc, &pts[0], 1); + + for (i = 0; i < curve->cpfx; i++) + { + pts[i + 1].x = x + int_from_fixed(curve->apfx[i].x); + pts[i + 1].y = y - int_from_fixed(curve->apfx[i].y); + IntLPtoDP(dc, &pts[i + 1], 1); + } + + PATH_BezierTo(pPath, pts, curve->cpfx + 1); + + ExFreePoolWithTag(pts, TAG_PATH); + break; + } + + default: + DPRINT1("Unknown curve type %04x\n", curve->wType); + return FALSE; + } + + curve = (TTPOLYCURVE *)&curve->apfx[curve->cpfx]; + } + header = (TTPOLYGONHEADER *)((char *)header + header->cb); + } + + IntGdiCloseFigure( pPath ); + PATH_UnlockPath( pPath ); + return TRUE; +} + +/********************************************************************** + * PATH_ExtTextOut + */ +BOOL +FASTCALL +PATH_ExtTextOut(PDC dc, INT x, INT y, UINT flags, const RECT *lprc, + LPCWSTR str, UINT count, const INT *dx) +{ + unsigned int idx; + double cosEsc, sinEsc; + PDC_ATTR Dc_Attr; + PTEXTOBJ TextObj; + LOGFONTW lf; + POINTL org; + INT offset = 0, xoff = 0, yoff = 0; + + if (!count) return TRUE; + + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + TextObj = RealizeFontInit( Dc_Attr->hlfntNew); + if ( !TextObj ) return FALSE; + + FontGetObject( TextObj, sizeof(lf), &lf); + + if (lf.lfEscapement != 0) + { + cosEsc = cos(lf.lfEscapement * M_PI / 1800); + sinEsc = sin(lf.lfEscapement * M_PI / 1800); + } else + { + cosEsc = 1; + sinEsc = 0; + } + + IntGdiGetDCOrg(dc, &org); + + for (idx = 0; idx < count; idx++) + { + GLYPHMETRICS gm; + DWORD dwSize; + void *outline; + + dwSize = ftGdiGetGlyphOutline( dc, + str[idx], + GGO_GLYPH_INDEX | GGO_NATIVE, + &gm, + 0, + NULL, + NULL, + TRUE); + if (!dwSize) return FALSE; + + outline = ExAllocatePoolWithTag(PagedPool, dwSize, TAG_PATH); + if (!outline) return FALSE; + + ftGdiGetGlyphOutline( dc, + str[idx], + GGO_GLYPH_INDEX | GGO_NATIVE, + &gm, + dwSize, + outline, + NULL, + TRUE); + + PATH_add_outline(dc, org.x + x + xoff, org.x + y + yoff, outline, dwSize); + + ExFreePoolWithTag(outline, TAG_PATH); + + if (dx) + { + offset += dx[idx]; + xoff = offset * cosEsc; + yoff = offset * -sinEsc; + } + else + { + xoff += gm.gmCellIncX; + yoff += gm.gmCellIncY; + } + } + return TRUE; +} /***********************************************************************

1 0

[dreimer] 37344: Further work on PS files. Last problems left: - raddr2line fails - ssvn status fails
by dreimer＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: dreimer Date: Thu Nov 13 14:16:33 2008 New Revision: 37344 URL: http://svn.reactos.org/svn/reactos?rev=37344&view=rev Log: Further work on PS files. Last problems left: - raddr2line fails - ssvn status fails Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Thu Nov 13 14:16:33 2008 @@ -24,7 +24,7 @@ # If Parameters were set, parse them, if not, ask the user to add them. # $_1 = Read-Host "Please enter a Architecture you want to build ReactOS for: " - if ($_1 -eq $null) { + if ($_1.length -eq 0) { "ERROR: You must enter a Architecture." } } else { @@ -46,7 +46,7 @@ $_ROSBE_ARCH = 3 SYSPARAM } -elseif ($_1 -eq $null) { +else { "Unknown parameter specified. Try 'help [COMMAND]'." } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] Thu Nov 13 14:16:33 2008 @@ -19,7 +19,7 @@ # If Parameters were set, parse them, if not, ask the user to add them. # $_1 = Read-Host "Please enter a ReactOS source directory, or 'previous': " - if ($_1 -eq $null) { + if ($_1.length -eq 0) { "ERROR: You must enter a ReactOS source directory, or 'previous'." } } else { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Thu Nov 13 14:16:33 2008 @@ -11,46 +11,47 @@ $host.ui.RawUI.WindowTitle = "Change the current MinGW/GCC Host/Target directory..." } +function settitle { + if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" + } + exit +} + function EOA { IEX "&'$_ROSBE_BASEDIR\rosbe-gcc-env.cmd' chdefgcc" -} - -function INTERACTIVE { - $_1 = Read-Host "Please enter a MinGW/GCC directory (don't use quotes): " - if ($_1 -eq $null) { - "ERROR: You must enter a MinGW/GCC directory." - } - $_2 = Read-Host "Please specify, if this will be the Target or Host GCC: " - if ($_2 -eq $null) { - "ERROR: You must enter ""target"" or ""host""." - } -} -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" + settitle } # # Parse the command line arguments. # $_1 = $args[0] -"$_1" -$_1 = IEX "& '$_ROSBE_BASEDIR\Tools\rquote.exe' '$_1'" $_2 = $args[1] if ($_1 -eq $null) { - INTERACTIVE + $_1 = Read-Host "Please enter a MinGW/GCC directory (don't use quotes): " + if ($_1.length -eq 0) { + "ERROR: You must enter a MinGW/GCC directory." + settitle + } } if ($_2 -eq $null) { - INTERACTIVE + $_2 = Read-Host "Please specify, if this will be the Target or Host GCC: " + if ($_2.length -eq 0) { + "ERROR: You must enter ""target"" or ""host""." + settitle + } } - if (Test-Path "$_ROSBE_BASEDIR\$_1\.") { $_1 = "$_ROSBE_BASEDIR\$_1" } elseif (!(Test-Path "$_1\.")) { "ERROR: The path specified doesn't seem to exist." + settitle } if (!(Test-Path "$_1\bin\*gcc.exe")) { "ERROR: No MinGW/GCC found in the specified path." + settitle } if ($_2 -eq "target") { @@ -64,6 +65,7 @@ EOA } else { "ERROR: You specified wrong parameters." + settitle } # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Thu Nov 13 14:16:33 2008 @@ -13,9 +13,7 @@ # Run options.exe # if (Test-Path "$_ROSBE_BASEDIR\Tools\options.exe") { - pushd "$_ROSBE_BASEDIR" - & "$_ROSBE_BASEDIR\Tools\options.exe" - popd + & "$_ROSBE_BASEDIR\Tools\options.exe" | out-null if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.cmd") { & "$ENV:APPDATA\RosBE\rosbe-options.cmd" } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Thu Nov 13 14:16:33 2008 @@ -15,7 +15,7 @@ "Your tree is not up to date. Do you want to update it?" $UP = Read-Host "Please enter 'yes' or 'no': " if ($UP -eq "yes") { - IEX "'$_ROSBE_BASEDIR\ssvn' update" + IEX "&'$_ROSBE_BASEDIR\ssvn' update" } } if ($OFFSVN -eq $ONSVN) { @@ -38,16 +38,17 @@ "This might take a while, so please be patient." "" if ($args[1] -ne $null) { - IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $args[1]" + $temparg = $args[1] + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" } else { - IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' update" + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" } } elseif ($args[0] -eq "cleanup") { $host.ui.RawUI.WindowTitle = "SVN Cleaning..." "This might take a while, so please be patient." "" - IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' cleanup" + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' cleanup" } # @@ -58,9 +59,9 @@ if (Test-Path ".svn\.") { "ERROR: Folder already contains a repository." } else { - dir /b 2>nul | findstr "." >nul - if (errorlevel -eq 1) { - IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/reactos ." + $dir = dir + if ($dir -eq $null) { + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/reactos ." } else { "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" } @@ -75,8 +76,8 @@ $host.ui.RawUI.WindowTitle = "SVN Status" "This might take a while, so please be patient." "" - $OFFSVN = IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' info" | find "Revision:" - $ONSVN = IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | find "Revision:" + $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | find "Revision:" + $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | find "Revision:" UP } @@ -94,3 +95,5 @@ $OFFSVN = $null $ONSVN = $null $UP = $null +$dir = dir +$temparg = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] Thu Nov 13 14:16:33 2008 @@ -8,9 +8,12 @@ # Peter Ward <dralnix(a)gmail.com> # -function paramcall { - $OUT = IEX "'$_ROSBE_BASEDIR\Tools\scut.exe' $args" +function paramcall($arg) { + IEX "&'$_ROSBE_BASEDIR\Tools\scut.exe' $arg" +} +function parse($arg) { + $OUT = paramcall($arg) # It's a shortcut name, so change the directory if ($OUT -ne "Default") { @@ -22,14 +25,15 @@ } # Check if the parameter is an scut parameter, which can just be forwarded to the EXE file -if ($args[0] -eq "add") {paramcall} -if ($args[0] -eq "rem") {paramcall} -if ($args[0] -eq "edit") {paramcall} -if ($args[0] -eq "def") {paramcall} -if ($args[0] -eq "list") {paramcall} -if ($args[0] -eq "/?") {paramcall} -if ($args[0] -eq "-h") {paramcall} -if ($args[0] -eq "--help") {paramcall} +if ($args[0] -eq "add") {paramcall($args)} +elseif ($args[0] -eq "rem") {paramcall($args)} +elseif ($args[0] -eq "edit") {paramcall($args)} +elseif ($args[0] -eq "def") {paramcall($args)} +elseif ($args[0] -eq "list") {paramcall($args)} +elseif ($args[0] -eq "/?") {paramcall($args)} +elseif ($args[0] -eq "-h") {paramcall($args)} +elseif ($args[0] -eq "--help") {paramcall($args)} +else {parse($args)} if ($_ROSBE_VERSION -ne $null) { $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"

1 0

[greatlrd] 37343: Bugfix : Do not link to LPDDRAWI_DIRECTDRAW_INT->lpLink when we do not have any LPDDRAWI_DIRECTDRAW_INT->lpLcl
by greatlrd＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: greatlrd Date: Thu Nov 13 13:52:20 2008 New Revision: 37343 URL: http://svn.reactos.org/svn/reactos?rev=37343&view=rev Log: Bugfix : Do not link to LPDDRAWI_DIRECTDRAW_INT->lpLink when we do not have any LPDDRAWI_DIRECTDRAW_INT->lpLcl Modified: branches/reactx/reactos/dll/directx/ddraw/startup.c Modified: branches/reactx/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/startup.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/startup.c [iso-8859-1] Thu Nov 13 13:52:20 2008 @@ -33,8 +33,8 @@ This = (LPDDRAWI_DIRECTDRAW_INT)*pIface; - /* fixme linking too second link when we shall not doing it */ - if (IsBadReadPtr(This,sizeof(LPDIRECTDRAW))) + if ( (IsBadWritePtr(This,sizeof(LPDDRAWI_DIRECTDRAW_INT)) != 0) || + (IsBadWritePtr(This->lpLcl,sizeof(LPDDRAWI_DIRECTDRAW_LCL)) != 0) ) { /* We do not have a DirectDraw interface, we need alloc it*/ LPDDRAWI_DIRECTDRAW_INT memThis;

1 0

[cgutman] 37342: - Split NdisRegisterProtocol so I can reuse the code for NdisReEnumerateProtocolBindings - Move NdisReEnumerateProtocolBindings into protocol.c - Implement NdisReEnumerateProtocolBindings
by cgutman＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: cgutman Date: Thu Nov 13 13:52:11 2008 New Revision: 37342 URL: http://svn.reactos.org/svn/reactos?rev=37342&view=rev Log: - Split NdisRegisterProtocol so I can reuse the code for NdisReEnumerateProtocolBindings - Move NdisReEnumerateProtocolBindings into protocol.c - Implement NdisReEnumerateProtocolBindings Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Thu Nov 13 13:52:11 2008 @@ -609,6 +609,151 @@ *Status = NDIS_STATUS_SUCCESS; } +VOID +ndisBindMiniportsToProtocol(OUT PNDIS_STATUS Status, IN PPROTOCOL_BINDING Protocol, IN PNDIS_PROTOCOL_CHARACTERISTICS ProtocolCharacteristics) +{ + /* + * bind the protocol to all of its miniports + * + * open registry path + * get list of devices from Bind key + * call BindAdapterHandler for each + */ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING RegistryPath; + WCHAR *RegistryPathStr; + NTSTATUS NtStatus; + WCHAR *DataPtr; + HANDLE DriverKeyHandle = NULL; + PKEY_VALUE_PARTIAL_INFORMATION KeyInformation = NULL; + + RegistryPathStr = ExAllocatePoolWithTag(PagedPool, sizeof(SERVICES_KEY) + ProtocolCharacteristics->Name.Length + sizeof(LINKAGE_KEY), NDIS_TAG + __LINE__); + if(!RegistryPathStr) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + wcscpy(RegistryPathStr, SERVICES_KEY); + wcsncat(RegistryPathStr, ((WCHAR *)ProtocolCharacteristics->Name.Buffer), ProtocolCharacteristics->Name.Length / sizeof(WCHAR)); + RegistryPathStr[wcslen(SERVICES_KEY)+ProtocolCharacteristics->Name.Length/sizeof(WCHAR)] = 0; + wcscat(RegistryPathStr, LINKAGE_KEY); + + RtlInitUnicodeString(&RegistryPath, RegistryPathStr); + NDIS_DbgPrint(MAX_TRACE, ("Opening configuration key: %wZ\n", &RegistryPath)); + + InitializeObjectAttributes(&ObjectAttributes, &RegistryPath, OBJ_CASE_INSENSITIVE, NULL, NULL); + NtStatus = ZwOpenKey(&DriverKeyHandle, KEY_READ, &ObjectAttributes); + + ExFreePool(RegistryPathStr); + + if(!NT_SUCCESS(NtStatus)) + { + NDIS_DbgPrint(MIN_TRACE, ("Unable to open protocol configuration\n")); + *Status = NDIS_STATUS_FAILURE; + return; + } + + NDIS_DbgPrint(MAX_TRACE, ("Successfully opened the registry configuration\n")); + + { + UNICODE_STRING ValueName; + ULONG ResultLength; + + RtlInitUnicodeString(&ValueName, L"Bind"); + + NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, NULL, 0, &ResultLength); + if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL && NtStatus != STATUS_SUCCESS) + { + NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value for size\n")); + ZwClose(DriverKeyHandle); + *Status = NDIS_STATUS_FAILURE; + return; + } + + KeyInformation = ExAllocatePoolWithTag(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, NDIS_TAG + __LINE__); + if(!KeyInformation) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ZwClose(DriverKeyHandle); + *Status = NDIS_STATUS_FAILURE; + return; + } + + NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, KeyInformation, + sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, &ResultLength); + + ZwClose(DriverKeyHandle); + + if(!NT_SUCCESS(NtStatus)) + { + NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value\n")); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_FAILURE; + return; + } + } + + for (DataPtr = (WCHAR *)KeyInformation->Data; + *DataPtr != 0; + DataPtr += wcslen(DataPtr) + 1) + { + /* BindContext is for tracking pending binding operations */ + VOID *BindContext = 0; + NDIS_STRING DeviceName; + NDIS_STRING RegistryPath; + WCHAR *RegistryPathStr = NULL; + ULONG PathLength = 0; + + RtlInitUnicodeString(&DeviceName, DataPtr); /* we know this is 0-term */ + + /* + * RegistryPath should be: + * \Registry\Machine\System\CurrentControlSet\Services\Nic1\Parameters\Tcpip + * + * This is constructed as follows: + * SERVICES_KEY + extracted device name + Protocol name from characteristics + */ + + PathLength = sizeof(SERVICES_KEY) + /* \Registry\Machine\System\CurrentControlSet\Services\ */ + wcslen( DataPtr + 8 ) * sizeof(WCHAR) + /* Adapter1 (extracted from \Device\Adapter1) */ + sizeof(PARAMETERS_KEY) + /* \Parameters\ */ + ProtocolCharacteristics->Name.Length + sizeof(WCHAR); /* Tcpip */ + + RegistryPathStr = ExAllocatePool(PagedPool, PathLength); + if(!RegistryPathStr) + { + NDIS_DbgPrint(MIN_TRACE, ("insufficient resources.\n")); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + wcscpy(RegistryPathStr, SERVICES_KEY); + wcscat(RegistryPathStr, DataPtr + 8 ); + wcscat(RegistryPathStr, PARAMETERS_KEY); + wcsncat(RegistryPathStr, ProtocolCharacteristics->Name.Buffer, ProtocolCharacteristics->Name.Length / sizeof(WCHAR) ); + + RegistryPathStr[PathLength/sizeof(WCHAR) - 1] = 0; + + RtlInitUnicodeString(&RegistryPath, RegistryPathStr); + + NDIS_DbgPrint(MAX_TRACE, ("Calling protocol's BindAdapter handler with DeviceName %wZ and RegistryPath %wZ\n", + &DeviceName, &RegistryPath)); + + { + BIND_HANDLER BindHandler = ProtocolCharacteristics->BindAdapterHandler; + if(BindHandler) + BindHandler(Status, BindContext, &DeviceName, &RegistryPath, 0); + else + NDIS_DbgPrint(MID_TRACE, ("No protocol bind handler specified\n")); + } + } + + *Status = NDIS_STATUS_SUCCESS; + ExFreePool(KeyInformation); +} /* * @implemented @@ -640,9 +785,6 @@ PPROTOCOL_BINDING Protocol; NTSTATUS NtStatus; UINT MinSize; - HANDLE DriverKeyHandle = NULL; - PKEY_VALUE_PARTIAL_INFORMATION KeyInformation = NULL; - WCHAR *DataPtr; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -703,172 +845,13 @@ InitializeListHead(&Protocol->AdapterListHead); - /* - * bind the protocol to all of its miniports - * - * open registry path - * get list of devices from Bind key - * call BindAdapterHandler for each - */ - { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING RegistryPath; - WCHAR *RegistryPathStr; - - RegistryPathStr = ExAllocatePoolWithTag(PagedPool, sizeof(SERVICES_KEY) + ProtocolCharacteristics->Name.Length + sizeof(LINKAGE_KEY), NDIS_TAG + __LINE__); - if(!RegistryPathStr) - { - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - ExFreePool(Protocol); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - wcscpy(RegistryPathStr, SERVICES_KEY); - wcsncat(RegistryPathStr, ((WCHAR *)ProtocolCharacteristics->Name.Buffer), ProtocolCharacteristics->Name.Length / sizeof(WCHAR)); - RegistryPathStr[wcslen(SERVICES_KEY)+ProtocolCharacteristics->Name.Length/sizeof(WCHAR)] = 0; - wcscat(RegistryPathStr, LINKAGE_KEY); - - RtlInitUnicodeString(&RegistryPath, RegistryPathStr); - NDIS_DbgPrint(MAX_TRACE, ("Opening configuration key: %wZ\n", &RegistryPath)); - - InitializeObjectAttributes(&ObjectAttributes, &RegistryPath, OBJ_CASE_INSENSITIVE, NULL, NULL); - NtStatus = ZwOpenKey(&DriverKeyHandle, KEY_READ, &ObjectAttributes); - - ExFreePool(RegistryPathStr); - - if(!NT_SUCCESS(NtStatus)) - { - NDIS_DbgPrint(MIN_TRACE, ("Unable to open protocol configuration\n")); - ExFreePool(Protocol); - *Status = NDIS_STATUS_FAILURE; - return; - } - } - - NDIS_DbgPrint(MAX_TRACE, ("Successfully opened the registry configuration\n")); - - { - UNICODE_STRING ValueName; - ULONG ResultLength; - - RtlInitUnicodeString(&ValueName, L"Bind"); - - NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, NULL, 0, &ResultLength); - if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL && NtStatus != STATUS_SUCCESS) - { - NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value for size\n")); - ZwClose(DriverKeyHandle); - ExFreePool(Protocol); - *Status = NDIS_STATUS_FAILURE; - return; - } - - KeyInformation = ExAllocatePoolWithTag(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, NDIS_TAG + __LINE__); - if(!KeyInformation) - { - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - ZwClose(DriverKeyHandle); - ExFreePool(Protocol); - *Status = NDIS_STATUS_FAILURE; - return; - } - - NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, KeyInformation, - sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, &ResultLength); - - ZwClose(DriverKeyHandle); - - if(!NT_SUCCESS(NtStatus)) - { - NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value\n")); - ExFreePool(KeyInformation); - ExFreePool(Protocol); - *Status = NDIS_STATUS_FAILURE; - return; - } - } - - for (DataPtr = (WCHAR *)KeyInformation->Data; - *DataPtr != 0; - DataPtr += wcslen(DataPtr) + 1) - { - /* BindContext is for tracking pending binding operations */ - VOID *BindContext = 0; - NDIS_STRING DeviceName; - NDIS_STRING RegistryPath; - WCHAR *RegistryPathStr = NULL; - ULONG PathLength = 0; - - RtlInitUnicodeString(&DeviceName, DataPtr); /* we know this is 0-term */ - - /* - * RegistryPath should be: - * \Registry\Machine\System\CurrentControlSet\Services\Nic1\Parameters\Tcpip - * - * This is constructed as follows: - * SERVICES_KEY + extracted device name + Protocol name from characteristics - */ - - PathLength = sizeof(SERVICES_KEY) + /* \Registry\Machine\System\CurrentControlSet\Services\ */ - wcslen( DataPtr + 8 ) * sizeof(WCHAR) + /* Adapter1 (extracted from \Device\Adapter1) */ - sizeof(PARAMETERS_KEY) + /* \Parameters\ */ - ProtocolCharacteristics->Name.Length + sizeof(WCHAR); /* Tcpip */ - - RegistryPathStr = ExAllocatePool(PagedPool, PathLength); - if(!RegistryPathStr) - { - NDIS_DbgPrint(MIN_TRACE, ("insufficient resources.\n")); - ExFreePool(KeyInformation); - ExFreePool(Protocol); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - wcscpy(RegistryPathStr, SERVICES_KEY); - wcscat(RegistryPathStr, DataPtr + 8 ); - wcscat(RegistryPathStr, PARAMETERS_KEY); - wcsncat(RegistryPathStr, ProtocolCharacteristics->Name.Buffer, ProtocolCharacteristics->Name.Length / sizeof(WCHAR) ); - - RegistryPathStr[PathLength/sizeof(WCHAR) - 1] = 0; - - RtlInitUnicodeString(&RegistryPath, RegistryPathStr); - - NDIS_DbgPrint(MAX_TRACE, ("Calling protocol's BindAdapter handler with DeviceName %wZ and RegistryPath %wZ\n", - &DeviceName, &RegistryPath)); - - /* XXX SD must do something with bind context */ + ndisBindMiniportsToProtocol(Status, Protocol, ProtocolCharacteristics); + + if (*Status == NDIS_STATUS_SUCCESS) { + ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock); *NdisProtocolHandle = Protocol; - - { - BIND_HANDLER BindHandler = ProtocolCharacteristics->BindAdapterHandler; - if(BindHandler) - BindHandler(Status, BindContext, &DeviceName, &RegistryPath, 0); - else - NDIS_DbgPrint(MID_TRACE, ("No protocol bind handler specified\n")); - } - - /* - (*(Protocol->Chars.BindAdapterHandler))(Status, BindContext, &DeviceName, &RegistryPath, 0); - */ - - if(*Status == NDIS_STATUS_SUCCESS) - { - /* Put protocol binding struct on global list */ - ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock); - } - else if(*Status != NDIS_STATUS_PENDING) - { - NDIS_DbgPrint(MIN_TRACE, ("ProtocolBindAdapter failed with status 0x%x\n", *Status)); - ExFreePool(Protocol); - ExFreePool(KeyInformation); - *NdisProtocolHandle = NULL; - return; - } - } - - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_SUCCESS; + } else + ExFreePool(Protocol); } @@ -977,4 +960,17 @@ BytesTransferred); } +/* + * @implemented + */ +VOID +NTAPI +NdisReEnumerateProtocolBindings(IN NDIS_HANDLE NdisProtocolHandle) +{ + PPROTOCOL_BINDING Protocol = NdisProtocolHandle; + NDIS_STATUS NdisStatus; + + ndisBindMiniportsToProtocol(&NdisStatus, Protocol, &Protocol->Chars); +} + /* EOF */ Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c [iso-8859-1] Thu Nov 13 13:52:11 2008 @@ -1063,13 +1063,3 @@ ExQueueWorkItem(pntWorkItem, CriticalWorkQueue); return NDIS_STATUS_SUCCESS; } - -/* - * @unimplemented - */ -VOID -NTAPI -NdisReEnumerateProtocolBindings(IN NDIS_HANDLE NdisProtocolHandle) -{ - UNIMPLEMENTED; -}

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
66
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 November 2008