Ros-diffs May 2013

ros-diffs@reactos.org

16 participants
234 discussions

[hbelusca] 58950: [KDROSDBG] Remove further legacy exports (the aim is to obtain at least the same exports as kdcom).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 5 19:36:05 2013 New Revision: 58950 URL: http://svn.reactos.org/svn/reactos?rev=58950&view=rev Log: [KDROSDBG] Remove further legacy exports (the aim is to obtain at least the same exports as kdcom). Modified: branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec branches/kd++/ntoskrnl/include/internal/kd.h Modified: branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c [iso-8859-1] Sun May 5 19:36:05 2013 @@ -113,6 +113,7 @@ return FALSE; } +#if 0 BOOLEAN NTAPI KdPortGetByte(OUT PUCHAR ByteReceived) @@ -142,6 +143,7 @@ // return KdPortPollByteEx(&DefaultPort, ByteReceived); } +#endif VOID NTAPI Modified: branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] Sun May 5 19:36:05 2013 @@ -268,18 +268,6 @@ } -/* HAL.KdPortGetByte */ -BOOLEAN -NTAPI -KdPortGetByte( - OUT PUCHAR ByteReceived) -{ - if (!PortInitialized) - return FALSE; - return KdPortGetByteEx(&DefaultPort, ByteReceived); -} - - /* HAL.KdPortGetByteEx ; ReactOS-specific */ BOOLEAN NTAPI @@ -298,6 +286,17 @@ return FALSE; } +#if 0 +/* HAL.KdPortGetByte */ +BOOLEAN +NTAPI +KdPortGetByte( + OUT PUCHAR ByteReceived) +{ + if (!PortInitialized) + return FALSE; + return KdPortGetByteEx(&DefaultPort, ByteReceived); +} /* HAL.KdPortPollByte */ BOOLEAN @@ -327,7 +326,7 @@ return TRUE; } - +#endif /* HAL.KdPortPutByte */ VOID Modified: branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec [iso-8859-1] Sun May 5 19:36:05 2013 @@ -1,10 +1,10 @@ ; Old KD -@ stdcall KdPortGetByte(ptr) +;;@ stdcall KdPortGetByte(ptr) @ stdcall KdPortGetByteEx(ptr ptr) @ stdcall KdPortInitialize(ptr long long) @ stdcall KdPortInitializeEx(ptr long long) -@ stdcall KdPortPollByte(ptr) -@ stdcall KdPortPollByteEx(ptr ptr) +;;@ stdcall KdPortPollByte(ptr) +;;@ stdcall KdPortPollByteEx(ptr ptr) @ stdcall KdPortPutByte(long) @ stdcall KdPortPutByteEx(ptr long) Modified: branches/kd++/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/ntoskrnl/include/inter… ============================================================================== --- branches/kd++/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ branches/kd++/ntoskrnl/include/internal/kd.h [iso-8859-1] Sun May 5 19:36:05 2013 @@ -39,10 +39,12 @@ ULONG Unknown2 ); +#if 0 BOOLEAN NTAPI KdPortGetByte( PUCHAR ByteReceived); +#endif BOOLEAN NTAPI

11 years, 7 months

[pschweitzer] 58949: [RTL] Don't allocate an extra privilege entry when not required. Still doesn't fix issue.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 5 19:24:25 2013 New Revision: 58949 URL: http://svn.reactos.org/svn/reactos?rev=58949&view=rev Log: [RTL] Don't allocate an extra privilege entry when not required. Still doesn't fix issue. Modified: trunk/reactos/lib/rtl/priv.c Modified: trunk/reactos/lib/rtl/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/priv.c?rev=58949&r… ============================================================================== --- trunk/reactos/lib/rtl/priv.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/priv.c [iso-8859-1] Sun May 5 19:24:25 2013 @@ -11,7 +11,7 @@ #include <rtl.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* FUNCTIONS ***************************************************************/ @@ -138,7 +138,7 @@ * new privileges (big enough, after old privileges memory area) */ State = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(RTL_ACQUIRE_STATE) + sizeof(TOKEN_PRIVILEGES) + - NumPriv * sizeof(LUID_AND_ATTRIBUTES)); + (NumPriv - ANYSIZE_ARRAY) * sizeof(LUID_AND_ATTRIBUTES)); if (!State) { return STATUS_NO_MEMORY;

11 years, 7 months

[hbelusca] 58948: [KDROSDBG] Remove some unneeded legacy.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 5 19:21:03 2013 New Revision: 58948 URL: http://svn.reactos.org/svn/reactos?rev=58948&view=rev Log: [KDROSDBG] Remove some unneeded legacy. Modified: branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec Modified: branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt [iso-8859-1] Sun May 5 19:21:03 2013 @@ -10,7 +10,7 @@ endif(ARCH STREQUAL "i386") list(APPEND SOURCE kdrosdbg.rc - ${CMAKE_CURRENT_BINARY_DIR}/kdrosdbg.def) + ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) add_library(kdcom SHARED ${SOURCE}) Modified: branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c [iso-8859-1] Sun May 5 19:21:03 2013 @@ -169,40 +169,6 @@ KdPortPutByteEx(&DefaultPort, ByteToSend); } -VOID -NTAPI -KdPortRestore(VOID) -{ - UNIMPLEMENTED; - while (TRUE); -} - -VOID -NTAPI -KdPortSave(VOID) -{ - UNIMPLEMENTED; - while (TRUE); -} - -BOOLEAN -NTAPI -KdPortDisableInterrupts(VOID) -{ - UNIMPLEMENTED; - while (TRUE); - return TRUE; -} - -BOOLEAN -NTAPI -KdPortEnableInterrupts(VOID) -{ - UNIMPLEMENTED; - while (TRUE); - return TRUE; -} - /* WINDOWS FUNCTIONS **********************************************************/ NTSTATUS @@ -219,6 +185,20 @@ { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +KdD0Transition(VOID) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdD3Transition(VOID) +{ + return STATUS_SUCCESS; } NTSTATUS Modified: branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] Sun May 5 19:21:03 2013 @@ -355,70 +355,6 @@ WRITE_PORT_UCHAR(SER_THR(ComPortBase), ByteToSend); } - -/* HAL.KdPortRestore */ -VOID -NTAPI -KdPortRestore(VOID) -{ - UNIMPLEMENTED; -} - - -/* HAL.KdPortSave */ -VOID -NTAPI -KdPortSave(VOID) -{ - UNIMPLEMENTED; -} - - -/* HAL.KdPortDisableInterrupts */ -BOOLEAN -NTAPI -KdPortDisableInterrupts(VOID) -{ - UCHAR ch; - - if (!PortInitialized) - return FALSE; - - ch = READ_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress)); - ch &= (~(SR_MCR_OUT1 | SR_MCR_OUT2)); - WRITE_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress), ch); - - ch = READ_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress)); - ch &= (~SR_IER_ALL); - WRITE_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress), ch); - - return TRUE; -} - - -/* HAL.KdPortEnableInterrupts */ -BOOLEAN -NTAPI -KdPortEnableInterrupts(VOID) -{ - UCHAR ch; - - if (PortInitialized == FALSE) - return FALSE; - - ch = READ_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress)); - ch &= (~SR_IER_ALL); - ch |= SR_IER_ERDA; - WRITE_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress), ch); - - ch = READ_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress)); - ch &= (~SR_MCR_LOOP); - ch |= (SR_MCR_OUT1 | SR_MCR_OUT2); - WRITE_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress), ch); - - return TRUE; -} - /* * @unimplemented */ @@ -439,6 +375,20 @@ IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) { return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +KdD0Transition(VOID) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdD3Transition(VOID) +{ + return STATUS_SUCCESS; } /* Modified: branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec [iso-8859-1] Sun May 5 19:21:03 2013 @@ -7,15 +7,13 @@ @ stdcall KdPortPollByteEx(ptr ptr) @ stdcall KdPortPutByte(long) @ stdcall KdPortPutByteEx(ptr long) -@ stdcall KdPortRestore() -@ stdcall KdPortSave() -@ stdcall KdPortDisableInterrupts() -@ stdcall KdPortEnableInterrupts() ; New KD +@ stdcall KdD0Transition() +@ stdcall KdD3Transition() @ stdcall KdDebuggerInitialize0(ptr) @ stdcall KdDebuggerInitialize1(ptr) +@ stdcall KdReceivePacket(long ptr ptr ptr ptr) +@ stdcall KdRestore(long) @ stdcall KdSave(long) -@ stdcall KdRestore(long) -@ stdcall KdReceivePacket(long ptr ptr ptr ptr) @ stdcall KdSendPacket(long ptr ptr ptr)

11 years, 7 months

[hbelusca] 58947: Small files renaming.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 5 18:25:57 2013 New Revision: 58947 URL: http://svn.reactos.org/svn/reactos?rev=58947&view=rev Log: Small files renaming. Added: branches/kd++/drivers/base/kdrosdbg/kdrosdbg.rc - copied unchanged from r58904, branches/kd++/drivers/base/kdrosdbg/kdcom.rc branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec - copied unchanged from r58904, branches/kd++/drivers/base/kdrosdbg/kdcom.spec Removed: branches/kd++/drivers/base/kdrosdbg/kdcom.rc branches/kd++/drivers/base/kdrosdbg/kdcom.spec Modified: branches/kd++/drivers/base/CMakeLists.txt branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt Modified: branches/kd++/drivers/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/CMakeList… ============================================================================== --- branches/kd++/drivers/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/kd++/drivers/base/CMakeLists.txt [iso-8859-1] Sun May 5 18:25:57 2013 @@ -7,5 +7,6 @@ else() add_subdirectory(kdrosdbg) endif() + add_subdirectory(nmidebug) add_subdirectory(null) Modified: branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt [iso-8859-1] Sun May 5 18:25:57 2013 @@ -1,5 +1,5 @@ -spec2def(kdcom.dll kdcom.spec ADD_IMPORTLIB) +spec2def(kdcom.dll kdrosdbg.spec ADD_IMPORTLIB) if(ARCH STREQUAL "i386") list(APPEND SOURCE i386/kdbg.c) @@ -9,8 +9,8 @@ list(APPEND SOURCE arm/kdbg.c) endif(ARCH STREQUAL "i386") list(APPEND SOURCE - kdcom.rc - ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) + kdrosdbg.rc + ${CMAKE_CURRENT_BINARY_DIR}/kdrosdbg.def) add_library(kdcom SHARED ${SOURCE}) Removed: branches/kd++/drivers/base/kdrosdbg/kdcom.rc URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/kdcom.rc [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/kdcom.rc (removed) @@ -1,6 +0,0 @@ - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS KDBG COM Library" -#define REACTOS_STR_INTERNAL_NAME "kdcom" -#define REACTOS_STR_ORIGINAL_FILENAME "kdcom.dll" -#include <reactos/version.rc> Removed: branches/kd++/drivers/base/kdrosdbg/kdcom.spec URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/kdcom.spec [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/kdcom.spec (removed) @@ -1,21 +0,0 @@ -; Old KD -@ stdcall KdPortGetByte(ptr) -@ stdcall KdPortGetByteEx(ptr ptr) -@ stdcall KdPortInitialize(ptr long long) -@ stdcall KdPortInitializeEx(ptr long long) -@ stdcall KdPortPollByte(ptr) -@ stdcall KdPortPollByteEx(ptr ptr) -@ stdcall KdPortPutByte(long) -@ stdcall KdPortPutByteEx(ptr long) -@ stdcall KdPortRestore() -@ stdcall KdPortSave() -@ stdcall KdPortDisableInterrupts() -@ stdcall KdPortEnableInterrupts() - -; New KD -@ stdcall KdDebuggerInitialize0(ptr) -@ stdcall KdDebuggerInitialize1(ptr) -@ stdcall KdSave(long) -@ stdcall KdRestore(long) -@ stdcall KdReceivePacket(long ptr ptr ptr ptr) -@ stdcall KdSendPacket(long ptr ptr ptr)

11 years, 7 months

[pschweitzer] 58946: [RTL] Add a few DPRINTs. Fix a bug where last status was overrided in case of failure. Still commented out...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 5 17:32:00 2013 New Revision: 58946 URL: http://svn.reactos.org/svn/reactos?rev=58946&view=rev Log: [RTL] Add a few DPRINTs. Fix a bug where last status was overrided in case of failure. Still commented out... Modified: trunk/reactos/lib/rtl/priv.c Modified: trunk/reactos/lib/rtl/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/priv.c?rev=58946&r… ============================================================================== --- trunk/reactos/lib/rtl/priv.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/priv.c [iso-8859-1] Sun May 5 17:32:00 2013 @@ -113,12 +113,14 @@ OUT PVOID *ReturnedState) { #if 0 - NTSTATUS Status; PRTL_ACQUIRE_STATE State; + NTSTATUS Status, IntStatus; ULONG ReturnLength, i, OldSize; SECURITY_QUALITY_OF_SERVICE Sqos; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE ImpersonationToken = 0, ProcessToken; + + DPRINT("RtlAcquirePrivilege(%p, %u, %u, %p)\n", Privilege, NumPriv, Flags, ReturnedState); /* Validate flags */ if (Flags & ~(RTL_ACQUIRE_PRIVILEGE_PROCESS | RTL_ACQUIRE_PRIVILEGE_IMPERSONATE)) @@ -283,6 +285,7 @@ State->OldPrivileges = RtlAllocateHeap(RtlGetProcessHeap(), 0, ReturnLength); if (State->OldPrivileges) { + DPRINT("Allocated old privileges: %p\n", State->OldPrivileges); OldSize = ReturnLength; continue; } @@ -313,6 +316,8 @@ *ReturnedState = State; } } while (FALSE); + + DPRINT("RtlAcquirePrivilege succeed!\n"); return Status; @@ -326,12 +331,12 @@ /* Do we have to restore previously active impersonation? */ if (State->Flags & RTL_ACQUIRE_PRIVILEGE_IMPERSONATE) { - Status = ZwSetInformationThread(NtCurrentThread(), ThreadImpersonationToken, - &State->OldImpersonationToken, sizeof(HANDLE)); + IntStatus = ZwSetInformationThread(NtCurrentThread(), ThreadImpersonationToken, + &State->OldImpersonationToken, sizeof(HANDLE)); /* If this ever happens, we're in a really bad situation... */ - if (!NT_SUCCESS(Status)) - { - RtlRaiseStatus(Status); + if (!NT_SUCCESS(IntStatus)) + { + RtlRaiseStatus(IntStatus); } } @@ -343,6 +348,8 @@ /* And free our state buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, State); + + DPRINT("RtlAcquirePrivilege() failed with status: %lx\n", Status); return Status; #else @@ -362,6 +369,8 @@ NTSTATUS Status; PRTL_ACQUIRE_STATE State = (PRTL_ACQUIRE_STATE)ReturnedState; + DPRINT("RtlReleasePrivilege(%p)\n", ReturnedState); + /* If we had an active impersonation before we acquired privileges */ if (State->Flags & RTL_ACQUIRE_PRIVILEGE_IMPERSONATE) { @@ -388,6 +397,7 @@ /* If we used a different buffer for old privileges, just free it */ if ((PVOID)State->OldPrivBuffer != (PVOID)State->OldPrivileges) { + DPRINT("Releasing old privileges: %p\n", State->OldPrivileges); RtlFreeHeap(RtlGetProcessHeap(), 0, State->OldPrivileges); }

11 years, 7 months

[pschweitzer] 58945: [KERNEL32] If you workaround RtlAcquirePrivilege, do it properly! Will prevent bad address freeing...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 5 16:38:41 2013 New Revision: 58945 URL: http://svn.reactos.org/svn/reactos?rev=58945&view=rev Log: [KERNEL32] If you workaround RtlAcquirePrivilege, do it properly! Will prevent bad address freeing... Modified: trunk/reactos/dll/win32/kernel32/client/time.c Modified: trunk/reactos/dll/win32/kernel32/client/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/time.c [iso-8859-1] Sun May 5 16:38:41 2013 @@ -379,11 +379,15 @@ NewSystemTime.QuadPart += TimeZoneBias.QuadPart; Status = RtlAcquirePrivilege(&Privilege, 1, 0, &State); - Status = STATUS_SUCCESS; if (NT_SUCCESS(Status)) { Status = NtSetSystemTime(&NewSystemTime, NULL); RtlReleasePrivilege(State); + } + else + { + DPRINT1("Workaround RtlAcquirePrivilege failure!\n"); + Status = NtSetSystemTime(&NewSystemTime, NULL); } if (!NT_SUCCESS(Status))

11 years, 7 months

[tfaber] 58944: [HIDCLASS] - Don't return inconsistent status values from HidClass_DeviceControl

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 5 15:04:49 2013 New Revision: 58944 URL: http://svn.reactos.org/svn/reactos?rev=58944&view=rev Log: [HIDCLASS] - Don't return inconsistent status values from HidClass_DeviceControl Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/hidcl… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sun May 5 15:04:49 2013 @@ -864,7 +864,7 @@ // invalid request // DPRINT1("[HIDCLASS] DeviceControl Irp for FDO arrived\n"); - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER_1; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INVALID_PARAMETER_1; }

11 years, 7 months

[janderwald] 58943: [HID] - Fix bug in irp completion handler CORE-7069

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun May 5 14:51:27 2013 New Revision: 58943 URL: http://svn.reactos.org/svn/reactos?rev=58943&view=rev Log: [HID] - Fix bug in irp completion handler CORE-7069 Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/hidcl… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sun May 5 14:51:27 2013 @@ -458,7 +458,7 @@ // copy result status // IrpContext->OriginalIrp->IoStatus.Status = Irp->IoStatus.Status; - Irp->IoStatus.Information = Irp->IoStatus.Information; + IrpContext->OriginalIrp->IoStatus.Information = Irp->IoStatus.Information; // // free input report buffer

11 years, 7 months

[janderwald] 58942: [LIBUSB] - Remove useless debug prints, which violate the spec - Fix identation CORE-7009

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun May 5 14:43:39 2013 New Revision: 58942 URL: http://svn.reactos.org/svn/reactos?rev=58942&view=rev Log: [LIBUSB] - Remove useless debug prints, which violate the spec - Fix identation CORE-7009 Modified: trunk/reactos/lib/drivers/libusb/hcd_controller.cpp trunk/reactos/lib/drivers/libusb/hub_controller.cpp Modified: trunk/reactos/lib/drivers/libusb/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hcd_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] Sun May 5 14:43:39 2013 @@ -279,14 +279,6 @@ // it does // Status = IoGetDeviceProperty(m_PhysicalDeviceObject, DevicePropertyDriverKeyName, IoStack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(ULONG), DriverKey->DriverKeyName, &ResultLength); - - if (NT_SUCCESS(Status)) - { - // - // informal debug print - // - DPRINT1("[%s] Result %S\n", m_USBType, DriverKey->DriverKeyName); - } } // @@ -337,7 +329,6 @@ PC_ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(ULONG) - sizeof(WCHAR) >= ResultLength); DriverKey->DriverKeyName[ResultLength / sizeof(WCHAR)] = L'\0'; - DPRINT1("[%s] Result %S\n", m_USBType, DriverKey->DriverKeyName); } // Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Sun May 5 14:43:39 2013 @@ -476,8 +476,6 @@ swprintf(Buffer, L"USB\\ROOT_HUB"); } - DPRINT("Name %S\n", Buffer); - // // calculate length // @@ -549,11 +547,8 @@ Index += swprintf(&Buffer[Index], L"USB\\ROOT_HUB") + 1; } - Buffer[Index] = UNICODE_NULL; - Index++; - - - DPRINT1("[%s] Name %S\n", m_USBType, Buffer); + Buffer[Index] = UNICODE_NULL; + Index++; // // allocate buffer

11 years, 7 months

[spetreolle] 58941: [FUSION] Remove baseaddress to fix address conflicts. Reenable creation of InstallRoot .NET key in its REG_SZ form.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun May 5 13:09:46 2013 New Revision: 58941 URL: http://svn.reactos.org/svn/reactos?rev=58941&view=rev Log: [FUSION] Remove baseaddress to fix address conflicts. Reenable creation of InstallRoot .NET key in its REG_SZ form. Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/cmake/baseaddress.cmake Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun May 5 13:09:46 2013 @@ -69,9 +69,6 @@ HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","68",2,"netlogon.dll" HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","9",2,"secur32.dll" -; .NET -HKLM,"SOFTWARE\Microsoft\.NETFramework\","InstallRoot",0x00020000,"%SystemRoot%\Microsoft .NET\Framework\" - HKLM,"SOFTWARE\Microsoft\Secure",,0x00000012 ; WBem @@ -115,7 +112,7 @@ ; FIXME - usetup doesn't handle extra paths HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","",0x00000000,"cmd /c md ""%programfiles%\Internet Explorer\"" && move %windir%\iexplore.exe ""%programfiles%\Internet Explorer\"" && ""%programfiles%\Internet Explorer\iexplore.exe"" /RegServer" ; Create .NET Framework InstallRoot key, reg_sz & full path -;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","InstallRoot.NET",0x00000000,"cmd /c reg add HKLM\SOFTWARE\Microsoft\.NETFramework /v InstallRoot /t REG_SZ /d %SystemRoot%\Microsoft.NET\Framework\" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","InstallRoot.NET",0x00000000,"cmd /c reg add HKLM\SOFTWARE\Microsoft\.NETFramework /v InstallRoot /t REG_SZ /d %SystemRoot%\Microsoft.NET\Framework\" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu",,0x00000012 Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Sun May 5 13:09:46 2013 @@ -123,7 +123,8 @@ set(baseaddress_faultrep 0x744f0000) set(baseaddress_fmifs 0x744d0000) set(baseaddress_fontext 0x744a0000) -set(baseaddress_fusion 0x74470000) +#fusion has to have dynamic address +#set(baseaddress_fusion 0x74470000) set(baseaddress_getuname 0x74440000) set(baseaddress_hhctrl 0x74400000) set(baseaddress_hlink 0x743c0000)

11 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
23
24
Older →

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 May 2013