Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 28341: - Rename NtGdiCreateBitmap to IntGdiCreateBitmap and remove SEH - implement new NtGdiCreateBitmap, calling IntGdiCreateBitmap with SEH - Use only IntGdiCreateBitmap internally - implement BITMAPOBJ_GetRealBitsPixel, finding an appropriate value for unsupported values of BitsPixel - make parameter validation more windows compatible
by tkreuzer＠svn.reactos.org 14 Aug '07

14 Aug '07

Author: tkreuzer Date: Wed Aug 15 03:22:07 2007 New Revision: 28341 URL: http://svn.reactos.org/svn/reactos?rev=28341&view=rev Log: - Rename NtGdiCreateBitmap to IntGdiCreateBitmap and remove SEH - implement new NtGdiCreateBitmap, calling IntGdiCreateBitmap with SEH - Use only IntGdiCreateBitmap internally - implement BITMAPOBJ_GetRealBitsPixel, finding an appropriate value for unsupported values of BitsPixel - make parameter validation more windows compatible Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.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/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h Wed Aug 15 03:22:07 2007 @@ -39,6 +39,7 @@ void INTERNAL_CALL BITMAPOBJ_CleanupBitsLock(BITMAPOBJ *pBMObj); INT FASTCALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp); +INT FASTCALL BITMAPOBJ_GetRealBitsPixel(INT nBitsPixel); HBITMAP FASTCALL BITMAPOBJ_CopyBitmap (HBITMAP hBitmap); INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth); int NTAPI DIB_GetDIBImageBytes (INT width, INT height, INT depth); Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h Wed Aug 15 03:22:07 2007 @@ -253,6 +253,14 @@ INT Width, INT Height); +HBITMAP STDCALL +IntGdiCreateBitmap( + INT Width, + INT Height, + UINT Planes, + UINT BitsPixel, + IN OPTIONAL LPBYTE pBits); + HDC STDCALL IntGdiGetDCState(HDC hDC); WORD STDCALL IntGdiSetHookFlags(HDC hDC, WORD Flags); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Wed Aug 15 03:22:07 2007 @@ -1308,7 +1308,7 @@ } else { - BitmapStretched = NtGdiCreateBitmap(WidthDest, HeightDest, 1, 1, NULL); + BitmapStretched = IntGdiCreateBitmap(WidthDest, HeightDest, 1, 1, NULL); } if (NULL == BitmapStretched) { Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Wed Aug 15 03:22:07 2007 @@ -32,12 +32,12 @@ ) HBITMAP STDCALL -NtGdiCreateBitmap( +IntGdiCreateBitmap( INT Width, INT Height, UINT Planes, UINT BitsPixel, - IN OPTIONAL LPBYTE pUnsafeBits) + IN OPTIONAL LPBYTE pBits) { PBITMAPOBJ bmp; HBITMAP hBitmap; @@ -45,32 +45,33 @@ LONG WidthBytes; /* NOTE: Windows also doesn't store nr. of planes separately! */ - BitsPixel = BitsPixel * Planes; + BitsPixel = BITMAPOBJ_GetRealBitsPixel(BitsPixel * Planes); + + /* Check parameters */ + if (BitsPixel == 0 || Width < 1 || Height < 1) + { + DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } + WidthBytes = BITMAPOBJ_GetWidthBytes(Width, BitsPixel); - /* Check parameters */ - if (0 == Height || 0 == Width) - { - Size.cx = Size.cy = 1; - } - else - { - Size.cx = abs(Width); - Size.cy = abs(Height); - } + Size.cx = Width; + Size.cy = Height; /* Create the bitmap object. */ hBitmap = IntCreateBitmap(Size, WidthBytes, BitmapFormat(BitsPixel, BI_RGB), (Height < 0 ? BMF_TOPDOWN : 0) | - (NULL == pUnsafeBits ? 0 : BMF_NOZEROINIT), NULL); + (NULL == pBits ? 0 : BMF_NOZEROINIT), NULL); if (!hBitmap) { - DPRINT("NtGdiCreateBitmap: returned 0\n"); + DPRINT("IntGdiCreateBitmap: returned 0\n"); return 0; } - DPRINT("NtGdiCreateBitmap:%dx%d, %d BPP colors returning %08x\n", + DPRINT("IntGdiCreateBitmap:%dx%d, %d BPP colors returning %08x\n", Size.cx, Size.cy, BitsPixel, hBitmap); bmp = BITMAPOBJ_LockBitmap( hBitmap ); @@ -82,20 +83,41 @@ bmp->flFlags = BITMAPOBJ_IS_APIBITMAP; - if (NULL != pUnsafeBits) + if (NULL != pBits) { - _SEH_TRY + IntSetBitmapBits(bmp, bmp->SurfObj.cjBits, pBits); + } + + BITMAPOBJ_UnlockBitmap( bmp ); + + return hBitmap; +} + + +HBITMAP STDCALL +NtGdiCreateBitmap( + INT Width, + INT Height, + UINT Planes, + UINT BitsPixel, + IN OPTIONAL LPBYTE pUnsafeBits) +{ + HBITMAP hBitmap; + + _SEH_TRY + { + if (pUnsafeBits) { - ProbeForRead(pUnsafeBits, bmp->SurfObj.cjBits, 1); - IntSetBitmapBits(bmp, bmp->SurfObj.cjBits, pUnsafeBits); + UINT cjBits = BITMAPOBJ_GetWidthBytes(Width, BitsPixel) * Height; + ProbeForRead(pUnsafeBits, cjBits, 1); } - _SEH_HANDLE - { - } - _SEH_END + hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); } - - BITMAPOBJ_UnlockBitmap( bmp ); + _SEH_HANDLE + { + hBitmap = 0; + } + _SEH_END return hBitmap; } @@ -152,11 +174,11 @@ /* MS doc says if width or height is 0, return 1-by-1 pixel, monochrome bitmap */ if (0 == Width || 0 == Height) { - Bmp = NtGdiCreateBitmap (1, 1, 1, 1, NULL); + Bmp = IntGdiCreateBitmap (1, 1, 1, 1, NULL); } else { - Bmp = NtGdiCreateBitmap(Width, Height, 1, Dc->w.bitsPerPixel, NULL); + Bmp = IntGdiCreateBitmap(Width, Height, 1, Dc->w.bitsPerPixel, NULL); } return Bmp; @@ -272,7 +294,7 @@ BITMAPINFO bi; RtlMoveMemory ( &(bi.bmiHeader), &bih, sizeof(bih) ); hBmpTmp = NtGdiCreateDIBitmap ( hDC, &bi.bmiHeader, 0, NULL, &bi, DIB_RGB_COLORS ); - //HBITMAP hBmpTmp = NtGdiCreateBitmap ( 1, 1, 1, 32, NULL); + //HBITMAP hBmpTmp = IntGdiCreateBitmap ( 1, 1, 1, 32, NULL); if ( hBmpTmp ) { HBITMAP hBmpOld = (HBITMAP)NtGdiSelectObject ( hDCTmp, hBmpTmp ); @@ -539,6 +561,29 @@ /* Internal Functions */ INT FASTCALL +BITMAPOBJ_GetRealBitsPixel(INT nBitsPixel) +{ + if (nBitsPixel < 0) + return 0; + if (nBitsPixel <= 1) + return 1; + if (nBitsPixel <= 2) + return 2; + if (nBitsPixel <= 4) + return 4; + if (nBitsPixel <= 8) + return 8; + if (nBitsPixel <= 16) + return 16; + if (nBitsPixel <= 24) + return 24; + if (nBitsPixel <= 32) + return 32; + + return 0; +} + +INT FASTCALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp) { #if 0 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 (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c Wed Aug 15 03:22:07 2007 @@ -326,7 +326,7 @@ else DataPtr += PaletteEntryCount * sizeof(USHORT); - hPattern = NtGdiCreateBitmap(BitmapInfo->bmiHeader.biWidth, + hPattern = IntGdiCreateBitmap(BitmapInfo->bmiHeader.biWidth, BitmapInfo->bmiHeader.biHeight, BitmapInfo->bmiHeader.biPlanes, BitmapInfo->bmiHeader.biBitCount, @@ -378,7 +378,7 @@ return 0; } - hPattern = NtGdiCreateBitmap(8, 8, 1, 1, (LPBYTE)HatchBrushes[Style]); + hPattern = IntGdiCreateBitmap(8, 8, 1, 1, (LPBYTE)HatchBrushes[Style]); if (hPattern == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); 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 (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Aug 15 03:22:07 2007 @@ -226,7 +226,7 @@ NewDC->Dc_Attr.szlViewportExt.cy = OrigDC->Dc_Attr.szlViewportExt.cy; /* Create default bitmap */ - if (!(hBitmap = NtGdiCreateBitmap( 1, 1, 1, NewDC->w.bitsPerPixel, NULL ))) + if (!(hBitmap = IntGdiCreateBitmap( 1, 1, 1, NewDC->w.bitsPerPixel, NULL ))) { DC_UnlockDc( OrigDC ); DC_UnlockDc( NewDC ); 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 (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c Wed Aug 15 03:22:07 2007 @@ -99,27 +99,27 @@ case PS_ALTERNATE: PenObject->flAttrs |= GDIBRUSH_IS_BITMAP; - PenObject->hbmPattern = NtGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); + PenObject->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); break; case PS_DOT: PenObject->flAttrs |= GDIBRUSH_IS_BITMAP; - PenObject->hbmPattern = NtGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDot); + PenObject->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDot); break; case PS_DASH: PenObject->flAttrs |= GDIBRUSH_IS_BITMAP; - PenObject->hbmPattern = NtGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDash); + PenObject->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDash); break; case PS_DASHDOT: PenObject->flAttrs |= GDIBRUSH_IS_BITMAP; - PenObject->hbmPattern = NtGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDot); + PenObject->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDot); break; case PS_DASHDOTDOT: PenObject->flAttrs |= GDIBRUSH_IS_BITMAP; - PenObject->hbmPattern = NtGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDotDot); + PenObject->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDotDot); break; case PS_INSIDEFRAME:

1 0

[hpoussin] 28340: Do not import RtlDuplicateUnicodeString from ntoskrnl, it doesn't exist on MS Windows XP
by hpoussin＠svn.reactos.org 14 Aug '07

14 Aug '07

Author: hpoussin Date: Tue Aug 14 21:15:16 2007 New Revision: 28340 URL: http://svn.reactos.org/svn/reactos?rev=28340&view=rev Log: Do not import RtlDuplicateUnicodeString from ntoskrnl, it doesn't exist on MS Windows XP Modified: trunk/reactos/drivers/bus/pci/pci.c trunk/reactos/drivers/bus/pci/pci.h trunk/reactos/drivers/bus/pci/pdo.c trunk/reactos/drivers/storage/ide/pciidex/misc.c trunk/reactos/drivers/storage/ide/pciidex/pciidex.h trunk/reactos/drivers/storage/ide/pciidex/pdo.c Modified: trunk/reactos/drivers/bus/pci/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pci.c (original) +++ trunk/reactos/drivers/bus/pci/pci.c Tue Aug 14 21:15:16 2007 @@ -297,7 +297,7 @@ BufferU.Length = BufferU.MaximumLength = (USHORT) Index * sizeof(WCHAR); BufferU.Buffer = Buffer; - return RtlDuplicateUnicodeString(0, &BufferU, HardwareIDs); + return PciDuplicateUnicodeString(0, &BufferU, HardwareIDs); } @@ -361,7 +361,7 @@ BufferU.Length = BufferU.MaximumLength = (USHORT)Index * sizeof(WCHAR); BufferU.Buffer = Buffer; - return RtlDuplicateUnicodeString(0, &BufferU, CompatibleIDs); + return PciDuplicateUnicodeString(0, &BufferU, CompatibleIDs); } @@ -644,4 +644,49 @@ return RtlCreateUnicodeString(DeviceLocation, Buffer) ? STATUS_SUCCESS : STATUS_INSUFFICIENT_RESOURCES; } +NTSTATUS +PciDuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString) +{ + if (SourceString == NULL || DestinationString == NULL + || SourceString->Length > SourceString->MaximumLength + || (SourceString->Length == 0 && SourceString->MaximumLength > 0 && SourceString->Buffer == NULL) + || Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || Flags >= 4) + { + return STATUS_INVALID_PARAMETER; + } + + + if ((SourceString->Length == 0) + && (Flags != (RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE | + RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING))) + { + DestinationString->Length = 0; + DestinationString->MaximumLength = 0; + DestinationString->Buffer = NULL; + } + else + { + USHORT DestMaxLength = SourceString->Length; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestMaxLength += sizeof(UNICODE_NULL); + + DestinationString->Buffer = ExAllocatePoolWithTag(PagedPool, DestMaxLength, TAG_PCI); + if (DestinationString->Buffer == NULL) + return STATUS_NO_MEMORY; + + RtlCopyMemory(DestinationString->Buffer, SourceString->Buffer, SourceString->Length); + DestinationString->Length = SourceString->Length; + DestinationString->MaximumLength = DestMaxLength; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestinationString->Buffer[DestinationString->Length / sizeof(WCHAR)] = 0; + } + + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pci/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.h?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pci.h (original) +++ trunk/reactos/drivers/bus/pci/pci.h Tue Aug 14 21:15:16 2007 @@ -158,6 +158,12 @@ PUNICODE_STRING DeviceLocation, PPCI_DEVICE Device); +NTSTATUS +PciDuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString); + /* pdo.c */ NTSTATUS Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c (original) +++ trunk/reactos/drivers/bus/pci/pdo.c Tue Aug 14 21:15:16 2007 @@ -74,7 +74,7 @@ switch (IrpSp->Parameters.QueryId.IdType) { case BusQueryDeviceID: - Status = RtlDuplicateUnicodeString( + Status = PciDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &DeviceExtension->DeviceID, &String); @@ -85,7 +85,7 @@ break; case BusQueryHardwareIDs: - Status = RtlDuplicateUnicodeString( + Status = PciDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &DeviceExtension->HardwareIDs, &String); @@ -94,7 +94,7 @@ break; case BusQueryCompatibleIDs: - Status = RtlDuplicateUnicodeString( + Status = PciDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &DeviceExtension->CompatibleIDs, &String); @@ -103,7 +103,7 @@ break; case BusQueryInstanceID: - Status = RtlDuplicateUnicodeString( + Status = PciDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &DeviceExtension->InstanceID, &String); Modified: trunk/reactos/drivers/storage/ide/pciidex/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/misc.c (original) +++ trunk/reactos/drivers/storage/ide/pciidex/misc.c Tue Aug 14 21:15:16 2007 @@ -66,3 +66,48 @@ IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(LowerDevice, Irp); } + +NTSTATUS +DuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString) +{ + if (SourceString == NULL || DestinationString == NULL + || SourceString->Length > SourceString->MaximumLength + || (SourceString->Length == 0 && SourceString->MaximumLength > 0 && SourceString->Buffer == NULL) + || Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || Flags >= 4) + { + return STATUS_INVALID_PARAMETER; + } + + + if ((SourceString->Length == 0) + && (Flags != (RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE | + RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING))) + { + DestinationString->Length = 0; + DestinationString->MaximumLength = 0; + DestinationString->Buffer = NULL; + } + else + { + USHORT DestMaxLength = SourceString->Length; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestMaxLength += sizeof(UNICODE_NULL); + + DestinationString->Buffer = ExAllocatePool(PagedPool, DestMaxLength); + if (DestinationString->Buffer == NULL) + return STATUS_NO_MEMORY; + + RtlCopyMemory(DestinationString->Buffer, SourceString->Buffer, SourceString->Length); + DestinationString->Length = SourceString->Length; + DestinationString->MaximumLength = DestMaxLength; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestinationString->Buffer[DestinationString->Length / sizeof(WCHAR)] = 0; + } + + return STATUS_SUCCESS; +} Modified: trunk/reactos/drivers/storage/ide/pciidex/pciidex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pciidex.h (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pciidex.h Tue Aug 14 21:15:16 2007 @@ -68,6 +68,12 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS +DuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString); + /* pdo.c */ NTSTATUS NTAPI Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pdo.c (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pdo.c Tue Aug 14 21:15:16 2007 @@ -111,7 +111,7 @@ return STATUS_NOT_SUPPORTED; } - Status = RtlDuplicateUnicodeString( + Status = DuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &SourceString, &String);

1 0

[frik85] 28339: RosCMS update: * install-script: easy to use install-script to setup RosCMS (only PHP 4+ & MySQL 4+ are required) * up-to-date SQL-dumb file * if you want to install RosCMS on your server, try out the prepaired package: http://www.reactos.org/?page=roscms
by frik85＠svn.reactos.org 14 Aug '07

14 Aug '07

Author: frik85 Date: Tue Aug 14 19:26:16 2007 New Revision: 28339 URL: http://svn.reactos.org/svn/reactos?rev=28339&view=rev Log: RosCMS update: * install-script: easy to use install-script to setup RosCMS (only PHP 4+ & MySQL 4+ are required) * up-to-date SQL-dumb file * if you want to install RosCMS on your server, try out the prepaired package: http://www.reactos.org/?page=roscms Added: trunk/web/reactos.org/htdocs/roscms/roscms.sql Modified: trunk/web/reactos.org/htdocs/roscms/inc/home.php trunk/web/reactos.org/htdocs/roscms/inc/user_overview.php trunk/web/reactos.org/htdocs/roscms/install.php trunk/web/reactos.org/sql/roscms.sql Modified: trunk/web/reactos.org/htdocs/roscms/inc/home.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/home.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/home.php Tue Aug 14 19:26:16 2007 @@ -20,10 +20,15 @@ ?> <?php /*require("inc/data_menu.php"); */ ?> <p> </p> -<h2>RosCMS v2 to RosCMS v3 update</h2> -<h4>RosCMS v2 will be replaced by RosCMS v3 in a few hours, come back later!</h4> -<p>If you have any questions, please join #reactos-web IRC channel. See reactos.org website for more information about our IRC channels.<br /><br /> -Klemens Friedl, 2007-07-30 11:10 GMT+1</p> +<h2>RosCMS v3 - Status </h2> +<p><strong>RosCMS v2 got replaced by RosCMS v3 on 2007-07-31!</strong></p> +<h4>Tutorials</h4> +<p>Please read and/or watch the<strong> <a href="http://www.reactos.org/?page=tutorial_roscms">RosCMS Tutorials</a></strong> to learn more about RosCMS v3 new interface and its features! </p> +<h4>Welcome page </h4> +<p>Please change your RosCMS-bookmark to "<a href="http://www.reactos.org/roscms/?page=data&branch=welcome">http://www.reactos.org/roscms/?page=data&branch=welcome</a>". The new <a href="http://www.reactos.org/roscms/?page=data&branch=welcome">RosCMS Welcome-page</a> should be your first start point to get the latest information about the website translation process and anything related to website content changes. </p> +<p>If you have any questions, please join #reactos-web IRC channel. See reactos.org website for more information about our IRC channels.<br /> + <br /> +Klemens Friedl, 2007-07-31 15:42 GMT+1</p> <p> </p> <p> </p> Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_overview.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/user_overview.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/user_overview.php Tue Aug 14 19:26:16 2007 @@ -91,8 +91,9 @@ <td valign="top"><font size="2" face="Arial, Helvetica, sans-serif">Description:</font></td> <td colspan="2" valign="top"> <font size="2" face="Arial, Helvetica, sans-serif"><?php - include("../editor/bbcode/cbparser.php"); - echo @bb2html($result_usraccount['user_description'],''); + //include("../editor/bbcode/cbparser.php"); + //echo @bb2html($result_usraccount['user_description'],''); + echo $result_usraccount['user_description']; ?></font></td> </tr> Modified: trunk/web/reactos.org/htdocs/roscms/install.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inst… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/install.php (original) +++ trunk/web/reactos.org/htdocs/roscms/install.php Tue Aug 14 19:26:16 2007 @@ -30,7 +30,7 @@ if( !mysql_query( $cmd ) ) { $ret = FALSE; - echo "<br>" . mysql_errno() . ": " . mysql_error(); + echo "<br />" . mysql_errno() . ": " . mysql_error(); } $done = false; @@ -52,92 +52,343 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> <html> <head> - <title>RosCMS Install Script</title> + <title>RosCMS v3 - Install Script</title> + <style type="text/css"> +  + </style> </head> <body> <?php if ($rpm_ready == "step2") { ?> - <h1>RosCMS - Install Script - Step2</h1> + <h1>RosCMS v3 - Install Script - Step2</h1> <form id="form1" method="post" action="install.php?ready=step3"> <h3>Database Information</h3> <table> <tr> <td>Database Host Name:</td> - <td><input name="dbHost" type="text" id="dbHost" value="localhost" /></td> + <td><input name="dbHost" type="text" id="dbHost" value="localhost" size="25" maxlength="255" /></td> </tr> <tr> <td>Database User Name:</td> - <td><input name="dbUser" type="text" id="dbUser" value="root" /></td> + <td><input name="dbUser" type="text" id="dbUser" value="root" size="25" maxlength="255" /></td> </tr> <tr> <td>Database User Password:</td> - <td><input name="dbPass" type="text" id="dbPass" /></td> + <td><input name="dbPass" type="text" id="dbPass" size="25" maxlength="255" /></td> </tr> <tr> <td>Database Name:</td> - <td><input name="dbName" type="text" id="dbName" value="domainname" /></td> + <td><input name="dbName" type="text" id="dbName" value="roscms" size="25" maxlength="255" /></td> </tr> </table> <h3>Server Information</h3> - <p>Complete Server Path: <input name="path_server" type="text" id="path_server" value="http://localhost/domain.com/" size="50" /></p> - + <p>Complete Server Path: <input name="path_server" type="text" id="path_server" value="http://localhost/domain.com/" size="50" maxlength="255" /> + </p> + + <h3>RosCMS Settings</h3> + <p>RosCMS directory : + <input name="roscmsdir" type="text" id="roscmsdir" value="roscms" size="20" maxlength="50" /> + </p> + <p>Default Language: + <input name="lang_std" type="text" id="lang_std" value="en" size="5" maxlength="2" /> + </p> + <p>Default Language Name: + <input name="lang_std_full" type="text" id="lang_std_full" value="English" size="20" maxlength="50" /> + </p> + <p>Default Translation Language: + <input name="lang_std_trans" type="text" id="lang_std_trans" value="de" size="5" maxlength="2" /> + </p> + + <h3>Super Administrator Account</h3> + <p>Account-Name: + <input name="admin_name" type="text" id="admin_name" value="Admin" size="20" maxlength="50" /> + </p> + <p>Fullname: + <input name="admin_fullname" type="text" id="admin_fullname" value="Administrator" size="20" maxlength="50" /> +</p> + <p>Password: + <input name="admin_pwd" type="password" id="admin_pwd" size="20" maxlength="50" /> + <font size="1">(6 or more characters)</font></p> + <p>E-Mail Address: + <input name="admin_email" type="text" id="admin_email" value="admin(a)domain.com" size="50" maxlength="255" /> +</p> <p> </p> - <input type="submit" name="Submit" value="Install RosCMS ..." /> </form> <?php } else if ($rpm_ready == "step3") { - echo "<h1>RosCMS - Install Script - Step3</h1>"; + echo "<h1>RosCMS v3 - Install Script - Step3</h1>"; $dbHost = "localhost"; $dbUser = "root"; $dbPass = ""; $dbName = "roscms"; $path_server = ""; + $path_roscms = ""; + $lang_std = ""; + $lang_std_full = ""; + $lang_std_trans = ""; + $admin_name = ""; + $admin_fullname = ""; + $admin_pwd = ""; + $admin_email = ""; if (array_key_exists("dbHost", $_POST)) $dbHost=htmlspecialchars($_POST["dbHost"]); if (array_key_exists("dbUser", $_POST)) $dbUser=htmlspecialchars($_POST["dbUser"]); if (array_key_exists("dbPass", $_POST)) $dbPass=htmlspecialchars($_POST["dbPass"]); if (array_key_exists("dbName", $_POST)) $dbName=htmlspecialchars($_POST["dbName"]); if (array_key_exists("path_server", $_POST)) $path_server=htmlspecialchars($_POST["path_server"]); + if (array_key_exists("roscmsdir", $_POST)) $path_roscms=htmlspecialchars($_POST["roscmsdir"]); + if (array_key_exists("lang_std", $_POST)) $lang_std=htmlspecialchars($_POST["lang_std"]); + if (array_key_exists("lang_std_full", $_POST)) $lang_std_full=htmlspecialchars($_POST["lang_std_full"]); + if (array_key_exists("lang_std_trans", $_POST)) $lang_std_trans=htmlspecialchars($_POST["lang_std_trans"]); + if (array_key_exists("admin_name", $_POST)) $admin_name=htmlspecialchars($_POST["admin_name"]); + if (array_key_exists("admin_fullname", $_POST)) $admin_fullname=htmlspecialchars($_POST["admin_fullname"]); + if (array_key_exists("admin_pwd", $_POST)) $admin_pwd=htmlspecialchars($_POST["admin_pwd"]); + if (array_key_exists("admin_email", $_POST)) $admin_email=htmlspecialchars($_POST["admin_email"]); + + + if ($path_server == "") { + die("Invalid server-path!"); + } + + if ($path_roscms == "" || $lang_std == "" || $lang_std_full == "" || lang_std_trans == "") { + die("Invalid RosCMS config settings!"); + } + + if ($admin_name == "" || $admin_pwd == "" || $admin_email == "") { + die("Invalid account settings!"); + } echo "Connecting to the MySQL Server... "; $connect = mysql_connect($dbHost, $dbUser, $dbPass) or die("Cannot connect to the MySQL Server!"); - echo "OK<br>"; + echo "OK<br />"; echo "Creating the Database... "; mysql_query("CREATE DATABASE `". mysql_real_escape_string($dbName) ."`") or die( mysql_errno() . ": " . mysql_error() ); - echo "OK<br>"; + echo "OK<br />"; echo "Selecting the Database... "; - mysql_select_db($dbName, $connect) or die("Cannot find and select <b>$dbName</b>!"); - echo "OK<br>"; + mysql_select_db($dbName, $connect) or die("Cannot find and select <b>".$dbName."</b>!"); + echo "OK<br />"; echo "Importing the SQL Data... "; - if( !import_sql_dump( "roscms.sql" ) ) - exit; - - /* TODO: The complete server path has to be saved somewhere */ + if( !import_sql_dump( "roscms.sql" ) ) { + die("Error: import not successfull!"); + } + echo "<br />"; + + echo "Adding first account... "; + $insert_account = mysql_query("INSERT INTO `users` ( `user_id` , `user_name` , `user_roscms_password` , `user_roscms_getpwd_id` , `user_timestamp_touch` , `user_timestamp_touch2` , `user_login_counter` , `user_account_enabled` , `user_account_hidden` , `user_register` , `user_fullname` , `user_email` , `user_website` , `user_language` , `user_country` , `user_timezone` , `user_occupation` , `user_description` , `user_setting_multisession` , `user_setting_browseragent` , `user_setting_ipaddress` , `user_setting_timeout` ) + VALUES ( + NULL , + '".mysql_real_escape_string($admin_name)."', + MD5( '".mysql_real_escape_string($admin_pwd)."' ) , + '', + '', + NOW( ) , + '0', + 'yes', + 'no', + NOW( ) , + '".mysql_real_escape_string($admin_fullname)."', + '".mysql_real_escape_string($admin_email)."', + '".mysql_real_escape_string($path_server)."', + '".mysql_real_escape_string($lang_std)."', + '', + '', + '', + '', + 'true', + 'true', + 'true', + 'true' + );") or die("Cannot insert first account!"); + echo "OK<br />"; + + echo "Adding account memberships... "; + $insert_membership = mysql_query("INSERT INTO `usergroup_members` ( `usergroupmember_userid` , `usergroupmember_usergroupid` ) + VALUES ( + '1', + 'user' + ), + ( + '1', + 'ros_sadmin' + );") or die("Cannot insert account memberships!"); + echo "OK<br />"; + + + // RosCMS settings + echo "Creating roscms config file... "; + $fp = fopen("custom.php", "w"); + flock($fp,2); + fputs($fp, '<?php + + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2007 Klemens Friedl <frik85(a)reactos.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + + global $rpm_page; + + $roscms_extern_brand = "RosCMS"; + $roscms_extern_version = "v3"; + $roscms_extern_version_detail = "v3.0731"; + + $roscms_intern_webserver_pages = "'.$path_server.'"; + + $roscms_intern_roscms_dir = "'.$path_roscms.'"; + $roscms_intern_webserver_roscms = "'.$path_server.'".$roscms_intern_roscms_dir."/"; + $roscms_intern_page_link = $roscms_intern_webserver_roscms . "?page="; + $roscms_intern_script_name = $roscms_intern_page_link . $rpm_page; + + $roscms_intern_script_branch = $roscms_intern_script_name. "&branch="; + + $roscms_standard_language="'.$lang_std.'"; // en/de/fr/... + $roscms_standard_language_full="'.$lang_std_full.'"; // English/German/... + $roscms_standard_language_trans="'.$lang_std_trans.'"; // en/de/fr/...'); + + fputs($fp, "\n ?>"); + flock($fp, 3); + fclose($fp); + echo "OK<br />"; + + // RosCMS database login config + echo "Creating roscms database config file... "; + $fp = fopen("connect.db.php", "w"); + flock($fp,2); + fputs($fp, '<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005-2007 Klemens Friedl <frik85(a)reactos.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + + // Database: + $dbHost = "'.$dbHost.'"; + $dbUser = "'.$dbUser.'"; + $dbPass = "'.$dbPass.'"; + $dbName = "'.$dbName.'"; + $roscms_database = $dbName; + + $connect = @mysql_connect($dbHost, $dbUser, $dbPass) or die("ERROR: Cannot connect to the database!"); + $selectDB = @mysql_select_db($dbName, $connect) or die("Cannot find and select <b>".$dbName."</b>!"); + + // Delete (set nothing) the vars after usage: + $dbHost = ""; + $dbUser = ""; + $dbPass = ""; + $dbName = "";'); + + fputs($fp, "\n ?>"); + flock($fp, 3); + fclose($fp); + echo "OK<br />"; + echo "<p> </p>"; echo "<p><b>RosCMS was set up successfully!</b></p>"; + + echo "<p> </p>"; + echo "<p>Delete this \"install.php\" file on the server and <a href=\"index.php?page=login\">then login into RosCMS</a> with your account.</p>"; + } else { ?> - <h1>RosCMS - Install Script - Step1</h1> + <h1>RosCMS v3 - Install Script - Step1</h1> <p><i>© Klemens Friedl 2005-2007, GNU GPL 2 license</i></p> <p> </p> <?php if (get_magic_quotes_gpc()) { die("<p>ERROR: Disable 'magic quotes' in php.ini (=Off)</p>"); } -?> - <p>Your PHP installation is configured correctly. Click <i>Next</i> to continue!</p> + + $phpver = explode('-', phpversion()); + $phpver = $phpver[0]; + + if (substr($phpver, 0, 1) <= 3) { + die("<p>ERROR: RosCMS v3 don't work with versions prior to PHP 4!</p>"); + } + else if (substr($phpver, 0, 1) == 4) { + echo "<p>RosCMS v3 should work fine with PHP 4, make sure you use an up-to-date PHP 4 version. If possible and reasonable, upgrade to PHP 5 or later.</p>"; + } +?> + <p>Your PHP installation is configured correctly. RosCMS has been tested with MySQL 4 and 5. </p> + <p>Click <i>Next</i> to continue!</p> <p><a href="install.php?ready=step2"><b>Next ></b></a></p> <?php Added: trunk/web/reactos.org/htdocs/roscms/roscms.sql URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/rosc… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/roscms.sql (added) +++ trunk/web/reactos.org/htdocs/roscms/roscms.sql Tue Aug 14 19:26:16 2007 @@ -1,0 +1,486 @@ +-- Database: `roscms` +-- +-- Date: 2007-08-13 11:12 +-- MySQL-Version: 5.0.33 +-- PHP-Version: 5.2.1 +-- + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_` +-- + +CREATE TABLE `data_` ( + `data_id` int(11) NOT NULL auto_increment, + `data_name` varchar(100) collate utf8_unicode_ci NOT NULL COMMENT 'together with page_type unique entries', + `data_type` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT '"page", "layout", "content", "script"', + `data_acl` varchar(50) collate utf8_unicode_ci NOT NULL default 'default', + PRIMARY KEY (`data_id`), + KEY `data_name` (`data_name`,`data_type`), + KEY `data_type` (`data_type`), + KEY `data_acl` (`data_acl`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='all RosCMS v1 "pages", "content", "dyncontent" and "inctext"'; + +INSERT INTO `data_` VALUES (1, 'index', 'page', 'defaultpage'); +INSERT INTO `data_` VALUES (2, 'default', 'template', 'layout'); +INSERT INTO `data_` VALUES (3, 'index', 'content', 'default'); +INSERT INTO `data_` VALUES (4, 'news', 'script', 'script'); +INSERT INTO `data_` VALUES (5, 'news_page', 'content', 'default'); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_a` +-- + +CREATE TABLE `data_a` ( + `data_id` int(11) NOT NULL auto_increment, + `data_name` varchar(100) collate utf8_unicode_ci NOT NULL COMMENT 'together with page_type unique entries', + `data_type` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT '"page", "layout", "content", "script"', + `data_acl` varchar(50) collate utf8_unicode_ci NOT NULL default 'default', + PRIMARY KEY (`data_id`), + KEY `data_name` (`data_name`,`data_type`), + KEY `data_type` (`data_type`), + KEY `data_acl` (`data_acl`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='all RosCMS v1 "pages", "content", "dyncontent" and "inctext"'; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_revision` +-- + +CREATE TABLE `data_revision` ( + `rev_id` int(11) NOT NULL auto_increment COMMENT 'unique revisions id', + `data_id` int(11) NOT NULL, + `rev_version` int(11) NOT NULL COMMENT 'version number increase with every entry change', + `rev_language` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT 'language code ("en", "de", etc.)', + `rev_usrid` int(11) NOT NULL COMMENT 'user id who saved the entry', + `rev_datetime` datetime NOT NULL, + `rev_date` date NOT NULL, + `rev_time` time NOT NULL, + PRIMARY KEY (`rev_id`), + KEY `data_id` (`data_id`), + KEY `rev_language` (`rev_language`), + KEY `rev_version` (`rev_version`), + KEY `rev_datetime` (`rev_datetime`), + KEY `rev_usrid` (`rev_usrid`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +INSERT INTO `data_revision` VALUES (1, 1, 1, 'en', 1, '2007-08-13 17:03:44', '2007-08-13', '17:03:44'); +INSERT INTO `data_revision` VALUES (2, 2, 1, 'en', 1, '2007-08-13 17:05:03', '2007-08-13', '17:05:03'); +INSERT INTO `data_revision` VALUES (6, 3, 2, 'en', 1, '2007-08-13 17:15:15', '2007-08-13', '17:15:15'); +INSERT INTO `data_revision` VALUES (5, 4, 2, 'en', 1, '2007-08-13 17:11:36', '2007-08-13', '17:11:36'); +INSERT INTO `data_revision` VALUES (7, 5, 1, 'en', 1, '2007-08-13 17:15:20', '2007-08-13', '17:15:20'); +INSERT INTO `data_revision` VALUES (8, 5, 1, 'en', 1, '2007-08-13 17:15:45', '2007-08-13', '17:15:45'); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_revision_a` +-- + +CREATE TABLE `data_revision_a` ( + `rev_id` int(11) NOT NULL auto_increment COMMENT 'unique revisions id', + `data_id` int(11) NOT NULL, + `rev_version` int(11) NOT NULL COMMENT 'version number increase with every entry change', + `rev_language` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT 'language code ("en", "de", etc.)', + `rev_usrid` int(11) NOT NULL COMMENT 'user id who saved the entry', + `rev_datetime` datetime NOT NULL, + `rev_date` date NOT NULL, + `rev_time` time NOT NULL, + PRIMARY KEY (`rev_id`), + KEY `data_id` (`data_id`), + KEY `rev_language` (`rev_language`), + KEY `rev_version` (`rev_version`), + KEY `rev_datetime` (`rev_datetime`), + KEY `rev_usrid` (`rev_usrid`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_security` +-- + +CREATE TABLE `data_security` ( + `sec_name` varchar(50) collate utf8_unicode_ci NOT NULL, + `sec_fullname` varchar(100) collate utf8_unicode_ci NOT NULL, + `sec_description` varchar(255) collate utf8_unicode_ci NOT NULL, + `sec_branch` varchar(10) collate utf8_unicode_ci NOT NULL, + `sec_lev1_read` tinyint(4) NOT NULL default '0', + `sec_lev1_write` tinyint(4) NOT NULL default '0', + `sec_lev1_add` tinyint(4) NOT NULL default '0', + `sec_lev1_pub` tinyint(4) NOT NULL default '0', + `sec_lev1_trans` tinyint(4) NOT NULL default '0', + `sec_lev2_read` tinyint(4) NOT NULL default '0', + `sec_lev2_write` tinyint(4) NOT NULL default '0', + `sec_lev2_add` tinyint(4) NOT NULL default '0', + `sec_lev2_pub` tinyint(4) NOT NULL default '0', + `sec_lev2_trans` tinyint(4) NOT NULL default '0', + `sec_lev3_read` tinyint(4) NOT NULL default '0', + `sec_lev3_write` tinyint(4) NOT NULL default '0', + `sec_lev3_add` tinyint(4) NOT NULL default '0', + `sec_lev3_pub` tinyint(4) NOT NULL default '0', + `sec_lev3_trans` tinyint(4) NOT NULL default '0', + `sec_allow` varchar(255) collate utf8_unicode_ci NOT NULL, + `sec_deny` varchar(255) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`sec_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS content security'; + +INSERT INTO `data_security` VALUES ('default', 'Content (default)', 'Default content security ACL; normal translator cannot publish nor add new content', 'website', 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, '', ''); +INSERT INTO `data_security` VALUES ('script', 'Script or Variable', 'Entry contain scripts, variables or similar content which can only be accessed and altered by admins.', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, '', ''); +INSERT INTO `data_security` VALUES ('layout', 'Layout', 'Website layout related content, changing may destroy the website layout, so be careful!', 'website', 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, '', '|transmaint|'); +INSERT INTO `data_security` VALUES ('announcement', 'Official announcement', 'Official announcement, which shouldn''t be altered by anyone except admins and devs', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, '|developer|', ''); +INSERT INTO `data_security` VALUES ('notrans', 'No translation needed', 'Content don''t need a translation.', '', 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, '', ''); +INSERT INTO `data_security` VALUES ('rosversion', 'ReactOS versions number', 'Currrent ReactOS version number, change the related contents on every release day!', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, '|developer|', ''); +INSERT INTO `data_security` VALUES ('defaultpage', 'Page (default)', 'Default page security ACL', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, '|developer|', ''); +INSERT INTO `data_security` VALUES ('defaultmenu', 'Menu (default)', 'Menu content which can be translated by language maintainers', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, '|transmaint|', ''); +INSERT INTO `data_security` VALUES ('system', 'System', 'RosCMS system', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '|ros_sadmin|', ''); +INSERT INTO `data_security` VALUES ('readonly', 'Read-Only', 'Read only, noone can alter this', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, '', ''); +INSERT INTO `data_security` VALUES ('langmaint', 'Language Maintainer', 'Language-Group related content', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, '|transmaint|', ''); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_stext` +-- + +CREATE TABLE `data_stext` ( + `stext_id` int(11) NOT NULL auto_increment, + `data_rev_id` int(11) NOT NULL, + `stext_name` varchar(100) collate utf8_unicode_ci NOT NULL, + `stext_content` varchar(255) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`stext_id`), + KEY `data_rev_id` (`data_rev_id`), + FULLTEXT KEY `stext_content` (`stext_content`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +INSERT INTO `data_stext` VALUES (14, 1, 'description', 'test page'); +INSERT INTO `data_stext` VALUES (13, 1, 'comment', ''); +INSERT INTO `data_stext` VALUES (12, 2, 'description', 'test template'); +INSERT INTO `data_stext` VALUES (15, 1, 'title', 'Index'); +INSERT INTO `data_stext` VALUES (19, 6, 'description', 'test content'); +INSERT INTO `data_stext` VALUES (18, 5, 'description', 'news php script'); +INSERT INTO `data_stext` VALUES (22, 7, 'description', 'news issue 1'); +INSERT INTO `data_stext` VALUES (23, 7, 'title', 'News_page'); +INSERT INTO `data_stext` VALUES (26, 8, 'description', 'news issue 2'); +INSERT INTO `data_stext` VALUES (27, 8, 'title', 'News_page'); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_stext_a` +-- + +CREATE TABLE `data_stext_a` ( + `stext_id` int(11) NOT NULL auto_increment, + `data_rev_id` int(11) NOT NULL, + `stext_name` varchar(100) collate utf8_unicode_ci NOT NULL, + `stext_content` varchar(255) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`stext_id`), + KEY `data_rev_id` (`data_rev_id`), + FULLTEXT KEY `stext_content` (`stext_content`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_tag` +-- + +CREATE TABLE `data_tag` ( + `tag_id` int(11) NOT NULL auto_increment, + `data_id` int(11) NOT NULL, + `data_rev_id` int(11) NOT NULL, + `tag_name_id` int(11) NOT NULL, + `tag_value_id` int(11) NOT NULL, + `tag_usrid` int(11) NOT NULL, + PRIMARY KEY (`tag_id`), + KEY `data_id` (`data_id`), + KEY `data_rev_id` (`data_rev_id`), + KEY `tag_name_id` (`tag_name_id`), + KEY `tag_value_id` (`tag_value_id`), + KEY `tag_usrid` (`tag_usrid`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +INSERT INTO `data_tag` VALUES (11, 1, 1, 1, 5, -1); +INSERT INTO `data_tag` VALUES (2, 1, 1, 2, 2, -1); +INSERT INTO `data_tag` VALUES (10, 2, 2, 1, 5, -1); +INSERT INTO `data_tag` VALUES (15, 4, 5, 5, 7, -1); +INSERT INTO `data_tag` VALUES (14, 4, 5, 1, 5, -1); +INSERT INTO `data_tag` VALUES (24, 3, 6, 1, 5, -1); +INSERT INTO `data_tag` VALUES (22, 5, 7, 1, 5, -1); +INSERT INTO `data_tag` VALUES (18, 5, 7, 6, 9, -1); +INSERT INTO `data_tag` VALUES (21, 5, 8, 1, 5, -1); +INSERT INTO `data_tag` VALUES (20, 5, 8, 6, 10, -1); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_tag_a` +-- + +CREATE TABLE `data_tag_a` ( + `tag_id` int(11) NOT NULL auto_increment, + `data_id` int(11) NOT NULL, + `data_rev_id` int(11) NOT NULL, + `tag_name_id` int(11) NOT NULL, + `tag_value_id` int(11) NOT NULL, + `tag_usrid` int(11) NOT NULL, + PRIMARY KEY (`tag_id`), + KEY `data_id` (`data_id`), + KEY `data_rev_id` (`data_rev_id`), + KEY `tag_name_id` (`tag_name_id`), + KEY `tag_value_id` (`tag_value_id`), + KEY `tag_usrid` (`tag_usrid`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_tag_name` +-- + +CREATE TABLE `data_tag_name` ( + `tn_id` int(11) NOT NULL auto_increment, + `tn_name` varchar(100) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`tn_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +INSERT INTO `data_tag_name` VALUES (1, 'status'); +INSERT INTO `data_tag_name` VALUES (2, 'extension'); +INSERT INTO `data_tag_name` VALUES (4, 'star'); +INSERT INTO `data_tag_name` VALUES (5, 'kind'); +INSERT INTO `data_tag_name` VALUES (6, 'number'); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_tag_name_a` +-- + +CREATE TABLE `data_tag_name_a` ( + `tn_id` int(11) NOT NULL auto_increment, + `tn_name` varchar(100) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`tn_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_tag_value` +-- + +CREATE TABLE `data_tag_value` ( + `tv_id` int(11) NOT NULL auto_increment, + `tv_value` varchar(255) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`tv_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +INSERT INTO `data_tag_value` VALUES (7, 'php'); +INSERT INTO `data_tag_value` VALUES (2, 'html'); +INSERT INTO `data_tag_value` VALUES (4, 'off'); +INSERT INTO `data_tag_value` VALUES (5, 'stable'); +INSERT INTO `data_tag_value` VALUES (9, '1'); +INSERT INTO `data_tag_value` VALUES (10, '2'); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_tag_value_a` +-- + +CREATE TABLE `data_tag_value_a` ( + `tv_id` int(11) NOT NULL auto_increment, + `tv_value` varchar(255) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`tv_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_text` +-- + +CREATE TABLE `data_text` ( + `text_id` int(11) NOT NULL auto_increment, + `data_rev_id` int(11) NOT NULL, + `text_name` varchar(100) collate utf8_unicode_ci NOT NULL, + `text_content` text collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`text_id`), + KEY `data_rev_id` (`data_rev_id`), + FULLTEXT KEY `text_content` (`text_content`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +INSERT INTO `data_text` VALUES (9, 1, 'content', '[#templ_default]'); +INSERT INTO `data_text` VALUES (8, 2, 'content', '[#cont_head][#cont_menu_top][#cont_menu_side][#cont_contmenu_[#%NAME%]][#cont_menu_search][#cont_menu_language][#cont_menu_misc][#cont_%NAME%][#cont_bottom]'); +INSERT INTO `data_text` VALUES (13, 6, 'content', '<h1>Welcome to RosCMS v3</h1><p>RosCMS test page</p>[#inc_news]'); +INSERT INTO `data_text` VALUES (15, 7, 'content', 'news #1 ...'); +INSERT INTO `data_text` VALUES (17, 8, 'content', 'news #2'); +INSERT INTO `data_text` VALUES (12, 5, 'content', '<h3>News</h3> <?php $tmp_year = "2085"; $query_content = mysql_query("SELECT d.data_name, r.rev_usrid, s1.stext_content AS ''title'', s2.stext_content AS ''description'', v.tv_value as ''numb'', r.rev_date FROM data_ d, data_revision r, data_stext s1, data_stext s2, data_tag a, data_tag_name n, data_tag_value v WHERE d.data_name = ''news_page'' AND d.data_type = ''content'' AND r.data_id = d.data_id AND (r.rev_language = ''".mysql_real_escape_string($roscms_template_var_lang)."'' OR r.rev_language = ''en'') AND r.rev_version > 0 AND s1.data_rev_id = r.rev_id AND s1.stext_name = ''title'' AND s2.data_rev_id = r.rev_id AND s2.stext_name = ''description'' AND r.data_id = a.data_id AND r.rev_id = a.data_rev_id AND a.tag_usrid = ''-1'' AND a.tag_name_id = n.tn_id AND n.tn_name = ''number'' AND a.tag_value_id = v.tv_id ORDER BY r.rev_datetime DESC LIMIT 3;"); while($result_content = mysql_fetch_array($query_content)) { +if ($tmp_year > substr($result_content[''rev_date''], 0, 4)) { $tmp_year = substr($result_content[''rev_date''], 0, 4); echo "<h3>".$tmp_year."</h3>"; } $query_usraccount= mysql_query("SELECT user_name, user_fullname FROM users WHERE user_id = ''".mysql_real_escape_string($result_content["rev_usrid"])."'' LIMIT 1;"); $result_usraccount=mysql_fetch_array($query_usraccount); ?> <p align="left"><b><font color="#666666"><?php echo $result_content[''rev_date'']; ?>, <?php if ($result_usraccount[''user_fullname'']) { echo $result_usraccount[''user_fullname'']; } else { echo $result_usraccount[''user_name'']; } ?> </font></b><br /> <b><a href="<?php echo "[#link_".$result_content["data_name"]."_".$result_content["numb"]."]"; ?>"><?php echo $result_content["title"]; ?></a></b><br /> <?php echo $result_content["description"]; ?></p> <?php } // end while ?> '); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_text_a` +-- + +CREATE TABLE `data_text_a` ( + `text_id` int(11) NOT NULL auto_increment, + `data_rev_id` int(11) NOT NULL, + `text_name` varchar(100) collate utf8_unicode_ci NOT NULL, + `text_content` text collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`text_id`), + KEY `data_rev_id` (`data_rev_id`), + FULLTEXT KEY `text_content` (`text_content`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_user_filter` +-- + +CREATE TABLE `data_user_filter` ( + `filt_id` int(11) NOT NULL auto_increment, + `filt_usrid` int(11) NOT NULL, + `filt_title` varchar(50) collate utf8_unicode_ci NOT NULL, + `filt_type` smallint(6) NOT NULL default '1', + `filt_string` varchar(255) collate utf8_unicode_ci NOT NULL, + `filt_datetime` datetime NOT NULL, + `filt_usage` int(11) NOT NULL, + `filt_usagedate` datetime NOT NULL, + PRIMARY KEY (`filt_id`), + KEY `filt_usrid` (`filt_usrid`), + KEY `filt_name` (`filt_title`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `languages` +-- + +CREATE TABLE `languages` ( + `lang_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `lang_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `lang_name_org` varchar(100) collate utf8_unicode_ci NOT NULL, + `lang_level` int(11) NOT NULL default '0', + PRIMARY KEY (`lang_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='available languages'; + +INSERT INTO `languages` VALUES ('en', 'English', 'English', 10); +INSERT INTO `languages` VALUES ('de', 'German', 'Deutsch', 8); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `subsys_mappings` +-- + +CREATE TABLE `subsys_mappings` ( + `map_roscms_userid` bigint(20) NOT NULL default '0', + `map_subsys_name` varchar(10) character set utf8 NOT NULL default '', + `map_subsys_userid` int(7) NOT NULL default '0', + PRIMARY KEY (`map_roscms_userid`,`map_subsys_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `user_sessions` +-- + +CREATE TABLE `user_sessions` ( + `usersession_id` varchar(32) character set utf8 NOT NULL default '' COMMENT 'Unique ID of this session', + `usersession_user_id` bigint(20) NOT NULL default '0' COMMENT 'User this session belongs to', + `usersession_expires` datetime default NULL COMMENT 'Expiry date/time (NULL if does not expire)', + `usersession_browseragent` varchar(255) character set utf8 NOT NULL default '' COMMENT 'HTTP_USER_AGENT when this session was created', + `usersession_ipaddress` varchar(15) character set utf8 NOT NULL default '' COMMENT 'IP address from which this session was created', + `usersession_created` datetime NOT NULL default '0000-00-00 00:00:00' COMMENT 'session created (date/time) - all session will get deleted ... by date', + PRIMARY KEY (`usersession_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci PACK_KEYS=0 COMMENT='Sessions'; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `usergroup_members` +-- + +CREATE TABLE `usergroup_members` ( + `usergroupmember_userid` bigint(20) NOT NULL default '0', + `usergroupmember_usergroupid` varchar(10) collate utf8_unicode_ci NOT NULL default 'user' +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `usergroups` +-- + +CREATE TABLE `usergroups` ( + `usrgroup_name_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `usrgroup_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `usrgroup_intern_id` varchar(25) collate utf8_unicode_ci NOT NULL default '', + `usrgroup_seclev` tinyint(4) NOT NULL default '0', + `usrgroup_securitylevel` tinyint(4) NOT NULL default '0', + `usrgroup_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + PRIMARY KEY (`usrgroup_name_id`), + UNIQUE KEY `usrgroup_name` (`usrgroup_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +INSERT INTO `usergroups` VALUES ('ros_admin', 'Administrator', 'roscms_usrgrp_admin', 3, 70, 'Administrator-Group'); +INSERT INTO `usergroups` VALUES ('user', 'User', 'roscms_usrgrp_user', 0, 0, 'Normal Visitors'); +INSERT INTO `usergroups` VALUES ('developer', 'Developer', 'roscms_usrgrp_dev', 2, 50, 'Developer'); +INSERT INTO `usergroups` VALUES ('moderator', 'Moderator', 'roscms_usrgrp_team', 2, 20, 'Website Moderators'); +INSERT INTO `usergroups` VALUES ('translator', 'Translator', 'roscms_usrgrp_trans', 1, 10, 'Translators'); +INSERT INTO `usergroups` VALUES ('ros_sadmin', 'Super-Administrator', 'roscms_usrgrp_sadmin', 3, 100, 'Super-Administrator-Group'); +INSERT INTO `usergroups` VALUES ('transmaint', 'Tranlation Maintainer', 'roscms_usrgrp_trans', 2, 15, 'Translation Maintainer'); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `users` +-- + +CREATE TABLE `users` ( + `user_id` bigint(20) NOT NULL auto_increment, + `user_name` varchar(20) collate utf8_unicode_ci NOT NULL default '', + `user_roscms_password` varchar(32) collate utf8_unicode_ci NOT NULL default '', + `user_roscms_getpwd_id` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `user_timestamp_touch` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `user_timestamp_touch2` timestamp NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + `user_login_counter` bigint(20) NOT NULL default '0', + `user_account_enabled` varchar(10) collate utf8_unicode_ci NOT NULL default 'no', + `user_account_hidden` varchar(5) collate utf8_unicode_ci NOT NULL default 'no', + `user_register` timestamp NULL default NULL, + `user_fullname` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `user_email` varchar(150) collate utf8_unicode_ci NOT NULL default '', + `user_website` varchar(150) collate utf8_unicode_ci NOT NULL default '', + `user_language` varchar(2) collate utf8_unicode_ci NOT NULL default '', + `user_country` varchar(2) collate utf8_unicode_ci NOT NULL default '', + `user_timezone` varchar(3) collate utf8_unicode_ci NOT NULL default '', + `user_occupation` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `user_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `user_setting_multisession` varchar(5) collate utf8_unicode_ci NOT NULL default 'false', + `user_setting_browseragent` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + `user_setting_ipaddress` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + `user_setting_timeout` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + PRIMARY KEY (`user_id`), + UNIQUE KEY `user_name` (`user_name`), + UNIQUE KEY `user_email` (`user_email`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS User Table'; + Modified: trunk/web/reactos.org/sql/roscms.sql URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/sql/roscms.sql?rev… ============================================================================== --- trunk/web/reactos.org/sql/roscms.sql (original) +++ trunk/web/reactos.org/sql/roscms.sql Tue Aug 14 19:26:16 2007 @@ -1,58 +1,55 @@ --- phpMyAdmin SQL Dump --- version 2.9.2 --- http://www.phpmyadmin.net --- --- Host: localhost --- Erstellungszeit: 27. Mai 2007 um 13:02 --- Server Version: 5.0.33 +-- Database: `roscms` +-- +-- Date: 2007-08-13 11:12 +-- MySQL-Version: 5.0.33 -- PHP-Version: 5.2.1 -- --- Datenbank: `roscms` --- - --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `content` --- - -CREATE TABLE `content` ( - `content_id` bigint(20) NOT NULL auto_increment, - `content_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', - `content_lang` varchar(10) collate utf8_unicode_ci NOT NULL default 'all', - `content_text` text collate utf8_unicode_ci NOT NULL, - `content_version` int(11) NOT NULL default '0', - `content_active` tinyint(4) NOT NULL default '0', - `content_visible` tinyint(4) NOT NULL default '0', - `content_type` varchar(10) collate utf8_unicode_ci NOT NULL default 'default', - `content_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', - `content_editor` varchar(10) collate utf8_unicode_ci NOT NULL default '', - `content_usrname_id` bigint(20) NOT NULL default '0', - `content_date` date NOT NULL default '0000-00-00', - `content_time` time NOT NULL default '00:00:00', - `content_altered` varchar(1) collate utf8_unicode_ci NOT NULL default '0', - PRIMARY KEY (`content_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents'; - --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `data_` + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_` -- CREATE TABLE `data_` ( `data_id` int(11) NOT NULL auto_increment, `data_name` varchar(100) collate utf8_unicode_ci NOT NULL COMMENT 'together with page_type unique entries', `data_type` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT '"page", "layout", "content", "script"', + `data_acl` varchar(50) collate utf8_unicode_ci NOT NULL default 'default', PRIMARY KEY (`data_id`), KEY `data_name` (`data_name`,`data_type`), - KEY `data_type` (`data_type`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='all RosCMS v2 "pages", "content", "dyncontent" and "inctext"'; - --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `data_revision` + KEY `data_type` (`data_type`), + KEY `data_acl` (`data_acl`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='all RosCMS v1 "pages", "content", "dyncontent" and "inctext"'; + +INSERT INTO `data_` VALUES (1, 'index', 'page', 'defaultpage'); +INSERT INTO `data_` VALUES (2, 'default', 'template', 'layout'); +INSERT INTO `data_` VALUES (3, 'index', 'content', 'default'); +INSERT INTO `data_` VALUES (4, 'news', 'script', 'script'); +INSERT INTO `data_` VALUES (5, 'news_page', 'content', 'default'); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_a` +-- + +CREATE TABLE `data_a` ( + `data_id` int(11) NOT NULL auto_increment, + `data_name` varchar(100) collate utf8_unicode_ci NOT NULL COMMENT 'together with page_type unique entries', + `data_type` varchar(10) collate utf8_unicode_ci NOT NULL COMMENT '"page", "layout", "content", "script"', + `data_acl` varchar(50) collate utf8_unicode_ci NOT NULL default 'default', + PRIMARY KEY (`data_id`), + KEY `data_name` (`data_name`,`data_type`), + KEY `data_type` (`data_type`), + KEY `data_acl` (`data_acl`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='all RosCMS v1 "pages", "content", "dyncontent" and "inctext"'; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_revision` -- CREATE TABLE `data_revision` ( @@ -67,13 +64,23 @@ PRIMARY KEY (`rev_id`), KEY `data_id` (`data_id`), KEY `rev_language` (`rev_language`), - KEY `rev_version` (`rev_version`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `data_revision_a` + KEY `rev_version` (`rev_version`), + KEY `rev_datetime` (`rev_datetime`), + KEY `rev_usrid` (`rev_usrid`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +INSERT INTO `data_revision` VALUES (1, 1, 1, 'en', 1, '2007-08-13 17:03:44', '2007-08-13', '17:03:44'); +INSERT INTO `data_revision` VALUES (2, 2, 1, 'en', 1, '2007-08-13 17:05:03', '2007-08-13', '17:05:03'); +INSERT INTO `data_revision` VALUES (6, 3, 2, 'en', 1, '2007-08-13 17:15:15', '2007-08-13', '17:15:15'); +INSERT INTO `data_revision` VALUES (5, 4, 2, 'en', 1, '2007-08-13 17:11:36', '2007-08-13', '17:11:36'); +INSERT INTO `data_revision` VALUES (7, 5, 1, 'en', 1, '2007-08-13 17:15:20', '2007-08-13', '17:15:20'); +INSERT INTO `data_revision` VALUES (8, 5, 1, 'en', 1, '2007-08-13 17:15:45', '2007-08-13', '17:15:45'); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_revision_a` -- CREATE TABLE `data_revision_a` ( @@ -86,13 +93,61 @@ `rev_date` date NOT NULL, `rev_time` time NOT NULL, PRIMARY KEY (`rev_id`), - KEY `data_id` (`data_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `data_stext` + KEY `data_id` (`data_id`), + KEY `rev_language` (`rev_language`), + KEY `rev_version` (`rev_version`), + KEY `rev_datetime` (`rev_datetime`), + KEY `rev_usrid` (`rev_usrid`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_security` +-- + +CREATE TABLE `data_security` ( + `sec_name` varchar(50) collate utf8_unicode_ci NOT NULL, + `sec_fullname` varchar(100) collate utf8_unicode_ci NOT NULL, + `sec_description` varchar(255) collate utf8_unicode_ci NOT NULL, + `sec_branch` varchar(10) collate utf8_unicode_ci NOT NULL, + `sec_lev1_read` tinyint(4) NOT NULL default '0', + `sec_lev1_write` tinyint(4) NOT NULL default '0', + `sec_lev1_add` tinyint(4) NOT NULL default '0', + `sec_lev1_pub` tinyint(4) NOT NULL default '0', + `sec_lev1_trans` tinyint(4) NOT NULL default '0', + `sec_lev2_read` tinyint(4) NOT NULL default '0', + `sec_lev2_write` tinyint(4) NOT NULL default '0', + `sec_lev2_add` tinyint(4) NOT NULL default '0', + `sec_lev2_pub` tinyint(4) NOT NULL default '0', + `sec_lev2_trans` tinyint(4) NOT NULL default '0', + `sec_lev3_read` tinyint(4) NOT NULL default '0', + `sec_lev3_write` tinyint(4) NOT NULL default '0', + `sec_lev3_add` tinyint(4) NOT NULL default '0', + `sec_lev3_pub` tinyint(4) NOT NULL default '0', + `sec_lev3_trans` tinyint(4) NOT NULL default '0', + `sec_allow` varchar(255) collate utf8_unicode_ci NOT NULL, + `sec_deny` varchar(255) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`sec_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS content security'; + +INSERT INTO `data_security` VALUES ('default', 'Content (default)', 'Default content security ACL; normal translator cannot publish nor add new content', 'website', 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, '', ''); +INSERT INTO `data_security` VALUES ('script', 'Script or Variable', 'Entry contain scripts, variables or similar content which can only be accessed and altered by admins.', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, '', ''); +INSERT INTO `data_security` VALUES ('layout', 'Layout', 'Website layout related content, changing may destroy the website layout, so be careful!', 'website', 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, '', '|transmaint|'); +INSERT INTO `data_security` VALUES ('announcement', 'Official announcement', 'Official announcement, which shouldn''t be altered by anyone except admins and devs', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, '|developer|', ''); +INSERT INTO `data_security` VALUES ('notrans', 'No translation needed', 'Content don''t need a translation.', '', 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, '', ''); +INSERT INTO `data_security` VALUES ('rosversion', 'ReactOS versions number', 'Currrent ReactOS version number, change the related contents on every release day!', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, '|developer|', ''); +INSERT INTO `data_security` VALUES ('defaultpage', 'Page (default)', 'Default page security ACL', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, '|developer|', ''); +INSERT INTO `data_security` VALUES ('defaultmenu', 'Menu (default)', 'Menu content which can be translated by language maintainers', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, '|transmaint|', ''); +INSERT INTO `data_security` VALUES ('system', 'System', 'RosCMS system', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '|ros_sadmin|', ''); +INSERT INTO `data_security` VALUES ('readonly', 'Read-Only', 'Read only, noone can alter this', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, '', ''); +INSERT INTO `data_security` VALUES ('langmaint', 'Language Maintainer', 'Language-Group related content', 'website', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, '|transmaint|', ''); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_stext` -- CREATE TABLE `data_stext` ( @@ -105,10 +160,22 @@ FULLTEXT KEY `stext_content` (`stext_content`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `data_stext_a` +INSERT INTO `data_stext` VALUES (14, 1, 'description', 'test page'); +INSERT INTO `data_stext` VALUES (13, 1, 'comment', ''); +INSERT INTO `data_stext` VALUES (12, 2, 'description', 'test template'); +INSERT INTO `data_stext` VALUES (15, 1, 'title', 'Index'); +INSERT INTO `data_stext` VALUES (19, 6, 'description', 'test content'); +INSERT INTO `data_stext` VALUES (18, 5, 'description', 'news php script'); +INSERT INTO `data_stext` VALUES (22, 7, 'description', 'news issue 1'); +INSERT INTO `data_stext` VALUES (23, 7, 'title', 'News_page'); +INSERT INTO `data_stext` VALUES (26, 8, 'description', 'news issue 2'); +INSERT INTO `data_stext` VALUES (27, 8, 'title', 'News_page'); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_stext_a` -- CREATE TABLE `data_stext_a` ( @@ -117,13 +184,14 @@ `stext_name` varchar(100) collate utf8_unicode_ci NOT NULL, `stext_content` varchar(255) collate utf8_unicode_ci NOT NULL, PRIMARY KEY (`stext_id`), + KEY `data_rev_id` (`data_rev_id`), FULLTEXT KEY `stext_content` (`stext_content`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `data_tag` +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_tag` -- CREATE TABLE `data_tag` ( @@ -141,10 +209,43 @@ KEY `tag_usrid` (`tag_usrid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `data_tag_name` +INSERT INTO `data_tag` VALUES (11, 1, 1, 1, 5, -1); +INSERT INTO `data_tag` VALUES (2, 1, 1, 2, 2, -1); +INSERT INTO `data_tag` VALUES (10, 2, 2, 1, 5, -1); +INSERT INTO `data_tag` VALUES (15, 4, 5, 5, 7, -1); +INSERT INTO `data_tag` VALUES (14, 4, 5, 1, 5, -1); +INSERT INTO `data_tag` VALUES (24, 3, 6, 1, 5, -1); +INSERT INTO `data_tag` VALUES (22, 5, 7, 1, 5, -1); +INSERT INTO `data_tag` VALUES (18, 5, 7, 6, 9, -1); +INSERT INTO `data_tag` VALUES (21, 5, 8, 1, 5, -1); +INSERT INTO `data_tag` VALUES (20, 5, 8, 6, 10, -1); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_tag_a` +-- + +CREATE TABLE `data_tag_a` ( + `tag_id` int(11) NOT NULL auto_increment, + `data_id` int(11) NOT NULL, + `data_rev_id` int(11) NOT NULL, + `tag_name_id` int(11) NOT NULL, + `tag_value_id` int(11) NOT NULL, + `tag_usrid` int(11) NOT NULL, + PRIMARY KEY (`tag_id`), + KEY `data_id` (`data_id`), + KEY `data_rev_id` (`data_rev_id`), + KEY `tag_name_id` (`tag_name_id`), + KEY `tag_value_id` (`tag_value_id`), + KEY `tag_usrid` (`tag_usrid`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_tag_name` -- CREATE TABLE `data_tag_name` ( @@ -153,10 +254,29 @@ PRIMARY KEY (`tn_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `data_tag_value` +INSERT INTO `data_tag_name` VALUES (1, 'status'); +INSERT INTO `data_tag_name` VALUES (2, 'extension'); +INSERT INTO `data_tag_name` VALUES (4, 'star'); +INSERT INTO `data_tag_name` VALUES (5, 'kind'); +INSERT INTO `data_tag_name` VALUES (6, 'number'); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_tag_name_a` +-- + +CREATE TABLE `data_tag_name_a` ( + `tn_id` int(11) NOT NULL auto_increment, + `tn_name` varchar(100) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`tn_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_tag_value` -- CREATE TABLE `data_tag_value` ( @@ -165,10 +285,30 @@ PRIMARY KEY (`tv_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `data_text` +INSERT INTO `data_tag_value` VALUES (7, 'php'); +INSERT INTO `data_tag_value` VALUES (2, 'html'); +INSERT INTO `data_tag_value` VALUES (4, 'off'); +INSERT INTO `data_tag_value` VALUES (5, 'stable'); +INSERT INTO `data_tag_value` VALUES (9, '1'); +INSERT INTO `data_tag_value` VALUES (10, '2'); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_tag_value_a` +-- + +CREATE TABLE `data_tag_value_a` ( + `tv_id` int(11) NOT NULL auto_increment, + `tv_value` varchar(255) collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`tv_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_text` -- CREATE TABLE `data_text` ( @@ -181,10 +321,19 @@ FULLTEXT KEY `text_content` (`text_content`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `data_text_a` +INSERT INTO `data_text` VALUES (9, 1, 'content', '[#templ_default]'); +INSERT INTO `data_text` VALUES (8, 2, 'content', '[#cont_head][#cont_menu_top][#cont_menu_side][#cont_contmenu_[#%NAME%]][#cont_menu_search][#cont_menu_language][#cont_menu_misc][#cont_%NAME%][#cont_bottom]'); +INSERT INTO `data_text` VALUES (13, 6, 'content', '<h1>Welcome to RosCMS v3</h1><p>RosCMS test page</p>[#inc_news]'); +INSERT INTO `data_text` VALUES (15, 7, 'content', 'news #1 ...'); +INSERT INTO `data_text` VALUES (17, 8, 'content', 'news #2'); +INSERT INTO `data_text` VALUES (12, 5, 'content', '<h3>News</h3> <?php $tmp_year = "2085"; $query_content = mysql_query("SELECT d.data_name, r.rev_usrid, s1.stext_content AS ''title'', s2.stext_content AS ''description'', v.tv_value as ''numb'', r.rev_date FROM data_ d, data_revision r, data_stext s1, data_stext s2, data_tag a, data_tag_name n, data_tag_value v WHERE d.data_name = ''news_page'' AND d.data_type = ''content'' AND r.data_id = d.data_id AND (r.rev_language = ''".mysql_real_escape_string($roscms_template_var_lang)."'' OR r.rev_language = ''en'') AND r.rev_version > 0 AND s1.data_rev_id = r.rev_id AND s1.stext_name = ''title'' AND s2.data_rev_id = r.rev_id AND s2.stext_name = ''description'' AND r.data_id = a.data_id AND r.rev_id = a.data_rev_id AND a.tag_usrid = ''-1'' AND a.tag_name_id = n.tn_id AND n.tn_name = ''number'' AND a.tag_value_id = v.tv_id ORDER BY r.rev_datetime DESC LIMIT 3;"); while($result_content = mysql_fetch_array($query_content)) { +if ($tmp_year > substr($result_content[''rev_date''], 0, 4)) { $tmp_year = substr($result_content[''rev_date''], 0, 4); echo "<h3>".$tmp_year."</h3>"; } $query_usraccount= mysql_query("SELECT user_name, user_fullname FROM users WHERE user_id = ''".mysql_real_escape_string($result_content["rev_usrid"])."'' LIMIT 1;"); $result_usraccount=mysql_fetch_array($query_usraccount); ?> <p align="left"><b><font color="#666666"><?php echo $result_content[''rev_date'']; ?>, <?php if ($result_usraccount[''user_fullname'']) { echo $result_usraccount[''user_fullname'']; } else { echo $result_usraccount[''user_name'']; } ?> </font></b><br /> <b><a href="<?php echo "[#link_".$result_content["data_name"]."_".$result_content["numb"]."]"; ?>"><?php echo $result_content["title"]; ?></a></b><br /> <?php echo $result_content["description"]; ?></p> <?php } // end while ?> '); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_text_a` -- CREATE TABLE `data_text_a` ( @@ -193,13 +342,14 @@ `text_name` varchar(100) collate utf8_unicode_ci NOT NULL, `text_content` text collate utf8_unicode_ci NOT NULL, PRIMARY KEY (`text_id`), + KEY `data_rev_id` (`data_rev_id`), FULLTEXT KEY `text_content` (`text_content`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `data_user_filter` +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `data_user_filter` -- CREATE TABLE `data_user_filter` ( @@ -219,118 +369,25 @@ -- -------------------------------------------------------- -- --- Tabellenstruktur fÃ¼r Tabelle `dyn_content` --- - -CREATE TABLE `dyn_content` ( - `dyn_id` bigint(20) NOT NULL auto_increment, - `dyn_content_id` bigint(20) NOT NULL default '0', - `dyn_content_nr` int(11) NOT NULL default '0', - `dyn_content_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', - `dyn_content_lang` varchar(10) collate utf8_unicode_ci NOT NULL default 'all', - `dyn_content_text1` varchar(255) collate utf8_unicode_ci NOT NULL default '', - `dyn_content_text2` varchar(255) collate utf8_unicode_ci NOT NULL default '', - `dyn_content_text3` varchar(255) collate utf8_unicode_ci NOT NULL default '', - `dyn_content_text4` longtext collate utf8_unicode_ci NOT NULL, - `dyn_content_version` int(11) NOT NULL default '0', - `dyn_content_active` tinyint(4) NOT NULL default '0', - `dyn_content_visible` tinyint(4) NOT NULL default '0', - `dyn_content_editor` varchar(10) collate utf8_unicode_ci NOT NULL default '', - `dyn_content_usrname_id` bigint(20) NOT NULL default '0', - `dyn_content_date` date NOT NULL default '0000-00-00', - `dyn_content_time` time NOT NULL default '00:00:00', - `dyn_altered` varchar(1) collate utf8_unicode_ci NOT NULL default '0', - PRIMARY KEY (`dyn_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents'; - --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `include_text` --- - -CREATE TABLE `include_text` ( - `inc_id` bigint(20) NOT NULL auto_increment, - `inc_level` tinyint(4) NOT NULL default '0', - `inc_word` varchar(255) collate utf8_unicode_ci NOT NULL default '', - `inc_text` text collate utf8_unicode_ci NOT NULL, - `inc_lang` varchar(10) collate utf8_unicode_ci NOT NULL default 'all', - `inc_extra` varchar(20) collate utf8_unicode_ci NOT NULL default '', - `inc_vis` tinyint(4) NOT NULL default '0', - `inc_seclevel` tinyint(4) NOT NULL default '50', - `inc_usrname_id` bigint(20) NOT NULL default '0', - `inc_date` date NOT NULL default '0000-00-00', - `inc_time` time NOT NULL default '00:00:00', - `inc_altered` varchar(1) collate utf8_unicode_ci NOT NULL default '0', - PRIMARY KEY (`inc_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Replace words with text phrases'; - --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `languages` +-- Tabellenstruktur für Tabelle `languages` -- CREATE TABLE `languages` ( `lang_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', `lang_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', - `lang_level` int(11) NOT NULL default '0' + `lang_name_org` varchar(100) collate utf8_unicode_ci NOT NULL, + `lang_level` int(11) NOT NULL default '0', + PRIMARY KEY (`lang_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='available languages'; --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `pages` --- - -CREATE TABLE `pages` ( - `page_id` bigint(20) NOT NULL auto_increment, - `page_name` varchar(50) collate utf8_unicode_ci NOT NULL default '', - `page_language` varchar(50) collate utf8_unicode_ci NOT NULL default '', - `pages_extra` varchar(20) collate utf8_unicode_ci NOT NULL default '', - `pages_extention` varchar(10) collate utf8_unicode_ci NOT NULL default 'default', - `page_text` text collate utf8_unicode_ci NOT NULL, - `page_version` int(11) NOT NULL default '0', - `page_active` tinyint(4) NOT NULL default '0', - `page_visible` tinyint(4) NOT NULL default '0', - `page_usrname_id` bigint(20) NOT NULL default '0', - `page_date` date NOT NULL default '0000-00-00', - `page_time` time NOT NULL default '00:00:00', - `page_generate_usrid` bigint(20) NOT NULL default '0', - `page_generate_timestamp` varchar(50) collate utf8_unicode_ci NOT NULL default '', - `page_generate_force` char(1) collate utf8_unicode_ci NOT NULL default '0', - `page_title` varchar(150) collate utf8_unicode_ci NOT NULL default '', - `page_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', - PRIMARY KEY (`page_id`), - KEY `page_generate_force` (`page_generate_force`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Pages'; - --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `roscms_security_log` --- - -CREATE TABLE `roscms_security_log` ( - `roscms_sec_log_id` bigint(20) NOT NULL auto_increment, - `roscms_sec_log_section` varchar(100) collate utf8_unicode_ci NOT NULL default '', - `roscms_sec_log_priority` int(11) NOT NULL default '100', - `roscms_sec_log_reason` varchar(255) collate utf8_unicode_ci NOT NULL default '', - `roscms_sec_log_user` varchar(100) collate utf8_unicode_ci NOT NULL default 'roscms_system', - `roscms_sec_log_useraccount` varchar(100) collate utf8_unicode_ci NOT NULL default '', - `roscms_sec_log_userip` varchar(255) collate utf8_unicode_ci NOT NULL default '', - `roscms_sec_log_referrer` varchar(255) collate utf8_unicode_ci NOT NULL default '', - `roscms_sec_log_text` text collate utf8_unicode_ci NOT NULL, - `roscms_sec_log_date` date NOT NULL default '0000-00-00', - `roscms_sec_log_time` time NOT NULL default '00:00:00', - `roscms_sec_log_visible` int(11) NOT NULL default '1', - PRIMARY KEY (`roscms_sec_log_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS Security Log'; - --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `subsys_mappings` +INSERT INTO `languages` VALUES ('en', 'English', 'English', 10); +INSERT INTO `languages` VALUES ('de', 'German', 'Deutsch', 8); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `subsys_mappings` -- CREATE TABLE `subsys_mappings` ( @@ -343,7 +400,7 @@ -- -------------------------------------------------------- -- --- Tabellenstruktur fÃ¼r Tabelle `user_sessions` +-- Tabellenstruktur für Tabelle `user_sessions` -- CREATE TABLE `user_sessions` ( @@ -359,7 +416,7 @@ -- -------------------------------------------------------- -- --- Tabellenstruktur fÃ¼r Tabelle `usergroup_members` +-- Tabellenstruktur für Tabelle `usergroup_members` -- CREATE TABLE `usergroup_members` ( @@ -370,23 +427,33 @@ -- -------------------------------------------------------- -- --- Tabellenstruktur fÃ¼r Tabelle `usergroups` +-- Tabellenstruktur für Tabelle `usergroups` -- CREATE TABLE `usergroups` ( `usrgroup_name_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', `usrgroup_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', `usrgroup_intern_id` varchar(25) collate utf8_unicode_ci NOT NULL default '', + `usrgroup_seclev` tinyint(4) NOT NULL default '0', `usrgroup_securitylevel` tinyint(4) NOT NULL default '0', `usrgroup_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', PRIMARY KEY (`usrgroup_name_id`), UNIQUE KEY `usrgroup_name` (`usrgroup_name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; --- -------------------------------------------------------- - --- --- Tabellenstruktur fÃ¼r Tabelle `users` +INSERT INTO `usergroups` VALUES ('ros_admin', 'Administrator', 'roscms_usrgrp_admin', 3, 70, 'Administrator-Group'); +INSERT INTO `usergroups` VALUES ('user', 'User', 'roscms_usrgrp_user', 0, 0, 'Normal Visitors'); +INSERT INTO `usergroups` VALUES ('developer', 'Developer', 'roscms_usrgrp_dev', 2, 50, 'Developer'); +INSERT INTO `usergroups` VALUES ('moderator', 'Moderator', 'roscms_usrgrp_team', 2, 20, 'Website Moderators'); +INSERT INTO `usergroups` VALUES ('translator', 'Translator', 'roscms_usrgrp_trans', 1, 10, 'Translators'); +INSERT INTO `usergroups` VALUES ('ros_sadmin', 'Super-Administrator', 'roscms_usrgrp_sadmin', 3, 100, 'Super-Administrator-Group'); +INSERT INTO `usergroups` VALUES ('transmaint', 'Tranlation Maintainer', 'roscms_usrgrp_trans', 2, 15, 'Translation Maintainer'); + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `users` -- CREATE TABLE `users` ( @@ -416,3 +483,4 @@ UNIQUE KEY `user_name` (`user_name`), UNIQUE KEY `user_email` (`user_email`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS User Table'; +

1 0

[hpoussin] 28338: Implement BackupEventLogA/W, ClearEventLogA/W, CloseEventLog, DeregisterEventSource, GetNumberOfEventLogRecords, GetOldestEventLogRecord, OpenBackupEventLogA/W, OpenEventLogA/W, ReadEventLogA/W, RegisterEventSourceA/W by calling appropriate method in eventlog.exe Add correct implementation for ReportEventW, but do not activate it (WIDL doesn't support the prototype)
by hpoussin＠svn.reactos.org 14 Aug '07

14 Aug '07

Author: hpoussin Date: Tue Aug 14 17:20:14 2007 New Revision: 28338 URL: http://svn.reactos.org/svn/reactos?rev=28338&view=rev Log: Implement BackupEventLogA/W, ClearEventLogA/W, CloseEventLog, DeregisterEventSource, GetNumberOfEventLogRecords, GetOldestEventLogRecord, OpenBackupEventLogA/W, OpenEventLogA/W, ReadEventLogA/W, RegisterEventSourceA/W by calling appropriate method in eventlog.exe Add correct implementation for ReportEventW, but do not activate it (WIDL doesn't support the prototype) Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c Tue Aug 14 17:20:14 2007 @@ -4,6 +4,7 @@ * Copyright 1995 Sven Verdoolaege * Copyright 1998 Juergen Schmied * Copyright 2003 Mike Hearn + * Copyright 2007 Hervé Poussineau * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,15 +26,46 @@ #include <debug.h> +typedef struct _LOG_INFO +{ + RPC_BINDING_HANDLE BindingHandle; + LOGHANDLE LogHandle; + BOOL bLocal; +} LOG_INFO, *PLOG_INFO; + /****************************************************************************** * BackupEventLogA [ADVAPI32.@] */ BOOL WINAPI -BackupEventLogA (HANDLE hEventLog, - LPCSTR lpBackupFileName) -{ - DPRINT1("stub\n"); - return TRUE; +BackupEventLogA( + IN HANDLE hEventLog, + IN LPCSTR lpBackupFileName) +{ + PLOG_INFO pLog; + NTSTATUS Status; + ANSI_STRING BackupFileName; + + DPRINT("%p, %s\n", hEventLog, lpBackupFileName); + + RtlInitAnsiString(&BackupFileName, lpBackupFileName); + + pLog = (PLOG_INFO)hEventLog; + if (!pLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + Status = ElfrBackupELFA( + pLog->BindingHandle, + pLog->LogHandle, + BackupFileName.Buffer); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + return TRUE; } /****************************************************************************** @@ -44,11 +76,35 @@ * lpBackupFileName [] */ BOOL WINAPI -BackupEventLogW (HANDLE hEventLog, - LPCWSTR lpBackupFileName) -{ - DPRINT1("stub\n"); - return TRUE; +BackupEventLogW( + IN HANDLE hEventLog, + IN LPCWSTR lpBackupFileName) +{ + PLOG_INFO pLog; + NTSTATUS Status; + UNICODE_STRING BackupFileName; + + DPRINT("%p, %s\n", hEventLog, lpBackupFileName); + + RtlInitUnicodeString(&BackupFileName, lpBackupFileName); + + pLog = (PLOG_INFO)hEventLog; + if (!pLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + Status = ElfrBackupELFW( + pLog->BindingHandle, + pLog->LogHandle, + BackupFileName.Buffer); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + return TRUE; } @@ -56,11 +112,35 @@ * ClearEventLogA [ADVAPI32.@] */ BOOL WINAPI -ClearEventLogA (HANDLE hEventLog, - LPCSTR lpBackupFileName) -{ - DPRINT1("stub\n"); - return TRUE; +ClearEventLogA( + IN HANDLE hEventLog, + IN LPCSTR lpBackupFileName) +{ + PLOG_INFO pLog; + NTSTATUS Status; + ANSI_STRING BackupFileName; + + DPRINT("%p, %s\n", hEventLog, lpBackupFileName); + + RtlInitAnsiString(&BackupFileName, lpBackupFileName); + + pLog = (PLOG_INFO)hEventLog; + if (!pLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + Status = ElfrClearELFA( + pLog->BindingHandle, + pLog->LogHandle, + BackupFileName.Buffer); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + return TRUE; } @@ -68,11 +148,35 @@ * ClearEventLogW [ADVAPI32.@] */ BOOL WINAPI -ClearEventLogW (HANDLE hEventLog, - LPCWSTR lpBackupFileName) -{ - DPRINT1("stub\n"); - return TRUE; +ClearEventLogW( + IN HANDLE hEventLog, + IN LPCWSTR lpBackupFileName) +{ + PLOG_INFO pLog; + NTSTATUS Status; + UNICODE_STRING BackupFileName; + + DPRINT("%p, %s\n", hEventLog, lpBackupFileName); + + RtlInitUnicodeString(&BackupFileName, lpBackupFileName); + + pLog = (PLOG_INFO)hEventLog; + if (!pLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + Status = ElfrClearELFW( + pLog->BindingHandle, + pLog->LogHandle, + BackupFileName.Buffer); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + return TRUE; } @@ -80,10 +184,41 @@ * CloseEventLog [ADVAPI32.@] */ BOOL WINAPI -CloseEventLog (HANDLE hEventLog) -{ - DPRINT1("stub\n"); - return TRUE; +CloseEventLog( + IN HANDLE hEventLog) +{ + PLOG_INFO pLog; + NTSTATUS Status; + + DPRINT("%p", hEventLog); + + pLog = (PLOG_INFO)hEventLog; + if (!pLog) + return TRUE; + + if (pLog->bLocal == FALSE) + { + if (!EvtUnbindRpc(pLog->BindingHandle)) + { + SetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + } + else + { + Status = ElfrCloseEL( + pLog->BindingHandle, + &pLog->LogHandle); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + + HeapFree(GetProcessHeap(), 0, pLog); + + return TRUE; } @@ -100,21 +235,18 @@ DeregisterEventSource( IN HANDLE hEventLog) { - RPC_BINDING_HANDLE BindingHandle = NULL; - LOGHANDLE Handle = (LOGHANDLE)hEventLog; + PLOG_INFO pLog; NTSTATUS Status; DPRINT("%p\n", hEventLog); - if (!EvtGetLocalHandle(&BindingHandle)) - { - SetLastError(ERROR_GEN_FAILURE); - return FALSE; - } + pLog = (PLOG_INFO)hEventLog; + if (!pLog) + return TRUE; Status = ElfrDeregisterEventSource( - BindingHandle, - &Handle); + pLog->BindingHandle, + &pLog->LogHandle); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -132,11 +264,34 @@ * NumberOfRecords [] */ BOOL WINAPI -GetNumberOfEventLogRecords (HANDLE hEventLog, - PDWORD NumberOfRecords) -{ - DPRINT1("stub\n"); - return TRUE; +GetNumberOfEventLogRecords( + IN HANDLE hEventLog, + OUT PDWORD NumberOfRecords) +{ + PLOG_INFO pLog; + NTSTATUS Status; + long Records; + + DPRINT("%p, %p\n", hEventLog, NumberOfRecords); + + pLog = (PLOG_INFO)hEventLog; + if (!pLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + Status = ElfrNumberOfRecords( + pLog->BindingHandle, + pLog->LogHandle, + &Records); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + *NumberOfRecords = Records; + return TRUE; } @@ -148,11 +303,34 @@ * OldestRecord [] */ BOOL WINAPI -GetOldestEventLogRecord (HANDLE hEventLog, - PDWORD OldestRecord) -{ - DPRINT1("stub\n"); - return TRUE; +GetOldestEventLogRecord( + IN HANDLE hEventLog, + OUT PDWORD OldestRecord) +{ + PLOG_INFO pLog; + NTSTATUS Status; + long Oldest; + + DPRINT("%p, %p\n", hEventLog, OldestRecord); + + pLog = (PLOG_INFO)hEventLog; + if (!pLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + Status = ElfrOldestRecord( + pLog->BindingHandle, + pLog->LogHandle, + &Oldest); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + *OldestRecord = Oldest; + return TRUE; } @@ -164,11 +342,14 @@ * hEvent [] */ BOOL WINAPI -NotifyChangeEventLog (HANDLE hEventLog, - HANDLE hEvent) -{ - DPRINT1("stub\n"); - return TRUE; +NotifyChangeEventLog( + IN HANDLE hEventLog, + IN HANDLE hEvent) +{ + /* Use ElfrChangeNotify */ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } @@ -176,11 +357,36 @@ * OpenBackupEventLogA [ADVAPI32.@] */ HANDLE WINAPI -OpenBackupEventLogA (LPCSTR lpUNCServerName, - LPCSTR lpFileName) -{ - DPRINT1("stub\n"); - return (HANDLE)1; +OpenBackupEventLogA( + IN LPCSTR lpUNCServerName, + IN LPCSTR lpFileName) +{ + UNICODE_STRING UNCServerName; + UNICODE_STRING FileName; + HANDLE Handle; + + DPRINT("%s, %s\n", lpUNCServerName, lpFileName); + + if (!RtlCreateUnicodeStringFromAsciiz(&UNCServerName, lpUNCServerName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + if (!RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName)) + { + RtlFreeUnicodeString(&UNCServerName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + Handle = OpenBackupEventLogW( + UNCServerName.Buffer, + FileName.Buffer); + + RtlFreeUnicodeString(&UNCServerName); + RtlFreeUnicodeString(&FileName); + + return Handle; } @@ -192,11 +398,66 @@ * lpFileName [] */ HANDLE WINAPI -OpenBackupEventLogW (LPCWSTR lpUNCServerName, - LPCWSTR lpFileName) -{ - DPRINT1("stub\n"); - return (HANDLE)1; +OpenBackupEventLogW( + IN LPCWSTR lpUNCServerName, + IN LPCWSTR lpFileName) +{ + PLOG_INFO pLog; + NTSTATUS Status; + UNICODE_STRING UNCServerName; + UNICODE_STRING FileName; + + DPRINT("%s, %s\n", lpUNCServerName, lpFileName); + + RtlInitUnicodeString(&UNCServerName, lpUNCServerName); + RtlInitUnicodeString(&FileName, lpFileName); + + pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); + if (!pLog) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + ZeroMemory(pLog, sizeof(LOG_INFO)); + + if (lpUNCServerName == NULL || *lpUNCServerName == 0) + { + pLog->bLocal = TRUE; + + if (!EvtGetLocalHandle(&pLog->BindingHandle)) + { + HeapFree(GetProcessHeap(), 0, pLog); + SetLastError(ERROR_GEN_FAILURE); + return NULL; + } + } + else + { + pLog->bLocal = FALSE; + + if (!EvtBindRpc(lpUNCServerName, &pLog->BindingHandle)) + { + HeapFree(GetProcessHeap(), 0, pLog); + SetLastError(ERROR_INVALID_COMPUTERNAME); + return NULL; + } + } + + Status = ElfrOpenBELW( + pLog->BindingHandle, + UNCServerName.Buffer, + FileName.Buffer, + 0, + 0, + &pLog->LogHandle); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + HeapFree(GetProcessHeap(), 0, pLog); + return NULL; + } + return pLog; } @@ -204,12 +465,32 @@ * OpenEventLogA [ADVAPI32.@] */ HANDLE WINAPI -OpenEventLogA (LPCSTR lpUNCServerName, - LPCSTR lpSourceName) -{ - DPRINT1("(%s,%s),stub!\n", - lpUNCServerName, lpSourceName); - return (HANDLE)0xcafe4242; +OpenEventLogA( + IN LPCSTR lpUNCServerName, + IN LPCSTR lpSourceName) +{ + UNICODE_STRING UNCServerName; + UNICODE_STRING SourceName; + HANDLE Handle; + + if (!RtlCreateUnicodeStringFromAsciiz(&UNCServerName, lpUNCServerName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + if (!RtlCreateUnicodeStringFromAsciiz(&SourceName, lpSourceName)) + { + RtlFreeUnicodeString(&UNCServerName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + Handle = OpenEventLogW(UNCServerName.Buffer, SourceName.Buffer); + + RtlFreeUnicodeString(&UNCServerName); + RtlFreeUnicodeString(&SourceName); + + return Handle; } @@ -217,15 +498,71 @@ * OpenEventLogW [ADVAPI32.@] * * PARAMS - * uncname [] - * source [] + * lpUNCServerName [] + * lpSourceName [] */ HANDLE WINAPI -OpenEventLogW (LPCWSTR lpUNCServerName, - LPCWSTR lpSourceName) -{ - DPRINT1("stub\n"); - return (HANDLE)1; +OpenEventLogW( + IN LPCWSTR lpUNCServerName, + IN LPCWSTR lpSourceName) +{ + PLOG_INFO pLog; + NTSTATUS Status; + UNICODE_STRING UNCServerName; + UNICODE_STRING SourceName; + + DPRINT("%s, %s\n", lpUNCServerName, lpSourceName); + + RtlInitUnicodeString(&UNCServerName, lpUNCServerName); + RtlInitUnicodeString(&SourceName, lpSourceName); + + pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); + if (!pLog) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + ZeroMemory(pLog, sizeof(LOG_INFO)); + + if (lpUNCServerName == NULL || *lpUNCServerName == 0) + { + pLog->bLocal = TRUE; + + if (!EvtGetLocalHandle(&pLog->BindingHandle)) + { + HeapFree(GetProcessHeap(), 0, pLog); + SetLastError(ERROR_GEN_FAILURE); + return NULL; + } + } + else + { + pLog->bLocal = FALSE; + + if (!EvtBindRpc(lpUNCServerName, &pLog->BindingHandle)) + { + HeapFree(GetProcessHeap(), 0, pLog); + SetLastError(ERROR_INVALID_COMPUTERNAME); + return NULL; + } + } + + Status = ElfrOpenELW( + pLog->BindingHandle, + UNCServerName.Buffer, + SourceName.Buffer, + NULL, + 0, + 0, + &pLog->LogHandle); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + HeapFree(GetProcessHeap(), 0, pLog); + return NULL; + } + return pLog; } @@ -233,16 +570,47 @@ * ReadEventLogA [ADVAPI32.@] */ BOOL WINAPI -ReadEventLogA (HANDLE hEventLog, - DWORD dwReadFlags, - DWORD dwRecordOffset, - LPVOID lpBuffer, - DWORD nNumberOfBytesToRead, - DWORD *pnBytesRead, - DWORD *pnMinNumberOfBytesNeeded) -{ - DPRINT1("stub\n"); - return TRUE; +ReadEventLogA( + IN HANDLE hEventLog, + IN DWORD dwReadFlags, + IN DWORD dwRecordOffset, + OUT LPVOID lpBuffer, + IN DWORD nNumberOfBytesToRead, + OUT DWORD *pnBytesRead, + OUT DWORD *pnMinNumberOfBytesNeeded) +{ + PLOG_INFO pLog; + NTSTATUS Status; + long bytesRead, minNumberOfBytesNeeded; + + DPRINT("%p, %lu, %lu, %p, %lu, %p, %p\n", + hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, + nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); + + pLog = (PLOG_INFO)hEventLog; + if (!pLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + Status = ElfrReadELA( + pLog->BindingHandle, + pLog->LogHandle, + dwReadFlags, + dwRecordOffset, + nNumberOfBytesToRead, + lpBuffer, + &bytesRead, + &minNumberOfBytesNeeded); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + *pnBytesRead = (DWORD)bytesRead; + *pnMinNumberOfBytesNeeded = (DWORD)minNumberOfBytesNeeded; + return TRUE; } @@ -259,16 +627,47 @@ * pnMinNumberOfBytesNeeded [] */ BOOL WINAPI -ReadEventLogW (HANDLE hEventLog, - DWORD dwReadFlags, - DWORD dwRecordOffset, - LPVOID lpBuffer, - DWORD nNumberOfBytesToRead, - DWORD *pnBytesRead, - DWORD *pnMinNumberOfBytesNeeded) -{ - DPRINT1("stub\n"); - return TRUE; +ReadEventLogW( + IN HANDLE hEventLog, + IN DWORD dwReadFlags, + IN DWORD dwRecordOffset, + OUT LPVOID lpBuffer, + IN DWORD nNumberOfBytesToRead, + OUT DWORD *pnBytesRead, + OUT DWORD *pnMinNumberOfBytesNeeded) +{ + PLOG_INFO pLog; + NTSTATUS Status; + long bytesRead, minNumberOfBytesNeeded; + + DPRINT("%p, %lu, %lu, %p, %lu, %p, %p\n", + hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, + nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); + + pLog = (PLOG_INFO)hEventLog; + if (!pLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + Status = ElfrReadELW( + pLog->BindingHandle, + pLog->LogHandle, + dwReadFlags, + dwRecordOffset, + nNumberOfBytesToRead, + lpBuffer, + &bytesRead, + &minNumberOfBytesNeeded); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + *pnBytesRead = (DWORD)bytesRead; + *pnMinNumberOfBytesNeeded = (DWORD)minNumberOfBytesNeeded; + return TRUE; } @@ -276,25 +675,34 @@ * RegisterEventSourceA [ADVAPI32.@] */ HANDLE WINAPI -RegisterEventSourceA (LPCSTR lpUNCServerName, - LPCSTR lpSourceName) -{ - UNICODE_STRING UNCServerName; - UNICODE_STRING SourceName; - HANDLE ret; - - RtlCreateUnicodeStringFromAsciiz (&UNCServerName, - (PSTR)lpUNCServerName); - RtlCreateUnicodeStringFromAsciiz (&SourceName, - (PSTR)lpSourceName); - - ret = RegisterEventSourceW (UNCServerName.Buffer, - SourceName.Buffer); - - RtlFreeUnicodeString (&UNCServerName); - RtlFreeUnicodeString (&SourceName); - - return ret; +RegisterEventSourceA( + IN LPCSTR lpUNCServerName, + IN LPCSTR lpSourceName) +{ + UNICODE_STRING UNCServerName; + UNICODE_STRING SourceName; + HANDLE Handle; + + DPRINT("%s, %s\n", lpUNCServerName, lpSourceName); + + if (!RtlCreateUnicodeStringFromAsciiz(&UNCServerName, lpUNCServerName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + if (!RtlCreateUnicodeStringFromAsciiz(&SourceName, lpSourceName)) + { + RtlFreeUnicodeString(&UNCServerName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + Handle = RegisterEventSourceW(UNCServerName.Buffer, SourceName.Buffer); + + RtlFreeUnicodeString(&UNCServerName); + RtlFreeUnicodeString(&SourceName); + + return Handle; } @@ -315,40 +723,63 @@ IN LPCWSTR lpUNCServerName, IN LPCWSTR lpSourceName) { - RPC_BINDING_HANDLE BindingHandle = NULL; - LOGHANDLE Handle; - NTSTATUS Status; - - DPRINT("%S, %S\n", lpUNCServerName, lpSourceName); - - if (lpUNCServerName != NULL) - { - DPRINT1("lpUNCServerName argument not supported\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return NULL; - } - - if (!EvtGetLocalHandle(&BindingHandle)) - { - SetLastError(ERROR_GEN_FAILURE); - return NULL; + PLOG_INFO pLog; + NTSTATUS Status; + UNICODE_STRING UNCServerName; + UNICODE_STRING SourceName; + + DPRINT("%s, %s\n", lpUNCServerName, lpSourceName); + + RtlInitUnicodeString(&UNCServerName, lpUNCServerName); + RtlInitUnicodeString(&SourceName, lpSourceName); + + pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); + if (!pLog) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + ZeroMemory(pLog, sizeof(LOG_INFO)); + + if (lpUNCServerName == NULL || *lpUNCServerName == 0) + { + pLog->bLocal = TRUE; + + if (!EvtGetLocalHandle(&pLog->BindingHandle)) + { + HeapFree(GetProcessHeap(), 0, pLog); + SetLastError(ERROR_GEN_FAILURE); + return NULL; + } + } + else + { + pLog->bLocal = FALSE; + + if (!EvtBindRpc(lpUNCServerName, &pLog->BindingHandle)) + { + HeapFree(GetProcessHeap(), 0, pLog); + SetLastError(ERROR_INVALID_COMPUTERNAME); + return NULL; + } } Status = ElfrRegisterEventSourceW( - BindingHandle, - (LPWSTR)lpUNCServerName, - (LPWSTR)lpSourceName, + pLog->BindingHandle, + UNCServerName.Buffer, + SourceName.Buffer, L"", 0, 0, - &Handle); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return NULL; - } - - return (HANDLE)Handle; + &pLog->LogHandle); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + HeapFree(GetProcessHeap(), 0, pLog); + return NULL; + } + return pLog; } @@ -356,63 +787,76 @@ * ReportEventA [ADVAPI32.@] */ BOOL WINAPI -ReportEventA (HANDLE hEventLog, - WORD wType, - WORD wCategory, - DWORD dwEventID, - PSID lpUserSid, - WORD wNumStrings, - DWORD dwDataSize, - LPCSTR *lpStrings, - LPVOID lpRawData) -{ - LPCWSTR *wideStrArray; - UNICODE_STRING str; - int i; - BOOL ret; - - if (wNumStrings == 0) - return TRUE; - - if (lpStrings == NULL) - return TRUE; - - wideStrArray = HeapAlloc (GetProcessHeap (), - 0, - sizeof(LPCWSTR) * wNumStrings); - - for (i = 0; i < wNumStrings; i++) - { - RtlCreateUnicodeStringFromAsciiz (&str, - (PSTR)lpStrings[i]); +ReportEventA( + IN HANDLE hEventLog, + IN WORD wType, + IN WORD wCategory, + IN DWORD dwEventID, + IN PSID lpUserSid, + IN WORD wNumStrings, + IN DWORD dwDataSize, + IN LPCSTR *lpStrings, + IN LPVOID lpRawData) +{ + LPCWSTR *wideStrArray; + UNICODE_STRING str; + WORD i; + BOOL ret; + + if (wNumStrings == 0) + return TRUE; + + if (lpStrings == NULL) + return TRUE; + + wideStrArray = HeapAlloc( + GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(LPCWSTR) * wNumStrings); + + for (i = 0; i < wNumStrings; i++) + { + if (!RtlCreateUnicodeStringFromAsciiz(&str, (PSTR)lpStrings[i])) + break; wideStrArray[i] = str.Buffer; } - ret = ReportEventW (hEventLog, - wType, - wCategory, - dwEventID, - lpUserSid, - wNumStrings, - dwDataSize, - wideStrArray, - lpRawData); - - for (i = 0; i < wNumStrings; i++) - { - if (wideStrArray[i]) - { - HeapFree (GetProcessHeap (), - 0, - (LPSTR)wideStrArray[i]); - } - } - - HeapFree (GetProcessHeap(), - 0, - wideStrArray); - - return ret; + if (i == wNumStrings) + { + ret = ReportEventW( + hEventLog, + wType, + wCategory, + dwEventID, + lpUserSid, + wNumStrings, + dwDataSize, + wideStrArray, + lpRawData); + } + else + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ret = FALSE; + } + + for (i = 0; i < wNumStrings; i++) + { + if (wideStrArray[i]) + { + HeapFree( + GetProcessHeap(), + 0, + (PVOID)wideStrArray[i]); + } + } + + HeapFree( + GetProcessHeap(), + 0, + wideStrArray); + + return ret; } @@ -431,16 +875,71 @@ * lpRawData [] */ BOOL WINAPI -ReportEventW (HANDLE hEventLog, - WORD wType, - WORD wCategory, - DWORD dwEventID, - PSID lpUserSid, - WORD wNumStrings, - DWORD dwDataSize, - LPCWSTR *lpStrings, - LPVOID lpRawData) -{ +ReportEventW( + IN HANDLE hEventLog, + IN WORD wType, + IN WORD wCategory, + IN DWORD dwEventID, + IN PSID lpUserSid, + IN WORD wNumStrings, + IN DWORD dwDataSize, + IN LPCWSTR *lpStrings, + IN LPVOID lpRawData) +{ +#if 0 + PLOG_INFO pLog; + NTSTATUS Status; + UNICODE_STRING *Strings; + WORD i; + + DPRINT("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n", + hEventLog, wType, wCategory, dwEventID, lpUserSid, + wNumStrings, dwDataSize, lpStrings, lpRawData); + + pLog = (PLOG_INFO)hEventLog; + if (!pLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + Strings = HeapAlloc( + GetProcessHeap(), + 0, + wNumStrings * sizeof(UNICODE_STRING)); + if (!Strings) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + for (i = 0; i < wNumStrings; i++) + RtlInitUnicodeString(&Strings[i], lpStrings[i]); + + Status = ElfrReportEventW( + pLog->BindingHandle, + pLog->LogHandle, + 0, /* FIXME: Time */ + wType, + wCategory, + dwEventID, + wNumStrings, + dwDataSize, + L"", /* FIXME: ComputerName */ + lpUserSid, + (LPWSTR *)lpStrings, /* FIXME: should be Strings */ + lpRawData, + 0, + NULL, + NULL); + HeapFree(GetProcessHeap(), 0, Strings); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + return TRUE; +#else int i; /* partial stub */ @@ -478,4 +977,5 @@ } return TRUE; -} +#endif +}

1 0

[hpoussin] 28337: Forward RegisterEventSourceW and DeregisterEventSource to eventlog service
by hpoussin＠svn.reactos.org 14 Aug '07

14 Aug '07

Author: hpoussin Date: Tue Aug 14 12:49:29 2007 New Revision: 28337 URL: http://svn.reactos.org/svn/reactos?rev=28337&view=rev Log: Forward RegisterEventSourceW and DeregisterEventSource to eventlog service Added: trunk/reactos/dll/win32/advapi32/service/rpc.c - copied, changed from r28297, trunk/reactos/dll/win32/setupapi/rpc.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/advapi32/advapi32.rbuild trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/advapi32/service/eventlog.c trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.h (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.h Tue Aug 14 12:49:29 2007 @@ -28,6 +28,7 @@ #include <services/services.h> #include "svcctl_c.h" #include "lsa_c.h" +#include "eventlogrpc_c.h" #ifndef HAS_FN_PROGRESSW #define FN_PROGRESSW FN_PROGRESS @@ -35,6 +36,16 @@ #ifndef HAS_FN_PROGRESSA #define FN_PROGRESSA FN_PROGRESS #endif + +/* rpc.c */ + +RPC_STATUS EvtBindRpc(LPCWSTR pszMachine, + RPC_BINDING_HANDLE* BindingHandle); +RPC_STATUS EvtUnbindRpc(RPC_BINDING_HANDLE *BindingHandle); + +BOOL +EvtGetLocalHandle(RPC_BINDING_HANDLE *BindingHandle); +RPC_STATUS EvtUnbindLocalHandle(void); /* Interface to ntmarta.dll **************************************************/ Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.rbuild (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild Tue Aug 14 12:49:29 2007 @@ -4,6 +4,7 @@ <include base="advapi32">.</include> <include base="scm_client">.</include> <include base="lsa_client">.</include> + <include base="eventlog_client">.</include> <define name="__USE_W32API" /> <define name="WINVER">0x600</define> <define name="_WIN32_IE">0x0500</define> @@ -12,6 +13,7 @@ <define name="_UNICODE"></define> <library>scm_client</library> <library>lsa_client</library> + <library>eventlog_client</library> <library>ntdll</library> <library>rpcrt4</library> <library>wine</library> @@ -49,6 +51,7 @@ </directory> <directory name="service"> <file>eventlog.c</file> + <file>rpc.c</file> <file>scm.c</file> <file>sctrl.c</file> <file>undoc.c</file> Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c Tue Aug 14 12:49:29 2007 @@ -899,7 +899,7 @@ PSID_NAME_USE peUse ) { LSA_UNICODE_STRING SystemName; - LSA_OBJECT_ATTRIBUTES ObjectAttributes = {0}; + LSA_OBJECT_ATTRIBUTES ObjectAttributes = {0}; LSA_HANDLE PolicyHandle = NULL; NTSTATUS Status; PLSA_REFERENCED_DOMAIN_LIST ReferencedDomain = NULL; Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c Tue Aug 14 12:49:29 2007 @@ -97,10 +97,30 @@ * RETURNS STD */ BOOL WINAPI -DeregisterEventSource (HANDLE hEventLog) -{ - DPRINT1("(%p): stub\n",hEventLog); - return TRUE; +DeregisterEventSource( + IN HANDLE hEventLog) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + LOGHANDLE Handle = (LOGHANDLE)hEventLog; + NTSTATUS Status; + + DPRINT("%p\n", hEventLog); + + if (!EvtGetLocalHandle(&BindingHandle)) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + + Status = ElfrDeregisterEventSource( + BindingHandle, + &Handle); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + return TRUE; } @@ -291,12 +311,44 @@ * Failure: NULL */ HANDLE WINAPI -RegisterEventSourceW (LPCWSTR lpUNCServerName, - LPCWSTR lpSourceName) -{ - DPRINT1("(%S, %S): stub\n", - lpUNCServerName, lpSourceName); - return (HANDLE)1; +RegisterEventSourceW( + IN LPCWSTR lpUNCServerName, + IN LPCWSTR lpSourceName) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + LOGHANDLE Handle; + NTSTATUS Status; + + DPRINT("%S, %S\n", lpUNCServerName, lpSourceName); + + if (lpUNCServerName != NULL) + { + DPRINT1("lpUNCServerName argument not supported\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; + } + + if (!EvtGetLocalHandle(&BindingHandle)) + { + SetLastError(ERROR_GEN_FAILURE); + return NULL; + } + + Status = ElfrRegisterEventSourceW( + BindingHandle, + (LPWSTR)lpUNCServerName, + (LPWSTR)lpSourceName, + L"", + 0, + 0, + &Handle); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return NULL; + } + + return (HANDLE)Handle; } @@ -415,6 +467,10 @@ DPRINT1("Warning: %S\n", lpStrings[i]); break; + case EVENTLOG_INFORMATION_TYPE: + DPRINT1("Info: %S\n", lpStrings[i]); + break; + default: DPRINT1("Type %hu: %S\n", wType, lpStrings[i]); break; Copied: trunk/reactos/dll/win32/advapi32/service/rpc.c (from r28297, trunk/reactos/dll/win32/setupapi/rpc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/setupapi/rpc.c (original) +++ trunk/reactos/dll/win32/advapi32/service/rpc.c Tue Aug 14 12:49:29 2007 @@ -1,33 +1,19 @@ /* - * RPC support routines - * - * Copyright 2005 Eric Kohl - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/advapi32/service/rpc.c + * PURPOSE: RPC support routines + * PROGRAMMER: Eric Kohl */ -#include "setupapi_private.h" +/* INCLUDES ******************************************************************/ -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +#include <advapi32.h> static RPC_BINDING_HANDLE LocalBindingHandle = NULL; -static HSTRING_TABLE LocalStringTable = NULL; - RPC_STATUS -PnpBindRpc(LPCWSTR pszMachine, +EvtBindRpc(LPCWSTR pszMachine, RPC_BINDING_HANDLE* BindingHandle) { PWSTR pszStringBinding = NULL; @@ -36,7 +22,7 @@ Status = RpcStringBindingComposeW(NULL, L"ncacn_np", (LPWSTR)pszMachine, - L"\\pipe\\umpnpmgr", + L"\\pipe\\EventLog", NULL, &pszStringBinding); if (Status != RPC_S_OK) @@ -50,9 +36,8 @@ return Status; } - RPC_STATUS -PnpUnbindRpc(RPC_BINDING_HANDLE *BindingHandle) +EvtUnbindRpc(RPC_BINDING_HANDLE *BindingHandle) { if (BindingHandle != NULL) { @@ -63,52 +48,31 @@ return RPC_S_OK; } - BOOL -PnpGetLocalHandles(RPC_BINDING_HANDLE *BindingHandle, - HSTRING_TABLE *StringTable) +EvtGetLocalHandle(RPC_BINDING_HANDLE *BindingHandle) { if (LocalBindingHandle != NULL) { if (BindingHandle != NULL) *BindingHandle = LocalBindingHandle; - if (StringTable != NULL) - *StringTable = LocalStringTable; - return TRUE; } - LocalStringTable = StringTableInitialize(); - if (LocalStringTable == NULL) + if (EvtBindRpc(NULL, &LocalBindingHandle) != RPC_S_OK) return FALSE; - - if (PnpBindRpc(NULL, &LocalBindingHandle) != RPC_S_OK) - { - StringTableDestroy(LocalStringTable); - return FALSE; - } - - StringTableAddString(LocalStringTable, L"PLT", 1); if (BindingHandle != NULL) *BindingHandle = LocalBindingHandle; - if (StringTable != NULL) - *StringTable = LocalStringTable; - return TRUE; } - RPC_STATUS -PnpUnbindLocalBindingHandle(VOID) +EvtUnbindLocalHandle(VOID) { - StringTableDestroy(LocalStringTable); - LocalStringTable = NULL; - return PnpUnbindRpc(&LocalBindingHandle); + return EvtUnbindRpc(&LocalBindingHandle); } - void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Tue Aug 14 12:49:29 2007 @@ -2163,16 +2163,4 @@ return TRUE; } - -void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - - -void __RPC_USER midl_user_free(void __RPC_FAR * ptr) -{ - HeapFree(GetProcessHeap(), 0, ptr); -} - /* EOF */

1 0

[hpoussin] 28336: Start the RPC server in eventlog service
by hpoussin＠svn.reactos.org 14 Aug '07

14 Aug '07

Author: hpoussin Date: Tue Aug 14 12:48:02 2007 New Revision: 28336 URL: http://svn.reactos.org/svn/reactos?rev=28336&view=rev Log: Start the RPC server in eventlog service Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c (original) +++ trunk/reactos/base/services/eventlog/eventlog.c Tue Aug 14 12:48:02 2007 @@ -43,7 +43,6 @@ else CloseHandle(hThread); -#ifdef RPC_ENABLED hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) @@ -56,7 +55,6 @@ DPRINT("Can't create RpcThread\n"); else CloseHandle(hThread); -#endif } BOOL LoadLogFile(HKEY hKey, WCHAR * LogName) Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c (original) +++ trunk/reactos/base/services/eventlog/rpc.c Tue Aug 14 12:48:02 2007 @@ -9,7 +9,15 @@ /* INCLUDES *****************************************************************/ #include "eventlog.h" -#ifdef RPC_ENABLED + +#ifdef __GNUC__ +/* HACK as long as idl compiler doesn't support well PUNICODE_STRING args */ +#define PANSI_STRING LPSTR +#define PUNICODE_STRING LPWSTR +#define BINDING_HANDLE handle_t BindingHandle, +#else +#define BINDING_HANDLE +#endif /* FUNCTIONS ****************************************************************/ @@ -46,73 +54,80 @@ return 0; } -/* Function 0 */ +/* Function 0x00 */ NTSTATUS ElfrClearELFW( + BINDING_HANDLE /* [in] */ LOGHANDLE Handle, /* [in] */ PUNICODE_STRING BackupName) { - DPRINT("UNIMPLEMENTED"); - return STATUS_NOT_IMPLEMENTED; -} - -/* Function 1 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 0x01 */ NTSTATUS ElfrBackupELFW( + BINDING_HANDLE /* [in] */ LOGHANDLE Handle, /* [in] */ PUNICODE_STRING BackupName) { - DPRINT("UNIMPLEMENTED"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 2 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x02 */ NTSTATUS ElfrCloseEL( + BINDING_HANDLE /* [out][in] */ PLOGHANDLE Handle) { - DPRINT("UNIMPLEMENTED"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 3 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x03 */ NTSTATUS ElfrDeregisterEventSource( + BINDING_HANDLE /* [out][in] */ PLOGHANDLE Handle) { - DPRINT("UNIMPLEMENTED"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 4 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x04 */ NTSTATUS ElfrNumberOfRecords( + BINDING_HANDLE /* [in] */ LOGHANDLE Handle, /* [out] */ long __RPC_FAR * NumberOfRecords) { - DPRINT("UNIMPLEMENTED"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 5 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x05 */ NTSTATUS ElfrOldestRecord( + BINDING_HANDLE /* [in] */ LOGHANDLE LogHandle, /* [out] */ long __RPC_FAR * OldestRecNumber) { - DPRINT("EventLogGetOldestRec UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 6 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x06 */ NTSTATUS ElfrChangeNotify(void) { - DPRINT("EventLogChangeNotify UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 7 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x07 */ NTSTATUS ElfrOpenELW( + BINDING_HANDLE /* [unique][in] */ LPWSTR ServerName, /* [in] */ PUNICODE_STRING FileName, /* [in] */ PUNICODE_STRING NullStr, @@ -120,13 +135,14 @@ /* [in] */ long MinorVer, /* [out] */ PLOGHANDLE Handle) { - DPRINT("EventLogOpenW UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 8 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x08 */ NTSTATUS ElfrRegisterEventSourceW( + BINDING_HANDLE /* [unique][in] */ LPWSTR ServerName, /* [in] */ PUNICODE_STRING LogName, /* [in] */ PUNICODE_STRING NullStr, @@ -134,26 +150,28 @@ /* [in] */ long MinorVer, /* [out] */ PLOGHANDLE Handle) { - DPRINT("EventLogRegSrcW UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 9 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x09 */ NTSTATUS ElfrOpenBELW( + BINDING_HANDLE /* [unique][in] */ LPWSTR ServerName, /* [in] */ PUNICODE_STRING BackupName, /* [in] */ long MajorVer, /* [in] */ long MinorVer, /* [out] */ PLOGHANDLE Handle) { - DPRINT("EventLogOpenBackupW UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 10 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x0a */ NTSTATUS ElfrReadELW( + BINDING_HANDLE /* [in] */ LOGHANDLE Handle, /* [in] */ long Flags, /* [in] */ long Offset, @@ -162,13 +180,14 @@ /* [out] */ long __RPC_FAR * BytesRead, /* [out] */ long __RPC_FAR * BytesNeeded) { - DPRINT("EventLogReadW UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 11 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x0b */ NTSTATUS ElfrReportEventW( + BINDING_HANDLE /* [in] */ LOGHANDLE Handle, /* [in] */ long Time, /* [in] */ short Type, @@ -184,33 +203,36 @@ /* [unique][out][in] */ long __RPC_FAR * unknown1, /* [unique][out][in] */ long __RPC_FAR * unknown2) { - DPRINT("EventLogReportEventW UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 12 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x0c */ NTSTATUS ElfrClearELFA( + BINDING_HANDLE /* [in] */ LOGHANDLE Handle, /* [unique][in] */ PANSI_STRING BackupName) { - DPRINT("EventLogClearA UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 13 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x0d */ NTSTATUS ElfrBackupELFA( + BINDING_HANDLE /* [in] */ LOGHANDLE Handle, /* [in] */ PANSI_STRING BackupName) { - DPRINT("EventLogBackupA UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 14 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x0e */ NTSTATUS ElfrOpenELA( + BINDING_HANDLE /* [unique][in] */ LPSTR ServerName, /* [in] */ PANSI_STRING LogName, /* [in] */ PANSI_STRING NullStr, @@ -218,7 +240,7 @@ /* [in] */ long MinorVer, /* [out] */ PLOGHANDLE Handle) { - UNICODE_STRING logname = { 0 }, servername = { 0 }, StrNull = { 0 }; + UNICODE_STRING logname = { 0, }, servername = { 0, }, StrNull = { 0, }; NTSTATUS status; if (LogName && !RtlCreateUnicodeStringFromAsciiz(&logname, LogName)) @@ -233,8 +255,8 @@ return STATUS_NO_MEMORY; } - status = EventLogOpenW(servername.Buffer, logname.Buffer, - StrNull, MajorVer, MinorVer, Handle); + status = ElfrOpenELW(BindingHandle, servername.Buffer, logname.Buffer, + StrNull.Buffer, MajorVer, MinorVer, Handle); RtlFreeUnicodeString(&servername); RtlFreeUnicodeString(&logname); @@ -243,8 +265,9 @@ } -/* Function 15 */ +/* Function 0x0f */ NTSTATUS ElfrRegisterEventSourceA( + BINDING_HANDLE /* [unique][in] */ LPSTR ServerName, /* [in] */ PANSI_STRING LogName, /* [in] */ PANSI_STRING NullStr, @@ -252,26 +275,28 @@ /* [in] */ long MinorVer, /* [out] */ PLOGHANDLE Handle) { - DPRINT("EventLogRegSrcA UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 16 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x10 */ NTSTATUS ElfrOpenBELA( + BINDING_HANDLE /* [unique][in] */ LPSTR ServerName, /* [in] */ PANSI_STRING BakckupName, /* [in] */ long MajorVer, /* [in] */ long MinorVer, /* [out] */ PLOGHANDLE Handle) { - DPRINT("EventLogOpenBackupA UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 17 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x11 */ NTSTATUS ElfrReadELA( + BINDING_HANDLE /* [in] */ LOGHANDLE Handle, /* [in] */ long Flags, /* [in] */ long Offset, @@ -280,13 +305,14 @@ /* [out] */ long __RPC_FAR * BytesRead, /* [out] */ long __RPC_FAR * BytesNeeded) { - DPRINT("EventLogReadA UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 18 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x12 */ NTSTATUS ElfrReportEventA( + BINDING_HANDLE /* [in] */ LOGHANDLE Handle, /* [in] */ long Time, /* [in] */ short Type, @@ -302,60 +328,58 @@ /* [unique][out][in] */ long __RPC_FAR * unknown1, /* [unique][out][in] */ long __RPC_FAR * unknown2) { - DPRINT("EventLogReportEventA UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 19 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x13 */ NTSTATUS ElfrRegisterClusterSvc(void) { - DPRINT("EventLogRegisterClusterSvc UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 20 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x14 */ NTSTATUS ElfrDeregisterClusterSvc(void) { - DPRINT("EventLogDeregisterClusterSvc UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 21 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x15 */ NTSTATUS ElfrWriteClusterEvents(void) { - DPRINT("EventLogWriteClusterEvents UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 22 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x16 */ NTSTATUS ElfrGetLogInformation( + BINDING_HANDLE /* [in] */ LOGHANDLE Handle, /* [in] */ long InfoLevel, /* [size_is][out] */unsigned char __RPC_FAR * Buffer, /* [in] */ long BufSize, /* [out] */ long __RPC_FAR * BytesNeeded) { - DPRINT("EventLogGetInfo UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 23 */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 0x17 */ NTSTATUS ElfrFlushEL( + BINDING_HANDLE /* [in] */ LOGHANDLE Handle) { DbgPrint("EventLogFlush UNIMPLEMENTED\n"); return STATUS_NOT_IMPLEMENTED; } -#else -void func(handle_t h) { } -#endif // RPC_ENABLED - void __RPC_FAR *__RPC_USER midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);

1 0

[hpoussin] 28335: Add back idl for eventlog
by hpoussin＠svn.reactos.org 14 Aug '07

14 Aug '07

Author: hpoussin Date: Tue Aug 14 12:01:01 2007 New Revision: 28335 URL: http://svn.reactos.org/svn/reactos?rev=28335&view=rev Log: Add back idl for eventlog Modified: trunk/reactos/include/reactos/idl/eventlogrpc.idl Modified: trunk/reactos/include/reactos/idl/eventlogrpc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/eventl… ============================================================================== --- trunk/reactos/include/reactos/idl/eventlogrpc.idl (original) +++ trunk/reactos/include/reactos/idl/eventlogrpc.idl Tue Aug 14 12:01:01 2007 @@ -16,30 +16,29 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - - -#ifdef __midl - [ uuid(82273FDC-E32A-18C3-3F78-827929DC23EA), - version(0.0), - pointer_default(unique) + version(0.0), + pointer_default(unique) +#ifndef __midl + ,explicit_handle +#endif ] interface eventlog { - cpp_quote("#ifdef __GNUC__") - cpp_quote("/* FIXME ReactOS SEH support, we need remove this when gcc support native seh */") - cpp_quote("#include <pseh/pseh.h>") - cpp_quote("#endif") - - - cpp_quote("#define RPC_ENABLED") cpp_quote("#if 0") +#ifdef __midl typedef [handle, unique] wchar_t *LPWSTR; typedef [handle, unique] char *LPSTR; typedef unsigned int NTSTATUS; - +#else + #define LPWSTR wchar_t * + #define LPSTR char * + #define NTSTATUS long +#endif + +#ifdef __midl typedef struct _UNICODE_STRING { unsigned short Length; unsigned short MaximumLength; @@ -47,50 +46,81 @@ } UNICODE_STRING, *PUNICODE_STRING; typedef struct _ANSI_STRING { - unsigned short Length; - unsigned short MaximumLength; - [size_is(MaximumLength), unique] char *Buffer; + unsigned short Length; + unsigned short MaximumLength; + [size_is(MaximumLength), unique] char *Buffer; } ANSI_STRING, *PANSI_STRING; +#else + #define PUNICODE_STRING wchar_t * + #define PANSI_STRING char * +#endif cpp_quote("#endif") +#ifdef __midl typedef [context_handle] struct _LOGHANDLE { int pos; } *LOGHANDLE; typedef LOGHANDLE *PLOGHANDLE; +#else + #define LOGHANDLE unsigned int + #define PLOGHANDLE unsigned int* + cpp_quote("typedef unsigned int LOGHANDLE, *PLOGHANDLE;"); +#endif /* Function 0x00 */ NTSTATUS ElfrClearELFW( +#ifndef __midl + handle_t BindingHandle, +#endif [in] LOGHANDLE Handle, [in] PUNICODE_STRING BackupName); /* Function 0x01 */ NTSTATUS ElfrBackupELFW( +#ifndef __midl + handle_t BindingHandle, +#endif [in] LOGHANDLE Handle, [in] PUNICODE_STRING BackupName); /* Function 0x02 */ NTSTATUS ElfrCloseEL( +#ifndef __midl + handle_t BindingHandle, +#endif [in,out] PLOGHANDLE Handle); /* Function 0x03 */ NTSTATUS ElfrDeregisterEventSource( +#ifndef __midl + handle_t BindingHandle, +#endif [in,out] PLOGHANDLE Handle); /* Function 0x04 */ NTSTATUS ElfrNumberOfRecords( - [in] LOGHANDLE Handle, - [out] long * NumberOfRecords); +#ifndef __midl + handle_t BindingHandle, +#endif + [in] LOGHANDLE Handle, + [out] long *NumberOfRecords); /* Function 0x05 */ NTSTATUS ElfrOldestRecord( +#ifndef __midl + handle_t BindingHandle, +#endif [in] LOGHANDLE LogHandle, - [out] long * OldestRecNumber); + [out] long *OldestRecNumber); /* Function 0x06 */ - NTSTATUS ElfrChangeNotify(); // FIXME + //NTSTATUS ElfrChangeNotify(); // FIXME /* Function 0x07 */ NTSTATUS ElfrOpenELW( +#ifndef __midl + handle_t BindingHandle, +#endif [in, unique] LPWSTR ServerName, [in] PUNICODE_STRING FileName, [in] PUNICODE_STRING NullStr, @@ -100,6 +130,9 @@ /* Function 0x08 */ NTSTATUS ElfrRegisterEventSourceW( +#ifndef __midl + handle_t BindingHandle, +#endif [in, unique] LPWSTR ServerName, [in] PUNICODE_STRING LogName, [in] PUNICODE_STRING NullStr, @@ -109,6 +142,9 @@ /* Function 0x09 */ NTSTATUS ElfrOpenBELW( +#ifndef __midl + handle_t BindingHandle, +#endif [in, unique] LPWSTR ServerName, [in] PUNICODE_STRING BackupName, [in] long MajorVer, @@ -117,16 +153,22 @@ /* Function 0x0a */ NTSTATUS ElfrReadELW( +#ifndef __midl + handle_t BindingHandle, +#endif [in] LOGHANDLE Handle, [in] long Flags, [in] long Offset, [in] long BufSize, - [out,size_is(BufSize)] char * Buffer, - [out] long * BytesRead, - [out] long * BytesNeeded); + [out,size_is(BufSize)] unsigned char *Buffer, + [out] long *BytesRead, + [out] long *BytesNeeded); /* Function 0x0b */ NTSTATUS ElfrReportEventW( +#ifndef __midl + handle_t BindingHandle, +#endif [in] LOGHANDLE Handle, [in] long Time, [in] short Type, @@ -135,25 +177,38 @@ [in] short NumStrings, [in] long DataSize, [in] PUNICODE_STRING ComputerName, - [in, unique] char *SID, + [in, unique] unsigned char *SID, +#ifdef __midl [in, size_is(NumStrings), unique] PUNICODE_STRING Strings[*], - [in, size_is(DataSize), unique] unsigned char * Data, +#else + [in, size_is(NumStrings), unique] PUNICODE_STRING *Strings, +#endif + [in, size_is(DataSize), unique] unsigned char *Data, [in] short Flags, - [in,out,unique] long * unknown1, - [in,out,unique] long * unknown2); + [in,out,unique] long *unknown1, + [in,out,unique] long *unknown2); /* Function 0x0c */ NTSTATUS ElfrClearELFA( +#ifndef __midl + handle_t BindingHandle, +#endif [in] LOGHANDLE Handle, [in,unique] PANSI_STRING BackupName); /* Function 0x0d */ NTSTATUS ElfrBackupELFA( +#ifndef __midl + handle_t BindingHandle, +#endif [in] LOGHANDLE Handle, [in] PANSI_STRING BackupName); /* Function 0x0e */ NTSTATUS ElfrOpenELA( +#ifndef __midl + handle_t BindingHandle, +#endif [in, unique] LPSTR ServerName, [in] PANSI_STRING LogName, [in] PANSI_STRING NullStr, @@ -163,6 +218,9 @@ /* Function 0x0f */ NTSTATUS ElfrRegisterEventSourceA( +#ifndef __midl + handle_t BindingHandle, +#endif [in, unique] LPSTR ServerName, [in] PANSI_STRING LogName, [in] PANSI_STRING NullStr, @@ -172,6 +230,9 @@ /* Function 0x10 */ NTSTATUS ElfrOpenBELA( +#ifndef __midl + handle_t BindingHandle, +#endif [in, unique] LPSTR ServerName, [in] PANSI_STRING BakckupName, [in] long MajorVer, @@ -180,16 +241,22 @@ /* Function 0x11 */ NTSTATUS ElfrReadELA( +#ifndef __midl + handle_t BindingHandle, +#endif [in] LOGHANDLE Handle, [in] long Flags, [in] long Offset, [in] long BufSize, - [out,size_is(BufSize)] unsigned char * Buffer, + [out,size_is(BufSize)] unsigned char *Buffer, [out] long *BytesRead, [out] long *BytesNeeded); /* Function 0x12 */ NTSTATUS ElfrReportEventA( +#ifndef __midl + handle_t BindingHandle, +#endif [in] LOGHANDLE Handle, [in] long Time, [in] short Type, @@ -198,51 +265,42 @@ [in] short NumStrings, [in] long DataSize, [in] PANSI_STRING ComputerName, - [in, unique] unsigned char * SID, + [in, unique] unsigned char *SID, +#ifdef __midl [in, size_is(NumStrings), unique] PANSI_STRING Strings[*], +#else + [in, size_is(NumStrings), unique] PANSI_STRING *Strings, +#endif [in, size_is(DataSize), unique] unsigned char *Data, [in] short Flags, - [in,out,unique] long * unknown1, - [in,out,unique] long * unknown2); + [in,out,unique] long *unknown1, + [in,out,unique] long *unknown2); /* Function 0x13 */ - NTSTATUS ElfrRegisterClusterSvc(); //FIXME + //NTSTATUS ElfrRegisterClusterSvc(); //FIXME /* Function 0x14 */ - NTSTATUS ElfrDeregisterClusterSvc(); //FIXME + //NTSTATUS ElfrDeregisterClusterSvc(); //FIXME /* Function 0x15 */ - NTSTATUS ElfrWriteClusterEvents(); //FIXME + //NTSTATUS ElfrWriteClusterEvents(); //FIXME /* Function 0x16 */ NTSTATUS ElfrGetLogInformation( +#ifndef __midl + handle_t BindingHandle, +#endif [in] LOGHANDLE Handle, [in] long InfoLevel, - [out, size_is(BufSize)] char *Buffer, + [out, size_is(BufSize)] unsigned char *Buffer, [in] long BufSize, [out] long *BytesNeeded); /* Function 0x17 */ NTSTATUS ElfrFlushEL( +#ifndef __midl + handle_t BindingHandle, +#endif [in] LOGHANDLE Handle); } - -#else - cpp_quote("#ifdef __GNUC__") - cpp_quote("/* FIXME ReactOS SEH support, we need remove this when gcc support native seh */") - cpp_quote("#include <pseh/pseh.h>") - cpp_quote("#endif") - -[ - uuid(82273FDC-E32A-18C3-3F78-827929DC23EA), - version(0.0), - explicit_handle -] - -interface eventlog -{ - void func(handle_t h); -} - -#endif // __midl

1 0

[zguo] 28334: Merged 28032-37, 45-6, 49-54, 59, 63, 65-78, 81, 83-90, 92-95, 28113-15, 20
by zguo＠svn.reactos.org 14 Aug '07

14 Aug '07

Author: zguo Date: Tue Aug 14 06:55:59 2007 New Revision: 28334 URL: http://svn.reactos.org/svn/reactos?rev=28334&view=rev Log: Merged 28032-37, 45-6, 49-54, 59, 63, 65-78, 81, 83-90, 92-95, 28113-15, 20 Added: branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmddbg.c - copied unchanged from r28079, trunk/reactos/base/shell/cmd/cmddbg.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmddbg.h - copied unchanged from r28079, trunk/reactos/base/shell/cmd/cmddbg.h Removed: branches/ros-branch-0_3_3/reactos/base/shell/cmd/main.c Modified: branches/ros-branch-0_3_3/reactos/base/applications/mmc/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/mscutils/servman/mainwnd.c branches/ros-branch-0_3_3/reactos/base/applications/regedit/childwnd.c branches/ros-branch-0_3_3/reactos/base/applications/regedit/regproc.c branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/column.c branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/column.h branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/precomp.h branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/taskmgr.c branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/taskmgr.h branches/ros-branch-0_3_3/reactos/base/shell/cmd/alias.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/attrib.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/batch.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/beep.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/call.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/chcp.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/choice.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/cls.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmd.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmd.h branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmd.rbuild branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmdinput.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmdtable.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/color.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/console.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/copy.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/date.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/del.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/delay.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/dir.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/dirstack.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/echo.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/error.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/filecomp.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/for.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/free.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/goto.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/history.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/if.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/internal.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/label.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/de-DE.rc branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/en-US.rc branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/es-ES.rc branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/fr-FR.rc branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/hu-HU.rc branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/id-ID.rc branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/it-IT.rc branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/pl-PL.rc branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/ru-RU.rc branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/base/shell/cmd/locale.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/memory.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/misc.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/move.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/msgbox.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/path.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/pause.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/precomp.h branches/ros-branch-0_3_3/reactos/base/shell/cmd/prompt.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/ren.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/screen.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/set.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/shift.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/start.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/time.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/timer.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/title.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/type.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/ver.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/verify.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/vol.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/where.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/window.c branches/ros-branch-0_3_3/reactos/dll/win32/kernel32/file/move.c branches/ros-branch-0_3_3/reactos/dll/win32/msgina/msgina.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/install.c branches/ros-branch-0_3_3/reactos/dll/win32/user32/include/user32p.h branches/ros-branch-0_3_3/reactos/dll/win32/user32/user32.def branches/ros-branch-0_3_3/reactos/dll/win32/user32/windows/caret.c branches/ros-branch-0_3_3/reactos/dll/win32/user32/windows/class.c branches/ros-branch-0_3_3/reactos/dll/win32/user32/windows/defwnd.c branches/ros-branch-0_3_3/reactos/dll/win32/user32/windows/message.c branches/ros-branch-0_3_3/reactos/dll/win32/user32/windows/paint.c branches/ros-branch-0_3_3/reactos/drivers/ksfilter/ks/ks.rbuild branches/ros-branch-0_3_3/reactos/drivers/network/ndis/ndis.rbuild branches/ros-branch-0_3_3/reactos/drivers/network/tcpip/tcpip.rbuild branches/ros-branch-0_3_3/reactos/drivers/network/tdi/tdi.rbuild branches/ros-branch-0_3_3/reactos/drivers/storage/class/class2/class2.rbuild branches/ros-branch-0_3_3/reactos/drivers/storage/ide/pciidex/pciidex.rbuild branches/ros-branch-0_3_3/reactos/drivers/storage/port/diskdump/diskdump.rbuild branches/ros-branch-0_3_3/reactos/drivers/storage/scsiport/scsiport.rbuild branches/ros-branch-0_3_3/reactos/drivers/video/videoprt/videoprt.rbuild branches/ros-branch-0_3_3/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild branches/ros-branch-0_3_3/reactos/drivers/wmi/wmilib.rbuild branches/ros-branch-0_3_3/reactos/include/reactos/win32k/ntgdibad.h branches/ros-branch-0_3_3/reactos/include/reactos/win32k/ntuser.h branches/ros-branch-0_3_3/reactos/lib/inflib/infcore.c branches/ros-branch-0_3_3/reactos/lib/inflib/inflib.h branches/ros-branch-0_3_3/reactos/lib/inflib/infpriv.h branches/ros-branch-0_3_3/reactos/lib/inflib/infput.c branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/include/intgdi.h branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/caret.c branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/painting.c branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/vis.c branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/windc.c branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/dc.c branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/gdiobj.c branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/paintobj.c branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/win32k.rbuild branches/ros-branch-0_3_3/reactos/tools/nci/w32ksvc.db branches/ros-branch-0_3_3/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/ros-branch-0_3_3/reactos/tools/rbuild/bootstrap.cpp branches/ros-branch-0_3_3/reactos/tools/rbuild/module.cpp branches/ros-branch-0_3_3/reactos/tools/rbuild/rbuild.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-branch-0_3_3/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/column.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/column.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/taskmgr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/alias.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/beep.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/chcp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/choice.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/cls.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/color.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/date.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/delay.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/dirstack.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/free.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/history.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/label.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/locale.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Removed: branches/ros-branch-0_3_3/reactos/base/shell/cmd/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/msgbox.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/pause.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/prompt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/screen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/shift.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/time.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/title.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/verify.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/vol.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/where.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/window.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/user32/windows/caret.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/driver… Modified: branches/ros-branch-0_3_3/reactos/drivers/network/ndis/ndis.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/driver… Modified: branches/ros-branch-0_3_3/reactos/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/driver… Modified: branches/ros-branch-0_3_3/reactos/drivers/network/tdi/tdi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/driver… Modified: branches/ros-branch-0_3_3/reactos/drivers/storage/class/class2/class2.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/driver… Modified: branches/ros-branch-0_3_3/reactos/drivers/storage/ide/pciidex/pciidex.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/driver… Modified: branches/ros-branch-0_3_3/reactos/drivers/storage/port/diskdump/diskdump.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/driver… Modified: branches/ros-branch-0_3_3/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/driver… Modified: branches/ros-branch-0_3_3/reactos/drivers/video/videoprt/videoprt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/driver… Modified: branches/ros-branch-0_3_3/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/driver… Modified: branches/ros-branch-0_3_3/reactos/drivers/wmi/wmilib.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/driver… Modified: branches/ros-branch-0_3_3/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/includ… Modified: branches/ros-branch-0_3_3/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/includ… Modified: branches/ros-branch-0_3_3/reactos/lib/inflib/infcore.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/lib/in… Modified: branches/ros-branch-0_3_3/reactos/lib/inflib/inflib.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/lib/in… Modified: branches/ros-branch-0_3_3/reactos/lib/inflib/infpriv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/lib/in… Modified: branches/ros-branch-0_3_3/reactos/lib/inflib/infput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/lib/in… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/paintobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/…

1 0

[gedmurphy] 28333: only display resolutions which match the current frequency
by gedmurphy＠svn.reactos.org 13 Aug '07

13 Aug '07

Author: gedmurphy Date: Tue Aug 14 03:33:48 2007 New Revision: 28333 URL: http://svn.reactos.org/svn/reactos?rev=28333&view=rev Log: only display resolutions which match the current frequency Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Tue Aug 14 03:33:48 2007 @@ -63,7 +63,6 @@ for (index = 0; index < pGlobalData->CurrentDisplayDevice->ResolutionsCount; index++) { - if (pGlobalData->CurrentDisplayDevice->Resolutions[index].dmPelsWidth == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth && pGlobalData->CurrentDisplayDevice->Resolutions[index].dmPelsHeight == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight) { @@ -87,6 +86,7 @@ HDC hDC; PSETTINGS_ENTRY Current; DWORD bpp, xres, yres, checkbpp; + DWORD curDispFreq; /* Get current settings */ @@ -101,10 +101,24 @@ /* List all settings */ devmode.dmSize = (WORD)sizeof(DEVMODE); devmode.dmDriverExtra = 0; + + if (!EnumDisplaySettingsEx(DeviceName, ENUM_CURRENT_SETTINGS, &devmode, dwFlags)) + return NULL; + + curDispFreq = devmode.dmDisplayFrequency; + while (EnumDisplaySettingsEx(DeviceName, iMode, &devmode, dwFlags)) { - if (devmode.dmBitsPerPel==8 || devmode.dmBitsPerPel==16 || devmode.dmBitsPerPel==24 || devmode.dmBitsPerPel==32) checkbpp=1; - else checkbpp=0; + if ((devmode.dmBitsPerPel==8 || + devmode.dmBitsPerPel==16 || + devmode.dmBitsPerPel==24 || + devmode.dmBitsPerPel==32) && + devmode.dmDisplayFrequency==curDispFreq) + { + checkbpp=1; + } + else + checkbpp=0; if (devmode.dmPelsWidth < 640 || devmode.dmPelsHeight < 480 || checkbpp == 0) @@ -189,17 +203,22 @@ newEntry->Resolutions = HeapAlloc(GetProcessHeap(), 0, ResolutionsCount * sizeof(RESOLUTION_INFO)); if (!newEntry->Resolutions) goto ByeBye; + newEntry->ResolutionsCount = ResolutionsCount; + /* Fill resolutions infos */ for (Current = newEntry->Settings, i = 0; Current != NULL; Current = Current->Flink) - if (Current->Flink == NULL || (Current->Flink != NULL && - ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) || (Current->dmPelsHeight != Current->Flink->dmPelsHeight)))) + { + if (Current->Flink == NULL || + (Current->Flink != NULL && + ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) || + (Current->dmPelsHeight != Current->Flink->dmPelsHeight)))) { newEntry->Resolutions[i].dmPelsWidth = Current->dmPelsWidth; newEntry->Resolutions[i].dmPelsHeight = Current->dmPelsHeight; i++; } - + } descriptionSize = (_tcslen(Description) + 1) * sizeof(TCHAR); description = HeapAlloc(GetProcessHeap(), 0, descriptionSize); if (!description) goto ByeBye;

1 0

[zguo] 28332: Properly revert 28327-8 and 28330
by zguo＠svn.reactos.org 13 Aug '07

13 Aug '07

Author: zguo Date: Tue Aug 14 02:54:24 2007 New Revision: 28332 URL: http://svn.reactos.org/svn/reactos?rev=28332&view=rev Log: Properly revert 28327-8 and 28330 Added: branches/ros-branch-0_3_3/tools/ (props changed) - copied from r28326, branches/ros-branch-0_3_3/tools/ branches/ros-branch-0_3_3/wallpaper/ - copied from r28329, branches/ros-branch-0_3_3/wallpaper/ branches/ros-branch-0_3_3/web/ (props changed) - copied from r28327, branches/ros-branch-0_3_3/web/ Modified: branches/ros-branch-0_3_3/tools/RosTE/ (props changed) branches/ros-branch-0_3_3/tools/RosTE/GUI/ (props changed) branches/ros-branch-0_3_3/tools/RosTE/GUI/Properties/ (props changed) branches/ros-branch-0_3_3/tools/RosTE/GUI/Resources/ (props changed) branches/ros-branch-0_3_3/tools/RosTE/GUI/Resources/direct/ (props changed) branches/ros-branch-0_3_3/tools/RosTE/installer/ (props changed) branches/ros-branch-0_3_3/tools/vmwaregateway/ (props changed) Propchange: branches/ros-branch-0_3_3/tools/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Aug 14 02:54:24 2007 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-branch-0_3_3/tools/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-branch-0_3_3/tools/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-branch-0_3_3/web/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Aug 14 02:54:24 2007 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-branch-0_3_3/web/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-branch-0_3_3/web/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs