Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 30037: - dont show Open With shell extension when a selected item is a folder or a shortcut - add the "explore" verb only if folder has a subfolder - always add open verb
by janderwald＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: janderwald Date: Thu Nov 1 16:33:18 2007 New Revision: 30037 URL: http://svn.reactos.org/svn/reactos?rev=30037&view=rev Log: - dont show Open With shell extension when a selected item is a folder or a shortcut - add the "explore" verb only if folder has a subfolder - always add open verb Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.c (original) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.c Thu Nov 1 16:33:18 2007 @@ -23,7 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -//#define YDEBUG +#define YDEBUG #include "winerror.h" #include "wine/debug.h" @@ -588,6 +588,7 @@ LPCITEMIDLIST pidl; WCHAR szPath[MAX_PATH]; LPWSTR szPtr; + static const WCHAR szShortCut[] = { '.','l','n','k', 0 }; fmt.cfFormat = RegisterClipboardFormatA(CFSTR_SHELLIDLIST); fmt.ptd = NULL; @@ -619,11 +620,18 @@ ERR("no mem\n"); return E_OUTOFMEMORY; } + if (_ILIsFolder(pidl_child)) + { + TRACE("pidl is a folder\n"); + SHFree(pidl); + return E_FAIL; + } + if (!SHGetPathFromIDListW(pidl, szPath)) { SHFree(pidl); ERR("SHGetPathFromIDListW failed\n"); - return FALSE; + return E_FAIL; } SHFree(pidl); @@ -632,6 +640,12 @@ szPtr = wcschr(szPath, '.'); if (szPtr) { + if (!_wcsicmp(szPtr, szShortCut)) + { + TRACE("pidl is a shortcut\n"); + return E_FAIL; + } + SHEOW_LoadItemFromHKCU(This, szPtr); SHEOW_LoadItemFromHKCR(This, szPtr); } 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 16:33:18 2007 @@ -382,19 +382,18 @@ _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Select", MFS_ENABLED); TRACE("rfg %x\n", This->rfg); - if (This->rfg & SFGAO_BROWSABLE) + + if (This->rfg & SFGAO_HASSUBFOLDER) { - if(This->bAllValues) - { - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Open", MFS_ENABLED); - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_EXPLORE, MFT_STRING, "&Explore", MFS_ENABLED); - } - else - { - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_EXPLORE, MFT_STRING, "&Explore", MFS_ENABLED); - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Open", MFS_ENABLED); - } + /* FIXME + * check if folder hasnt already been extended + * use reduce verb then + */ + + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_EXPLORE, MFT_STRING, "&Explore", MFS_ENABLED); } + + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Open", MFS_ENABLED); SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION); @@ -669,7 +668,7 @@ HRESULT DoShellExtensions(ItemCmImpl *This, LPCMINVOKECOMMANDINFO lpcmi) { - HRESULT hResult; + HRESULT hResult = NOERROR; UINT i; TRACE("DoShellExtensions %p verb %x count %u\n",This, LOWORD(lpcmi->lpVerb), This->ecount); @@ -679,9 +678,12 @@ hResult = cmenu->lpVtbl->InvokeCommand(cmenu, lpcmi); if (SUCCEEDED(hResult)) - return hResult; - } - return NOERROR; + { + break; + } + } + TRACE("DoShellExtensions result %x\n", hResult); + return hResult; } @@ -873,7 +875,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] 30036: Remove cut and grep dependency from config. byebye for two other external tools. Still TBD : SED
by dreimer＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: dreimer Date: Thu Nov 1 16:30:03 2007 New Revision: 30036 URL: http://svn.reactos.org/svn/reactos?rev=30036&view=rev Log: Remove cut and grep dependency from config. byebye for two other external tools. Still TBD : SED Modified: trunk/tools/RosBE-Windows/Root/Config.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 16:30:03 2007 @@ -106,8 +106,9 @@ echo Sub-Architecture to build for. echo Default is: none echo. -echo Right now: -grep \"SARCH\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 +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" cls @@ -119,8 +120,9 @@ echo See GCC manual for more CPU names and which CPUs GCC can optimize for. echo Default is: pentium echo. -echo Right now: -grep \"OARCH\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 +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 @@ -135,8 +137,9 @@ echo official release builds and debug builds. echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. echo. -echo Right now: -grep \"OPTIMIZE\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 +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 @@ -147,8 +150,9 @@ echo Whether to compile for an uniprocessor or multiprocessor machine. echo Default is: 0 echo. -echo Right now: -grep \"MP\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 +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 @@ -159,8 +163,9 @@ echo Whether to compile in the integrated kernel debugger. echo Default is: 0 echo. -echo Right now: -grep \"KDBG\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 +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 @@ -172,8 +177,9 @@ echo performed. echo Default is: 1 echo. -echo Right now: -grep \"DBG\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 +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 @@ -185,8 +191,9 @@ echo don't enable this. echo Default is: 0 echo. -echo Right now: -grep \"GDB\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 +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 @@ -200,8 +207,9 @@ echo from the patent owner). echo Default is: 0 echo. -echo Right now: -grep \"NSWPAT\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 +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 @@ -217,8 +225,9 @@ echo unless you know what you're doing. echo Default is: 0 echo. -echo Right now: -grep \"_WINKD_\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 +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

1 0

[ekohl] 30035: Expand an environment variable only if its value got at least two percent characters.
by ekohl＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: ekohl Date: Thu Nov 1 14:45:14 2007 New Revision: 30035 URL: http://svn.reactos.org/svn/reactos?rev=30035&view=rev Log: Expand an environment variable only if its value got at least two percent characters. Modified: trunk/reactos/dll/cpl/sysdm/environment.c Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Thu Nov 1 14:45:14 2007 @@ -56,6 +56,8 @@ dwValueLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXTLENGTH, 0, 0); if (dwNameLength > 0 && dwValueLength > 0) { + LPTSTR p; + if (VarData->lpName == NULL) { VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); @@ -84,7 +86,8 @@ VarData->lpCookedValue = NULL; } - if (_tcschr(VarData->lpRawValue, _T('%'))) + p = _tcschr(VarData->lpRawValue, _T('%')); + if (p && _tcschr(++p, _T('%'))) { VarData->dwType = REG_EXPAND_SZ; VarData->lpCookedValue = GlobalAlloc(GPTR, 2 * MAX_PATH * sizeof(TCHAR)); @@ -115,7 +118,7 @@ static VOID -SetEnvironmentVariables(HWND hwndListView, +GetEnvironmentVariables(HWND hwndListView, HKEY hRootKey, LPTSTR lpSubKeyName) { @@ -276,7 +279,7 @@ SetListViewColumns(hwndListView); - SetEnvironmentVariables(hwndListView, + GetEnvironmentVariables(hwndListView, HKEY_CURRENT_USER, _T("Environment")); @@ -294,7 +297,7 @@ SetListViewColumns(hwndListView); - SetEnvironmentVariables(hwndListView, + GetEnvironmentVariables(hwndListView, HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment"));

1 0

[gedmurphy] 30034: Don't lock unnecessarily and don't leak a bitmap object in case of failure
by gedmurphy＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: gedmurphy Date: Thu Nov 1 13:06:11 2007 New Revision: 30034 URL: http://svn.reactos.org/svn/reactos?rev=30034&view=rev Log: Don't lock unnecessarily and don't leak a bitmap object in case of failure 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 13:06:11 2007 @@ -39,7 +39,6 @@ UINT BitsPixel, IN OPTIONAL LPBYTE pBits) { - PBITMAPOBJ bmp; HBITMAP hBitmap; SIZEL Size; LONG WidthBytes; @@ -71,24 +70,25 @@ return 0; } - DPRINT("IntGdiCreateBitmap:%dx%d, %d BPP colors returning %08x\n", - Size.cx, Size.cy, BitsPixel, hBitmap); - - bmp = BITMAPOBJ_LockBitmap( hBitmap ); - if (bmp == NULL) - { - /* FIXME should we free the hBitmap or return it ?? */ - return 0; - } - - bmp->flFlags = BITMAPOBJ_IS_APIBITMAP; - if (NULL != pBits) { - IntSetBitmapBits(bmp, bmp->SurfObj.cjBits, pBits); + PBITMAPOBJ bmp = BITMAPOBJ_LockBitmap( hBitmap ); + if (bmp == NULL) + { + NtGdiDeleteObject(hBitmap); + return NULL; + } + + bmp->flFlags = BITMAPOBJ_IS_APIBITMAP; + + IntSetBitmapBits(bmp, bmp->SurfObj.cjBits, pBits); + + + BITMAPOBJ_UnlockBitmap( bmp ); } - BITMAPOBJ_UnlockBitmap( bmp ); + DPRINT("IntGdiCreateBitmap : %dx%d, %d BPP colors, topdown %d, returning %08x\n", + Size.cx, Size.cy, BitsPixel, (Height < 0 ? 1 : 0), hBitmap); return hBitmap; }

1 0

[jimtabor] 30033: Fix structure storage types.
by jimtabor＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: jimtabor Date: Thu Nov 1 04:59:05 2007 New Revision: 30033 URL: http://svn.reactos.org/svn/reactos?rev=30033&view=rev Log: Fix structure storage types. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Thu Nov 1 04:59:05 2007 @@ -225,7 +225,7 @@ ULONG ulBackgroundClr; ULONG ulBrushClr; POINTL ptlViewportOrg; - PATRECT pRect; // POLYPATBLT + PATRECT pRect[1]; // POLYPATBLT } GDIBSPPATBLT, *PGDIBSPPATBLT; typedef struct _GDIBSTEXTOUT @@ -246,7 +246,7 @@ HANDLE hlfntNew; FLONG flTextAlign; POINTL ptlViewportOrg; - CHAR String[1]; + WCHAR String[2]; } GDIBSTEXTOUT, *PGDIBSTEXTOUT; typedef struct _GDIBSEXTTEXTOUT

1 0

[janderwald] 30032: - implement IPersistFolder2 interface for desktop object - add a backslash when required - fixes deleting of objects on desktop
by janderwald＠svn.reactos.org 01 Nov '07

01 Nov '07

Author: janderwald Date: Thu Nov 1 03:42:06 2007 New Revision: 30032 URL: http://svn.reactos.org/svn/reactos?rev=30032&view=rev Log: - implement IPersistFolder2 interface for desktop object - add a backslash when required - fixes deleting of objects on desktop Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_desktop.c (original) +++ trunk/reactos/dll/win32/shell32/shfldr_desktop.c Thu Nov 1 03:42:06 2007 @@ -61,6 +61,7 @@ typedef struct { const IShellFolder2Vtbl *lpVtbl; + const IPersistFolder2Vtbl *lpPF2; LONG ref; /* both paths are parsible from the desktop */ @@ -104,7 +105,11 @@ { *ppvObj = This; } - + else if (IsEqualIID (riid, &IID_IPersistFolder) || + IsEqualIID (riid, &IID_IPersistFolder2)) + { + *ppvObj = &This->lpPF2; + } if (*ppvObj) { IUnknown_AddRef ((IUnknown *) (*ppvObj)); @@ -843,6 +848,93 @@ ISF_Desktop_fnMapColumnToSCID }; +static inline IGenericSFImpl *impl_from_IPersistFolder2( IPersistFolder2 *iface ) +{ + return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpPF2)); +} + +static HRESULT WINAPI +ISF_Desktop_PersistFolder2_fnQueryInterface (IPersistFolder2 * iface, REFIID iid, + LPVOID * ppvObj) +{ + IGenericSFImpl *This = impl_from_IPersistFolder2(iface); + + TRACE ("(%p)\n", This); + + return ISF_Desktop_fnQueryInterface ((IShellFolder2*)This, iid, ppvObj); +} + +static ULONG WINAPI +ISF_Desktop_PersistFolder2_fnAddRef (IPersistFolder2 * iface) +{ + IGenericSFImpl *This = impl_from_IPersistFolder2(iface); + + TRACE ("(%p)->(count=%u)\n", This, This->ref); + + return ISF_Desktop_fnAddRef((IShellFolder2*)This); +} + +static ULONG WINAPI +ISF_Desktop_PersistFolder2_fnRelease (IPersistFolder2 * iface) +{ + IGenericSFImpl *This = impl_from_IPersistFolder2(iface); + + TRACE ("(%p)->(count=%u)\n", This, This->ref); + + return ISF_Desktop_fnRelease ((IShellFolder2*)This); +} + +static HRESULT WINAPI +ISF_Desktop_PersistFolder2_fnGetClassID (IPersistFolder2 * iface, CLSID * lpClassId) +{ + static GUID const CLSID_Desktop = + { 0x00021400, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; + + IGenericSFImpl *This = impl_from_IPersistFolder2(iface); + + TRACE ("(%p)\n", This); + + if (!lpClassId) + return E_POINTER; + + memcpy(lpClassId, &CLSID_Desktop, sizeof(GUID)); + + return S_OK; +} +static HRESULT WINAPI +ISF_Desktop_PersistFolder2_fnInitialize (IPersistFolder2 * iface, LPCITEMIDLIST pidl) +{ + IGenericSFImpl *This = impl_from_IPersistFolder2(iface); + + TRACE ("(%p)->(%p)\n", This, pidl); + + return E_NOTIMPL; +} + +static HRESULT WINAPI +ISF_Desktop_PersistFolder2_fnGetCurFolder (IPersistFolder2 * iface, + LPITEMIDLIST * pidl) +{ + IGenericSFImpl *This = impl_from_IPersistFolder2(iface); + + TRACE ("(%p)->(%p)\n", This, pidl); + + if (!pidl) return E_POINTER; + *pidl = ILClone (This->pidlRoot); + return S_OK; +} + +static const IPersistFolder2Vtbl vt_FSFldr_PersistFolder2 = +{ + ISF_Desktop_PersistFolder2_fnQueryInterface, + ISF_Desktop_PersistFolder2_fnAddRef, + ISF_Desktop_PersistFolder2_fnRelease, + ISF_Desktop_PersistFolder2_fnGetClassID, + ISF_Desktop_PersistFolder2_fnInitialize, + ISF_Desktop_PersistFolder2_fnGetCurFolder, +}; + + /************************************************************************** * ISF_Desktop_Constructor */ @@ -872,6 +964,7 @@ sf->ref = 1; sf->lpVtbl = &vt_MCFldr_ShellFolder2; + sf->lpPF2 = &vt_FSFldr_PersistFolder2; sf->pidlRoot = _ILCreateDesktop(); /* my qualified pidl */ sf->sPathTarget = SHAlloc( (lstrlenW(szMyPath) + 1)*sizeof(WCHAR) ); lstrcpyW( sf->sPathTarget, szMyPath ); 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 03:42:06 2007 @@ -34,6 +34,7 @@ #include "shlobj.h" #include "objbase.h" +#include "shlwapi.h" #include "shell32_main.h" #include "shellfolder.h" #include "debughlp.h" @@ -513,36 +514,39 @@ */ static void DoDelete(IContextMenu2 *iface, HWND hwnd) { - ItemCmImpl *This = (ItemCmImpl *)iface; WCHAR szPath[MAX_PATH]; WCHAR * szTarget; SHFILEOPSTRUCTW op; - LPSHELLBROWSER lpSB; - LPSHELLVIEW lpSV; - IPersistFolder3 * psf; + LPSHELLBROWSER lpSB; + LPSHELLVIEW lpSV; + IPersistFolder2 * psf; LPITEMIDLIST pidl; STRRET strTemp; - + ItemCmImpl *This = (ItemCmImpl *)iface; + if (IShellFolder2_QueryInterface(This->pSFParent, &IID_IPersistFolder2, (LPVOID*)&psf) != S_OK) { ERR("Failed to get interface IID_IPersistFolder2\n"); return; } + if (IPersistFolder2_GetCurFolder(psf, &pidl) != S_OK) { ERR("IPersistFolder2_GetCurFolder failed\n"); - IShellFolder2_Release(psf); + IPersistFolder2_Release(psf); return; } if (IShellFolder2_GetDisplayNameOf(This->pSFParent, pidl, SHGDN_FORPARSING, &strTemp) != S_OK) { ERR("IShellFolder_GetDisplayNameOf failed\n"); - IShellFolder2_Release(psf); + IPersistFolder2_Release(psf); return; } + szPath[MAX_PATH-1] = 0; StrRetToBufW(&strTemp, pidl, szPath, MAX_PATH); - IShellFolder2_Release(psf); + PathAddBackslashW(szPath); + IPersistFolder2_Release(psf); szTarget = build_paths_list(szPath, This->cidl, This->apidl); @@ -557,6 +561,7 @@ op.fFlags = FOF_ALLOWUNDO; SHFileOperationW(&op); } + ILFree(pidl); } if ((lpSB = (LPSHELLBROWSER)SendMessageA(hwnd, CWM_GETISHELLBROWSER,0,0)))

1 0

[cfinck] 30031: - Add an #error, when UNICODE is not defined. Task-Manager makes use of NDK API's, which forces the application to be compiled Unicode-only. - To make this obvious, change all TCHAR variables and functions to their Unicode counterparts and get rid of the "tchar.h" include. - Use a Unicode entry-point and 'unicode="yes"' instead of UNICODE and _UNICODE definitions in the rbuild file - Many indentation fixes
by cfinck＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: cfinck Date: Thu Nov 1 02:26:27 2007 New Revision: 30031 URL: http://svn.reactos.org/svn/reactos?rev=30031&view=rev Log: - Add an #error, when UNICODE is not defined. Task-Manager makes use of NDK API's, which forces the application to be compiled Unicode-only. - To make this obvious, change all TCHAR variables and functions to their Unicode counterparts and get rid of the "tchar.h" include. - Use a Unicode entry-point and 'unicode="yes"' instead of UNICODE and _UNICODE definitions in the rbuild file - Many indentation fixes Modified: trunk/reactos/base/applications/taskmgr/about.c trunk/reactos/base/applications/taskmgr/affinity.c trunk/reactos/base/applications/taskmgr/applpage.c trunk/reactos/base/applications/taskmgr/column.c trunk/reactos/base/applications/taskmgr/dbgchnl.c trunk/reactos/base/applications/taskmgr/debug.c trunk/reactos/base/applications/taskmgr/endproc.c trunk/reactos/base/applications/taskmgr/graph.c trunk/reactos/base/applications/taskmgr/graphctl.c trunk/reactos/base/applications/taskmgr/optnmenu.c trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/taskmgr/perfpage.c trunk/reactos/base/applications/taskmgr/precomp.h trunk/reactos/base/applications/taskmgr/priority.c trunk/reactos/base/applications/taskmgr/proclist.c trunk/reactos/base/applications/taskmgr/procpage.c trunk/reactos/base/applications/taskmgr/run.c trunk/reactos/base/applications/taskmgr/taskmgr.c trunk/reactos/base/applications/taskmgr/taskmgr.rbuild trunk/reactos/base/applications/taskmgr/trayicon.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/taskmgr/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/affinity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/column.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/dbgchnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/endproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/graphctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/optnmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/priority.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/proclist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/trayicon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…

1 0

[jimtabor] 30030: Win32k/Gdi: - The start of Gdi Batch. - I've tested it on Qemu and Hardware. - No improvements. I think it is running, so please check. - Fix DcUtil code. Will fork soon.
by jimtabor＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: jimtabor Date: Thu Nov 1 01:56:38 2007 New Revision: 30030 URL: http://svn.reactos.org/svn/reactos?rev=30030&view=rev Log: Win32k/Gdi: - The start of Gdi Batch. - I've tested it on Qemu and Hardware. - No improvements. I think it is running, so please check. - Fix DcUtil code. Will fork soon. Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Thu Nov 1 01:56:38 2007 @@ -51,7 +51,11 @@ Dc_Attr->szlViewportExt.cx = dc->Dc_Attr.szlViewportExt.cx; Dc_Attr->szlViewportExt.cy = dc->Dc_Attr.szlViewportExt.cy; - Dc_Attr->ulDirty_ = 0; // Force to Zero! + Dc_Attr->ulDirty_ = dc->Dc_Attr.ulDirty_; //Copy flags! We may have set them. + + XForm2MatrixS( &Dc_Attr->mxWorldToDevice, &dc->w.xformWorld2Vport); + XForm2MatrixS( &Dc_Attr->mxDevicetoWorld, &dc->w.xformVport2World); + XForm2MatrixS( &Dc_Attr->mxWorldToPage, &dc->w.xformWorld2Wnd); } static @@ -77,6 +81,17 @@ dc->Dc_Attr.crForegroundClr = Dc_Attr->crForegroundClr; dc->Dc_Attr.ulForegroundClr = Dc_Attr->ulForegroundClr; Dc_Attr->ulDirty_ &= ~DIRTY_TEXT; + } + + if ( Dirty & (DC_MODE_DIRTY|DC_FONTTEXT_DIRTY) || + (Dc_Attr->ulDirty_ & (DC_MODE_DIRTY|DC_FONTTEXT_DIRTY))) + { + dc->Dc_Attr.jROP2 = Dc_Attr->jROP2; + dc->Dc_Attr.iGraphicsMode = Dc_Attr->iGraphicsMode; + dc->Dc_Attr.lFillMode = Dc_Attr->lFillMode; + dc->Dc_Attr.flFontMapper = Dc_Attr->flFontMapper; + dc->Dc_Attr.lBreakExtra = Dc_Attr->lBreakExtra; + dc->Dc_Attr.cBreak = Dc_Attr->cBreak; } } @@ -131,7 +146,6 @@ FASTCALL DCU_UpdateUserXForms(PDC pDC, ULONG uMask) { -#if 0 PDC_ATTR DC_Attr = pDC->pDc_Attr; if (!uMask) return FALSE; @@ -167,7 +181,6 @@ return FALSE; } } -#endif return TRUE; } @@ -207,6 +220,7 @@ DCU_SynchDcAttrtoUser(HDC hDC, FLONG Dirty) { PDC pDC = DC_LockDc ( hDC ); + if (!pDC) return FALSE; BOOL Ret = DCU_SyncDcAttrtoUser(pDC, Dirty); DC_UnlockDc( pDC ); return Ret; @@ -248,13 +262,47 @@ DCU_SynchDcAttrtoW32k(HDC hDC, FLONG Dirty) { PDC pDC = DC_LockDc ( hDC ); + if (!pDC) return FALSE; BOOL Ret = DCU_SyncDcAttrtoW32k(pDC, Dirty); DC_UnlockDc( pDC ); return Ret; } - - +// +// +// Gdi Batch Flush support functions. +// + + +// +// Process the batch. +// +ULONG +FASTCALL +GdiFlushUserBatch(HDC hDC, PGDIBATCHHDR pHdr) +{ + switch(pHdr->Cmd) + { + case GdiBCPatBlt: // Highest pri first! + case GdiBCPolyPatBlt: + case GdiBCTextOut: + case GdiBCExtTextOut: + case GdiBCSetBrushOrg: + case GdiBCExtSelClipRgn: + case GdiBCSelObj: + case GdiBCDelObj: + case GdiBCDelRgn: + default: + return 0; + } + return pHdr->Size; // Return the full size of the structure. +} + +/* + * NtGdiFlush + * + * Flushes the calling thread's current batch. + */ VOID APIENTRY NtGdiFlush(VOID) @@ -262,12 +310,38 @@ UNIMPLEMENTED; } +/* + * NtGdiFlushUserBatch + * + * Callback for thread batch flush routine. + * + * Think small & fast! + */ NTSTATUS APIENTRY NtGdiFlushUserBatch(VOID) { - NTSTATUS Status = STATUS_SUCCESS; -// UNIMPLEMENTED; - return Status; -} - + PTEB pTeb = NtCurrentTeb(); + ULONG GdiBatchCount = pTeb->GdiBatchCount; + + if( (GdiBatchCount > 0) && (GdiBatchCount <= 310)) // 310 UL size of Buffer in TEB. + { + HDC hDC = (HDC) pTeb->GdiTebBatch.HDC; + if (hDC) + { + PULONG pHdr = &pTeb->GdiTebBatch.Buffer[0]; + // No need to init anything, just go! + for (; GdiBatchCount > 0; GdiBatchCount--) + { + // Process Gdi Batch! + pHdr += GdiFlushUserBatch( hDC, (PGDIBATCHHDR) pHdr ); + } + // Exit and clear out for the next round. + pTeb->GdiTebBatch.Offset = 0; + pTeb->GdiBatchCount = 0; + pTeb->GdiTebBatch.HDC = 0; + } + } + return STATUS_SUCCESS; +} +

1 0

[janderwald] 30029: - refresh folder when deleting an item - does not work for items placed on desktop yet because the desktop folder doesnot implement IPersistFolder2 interface - avoid using ISFHelper interface
by janderwald＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: janderwald Date: Thu Nov 1 01:56:24 2007 New Revision: 30029 URL: http://svn.reactos.org/svn/reactos?rev=30029&view=rev Log: - refresh folder when deleting an item - does not work for items placed on desktop yet because the desktop folder doesnot implement IPersistFolder2 interface - avoid using ISFHelper interface Modified: trunk/reactos/dll/win32/shell32/shfldr_fs.c trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shfldr_fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_fs.c (original) +++ trunk/reactos/dll/win32/shell32/shfldr_fs.c Thu Nov 1 01:56:24 2007 @@ -1170,7 +1170,7 @@ * Builds a list of paths like the one used in SHFileOperation from a table of * PIDLs relative to the given base folder */ -static WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls) +WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls) { WCHAR *wszPathsList; WCHAR *wszListPos; 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 01:56:24 2007 @@ -23,7 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -//#define YDEBUG +#define YDEBUG #include "winerror.h" #include "wine/debug.h" @@ -64,6 +64,7 @@ UINT SH_EnumerateDynamicContextHandlerForKey(LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj, LPITEMIDLIST pidlFolder); +WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls); static const IContextMenu2Vtbl cmvt; @@ -510,17 +511,61 @@ * * deletes the currently selected items */ -static void DoDelete(IContextMenu2 *iface) +static void DoDelete(IContextMenu2 *iface, HWND hwnd) { ItemCmImpl *This = (ItemCmImpl *)iface; - ISFHelper * psfhlp; - - IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlp); - if (psfhlp) - { - ISFHelper_DeleteItems(psfhlp, This->cidl, (LPCITEMIDLIST *)This->apidl); - ISFHelper_Release(psfhlp); - } + WCHAR szPath[MAX_PATH]; + WCHAR * szTarget; + SHFILEOPSTRUCTW op; + LPSHELLBROWSER lpSB; + LPSHELLVIEW lpSV; + IPersistFolder3 * psf; + LPITEMIDLIST pidl; + STRRET strTemp; + + if (IShellFolder2_QueryInterface(This->pSFParent, &IID_IPersistFolder2, (LPVOID*)&psf) != S_OK) + { + ERR("Failed to get interface IID_IPersistFolder2\n"); + return; + } + if (IPersistFolder2_GetCurFolder(psf, &pidl) != S_OK) + { + ERR("IPersistFolder2_GetCurFolder failed\n"); + IShellFolder2_Release(psf); + return; + } + + if (IShellFolder2_GetDisplayNameOf(This->pSFParent, pidl, SHGDN_FORPARSING, &strTemp) != S_OK) + { + ERR("IShellFolder_GetDisplayNameOf failed\n"); + IShellFolder2_Release(psf); + return; + } + StrRetToBufW(&strTemp, pidl, szPath, MAX_PATH); + IShellFolder2_Release(psf); + + szTarget = build_paths_list(szPath, This->cidl, This->apidl); + + if (pidl) + { + if (SHGetPathFromIDListW(pidl, szPath)) + { + ZeroMemory(&op, sizeof(op)); + op.hwnd = GetActiveWindow(); + op.wFunc = FO_DELETE; + op.pFrom = szTarget; + op.fFlags = FOF_ALLOWUNDO; + SHFileOperationW(&op); + } + } + + if ((lpSB = (LPSHELLBROWSER)SendMessageA(hwnd, CWM_GETISHELLBROWSER,0,0))) + { + if (SUCCEEDED(IShellBrowser_QueryActiveShellView(lpSB, &lpSV))) + { + IShellView_Refresh(lpSV); + } + } } /************************************************************************** @@ -673,7 +718,7 @@ break; case FCIDM_SHVIEW_DELETE: TRACE("Verb FCIDM_SHVIEW_DELETE\n"); - DoDelete(iface); + DoDelete(iface, lpcmi->hwnd); break; case FCIDM_SHVIEW_COPY: TRACE("Verb FCIDM_SHVIEW_COPY\n"); @@ -690,7 +735,7 @@ default: if (LOWORD(lpcmi->lpVerb) >= This->iIdSHEFirst && LOWORD(lpcmi->lpVerb) <= This->iIdSHELast) { - return DoShellExtensions(iface, lpcmi); + return DoShellExtensions(This, lpcmi); } FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); } @@ -699,7 +744,7 @@ { TRACE("Verb is %s\n",debugstr_a(lpcmi->lpVerb)); if (strcmp(lpcmi->lpVerb,"delete")==0) - DoDelete(iface); + DoDelete(iface, lpcmi->hwnd); else FIXME("Unhandled string verb %s\n",debugstr_a(lpcmi->lpVerb)); }

1 0

[fireball] 30028: - Update cached KCB values when necessary. - Update Node Maximum values when necessary. - Return data from the node instead of calling 3rd-party functions to loop around the entire key until they find something appropriate. - Get rid of CmiScanForSubKey, CmiGetMaxValueDataLength, CmiGetMaxValueNameLength, CmiGetMaxClassLength, CmiGetMaxNameLength.
by fireball＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: fireball Date: Thu Nov 1 01:33:43 2007 New Revision: 30028 URL: http://svn.reactos.org/svn/reactos?rev=30028&view=rev Log: - Update cached KCB values when necessary. - Update Node Maximum values when necessary. - Return data from the node instead of calling 3rd-party functions to loop around the entire key until they find something appropriate. - Get rid of CmiScanForSubKey, CmiGetMaxValueDataLength, CmiGetMaxValueNameLength, CmiGetMaxClassLength, CmiGetMaxNameLength. Modified: trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Thu Nov 1 01:33:43 2007 @@ -101,157 +101,6 @@ return Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } -ULONG -CmiGetMaxNameLength(PHHIVE Hive, - PCM_KEY_NODE KeyCell) -{ - PCM_KEY_FAST_INDEX HashBlock; - PCM_KEY_NODE CurSubKeyCell; - ULONG MaxName; - ULONG NameLength; - ULONG i; - ULONG Storage; - - MaxName = 0; - for (Storage = Stable; Storage < HTYPE_COUNT; Storage++) - { - if (KeyCell->SubKeyLists[Storage] != HCELL_NIL) - { - HashBlock = (PCM_KEY_FAST_INDEX)HvGetCell (Hive, KeyCell->SubKeyLists[Storage]); - ASSERT(HashBlock->Signature == CM_KEY_FAST_LEAF); - - for (i = 0; i < KeyCell->SubKeyCounts[Storage]; i++) - { - CurSubKeyCell = (PCM_KEY_NODE)HvGetCell (Hive, - HashBlock->List[i].Cell); - NameLength = CurSubKeyCell->NameLength; - if (CurSubKeyCell->Flags & KEY_COMP_NAME) - NameLength *= sizeof(WCHAR); - if (NameLength > MaxName) - MaxName = NameLength; - } - } - } - - DPRINT ("MaxName %lu\n", MaxName); - - return MaxName; -} - -ULONG -CmiGetMaxClassLength(PHHIVE Hive, - PCM_KEY_NODE KeyCell) -{ - PCM_KEY_FAST_INDEX HashBlock; - PCM_KEY_NODE CurSubKeyCell; - ULONG MaxClass; - ULONG i; - ULONG Storage; - - MaxClass = 0; - for (Storage = Stable; Storage < HTYPE_COUNT; Storage++) - { - if (KeyCell->SubKeyLists[Storage] != HCELL_NIL) - { - HashBlock = (PCM_KEY_FAST_INDEX)HvGetCell (Hive, - KeyCell->SubKeyLists[Storage]); - ASSERT(HashBlock->Signature == CM_KEY_FAST_LEAF); - - for (i = 0; i < KeyCell->SubKeyCounts[Storage]; i++) - { - CurSubKeyCell = (PCM_KEY_NODE)HvGetCell (Hive, - HashBlock->List[i].Cell); - - if (MaxClass < CurSubKeyCell->ClassLength) - { - MaxClass = CurSubKeyCell->ClassLength; - } - } - } - } - - return MaxClass; -} - -ULONG -CmiGetMaxValueNameLength(PHHIVE Hive, - PCM_KEY_NODE KeyCell) -{ - PVALUE_LIST_CELL ValueListCell; - PCM_KEY_VALUE CurValueCell; - ULONG MaxValueName; - ULONG Size; - ULONG i; - - VERIFY_KEY_CELL(KeyCell); - - if (KeyCell->ValueList.List == HCELL_NIL) - { - return 0; - } - - MaxValueName = 0; - ValueListCell = (PVALUE_LIST_CELL)HvGetCell (Hive, - KeyCell->ValueList.List); - - for (i = 0; i < KeyCell->ValueList.Count; i++) - { - CurValueCell = (PCM_KEY_VALUE)HvGetCell (Hive, - ValueListCell->ValueOffset[i]); - if (CurValueCell == NULL) - { - DPRINT("CmiGetBlock() failed\n"); - } - - if (CurValueCell != NULL) - { - Size = CurValueCell->NameLength; - if (CurValueCell->Flags & VALUE_COMP_NAME) - { - Size *= sizeof(WCHAR); - } - if (MaxValueName < Size) - { - MaxValueName = Size; - } - } - } - - return MaxValueName; -} - -ULONG -CmiGetMaxValueDataLength(PHHIVE Hive, - PCM_KEY_NODE KeyCell) -{ - PVALUE_LIST_CELL ValueListCell; - PCM_KEY_VALUE CurValueCell; - LONG MaxValueData; - ULONG i; - - VERIFY_KEY_CELL(KeyCell); - - if (KeyCell->ValueList.List == HCELL_NIL) - { - return 0; - } - - MaxValueData = 0; - ValueListCell = (PVALUE_LIST_CELL)HvGetCell (Hive, KeyCell->ValueList.List); - - for (i = 0; i < KeyCell->ValueList.Count; i++) - { - CurValueCell = (PCM_KEY_VALUE)HvGetCell (Hive, - ValueListCell->ValueOffset[i]); - if ((MaxValueData < (LONG)(CurValueCell->DataLength & REG_DATA_SIZE_MASK))) - { - MaxValueData = CurValueCell->DataLength & REG_DATA_SIZE_MASK; - } - } - - return MaxValueData; -} - NTSTATUS CmiScanKeyForValue(IN PCMHIVE RegistryHive, IN PCM_KEY_NODE KeyCell, @@ -275,28 +124,4 @@ return STATUS_SUCCESS; } -NTSTATUS -CmiScanForSubKey(IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, - OUT PCM_KEY_NODE *SubKeyCell, - OUT HCELL_INDEX *BlockOffset, - IN PCUNICODE_STRING KeyName, - IN ACCESS_MASK DesiredAccess, - IN ULONG Attributes) -{ - HCELL_INDEX CellIndex; - - /* Assume failure */ - *SubKeyCell = NULL; - - /* Call newer Cm API */ - CellIndex = CmpFindSubKeyByName(&RegistryHive->Hive, KeyCell, KeyName); - if (CellIndex == HCELL_NIL) return STATUS_OBJECT_NAME_NOT_FOUND; - - /* Otherwise, get the cell data back too */ - *BlockOffset = CellIndex; - *SubKeyCell = (PCM_KEY_NODE)HvGetCell(&RegistryHive->Hive, CellIndex); - return STATUS_SUCCESS; -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Thu Nov 1 01:33:43 2007 @@ -331,8 +331,23 @@ Quickie: if (NT_SUCCESS(Status)) { + ASSERT(Parent->MaxValueNameLen == Kcb->KcbMaxValueNameLen); + if (Parent->MaxValueNameLen < ValueName->Length) + { + Parent->MaxValueNameLen = ValueName->Length; + Kcb->KcbMaxValueNameLen = ValueName->Length; + } + + ASSERT(Parent->MaxValueDataLen == Kcb->KcbMaxValueDataLen); + if (Parent->MaxValueDataLen < DataLength) + { + Parent->MaxValueDataLen = DataLength; + Kcb->KcbMaxValueDataLen = Parent->MaxValueDataLen; + } + /* Save the write time */ KeQuerySystemTime(&Parent->LastWriteTime); + KeQuerySystemTime(&Kcb->KcbLastWriteTime); } /* Release the lock */ @@ -422,8 +437,11 @@ /* Set the last write time */ KeQuerySystemTime(&Parent->LastWriteTime); + KeQuerySystemTime(&Kcb->KcbLastWriteTime); /* Sanity check */ + ASSERT(Parent->MaxValueNameLen == Kcb->KcbMaxValueNameLen); + ASSERT(Parent->MaxValueDataLen == Kcb->KcbMaxValueDataLen); ASSERT(HvIsCellDirty(Hive, Cell)); /* Check if the value list is empty now */ @@ -432,6 +450,8 @@ /* Then clear key node data */ Parent->MaxValueNameLen = 0; Parent->MaxValueDataLen = 0; + Kcb->KcbMaxValueNameLen = 0; + Kcb->KcbMaxValueDataLen = 0; } /* Change default Status to success */ @@ -811,19 +831,10 @@ Info->KeyFullInformation.SubKeys = Node->SubKeyCounts[Stable] + Node->SubKeyCounts[Volatile]; Info->KeyFullInformation.Values = Node->ValueList.Count; - Info->KeyFullInformation.MaxNameLen = CmiGetMaxNameLength(Hive, Node); - Info->KeyFullInformation.MaxClassLen = CmiGetMaxClassLength(Hive, Node); - Info->KeyFullInformation.MaxValueNameLen = CmiGetMaxValueNameLength(Hive, Node); - Info->KeyFullInformation.MaxValueDataLen = CmiGetMaxValueDataLength(Hive, Node); - DPRINT("%d %d %d %d\n", - CmiGetMaxNameLength(Hive, Node), - CmiGetMaxValueDataLength(Hive, Node), - CmiGetMaxValueNameLength(Hive, Node), - CmiGetMaxClassLength(Hive, Node)); - //Info->KeyFullInformation.MaxNameLen = Node->MaxNameLen; - //Info->KeyFullInformation.MaxClassLen = Node->MaxClassLen; - //Info->KeyFullInformation.MaxValueNameLen = Node->MaxValueNameLen; - //Info->KeyFullInformation.MaxValueDataLen = Node->MaxValueDataLen; + Info->KeyFullInformation.MaxNameLen = Node->MaxNameLen; + Info->KeyFullInformation.MaxClassLen = Node->MaxClassLen; + Info->KeyFullInformation.MaxValueNameLen = Node->MaxValueNameLen; + Info->KeyFullInformation.MaxValueDataLen = Node->MaxValueDataLen; /* Check if we have a class */ if (Node->ClassLength > 0)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs