Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 40334: - Rework NtGdiStretchBlt into GreStretchBltMask function, which provides stretch blitting with mask support. - Add NtGdiStretchBlt as a simple forwarder to the internal GreStretchBltMask helper. - Based on a patch by Evgeniy Boltik. - Some optimisation issues could still be solved as Timo suggested. See issue #4294 for more details.
by fireball＠svn.reactos.org 02 Apr '09

02 Apr '09

Author: fireball Date: Thu Apr 2 23:00:09 2009 New Revision: 40334 URL: http://svn.reactos.org/svn/reactos?rev=40334&view=rev Log: - Rework NtGdiStretchBlt into GreStretchBltMask function, which provides stretch blitting with mask support. - Add NtGdiStretchBlt as a simple forwarder to the internal GreStretchBltMask helper. - Based on a patch by Evgeniy Boltik. - Some optimisation issues could still be solved as Timo suggested. See issue #4294 for more details. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c trunk/reactos/subsystems/win32/win32k/dib/dib.h trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] Thu Apr 2 23:00:09 2009 @@ -224,7 +224,7 @@ } BOOLEAN Dummy_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - SURFOBJ *PatternSurface, + SURFOBJ *PatternSurface, SURFOBJ *MaskSurf, RECTL* DestRect, RECTL *SourceRect, POINTL* MaskOrigin, BRUSHOBJ* Brush, POINTL* BrushOrign, Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] Thu Apr 2 23:00:09 2009 @@ -41,7 +41,7 @@ typedef VOID (*PFN_DIB_HLine)(SURFOBJ*,LONG,LONG,LONG,ULONG); typedef VOID (*PFN_DIB_VLine)(SURFOBJ*,LONG,LONG,LONG,ULONG); typedef BOOLEAN (*PFN_DIB_BitBlt)(PBLTINFO); -typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); +typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); typedef BOOLEAN (*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); typedef BOOLEAN (*PFN_DIB_ColorFill)(SURFOBJ*, RECTL*, ULONG); typedef BOOLEAN (*PFN_DIB_AlphaBlend)(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -67,7 +67,7 @@ VOID Dummy_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG); VOID Dummy_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN Dummy_BitBlt(PBLTINFO); -BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); +BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); BOOLEAN Dummy_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); BOOLEAN Dummy_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN Dummy_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -132,7 +132,7 @@ BOOLEAN DIB_32BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_32BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); -BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); +BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; Modified: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] Thu Apr 2 23:00:09 2009 @@ -22,7 +22,7 @@ #define NDEBUG #include <debug.h> -BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, +BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, SURFOBJ *MaskSurf, SURFOBJ *PatternSurface, RECTL *DestRect, RECTL *SourceRect, POINTL *MaskOrigin, BRUSHOBJ *Brush, @@ -48,6 +48,7 @@ PFN_DIB_GetPixel fnDest_GetPixel = NULL; PFN_DIB_PutPixel fnDest_PutPixel = NULL; PFN_DIB_GetPixel fnPattern_GetPixel = NULL; + PFN_DIB_GetPixel fnMask_GetPixel = NULL; ULONG PatternX = 0, PatternY = 0; @@ -65,6 +66,11 @@ fnSource_GetPixel = DibFunctionsForBitmapFormat[SourceSurf->iBitmapFormat].DIB_GetPixel; DPRINT("Source BPP: %u, srcRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom); + } + + if (MaskSurf) + { + fnMask_GetPixel = DibFunctionsForBitmapFormat[MaskSurf->iBitmapFormat].DIB_GetPixel; } DstHeight = DestRect->bottom - DestRect->top; @@ -120,7 +126,19 @@ for (DesX = DestRect->left; DesX < DestRect->right; DesX++) { CanDraw = TRUE; - if (UsesSource) + + if (fnMask_GetPixel) + { + sx = SourceRect->left+(DesX - DestRect->left) * SrcWidth / DstWidth; + if (sx < 0 || sy < 0 || + MaskSurf->sizlBitmap.cx < sx || MaskSurf->sizlBitmap.cy < sy || + fnMask_GetPixel(MaskSurf, sx, sy) != 0) + { + CanDraw = FALSE; + } + } + + if (UsesSource && CanDraw) { sx = SourceRect->left+(DesX - DestRect->left) * SrcWidth / DstWidth; if (sx >= 0 && sy >= 0 && Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Thu Apr 2 23:00:09 2009 @@ -808,7 +808,7 @@ } return DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_StretchBlt( - psoDest, psoSource, PatternSurface, + psoDest, psoSource, Mask, PatternSurface, OutputRect, InputRect, MaskOrigin, pbo, &RealBrushOrigin, ColorTranslation, XlatePatternToDest, Rop4); @@ -1021,21 +1021,7 @@ AdjustedBrushOrigin = Translate; } - if (Mask != NULL) - { - //BltRectFunc = BltMask; - DPRINT("EngStretchBlt isn't capable of handling mask yet.\n"); - IntEngLeave(&EnterLeaveDest); - if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - return FALSE; - } - else - { - BltRectFunc = CallDibStretchBlt; - } + BltRectFunc = CallDibStretchBlt; DstHeight = OutputRect.bottom - OutputRect.top; DstWidth = OutputRect.right - OutputRect.left; 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] Thu Apr 2 23:00:09 2009 @@ -253,5 +253,20 @@ UINT APIENTRY IntSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Colors); +BOOL APIENTRY +GreStretchBltMask(IN HDC hdcDst, + IN INT xDst, + IN INT yDst, + IN INT cxDst, + IN INT cyDst, + IN HDC hdcSrc, + IN INT xSrc, + IN INT ySrc, + IN INT cxSrc, + IN INT cySrc, + IN DWORD dwRop, + IN DWORD dwBackColor, + IN HDC hdcMask); + #endif /* _WIN32K_INTGDI_H */ Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Thu Apr 2 23:00:09 2009 @@ -720,7 +720,7 @@ } BOOL APIENTRY -NtGdiStretchBlt( +GreStretchBltMask( HDC hDCDest, INT XOriginDest, INT YOriginDest, @@ -732,12 +732,15 @@ INT WidthSrc, INT HeightSrc, DWORD ROP, - IN DWORD dwBackColor) + IN DWORD dwBackColor, + HDC hDCMask) { PDC DCDest; PDC DCSrc = NULL; + PDC DCMask = NULL; PDC_ATTR pdcattr; SURFACE *BitmapDest, *BitmapSrc = NULL; + SURFACE *BitmapMask = NULL; RECTL DestRect; RECTL SourceRect; BOOL Status = FALSE; @@ -853,6 +856,23 @@ BrushOrigin.x += DCDest->ptlDCOrig.x; BrushOrigin.y += DCDest->ptlDCOrig.y; + /* Make mask surface for source surface */ + if (BitmapSrc && hDCMask) + { + DCMask = DC_LockDc(hDCMask); + if (DCMask) + { + BitmapMask = SURFACE_LockSurface(DCMask->rosdc.hBitmap); + if (BitmapMask && + (BitmapMask->SurfObj.sizlBitmap.cx != WidthSrc || + BitmapMask->SurfObj.sizlBitmap.cy != HeightSrc)) + { + DPRINT1("Mask and bitmap sizes don't match!\n"); + goto failed; + } + } + } + /* Perform the bitblt operation */ Status = IntEngStretchBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, @@ -879,14 +899,55 @@ { SURFACE_UnlockSurface(BitmapDest); } + if (BitmapMask) + { + SURFACE_UnlockSurface(BitmapMask); + } if (UsesSource && hDCSrc != hDCDest) { DC_UnlockDc(DCSrc); + } + if (DCMask) + { + DC_UnlockDc(DCMask); } DC_UnlockDc(DCDest); return Status; } + + +BOOL APIENTRY +NtGdiStretchBlt( + HDC hDCDest, + INT XOriginDest, + INT YOriginDest, + INT WidthDest, + INT HeightDest, + HDC hDCSrc, + INT XOriginSrc, + INT YOriginSrc, + INT WidthSrc, + INT HeightSrc, + DWORD ROP, + IN DWORD dwBackColor) +{ + return GreStretchBltMask( + hDCDest, + XOriginDest, + YOriginDest, + WidthDest, + HeightDest, + hDCSrc, + XOriginSrc, + YOriginSrc, + WidthSrc, + HeightSrc, + ROP, + dwBackColor, + NULL); +} + BOOL FASTCALL IntPatBlt(

1 0

[jimtabor] 40333: - Migration changes from PPROCESSINFO and PTHREADINFO to use ClientInfo from TEB. I moved kpi to ci->ppi, we still depend on it as a reference pointer. - Added and changed structure types. - Tested with old AbiWord, FireFox and explorer. - Comment out TestWindowProcess until the rest is ready.
by jimtabor＠svn.reactos.org 02 Apr '09

02 Apr '09

Author: jimtabor Date: Thu Apr 2 22:52:34 2009 New Revision: 40333 URL: http://svn.reactos.org/svn/reactos?rev=40333&view=rev Log: - Migration changes from PPROCESSINFO and PTHREADINFO to use ClientInfo from TEB. I moved kpi to ci->ppi, we still depend on it as a reference pointer. - Added and changed structure types. - Tested with old AbiWord, FireFox and explorer. - Comment out TestWindowProcess until the rest is ready. Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -93,7 +93,7 @@ static __inline BOOL IsThreadHooked(PW32THREADINFO ti) { - return ti->Hooks != 0; + return ti->fsHooks != 0; } static __inline PDESKTOPINFO @@ -104,7 +104,7 @@ ti = GetW32ThreadInfo(); if (ti != NULL) - di = DesktopPtrToUser(ti->Desktop); + di = DesktopPtrToUser(ti->pDeskInfo); return di; } Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -431,7 +431,7 @@ ValidateCallProc(HANDLE hCallProc) { PCALLPROC CallProc = ValidateHandle(hCallProc, VALIDATE_TYPE_CALLPROC); - if (CallProc != NULL ) //&& CallProc->pi == g_kpi) + if (CallProc != NULL && CallProc->pi == GetWin32ClientInfo()->ppi) return CallProc; return NULL; Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -1126,7 +1126,8 @@ _SEH2_TRY { - if (TestWindowProcess( Wnd))// if (Wnd->pi != g_kpi) +// if (TestWindowProcess( Wnd)) + if (Wnd->pi != GetWin32ClientInfo()->ppi) { if (nMaxCount > 0) { @@ -1216,7 +1217,8 @@ _SEH2_TRY { - if (TestWindowProcess( Wnd)) //if (Wnd->pi != g_kpi) +// if (TestWindowProcess( Wnd)) + if (Wnd->pi != GetWin32ClientInfo()->ppi) { if (nMaxCount > 0) { Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -364,13 +364,12 @@ typedef struct _W32THREADINFO { - PPROCESSINFO pi; /* [USER] */ - PPROCESSINFO kpi; /* [KERNEL] */ - PDESKTOPINFO Desktop; + PPROCESSINFO ppi; /* [KERNEL] */ + PDESKTOPINFO pDeskInfo; // PVOID DesktopHeapBase; // ULONG_PTR DesktopHeapLimit; /* A mask of what hooks are currently active */ - ULONG Hooks; + ULONG fsHooks; CLIENTTHREADINFO ClientThreadInfo; } W32THREADINFO, *PW32THREADINFO; @@ -424,7 +423,9 @@ USHORT CodePage; USHORT achDbcsCF; MSG msgDbcsCB; - ULONG Win32ClientInfo3[29]; + ULONG Win32ClientInfo3[28]; +/* It's just a pointer reference not to be used w the structure in user space. */ + PPROCESSINFO ppi; } CLIENTINFO, *PCLIENTINFO; /* Make sure it fits exactly into the TEB */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -1142,13 +1142,13 @@ pti = PsGetCurrentThreadWin32Thread(); ti = GetW32ThreadInfo(); - if (ti == NULL || !ti->kpi->RegisteredSysClasses) + if (ti == NULL || !ti->ppi->RegisteredSysClasses) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return (RTL_ATOM)0; } - pi = ti->kpi; + pi = ti->ppi; /* try to find a previously registered class */ ClassAtom = IntGetClassAtom(ClassName, @@ -2149,7 +2149,7 @@ Window = UserGetWindowObject(hWnd); if (Window != NULL) { - if (Window->ti->kpi != pi) + if (Window->ti->ppi != pi) { SetLastWin32Error(ERROR_ACCESS_DENIED); goto Cleanup; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -1748,9 +1748,9 @@ ti = GetW32ThreadInfo(); if (ti != NULL) { - if (ti->Desktop == DesktopObject->DesktopInfo) + if (ti->pDeskInfo == DesktopObject->DesktopInfo) { - ti->Desktop = NULL; + ti->pDeskInfo = NULL; } GetWin32ClientInfo()->pDeskInfo = NULL; } @@ -1830,11 +1830,11 @@ GetWin32ClientInfo()->ulClientDelta = DesktopHeapGetUserDelta(); if (ti != NULL) { - if (ti->Desktop == NULL) + if (ti->pDeskInfo == NULL) { - ti->Desktop = DesktopObject->DesktopInfo; + ti->pDeskInfo = DesktopObject->DesktopInfo; GetWin32ClientInfo()->pDeskInfo = - (PVOID)((ULONG_PTR)ti->Desktop - GetWin32ClientInfo()->ulClientDelta); + (PVOID)((ULONG_PTR)ti->pDeskInfo - GetWin32ClientInfo()->ulClientDelta); } } @@ -1882,7 +1882,7 @@ PW32THREADINFO ti = GetW32ThreadInfo(); if (ti != NULL) { - ti->Desktop = NULL; + ti->pDeskInfo = NULL; } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -113,7 +113,7 @@ GetWin32ClientInfo()->fsHooks = W32Thread->Hooks; if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->Hooks = W32Thread->Hooks; + W32Thread->ThreadInfo->fsHooks = W32Thread->Hooks; } RtlInitUnicodeString(&Hook->ModuleName, NULL); @@ -227,7 +227,7 @@ GetWin32ClientInfo()->fsHooks = W32Thread->Hooks; if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->Hooks = W32Thread->Hooks; + W32Thread->ThreadInfo->fsHooks = W32Thread->Hooks; if (0 != Table->Counts[HOOKID_TO_INDEX(Hook->HookId)]) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -306,7 +306,7 @@ if (Window->ti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->ThreadInfo) SameThread = TRUE; - if ((!SameThread && (Window->ti->Hooks & HOOKID_TO_FLAG(WH_CALLWNDPROC))) || + if ((!SameThread && (Window->ti->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROC))) || (SameThread && ISITHOOKED(WH_CALLWNDPROC)) ) { CWPSTRUCT CWP; @@ -328,7 +328,7 @@ if (Window->ti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->ThreadInfo) SameThread = TRUE; - if ((!SameThread && (Window->ti->Hooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET))) || + if ((!SameThread && (Window->ti->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET))) || (SameThread && ISITHOOKED(WH_CALLWNDPROCRET)) ) { CWPRETSTRUCT CWPR; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -91,9 +91,9 @@ /* FIXME should use UserEnterShared */ RETURN( (DWORD)IntGetCapture()); case THREADSTATE_PROGMANWINDOW: - RETURN( (DWORD)GetW32ThreadInfo()->Desktop->hProgmanWindow); + RETURN( (DWORD)GetW32ThreadInfo()->pDeskInfo->hProgmanWindow); case THREADSTATE_TASKMANWINDOW: - RETURN( (DWORD)GetW32ThreadInfo()->Desktop->hTaskManWindow); + RETURN( (DWORD)GetW32ThreadInfo()->pDeskInfo->hTaskManWindow); case THREADSTATE_ACTIVEWINDOW: RETURN ( (DWORD)UserGetActiveWindow()); } @@ -501,17 +501,16 @@ sizeof(W32THREADINFO)); /* initialize it */ - ti->kpi = GetW32ProcessInfo(); - ti->pi = UserHeapAddressToUser(ti->kpi); - ti->Hooks = W32Thread->Hooks; + ti->ppi = GetW32ProcessInfo(); + ti->fsHooks = W32Thread->Hooks; W32Thread->pcti = &ti->ClientThreadInfo; if (W32Thread->Desktop != NULL) { - ti->Desktop = W32Thread->Desktop->DesktopInfo; + ti->pDeskInfo = W32Thread->Desktop->DesktopInfo; } else { - ti->Desktop = NULL; + ti->pDeskInfo = NULL; } W32Thread->ThreadInfo = ti; @@ -527,6 +526,7 @@ // FIXME PLEASE! it's a ref pointer and not user data! Use ClientThreadInfo! Teb->Win32ThreadInfo = UserHeapAddressToUser(W32Thread->ThreadInfo); ci->pClientThreadInfo = &ti->ClientThreadInfo; // FIXME! + ci->ppi = ti->ppi; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -79,7 +79,7 @@ if (Window && Window->ti) { - if (Window->ti->Hooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE)) + if (Window->ti->fsHooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE)) { co_HOOK_CallHooks(WH_FOREGROUNDIDLE,HC_ACTION,0,0); } @@ -547,7 +547,7 @@ if (DesktopWindow) { UserRefObjectCo(DesktopWindow, &Ref);//can DesktopWindow be NULL? - Desk = DesktopWindow->ti->Desktop; + Desk = DesktopWindow->ti->pDeskInfo; } /* Process messages in the message queue itself. */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -376,7 +376,7 @@ RETURN(FALSE); } - if (InterlockedCompareExchangePointer(&ti->kpi->hModUser, + if (InterlockedCompareExchangePointer(&ti->ppi->hModUser, (HINSTANCE)Param, NULL) == NULL) { @@ -814,11 +814,11 @@ switch (Routine) { case HWNDOPT_ROUTINE_SETPROGMANWINDOW: - GetW32ThreadInfo()->Desktop->hProgmanWindow = hWnd; + GetW32ThreadInfo()->pDeskInfo->hProgmanWindow = hWnd; break; case HWNDOPT_ROUTINE_SETTASKMANWINDOW: - GetW32ThreadInfo()->Desktop->hTaskManWindow = hWnd; + GetW32ThreadInfo()->pDeskInfo->hTaskManWindow = hWnd; break; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -162,7 +162,7 @@ { if ( (lParam == (LPARAM)pTmr->pfn) && (pTmr->flags & (TMRF_SYSTEM|TMRF_RIT)) && - (pTmr->pti->ThreadInfo->kpi == pti->ThreadInfo->kpi) ) + (pTmr->pti->ThreadInfo->ppi == pti->ThreadInfo->ppi) ) break; pTmr = (PTIMER)pTmr->ptmrList.Flink; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Apr 2 22:52:34 2009 @@ -499,8 +499,8 @@ /* dereference the class */ IntDereferenceClass(Wnd->Class, - Window->ti->Desktop, - Window->ti->kpi); + Window->ti->pDeskInfo, + Window->ti->ppi); Wnd->Class = NULL; if(Window->WindowRegion) @@ -581,10 +581,10 @@ Wnd->Unicode); if (NewCallProc == NULL) { - NewCallProc = CreateCallProc(Wnd->ti->Desktop, + NewCallProc = CreateCallProc(Wnd->ti->pDeskInfo, Wnd->WndProc, Wnd->Unicode, - Wnd->ti->kpi); + Wnd->ti->ppi); if (NewCallProc == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); @@ -1630,7 +1630,7 @@ ClassAtom = IntGetClassAtom(ClassName, hInstance, - ti->kpi, + ti->ppi, &Class, &ClassLink); @@ -1679,7 +1679,7 @@ Wnd = Window->Wnd; Wnd->ti = ti; - Wnd->pi = ti->kpi; + Wnd->pi = ti->ppi; Wnd->pdesktop = pti->Desktop; Wnd->hWndLastActive = hWnd; } @@ -2245,8 +2245,8 @@ if (ClassAtom == 0XC007) { PCALLPROC CallProc; - //CallProc = CreateCallProc(NULL, Wnd->WndProc, bUnicodeWindow, Wnd->ti->kpi); - CallProc = CreateCallProc(NULL, Wnd->WndProc, Wnd->Unicode , Wnd->ti->kpi); + //CallProc = CreateCallProc(NULL, Wnd->WndProc, bUnicodeWindow, Wnd->ti->ppi); + CallProc = CreateCallProc(NULL, Wnd->WndProc, Wnd->Unicode , Wnd->ti->ppi); if (!CallProc) { @@ -2279,8 +2279,8 @@ if (Class != NULL) { IntDereferenceClass(Class, - ti->Desktop, - ti->kpi); + ti->pDeskInfo, + ti->ppi); } } END_CLEANUP; @@ -3339,7 +3339,7 @@ WinStaObject->ShellListView = hwndListView; ti = GetW32ThreadInfo(); - if (ti->Desktop) ti->Desktop->hShellWindow = hwndShell; + if (ti->pDeskInfo) ti->pDeskInfo->hShellWindow = hwndShell; UserDerefObjectCo(WndShell); @@ -3707,7 +3707,7 @@ CallProc = CreateCallProc(NULL, Wnd->WndProc, Wnd->Unicode, - Wnd->ti->kpi); + Wnd->ti->ppi); if (CallProc == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);

1 0

[fireball] 40332: - Apply a fix by Timo Kreuzer for the bug spotted by Evgeniy Boltik. 4 failures less in "gdi32_winetest.exe bitmap" now. See issue #4326 for more details.
by fireball＠svn.reactos.org 02 Apr '09

02 Apr '09

Author: fireball Date: Thu Apr 2 21:43:24 2009 New Revision: 40332 URL: http://svn.reactos.org/svn/reactos?rev=40332&view=rev Log: - Apply a fix by Timo Kreuzer for the bug spotted by Evgeniy Boltik. 4 failures less in "gdi32_winetest.exe bitmap" now. See issue #4326 for more details. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] Thu Apr 2 21:43:24 2009 @@ -62,8 +62,11 @@ static void DIB_1BPP_BitBltSrcCopy_From1BPP ( - SURFOBJ* DestSurf, SURFOBJ* SourceSurf, - PRECTL DestRect, POINTL *SourcePoint ) + SURFOBJ* DestSurf, + SURFOBJ* SourceSurf, + XLATEOBJ* pxlo, + PRECTL DestRect, + POINTL *SourcePoint ) { // the 'window' in this sense is the x-position that corresponds // to the left-edge of the 8-pixel byte we are currently working with. @@ -88,9 +91,9 @@ int dy2; // dest y end int sy1; // src y start - int dx; + int dx; int shift; - BYTE srcmask, dstmask; + BYTE srcmask, dstmask, xormask; // 'd' and 's' are the dest & src buffer pointers that I use on my x-sweep // 'pd' and 'ps' are the dest & src buffer pointers used on the inner y-sweep @@ -98,6 +101,8 @@ PBYTE s, ps; // src ptrs shift = (dl-sl)&7; + + xormask = 0xFF * XLATEOBJ_iXlate(pxlo, 0); if ( DestRect->top <= SourcePoint->y ) { @@ -164,7 +169,7 @@ { for ( ;; ) { - *pd = (BYTE)((*pd & dstmask) | (*ps & srcmask)); + *pd = (BYTE)((*pd & dstmask) | ((ps[0]^xormask) & srcmask)); // this *must* be here, because we could be going up *or* down... if ( dy == dy2 ) @@ -179,7 +184,7 @@ for ( ;; ) { *pd = (BYTE)((*pd & dstmask) - | ( ( ps[1] >> shift ) & srcmask )); + | ( ( (ps[1]^xormask) >> shift ) & srcmask )); // this *must* be here, because we could be going up *or* down... if ( dy == dy2 ) @@ -194,7 +199,7 @@ for ( ;; ) { *pd = (*pd & dstmask) - | ( ( ps[0] << ( 8 - shift ) ) & srcmask ); + | ( ( (ps[0]^xormask) << ( 8 - shift ) ) & srcmask ); // this *must* be here, because we could be going up *or* down... if ( dy == dy2 ) @@ -209,7 +214,7 @@ for ( ;; ) { *pd = (*pd & dstmask) - | ( ( ( (ps[1])|(ps[0]<<8) ) >> shift ) & srcmask ); + | ( ( ( ((ps[1]^xormask))|((ps[0]^xormask)<<8) ) >> shift ) & srcmask ); // this *must* be here, because we could be going up *or* down... if ( dy == dy2 ) @@ -239,7 +244,7 @@ switch ( BltInfo->SourceSurface->iBitmapFormat ) { case BMF_1BPP: - DIB_1BPP_BitBltSrcCopy_From1BPP ( BltInfo->DestSurface, BltInfo->SourceSurface, &BltInfo->DestRect, &BltInfo->SourcePoint ); + DIB_1BPP_BitBltSrcCopy_From1BPP ( BltInfo->DestSurface, BltInfo->SourceSurface, BltInfo->XlateSourceToDest, &BltInfo->DestRect, &BltInfo->SourcePoint ); break; case BMF_4BPP:

1 0

[fireball] 40331: - NtGdiSetDIBitsToDeviceInternal: use bitmap's palette if it exists instead of always using system palette. Based on a patch by Evgeniy Boltik from bug 4326. See issue #4326 for more details.
by fireball＠svn.reactos.org 02 Apr '09

02 Apr '09

Author: fireball Date: Thu Apr 2 21:25:56 2009 New Revision: 40331 URL: http://svn.reactos.org/svn/reactos?rev=40331&view=rev Log: - NtGdiSetDIBitsToDeviceInternal: use bitmap's palette if it exists instead of always using system palette. Based on a patch by Evgeniy Boltik from bug 4326. See issue #4326 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Apr 2 21:25:56 2009 @@ -437,6 +437,7 @@ PDC pDC; HBITMAP hSourceBitmap = NULL; SURFOBJ *pDestSurf, *pSourceSurf = NULL; + SURFACE *pSurf; RECTL rcDest; POINTL ptSource; INT DIBWidth; @@ -476,13 +477,18 @@ return 0; } + /* Use destination palette obtained from the DC by default */ + DDBPalette = pDC->ppdev->DevInfo.hpalDefault; + + /* Try to use hDIBPalette if it exists */ + pSurf = SURFACE_LockSurface(pDC->rosdc.hBitmap); + if (pSurf && pSurf->hDIBPalette) + { + DDBPalette = pSurf->hDIBPalette; + SURFACE_UnlockSurface(pSurf); + } + pDestSurf = EngLockSurface((HSURF)pDC->rosdc.hBitmap); - if (!pDestSurf) - { - /* FIXME: SetLastError ? */ - DC_UnlockDc(pDC); - return 0; - } rcDest.left = XDest; rcDest.top = YDest; @@ -521,8 +527,8 @@ goto Exit; } - /* Obtain destination palette from the DC */ - pDCPalette = PALETTE_LockPalette(pDC->ppdev->DevInfo.hpalDefault); + /* Obtain destination palette */ + pDCPalette = PALETTE_LockPalette(DDBPalette); if (!pDCPalette) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -531,7 +537,6 @@ } DDBPaletteType = pDCPalette->Mode; - DDBPalette = pDC->ppdev->DevInfo.hpalDefault; PALETTE_UnlockPalette(pDCPalette); DIBPalette = BuildDIBPalette(bmi, (PINT)&DIBPaletteType);

1 0

[dgoette] 40330: finish: converting database calls to pdo
by dgoette＠svn.reactos.org 02 Apr '09

02 Apr '09

1 0

[fireball] 40329: - Simplify code. Inspired by Evgeniy Boltik's patch. See issue #4326 for more details.
by fireball＠svn.reactos.org 02 Apr '09

02 Apr '09

Author: fireball Date: Thu Apr 2 20:34:11 2009 New Revision: 40329 URL: http://svn.reactos.org/svn/reactos?rev=40329&view=rev Log: - Simplify code. Inspired by Evgeniy Boltik's patch. See issue #4326 for more details. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] Thu Apr 2 20:34:11 2009 @@ -233,6 +233,7 @@ BOOLEAN DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo) { + ULONG Color; LONG i, j, sx, sy = BltInfo->SourcePoint.y; switch ( BltInfo->SourceSurface->iBitmapFormat ) @@ -247,12 +248,8 @@ sx = BltInfo->SourcePoint.x; for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) { - if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_4BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0) - { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0); - } else { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1); - } + Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_4BPP_GetPixel(BltInfo->SourceSurface, sx, sy)); + DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color); sx++; } sy++; @@ -265,12 +262,8 @@ sx = BltInfo->SourcePoint.x; for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) { - if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_8BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0) - { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0); - } else { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1); - } + Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_8BPP_GetPixel(BltInfo->SourceSurface, sx, sy)); + DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color); sx++; } sy++; @@ -283,12 +276,8 @@ sx = BltInfo->SourcePoint.x; for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) { - if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_16BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0) - { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0); - } else { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1); - } + Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_16BPP_GetPixel(BltInfo->SourceSurface, sx, sy)); + DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color); sx++; } sy++; @@ -301,12 +290,8 @@ sx = BltInfo->SourcePoint.x; for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) { - if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_24BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0) - { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0); - } else { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1); - } + Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_24BPP_GetPixel(BltInfo->SourceSurface, sx, sy)); + DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color); sx++; } sy++; @@ -319,12 +304,8 @@ sx = BltInfo->SourcePoint.x; for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) { - if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_32BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0) - { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0); - } else { - DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1); - } + Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_32BPP_GetPixel(BltInfo->SourceSurface, sx, sy)); + DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color); sx++; } sy++;

1 0

[gedmurphy] 40328: Pretend to open folders in a new window... I say pretend because it doesn't actually work as it should it just maximizes them, but it gives the illusion that it does and that's good enough for now as it's not worth fixing.
by gedmurphy＠svn.reactos.org 02 Apr '09

02 Apr '09

Author: gedmurphy Date: Thu Apr 2 19:06:04 2009 New Revision: 40328 URL: http://svn.reactos.org/svn/reactos?rev=40328&view=rev Log: Pretend to open folders in a new window... I say pretend because it doesn't actually work as it should it just maximizes them, but it gives the illusion that it does and that's good enough for now as it's not worth fixing. Modified: trunk/reactos/base/shell/explorer/explorer-cfg-template.xml Modified: trunk/reactos/base/shell/explorer/explorer-cfg-template.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cfg-template.xml [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-cfg-template.xml [iso-8859-1] Thu Apr 2 19:06:04 2009 @@ -2,7 +2,7 @@ <explorer-cfg> <general> <look-and-feel name="classic"/> - <explorer mdi="true" separate-folders="true"/> + <explorer mdi="true" separate-folders="false"/> <language name="EN"/> </general>

1 0

[gedmurphy] 40327: Stop mithering me and just open the MDI shell browser by default.
by gedmurphy＠svn.reactos.org 02 Apr '09

02 Apr '09

Author: gedmurphy Date: Thu Apr 2 18:59:18 2009 New Revision: 40327 URL: http://svn.reactos.org/svn/reactos?rev=40327&view=rev Log: Stop mithering me and just open the MDI shell browser by default. Modified: trunk/reactos/base/shell/explorer/explorer.cpp Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Thu Apr 2 18:59:18 2009 @@ -723,16 +723,7 @@ g_Globals._prescan_nodes = false; - XMLPos explorer_options = g_Globals.get_cfg("general/explorer"); - XS_String mdiStr = XMLString(explorer_options, "mdi"); - - // If there isn't yet the "mdi" setting in the configuration, display the MDI/SDI dialog. - if (mdiStr.empty()) - Dialog::DoModal(IDD_MDI_SDI, WINDOW_CREATOR(MdiSdiDlg), g_Globals._hwndDesktop); - - // Now read the MDI attribute again and interpret it as boolean value. - cmd._mdi = XMLBool(explorer_options, "mdi", true); - + cmd._mdi = true; cmd._cmdShow = cmdShow; // parse command line options, which may overwrite the MDI flag

1 0

[dgoette] 40326: remove parts of the supportDB that are not part of the compatDB
by dgoette＠svn.reactos.org 02 Apr '09

02 Apr '09

Author: dgoette Date: Thu Apr 2 13:03:34 2009 New Revision: 40326 URL: http://svn.reactos.org/svn/reactos?rev=40326&view=rev Log: remove parts of the supportDB that are not part of the compatDB Removed: branches/danny-web/reactos.org/htdocs/compat/inc/devnet/ branches/danny-web/reactos.org/htdocs/compat/inc/devnet.php branches/danny-web/reactos.org/htdocs/compat/inc/media/ branches/danny-web/reactos.org/htdocs/compat/inc/media.php branches/danny-web/reactos.org/htdocs/compat/inc/pack/ branches/danny-web/reactos.org/htdocs/compat/inc/pack.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_group.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item_menubar.php Modified: branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_bugs.php branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_details.php branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_forum.php branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshot_… branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshots… branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests.php branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests_submi… branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tips.php branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/tree_category_com… branches/danny-web/reactos.org/htdocs/compat/inc/home.php branches/danny-web/reactos.org/htdocs/compat/inc/lang/de.php branches/danny-web/reactos.org/htdocs/compat/inc/lang/en.php branches/danny-web/reactos.org/htdocs/compat/inc/structure.php branches/danny-web/reactos.org/htdocs/compat/inc/tools/forum_submit.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_historybar.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id.php branches/danny-web/reactos.org/htdocs/compat/index.php branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php Modified: branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_bugs.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_bugs.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_bugs.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -43,7 +43,7 @@ echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".show_osversion($result_page['comp_osversion']) ."]</h2>"; - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); ?> <p>Bugzilla integration is still on the TODO list ... </p> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_details.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_details.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_details.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -42,7 +42,7 @@ if ($result_page['comp_id']) { echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".@show_osversion($result_page['comp_osversion']) ."]</h2>"; - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_id = :group_id"); $stmt->bindParam('group_id',$result_page['comp_groupid'],PDO::PARAM_STR); Modified: branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_forum.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_forum.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_forum.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -44,7 +44,7 @@ echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".show_osversion($result_page['comp_osversion']) ."]</h2>"; - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); echo "<br />"; echo forum_bar(); Modified: branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshot_… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshot_… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshot_… [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -49,7 +49,7 @@ } else { - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); echo "<h3>Submit Screenshot</h3>"; Modified: branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshots… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshots… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_screenshots… [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -42,7 +42,7 @@ if ($result_page['comp_id']) { echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".@show_osversion($result_page['comp_osversion']) ."]</h2>"; - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); Modified: branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -44,7 +44,7 @@ echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".@show_osversion($result_page['comp_osversion']) ."]</h2>"; - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); echo test_bar(); ?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests_submi… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests_submi… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tests_submi… [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -50,7 +50,7 @@ } else { - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); echo "<h3>Submit a Report - Step 3</h3>"; Modified: branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tips.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tips.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_item_tips.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -40,7 +40,7 @@ $result_page = $stmt->fetch(PDO::FETCH_ASSOC); - include('inc/tree/tree_item_menubar.php'); + include("inc/comp/comp_item_menubar.php"); ?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/tree_category_com… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/tree_category_com… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/tree_category_com… [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -52,12 +52,7 @@ if ($result_count_cat[0]) { - if ($RSDB_intern_code_view_shortname == "devnet") { - $RSDB_TEMP_sortby = "cat_order"; - } - else { $RSDB_TEMP_sortby = "cat_name"; - } Removed: branches/danny-web/reactos.org/htdocs/compat/inc/devnet.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/devnet.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/devnet.php (removed) @@ -1,54 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 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. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - -?> -<h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > - -<?php - - switch ($RSDB_SET_sec) { - case "home": // Home - default: - include("inc/devnet/devnet_home.php"); - break; - case "category": // Category - include("inc/tree/tree_category.php"); - break; - case "name": // Name - include("inc/tree/tree_name.php"); - break; - } - -?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/home.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/home.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/home.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -46,17 +46,5 @@ <?php echo $RSDB_langres['CONTENT_compdb_description']; ?> <a href="<?php echo $RSDB_intern_link_db_view_comp; ?>&sec=home"><?php echo $RSDB_langres['TEXT_more']; ?></a> </p> -<h3><?php echo $RSDB_langres['TEXT_packdb']; ?></h3> -<p> - <?php echo $RSDB_langres['CONTENT_packdb_description']; ?> <a href="<?php echo $RSDB_intern_link_db_view_pack; ?>&sec=home"><?php echo $RSDB_langres['TEXT_more']; ?></a> -</p> - -<h3><?php echo $RSDB_langres['TEXT_devnet']; ?></h3> -<p> <?php echo $RSDB_langres['CONTENT_devnet_description']; ?> - <a href="<?php echo $RSDB_intern_link_db_view_devnet; ?>&sec=home"><?php echo $RSDB_langres['TEXT_more']; ?></a> -</p> -<h3><?php echo $RSDB_langres['TEXT_mediadb']; ?></h3> -<p><?php echo $RSDB_langres['CONTENT_mediadb_description']; ?> <a href="<?php echo $RSDB_intern_link_db_view_media; ?>&sec=home"><?php echo $RSDB_langres['TEXT_more']; ?></a> -</p> <p> </p> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/lang/de.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/lang/de.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/lang/de.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -58,13 +58,6 @@ $RSDB_langres['TEXT_compdb'] = 'Compatibility Database'; $RSDB_langres['TEXT_compdb_short'] = 'Compatibility'; - $RSDB_langres['TEXT_packdb'] = 'Package Database'; - $RSDB_langres['TEXT_packdb_short'] = 'Packages'; - $RSDB_langres['TEXT_devnet'] = 'Developer Network'; - $RSDB_langres['TEXT_devnet_short'] = 'Dev Network'; - $RSDB_langres['TEXT_devnet_long'] = 'ReactOS Developer Network'; - $RSDB_langres['TEXT_mediadb'] = 'Media Database'; - $RSDB_langres['TEXT_mediadb_short'] = 'Media'; $RSDB_langres['TEXT_about_rsdb'] = 'About the ReactOS Support Database'; $RSDB_langres['TEXT_credits'] = 'Credits'; @@ -78,14 +71,6 @@ $RSDB_langres['CONTENT_about_short'] = 'The ReactOS Support Database is a free service of the ReactOS Foundation.'; $RSDB_langres['CONTENT_compdb_description'] = 'ReactOS Software and Hardware Compatibility Database.'; - $RSDB_langres['CONTENT_packdb_description'] = 'ReactOS Package Database, the official online database for the ReactOS Package Manager.'; - $RSDB_langres['CONTENT_devnet_description'] = 'ReactOS Developer Network, the online documentation of the ReactOS Internals.<br /><br /> - The ReactOS Developer Network (RosDevNet or RDN) Library is the essential reference - for developers, with technical programming information, including sample code, - documentation, technical articles, the ReactOS Developer Knowledge Base, and - anything else you might need to develop solutions for ReactOS (or compatible).'; - $RSDB_langres['CONTENT_devnet_description_short'] = 'ReactOS Developer Network, the online documentation of the ReactOS Internals'; - $RSDB_langres['CONTENT_mediadb_description'] = 'ReactOS Media Database, ReactOS related media files stored in a huge database.'; $RSDB_langres['CONTENT_about_rsdb'] = 'The ReactOS Support Database (application and driver compatibility, application packages, developer network and media files) is a free service of the ReactOS Modified: branches/danny-web/reactos.org/htdocs/compat/inc/lang/en.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/lang/en.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/lang/en.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -58,13 +58,6 @@ $RSDB_langres['TEXT_compdb'] = 'Compatibility Database'; $RSDB_langres['TEXT_compdb_short'] = 'Compatibility'; - $RSDB_langres['TEXT_packdb'] = 'Package Database'; - $RSDB_langres['TEXT_packdb_short'] = 'Packages'; - $RSDB_langres['TEXT_devnet'] = 'Developer Network'; - $RSDB_langres['TEXT_devnet_short'] = 'Dev Network'; - $RSDB_langres['TEXT_devnet_long'] = 'ReactOS Developer Network'; - $RSDB_langres['TEXT_mediadb'] = 'Media Database'; - $RSDB_langres['TEXT_mediadb_short'] = 'Media'; $RSDB_langres['TEXT_about_rsdb'] = 'About the ReactOS Support Database'; $RSDB_langres['TEXT_credits'] = 'Credits'; @@ -78,14 +71,6 @@ $RSDB_langres['CONTENT_about_short'] = 'The ReactOS Support Database is a free service of the ReactOS Foundation.'; $RSDB_langres['CONTENT_compdb_description'] = 'ReactOS Software and Hardware Compatibility Database.'; - $RSDB_langres['CONTENT_packdb_description'] = 'ReactOS Package Database, the official online database for the ReactOS Package Manager.'; - $RSDB_langres['CONTENT_devnet_description'] = 'ReactOS Developer Network, the online documentation of the ReactOS Internals.<br /><br /> - The ReactOS Developer Network (RosDevNet or RDN) Library is the essential reference - for developers, with technical programming information, including sample code, - documentation, technical articles, the ReactOS Developer Knowledge Base, and - anything else you might need to develop solutions for ReactOS (or compatible).'; - $RSDB_langres['CONTENT_devnet_description_short'] = 'ReactOS Developer Network, the online documentation of the ReactOS Internals'; - $RSDB_langres['CONTENT_mediadb_description'] = 'ReactOS Media Database, ReactOS related media files stored in a huge database.'; $RSDB_langres['CONTENT_about_rsdb'] = 'The ReactOS Support Database (application and driver compatibility, application packages, developer network and media files) is a free service of the ReactOS Removed: branches/danny-web/reactos.org/htdocs/compat/inc/media.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/media.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/media.php (removed) @@ -1,54 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 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. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - -?> -<h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > - -<?php - - switch ($RSDB_SET_sec) { - case "home": // Home - default: - include("inc/media/media_home.php"); - break; - case "category": // Category - include("inc/tree/tree_category.php"); - break; - case "name": // Name - include("inc/tree/tree_name.php"); - break; - } - -?> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/pack.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/pack.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/pack.php (removed) @@ -1,57 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 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. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - -?> -<h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > - -<?php - - switch ($RSDB_SET_sec) { - case "home": // Home - default: - include("inc/pack/pack_home.php"); - break; - case "category": // Category - include("inc/tree/tree_category.php"); - break; - case "name": // Name - include("inc/tree/tree_name.php"); - break; - case "vendor": // Vendor/Company - include("inc/tree/tree_vendor.php"); - break; - } - -?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/structure.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/structure.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/structure.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -72,24 +72,10 @@ </ol></div> <p></p> <?php - if ($RSDB_SET_view == "comp" || $RSDB_SET_view == "pack" || $RSDB_SET_view == "devnet" || $RSDB_SET_view == "media") { + if ($RSDB_SET_view == "comp") { ?> <div class="navTitle"><?php - if ($RSDB_SET_view == "comp") { echo "Compatibility"; - } - if ($RSDB_SET_view == "") { - echo "Compatibility"; - } - if ($RSDB_SET_view == "pack") { - echo "Packages"; - } - if ($RSDB_SET_view == "devnet") { - echo "Dev Network"; - } - if ($RSDB_SET_view == "media") { - echo "Media"; - } ?></div> <ol> <li><a href="<?php echo $RSDB_intern_link_view_EX."home".$RSDB_URI_slash; ?>">Overview</a></li> @@ -100,12 +86,12 @@ <li><a href="<?php echo $RSDB_intern_link_category_EX."0".$RSDB_URI_slash; ?>"> - By Category</a></li> <li><a href="<?php echo $RSDB_intern_link_name_letter_EX."all".$RSDB_URI_slash; ?>"> - By Name</a></li> <?php - if ($RSDB_SET_view == "comp" || $RSDB_SET_view == "pack") { + if ($RSDB_SET_view == "comp") { ?> <li><a href="<?php echo $RSDB_intern_link_vendor_letter_EX."all".$RSDB_URI_slash; ?>"> - By Vendor</a></li> <?php } - if ($RSDB_SET_view == "comp" || $RSDB_SET_view == "pack") { + if ($RSDB_SET_view == "comp") { ?> <li><a href="<?php echo $RSDB_intern_link_rank_EX."rank".$RSDB_URI_slash; ?>"> - By Rank</a></li> <?php Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tools/forum_submit.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tools/forum_submit.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tools/forum_submit.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -45,7 +45,7 @@ // echo "<h2>".$result_page['comp_name'] ." [". "ReactOS ".show_osversion($result_page['comp_osversion']) ."]</h2>"; -// include('inc/tree/tree_item_menubar.php'); +// include("inc/comp/comp_item_menubar.php"); echo "<h3>Submit a forum post</h3>"; Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -53,7 +53,7 @@ include("inc/comp/comp_itemver_submit.php"); } else { - include("inc/tree/tree_group.php"); + include("inc/comp/comp_group.php"); } } else { @@ -66,7 +66,7 @@ include("inc/tree/tree_category_tree.php"); break; } - include("inc/tree/tree_category_grouplist.php"); + include("inc/tree/tree_category_grouplist_1.php"); } } Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_flat.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -49,12 +49,7 @@ if ($result_count_cat[0]) { - if ($RSDB_intern_code_view_shortname == "devnet") { - $RSDB_TEMP_sortby = "cat_order"; - } - else { $RSDB_TEMP_sortby = "cat_name"; - } ?> <table width="100%" border="0" cellpadding="1" cellspacing="1"> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… (removed) @@ -1,52 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 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. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: - include("inc/tree/tree_category_grouplist_1.php"); - break; - case "pack": // Packages - include("inc/tree/tree_category_grouplist_1.php"); - break; - case "devnet": // Developer Network - include("inc/tree/tree_category_grouplist_2.php"); - break; - case "media": // Media - include("inc/tree/tree_category_grouplist_2.php"); - break; - } -?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -45,17 +45,8 @@ <tr bgcolor="#5984C3"> <td width="20%" title="Item"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong><?php - switch ($RSDB_SET_view) { - case "comp": // Compatibility + echo "Application"; - break; - case "pack": // Packages - echo "Package"; - break; - default: - echo "Name"; - break; - } ?></strong></font></div></td> <td width="15%" title="Company/Vendor/Project"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Vendor</strong></font></div></td> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_groupli… (removed) @@ -1,128 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 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. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - -$stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_category = :category " . $RSDB_intern_code_db_rsdb_groups . ""); -$stmt->bindParam('category',$RSDB_SET_cat,PDO::PARAM_STR); -$stmt->execute(); -$result_count_groups = $stmt->fetch(PDO::FETCH_NUM); -if ($result_count_groups[0]) { - -?> - <table width="100%" border="0" cellpadding="1" cellspacing="1"> - <tr bgcolor="#5984C3"> - <td width="20%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Name</strong></font></div></td> - <td width="50%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Description</strong></font></div></td> - <td width="10%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Pages</strong></font></div></td> - <td width="20%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Rating Ø </strong></font></div></td> - </tr> - <?php - - $stmt=CDBConnecion::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_category = :category " . $RSDB_intern_code_db_rsdb_groups . " ORDER BY grpentr_order ASC"); - $stmt->bindParam('category',$RSDB_SET_cat,PDO::PARAM_STR); - $stmt->execute(); - - $farbe1="#E2E2E2"; - $farbe2="#EEEEEE"; - $zaehler="0"; - - while($result_page = $stmt->fetch(PDO::FETCH_ASSOC)) { // Pages - ?> - <tr> - <td valign="top" bgcolor="<?php - $zaehler++; - if ($zaehler == "1") { - echo $farbe1; - $farbe = $farbe1; - } - elseif ($zaehler == "2") { - $zaehler="0"; - echo $farbe2; - $farbe = $farbe2; - } - ?>" > <div align="left"><font size="2" face="Arial, Helvetica, sans-serif"><a href="<?php echo $RSDB_intern_link_group.$result_page['grpentr_id']; ?>"><?php echo $result_page['grpentr_name']; ?></a></font></div></td> - <td valign="top" bgcolor="<?php echo $farbe; ?>"><font size="2"><?php - - if (strlen(htmlentities($result_page['grpentr_description'], ENT_QUOTES)) <= 30) { - echo $result_page['grpentr_description']; - } - else { - echo substr(htmlentities($result_page['grpentr_description'], ENT_QUOTES), 0, 30)."..."; - } - - ?></font></td> - <td valign="top" bgcolor="<?php echo $farbe; ?>"><div align="center"><font size="2"> - <?php - - $counter_stars_install_sum = 0; - $counter_stars_function_sum = 0; - $counter_stars_user_sum = 0; - - $counter_items = 0; - - $stmt_item=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_".$RSDB_intern_code_view_shortname." WHERE ".$RSDB_intern_code_view_shortname."_groupid = :group_id AND ".$RSDB_intern_code_view_shortname."_visible` = '1' ORDER BY ".$RSDB_intern_code_view_shortname."_groupid DESC"); - $stmt_item->bindParam('group_id',$result_page['grpentr_id'],PDO::PARAM_STR); - $stmt_item->execute(); - while($result_group_sum_items = $stmt_item->fetch(PDO::FETCH_ASSOC)) { - $counter_items++; - $stmt_tests=CDBConnection::getInstance()->prepare("SELECT SUM(test_result_install) AS install_sum, SUM(test_result_function) AS function_sum, COUNT(*) AS user_sum FROM ".$RSDB_intern_code_view_shortname."_item_".$RSDB_intern_code_view_shortname."_testresults WHERE test_visible = '1' AND test_comp_id = :comp_id ORDER BY test_comp_id ASC"); - $stmt_tests->bindParam('comp_id',$result_group_sum_items[$RSDB_intern_code_view_shortname.'_id'],PDO::PARAM_STR); - $stmt_tests->execute(); - $tmp=$stmt_tests->fetch(PDO::FETCH_ASSOC); - - $counter_stars_install_sum += $tmp['install_sum']; - $counter_stars_function_sum += $tmp['function_sum']; - $counter_stars_user_sum += $tmp['user_sum']; - } - echo $counter_items; - - ?> - </font></div></td> - <td valign="top" bgcolor="<?php echo $farbe; ?>"><div align="left"><font size="2"> - <?php - - echo draw_stars_small($counter_stars_function_sum, $counter_stars_user_sum, 5, "") . " (".$counter_stars_user_sum.")"; - - ?> - </font></div></td> - </tr> - <?php - } // end while - ?> - </table> -<?php -} -?> - Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_category_tree.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -51,12 +51,7 @@ if ($result_count_cat[0]) { - if ($RSDB_intern_code_view_shortname == "devnet") { - $RSDB_TEMP_sortby = "cat_order"; - } - else { $RSDB_TEMP_sortby = "cat_name"; - } ?> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_group.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_group.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_group.php (removed) @@ -1,52 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 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. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: - include("inc/comp/comp_group.php"); - break; - case "pack": // Packages - include("inc/pack/pack_group.php"); - break; - case "devnet": // Developer Network - include("inc/devnet/devnet_group.php"); - break; - case "media": // Media - include("inc/media/media_group.php"); - break; - } -?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_historybar.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_historybar.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_historybar.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -37,7 +37,7 @@ -// echo "Comp: ".$RSDB_intern_trigger_comp." | Pack:".$RSDB_intern_trigger_pack." | DevNet:".$RSDB_intern_trigger_devnet." | Media:".$RSDB_intern_trigger_media; +// echo "Comp: ".$RSDB_intern_trigger_comp."; // echo "<br>".$RSDB_intern_code_db_rsdb_categories; $RSDB_viewpage = true; @@ -185,21 +185,7 @@ $result_current_group = $stmt->fetch(PDO::PARAM_STR); echo " <font size='2'>→</font> <a href='".$RSDB_intern_link_item2_id_EX.$RSDB_SET_item.$RSDB_URI_slash."'>".$result_current_group[$RSDB_intern_code_view_shortname .'_name']; - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: echo " ["."ReactOS ".show_osversion($result_current_group['comp_osversion'])."]"; - break; - case "pack": // Packages - echo " [".$result_current_group['pack_rosversion']."]"; - break; - case "devnet": // Developer Network - echo " [rev. ".$result_current_group['devnet_version']."]"; - break; - case "media": // Media - echo " [".$result_current_group['media_version']."]"; - break; - } echo "</a>"; } @@ -295,21 +281,7 @@ $result_current_group = $stmt->fetch(PDO::FETCH_ASSOC); echo " <font size='2'>→</font> <a href='".$RSDB_intern_link_item_EX.$RSDB_SET_item.$RSDB_URI_slash."'>".$result_current_group[$RSDB_intern_code_view_shortname .'_name']; - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: echo " ["."ReactOS ".show_osversion($result_current_group['comp_osversion'])."]"; - break; - case "pack": // Packages - echo " [".$result_current_group['pack_rosversion']."]"; - break; - case "devnet": // Developer Network - echo " [rev. ".$result_current_group['devnet_version']."]"; - break; - case "media": // Media - echo " [".$result_current_group['media_version']."]"; - break; - } echo "</a>"; } @@ -596,22 +568,5 @@ } - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: //msg_bar("Compatibility"); - break; - case "pack": // Packages - msg_bar("The Package Section is under heavy construction!"); - echo "<br />"; - break; - case "devnet": // Developer Network - msg_bar("The Dev Network Section is under heavy construction!"); - echo "<br />"; - break; - case "media": // Media - msg_bar("The Media Section is under heavy construction!"); - echo "<br />"; - break; - } ?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -35,9 +35,6 @@ - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: switch ($RSDB_SET_item2) { case "details": // Details default: @@ -85,16 +82,5 @@ include('inc/comp/comp_item_tips.php'); break; } - break; - case "pack": // Packages - include('inc/pack/pack_item.php'); - break; - case "devnet": // Developer Network - include('inc/devnet/devnet_item.php'); - break; - case "media": // Media - include('inc/media/media_item.php'); - break; - } ?> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item_menubar.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item_menubar.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_item_menubar.php (removed) @@ -1,52 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 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. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: - include("inc/comp/comp_item_menubar.php"); - break; - case "pack": // Packages - include("inc/pack/pack_item_menubar.php"); - break; - case "devnet": // Developer Network - //include("inc/devnet/devnet_item_menubar.php"); - break; - case "media": // Media - //include("inc/media/media_item_menubar.php"); - break; - } -?> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_menubar_sections… [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -48,9 +48,6 @@ if ($RSDB_SET_cat != "" && $RSDB_SET_item =="" && $RSDB_SET_group =="") { if ($RSDB_SET_cat == 0) { $result_count_group['cat_comp']=1; - $result_count_group['cat_pack']=1; - $result_count_group['cat_devnet']=1; - $result_count_group['cat_media']=1; } else { $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_categories WHERE cat_id = :cat_id AND cat_visible = '1'"); @@ -63,21 +60,9 @@ else { if ($RSDB_SET_item != "") { $result_count_group['item_comp']=0; - $result_count_group['item_pack']=0; - $result_count_group['item_devnet']=0; - $result_count_group['item_media']=0; if ($RSDB_SET_view == "comp") { $result_count_group['item_comp']=1; - } - if ($RSDB_SET_view == "pack") { - $result_count_group['item_pack']=1; - } - if ($RSDB_SET_view == "devnet") { - $result_count_group['item_devnet']=1; - } - if ($RSDB_SET_view == "media") { - $result_count_group['item_media']=1; } $RSDB_compare_string = 'item'; } @@ -95,27 +80,6 @@ else { echo '<font color="#cccccc"> '. $RSDB_langres['TEXT_compdb_short'] .' </font>'; } - echo ' <font color="#ffffff">|</font> '; - if ($result_count_group[$RSDB_compare_string."_pack"] == "1") { - echo '<a href="'. $RSDB_intern_link_db_view2 .'pack">'. $RSDB_langres['TEXT_packdb_short'] .'</a>'; - } - else { - echo '<font color="#cccccc"> '. $RSDB_langres['TEXT_packdb_short'] .' </font>'; - } - echo ' <font color="#ffffff">|</font> '; - if ($result_count_group[$RSDB_compare_string."_devnet"] == "1") { - echo '<a href="'. $RSDB_intern_link_db_view2 .'devnet">'. $RSDB_langres['TEXT_devnet_short'] .'</a>'; - } - else { - echo '<font color="#cccccc"> '. $RSDB_langres['TEXT_devnet_short'] .' </font>'; - } - echo ' <font color="#ffffff">|</font> '; - if ($result_count_group[$RSDB_compare_string."_media"] == "1") { - echo '<a href="'. $RSDB_intern_link_db_view2 .'media">'. $RSDB_langres['TEXT_mediadb_short'] .'</a>'; - } - else { - echo '<font color="#cccccc"> '. $RSDB_langres['TEXT_mediadb_short'] .' </font>'; - } ?></div></td> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -54,7 +54,7 @@ include("inc/comp/comp_itemver_submit.php"); } else { - include("inc/tree/tree_group.php"); + include("inc/comp/comp_group.php"); } } else { Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_name_flat.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -65,17 +65,7 @@ <td width="20%" bgcolor="#5984C3"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif" ><strong><?php - switch ($RSDB_SET_view) { - case "comp": // Compatibility echo "Application"; - break; - case "pack": // Packages - echo "Package"; - break; - default: - echo "Name"; - break; - } ?></strong></font></div></td> <td width="12%"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif" ><strong>Vendor</strong></font></div></td> Modified: branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/tree/tree_vendor_id.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -145,17 +145,7 @@ <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong> <?php - switch ($RSDB_SET_view) { - case "comp": // Compatibility echo "Application"; - break; - case "pack": // Packages - echo "Package"; - break; - default: - echo "Name"; - break; - } ?> </strong></font></div></td> Modified: branches/danny-web/reactos.org/htdocs/compat/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/index.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/index.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -296,26 +296,9 @@ default: case "db": // developer interface //require($RSDB_intern_path_server.$RSDB_intern_loginsystem_path."inc/login.php"); - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: $RSDB_SET_view = "comp"; $rpm_page_title="Support Database - Compatibility"; $RSDB_intern_section_script = "inc/comp.php"; - break; - case "pack": // Packages - $rpm_page_title="Support Database - Packages"; - $RSDB_intern_section_script = "inc/pack.php"; - break; - case "devnet": // Developer Network - $rpm_page_title="Support Database - Developer Network"; - $RSDB_intern_section_script = "inc/devnet.php"; - break; - case "media": // Media - $rpm_page_title="Support Database - Media"; - $RSDB_intern_section_script = "inc/media.php"; - break; - } include("inc/header.php"); create_head($rpm_page_title, $rpm_logo, $RSDB_langres); Modified: branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/rsdb_config.php [iso-8859-1] Thu Apr 2 13:03:34 2009 @@ -168,9 +168,6 @@ // Views $RSDB_intern_link_db_view_comp = $RSDB_intern_link_db_view."comp"; - $RSDB_intern_link_db_view_pack = $RSDB_intern_link_db_view."pack"; - $RSDB_intern_link_db_view_devnet = $RSDB_intern_link_db_view."devnet"; - $RSDB_intern_link_db_view_media = $RSDB_intern_link_db_view."media"; // Category $RSDB_intern_link_category_all = $RSDB_intern_link_db_sec.$RSDB_SET_sec."&cat=".$RSDB_SET_cat."&cat2=".$RSDB_SET_cat2; @@ -337,100 +334,29 @@ // Views $RSDB_intern_trigger_comp = "0"; - $RSDB_intern_trigger_pack = "0"; - $RSDB_intern_trigger_devnet = "0"; - $RSDB_intern_trigger_media = "0"; - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: $RSDB_intern_trigger_comp = "1"; - break; - case "pack": // Packages - $RSDB_intern_trigger_pack = "1"; - break; - case "devnet": // Developer Network - $RSDB_intern_trigger_devnet = "1"; - break; - case "media": // Media - $RSDB_intern_trigger_media = "1"; - break; - } // Code Snips: // *********** // Views - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: $RSDB_intern_code_view_name = $RSDB_langres['TEXT_compdb_short']; $RSDB_intern_code_view_shortname = "comp"; $RSDB_intern_code_view_description = $RSDB_langres['CONTENT_compdb_description']; - break; - case "pack": // Packages - $RSDB_intern_code_view_name = $RSDB_langres['TEXT_packdb_short']; - $RSDB_intern_code_view_shortname = "pack"; - $RSDB_intern_code_view_description = $RSDB_langres['CONTENT_packdb_description']; - break; - case "devnet": // Developer Network - $RSDB_intern_code_view_name = $RSDB_langres['TEXT_devnet_long']; - $RSDB_intern_code_view_shortname = "devnet"; - $RSDB_intern_code_view_description = $RSDB_langres['CONTENT_devnet_description_short']; - break; - case "media": // Media - $RSDB_intern_code_view_name = $RSDB_langres['TEXT_mediadb_short']; - $RSDB_intern_code_view_shortname = "media"; - $RSDB_intern_code_view_description = $RSDB_langres['CONTENT_mediadb_description']; - break; - } // Database // rsdb_categories $RSDB_intern_code_db_rsdb_categories_comp = ""; - $RSDB_intern_code_db_rsdb_categories_pack = ""; - $RSDB_intern_code_db_rsdb_categories_devnet = ""; - $RSDB_intern_code_db_rsdb_categories_media = ""; - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: $RSDB_intern_code_db_rsdb_categories_comp = " AND `cat_comp` = '" . $RSDB_intern_trigger_comp . "' "; - break; - case "pack": // Packages - $RSDB_intern_code_db_rsdb_categories_pack = " AND `cat_pack` = '" . $RSDB_intern_trigger_pack . "' "; - break; - case "devnet": // Developer Network - $RSDB_intern_code_db_rsdb_categories_devnet = " AND `cat_devnet` = '" . $RSDB_intern_trigger_devnet . "' "; - break; - case "media": // Media - $RSDB_intern_code_db_rsdb_categories_media = " AND `cat_media` = '" . $RSDB_intern_trigger_media . "' "; - break; - } - $RSDB_intern_code_db_rsdb_categories = $RSDB_intern_code_db_rsdb_categories_comp.$RSDB_intern_code_db_rsdb_categories_pack.$RSDB_intern_code_db_rsdb_categories_devnet.$RSDB_intern_code_db_rsdb_categories_media; + $RSDB_intern_code_db_rsdb_categories = $RSDB_intern_code_db_rsdb_categories_comp; // Code: " . $RSDB_intern_code_db_rsdb_categories . " // rsdb_groups $RSDB_intern_code_db_rsdb_groups_comp = ""; - $RSDB_intern_code_db_rsdb_groups_pack = ""; - $RSDB_intern_code_db_rsdb_groups_devnet = ""; - $RSDB_intern_code_db_rsdb_groups_media = ""; - switch ($RSDB_SET_view) { - case "comp": // Compatibility - default: $RSDB_intern_code_db_rsdb_groups_comp = " AND `grpentr_comp` = '" . $RSDB_intern_trigger_comp . "' "; - break; - case "pack": // Packages - $RSDB_intern_code_db_rsdb_groups_pack = " AND `grpentr_pack` = '" . $RSDB_intern_trigger_pack . "' "; - break; - case "devnet": // Developer Network - $RSDB_intern_code_db_rsdb_groups_devnet = " AND `grpentr_devnet` = '" . $RSDB_intern_trigger_devnet . "' "; - break; - case "media": // Media - $RSDB_intern_code_db_rsdb_groups_media = " AND `grpentr_media` = '" . $RSDB_intern_trigger_media . "' "; - break; - } - $RSDB_intern_code_db_rsdb_groups = $RSDB_intern_code_db_rsdb_groups_comp.$RSDB_intern_code_db_rsdb_groups_pack.$RSDB_intern_code_db_rsdb_groups_devnet.$RSDB_intern_code_db_rsdb_groups_media; + $RSDB_intern_code_db_rsdb_groups = $RSDB_intern_code_db_rsdb_groups_comp; // Code: " . $RSDB_intern_code_db_rsdb_groups . " ?>

1 0

[dgorbachev] 40325: Japanese translations by Tomoya Kitagawa. Bug #4328.
by dgorbachev＠svn.reactos.org 02 Apr '09

02 Apr '09

Author: dgorbachev Date: Thu Apr 2 10:20:50 2009 New Revision: 40325 URL: http://svn.reactos.org/svn/reactos?rev=40325&view=rev Log: Japanese translations by Tomoya Kitagawa. Bug #4328. Modified: trunk/reactos/media/inf/NET_NIC.inf trunk/reactos/media/inf/acpi.inf trunk/reactos/media/inf/cpu.inf trunk/reactos/media/inf/display.inf trunk/reactos/media/inf/fdc.inf trunk/reactos/media/inf/hdc.inf trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/machine.inf trunk/reactos/media/inf/msmouse.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/ports.inf trunk/reactos/media/inf/scsi.inf trunk/reactos/media/inf/usb.inf trunk/reactos/media/inf/usbport.inf trunk/reactos/media/inf/usbstor.inf Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/acpi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/acpi.inf?rev=403… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=4032… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=4032… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=4032… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=4… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=40… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=403… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=4032… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… ============================================================================== Binary files - no diff available.

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