Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[pschweitzer] 74751: [KMTESTS:MM] Add tests for MmMapLockedPagesSpecifyCache() functions, and more specifically for usermode mapping. This was designed/tested under W2K3. CORE-8204

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Jun 2 19:19:32 2017 New Revision: 74751 URL: http://svn.reactos.org/svn/reactos?rev=74751&view=rev Log: [KMTESTS:MM] Add tests for MmMapLockedPagesSpecifyCache() functions, and more specifically for usermode mapping. This was designed/tested under W2K3. CORE-8204 Added: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache.h (with props) trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c (with props) trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest/testlist.c trunk/rostests/kmtests/ntos_mm/CMakeLists.txt Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Fri Jun 2 19:19:32 2017 @@ -128,6 +128,7 @@ ntos_io/IoCreateFile_user.c ntos_io/IoDeviceObject_user.c ntos_io/IoReadWrite_user.c + ntos_mm/MmMapLockedPagesSpecifyCache_user.c ntos_mm/NtCreateSection_user.c ntos_po/PoIrp_user.c tcpip/TcpIp_user.c @@ -157,6 +158,7 @@ iodeviceobject_drv iohelper_drv ioreadwrite_drv + mmmaplockedpagesspecifycache_drv ntcreatesection_drv poirp_drv tcpip_drv Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Fri Jun 2 19:19:32 2017 @@ -13,6 +13,7 @@ KMT_TESTFUNC Test_IoCreateFile; KMT_TESTFUNC Test_IoDeviceObject; KMT_TESTFUNC Test_IoReadWrite; +KMT_TESTFUNC Test_MmMapLockedPagesSpecifyCache; KMT_TESTFUNC Test_NtCreateSection; KMT_TESTFUNC Test_PoIrp; KMT_TESTFUNC Test_RtlAvlTree; @@ -30,23 +31,24 @@ /* tests with a leading '-' will not be listed */ const KMT_TEST TestList[] = { - { "CcCopyRead", Test_CcCopyRead }, - { "-Example", Test_Example }, - { "FindFile", Test_FindFile }, - { "IoCreateFile", Test_IoCreateFile }, - { "IoDeviceObject", Test_IoDeviceObject }, - { "IoReadWrite", Test_IoReadWrite }, - { "NtCreateSection", Test_NtCreateSection }, - { "PoIrp", Test_PoIrp }, - { "RtlAvlTree", Test_RtlAvlTree }, - { "RtlException", Test_RtlException }, - { "RtlIntSafe", Test_RtlIntSafe }, - { "RtlMemory", Test_RtlMemory }, - { "RtlRegistry", Test_RtlRegistry }, - { "RtlSplayTree", Test_RtlSplayTree }, - { "RtlStack", Test_RtlStack }, - { "RtlUnicodeString", Test_RtlUnicodeString }, - { "TcpIpTdi", Test_TcpIpTdi }, - { "TcpIpConnect", Test_TcpIpConnect }, - { NULL, NULL }, + { "CcCopyRead", Test_CcCopyRead }, + { "-Example", Test_Example }, + { "FindFile", Test_FindFile }, + { "IoCreateFile", Test_IoCreateFile }, + { "IoDeviceObject", Test_IoDeviceObject }, + { "IoReadWrite", Test_IoReadWrite }, + { "MmMapLockedPagesSpecifyCache", Test_MmMapLockedPagesSpecifyCache }, + { "NtCreateSection", Test_NtCreateSection }, + { "PoIrp", Test_PoIrp }, + { "RtlAvlTree", Test_RtlAvlTree }, + { "RtlException", Test_RtlException }, + { "RtlIntSafe", Test_RtlIntSafe }, + { "RtlMemory", Test_RtlMemory }, + { "RtlRegistry", Test_RtlRegistry }, + { "RtlSplayTree", Test_RtlSplayTree }, + { "RtlStack", Test_RtlStack }, + { "RtlUnicodeString", Test_RtlUnicodeString }, + { "TcpIpTdi", Test_TcpIpTdi }, + { "TcpIpConnect", Test_TcpIpConnect }, + { NULL, NULL }, }; Modified: trunk/rostests/kmtests/ntos_mm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/CMakeList… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/CMakeLists.txt [iso-8859-1] Fri Jun 2 19:19:32 2017 @@ -15,3 +15,18 @@ add_target_compile_definitions(ntcreatesection_drv KMT_STANDALONE_DRIVER) #add_pch(ntcreatesection_drv ../include/kmt_test.h) add_rostests_file(TARGET ntcreatesection_drv) + +# +# MmMapLockedPagesSpecifyCache +# +list(APPEND MMMAPLOCKEDPAGESSPECIFYCACHE_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + MmMapLockedPagesSpecifyCache_drv.c) + +add_library(mmmaplockedpagesspecifycache_drv SHARED ${MMMAPLOCKEDPAGESSPECIFYCACHE_DRV_SOURCE}) +set_module_type(mmmaplockedpagesspecifycache_drv kernelmodedriver) +target_link_libraries(mmmaplockedpagesspecifycache_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(mmmaplockedpagesspecifycache_drv ntoskrnl hal) +add_target_compile_definitions(mmmaplockedpagesspecifycache_drv KMT_STANDALONE_DRIVER) +#add_pch(mmmaplockedpagesspecifycache_drv ../include/kmt_test.h) +add_rostests_file(TARGET mmmaplockedpagesspecifycache_drv) Added: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMapLock… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache.h (added) +++ trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache.h [iso-8859-1] Fri Jun 2 19:19:32 2017 @@ -0,0 +1,29 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite MmMapLockedPagesSpecifyCache test declarations + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + + +#ifndef _KMTEST_MMMAPLOCKEDPAGESSPECIFYCACHE_H_ +#define _KMTEST_MMMAPLOCKEDPAGESSPECIFYCACHE_H_ + +typedef struct _QUERY_BUFFER +{ + USHORT Length; + PVOID Buffer; + BOOLEAN Cached; +} QUERY_BUFFER, *PQUERY_BUFFER; + +typedef struct _READ_BUFFER +{ + USHORT Length; + PVOID Buffer; + USHORT Pattern; +} READ_BUFFER, *PREAD_BUFFER; + +#define IOCTL_QUERY_BUFFER 1 +#define IOCTL_READ_BUFFER 2 + +#endif /* !defined _KMTEST_MMMAPLOCKEDPAGESSPECIFYCACHE_H_ */ Propchange: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMapLock… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c (added) +++ trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c [iso-8859-1] Fri Jun 2 19:19:32 2017 @@ -0,0 +1,261 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test driver for MmMapLockedPagesSpecifyCache function + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +#include "MmMapLockedPagesSpecifyCache.h" + +static KMT_IRP_HANDLER TestIrpHandler; +static KMT_MESSAGE_HANDLER TestMessageHandler; + +static PVOID CurrentBuffer; +static PMDL CurrentMdl; +static PVOID CurrentUser; + +NTSTATUS +TestEntry( + IN PDRIVER_OBJECT DriverObject, + IN PCUNICODE_STRING RegistryPath, + OUT PCWSTR *DeviceName, + IN OUT INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + UNREFERENCED_PARAMETER(Flags); + + *DeviceName = L"MmMapLockedPagesSpecifyCache"; + + KmtRegisterIrpHandler(IRP_MJ_CLEANUP, NULL, TestIrpHandler); + KmtRegisterMessageHandler(0, NULL, TestMessageHandler); + + return Status; +} + +VOID +TestUnload( + IN PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); +} + +VOID +TestCleanEverything(VOID) +{ + NTSTATUS SehStatus; + + if (CurrentMdl == NULL) + { + return; + } + + if (CurrentUser != NULL) + { + SehStatus = STATUS_SUCCESS; + _SEH2_TRY + { + MmUnmapLockedPages(CurrentUser, CurrentMdl); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SehStatus = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_eq_hex(SehStatus, STATUS_SUCCESS); + CurrentUser = NULL; + } + + SehStatus = STATUS_SUCCESS; + _SEH2_TRY + { + MmUnlockPages(CurrentMdl); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SehStatus = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_eq_hex(SehStatus, STATUS_SUCCESS); + IoFreeMdl(CurrentMdl); + ExFreePoolWithTag(CurrentBuffer, 'MLPC'); + CurrentMdl = NULL; +} + +static +NTSTATUS +TestMessageHandler( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG ControlCode, + IN PVOID Buffer OPTIONAL, + IN SIZE_T InLength, + IN OUT PSIZE_T OutLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS SehStatus; + + switch (ControlCode) + { + case IOCTL_QUERY_BUFFER: + { + ok(Buffer != NULL, "Buffer is NULL\n"); + ok_eq_size(InLength, sizeof(QUERY_BUFFER)); + ok_eq_size(*OutLength, sizeof(QUERY_BUFFER)); + ok_eq_pointer(CurrentMdl, NULL); + ok(ExGetPreviousMode() == UserMode, "Not comming from umode!\n"); + if (!skip(Buffer && InLength >= sizeof(QUERY_BUFFER) && *OutLength >= sizeof(QUERY_BUFFER), "Cannot read/write from/to buffer!\n")) + { + PQUERY_BUFFER QueryBuffer; + USHORT Length; + MEMORY_CACHING_TYPE CacheType; + + QueryBuffer = Buffer; + CacheType = (QueryBuffer->Cached ? MmCached : MmNonCached); + Length = QueryBuffer->Length; + ok(Length > 0, "Null size!\n"); + + CurrentBuffer = ExAllocatePoolWithTag(NonPagedPool, Length + 0x8, 'MLPC'); + ok(CurrentBuffer != NULL, "ExAllocatePool failed!\n"); + CurrentUser = NULL; + if (!skip(CurrentBuffer != NULL, "ExAllocatePool failed!\n")) + { + CurrentMdl = IoAllocateMdl(CurrentBuffer, Length, FALSE, FALSE, NULL); + ok(CurrentMdl != NULL, "IoAllocateMdl failed!\n"); + if (CurrentMdl) + { + KIRQL Irql; + + SehStatus = STATUS_SUCCESS; + _SEH2_TRY + { + MmProbeAndLockPages(CurrentMdl, KernelMode, IoWriteAccess); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SehStatus = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_eq_hex(SehStatus, STATUS_SUCCESS); + + Irql = KeGetCurrentIrql(); + ok(Irql <= APC_LEVEL, "IRQL > APC_LEVEL: %d\n", Irql); + + SehStatus = STATUS_SUCCESS; + _SEH2_TRY + { + CurrentUser = MmMapLockedPagesSpecifyCache(CurrentMdl, UserMode, CacheType, NULL, FALSE, NormalPagePriority); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SehStatus = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (QueryBuffer->Cached) + { + ok_eq_hex(SehStatus, STATUS_SUCCESS); + ok(CurrentUser != NULL, "MmMapLockedPagesSpecifyCache failed!\n"); + } + else + { + ok_eq_hex(SehStatus, STATUS_INVALID_ADDRESS); + ok_eq_pointer(CurrentUser, NULL); + } + } + } + QueryBuffer->Buffer = CurrentUser; + + *OutLength = sizeof(QUERY_BUFFER); + } + + break; + } + case IOCTL_READ_BUFFER: + { + ok(Buffer != NULL, "Buffer is NULL\n"); + ok_eq_size(InLength, sizeof(READ_BUFFER)); + ok_eq_size(*OutLength, 0); + ok(CurrentMdl != NULL, "MDL is not in use!\n"); + + if (!skip(Buffer && InLength >= sizeof(QUERY_BUFFER), "Cannot read from buffer!\n")) + { + PREAD_BUFFER ReadBuffer; + + ReadBuffer = Buffer; + if (!skip(ReadBuffer && ReadBuffer->Buffer == CurrentUser, "Cannot find matching MDL\n")) + { + if (ReadBuffer->Buffer != NULL) + { + USHORT i; + PUSHORT KBuffer = MmGetSystemAddressForMdlSafe(CurrentMdl, NormalPagePriority); + ok(KBuffer != NULL, "Failed to get kmode ptr\n"); + + if (!skip(Buffer != NULL, "Failed to get kmode ptr\n")) + { + for (i = 0; i < ReadBuffer->Length / sizeof(USHORT); ++i) + { + ok_eq_ulong((ULONG)KBuffer[i], (ULONG)ReadBuffer->Pattern); + } + } + } + } + + TestCleanEverything(); + } + + break; + } + default: + ok(0, "Got an unknown message! DeviceObject=%p, ControlCode=%lu, Buffer=%p, In=%lu, Out=%lu bytes\n", + DeviceObject, ControlCode, Buffer, InLength, *OutLength); + break; + } + + return Status; +} + +static +NTSTATUS +TestIrpHandler( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PIO_STACK_LOCATION IoStack) +{ + NTSTATUS Status; + + PAGED_CODE(); + + DPRINT("IRP %x/%x\n", IoStack->MajorFunction, IoStack->MinorFunction); + ASSERT(IoStack->MajorFunction == IRP_MJ_CLEANUP); + + Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + + if (IoStack->MajorFunction == IRP_MJ_CLEANUP) + { + TestCleanEverything(); + Status = STATUS_SUCCESS; + } + + if (Status == STATUS_PENDING) + { + IoMarkIrpPending(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + Status = STATUS_PENDING; + } + else + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; +} Propchange: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMapLock… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c (added) +++ trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c [iso-8859-1] Fri Jun 2 19:19:32 2017 @@ -0,0 +1,60 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite MmMapLockedPagesSpecifyCache test user-mode part + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +#include "MmMapLockedPagesSpecifyCache.h" + +START_TEST(MmMapLockedPagesSpecifyCache) +{ + QUERY_BUFFER QueryBuffer; + READ_BUFFER ReadBuffer; + DWORD Length; + USHORT i; + PUSHORT Buffer; + + KmtLoadDriver(L"MmMapLockedPagesSpecifyCache", FALSE); + KmtOpenDriver(); + + QueryBuffer.Length = 0x100; + QueryBuffer.Buffer = NULL; + QueryBuffer.Cached = FALSE; + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, 0x100); + ok_eq_pointer(QueryBuffer.Buffer, NULL); + + ReadBuffer.Buffer = QueryBuffer.Buffer; + Length = 0; + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + QueryBuffer.Length = 0x100; + QueryBuffer.Buffer = NULL; + QueryBuffer.Cached = TRUE; + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, 0x100); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + + ReadBuffer.Buffer = QueryBuffer.Buffer; + if (!skip(QueryBuffer.Buffer != NULL, "Buffer is NULL\n")) + { + ReadBuffer.Pattern = 0xA7; + ReadBuffer.Length = QueryBuffer.Length; + Buffer = QueryBuffer.Buffer; + for (i = 0; i < ReadBuffer.Length / sizeof(USHORT); ++i) + { + Buffer[i] = ReadBuffer.Pattern; + } + } + + Length = 0; + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + KmtCloseDriver(); + KmtUnloadDriver(); +} Propchange: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c ------------------------------------------------------------------------------ svn:eol-style = native

7 years, 6 months

[phater] 74750: [MSWSOCK] Call explicitly DnsQuery_W. Copy host aliases if available as answer from the query

by phater＠svn.reactos.org

Author: phater Date: Fri Jun 2 17:52:20 2017 New Revision: 74750 URL: http://svn.reactos.org/svn/reactos?rev=74750&view=rev Log: [MSWSOCK] Call explicitly DnsQuery_W. Copy host aliases if available as answer from the query Modified: trunk/reactos/dll/win32/mswsock/mswhelper.c trunk/reactos/dll/win32/mswsock/mswhelper.h trunk/reactos/dll/win32/mswsock/nsplookup.c Modified: trunk/reactos/dll/win32/mswsock/mswhelper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswhelpe… ============================================================================== --- trunk/reactos/dll/win32/mswsock/mswhelper.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/mswhelper.c [iso-8859-1] Fri Jun 2 17:52:20 2017 @@ -423,7 +423,7 @@ return NULL; } - ret = MultiByteToWideChar(1252, + ret = MultiByteToWideChar(CP_ACP, 0, aStr, aStrByteLen, @@ -464,7 +464,7 @@ return NULL; } - ret = WideCharToMultiByte(1252, + ret = WideCharToMultiByte(CP_ACP, 0, wStr, charLen, @@ -553,7 +553,7 @@ if (aCount >= MAX_ARRAY_SIZE) return NULL; - bItmLen = (strlen(*aSrcPtr) + 1) * sizeof(char); + bItmLen = strlen(*aSrcPtr) + 1; aStrByteLen[aCount] = bItmLen; bLen += sizeof(*aSrcPtr) + bItmLen; @@ -591,3 +591,93 @@ return resA; } + +char** +StrAryCpyHeapAllocWToA(_In_opt_ HANDLE hHeap, + _In_ WCHAR** wStrAry) +{ + WCHAR** wSrcPtr; + char** aDstPtr; + char* aDstNextStr; + DWORD aStrByteLen[MAX_ARRAY_SIZE]; + int bLen; + int bItmLen; + int aCount; + int i1; + char** resA; + int ret; + char* aStr; + + if (hHeap == 0) + hHeap = GetProcessHeap(); + + /* Calculating size of array ... */ + wSrcPtr = wStrAry; + bLen = 0; + aCount = 0; + + while (*wSrcPtr != NULL) + { + if (aCount >= MAX_ARRAY_SIZE) + return NULL; + + bItmLen = wcslen(*wSrcPtr) + 1; + aStrByteLen[aCount] = bItmLen; + + bLen += sizeof(*wSrcPtr) + bItmLen; + + wSrcPtr++; + aCount++; + } + + /* size for NULL-terminator */ + bLen += sizeof(*wSrcPtr); + + /* get memory */ + resA = HeapAlloc(hHeap, 0, bLen); + + /* copy data */ + wSrcPtr = wStrAry; + aDstPtr = resA; + + /* pos for the first string */ + aDstNextStr = (char*)(resA + aCount + 1); + for (i1 = 0; i1 < aCount; i1++) + { + bItmLen = aStrByteLen[i1]; + + *aDstPtr = aDstNextStr; + + aStr = HeapAlloc(hHeap, 0, bItmLen); + if (aStr == NULL) + { + HeapFree(hHeap, 0, aStr); + return NULL; + } + + ret = WideCharToMultiByte(CP_ACP, + 0, + *wSrcPtr, + bItmLen, + aStr, + bItmLen, + NULL, + NULL); + if (ret != bItmLen) + { + HeapFree(hHeap, 0, aStr); + return NULL; + } + RtlCopyMemory(*aDstPtr, aStr, bItmLen); + HeapFree(hHeap, 0, aStr); + + aDstNextStr = (char*)((DWORD)aDstNextStr + (DWORD)bItmLen); + aDstPtr++; + wSrcPtr++; + } + + /* terminate with NULL */ + *aDstPtr = NULL; + + return resA; +} Modified: trunk/reactos/dll/win32/mswsock/mswhelper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswhelpe… ============================================================================== --- trunk/reactos/dll/win32/mswsock/mswhelper.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/mswhelper.h [iso-8859-1] Fri Jun 2 17:52:20 2017 @@ -117,4 +117,13 @@ _In_opt_ HANDLE hHeap, _In_ char** aStrAry); +/* strary: + ptr1 ... ptrn \0 + data1 ... datan +*/ +char** +StrAryCpyHeapAllocWToA( + _In_opt_ HANDLE hHeap, + _In_ WCHAR** aStrAry); + #endif // _MSWHELPER_H Modified: trunk/reactos/dll/win32/mswsock/nsplookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/nsplooku… ============================================================================== --- trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] Fri Jun 2 17:52:20 2017 @@ -469,12 +469,14 @@ _Out_ PWSHOSTINFOINTERN hostinfo) { HANDLE hHeap = GetProcessHeap(); - DNS_STATUS dns_status = {0}; + DNS_STATUS dns_status = { 0 }; /* include/WinDNS.h -- look up DNS_RECORD on MSDN */ - PDNS_RECORD dp; - PDNS_RECORD curr; + PDNS_RECORDW dp; + PDNS_RECORDW curr; INT result = ERROR_SUCCESS; DWORD dwQueryFlags = DNS_QUERY_STANDARD; + PWCHAR Aliases[WS2_INTERNAL_MAX_ALIAS] = { 0 }; + int AliasIndex = 0; /* needed to be cleaned up if != NULL */ dp = NULL; @@ -492,13 +494,12 @@ /* DNS_TYPE_A: include/WinDNS.h */ /* DnsQuery -- lib/dnsapi/dnsapi/query.c */ - dns_status = DnsQuery(data->hostnameW, - DNS_TYPE_A, - dwQueryFlags, - /* extra dns servers */ 0, - &dp, - 0); - + dns_status = DnsQuery_W(data->hostnameW, + DNS_TYPE_A, + dwQueryFlags, + NULL /* extra dns servers */, + &dp, + NULL); if (dns_status == ERROR_INVALID_NAME) { WSASetLastError(WSAEFAULT); @@ -517,7 +518,10 @@ curr = dp; while ((curr->pNext != NULL) || (curr->wType != DNS_TYPE_A)) { - /* FIXME build aliases list */ + if (curr->wType == DNS_TYPE_CNAME) + { + Aliases[AliasIndex++] = curr->Data.Cname.pNameHost; + } curr = curr->pNext; } @@ -526,10 +530,12 @@ result = WSASERVICE_NOT_FOUND; goto cleanup; } - hostinfo->hostnameW = StrCpyHeapAllocW(hHeap, curr->pName); hostinfo->addr4 = curr->Data.A.IpAddress; - /* FIXME attach built aliases list */ + if (AliasIndex) + { + hostinfo->servaliasesA = StrAryCpyHeapAllocWToA(hHeap, (WCHAR**)&Aliases); + } result = ERROR_SUCCESS; cleanup:

7 years, 6 months

[hbelusca] 74749: [CMAKE]: Make the mkhive commands actually depend on the generated UTF16 INF files since the latter are those actually used as input to mkhive. Otherwise, the mkhive calls & the U...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 2 16:22:45 2017 New Revision: 74749 URL: http://svn.reactos.org/svn/reactos?rev=74749&view=rev Log: [CMAKE]: Make the mkhive commands actually depend on the generated UTF16 INF files since the latter are those actually used as input to mkhive. Otherwise, the mkhive calls & the UTF16 INF file conversion is not serialized and we can generate "corrupted" hives due to the fact that mkhive is using INF files that are in the process of being (and therefore, only partially) generated. Modified: branches/setup_improvements/sdk/cmake/CMakeMacros.cmake Modified: branches/setup_improvements/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/cmake/CM… ============================================================================== --- branches/setup_improvements/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/setup_improvements/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Fri Jun 2 16:22:45 2017 @@ -766,7 +766,7 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV COMMAND native-mkhive -h:SETUPREG -d:${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf - DEPENDS native-mkhive ${CMAKE_SOURCE_DIR}/boot/bootdata/hivesys.inf) + DEPENDS native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf) add_custom_target(bootcd_hives DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV) @@ -814,7 +814,7 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/BCD COMMAND native-mkhive -h:BCD -d:${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf - DEPENDS native-mkhive ${CMAKE_SOURCE_DIR}/boot/bootdata/hivebcd.inf) + DEPENDS native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf) add_custom_target(bcd_hive DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/BCD)

7 years, 6 months

[hbelusca] 74748: [NTOS]: Add some dprints in IopLoadServiceModule() and IopOpenRegistryKeyEx() to investigate why these 1st-stage text-mode hacks may, or are (respectively) still needed.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 2 15:49:12 2017 New Revision: 74748 URL: http://svn.reactos.org/svn/reactos?rev=74748&view=rev Log: [NTOS]: Add some dprints in IopLoadServiceModule() and IopOpenRegistryKeyEx() to investigate why these 1st-stage text-mode hacks may, or are (respectively) still needed. Modified: branches/setup_improvements/ntoskrnl/io/iomgr/driver.c Modified: branches/setup_improvements/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/io/… ============================================================================== --- branches/setup_improvements/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ branches/setup_improvements/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Fri Jun 2 15:49:12 2017 @@ -322,6 +322,7 @@ if (ExpInTextModeSetup) { /* We have no registry, but luckily we know where all the drivers are */ + DPRINT1("IopLoadServiceModule(%wZ, 0x%p) called in ExpInTextModeSetup mode...\n", ServiceName, ModuleObject); /* ServiceStart < 4 is all that matters */ ServiceStart = 0; @@ -1127,8 +1128,13 @@ NULL, &BootEntry->RegistryPath, KEY_READ); + DPRINT1("IopOpenRegistryKeyEx(%wZ) returned 0x%08lx\n", &BootEntry->RegistryPath, Status); +#if 0 + if (NT_SUCCESS(Status)) +#else // Hack still needed... if ((NT_SUCCESS(Status)) || /* ReactOS HACK for SETUPLDR */ ((KeLoaderBlock->SetupLdrBlock) && ((KeyHandle = (PVOID)1)))) // yes, it's an assignment! +#endif { /* Save the handle */ DriverInfo->ServiceHandle = KeyHandle; @@ -1205,7 +1211,7 @@ PUNICODE_STRING *DriverList, *SavedList; /* No system drivers on the boot cd */ - if (KeLoaderBlock->SetupLdrBlock) return; + if (KeLoaderBlock->SetupLdrBlock) return; // ExpInTextModeSetup /* Get the driver list */ SavedList = DriverList = CmGetSystemDriverList();

7 years, 6 months

[hbelusca] 74747: [NTOS]: Cm fixes: - Rework CmpSetSystemValues() and remove its 1st-stage text-mode setup hack, since I'm going to have a real hive for the 1st-stage either. - Lock, then unlock th...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 2 15:47:52 2017 New Revision: 74747 URL: http://svn.reactos.org/svn/reactos?rev=74747&view=rev Log: [NTOS]: Cm fixes: - Rework CmpSetSystemValues() and remove its 1st-stage text-mode setup hack, since I'm going to have a real hive for the 1st-stage either. - Lock, then unlock the registry in NtInitializeRegistry when initializing the hives & flusher. - Call CmpInitializeHiveList() (i.e., initialize the other hives like \Software, \User, \.Default) only when we are not in setup-mode. Modified: branches/setup_improvements/ntoskrnl/config/cmlazy.c branches/setup_improvements/ntoskrnl/config/cmsysini.c branches/setup_improvements/ntoskrnl/config/ntapi.c branches/setup_improvements/ntoskrnl/ex/init.c branches/setup_improvements/ntoskrnl/include/internal/cm.h Modified: branches/setup_improvements/ntoskrnl/config/cmlazy.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… ============================================================================== --- branches/setup_improvements/ntoskrnl/config/cmlazy.c [iso-8859-1] (original) +++ branches/setup_improvements/ntoskrnl/config/cmlazy.c [iso-8859-1] Fri Jun 2 15:47:52 2017 @@ -262,8 +262,9 @@ /* Testing: Force Lazy Flushing */ CmpHoldLazyFlush = FALSE; - /* Setup the hive list */ - CmpInitializeHiveList(SetupBoot); + /* Setup the hive list if this is not a Setup boot*/ + if (!SetupBoot) + CmpInitializeHiveList(); } NTSTATUS Modified: branches/setup_improvements/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… ============================================================================== --- branches/setup_improvements/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ branches/setup_improvements/ntoskrnl/config/cmsysini.c [iso-8859-1] Fri Jun 2 15:47:52 2017 @@ -394,10 +394,11 @@ INIT_FUNCTION CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE KeyHandle; UNICODE_STRING KeyName, ValueName = { 0, 0, NULL }; - HANDLE KeyHandle = NULL; - NTSTATUS Status; + ASSERT(LoaderBlock != NULL); /* Setup attributes for loader options */ @@ -410,9 +411,10 @@ NULL, NULL); Status = NtOpenKey(&KeyHandle, KEY_WRITE, &ObjectAttributes); - if (!NT_SUCCESS(Status)) goto Quickie; - - /* Key opened, now write to the key */ + if (!NT_SUCCESS(Status)) + return Status; + + /* Setup the value for the system start options */ RtlInitUnicodeString(&KeyName, L"SystemStartOptions"); Status = NtSetValueKey(KeyHandle, &KeyName, @@ -420,9 +422,10 @@ REG_SZ, CmpLoadOptions.Buffer, CmpLoadOptions.Length); - if (!NT_SUCCESS(Status)) goto Quickie; - - /* Setup value name for system boot device in ARC format */ + if (!NT_SUCCESS(Status)) + goto Quit; + + /* Setup the value for the system boot device in ARC format */ RtlInitUnicodeString(&KeyName, L"SystemBootDevice"); RtlCreateUnicodeStringFromAsciiz(&ValueName, LoaderBlock->ArcBootDeviceName); Status = NtSetValueKey(KeyHandle, @@ -432,15 +435,13 @@ ValueName.Buffer, ValueName.Length); -Quickie: - /* Free the buffers */ + /* Free the temporary string */ RtlFreeUnicodeString(&ValueName); +Quit: /* Close the key and return */ - if (KeyHandle) NtClose(KeyHandle); - - /* Return the status */ - return (ExpInTextModeSetup ? STATUS_SUCCESS : Status); + NtClose(KeyHandle); + return Status; } static @@ -1413,7 +1414,7 @@ VOID NTAPI -CmpInitializeHiveList(IN USHORT Flag) +CmpInitializeHiveList(VOID) { WCHAR FileBuffer[MAX_PATH], RegBuffer[MAX_PATH], ConfigPath[MAX_PATH]; UNICODE_STRING TempName, FileName, RegName; Modified: branches/setup_improvements/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… ============================================================================== --- branches/setup_improvements/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ branches/setup_improvements/ntoskrnl/config/ntapi.c [iso-8859-1] Fri Jun 2 15:47:52 2017 @@ -950,7 +950,8 @@ PAGED_CODE(); /* Always do this as kernel mode */ - if (KeGetPreviousMode() == UserMode) return ZwInitializeRegistry(Flag); + if (KeGetPreviousMode() == UserMode) + return ZwInitializeRegistry(Flag); /* Enough of the system has booted by now */ Ki386PerfEnd(); @@ -992,8 +993,8 @@ if (!CmFirstTime) return STATUS_ACCESS_DENIED; CmFirstTime = FALSE; - /* Acquire registry lock */ - //CmpLockRegistryExclusive(); + /* Lock the registry exclusively */ + CmpLockRegistryExclusive(); /* Initialize the hives and lazy flusher */ CmpCmdInit(SetupBoot); @@ -1002,7 +1003,7 @@ CmpSetVersionData(); /* Release the registry lock */ - //CmpUnlockRegistry(); + CmpUnlockRegistry(); return STATUS_SUCCESS; } Modified: branches/setup_improvements/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/ex/… ============================================================================== --- branches/setup_improvements/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ branches/setup_improvements/ntoskrnl/ex/init.c [iso-8859-1] Fri Jun 2 15:47:52 2017 @@ -963,7 +963,8 @@ if (LoaderBlock->SetupLdrBlock) { /* Check if this is text-mode setup */ - if (LoaderBlock->SetupLdrBlock->Flags & SETUPLDR_TEXT_MODE) ExpInTextModeSetup = TRUE; + if (LoaderBlock->SetupLdrBlock->Flags & SETUPLDR_TEXT_MODE) + ExpInTextModeSetup = TRUE; /* Check if this is network boot */ if (LoaderBlock->SetupLdrBlock->Flags & SETUPLDR_REMOTE_BOOT) Modified: branches/setup_improvements/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/inc… ============================================================================== --- branches/setup_improvements/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ branches/setup_improvements/ntoskrnl/include/internal/cm.h [iso-8859-1] Fri Jun 2 15:47:52 2017 @@ -859,7 +859,7 @@ VOID NTAPI CmpInitializeHiveList( - IN USHORT Flag + VOID ); //

7 years, 6 months

[hbelusca] 74746: [NTOS]: Remove other 1st-stage setup hacks that I don't need anymore.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 2 15:42:41 2017 New Revision: 74746 URL: http://svn.reactos.org/svn/reactos?rev=74746&view=rev Log: [NTOS]: Remove other 1st-stage setup hacks that I don't need anymore. Modified: branches/setup_improvements/ntoskrnl/config/i386/cmhardwr.c branches/setup_improvements/ntoskrnl/config/powerpc/cmhardwr.c Modified: branches/setup_improvements/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… ============================================================================== --- branches/setup_improvements/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ branches/setup_improvements/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Fri Jun 2 15:42:41 2017 @@ -401,12 +401,7 @@ NULL, REG_OPTION_NON_VOLATILE, &Disposition); - if (ExpInTextModeSetup) - { - if (!NT_SUCCESS(Status)) - BiosHandle = NULL; - } - else if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { NtClose(SystemHandle); return Status; Modified: branches/setup_improvements/ntoskrnl/config/powerpc/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… ============================================================================== --- branches/setup_improvements/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] (original) +++ branches/setup_improvements/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] Fri Jun 2 15:42:41 2017 @@ -306,12 +306,7 @@ NULL, REG_OPTION_NON_VOLATILE, &Disposition); - if (ExpInTextModeSetup) - { - if (!NT_SUCCESS(Status)) - BiosHandle = NULL; - } - else if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { NtClose(SystemHandle); return Status;

7 years, 6 months

[hbelusca] 74745: [NTOS]: Remove some hacks that I don't need anymore in the branch (since I'll also use for 1st-stage a real registry hive). This reverts r53255 and r53694, and a hack from r46690.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 2 15:37:56 2017 New Revision: 74745 URL: http://svn.reactos.org/svn/reactos?rev=74745&view=rev Log: [NTOS]: Remove some hacks that I don't need anymore in the branch (since I'll also use for 1st-stage a real registry hive). This reverts r53255 and r53694, and a hack from r46690. Modified: branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpinit.c branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpmgr.c branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpreport.c Modified: branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/io/… ============================================================================== --- branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] (original) +++ branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] Fri Jun 2 15:37:56 2017 @@ -55,17 +55,6 @@ UNICODE_STRING GroupString = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet" L"\\Control\\ServiceGroupOrder"); - - /* ReactOS HACK for SETUPLDR */ - if (KeLoaderBlock->SetupLdrBlock) - { - DPRINT1("WARNING!! In PiInitCacheGroupInformation, using ReactOS HACK for SETUPLDR!!\n"); - - /* Bogus data */ - PiInitGroupOrderTableCount = 0; - PiInitGroupOrderTable = (PVOID)0xBABEB00B; - return STATUS_SUCCESS; - } /* Open the registry key */ Status = IopOpenRegistryKeyEx(&KeyHandle, Modified: branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/io/… ============================================================================== --- branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Fri Jun 2 15:37:56 2017 @@ -23,7 +23,6 @@ extern ERESOURCE IopDriverLoadResource; extern ULONG ExpInitializationPhase; -extern BOOLEAN ExpInTextModeSetup; extern BOOLEAN PnpSystemInit; /* DATA **********************************************************************/ @@ -94,7 +93,7 @@ PWCHAR IdBuffer, OriginalIdBuffer; /* Open the device instance key */ - Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey); + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, REG_OPTION_NON_VOLATILE, &InstanceKey); if (Status != STATUS_SUCCESS) return; @@ -796,7 +795,7 @@ IopStartAndEnumerateDevice(DeviceNode); /* FIX: Should be done in new device instance code */ - Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceHandle); + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, REG_OPTION_NON_VOLATILE, &InstanceHandle); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -808,7 +807,13 @@ OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, InstanceHandle, NULL); - Status = ZwCreateKey(&ControlHandle, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); + Status = ZwCreateKey(&ControlHandle, + KEY_SET_VALUE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -869,7 +874,7 @@ else DeviceNode->UserFlags &= ~DNUF_DONT_SHOW_IN_UI; - Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey); + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, REG_OPTION_NON_VOLATILE, &InstanceKey); if (NT_SUCCESS(Status)) { /* Set 'Capabilities' value */ @@ -1447,10 +1452,6 @@ /* Assume failure */ *Handle = NULL; - /* Create a volatile device tree in 1st stage so we have a clean slate - * for enumeration using the correct HAL (chosen in 1st stage setup) */ - if (ExpInTextModeSetup) CreateOptions |= REG_OPTION_VOLATILE; - /* Open root key for device instances */ Status = IopOpenRegistryKeyEx(&hParent, NULL, &EnumU, KEY_CREATE_SUB_KEY); if (!NT_SUCCESS(Status)) @@ -1545,6 +1546,8 @@ &ObjectAttributes, 0, NULL, + // FIXME? In r53694 it was silently turned from non-volatile into this, + // without any extra warning. Is this still needed?? REG_OPTION_VOLATILE, NULL); if (NT_SUCCESS(Status)) @@ -1608,8 +1611,13 @@ OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, InstanceKey, NULL); - Status = ZwCreateKey(&ControlHandle, 0, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); - + Status = ZwCreateKey(&ControlHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); if (NT_SUCCESS(Status)) ZwClose(ControlHandle); @@ -2127,7 +2135,7 @@ /* * Create registry key for the instance id, if it doesn't exist yet */ - Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey); + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, REG_OPTION_NON_VOLATILE, &InstanceKey); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create the instance key! (Status %lx)\n", Status); @@ -3112,7 +3120,7 @@ &ObjectAttributes, 0, NULL, - ExpInTextModeSetup ? REG_OPTION_VOLATILE : 0, + REG_OPTION_NON_VOLATILE, NULL); if (!NT_SUCCESS(Status)) { @@ -3128,7 +3136,7 @@ &ObjectAttributes, 0, NULL, - ExpInTextModeSetup ? REG_OPTION_VOLATILE : 0, + REG_OPTION_NON_VOLATILE, NULL); ZwClose(hLevel1Key); if (!NT_SUCCESS(Status)) @@ -3306,7 +3314,7 @@ NTSTATUS Status; InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwCreateKey(&hEnum, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); + Status = ZwCreateKey(&hEnum, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, REG_OPTION_NON_VOLATILE, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("ZwCreateKey() failed with status 0x%08lx\n", Status); @@ -3314,7 +3322,7 @@ } InitializeObjectAttributes(&ObjectAttributes, &RootPathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hEnum, NULL); - Status = ZwCreateKey(&hRoot, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); + Status = ZwCreateKey(&hRoot, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, REG_OPTION_NON_VOLATILE, NULL); ZwClose(hEnum); if (!NT_SUCCESS(Status)) { @@ -4382,8 +4390,13 @@ OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, *DevInstRegKey, NULL); - Status = ZwCreateKey(DevInstRegKey, DesiredAccess, &ObjectAttributes, - 0, NULL, ExpInTextModeSetup ? REG_OPTION_VOLATILE : 0, NULL); + Status = ZwCreateKey(DevInstRegKey, + DesiredAccess, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + NULL); ZwClose(ObjectAttributes.RootDirectory); return Status; Modified: branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/io/… ============================================================================== --- branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Fri Jun 2 15:37:56 2017 @@ -252,8 +252,7 @@ IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); /* Open a handle to the instance path key */ - /* REG_OPTION_VOLATILE is a HACK!!! */ - Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, REG_OPTION_VOLATILE, &InstanceKey); + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, REG_OPTION_NON_VOLATILE, &InstanceKey); if (!NT_SUCCESS(Status)) return Status;

7 years, 6 months

[hbelusca] 74744: Sync with trunk r74743.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 2 15:16:39 2017 New Revision: 74744 URL: http://svn.reactos.org/svn/reactos?rev=74744&view=rev Log: Sync with trunk r74743. Added: branches/setup_improvements/dll/appcompat/apphelp/shimeng.c - copied unchanged from r74743, trunk/reactos/dll/appcompat/apphelp/shimeng.c branches/setup_improvements/dll/appcompat/shims/genral/ignoredbgout.c - copied unchanged from r74743, trunk/reactos/dll/appcompat/shims/genral/ignoredbgout.c branches/setup_improvements/dll/win32/fltlib/fltlib.h - copied unchanged from r74743, trunk/reactos/dll/win32/fltlib/fltlib.h branches/setup_improvements/dll/win32/fltlib/message.c - copied unchanged from r74743, trunk/reactos/dll/win32/fltlib/message.c branches/setup_improvements/dll/win32/kernel32_vista/sync.c - copied unchanged from r74743, trunk/reactos/dll/win32/kernel32_vista/sync.c branches/setup_improvements/dll/win32/ntdll_vista/ - copied from r74743, trunk/reactos/dll/win32/ntdll_vista/ branches/setup_improvements/dll/win32/ufatx/ufatx.c - copied unchanged from r74743, trunk/reactos/dll/win32/ufatx/ufatx.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dspkginit.c - copied unchanged from r74743, trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dspkginit.c branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utresdecode.c - copied unchanged from r74743, trunk/reactos/drivers/bus/acpi/acpica/utilities/utresdecode.c branches/setup_improvements/drivers/filesystems/mup/dfs.c - copied unchanged from r74743, trunk/reactos/drivers/filesystems/mup/dfs.c branches/setup_improvements/drivers/filesystems/mup/dfs.h - copied unchanged from r74743, trunk/reactos/drivers/filesystems/mup/dfs.h branches/setup_improvements/drivers/filters/fltmgr/Messaging.c - copied unchanged from r74743, trunk/reactos/drivers/filters/fltmgr/Messaging.c branches/setup_improvements/drivers/filters/fltmgr/fltmgrint.h - copied unchanged from r74743, trunk/reactos/drivers/filters/fltmgr/fltmgrint.h branches/setup_improvements/sdk/include/ddk/backpack.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/backpack.h branches/setup_improvements/sdk/include/ddk/buffring.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/buffring.h branches/setup_improvements/sdk/include/ddk/fcb.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/fcb.h branches/setup_improvements/sdk/include/ddk/fcbtable.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/fcbtable.h branches/setup_improvements/sdk/include/ddk/lowio.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/lowio.h branches/setup_improvements/sdk/include/ddk/mrx.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/mrx.h branches/setup_improvements/sdk/include/ddk/mrxfcb.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/mrxfcb.h branches/setup_improvements/sdk/include/ddk/nodetype.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/nodetype.h branches/setup_improvements/sdk/include/ddk/ntrxdef.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/ntrxdef.h branches/setup_improvements/sdk/include/ddk/prefix.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/prefix.h branches/setup_improvements/sdk/include/ddk/rx.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rx.h branches/setup_improvements/sdk/include/ddk/rxcontx.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxcontx.h branches/setup_improvements/sdk/include/ddk/rxdata.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxdata.h branches/setup_improvements/sdk/include/ddk/rxlog.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxlog.h branches/setup_improvements/sdk/include/ddk/rxovride.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxovride.h branches/setup_improvements/sdk/include/ddk/rxpooltg.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxpooltg.h branches/setup_improvements/sdk/include/ddk/rxprocs.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxprocs.h branches/setup_improvements/sdk/include/ddk/rxstruc.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxstruc.h branches/setup_improvements/sdk/include/ddk/rxtimer.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxtimer.h branches/setup_improvements/sdk/include/ddk/rxtypes.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxtypes.h branches/setup_improvements/sdk/include/ddk/rxworkq.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxworkq.h branches/setup_improvements/sdk/include/ddk/scavengr.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/scavengr.h branches/setup_improvements/sdk/include/ddk/struchdr.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/struchdr.h branches/setup_improvements/sdk/lib/drivers/rdbsslib/ - copied from r74743, trunk/reactos/sdk/lib/drivers/rdbsslib/ branches/setup_improvements/sdk/lib/drivers/rxce/ - copied from r74743, trunk/reactos/sdk/lib/drivers/rxce/ Removed: branches/setup_improvements/dll/appcompat/shims/shimlib/shimdbgsupp.c branches/setup_improvements/dll/shellext/slayer/ branches/setup_improvements/sdk/lib/rtl/condvar.c branches/setup_improvements/sdk/lib/rtl/srw.c Modified: branches/setup_improvements/ (props changed) branches/setup_improvements/base/applications/calc/convert.c branches/setup_improvements/base/applications/calc/lang/bg-BG.rc branches/setup_improvements/base/applications/calc/lang/cs-CZ.rc branches/setup_improvements/base/applications/calc/lang/de-DE.rc branches/setup_improvements/base/applications/calc/lang/el-GR.rc branches/setup_improvements/base/applications/calc/lang/en-US.rc branches/setup_improvements/base/applications/calc/lang/es-ES.rc branches/setup_improvements/base/applications/calc/lang/fr-FR.rc branches/setup_improvements/base/applications/calc/lang/he-IL.rc branches/setup_improvements/base/applications/calc/lang/hu-HU.rc branches/setup_improvements/base/applications/calc/lang/it-IT.rc branches/setup_improvements/base/applications/calc/lang/ja-JP.rc branches/setup_improvements/base/applications/calc/lang/ko-KR.rc branches/setup_improvements/base/applications/calc/lang/nl-NL.rc branches/setup_improvements/base/applications/calc/lang/no-NO.rc branches/setup_improvements/base/applications/calc/lang/pl-PL.rc branches/setup_improvements/base/applications/calc/lang/pt-BR.rc branches/setup_improvements/base/applications/calc/lang/ro-RO.rc branches/setup_improvements/base/applications/calc/lang/ru-RU.rc branches/setup_improvements/base/applications/calc/lang/sk-SK.rc branches/setup_improvements/base/applications/calc/lang/sq-AL.rc branches/setup_improvements/base/applications/calc/lang/sv-SE.rc branches/setup_improvements/base/applications/calc/lang/th-TH.rc branches/setup_improvements/base/applications/calc/lang/tr-TR.rc branches/setup_improvements/base/applications/calc/lang/uk-UA.rc branches/setup_improvements/base/applications/calc/lang/zh-CN.rc branches/setup_improvements/base/applications/calc/resource.h branches/setup_improvements/base/applications/mspaint/registry.cpp branches/setup_improvements/base/applications/mspaint/winproc.cpp branches/setup_improvements/base/applications/mstsc/constants.h branches/setup_improvements/base/applications/mstsc/licence.c branches/setup_improvements/base/applications/mstsc/precomp.h branches/setup_improvements/base/applications/mstsc/proto.h branches/setup_improvements/base/applications/mstsc/rdp.c branches/setup_improvements/base/applications/mstsc/secure.c branches/setup_improvements/base/applications/mstsc/settings.c branches/setup_improvements/base/applications/mstsc/ssl_calls.c branches/setup_improvements/base/applications/mstsc/uimain.c branches/setup_improvements/base/applications/mstsc/win32.c branches/setup_improvements/base/setup/usetup/interface/devinst.c branches/setup_improvements/base/shell/explorer/precomp.h branches/setup_improvements/base/shell/explorer/taskswnd.cpp branches/setup_improvements/base/shell/explorer/trayntfy.cpp branches/setup_improvements/base/shell/explorer/traywnd.cpp branches/setup_improvements/base/system/format/format.c branches/setup_improvements/boot/CMakeLists.txt branches/setup_improvements/boot/bootdata/bootcd/unattend.inf branches/setup_improvements/boot/bootdata/hivesft.inf branches/setup_improvements/boot/bootdata/hivesys.inf branches/setup_improvements/boot/environ/app/rosload/rosload.c branches/setup_improvements/boot/environ/include/bl.h branches/setup_improvements/boot/environ/lib/firmware/efi/firmware.c branches/setup_improvements/boot/environ/lib/io/device.c branches/setup_improvements/boot/environ/lib/io/display/display.c branches/setup_improvements/boot/environ/lib/io/display/efi/gop.c branches/setup_improvements/boot/environ/lib/misc/image.c branches/setup_improvements/boot/environ/lib/misc/util.c branches/setup_improvements/boot/environ/lib/mm/descriptor.c branches/setup_improvements/boot/environ/lib/mm/heapalloc.c branches/setup_improvements/boot/environ/lib/mm/i386/mmx86.c branches/setup_improvements/boot/environ/lib/mm/pagealloc.c branches/setup_improvements/boot/environ/lib/platform/time.c branches/setup_improvements/dll/appcompat/apphelp/CMakeLists.txt branches/setup_improvements/dll/appcompat/apphelp/apphelp.c branches/setup_improvements/dll/appcompat/apphelp/apphelp.h branches/setup_improvements/dll/appcompat/apphelp/apphelp.spec branches/setup_improvements/dll/appcompat/apphelp/hsdb.c branches/setup_improvements/dll/appcompat/shims/genral/CMakeLists.txt branches/setup_improvements/dll/appcompat/shims/shimlib/CMakeLists.txt branches/setup_improvements/dll/appcompat/shims/shimlib/shimlib.h branches/setup_improvements/dll/cpl/intl/advanced.c branches/setup_improvements/dll/cpl/sysdm/virtmem.c branches/setup_improvements/dll/ntdll/ldr/ldrinit.c branches/setup_improvements/dll/shellext/CMakeLists.txt branches/setup_improvements/dll/win32/CMakeLists.txt branches/setup_improvements/dll/win32/fltlib/CMakeLists.txt branches/setup_improvements/dll/win32/fltlib/fltlib.c branches/setup_improvements/dll/win32/fltlib/stubs.c branches/setup_improvements/dll/win32/gdiplus/graphics.c branches/setup_improvements/dll/win32/kernel32/client/appcache.c branches/setup_improvements/dll/win32/kernel32/client/except.c branches/setup_improvements/dll/win32/kernel32/client/proc.c branches/setup_improvements/dll/win32/kernel32/client/utils.c branches/setup_improvements/dll/win32/kernel32_vista/CMakeLists.txt branches/setup_improvements/dll/win32/kernel32_vista/kernel32_vista.spec branches/setup_improvements/dll/win32/msafd/misc/dllmain.c branches/setup_improvements/dll/win32/mswsock/extensions.c branches/setup_improvements/dll/win32/mswsock/mswhelper.c branches/setup_improvements/dll/win32/mswsock/mswhelper.h branches/setup_improvements/dll/win32/mswsock/nsplookup.c branches/setup_improvements/dll/win32/mswsock/stubs.c branches/setup_improvements/dll/win32/shell32/dialogs/drive.cpp branches/setup_improvements/dll/win32/syssetup/wizard.c branches/setup_improvements/dll/win32/ubtrfs/ubtrfs.c branches/setup_improvements/dll/win32/uext2/uext2.c branches/setup_improvements/dll/win32/ufat/ufat.c branches/setup_improvements/dll/win32/ufatx/CMakeLists.txt branches/setup_improvements/dll/win32/ufatx/ufatx.spec branches/setup_improvements/dll/win32/uffs/uffs.c branches/setup_improvements/dll/win32/untfs/untfs.c branches/setup_improvements/dll/win32/ureiserfs/ureiserfs.c branches/setup_improvements/dll/win32/uxtheme/draw.c branches/setup_improvements/dll/win32/uxtheme/metric.c branches/setup_improvements/dll/win32/uxtheme/msstyles.c branches/setup_improvements/dll/win32/uxtheme/ncscrollbar.c branches/setup_improvements/dll/win32/uxtheme/nonclient.c branches/setup_improvements/dll/win32/uxtheme/property.c branches/setup_improvements/dll/win32/uxtheme/system.c branches/setup_improvements/dll/win32/uxtheme/themehooks.c branches/setup_improvements/dll/win32/uxtheme/uxthemep.h branches/setup_improvements/dll/win32/ws2_32/src/sockctrl.c branches/setup_improvements/dll/win32/ws2_32/src/socklife.c branches/setup_improvements/drivers/bus/acpi/CMakeLists.txt branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsargs.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsdebug.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsmethod.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsopcode.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsutils.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dswexec.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dswload.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dswload2.c branches/setup_improvements/drivers/bus/acpi/acpica/events/evxfevnt.c branches/setup_improvements/drivers/bus/acpi/acpica/executer/exdebug.c branches/setup_improvements/drivers/bus/acpi/acpica/executer/exdump.c branches/setup_improvements/drivers/bus/acpi/acpica/executer/exoparg1.c branches/setup_improvements/drivers/bus/acpi/acpica/executer/exresolv.c branches/setup_improvements/drivers/bus/acpi/acpica/include/acapps.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acdisasm.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acglobal.h branches/setup_improvements/drivers/bus/acpi/acpica/include/aclocal.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acopcode.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acpixf.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acpredef.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acresrc.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acrestyp.h branches/setup_improvements/drivers/bus/acpi/acpica/include/actbl1.h branches/setup_improvements/drivers/bus/acpi/acpica/include/actbl2.h branches/setup_improvements/drivers/bus/acpi/acpica/include/actbl3.h branches/setup_improvements/drivers/bus/acpi/acpica/include/actypes.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acutils.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acuuid.h branches/setup_improvements/drivers/bus/acpi/acpica/include/amlcode.h branches/setup_improvements/drivers/bus/acpi/acpica/include/amlresrc.h branches/setup_improvements/drivers/bus/acpi/acpica/include/platform/acgcc.h branches/setup_improvements/drivers/bus/acpi/acpica/include/platform/acintel.h branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsaccess.c branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsnames.c branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsutils.c branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsxfeval.c branches/setup_improvements/drivers/bus/acpi/acpica/parser/psobject.c branches/setup_improvements/drivers/bus/acpi/acpica/parser/psopcode.c branches/setup_improvements/drivers/bus/acpi/acpica/parser/psparse.c branches/setup_improvements/drivers/bus/acpi/acpica/resources/rscalc.c branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsdump.c branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsdumpinfo.c branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsinfo.c branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsmisc.c branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsserial.c branches/setup_improvements/drivers/bus/acpi/acpica/tables/tbfadt.c branches/setup_improvements/drivers/bus/acpi/acpica/tables/tbutils.c branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utdecode.c branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utownerid.c branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utresrc.c branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utxfmutex.c branches/setup_improvements/drivers/bus/acpi/busmgr/system.c branches/setup_improvements/drivers/bus/acpi/busmgr/utils.c branches/setup_improvements/drivers/bus/acpi/include/acpi_bus.h branches/setup_improvements/drivers/bus/acpi/main.c branches/setup_improvements/drivers/bus/acpi/pnp.c branches/setup_improvements/drivers/filesystems/mup/CMakeLists.txt branches/setup_improvements/drivers/filesystems/mup/mup.c branches/setup_improvements/drivers/filesystems/mup/mup.h branches/setup_improvements/drivers/filters/fltmgr/CMakeLists.txt branches/setup_improvements/drivers/filters/fltmgr/Dispatch.c branches/setup_improvements/drivers/filters/fltmgr/Object.c branches/setup_improvements/drivers/filters/fltmgr/fltmgr.h branches/setup_improvements/drivers/filters/fltmgr/fltmgr.spec branches/setup_improvements/drivers/storage/scsiport/scsiport.c branches/setup_improvements/hal/halx86/generic/bios.c branches/setup_improvements/hal/halx86/legacy/bus/pci_classes.ids branches/setup_improvements/hal/halx86/legacy/bus/pci_vendors.ids branches/setup_improvements/media/drivers/etc/protocol branches/setup_improvements/media/inf/intl.inf branches/setup_improvements/media/rapps/7zip.txt branches/setup_improvements/ntoskrnl/cc/view.c branches/setup_improvements/ntoskrnl/config/cmconfig.c branches/setup_improvements/ntoskrnl/config/cmdata.c branches/setup_improvements/ntoskrnl/config/cmsysini.c branches/setup_improvements/ntoskrnl/config/i386/cmhardwr.c branches/setup_improvements/ntoskrnl/config/powerpc/cmhardwr.c branches/setup_improvements/ntoskrnl/fstub/disksup.c branches/setup_improvements/ntoskrnl/io/iomgr/driver.c branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpinit.c branches/setup_improvements/ntoskrnl/ke/i386/traphdlr.c branches/setup_improvements/ntoskrnl/mm/ARM3/expool.c branches/setup_improvements/ntoskrnl/mm/ARM3/mminit.c branches/setup_improvements/ntoskrnl/mm/ARM3/pagfault.c branches/setup_improvements/ntoskrnl/mm/ARM3/section.c branches/setup_improvements/ntoskrnl/mm/ARM3/session.c branches/setup_improvements/ntoskrnl/mm/ARM3/special.c branches/setup_improvements/ntoskrnl/mm/ARM3/sysldr.c branches/setup_improvements/sdk/include/ddk/fltuserstructures.h branches/setup_improvements/sdk/include/ndk/cmtypes.h branches/setup_improvements/sdk/include/ndk/rtlfuncs.h branches/setup_improvements/sdk/include/psdk/ntstatus.h branches/setup_improvements/sdk/include/reactos/arc/arc.h branches/setup_improvements/sdk/include/reactos/arc/setupblk.h branches/setup_improvements/sdk/include/reactos/drivers/fltmgr/fltmgr_shared.h branches/setup_improvements/sdk/include/reactos/mc/bugcodes.mc branches/setup_improvements/sdk/lib/cmlib/hivecell.c branches/setup_improvements/sdk/lib/drivers/CMakeLists.txt branches/setup_improvements/sdk/lib/fslib/btrfslib/btrfslib.c branches/setup_improvements/sdk/lib/fslib/ext2lib/Mke2fs.c branches/setup_improvements/sdk/lib/fslib/ffslib/ffslib.c branches/setup_improvements/sdk/lib/fslib/ntfslib/ntfslib.c branches/setup_improvements/sdk/lib/fslib/reiserfslib/reiserfslib.c branches/setup_improvements/sdk/lib/fslib/vfatlib/vfatlib.c branches/setup_improvements/sdk/lib/fslib/vfatxlib/vfatxlib.c branches/setup_improvements/sdk/lib/rtl/CMakeLists.txt branches/setup_improvements/sdk/lib/rtl/env.c branches/setup_improvements/sdk/lib/rtl/handle.c branches/setup_improvements/sdk/tools/hhpcomp/chmc/list.h branches/setup_improvements/win32ss/drivers/videoprt/int10.c branches/setup_improvements/win32ss/drivers/videoprt/videoprt.c branches/setup_improvements/win32ss/drivers/videoprt/videoprt.h branches/setup_improvements/win32ss/gdi/eng/engobjects.h branches/setup_improvements/win32ss/gdi/ntgdi/coord.c branches/setup_improvements/win32ss/gdi/ntgdi/coord.h branches/setup_improvements/win32ss/gdi/ntgdi/dcutil.c branches/setup_improvements/win32ss/gdi/ntgdi/freetype.c branches/setup_improvements/win32ss/user/ntuser/main.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/setup_improvements/base/applications/calc/convert.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/resource.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mspaint/registry.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mspaint/winproc.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/constants.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/licence.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/proto.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/rdp.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/ssl_calls.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/uimain.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… Modified: branches/setup_improvements/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/CMakeLi… Modified: branches/setup_improvements/boot/bootdata/bootcd/unattend.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdat… Modified: branches/setup_improvements/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdat… Modified: branches/setup_improvements/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdat… Modified: branches/setup_improvements/boot/environ/app/rosload/rosload.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/firmware/efi/firmware.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/io/device.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/io/display/display.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/io/display/efi/gop.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/misc/image.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/misc/util.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/mm/heapalloc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/mm/i386/mmx86.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/platform/time.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/dll/appcompat/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/apphelp/apphelp.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/apphelp/hsdb.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/shims/genral/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/shims/shimlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Removed: branches/setup_improvements/dll/appcompat/shims/shimlib/shimdbgsupp.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/shims/shimlib/shimlib.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/cpl/intl… Modified: branches/setup_improvements/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/cpl/sysd… Modified: branches/setup_improvements/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/ntdll/ld… Modified: branches/setup_improvements/dll/shellext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/CM… Modified: branches/setup_improvements/dll/win32/fltlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/fl… Modified: branches/setup_improvements/dll/win32/fltlib/fltlib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/fl… Modified: branches/setup_improvements/dll/win32/fltlib/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/fl… Modified: branches/setup_improvements/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/gd… Modified: branches/setup_improvements/dll/win32/kernel32/client/appcache.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/kernel32_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/kernel32_vista/kernel32_vista.spec URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ms… Modified: branches/setup_improvements/dll/win32/mswsock/extensions.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ms… Modified: branches/setup_improvements/dll/win32/mswsock/mswhelper.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ms… Modified: branches/setup_improvements/dll/win32/mswsock/mswhelper.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ms… Modified: branches/setup_improvements/dll/win32/mswsock/nsplookup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ms… Modified: branches/setup_improvements/dll/win32/mswsock/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ms… Modified: branches/setup_improvements/dll/win32/shell32/dialogs/drive.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sy… Modified: branches/setup_improvements/dll/win32/ubtrfs/ubtrfs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ub… Modified: branches/setup_improvements/dll/win32/uext2/uext2.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ue… Modified: branches/setup_improvements/dll/win32/ufat/ufat.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/uf… Modified: branches/setup_improvements/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/uf… Modified: branches/setup_improvements/dll/win32/ufatx/ufatx.spec URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/uf… Modified: branches/setup_improvements/dll/win32/uffs/uffs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/uf… Modified: branches/setup_improvements/dll/win32/untfs/untfs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/un… Modified: branches/setup_improvements/dll/win32/ureiserfs/ureiserfs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ur… Modified: branches/setup_improvements/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/metric.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/ncscrollbar.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/property.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/ws2_32/src/sockctrl.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ws… Modified: branches/setup_improvements/dll/win32/ws2_32/src/socklife.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ws… Modified: branches/setup_improvements/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsargs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsdebug.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsmethod.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsopcode.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsutils.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dswexec.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dswload.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dswload2.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/events/evxfevnt.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/executer/exdebug.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/executer/exdump.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/executer/exoparg1.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/executer/exresolv.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acapps.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acdisasm.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acglobal.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/aclocal.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acopcode.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acpixf.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acpredef.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acresrc.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acrestyp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/actbl1.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/actbl2.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/actbl3.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/actypes.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acutils.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acuuid.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/amlcode.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/amlresrc.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/platform/acgcc.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/platform/acintel.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsaccess.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsnames.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsutils.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsxfeval.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/parser/psobject.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/parser/psopcode.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/parser/psparse.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/resources/rscalc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsdump.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsdumpinfo.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsinfo.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsmisc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsserial.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/tables/tbfadt.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/tables/tbutils.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utdecode.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utownerid.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utresrc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utxfmutex.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/busmgr/system.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/busmgr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/include/acpi_bus.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/filesystems/mup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/mup/mup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filters/fltmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/filt… Modified: branches/setup_improvements/drivers/filters/fltmgr/Dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/filt… Modified: branches/setup_improvements/drivers/filters/fltmgr/Object.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/filt… Modified: branches/setup_improvements/drivers/filters/fltmgr/fltmgr.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/filt… Modified: branches/setup_improvements/drivers/filters/fltmgr/fltmgr.spec URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/filt… Modified: branches/setup_improvements/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/stor… Modified: branches/setup_improvements/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/hal/halx86/g… Modified: branches/setup_improvements/hal/halx86/legacy/bus/pci_classes.ids URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/hal/halx86/l… Modified: branches/setup_improvements/hal/halx86/legacy/bus/pci_vendors.ids URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/hal/halx86/l… Modified: branches/setup_improvements/media/drivers/etc/protocol URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/media/driver… Modified: branches/setup_improvements/media/inf/intl.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/media/inf/in… Modified: branches/setup_improvements/media/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/media/rapps/… Modified: branches/setup_improvements/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/cc/… Modified: branches/setup_improvements/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… Modified: branches/setup_improvements/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… Modified: branches/setup_improvements/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… Modified: branches/setup_improvements/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… Modified: branches/setup_improvements/ntoskrnl/config/powerpc/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… Modified: branches/setup_improvements/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/fst… Modified: branches/setup_improvements/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/io/… Modified: branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/io/… Modified: branches/setup_improvements/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/ke/… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/session.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/special.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/sdk/include/ddk/fltuserstructures.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/psdk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/reactos/arc/setupblk.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/reactos/drivers/fltmgr/fltmgr_shared.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/cmli… Modified: branches/setup_improvements/sdk/lib/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/driv… Modified: branches/setup_improvements/sdk/lib/fslib/btrfslib/btrfslib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/sdk/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/sdk/lib/fslib/ffslib/ffslib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/sdk/lib/fslib/ntfslib/ntfslib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/sdk/lib/fslib/reiserfslib/reiserfslib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/sdk/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/sdk/lib/fslib/vfatxlib/vfatxlib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/sdk/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/rtl/… Removed: branches/setup_improvements/sdk/lib/rtl/condvar.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/rtl/… Modified: branches/setup_improvements/sdk/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/rtl/… Modified: branches/setup_improvements/sdk/lib/rtl/handle.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/rtl/… Removed: branches/setup_improvements/sdk/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/rtl/… Modified: branches/setup_improvements/sdk/tools/hhpcomp/chmc/list.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/tools/hh… Modified: branches/setup_improvements/win32ss/drivers/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/driv… Modified: branches/setup_improvements/win32ss/drivers/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/driv… Modified: branches/setup_improvements/win32ss/drivers/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/driv… Modified: branches/setup_improvements/win32ss/gdi/eng/engobjects.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/gdi/ntgdi/coord.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/user…

7 years, 6 months

[hbelusca] 74743: [FREELDR]: Split the "main" winldr.h header into the one containing global code that actually doesn't really depend on the "windows" NT loader part, and one that actually concerns...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 2 00:52:36 2017 New Revision: 74743 URL: http://svn.reactos.org/svn/reactos?rev=74743&view=rev Log: [FREELDR]: Split the "main" winldr.h header into the one containing global code that actually doesn't really depend on the "windows" NT loader part, and one that actually concerns code just for the NT Loader. The latter goes into ntldr. Added: branches/setup_improvements/boot/freeldr/freeldr/ntldr/winldr.h - copied, changed from r74742, branches/setup_improvements/boot/freeldr/freeldr/include/winldr.h Modified: branches/setup_improvements/boot/freeldr/freeldr/include/winldr.h branches/setup_improvements/boot/freeldr/freeldr/ntldr/setupldr.c branches/setup_improvements/boot/freeldr/freeldr/ntldr/winldr.c branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlmemory.c branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlregistry.c Modified: branches/setup_improvements/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… ============================================================================== --- branches/setup_improvements/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] (original) +++ branches/setup_improvements/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] Fri Jun 2 00:52:36 2017 @@ -22,20 +22,20 @@ #include <arc/setupblk.h> +// See freeldr/ntldr/winldr.h #define TAG_WLDR_DTE 'eDlW' #define TAG_WLDR_BDE 'dBlW' #define TAG_WLDR_NAME 'mNlW' -/* Entry-point to kernel */ -typedef VOID (NTAPI *KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock); - // Some definitions + +// FIXME: This one has nothing to do here!! #define SECTOR_SIZE 512 // Descriptors -#define NUM_GDT 128 // Must be 128 -#define NUM_IDT 0x100 // only 16 are used though. Must be 0x100 +#define NUM_GDT 128 // Must be 128 +#define NUM_IDT 0x100 // Only 16 are used though. Must be 0x100 #include <pshpack1.h> typedef struct /* Root System Descriptor Pointer */ @@ -58,27 +58,6 @@ CHAR ArcName[MAX_PATH]; } ARC_DISK_SIGNATURE_EX, *PARC_DISK_SIGNATURE_EX; -#define MAX_OPTIONS_LENGTH 255 - -typedef struct _LOADER_SYSTEM_BLOCK -{ - LOADER_PARAMETER_BLOCK LoaderBlock; - LOADER_PARAMETER_EXTENSION Extension; - SETUP_LOADER_BLOCK SetupBlock; -#ifdef _M_IX86 - HEADLESS_LOADER_BLOCK HeadlessLoaderBlock; -#endif - NLS_DATA_BLOCK NlsDataBlock; - CHAR LoadOptions[MAX_OPTIONS_LENGTH+1]; - CHAR ArcBootDeviceName[MAX_PATH+1]; - // CHAR ArcHalDeviceName[MAX_PATH]; - CHAR NtBootPathName[MAX_PATH+1]; - CHAR NtHalPathName[MAX_PATH+1]; - ARC_DISK_INFORMATION ArcDiskInformation; -} LOADER_SYSTEM_BLOCK, *PLOADER_SYSTEM_BLOCK; - -extern PLOADER_SYSTEM_BLOCK WinLdrSystemBlock; - /////////////////////////////////////////////////////////////////////////////////////// // // ReactOS Loading Functions @@ -87,18 +66,22 @@ VOID LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem, IN USHORT OperatingSystemVersion); -// conversion.c +VOID +LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, + IN USHORT OperatingSystemVersion); + + +// conversion.c and conversion.h PVOID VaToPa(PVOID Va); PVOID PaToVa(PVOID Pa); VOID List_PaToVa(_In_ LIST_ENTRY *ListEntry); -VOID ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start); + // peloader.c BOOLEAN WinLdrLoadImage(IN PCHAR FileName, TYPE_OF_MEMORY MemoryType, OUT PVOID *ImageBasePA); - BOOLEAN WinLdrAllocateDataTableEntry(IN OUT PLIST_ENTRY ModuleListHead, @@ -112,54 +95,13 @@ IN PCCH DirectoryPath, IN PLDR_DATA_TABLE_ENTRY ScanDTE); -// winldr.c -PVOID WinLdrLoadModule(PCSTR ModuleName, ULONG *Size, - TYPE_OF_MEMORY MemoryType); - -// wlmemory.c -BOOLEAN -WinLdrSetupMemoryLayout(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock); - -// wlregistry.c -BOOLEAN WinLdrInitSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath); - -BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath); - - BOOLEAN WinLdrCheckForLoadedDll(IN OUT PLIST_ENTRY ModuleListHead, IN PCH DllName, OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry); -VOID -WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, - LPCSTR Options, - LPCSTR SystemPath, - LPCSTR BootPath, - USHORT VersionToBoot); -BOOLEAN -WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath, - IN LPCSTR AnsiFileName, - IN LPCSTR OemFileName, - IN LPCSTR LanguageFileName); -BOOLEAN -WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, - LPWSTR RegistryPath, - LPWSTR ImagePath, - LPWSTR ServiceName); -VOID -WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock); - -VOID -WinLdrpDumpBootDriver(PLOADER_PARAMETER_BLOCK LoaderBlock); - -VOID -WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock); - +// arch/xxx/winldr.c BOOLEAN MempSetupPaging(IN PFN_NUMBER StartPage, IN PFN_NUMBER NumberOfPages, @@ -169,19 +111,7 @@ MempUnmapPage(PFN_NUMBER Page); VOID -MempDump(); - -VOID -LoadAndBootWindowsCommon( - USHORT OperatingSystemVersion, - PLOADER_PARAMETER_BLOCK LoaderBlock, - LPCSTR BootOptions, - LPCSTR BootPath, - BOOLEAN Setup); - -VOID -LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, - IN USHORT OperatingSystemVersion); +MempDump(VOID); VOID WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock); Modified: branches/setup_improvements/boot/freeldr/freeldr/ntldr/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… ============================================================================== --- branches/setup_improvements/boot/freeldr/freeldr/ntldr/setupldr.c [iso-8859-1] (original) +++ branches/setup_improvements/boot/freeldr/freeldr/ntldr/setupldr.c [iso-8859-1] Fri Jun 2 00:52:36 2017 @@ -19,6 +19,7 @@ */ #include <freeldr.h> +#include "winldr.h" #include <ndk/ldrtypes.h> #include <arc/setupblk.h> @@ -27,12 +28,6 @@ DBG_DEFAULT_CHANNEL(WINDOWS); #define TAG_BOOT_OPTIONS 'pOtB' - -void -WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock); - -VOID -WinLdrSetProcessorContext(void); // TODO: Move to .h VOID AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock); Modified: branches/setup_improvements/boot/freeldr/freeldr/ntldr/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… ============================================================================== --- branches/setup_improvements/boot/freeldr/freeldr/ntldr/winldr.c [iso-8859-1] (original) +++ branches/setup_improvements/boot/freeldr/freeldr/ntldr/winldr.c [iso-8859-1] Fri Jun 2 00:52:36 2017 @@ -20,6 +20,7 @@ */ #include <freeldr.h> +#include "winldr.h" #include "registry.h" #include <ndk/ldrtypes.h> @@ -96,7 +97,7 @@ /* Construct SystemRoot and ArcBoot from SystemPath */ PathSeparator = strstr(BootPath, "\\") - BootPath; strncpy(ArcBoot, BootPath, PathSeparator); - ArcBoot[PathSeparator] = 0; + ArcBoot[PathSeparator] = ANSI_NULL; TRACE("ArcBoot: %s\n", ArcBoot); TRACE("SystemRoot: %s\n", SystemRoot); @@ -249,7 +250,7 @@ { // There is no directory in the path strcpy(DllName, DriverPath); - DriverPath[0] = 0; + DriverPath[0] = ANSI_NULL; } TRACE("DriverPath: %s, DllName: %s, LPB\n", DriverPath, DllName); @@ -426,13 +427,13 @@ static BOOLEAN LoadModule( - PLOADER_PARAMETER_BLOCK LoaderBlock, - PCCH Path, - PCCH File, - TYPE_OF_MEMORY MemoryType, - PLDR_DATA_TABLE_ENTRY *Dte, - BOOLEAN IsKdTransportDll, - ULONG Percentage) + IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PCCH Path, + IN PCCH File, + IN PCCH ImportName, // BaseDllName + IN TYPE_OF_MEMORY MemoryType, + OUT PLDR_DATA_TABLE_ENTRY *Dte, + IN ULONG Percentage) { BOOLEAN Success; CHAR FullFileName[MAX_PATH]; @@ -444,7 +445,6 @@ UiDrawProgressBarCenter(Percentage, 100, ProgressString); strcpy(FullFileName, Path); - strcat(FullFileName, "SYSTEM32\\"); strcat(FullFileName, File); Success = WinLdrLoadImage(FullFileName, MemoryType, &BaseAddress); @@ -455,15 +455,13 @@ } TRACE("%s loaded successfully at %p\n", File, BaseAddress); - strcpy(FullFileName, "WINDOWS\\SYSTEM32\\"); - strcat(FullFileName, File); /* * Cheat about the base DLL name if we are loading * the Kernel Debugger Transport DLL, to make the * PE loader happy. */ Success = WinLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, - (IsKdTransportDll ? "KDCOM.DLL" : File), + ImportName, FullFileName, BaseAddress, Dte); @@ -475,22 +473,82 @@ BOOLEAN LoadWindowsCore(IN USHORT OperatingSystemVersion, IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR BootOptions, - IN LPCSTR BootPath, + IN PCSTR BootOptions, + IN PCSTR BootPath, IN OUT PLDR_DATA_TABLE_ENTRY* KernelDTE) { BOOLEAN Success; + PCSTR Options; CHAR DirPath[MAX_PATH]; + CHAR KernelFileName[MAX_PATH]; + CHAR HalFileName[MAX_PATH]; CHAR KdTransportDllName[MAX_PATH]; PLDR_DATA_TABLE_ENTRY HalDTE, KdComDTE = NULL; if (!KernelDTE) return FALSE; + /* Initialize SystemRoot\System32 path */ + strcpy(DirPath, BootPath); + strcat(DirPath, "SYSTEM32\\"); + + // + // TODO: Parse also the separate INI values "Kernel=" and "Hal=" + // + + /* Default KERNEL and HAL file names */ + strcpy(KernelFileName, "NTOSKRNL.EXE"); + strcpy(HalFileName , "HAL.DLL"); + + /* Find any /KERNEL= or /HAL= switch in the boot options */ + Options = BootOptions; + while (Options) + { + /* Skip possible initial whitespace */ + Options += strspn(Options, " \t"); + + /* Check whether a new commutator starts and it is either KERNEL or HAL */ + if (*Options != '/' || (++Options, + !(_strnicmp(Options, "KERNEL=", 7) == 0 || + _strnicmp(Options, "HAL=", 4) == 0)) ) + { + /* Search for another whitespace */ + Options = strpbrk(Options, " \t"); + continue; + } + else + { + size_t i = strcspn(Options, " \t"); /* Skip whitespace */ + if (i == 0) + { + /* Use the default values */ + break; + } + + /* We have found either KERNEL or HAL commutator */ + if (_strnicmp(Options, "KERNEL=", 7) == 0) + { + Options += 7; i -= 7; + strncpy(KernelFileName, Options, i); + KernelFileName[i] = ANSI_NULL; + _strupr(KernelFileName); + } + else if (_strnicmp(Options, "HAL=", 4) == 0) + { + Options += 4; i -= 4; + strncpy(HalFileName, Options, i); + HalFileName[i] = ANSI_NULL; + _strupr(HalFileName); + } + } + } + + TRACE("Kernel file = '%s' ; HAL file = '%s'\n", KernelFileName, HalFileName); + /* Load the Kernel */ - LoadModule(LoaderBlock, BootPath, "NTOSKRNL.EXE", LoaderSystemCode, KernelDTE, FALSE, 30); + LoadModule(LoaderBlock, DirPath, KernelFileName, "NTOSKRNL.EXE", LoaderSystemCode, KernelDTE, 30); /* Load the HAL */ - LoadModule(LoaderBlock, BootPath, "HAL.DLL", LoaderHalCode, &HalDTE, FALSE, 45); + LoadModule(LoaderBlock, DirPath, HalFileName, "HAL.DLL", LoaderHalCode, &HalDTE, 45); /* Load the Kernel Debugger Transport DLL */ if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) @@ -525,27 +583,28 @@ * "...foo /DEBUGPORT= bar..." * (in that case, we default the port to COM). */ - while (BootOptions) + Options = BootOptions; + while (Options) { /* Skip possible initial whitespace */ - BootOptions += strspn(BootOptions, " \t"); + Options += strspn(Options, " \t"); /* Check whether a new commutator starts and it is the DEBUGPORT one */ - if (*BootOptions != '/' || _strnicmp(++BootOptions, "DEBUGPORT=", 10) != 0) + if (*Options != '/' || _strnicmp(++Options, "DEBUGPORT=", 10) != 0) { /* Search for another whitespace */ - BootOptions = strpbrk(BootOptions, " \t"); + Options = strpbrk(Options, " \t"); continue; } else { /* We found the DEBUGPORT commutator. Move to the port name. */ - BootOptions += 10; + Options += 10; break; } } - if (BootOptions) + if (Options) { /* * We have found the DEBUGPORT commutator. Parse the port name. @@ -553,33 +612,30 @@ * If we only have /DEBUGPORT= (i.e. without any port name), defaults it to "COM". */ strcpy(KdTransportDllName, "KD"); - if (_strnicmp(BootOptions, "COM", 3) == 0 && '0' <= BootOptions[3] && BootOptions[3] <= '9') + if (_strnicmp(Options, "COM", 3) == 0 && '0' <= Options[3] && Options[3] <= '9') { - strncat(KdTransportDllName, BootOptions, 3); + strncat(KdTransportDllName, Options, 3); } else { - size_t i = strcspn(BootOptions, " \t:"); /* Skip valid separators: whitespace or colon */ + size_t i = strcspn(Options, " \t:"); /* Skip valid separators: whitespace or colon */ if (i == 0) strcat(KdTransportDllName, "COM"); else - strncat(KdTransportDllName, BootOptions, i); + strncat(KdTransportDllName, Options, i); } strcat(KdTransportDllName, ".DLL"); _strupr(KdTransportDllName); /* - * Load the transport DLL. Specify it to LoadModule so that it can - * change the base DLL name of the loaded transport DLL to the default - * "KDCOM.DLL" name, to make the PE loader happy. + * Load the transport DLL. Override the base DLL name of the + * loaded transport DLL to the default "KDCOM.DLL" name. */ - LoadModule(LoaderBlock, BootPath, KdTransportDllName, LoaderSystemCode, &KdComDTE, TRUE, 60); + LoadModule(LoaderBlock, DirPath, KdTransportDllName, "KDCOM.DLL", LoaderSystemCode, &KdComDTE, 60); } } /* Load all referenced DLLs for Kernel, HAL and Kernel Debugger Transport DLL */ - strcpy(DirPath, BootPath); - strcat(DirPath, "system32\\"); Success = WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, *KernelDTE); Success &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, HalDTE); if (KdComDTE) @@ -691,7 +747,7 @@ /* Allocate and minimalist-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); - /* Load Hive */ + /* Load the system hive */ UiDrawBackdrop(); UiDrawProgressBarCenter(15, 100, "Loading system hive..."); Success = WinLdrInitSystemHive(LoaderBlock, BootPath); Copied: branches/setup_improvements/boot/freeldr/freeldr/ntldr/winldr.h (from r74742, branches/setup_improvements/boot/freeldr/freeldr/include/winldr.h) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… ============================================================================== --- branches/setup_improvements/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] (original) +++ branches/setup_improvements/boot/freeldr/freeldr/ntldr/winldr.h [iso-8859-1] Fri Jun 2 00:52:36 2017 @@ -22,20 +22,25 @@ #include <arc/setupblk.h> +#if 0 +// See freeldr/include/winldr.h #define TAG_WLDR_DTE 'eDlW' #define TAG_WLDR_BDE 'dBlW' #define TAG_WLDR_NAME 'mNlW' + +#endif /* Entry-point to kernel */ typedef VOID (NTAPI *KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock); // Some definitions -#define SECTOR_SIZE 512 + +#if 0 // Descriptors -#define NUM_GDT 128 // Must be 128 -#define NUM_IDT 0x100 // only 16 are used though. Must be 0x100 +#define NUM_GDT 128 // Must be 128 +#define NUM_IDT 0x100 // Only 16 are used though. Must be 0x100 #include <pshpack1.h> typedef struct /* Root System Descriptor Pointer */ @@ -58,6 +63,8 @@ CHAR ArcName[MAX_PATH]; } ARC_DISK_SIGNATURE_EX, *PARC_DISK_SIGNATURE_EX; +#endif + #define MAX_OPTIONS_LENGTH 255 typedef struct _LOADER_SYSTEM_BLOCK @@ -79,38 +86,15 @@ extern PLOADER_SYSTEM_BLOCK WinLdrSystemBlock; -/////////////////////////////////////////////////////////////////////////////////////// -// -// ReactOS Loading Functions -// -/////////////////////////////////////////////////////////////////////////////////////// -VOID LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem, - IN USHORT OperatingSystemVersion); // conversion.c +#if 0 PVOID VaToPa(PVOID Va); PVOID PaToVa(PVOID Pa); VOID List_PaToVa(_In_ LIST_ENTRY *ListEntry); +#endif VOID ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start); -// peloader.c -BOOLEAN -WinLdrLoadImage(IN PCHAR FileName, - TYPE_OF_MEMORY MemoryType, - OUT PVOID *ImageBasePA); - - -BOOLEAN -WinLdrAllocateDataTableEntry(IN OUT PLIST_ENTRY ModuleListHead, - IN PCCH BaseDllName, - IN PCCH FullDllName, - IN PVOID BasePA, - OUT PLDR_DATA_TABLE_ENTRY *NewEntry); - -BOOLEAN -WinLdrScanImportDescriptorTable(IN OUT PLIST_ENTRY ModuleListHead, - IN PCCH DirectoryPath, - IN PLDR_DATA_TABLE_ENTRY ScanDTE); // winldr.c PVOID WinLdrLoadModule(PCSTR ModuleName, ULONG *Size, @@ -121,18 +105,16 @@ WinLdrSetupMemoryLayout(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock); // wlregistry.c -BOOLEAN WinLdrInitSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath); +BOOLEAN +WinLdrInitSystemHive( + IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PCSTR SystemRoot, + IN BOOLEAN Setup); BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, IN LPCSTR DirectoryPath); - -BOOLEAN -WinLdrCheckForLoadedDll(IN OUT PLIST_ENTRY ModuleListHead, - IN PCH DllName, - OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry); - +// winldr.c VOID WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, LPCSTR Options, @@ -160,17 +142,6 @@ VOID WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock); -BOOLEAN -MempSetupPaging(IN PFN_NUMBER StartPage, - IN PFN_NUMBER NumberOfPages, - IN BOOLEAN KernelMapping); - -VOID -MempUnmapPage(PFN_NUMBER Page); - -VOID -MempDump(); - VOID LoadAndBootWindowsCommon( USHORT OperatingSystemVersion, @@ -178,13 +149,3 @@ LPCSTR BootOptions, LPCSTR BootPath, BOOLEAN Setup); - -VOID -LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, - IN USHORT OperatingSystemVersion); - -VOID -WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock); - -VOID -WinLdrSetProcessorContext(VOID); Modified: branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… ============================================================================== --- branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlmemory.c [iso-8859-1] (original) +++ branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlmemory.c [iso-8859-1] Fri Jun 2 00:52:36 2017 @@ -9,6 +9,7 @@ /* INCLUDES ***************************************************************/ #include <freeldr.h> +#include "winldr.h" #include <debug.h> Modified: branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlregistry.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… ============================================================================== --- branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlregistry.c [iso-8859-1] (original) +++ branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlregistry.c [iso-8859-1] Fri Jun 2 00:52:36 2017 @@ -9,6 +9,7 @@ /* INCLUDES ***************************************************************/ #include <freeldr.h> +#include "winldr.h" #include "registry.h" #include <debug.h>

7 years, 6 months

[hbelusca] 74742: [USETUP]: Creating a registry key with zero access is just plainly invalid. Fix it. It was not caught before because, we never ever booted a 1st-stage setup with a valid mounted e...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 2 00:44:04 2017 New Revision: 74742 URL: http://svn.reactos.org/svn/reactos?rev=74742&view=rev Log: [USETUP]: Creating a registry key with zero access is just plainly invalid. Fix it. It was not caught before because, we never ever booted a 1st-stage setup with a valid mounted existing SYSTEM key (as Windows does). Modified: trunk/reactos/base/setup/usetup/interface/devinst.c Modified: trunk/reactos/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] Fri Jun 2 00:44:04 2017 @@ -341,7 +341,7 @@ } InitializeObjectAttributes(&ObjectAttributes, &ServicesU, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey(&hServices, 0, &ObjectAttributes, 0, NULL, 0, NULL); + Status = NtCreateKey(&hServices, KEY_ALL_ACCESS, &ObjectAttributes, 0, NULL, 0, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey('%wZ') failed with status 0x%08lx\n", &ServicesU, Status);

7 years, 6 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 June 2017