Merge branch 'reactos:master' into AppleTV-Desktop

Author: DistroHopper39B

boot/freeldr/freeldr/arch/i386/pc/machpc.c

@@ -92,6 +92,14 @@ DBG_DEFAULT_CHANNEL(HWDETECT);
 /* Timeout in ms for sending to keyboard controller. */
 #define CONTROLLER_TIMEOUT                              250
 
+#include <pshpack1.h>
+typedef struct _PNP_DOCK_INFO
+{
+    ULONG DockLocationID;
+    ULONG SerialNumber;
+    USHORT Capabilities;
+} PNP_DOCK_INFO, *PPNP_DOCK_INFO;
+#include <poppack.h>
 
 VOID
 PcGetExtendedBIOSData(PULONG ExtendedBIOSDataArea, PULONG ExtendedBIOSDataSize)
@@ -188,6 +196,7 @@ DetectDockingStation(
     PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor;
     PCONFIGURATION_COMPONENT_DATA PeripheralKey;
     PDOCKING_STATE_INFORMATION DockingState;
+    PPNP_DOCK_INFO DockInfo;
     ULONG Size, Result;
 
     Result = PnpBiosGetDockStationInformation(DiskReadBuffer);
@@ -219,8 +228,14 @@ DetectDockingStation(
     DockingState->ReturnCode = Result;
     if (Result == 0)
     {
-        /* FIXME: Add more device specific data */
-        ERR("FIXME: System docked\n");
+        DockInfo = (PPNP_DOCK_INFO)DiskReadBuffer;
+        DockingState->DockLocationID = DockInfo->DockLocationID;
+        DockingState->SerialNumber = DockInfo->SerialNumber;
+        DockingState->Capabilities = DockInfo->Capabilities;
+        TRACE("System docked\n");
+        TRACE("Location: 0x%08lx\n", DockInfo->DockLocationID);
+        TRACE("Serial: 0x%08lx\n", DockInfo->SerialNumber);
+        TRACE("Capabilities: 0x%04hx\n", DockInfo->Capabilities);
     }
 
     /* Create controller key */

boot/freeldr/freeldr/include/arch/pc/pcbios.h

@@ -81,7 +81,9 @@ typedef struct _ACPI_BIOS_DATA
 
 typedef struct _DOCKING_STATE_INFORMATION
 {
-    USHORT Unused[5];
+    ULONG DockLocationID;
+    ULONG SerialNumber;
+    USHORT Capabilities;
     USHORT ReturnCode;
 } DOCKING_STATE_INFORMATION, *PDOCKING_STATE_INFORMATION;
 

dll/win32/rpcrt4/ndr_fullpointer.c

@@ -86,12 +86,41 @@ static void expand_pointer_table_if_necessary(PFULL_PTR_XLAT_TABLES pXlatTables,
 {
     if (RefId >= pXlatTables->RefIdToPointer.NumberOfEntries)
     {
+#ifdef __REACTOS__
+        void* ptrNew;
+        ptrNew = realloc(pXlatTables->RefIdToPointer.XlatTable, sizeof(void *) * RefId * 2);
+        if (!ptrNew)
+        {
+            ERR("Couldn't reallocate RefIdToPointer.XlatTable from %lu to %lu entries\n",
+                pXlatTables->RefIdToPointer.NumberOfEntries, RefId * 2);
+            free(pXlatTables->RefIdToPointer.XlatTable);
+        }
+        pXlatTables->RefIdToPointer.XlatTable = ptrNew;
+        if (ptrNew)
+        {
+            ptrNew = realloc(pXlatTables->RefIdToPointer.StateTable, RefId * 2);
+            if (!ptrNew)
+            {
+                ERR("Couldn't reallocate RefIdToPointer.StateTable from %lu to %lu entries\n",
+                    pXlatTables->RefIdToPointer.NumberOfEntries, RefId * 2);
+                free(pXlatTables->RefIdToPointer.StateTable);
+            }
+            pXlatTables->RefIdToPointer.StateTable = ptrNew;
+        }
+#else
         pXlatTables->RefIdToPointer.XlatTable =
             realloc(pXlatTables->RefIdToPointer.XlatTable, sizeof(void *) * RefId * 2);
         pXlatTables->RefIdToPointer.StateTable =
             realloc(pXlatTables->RefIdToPointer.StateTable, RefId * 2);
+#endif
         if (!pXlatTables->RefIdToPointer.XlatTable || !pXlatTables->RefIdToPointer.StateTable)
         {
+#ifdef __REACTOS__
+            free(pXlatTables->RefIdToPointer.XlatTable);
+            free(pXlatTables->RefIdToPointer.StateTable);
+            pXlatTables->RefIdToPointer.XlatTable = NULL;
+            pXlatTables->RefIdToPointer.StateTable = NULL;
+#endif
             pXlatTables->RefIdToPointer.NumberOfEntries = 0;
             return;
         }

drivers/network/CMakeLists.txt

@@ -3,5 +3,6 @@ add_subdirectory(afd)
 add_subdirectory(dd)
 add_subdirectory(ndis)
 add_subdirectory(ndisuio)
+add_subdirectory(netio)
 add_subdirectory(tcpip)
 add_subdirectory(tdi)

drivers/network/afd/CMakeLists.txt

@@ -1,6 +1,7 @@
 
 include_directories(
     BEFORE include
+    ../tdihelpers/include
     ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers)
 
 list(APPEND SOURCE
@@ -13,8 +14,8 @@ list(APPEND SOURCE
     afd/main.c
     afd/read.c
     afd/select.c
-    afd/tdi.c
-    afd/tdiconn.c
+    ../tdihelpers/tdi.c
+    ../tdihelpers/tdiconn.c
     afd/write.c
     include/afd.h)
 

drivers/network/afd/include/afd.h

@@ -337,71 +337,6 @@ VOID SignalSocket(
    PAFD_ACTIVE_POLL Poll OPTIONAL, PIRP _Irp OPTIONAL,
    PAFD_POLL_INFO PollReq, NTSTATUS Status);
 
-/* tdi.c */
-
-NTSTATUS TdiOpenAddressFile(
-    PUNICODE_STRING DeviceName,
-    PTRANSPORT_ADDRESS Name,
-    ULONG ShareType,
-    PHANDLE AddressHandle,
-    PFILE_OBJECT *AddressObject);
-
-NTSTATUS TdiAssociateAddressFile(
-  HANDLE AddressHandle,
-  PFILE_OBJECT ConnectionObject);
-
-NTSTATUS TdiDisassociateAddressFile(
-  PFILE_OBJECT ConnectionObject);
-
-NTSTATUS TdiListen
-( PIRP *Irp,
-  PFILE_OBJECT ConnectionObject,
-  PTDI_CONNECTION_INFORMATION *RequestConnectionInfo,
-  PTDI_CONNECTION_INFORMATION *ReturnConnectionInfo,
-  PIO_COMPLETION_ROUTINE  CompletionRoutine,
-  PVOID CompletionContext);
-
-NTSTATUS TdiReceive
-( PIRP *Irp,
-  PFILE_OBJECT ConnectionObject,
-  USHORT Flags,
-  PCHAR Buffer,
-  UINT BufferLength,
-  PIO_COMPLETION_ROUTINE  CompletionRoutine,
-  PVOID CompletionContext);
-
-NTSTATUS TdiSend
-( PIRP *Irp,
-  PFILE_OBJECT ConnectionObject,
-  USHORT Flags,
-  PCHAR Buffer,
-  UINT BufferLength,
-  PIO_COMPLETION_ROUTINE  CompletionRoutine,
-  PVOID CompletionContext);
-
-NTSTATUS TdiReceiveDatagram(
-    PIRP *Irp,
-    PFILE_OBJECT TransportObject,
-    USHORT Flags,
-    PCHAR Buffer,
-    UINT BufferLength,
-    PTDI_CONNECTION_INFORMATION From,
-    PIO_COMPLETION_ROUTINE CompletionRoutine,
-    PVOID CompletionContext);
-
-NTSTATUS TdiSendDatagram(
-    PIRP *Irp,
-    PFILE_OBJECT TransportObject,
-    PCHAR Buffer,
-    UINT BufferLength,
-    PTDI_CONNECTION_INFORMATION To,
-    PIO_COMPLETION_ROUTINE CompletionRoutine,
-    PVOID CompletionContext);
-
-NTSTATUS TdiQueryMaxDatagramLength(
-        PFILE_OBJECT FileObject,
-        PUINT MaxDatagramLength);
-
 /* write.c */
 
 NTSTATUS NTAPI

drivers/network/afd/include/tdi_proto.h

@@ -0,0 +1,28 @@
+
+spec2def(netio.sys netio.spec ADD_IMPORTLIB)
+
+# NETIO.SYS is a NT 6 driver
+remove_definitions(-D_WIN32_WINNT=0x502)
+add_definitions(-D_WIN32_WINNT=0x600)
+
+# Including AFD is needed by the TDI helpers.
+# They have been part of AFD before.
+
+include_directories(
+    BEFORE include
+    ../afd/include
+    ../tdihelpers/include
+    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers)
+
+list(APPEND SOURCE
+    netio.c
+    ../tdihelpers/tdi.c
+    ../tdihelpers/tdiconn.c
+    ${CMAKE_CURRENT_BINARY_DIR}/netio.def)
+
+add_library(netio MODULE ${SOURCE})
+target_link_libraries(netio ${PSEH_LIB})
+set_module_type(netio kernelmodedriver)
+add_importlibs(netio ntoskrnl hal)
+add_cd_file(TARGET netio DESTINATION reactos/system32/drivers FOR all)
+add_registry_inf(netio_reg.inf)