Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 15529: Fix more bugs in change display. when you press on aply in desk.cpl later on ok you did get change_display fail msg. fix the return code to reboot req. Remove switch statmenet for more that one flags can be send same time. example CDS_TEST + CDS_FULLSCREEN ..... and replace thuse with if statement instead.
by greatlrd＠svn.reactos.com 26 May '05

26 May '05

Fix more bugs in change display. when you press on aply in desk.cpl later on ok you did get change_display fail msg. fix the return code to reboot req. Remove switch statmenet for more that one flags can be send same time. example CDS_TEST + CDS_FULLSCREEN ..... and replace thuse with if statement instead. Modified: trunk/reactos/subsys/win32k/objects/dc.c _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-05-26 19:58:58 UTC (rev 15528) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-05-26 20:07:10 UTC (rev 15529) @@ -2494,7 +2494,6 @@ return TRUE; } - LONG FASTCALL IntChangeDisplaySettings( @@ -2529,22 +2528,44 @@ if (Reset && NoReset) return DISP_CHANGE_BADFLAGS; - switch (dwflags) + if (dwflags == 0) { - case 0: /* Dynamically change graphics mode */ - DPRINT1("flag 0 UNIMPLEMENT \n"); - - Ret = DISP_CHANGE_FAILED; - break; + /* Dynamically change graphics mode */ + DPRINT1("flag 0 UNIMPLEMENT \n"); + return DISP_CHANGE_FAILED; + } - case CDS_FULLSCREEN: /* Given mode is temporary */ - DPRINT1("flag CDS_FULLSCREEN UNIMPLEMENT \n"); - Ret = DISP_CHANGE_FAILED; - break; + if ((dwflags & CDS_TEST) == CDS_TEST) + { + /* Test reslution */ + dwflags &= ~CDS_TEST; + DPRINT1("flag CDS_TEST UNIMPLEMENT"); + Ret = DISP_CHANGE_FAILED; + } + + if ((dwflags & CDS_FULLSCREEN) == CDS_FULLSCREEN) + { + /* Full Screen */ + dwflags &= ~CDS_FULLSCREEN; + DPRINT1("flag CDS_FULLSCREEN UNIMPLEMENT"); + Ret = DISP_CHANGE_FAILED; + } + if ((dwflags & CDS_VIDEOPARAMETERS) == CDS_VIDEOPARAMETERS) + { + dwflags &= ~CDS_VIDEOPARAMETERS; + if (lParam == NULL) Ret=DISP_CHANGE_BADPARAM; + else + { + DPRINT1("flag CDS_VIDEOPARAMETERS UNIMPLEMENT"); + Ret = DISP_CHANGE_FAILED; + } - case CDS_UPDATEREGISTRY: - { + } + + if ((dwflags & CDS_UPDATEREGISTRY) == CDS_UPDATEREGISTRY) + { + UNICODE_STRING ObjectName; UNICODE_STRING KernelModeName; WCHAR KernelModeNameBuffer[256]; @@ -2556,8 +2577,11 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE DevInstRegKey; ULONG NewValue; + DPRINT1("set CDS_UPDATEREGISTRY \n"); + + dwflags &= ~CDS_UPDATEREGISTRY; /* Get device name (pDeviceName is "\.\xxx") */ for (LastSlash = pDeviceName->Length / sizeof(WCHAR); LastSlash > 0; LastSlash--) @@ -2565,7 +2589,8 @@ if (pDeviceName->Buffer[LastSlash - 1] == L'\\') break; } - if (LastSlash == 0) return DISP_CHANGE_FAILED; + + if (LastSlash == 0) return DISP_CHANGE_RESTART; ObjectName = *pDeviceName; ObjectName.Length -= LastSlash * sizeof(WCHAR); ObjectName.MaximumLength -= LastSlash * sizeof(WCHAR); @@ -2577,8 +2602,10 @@ /* Open \??\xxx (ex: "\??\DISPLAY1") */ Status = RtlAppendUnicodeToString(&KernelModeName, L"\\??\\"); + if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; Status = RtlAppendUnicodeStringToString(&KernelModeName, &ObjectName); + if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; Status = ObReferenceObjectByName( &KernelModeName, @@ -2589,6 +2616,7 @@ KernelMode, NULL, (PVOID*)&DeviceObject); + if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; /* Get associated driver name (ex: "VBE") */ for (LastSlash = DeviceObject->DriverObject->DriverName.Length / sizeof(WCHAR); LastSlash > 0; LastSlash--) @@ -2596,6 +2624,7 @@ if (DeviceObject->DriverObject->DriverName.Buffer[LastSlash - 1] == L'\\') break; } + if (LastSlash == 0) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } ObjectName = DeviceObject->DriverObject->DriverName; ObjectName.Length -= LastSlash * sizeof(WCHAR); @@ -2609,11 +2638,14 @@ /* Open registry key */ Status = RtlAppendUnicodeToString(&RegistryKey, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\"); + if (!NT_SUCCESS(Status)) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } Status = RtlAppendUnicodeStringToString(&RegistryKey, &ObjectName); + if (!NT_SUCCESS(Status)) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } Status = RtlAppendUnicodeToString(&RegistryKey, L"\\Device0"); + if (!NT_SUCCESS(Status)) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } InitializeObjectAttributes(&ObjectAttributes, &RegistryKey, @@ -2633,7 +2665,7 @@ if (NT_SUCCESS(Status) && DevMode->dmFields & DM_PELSWIDTH) { RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.XResolution"); - NewValue = DevMode->dmPelsWidth; + NewValue = DevMode->dmPelsWidth; Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); } @@ -2650,29 +2682,11 @@ else /* return DISP_CHANGE_NOTUPDATED when we can save to reg only vaild for NT */ Ret = DISP_CHANGE_NOTUPDATED; - break; + } - - case CDS_TEST: /* Test if the mode could be set */ - DPRINT1("flag CDS_TEST UNIMPLEMENT"); - Ret = DISP_CHANGE_FAILED; - break; - - - case CDS_VIDEOPARAMETERS: - - if (lParam == NULL) return DISP_CHANGE_BADPARAM; - - DPRINT1("flag CDS_VIDEOPARAMETERS UNIMPLEMENT"); - Ret = DISP_CHANGE_FAILED; - break; - - - default: - DPRINT1("flag DISP_CHANGE_BADFLAGS\n"); + + if (dwflags != 0) Ret = DISP_CHANGE_BADFLAGS; - break; - } return Ret; }

1 0

[navaraf] 15528: Report 16bpp for modes where VBE returns 15bpp.
by navaraf＠svn.reactos.com 26 May '05

26 May '05

Report 16bpp for modes where VBE returns 15bpp. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-05-26 19:57:54 UTC (rev 15527) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-05-26 19:58:58 UTC (rev 15528) @@ -885,6 +885,14 @@ VideoMode->YMillimeter = 0; /* FIXME */ if (VBEMode->BitsPerPixel > 8) { + /* + * Always report 16bpp modes and not 15bpp mode... + */ + if (VBEMode->BitsPerPixel == 15 && VBEMode->NumberOfPlanes == 1) + { + VideoMode->BitsPerPlane = 16; + } + if (DeviceExtension->VbeInfo.Version < 0x300) { VideoMode->NumberRedBits = VBEMode->RedMaskSize;

1 0

[navaraf] 15527: - Revert hacks added by GreatLord in revisons 15521 and 15522.
by navaraf＠svn.reactos.com 26 May '05

26 May '05

- Revert hacks added by GreatLord in revisons 15521 and 15522. - Fix mode enumeration code on few places. Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c _____ Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c --- trunk/reactos/drivers/video/displays/framebuf/screen.c 2005-05-26 19:22:45 UTC (rev 15526) +++ trunk/reactos/drivers/video/displays/framebuf/screen.c 2005-05-26 19:57:54 UTC (rev 15527) @@ -90,17 +90,9 @@ while (ulTemp--) { - /* - FIXME - Do only remove no supporet mode not reste the ModeInfoPtr->Length=0 - if the mode should be betwin 8 - 32 it will not found the rest - of the mode that comes after it. That why 24bits graphic card - fails. and that reason We add 15bpp check here - */ if ((ModeInfoPtr->NumberOfPlanes != 1) || !(ModeInfoPtr->AttributeFlags & VIDEO_MODE_GRAPHICS) || ((ModeInfoPtr->BitsPerPlane != 8) && - (ModeInfoPtr->BitsPerPlane != 15) && (ModeInfoPtr->BitsPerPlane != 16) && (ModeInfoPtr->BitsPerPlane != 24) && (ModeInfoPtr->BitsPerPlane != 32))) @@ -108,7 +100,6 @@ ModeInfoPtr->Length = 0; } - ModeInfoPtr = (PVIDEO_MODE_INFORMATION) (((PUCHAR)ModeInfoPtr) + Modes.ModeInformationLength); } @@ -167,7 +158,6 @@ ModeInfoPtr = ModeInfo; while (ModeCount-- > 0) { - if (ModeInfoPtr->Length > 0 && pDevMode->dmPelsWidth == ModeInfoPtr->VisScreenWidth && pDevMode->dmPelsHeight == ModeInfoPtr->VisScreenHeight && @@ -179,7 +169,8 @@ break; } - ModeInfoPtr++; + ModeInfoPtr = (PVIDEO_MODE_INFORMATION) + (((PUCHAR)ModeInfoPtr) + ModeInfoSize); } } @@ -392,6 +383,7 @@ { if (ModeInfoPtr->Length == 0) { + ModeInfoPtr = (PVIDEO_MODE_INFORMATION)(((ULONG_PTR)ModeInfoPtr) + ModeInfoSize); continue; }

1 0

[hbirr] 15526: Protected the handle table.
by hbirr＠svn.reactos.com 26 May '05

26 May '05

Protected the handle table. Modified: trunk/reactos/subsys/csrss/api/handle.c Modified: trunk/reactos/subsys/csrss/api/process.c Modified: trunk/reactos/subsys/csrss/include/api.h _____ Modified: trunk/reactos/subsys/csrss/api/handle.c --- trunk/reactos/subsys/csrss/api/handle.c 2005-05-26 17:17:29 UTC (rev 15525) +++ trunk/reactos/subsys/csrss/api/handle.c 2005-05-26 19:22:45 UTC (rev 15526) @@ -123,8 +123,10 @@ } Status = CsrReleaseObjectByPointer(ProcessData->HandleTable[h]); + + RtlEnterCriticalSection(&ProcessData->HandleTableLock); ProcessData->HandleTable[h] = 0; - + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return Status; } @@ -138,33 +140,36 @@ return STATUS_INVALID_PARAMETER; } + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + for (i = 0; i < ProcessData->HandleTableSize; i++) { if (ProcessData->HandleTable[i] == NULL) { - ProcessData->HandleTable[i] = Object; - *Handle = (HANDLE)(((i + 1) << 2) | 0x3); - InterlockedIncrement( &Object->ReferenceCount ); - return(STATUS_SUCCESS); + break; } } - NewBlock = RtlAllocateHeap(CsrssApiHeap, - HEAP_ZERO_MEMORY, - (ProcessData->HandleTableSize + 64) * - sizeof(HANDLE)); - if (NewBlock == NULL) + if (i >= ProcessData->HandleTableSize) { - return(STATUS_UNSUCCESSFUL); + NewBlock = RtlAllocateHeap(CsrssApiHeap, + HEAP_ZERO_MEMORY, + (ProcessData->HandleTableSize + 64) * sizeof(HANDLE)); + if (NewBlock == NULL) + { + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + return(STATUS_UNSUCCESSFUL); + } + RtlCopyMemory(NewBlock, + ProcessData->HandleTable, + ProcessData->HandleTableSize * sizeof(HANDLE)); + RtlFreeHeap( CsrssApiHeap, 0, ProcessData->HandleTable ); + ProcessData->HandleTable = (Object_t **)NewBlock; + ProcessData->HandleTableSize += 64; } - RtlCopyMemory(NewBlock, - ProcessData->HandleTable, - ProcessData->HandleTableSize * sizeof(HANDLE)); - RtlFreeHeap( CsrssApiHeap, 0, ProcessData->HandleTable ); - ProcessData->HandleTable = (Object_t **)NewBlock; ProcessData->HandleTable[i] = Object; *Handle = (HANDLE)(((i + 1) << 2) | 0x3); InterlockedIncrement( &Object->ReferenceCount ); - ProcessData->HandleTableSize = ProcessData->HandleTableSize + 64; + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return(STATUS_SUCCESS); } _____ Modified: trunk/reactos/subsys/csrss/api/process.c --- trunk/reactos/subsys/csrss/api/process.c 2005-05-26 17:17:29 UTC (rev 15525) +++ trunk/reactos/subsys/csrss/api/process.c 2005-05-26 19:22:45 UTC (rev 15526) @@ -103,7 +103,8 @@ ProcessData[hash] = pProcessData->next; RtlFreeHeap(CsrssApiHeap, 0, pProcessData); pProcessData = NULL; - } + } + RtlInitializeCriticalSection(&pProcessData->HandleTableLock); } } else @@ -160,6 +161,7 @@ } RtlFreeHeap(CsrssApiHeap, 0, pProcessData->HandleTable); } + RtlDeleteCriticalSection(&pProcessData->HandleTableLock); if (pProcessData->Console) { CsrReleaseObjectByPointer((Object_t *) pProcessData->Console); @@ -254,7 +256,6 @@ if( !NT_SUCCESS( Status ) ) { DbgPrint( "CSR: NtDuplicateObject() failed: %x\n", Status ); - InterlockedDecrement( &(NewProcessData->Console->Header.ReferenceCount) ); CsrFreeProcessData( NewProcessData->ProcessId ); Reply->Status = Status; return Status; _____ Modified: trunk/reactos/subsys/csrss/include/api.h --- trunk/reactos/subsys/csrss/include/api.h 2005-05-26 17:17:29 UTC (rev 15525) +++ trunk/reactos/subsys/csrss/include/api.h 2005-05-26 19:22:45 UTC (rev 15526) @@ -34,6 +34,7 @@ typedef struct _CSRSS_PROCESS_DATA { PCSRSS_CONSOLE Console; + RTL_CRITICAL_SECTION HandleTableLock; ULONG HandleTableSize; Object_t ** HandleTable; HANDLE ProcessId;

1 0

[sedwards] 15525: work around include_next problem when cross-compiling
by sedwards＠svn.reactos.com 26 May '05

26 May '05

work around include_next problem when cross-compiling Modified: trunk/reactos/tools/winebuild/import.c _____ Modified: trunk/reactos/tools/winebuild/import.c --- trunk/reactos/tools/winebuild/import.c 2005-05-26 15:53:24 UTC (rev 15524) +++ trunk/reactos/tools/winebuild/import.c 2005-05-26 17:17:29 UTC (rev 15525) @@ -34,9 +34,15 @@ #endif #include "winglue.h" -#include "wine/exception.h" +//#include "wine/exception.h" #include "build.h" +#ifndef EXCEPTION_NONCONTINUABLE +#define EXCEPTION_NONCONTINUABLE 1 +#endif + +#define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ + struct import { DLLSPEC *spec; /* description of the imported dll */

1 0

[greatlrd] 15524: change line 15 from #if DBG to #ifdef DBG
by greatlrd＠svn.reactos.com 26 May '05

26 May '05

change line 15 from #if DBG to #ifdef DBG so head builds agein Modified: trunk/reactos/include/wine/debug.h _____ Modified: trunk/reactos/include/wine/debug.h --- trunk/reactos/include/wine/debug.h 2005-05-26 15:44:04 UTC (rev 15523) +++ trunk/reactos/include/wine/debug.h 2005-05-26 15:53:24 UTC (rev 15524) @@ -12,7 +12,7 @@ unsigned long DbgPrint(char *Format,...); -#if DBG +#ifdef DBG #define DPRINT1 DbgPrint("(%s:%d:%s) ",__FILE__,__LINE__,__FUNCTION__), DbgPrint #else #define DPRINT1(args...)

1 0

[hpoussin] 15523: Fix compile when DBG is set
by hpoussin＠svn.reactos.com 26 May '05

26 May '05

Fix compile when DBG is set Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2005-05-26 15:15:55 UTC (rev 15522) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2005-05-26 15:44:04 UTC (rev 15523) @@ -32,7 +32,7 @@ #include <ddk/ntapi.h> #ifdef DBG -#define DPRINT(arg) DbgPrint arg; +#define DPRINT(arg) DbgPrint(arg) #else #define DPRINT(arg) #endif

1 0

[greatlrd] 15522: add a commet why 24bits cards fails
by greatlrd＠svn.reactos.com 26 May '05

26 May '05

add a commet why 24bits cards fails and maby other card will fails in GetAvailableModes Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c _____ Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c --- trunk/reactos/drivers/video/displays/framebuf/screen.c 2005-05-26 14:46:23 UTC (rev 15521) +++ trunk/reactos/drivers/video/displays/framebuf/screen.c 2005-05-26 15:15:55 UTC (rev 15522) @@ -90,6 +90,13 @@ while (ulTemp--) { + /* + FIXME + Do only remove no supporet mode not reste the ModeInfoPtr->Length=0 + if the mode should be betwin 8 - 32 it will not found the rest + of the mode that comes after it. That why 24bits graphic card + fails. and that reason We add 15bpp check here + */ if ((ModeInfoPtr->NumberOfPlanes != 1) || !(ModeInfoPtr->AttributeFlags & VIDEO_MODE_GRAPHICS) || ((ModeInfoPtr->BitsPerPlane != 8) && @@ -101,6 +108,7 @@ ModeInfoPtr->Length = 0; } + ModeInfoPtr = (PVIDEO_MODE_INFORMATION) (((PUCHAR)ModeInfoPtr) + Modes.ModeInformationLength); }

1 0

[greatlrd] 15521: Fix the problem for 24 bits graphic card.
by greatlrd＠svn.reactos.com 26 May '05

26 May '05

Fix the problem for 24 bits graphic card. But it report color deep 15 are supported now. it solv the problem. Thanks WaxDragon Hope filip does like this change. Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c _____ Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c --- trunk/reactos/drivers/video/displays/framebuf/screen.c 2005-05-26 13:55:13 UTC (rev 15520) +++ trunk/reactos/drivers/video/displays/framebuf/screen.c 2005-05-26 14:46:23 UTC (rev 15521) @@ -93,6 +93,7 @@ if ((ModeInfoPtr->NumberOfPlanes != 1) || !(ModeInfoPtr->AttributeFlags & VIDEO_MODE_GRAPHICS) || ((ModeInfoPtr->BitsPerPlane != 8) && + (ModeInfoPtr->BitsPerPlane != 15) && (ModeInfoPtr->BitsPerPlane != 16) && (ModeInfoPtr->BitsPerPlane != 24) && (ModeInfoPtr->BitsPerPlane != 32)))

1 0

[ion] 15520: Strip files on retail builds and do not send file/section alignment twice
by ion＠svn.reactos.com 26 May '05

26 May '05

Strip files on retail builds and do not send file/section alignment twice Modified: trunk/reactos/tools/helper.mk _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-05-26 13:53:15 UTC (rev 15519) +++ trunk/reactos/tools/helper.mk 2005-05-26 13:55:13 UTC (rev 15520) @@ -277,6 +277,8 @@ MK_BOOTCDDIR := . MK_DISTDIR := drivers MK_RES_BASE := $(TARGET_NAME) + MK_LFLAGS := -Wl,--file-alignment,0x1000 \ + -Wl,--section-alignment,0x1000 endif ifeq ($(TARGET_TYPE),hal) @@ -697,6 +699,7 @@ MK_CPPFLAGS += -O2 -Wno-strict-aliasing MK_CPPFLAGS += -mpreferred-stack-boundary=2 + OPTIMIZE = yes endif ifneq ($(TARGET_LIBS),) @@ -877,6 +880,11 @@ $(MK_FULLNAME): $(MK_NOSTRIPNAME) $(MK_EXTRADEP) $(HALFVERBOSEECHO) [RSYM] $(MK_FULLNAME) $(RSYM) $(MK_NOSTRIPNAME) $(MK_FULLNAME) + +# Strip the files on release builds +ifeq ($(DBG),0) + $(STRIP) -x $(MK_FULLNAME) +endif # DBG endif # KM_MODE @@ -908,8 +916,6 @@ $(LD_CC) $(TARGET_LFLAGS) \ -Wl,--subsystem,native \ -Wl,--image-base,$(TARGET_BASE) \ - -Wl,--file-alignment,0x1000 \ - -Wl,--section-alignment,0x1000 \ -Wl,--entry,$(TARGET_ENTRY) \ -Wl,temp.exp -mdll \ -o $(MK_NOSTRIPNAME) \ @@ -929,6 +935,11 @@ $(HALFVERBOSEECHO) [RSYM] $(MK_FULLNAME) $(RSYM) $(MK_NOSTRIPNAME) $(MK_FULLNAME) +# Strip the files on release builds +ifeq ($(DBG),0) + $(STRIP) -x $(MK_FULLNAME) +endif # DBG + endif # MK_MODE # Static library target

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