Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[royce] 17379: WINAPI -> STDCALL, plus fix/expound documentation
by royce＠svn.reactos.com 14 Aug '05

14 Aug '05

WINAPI -> STDCALL, plus fix/expound documentation Modified: trunk/reactos/ntoskrnl/rtl/debug.c _____ Modified: trunk/reactos/ntoskrnl/rtl/debug.c --- trunk/reactos/ntoskrnl/rtl/debug.c 2005-08-14 04:24:01 UTC (rev 17378) +++ trunk/reactos/ntoskrnl/rtl/debug.c 2005-08-14 04:36:36 UTC (rev 17379) @@ -34,7 +34,7 @@ /* * @implemented */ -ULONG WINAPI +ULONG STDCALL vDbgPrintExWithPrefix(IN LPCSTR Prefix, IN ULONG ComponentId, IN ULONG Level, @@ -133,7 +133,7 @@ /* * @implemented */ -ULONG WINAPI +ULONG STDCALL vDbgPrintEx(IN ULONG ComponentId, IN ULONG Level, IN LPCSTR Format, @@ -156,8 +156,9 @@ * * https://www.osronline.com/article.cfm?article=295 * - * ( first need to add those items to registry by default tho so we don't anger - * ros-devs when DbgPrint() suddenly stops working ) + * ( first need to add those items to default registry and write the code + * to load those settings so we don't anger ros-devs when DbgPrint() suddenly + * stops working ) * * ( also when you do this, remove -1 hack from DbgQueryDebugFilterState() ) */ @@ -233,6 +234,7 @@ { int i; + /* HACK HACK HACK - see comments in DbgPrint() */ if ( ComponentId == -1 ) return TRUE;

1 0

[royce] 17378: implement DbgPrintEx, vDbgPrintEx, and vDbgPrintExWithPrefix
by royce＠svn.reactos.com 14 Aug '05

14 Aug '05

implement DbgPrintEx, vDbgPrintEx, and vDbgPrintExWithPrefix Modified: trunk/reactos/ntoskrnl/rtl/debug.c _____ Modified: trunk/reactos/ntoskrnl/rtl/debug.c --- trunk/reactos/ntoskrnl/rtl/debug.c 2005-08-14 04:22:07 UTC (rev 17377) +++ trunk/reactos/ntoskrnl/rtl/debug.c 2005-08-14 04:24:01 UTC (rev 17378) @@ -12,6 +12,17 @@ #include <ntoskrnl.h> #include <internal/debug.h> +/* DATA *********************************************************************/ + +typedef struct +{ + ULONG ComponentId; + ULONG Level; +} KD_COMPONENT_DATA; +#define MAX_KD_COMPONENT_TABLE_ENTRIES 128 +KD_COMPONENT_DATA KdComponentTable[MAX_KD_COMPONENT_TABLE_ENTRIES]; +ULONG KdComponentTableEntries = 0; + /* FUNCTIONS ****************************************************************/ /* @@ -23,12 +34,17 @@ /* * @implemented */ -ULONG -DbgPrint(PCH Format, ...) +ULONG WINAPI +vDbgPrintExWithPrefix(IN LPCSTR Prefix, + IN ULONG ComponentId, + IN ULONG Level, + IN LPCSTR Format, + IN va_list ap) { ANSI_STRING DebugString; - CHAR Buffer[1024]; - va_list ap; + CHAR Buffer[513]; + PCHAR pBuffer; + ULONG pBufferSize; #ifdef SERIALIZE_DBGPRINT # define MESSAGETABLE_SIZE 16 LONG MyTableIndex; @@ -37,14 +53,31 @@ static CHAR MessageTable[MESSAGETABLE_SIZE][sizeof(Buffer)] = { { '\0' } }; #endif /* SERIALIZE_DBGPRINT */ + /* TODO FIXME - call NtQueryDebugFilterState() instead per Alex */ + if ( !DbgQueryDebugFilterState ( ComponentId, Level ) ) + return 0; + /* init ansi string */ DebugString.Buffer = Buffer; DebugString.MaximumLength = sizeof(Buffer); - va_start (ap, Format); - DebugString.Length = _vsnprintf (Buffer, sizeof( Buffer ), Format, ap); - va_end (ap); + pBuffer = Buffer; + pBufferSize = sizeof(Buffer); + DebugString.Length = 0; + if ( Prefix && *Prefix ) + { + DebugString.Length = strlen(Prefix); + if ( DebugString.Length >= sizeof(Buffer) ) + DebugString.Length = sizeof(Buffer) - 1; + memmove ( Buffer, Prefix, DebugString.Length ); + Buffer[DebugString.Length] = '\0'; + pBuffer = &Buffer[DebugString.Length]; + pBufferSize -= DebugString.Length; + } + DebugString.Length += _vsnprintf ( pBuffer, pBufferSize, Format, ap ); + Buffer[sizeof(Buffer)-1] = '\0'; + #ifdef SERIALIZE_DBGPRINT /* check if we are already running */ if (InterlockedCompareExchange(&Lock, 1, 0) == 1) @@ -62,9 +95,6 @@ } else { - /*DebugString.Buffer = "ÁÁÁ"; - DebugString.Length = 3; - KdpPrintString(&DebugString);*/ memcpy(MessageTable[MyTableIndex], DebugString.Buffer, DebugString.Length); MessageTable[MyTableIndex][DebugString.Length] = '\0'; } @@ -101,17 +131,60 @@ } /* - * @unimplemented + * @implemented */ +ULONG WINAPI +vDbgPrintEx(IN ULONG ComponentId, + IN ULONG Level, + IN LPCSTR Format, + IN va_list ap) +{ + return vDbgPrintExWithPrefix ( NULL, ComponentId, Level, Format, ap ); +} + +/* + * @implemented + */ ULONG +DbgPrint(PCH Format, ...) +{ + va_list ap; + ULONG rc; + + va_start (ap, Format); + /* TODO FIXME - use DPFLTR_DEFAULT_ID and DPFLTR_INFO_LEVEL + * + * https://www.osronline.com/article.cfm?article=295 + * + * ( first need to add those items to registry by default tho so we don't anger + * ros-devs when DbgPrint() suddenly stops working ) + * + * ( also when you do this, remove -1 hack from DbgQueryDebugFilterState() ) + */ + rc = vDbgPrintExWithPrefix ( NULL, (ULONG)-1, (ULONG)-1, Format, ap ); + va_end (ap); + + return rc; +} + +/* + * @implemented + */ +ULONG __cdecl DbgPrintEx(IN ULONG ComponentId, IN ULONG Level, IN PCH Format, ...) { - UNIMPLEMENTED; - return 0; + va_list ap; + ULONG rc; + + va_start (ap, Format); + rc = vDbgPrintExWithPrefix ( NULL, ComponentId, Level, Format, ap ); + va_end (ap); + + return rc; } /* @@ -151,19 +224,36 @@ } /* - * @unimplemented + * @implemented */ -NTSTATUS +BOOLEAN STDCALL DbgQueryDebugFilterState(IN ULONG ComponentId, IN ULONG Level) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + int i; + + if ( ComponentId == -1 ) + return TRUE; + + /* convert Level to mask if it isn't already one */ + if ( Level < 32 ) + Level = 1 << Level; + + for ( i = 0; i < KdComponentTableEntries; i++ ) + { + if ( ComponentId == KdComponentTable[i].ComponentId ) + { + if ( Level & KdComponentTable[i].Level ) + return TRUE; + break; + } + } + return FALSE; } /* - * @unimplemented + * @implemented */ NTSTATUS STDCALL @@ -171,8 +261,25 @@ IN ULONG Level, IN BOOLEAN State) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + int i; + for ( i = 0; i < KdComponentTableEntries; i++ ) + { + if ( ComponentId == KdComponentTable[i].ComponentId ) + break; + } + if ( i == KdComponentTableEntries ) + { + if ( i == MAX_KD_COMPONENT_TABLE_ENTRIES ) + return STATUS_INVALID_PARAMETER_1; + ++KdComponentTableEntries; + KdComponentTable[i].ComponentId = ComponentId; + KdComponentTable[i].Level = 0; + } + if ( State ) + KdComponentTable[i].Level |= Level; + else + KdComponentTable[i].Level &= ~Level; + return STATUS_SUCCESS; } /*

1 0

[royce] 17377: fix declaration of DbgQueryDebugFilterState()
by royce＠svn.reactos.com 14 Aug '05

14 Aug '05

fix declaration of DbgQueryDebugFilterState() Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-08-14 01:30:15 UTC (rev 17376) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-08-14 04:22:07 UTC (rev 17377) @@ -9824,7 +9824,7 @@ IN ...); NTOSAPI -NTSTATUS +BOOLEAN DDKAPI DbgQueryDebugFilterState( IN ULONG ComponentId,

1 0

[hbirr] 17376: Added the lowercase files from r16249.
by hbirr＠svn.reactos.com 14 Aug '05

14 Aug '05

Added the lowercase files from r16249. Added: branches/cache_manager_rewrite/reactos/lib/gdiplus/include/gdiplusprivat e.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplus.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusbase.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusbrush.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdipluscolor.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdipluscolormatrix .h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdipluseffects.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusenums.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusflat.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusgpstubs.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusgraphics.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusheaders.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusimageattrib utes.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusimaging.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusinit.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdipluslinecaps.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusmatrix.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusmem.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusmetafile.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusmetaheader. h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdipluspath.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdipluspen.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdipluspixelformat s.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusstringforma t.h Added: branches/cache_manager_rewrite/reactos/w32api/include/gdiplustypes.h _____ Copied: branches/cache_manager_rewrite/reactos/lib/gdiplus/include/gdiplusprivat e.h (from rev 16250, trunk/reactos/lib/gdiplus/include/gdiplusprivate.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplus.h (from rev 16250, trunk/reactos/w32api/include/gdiplus.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusbase.h (from rev 16250, trunk/reactos/w32api/include/gdiplusbase.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusbrush.h (from rev 16250, trunk/reactos/w32api/include/gdiplusbrush.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdipluscolor.h (from rev 16250, trunk/reactos/w32api/include/gdipluscolor.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdipluscolormatrix .h (from rev 16250, trunk/reactos/w32api/include/gdipluscolormatrix.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdipluseffects.h (from rev 16250, trunk/reactos/w32api/include/gdipluseffects.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusenums.h (from rev 16250, trunk/reactos/w32api/include/gdiplusenums.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusflat.h (from rev 16250, trunk/reactos/w32api/include/gdiplusflat.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusgpstubs.h (from rev 16250, trunk/reactos/w32api/include/gdiplusgpstubs.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusgraphics.h (from rev 16250, trunk/reactos/w32api/include/gdiplusgraphics.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusheaders.h (from rev 16250, trunk/reactos/w32api/include/gdiplusheaders.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusimageattrib utes.h (from rev 16250, trunk/reactos/w32api/include/gdiplusimageattributes.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusimaging.h (from rev 16250, trunk/reactos/w32api/include/gdiplusimaging.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusinit.h (from rev 16250, trunk/reactos/w32api/include/gdiplusinit.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdipluslinecaps.h (from rev 16250, trunk/reactos/w32api/include/gdipluslinecaps.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusmatrix.h (from rev 16250, trunk/reactos/w32api/include/gdiplusmatrix.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusmem.h (from rev 16250, trunk/reactos/w32api/include/gdiplusmem.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusmetafile.h (from rev 16250, trunk/reactos/w32api/include/gdiplusmetafile.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusmetaheader. h (from rev 16250, trunk/reactos/w32api/include/gdiplusmetaheader.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdipluspath.h (from rev 16250, trunk/reactos/w32api/include/gdipluspath.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdipluspen.h (from rev 16250, trunk/reactos/w32api/include/gdipluspen.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdipluspixelformat s.h (from rev 16250, trunk/reactos/w32api/include/gdipluspixelformats.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplusstringforma t.h (from rev 16250, trunk/reactos/w32api/include/gdiplusstringformat.h) _____ Copied: branches/cache_manager_rewrite/reactos/w32api/include/gdiplustypes.h (from rev 16250, trunk/reactos/w32api/include/gdiplustypes.h)

1 0

[hbirr] 17375: Merged r16249 from trunk except the added lowercase files.
by hbirr＠svn.reactos.com 14 Aug '05

14 Aug '05

Merged r16249 from trunk except the added lowercase files. Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/arrow.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/bitmap.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/brush.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/clip.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/codec.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/container.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/dllmain.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/draw.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/effect.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/fill.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/font.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/graphics.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/image.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/linecap.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/linegradient. c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/matrix.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/memory.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/metafile.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/palette.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/path.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/pathgradient. c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/pathiterator. c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/pen.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/region.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/string.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/texture.c Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/transform.c Deleted: branches/cache_manager_rewrite/reactos/lib/gdiplus/include/GdiPlusPrivat e.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlus.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusBase.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusBrush.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusColor.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusColorMatrix .h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusEffects.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusEnums.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusFlat.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusGpStubs.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusGraphics.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusHeaders.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusImageAttrib utes.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusImaging.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusInit.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusLineCaps.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusMatrix.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusMem.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusMetaFile.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusMetaHeader. h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusPath.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusPen.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusPixelFormat s.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusStringForma t.h Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusTypes.h _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/arrow.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/arrow.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/arrow.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/bitmap.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/bitmap.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/bitmap.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/brush.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/brush.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/brush.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/clip.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/clip.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/clip.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/codec.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/codec.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/codec.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/container.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/container.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/container.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/dllmain.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/dllmain.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/dllmain.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> #ifdef DBG _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/draw.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/draw.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/draw.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/effect.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/effect.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/effect.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/fill.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/fill.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/fill.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/font.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/font.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/font.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/graphics.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/graphics.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/graphics.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/image.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/image.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/image.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/linecap.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/linecap.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/linecap.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,7 +1,6 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> -#include <GdiPlusPrivate.h> /* * @unimplemented _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/linegradient. c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/linegradient. c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/linegradient. c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/matrix.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/matrix.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/matrix.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/memory.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/memory.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/memory.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/metafile.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/metafile.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/metafile.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/palette.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/palette.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/palette.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/path.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/path.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/path.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/pathgradient. c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/pathgradient. c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/pathgradient. c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/pathiterator. c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/pathiterator. c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/pathiterator. c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/pen.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/pen.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/pen.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/region.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/region.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/region.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/string.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/string.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/string.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/texture.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/texture.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/texture.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Modified: branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/transform.c --- branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/transform.c 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/gdiplus/transform.c 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,5 +1,5 @@ #include <windows.h> -#include <GdiPlusPrivate.h> +#include <gdiplusprivate.h> #include <debug.h> /* _____ Deleted: branches/cache_manager_rewrite/reactos/lib/gdiplus/include/GdiPlusPrivat e.h --- branches/cache_manager_rewrite/reactos/lib/gdiplus/include/GdiPlusPrivat e.h 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/lib/gdiplus/include/GdiPlusPrivat e.h 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,342 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS gdiplus.dll - * FILE: include/GdiPlusPrivate.h - * PURPOSE: GDI+ private definitions - */ -#ifndef __GDIPLUSPRIVATE_H -#define __GDIPLUSPRIVATE_H - -#include <GdiPlusEnums.h> -#include <GdiPlusPixelFormats.h> - -typedef float REAL; -typedef ARGB Color; -#include <GdiPlusColorMatrix.h> - -#define WINGDIPAPI __stdcall -#define GDIPCONST const - -typedef BOOL (CALLBACK * ImageAbort)(VOID *); -typedef ImageAbort DrawImageAbort; -typedef ImageAbort GetThumbnailImageAbort; -typedef BOOL (CALLBACK * EnumerateMetafileProc)(EmfPlusRecordType, - UINT, - UINT, - const BYTE*, - VOID*); - -typedef enum { - Ok = 0, - GenericError = 1, - InvalidParameter = 2, - OutOfMemory = 3, - ObjectBusy = 4, - InsufficientBuffer = 5, - NotImplemented = 6, - Win32Error = 7, - WrongState = 8, - Aborted = 9, - FileNotFound = 10, - ValueOverflow = 11, - AccessDenied = 12, - UnknownImageFormat = 13, - FontFamilyNotFound = 14, - FontStyleNotFound = 15, - NotTrueTypeFont = 16, - UnsupportedGdiplusVersion = 17, - GdiplusNotInitialized = 18, - PropertyNotFound = 19, - PropertyNotSupported = 20, - ProfileNotFound = 21 -} GpStatus; - -typedef GpStatus Status; - -typedef struct -{ -} GpAdjustableArrowCap; - -typedef struct -{ -} GpBitmap; - -typedef struct -{ -} GpGraphics; - -typedef struct -{ -} BitmapData; - -typedef struct -{ -} CGpEffect; - -typedef struct -{ -} GpCachedBitmap; - -typedef struct -{ -} IDirectDrawSurface7; - -typedef struct -{ -} GpBrush; - -typedef BrushType GpBrushType; - -typedef HatchStyle GpHatchStyle; - -typedef struct -{ -} GpHatch; - -typedef struct -{ -} GpPath; - -typedef struct -{ -} GpRegion; - -typedef struct -{ - CLSID Clsid; - GUID FormatID; - WCHAR *CodecName; - WCHAR *DllName; - WCHAR *FormatDescription; - WCHAR *FilenameExtension; - WCHAR *MimeType; - DWORD Flags; - DWORD Version; - DWORD SigCount; - DWORD SigSize; - BYTE *SigPattern; - BYTE *SigMask; -} ImageCodecInfo; - -typedef Unit GpUnit; - -typedef struct -{ -} GpPen; - -typedef struct -{ - REAL X; - REAL Y; -} GpPointF; - -typedef struct -{ - INT X; - INT Y; -} GpPoint; - -typedef FillMode GpFillMode; - -typedef struct -{ -} GpSolidFill; - -typedef struct -{ -} GpFont; - -typedef struct -{ -} GpFontFamily; - -typedef struct -{ -} GpFontCollection; - -typedef FlushIntention GpFlushIntention; - -typedef struct -{ -} GpImage; - -typedef struct -{ -} GpImageAttributes; - -typedef struct -{ -} GpMatrix; - -typedef struct -{ - GUID Guid; - ULONG NumberOfValues; - ULONG Type; - VOID *Value; -} EncoderParameter; - -typedef struct -{ - UINT Count; - EncoderParameter Parameter[1]; -} EncoderParameters; - -typedef struct -{ - PROPID id; - ULONG length; - WORD type; - VOID *value; -} PropertyItem; - -typedef struct -{ - UINT Size; - UINT Position; - VOID *Desc; - UINT DescSize; - UINT *Data; - UINT DataSize; - UINT Cookie; -} ImageItemData; - -typedef enum { - ColorChannelFlagsC = 0, - ColorChannelFlagsM = 1, - ColorChannelFlagsY = 2, - ColorChannelFlagsK = 3, - ColorChannelFlagsLast = 4 -} ColorChannelFlags; - -typedef LineCap GpLineCap; - -typedef struct -{ -} GpCustomLineCap; - -typedef LineJoin GpLineJoin; - -typedef WrapMode GpWrapMode; - -typedef struct -{ -} GpLineGradient; - -typedef MatrixOrder GpMatrixOrder; - -typedef struct -{ -} GpMetafile; - -typedef struct -{ - REAL X; - REAL Y; -} PointF; - -typedef struct -{ - INT X; - INT Y; -} Point; - -typedef struct -{ - REAL X; - REAL Y; - REAL Width; - REAL Height; -} RectF; - -typedef RectF GpRectF; - -typedef struct -{ - INT X; - INT Y; - INT Width; - INT Height; -} Rect; - -typedef Rect GpRect; - -typedef struct -{ -} MetafileHeader; - -typedef struct { - INT16 Left; - INT16 Top; - INT16 Right; - INT16 Bottom; -} PWMFRect16; - -typedef struct { - UINT32 Key; - INT16 Hmf; - PWMFRect16 BoundingBox; - INT16 Inch; - UINT32 Reserved; - INT16 Checksum; -} WmfPlaceableFileHeader; - -typedef struct -{ -} GpPathData; - -typedef struct -{ -} GpStringFormat; - -typedef struct -{ -} GpPathGradient; - -typedef struct -{ -} GpPathIterator; - -typedef DashCap GpDashCap; - -typedef PenAlignment GpPenAlignment; - -typedef PenType GpPenType; - -typedef DashStyle GpDashStyle; - -typedef struct -{ -} CharacterRange; - -typedef struct -{ -} GpTexture; - -typedef CoordinateSpace GpCoordinateSpace; - -typedef enum { - DebugEventLevelFatal, - DebugEventLevelWarning -} DebugEventLevel; - -typedef VOID (WINAPI *DebugEventProc)(DebugEventLevel level, - CHAR *message); - -typedef struct -{ - UINT32 GdiplusVersion; - DebugEventProc DebugEventCallback; - BOOL SuppressBackgroundThread; - BOOL SuppressExternalCodecs; -} GdiplusStartupInput; - -typedef Status (WINAPI *NotificationHookProc)(OUT ULONG_PTR *token); -typedef VOID (WINAPI *NotificationUnhookProc)(ULONG_PTR token); - -typedef struct { - NotificationHookProc NotificationHook; - NotificationUnhookProc NotificationUnhook; -} GdiplusStartupOutput; - -#endif /* __GDIPLUSPRIVATE_H */ _____ Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlus.h --- branches/cache_manager_rewrite/reactos/w32api/include/GdiPlus.h 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/w32api/include/GdiPlus.h 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,78 +0,0 @@ -/* - * GdiPlus.h - * - * Windows GDI+ - * - * This file is part of the w32api package. - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ - -#ifndef _GDIPLUS_H -#define _GDIPLUS_H - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif - -#ifndef __cplusplus -#error In order to use GDI+ headers use must use a C++ compiler -#else - -struct IDirectDrawSurface7; - -typedef signed short INT16; -typedef unsigned short UINT16; - -#include <pshpack8.h> - -namespace Gdiplus -{ - namespace DllExports - { - #include "GdiplusMem.h" - }; - - #include "GdiplusBase.h" - - #include "GdiplusEnums.h" - #include "GdiplusTypes.h" - #include "GdiplusInit.h" - #include "GdiplusPixelFormats.h" - #include "GdiplusColor.h" - #include "GdiplusMetaHeader.h" - #include "GdiplusImaging.h" - #include "GdiplusColorMatrix.h" - #include "GdiplusGpStubs.h" - #include "GdiplusHeaders.h" - - namespace DllExports - { - #include "GdiPlusFlat.h" - }; - - #include "GdiplusImageAttributes.h" - #include "GdiplusMatrix.h" - #include "GdiplusBrush.h" - #include "GdiplusPen.h" - #include "GdiplusStringFormat.h" - #include "GdiplusPath.h" - #include "GdiplusLineCaps.h" - #include "GdiplusMetaFile.h" - #include "GdiplusGraphics.h" - #include "GdiplusEffects.h" -} - -#include <poppack.h> - -#endif - -#endif /* _GDIPLUS_H */ _____ Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusBase.h --- branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusBase.h 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusBase.h 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,49 +0,0 @@ -/* - * GdiPlusBase.h - * - * Windows GDI+ - * - * This file is part of the w32api package. - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ - -#ifndef _GDIPLUSBASE_H -#define _GDIPLUSBASE_H - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif - -class GdiplusBase { -public: - void operator delete(void *in_pVoid) - { - DllExports::GdipFree(in_pVoid); - } - - void operator delete[](void *in_pVoid) - { - DllExports::GdipFree(in_pVoid); - } - - void *operator new(size_t in_size) - { - return DllExports::GdipAlloc(in_size); - } - - void *operator new[](size_t in_size) - { - return DllExports::GdipAlloc(in_size); - } -}; - -#endif /* _GDIPLUSBASE_H */ _____ Deleted: branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusBrush.h --- branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusBrush.h 2005-08-13 23:59:17 UTC (rev 17374) +++ branches/cache_manager_rewrite/reactos/w32api/include/GdiPlusBrush.h 2005-08-14 01:12:56 UTC (rev 17375) @@ -1,315 +0,0 @@ -/* - * GdiPlusBrush.h - * - * Windows GDI+ - * - * This file is part of the w32api package. - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ - -#ifndef _GDIPLUSBRUSH_H -#define _GDIPLUSBRUSH_H - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif - -class Brush : public GdiplusBase -{ -public: - Brush *Clone(VOID) const - { - return NULL; - } - - Status GetLastStatus(VOID) - { - return NotImplemented; - } - - BrushType GetType(VOID) - { - return BrushTypeSolidColor; - } -}; - - -class HatchBrush : public Brush -{ -public: - HatchBrush(HatchStyle hatchStyle, const Color &foreColor, const Color &backColor) - { - } - - Status GetBackgroundColor(Color *color) const - { - return NotImplemented; - } - - Status GetForegroundColor(Color *color) const - { - return NotImplemented; - } - - HatchStyle GetHatchStyle(VOID) const - { - return HatchStyleHorizontal; - } -}; - - -class LinearGradientBrush : public Brush -{ -public: - LinearGradientBrush(const PointF &point1, const PointF &point2, const Color &color1, const Color &color2) - { - } - - LinearGradientBrush(const Rect &rect, const Color &color1, const Color &color2, REAL angle, BOOL isAngleScalable) - { - } - - LinearGradientBrush(const Rect &rect, const Color &color1, const Color &color2, LinearGradientMode mode) - { - } - - LinearGradientBrush(const Point &point1, const Point &point2, const Color &color1, const Color &color2) - { - } - - LinearGradientBrush(const RectF &rect, const Color &color1, const Color &color2, REAL angle, BOOL isAngleScalable) - { - } - - LinearGradientBrush(const RectF &rect, const Color &color1, const Color &color2, LinearGradientMode mode) - { - } - - Status GetBlend(REAL *blendFactors, REAL *blendPositions, INT count) - { - return NotImplemented; - } - - INT GetBlendCount(VOID) const - { - return 0; - } - - BOOL GetGammaCorrection(VOID) const - { - return FALSE; - } - - INT GetInterpolationColorCount(VOID) const - { - return 0; - } - - Status GetInterpolationColors(Color *presetColors, REAL *blendPositions, INT count) const - { - return NotImplemented; - } - - Status GetLinearColors(Color* colors) const - { - return NotImplemented; - } - - Status GetRectangle(Rect *rect) const - { - return NotImplemented; - } - - Status GetRectangle(RectF* rect) const - { - return NotImplemented; - } - - Status GetTransform(Matrix* matrix) const - { - return NotImplemented; - } - - WrapMode GetWrapMode(VOID) const - { - return WrapModeTile; - } - - Status MultiplyTransform(const Matrix *matrix, MatrixOrder order) - { - return NotImplemented; - } - - Status ResetTransform(VOID) - { - return NotImplemented; - } - - Status RotateTransform(REAL angle, MatrixOrder order) - { - return NotImplemented; - } - - Status ScaleTransform(REAL sx, REAL sy, MatrixOrder order) - { - return NotImplemented; - } - - Status SetBlend(const REAL *blendFactors, const REAL *blendPositions, INT count) - { - return NotImplemented; - } - - Status SetBlendBellShape(REAL focus, REAL scale) - { - return NotImplemented; - } - - Status SetBlendTriangularShape(REAL focus, REAL scale) - { - return NotImplemented; - } - - Status SetGammaCorrection(BOOL useGammaCorrection) - { - return NotImplemented; - } - - Status SetInterpolationColors(const Color *presetColors, const REAL *blendPositions, INT count) - { - return NotImplemented; - } - - Status SetLinearColors(const Color& color1, const Color& color2) - { - return NotImplemented; - } - - Status SetTransform(const Matrix* matrix) - { - return NotImplemented; - } - - Status SetWrapMode(WrapMode wrapMode) - { - return NotImplemented; - } - - Status TranslateTransform(REAL dx, REAL dy, MatrixOrder order) - { - return NotImplemented; - } -}; - [truncated at 1000 lines; 7185 more skipped]

1 0

[hbirr] 17374: Merged r15792:16248 from trunk.
by hbirr＠svn.reactos.com 14 Aug '05

14 Aug '05

Merged r15792:16248 from trunk. Modified: branches/cache_manager_rewrite/reactos/CREDITS Modified: branches/cache_manager_rewrite/reactos/Makefile Modified: branches/cache_manager_rewrite/reactos/ReactOS.xml Deleted: branches/cache_manager_rewrite/reactos/apps/Makefile Deleted: branches/cache_manager_rewrite/reactos/apps/testsets/Makefile Deleted: branches/cache_manager_rewrite/reactos/apps/testsets/loadlib/makefile Deleted: branches/cache_manager_rewrite/reactos/apps/testsets/msvcrt/fileio/makef ile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/binpatch/Makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/cat/makefile Modified: branches/cache_manager_rewrite/reactos/apps/utils/directory.xml Deleted: branches/cache_manager_rewrite/reactos/apps/utils/driver/load/makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/driver/unload/makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/infinst/makefile Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/directory.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.xml Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/roshttpd/makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/ip.h Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/ip_icmp.h Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/makefile Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/tracert.c Added: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/tracert.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/tracert.rc Added: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/tracert.xm l Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/whois/whois.xml Deleted: branches/cache_manager_rewrite/reactos/apps/utils/nts2w32err/makefile Modified: branches/cache_manager_rewrite/reactos/apps/utils/nts2w32err/nts2w32err. c Deleted: branches/cache_manager_rewrite/reactos/apps/utils/objdir/makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/partinfo/makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/patchnv4/Makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/pesum/makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/pice/loader/makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/pice/makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/pice/module/makefile Modified: branches/cache_manager_rewrite/reactos/apps/utils/pice/module/symbols.c Deleted: branches/cache_manager_rewrite/reactos/apps/utils/pnpdump/makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/ps/makefile Added: branches/cache_manager_rewrite/reactos/apps/utils/ps/ps.xml Deleted: branches/cache_manager_rewrite/reactos/apps/utils/sc/makefile Modified: branches/cache_manager_rewrite/reactos/apps/utils/sdkparse/test.h Deleted: branches/cache_manager_rewrite/reactos/apps/utils/shutdown/Makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/stats/Makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/theme/dump/Makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/tickcount/makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/winetest/makefile Deleted: branches/cache_manager_rewrite/reactos/boot/freeldr/Makefile Deleted: branches/cache_manager_rewrite/reactos/boot/freeldr/fdebug/Makefile Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/reac tos.c Deleted: branches/cache_manager_rewrite/reactos/boot/freeldr/install/Makefile Deleted: branches/cache_manager_rewrite/reactos/boot/freeldr/tools/Makefile Modified: branches/cache_manager_rewrite/reactos/bootdata/hivesys.inf Modified: branches/cache_manager_rewrite/reactos/bootdata/packages/reactos.dff Deleted: branches/cache_manager_rewrite/reactos/dk/ Deleted: branches/cache_manager_rewrite/reactos/drivers/Makefile Deleted: branches/cache_manager_rewrite/reactos/drivers/bus/Makefile Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/acpi.xml Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/detect.c Deleted: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/makefile Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/pdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/serenum.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/serenum.h Deleted: branches/cache_manager_rewrite/reactos/drivers/dd/Makefile Modified: branches/cache_manager_rewrite/reactos/drivers/dd/beep/beep.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/blue/blue.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/blue/blue.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/bootvid.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/bootvid.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/debugout/debugout.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/debugout/debugout.xml Deleted: branches/cache_manager_rewrite/reactos/drivers/dd/green/makefile Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/mpu401.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/mpu401.h Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/mpu401.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/portio.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/settings.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/null/null.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/parallel/parallel.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/parallel/parallel.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/ramdrv/ramdrv.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/ramdrv/ramdrv.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.h Modified: branches/cache_manager_rewrite/reactos/drivers/dd/sndblst/portio.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/sndblst/settings.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/sndblst/sndblst.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/sndblst/sndblst.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/sound/sb16.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/sound/sound.xml Deleted: branches/cache_manager_rewrite/reactos/drivers/dd/test/makefile Deleted: branches/cache_manager_rewrite/reactos/drivers/fs/Makefile Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/cdfs.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/cdfs.h Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/cdfs.xml Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/create.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/dirctl.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/fcb.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/fsctl.c Deleted: branches/cache_manager_rewrite/reactos/drivers/fs/ext2/makefile Modified: branches/cache_manager_rewrite/reactos/drivers/fs/ext2/super.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/fs_rec/cdfs.c [truncated at 100 lines; 1130 more skipped] _____ Modified: branches/cache_manager_rewrite/reactos/CREDITS --- branches/cache_manager_rewrite/reactos/CREDITS 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/CREDITS 2005-08-13 23:59:17 UTC (rev 17374) @@ -46,6 +46,7 @@ David Welch <welch(a)cwcom.net> Jonathan Wilson <jonwil(a)tpgi.com.au> Art Yerkes <ayerkes(a)speakeasy.net> +Magnus Olsen (magnus(a)greatlord.com) Graphic Design from _____ Modified: branches/cache_manager_rewrite/reactos/Makefile --- branches/cache_manager_rewrite/reactos/Makefile 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/Makefile 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,3 +1,52 @@ +# Well-known targets: +# +# all (default target) +# This target builds all of ReactOS. +# +# module +# These targets builds a single module. Replace module with the name of +# the module you want to build. +# +# bootcd +# This target builds an ISO (ReactOS.iso) from which ReactOS can be booted +# and installed. +# +# livecd +# This target builds an ISO (ReactOS-Live.iso) from which ReactOS can be +# booted, but not installed. +# +# install +# This target installs all of ReactOS to a location specified by the +# ROS_INSTALL environment variable. +# +# module_install +# These targets installs a single module to a location specified by the +# ROS_INSTALL environment variable. Replace module with the name of the +# module you want to install. +# +# clean +# This target cleans (deletes) all files that are generated when building +# ReactOS. +# +# module_clean +# These targets cleans (deletes) files that are generated when building a +# single module. Replace module with the name of the module you want to +# clean. +# +# depends +# This target does a complete dependency check of the ReactOS codebase. +# This can require several minutes to complete. If you only need to check +# dependencies for a single or few modules then you can use the +# module_depends targets instead. This target can also repair a damaged or +# missing makefile.auto if needed. +# +# module_depends +# These targets do a dependency check of individual modules. Replace module +# with the name of the module for which you want to check dependencies. +# This is faster than the depends target which does a complete dependency +# check of the ReactOS codebase. +# +# # Accepted environment variables: # # ROS_PREFIX @@ -50,6 +99,12 @@ # # ROS_RBUILDFLAGS # Pass parameters to rbuild. +# -v Be verbose. +# -c Clean as you go. Delete generated files as soon as they are not needed anymore. +# -dd Disable automatic dependencies. +# -dm{module} Check only automatic dependencies for this module. +# -mi Let make handle creation of install directories. Rbuild will not generate the directories. +# -ps Generate proxy makefiles in source tree instead of the output tree. .PHONY: all .PHONY: clean _____ Modified: branches/cache_manager_rewrite/reactos/ReactOS.xml --- branches/cache_manager_rewrite/reactos/ReactOS.xml 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/ReactOS.xml 2005-08-13 23:59:17 UTC (rev 17374) @@ -57,6 +57,9 @@ <directory name="media"> <xi:include href="media/directory.xml" /> </directory> + <directory name="modules"> + <xi:include href="modules/directory.xml" /> + </directory> <directory name="ntoskrnl"> <xi:include href="ntoskrnl/ntoskrnl.xml" /> </directory> _____ Deleted: branches/cache_manager_rewrite/reactos/apps/Makefile --- branches/cache_manager_rewrite/reactos/apps/Makefile 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/Makefile 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,13 +0,0 @@ -# $Id$ -# -# ReactOS apps and tools makefile to generate Doxygen documentation -# - - -docu: - doxygen Doxyfile - -.PHONY: docu - - -# EOF _____ Deleted: branches/cache_manager_rewrite/reactos/apps/testsets/Makefile --- branches/cache_manager_rewrite/reactos/apps/testsets/Makefile 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/testsets/Makefile 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,162 +0,0 @@ -# -# ReactOS system testsets makefile -# - -PATH_TO_TOP = ../.. - -include $(PATH_TO_TOP)/rules.mak - - -# Testset applications -TEST_SETS = loadlib - -TEST_KERNEL32 = - -TEST_MSVCRT = - -TEST_COM = - -TEST_SEH = - -TEST_REGRESSIONS = - -all: $(TEST_SETS) $(TEST_KERNEL32) $(TEST_MSVCRT) $(TEST_COM) $(TEST_SEH) $(TEST_REGRESSIONS) - -depends: - -implib: $(TEST_SETS:%=%_implib) \ - $(TEST_KERNEL32:%=%_implib) \ - $(TEST_MSVCRT:%=%_implib) \ - $(TEST_COM:%=%_implib) \ - $(TEST_SEH:%=%_implib) \ - $(TEST_REGRESSIONS:%=%_implib) - -clean: $(TEST_SETS:%=%_clean) \ - $(TEST_KERNEL32:%=%_clean) \ - $(TEST_MSVCRT:%=%_clean) \ - $(TEST_COM:%=%_clean) \ - $(TEST_SEH:%=%_clean) \ - $(TEST_REGRESSIONS:%=%_clean) - -install: $(TEST_SETS:%=%_install) \ - $(TEST_KERNEL32:%=%_install) \ - $(TEST_MSVCRT:%=%_install) \ - $(TEST_COM:%=%_install) \ - $(TEST_SEH:%=%_install) \ - $(TEST_REGRESSIONS:%=%_install) - -.PHONY: all depends implib clean install - - -# -# Testset Applications -# -$(TEST_SETS): %: - $(MAKE) -C $* - -$(TEST_SETS:%=%_implib): %_implib: - $(MAKE) -C $* implib - -$(TEST_SETS:%=%_clean): %_clean: - $(MAKE) -C $* clean - -$(TEST_SETS:%=%_install): %_install: - $(MAKE) -C $* install - -.PHONY: $(TEST_SETS) $(TEST_SETS:%=%_implib) $(TEST_SETS:%=%_clean) $(TEST_SETS:%=%_install) - - -# -# Kernel32 Test Applications -# -$(TEST_KERNEL32): %: - $(MAKE) -C kernel32/$* - -$(TEST_KERNEL32:%=%_implib): %_implib: - $(MAKE) -C kernel32/$* implib - -$(TEST_KERNEL32:%=%_clean): %_clean: - $(MAKE) -C kernel32/$* clean - -$(TEST_KERNEL32:%=%_install): %_install: - $(MAKE) -C kernel32/$* install - -.PHONY: $(TEST_KERNEL32) $(TEST_KERNEL32:%=%_implib) $(TEST_KERNEL32:%=%_clean) $(TEST_KERNEL32:%=%_install) - - -# -# msvcrt Test Applications -# -$(TEST_MSVCRT): %: - $(MAKE) -C msvcrt/$* - -$(TEST_MSVCRT:%=%_implib): %_implib: - $(MAKE) -C msvcrt/$* implib - -$(TEST_MSVCRT:%=%_clean): %_clean: - $(MAKE) -C msvcrt/$* clean - -$(TEST_MSVCRT:%=%_install): %_install: - $(MAKE) -C msvcrt/$* install - -.PHONY: $(TEST_MSVCRT) $(TEST_MSVCRT:%=%_implib) $(TEST_MSVCRT:%=%_clean) $(TEST_MSVCRT:%=%_install) - - -# -# COM Test Applications -# -$(TEST_COM): %: - $(MAKE) -C com/$* - -$(TEST_COM:%=%_implib): %_implib: - $(MAKE) -C com/$* implib - -$(TEST_COM:%=%_clean): %_clean: - $(MAKE) -C com/$* clean - -$(TEST_COM:%=%_install): %_install: - $(MAKE) -C com/$* install - -.PHONY: $(TEST_COM) $(TEST_COM:%=%_implib) $(TEST_COM:%=%_clean) $(TEST_COM:%=%_install) - - -# -# SEH Test Applications -# -$(TEST_SEH): %: - $(MAKE) -C seh/$* - -$(TEST_SEH:%=%_implib): %_implib: - $(MAKE) -C seh/$* implib - -$(TEST_SEH:%=%_clean): %_clean: - $(MAKE) -C seh/$* clean - -$(TEST_SEH:%=%_install): %_install: - $(MAKE) -C seh/$* install - -.PHONY: $(TEST_SEH) $(TEST_SEH:%=%_implib) $(TEST_SEH:%=%_clean) $(TEST_SEH:%=%_install) - - -# -# Regression Test Applications -# -$(TEST_REGRESSIONS): %: - $(MAKE) -C regres/$* - -$(TEST_REGRESSIONS:%=%_implib): %_implib: - $(MAKE) -C regres/$* implib - -$(TEST_REGRESSIONS:%=%_clean): %_clean: - $(MAKE) -C regres/$* clean - -$(TEST_REGRESSIONS:%=%_install): %_install: - $(MAKE) -C regres/$* install - -.PHONY: $(TEST_REGRESSIONS) $(TEST_REGRESSIONS:%=%_implib) $(TEST_REGRESSIONS:%=%_clean) $(TEST_REGRESSIONS:%=%_install) - - -etags: - find . -name "*.[ch]" -print | etags --language=c - - -# EOF _____ Deleted: branches/cache_manager_rewrite/reactos/apps/testsets/loadlib/makefile --- branches/cache_manager_rewrite/reactos/apps/testsets/loadlib/makefile 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/testsets/loadlib/makefile 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,24 +0,0 @@ -# -# $Id: makefile,v 1.0 - -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = loadlib - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -DUNICODE -D_UNICODE - -TARGET_SDKLIBS = kernel32.a ntdll.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: branches/cache_manager_rewrite/reactos/apps/testsets/msvcrt/fileio/makef ile --- branches/cache_manager_rewrite/reactos/apps/testsets/msvcrt/fileio/makef ile 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/testsets/msvcrt/fileio/makef ile 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,27 +0,0 @@ -# -# $Id: makefile,v 1.0 - -PATH_TO_TOP = ../../../.. - -TEST_ROOT = $(PATH_TO_TOP)/apps/testsets/test - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = fileio - -#TARGET_CFLAGS = -I$(TEST_ROOT) -DDBG -DUNICODE -D_UNICODE -TARGET_CFLAGS = -I$(TEST_ROOT) -DDBG - -TARGET_SDKLIBS = ntdll.a kernel32.a - -TARGET_OBJECTS = $(TARGET_NAME).o wfileio.o main.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/binpatch/Makefile --- branches/cache_manager_rewrite/reactos/apps/utils/binpatch/Makefile 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/binpatch/Makefile 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,21 +0,0 @@ -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = binpatch - -TARGET_SDKLIBS = - -TARGET_OBJECTS = patch.o - -TARGET_CFLAGS += -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/cat/makefile --- branches/cache_manager_rewrite/reactos/apps/utils/cat/makefile 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/cat/makefile 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,21 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = cat - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/directory.xml --- branches/cache_manager_rewrite/reactos/apps/utils/directory.xml 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/directory.xml 2005-08-13 23:59:17 UTC (rev 17374) @@ -4,4 +4,7 @@ <directory name="rosperf"> <xi:include href="rosperf/rosperf.xml" /> </directory> +<directory name="ps"> + <xi:include href="ps/ps.xml" /> +</directory> _____ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/driver/load/makefile --- branches/cache_manager_rewrite/reactos/apps/utils/driver/load/makefile 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/driver/load/makefile 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,21 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = load - -TARGET_CFLAGS = -DUNICODE -D_UNICODE - -TARGET_SDKLIBS = ntdll.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/driver/unload/makefile --- branches/cache_manager_rewrite/reactos/apps/utils/driver/unload/makefile 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/driver/unload/makefile 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,21 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = unload - -TARGET_CFLAGS = -DUNICODE -D_UNICODE - -TARGET_SDKLIBS = ntdll.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/infinst/makefile --- branches/cache_manager_rewrite/reactos/apps/utils/infinst/makefile 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/infinst/makefile 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,21 +0,0 @@ -PATH_TO_TOP = ../../.. - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = infinst - -TARGET_SDKLIBS = comdlg32.a setupapi.a - -TARGET_OBJECTS = infinst.o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c --- branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c 2005-08-13 23:59:17 UTC (rev 17374) @@ -17,10 +17,8 @@ #include "trace.h" +VOID WINAPI SnmpSvcInitUptime(); -VOID SNMP_FUNC_TYPE SnmpSvcInitUptime(); -DWORD SNMP_FUNC_TYPE SnmpSvcGetUptime(); - //////////////////////////////////////////////////////////////////////// //////// const char szUsage[] = { "\n" \ _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/directory.xml --- branches/cache_manager_rewrite/reactos/apps/utils/net/directory.xml 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/directory.xml 2005-08-13 23:59:17 UTC (rev 17374) @@ -22,6 +22,9 @@ <directory name="telnet"> <xi:include href="telnet/telnet.xml" /> </directory> +<directory name="tracert"> + <xi:include href="tracert/tracert.xml" /> +</directory> <directory name="whois"> <xi:include href="whois/whois.xml" /> </directory> _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.xml --- branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.xml 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.xml 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,5 +1,6 @@ <module name="finger" type="win32cui" installbase="system32" installname="finger.exe"> <include base="finger">.</include> + <define name="__USE_W32API" /> <define name="__USE_W32_SOCKETS" /> <library>kernel32</library> <library>ws2_32</library> _____ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/makefile --- branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/makefile 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/makefile 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,5 +0,0 @@ -# This file is automatically generated. - -TOP = ..\..\..\.. -DEFAULT = ftp -include $(TOP)/proxy.mak _____ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/roshttpd/makefile --- branches/cache_manager_rewrite/reactos/apps/utils/net/roshttpd/makefile 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/roshttpd/makefile 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,31 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../../.. - -TARGET_PATH = common - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = roshttpd - -TARGET_CPPFLAGS = -I./include -DUNICODE -D_UNICODE -DDBG -D__USE_W32API -Wno-deprecated - -TARGET_GCCLIBS = stdc++ - -TARGET_SDKLIBS = kernel32.a ws2_32.a user32.a - -MAIN_OBJECTS = roshttpd.o config.o error.o http.o httpd.o - -COMMON_OBJECTS = common/list.o common/socket.o common/thread.o - -TARGET_OBJECTS = $(MAIN_OBJECTS) $(COMMON_OBJECTS) - -TARGET_CLEAN = common/*.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/ip.h --- branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/ip.h 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/ip.h 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,195 +0,0 @@ -/* - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip.h 8.2 (Berkeley) 6/1/94 - * $FreeBSD: src/sys/netinet/ip.h,v 1.16 1999/08/28 00:49:19 peter Exp $ - */ - -#ifndef _NETINET_IP_H_ -#define _NETINET_IP_H_ - -/* - * Definitions for internet protocol version 4. - * Per RFC 791, September 1981. - */ -#define IPVERSION 4 - -/* A little magic to make the Windows build happy. */ -#if defined(_MSC_VER) || defined(__MINGW32__) -#include <winsock2.h> -#include <ws2tcpip.h> -#include <time.h> - -typedef u_short n_short; -typedef u_int n_long; -typedef u_int n_time; - -#define EMSGSIZE WSAEMSGSIZE -#define ENETUNREACH WSAENETUNREACH -#define EHOSTUNREACH WSAEHOSTUNREACH -#endif - -/* - * Structure of an internet header, naked of options. - */ -struct ip { -#ifdef _IP_VHL - u_char ip_vhl; /* version << 4 | header length >> 2 */ -#else -#if BYTE_ORDER == LITTLE_ENDIAN - u_int ip_hl:4, /* header length */ - ip_v:4; /* version */ -#endif -#if BYTE_ORDER == BIG_ENDIAN - u_int ip_v:4, /* version */ - ip_hl:4; /* header length */ -#endif -#endif /* not _IP_VHL */ - u_char ip_tos; /* type of service */ - u_short ip_len; /* total length */ - u_short ip_id; /* identification */ - u_short ip_off; /* fragment offset field */ -#define IP_RF 0x8000 /* reserved fragment flag */ -#define IP_DF 0x4000 /* don't fragment flag */ -#define IP_MF 0x2000 /* more fragments flag */ -#define IP_OFFMASK 0x1fff /* mask for fragmenting bits */ - u_char ip_ttl; /* time to live */ - u_char ip_p; /* protocol */ - u_short ip_sum; /* checksum */ - struct in_addr ip_src,ip_dst; /* source and dest address */ -}; - -#ifdef _IP_VHL -#define IP_MAKE_VHL(v, hl) ((v) << 4 | (hl)) -#define IP_VHL_HL(vhl) ((vhl) & 0x0f) -#define IP_VHL_V(vhl) ((vhl) >> 4) -#define IP_VHL_BORING 0x45 -#endif - -#define IP_MAXPACKET 65535 /* maximum packet size */ - -/* - * Definitions for IP type of service (ip_tos) - */ -#define IPTOS_LOWDELAY 0x10 -#define IPTOS_THROUGHPUT 0x08 -#define IPTOS_RELIABILITY 0x04 -#define IPTOS_MINCOST 0x02 - -/* - * Definitions for IP precedence (also in ip_tos) (hopefully unused) - */ -#define IPTOS_PREC_NETCONTROL 0xe0 -#define IPTOS_PREC_INTERNETCONTROL 0xc0 -#define IPTOS_PREC_CRITIC_ECP 0xa0 -#define IPTOS_PREC_FLASHOVERRIDE 0x80 -#define IPTOS_PREC_FLASH 0x60 -#define IPTOS_PREC_IMMEDIATE 0x40 -#define IPTOS_PREC_PRIORITY 0x20 -#define IPTOS_PREC_ROUTINE 0x00 - -/* - * Definitions for options. - */ -#define IPOPT_COPIED(o) ((o)&0x80) -#define IPOPT_CLASS(o) ((o)&0x60) -#define IPOPT_NUMBER(o) ((o)&0x1f) - -#define IPOPT_CONTROL 0x00 -#define IPOPT_RESERVED1 0x20 -#define IPOPT_DEBMEAS 0x40 -#define IPOPT_RESERVED2 0x60 - -#define IPOPT_EOL 0 /* end of option list */ -#define IPOPT_NOP 1 /* no operation */ - -#define IPOPT_RR 7 /* record packet route */ -#define IPOPT_TS 68 /* timestamp */ -#define IPOPT_SECURITY 130 /* provide s,c,h,tcc */ -#define IPOPT_LSRR 131 /* loose source route */ -#define IPOPT_SATID 136 /* satnet id */ -#define IPOPT_SSRR 137 /* strict source route */ -#define IPOPT_RA 148 /* router alert */ - -/* - * Offsets to fields in options other than EOL and NOP. - */ -#define IPOPT_OPTVAL 0 /* option ID */ -#define IPOPT_OLEN 1 /* option length */ -#define IPOPT_OFFSET 2 /* offset within option */ -#define IPOPT_MINOFF 4 /* min value of above */ - -/* - * Time stamp option structure. - */ -struct ip_timestamp { - u_char ipt_code; /* IPOPT_TS */ - u_char ipt_len; /* size of structure (variable) */ - u_char ipt_ptr; /* index of current entry */ -#if BYTE_ORDER == LITTLE_ENDIAN - u_int ipt_flg:4, /* flags, see below */ - ipt_oflw:4; /* overflow counter */ -#endif -#if BYTE_ORDER == BIG_ENDIAN - u_int ipt_oflw:4, /* overflow counter */ - ipt_flg:4; /* flags, see below */ -#endif - union ipt_timestamp { - n_long ipt_time[1]; - struct ipt_ta { - struct in_addr ipt_addr; - n_long ipt_time; - } ipt_ta[1]; - } ipt_timestamp; -}; - -/* flag bits for ipt_flg */ -#define IPOPT_TS_TSONLY 0 /* timestamps only */ -#define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */ -#define IPOPT_TS_PRESPEC 3 /* specified modules only */ - -/* bits for security (not byte swapped) */ -#define IPOPT_SECUR_UNCLASS 0x0000 -#define IPOPT_SECUR_CONFID 0xf135 -#define IPOPT_SECUR_EFTO 0x789a -#define IPOPT_SECUR_MMMM 0xbc4d -#define IPOPT_SECUR_RESTR 0xaf13 -#define IPOPT_SECUR_SECRET 0xd788 -#define IPOPT_SECUR_TOPSECRET 0x6bc5 - -/* - * Internet implementation parameters. - */ -#define MAXTTL 255 /* maximum time to live (seconds) */ -#define IPDEFTTL 64 /* default ttl, from RFC 1340 */ -#define IPFRAGTTL 60 /* time to live for frags, slowhz */ -#define IPTTLDEC 1 /* subtracted when forwarding */ - -#define IP_MSS 576 /* default maximum segment size */ - -#endif _____ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/ip_icmp.h --- branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/ip_icmp.h 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/ip_icmp.h 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,186 +0,0 @@ -/* - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip_icmp.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/ip_icmp.h,v 1.13 1999/08/28 00:49:24 peter Exp $ - */ - -#ifndef _NETINET_IP_ICMP_H_ -#define _NETINET_IP_ICMP_H_ - -/* - * Interface Control Message Protocol Definitions. - * Per RFC 792, September 1981. - */ - -/* - * Internal of an ICMP Router Advertisement - */ -struct icmp_ra_addr { - u_int32_t ira_addr; - u_int32_t ira_preference; -}; - -/* - * Structure of an icmp header. - */ -struct icmp { - u_char icmp_type; /* type of message, see below */ - u_char icmp_code; /* type sub code */ - u_short icmp_cksum; /* ones complement cksum of struct */ - union { - u_char ih_pptr; /* ICMP_PARAMPROB */ - struct in_addr ih_gwaddr; /* ICMP_REDIRECT */ - struct ih_idseq { - n_short icd_id; - n_short icd_seq; - } ih_idseq; - int ih_void; - - /* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */ - struct ih_pmtu { - n_short ipm_void; - n_short ipm_nextmtu; - } ih_pmtu; - - struct ih_rtradv { - u_char irt_num_addrs; - u_char irt_wpa; - u_int16_t irt_lifetime; - } ih_rtradv; - } icmp_hun; -#define icmp_pptr icmp_hun.ih_pptr -#define icmp_gwaddr icmp_hun.ih_gwaddr -#define icmp_id icmp_hun.ih_idseq.icd_id -#define icmp_seq icmp_hun.ih_idseq.icd_seq -#define icmp_void icmp_hun.ih_void -#define icmp_pmvoid icmp_hun.ih_pmtu.ipm_void -#define icmp_nextmtu icmp_hun.ih_pmtu.ipm_nextmtu -#define icmp_num_addrs icmp_hun.ih_rtradv.irt_num_addrs -#define icmp_wpa icmp_hun.ih_rtradv.irt_wpa -#define icmp_lifetime icmp_hun.ih_rtradv.irt_lifetime - union { - struct id_ts { - n_time its_otime; - n_time its_rtime; - n_time its_ttime; - } id_ts; - struct id_ip { - struct ip idi_ip; - /* options and then 64 bits of data */ - } id_ip; - struct icmp_ra_addr id_radv; - u_int32_t id_mask; - char id_data[1]; - } icmp_dun; -#define icmp_otime icmp_dun.id_ts.its_otime -#define icmp_rtime icmp_dun.id_ts.its_rtime -#define icmp_ttime icmp_dun.id_ts.its_ttime -#define icmp_ip icmp_dun.id_ip.idi_ip -#define icmp_radv icmp_dun.id_radv -#define icmp_mask icmp_dun.id_mask -#define icmp_data icmp_dun.id_data -}; - -/* - * Lower bounds on packet lengths for various types. - * For the error advice packets must first insure that the - * packet is large enough to contain the returned ip header. - * Only then can we do the check to see if 64 bits of packet - * data have been returned, since we need to check the returned - * ip header length. - */ -#define ICMP_MINLEN 8 /* abs minimum */ -#define ICMP_TSLEN (8 + 3 * sizeof (n_time)) /* timestamp */ -#define ICMP_MASKLEN 12 /* address mask */ -#define ICMP_ADVLENMIN (8 + sizeof (struct ip) + 8) /* min */ -#ifndef _IP_VHL -#define ICMP_ADVLEN(p) (8 + ((p)->icmp_ip.ip_hl << 2) + 8) - /* N.B.: must separately check that ip_hl >= 5 */ -#else -#define ICMP_ADVLEN(p) (8 + (IP_VHL_HL((p)->icmp_ip.ip_vhl) << 2) + 8) - /* N.B.: must separately check that header length >= 5 */ -#endif - -/* - * Definition of type and code field values. - */ -#define ICMP_ECHOREPLY 0 /* echo reply */ -#define ICMP_UNREACH 3 /* dest unreachable, codes: */ -#define ICMP_UNREACH_NET 0 /* bad net */ -#define ICMP_UNREACH_HOST 1 /* bad host */ -#define ICMP_UNREACH_PROTOCOL 2 /* bad protocol */ -#define ICMP_UNREACH_PORT 3 /* bad port */ -#define ICMP_UNREACH_NEEDFRAG 4 /* IP_DF caused drop */ -#define ICMP_UNREACH_SRCFAIL 5 /* src route failed */ -#define ICMP_UNREACH_NET_UNKNOWN 6 /* unknown net */ -#define ICMP_UNREACH_HOST_UNKNOWN 7 /* unknown host */ -#define ICMP_UNREACH_ISOLATED 8 /* src host isolated */ -#define ICMP_UNREACH_NET_PROHIB 9 /* prohibited access */ -#define ICMP_UNREACH_HOST_PROHIB 10 /* ditto */ -#define ICMP_UNREACH_TOSNET 11 /* bad tos for net */ -#define ICMP_UNREACH_TOSHOST 12 /* bad tos for host */ -#define ICMP_UNREACH_FILTER_PROHIB 13 /* admin prohib */ -#define ICMP_UNREACH_HOST_PRECEDENCE 14 /* host prec vio. */ -#define ICMP_UNREACH_PRECEDENCE_CUTOFF 15 /* prec cutoff */ -#define ICMP_SOURCEQUENCH 4 /* packet lost, slow down */ -#define ICMP_REDIRECT 5 /* shorter route, codes: */ -#define ICMP_REDIRECT_NET 0 /* for network */ -#define ICMP_REDIRECT_HOST 1 /* for host */ -#define ICMP_REDIRECT_TOSNET 2 /* for tos and net */ -#define ICMP_REDIRECT_TOSHOST 3 /* for tos and host */ -#define ICMP_ECHO 8 /* echo service */ -#define ICMP_ROUTERADVERT 9 /* router advertisement */ -#define ICMP_ROUTERSOLICIT 10 /* router solicitation */ -#define ICMP_TIMXCEED 11 /* time exceeded, code: */ -#define ICMP_TIMXCEED_INTRANS 0 /* ttl==0 in transit */ -#define ICMP_TIMXCEED_REASS 1 /* ttl==0 in reass */ -#define ICMP_PARAMPROB 12 /* ip header bad */ -#define ICMP_PARAMPROB_OPTABSENT 1 /* req. opt. absent */ -#define ICMP_TSTAMP 13 /* timestamp request */ -#define ICMP_TSTAMPREPLY 14 /* timestamp reply */ -#define ICMP_IREQ 15 /* information request */ -#define ICMP_IREQREPLY 16 /* information reply */ -#define ICMP_MASKREQ 17 /* address mask request */ -#define ICMP_MASKREPLY 18 /* address mask reply */ - -#define ICMP_MAXTYPE 18 - -#define ICMP_INFOTYPE(type) \ - ((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \ - (type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \ - (type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \ - (type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \ - (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY) - -#ifdef KERNEL -void icmp_error __P((struct mbuf *, int, int, n_long, struct ifnet *)); -void icmp_input __P((struct mbuf *, int)); -#endif - -#endif _____ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/makefile --- branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/makefile 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/makefile 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,20 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = tracert - -TARGET_INSTALLDIR = system32 - -TARGET_SDKLIBS = ws2_32.a iphlpapi.a ntdll.a - -TARGET_OBJECTS = \ -$(TARGET_NAME).o - -TARGET_GCCLIBS = - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/tracert.c --- branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/tracert.c 2005-08-13 17:29:38 UTC (rev 17373) +++ branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/tracert.c 2005-08-13 23:59:17 UTC (rev 17374) @@ -1,957 +1,656 @@ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Van Jacobson. - * - * Redistribution and use in source and binary forms, with or without [truncated at 1000 lines; 121029 more skipped]

1 0

[mf] 17373: Project file maintainance
by mf＠svn.reactos.com 13 Aug '05

13 Aug '05

Project file maintainance Modified: trunk/reactos/subsys/system/winefile/make_winefile.dsp Modified: trunk/reactos/subsys/system/winefile/winefile.dsp _____ Modified: trunk/reactos/subsys/system/winefile/make_winefile.dsp --- trunk/reactos/subsys/system/winefile/make_winefile.dsp 2005-08-13 17:24:50 UTC (rev 17372) +++ trunk/reactos/subsys/system/winefile/make_winefile.dsp 2005-08-13 17:29:38 UTC (rev 17373) @@ -85,5 +85,9 @@ SOURCE=.\Makefile.MinGW # End Source File +# Begin Source File + +SOURCE=.\winefile.xml +# End Source File # End Target # End Project _____ Modified: trunk/reactos/subsys/system/winefile/winefile.dsp --- trunk/reactos/subsys/system/winefile/winefile.dsp 2005-08-13 17:24:50 UTC (rev 17372) +++ trunk/reactos/subsys/system/winefile/winefile.dsp 2005-08-13 17:29:38 UTC (rev 17373) @@ -45,7 +45,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D _WIN32_WINNT=0x0501 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D _WIN32_WINNT=0x0501 /FR /FD /GZ /c +# SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" @@ -71,7 +72,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "UNICODE" /D _WIN32_WINNT=0x0501 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "UNICODE" /D _WIN32_WINNT=0x0501 /FR /FD /GZ /c +# SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" @@ -98,7 +100,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "UNICODE" /D _WIN32_WINNT=0x0501 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "UNICODE" /D _WIN32_WINNT=0x0501 /FD /c +# SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" @@ -125,7 +128,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "UNICODE" /D WINE_UNUSED= /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D _WIN32_WINNT=0x0501 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D _WIN32_WINNT=0x0501 /FD /c +# SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" @@ -260,20 +264,11 @@ # End Source File # Begin Source File -SOURCE=.\unixcalls.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - SOURCE=.\winefile.c # End Source File # Begin Source File SOURCE=.\winefile.h # End Source File -# Begin Source File - -SOURCE=.\winefile.xml -# End Source File # End Target # End Project

1 0

[mf] 17372: prepare for ANSI builds
by mf＠svn.reactos.com 13 Aug '05

13 Aug '05

prepare for ANSI builds Modified: trunk/reactos/subsys/system/winefile/Makefile.MinGW _____ Modified: trunk/reactos/subsys/system/winefile/Makefile.MinGW --- trunk/reactos/subsys/system/winefile/Makefile.MinGW 2005-08-13 16:04:29 UTC (rev 17371) +++ trunk/reactos/subsys/system/winefile/Makefile.MinGW 2005-08-13 17:24:50 UTC (rev 17372) @@ -5,7 +5,7 @@ CC = gcc LD = gcc -CFLAGS = -DUNICODE -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 +CFLAGS = -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 RCFLAGS = -D__WINDRES__ LFLAGS = -Wl,--subsystem,windows

1 0

[mf] 17371: Project file maintainance
by mf＠svn.reactos.com 13 Aug '05

13 Aug '05

Project file maintainance Modified: trunk/reactos/subsys/system/winefile/winefile.dsp Modified: trunk/reactos/subsys/system/winefile/winefile.xml _____ Modified: trunk/reactos/subsys/system/winefile/winefile.dsp --- trunk/reactos/subsys/system/winefile/winefile.dsp 2005-08-13 16:04:08 UTC (rev 17370) +++ trunk/reactos/subsys/system/winefile/winefile.dsp 2005-08-13 16:04:29 UTC (rev 17371) @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D _WIN32_WINNT=0x0501 /D WINE_UNUSED= /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D _WIN32_WINNT=0x0501 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "UNICODE" /D _WIN32_WINNT=0x0501 /D WINE_UNUSED= /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "UNICODE" /D _WIN32_WINNT=0x0501 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" @@ -93,12 +93,12 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "." +# PROP Output_Dir "winefileURelease" # PROP Intermediate_Dir "winefileURelease" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "UNICODE" /D _WIN32_WINNT=0x0501 /D WINE_UNUSED= /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "UNICODE" /D _WIN32_WINNT=0x0501 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" @@ -125,7 +125,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "UNICODE" /D WINE_UNUSED= /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D _WIN32_WINNT=0x0501 /D WINE_UNUSED= /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D _WIN32_WINNT=0x0501 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" _____ Modified: trunk/reactos/subsys/system/winefile/winefile.xml --- trunk/reactos/subsys/system/winefile/winefile.xml 2005-08-13 16:04:08 UTC (rev 17370) +++ trunk/reactos/subsys/system/winefile/winefile.xml 2005-08-13 16:04:29 UTC (rev 17371) @@ -4,9 +4,7 @@ <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> - <define name="_ROS_" /> <library>uuid</library> - <library>ntdll</library> <library>kernel32</library> <library>gdi32</library> <library>user32</library> @@ -14,7 +12,6 @@ <library>comdlg32</library> <library>shell32</library> <library>ole32</library> - <library>oleaut32</library> <library>version</library> <library>mpr</library> <file>winefile.c</file>

1 0

[mf] 17370: Winefile Makefile for pure MinGW
by mf＠svn.reactos.com 13 Aug '05

13 Aug '05

Winefile Makefile for pure MinGW Added: trunk/reactos/subsys/system/winefile/Makefile.MinGW Modified: trunk/reactos/subsys/system/winefile/make_winefile.dsp Property changes on: trunk/reactos/subsys/system/winefile ___________________________________________________________________ Name: svn:ignore - *.coff *.exe *.d *.o *.a *.sym *.map Debug Release UDebug URelease winefileDebug winefileRelease winefileUDebug winefileURelease *.ncb *.opt *.aps *.ncb *.plg makefile + *.coff *.exe *.d *.o *.a *.sym *.map Debug Release UDebug URelease winefileDebug winefileRelease winefileUDebug winefileURelease *.ncb *.opt *.aps *.ncb *.plg makefile *.user *.suo _____ Added: trunk/reactos/subsys/system/winefile/Makefile.MinGW --- trunk/reactos/subsys/system/winefile/Makefile.MinGW 2005-08-13 13:21:27 UTC (rev 17369) +++ trunk/reactos/subsys/system/winefile/Makefile.MinGW 2005-08-13 16:04:08 UTC (rev 17370) @@ -0,0 +1,56 @@ +# +# Winefile Makefile for MinGW +# + +CC = gcc +LD = gcc + +CFLAGS = -DUNICODE -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 +RCFLAGS = -D__WINDRES__ +LFLAGS = -Wl,--subsystem,windows + +ifdef DEBUG +CFLAGS += -D_DEBUG -g +RCFLAGS += -D_DEBUG +LFLAGS += -g +else +CFLAGS += -DNDEBUG -Os +RCFLAGS += -DNDEBUG +LFLAGS += -s +endif + +ifndef UNICODE +UNICODE = 1 +endif + +ifeq ($(UNICODE),1) +CFLAGS += -DUNICODE +# LFLAGS+= -Wl,--entry,_wWinMain@16 +RCFLAGS += -DUNICODE +endif + +CXXFLAGS = $(CFLAGS) + +EXEC_SUFFIX = .exe +RES_SUFFIX = .coff + +PROGRAM = winefile + +OBJECTS = winefile.o + +LIBS = uuid user32 gdi32 advapi32 comctl32 shell32 comdlg32 ole32 version mpr + +DELAYIMPORTS = + +TARGET = $(PROGRAM)$(EXEC_SUFFIX) + +all: $(TARGET) + +$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) + $(LD) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS)) + +$(PROGRAM)$(RES_SUFFIX): $(PROGRAM).rc *.bmp *.ico + windres $(RCFLAGS) -o $@ $(PROGRAM).rc + +clean: + rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) Property changes on: trunk/reactos/subsys/system/winefile/Makefile.MinGW ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/winefile/make_winefile.dsp --- trunk/reactos/subsys/system/winefile/make_winefile.dsp 2005-08-13 13:21:27 UTC (rev 17369) +++ trunk/reactos/subsys/system/winefile/make_winefile.dsp 2005-08-13 16:04:08 UTC (rev 17370) @@ -41,7 +41,7 @@ # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" -# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make" +# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile.MinGW" # PROP Rebuild_Opt "clean all" # PROP Target_File "winefile.exe" # PROP Bsc_Name "" @@ -62,7 +62,7 @@ # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" -# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make DEBUG=1" +# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile.MinGW DEBUG=1" # PROP Rebuild_Opt "clean all" # PROP Target_File "winefile.exe" # PROP Bsc_Name "" @@ -83,7 +83,7 @@ # Begin Source File -SOURCE=.\makefile +SOURCE=.\Makefile.MinGW # End Source File # End Target # End Project

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
67
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 August 2005