Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 30027: Comment out a hack in framebuf_acc, same hack should be remove from framebuf
by greatlrd＠svn.reactos.org 31 Oct '07

31 Oct '07

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;

1 0

[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 31 Oct '07

31 Oct '07

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;

1 0

[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 31 Oct '07

31 Oct '07

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

1 0

[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 31 Oct '07

31 Oct '07

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

1 0

[dreimer] 30023: Use Temp Folder instead of RosBE BaseDir or Temp Files.
by dreimer＠svn.reactos.org 31 Oct '07

31 Oct '07

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

1 0

[hpoussin] 30022: Repair TCP/IP service installation
by hpoussin＠svn.reactos.org 31 Oct '07

31 Oct '07

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

1 0

[weiden] 30021: Fix abusing the heap by using strdupW instead of _wcsdup
by weiden＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: weiden Date: Wed Oct 31 21:14:16 2007 New Revision: 30021 URL: http://svn.reactos.org/svn/reactos?rev=30021&view=rev Log: Fix abusing the heap by using strdupW instead of _wcsdup Modified: trunk/reactos/dll/win32/shell32/shelllink.c Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c Wed Oct 31 21:14:16 2007 @@ -392,7 +392,7 @@ if( SUCCEEDED( r ) ) { HeapFree(GetProcessHeap(), 0, This->sLinkPath); - This->sLinkPath = _wcsdup(pszFileName); + This->sLinkPath = strdupW(pszFileName); r = IPersistStream_Load(StreamThis, stm); ShellLink_UpdatePath(This->sPathRel, pszFileName, This->sWorkDir, &This->sPath); IStream_Release( stm );

1 0

[weiden] 30020: Don't call SHBrowseForFolder() with random pointers
by weiden＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: weiden Date: Wed Oct 31 20:13:52 2007 New Revision: 30020 URL: http://svn.reactos.org/svn/reactos?rev=30020&view=rev Log: Don't call SHBrowseForFolder() with random pointers Modified: trunk/reactos/dll/cpl/appwiz/createlink.c Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c Wed Oct 31 20:13:52 2007 @@ -88,6 +88,7 @@ switch(LOWORD(wParam)) { case IDC_SHORTCUT_BROWSE: + ZeroMemory(&brws, sizeof(brws)); brws.hwndOwner = hwndDlg; brws.pidlRoot = NULL; brws.pszDisplayName = szPath;

1 0

[gedmurphy] 30019: remove a sneaky little bugger
by gedmurphy＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: gedmurphy Date: Wed Oct 31 19:27:40 2007 New Revision: 30019 URL: http://svn.reactos.org/svn/reactos?rev=30019&view=rev Log: remove a sneaky little bugger 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 Wed Oct 31 19:27:40 2007 @@ -111,7 +111,7 @@ UINT cjBits = BITMAPOBJ_GetWidthBytes(Width, BitsPixel) * Height; ProbeForRead(pUnsafeBits, cjBits, 1); } - DPRINT1("calling IntGdiCreateBitmap 1\n"); + if (0 == Width || 0 == Height) { hBitmap = IntGdiCreateBitmap (1, 1, 1, 1, NULL);

1 0

[gedmurphy] 30018: - Fix param checking and don't send negative values in the SIZEL struct of IntCreateBitmap. - Fixes displaying of menu bitmaps in apps such as abiword
by gedmurphy＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: gedmurphy Date: Wed Oct 31 19:22:59 2007 New Revision: 30018 URL: http://svn.reactos.org/svn/reactos?rev=30018&view=rev Log: - Fix param checking and don't send negative values in the SIZEL struct of IntCreateBitmap. - Fixes displaying of menu bitmaps in apps such as 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 Wed Oct 31 19:22:59 2007 @@ -48,7 +48,7 @@ BitsPixel = BITMAPOBJ_GetRealBitsPixel(BitsPixel * Planes); /* Check parameters */ - if (BitsPixel == 0 || Width < 1 || Height < 1) + if (BitsPixel == 0 || Width < 0) { DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel); SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -58,7 +58,7 @@ WidthBytes = BITMAPOBJ_GetWidthBytes(Width, BitsPixel); Size.cx = Width; - Size.cy = Height; + Size.cy = abs(Height); /* Create the bitmap object. */ hBitmap = IntCreateBitmap(Size, WidthBytes, @@ -111,7 +111,15 @@ UINT cjBits = BITMAPOBJ_GetWidthBytes(Width, BitsPixel) * Height; ProbeForRead(pUnsafeBits, cjBits, 1); } - hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); + DPRINT1("calling IntGdiCreateBitmap 1\n"); + if (0 == Width || 0 == Height) + { + hBitmap = IntGdiCreateBitmap (1, 1, 1, 1, NULL); + } + else + { + hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); + } } _SEH_HANDLE {

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