Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[greatlrd] 30059: rename framebuf_acc.* to framebufacc.* for rbuild can not handle _, forget about that implement DrvSetPointerShape, left todo is the copy process for mono and color pointer data before it is completed.
by greatlrd＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: greatlrd Date: Fri Nov 2 03:03:02 2007 New Revision: 30059 URL: http://svn.reactos.org/svn/reactos?rev=30059&view=rev Log: rename framebuf_acc.* to framebufacc.* for rbuild can not handle _, forget about that implement DrvSetPointerShape, left todo is the copy process for mono and color pointer data before it is completed. Added: trunk/reactos/drivers/video/displays/framebufacc/framebufacc.def - copied unchanged from r30049, trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.def trunk/reactos/drivers/video/displays/framebufacc/framebufacc.h - copied, changed from r30049, trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.h trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild - copied, changed from r30050, trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rbuild trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rc - copied unchanged from r30049, trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rc Removed: trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.def trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.h trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rbuild trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rc Modified: trunk/reactos/drivers/video/displays/framebufacc/enable.c trunk/reactos/drivers/video/displays/framebufacc/palette.c trunk/reactos/drivers/video/displays/framebufacc/pointer.c trunk/reactos/drivers/video/displays/framebufacc/screen.c trunk/reactos/drivers/video/displays/framebufacc/surface.c Modified: trunk/reactos/drivers/video/displays/framebufacc/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/enable.c (original) +++ trunk/reactos/drivers/video/displays/framebufacc/enable.c Fri Nov 2 03:03:02 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "framebuf_acc.h" +#include "framebufacc.h" static DRVFN DrvFunctionTable[] = { Removed: trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.def (original) +++ trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.def (removed) @@ -1,3 +1,0 @@ -LIBRARY framebuf.dll -EXPORTS -DrvEnableDriver@12 Removed: trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.h (original) +++ trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.h (removed) @@ -1,190 +1,0 @@ -/* - * ReactOS Generic Framebuffer display driver - * - * Copyright (C) 2004 Filip Navara - * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef FRAMEBUF_H -#define FRAMEBUF_H - -#include <stdarg.h> -#include <windef.h> -#include <guiddef.h> -#include <wingdi.h> -#include <winddi.h> -#include <winioctl.h> -#include <ntddvdeo.h> - - -//#define EXPERIMENTAL_ACC_SUPPORT - -typedef struct _PDEV -{ - /* Driver stuff */ - HANDLE hDriver; - HDEV hDevEng; - HSURF hSurfEng; - ULONG dwHooks; - - /* Screen Data */ - ULONG ModeIndex; - ULONG ScreenWidth; - ULONG ScreenHeight; - ULONG ScreenDelta; - BYTE BitsPerPixel; - ULONG RedMask; - ULONG GreenMask; - ULONG BlueMask; - BYTE PaletteShift; - PVOID ScreenPtr; - - /* Vitual desktop stuff */ - POINTL ScreenOffsetXY; - - /* Palette data */ - HPALETTE DefaultPalette; - PALETTEENTRY *PaletteEntries; - - /* hw mouse acclartions support */ - VIDEO_POINTER_CAPABILITIES PointerCapabilities; - PVIDEO_POINTER_ATTRIBUTES pPointerAttributes; - ULONG PointerAttributesSize; - POINTL PointerHotSpot; - BOOL HwMouseActive; - -#ifdef EXPERIMENTAL_MOUSE_CURSOR_SUPPORT - XLATEOBJ *PointerXlateObject; - HSURF PointerColorSurface; - HSURF PointerMaskSurface; - HSURF PointerSaveSurface; - -#endif - - /* DirectX Support */ - DWORD iDitherFormat; - ULONG MemHeight; - ULONG MemWidth; - DWORD dwHeap; - VIDEOMEMORY* pvmList; - BOOL bDDInitialized; - DDPIXELFORMAT ddpfDisplay; - - /* System Cached data */ - PVOID pVideoMemCache; - PVOID pRealVideoMem; - - /* Avail Video memory from Current Screen and the end range */ - ULONG VideoMemSize; - -} PDEV, *PPDEV; - -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - -#define DEVICE_NAME L"framebuf" -#define ALLOC_TAG TAG('F','B','U','F') - - -DHPDEV APIENTRY -DrvEnablePDEV( - IN DEVMODEW *pdm, - IN LPWSTR pwszLogAddress, - IN ULONG cPat, - OUT HSURF *phsurfPatterns, - IN ULONG cjCaps, - OUT ULONG *pdevcaps, - IN ULONG cjDevInfo, - OUT DEVINFO *pdi, - IN HDEV hdev, - IN LPWSTR pwszDeviceName, - IN HANDLE hDriver); - -VOID APIENTRY -DrvCompletePDEV( - IN DHPDEV dhpdev, - IN HDEV hdev); - -VOID APIENTRY -DrvDisablePDEV( - IN DHPDEV dhpdev); - -HSURF APIENTRY -DrvEnableSurface( - IN DHPDEV dhpdev); - -VOID APIENTRY -DrvDisableSurface( - IN DHPDEV dhpdev); - -BOOL APIENTRY -DrvAssertMode( - IN DHPDEV dhpdev, - IN BOOL bEnable); - -ULONG APIENTRY -DrvGetModes( - IN HANDLE hDriver, - IN ULONG cjSize, - OUT DEVMODEW *pdm); - -BOOL APIENTRY -DrvSetPalette( - IN DHPDEV dhpdev, - IN PALOBJ *ppalo, - IN FLONG fl, - IN ULONG iStart, - IN ULONG cColors); - -ULONG APIENTRY -DrvSetPointerShape( - IN SURFOBJ *pso, - IN SURFOBJ *psoMask, - IN SURFOBJ *psoColor, - IN XLATEOBJ *pxlo, - IN LONG xHot, - IN LONG yHot, - IN LONG x, - IN LONG y, - IN RECTL *prcl, - IN FLONG fl); - -VOID APIENTRY -DrvMovePointer( - IN SURFOBJ *pso, - IN LONG x, - IN LONG y, - IN RECTL *prcl); - -BOOL -IntInitScreenInfo( - PPDEV ppdev, - LPDEVMODEW pDevMode, - PGDIINFO pGdiInfo, - PDEVINFO pDevInfo); - -BOOL -IntInitDefaultPalette( - PPDEV ppdev, - PDEVINFO pDevInfo); - -BOOL APIENTRY -IntSetPalette( - IN DHPDEV dhpdev, - IN PPALETTEENTRY ppalent, - IN ULONG iStart, - IN ULONG cColors); - -#endif /* FRAMEBUF_H */ Removed: trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rbuild (original) +++ trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rbuild (removed) @@ -1,14 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="framebufacc" type="kernelmodedll" entrypoint="_DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> - <importlibrary definition="framebuf_acc.def" /> - <include base="framebuf_acc">.</include> - <library>win32k</library> - <library>libcntpr</library> - <file>enable.c</file> - <file>palette.c</file> - <file>pointer.c</file> - <file>screen.c</file> - <file>surface.c</file> - <file>framebuf_acc.rc</file> -</module> Removed: trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rc (original) +++ trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rc (removed) @@ -1,5 +1,0 @@ -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "Framebuffer Display Driver\0" -#define REACTOS_STR_INTERNAL_NAME "framebuf\0" -#define REACTOS_STR_ORIGINAL_FILENAME "framebuf.dll\0" -#include <reactos/version.rc> Copied: trunk/reactos/drivers/video/displays/framebufacc/framebufacc.h (from r30049, trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.h (original) +++ trunk/reactos/drivers/video/displays/framebufacc/framebufacc.h Fri Nov 2 03:03:02 2007 @@ -91,6 +91,9 @@ ULONG VideoMemSize; } PDEV, *PPDEV; + + + #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) @@ -187,4 +190,14 @@ IN ULONG iStart, IN ULONG cColors); +BOOL +CopyMonoPointer(PPDEV ppdev, + SURFOBJ *pso); + +BOOL +CopyColorPointer(PPDEV ppdev, + SURFOBJ *psoMask, + SURFOBJ *psoColor, + XLATEOBJ *pxlo); + #endif /* FRAMEBUF_H */ Copied: trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild (from r30050, trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rbuild (original) +++ trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild Fri Nov 2 03:03:02 2007 @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="framebufacc" type="kernelmodedll" entrypoint="_DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> - <importlibrary definition="framebuf_acc.def" /> - <include base="framebuf_acc">.</include> + <importlibrary definition="framebufacc.def" /> + <include base="framebufacc">.</include> <library>win32k</library> <library>libcntpr</library> <file>enable.c</file> @@ -10,5 +10,5 @@ <file>pointer.c</file> <file>screen.c</file> <file>surface.c</file> - <file>framebuf_acc.rc</file> + <file>framebufacc.rc</file> </module> Modified: trunk/reactos/drivers/video/displays/framebufacc/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/palette.c (original) +++ trunk/reactos/drivers/video/displays/framebufacc/palette.c Fri Nov 2 03:03:02 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "framebuf_acc.h" +#include "framebufacc.h" /* * Standard color that must be in palette, because they're used for Modified: trunk/reactos/drivers/video/displays/framebufacc/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/pointer.c (original) +++ trunk/reactos/drivers/video/displays/framebufacc/pointer.c Fri Nov 2 03:03:02 2007 @@ -18,7 +18,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "framebuf_acc.h" +#include "framebufacc.h" + /* @@ -75,7 +76,7 @@ * Sets the new pointer shape. * * Status - * @unimplemented + * @implemented */ ULONG APIENTRY @@ -91,10 +92,135 @@ IN RECTL *prcl, IN FLONG fl) { -/* return SPS_DECLINE;*/ - return EngSetPointerShape(pso, psoMask, psoColor, pxlo, xHot, yHot, x, y, prcl, fl); -} - - - - + PPDEV ppdev = (PPDEV) pso->dhpdev; + ULONG returnedDataLength = 0; + + if (ppdev->pPointerAttributes == NULL) + { + /* hw did not support hw mouse pointer, we try then with software */ + return EngSetPointerShape(pso, psoMask, psoColor, pxlo, xHot, yHot, x, y, prcl, fl); + } + + /* check see if the apps ask to hide the mouse or not */ + if (psoMask == (SURFOBJ *) NULL) + { + if (EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_DISABLE_POINTER, NULL, 0, NULL, 0, &returnedDataLength)) + { + /* no hw support found for the mouse we try then the software version */ + return EngSetPointerShape(pso, psoMask, psoColor, pxlo, xHot, yHot, x, y, prcl, fl); + } + + return TRUE; + } + + /* set our hotspot */ + ppdev->PointerHotSpot.x = xHot; + ppdev->PointerHotSpot.y = yHot; + + /* Set the hw mouse shape */ + + if (psoColor != (SURFOBJ *) NULL) + { + /* We got a color mouse pointer */ + if ((ppdev->PointerCapabilities.Flags & VIDEO_MODE_COLOR_POINTER) && + (CopyColorPointer(ppdev, psoMask, psoColor, pxlo)) ) + { + ppdev->pPointerAttributes->Flags |= VIDEO_MODE_COLOR_POINTER; + } + else + { + /* No color mouse pointer being set, so we need try the software version then */ + if (ppdev->HwMouseActive) + { + ppdev->HwMouseActive = FALSE; + if (EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_DISABLE_POINTER, NULL, 0, NULL, 0, &returnedDataLength)) + { + /* hw did not support hw mouse pointer, we try then with software */ + return EngSetPointerShape(pso, psoMask, psoColor, pxlo, xHot, yHot, x, y, prcl, fl); + } + } + return SPS_DECLINE ; + } + } + else + { + /* We got a mono mouse pointer */ + if ( (ppdev->PointerCapabilities.Flags & VIDEO_MODE_MONO_POINTER) && + (CopyMonoPointer(ppdev, psoMask))) + { + ppdev->pPointerAttributes->Flags |= VIDEO_MODE_MONO_POINTER; + } + else + { + /* No mono mouse pointer being set, so we need try the software version then */ + if (ppdev->HwMouseActive) + { + ppdev->HwMouseActive = FALSE; + if (EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_DISABLE_POINTER, NULL, 0, NULL, 0, &returnedDataLength)) + { + /* hw did not support hw mouse pointer, we try then with software */ + return EngSetPointerShape(pso, psoMask, psoColor, pxlo, xHot, yHot, x, y, prcl, fl); + } + } + return SPS_DECLINE ; + } + } + + /* we goto hw mouse pointer then we contnue filling in more info */ + + /* calc the mouse point positions */ + if ((x != -1) || (y != -1)) + { + ppdev->pPointerAttributes->Column -= (SHORT)(ppdev->PointerHotSpot.x); + ppdev->pPointerAttributes->Row -= (SHORT)(ppdev->PointerHotSpot.y); + } + + /* set correct flags if it animated or need be updated anime or no flags at all */ + if (fl & SPS_ANIMATESTART) + { + ppdev->pPointerAttributes->Flags |= VIDEO_MODE_ANIMATE_START; + } + else if (fl & SPS_ANIMATEUPDATE) + { + ppdev->pPointerAttributes->Flags |= VIDEO_MODE_ANIMATE_UPDATE; + } + + ppdev->pPointerAttributes->Enable = 1; + ppdev->pPointerAttributes->Column = (SHORT)(x); + ppdev->pPointerAttributes->Row = (SHORT)(y); + + /* Set the new mouse pointer shape */ + if (EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_SET_POINTER_ATTR, ppdev->pPointerAttributes, + ppdev->PointerAttributesSize, NULL, 0, &returnedDataLength)) + { + /* no hw support found for the mouse we try then the software version */ + return EngSetPointerShape(pso, psoMask, psoColor, pxlo, xHot, yHot, x, y, prcl, fl); + } + + /* we got real hw support */ + ppdev->HwMouseActive = TRUE; + return SPS_ACCEPT_NOEXCLUDE; +} + + +/* Internal api that are only use in DrvSetPointerShape */ + +BOOL +CopyColorPointer(PPDEV ppdev, + SURFOBJ *psoMask, + SURFOBJ *psoColor, + XLATEOBJ *pxlo) +{ + /* FIXME unimplement */ + return FALSE; +} + +BOOL +CopyMonoPointer(PPDEV ppdev, + SURFOBJ *pso) +{ + /* FIXME unimplement */ + return FALSE; +} + + Modified: trunk/reactos/drivers/video/displays/framebufacc/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/screen.c (original) +++ trunk/reactos/drivers/video/displays/framebufacc/screen.c Fri Nov 2 03:03:02 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "framebuf_acc.h" +#include "framebufacc.h" /* * GetAvailableModes Modified: trunk/reactos/drivers/video/displays/framebufacc/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/surface.c (original) +++ trunk/reactos/drivers/video/displays/framebufacc/surface.c Fri Nov 2 03:03:02 2007 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "framebuf_acc.h" +#include "framebufacc.h" BOOL InitSurface(PPDEV ppdev, @@ -156,7 +156,8 @@ } /* Rest the desktop vitual position */ - ppdev->ScreenOffsetXY = {0,0}; + ppdev->ScreenOffsetXY.x = 0; + ppdev->ScreenOffsetXY.y = 0; switch (ppdev->BitsPerPixel)

1 0

[dreimer] 30058: And as always... you forget something... Cleanup the Tools needed txt-file remove the mirror file of srclist.txt
by dreimer＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: dreimer Date: Fri Nov 2 01:13:09 2007 New Revision: 30058 URL: http://svn.reactos.org/svn/reactos?rev=30058&view=rev Log: And as always... you forget something... Cleanup the Tools needed txt-file remove the mirror file of srclist.txt Removed: trunk/tools/RosBE-Windows/Tools/srclist.txt Modified: trunk/tools/RosBE-Windows/Tools/info.txt Modified: trunk/tools/RosBE-Windows/Tools/info.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/info.txt… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/info.txt (original) +++ trunk/tools/RosBE-Windows/Tools/info.txt Fri Nov 2 01:13:09 2007 @@ -1,12 +1,4 @@ Additional Tools needed: -cut: http://www.ltr-data.se/files/cut.zip -sed: http://gnuwin32.sourceforge.net/packages/sed.htm -grep: http://gnuwin32.sourceforge.net/packages/grep.htm svn: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 -Additional Libs needed: -LibIntl: http://gnuwin32.sourceforge.net/packages/libintl.htm -LibIconv: http://gnuwin32.sourceforge.net/packages/libiconv.htm -Pcre: http://gnuwin32.sourceforge.net/packages/pcre.htm - Built Tools and Rest needs to be copied to /Root/Tools/ Removed: trunk/tools/RosBE-Windows/Tools/srclist.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/srclist.… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/srclist.txt (original) +++ trunk/tools/RosBE-Windows/Tools/srclist.txt (removed) @@ -1,1 +1,0 @@ -Default,Default

1 0

[dreimer] 30057: Reorganize Setup to Copy srclist.txt to Application Data\RosBE. Update Changelog once more. If no more Bugs show up then will this be my last commit for Version 1.0 of RosBE.
by dreimer＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: dreimer Date: Fri Nov 2 01:06:37 2007 New Revision: 30057 URL: http://svn.reactos.org/svn/reactos?rev=30057&view=rev Log: Reorganize Setup to Copy srclist.txt to Application Data\RosBE. Update Changelog once more. If no more Bugs show up then will this be my last commit for Version 1.0 of RosBE. Added: trunk/tools/RosBE-Windows/Appdata/ trunk/tools/RosBE-Windows/Appdata/srclist.txt (with props) Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/RosBE.nsi Added: trunk/tools/RosBE-Windows/Appdata/srclist.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Appdata/srclis… ============================================================================== --- trunk/tools/RosBE-Windows/Appdata/srclist.txt (added) +++ trunk/tools/RosBE-Windows/Appdata/srclist.txt Fri Nov 2 01:06:37 2007 @@ -1,0 +1,2 @@ +Base,Default +Default,C:\RosBE\Source Propchange: trunk/tools/RosBE-Windows/Appdata/srclist.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Fri Nov 2 01:06:37 2007 @@ -20,7 +20,7 @@ - Updated todo list. (Pierre Schweitzer) - Reorganized resources. (Pierre Schweitzer) - Added a basic font preview. (Pierre Schweitzer) - - Continue dralnix code cleanup. (Pierre Schweitzer) + - Code cleanup. (Pierre Schweitzer, Ged Murphy) - Added checks to avoid buffers overflow. (Pierre Schweitzer) - Fixed a small regression with save button state introduced in rev 29850. (Pierre Schweitzer) - Moved UINT i to loop as it was done previously. (Pierre Schweitzer) @@ -30,6 +30,7 @@ - Make options.exe startable from cmd window. After exiting rosbe resets to use the new settings. (Daniel Reimer) - Improve the GUI to be easier to understand and add two more settings. (Daniel Reimer) - Make options.exe only write path variables if there is something to write. (Peter Ward) + - Fix the Case where you enable Logging and want to keep the default Path for it. (Daniel Reimer) - Added a small utility (chknewer) to check if one file is newer than another. This removes the dependency on test from Config.cmd and Build.cmd. (Peter Ward) - Added a small utility (chkslash) to check if a string contains a backslash '\', it's needed for the reladdr2line.cmd changes. @@ -39,11 +40,14 @@ - Added the command "oldmode" to still use the HOST headers, not the target ones in SVN Tree. (Daniel Reimer) - Readd chdefdir due to popular Demand. (Daniel Reimer) - Downgraded sed to prevent a EOL style destruction. (Daniel Reimer) +- Move Options cmd and srcdir.txt to Application Data Folder. (Peter Ward) +- Move Temp Files to Temp Folder. (Daniel Reimer) - Added a makefile for the RosBE tools. (Peter Ward) - Fix a warning in echoh.c. (Peter Ward) - Fix options.exe compile with RosBE 0.3.8.1 (Peter Ward) - Merged the NSIS files back together. (Peter Ward) +- Rewrote Scut in C. (Peter Ward) - Heaviliy cleaning up the .cmd files. (Peter Ward, Daniel Reimer) - Remove typos. (Peter Ward, Daniel Reimer) @@ -69,6 +73,8 @@ - Modified reladdr2line so that you can now use 'raddr2line ntdll.dll 7c90e143' instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can also use part of the file name ie. 'ntdll' instead of 'ntdll.dll' and it will match it. Searchs the current directory and all sub-directories. (Peter Ward) - Add a Shortcut Listing Feature to scut.cmd. (Daniel Reimer) - Fully get rid of all *nix Tools (Daniel Reimer) + - Unload all Vars at the Script's end. (Daniel Reimer) + - Remove Tools Folder From Path to prevent name Conflicts. (Daniel Reimer) - Started to Update the Documentation. (Daniel Reimer) Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Fri Nov 2 01:06:37 2007 @@ -110,7 +110,13 @@ File /r Icons\*.* SectionEnd -Section -StartMenuShortcuts SEC03 +Section "-Files in Application Data." SEC03 + SetOutPath "$APPDATA\RosBE\" + SetOverwrite try + File /r Appdata\*.* +SectionEnd + +Section -StartMenuShortcuts SEC04 SetShellVarContext current ;; @@ -126,11 +132,11 @@ CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk" \ "$INSTDIR\readme.pdf" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options.lnk" \ - "$INSTDIR\options.exe" + "$INSTDIR\Tools\options.exe" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd -Section /o "Desktop Shortcuts" SEC04 +Section /o "Desktop Shortcuts" SEC05 SetShellVarContext current ;; @@ -140,7 +146,7 @@ CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\reactos.ico" SectionEnd -Section /o "Quick Launch Shortcuts" SEC05 +Section /o "Quick Launch Shortcuts" SEC06 SetShellVarContext current ;; @@ -184,17 +190,18 @@ RMDir /r /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP" Delete /REBOOTOK "$INSTDIR\Build.cmd" Delete /REBOOTOK "$INSTDIR\chdefdir.cmd" + Delete /REBOOTOK "$INSTDIR\chdefgcc.cmd" Delete /REBOOTOK "$INSTDIR\Clean.cmd" Delete /REBOOTOK "$INSTDIR\Config.cmd" Delete /REBOOTOK "$INSTDIR\Help.cmd" Delete /REBOOTOK "$INSTDIR\options.cmd" Delete /REBOOTOK "$INSTDIR\reladdr2line.cmd" Delete /REBOOTOK "$INSTDIR\RosBE.cmd" + Delete /REBOOTOK "$INSTDIR\rosbe-gcc-env.cmd" + Delete /REBOOTOK "$INSTDIR\scut.cmd" Delete /REBOOTOK "$INSTDIR\sSVN.cmd" - Delete /REBOOTOK "$INSTDIR\scut.cmd" Delete /REBOOTOK "$INSTDIR\TimeDate.cmd" Delete /REBOOTOK "$INSTDIR\readme.pdf" - Delete /REBOOTOK "$INSTDIR\options.exe" Delete /REBOOTOK "$INSTDIR\reactos.ico" Delete /REBOOTOK "$INSTDIR\RosBE.mac" Delete /REBOOTOK "$INSTDIR\ChangeLog.txt"

1 0

[janderwald] 30056: - fix a bug found by w3seek - free memory when destroying IContextMenu
by janderwald＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: janderwald Date: Fri Nov 2 01:00:38 2007 New Revision: 30056 URL: http://svn.reactos.org/svn/reactos?rev=30056&view=rev Log: - fix a bug found by w3seek - free memory when destroying IContextMenu Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Fri Nov 2 01:00:38 2007 @@ -23,7 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -//#define YDEBUG +#define YDEBUG #include "winerror.h" #include "wine/debug.h" @@ -188,12 +188,30 @@ { ItemCmImpl *This = (ItemCmImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); + PStaticShellEntry curEntry; + PStaticShellEntry nextEntry; + UINT i; TRACE("(%p)->(count=%i)\n", This, refCount + 1); if (!refCount) { TRACE(" destroying IContextMenu(%p)\n",This); + + curEntry = nextEntry = This->head; + while(nextEntry) + { + nextEntry = nextEntry->Next; + free(curEntry->szCmd); + free(curEntry->szVerb); + free(curEntry); + curEntry = nextEntry; + } + for(i = 0; i < This->ecount; i++) + { + IContextMenu_Release(This->ecmenu[i]); + } + HeapFree(GetProcessHeap(), 0, This->ecmenu); if(This->pSFParent) IShellFolder_Release(This->pSFParent); @@ -410,15 +428,15 @@ return; } lastEntry = curEntry; - curEntry->Next = curEntry; + curEntry = curEntry->Next; } - curEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(StaticShellEntry)); + curEntry = malloc(sizeof(StaticShellEntry)); if (curEntry) { curEntry->Next = NULL; - curEntry->szCmd = StrDupW(szCmd); - curEntry->szVerb = StrDupW(szVerb); + curEntry->szCmd = wcsdup(szCmd); + curEntry->szVerb = wcsdup(szVerb); } if (lastEntry) @@ -984,7 +1002,7 @@ HRESULT hResult = NOERROR; UINT i; - TRACE("DoShellExtensions %p verb %x count %u\n",This, LOWORD(lpcmi->lpVerb), This->ecount); + TRACE("DoDynamicShellExtensions %p verb %x count %u\n",This, LOWORD(lpcmi->lpVerb), This->ecount); for(i = 0; i < This->ecount; i++) { IContextMenu * cmenu = This->ecmenu[i]; @@ -1203,6 +1221,7 @@ } else { + shext->lpVtbl->Release(shext); *ppv = cmobj; }

1 0

[janderwald] 30055: - fix position of dynamic context menus
by janderwald＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: janderwald Date: Fri Nov 2 00:30:44 2007 New Revision: 30055 URL: http://svn.reactos.org/svn/reactos?rev=30055&view=rev Log: - fix position of dynamic context menus Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Fri Nov 2 00:30:44 2007 @@ -310,7 +310,7 @@ return ret; } -VOID +UINT SH_LoadContextMenuHandlers(ItemCmImpl *This, IDataObject * pDataObj, HMENU hMenu, UINT indexMenu ) { UINT i; @@ -356,11 +356,15 @@ { cmenu = This->ecmenu[i]; hResult = cmenu->lpVtbl->QueryContextMenu(cmenu, hMenu, indexMenu, idCmdFirst, idCmdLast, CMF_NORMAL); - idCmdFirst += (hResult & 0xFFFF); + if (SUCCEEDED(hResult)) + { + idCmdFirst += (hResult & 0xFFFF); + indexMenu +=(hResult & 0xFFFF); + } } This->iIdSHELast = idCmdFirst; - TRACE("SH_LoadContextMenuHandlers first %x last %x\n", This->iIdSHEFirst, This->iIdSHELast); + return indexMenu; } void @@ -599,18 +603,15 @@ MultiByteToWideChar( CP_ACP, 0, sBuffer, -1, (LPWSTR)szExt, 10); SH_AddStaticEntryForFileClass(This, szExt); indexMenu = SH_AddStaticEntryToMenu(hmenu, indexMenu, This); + _InsertMenuItem(hmenu, ++indexMenu, TRUE, 0, MFT_SEPARATOR, NULL, 0); } pDataObj = IDataObject_Constructor(NULL, This->pidl, This->apidl, This->cidl); if (pDataObj) { - SH_LoadContextMenuHandlers(This, pDataObj, hmenu, indexMenu); + indexMenu = SH_LoadContextMenuHandlers(This, pDataObj, hmenu, indexMenu); IDataObject_Release(pDataObj); } - - - if (idCmdFirst != 0) - FIXME("We should use idCmdFirst=%d and idCmdLast=%d for command ids\n", idCmdFirst, idCmdLast); if(!(CMF_DEFAULTONLY & uFlags) && This->cidl>0) { @@ -1193,7 +1194,7 @@ cmobj->lpVtbl->Release(cmobj); return FALSE; } - hr = shext->lpVtbl->Initialize(shext, pidlFolder, pDataObj, hKey); + hr = shext->lpVtbl->Initialize(shext, NULL, pDataObj, hKey); if (hr != S_OK) { TRACE("Failed to initialize shell extension\n");

1 0

[dreimer] 30054: Removing the Tools Subfolder from PATH removed SVN, too and only left sSVN. I guess some devs would kill me if this would be the case in Final :-P
by dreimer＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: dreimer Date: Fri Nov 2 00:27:25 2007 New Revision: 30054 URL: http://svn.reactos.org/svn/reactos?rev=30054&view=rev Log: Removing the Tools Subfolder from PATH removed SVN, too and only left sSVN. I guess some devs would kill me if this would be the case in Final :-P Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/RosBE.mac Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Fri Nov 2 00:27:25 2007 @@ -125,6 +125,7 @@ if not exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( doskey RADDR2LINE= ) if not exist "%_ROSBE_BASEDIR%\scut.cmd" ( doskey SCUT= ) if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SSVN= ) + if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SVN= ) if not exist "%_ROSBE_BASEDIR%\options.cmd" ( doskey OPTIONS= ) goto :EOF Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.mac Fri Nov 2 00:27:25 2007 @@ -11,4 +11,5 @@ RENV = for /f "usebackq" %i in (`set _ROSBE_`) do @echo %i SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $* SSVN = "%_ROSBE_BASEDIR%\sSVN.cmd" $* +SVN = "%_ROSBE_BASEDIR%\Tools\svn.exe" $* OPTIONS = "%_ROSBE_BASEDIR%\options.cmd" $*

1 0

[janderwald] 30053: - remove debug prints - remove useless file
by janderwald＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: janderwald Date: Thu Nov 1 23:56:35 2007 New Revision: 30053 URL: http://svn.reactos.org/svn/reactos?rev=30053&view=rev Log: - remove debug prints - remove useless file Removed: trunk/reactos/dll/win32/shell32/shv_item_ecmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Thu Nov 1 23:56:35 2007 @@ -23,7 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define YDEBUG +//#define YDEBUG #include "winerror.h" #include "wine/debug.h" Removed: trunk/reactos/dll/win32/shell32/shv_item_ecmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_ecmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_ecmenu.c (removed) @@ -1,287 +1,0 @@ -/* - * IContextMenu for items in the shellview - * - * Copyright 1998, 2000 Juergen Schmied <juergen.schmied(a)debitel.net> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "winerror.h" -#include "wine/debug.h" - -#include "windef.h" -#include "wingdi.h" -#include "pidl.h" -#include "undocshell.h" -#include "shlobj.h" - -#include "shell32_main.h" -#include "shellfolder.h" -#include "debughlp.h" -WINE_DEFAULT_DEBUG_CHANNEL(shell); - -/************************************************************************** -* IContextMenu Implementation -*/ -typedef struct -{ const IContextMenu2Vtbl *lpVtbl; - LONG ref; - IShellFolder* pSFParent; - LPITEMIDLIST pidl; /* root pidl */ - LPITEMIDLIST *apidl; /* array of child pidls */ - UINT cidl; - LPWSTR szCommand; - LPWSTR szVerb; - INT iCommand; - -} StaticItemCmImpl; - -static const IContextMenu2Vtbl cmvt; - -/************************************************************************** -* ISvItemCm_Constructor() -*/ -IContextMenu2 *ISvStaticItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl, LPCITEMIDLIST *apidl, UINT cidl, HKEY hKey) -{ - StaticItemCmImpl* cm; - UINT u; - - cm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(StaticItemCmImpl)); - cm->lpVtbl = &cmvt; - cm->ref = 1; - cm->iCommand = -1; - cm->pidl = ILClone(pidl); - cm->pSFParent = pSFParent; - - if(pSFParent) IShellFolder_AddRef(pSFParent); - - cm->apidl = _ILCopyaPidl(apidl, cidl); - cm->cidl = cidl; - - cm->bAllValues = 1; - for(u = 0; u < cidl; u++) - { - cm->bAllValues &= (_ILIsValue(apidl[u]) ? 1 : 0); - } - - TRACE("(%p)->()\n",cm); - - return (IContextMenu2*)cm; -} - -/************************************************************************** -* ISvItemCm_fnQueryInterface -*/ -static HRESULT WINAPI ISvStaticItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) -{ - StaticItemCmImpl *This = (StaticItemCmImpl *)iface; - - TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); - - *ppvObj = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IContextMenu) || - IsEqualIID(riid, &IID_IContextMenu2)) - { - *ppvObj = This; - } - - if(*ppvObj) - { - IUnknown_AddRef((IUnknown*)*ppvObj); - TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj); - return S_OK; - } - TRACE("-- Interface: E_NOINTERFACE\n"); - return E_NOINTERFACE; -} - -/************************************************************************** -* ISvItemCm_fnAddRef -*/ -static ULONG WINAPI ISvStaticItemCm_fnAddRef(IContextMenu2 *iface) -{ - StaticItemCmImpl *This = (StaticItemCmImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(count=%u)\n", This, refCount - 1); - - return refCount; -} - -/************************************************************************** -* ISvItemCm_fnRelease -*/ -static ULONG WINAPI ISvStaticItemCm_fnRelease(IContextMenu2 *iface) -{ - StaticItemCmImpl *This = (StaticItemCmImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(count=%i)\n", This, refCount + 1); - - if (!refCount) - { - TRACE(" destroying IContextMenu(%p)\n",This); - - if(This->pSFParent) - IShellFolder_Release(This->pSFParent); - - SHFree(This->pidl); - - /*make sure the pidl is freed*/ - _ILFreeaPidl(This->apidl, This->cidl); - - HeapFree(GetProcessHeap(),0,This); - } - return refCount; -} - -/************************************************************************** -* ICM_InsertItem() -*/ -void WINAPI _InsertMenuItem ( - HMENU hmenu, - UINT indexMenu, - BOOL fByPosition, - UINT wID, - UINT fType, - LPCSTR dwTypeData, - UINT fState) -{ - MENUITEMINFOA mii; - - -} - -/************************************************************************** -* ISvItemCm_fnQueryContextMenu() -* FIXME: load menu MENU_SHV_FILE out of resources instead if creating -* each menu item by calling _InsertMenuItem() -*/ -static HRESULT WINAPI ISvStaticItemCm_fnQueryContextMenu( - IContextMenu2 *iface, - HMENU hmenu, - UINT indexMenu, - UINT idCmdFirst, - UINT idCmdLast, - UINT uFlags) -{ - IDataObject * pDataObj; - MENUITEMINFOW mii; - - StaticItemCmImpl *This = (StaticItemCmImpl *)iface; - - if (!This->szVerb || This->szCommand) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); - - - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; - mii.dwTypeData = (LPWSTR) This->szVerb; - mii.cch = strlenW( mii.dwTypeData ); - mii.fState = fState; - mii.wID = idCmdFirst + 1; - mii.fType = fType; - InsertMenuItemW( hmenu, indexMenu, fByPosition, &mii); - - - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 1); -} - -/************************************************************************** -* ISvItemCm_fnInvokeCommand() -*/ -static HRESULT WINAPI ISvStaticItemCm_fnInvokeCommand( - IContextMenu2 *iface, - LPCMINVOKECOMMANDINFO lpcmi) -{ - StaticItemCmImpl *This = (StaticItemCmImpl *)iface; - - if (lpcmi->cbSize != sizeof(CMINVOKECOMMANDINFO)) - FIXME("Is an EX structure\n"); - - TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); - - if( HIWORD(lpcmi->lpVerb)==0 && LOWORD(lpcmi->lpVerb) > FCIDM_SHVIEWLAST) - { - TRACE("Invalid Verb %x\n",LOWORD(lpcmi->lpVerb)); - return E_INVALIDARG; - } - - - - - return NOERROR; -} - -/************************************************************************** -* ISvItemCm_fnGetCommandString() -*/ -static HRESULT WINAPI ISvStaticItemCm_fnGetCommandString( - IContextMenu2 *iface, - UINT_PTR idCommand, - UINT uFlags, - UINT* lpReserved, - LPSTR lpszName, - UINT uMaxNameLen) -{ - StaticItemCmImpl *This = (StaticItemCmImpl *)iface; - - HRESULT hr = E_INVALIDARG; - - TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); - - TRACE("-- (%p)->(name=%s)\n",This, lpszName); - return hr; -} - -/************************************************************************** -* ISvItemCm_fnHandleMenuMsg() -* NOTES -* should be only in IContextMenu2 and IContextMenu3 -* is nevertheless called from word95 -*/ -static HRESULT WINAPI ISvStaticItemCm_fnHandleMenuMsg( - IContextMenu2 *iface, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - StaticItemCmImpl *This = (StaticItemCmImpl *)iface; - - TRACE("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); - - return E_NOTIMPL; -} - -static const IContextMenu2Vtbl cmvt = -{ - ISvStaticItemCm_fnQueryInterface, - ISvStaticItemCm_fnAddRef, - ISvStaticItemCm_fnRelease, - ISvStaticItemCm_fnQueryContextMenu, - ISvStaticItemCm_fnInvokeCommand, - ISvStaticItemCm_fnGetCommandString, - ISvStaticItemCm_fnHandleMenuMsg -}; -

1 0

[janderwald] 30052: - implement loading & executing of static context menu extensions
by janderwald＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: janderwald Date: Thu Nov 1 23:54:46 2007 New Revision: 30052 URL: http://svn.reactos.org/svn/reactos?rev=30052&view=rev Log: - implement loading & executing of static context menu extensions Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Thu Nov 1 23:54:46 2007 @@ -43,6 +43,13 @@ /* ugly hack for cut&paste files */ BOOL fileMoving = FALSE; +typedef struct _StaticShellEntry_ +{ + LPWSTR szVerb; + LPWSTR szCmd; + struct _StaticShellEntry_ * Next; +}StaticShellEntry, *PStaticShellEntry; + /************************************************************************** * IContextMenu Implementation */ @@ -58,6 +65,9 @@ IContextMenu ** ecmenu; UINT esize; UINT ecount; + PStaticShellEntry head; + UINT iIdSCMFirst; + UINT iIdSCMLast; UINT iIdSHEFirst; UINT iIdSHELast; SFGAOF rfg; @@ -66,7 +76,7 @@ UINT SH_EnumerateDynamicContextHandlerForKey(LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj, LPITEMIDLIST pidlFolder); WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls); - +WCHAR *strdupW(LPWSTR str); static const IContextMenu2Vtbl cmvt; /************************************************************************** @@ -353,6 +363,179 @@ TRACE("SH_LoadContextMenuHandlers first %x last %x\n", This->iIdSHEFirst, This->iIdSHELast); } +void +SH_AddStaticEntry(ItemCmImpl * This, HKEY hKey, WCHAR *szVerb) +{ + WCHAR szBuffer[50]; + WCHAR szCmd[100]; + DWORD dwCmd, dwBuffer; + LONG result; + HKEY hSubKey; + PStaticShellEntry curEntry; + PStaticShellEntry lastEntry = NULL; + + wcscpy(szBuffer, szVerb); + wcscat(szBuffer, L"\\command"); + + TRACE("szBuffer %s\n", debugstr_w(szBuffer)); + + result = RegOpenKeyExW(hKey, szBuffer, 0, KEY_READ, &hSubKey); + if (result != ERROR_SUCCESS) + { + TRACE("RegOpenKeyEx failed with 0x%x\n", result); + return; + } + dwCmd = sizeof(szCmd); + dwBuffer = 50; + result = RegEnumValueW(hSubKey, 0, szBuffer, &dwBuffer, 0, NULL, (LPBYTE)szCmd, &dwCmd); + RegCloseKey(hSubKey); + if (result != ERROR_SUCCESS) + { + TRACE("RegGetValueW failed with 0x%x\n", result); + return; + } + TRACE("SH_AddStaticEntry szBuffer %s szCmd %s\n", debugstr_w(szBuffer), debugstr_w(szCmd)); + + curEntry = This->head; + + while(curEntry) + { + if (!wcsicmp(curEntry->szVerb, szVerb)) + { + /* entry already exists */ + return; + } + lastEntry = curEntry; + curEntry->Next = curEntry; + } + + curEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(StaticShellEntry)); + if (curEntry) + { + curEntry->Next = NULL; + curEntry->szCmd = StrDupW(szCmd); + curEntry->szVerb = StrDupW(szVerb); + } + + if (lastEntry) + { + lastEntry->Next = curEntry; + } + else + { + This->head = curEntry; + } +} + +void +SH_AddStaticEntryForKey(ItemCmImpl * This, HKEY hKey) +{ + LONG result; + DWORD dwIndex; + WCHAR szName[40]; + DWORD dwName; + + TRACE("SH_AddStaticEntryForKey entered\n"); + + dwIndex = 0; + do + { + szName[0] = 0; + dwName = sizeof(szName) / sizeof(WCHAR); + result = RegEnumKeyExW(hKey, dwIndex, szName, &dwName, NULL, NULL, NULL, NULL); + szName[39] = 0; + if (result == ERROR_SUCCESS) + { + TRACE("szVerb %s\n", debugstr_w(szName)); + SH_AddStaticEntry(This, hKey, szName); + } + dwIndex++; + }while(result == ERROR_SUCCESS); +} + +void +SH_AddStaticEntryForFileClass(ItemCmImpl * This, WCHAR * szExt) +{ + WCHAR szBuffer[100]; + HKEY hKey; + LONG result; + DWORD dwBuffer; + + TRACE("SH_AddStaticEntryForFileClass entered with %s\n", debugstr_w(szExt)); + + wcscpy(szBuffer, szExt); + wcscat(szBuffer, L"\\shell"); + result = RegOpenKeyExW(HKEY_CLASSES_ROOT, szBuffer, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); + if (result == ERROR_SUCCESS) + { + SH_AddStaticEntryForKey(This, hKey); + RegCloseKey(hKey); + } + + dwBuffer = sizeof(szBuffer); + result = RegGetValueW(HKEY_CLASSES_ROOT, szExt, NULL, RRF_RT_REG_SZ, NULL, (LPBYTE)szBuffer, &dwBuffer); + if (result == ERROR_SUCCESS) + { + wcscat(szBuffer, L"\\shell"); + TRACE("szBuffer %s\n", debugstr_w(szBuffer)); + + result = RegOpenKeyExW(HKEY_CLASSES_ROOT, szBuffer, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); + if (result == ERROR_SUCCESS) + { + SH_AddStaticEntryForKey(This, hKey); + RegCloseKey(hKey); + } + } + + strcpyW(szBuffer, "SystemFileAssociations\\"); + dwBuffer = sizeof(szBuffer) - strlenW(szBuffer) * sizeof(WCHAR); + result = RegGetValueW(HKEY_CLASSES_ROOT, szExt, L"PerceivedType", RRF_RT_REG_SZ, NULL, (LPBYTE)&szBuffer[23], &dwBuffer); + if (result == ERROR_SUCCESS) + { + wcscat(szBuffer, L"\\shell"); + TRACE("szBuffer %s\n", debugstr_w(szBuffer)); + + result = RegOpenKeyExW(HKEY_CLASSES_ROOT, szBuffer, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); + if (result == ERROR_SUCCESS) + { + SH_AddStaticEntryForKey(This, hKey); + RegCloseKey(hKey); + } + } + RegCloseKey(hKey); +} +UINT +SH_AddStaticEntryToMenu(HMENU hMenu, UINT indexMenu, ItemCmImpl * This) +{ + MENUITEMINFOW mii; + PStaticShellEntry curEntry; + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; + mii.fType = MFT_STRING; + mii.fState = MFS_ENABLED | MFS_DEFAULT; + mii.wID = 0x4000; + This->iIdSCMFirst = mii.wID; + + curEntry = This->head; + + while(curEntry) + { + /* FIXME + * load localized verbs if its an open edit find print printto openas properties verb + */ + + mii.dwTypeData = curEntry->szVerb; + mii.cch = strlenW(mii.dwTypeData); + InsertMenuItemW(hMenu, indexMenu++, TRUE, &mii); + mii.fState = MFS_ENABLED; + mii.wID++; + curEntry = curEntry->Next; + } + This->iIdSCMLast = mii.wID - 1; + return indexMenu; +} + const char * GetLocalizedString(HMENU hMenu, UINT wID, const char * sDefault, char * sResult) { MENUITEMINFOA mii; @@ -395,6 +578,7 @@ USHORT lastindex = 0; HMENU hLocalMenu; char sBuffer[100]; + WCHAR szExt[10]; static const char sExplore[] = { '&','E','x','p','l','o','r','e',0 }; static const char sCopy[] = { '&','C','o','p','y',0 }; @@ -408,6 +592,22 @@ TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); hLocalMenu = LoadMenuW(shell32_hInstance, szSHVFile); + + if (_ILGetExtension(This->apidl[0], &sBuffer[1], sizeof(sBuffer)-1)) + { + sBuffer[0] = '.'; + MultiByteToWideChar( CP_ACP, 0, sBuffer, -1, (LPWSTR)szExt, 10); + SH_AddStaticEntryForFileClass(This, szExt); + indexMenu = SH_AddStaticEntryToMenu(hmenu, indexMenu, This); + } + + pDataObj = IDataObject_Constructor(NULL, This->pidl, This->apidl, This->cidl); + if (pDataObj) + { + SH_LoadContextMenuHandlers(This, pDataObj, hmenu, indexMenu); + IDataObject_Release(pDataObj); + } + if (idCmdFirst != 0) FIXME("We should use idCmdFirst=%d and idCmdLast=%d for command ids\n", idCmdFirst, idCmdLast); @@ -460,12 +660,7 @@ lastindex = FCIDM_SHVIEWLAST; } - pDataObj = IDataObject_Constructor(NULL, This->pidl, This->apidl, This->cidl); - if (pDataObj) - { - SH_LoadContextMenuHandlers(This, pDataObj, hmenu, indexMenu); - IDataObject_Release(pDataObj); - } + if (hLocalMenu) { DestroyMenu(hLocalMenu); @@ -706,7 +901,84 @@ } } HRESULT -DoShellExtensions(ItemCmImpl *This, LPCMINVOKECOMMANDINFO lpcmi) +DoStaticShellExtensions(ItemCmImpl *This, LPCMINVOKECOMMANDINFO lpcmi) +{ + UINT i; + WCHAR szTarget[MAX_PATH]; + WCHAR szTemp[MAX_PATH]; + WCHAR *ptr, *szCmd; + PStaticShellEntry curEntry; + LPITEMIDLIST pidl; + STARTUPINFOW sInfo; + PROCESS_INFORMATION pi; + + static const WCHAR szP1[] = { '%', '1', 0 }; + + TRACE("DoStaticShellExtensions entered with lpVerb %x first %x last %x\n", LOWORD(lpcmi->lpVerb), This->iIdSCMFirst, This->iIdSCMLast); + + i = This->iIdSCMFirst; + curEntry = This->head; + + while(curEntry) + { + if (i == LOWORD(lpcmi->lpVerb)) + break; + + i++; + curEntry = curEntry->Next; + } + + if (!curEntry) + { + ERR("unexpected\n"); + return E_UNEXPECTED; + } + + ExpandEnvironmentStringsW(curEntry->szCmd, szTarget, MAX_PATH); + + ptr = wcsstr(szTarget, szP1); + if (ptr) + { + ptr[1] = 's'; + pidl = ILCombine(This->pidl, This->apidl[0]); + if (pidl) + { + WCHAR szPath[MAX_PATH]; + if (SHGetPathFromIDListW(pidl, szPath)) + { + sprintfW(szTemp, szTarget, szPath); + } + SHFree(pidl); + } + else + { + ptr[0] = 0; + } + ptr = szTemp; + } + else + { + ptr = szTarget; + } + + ZeroMemory(&sInfo, sizeof(sInfo)); + sInfo.cb = sizeof(sizeof(sInfo)); + szCmd = wcsdup(ptr); + + if (!szCmd) + return E_OUTOFMEMORY; + + if (CreateProcessW(NULL, szCmd, NULL, NULL,FALSE,0,NULL,NULL,&sInfo, &pi)) + { + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + free(szCmd); + return S_OK; +} + +HRESULT +DoDynamicShellExtensions(ItemCmImpl *This, LPCMINVOKECOMMANDINFO lpcmi) { HRESULT hResult = NOERROR; UINT i; @@ -739,7 +1011,7 @@ if (lpcmi->cbSize != sizeof(CMINVOKECOMMANDINFO)) FIXME("Is an EX structure\n"); - TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); + TRACE("ISvItemCm_fnInvokeCommand (%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); if( HIWORD(lpcmi->lpVerb)==0 && LOWORD(lpcmi->lpVerb) > FCIDM_SHVIEWLAST) { @@ -782,8 +1054,14 @@ default: if (LOWORD(lpcmi->lpVerb) >= This->iIdSHEFirst && LOWORD(lpcmi->lpVerb) <= This->iIdSHELast) { - return DoShellExtensions(This, lpcmi); + return DoDynamicShellExtensions(This, lpcmi); } + + if (LOWORD(lpcmi->lpVerb) >= This->iIdSCMFirst && LOWORD(lpcmi->lpVerb) <= This->iIdSCMLast) + { + return DoStaticShellExtensions(This, lpcmi); + } + FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); } }

1 0

[dreimer] 30051: Remove The tools folder from Path and edit all calls to these tools. This prevents that another tool which might be directly accessable thx to the Path var cause any problems.
by dreimer＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: dreimer Date: Thu Nov 1 23:43:47 2007 New Revision: 30051 URL: http://svn.reactos.org/svn/reactos?rev=30051&view=rev Log: Remove The tools folder from Path and edit all calls to these tools. This prevents that another tool which might be directly accessable thx to the Path var cause any problems. Modified: trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/TimeDate.cmd trunk/tools/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Thu Nov 1 23:43:47 2007 @@ -18,7 +18,7 @@ :: setlocal enabledelayedexpansion if exist .\config.rbuild ( - chknewer .\config.template.rbuild .\config.rbuild + "%_ROSBE_BASEDIR%\Tools\chknewer.exe" .\config.template.rbuild .\config.rbuild if !errorlevel! == 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** @@ -107,13 +107,13 @@ :BUILD if %_ROSBE_SHOWTIME% == 1 ( if %_ROSBE_WRITELOG% == 1 ( - buildtime "%_ROSBE_MINGWMAKE%" %* 2>&1 | tee "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( - buildtime "%_ROSBE_MINGWMAKE%" %* + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* ) ) else ( if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" %* 2>&1 | tee "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( "%_ROSBE_MINGWMAKE%" %* ) @@ -129,17 +129,17 @@ :: -x2 - Number of CPUs, doubled. :: set CPUCOUNT= -for /f "usebackq" %%i in (`cpucount -x1`) do set CPUCOUNT=%%i +for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i if %_ROSBE_SHOWTIME% == 1 ( if %_ROSBE_WRITELOG% == 1 ( - buildtime "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | tee "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( - buildtime "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 ) ) else ( if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | tee "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 ) @@ -149,7 +149,7 @@ :: :: Highlight the fact that building has ended. :: -flash +"%_ROSBE_BASEDIR%\Tools\flash.exe" title ReactOS Build Environment %_ROSBE_VERSION% Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Thu Nov 1 23:43:47 2007 @@ -28,8 +28,8 @@ ) else ( echo Main Configuration File was not found in ReactOS Source Tree. ) - if exist "%_ROSBE_BASEDIR%\config.rbuild" ( - del "%_ROSBE_BASEDIR%\config.rbuild" + if exist "%APPDATA%\RosBE\config.rbuild" ( + del "%APPDATA%\RosBE\config.rbuild" echo Working Configuration File was found and deleted. ) else ( echo Working Configuration File was not found in ReactOS Source Tree. @@ -46,7 +46,7 @@ :CONT2 del "%_ROSBE_BASEDIR%\*.rbuild" del "config.rbuild" - copy "config.template.rbuild" "%_ROSBE_BASEDIR%\config.rbuild" + copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" echo Successfully Updated. goto :NOK ) @@ -58,8 +58,8 @@ :: :: Check if config.rbuild already exists. If not, get a working copy. :: -if not exist "%_ROSBE_BASEDIR%\config.rbuild" ( - copy "config.template.rbuild" "%_ROSBE_BASEDIR%\config.rbuild" +if not exist "%APPDATA%\RosBE\config.rbuild" ( + copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" ) :: @@ -86,7 +86,7 @@ :: setlocal enabledelayedexpansion if exist ".\config.rbuild" ( - chknewer ".\config.template.rbuild" ".\config.rbuild" + "%_ROSBE_BASEDIR%\Tools\chknewer.exe" ".\config.template.rbuild" ".\config.rbuild" if !errorlevel! == 1 ( echo. echo *** config.template.rbuild is newer than working config.rbuild *** @@ -95,7 +95,7 @@ echo *** previously made settings. *** echo. set /p YESNO="(yes), (no)" - if /i "%YESNO%"=="yes" del "%_ROSBE_BASEDIR%\*.rbuild" | del "config.rbuild" | copy "config.template.rbuild" "%_ROSBE_BASEDIR%\config.rbuild" | goto :OK + if /i "%YESNO%"=="yes" del "%APPDATA%\RosBE\*.rbuild" | del "config.rbuild" | copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" | goto :OK if /i "%YESNO%"=="no" goto :NOK goto :NOK ) @@ -108,7 +108,7 @@ echo Sub-Architecture to build for. echo Default is: none echo. -for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "SARCH" | find "property name""`) do set SARCH=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "SARCH" | find "property name""`) do set SARCH=%%i set SARCH=%SARCH:~7,-1% echo Right now: %SARCH% set /p SARCH_CH="(), (xbox)" @@ -121,7 +121,7 @@ echo See GCC manual for more CPU names and which CPUs GCC can optimize for. echo Default is: pentium echo. -for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "OARCH" | find "property name""`) do set OARCH=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "OARCH" | find "property name""`) do set OARCH=%%i set OARCH=%OARCH:~7,-1% echo Right now: %OARCH% set /p OARCH_CH= @@ -137,7 +137,7 @@ echo official release builds and debug builds. echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. echo. -for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "OPTIMIZE" | find "property name""`) do set OPTIMIZE=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "OPTIMIZE" | find "property name""`) do set OPTIMIZE=%%i set OPTIMIZE=%OPTIMIZE:~7,-1% echo Right now: %OPTIMIZE% set /p OPTIMIZE_CH="(0), (1), (2), (3), (4), (5)" @@ -149,7 +149,7 @@ echo Whether to compile for an uniprocessor or multiprocessor machine. echo Default is: 0 echo. -for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "MP" | find "property name""`) do set MP=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "MP" | find "property name""`) do set MP=%%i set MP=%MP:~7,-1% echo Right now: %MP% set /p MP_CH="(0), (1)" @@ -161,7 +161,7 @@ echo Whether to compile in the integrated kernel debugger. echo Default is: 0 echo. -for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "KDBG" | find "property name""`) do set KDBG=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "KDBG" | find "property name""`) do set KDBG=%%i set KDBG=%KDBG:~7,-1% echo Right now: %KDBG% set /p KDBG_CH="(0), (1)" @@ -174,7 +174,7 @@ echo performed. echo Default is: 1 echo. -for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "DBG" | find "property name" | find /V "KDBG""`) do set DBG=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "DBG" | find "property name" | find /V "KDBG""`) do set DBG=%%i set DBG=%DBG:~7,-1% echo Right now: %DBG% set /p DBG_CH="(0), (1)" @@ -187,7 +187,7 @@ echo don't enable this. echo Default is: 0 echo. -for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "GDB" | find "property name""`) do set GDB=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "GDB" | find "property name""`) do set GDB=%%i set GDB=%GDB:~7,-1% echo Right now: %GDB% set /p GDB_CH="(0), (1)" @@ -202,7 +202,7 @@ echo from the patent owner). echo Default is: 0 echo. -for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "NSWPAT" | find "property name""`) do set NSWPAT=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "NSWPAT" | find "property name""`) do set NSWPAT=%%i set NSWPAT=%NSWPAT:~7,-1% echo Right now: %NSWPAT% set /p NSWPAT_CH="(0), (1)" @@ -219,7 +219,7 @@ echo unless you know what you're doing. echo Default is: 0 echo. -for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "_WINKD_" | find "property name""`) do set WINKD=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "_WINKD_" | find "property name""`) do set WINKD=%%i set WINKD=%WINKD:~7,-1% echo Right now: %WINKD% set /p WINKD_CH="(0), (1)" @@ -245,9 +245,9 @@ echo ^<property name="_WINKD_" value="%WINKD_CH%" /^>>>%TEMP%\config.tmp echo ^</group^>>>%TEMP%\config.tmp -copy "%TEMP%\config.tmp" "%_ROSBE_BASEDIR%\config.rbuild" +copy "%TEMP%\config.tmp" "%APPDATA%\RosBE\config.rbuild" >NUL del %TEMP%\config.tmp -copy "%_ROSBE_BASEDIR%\config.rbuild" "config.rbuild" +copy "%APPDATA%\RosBE\config.rbuild" "config.rbuild" >NUL goto :NOK Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Thu Nov 1 23:43:47 2007 @@ -19,7 +19,6 @@ set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% set _ROSBE_ROSSOURCEDIR=%CD% -set PATH=%_ROSBE_BASEDIR%\Tools;%PATH% set _ROSBE_ORIGINALPATH=%PATH% set _ROSBE_SHOWTIME=1 set _ROSBE_WRITELOG=1 Modified: trunk/tools/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/TimeDate.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/TimeDate.cmd (original) +++ trunk/tools/RosBE-Windows/Root/TimeDate.cmd Thu Nov 1 23:43:47 2007 @@ -20,7 +20,7 @@ :: :: Get the raw date and time. :: -for /f "usebackq tokens=1" %%u in (`getdate`) do set DATERAW=%%u +for /f "usebackq tokens=1" %%u in (`"%_ROSBE_BASEDIR%\Tools\getdate.exe"`) do set DATERAW=%%u for /f "usebackq tokens=1" %%u in (`time /t`) do set TIMERAW=%%u :: Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Thu Nov 1 23:43:47 2007 @@ -52,11 +52,11 @@ echo %_1% for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i if %%i lss %_2% ( - raddr2line "%_1%" "%_2%" + "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%_2%" ) else ( set /a baseaddr+=0x%_2% - for /f %%i in ('"echoh %baseaddr%"') do set relbase=%%i - raddr2line "%_1%" "%relbase%" + for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" %baseaddr%"') do set relbase=%%i + "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%relbase%" ) goto :EOC @@ -83,7 +83,7 @@ :: sub-directories. :: :CHECKPATH - chkslash %_1% + "%_ROSBE_BASEDIR%\Tools\chkslash.exe" %_1% if errorlevel 2 ( for /f "usebackq" %%i in (`"dir /a:-d /s /b %_1% 2>NUL | findstr "%_1%""`) do set _1=%%i ) Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Thu Nov 1 23:43:47 2007 @@ -21,15 +21,15 @@ if /i "%1" == "update" ( title Updating... if not "%2" == "" ( - svn update -r %2 + "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 ) else ( - svn update + "%_ROSBE_BASEDIR%\Tools\svn.exe" update ) goto :EOC ) if /i "%1" == "cleanup" ( title Cleaning... - svn cleanup + "%_ROSBE_BASEDIR%\Tools\svn.exe" cleanup goto :EOC ) :: @@ -44,7 +44,7 @@ ) dir /b 2>nul | findstr "." >nul if errorlevel 1 ( - svn checkout svn://svn.reactos.org/reactos/trunk/reactos . + "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/reactos . ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) @@ -56,8 +56,8 @@ :: if /i "%1" == "status" ( title Status - for /f "usebackq tokens=2" %%i in (`"svn info | find "Revision:""`) do set OFFSVN=%%i - for /f "usebackq tokens=2" %%j in (`"svn info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set ONSVN=%%j + for /f "usebackq tokens=2" %%i in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info | find "Revision:""`) do set OFFSVN=%%i + for /f "usebackq tokens=2" %%j in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set ONSVN=%%j call :UP goto :EOC ) Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Thu Nov 1 23:43:47 2007 @@ -38,7 +38,7 @@ goto :EOC ) if not "%1" == "" ( - for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools Test\scut.exe" %*"`) do ( + for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\scut.exe" %*"`) do ( if /i not "%%i" == "Default" ( cd /d %%i set _ROSBE_ROSSOURCEDIR=%%i

1 0

[greatlrd] 30050: accdented acctivated framebufacc in the build system, sorry it broken the build
by greatlrd＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: greatlrd Date: Thu Nov 1 23:42:12 2007 New Revision: 30050 URL: http://svn.reactos.org/svn/reactos?rev=30050&view=rev Log: accdented acctivated framebufacc in the build system, sorry it broken the build Modified: trunk/reactos/drivers/video/displays/directory.rbuild trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rbuild Modified: trunk/reactos/drivers/video/displays/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/dir… ============================================================================== --- trunk/reactos/drivers/video/displays/directory.rbuild (original) +++ trunk/reactos/drivers/video/displays/directory.rbuild Thu Nov 1 23:42:12 2007 @@ -4,9 +4,6 @@ <directory name="framebuf"> <xi:include href="framebuf/framebuf.rbuild" /> </directory> - <directory name="framebufacc"> - <xi:include href="framebufacc/framebuf_acc.rbuild" /> - </directory> <directory name="vga"> <xi:include href="vga/vgaddi.rbuild" /> </directory> Modified: trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rbuild (original) +++ trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.rbuild Thu Nov 1 23:42:12 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="framebuf_acc" type="kernelmodedll" entrypoint="_DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> +<module name="framebufacc" type="kernelmodedll" entrypoint="_DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> <importlibrary definition="framebuf_acc.def" /> <include base="framebuf_acc">.</include> <library>win32k</library>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007