Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 74734: [NTOS]: Code formatting only.
by hbelusca＠svn.reactos.org 01 Jun '17

01 Jun '17

Author: hbelusca Date: Thu Jun 1 18:35:48 2017 New Revision: 74734 URL: http://svn.reactos.org/svn/reactos?rev=74734&view=rev Log: [NTOS]: Code formatting only. Modified: trunk/reactos/ntoskrnl/config/cmdata.c Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] Thu Jun 1 18:35:48 2017 @@ -40,13 +40,13 @@ HIVE_LIST_ENTRY CmpMachineHiveList[] = { - { L"HARDWARE", L"MACHINE\\", NULL, HIVE_VOLATILE , 0 , NULL, FALSE, FALSE, FALSE}, - { L"SECURITY", L"MACHINE\\", NULL, 0 , 0 , NULL, FALSE, FALSE, FALSE}, - { L"SOFTWARE", L"MACHINE\\", NULL, 0 , 0 , NULL, FALSE, FALSE, FALSE}, - { L"SYSTEM", L"MACHINE\\", NULL, 0 , 0 , NULL, FALSE, FALSE, FALSE}, - { L"DEFAULT", L"USER\\.DEFAULT", NULL, 0 , 0 , NULL, FALSE, FALSE, FALSE}, - { L"SAM", L"MACHINE\\", NULL, HIVE_NOLAZYFLUSH , 0 , NULL, FALSE, FALSE, FALSE}, - { NULL, NULL, 0, 0 , 0 , NULL, FALSE, FALSE, FALSE} + { L"HARDWARE", L"MACHINE\\", NULL, HIVE_VOLATILE , 0 , NULL, FALSE, FALSE, FALSE}, + { L"SECURITY", L"MACHINE\\", NULL, 0 , 0 , NULL, FALSE, FALSE, FALSE}, + { L"SOFTWARE", L"MACHINE\\", NULL, 0 , 0 , NULL, FALSE, FALSE, FALSE}, + { L"SYSTEM", L"MACHINE\\", NULL, 0 , 0 , NULL, FALSE, FALSE, FALSE}, + { L"DEFAULT", L"USER\\.DEFAULT", NULL, 0 , 0 , NULL, FALSE, FALSE, FALSE}, + { L"SAM", L"MACHINE\\", NULL, HIVE_NOLAZYFLUSH , 0 , NULL, FALSE, FALSE, FALSE}, + { NULL, NULL, 0, 0 , 0 , NULL, FALSE, FALSE, FALSE} }; UNICODE_STRING CmSymbolicLinkValueName =

1 0

[hbelusca] 74733: [NTOS]: Minor code formatting + don't leak a handle in case of failure, in CmpInitializeHardwareConfiguration().
by hbelusca＠svn.reactos.org 01 Jun '17

01 Jun '17

Author: hbelusca Date: Thu Jun 1 18:27:41 2017 New Revision: 74733 URL: http://svn.reactos.org/svn/reactos?rev=74733&view=rev Log: [NTOS]: Minor code formatting + don't leak a handle in case of failure, in CmpInitializeHardwareConfiguration(). Modified: trunk/reactos/ntoskrnl/config/cmconfig.c Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmconfig.c [iso-8859-1] Thu Jun 1 18:27:41 2017 @@ -226,23 +226,25 @@ { /* EISA */ case EisaAdapter: - + { /* Fixup information */ Interface = Eisa; Bus = CmpTypeCount[EisaAdapter]++; break; + } /* Turbo-channel */ case TcAdapter: - + { /* Fixup information */ Interface = TurboChannel; Bus = CmpTypeCount[TurboChannel]++; break; + } /* ISA, PCI, etc busses */ case MultiFunctionAdapter: - + { /* Check if we have an identifier */ if (Component->Identifier) { @@ -263,20 +265,24 @@ Bus = CmpMultifunctionTypes[i].Count++; } break; + } /* SCSI Bus */ case ScsiAdapter: - + { /* Fix up */ Interface = Internal; Bus = CmpTypeCount[ScsiAdapter]++; break; + } /* Unknown */ default: + { Interface = -1; Bus = CmpUnknownBusCount++; break; + } } } @@ -344,7 +350,8 @@ NULL, 0, &Disposition); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + return Status; NtClose(KeyHandle); /* Nobody should've created this key yet! */ @@ -367,7 +374,8 @@ NULL, 0, &Disposition); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + return Status; /* Nobody should've created this key yet! */ ASSERT(Disposition == REG_CREATED_NEW_KEY); @@ -376,7 +384,11 @@ CmpConfigurationData = ExAllocatePoolWithTag(PagedPool, CmpConfigurationAreaSize, TAG_CM); - if (!CmpConfigurationData) return STATUS_INSUFFICIENT_RESOURCES; + if (!CmpConfigurationData) + { + NtClose(KeyHandle); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Check if we got anything from NTLDR */ if (LoaderBlock->ConfigurationRoot) @@ -393,7 +405,7 @@ Status = STATUS_SUCCESS; } - /* Close our handle, free the buffer and return status */ + /* Free the buffer, close our handle and return status */ ExFreePoolWithTag(CmpConfigurationData, TAG_CM); NtClose(KeyHandle); return Status;

1 0

[hbelusca] 74732: [HAL] Update the PCI hardware IDs database. Extracted from the pci.ids database from http://pci-ids.ucw.cz/ from 2017-05-25 03:15:02 Maintained by Albert Pool, Martin Mares, and o...
by hbelusca＠svn.reactos.org 01 Jun '17

01 Jun '17

Author: hbelusca Date: Thu Jun 1 17:31:23 2017 New Revision: 74732 URL: http://svn.reactos.org/svn/reactos?rev=74732&view=rev Log: [HAL] Update the PCI hardware IDs database. Extracted from the pci.ids database from http://pci-ids.ucw.cz/ from 2017-05-25 03:15:02 Maintained by Albert Pool, Martin Mares, and other volunteers from the PCI ID Project. Modified: trunk/reactos/hal/halx86/legacy/bus/pci_classes.ids trunk/reactos/hal/halx86/legacy/bus/pci_vendors.ids [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/hal/halx86/legacy/bus/pci_classes.ids URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pci_… Modified: trunk/reactos/hal/halx86/legacy/bus/pci_vendors.ids URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pci_…

1 0

[phater] 74731: [MSWSOCK] Unstub AcceptEx and GetAcceptExSockaddrs. Note that real implementation in msafd is not available, so result will still be FALSE
by phater＠svn.reactos.org 01 Jun '17

01 Jun '17

Author: phater Date: Thu Jun 1 15:25:25 2017 New Revision: 74731 URL: http://svn.reactos.org/svn/reactos?rev=74731&view=rev Log: [MSWSOCK] Unstub AcceptEx and GetAcceptExSockaddrs. Note that real implementation in msafd is not available, so result will still be FALSE Modified: trunk/reactos/dll/win32/mswsock/extensions.c trunk/reactos/dll/win32/mswsock/stubs.c Modified: trunk/reactos/dll/win32/mswsock/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/extensio… ============================================================================== --- trunk/reactos/dll/win32/mswsock/extensions.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/extensions.c [iso-8859-1] Thu Jun 1 15:25:25 2017 @@ -12,6 +12,9 @@ #include <winsock2.h> #include <mswsock.h> +LPFN_TRANSMITFILE pfnTransmitFile = NULL; +LPFN_GETACCEPTEXSOCKADDRS pfnGetAcceptExSockaddrs = NULL; +LPFN_ACCEPTEX pfnAcceptEx = NULL; /* * @implemented */ @@ -25,30 +28,111 @@ LPTRANSMIT_FILE_BUFFERS TransmitBuffers, DWORD Flags) { - static GUID TransmitFileGUID = WSAID_TRANSMITFILE; - LPFN_TRANSMITFILE pfnTransmitFile; - DWORD cbBytesReturned; + GUID TransmitFileGUID = WSAID_TRANSMITFILE; + DWORD cbBytesReturned; - if (WSAIoctl(Socket, - SIO_GET_EXTENSION_FUNCTION_POINTER, - &TransmitFileGUID, - sizeof(TransmitFileGUID), - &pfnTransmitFile, - sizeof(pfnTransmitFile), - &cbBytesReturned, - NULL, - NULL) == SOCKET_ERROR) - { - return FALSE; - } + if (WSAIoctl(Socket, + SIO_GET_EXTENSION_FUNCTION_POINTER, + &TransmitFileGUID, + sizeof(TransmitFileGUID), + &pfnTransmitFile, + sizeof(pfnTransmitFile), + &cbBytesReturned, + NULL, + NULL) == SOCKET_ERROR) + { + return FALSE; + } - return pfnTransmitFile(Socket, - File, - NumberOfBytesToWrite, - NumberOfBytesPerSend, - Overlapped, - TransmitBuffers, - Flags); + return pfnTransmitFile(Socket, + File, + NumberOfBytesToWrite, + NumberOfBytesPerSend, + Overlapped, + TransmitBuffers, + Flags); } +/* +* @implemented +*/ +BOOL +WINAPI +AcceptEx(SOCKET ListenSocket, + SOCKET AcceptSocket, + PVOID OutputBuffer, + DWORD ReceiveDataLength, + DWORD LocalAddressLength, + DWORD RemoteAddressLength, + LPDWORD BytesReceived, + LPOVERLAPPED Overlapped) +{ + GUID AcceptExGUID = WSAID_ACCEPTEX; + GUID GetAcceptExSockaddrsGUID = WSAID_GETACCEPTEXSOCKADDRS; + DWORD cbBytesReturned; + + if (WSAIoctl(ListenSocket, + SIO_GET_EXTENSION_FUNCTION_POINTER, + &AcceptExGUID, + sizeof(AcceptExGUID), + &pfnAcceptEx, + sizeof(pfnAcceptEx), + &cbBytesReturned, + NULL, + NULL) == SOCKET_ERROR) + { + return FALSE; + } + + if (WSAIoctl(ListenSocket, + SIO_GET_EXTENSION_FUNCTION_POINTER, + &GetAcceptExSockaddrsGUID, + sizeof(GetAcceptExSockaddrsGUID), + &pfnGetAcceptExSockaddrs, + sizeof(pfnGetAcceptExSockaddrs), + &cbBytesReturned, + NULL, + NULL) == SOCKET_ERROR) + { + pfnAcceptEx = NULL; + return FALSE; + } + + return pfnAcceptEx(ListenSocket, + AcceptSocket, + OutputBuffer, + ReceiveDataLength, + LocalAddressLength, + RemoteAddressLength, + BytesReceived, + Overlapped); +} + + +/* +* @implemented +*/ +VOID +WINAPI +GetAcceptExSockaddrs(PVOID OutputBuffer, + DWORD ReceiveDataLength, + DWORD LocalAddressLength, + DWORD RemoteAddressLength, + LPSOCKADDR* LocalSockaddr, + LPINT LocalSockaddrLength, + LPSOCKADDR* RemoteSockaddr, + LPINT RemoteSockaddrLength) +{ + if (pfnGetAcceptExSockaddrs) + { + pfnGetAcceptExSockaddrs(OutputBuffer, + ReceiveDataLength, + LocalAddressLength, + RemoteAddressLength, + LocalSockaddr, + LocalSockaddrLength, + RemoteSockaddr, + RemoteSockaddrLength); + } +} /* EOF */ Modified: trunk/reactos/dll/win32/mswsock/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/mswsock/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/stubs.c [iso-8859-1] Thu Jun 1 15:25:25 2017 @@ -21,25 +21,6 @@ DWORD dwPriority; } NS_ROUTINE, *PNS_ROUTINE, * FAR LPNS_ROUTINE; -/* - * @unimplemented - */ -BOOL -WINAPI -AcceptEx(SOCKET ListenSocket, - SOCKET AcceptSocket, - PVOID OutputBuffer, - DWORD ReceiveDataLength, - DWORD LocalAddressLength, - DWORD RemoteAddressLength, - LPDWORD BytesReceived, - LPOVERLAPPED Overlapped) -{ - OutputDebugStringW(L"w32sock AcceptEx stub called\n"); - - return FALSE; -} - /* * @unimplemented @@ -68,24 +49,6 @@ OutputDebugStringW(L"w32sock EnumProtocolsW stub called\n"); return SOCKET_ERROR; -} - - -/* - * @unimplemented - */ -VOID -WINAPI -GetAcceptExSockaddrs(PVOID OutputBuffer, - DWORD ReceiveDataLength, - DWORD LocalAddressLength, - DWORD RemoteAddressLength, - LPSOCKADDR* LocalSockaddr, - LPINT LocalSockaddrLength, - LPSOCKADDR* RemoteSockaddr, - LPINT RemoteSockaddrLength) -{ - OutputDebugStringW(L"w32sock GetAcceptExSockaddrs stub called\n"); }

1 0

[phater] 74730: [MSWSOCK] Change functions to be able to use control flags with DnsQuery. Add host aliases to hostent if available and requested. Only copy servent aliases if available and requested.
by phater＠svn.reactos.org 01 Jun '17

01 Jun '17

Author: phater Date: Thu Jun 1 15:22:06 2017 New Revision: 74730 URL: http://svn.reactos.org/svn/reactos?rev=74730&view=rev Log: [MSWSOCK] Change functions to be able to use control flags with DnsQuery. Add host aliases to hostent if available and requested. Only copy servent aliases if available and requested. 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] Thu Jun 1 15:22:06 2017 @@ -226,6 +226,7 @@ BOOL mswBufferAppendBlob_Hostent(_Inout_ PMSW_BUFFER mswBuf, _Inout_ LPWSAQUERYSETW lpRes, + _In_ char** hostAliasesA, _In_ char* hostnameA, _In_ DWORD ip4addr) { @@ -256,8 +257,18 @@ /* aliases */ phe->h_aliases = (char**)(mswBufferEndPtr(mswBuf) - bytesOfs); - if (!mswBufferAppendPtr(mswBuf, NULL)) - return FALSE; + if (hostAliasesA) + { + if (!mswBufferAppendStrLstA(mswBuf, + (void**)hostAliasesA, + -(DWORD)bytesOfs)) + return FALSE; + } + else + { + if (!mswBufferAppendPtr(mswBuf, NULL)) + return FALSE; + } /* addr_list */ RtlZeroMemory(lst, sizeof(lst)); @@ -308,10 +319,18 @@ pse->s_aliases = (char**)(mswBufferEndPtr(mswBuf) - bytesOfs); - if (!mswBufferAppendStrLstA(mswBuf, - (void**)serviceAliasesA, - -(DWORD)bytesOfs)) - return FALSE; + if (serviceAliasesA) + { + if (!mswBufferAppendStrLstA(mswBuf, + (void**)serviceAliasesA, + -(DWORD)bytesOfs)) + return FALSE; + } + else + { + if (!mswBufferAppendPtr(mswBuf, NULL)) + return FALSE; + } pse->s_name = (char*)(mswBufferEndPtr(mswBuf) - bytesOfs); 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] Thu Jun 1 15:22:06 2017 @@ -69,7 +69,8 @@ mswBufferAppendBlob_Hostent( _Inout_ PMSW_BUFFER mswBuf, _Inout_ LPWSAQUERYSETW lpRes, - _In_ char* hostnameA, + _In_ char** hostAliasesA, + _In_ char* hostnameA, _In_ DWORD ip4addr); BOOL 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] Thu Jun 1 15:22:06 2017 @@ -106,7 +106,7 @@ INT NSP_LookupServiceNextW( _In_ PWSHANDLEINTERN data, - _In_ DWORD CallID, + _In_ DWORD dwControlFlags, _Inout_ LPWSAQUERYSETW lpRes, _Inout_ LPDWORD lpResLen); @@ -116,14 +116,14 @@ INT NSP_GetHostByNameHeapAllocW( - _In_ WCHAR* name, - _In_ GUID* lpProviderId, + _In_ PWSHANDLEINTERN data, + _In_ DWORD dwControlFlags, _Out_ PWSHOSTINFOINTERN hostinfo); INT NSP_GetServiceByNameHeapAllocW( - _In_ WCHAR* nameW, - _In_ GUID* lpProviderId, + _In_ PWSHANDLEINTERN data, + _In_ DWORD dwControlFlags, _Out_ PWSHOSTINFOINTERN hostinfo); /* Implementations - Internal */ @@ -303,7 +303,7 @@ lpqsResults->dwSize = sizeof(*lpqsResults); wsaErr = NSP_LookupServiceNextW(pLook, - pLook->CallID, + dwControlFlags, lpqsResults, lpdwBufferLength); @@ -464,8 +464,8 @@ } INT -NSP_GetHostByNameHeapAllocW(_In_ WCHAR* name, - _In_ GUID* lpProviderId, +NSP_GetHostByNameHeapAllocW(_In_ PWSHANDLEINTERN data, + _In_ DWORD dwControlFlags, _Out_ PWSHOSTINFOINTERN hostinfo) { HANDLE hHeap = GetProcessHeap(); @@ -474,21 +474,27 @@ PDNS_RECORD dp; PDNS_RECORD curr; INT result = ERROR_SUCCESS; + DWORD dwQueryFlags = DNS_QUERY_STANDARD; /* needed to be cleaned up if != NULL */ dp = NULL; - if (name == NULL) + if (data->hostnameW == NULL) { result = ERROR_INVALID_PARAMETER; goto cleanup; } + if ((data->dwControlFlags & LUP_DEEP) == 0) + { + dwQueryFlags |= DNS_QUERY_NO_RECURSION; + } + /* DNS_TYPE_A: include/WinDNS.h */ /* DnsQuery -- lib/dnsapi/dnsapi/query.c */ - dns_status = DnsQuery(name, + dns_status = DnsQuery(data->hostnameW, DNS_TYPE_A, - DNS_QUERY_STANDARD, + dwQueryFlags, /* extra dns servers */ 0, &dp, 0); @@ -511,6 +517,7 @@ curr = dp; while ((curr->pNext != NULL) || (curr->wType != DNS_TYPE_A)) { + /* FIXME build aliases list */ curr = curr->pNext; } @@ -522,6 +529,7 @@ hostinfo->hostnameW = StrCpyHeapAllocW(hHeap, curr->pName); hostinfo->addr4 = curr->Data.A.IpAddress; + /* FIXME attach built aliases list */ result = ERROR_SUCCESS; cleanup: @@ -684,8 +692,8 @@ } INT -NSP_GetServiceByNameHeapAllocW(_In_ WCHAR* nameW, - _In_ GUID* lpProviderId, +NSP_GetServiceByNameHeapAllocW(_In_ PWSHANDLEINTERN data, + _In_ DWORD dwControlFlags, _Out_ PWSHOSTINFOINTERN hostinfo) { BOOL Found = FALSE; @@ -703,14 +711,14 @@ PCHAR nameProtoA = NULL; INT res = WSANO_RECOVERY; - if (!nameW) + if (!data->hostnameW) { res = WSANO_RECOVERY; goto End; } hHeap = GetProcessHeap(); - nameA = StrW2AHeapAlloc(hHeap, nameW); + nameA = StrW2AHeapAlloc(hHeap, data->hostnameW); /* nameA has the form <service-name>/<protocol> we split these now */ @@ -837,7 +845,7 @@ INT NSP_LookupServiceNextW(_In_ PWSHANDLEINTERN data, - _In_ DWORD CallID, + _In_ DWORD dwControlFlags, _Inout_ LPWSAQUERYSETW lpRes, _Inout_ LPDWORD lpResLen) { @@ -860,9 +868,9 @@ lpRes->dwSize = sizeof(*lpRes); lpRes->dwNameSpace = NS_DNS; - if ((CallID == NSP_CALLID_HOSTNAME) || - (CallID == NSP_CALLID_HOSTBYNAME) || - (CallID == NSP_CALLID_SERVICEBYNAME)) + if ((data->CallID == NSP_CALLID_HOSTNAME) || + (data->CallID == NSP_CALLID_HOSTBYNAME) || + (data->CallID == NSP_CALLID_SERVICEBYNAME)) { if (data->CallIDCounter >= 1) { @@ -877,7 +885,7 @@ } data->CallIDCounter++; - if (CallID == NSP_CALLID_HOSTNAME) + if (data->CallID == NSP_CALLID_HOSTNAME) { result = NSP_GetHostNameHeapAllocW(&hostinfo.hostnameW); @@ -886,19 +894,19 @@ hostinfo.addr4 = 0; } - else if (CallID == NSP_CALLID_HOSTBYNAME) - { - result = NSP_GetHostByNameHeapAllocW(data->hostnameW, - &data->providerId, + else if (data->CallID == NSP_CALLID_HOSTBYNAME) + { + result = NSP_GetHostByNameHeapAllocW(data, + dwControlFlags, &hostinfo); if (result != ERROR_SUCCESS) goto End; } else { - ASSERT(CallID == NSP_CALLID_SERVICEBYNAME); - result = NSP_GetServiceByNameHeapAllocW(data->hostnameW, - &data->providerId, + ASSERT(data->CallID == NSP_CALLID_SERVICEBYNAME); + result = NSP_GetServiceByNameHeapAllocW(data, + dwControlFlags, &hostinfo); if (result != ERROR_SUCCESS) goto End; @@ -907,7 +915,7 @@ if (((LUP_RETURN_BLOB & data->dwControlFlags) != 0) || ((LUP_RETURN_NAME & data->dwControlFlags) != 0)) { - if (CallID == NSP_CALLID_HOSTNAME || CallID == NSP_CALLID_HOSTBYNAME) + if (data->CallID == NSP_CALLID_HOSTNAME || data->CallID == NSP_CALLID_HOSTBYNAME) { ServiceInstanceNameW = hostinfo.hostnameW; ServiceInstanceNameA = StrW2AHeapAlloc(hHeap, ServiceInstanceNameW); @@ -918,7 +926,7 @@ } } - if (CallID == NSP_CALLID_SERVICEBYNAME) + if (data->CallID == NSP_CALLID_SERVICEBYNAME) { ServiceInstanceNameW = hostinfo.servnameW; ServiceInstanceNameA = StrW2AHeapAlloc(hHeap, ServiceInstanceNameW); @@ -950,11 +958,12 @@ if ((LUP_RETURN_BLOB & data->dwControlFlags) != 0) { - if (CallID == NSP_CALLID_HOSTBYNAME) + if (data->CallID == NSP_CALLID_HOSTBYNAME) { /* Write data for PBLOB (hostent) */ if (!mswBufferAppendBlob_Hostent(&buf, lpRes, + (LUP_RETURN_ALIASES & data->dwControlFlags) != 0 ? hostinfo.servaliasesA : NULL, ServiceInstanceNameA, hostinfo.addr4)) { @@ -963,13 +972,13 @@ goto End; } } - else if (CallID == NSP_CALLID_SERVICEBYNAME) + else if (data->CallID == NSP_CALLID_SERVICEBYNAME) { /* Write data for PBLOB (servent) */ if (!mswBufferAppendBlob_Servent(&buf, lpRes, ServiceInstanceNameA,/* ServiceName */ - hostinfo.servaliasesA, + (LUP_RETURN_ALIASES & data->dwControlFlags) != 0 ? hostinfo.servaliasesA : NULL, ServiceProtocolNameA, hostinfo.servport)) {

1 0

[tfaber] 74729: [ACPICA] - Update to version 20170531 CORE-13348 #resolve
by tfaber＠svn.reactos.org 01 Jun '17

01 Jun '17

Author: tfaber Date: Thu Jun 1 10:54:48 2017 New Revision: 74729 URL: http://svn.reactos.org/svn/reactos?rev=74729&view=rev Log: [ACPICA] - Update to version 20170531 CORE-13348 #resolve Added: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dspkginit.c (with props) trunk/reactos/drivers/bus/acpi/acpica/utilities/utresdecode.c (with props) Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsargs.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsdebug.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmethod.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsopcode.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsutils.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswexec.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload2.c trunk/reactos/drivers/bus/acpi/acpica/events/evxfevnt.c trunk/reactos/drivers/bus/acpi/acpica/executer/exdebug.c trunk/reactos/drivers/bus/acpi/acpica/executer/exdump.c trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg1.c trunk/reactos/drivers/bus/acpi/acpica/executer/exresolv.c trunk/reactos/drivers/bus/acpi/acpica/include/acapps.h trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h trunk/reactos/drivers/bus/acpi/acpica/include/acopcode.h trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h trunk/reactos/drivers/bus/acpi/acpica/include/acpredef.h trunk/reactos/drivers/bus/acpi/acpica/include/acresrc.h trunk/reactos/drivers/bus/acpi/acpica/include/acrestyp.h trunk/reactos/drivers/bus/acpi/acpica/include/actbl1.h trunk/reactos/drivers/bus/acpi/acpica/include/actbl2.h trunk/reactos/drivers/bus/acpi/acpica/include/actbl3.h trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h trunk/reactos/drivers/bus/acpi/acpica/include/acuuid.h trunk/reactos/drivers/bus/acpi/acpica/include/amlcode.h trunk/reactos/drivers/bus/acpi/acpica/include/amlresrc.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acintel.h trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsnames.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsutils.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfeval.c trunk/reactos/drivers/bus/acpi/acpica/parser/psobject.c trunk/reactos/drivers/bus/acpi/acpica/parser/psopcode.c trunk/reactos/drivers/bus/acpi/acpica/parser/psparse.c trunk/reactos/drivers/bus/acpi/acpica/resources/rscalc.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsdump.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsdumpinfo.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsinfo.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsmisc.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsserial.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbfadt.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utdecode.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utownerid.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utresrc.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utxfmutex.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmethod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Added: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dspkginit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evxfevnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exresolv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acopcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpredef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acresrc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acrestyp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actbl1.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actbl2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actbl3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acuuid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/amlcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/amlresrc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acintel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsnames.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfeval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rscalc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsdumpinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsserial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbfadt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utdecode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utownerid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Added: trunk/reactos/drivers/bus/acpi/acpica/utilities/utresdecode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utresrc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxfmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut…

1 0

[phater] 74728: [MSAFD] Don't try to accept on non listening socket. Return WSAEINVAL
by phater＠svn.reactos.org 01 Jun '17

01 Jun '17

Author: phater Date: Thu Jun 1 09:41:19 2017 New Revision: 74728 URL: http://svn.reactos.org/svn/reactos?rev=74728&view=rev Log: [MSAFD] Don't try to accept on non listening socket. Return WSAEINVAL Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Thu Jun 1 09:41:19 2017 @@ -1464,6 +1464,11 @@ if (lpErrno) *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } + if (!Socket->SharedData->Listening) + { + if (lpErrno) *lpErrno = WSAEINVAL; + return SOCKET_ERROR; + } if ((SocketAddress && !SocketAddressLength) || (SocketAddressLength && !SocketAddress) || (SocketAddressLength && *SocketAddressLength < sizeof(SOCKADDR)))

1 0

[phater] 74727: [MSWSOCK] Update network protocols. Patch by Marco Savelli. CORE-13320 #resolve
by phater＠svn.reactos.org 01 Jun '17

01 Jun '17

Author: phater Date: Thu Jun 1 09:00:32 2017 New Revision: 74727 URL: http://svn.reactos.org/svn/reactos?rev=74727&view=rev Log: [MSWSOCK] Update network protocols. Patch by Marco Savelli. CORE-13320 #resolve Modified: trunk/reactos/media/drivers/etc/protocol Modified: trunk/reactos/media/drivers/etc/protocol URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/drivers/etc/protocol… ============================================================================== --- trunk/reactos/media/drivers/etc/protocol [iso-8859-1] (original) +++ trunk/reactos/media/drivers/etc/protocol [iso-8859-1] Thu Jun 1 09:00:32 2017 @@ -1,7 +1,7 @@ # The ReactOS protocols file # # Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992). -# Last IANA update included dated 2009-06-18 +# Last IANA update included dated 2017-05-24 # # See also http://www.iana.org/assignments/protocol-numbers @@ -93,6 +93,7 @@ secure-vmtp 82 SECURE-VMTP # SECURE-VMTP vines 83 VINES # VINES ttp 84 TTP # TTP +iptm 84 IPTM # Internet Protocol Traffic Manager nsfnet-igp 85 NSFNET-IGP # NSFNET-IGP dgp 86 DGP # Dissimilar Gateway Protocol tcf 87 TCF # TCF @@ -149,7 +150,9 @@ manet 138 manet # MANET Protocols [RFC5498] hip 139 HIP # Host Identity Protocol shim6 140 Shim6 #Shim6 Protocol [RFC5533] -# 141-252 Unassigned [IANA] +wesp 141 WESP # Wrapped Encapsulating Security Payload +rohc 142 ROHC # Robust Header Compression +# 143-252 Unassigned [IANA] # 253 Use for experimentation and testing [RFC3692] # 254 Use for experimentation and testing [RFC3692] # 255 Reserved [IANA]

1 0

[rgampa] 74726: added test.txt to usbxhci to check commit access
by rgampa＠svn.reactos.org 01 Jun '17

01 Jun '17

Author: rgampa Date: Thu Jun 1 05:50:21 2017 New Revision: 74726 URL: http://svn.reactos.org/svn/reactos?rev=74726&view=rev Log: added test.txt to usbxhci to check commit access Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/test.txt (with props) Added: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/test.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/test.txt (added) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/test.txt [iso-8859-1] Thu Jun 1 05:50:21 2017 @@ -0,0 +1 @@ +test commit Propchange: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/test.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 74725: [FREELDR/WINLDR]: Rework LoadModule() so that we can load custom kernels & hals via the /KERNEL= and /HAL= boot option switches.
by hbelusca＠svn.reactos.org 31 May '17

31 May '17

Author: hbelusca Date: Wed May 31 18:40:29 2017 New Revision: 74725 URL: http://svn.reactos.org/svn/reactos?rev=74725&view=rev Log: [FREELDR/WINLDR]: Rework LoadModule() so that we can load custom kernels & hals via the /KERNEL= and /HAL= boot option switches. Modified: trunk/reactos/boot/freeldr/freeldr/ntldr/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/ntldr/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ntldr… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ntldr/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ntldr/winldr.c [iso-8859-1] Wed May 31 18:40:29 2017 @@ -96,7 +96,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 +249,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 +426,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 +444,6 @@ UiDrawProgressBarCenter(Percentage, 100, ProgressString); strcpy(FullFileName, Path); - strcat(FullFileName, "SYSTEM32\\"); strcat(FullFileName, File); Success = WinLdrLoadImage(FullFileName, MemoryType, &BaseAddress); @@ -455,15 +454,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 +472,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 +582,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 +611,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 +746,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);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs