Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 14325: Implement IntChangeDisplaySettings in a crappy way. Feel free to improve it!
by hpoussin＠svn.reactos.com 25 Mar '05

25 Mar '05

Implement IntChangeDisplaySettings in a crappy way. Feel free to improve it! Modified: trunk/reactos/subsys/win32k/objects/dc.c _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-03-25 23:21:00 UTC (rev 14324) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-03-25 23:23:35 UTC (rev 14325) @@ -2538,8 +2538,111 @@ break; case CDS_UPDATEREGISTRY: - Ret = DISP_CHANGE_FAILED; - break; + { + UNICODE_STRING ObjectName; + UNICODE_STRING KernelModeName; + WCHAR KernelModeNameBuffer[256]; + UNICODE_STRING RegistryKey; + WCHAR RegistryKeyBuffer[512]; + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status; + ULONG LastSlash; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE DevInstRegKey; + ULONG NewValue; + + /* Get device name (pDeviceName is "\.\xxx") */ + for (LastSlash = pDeviceName->Length / sizeof(WCHAR); LastSlash > 0; LastSlash--) + { + if (pDeviceName->Buffer[LastSlash - 1] == L'\\') + break; + } + if (LastSlash == 0) return DISP_CHANGE_FAILED; + ObjectName = *pDeviceName; + ObjectName.Length -= LastSlash * sizeof(WCHAR); + ObjectName.MaximumLength -= LastSlash * sizeof(WCHAR); + ObjectName.Buffer += LastSlash; + + KernelModeName.Length = 0; + KernelModeName.MaximumLength = sizeof(KernelModeNameBuffer); + KernelModeName.Buffer = KernelModeNameBuffer; + + /* 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, + OBJ_CASE_INSENSITIVE, + NULL, + 0, + IoDeviceObjectType, + 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--) + { + 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); + ObjectName.MaximumLength -= LastSlash * sizeof(WCHAR); + ObjectName.Buffer += LastSlash; + + RegistryKey.Length = 0; + RegistryKey.MaximumLength = sizeof(RegistryKeyBuffer); + RegistryKey.Buffer = RegistryKeyBuffer; + + /* 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, + OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwOpenKey(&DevInstRegKey, GENERIC_READ | GENERIC_WRITE, &ObjectAttributes); + ObDereferenceObject(DeviceObject); + if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; + + /* Update needed fields */ + if (NT_SUCCESS(Status) && DevMode->dmFields & DM_BITSPERPEL) + { + RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.BitsPerPel"); + NewValue = DevMode->dmBitsPerPel; + Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); + } + + if (NT_SUCCESS(Status) && DevMode->dmFields & DM_PELSWIDTH) + { + RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.XResolution"); + NewValue = DevMode->dmPelsWidth; + Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); + } + + if (NT_SUCCESS(Status) && DevMode->dmFields & DM_PELSHEIGHT) + { + RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.YResolution"); + NewValue = DevMode->dmPelsHeight; + Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); + } + + ZwClose(DevInstRegKey); + if (NT_SUCCESS(Status)) + Ret = DISP_CHANGE_RESTART; + else + Ret = DISP_CHANGE_FAILED; + break; + } case CDS_TEST: /* Test if the mode could be set */ Ret = DISP_CHANGE_FAILED;

1 0

[hpoussin] 14324: Call ChangeDisplaySettingsEx.
by hpoussin＠svn.reactos.com 25 Mar '05

25 Mar '05

Call ChangeDisplaySettingsEx. We need to implement a test phase to verify that new settings are correct. Modified: trunk/reactos/lib/cpl/desk/settings.c _____ Modified: trunk/reactos/lib/cpl/desk/settings.c --- trunk/reactos/lib/cpl/desk/settings.c 2005-03-25 23:11:20 UTC (rev 14323) +++ trunk/reactos/lib/cpl/desk/settings.c 2005-03-25 23:21:00 UTC (rev 14324) @@ -518,9 +518,6 @@ || CurrentDisplayDevice->CurrentSettings->dmPelsHeight != CurrentDisplayDevice->InitialSettings.dmPelsHeight || CurrentDisplayDevice->CurrentSettings->dmBitsPerPel != CurrentDisplayDevice->InitialSettings.dmBitsPerPel) { -#if 1 - MessageBox(NULL, TEXT("Sorry... Applying changes is not implemented in ReactOS..."), TEXT("Display settings"), MB_OK | MB_ICONSTOP); -#else /* FIXME: Need to test changes */ /* Apply new settings */ LONG rc; @@ -554,7 +551,6 @@ MessageBox(NULL, TEXT("Unknown error when applying new settings..."), TEXT("Display settings"), MB_OK | MB_ICONSTOP); break; } -#endif } } break;

1 0

[weiden] 14323: grant correct access rights when duplicating a handle
by weiden＠svn.reactos.com 25 Mar '05

25 Mar '05

grant correct access rights when duplicating a handle Modified: trunk/reactos/ntoskrnl/ob/handle.c _____ Modified: trunk/reactos/ntoskrnl/ob/handle.c --- trunk/reactos/ntoskrnl/ob/handle.c 2005-03-25 22:53:57 UTC (rev 14322) +++ trunk/reactos/ntoskrnl/ob/handle.c 2005-03-25 23:11:20 UTC (rev 14323) @@ -193,6 +193,19 @@ NewHandleEntry.u2.GrantedAccess = ((Options & DUPLICATE_SAME_ACCESS) ? SourceHandleEntry->u2.GrantedAccess : DesiredAccess); + if (Options & DUPLICATE_SAME_ACCESS) + { + NewHandleEntry.u2.GrantedAccess = SourceHandleEntry->u2.GrantedAccess; + } + else + { + if (DesiredAccess & GENERIC_ANY) + { + RtlMapGenericMask(&DesiredAccess, + ObjectHeader->ObjectType->Mapping); + } + NewHandleEntry.u2.GrantedAccess = DesiredAccess; + } /* reference the object so it doesn't get deleted after releasing the lock and before creating a new handle for it */ @@ -336,23 +349,39 @@ SourceHandle == NtCurrentProcess()) { PVOID ObjectBody; + POBJECT_TYPE ObjectType; + ObjectType = (SourceHandle == NtCurrentThread()) ? PsThreadType : PsProcessType; + Status = ObReferenceObjectByHandle(SourceHandle, - PROCESS_DUP_HANDLE, - NULL, + 0, + ObjectType, PreviousMode, &ObjectBody, NULL); if(NT_SUCCESS(Status)) { + if (Options & DUPLICATE_SAME_ACCESS) + { + /* grant all access rights */ + DesiredAccess = ((ObjectType == PsThreadType) ? THREAD_ALL_ACCESS : PROCESS_ALL_ACCESS); + } + else + { + if (DesiredAccess & GENERIC_ANY) + { + RtlMapGenericMask(&DesiredAccess, + ObjectType->Mapping); + } + } Status = ObCreateHandle(TargetProcess, ObjectBody, - THREAD_ALL_ACCESS, + DesiredAccess, InheritHandle, &hTarget); ObDereferenceObject(ObjectBody); - + if (Options & DUPLICATE_CLOSE_SOURCE) { ObDeleteHandle(SourceProcess, @@ -781,7 +810,6 @@ KeLeaveCriticalRegion(); DPRINT1("GrantedAccess: 0x%x, ~GrantedAccess: 0x%x, DesiredAccess: 0x%x, denied: 0x%x\n", GrantedAccess, ~GrantedAccess, DesiredAccess, ~GrantedAccess & DesiredAccess); - KEBUGCHECK(0); return(STATUS_ACCESS_DENIED); }

1 0

[weiden] 14322: minor optimization fix for single linked lists
by weiden＠svn.reactos.com 25 Mar '05

25 Mar '05

minor optimization fix for single linked lists Modified: trunk/reactos/ntoskrnl/ex/list.c Modified: trunk/reactos/ntoskrnl/ob/handle.c _____ Modified: trunk/reactos/ntoskrnl/ex/list.c --- trunk/reactos/ntoskrnl/ex/list.c 2005-03-25 22:40:56 UTC (rev 14321) +++ trunk/reactos/ntoskrnl/ex/list.c 2005-03-25 22:53:57 UTC (rev 14322) @@ -449,7 +449,7 @@ do { - oldslh = *ListHead; + oldslh = *(volatile SLIST_HEADER *)ListHead; le = oldslh.Next.Next; if(le == NULL) { @@ -481,7 +481,7 @@ do { - oldslh = *ListHead; + oldslh = *(volatile SLIST_HEADER *)ListHead; newslh.Depth = oldslh.Depth + 1; newslh.Sequence = oldslh.Sequence + 1; ListEntry->Next = oldslh.Next.Next; _____ Modified: trunk/reactos/ntoskrnl/ob/handle.c --- trunk/reactos/ntoskrnl/ob/handle.c 2005-03-25 22:40:56 UTC (rev 14321) +++ trunk/reactos/ntoskrnl/ob/handle.c 2005-03-25 22:53:57 UTC (rev 14322) @@ -779,6 +779,9 @@ HandleEntry); KeLeaveCriticalRegion(); + + DPRINT1("GrantedAccess: 0x%x, ~GrantedAccess: 0x%x, DesiredAccess: 0x%x, denied: 0x%x\n", GrantedAccess, ~GrantedAccess, DesiredAccess, ~GrantedAccess & DesiredAccess); + KEBUGCHECK(0); return(STATUS_ACCESS_DENIED); }

1 0

[chorns] 14321: Always overwrite output file
by chorns＠svn.reactos.com 25 Mar '05

25 Mar '05

Always overwrite output file Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.cpp --- branches/xmlbuildsystem/reactos/tools/buildno/buildno.cpp 2005-03-25 21:29:11 UTC (rev 14320) +++ branches/xmlbuildsystem/reactos/tools/buildno/buildno.cpp 2005-03-25 22:40:56 UTC (rev 14321) @@ -59,7 +59,6 @@ FILE *h = NULL; char* s; char* s1; - unsigned length; int dllversion = KERNEL_VERSION_MAJOR + 42; s1 = s = (char *) malloc(256 * 1024); @@ -137,27 +136,6 @@ s = s + sprintf (s, "-%S\"\n", KERNEL_VERSION_BUILD_TYPE); s = s + sprintf (s, "#endif\n/* EOF */\n"); - h = fopen (filename, "rb"); - if (h != NULL) - { - fseek(h, 0, SEEK_END); - length = ftell(h); - if (length == strlen(s1)) - { - char* orig; - - orig = (char *) malloc(length); - fseek(h, 0, SEEK_SET); - fread(orig, 1, length, h); - if (memcmp(s1, orig, length) == 0) - { - fclose(h); - return; - } - } - fclose(h); - } - h = fopen (filename, "wb"); if (!h) {

1 0

[ekohl] 14320: Generate code without L-value casts. Fix remaining issues.
by ekohl＠svn.reactos.com 25 Mar '05

25 Mar '05

Generate code without L-value casts. Fix remaining issues. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-03-25 19:34:26 UTC (rev 14319) +++ trunk/reactos/tools/widl/ChangeLog 2005-03-25 21:29:11 UTC (rev 14320) @@ -1,5 +1,12 @@ ChangeLog +2005-03-25 ekohl + + tools/widl/client.c + tools/widl/server.c + +Generate code without L-value casts. Fix remaining issues. + 2005-03-21 navaraf tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-03-25 19:34:26 UTC (rev 14319) +++ trunk/reactos/tools/widl/client.c 2005-03-25 21:29:11 UTC (rev 14320) @@ -613,7 +613,11 @@ write_name(client, var); fprintf(client, " = *(("); write_type(client, var->type, NULL, var->tname); - fprintf(client, " __RPC_FAR *)_StubMsg.Buffer)++;\n"); + fprintf(client, " __RPC_FAR *)_StubMsg.Buffer);\n"); + + print_client("_StubMsg.Buffer += sizeof("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, ");\n"); } last_size = size; @@ -659,7 +663,11 @@ print_client("_StubMsg.Buffer += %u;\n", alignment); print_client("_RetVal = *(("); write_type(client, def->type, def, def->tname); - fprintf(client, " __RPC_FAR *)_StubMsg.Buffer)++;\n"); + fprintf(client, " __RPC_FAR *)_StubMsg.Buffer);\n"); + + print_client("_StubMsg.Buffer += sizeof("); + write_type(client, def->type, def, def->tname); + fprintf(client, ");\n"); } } _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-03-25 19:34:26 UTC (rev 14319) +++ trunk/reactos/tools/widl/server.c 2005-03-25 21:29:11 UTC (rev 14320) @@ -529,7 +529,10 @@ write_name(server, var); fprintf(server, " = *(("); write_type(server, var->type, NULL, var->tname); - fprintf(server, " __RPC_FAR*)_StubMsg.Buffer)++;\n"); + fprintf(server, " __RPC_FAR*)_StubMsg.Buffer);\n"); + print_server("_StubMsg.Buffer += sizeof("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, ");\n"); fprintf(server, "\n"); } else if (var->ptr_level == 1)

1 0

[royce] 14319: patch by Filip Navara:
by royce＠svn.reactos.com 25 Mar '05

25 Mar '05

patch by Filip Navara: IopCreateDeviceNode should allocate from NonPagedPool, not PagedPool... (the memory is accessed at DISPATCH_LEVEL) Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-03-25 19:28:55 UTC (rev 14318) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-03-25 19:34:26 UTC (rev 14319) @@ -508,7 +508,7 @@ DPRINT("ParentNode %x PhysicalDeviceObject %x\n", ParentNode, PhysicalDeviceObject); - Node = (PDEVICE_NODE)ExAllocatePool(PagedPool, sizeof(DEVICE_NODE)); + Node = (PDEVICE_NODE)ExAllocatePool(NonPagedPool, sizeof(DEVICE_NODE)); if (!Node) { return STATUS_INSUFFICIENT_RESOURCES;

1 0

[chorns] 14318: Build template HAL
by chorns＠svn.reactos.com 25 Mar '05

25 Mar '05

Build template HAL Modified: branches/xmlbuildsystem/reactos/hal/hal/hal.c Modified: branches/xmlbuildsystem/reactos/hal/hal/hal.xml _____ Modified: branches/xmlbuildsystem/reactos/hal/hal/hal.c --- branches/xmlbuildsystem/reactos/hal/hal/hal.c 2005-03-25 18:48:51 UTC (rev 14317) +++ branches/xmlbuildsystem/reactos/hal/hal/hal.c 2005-03-25 19:28:55 UTC (rev 14318) @@ -357,13 +357,23 @@ } +BOOLEAN +STDCALL +HalQueryDisplayOwnership(VOID) +{ + UNIMPLEMENTED; + + return FALSE; +} + + VOID STDCALL HalQueryDisplayParameters( - PULONG DispSizeX, - PULONG DispSizeY, - PULONG CursorPosX, - PULONG CursorPosY) + OUT PULONG DispSizeX, + OUT PULONG DispSizeY, + OUT PULONG CursorPosX, + OUT PULONG CursorPosY) { UNIMPLEMENTED; } @@ -391,6 +401,13 @@ VOID STDCALL +HalReleaseDisplayOwnership(VOID) +{ + UNIMPLEMENTED; +} + +VOID +STDCALL HalReportResourceUsage(VOID) { UNIMPLEMENTED; @@ -407,6 +424,15 @@ VOID +FASTCALL +HalRequestSoftwareInterrupt( + KIRQL Request) +{ + UNIMPLEMENTED; +} + + +VOID STDCALL HalReturnToFirmware( ULONG Action) @@ -623,6 +649,17 @@ BOOLEAN STDCALL +KdPortInitializeEx( + PKD_PORT_INFORMATION PortInformation, + DWORD Unknown1, + DWORD Unknown2) +{ + UNIMPLEMENTED; +} + + +BOOLEAN +STDCALL KdPortPollByte( PUCHAR ByteRecieved) { _____ Modified: branches/xmlbuildsystem/reactos/hal/hal/hal.xml --- branches/xmlbuildsystem/reactos/hal/hal/hal.xml 2005-03-25 18:48:51 UTC (rev 14317) +++ branches/xmlbuildsystem/reactos/hal/hal/hal.xml 2005-03-25 19:28:55 UTC (rev 14318) @@ -1,5 +1,7 @@ <module name="hal" type="kernelmodedll"> <importlibrary basename="hal" definition="hal.def" /> + <include base="ntoskrnl">include</include> + <library>ntoskrnl</library> <file>hal.c</file> <file>hal.rc</file> </module>

1 0

[chorns] 14317: Add missing files
by chorns＠svn.reactos.com 25 Mar '05

25 Mar '05

Add missing files Modified: branches/xmlbuildsystem/reactos/hal/hal/hal.xml _____ Modified: branches/xmlbuildsystem/reactos/hal/hal/hal.xml --- branches/xmlbuildsystem/reactos/hal/hal/hal.xml 2005-03-25 18:13:31 UTC (rev 14316) +++ branches/xmlbuildsystem/reactos/hal/hal/hal.xml 2005-03-25 18:48:51 UTC (rev 14317) @@ -1,3 +1,5 @@ <module name="hal" type="kernelmodedll"> <importlibrary basename="hal" definition="hal.def" /> + <file>hal.c</file> + <file>hal.rc</file> </module>

1 0

[weiden] 14316: only return the token handle if creating it succeeded
by weiden＠svn.reactos.com 25 Mar '05

25 Mar '05

only return the token handle if creating it succeeded Modified: trunk/reactos/ntoskrnl/ps/security.c _____ Modified: trunk/reactos/ntoskrnl/ps/security.c --- trunk/reactos/ntoskrnl/ps/security.c 2005-03-25 17:08:30 UTC (rev 14315) +++ trunk/reactos/ntoskrnl/ps/security.c 2005-03-25 18:13:31 UTC (rev 14316) @@ -82,15 +82,18 @@ &hToken); ObDereferenceObject(Token); - _SEH_TRY + if(NT_SUCCESS(Status)) { - *TokenHandle = hToken; + _SEH_TRY + { + *TokenHandle = hToken; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; } return Status;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs