Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[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

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/…

16 years, 11 months

[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

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; +} +

16 years, 11 months

[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

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)); }

16 years, 11 months

[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

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)

16 years, 11 months

[greatlrd] 30027: Comment out a hack in framebuf_acc, same hack should be remove from framebuf

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Nov 1 01:32:05 2007 New Revision: 30027 URL: http://svn.reactos.org/svn/reactos?rev=30027&view=rev Log: Comment out a hack in framebuf_acc, same hack should be remove from framebuf Modified: trunk/reactos/drivers/video/displays/framebuf_acc/screen.c 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 01:32:05 2007 @@ -90,6 +90,7 @@ while (ulTemp--) { + /* FIXME add banked graphic mode */ if ((ModeInfoPtr->NumberOfPlanes != 1) || !(ModeInfoPtr->AttributeFlags & VIDEO_MODE_GRAPHICS) || ((ModeInfoPtr->BitsPerPlane != 8) && @@ -118,9 +119,11 @@ ULONG ModeInfoSize; PVIDEO_MODE_INFORMATION ModeInfo, ModeInfoPtr, SelectedMode = NULL; VIDEO_COLOR_CAPABILITIES ColorCapabilities; +/* hack LOGFONTW SystemFont = {16, 7, 0, 0, 700, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, VARIABLE_PITCH | FF_DONTCARE, L"System"}; LOGFONTW AnsiVariableFont = {12, 9, 0, 0, 400, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_STROKE_PRECIS, PROOF_QUALITY, VARIABLE_PITCH | FF_DONTCARE, L"MS Sans Serif"}; LOGFONTW AnsiFixedFont = {12, 9, 0, 0, 400, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_STROKE_PRECIS, PROOF_QUALITY, FIXED_PITCH | FF_DONTCARE, L"Courier"}; +*/ ULONG Temp; /* @@ -298,9 +301,11 @@ pGdiInfo->flHTFlags = HT_FLAG_ADDITIVE_PRIMS; pDevInfo->flGraphicsCaps = 0; +/* hack pDevInfo->lfDefaultFont = SystemFont; pDevInfo->lfAnsiVarFont = AnsiVariableFont; pDevInfo->lfAnsiFixFont = AnsiFixedFont; +*/ pDevInfo->cFonts = 0; pDevInfo->cxDither = 0; pDevInfo->cyDither = 0;

16 years, 11 months

[fireball] 30026: - Get rid of parent key member in PKEY_OBJECT, and use ParentKcb instead. - Modify more functions to use KCB instead of PKEY_OBJECT.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Nov 1 01:22:07 2007 New Revision: 30026 URL: http://svn.reactos.org/svn/reactos?rev=30026&view=rev Log: - Get rid of parent key member in PKEY_OBJECT, and use ParentKcb instead. - Modify more functions to use KCB instead of PKEY_OBJECT. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Thu Nov 1 01:22:07 2007 @@ -313,7 +313,7 @@ KernelMode, Class, CreateOptions, - (PKEY_OBJECT)Object, + ((PKEY_OBJECT)Object)->KeyControlBlock, NULL, (PVOID*)&KeyObject); if (!NT_SUCCESS(Status)) @@ -333,13 +333,13 @@ RtlCreateUnicodeString(&KeyObject->Name, Start); - ParentNode = (PCM_KEY_NODE)HvGetCell(KeyObject->ParentKey->KeyControlBlock->KeyHive, - KeyObject->ParentKey->KeyControlBlock->KeyCell); + ParentNode = (PCM_KEY_NODE)HvGetCell(KeyObject->KeyControlBlock->ParentKcb->KeyHive, + KeyObject->KeyControlBlock->ParentKcb->KeyCell); Node = (PCM_KEY_NODE)HvGetCell(KeyObject->KeyControlBlock->KeyHive, KeyObject->KeyControlBlock->KeyCell); - Node->Parent = KeyObject->ParentKey->KeyControlBlock->KeyCell; + Node->Parent = KeyObject->KeyControlBlock->ParentKcb->KeyCell; Node->Security = ParentNode->Security; KeyObject->KeyControlBlock->ValueCache.ValueList = Node->ValueList.List; @@ -347,7 +347,7 @@ DPRINT("RemainingPath: %wZ\n", &RemainingPath); - CmiAddKeyToList(KeyObject->ParentKey, KeyObject); + CmiAddKeyToList(((PKEY_OBJECT)Object), KeyObject); VERIFY_KEY_OBJECT(KeyObject); @@ -722,7 +722,7 @@ /* Remove the keep-alive reference */ ObDereferenceObject(KeyObject); if (KeyObject->KeyControlBlock->KeyHive != - KeyObject->ParentKey->KeyControlBlock->KeyHive) + KeyObject->KeyControlBlock->ParentKcb->KeyHive) { /* Dereference again */ ObDereferenceObject(KeyObject); Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Thu Nov 1 01:22:07 2007 @@ -213,7 +213,7 @@ KernelMode, NULL, REG_OPTION_VOLATILE, - ParentKey, + ParentKey->KeyControlBlock, NULL, (PVOID*)&NewKey); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Thu Nov 1 01:22:07 2007 @@ -625,7 +625,6 @@ NTAPI CmpDeleteKeyObject(PVOID DeletedObject) { - PKEY_OBJECT ParentKeyObject; PKEY_OBJECT KeyObject; REG_KEY_HANDLE_CLOSE_INFORMATION KeyHandleCloseInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; @@ -634,9 +633,7 @@ DPRINT("Delete key object (%p)\n", DeletedObject); KeyObject = (PKEY_OBJECT) DeletedObject; - ParentKeyObject = KeyObject->ParentKey; - - ObReferenceObject (ParentKeyObject); + PostOperationInfo.Object = (PVOID)KeyObject; KeyHandleCloseInfo.Object = (PVOID)KeyObject; @@ -645,7 +642,6 @@ { PostOperationInfo.Status = Status; CmiCallRegisteredCallbacks(RegNtPostKeyHandleClose, &PostOperationInfo); - ObDereferenceObject (ParentKeyObject); return; } @@ -657,8 +653,6 @@ RtlFreeUnicodeString(&KeyObject->Name); ASSERT((KeyObject->KeyControlBlock->Delete) == FALSE); - - ObDereferenceObject (ParentKeyObject); if (KeyObject->SizeOfSubKeys) { @@ -680,14 +674,15 @@ PULONG ReturnLength, IN KPROCESSOR_MODE PreviousMode) { + DPRINT1("CmpQueryKeyName() called\n"); + while (TRUE); +#if 0 PKEY_OBJECT KeyObject; NTSTATUS Status; - DPRINT ("CmpQueryKeyName() called\n"); - KeyObject = (PKEY_OBJECT)ObjectBody; - if (KeyObject->ParentKey != KeyObject) + if (KeyObject->KeyControlBlock->ParentKcb != KeyObject->KeyControlBlock) { Status = ObQueryNameString (KeyObject->ParentKey, ObjectNameInfo, @@ -734,8 +729,9 @@ { DPRINT ("Total path: %wZ\n", &ObjectNameInfo->Name); } - - return Status; +#endif + + return STATUS_SUCCESS; } VOID @@ -773,7 +769,7 @@ STANDARD_RIGHTS_REQUIRED, CmpKeyObjectType, KernelMode); - NewKey->ParentKey = ParentKey; + //NewKey->ParentKey = ParentKey; } /* Preconditions: Must be called with CmpRegistryLock held. */ Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Thu Nov 1 01:22:07 2007 @@ -507,7 +507,6 @@ { ULONG Type; UNICODE_STRING Name; - struct _KEY_OBJECT *ParentKey; LIST_ENTRY KeyBodyList; ULONG SubKeyCounts; ULONG SizeOfSubKeys; @@ -975,7 +974,7 @@ IN KPROCESSOR_MODE AccessMode, IN PUNICODE_STRING Class, IN ULONG CreateOptions, - IN PKEY_OBJECT Parent, + IN PCM_KEY_CONTROL_BLOCK ParentKcb, IN PCMHIVE OriginatingHive OPTIONAL, OUT PVOID *Object ); Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Thu Nov 1 01:22:07 2007 @@ -83,7 +83,7 @@ IN PUNICODE_STRING Name, IN KPROCESSOR_MODE AccessMode, IN PUNICODE_STRING Class, - IN PKEY_OBJECT Parent, + IN PCM_KEY_CONTROL_BLOCK ParentKcb, IN ULONG CreateOptions, OUT PHCELL_INDEX KeyCell, OUT PVOID *Object) @@ -214,7 +214,7 @@ Kcb = CmpCreateKeyControlBlock(Hive, *KeyCell, KeyNode, - Parent->KeyControlBlock, + ParentKcb, 0, Name); if (!Kcb) @@ -233,7 +233,6 @@ KeyBody->SubKeyCounts = 0; KeyBody->SubKeys = NULL; KeyBody->SizeOfSubKeys = 0; - KeyBody->ParentKey = Parent; InsertTailList(&CmiKeyObjectListHead, &KeyBody->KeyBodyList); Quickie: @@ -267,7 +266,7 @@ IN KPROCESSOR_MODE AccessMode, IN PUNICODE_STRING Class OPTIONAL, IN ULONG CreateOptions, - IN PKEY_OBJECT Parent, + IN PCM_KEY_CONTROL_BLOCK ParentKcb, IN PCMHIVE OriginatingHive OPTIONAL, OUT PVOID *Object) { @@ -286,7 +285,7 @@ ExAcquirePushLockShared((PVOID)&((PCMHIVE)Hive)->FlusherLock); /* Check if the parent is being deleted */ - if (Parent->KeyControlBlock->Delete) + if (ParentKcb->Delete) { /* It has, quit */ ASSERT(FALSE); @@ -314,7 +313,7 @@ } /* Sanity check */ - ASSERT(Cell == Parent->KeyControlBlock->KeyCell); + ASSERT(Cell == ParentKcb->KeyCell); /* Get the parent type */ ParentType = HvGetCellType(Cell); @@ -327,7 +326,7 @@ } /* Don't allow children under symlinks */ - if (Parent->KeyControlBlock->Flags & KEY_SYM_LINK) + if (ParentKcb->Flags & KEY_SYM_LINK) { /* Fail */ ASSERT(FALSE); @@ -346,7 +345,7 @@ Name, AccessMode, Class, - Parent, + ParentKcb, CreateOptions, &KeyCell, Object); @@ -371,9 +370,10 @@ } /* Sanity checks */ - ASSERT(KeyBody->ParentKey->KeyControlBlock->KeyCell == Cell); - ASSERT(KeyBody->ParentKey->KeyControlBlock->KeyHive == Hive); - ASSERT(KeyBody->ParentKey == Parent); + ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyCell == Cell); + ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyHive == Hive); + ASSERT(KeyBody->KeyControlBlock->ParentKcb == ParentKcb); + //ASSERT(KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen == KeyNode->MaxNameLen); /* Update the timestamp */ KeQuerySystemTime(&TimeStamp); @@ -384,6 +384,7 @@ { /* Do it */ KeyNode->MaxNameLen = Name->Length; + KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen = Name->Length; } /* Check if we need toupdate class length maximum */ Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Thu Nov 1 01:22:07 2007 @@ -715,7 +715,6 @@ RootKey->ProcessID = PsGetCurrentProcessId(); #else RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); - RootKey->ParentKey = RootKey; RootKey->SubKeyCounts = 0; RootKey->SubKeys = NULL; RootKey->SizeOfSubKeys = 0;

16 years, 11 months

[janderwald] 30025: - implement CWM_GETISHELLBROWSER support in IShellView - fixes desktop refreshing after a new item has been placed with ShellNew command

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Nov 1 00:25:07 2007 New Revision: 30025 URL: http://svn.reactos.org/svn/reactos?rev=30025&view=rev Log: - implement CWM_GETISHELLBROWSER support in IShellView - fixes desktop refreshing after a new item has been placed with ShellNew command Modified: trunk/reactos/dll/win32/shell32/shlview.c trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c (original) +++ trunk/reactos/dll/win32/shell32/shlview.c Thu Nov 1 00:25:07 2007 @@ -1658,8 +1658,9 @@ (pThis->FolderSettings.fFlags & FWF_TRANSPARENT)) return 1; break; - } - + case CWM_GETISHELLBROWSER: + return pThis->pShellBrowser; + } return DefWindowProcW(hWnd, uMessage, wParam, lParam); } /********************************************************** Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Thu Nov 1 00:25:07 2007 @@ -879,6 +879,10 @@ if (LOWORD(lpcmi->lpVerb) >= This->iIdShellNewFirst && LOWORD(lpcmi->lpVerb) <= This->iIdShellNewLast) { DoShellNewCmd(This, lpcmi); + if (lpSV) + { + IShellView_Refresh(lpSV); + } break; }

16 years, 11 months

[greatlrd] 30024: start implement the system cache buffer. add helper function InitSurface to determent when we need remap or not the video memory. in DrvEnableSurface tell it use hook flags for diffent functions, add cached alloc as well in DrvDisableSurface, add to free the cached video memory rewrote DrvAssertMode to remap the video memory when it is need, and realloc the cache when it is need it Not tested if this change can be compile, yet. but this framebuf_acc is not setup yet with rbuild

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Oct 31 23:07:12 2007 New Revision: 30024 URL: http://svn.reactos.org/svn/reactos?rev=30024&view=rev Log: start implement the system cache buffer. add helper function InitSurface to determent when we need remap or not the video memory. in DrvEnableSurface tell it use hook flags for diffent functions, add cached alloc as well in DrvDisableSurface, add to free the cached video memory rewrote DrvAssertMode to remap the video memory when it is need, and realloc the cache when it is need it Not tested if this change can be compile, yet. but this framebuf_acc is not setup yet with rbuild build system yet Modified: trunk/reactos/drivers/video/displays/framebuf_acc/framebuf.h trunk/reactos/drivers/video/displays/framebuf_acc/surface.c Modified: 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 Wed Oct 31 23:07:12 2007 @@ -66,6 +66,14 @@ 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)) 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 Wed Oct 31 23:07:12 2007 @@ -1,7 +1,8 @@ /* - * ReactOS Generic Framebuffer display driver + * ReactOS Generic Framebuffer acclations 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 +21,79 @@ #include "framebuf.h" +BOOL +InitSurface(PPDEV ppdev, + BOOL bForcemapping) +{ + VIDEO_MEMORY VideoMemory; + VIDEO_MEMORY_INFORMATION VideoMemoryInfo; + ULONG returnedDataLength; + ULONG RemappingNeeded = 0; + + /* + * Set video mode of our adapter. + */ + + if (EngDeviceIoControl(ppdev->hDriver, + IOCTL_VIDEO_SET_CURRENT_MODE, + &(ppdev->ModeIndex), + sizeof(ULONG), + &RemappingNeeded, + sizeof(ULONG), + &returnedDataLength)) + { + return FALSE; + } + + /* Check if mapping is need it */ + if ((!bForcemapping) && + (!RemappingNeeded)) + { + return TRUE; + } + + + /* + * Map the framebuffer into our memory. + */ + + VideoMemory.RequestedVirtualAddress = NULL; + if (EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_MAP_VIDEO_MEMORY, + &VideoMemory, sizeof(VIDEO_MEMORY), + &VideoMemoryInfo, sizeof(VIDEO_MEMORY_INFORMATION), + &returnedDataLength)) + { + return FALSE; + } + + /* + * Save the real video memory + */ + 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 = EngAllocMem(0, (ULONG)VideoMemoryInfo.VideoRamLength, ALLOC_TAG); + if (ppdev->pVideoMemCache == NULL) + { + /* cached off for no avail system memory */ + ppdev->ScreenPtr = VideoMemoryInfo.FrameBufferBase; + } + else + { + /* cached on, system memory is avail */ + ppdev->ScreenPtr = ppdev->pRealVideoMem; + } + + /* FIXME hw mouse pointer */ + + return TRUE; +} + /* * DrvEnableSurface * @@ -38,35 +112,14 @@ HSURF hSurface; ULONG BitmapType; SIZEL ScreenSize; - VIDEO_MEMORY VideoMemory; - VIDEO_MEMORY_INFORMATION VideoMemoryInfo; - ULONG ulTemp; - - /* - * Set video mode of our adapter. - */ - - if (EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_SET_CURRENT_MODE, - &(ppdev->ModeIndex), sizeof(ULONG), NULL, 0, - &ulTemp)) - { - return FALSE; - } - - /* - * Map the framebuffer into our memory. - */ - - VideoMemory.RequestedVirtualAddress = NULL; - if (EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_MAP_VIDEO_MEMORY, - &VideoMemory, sizeof(VIDEO_MEMORY), - &VideoMemoryInfo, sizeof(VIDEO_MEMORY_INFORMATION), - &ulTemp)) - { - return FALSE; - } - - ppdev->ScreenPtr = VideoMemoryInfo.FrameBufferBase; + + + /* Setup surface and force the mapping */ + if (!InitSurface(ppdev, TRUE)) + { + return FALSE; + } + switch (ppdev->BitsPerPixel) { @@ -108,7 +161,9 @@ * Associate the surface with our device. */ - if (!EngAssociateSurface(hSurface, ppdev->hDevEng, 0)) + if (!EngAssociateSurface(hSurface, ppdev->hDevEng, HOOK_BITBLT | HOOK_COPYBITS | + HOOK_FILLPATH | HOOK_TEXTOUT | + HOOK_STROKEPATH | HOOK_LINETO)) { EngDeleteSurface(hSurface); return FALSE; @@ -140,18 +195,24 @@ EngDeleteSurface(ppdev->hSurfEng); ppdev->hSurfEng = NULL; -#ifdef EXPERIMENTAL_MOUSE_CURSOR_SUPPORT - /* Clear all mouse pointer surfaces. */ - DrvSetPointerShape(NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, 0); -#endif + + /* Free the video memory cache */ + if (ppdev->pVideoMemCache) + { + EngFreeMem(ppdev->pVideoMemCache); + } /* * Unmap the framebuffer. */ - VideoMemory.RequestedVirtualAddress = ((PPDEV)dhpdev)->ScreenPtr; + VideoMemory.RequestedVirtualAddress = ppdev->pRealVideoMem; EngDeviceIoControl(((PPDEV)dhpdev)->hDriver, IOCTL_VIDEO_UNMAP_VIDEO_MEMORY, &VideoMemory, sizeof(VIDEO_MEMORY), NULL, 0, &ulTemp); + + ppdev->pRealVideoMem = NULL; + ppdev->pVideoMemCache = NULL; + } /* @@ -175,18 +236,48 @@ if (bEnable) { BOOLEAN Result; - /* - * Reinitialize the device to a clean state. - */ - Result = EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_SET_CURRENT_MODE, - &(ppdev->ModeIndex), sizeof(ULONG), NULL, 0, - &ulTemp); - if (ppdev->BitsPerPixel == 8) + PBYTE pRealVideoMem = ppdev->pRealVideoMem; + + /* Setup surface and remapping if it need it */ + if (!InitSurface(ppdev, FALSE)) { - IntSetPalette(dhpdev, ppdev->PaletteEntries, 0, 256); + return FALSE; } - return Result; + /* Check if we got same surface or not */ + if (pRealVideoMem != ppdev->pRealVideoMem) + { + if (ppdev->pVideoMemCache == NULL) + { + if ( !EngModifySurface(ppdev->hsurfEng, + ppdev->hdevEng, + ppdev->flHooks | HOOK_SYNCHRONIZE, + MS_NOTSYSTEMMEMORY, + (DHSURF)ppdev, + ppdev->pRealVideoMem, + ppdev->lDeltaScreen, + NULL)) + { + return FALSE; + } + } + else + { + if ( !EngModifySurface(ppdev->hsurfEng, + ppdev->hdevEng, + ppdev->flHooks | HOOK_SYNCHRONIZE, + 0, + (DHSURF)ppdev, + ppdev->pVideoMemCache, + ppdev->lDeltaScreen, + NULL)) + { + return FALSE; + } + } + } + + return TRUE; } else

16 years, 11 months

[dreimer] 30023: Use Temp Folder instead of RosBE BaseDir or Temp Files.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Oct 31 22:48:32 2007 New Revision: 30023 URL: http://svn.reactos.org/svn/reactos?rev=30023&view=rev Log: Use Temp Folder instead of RosBE BaseDir or Temp Files. 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 Wed Oct 31 22:48:32 2007 @@ -109,7 +109,7 @@ echo Right now: grep \"SARCH\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /p X="(), (xbox)" -sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" "%_ROSBE_BASEDIR%\config.rbuild" > "%_ROSBE_BASEDIR%\config2.rbuild" +sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" "%_ROSBE_BASEDIR%\config.rbuild" > "%TEMP%\config2.rbuild" cls echo Which CPU ReactOS should be optimized for. @@ -125,7 +125,7 @@ if "%XX%" == "" ( set XX=pentium ) -sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" "%_ROSBE_BASEDIR%\config2.rbuild" > "%_ROSBE_BASEDIR%\config3.rbuild" +sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" "%TEMP%\config2.rbuild" > "%TEMP%\config3.rbuild" cls echo What level do you want ReactOS to be optimized at. @@ -141,7 +141,7 @@ if "%Y%" == "" ( set Y=1 ) -sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" "%_ROSBE_BASEDIR%\config3.rbuild" > "%_ROSBE_BASEDIR%\config4.rbuild" +sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" "%TEMP%\config3.rbuild" > "%TEMP%\config4.rbuild" cls echo Whether to compile for an uniprocessor or multiprocessor machine. @@ -153,7 +153,7 @@ if "%Z%" == "" ( set Z=0 ) -sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" "%_ROSBE_BASEDIR%\config4.rbuild" > "%_ROSBE_BASEDIR%\config5.rbuild" +sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" "%TEMP%\config4.rbuild" > "%TEMP%\config5.rbuild" cls echo Whether to compile in the integrated kernel debugger. @@ -165,7 +165,7 @@ if "%A%" == "" ( set A=0 ) -sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" "%_ROSBE_BASEDIR%\config5.rbuild" > "%_ROSBE_BASEDIR%\config6.rbuild" +sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" "%TEMP%\config5.rbuild" > "%TEMP%\config6.rbuild" cls echo Whether to compile for debugging. No compiler optimizations will be @@ -178,7 +178,7 @@ if "%B%" == "" ( set B=1 ) -sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" "%_ROSBE_BASEDIR%\config6.rbuild" > "%_ROSBE_BASEDIR%\config7.rbuild" +sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" "%TEMP%\config6.rbuild" > "%TEMP%\config7.rbuild" cls echo Whether to compile for debugging with GDB. If you don't use GDB, @@ -191,7 +191,7 @@ if "%C%" == "" ( set C=0 ) -sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" "%_ROSBE_BASEDIR%\config7.rbuild" > "%_ROSBE_BASEDIR%\config8.rbuild" +sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" "%TEMP%\config7.rbuild" > "%TEMP%\config8.rbuild" cls echo Whether to compile apps/libs with features covered software patents @@ -206,7 +206,7 @@ if "%D%" == "" ( set D=0 ) -sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" "%_ROSBE_BASEDIR%\config8.rbuild" > "%_ROSBE_BASEDIR%\config9.rbuild" +sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" "%TEMP%\config8.rbuild" > "%TEMP%\config9.rbuild" cls echo Whether to compile with the KD protocol. This will disable support for @@ -223,14 +223,15 @@ if "%F%" == "" ( set F=0 ) -sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" "%_ROSBE_BASEDIR%\config9.rbuild" > "%_ROSBE_BASEDIR%\config10.rbuild" +sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" "%TEMP%\config9.rbuild" > "%TEMP%\config10.rbuild" :: :: Generate a config.rbuild, copy it to the Source Tree and delete temp files. :: -copy "%_ROSBE_BASEDIR%\config10.rbuild" "%_ROSBE_BASEDIR%\config.tmp" -del "%_ROSBE_BASEDIR%\*.rbuild" -ren "%_ROSBE_BASEDIR%\config.tmp" "config.rbuild" +copy "%TEMP%\config10.rbuild" "%TEMP%\config.tmp" +del "%TEMP%\*.rbuild" +copy "%TEMP%\config.tmp" "%_ROSBE_BASEDIR%\config.rbuild" +del "%TEMP%\*.tmp" copy "%_ROSBE_BASEDIR%\config.rbuild" "config.rbuild" goto :NOK

16 years, 11 months

[hpoussin] 30022: Repair TCP/IP service installation

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Oct 31 21:17:00 2007 New Revision: 30022 URL: http://svn.reactos.org/svn/reactos?rev=30022&view=rev Log: Repair TCP/IP service installation Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.c (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.c Wed Oct 31 21:17:00 2007 @@ -101,7 +101,8 @@ InstallInfSection( IN HWND hWnd, IN LPCWSTR InfFile, - IN LPCWSTR InfSection) + IN LPCWSTR InfSection OPTIONAL, + IN LPCWSTR InfService OPTIONAL) { WCHAR Buffer[MAX_PATH]; HINF hInf = INVALID_HANDLE_VALUE; @@ -132,12 +133,21 @@ if (Context == NULL) goto cleanup; - ret = SetupInstallFromInfSectionW( - hWnd, hInf, - InfSection, SPINST_ALL, - NULL, NULL, SP_COPY_NEWER, - SetupDefaultQueueCallbackW, Context, - NULL, NULL); + ret = TRUE; + if (ret && InfSection) + { + ret = SetupInstallFromInfSectionW( + hWnd, hInf, + InfSection, SPINST_ALL, + NULL, NULL, SP_COPY_NEWER, + SetupDefaultQueueCallbackW, Context, + NULL, NULL); + } + if (ret && InfService) + { + ret = SetupInstallServicesFromInfSectionW( + hInf, InfService, 0); + } cleanup: if (Context) @@ -158,7 +168,8 @@ ret = InstallInfSection( hWnd, L"nettcpip.inf", - L"MS_TCPIP.PrimaryInstall"); + L"MS_TCPIP.PrimaryInstall", + L"MS_TCPIP.PrimaryInstall.Services"); if (!ret && GetLastError() != ERROR_FILE_NOT_FOUND) { DPRINT("InstallInfSection() failed with error 0x%lx\n", GetLastError());

16 years, 11 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 October 2007