Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[greatlrd] 30049: rename framebuf_acc to framebufacc to make rbuild happy implement hw support for DrvMovePointer, it mean if a driver have this function implement our framebufacc will use it

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Nov 1 23:32:39 2007 New Revision: 30049 URL: http://svn.reactos.org/svn/reactos?rev=30049&view=rev Log: rename framebuf_acc to framebufacc to make rbuild happy implement hw support for DrvMovePointer, it mean if a driver have this function implement our framebufacc will use it Added: trunk/reactos/drivers/video/displays/framebufacc/ - copied from r30044, trunk/reactos/drivers/video/displays/framebuf_acc/ Removed: trunk/reactos/drivers/video/displays/framebuf_acc/ Modified: trunk/reactos/drivers/video/displays/directory.rbuild trunk/reactos/drivers/video/displays/framebufacc/framebuf_acc.h trunk/reactos/drivers/video/displays/framebufacc/pointer.c trunk/reactos/drivers/video/displays/framebufacc/surface.c 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:32:39 2007 @@ -4,6 +4,9 @@ <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.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 Thu Nov 1 23:32:39 2007 @@ -51,6 +51,9 @@ ULONG BlueMask; BYTE PaletteShift; PVOID ScreenPtr; + + /* Vitual desktop stuff */ + POINTL ScreenOffsetXY; /* Palette data */ HPALETTE DefaultPalette; 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 Thu Nov 1 23:32:39 2007 @@ -1,7 +1,7 @@ /* * ReactOS Generic Framebuffer display driver * - * Copyright (C) 2004 Filip Navara + * Copyright (C) 2007 Magnus Olsen * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,6 +20,53 @@ #include "framebuf_acc.h" + +/* + * DrvMovePointer + * + * Moves the pointer to a new position and ensures that GDI does not interfere + * with the display of the pointer. + * + * Status + * @implemented + */ + +VOID APIENTRY +DrvMovePointer(IN SURFOBJ *pso, + IN LONG x, + IN LONG y, + IN RECTL *prcl) +{ + PPDEV ppdev = (PPDEV) pso->dhpdev; + DWORD returnedDataLength; + VIDEO_POINTER_POSITION NewPointerPosition; + + x -= ppdev->ScreenOffsetXY.x; + y -= ppdev->ScreenOffsetXY.y; + + /* position of (-1,-1) hide the pointer */ + if ((x == -1) || (y == -1)) + { + if (EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_DISABLE_POINTER, NULL, 0, NULL, 0, &returnedDataLength)) + { + /* hw did not disable the mouse, we try then with software */ + EngMovePointer(pso, x, y, prcl); + } + } + else + { + /* Calc the mouse positions and set it to the new positions */ + NewPointerPosition.Column = (SHORT) x - (SHORT) (ppdev->PointerHotSpot.x); + NewPointerPosition.Row = (SHORT) y - (SHORT) (ppdev->PointerHotSpot.y); + + if (EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_SET_POINTER_POSITION, &NewPointerPosition, + sizeof(VIDEO_POINTER_POSITION), NULL, 0, &returnedDataLength)) + { + /* hw did not disable the mouse, we try then with software */ + EngMovePointer(pso, x, y, prcl); + } + } +} /* @@ -48,24 +95,6 @@ return EngSetPointerShape(pso, psoMask, psoColor, pxlo, xHot, yHot, x, y, prcl, fl); } -/* - * DrvMovePointer - * - * Moves the pointer to a new position and ensures that GDI does not interfere - * with the display of the pointer. - * - * Status - * @unimplemented - */ - -VOID APIENTRY -DrvMovePointer( - IN SURFOBJ *pso, - IN LONG x, - IN LONG y, - IN RECTL *prcl) -{ - return EngMovePointer(pso, x, y, prcl); -} + 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 Thu Nov 1 23:32:39 2007 @@ -154,6 +154,9 @@ { return FALSE; } + + /* Rest the desktop vitual position */ + ppdev->ScreenOffsetXY = {0,0}; switch (ppdev->BitsPerPixel)

16 years, 10 months

[dreimer] 30048: Get rid of the last Unix Tool: SED. Byebye

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Nov 1 23:02:51 2007 New Revision: 30048 URL: http://svn.reactos.org/svn/reactos?rev=30048&view=rev Log: Get rid of the last Unix Tool: SED. Byebye Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/Config.cmd 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 Thu Nov 1 23:02:51 2007 @@ -68,6 +68,7 @@ - Get rid of svnversion.exe and its need in ssvn.cmd. (Daniel Reimer) - 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) - Started to Update the Documentation. (Daniel Reimer) 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:02:51 2007 @@ -112,7 +112,6 @@ set SARCH=%SARCH:~7,-1% echo Right now: %SARCH% set /p SARCH_CH="(), (xbox)" -sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%SARCH_CH%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%SARCH_CH%\"/g" "%_ROSBE_BASEDIR%\config.rbuild" > "%TEMP%\config2.rbuild" cls echo Which CPU ReactOS should be optimized for. @@ -129,7 +128,6 @@ if "%OARCH_CH%" == "" ( set OARCH_CH=pentium ) -sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%OARCH_CH%\"/g" "%TEMP%\config2.rbuild" > "%TEMP%\config3.rbuild" cls echo What level do you want ReactOS to be optimized at. @@ -146,7 +144,6 @@ if "%OPTIMIZE_CH%" == "" ( set OPTIMIZE_CH=1 ) -sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%OPTIMIZE_CH%\"/g" "%TEMP%\config3.rbuild" > "%TEMP%\config4.rbuild" cls echo Whether to compile for an uniprocessor or multiprocessor machine. @@ -159,7 +156,6 @@ if "%MP_CH%" == "" ( set MP_CH=0 ) -sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%MP_CH%\"/g" "%TEMP%\config4.rbuild" > "%TEMP%\config5.rbuild" cls echo Whether to compile in the integrated kernel debugger. @@ -172,7 +168,6 @@ if "%KDBG_CH%" == "" ( set KDBG_CH=0 ) -sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%KDBG_CH%\"/g" "%TEMP%\config5.rbuild" > "%TEMP%\config6.rbuild" cls echo Whether to compile for debugging. No compiler optimizations will be @@ -186,7 +181,6 @@ if "%DBG_CH%" == "" ( set DBG_CH=1 ) -sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%DBG_CH%\"/g" "%TEMP%\config6.rbuild" > "%TEMP%\config7.rbuild" cls echo Whether to compile for debugging with GDB. If you don't use GDB, @@ -200,7 +194,6 @@ if "%GDB_CH%" == "" ( set GDB_CH=0 ) -sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%GDB_CH%\"/g" "%TEMP%\config7.rbuild" > "%TEMP%\config8.rbuild" cls echo Whether to compile apps/libs with features covered software patents @@ -216,7 +209,6 @@ if "%NSWPAT_CH%" == "" ( set NSWPAT_CH=0 ) -sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%NSWPAT_CH%\"/g" "%TEMP%\config8.rbuild" > "%TEMP%\config9.rbuild" cls echo Whether to compile with the KD protocol. This will disable support for @@ -234,15 +226,27 @@ if "%WINKD_CH%" == "" ( set WINKD_CH=0 ) -sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%WINKD_CH%\"/g" "%TEMP%\config9.rbuild" > "%TEMP%\config10.rbuild" +cls :: :: Generate a config.rbuild, copy it to the Source Tree and delete temp files. :: -copy "%TEMP%\config10.rbuild" "%TEMP%\config.tmp" -del "%TEMP%\*.rbuild" +echo ^<?xml version="1.0"?^>>%TEMP%\config.tmp +echo ^<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"^>>%TEMP%\config.tmp +echo ^<group^>>%TEMP%\config.tmp +echo ^<property name="SARCH" value="%SARCH_CH%" /^>>>%TEMP%\config.tmp +echo ^<property name="OARCH" value="%OARCH_CH%" /^>>>%TEMP%\config.tmp +echo ^<property name="OPTIMIZE" value="%OPTIMIZE_CH%" /^>>>%TEMP%\config.tmp +echo ^<property name="MP" value="%MP_CH%" /^>>>%TEMP%\config.tmp +echo ^<property name="KDBG" value="%KDBG_CH%" /^>>>%TEMP%\config.tmp +echo ^<property name="DBG" value="%DBG_CH%" /^>>>%TEMP%\config.tmp +echo ^<property name="GDB" value="%GDB_CH%" /^>>>%TEMP%\config.tmp +echo ^<property name="NSWPAT" value="%NSWPAT_CH%" /^>>>%TEMP%\config.tmp +echo ^<property name="_WINKD_" value="%WINKD_CH%" /^>>>%TEMP%\config.tmp +echo ^</group^>>>%TEMP%\config.tmp + copy "%TEMP%\config.tmp" "%_ROSBE_BASEDIR%\config.rbuild" -del "%TEMP%\*.tmp" +del %TEMP%\config.tmp copy "%_ROSBE_BASEDIR%\config.rbuild" "config.rbuild" goto :NOK

16 years, 10 months

[weiden] 30047: Increase size of current date selection

by weiden＠svn.reactos.org

Author: weiden Date: Thu Nov 1 20:41:00 2007 New Revision: 30047 URL: http://svn.reactos.org/svn/reactos?rev=30047&view=rev Log: Increase size of current date selection Modified: trunk/reactos/dll/cpl/timedate/monthcal.c Modified: trunk/reactos/dll/cpl/timedate/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/monthcal.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/monthcal.c (original) +++ trunk/reactos/dll/cpl/timedate/monthcal.c Thu Nov 1 20:41:00 2007 @@ -542,7 +542,20 @@ if (Day == infoPtr->Day) { - rcHighlight = rcText; + SIZE TextSel; + + TextSel.cx = (infoPtr->CellSize.cx * 2) / 3; + TextSel.cy = (infoPtr->CellSize.cy * 3) / 4; + + if (TextSel.cx < rcText.right - rcText.left) + TextSel.cx = rcText.right - rcText.left; + if (TextSel.cy < rcText.bottom - rcText.top) + TextSel.cy = rcText.bottom - rcText.top; + + rcHighlight.left = rcCell.left + (infoPtr->CellSize.cx / 2) - (TextSel.cx / 2); + rcHighlight.right = rcHighlight.left + TextSel.cx; + rcHighlight.top = rcCell.top + (infoPtr->CellSize.cy / 2) - (TextSel.cy / 2); + rcHighlight.bottom = rcHighlight.top + TextSel.cy; InflateRect(&rcHighlight, GetSystemMetrics(SM_CXFOCUSBORDER),

16 years, 10 months

[fireball] 30046: - Fix a bug with incorrect handling of the keyboard layout pointer (which is HKL in fact in our current implementation). - Change the prototype to better match actual parameters usage. See issue #2787 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Nov 1 20:06:49 2007 New Revision: 30046 URL: http://svn.reactos.org/svn/reactos?rev=30046&view=rev Log: - Fix a bug with incorrect handling of the keyboard layout pointer (which is HKL in fact in our current implementation). - Change the prototype to better match actual parameters usage. See issue #2787 for more details. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c 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 (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Thu Nov 1 20:06:49 2007 @@ -2356,8 +2356,8 @@ DWORD NTAPI NtUserVkKeyScanEx( - DWORD Unknown0, - DWORD Unknown1, + WCHAR wChar, + ULONG_PTR KeyboardLayout, DWORD Unknown2); DWORD Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h Thu Nov 1 20:06:49 2007 @@ -32,6 +32,7 @@ BOOL FASTCALL IntKeyboardInput(KEYBDINPUT *ki); BOOL UserInitDefaultKeyboardLayout(); +PKBL UserHklToKbl(HKL hKl); #define ThreadHasInputAccess(W32Thread) \ (TRUE) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Thu Nov 1 20:06:49 2007 @@ -308,7 +308,7 @@ return pKbl; } -static PKBL UserHklToKbl(HKL hKl) +PKBL UserHklToKbl(HKL hKl) { PKBL pKbl = KBLList; do Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Thu Nov 1 20:06:49 2007 @@ -1007,12 +1007,11 @@ DWORD STDCALL NtUserVkKeyScanEx( - DWORD wChar, - DWORD KeyboardLayout, + WCHAR wChar, + ULONG_PTR KeyboardLayout, DWORD Unknown2) { -/* FAXME: currently, this routine doesnt seem to need any locking */ - +/* FIXME: currently, this routine doesnt seem to need any locking */ PKBDTABLES KeyLayout; PVK_TO_WCHAR_TABLE vtwTbl; PVK_TO_WCHARS10 vkPtr; @@ -1020,9 +1019,11 @@ int nMod; DWORD CapsMod = 0, CapsState = 0; + DPRINT("NtUserVkKeyScanEx() wChar %d, KbdLayout 0x%p\n", wChar, KeyboardLayout); + if(!KeyboardLayout) return -1; - KeyLayout = (PKBDTABLES) KeyboardLayout; + KeyLayout = UserHklToKbl((HKL)KeyboardLayout)->KBTables; for (nMod = 0; KeyLayout->pVkToWcharTable[nMod].nModifications; nMod++) {

16 years, 10 months

[janderwald] 30045: - use translated menu from resources if available

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Nov 1 19:09:04 2007 New Revision: 30045 URL: http://svn.reactos.org/svn/reactos?rev=30045&view=rev Log: - use translated menu from resources if available 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 19:09:04 2007 @@ -353,6 +353,30 @@ TRACE("SH_LoadContextMenuHandlers first %x last %x\n", This->iIdSHEFirst, This->iIdSHELast); } +const char * GetLocalizedString(HMENU hMenu, UINT wID, const char * sDefault, char * sResult) +{ + MENUITEMINFOA mii; + if (!hMenu) + { + return sDefault; + } + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_TYPE; + mii.fType = MFT_STRING; + mii.dwTypeData = sResult; + mii.cch = 100; + + if (GetMenuItemInfoA(hMenu, wID, FALSE, &mii)) + { + return sResult; + } + else + { + return sDefault; + } +} + /************************************************************************** * ISvItemCm_fnQueryContextMenu() * FIXME: load menu MENU_SHV_FILE out of resources instead if creating @@ -369,9 +393,21 @@ IDataObject * pDataObj; ItemCmImpl *This = (ItemCmImpl *)iface; USHORT lastindex = 0; + HMENU hLocalMenu; + char sBuffer[100]; + + static const char sExplore[] = { '&','E','x','p','l','o','r','e',0 }; + static const char sCopy[] = { '&','C','o','p','y',0 }; + static const char sCut[] = { '&','C','u','t',0 }; + static const char sDelete[] = { '&','D','e','l','e','t','e',0 }; + static const char sRename[] = { '&','R','e','n','a','m','e',0 }; + static const char sProperties[] = { '&','P','r','o','p','e','r','t','i','e','s',0 }; + static const WCHAR szSHVFile[] = { 'M','E','N','U','_','S','H','V','_','F','I','L','E',0 }; 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 (idCmdFirst != 0) FIXME("We should use idCmdFirst=%d and idCmdLast=%d for command ids\n", idCmdFirst, idCmdLast); @@ -382,18 +418,19 @@ _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Select", MFS_ENABLED); TRACE("rfg %x\n", This->rfg); - - if (This->rfg & SFGAO_HASSUBFOLDER) + if (This->rfg & SFGAO_BROWSABLE) { - /* FIXME - * check if folder hasnt already been extended - * use reduce verb then - */ - - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_EXPLORE, MFT_STRING, "&Explore", MFS_ENABLED); + if(This->bAllValues) + { + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Open", MFS_ENABLED); + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_EXPLORE, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_EXPLORE, sExplore, sBuffer), MFS_ENABLED); + } + else + { + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_EXPLORE, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_EXPLORE, sExplore, sBuffer), MFS_ENABLED); + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Open", MFS_ENABLED); + } } - - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Open", MFS_ENABLED); SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION); @@ -401,24 +438,24 @@ { _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); if (This->rfg & SFGAO_CANCOPY) - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_COPY, MFT_STRING, "&Copy", MFS_ENABLED); + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_COPY, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_COPY, sCopy, sBuffer), MFS_ENABLED); if (This->rfg & SFGAO_CANMOVE) - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_CUT, MFT_STRING, "&Cut", MFS_ENABLED); + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_CUT, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_CUT, sCut, sBuffer), MFS_ENABLED); } if (This->rfg & SFGAO_CANDELETE) { _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_DELETE, MFT_STRING, "&Delete", MFS_ENABLED); + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_DELETE, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_DELETE, sDelete, sBuffer), MFS_ENABLED); } if ((uFlags & CMF_CANRENAME) && (This->rfg & SFGAO_CANRENAME)) - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_RENAME, MFT_STRING, "&Rename", ISvItemCm_CanRenameItems(This) ? MFS_ENABLED : MFS_DISABLED); + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_RENAME, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_RENAME, sRename, sBuffer), ISvItemCm_CanRenameItems(This) ? MFS_ENABLED : MFS_DISABLED); if (This->rfg & SFGAO_HASPROPSHEET) { _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, "&Properties", MFS_ENABLED); + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_PROPERTIES, sProperties, sBuffer), MFS_ENABLED); } lastindex = FCIDM_SHVIEWLAST; @@ -429,7 +466,10 @@ SH_LoadContextMenuHandlers(This, pDataObj, hmenu, indexMenu); IDataObject_Release(pDataObj); } - + if (hLocalMenu) + { + DestroyMenu(hLocalMenu); + } return MAKE_HRESULT(SEVERITY_SUCCESS, 0, lastindex); } @@ -875,7 +915,7 @@ cmobj->lpVtbl->Release(cmobj); return FALSE; } - hr = shext->lpVtbl->Initialize(shext, NULL, pDataObj, hKey); + hr = shext->lpVtbl->Initialize(shext, pidlFolder, pDataObj, hKey); if (hr != S_OK) { TRACE("Failed to initialize shell extension\n");

16 years, 10 months

[peterw] 30044: - Fix the config.rbuild checks... variable expansion in cmd sucks :P.

by peterw＠svn.reactos.org

Author: peterw Date: Thu Nov 1 18:45:51 2007 New Revision: 30044 URL: http://svn.reactos.org/svn/reactos?rev=30044&view=rev Log: - Fix the config.rbuild checks... variable expansion in cmd sucks :P. Modified: trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/Config.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 18:45:51 2007 @@ -16,9 +16,10 @@ :: Check if config.template.rbuild is newer than config.rbuild, if it is then :: abort the build and inform the user. :: +setlocal enabledelayedexpansion if exist .\config.rbuild ( chknewer .\config.template.rbuild .\config.rbuild - if errorlevel 1 ( + if !errorlevel! == 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** echo *** aborting build. Please check for changes and *** @@ -27,6 +28,7 @@ goto :EOC ) ) +endlocal :: :: Check if strip or ccache are being used and set the appropriate options. 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 18:45:51 2007 @@ -84,9 +84,10 @@ :: Check if config.template.rbuild is newer than config.rbuild, if it is then :: inform the user and offer an update. :: +setlocal enabledelayedexpansion if exist ".\config.rbuild" ( chknewer ".\config.template.rbuild" ".\config.rbuild" - if errorlevel 1 ( + if !errorlevel! == 1 ( echo. echo *** config.template.rbuild is newer than working config.rbuild *** echo *** The Editor cannot continue with this file. Do you wanna *** @@ -99,6 +100,7 @@ goto :NOK ) ) +endlocal :: :: Start with reading settings from config.rbuild and let the user edit them.

16 years, 10 months

[gedmurphy] 30043: - don't pass minus values for creating topdown bitmaps. - fixes loading of toolbar bitmaps in abiword

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Nov 1 18:45:42 2007 New Revision: 30043 URL: http://svn.reactos.org/svn/reactos?rev=30043&view=rev Log: - don't pass minus values for creating topdown bitmaps. - fixes loading of toolbar bitmaps in abiword Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Thu Nov 1 18:45:42 2007 @@ -54,9 +54,9 @@ return 0; } - WidthBytes = BITMAPOBJ_GetWidthBytes(Width, BitsPixel); - - Size.cx = Width; + WidthBytes = BITMAPOBJ_GetWidthBytes(Width, Planes * BitsPixel); + + Size.cx = abs(Width); Size.cy = abs(Height); /* Create the bitmap object. */ @@ -108,7 +108,7 @@ { if (pUnsafeBits) { - UINT cjBits = BITMAPOBJ_GetWidthBytes(Width, BitsPixel) * Height; + UINT cjBits = BITMAPOBJ_GetWidthBytes(Width, BitsPixel) * abs(Height); ProbeForRead(pUnsafeBits, cjBits, 1); } @@ -186,7 +186,7 @@ } else { - Bmp = IntGdiCreateBitmap(Width, Height, 1, Dc->w.bitsPerPixel, NULL); + Bmp = IntGdiCreateBitmap(abs(Width), abs(Height), 1, Dc->w.bitsPerPixel, NULL); } return Bmp;

16 years, 10 months

[dreimer] 30042: Add some forgotten "" and add the list feature back to RosBE. It already was in the new C Version, but not in the .cmd which calls it.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Nov 1 18:33:59 2007 New Revision: 30042 URL: http://svn.reactos.org/svn/reactos?rev=30042&view=rev Log: Add some forgotten "" and add the list feature back to RosBE. It already was in the new C Version, but not in the .cmd which calls it. Modified: trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/scut.cmd 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 18:33:59 2007 @@ -84,8 +84,8 @@ :: Check if config.template.rbuild is newer than config.rbuild, if it is then :: inform the user and offer an update. :: -if exist .\config.rbuild ( - chknewer .\config.template.rbuild .\config.rbuild +if exist ".\config.rbuild" ( + chknewer ".\config.template.rbuild" ".\config.rbuild" if errorlevel 1 ( echo. echo *** config.template.rbuild is newer than working config.rbuild *** 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 18:33:59 2007 @@ -33,6 +33,10 @@ call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* goto :EOC ) +if /i "%1" == "list" ( + call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* + goto :EOC +) if not "%1" == "" ( for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools Test\scut.exe" %*"`) do ( if /i not "%%i" == "Default" (

16 years, 10 months

[dreimer] 30041: Unload all Vars a Script creates at the end of it. Give the Vars in Config better names than X and XX.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Nov 1 18:10:44 2007 New Revision: 30041 URL: http://svn.reactos.org/svn/reactos?rev=30041&view=rev Log: Unload all Vars a Script creates at the end of it. Give the Vars in Config better names than X and XX. Modified: trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE-Windows/Root/sSVN.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 18:10:44 2007 @@ -150,3 +150,16 @@ flash title ReactOS Build Environment %_ROSBE_VERSION% + +:: +:: Unload all used Vars. +:: +set ROS_LEAN_AND_MEAN= +set HOST_CC= +set HOST_CPP= +set TARGET_CC= +set TARGET_CPP= +set ROS_INTERMEDIATE= +set ROS_OUTPUT= +set ROS_TEMPORARY= +set CPUCOUNT= 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 18:10:44 2007 @@ -16,9 +16,9 @@ if /i "%1" == "delete" ( echo config.rbuild will be permanently deleted. All your settings will be gone. echo Continue? - set /p XY="(yes), (no)" - if /i "%XY%"=="yes" goto :CONT - if /i "%XY%"=="no" goto :NOK + set /p YESNO="(yes), (no)" + if /i "%YESNO%"=="yes" goto :CONT + if /i "%YESNO%"=="no" goto :NOK goto :NOK :CONT @@ -40,9 +40,9 @@ echo old config.rbuild will be deleted and will be updated with a recent, echo default one. You will need to reconfigure it to your wishes later. echo Continue? - set /p XY="(yes), (no)" - if /i "%XY%"=="yes" goto :CONT2 - if /i "%XY%"=="no" goto :NOK + set /p YESNO="(yes), (no)" + if /i "%YESNO%"=="yes" goto :CONT2 + if /i "%YESNO%"=="no" goto :NOK :CONT2 del "%_ROSBE_BASEDIR%\*.rbuild" del "config.rbuild" @@ -72,10 +72,10 @@ echo *** you are sure about what you are doing. *** echo. -set /p XY="(yes), (no)" - -if /i "%XY%"=="yes" goto :OK -if /i "%XY%"=="no" goto :NOK +set /p YESNO="(yes), (no)" + +if /i "%YESNO%"=="yes" goto :OK +if /i "%YESNO%"=="no" goto :NOK goto :NOK :OK @@ -93,9 +93,9 @@ echo *** update to the most recent one? You need to reset all your *** echo *** previously made settings. *** echo. - set /p XY="(yes), (no)" - if /i "%XY%"=="yes" del "%_ROSBE_BASEDIR%\*.rbuild" | del "config.rbuild" | copy "config.template.rbuild" "%_ROSBE_BASEDIR%\config.rbuild" | goto :OK - if /i "%XY%"=="no" goto :NOK + 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%"=="no" goto :NOK goto :NOK ) ) @@ -109,8 +109,8 @@ for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "SARCH" | find "property name""`) do set SARCH=%%i set SARCH=%SARCH:~7,-1% echo Right now: %SARCH% -set /p X="(), (xbox)" -sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" "%_ROSBE_BASEDIR%\config.rbuild" > "%TEMP%\config2.rbuild" +set /p SARCH_CH="(), (xbox)" +sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%SARCH_CH%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%SARCH_CH%\"/g" "%_ROSBE_BASEDIR%\config.rbuild" > "%TEMP%\config2.rbuild" cls echo Which CPU ReactOS should be optimized for. @@ -123,11 +123,11 @@ for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "OARCH" | find "property name""`) do set OARCH=%%i set OARCH=%OARCH:~7,-1% echo Right now: %OARCH% -set /p XX= -if "%XX%" == "" ( - set XX=pentium -) -sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" "%TEMP%\config2.rbuild" > "%TEMP%\config3.rbuild" +set /p OARCH_CH= +if "%OARCH_CH%" == "" ( + set OARCH_CH=pentium +) +sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%OARCH_CH%\"/g" "%TEMP%\config2.rbuild" > "%TEMP%\config3.rbuild" cls echo What level do you want ReactOS to be optimized at. @@ -140,11 +140,11 @@ for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "OPTIMIZE" | find "property name""`) do set OPTIMIZE=%%i set OPTIMIZE=%OPTIMIZE:~7,-1% echo Right now: %OPTIMIZE% -set /p Y="(0), (1), (2), (3), (4), (5)" -if "%Y%" == "" ( - set Y=1 -) -sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" "%TEMP%\config3.rbuild" > "%TEMP%\config4.rbuild" +set /p OPTIMIZE_CH="(0), (1), (2), (3), (4), (5)" +if "%OPTIMIZE_CH%" == "" ( + set OPTIMIZE_CH=1 +) +sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%OPTIMIZE_CH%\"/g" "%TEMP%\config3.rbuild" > "%TEMP%\config4.rbuild" cls echo Whether to compile for an uniprocessor or multiprocessor machine. @@ -153,11 +153,11 @@ for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "MP" | find "property name""`) do set MP=%%i set MP=%MP:~7,-1% echo Right now: %MP% -set /p Z="(0), (1)" -if "%Z%" == "" ( - set Z=0 -) -sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" "%TEMP%\config4.rbuild" > "%TEMP%\config5.rbuild" +set /p MP_CH="(0), (1)" +if "%MP_CH%" == "" ( + set MP_CH=0 +) +sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%MP_CH%\"/g" "%TEMP%\config4.rbuild" > "%TEMP%\config5.rbuild" cls echo Whether to compile in the integrated kernel debugger. @@ -166,11 +166,11 @@ for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "KDBG" | find "property name""`) do set KDBG=%%i set KDBG=%KDBG:~7,-1% echo Right now: %KDBG% -set /p A="(0), (1)" -if "%A%" == "" ( - set A=0 -) -sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" "%TEMP%\config5.rbuild" > "%TEMP%\config6.rbuild" +set /p KDBG_CH="(0), (1)" +if "%KDBG_CH%" == "" ( + set KDBG_CH=0 +) +sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%KDBG_CH%\"/g" "%TEMP%\config5.rbuild" > "%TEMP%\config6.rbuild" cls echo Whether to compile for debugging. No compiler optimizations will be @@ -180,11 +180,11 @@ for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\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 B="(0), (1)" -if "%B%" == "" ( - set B=1 -) -sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" "%TEMP%\config6.rbuild" > "%TEMP%\config7.rbuild" +set /p DBG_CH="(0), (1)" +if "%DBG_CH%" == "" ( + set DBG_CH=1 +) +sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%DBG_CH%\"/g" "%TEMP%\config6.rbuild" > "%TEMP%\config7.rbuild" cls echo Whether to compile for debugging with GDB. If you don't use GDB, @@ -194,11 +194,11 @@ for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "GDB" | find "property name""`) do set GDB=%%i set GDB=%GDB:~7,-1% echo Right now: %GDB% -set /p C="(0), (1)" -if "%C%" == "" ( - set C=0 -) -sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" "%TEMP%\config7.rbuild" > "%TEMP%\config8.rbuild" +set /p GDB_CH="(0), (1)" +if "%GDB_CH%" == "" ( + set GDB_CH=0 +) +sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%GDB_CH%\"/g" "%TEMP%\config7.rbuild" > "%TEMP%\config8.rbuild" cls echo Whether to compile apps/libs with features covered software patents @@ -210,11 +210,11 @@ for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "NSWPAT" | find "property name""`) do set NSWPAT=%%i set NSWPAT=%NSWPAT:~7,-1% echo Right now: %NSWPAT% -set /p D="(0), (1)" -if "%D%" == "" ( - set D=0 -) -sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" "%TEMP%\config8.rbuild" > "%TEMP%\config9.rbuild" +set /p NSWPAT_CH="(0), (1)" +if "%NSWPAT_CH%" == "" ( + set NSWPAT_CH=0 +) +sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%NSWPAT_CH%\"/g" "%TEMP%\config8.rbuild" > "%TEMP%\config9.rbuild" cls echo Whether to compile with the KD protocol. This will disable support for @@ -228,11 +228,11 @@ for /f "usebackq tokens=3" %%i in (`"type "%_ROSBE_BASEDIR%\config.rbuild" | find "_WINKD_" | find "property name""`) do set WINKD=%%i set WINKD=%WINKD:~7,-1% echo Right now: %WINKD% -set /p F="(0), (1)" -if "%F%" == "" ( - set F=0 -) -sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" "%TEMP%\config9.rbuild" > "%TEMP%\config10.rbuild" +set /p WINKD_CH="(0), (1)" +if "%WINKD_CH%" == "" ( + set WINKD_CH=0 +) +sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%WINKD_CH%\"/g" "%TEMP%\config9.rbuild" > "%TEMP%\config10.rbuild" :: :: Generate a config.rbuild, copy it to the Source Tree and delete temp files. @@ -247,3 +247,26 @@ :NOK title ReactOS Build Environment %_ROSBE_VERSION% + +:: +:: Unload all used Vars. +:: +set YESNO= +set SARCH_CH= +set OARCH_CH= +set OPTIMIZE_CH= +set MP_CH= +set KDBG_CH= +set DBG_CH= +set GDB_CH= +set NSWPAT_CH= +set WINKD_CH= +set SARCH= +set OARCH= +set OPTIMIZE= +set MP= +set KDBG= +set DBG= +set GDB= +set NSWPAT= +set WINKD= Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Thu Nov 1 18:10:44 2007 @@ -45,3 +45,8 @@ :EOC title ReactOS Build Environment %_ROSBE_VERSION% + +:: +:: Unload all used Vars. +:: +set _1= Modified: trunk/tools/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefgcc.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefgcc.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefgcc.cmd Thu Nov 1 18:10:44 2007 @@ -39,3 +39,8 @@ :EOC title ReactOS Build Environment %_ROSBE_VERSION% + +:: +:: Unload all used Vars. +:: +set _1= 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 18:10:44 2007 @@ -91,3 +91,11 @@ :EOC title ReactOS Build Environment %_ROSBE_VERSION% + +:: +:: Unload all used Vars. +:: +set _1= +set _2= +set baseaddr= +set relbase= 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 18:10:44 2007 @@ -81,9 +81,16 @@ ) :UP2 -set /p XY="Please enter 'yes' or 'no': " -if /i "%XY%"=="yes" %_ROSBE_BASEDIR%\ssvn update -if /i "%XY%"=="no" goto :EOC +set /p UP="Please enter 'yes' or 'no': " +if /i "%UP%"=="yes" %_ROSBE_BASEDIR%\ssvn update +if /i "%UP%"=="no" goto :EOC :EOC title ReactOS Build Environment %_ROSBE_VERSION% + +:: +:: Unload all used Vars. +:: +set OFFSVN= +set ONSVN= +set UP=

16 years, 10 months

[greatlrd] 30040: Rename framebuf.def to framebuf_acc.def, framebuf.h to framebuf_acc.h, framebuf.rbuild to framebuf_acc.h Start add hw mouse cures support Deleted all old mouse pointer code that was disable. Disable the new cached code for now

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Nov 1 17:40:22 2007 New Revision: 30040 URL: http://svn.reactos.org/svn/reactos?rev=30040&view=rev Log: Rename framebuf.def to framebuf_acc.def, framebuf.h to framebuf_acc.h, framebuf.rbuild to framebuf_acc.h Start add hw mouse cures support Deleted all old mouse pointer code that was disable. Disable the new cached code for now Added: trunk/reactos/drivers/video/displays/framebuf_acc/framebuf_acc.def - copied unchanged from r30014, trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.def trunk/reactos/drivers/video/displays/framebuf_acc/framebuf_acc.h - copied, changed from r30024, trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.h trunk/reactos/drivers/video/displays/framebuf_acc/framebuf_acc.rbuild - copied, changed from r30014, trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.rbuild trunk/reactos/drivers/video/displays/framebuf_acc/framebuf_acc.rc - copied unchanged from r30014, trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.rc Removed: trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.def trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.h trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.rbuild trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.rc Modified: trunk/reactos/drivers/video/displays/framebuf_acc/enable.c trunk/reactos/drivers/video/displays/framebuf_acc/palette.c trunk/reactos/drivers/video/displays/framebuf_acc/pointer.c trunk/reactos/drivers/video/displays/framebuf_acc/screen.c trunk/reactos/drivers/video/displays/framebuf_acc/surface.c Modified: trunk/reactos/drivers/video/displays/framebuf_acc/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_acc/enable.c (original) +++ trunk/reactos/drivers/video/displays/framebuf_acc/enable.c Thu Nov 1 17:40:22 2007 @@ -18,20 +18,20 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "framebuf.h" +#include "framebuf_acc.h" static DRVFN DrvFunctionTable[] = { - {INDEX_DrvEnablePDEV, (PFN)DrvEnablePDEV}, - {INDEX_DrvCompletePDEV, (PFN)DrvCompletePDEV}, - {INDEX_DrvDisablePDEV, (PFN)DrvDisablePDEV}, - {INDEX_DrvEnableSurface, (PFN)DrvEnableSurface}, - {INDEX_DrvDisableSurface, (PFN)DrvDisableSurface}, - {INDEX_DrvAssertMode, (PFN)DrvAssertMode}, - {INDEX_DrvGetModes, (PFN)DrvGetModes}, - {INDEX_DrvSetPalette, (PFN)DrvSetPalette}, - {INDEX_DrvSetPointerShape, (PFN)DrvSetPointerShape}, - {INDEX_DrvMovePointer, (PFN)DrvMovePointer} + {INDEX_DrvEnablePDEV, (PFN)DrvEnablePDEV}, + {INDEX_DrvCompletePDEV, (PFN)DrvCompletePDEV}, + {INDEX_DrvDisablePDEV, (PFN)DrvDisablePDEV}, + {INDEX_DrvEnableSurface, (PFN)DrvEnableSurface}, + {INDEX_DrvDisableSurface, (PFN)DrvDisableSurface}, + {INDEX_DrvAssertMode, (PFN)DrvAssertMode}, + {INDEX_DrvGetModes, (PFN)DrvGetModes}, + {INDEX_DrvSetPalette, (PFN)DrvSetPalette}, + {INDEX_DrvSetPointerShape, (PFN)DrvSetPointerShape}, + {INDEX_DrvMovePointer, (PFN)DrvMovePointer} }; @@ -91,6 +91,7 @@ PPDEV ppdev; GDIINFO GdiInfo; DEVINFO DevInfo; + ULONG returnedDataLength = 0; ppdev = EngAllocMem(FL_ZERO_MEMORY, sizeof(PDEV), ALLOC_TAG); if (ppdev == NULL) @@ -106,6 +107,35 @@ return NULL; } + /* hw mouse pointer */ + + ppdev->pPointerAttributes = NULL; + ppdev->PointerAttributesSize = 0; + + /* Test see if the driver support hw mouse or not */ + if (!EngDeviceIoControl(ppdev->hDriver,IOCTL_VIDEO_QUERY_POINTER_CAPABILITIES, + &ppdev->ModeIndex, sizeof(PVIDEO_MODE), + &ppdev->PointerCapabilities, + sizeof(VIDEO_POINTER_CAPABILITIES), + &returnedDataLength)) + { + /* Test see if we got a hw mouse or not */ + if ( (ppdev->PointerCapabilities.Flags & VIDEO_MODE_MONO_POINTER) || + (ppdev->PointerCapabilities.Flags & VIDEO_MODE_COLOR_POINTER) ) + { + /* determent the hw mouse mode */ + if (!(ppdev->PointerCapabilities.Flags & VIDEO_MODE_ASYNC_POINTER)) + { + DevInfo.flGraphicsCaps &= ~GCAPS_ASYNCMOVE; + } + else + { + DevInfo.flGraphicsCaps |= GCAPS_ASYNCMOVE; + } + } + } + + /* setup paletted */ if (!IntInitDefaultPalette(ppdev, &DevInfo)) { EngFreeMem(ppdev); Removed: trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.def (original) +++ trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.def (removed) @@ -1,3 +1,0 @@ -LIBRARY framebuf.dll -EXPORTS -DrvEnableDriver@12 Removed: trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.h (original) +++ trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.h (removed) @@ -1,174 +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_MOUSE_CURSOR_SUPPORT - -typedef struct _PDEV -{ - HANDLE hDriver; - HDEV hDevEng; - HSURF hSurfEng; - ULONG ModeIndex; - ULONG ScreenWidth; - ULONG ScreenHeight; - ULONG ScreenDelta; - BYTE BitsPerPixel; - ULONG RedMask; - ULONG GreenMask; - ULONG BlueMask; - BYTE PaletteShift; - PVOID ScreenPtr; - HPALETTE DefaultPalette; - PALETTEENTRY *PaletteEntries; - -#ifdef EXPERIMENTAL_MOUSE_CURSOR_SUPPORT - VIDEO_POINTER_ATTRIBUTES PointerAttributes; - XLATEOBJ *PointerXlateObject; - HSURF PointerColorSurface; - HSURF PointerMaskSurface; - HSURF PointerSaveSurface; - POINTL PointerHotSpot; -#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/framebuf_acc/framebuf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.rbuild (original) +++ trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.rbuild (removed) @@ -1,14 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="framebuf" type="kernelmodedll" entrypoint="_DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> - <importlibrary definition="framebuf.def" /> - <include base="framebuf">.</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.rc</file> -</module> Removed: trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.rc (original) +++ trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.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/framebuf_acc/framebuf_acc.h (from r30024, trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.h (original) +++ trunk/reactos/drivers/video/displays/framebuf_acc/framebuf_acc.h Thu Nov 1 17:40:22 2007 @@ -29,13 +29,18 @@ #include <winioctl.h> #include <ntddvdeo.h> -//#define EXPERIMENTAL_MOUSE_CURSOR_SUPPORT + +//#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; @@ -46,16 +51,24 @@ ULONG BlueMask; BYTE PaletteShift; PVOID ScreenPtr; + + /* 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 - VIDEO_POINTER_ATTRIBUTES PointerAttributes; XLATEOBJ *PointerXlateObject; HSURF PointerColorSurface; HSURF PointerMaskSurface; HSURF PointerSaveSurface; - POINTL PointerHotSpot; + #endif /* DirectX Support */ Copied: trunk/reactos/drivers/video/displays/framebuf_acc/framebuf_acc.rbuild (from r30014, trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.rbuild (original) +++ trunk/reactos/drivers/video/displays/framebuf_acc/framebuf_acc.rbuild Thu Nov 1 17:40:22 2007 @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="framebuf" type="kernelmodedll" entrypoint="_DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> - <importlibrary definition="framebuf.def" /> - <include base="framebuf">.</include> +<module name="framebuf_acc" 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> @@ -10,5 +10,5 @@ <file>pointer.c</file> <file>screen.c</file> <file>surface.c</file> - <file>framebuf.rc</file> + <file>framebuf_acc.rc</file> </module> Modified: trunk/reactos/drivers/video/displays/framebuf_acc/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_acc/palette.c (original) +++ trunk/reactos/drivers/video/displays/framebuf_acc/palette.c Thu Nov 1 17:40:22 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "framebuf.h" +#include "framebuf_acc.h" /* * Standard color that must be in palette, because they're used for Modified: trunk/reactos/drivers/video/displays/framebuf_acc/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_acc/pointer.c (original) +++ trunk/reactos/drivers/video/displays/framebuf_acc/pointer.c Thu Nov 1 17:40:22 2007 @@ -18,9 +18,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "framebuf.h" +#include "framebuf_acc.h" -#ifndef EXPERIMENTAL_MOUSE_CURSOR_SUPPORT + /* * DrvSetPointerShape @@ -68,303 +68,4 @@ return EngMovePointer(pso, x, y, prcl); } -#else -VOID FASTCALL -IntHideMousePointer(PPDEV ppdev, SURFOBJ *DestSurface) -{ - if (ppdev->PointerAttributes.Enable == FALSE) - { - return; - } - - ppdev->PointerAttributes.Enable = FALSE; - if (ppdev->PointerSaveSurface != NULL) - { - RECTL DestRect; - POINTL SrcPoint; - SURFOBJ *SaveSurface; - SURFOBJ *MaskSurface; - - DestRect.left = max(ppdev->PointerAttributes.Column, 0); - DestRect.top = max(ppdev->PointerAttributes.Row, 0); - DestRect.right = min( - ppdev->PointerAttributes.Column + ppdev->PointerAttributes.Width, - ppdev->ScreenWidth - 1); - DestRect.bottom = min( - ppdev->PointerAttributes.Row + ppdev->PointerAttributes.Height, - ppdev->ScreenHeight - 1); - - SrcPoint.x = max(-ppdev->PointerAttributes.Column, 0); - SrcPoint.y = max(-ppdev->PointerAttributes.Row, 0); - - SaveSurface = EngLockSurface(ppdev->PointerSaveSurface); - MaskSurface = EngLockSurface(ppdev->PointerMaskSurface); - EngBitBlt(DestSurface, SaveSurface, MaskSurface, NULL, NULL, - &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, SRCCOPY); - EngUnlockSurface(MaskSurface); - EngUnlockSurface(SaveSurface); - } -} - -VOID FASTCALL -IntShowMousePointer(PPDEV ppdev, SURFOBJ *DestSurface) -{ - if (ppdev->PointerAttributes.Enable == TRUE) - { - return; - } - - ppdev->PointerAttributes.Enable = TRUE; - - /* - * Copy the pixels under the cursor to temporary surface. - */ - - if (ppdev->PointerSaveSurface != NULL) - { - RECTL DestRect; - POINTL SrcPoint; - SURFOBJ *SaveSurface; - - SrcPoint.x = max(ppdev->PointerAttributes.Column, 0); - SrcPoint.y = max(ppdev->PointerAttributes.Row, 0); - - DestRect.left = SrcPoint.x - ppdev->PointerAttributes.Column; - DestRect.top = SrcPoint.y - ppdev->PointerAttributes.Row; - DestRect.right = min( - ppdev->PointerAttributes.Width, - ppdev->ScreenWidth - ppdev->PointerAttributes.Column - 1); - DestRect.bottom = min( - ppdev->PointerAttributes.Height, - ppdev->ScreenHeight - ppdev->PointerAttributes.Row - 1); - - SaveSurface = EngLockSurface(ppdev->PointerSaveSurface); - EngBitBlt(SaveSurface, DestSurface, NULL, NULL, NULL, - &DestRect, &SrcPoint, NULL, NULL, NULL, SRCCOPY); - EngUnlockSurface(SaveSurface); - } - - /* - * Blit the cursor on the screen. - */ - - { - RECTL DestRect; - POINTL SrcPoint; - SURFOBJ *ColorSurf; - SURFOBJ *MaskSurf; - - DestRect.left = max(ppdev->PointerAttributes.Column, 0); - DestRect.top = max(ppdev->PointerAttributes.Row, 0); - DestRect.right = min( - ppdev->PointerAttributes.Column + ppdev->PointerAttributes.Width, - ppdev->ScreenWidth - 1); - DestRect.bottom = min( - ppdev->PointerAttributes.Row + ppdev->PointerAttributes.Height, - ppdev->ScreenHeight - 1); - - SrcPoint.x = max(-ppdev->PointerAttributes.Column, 0); - SrcPoint.y = max(-ppdev->PointerAttributes.Row, 0); - - MaskSurf = EngLockSurface(ppdev->PointerMaskSurface); - if (ppdev->PointerColorSurface != NULL) - { - ColorSurf = EngLockSurface(ppdev->PointerColorSurface); - EngBitBlt(DestSurface, ColorSurf, MaskSurf, NULL, ppdev->PointerXlateObject, - &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, 0xAACC); - EngUnlockSurface(ColorSurf); - } - else - { - /* FIXME */ - EngBitBlt(DestSurface, MaskSurf, NULL, NULL, ppdev->PointerXlateObject, - &DestRect, &SrcPoint, NULL, NULL, NULL, SRCAND); - SrcPoint.y += ppdev->PointerAttributes.Height; - EngBitBlt(DestSurface, MaskSurf, NULL, NULL, ppdev->PointerXlateObject, - &DestRect, &SrcPoint, NULL, NULL, NULL, SRCINVERT); - } - EngUnlockSurface(MaskSurf); - } -} - -/* - * DrvSetPointerShape - * - * Sets the new pointer shape. - * - * Status - * @implemented - */ - -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) -{ - PPDEV ppdev = (PPDEV)pso->dhpdev; - SURFOBJ *TempSurfObj; - - IntHideMousePointer(ppdev, pso); - - if (ppdev->PointerColorSurface != NULL) - { - /* FIXME: Is this really needed? */ - TempSurfObj = EngLockSurface(ppdev->PointerColorSurface); - EngFreeMem(TempSurfObj->pvBits); - TempSurfObj->pvBits = 0; - EngUnlockSurface(TempSurfObj); - - EngDeleteSurface(ppdev->PointerColorSurface); - ppdev->PointerMaskSurface = NULL; - } - - if (ppdev->PointerMaskSurface != NULL) - { - /* FIXME: Is this really needed? */ - TempSurfObj = EngLockSurface(ppdev->PointerMaskSurface); - EngFreeMem(TempSurfObj->pvBits); - TempSurfObj->pvBits = 0; - EngUnlockSurface(TempSurfObj); - - EngDeleteSurface(ppdev->PointerMaskSurface); - ppdev->PointerMaskSurface = NULL; - } - - if (ppdev->PointerSaveSurface != NULL) - { - EngDeleteSurface(ppdev->PointerSaveSurface); - ppdev->PointerSaveSurface = NULL; - } - - /* - * See if we are being asked to hide the pointer. - */ - - if (psoMask == NULL) - { - return SPS_ACCEPT_EXCLUDE; - } - - ppdev->PointerHotSpot.x = xHot; - ppdev->PointerHotSpot.y = yHot; - - ppdev->PointerXlateObject = pxlo; - ppdev->PointerAttributes.Column = x - xHot; - ppdev->PointerAttributes.Row = y - yHot; - ppdev->PointerAttributes.Width = psoMask->lDelta << 3; - ppdev->PointerAttributes.Height = (psoMask->cjBits / psoMask->lDelta) >> 1; - - if (psoColor != NULL) - { - SIZEL Size; - PBYTE Bits; - - Size.cx = ppdev->PointerAttributes.Width; - Size.cy = ppdev->PointerAttributes.Height; - Bits = EngAllocMem(0, psoColor->cjBits, ALLOC_TAG); - memcpy(Bits, psoColor->pvBits, psoColor->cjBits); - - ppdev->PointerColorSurface = (HSURF)EngCreateBitmap(Size, - psoColor->lDelta, psoColor->iBitmapFormat, 0, Bits); - } - else - { - ppdev->PointerColorSurface = NULL; - } - - if (psoMask != NULL) - { - SIZEL Size; - PBYTE Bits; - - Size.cx = ppdev->PointerAttributes.Width; - Size.cy = ppdev->PointerAttributes.Height << 1; - Bits = EngAllocMem(0, psoMask->cjBits, ALLOC_TAG); - memcpy(Bits, psoMask->pvBits, psoMask->cjBits); - - ppdev->PointerMaskSurface = (HSURF)EngCreateBitmap(Size, - psoMask->lDelta, psoMask->iBitmapFormat, 0, Bits); - } - else - { - ppdev->PointerMaskSurface = NULL; - } - - /* - * Create surface for saving the pixels under the cursor. - */ - - { - SIZEL Size; - LONG lDelta; - - Size.cx = ppdev->PointerAttributes.Width; - Size.cy = ppdev->PointerAttributes.Height; - - switch (pso->iBitmapFormat) - { - case BMF_8BPP: lDelta = Size.cx; break; - case BMF_16BPP: lDelta = Size.cx << 1; break; - case BMF_24BPP: lDelta = Size.cx * 3; break; - case BMF_32BPP: lDelta = Size.cx << 2; break; - } - - ppdev->PointerSaveSurface = (HSURF)EngCreateBitmap( - Size, lDelta, pso->iBitmapFormat, BMF_NOZEROINIT, NULL); - } - - IntShowMousePointer(ppdev, pso); - - return SPS_ACCEPT_EXCLUDE; -} - -/* - * DrvMovePointer - * - * Moves the pointer to a new position and ensures that GDI does not interfere - * with the display of the pointer. - * - * Status - * @implemented - */ - -VOID APIENTRY -DrvMovePointer( - IN SURFOBJ *pso, - IN LONG x, - IN LONG y, - IN RECTL *prcl) -{ - PPDEV ppdev = (PPDEV)pso->dhpdev; - BOOL WasVisible; - - WasVisible = ppdev->PointerAttributes.Enable; - if (WasVisible) - { - IntHideMousePointer(ppdev, pso); - } - - if (x == -1) - { - return; - } - - ppdev->PointerAttributes.Column = x - ppdev->PointerHotSpot.x; - ppdev->PointerAttributes.Row = y - ppdev->PointerHotSpot.y; - - if (WasVisible) - { - IntShowMousePointer(ppdev, pso); - } -} - -#endif Modified: trunk/reactos/drivers/video/displays/framebuf_acc/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_acc/screen.c (original) +++ trunk/reactos/drivers/video/displays/framebuf_acc/screen.c Thu Nov 1 17:40:22 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "framebuf.h" +#include "framebuf_acc.h" /* * GetAvailableModes Modified: trunk/reactos/drivers/video/displays/framebuf_acc/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_acc/surface.c (original) +++ trunk/reactos/drivers/video/displays/framebuf_acc/surface.c Thu Nov 1 17:40:22 2007 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "framebuf.h" +#include "framebuf_acc.h" BOOL InitSurface(PPDEV ppdev, @@ -29,6 +29,8 @@ VIDEO_MEMORY_INFORMATION VideoMemoryInfo; ULONG returnedDataLength; ULONG RemappingNeeded = 0; + ULONG PointerMaxWidth = 0; + ULONG PointerMaxHeight = 0; /* * Set video mode of our adapter. @@ -72,11 +74,16 @@ ppdev->pRealVideoMem = VideoMemoryInfo.FrameBufferBase; ppdev->VideoMemSize = VideoMemoryInfo.VideoRamLength; + /* * Video memory cached * * We maby should only ask max 8MB as cached ?, think of the video ram length is 256MB */ + + ppdev->pVideoMemCache = NULL; +#ifdef EXPERIMENTAL_ACC_SUPPORT + ppdev->pVideoMemCache = EngAllocMem(0, (ULONG)VideoMemoryInfo.VideoRamLength, ALLOC_TAG); if (ppdev->pVideoMemCache == NULL) { @@ -84,12 +91,40 @@ ppdev->ScreenPtr = VideoMemoryInfo.FrameBufferBase; } else + +#endif { /* cached on, system memory is avail */ ppdev->ScreenPtr = ppdev->pRealVideoMem; } - /* FIXME hw mouse pointer */ + /* hw mouse pointer support */ + PointerMaxHeight = ppdev->PointerCapabilities.MaxHeight; + PointerMaxWidth = ppdev->PointerCapabilities.MaxWidth * sizeof(ULONG); + if (ppdev->PointerCapabilities.Flags & VIDEO_MODE_COLOR_POINTER) + { + PointerMaxWidth = (ppdev->PointerCapabilities.MaxWidth + 7) / 8; + } + + ppdev->PointerAttributesSize = sizeof(VIDEO_POINTER_ATTRIBUTES) + ((sizeof(UCHAR) * PointerMaxWidth * PointerMaxHeight) << 1); + + ppdev->pPointerAttributes = EngAllocMem(0, ppdev->PointerAttributesSize, ALLOC_TAG); + + if (ppdev->pPointerAttributes != NULL) + { + ppdev->pPointerAttributes->Flags = ppdev->PointerCapabilities.Flags; + ppdev->pPointerAttributes->WidthInBytes = PointerMaxWidth; + ppdev->pPointerAttributes->Width = ppdev->PointerCapabilities.MaxWidth; + ppdev->pPointerAttributes->Height = PointerMaxHeight; + ppdev->pPointerAttributes->Column = 0; + ppdev->pPointerAttributes->Row = 0; + ppdev->pPointerAttributes->Enable = 0; + } + else + { + /* no hw mouse was avail */ + ppdev->PointerAttributesSize = 0; + } return TRUE; } @@ -157,13 +192,15 @@ return FALSE; } + /* Which api we hooking to */ + ppdev->dwHooks = HOOK_BITBLT | HOOK_COPYBITS | HOOK_FILLPATH | HOOK_TEXTOUT | HOOK_STROKEPATH | HOOK_LINETO ; + /* * Associate the surface with our device. */ - if (!EngAssociateSurface(hSurface, ppdev->hDevEng, HOOK_BITBLT | HOOK_COPYBITS | - HOOK_FILLPATH | HOOK_TEXTOUT | - HOOK_STROKEPATH | HOOK_LINETO)) + + if (!EngAssociateSurface(hSurface, ppdev->hDevEng, ppdev->dwHooks)) { EngDeleteSurface(hSurface); return FALSE; @@ -232,52 +269,43 @@ { PPDEV ppdev = (PPDEV)dhpdev; ULONG ulTemp; + BOOLEAN Result = TRUE; if (bEnable) { - BOOLEAN Result; - PBYTE pRealVideoMem = ppdev->pRealVideoMem; + PVOID pRealVideoMem = ppdev->pRealVideoMem; /* Setup surface and remapping if it need it */ if (!InitSurface(ppdev, FALSE)) { - return FALSE; + Result = FALSE; } - - /* Check if we got same surface or not */ - if (pRealVideoMem != ppdev->pRealVideoMem) + else { - if (ppdev->pVideoMemCache == NULL) - { - if ( !EngModifySurface(ppdev->hsurfEng, - ppdev->hdevEng, - ppdev->flHooks | HOOK_SYNCHRONIZE, - MS_NOTSYSTEMMEMORY, - (DHSURF)ppdev, - ppdev->pRealVideoMem, - ppdev->lDeltaScreen, - NULL)) + /* Check if we got same surface or not */ + if (pRealVideoMem != ppdev->pRealVideoMem) + { + PVOID pVideoMem= NULL; + + if (ppdev->pVideoMemCache == NULL) { - return FALSE; + pVideoMem = ppdev->pRealVideoMem; } - } - else - { - if ( !EngModifySurface(ppdev->hsurfEng, - ppdev->hdevEng, - ppdev->flHooks | HOOK_SYNCHRONIZE, - 0, - (DHSURF)ppdev, - ppdev->pVideoMemCache, - ppdev->lDeltaScreen, - NULL)) + else { - return FALSE; + pVideoMem = ppdev->pVideoMemCache; } - } + + Result = !EngModifySurface(ppdev->hSurfEng, ppdev->hDevEng, + ppdev->dwHooks | HOOK_SYNCHRONIZE, + 0, (DHSURF)ppdev, pVideoMem, + ppdev->ScreenDelta, NULL); + } + + /* if the pRealVideoMem == ppdev->pRealVideoMem are + * the Result is then TRUE + */ } - - return TRUE; } else @@ -286,7 +314,9 @@ * Call the miniport driver to reset the device to a known state. */ - return !EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_RESET_DEVICE, + Result = !EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_RESET_DEVICE, NULL, 0, NULL, 0, &ulTemp); } + + return Result; }

16 years, 10 months

Jump to page:

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