Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[tkreuzer] 37462: - use (unsigned) long instead of ULONG - add DW_CFA_offset_extended_sf
by tkreuzer＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: tkreuzer Date: Wed Nov 19 13:03:40 2008 New Revision: 37462 URL: http://svn.reactos.org/svn/reactos?rev=37462&view=rev Log: - use (unsigned) long instead of ULONG - add DW_CFA_offset_extended_sf Modified: branches/ros-amd64-bringup/reactos/tools/rsym/dwarf2.h branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c Modified: branches/ros-amd64-bringup/reactos/tools/rsym/dwarf2.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/dwarf2.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym/dwarf2.h [iso-8859-1] Wed Nov 19 13:03:40 2008 @@ -802,27 +802,27 @@ typedef struct { - ULONG Length; + unsigned long Length; char *Next; char *CiePointer; - ULONG PcBegin; - ULONG PcRange; - ULONG AugLength; + unsigned long PcBegin; + unsigned long PcRange; + unsigned long AugLength; char *AugData; char *Instructions; } DW2FDE, *PDW2FDE; typedef struct _CFSTATE { - ULONG Location; - ULONG Code; - ULONG Reg; - ULONG Reg2; - ULONG FramePtr; - ULONG FramePtrDiff; - ULONG Offset; - ULONG IsUwop; - ULONG Scope; + unsigned long Location; + unsigned long Code; + unsigned long Reg; + unsigned long Reg2; + long FramePtr; + long FramePtrDiff; + long Offset; + unsigned long IsUwop; + unsigned long Scope; } DW2CFSTATE, *PDW2CFSTATE; #define NextCIE(p) ((void*)((char*)p + p->Length + 4)) Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] Wed Nov 19 13:03:40 2008 @@ -131,7 +131,7 @@ { State->Code = DW_CFA_offset; State->Reg = Code & 0x3f; - Length += DwDecodeUleb128(&State->Offset, pc + 1); + Length += DwDecodeUleb128((unsigned long*)&State->Offset, pc + 1); State->Offset *= 8; // fixme data alignment State->IsUwop = 1; } @@ -162,9 +162,14 @@ break; case DW_CFA_offset_extended: Length += DwDecodeUleb128(&State->Reg, pc + Length); - Length += DwDecodeUleb128(&State->Offset, pc + Length); + Length += DwDecodeUleb128((unsigned long*)&State->Offset, pc + Length); State->IsUwop = 1; break; + case DW_CFA_offset_extended_sf: + Length += DwDecodeUleb128(&State->Reg, pc + Length); + Length += DwDecodeSleb128(&State->Offset, pc + Length); + State->IsUwop = 1; + break; case DW_CFA_restore_extended: Length += DwDecodeUleb128(&State->Reg, pc + Length); break; @@ -184,19 +189,19 @@ break; case DW_CFA_def_cfa: Length += DwDecodeUleb128(&State->Reg, pc + Length); - Length += DwDecodeUleb128(&State->FramePtr, pc + Length); + Length += DwDecodeUleb128((unsigned long*)&State->FramePtr, pc + Length); State->IsUwop = 1; break; case DW_CFA_def_cfa_register: Length += DwDecodeUleb128(&State->Reg, pc + Length); break; case DW_CFA_def_cfa_offset: - Length += DwDecodeUleb128(&State->FramePtr, pc + Length); + Length += DwDecodeUleb128((unsigned long*)&State->FramePtr, pc + Length); State->IsUwop = 1; break; case DW_CFA_def_cfa_sf: Length += DwDecodeUleb128(&State->Reg, pc + Length); - Length += DwDecodeSleb128((LONG*)&State->FramePtr, pc + Length); + Length += DwDecodeSleb128(&State->FramePtr, pc + Length); State->FramePtr *= 8; // data alignment State->IsUwop = 1; break;

1 0

[greatlrd] 37461: Fixed hack so DdUnlock hel does not leak memory, ToDO : DdLock hel captuer the screen outside the client area, DdUnlock also need write back to the client area.
by greatlrd＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: greatlrd Date: Wed Nov 19 12:28:34 2008 New Revision: 37461 URL: http://svn.reactos.org/svn/reactos?rev=37461&view=rev Log: Fixed hack so DdUnlock hel does not leak memory, ToDO : DdLock hel captuer the screen outside the client area, DdUnlock also need write back to the client area. Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] Wed Nov 19 12:28:34 2008 @@ -130,6 +130,9 @@ /* Get the bitmap bits */ GetBitmapBits(hImage,cbBuffer,pixels); + /* Fixme HACK check which member that store the hel bitmap buffer */ + lpLockData->lpDDSurface->lpSurfMore->lpDDRAWReserved2 = pixels; + /* Setup return value */ lpLockData->ddRVal = DD_OK; lpLockData->lpSurfData = pixels; @@ -191,48 +194,62 @@ DWORD CALLBACK HelDdSurfUnlock(LPDDHAL_UNLOCKDATA lpUnLockData) { HDC hDC; - BITMAP bm; - PDWORD pixels = NULL; - HGDIOBJ hBmp; - BITMAPINFO bmi; - int retvalue = 0; + HBITMAP hImage = NULL; + + HDC hMemDC = NULL; + HBITMAP hDCBmp = NULL; + BITMAP bm = {0}; + + DX_WINDBG_trace(); /* Get our hdc for the surface */ - hDC = (HDC)lpUnLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hDC; - - /* Get our bitmap handle from hdc, we need it if we want extract the Bitmap pixel data */ - hBmp = GetCurrentObject(hDC, OBJ_BITMAP); - - /* Get our bitmap information from hBmp, we need it if we want extract the Bitmap pixel data */ - if (GetObject(hBmp, sizeof(BITMAP), &bm) ) - { - /* Zero out all members in bmi so no junk data are left */ - ZeroMemory(&bmi, sizeof(BITMAPINFO)); - - /* Setup BITMAPINFOHEADER for bmi header */ - bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bmi.bmiHeader.biWidth = bm.bmWidth; - bmi.bmiHeader.biHeight = bm.bmHeight; - bmi.bmiHeader.biPlanes = bm.bmPlanes; - bmi.bmiHeader.biBitCount = bm.bmBitsPixel; - bmi.bmiHeader.biCompression = BI_RGB; - - /* Check if it the bitmap is palete or not */ - if ( bm.bmBitsPixel <= 8) - { - /* Upload the bitmap bits data from palete bitmap */ - retvalue = SetDIBits(hDC, hBmp, 0, bm.bmHeight, pixels, &bmi, DIB_PAL_COLORS); - } - else - { - /* Upload the bitmap bits data from RGB bitmap */ - retvalue = SetDIBits(hDC, hBmp, 0, bm.bmHeight, pixels, &bmi, DIB_RGB_COLORS); - } - } - if (retvalue) - { - lpUnLockData->ddRVal = DD_OK; - } + hDC = (HDC) lpUnLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hDC; + + if (hDC != NULL) + { + /* Create a memory bitmap to store a copy of current hdc surface */ + + /* fixme the rcarea are not store in the struct yet so the data will look corupted */ + hImage = CreateCompatibleBitmap (hDC, lpUnLockData->lpDDSurface->lpGbl->wWidth, lpUnLockData->lpDDSurface->lpGbl->wHeight); + + /* Create a memory hdc so we can draw on our current memory bitmap */ + hMemDC = CreateCompatibleDC(hDC); + + if (hMemDC != NULL) + { + /* Select our memory bitmap to our memory hdc */ + hDCBmp = (HBITMAP) SelectObject (hMemDC, hImage); + + /* Get our memory bitmap information */ + GetObject(hImage, sizeof(BITMAP), &bm); + + SetBitmapBits(hImage,bm.bmWidthBytes * bm.bmHeight, lpUnLockData->lpDDSurface->lpSurfMore->lpDDRAWReserved2); + + BitBlt (hDC, 0, 0, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, SRCCOPY); + + SelectObject (hMemDC, hDCBmp); + + /* Setup return value */ + lpUnLockData->ddRVal = DD_OK; + } + } + + /* Cleanup after us */ + if (hImage != NULL) + { + DeleteObject (hImage); + } + + if (hMemDC != NULL) + { + DeleteDC (hMemDC); + } + + if (lpUnLockData->lpDDSurface->lpSurfMore->lpDDRAWReserved2 != NULL) + { + HeapFree(GetProcessHeap(), 0, lpUnLockData->lpDDSurface->lpSurfMore->lpDDRAWReserved2 ); + } + return DDHAL_DRIVER_HANDLED; }

1 0

[greatlrd] 37460: Fixed bug in hel surface lock. Now we truly get back a buffer with bitmap data for specify bitmap area. and few other mirror bugfix for DdLock hel function
by greatlrd＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: greatlrd Date: Wed Nov 19 11:56:56 2008 New Revision: 37460 URL: http://svn.reactos.org/svn/reactos?rev=37460&view=rev Log: Fixed bug in hel surface lock. Now we truly get back a buffer with bitmap data for specify bitmap area. and few other mirror bugfix for DdLock hel function Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] Wed Nov 19 11:56:56 2008 @@ -16,6 +16,8 @@ DWORD CALLBACK HelDdSurfBlt(LPDDHAL_BLTDATA lpBltData) { + DX_WINDBG_trace(); + if (lpBltData->dwFlags & DDBLT_COLORFILL) { HBRUSH hbr = CreateSolidBrush(lpBltData->bltFX.dwFillColor ); @@ -63,77 +65,95 @@ DWORD CALLBACK HelDdSurfLock(LPDDHAL_LOCKDATA lpLockData) { + HDC hDC; - BITMAP bm; - PDWORD pixels = NULL; - HGDIOBJ hBmp; - BITMAPINFO bmi; - int retvalue = 0; + HBITMAP hImage = NULL; + + LONG cbBuffer = 0; + LPDWORD pixels = NULL; + + HDC hMemDC = NULL; + HBITMAP hDCBmp = NULL; + BITMAP bm = {0}; + + DX_WINDBG_trace(); /* ToDo tell ddraw internal this surface are locked */ /* ToDo add support for dwFlags */ + /* Get our hdc for the surface */ hDC = (HDC)lpLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hDC; - /* Get our bitmap handle from hdc, we need it if we want extract the Bitmap pixel data */ - hBmp = GetCurrentObject(hDC, OBJ_BITMAP); - - /* Get our bitmap information from hBmp, we need it if we want extract the Bitmap pixel data */ - if (GetObject(hBmp, sizeof(BITMAP), &bm) ) - { - /* Alloc memory buffer at usermode for the bitmap pixel data */ - pixels = (PDWORD) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bm.bmWidth * bm.bmHeight * (bm.bmBitsPixel*bm.bmBitsPixel ) ); - - if (pixels != NULL) - { - /* Zero out all members in bmi so no junk data are left */ - ZeroMemory(&bmi, sizeof(BITMAPINFO)); - - /* Setup BITMAPINFOHEADER for bmi header */ - bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bmi.bmiHeader.biWidth = bm.bmWidth; - bmi.bmiHeader.biHeight = bm.bmHeight; - bmi.bmiHeader.biPlanes = bm.bmPlanes; - bmi.bmiHeader.biBitCount = bm.bmBitsPixel; - bmi.bmiHeader.biCompression = BI_RGB; - - /* Check if it the bitmap is palete or not */ - if ( bm.bmBitsPixel <= 8) + if (hDC != NULL) + { + /* Create a memory bitmap to store a copy of current hdc surface */ + + if (!lpLockData->bHasRect) + { + + hImage = CreateCompatibleBitmap (hDC, lpLockData->lpDDSurface->lpGbl->wWidth, lpLockData->lpDDSurface->lpGbl->wHeight); + } + else + { + hImage = CreateCompatibleBitmap (hDC, lpLockData->rArea.right, lpLockData->rArea.bottom); + } + + /* Create a memory hdc so we can draw on our current memory bitmap */ + hMemDC = CreateCompatibleDC(hDC); + + if (hMemDC != NULL) + { + /* Select our memory bitmap to our memory hdc */ + hDCBmp = (HBITMAP) SelectObject (hMemDC, hImage); + + /* Get our memory bitmap information */ + GetObject(hImage, sizeof(BITMAP), &bm); + + if (!lpLockData->bHasRect) { - /* Extract the bitmap bits data from palete bitmap */ - retvalue = GetDIBits(hDC, hBmp, 0, bm.bmHeight, pixels, &bmi, DIB_PAL_COLORS); + BitBlt (hMemDC, 0, 0, bm.bmWidth, bm.bmHeight, hDC, 0, 0, SRCCOPY); } else { - /* Extract the bitmap bits data from RGB bitmap */ - retvalue = GetDIBits(hDC, hBmp, 0, bm.bmHeight, pixels, &bmi, DIB_RGB_COLORS); + BitBlt (hMemDC, lpLockData->rArea.top, lpLockData->rArea.left, lpLockData->rArea.right, lpLockData->rArea.bottom, hDC, 0, 0, SRCCOPY); } - /* Check see if we susccess it to get the memory pointer and fill it for the bitmap pixel data */ - if (retvalue) + SelectObject (hMemDC, hDCBmp); + + /* Alloc memory buffer at usermode for the bitmap pixel data */ + cbBuffer = bm.bmWidthBytes * bm.bmHeight ; + pixels = (PDWORD) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbBuffer ); + + if (pixels != NULL) { - /* Check see if the are special area it should have been extracted or not */ - if (!lpLockData->bHasRect) - { - /* The all bitmap pixel data must return */ - lpLockData->lpSurfData = pixels; - lpLockData->ddRVal = DD_OK; - } - else - { - /* Only the lpLockData->rArea bitmap data should be return */ - DX_STUB; - } + /* Get the bitmap bits */ + GetBitmapBits(hImage,cbBuffer,pixels); + + /* Setup return value */ + lpLockData->ddRVal = DD_OK; + lpLockData->lpSurfData = pixels; } } } + /* Free the pixels buffer if we fail */ if ( (pixels != NULL) && (lpLockData->ddRVal != DD_OK) ) { HeapFree(GetProcessHeap(), 0, pixels ); + } + + /* Cleanup after us */ + if (hImage != NULL) + { + DeleteObject (hImage); + } + + if (hMemDC != NULL) + { + DeleteDC (hMemDC); } return DDHAL_DRIVER_HANDLED; Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Wed Nov 19 11:56:56 2008 @@ -415,6 +415,12 @@ /* Zero out members in DDHAL_LOCKDATA */ ZeroMemory(&mdLock, sizeof(DDHAL_LOCKDATA)); + if ( (ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & + DDHAL_SURFCB32_UNLOCK) == DDHAL_SURFCB32_UNLOCK) + { + ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags -=DDHAL_SURFCB32_UNLOCK; + ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags -=DDHAL_SURFCB32_LOCK; + } /* Check if we got HAL support for this api */ if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & DDHAL_SURFCB32_LOCK) == DDHAL_SURFCB32_LOCK) @@ -463,7 +469,7 @@ if (!DdResetVisrgn(ThisDest->lpLcl->lpSurfMore->slist[0], NULL)) { DX_STUB_str("Here DdResetVisrgn lock"); - return DDERR_UNSUPPORTED; + // return DDERR_UNSUPPORTED; } if (mdLock.Lock(&mdLock)!= DDHAL_DRIVER_HANDLED) @@ -518,6 +524,12 @@ ZeroMemory(&mdUnLock, sizeof(DDHAL_UNLOCKDATA)); /* Check if we got HAL support for this api */ + if ( (This->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & + DDHAL_SURFCB32_UNLOCK) == DDHAL_SURFCB32_UNLOCK) + { + This->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags -=DDHAL_SURFCB32_UNLOCK; + This->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags -=DDHAL_SURFCB32_LOCK; + } if (( This->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & DDHAL_SURFCB32_UNLOCK) == DDHAL_SURFCB32_UNLOCK) {

1 0

[dreimer] 37459: Updater updated to update more new and updated components.
by dreimer＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: dreimer Date: Wed Nov 19 11:50:37 2008 New Revision: 37459 URL: http://svn.reactos.org/svn/reactos?rev=37459&view=rev Log: Updater updated to update more new and updated components. Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Wed Nov 19 11:50:37 2008 @@ -42,69 +42,53 @@ if "%1" == "" ( goto :next ) - -if "%1" == "nocmds" ( +elseif "%1" == "nocmds" ( set _ROSBE_CMDS=no - goto :p1 -) -if "%1" == "nogcc" ( +) +elseif "%1" == "nogcc" ( set _ROSBE_GCC=no - goto :p1 -) -if "%1" == "notools" ( +) +elseif "%1" == "notools" ( set _ROSBE_TOOLS=no - goto :p1 -) - -cls -echo Unknown first parameter specified. Exiting. -goto :EOU - -:p1 +) else ( + cls + echo Unknown first parameter specified. Exiting. + goto :EOU +) if "%2" == "" ( goto :next ) - -if "%2" == "nocmds" ( +elseif "%2" == "nocmds" ( set _ROSBE_CMDS=no - goto :p2 -) -if "%2" == "nogcc" ( +) +elseif "%2" == "nogcc" ( set _ROSBE_GCC=no - goto :p2 -) -if "%2" == "notools" ( +) +elseif "%2" == "notools" ( set _ROSBE_TOOLS=no - goto :p2 -) - -cls -echo Unknown second parameter specified. Exiting. -goto :EOU - -:p2 +) else ( + cls + echo Unknown second parameter specified. Exiting. + goto :EOU +) if "%3" == "" ( goto :next ) - -if "%3" == "nocmds" ( +elseif "%3" == "nocmds" ( set _ROSBE_CMDS=no - goto :next -) -if "%3" == "nogcc" ( +) +elseif "%3" == "nogcc" ( set _ROSBE_GCC=no - goto :next -) -if "%3" == "notools" ( +) +elseif "%3" == "notools" ( set _ROSBE_TOOLS=no - goto :next -) - -cls -echo Unknown third parameter specified. Exiting. -goto :EOU +) else ( + cls + echo Unknown third parameter specified. Exiting. + goto :EOU +) :next @@ -129,6 +113,9 @@ if exist "Build.ps1" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Build.ps1 ) + if exist "chdefgcc.ps1" ( + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefgcc.ps1 + ) if exist "Clean.ps1" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Clean.ps1 ) @@ -145,37 +132,64 @@ "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe-gcc-env.ps1 ) + REM Arch Changer Files. + + if exist "charch.cmd" ( + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/charch.cmd + ) + if exist "charch.ps1" ( + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/charch.ps1 + ) + REM Options Files. if exist "options.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/options.cmd ) + if exist "options.ps1" ( + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/options.ps1 + ) REM SVN Files. if exist "sSVN.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/sSVN.cmd ) + if exist "sSVN.ps1" ( + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/sSVN.ps1 + ) REM SCut Files. if exist "scut.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/scut.cmd ) + if exist "scut.ps1" ( + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/scut.ps1 + ) REM RelAddr2Line Files. if exist "reladdr2line.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/reladdr2line.cmd ) + if exist "reladdr2line.ps1" ( + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/reladdr2line.ps1 + ) REM Other Tools Files. if exist "Config.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Config.cmd ) + if exist "Config.ps1" ( + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Config.ps1 + ) if exist "chdefdir.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefdir.cmd + ) + if exist "chdefdir.ps1" ( + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefdir.ps1 ) REM Default Files.

1 0

[mkupfer] 37458: - revert winioctl.h to previous version (for compatibility) - add additional partition types to rosioctl.h - adapt freeloader to rosioctl.h
by mkupfer＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: mkupfer Date: Wed Nov 19 08:28:24 2008 New Revision: 37458 URL: http://svn.reactos.org/svn/reactos?rev=37458&view=rev Log: - revert winioctl.h to previous version (for compatibility) - add additional partition types to rosioctl.h - adapt freeloader to rosioctl.h Added: trunk/reactos/include/reactos/rosioctl.h (with props) Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h trunk/reactos/include/psdk/winioctl.h Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] Wed Nov 19 08:28:24 2008 @@ -20,6 +20,7 @@ #ifndef __DISK_H #define __DISK_H +#include <reactos/rosioctl.h> typedef struct _GEOMETRY { @@ -79,7 +80,7 @@ #include <poppack.h> // -// Partition type defines +// Partition type defines (of PSDK) // #define PARTITION_ENTRY_UNUSED 0x00 // Entry unused #define PARTITION_FAT_12 0x01 // 12-bit FAT entries @@ -89,7 +90,6 @@ #define PARTITION_EXTENDED 0x05 // Extended partition entry #define PARTITION_HUGE 0x06 // Huge partition MS-DOS V4 #define PARTITION_IFS 0x07 // IFS Partition -#define PARTITION_OS2BOOTMGR 0x0A // OS/2 Boot Manager/OPUS/Coherent swap #define PARTITION_FAT32 0x0B // FAT32 #define PARTITION_FAT32_XINT13 0x0C // FAT32 using extended int13 services #define PARTITION_XINT13 0x0E // Win95 partition using extended int13 services @@ -98,8 +98,6 @@ #define PARTITION_PREP 0x41 // PowerPC Reference Platform (PReP) Boot Partition #define PARTITION_LDM 0x42 // Logical Disk Manager partition #define PARTITION_UNIX 0x63 // Unix -#define PARTITION_LINUX_SWAP 0x82 // Linux Swap Partition -#define PARTITION_EXT2 0x83 // Linux Ext2/Ext3 /////////////////////////////////////////////////////////////////////////////////////// // Modified: trunk/reactos/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winioctl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winioctl.h [iso-8859-1] Wed Nov 19 08:28:24 2008 @@ -159,9 +159,6 @@ #define PARTITION_PREP 0x41 #define PARTITION_LDM 0x42 #define PARTITION_UNIX 0x63 -#define PARTITION_LINUX_SWAP 0x82 -#define PARTITION_LINUX 0x83 -#define PARTITION_LINUX_LVM 0x8E #define PARTITION_NTFT 128 #define VALID_NTFT 0xC0 #define METHOD_BUFFERED 0 Added: trunk/reactos/include/reactos/rosioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/rosioctl.h… ============================================================================== --- trunk/reactos/include/reactos/rosioctl.h (added) +++ trunk/reactos/include/reactos/rosioctl.h [iso-8859-1] Wed Nov 19 08:28:24 2008 @@ -1,0 +1,23 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS PSDK extensions + * FILE: include/reactos/rosioctl.h + * PURPOSE: Additional partition types + * (partition types not covered by winioctl.h of PSDK) + * + * PROGRAMMERS: Matthias Kupfer (mkupfer(a)reactos.com) + */ + +#ifndef __ROSIOCTL_H +#define __ROSIOCTL_H + +#define PARTITION_OS2BOOTMGR 0x0A // OS/2 Boot Manager/OPUS/Coherent swap +#define PARTITION_LINUX_SWAP 0x82 // Linux Swap Partition +#define PARTITION_LINUX 0x83 // Linux Partition Ext2/Ext3/Ext4 +#define PARTITION_EXT2 PARTITION_LINUX // some apps use this identifier +#define PARTITION_LINUX_LVM 0x8E + +#endif /* __ROSIOCTL_H */ + +/* EOF */ + Propchange: trunk/reactos/include/reactos/rosioctl.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 37457: OMG, it works!
by dreimer＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: dreimer Date: Wed Nov 19 08:17:11 2008 New Revision: 37457 URL: http://svn.reactos.org/svn/reactos?rev=37457&view=rev Log: OMG, it works! Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Wed Nov 19 08:17:11 2008 @@ -27,7 +27,7 @@ # $_1 = $args[0] $_2 = $args[1] -if ($args.length -bt 2) { +if ($args.length -gt 2) { "ERROR: Too many parameters specified." } elseif ($args.length -lt 1) { @@ -54,12 +54,15 @@ if ($_2 -eq $null) { "ERROR: You must specify a address to analyze." } -$baseaddr = (objdump -p $_1 2>NUL | select-string "ImageBase") + +$baseaddr = (objdump -p $_1 | select-string "ImageBase").tostring().split() +$baseaddr = "0x" + ($baseaddr.get($baseaddr.length - 1)) + if ($baseaddr -lt $_2) { IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$_1' '$_2'" } else { - $baseaddr = $baseaddr + 0x$_2 - $relbase = "{0:X}" -f $baseaddr + $baseaddr = ($baseaddr | % {[Convert]::ToInt32($_,16)}) + ($_2 | % {[Convert]::ToInt32($_,16)}) + $relbase = "0x" + ("{0:X}" -f $baseaddr) IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$_1' '$relbase'" }

1 0

[mkupfer] 37456: - add some linux partition types
by mkupfer＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: mkupfer Date: Wed Nov 19 07:24:43 2008 New Revision: 37456 URL: http://svn.reactos.org/svn/reactos?rev=37456&view=rev Log: - add some linux partition types Modified: trunk/reactos/include/psdk/winioctl.h Modified: trunk/reactos/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winioctl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winioctl.h [iso-8859-1] Wed Nov 19 07:24:43 2008 @@ -159,6 +159,9 @@ #define PARTITION_PREP 0x41 #define PARTITION_LDM 0x42 #define PARTITION_UNIX 0x63 +#define PARTITION_LINUX_SWAP 0x82 +#define PARTITION_LINUX 0x83 +#define PARTITION_LINUX_LVM 0x8E #define PARTITION_NTFT 128 #define VALID_NTFT 0xC0 #define METHOD_BUFFERED 0

1 0

[dgoette] 37455: * preview function can now be used to *preview* pages * fixed some bugs
by dgoette＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: dgoette Date: Wed Nov 19 07:07:44 2008 New Revision: 37455 URL: http://svn.reactos.org/svn/reactos?rev=37455&view=rev Log: * preview function can now be used to *preview* pages * fixed some bugs Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Export_HTML.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Export_Page.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.clas… Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] Wed Nov 19 07:07:44 2008 @@ -322,8 +322,6 @@ echo '<span id="elmcount" class="'.$text_num.'"> </span>'; } - echo '</form>'; - if (Security::hasRight($this->data_id, 'write')) { echo_strip(' <button type="button" id="bsavedraft" onclick="'."edit_form_submit_draft(".$this->data_id.",".$this->rev_id.")".'">Save as Draft</button>   @@ -409,8 +407,11 @@ } echo_strip(' -   <span id="mefasi"> </span> - </div></div> + </form> +   <span id="mefasi"> </span> + </div> + </div> + </div> <div id="frmdiff" style="display:none;"></div>'); } @@ -577,7 +578,7 @@ echo_strip(' </span>   <span style="white-space: nowrap;">type: <span class="frmeditheader">'.$revision['data_type'].'</span></span>   - <span style="white-space: nowrap;">version: <span id="mefrverid" class="frmeditheader">'.$revision['rev_version'].'</span></span>   + <span style="white-space: nowrap;">version: <span id="mefrverid" class="frmeditheader">'.$revision['rev_version'].'</span></span>   <span style="white-space: nowrap;">language: <span id="mefrlang" class="frmeditheader">'.$revision['rev_language'].'</span></span>   <span style="white-space: nowrap;">user: <span id="mefrusrid" class="frmeditheader">'.$revision['user_name'].'</span></span>   '); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_HTML.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_HTML.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_HTML.class.php [iso-8859-1] Wed Nov 19 07:07:44 2008 @@ -289,101 +289,133 @@ */ public function processTextByName( $page_name, $lang = '', $dynamic_num = 0, $output_type = '' ) { + global $roscms_standard_language; + + // use class vars instead of give them every method as param + $this->page_name = $page_name; + $this->lang = $lang; + $this->dynamic_num = intval($dynamic_num); + $this->output_type = $output_type; + + // + if ($dynamic_num > 0) { + $stmt=DBConnection::getInstance()->prepare("SELECT r.rev_id, r.rev_language FROM data_ d JOIN data_revision r ON r.data_id = d.data_id JOIN data_tag t ON t.data_rev_id=r.rev_id JOIN data_tag_name n ON t.tag_name_id=n.tn_id JOIN data_tag_value v ON t.tag_value_id=v.tv_id WHERE data_name = :name AND data_type = 'page' AND r.rev_version > 0 AND (r.rev_language = :lang_one OR r.rev_language = :lang_two) AND n.tn_name = 'number' AND t.tag_usrid = '-1' AND v.tv_value = :dynamic_num ORDER BY r.rev_version DESC LIMIT 2"); + $stmt->bindParam('dynamic_num',$dynamic_num,PDO::PARAM_INT); + } + else { + $stmt=DBConnection::getInstance()->prepare("SELECT r.rev_id, r.rev_language FROM data_ d JOIN data_revision r ON r.data_id = d.data_id WHERE data_name = :name AND data_type = 'page' AND r.rev_version > 0 AND (r.rev_language = :lang_one OR r.rev_language = :lang_two) ORDER BY r.rev_version DESC LIMIT 2"); + } + $stmt->bindParam('name',$page_name,PDO::PARAM_STR); + $stmt->bindParam('lang_one',$lang,PDO::PARAM_STR); + $stmt->bindParam('lang_two',$roscms_standard_language,PDO::PARAM_STR); + $stmt->execute(); + $results=$stmt->fetchAll(PDO::FETCH_ASSOC); + $page = @$results[0]; + + // try to get the dataset with rev_language == $lang, to boost the translated content + if( count($results) == 2 && $page['rev_language'] == $roscms_standard_language ) { + $page = $results[1]; + } + + $this->processText($page['rev_id'], $output_type); + } + + + /** + * processes the content + * need to call this in object context + * + * @return content + * @access public + */ + public function processText( $rev_id, $output_type = '' ) + { global $roscms_intern_account_id; global $roscms_standard_language_full; global $roscms_intern_webserver_pages; global $roscms_intern_webserver_roscms; global $roscms_standard_language; - // use class vars instead of give them every method as param - $this->page_name = $page_name; - $this->lang = $lang; - $this->dynamic_num = intval($dynamic_num); - $this->output_type = $output_type; - // try to force unlimited script runtime @set_time_limit(0); - // - $stmt=DBConnection::getInstance()->prepare("SELECT r.rev_id, r.rev_version, r.rev_usrid, r.rev_datetime, r.rev_date, r.rev_time, r.rev_language FROM data_ d JOIN data_revision r ON r.data_id = d.data_id WHERE data_name = :name AND data_type = 'page' AND r.rev_version > 0 AND (r.rev_language = :lang_one OR r.rev_language = :lang_two) ORDER BY r.rev_version DESC LIMIT 2"); - $stmt->bindParam('name',$this->page_name,PDO::PARAM_STR); - $stmt->bindParam('lang_one',$this->lang,PDO::PARAM_STR); - $stmt->bindParam('lang_two',$roscms_standard_language,PDO::PARAM_STR); - $stmt->execute(); - $results=$stmt->fetchAll(PDO::FETCH_ASSOC); - $page = @$results[0]; - - // try to get the dataset with rev_language == $lang, to boost the translated content - if( count($results) == 2 && $page['rev_language'] == $roscms_standard_language ) { - $page = $results[1]; - } - - // replace first dynamic and then static tags - if ($page['rev_id'] > 0) { - - // get content and replace with other contents - $content = Data::getText($page['rev_id'], 'content'); - $content = preg_replace_callback('/(\[#templ_[^][#[:space:]]+\])/', array($this,'insertTemplate'), $content); - $content = preg_replace_callback('/(\[#cont_[^][#[:space:]]+\])/', array($this,'insertContent'), $content); - $content = preg_replace_callback('/(\[#inc_[^][#[:space:]]+\])/', array($this,'insertScript'), $content); - $content = preg_replace_callback('/(\[#link_[^][#[:space:]]+\])/', array($this,'insertHyperlink'), $content); - - // website url - $content = str_replace('[#roscms_path_homepage]', $roscms_intern_webserver_pages, $content); - - // replace roscms constants dependent from dynamic number - if ($this->dynamic_num > 0) { - $content = str_replace('[#roscms_filename]', $this->page_name.'_'.$this->dynamic_num.'.html', $content); - $content = str_replace('[#roscms_pagename]', $this->page_name.'_'.$this->dynamic_num, $content); - $content = str_replace('[#roscms_pagetitle]', ucfirst(get_stext($page['rev_id'], 'title')).' #'.$this->dynamic_num, $content); - } - // take care of dynamic number independent entries - else { - $content = str_replace('[#roscms_filename]', $this->page_name.'.html', $content); - $content = str_replace('[#roscms_pagename]', $this->page_name, $content); - $content = str_replace('[#roscms_pagetitle]', ucfirst(Data::getSText($page['rev_id'], 'title')), $content); - } - - // replace current language stuff - $stmt=DBConnection::getInstance()->prepare("SELECT lang_name FROM languages WHERE lang_id = :lang LIMIT 1"); - $stmt->bindParam('lang',$this->lang); - $stmt->execute(); - $content = str_replace('[#roscms_language]', $stmt->fetchColumn(), $content); - $content = str_replace('[#roscms_language_short]', $this->lang, $content); - - // @REMOVEME if it is no more present in Database - $content = str_replace('[#roscms_format]', 'html', $content); - - // replace date and time - $content = str_replace('[#roscms_date]', date('Y-m-d'), $content); - $localtime = localtime(time() , 1); - $content = str_replace('[#roscms_time]', sprintf('%02d:%02d', $localtime['tm_hour'],$localtime['tm_min']), $content); - - // replace with user_name - // @FIXME broken logic, or one link too much, which should be removed from Database - $stmt=DBConnection::getInstance()->prepare("SELECT user_name FROM users WHERE user_id = :user_id LIMIT 1"); - $stmt->bindParam('user_id',$roscms_intern_account_id); - $stmt->execute(); - $user_name = $stmt->fetchColumn(); - $content = str_replace('[#roscms_user]', $user_name, $content); // account that generate - $content = str_replace("[#roscms_inc_author]", $user_name, $content); // account that changed the include text - - // page version - $content = str_replace('[#roscms_page_version]', $page['rev_version'], $content); - - // page edit link - $content = str_replace('[#roscms_page_edit]', $roscms_intern_webserver_roscms.'?page=data_out&d_f=page&d_u=show&d_val='.$this->page_name.'&d_val2='.$this->lang.'&d_val3='.$this->dynamic_num.'&d_val4=edit', $content); - - // translation info - if ($this->lang == $roscms_standard_language) { - $content = str_replace('[#roscms_trans]', '<p><a href="'.$roscms_intern_webserver_roscms.'?page=data_out&d_f=page&d_u=show&d_val='.$this->page_name.'&d_val2='.$this->lang.'&d_val3='.$this->dynamic_num.'&d_val4=edit" style="font-size:10px !important;">Edit page content</a> (RosCMS translator account membership required, visit the <a href="'.$roscms_intern_webserver_pages.'forum/" style="font-size:10px !important;">website forum</a> for help)</p><br />', $content); - } - else { - $content = str_replace('[#roscms_trans]', '<p><em>If the translation of the <a href="'.$roscms_intern_webserver_pages.'?page='.$this->page_name.'&lang='.$roscms_standard_language.'" style="font-size:10px !important;">'.$roscms_standard_language_full.' language</a> of this page appears to be outdated or incorrect, please check-out the <a href="'.$roscms_intern_webserver_pages.'?page='.$this->page_name.'&lang='.$roscms_standard_language.'" style="font-size:10px !important;">'.$roscms_standard_language_full.'</a> page and <a href="'.$roscms_intern_webserver_pages.'forum/viewforum.php?f=18" style="font-size:10px !important;">report</a> or <a href="'.$roscms_intern_webserver_roscms.'?page=data_out&d_f=page&d_u=show&d_val='.$this->page_name.'&d_val2='.$this->lang.'&d_val3='.$this->dynamic_num.'&d_val4=edit" style="font-size:10px !important;">update the content</a>.</em></p><br />', $content); - } - - return $content; - } + $stmt=DBConnection::getInstance()->prepare("SELECT d.data_name, d.data_id, r.rev_id, r.rev_version, r.rev_usrid, r.rev_datetime, r.rev_date, r.rev_time, r.rev_language FROM data_ d JOIN data_revision r ON r.data_id = d.data_id WHERE r.rev_id = :rev_id ORDER BY r.rev_version DESC LIMIT 2"); + $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); + $stmt->execute(); + $page=$stmt->fetch(PDO::FETCH_ASSOC); + + if ($page['rev_id'] === false) { + return; // nothing found + } + + $this->page_name = $page['data_name']; + $this->lang = $page['rev_language']; + $this->dynamic_num = Tag::getValueByUser($page['data_id'], $page['rev_id'], 'number', -1); + $this->output_type = $output_type; + // replace dynamic tags first and then static + + // get content and replace with other contents + $content = Data::getText($page['rev_id'], 'content'); + $content = preg_replace_callback('/(\[#templ_[^][#[:space:]]+\])/', array($this,'insertTemplate'), $content); + $content = preg_replace_callback('/(\[#cont_[^][#[:space:]]+\])/', array($this,'insertContent'), $content); + $content = preg_replace_callback('/(\[#inc_[^][#[:space:]]+\])/', array($this,'insertScript'), $content); + $content = preg_replace_callback('/(\[#link_[^][#[:space:]]+\])/', array($this,'insertHyperlink'), $content); + + // website url + $content = str_replace('[#roscms_path_homepage]', $roscms_intern_webserver_pages, $content); + + // replace roscms constants dependent from dynamic number + if ($this->dynamic_num > 0) { + $content = str_replace('[#roscms_filename]', $this->page_name.'_'.$this->dynamic_num.'.html', $content); + $content = str_replace('[#roscms_pagename]', $this->page_name.'_'.$this->dynamic_num, $content); + $content = str_replace('[#roscms_pagetitle]', ucfirst(Data::getSText($page['rev_id'], 'title')).' #'.$this->dynamic_num, $content); + } + // take care of dynamic number independent entries + else { + $content = str_replace('[#roscms_filename]', $this->page_name.'.html', $content); + $content = str_replace('[#roscms_pagename]', $this->page_name, $content); + $content = str_replace('[#roscms_pagetitle]', ucfirst(Data::getSText($page['rev_id'], 'title')), $content); + } + + // replace current language stuff + $stmt=DBConnection::getInstance()->prepare("SELECT lang_name FROM languages WHERE lang_id = :lang LIMIT 1"); + $stmt->bindParam('lang',$this->lang); + $stmt->execute(); + $content = str_replace('[#roscms_language]', $stmt->fetchColumn(), $content); + $content = str_replace('[#roscms_language_short]', $this->lang, $content); + + // @REMOVEME if it is no more present in Database + $content = str_replace('[#roscms_format]', 'html', $content); + + // replace date and time + $content = str_replace('[#roscms_date]', date('Y-m-d'), $content); + $localtime = localtime(time() , 1); + $content = str_replace('[#roscms_time]', sprintf('%02d:%02d', $localtime['tm_hour'],$localtime['tm_min']), $content); + + // replace with user_name + // @FIXME broken logic, or one link too much, which should be removed from Database + $stmt=DBConnection::getInstance()->prepare("SELECT user_name FROM users WHERE user_id = :user_id LIMIT 1"); + $stmt->bindParam('user_id',$roscms_intern_account_id); + $stmt->execute(); + $user_name = $stmt->fetchColumn(); + $content = str_replace('[#roscms_user]', $user_name, $content); // account that generate + $content = str_replace("[#roscms_inc_author]", $user_name, $content); // account that changed the include text + + // page version + $content = str_replace('[#roscms_page_version]', $page['rev_version'], $content); + + // page edit link + $content = str_replace('[#roscms_page_edit]', $roscms_intern_webserver_roscms.'?page=data_out&d_f=page&d_u=show&d_val='.$this->page_name.'&d_val2='.$this->lang.'&d_val3='.$this->dynamic_num.'&d_val4=edit', $content); + + // translation info + if ($this->lang == $roscms_standard_language) { + $content = str_replace('[#roscms_trans]', '<p><a href="'.$roscms_intern_webserver_roscms.'?page=data_out&d_f=page&d_u=show&d_val='.$this->page_name.'&d_val2='.$this->lang.'&d_val3='.$this->dynamic_num.'&d_val4=edit" style="font-size:10px !important;">Edit page content</a> (RosCMS translator account membership required, visit the <a href="'.$roscms_intern_webserver_pages.'forum/" style="font-size:10px !important;">website forum</a> for help)</p><br />', $content); + } + else { + $content = str_replace('[#roscms_trans]', '<p><em>If the translation of the <a href="'.$roscms_intern_webserver_pages.'?page='.$this->page_name.'&lang='.$roscms_standard_language.'" style="font-size:10px !important;">'.$roscms_standard_language_full.' language</a> of this page appears to be outdated or incorrect, please check-out the <a href="'.$roscms_intern_webserver_pages.'?page='.$this->page_name.'&lang='.$roscms_standard_language.'" style="font-size:10px !important;">'.$roscms_standard_language_full.'</a> page and <a href="'.$roscms_intern_webserver_pages.'forum/viewforum.php?f=18" style="font-size:10px !important;">report</a> or <a href="'.$roscms_intern_webserver_roscms.'?page=data_out&d_f=page&d_u=show&d_val='.$this->page_name.'&d_val2='.$this->lang.'&d_val3='.$this->dynamic_num.'&d_val4=edit" style="font-size:10px !important;">update the content</a>.</em></p><br />', $content); + } + + return $content; } // end of member function generate_content Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_Page.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_Page.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_Page.class.php [iso-8859-1] Wed Nov 19 07:07:44 2008 @@ -51,10 +51,12 @@ */ public function page( ) { - parent::__construct(); + global $RosCMS_GET_d_value, $RosCMS_GET_d_value2,$RosCMS_GET_d_value3; + global $RosCMS_GET_d_r_lang; + global $roscms_standard_language; - $export_html = new Export_HTML(); - + $dynamic_num = $RosCMS_GET_d_value3; + switch (@$_GET['d_u']) { case 'output': // @TODO @@ -63,7 +65,7 @@ case 'show': default: if (empty($_GET['d_r_id']) || strpos($_GET['d_r_id'], 'tr') >= 0) { - // translation mode (contains "tr") + // translation mode (contains "tr") $RosCMS_GET_d_value2 = $RosCMS_GET_d_r_lang; } @@ -71,11 +73,11 @@ $RosCMS_GET_d_value = str_replace('tr', '', $RosCMS_GET_d_value); if ( is_numeric($RosCMS_GET_d_value) ) { - $stmt=DBConnection::getInstance()->prepare("SELECT d.data_name, r.rev_id, d.data_id, r.rev_language FROM data_ d, data_revision r WHERE r.data_id = d.data_id AND r.rev_id = ".DBConnection::getInstance()->quote()." ORDER BY r.rev_version DESC LIMIT 1"); + $stmt=DBConnection::getInstance()->prepare("SELECT d.data_name, r.rev_id, d.data_id, r.rev_language FROM data_ d, data_revision r WHERE r.data_id = d.data_id AND r.rev_id = :rev_id ORDER BY r.rev_version DESC LIMIT 1"); $stmt->bindParam('rev_id',$RosCMS_GET_d_value,PDO::PARAM_INT); } else { - $stmt=DBConnection::getInstance()->prepare("SELECT d.data_name, r.rev_id, d.data_id, r.rev_language FROM data_ d, data_revision r WHERE r.data_id = d.data_id AND d.data_name = :data_name AND (r.rev_language = lang_one OR r.rev_language = :lang_two) ORDER BY r.rev_version DESC LIMIT 1"); + $stmt=DBConnection::getInstance()->prepare("SELECT d.data_name, r.rev_id, d.data_id, r.rev_language FROM data_ d JOIN data_revision r ON r.data_id = d.data_id WHERE d.data_name = :data_name AND (r.rev_language = lang_one OR r.rev_language = :lang_two) ORDER BY r.rev_version DESC LIMIT 1"); $stmt->bindParam('data_name',$RosCMS_GET_d_value,PDO::PARAM_STR); $stmt->bindParam('lang_one',$RosCMS_GET_d_value2,PDO::PARAM_STR); $stmt->bindParam('lang_two',$roscms_standard_language,PDO::PARAM_STR); @@ -83,14 +85,14 @@ $stmt->execute(); $revision = $stmt->fetchOnce(); - if ($RosCMS_GET_d_value3 == '') { - $tmp_nbr = Tag::getValue($revision['data_id'], $revision['rev_id'], 'number'); + if ($dynamic_num == '') { + $dynamic_num = Tag::getValueByUser($revision['data_id'], $revision['rev_id'], 'number', -1); } - else { - $tmp_nbr = $RosCMS_GET_d_value3; - } - Log::writeGenerateLow('preview page: generate_page('.$tmp_name.', '.$tmp_lang.', '.$tmp_nbr.', '.$_GET['d_u'].')'); - echo $export_html->processTextByName($revision['data_name'], $RosCMS_GET_d_value2, $tmp_nbr, $_GET['d_u']); + + Log::writeGenerateLow('preview page: generate_page('.$revision['data_name'].', '.$revision['rev_language'].', '.$dynamic_num.', '.$_GET['d_u'].')'); + + $export_html = new Export_HTML(); + echo $export_html->processText($revision['rev_id'], $_GET['d_u']); break; } } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php [iso-8859-1] Wed Nov 19 07:07:44 2008 @@ -26,7 +26,9 @@ { - public function __construct(){ + public function __construct() + { + parent::__construct(); // check if everything was given, we need to get the quick info if (!isset($_GET['d_id']) || !isset($_GET['d_r_id'])) { Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.clas… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.clas… [iso-8859-1] Wed Nov 19 07:07:44 2008 @@ -53,6 +53,7 @@ global $rdf_name; global $rdf_register_user_pwd_min; global $rdf_register_user_pwd_max; + global $rdf_register_user_name_max; global $roscms_intern_webserver_pages; $activation_code = $rdf_uri_3; @@ -237,8 +238,7 @@ <br /> <span style="color:#817A71;">You cannot change your username.</span> </div> -v> - + <div class="login-form"> <label for="userpwd3"'.((isset($_POST['registerpost']) && isset($_POST['userpwd3']) && $_POST['userpwd3'] != '') ? ' style="color:red;"' : '').'>Current Password *</label> <input name="userpwd3" type="password" class="input" tabindex="1" id="userpwd3" size="50" maxlength="50" />

1 0

[mkupfer] 37454: revert to revision 37390
by mkupfer＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: mkupfer Date: Wed Nov 19 06:00:23 2008 New Revision: 37454 URL: http://svn.reactos.org/svn/reactos?rev=37454&view=rev Log: revert to revision 37390 Modified: trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Wed Nov 19 06:00:23 2008 @@ -3091,7 +3091,7 @@ size += get_size_procformatstring(stmt->u.lib->stmts, pred) - 1; continue; } - else if (stmt->type != STMT_TYPE && stmt->u.type->type != RPC_FC_IP) + else if (stmt->type != STMT_TYPE || stmt->u.type->type != RPC_FC_IP) continue; iface = stmt->u.type;

1 0

[dgoette] 37453: * use proper html * include css & js files in <head> instaed of in <body> if possible * fix minor bugs
by dgoette＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: dgoette Date: Wed Nov 19 05:15:29 2008 New Revision: 37453 URL: http://svn.reactos.org/svn/reactos?rev=37453&view=rev Log: * use proper html * include css & js files in <head> instaed of in <body> if possible * fix minor bugs Added: branches/danny-web/reactos.org/htdocs/roscms/css/cms_maintain.css (with props) Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js.php branches/danny-web/reactos.org/htdocs/roscms/js/cms_navigation.js.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Maintain.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_User.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_Nopermission.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Activate.class.p… branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Login.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_LostPassword.cla… branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Profile.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.clas… branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Register.class.p… Added: branches/danny-web/reactos.org/htdocs/roscms/css/cms_maintain.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/css/cms_maintain.css (added) +++ branches/danny-web/reactos.org/htdocs/roscms/css/cms_maintain.css [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -1,0 +1,1 @@ +TEXTAREA { width: 100%; } Propchange: branches/danny-web/reactos.org/htdocs/roscms/css/cms_maintain.css ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -1,3 +1,4 @@ +<?php include('../custom.php'); ?> function optimizedb() { makeRequest('?page=data_out&d_f=maintain&d_u=optimize', 'optimize', 'maintainarea'); Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_navigation.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_navigation.js.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_navigation.js.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -1,3 +1,6 @@ +<?php + include_once('../custom.php'); ?> + function pagerefresh() { exitmsg = ''; window.location.href = '<?php echo $roscms_intern_page_link."data&branch=".urldecode(@$_GET['branch']); ?>'; Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -27,12 +27,20 @@ protected $page_start; // start time of page generation protected $title; - protected $css; + protected $css_files=array(); + protected $js_files=array(); public function __construct( $page_title = '', $page_css = 'roscms' ) { + // get page title and register css files $this->title = $page_title; - $this->css = $page_css; + if ($page_css == 'roscms'){ + $this->register_css('style_v3.css'); + } + else { + $this->register_css('style.css'); + $this->register_css('logon.css'); + } // this page was generated in ... $roscms_gentime = explode(' ',microtime()); @@ -73,7 +81,7 @@ // output header echo_strip( ' - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html lang="'.$roscms_langres['lang_code'].'"> <head> <title>ReactOS '.(($this->title!=='') ? '- '.$this->title : '').'</title> @@ -83,15 +91,21 @@ <meta name="generator" content="RosCMS" /> <meta name="Content-language" content="'.$roscms_langres['lang_code'].'" /> <meta name="Robots" content="noindex,nofollow" /> + <meta http-equiv="Content-Script-Type" content="text/javascript" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> <link rel="SHORTCUT ICON" href="../favicon.ico" />'); - if ($this->css == 'roscms') { - echo '<link href="'.$roscms_intern_webserver_roscms.'css/style_v3.css" type="text/css" rel="stylesheet" />'; + // link css & js files (use register_* methods) + foreach($this->css_files as $file) { + if ($file['condition'] === false) { + echo '<link href="'.$roscms_intern_webserver_roscms.'css/'.$file['name'].'" type="text/css" rel="stylesheet" />'; + } + else { + echo ''; + } } - else { - echo_strip(' - <link href="'.$roscms_intern_webserver_roscms.'css/style.css" type="text/css" rel="stylesheet" /> - <link href="'.$roscms_intern_webserver_roscms.'css/logon.css" type="text/css" rel="stylesheet" />'); + foreach($this->js_files as $file) { + echo '<script src="'.$roscms_intern_webserver_roscms.'js/'.$file.'" type="text/javascript"></script>'; } echo_strip(' @@ -99,17 +113,15 @@ <body> <div id="top"> <div id="topMenu"> - <p align="center" style="color: white;"> + <p style="color: white;text-align: center;"> <a href="'.$roscms_intern_webserver_pages.'?page=index">'.$roscms_langres['Home'].'</a> <span>|</span> <a href="'.$roscms_intern_webserver_pages.'?page=about">'.$roscms_langres['Info'].'</a> <span>|</span> <a href="'.$roscms_intern_webserver_pages.'?page=community">'.$roscms_langres['Community'].'</a> <span>|</span> <a href="'.$roscms_intern_webserver_pages.'?page=dev">'.$roscms_langres['Dev'].'</a> <span>|</span> <a href="'.$roscms_intern_webserver_roscms.'?page=user">'.$roscms_langres['myReactOS'].'</a> - </p> - </div> - </div> - - '); + </p> + </div> + </div>'); } // end of member function header @@ -129,17 +141,37 @@ // footer information echo_strip(' - <hr size="1" /> - + <hr /> <div id="footer" style="text-align:center;"> '.$roscms_extern_brand.' '.$roscms_extern_version_detail.' - (c) 2005-2007 Klemens Friedl<br /> <br /> Page generated in '.$page_time.' seconds </div> - </body> </html>'); } // end of member function footer + + /** + * register a css file to be included in the header + * + * @access protected + */ + protected function register_css( $name, $condition = false ) + { + $this->css_files[] = array('name'=>$name, 'condition'=>$condition); + } // end of member function register_css + + + /** + * register a javascript file to be included in the header + * + * @access protected + */ + protected function register_js( $name ) + { + $this->js_files[] = $name; + } // end of member function register_css + } // end of HTML ?> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -42,22 +42,26 @@ header('location:?page=nopermission'); } + // register css & js files + $this->register_css('cms_navigation.css'); + $this->register_js('cms_navigation.js.php'); + parent::__construct( $page_title, 'roscms'); } protected function build() { - parent::header(); + $this->header(); $this->navigation(); $this->body(); - parent::footer(); + $this->footer(); } /** * * - * @access public + * @access private */ private function navigation( ) { @@ -66,26 +70,6 @@ global $roscms_intern_login_check_username; global $roscms_intern_page_link; global $roscms_intern_webserver_pages, $roscms_intern_page_link; - - // get CSS - echo ' - <style type="text/css"> -  - </style>'; - - // Javascript - echo ' - <script language="javascript" type="text/javascript"> -  - </script>'; // get selected navigation entry echo_strip(' @@ -101,7 +85,7 @@ <a href="'.$roscms_intern_page_link.'logout">Sign out</a> </div> <div class="roscms_page"> - <table id="mt" border="0" cellpadding="0" cellspacing="0" width="100%"> + <table id="mt" border="0" cellpadding="0" cellspacing="0" style="width:100%"> <tbody> <tr> <th class="int'.(($this->branch == 'welcome') ? '2' : '1').'" onclick="'."roscms_mainmenu('welcome')".'"> @@ -126,52 +110,52 @@ if (ROSUser::isMemberOfGroup('transmaint','ros_admin','ros_sadmin')) { echo_strip(' - <th class="int'.(($this->branch == 'user') ? '2' : '1').'" onclick="'."roscms_mainmenu('user')".'"> - <div class="tc1"> - <div class="tc2"> - <div class="tc3"></div> - </div> - </div> - <div class="tblbl">User</div> - </th> - <td>  </td>'); + <th class="int'.(($this->branch == 'user') ? '2' : '1').'" onclick="'."roscms_mainmenu('user')".'"> + <div class="tc1"> + <div class="tc2"> + <div class="tc3"></div> + </div> + </div> + <div class="tblbl">User</div> + </th> + <td>  </td>'); } if ($roscms_security_level == 3) { echo_strip(' - <th class="int'.(($this->branch == 'maintain') ? '2' : '1').'" onclick="'."roscms_mainmenu('maintain')".'"> - <div class="tc1"> - <div class="tc2"> - <div class="tc3"></div> - </div> - </div> - <div class="tblbl">Maintain</div> - </th> - <td>  </td> - - <th class="int'.(($this->branch == 'stats') ? '2' : '1').'" onclick="'."roscms_mainmenu('stats')".'"> - <div class="tc1"> - <div class="tc2"> - <div class="tc3"></div> - </div> - </div> - <div class="tblbl">Statistics</div> - </th> - <td>  </td>'); + <th class="int'.(($this->branch == 'maintain') ? '2' : '1').'" onclick="'."roscms_mainmenu('maintain')".'"> + <div class="tc1"> + <div class="tc2"> + <div class="tc3"></div> + </div> + </div> + <div class="tblbl">Maintain</div> + </th> + <td>  </td> + + <th class="int'.(($this->branch == 'stats') ? '2' : '1').'" onclick="'."roscms_mainmenu('stats')".'"> + <div class="tc1"> + <div class="tc2"> + <div class="tc3"></div> + </div> + </div> + <div class="tblbl">Statistics</div> + </th> + <td>  </td>'); } echo_strip(' - <td width="100%"> - <div align="right" id="ajaxloadinginfo" style="visibility:hidden;"> - <img src="images/ajax_loading.gif" alt="loading ..." width="13" height="13" /> - </div> - </td> - </tr> - </tbody> - </table> - - <div class="tc2" style="background-color:#C9DAF8;"> - <div class="submenu" style="font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;">'); + <td style="width:100%"> + <div id="ajaxloadinginfo" style="visibility:hidden; text-align: center;"> + <img src="images/ajax_loading.gif" alt="loading ..." width="13" height="13" /> + </div> + </td> + </tr> + </tbody> + </table> + + <div class="tc2" style="background-color:#C9DAF8;"> + <div class="submenu" style="font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;">'); switch ($this->branch) { case 'welcome'; @@ -197,9 +181,20 @@ break; } echo_strip(' - </div> - </div>'); + </div> + </div>'); } // end of member function navigation + + + /** + * + * + * @access protected + */ + protected function footer() { + echo '</div>'; + parent::footer(); + } } // end of HTML_CMS ?> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Maintain.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Maintain.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Maintain.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -35,6 +35,10 @@ public function __construct( $page_title = '', $page_css = 'roscms' ) { $this->branch = 'maintain'; + + // register css & js files + $this->register_css('cms_maintain.css'); + $this->register_js('cms_maintain.js.php'); parent::__construct( $page_title, $page_css); } @@ -89,8 +93,8 @@ </div> <p><a href="javascript:genpages()">Generate All Pages</a></p> - <div id="maintainarea" style="border: 1px dashed red;" style="display:none;"></div> - <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" /> + <div id="maintainarea" style="border: 1px dashed red;display:none;"></div> + <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" alt="" /> <br />'); if (ROSUser::isMemberOfGroup('ros_sadmin')) { @@ -100,24 +104,24 @@ <br /> <h2>RosCMS Global Log</h2> <h3>High Security Log - '.date('Y-W').'</h3> - <textarea name="logviewerhigh" cols="75" rows="7" wrap="off">');echo Log::read('high');echo_strip('</textarea><br /> + <textarea name="logviewerhigh" cols="75" rows="7">');echo Log::read('high');echo_strip('</textarea><br /> <br /> <h3>Medium Security Log - '.date('Y-W').'</h3> - <textarea name="logviewermed" cols="75" rows="5" wrap="off">');echo Log::read('medium');echo_strip('</textarea><br /> + <textarea name="logviewermed" cols="75" rows="5">');echo Log::read('medium');echo_strip('</textarea><br /> <br /><h3>Low Security Log - '.date('Y-W').'</h3> - <textarea name="logviewerlow" cols="75" rows="3" wrap="off">');echo Log::read('low');echo_strip('</textarea><br /> + <textarea name="logviewerlow" cols="75" rows="3">');echo Log::read('low');echo_strip('</textarea><br /> <br /> <br /> <br /> <h2>RosCMS Generator Log</h2> <h3>High Security Log - '.date('Y-W').'</h3> - <textarea name="logviewerhigh2" cols="75" rows="7" wrap="off">');echo Log::read('high','generate');echo_strip('</textarea><br /> + <textarea name="logviewerhigh2" cols="75" rows="7">');echo Log::read('high','generate');echo_strip('</textarea><br /> <br /> <h3>Medium Security Log - '.date('Y-W').'</h3> - <textarea name="logviewermed2" cols="75" rows="5" wrap="off">');echo Log::read('medium','generate');echo_strip('</textarea><br /> + <textarea name="logviewermed2" cols="75" rows="5">');echo Log::read('medium','generate');echo_strip('</textarea><br /> <br /> <h3>Low Security Log - '.date('Y-W').'</h3> - <textarea name="logviewerlow2" cols="75" rows="3" wrap="off">');echo Log::read('low','generate');echo_strip('</textarea><br /> + <textarea name="logviewerlow2" cols="75" rows="3">');echo Log::read('low','generate');echo_strip('</textarea><br /> <br /> <br /> <br /> @@ -130,26 +134,18 @@ echo_strip(' <h3>'.$language['lang_name'].'</h3> <h4>High Security Log - '.date('Y-W').'</h4> - <textarea name="logviewerhigh'.$language['lang_id'].'" cols="75" rows="5" wrap="off">');echo Log::read('high', $language['lang_id']);echo_strip('</textarea><br /> + <textarea name="logviewerhigh'.$language['lang_id'].'" cols="75" rows="5">');echo Log::read('high', $language['lang_id']);echo_strip('</textarea><br /> <br /> <h4>Medium Security Log - '.date('Y-W').'</h4> - <textarea name="logviewermed'.$language['lang_id'].'" cols="75" rows="4" wrap="off">');echo Log::read('medium', $language['lang_id']);echo_strip('</textarea><br /> + <textarea name="logviewermed'.$language['lang_id'].'" cols="75" rows="4">');echo Log::read('medium', $language['lang_id']);echo_strip('</textarea><br /> <br /> <h4>Low Security Log - '.date('Y-W').'</h4> - <textarea name="logviewerlow'.$language['lang_id'].'" cols="75" rows="3" wrap="off">');echo Log::read('low', $language['lang_id']);echo_strip('</textarea><br /> + <textarea name="logviewerlow'.$language['lang_id'].'" cols="75" rows="3">');echo Log::read('low', $language['lang_id']);echo_strip('</textarea><br /> <br /> <br />'); } } // end of ros_admin only - echo ' - <script type="text/javascript" language="javascript"> -  - </script>'; } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_User.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_User.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_User.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -36,6 +36,10 @@ { $this->branch = 'user'; + // register css & js files + $this->register_css('cms_user.css'); + $this->register_js('cms_user.js'); + parent::__construct( $page_title, $page_css); } @@ -53,14 +57,6 @@ return; } - echo ' - <style type="text/css"> -  - </style>'; echo_strip(' <br /> <h2>User</h2> @@ -84,7 +80,7 @@ <input name="searchopt" type="radio" id="searchopt3" value="email" onclick="getuser()" /><label>email address</label> <input name="searchopt" type="radio" id="searchopt4" value="website" onclick="getuser()" /><label>website</label> <input name="searchopt" type="radio" id="searchopt5" value="language" onclick="getuser()" /><label>language</label> - <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" /><br /> + <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" alt="" /><br /> <br /> </div> <div id="userarea"></div> @@ -104,14 +100,6 @@ echo_strip(' </ul> <br />'); - echo ' - <script type="text/javascript" language="javascript"> -  - </script>'; } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -36,6 +36,15 @@ { $this->branch = 'website'; + // register css + $this->register_css('cms_website.css'); + $this->register_css('cms_website-ie.css','IE'); + + $this->register_js('cms_website.js'); + $this->register_js('cms_website.js.php'); + $this->register_js('diffv3.js'); + $this->register_js('../editor/jscripts/tiny_mce/tiny_mce_src.js'); + $this->register_js('../editor/jscripts/mef.js'); parent::__construct( $page_title, $page_css); } @@ -61,7 +70,7 @@ <p>It does work fine in Internet Explorer 5.5+, Mozilla Firefox 1.5+, Opera 9.1+, Safari 3.2+ and probably every client with basic Javascript (+AJAX) support.</p> </noscript>'); echo ' - <script type="text/javascript" language="javascript"> + <script type="text/javascript">  - </script>"; - echo_strip(' - <script language="javascript" type="text/javascript" src="'.$roscms_intern_webserver_roscms.'js/cms_website.js"></script> - <script language="javascript" type="text/javascript" src="'.$roscms_intern_webserver_roscms.'js/cms_website.js.php"></script> - <script language="javascript" type="text/javascript" src="'.$roscms_intern_webserver_roscms.'editor/jscripts/tiny_mce/tiny_mce_src.js"></script> - <script language="javascript" type="text/javascript" src="'.$roscms_intern_webserver_roscms.'editor/jscripts/mef.js"></script> - <script language="javascript" type="text/javascript" src="'.$roscms_intern_webserver_roscms.'js/diffv3.js"></script>'); - - echo ' - <style type="text/css"> -  - </style>'; - - echo_strip(' + </script>";echo_strip(' <div class="spacer"> </div> - <div align="center" style="padding-top: 8px; padding-bottom: 5px;"> + <div style="padding-top: 8px; padding-bottom: 5px;text-align: center"> <div id="alertb" class="infobox" style="visibility:hidden;"> <div class="lab1"> <div class="lab2"> @@ -290,7 +280,7 @@ <div class="rounded_ul"> <div class="rounded_ur"> <div class="bubble" id="bub"> - <div id="frametable" name="frametable" style="border: 0px dashed white;"> + <div id="frametable" style="border: 0px dashed white;"> <div class="filterbar"> <input id="txtfind" type="text" accesskey="f" tabindex="1" title="Search & Filters" onfocus="'."textbox_hint(this.id, this.value, 'Search & Filters', 1)".'" onblur="'."textbox_hint(this.id, this.value, 'Search & Filters', 0)".'" onkeyup="filtsearchbox()" value="Search & Filters" size="39" maxlength="250" class="tfind" />  <span id="filters" class="filterbutton" onclick="TabOpenClose(this.id)"><img id="filtersi" src="images/tab_closed.gif" alt="" style="width:11px; height:11px; border:0px;" /> Filters</span>  @@ -303,7 +293,7 @@    <span class="filterbutton" onclick="filtsearch()"><img src="images/search.gif" alt="" style="width:14px; height:14px; border:0px;" /> Search</span> </div> </div>');echo ' - <script type="text/javascript" language="javascript"> + <script type="text/javascript"> ";echo_strip(' </script> <img id="captcha" src="'.$roscms_SET_path_ex.'register/captcha" style="padding-top:10px;" alt="If you can\'t read this, try another one or email '.$rdf_support_email_str.' for help." title="Are you human?" />

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008