Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[jimtabor] 45096: [Win32k] - Fix the window handle De/Reference throttler issue. Used mIrc.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jan 16 06:56:22 2010 New Revision: 45096 URL: http://svn.reactos.org/svn/reactos?rev=45096&view=rev Log: [Win32k] - Fix the window handle De/Reference throttler issue. Used mIrc. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] Sat Jan 16 06:56:22 2010 @@ -396,37 +396,26 @@ BOOL FASTCALL -UserDereferenceObject(PVOID obj) -{ - ASSERT(((PHEAD)obj)->cLockObj >= 1); - - if (--((PHEAD)obj)->cLockObj <= 0) +UserDereferenceObject(PVOID object) +{ + PUSER_HANDLE_ENTRY entry; + USER_OBJECT_TYPE type; + + ASSERT(((PHEAD)object)->cLockObj >= 1); + + if ((INT)--((PHEAD)object)->cLockObj <= 0) { - return TRUE; - } - return FALSE; -} - -BOOL -FASTCALL -UserFreeHandle(PUSER_HANDLE_TABLE ht, HANDLE handle ) -{ - PUSER_HANDLE_ENTRY entry; - PVOID object; - USER_OBJECT_TYPE type; - - if (!(entry = handle_to_entry( ht, handle ))) - { - SetLastNtError( STATUS_INVALID_HANDLE ); - return FALSE; - } - - entry->flags = HANDLEENTRY_INDESTROY; - - if (UserDereferenceObject(entry->ptr)) - { + entry = handle_to_entry(gHandleTable, ((PHEAD)object)->h ); + + DPRINT("warning! Dereference to zero! Obj -> 0x%x\n", object); + + ((PHEAD)object)->cLockObj = 0; + + if (!(entry->flags & HANDLEENTRY_INDESTROY)) + return TRUE; + type = entry->type; - object = free_user_entry(ht, entry ); + free_user_entry(gHandleTable, entry ); switch (type) { @@ -446,6 +435,23 @@ BOOL FASTCALL +UserFreeHandle(PUSER_HANDLE_TABLE ht, HANDLE handle ) +{ + PUSER_HANDLE_ENTRY entry; + + if (!(entry = handle_to_entry( ht, handle ))) + { + SetLastNtError( STATUS_INVALID_HANDLE ); + return FALSE; + } + + entry->flags = HANDLEENTRY_INDESTROY; + + return UserDereferenceObject(entry->ptr); +} + +BOOL +FASTCALL UserDeleteObject(HANDLE h, USER_OBJECT_TYPE type ) { PVOID body = UserGetObject(gHandleTable, h, type);

14 years, 8 months

[tkreuzer] 45095: [NTOS] - Implement KiInitializeCpuFeatures amd call it early in the boot process - fix KeProcessorArchitecture - sumplify KiGetCpuVendor - fix and enable __lldt - remove some legacy code

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 16 05:36:56 2010 New Revision: 45095 URL: http://svn.reactos.org/svn/reactos?rev=45095&view=rev Log: [NTOS] - Implement KiInitializeCpuFeatures amd call it early in the boot process - fix KeProcessorArchitecture - sumplify KiGetCpuVendor - fix and enable __lldt - remove some legacy code Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] Sat Jan 16 05:36:56 2010 @@ -72,9 +72,9 @@ __asm__ __volatile__("sgdt %0" : : "m"(*(short*)Destination) : "memory"); } -static __inline__ __attribute__((always_inline)) void __lldt(void *Source) -{ - __asm__ __volatile__("lldt %0" : : "m"(*(short*)Source)); +static __inline__ __attribute__((always_inline)) void __lldt(unsigned short Value) +{ + __asm__ __volatile__("lldt %0" : : "rm"(Value)); } static __inline__ __attribute__((always_inline)) void __sldt(void *Destination) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Sat Jan 16 05:36:56 2010 @@ -33,8 +33,6 @@ ULONG KeFeatureBits; ULONG KeI386MachineType; ULONG KeI386NpxPresent = 1; -ULONG KeI386XMMIPresent = 0; -ULONG KeI386FxsrPresent = 0; ULONG KeLargestCacheLine = 0x40; ULONG KiDmaIoCoherency = 0; CHAR KeNumberProcessors = 0; @@ -127,26 +125,15 @@ { PKPRCB Prcb = KeGetCurrentPrcb(); INT Vendor[5]; - ULONG Temp; - - /* Assume no Vendor ID and fail if no CPUID Support. */ - Prcb->VendorString[0] = 0; - if (!Prcb->CpuID) return 0; /* Get the Vendor ID and null-terminate it */ __cpuid(Vendor, 0); - Vendor[4] = 0; - - /* Re-arrange vendor string */ - Temp = Vendor[2]; - Vendor[2] = Vendor[3]; - Vendor[3] = Temp; - - /* Copy it to the PRCB and null-terminate it again */ - RtlCopyMemory(Prcb->VendorString, - &Vendor[1], - sizeof(Prcb->VendorString) - sizeof(CHAR)); - Prcb->VendorString[sizeof(Prcb->VendorString) - sizeof(CHAR)] = ANSI_NULL; + + /* Copy it to the PRCB and null-terminate it */ + *(ULONG*)&Prcb->VendorString[0] = Vendor[1]; // ebx + *(ULONG*)&Prcb->VendorString[4] = Vendor[3]; // edx + *(ULONG*)&Prcb->VendorString[8] = Vendor[2]; // ecx + *(ULONG*)&Prcb->VendorString[12] = 0; /* Now check the CPU Type */ if (!strcmp((PCHAR)Prcb->VendorString, CmpIntelID)) @@ -223,6 +210,15 @@ if (CpuFeatures & 0x02000000) FeatureBits |= KF_XMMI; if (CpuFeatures & 0x04000000) FeatureBits |= KF_XMMI64; +#if 0 + if (Reg[2] & 0x00000001) FeatureBits |= KF_SSE3NEW; + if (Reg[2] & 0x00000008) FeatureBits |= KF_MONITOR; + if (Reg[2] & 0x00000200) FeatureBits |= KF_SSE3SUP; + if (Reg[2] & 0x00002000) FeatureBits |= KF_CMPXCHG16B; + if (Reg[2] & 0x00080000) FeatureBits |= KF_SSE41; + if (Reg[2] & 0x00800000) FeatureBits |= KF_POPCNT; +#endif + /* Check if the CPU has hyper-threading */ if (CpuFeatures & 0x10000000) { @@ -265,18 +261,6 @@ /* Return the Feature Bits */ return FeatureBits; -} - -VOID -NTAPI -KiInitializeCpuFeatures() -{ - /* Enable Write-Protection */ - __writecr0(__readcr0() | CR0_WP); - - /* Disable fpu monitoring */ - __writecr0(__readcr0() & ~CR0_MP); - } VOID Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Sat Jan 16 05:36:56 2010 @@ -36,19 +36,6 @@ NTAPI KiInitMachineDependent(VOID) { -#if 0 - ULONG Protect; - ULONG CpuCount; - BOOLEAN FbCaching = FALSE; - NTSTATUS Status; - ULONG ReturnLength; - ULONG i, Affinity, Sample = 0; - PFX_SAVE_AREA FxSaveArea; - ULONG MXCsrMask = 0xFFBF; - ULONG Dummy[4]; - KI_SAMPLE_MAP Samples[4]; - PKI_SAMPLE_MAP CurrentSample = Samples; - /* Check for large page support */ if (KeFeatureBits & KF_LARGE_PAGE) { @@ -59,274 +46,25 @@ /* Check for global page support */ if (KeFeatureBits & KF_GLOBAL_PAGE) { - /* Do an IPI to enable it on all CPUs */ - CpuCount = KeNumberProcessors; - KeIpiGenericCall(Ki386EnableGlobalPage, (ULONG_PTR)&CpuCount); + /* FIXME: Support this */ + DPRINT1("Global Page support detected but not yet taken advantage of!\n"); + } + + /* Check if we have MTRR */ + if (KeFeatureBits & KF_MTRR) + { + /* FIXME: Support this */ + DPRINT1("MTRR support detected but not yet taken advantage of!\n"); } /* Check for PAT and/or MTRR support */ - if (KeFeatureBits & (KF_PAT | KF_MTRR)) - { - /* Query the HAL to make sure we can use it */ - Status = HalQuerySystemInformation(HalFrameBufferCachingInformation, - sizeof(BOOLEAN), - &FbCaching, - &ReturnLength); - if ((NT_SUCCESS(Status)) && (FbCaching)) - { - /* We can't, disable it */ - KeFeatureBits &= ~(KF_PAT | KF_MTRR); - } - } - - /* Check for PAT support and enable it */ - if (KeFeatureBits & KF_PAT) KiInitializePAT(); - - /* Assume no errata for now */ - SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = 0; - - /* Check if we have an NPX */ - if (KeI386NpxPresent) - { - /* Loop every CPU */ - i = KeActiveProcessors; - for (Affinity = 1; i; Affinity <<= 1) - { - /* Check if this is part of the set */ - if (i & Affinity) - { - /* Run on this CPU */ - i &= ~Affinity; - KeSetSystemAffinityThread(Affinity); - - /* Detect FPU errata */ - if (KiIsNpxErrataPresent()) - { - /* Disable NPX support */ - KeI386NpxPresent = FALSE; - SharedUserData-> - ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = - TRUE; - break; - } - } - } - } - - /* If there's no NPX, then we're emulating the FPU */ - SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = - !KeI386NpxPresent; - - /* Check if there's no NPX, so that we can disable associated features */ - if (!KeI386NpxPresent) - { - /* Remove NPX-related bits */ - KeFeatureBits &= ~(KF_XMMI64 | KF_XMMI | KF_FXSR | KF_MMX); - - /* Disable kernel flags */ - KeI386FxsrPresent = KeI386XMMIPresent = FALSE; - - /* Disable processor features that might've been set until now */ - SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = - SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = - SharedUserData->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = - SharedUserData->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = - SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = 0; - } - - /* Check for CR4 support */ - if (KeFeatureBits & KF_CR4) - { - /* Do an IPI call to enable the Debug Exceptions */ - CpuCount = KeNumberProcessors; - KeIpiGenericCall(Ki386EnableDE, (ULONG_PTR)&CpuCount); - } - - /* Check if FXSR was found */ - if (KeFeatureBits & KF_FXSR) - { - /* Do an IPI call to enable the FXSR */ - CpuCount = KeNumberProcessors; - KeIpiGenericCall(Ki386EnableFxsr, (ULONG_PTR)&CpuCount); - - /* Check if XMM was found too */ - if (KeFeatureBits & KF_XMMI) - { - /* Do an IPI call to enable XMMI exceptions */ - CpuCount = KeNumberProcessors; - KeIpiGenericCall(Ki386EnableXMMIExceptions, (ULONG_PTR)&CpuCount); - - /* FIXME: Implement and enable XMM Page Zeroing for Mm */ - - /* Patch the RtlPrefetchMemoryNonTemporal routine to enable it */ - Protect = MmGetPageProtect(NULL, RtlPrefetchMemoryNonTemporal); - MmSetPageProtect(NULL, - RtlPrefetchMemoryNonTemporal, - Protect | PAGE_IS_WRITABLE); - *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; - MmSetPageProtect(NULL, RtlPrefetchMemoryNonTemporal, Protect); - } - } - - /* Check for, and enable SYSENTER support */ - KiRestoreFastSyscallReturnState(); - - /* Loop every CPU */ - i = KeActiveProcessors; - for (Affinity = 1; i; Affinity <<= 1) - { - /* Check if this is part of the set */ - if (i & Affinity) - { - /* Run on this CPU */ - i &= ~Affinity; - KeSetSystemAffinityThread(Affinity); - - /* Reset MHz to 0 for this CPU */ - KeGetCurrentPrcb()->MHz = 0; - - /* Check if we can use RDTSC */ - if (KeFeatureBits & KF_RDTSC) - { - /* Start sampling loop */ - for (;;) - { - /* Do a dummy CPUID to start the sample */ - CPUID(Dummy, 0); - - /* Fill out the starting data */ - CurrentSample->PerfStart = KeQueryPerformanceCounter(NULL); - CurrentSample->TSCStart = __rdtsc(); - CurrentSample->PerfFreq.QuadPart = -50000; - - /* Sleep for this sample */ - KeDelayExecutionThread(KernelMode, - FALSE, - &CurrentSample->PerfFreq); - - /* Do another dummy CPUID */ - CPUID(Dummy, 0); - - /* Fill out the ending data */ - CurrentSample->PerfEnd = - KeQueryPerformanceCounter(&CurrentSample->PerfFreq); - CurrentSample->TSCEnd = __rdtsc(); - - /* Calculate the differences */ - CurrentSample->PerfDelta = CurrentSample->PerfEnd.QuadPart - - CurrentSample->PerfStart.QuadPart; - CurrentSample->TSCDelta = CurrentSample->TSCEnd - - CurrentSample->TSCStart; - - /* Compute CPU Speed */ - CurrentSample->MHz = (ULONG)((CurrentSample->TSCDelta * - CurrentSample-> - PerfFreq.QuadPart + 500000) / - (CurrentSample->PerfDelta * - 1000000)); - - /* Check if this isn't the first sample */ - if (Sample) - { - /* Check if we got a good precision within 1MHz */ - if ((CurrentSample->MHz == CurrentSample[-1].MHz) || - (CurrentSample->MHz == CurrentSample[-1].MHz + 1) || - (CurrentSample->MHz == CurrentSample[-1].MHz - 1)) - { - /* We did, stop sampling */ - break; - } - } - - /* Move on */ - CurrentSample++; - Sample++; - - if (Sample == sizeof(Samples) / sizeof(Samples[0])) - { - /* Restart */ - CurrentSample = Samples; - Sample = 0; - } - } - - /* Save the CPU Speed */ - KeGetCurrentPrcb()->MHz = CurrentSample[-1].MHz; - } - - /* Check if we have MTRR */ - if (KeFeatureBits & KF_MTRR) - { - /* Then manually initialize MTRR for the CPU */ - KiInitializeMTRR(i ? FALSE : TRUE); - } - - /* Check if we have AMD MTRR and initialize it for the CPU */ - if (KeFeatureBits & KF_AMDK6MTRR) KiAmdK6InitializeMTRR(); - - /* Check if this is a buggy Pentium and apply the fixup if so */ - if (KiI386PentiumLockErrataPresent) KiI386PentiumLockErrataFixup(); - - /* Check if the CPU supports FXSR */ - if (KeFeatureBits & KF_FXSR) - { - /* Get the current thread NPX state */ - FxSaveArea = (PVOID) - ((ULONG_PTR)KeGetCurrentThread()->InitialStack - - NPX_FRAME_LENGTH); - - /* Clear initial MXCsr mask */ - FxSaveArea->U.FxArea.MXCsrMask = 0; - - /* Save the current NPX State */ -#ifdef __GNUC__ - asm volatile("fxsave %0\n\t" : "=m" (*FxSaveArea)); -#else - __asm fxsave [FxSaveArea] -#endif - /* Check if the current mask doesn't match the reserved bits */ - if (FxSaveArea->U.FxArea.MXCsrMask != 0) - { - /* Then use whatever it's holding */ - MXCsrMask = FxSaveArea->U.FxArea.MXCsrMask; - } - - /* Check if nobody set the kernel-wide mask */ - if (!KiMXCsrMask) - { - /* Then use the one we calculated above */ - KiMXCsrMask = MXCsrMask; - } - else - { - /* Was it set to the same value we found now? */ - if (KiMXCsrMask != MXCsrMask) - { - /* No, something is definitely wrong */ - KEBUGCHECKEX(MULTIPROCESSOR_CONFIGURATION_NOT_SUPPORTED, - KF_FXSR, - KiMXCsrMask, - MXCsrMask, - 0); - } - } - - /* Now set the kernel mask */ - KiMXCsrMask &= MXCsrMask; - } - } - } - - /* Return affinity back to where it was */ - KeRevertToUserAffinityThread(); - - /* NT allows limiting the duration of an ISR with a registry key */ - if (KiTimeLimitIsrMicroseconds) - { - /* FIXME: TODO */ - DPRINT1("ISR Time Limit not yet supported\n"); - } -#endif + if (KeFeatureBits & KF_PAT) + { + /* FIXME: Support this */ + DPRINT1("PAT support detected but not yet taken advantage of!\n"); + } + + } VOID @@ -407,6 +145,44 @@ VOID NTAPI +KiInitializeCpuFeatures(ULONG Cpu) +{ + ULONG FeatureBits; + + /* Get the processor features for this CPU */ + FeatureBits = KiGetFeatureBits(); + + /* Check if we support all needed features */ + if ((FeatureBits & REQUIRED_FEATURE_BITS) != REQUIRED_FEATURE_BITS) + { + /* If not, bugcheck system */ + FrLdrDbgPrint("CPU doesn't have needed features! Has: 0x%x, required: 0x%x\n", + FeatureBits, REQUIRED_FEATURE_BITS); + KeBugCheck(0); + } + + /* Set DEP to always on */ + SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSON; + FeatureBits |= KF_NX_ENABLED; + + /* Save feature bits */ + KeGetCurrentPrcb()->FeatureBits = FeatureBits; + + /* Enable fx save restore support */ + __writecr4(__readcr4() | CR4_FXSR); + + /* Enable XMMI exceptions */ + __writecr4(__readcr4() | CR4_XMMEXCPT); + + /* Enable Write-Protection */ + __writecr0(__readcr0() | CR0_WP); + + /* Disable fpu monitoring */ + __writecr0(__readcr0() & ~CR0_MP); +} + +VOID +NTAPI KiInitializeKernel(IN PKPROCESS InitProcess, IN PKTHREAD InitThread, IN PVOID IdleStack, @@ -414,7 +190,6 @@ IN CCHAR Number, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - ULONG FeatureBits; ULONG PageDirectory[2]; PVOID DpcStack; @@ -423,54 +198,6 @@ /* Initialize the Power Management Support for this PRCB */ // PoInitializePrcb(Prcb); - - /* Get the processor features for the CPU */ - FeatureBits = KiGetFeatureBits(); - - /* Check if we support all needed features */ - if ((FeatureBits & REQUIRED_FEATURE_BITS) != REQUIRED_FEATURE_BITS) - { - /* If not, bugcheck system */ - DPRINT1("CPU doesn't have needed features! Has: 0x%x, required: 0x%x\n", - FeatureBits, REQUIRED_FEATURE_BITS); - KeBugCheck(0); - } - - /* Set the default NX policy (opt-in) */ - SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_OPTIN; - - /* Check if NPX is always on */ - if (strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=ALWAYSON")) - { - /* Set it always on */ - SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSON; - FeatureBits |= KF_NX_ENABLED; - } - else if (strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=OPTOUT")) - { - /* Set it in opt-out mode */ - SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_OPTOUT; - FeatureBits |= KF_NX_ENABLED; - } - else if ((strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=OPTIN")) || - (strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE"))) - { - /* Set the feature bits */ - FeatureBits |= KF_NX_ENABLED; - } - else if ((strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=ALWAYSOFF")) || - (strstr(KeLoaderBlock->LoadOptions, "EXECUTE"))) - { - /* Set disabled mode */ - SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSOFF; - FeatureBits |= KF_NX_DISABLED; - } - - /* Save feature bits */ - Prcb->FeatureBits = FeatureBits; - - /* Initialize the CPU features */ - KiInitializeCpuFeatures(); /* Save CPU state */ KiSaveProcessorControlState(&Prcb->ProcessorState); @@ -490,15 +217,9 @@ KeNodeBlock[0]->ProcessorMask = Prcb->SetMember; /* Set boot-level flags */ - KeI386NpxPresent = TRUE; - KeI386CpuType = Prcb->CpuType; - KeI386CpuStep = Prcb->CpuStep; - KeProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; + KeProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; KeProcessorLevel = (USHORT)Prcb->CpuType; if (Prcb->CpuID) KeProcessorRevision = Prcb->CpuStep; - KeFeatureBits = FeatureBits; - KeI386FxsrPresent = (KeFeatureBits & KF_FXSR) ? TRUE : FALSE; - KeI386XMMIPresent = (KeFeatureBits & KF_XMMI) ? TRUE : FALSE; /* Set the current MP Master KPRCB to the Boot PRCB */ Prcb->MultiThreadSetMaster = Prcb; @@ -646,10 +367,7 @@ KeLoaderBlock = LoaderBlock; /* Get the current CPU number */ - Cpu = KeNumberProcessors++; - - /* Set active processors */ - KeActiveProcessors |= 1 << Cpu; + Cpu = KeNumberProcessors++; // FIXME /* LoaderBlock initialization for Cpu 0 */ if (Cpu == 0) @@ -677,10 +395,7 @@ Ke386SetFs(KGDT_32_R3_TEB | RPL_MASK); /* LDT is unused */ -// __lldt(0); - - /* Enable fx save restore support */ - __writecr4(__readcr4() | CR4_FXSR); + __lldt(0); /* Align stack to 16 bytes */ LoaderBlock->KernelStack &= ~(16 - 1); @@ -697,6 +412,9 @@ /* Initialize the PCR */ KiInitializePcr(Pcr, Cpu, InitialThread, KiDoubleFaultStack); + + /* Initialize the CPU features */ + KiInitializeCpuFeatures(Cpu); /* Initial setup for the boot CPU */ if (Cpu == 0) @@ -721,21 +439,26 @@ while (!KdPollBreakIn()); DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); #endif - } DPRINT("Pcr = %p, Gdt = %p, Idt = %p, Tss = %p\n", Pcr, Pcr->GdtBase, Pcr->IdtBase, Pcr->TssBase); + /* Acquire lock */ + while (InterlockedBitTestAndSet64((PLONG64)&KiFreezeExecutionLock, 0)) + { + /* Loop until lock is free */ + while ((*(volatile KSPIN_LOCK*)&KiFreezeExecutionLock) & 1); + } + /* Initialize the Processor with HAL */ HalInitializeProcessor(Cpu, KeLoaderBlock); - /* Loop until we can release the freeze lock */ - do - { - /* Loop until execution can continue */ - while (*(volatile PKSPIN_LOCK*)&KiFreezeExecutionLock == (PVOID)1); - } while(InterlockedBitTestAndSet64((PLONG64)&KiFreezeExecutionLock, 0)); + /* Set processor as active */ + KeActiveProcessors |= 1 << Cpu; + + /* Release lock */ + InterlockedAnd64((PLONG64)&KiFreezeExecutionLock, 0); /* Raise to HIGH_LEVEL */ KfRaiseIrql(HIGH_LEVEL); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c [iso-8859-1] Sat Jan 16 05:36:56 2010 @@ -81,9 +81,6 @@ /* Setup the Fx Area */ //FxSaveArea = &InitFrame->FxSaveArea; - /* Check if we support FXsr */ -// if (KeI386FxsrPresent) -// { // /* Get the FX Save Format Area */ // FxSaveFormat = (PFXSAVE_FORMAT)Context->ExtendedRegisters; // @@ -96,41 +93,19 @@ // FxSaveFormat->DataOffset = 0; // FxSaveFormat->DataSelector = 0; // FxSaveFormat->MXCsr = 0x1F80; -// } -// else -// { -// /* Setup the regular save area */ -// Context->FloatSave.ControlWord = 0x27F; -// Context->FloatSave.StatusWord = 0; -// Context->FloatSave.TagWord = -1; -// Context->FloatSave.ErrorOffset = 0; -// Context->FloatSave.ErrorSelector = 0; -// Context->FloatSave.DataOffset =0; -// Context->FloatSave.DataSelector = 0; -// } - /* Check if the CPU has NPX */ - if (KeI386NpxPresent) - { - /* Set an intial NPX State */ - //Context->FloatSave.Cr0NpxState = 0; - //FxSaveArea->Cr0NpxState = 0; - //FxSaveArea->NpxSavedCpu = 0; + /* Set an intial NPX State */ + //Context->FloatSave.Cr0NpxState = 0; + //FxSaveArea->Cr0NpxState = 0; + //FxSaveArea->NpxSavedCpu = 0; - /* Now set the context flags depending on XMM support */ - //ContextFlags |= (KeI386FxsrPresent) ? CONTEXT_EXTENDED_REGISTERS : - // CONTEXT_FLOATING_POINT; + /* Now set the context flags depending on XMM support */ + //ContextFlags |= (KeI386FxsrPresent) ? CONTEXT_EXTENDED_REGISTERS : + // CONTEXT_FLOATING_POINT; - /* Set the Thread's NPX State */ - Thread->NpxState = 0xA; - Thread->DispatcherHeader.NpxIrql = PASSIVE_LEVEL; - } - else - { - /* We'll use emulation */ - //FxSaveArea->Cr0NpxState = CR0_EM; - Thread->NpxState = 0xA &~ CR0_MP; - } + /* Set the Thread's NPX State */ + Thread->NpxState = 0xA; + Thread->DispatcherHeader.NpxIrql = PASSIVE_LEVEL; /* Disable any debug regiseters */ Context->ContextFlags &= ~CONTEXT_DEBUG_REGISTERS; @@ -179,19 +154,10 @@ //RtlZeroMemory(FxSaveArea, sizeof(FX_SAVE_AREA)); /* Check if we have Fxsr support */ - if (KeI386FxsrPresent) - { - DPRINT1("FxsrPresent but did nothing\n"); -// /* Set the stub FX area */ -// FxSaveArea->U.FxArea.ControlWord = 0x27F; -// FxSaveArea->U.FxArea.MXCsr = 0x1F80; -// } -// else -// { -// /* Set the stub FN area */ -// FxSaveArea->U.FnArea.ControlWord = 0x27F; -// FxSaveArea->U.FnArea.TagWord = -1; - } + DPRINT1("FxsrPresent but did nothing\n"); +// /* Set the stub FX area */ +// FxSaveArea->U.FxArea.ControlWord = 0x27F; +// FxSaveArea->U.FxArea.MXCsr = 0x1F80; /* No NPX State */ Thread->NpxState = 0xA;

14 years, 8 months

[cgutman] 45094: - Fix ECHO_REPLY_HEADER which was corrupting incoming packets (fixes displaying reply time) - Fix a bug in the packet waiting code - Display the IP address if getnameinfo fails - tracert is actually useful now

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 16 04:30:10 2010 New Revision: 45094 URL: http://svn.reactos.org/svn/reactos?rev=45094&view=rev Log: - Fix ECHO_REPLY_HEADER which was corrupting incoming packets (fixes displaying reply time) - Fix a bug in the packet waiting code - Display the IP address if getnameinfo fails - tracert is actually useful now Modified: branches/aicom-network-branch/base/applications/network/tracert/tracert.c branches/aicom-network-branch/base/applications/network/tracert/tracert.h Modified: branches/aicom-network-branch/base/applications/network/tracert/tracert.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/base/appli… ============================================================================== --- branches/aicom-network-branch/base/applications/network/tracert/tracert.c [iso-8859-1] (original) +++ branches/aicom-network-branch/base/applications/network/tracert/tracert.c [iso-8859-1] Sat Jan 16 04:30:10 2010 @@ -377,7 +377,6 @@ /* cast the recieved packet into an ECHO reply and a TTL Exceed and check the ID*/ ECHO_REPLY_HEADER *IcmpHdr = (ECHO_REPLY_HEADER *)((char*)pInfo->RecvPacket + header_len); - TTL_EXCEED_HEADER *TTLExceedHdr = (TTL_EXCEED_HEADER *)((char *)pInfo->RecvPacket + header_len); /* Make sure the reply is ok */ if (PACKET_SIZE < header_len + ICMP_MIN_SIZE) @@ -389,13 +388,6 @@ switch (IcmpHdr->icmpheader.type) { case TTL_EXCEEDED : - if (TTLExceedHdr->OrigIcmpHeader.id != (USHORT)GetCurrentProcessId()) - { - /* FIXME: our network stack shouldn't allow this... */ - /* we've picked up a packet not related to this process probably from another local program. We ignore it */ - DebugPrint(_T("Rouge packet: header id, process id %d"), TTLExceedHdr->OrigIcmpHeader.id, GetCurrentProcessId()); - return -1; - } _tprintf(_T("%3ld ms"), (ULONG)((pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart)); return 0; @@ -415,7 +407,7 @@ return 2; } - return 0; + return -3; } @@ -513,11 +505,9 @@ if (iRecieveReturn) { - DecodeResponse(pInfo); + if (DecodeResponse(pInfo) < 0) + bAwaitPacket = TRUE; } - else - /* packet timed out. Don't wait for it again */ - bAwaitPacket = FALSE; } while (bAwaitPacket); } @@ -559,6 +549,7 @@ { DebugPrint(_T("error: %d"), WSAGetLastError()); DebugPrint(_T(" getnameinfo failed: %d"), iNameInfoRet); + _tprintf(_T("%s"), inet_ntoa(pInfo->source.sin_addr)); } } Modified: branches/aicom-network-branch/base/applications/network/tracert/tracert.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/base/appli… ============================================================================== --- branches/aicom-network-branch/base/applications/network/tracert/tracert.h [iso-8859-1] (original) +++ branches/aicom-network-branch/base/applications/network/tracert/tracert.h [iso-8859-1] Sat Jan 16 04:30:10 2010 @@ -50,20 +50,11 @@ USHORT seq; // not used in time exceeded } ICMP_HEADER, *PICMP_HEADER; -/* ICMP Echo Reply Header, 12 bytes */ +/* ICMP Echo Reply Header */ typedef struct EchoReplyHeader { - struct timeval timestamp; struct ICMPHeader icmpheader; } ECHO_REPLY_HEADER, *PECHO_REPLY_HEADER; - -/* ICMP Echo Reply Header, 12 bytes */ -typedef struct TTLExceedHeader -{ - struct ICMPHeader icmpheader; - struct IPv4Header ipheader; - struct ICMPHeader OrigIcmpHeader; -} TTL_EXCEED_HEADER, *PTTL_EXCEED_HEADER; #include <poppack.h>

14 years, 8 months

[cgutman] 45093: [TDILIB, IPHLPAPI, WSHTCPIP] - Move the TDI stuff from iphlpapi to a shared library called tdilib [IP] - Implement tcpip side of IP_HDRINCL [PSDK, WSHTCPIP, WSHIRDA] - Fix definition of WSHGetSocketInformation [PSDK] - Add AO_OPTION_* defines [WSHTCPIP] - Request notifications for bind also - Implement WSHSetSocketInformation [MSAFD] - Implement event notifications (bonus: fixes a memory leak on socket closure due to unfreed helper context) - Store TdiConnectionHandle the same w

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 16 01:05:15 2010 New Revision: 45093 URL: http://svn.reactos.org/svn/reactos?rev=45093&view=rev Log: [TDILIB, IPHLPAPI, WSHTCPIP] - Move the TDI stuff from iphlpapi to a shared library called tdilib [IP] - Implement tcpip side of IP_HDRINCL [PSDK, WSHTCPIP, WSHIRDA] - Fix definition of WSHGetSocketInformation [PSDK] - Add AO_OPTION_* defines [WSHTCPIP] - Request notifications for bind also - Implement WSHSetSocketInformation [MSAFD] - Implement event notifications (bonus: fixes a memory leak on socket closure due to unfreed helper context) - Store TdiConnectionHandle the same way we store TdiAddressHandle - Half-plement WSPSetSockOpt - Fix WSPGetSockOpt [TCPIP] - Handle AO_OPTION_TTL, AO_OPTION_IP_DONTFRAGMENT (not working yet), AO_OPTION_BROADCAST (not working yet), and AO_OPTION_IP_HDRINCL - Add new members of ADDRESS_FILE for the preceding AO options [AFD] - Return the connection handle in the Information of the IOSB (same as we do with the address file handle) [GENERAL] - Tracert works now Added: branches/aicom-network-branch/lib/tdilib/ branches/aicom-network-branch/lib/tdilib/enum.c (with props) branches/aicom-network-branch/lib/tdilib/handle.c (with props) branches/aicom-network-branch/lib/tdilib/tdilib.h (with props) branches/aicom-network-branch/lib/tdilib/tdilib.rbuild (with props) Modified: branches/aicom-network-branch/dll/win32/iphlpapi/ifenum_reactos.c branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi.rbuild branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi_private.h branches/aicom-network-branch/dll/win32/msafd/misc/dllmain.c branches/aicom-network-branch/dll/win32/msafd/misc/stubs.c branches/aicom-network-branch/dll/win32/wshirda/wshirda.c branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.c branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.h branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.rbuild branches/aicom-network-branch/drivers/network/afd/afd/connect.c branches/aicom-network-branch/drivers/network/tcpip/include/titypes.h branches/aicom-network-branch/drivers/network/tcpip/tcpip/ainfo.c branches/aicom-network-branch/drivers/network/tcpip/tcpip/fileobjs.c branches/aicom-network-branch/include/psdk/tcpioctl.h branches/aicom-network-branch/include/psdk/wsahelp.h branches/aicom-network-branch/lib/drivers/ip/transport/datagram/datagram.c branches/aicom-network-branch/lib/lib.rbuild Modified: branches/aicom-network-branch/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -45,9 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); -/* Globals */ -const PWCHAR TcpFileName = L"\\Device\\Tcp"; - /* Functions */ /* I'm a bit skittish about maintaining this info in memory, as I'd rather @@ -62,171 +59,6 @@ void interfaceMapFree(void) { /* Ditto. */ -} - -NTSTATUS openTcpFile(PHANDLE tcpFile) { - UNICODE_STRING fileName; - OBJECT_ATTRIBUTES objectAttributes; - IO_STATUS_BLOCK ioStatusBlock; - NTSTATUS status; - - TRACE("called.\n"); - - /* Shamelessly ripped from CreateFileW */ - RtlInitUnicodeString( &fileName, TcpFileName ); - - InitializeObjectAttributes( &objectAttributes, - &fileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL ); - - status = ZwCreateFile( tcpFile, - SYNCHRONIZE | GENERIC_EXECUTE | - GENERIC_READ | GENERIC_WRITE, - &objectAttributes, - &ioStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_OPEN_IF, - FILE_SYNCHRONOUS_IO_NONALERT, - 0, - 0 ); - - /* String does not need to be freed: it points to the constant - * string we provided */ - - if (!NT_SUCCESS(status)) { - ERR("openTcpFile for <%wZ> failed: 0x%lx\n", &fileName, status); - *tcpFile = INVALID_HANDLE_VALUE; - } - - return status; -} - -void closeTcpFile( HANDLE h ) { - TRACE("called.\n"); - ASSERT(h != INVALID_HANDLE_VALUE); - ZwClose( h ); -} - -/* A generic thing-getting function which interacts in the right way with - * TDI. This may seem oblique, but I'm using it to reduce code and hopefully - * make this thing easier to debug. - * - * The things returned can be any of: - * TDIEntityID - * TDIObjectID - * IFEntry - * IPSNMPInfo - * IPAddrEntry - * IPInterfaceInfo - */ -NTSTATUS tdiGetSetOfThings( HANDLE tcpFile, - DWORD toiClass, - DWORD toiType, - DWORD toiId, - DWORD teiEntity, - DWORD teiInstance, - DWORD fixedPart, - DWORD entrySize, - PVOID *tdiEntitySet, - PDWORD numEntries ) { - TCP_REQUEST_QUERY_INFORMATION_EX req = TCP_REQUEST_QUERY_INFORMATION_INIT; - PVOID entitySet = 0; - NTSTATUS status = STATUS_SUCCESS; - DWORD allocationSizeForEntityArray = entrySize * MAX_TDI_ENTITIES, - arraySize = entrySize * MAX_TDI_ENTITIES; - - TRACE("TdiGetSetOfThings(tcpFile %x,toiClass %x,toiType %x,toiId %x," - "teiEntity %x,fixedPart %d,entrySize %d)\n", - (int)tcpFile, - (int)toiClass, - (int)toiType, - (int)toiId, - (int)teiEntity, - (int)fixedPart, - (int)entrySize ); - - req.ID.toi_class = toiClass; - req.ID.toi_type = toiType; - req.ID.toi_id = toiId; - req.ID.toi_entity.tei_entity = teiEntity; - req.ID.toi_entity.tei_instance = teiInstance; - - /* There's a subtle problem here... - * If an interface is added at this exact instant, (as if by a PCMCIA - * card insertion), the array will still not have enough entries after - * have allocated it after the first DeviceIoControl call. - * - * We'll get around this by repeating until the number of interfaces - * stabilizes. - */ - do { - assert( !entitySet ); /* We must not have an entity set allocated */ - status = DeviceIoControl( tcpFile, - IOCTL_TCP_QUERY_INFORMATION_EX, - &req, - sizeof(req), - 0, - 0, - &allocationSizeForEntityArray, - NULL ); - - if(!NT_SUCCESS(status)) - { - ERR("IOCTL Failed\n"); - return STATUS_UNSUCCESSFUL; - } - - arraySize = allocationSizeForEntityArray; - entitySet = HeapAlloc( GetProcessHeap(), 0, arraySize ); - - if( !entitySet ) { - status = STATUS_INSUFFICIENT_RESOURCES; - WARN("TdiGetSetOfThings() => %08x\n", (int)status); - return status; - } - - status = DeviceIoControl( tcpFile, - IOCTL_TCP_QUERY_INFORMATION_EX, - &req, - sizeof(req), - entitySet, - arraySize, - &allocationSizeForEntityArray, - NULL ); - - /* This is why we have the loop -- we might have added an adapter */ - if( arraySize == allocationSizeForEntityArray ) - break; - - HeapFree( GetProcessHeap(), 0, entitySet ); - entitySet = 0; - - if(!status) - { - WARN("IOCTL Failed\n"); - return STATUS_UNSUCCESSFUL; - } - - WARN("TdiGetSetOfThings(): Array changed size: %d -> %d.\n", - arraySize, allocationSizeForEntityArray ); - } while( TRUE ); /* We break if the array we received was the size we - * expected. Therefore, we got here because it wasn't */ - - *numEntries = (arraySize - fixedPart) / entrySize; - *tdiEntitySet = entitySet; - - WARN("TdiGetSetOfThings() => Success: %d things @ %08x\n", - (int)*numEntries, (int)entitySet); - - return STATUS_SUCCESS; -} - -VOID tdiFreeThingSet( PVOID things ) { - HeapFree( GetProcessHeap(), 0, things ); } NTSTATUS tdiGetMibForIfEntity @@ -283,33 +115,6 @@ return STATUS_SUCCESS; } -NTSTATUS tdiGetEntityIDSet( HANDLE tcpFile, - TDIEntityID **entitySet, - PDWORD numEntities ) { - NTSTATUS status = tdiGetSetOfThings( tcpFile, - INFO_CLASS_GENERIC, - INFO_TYPE_PROVIDER, - ENTITY_LIST_ID, - GENERIC_ENTITY, - 0, - 0, - sizeof(TDIEntityID), - (PVOID *)entitySet, - numEntities ); - if( NT_SUCCESS(status) ) { - int i; - - for( i = 0; i < *numEntities; i++ ) { - TRACE("%-4d: %04x:%08x\n", - i, - (*entitySet)[i].tei_entity, - (*entitySet)[i].tei_instance ); - } - } - - return status; -} - BOOL isInterface( TDIEntityID *if_maybe ) { return if_maybe->tei_entity == IF_ENTITY; Modified: branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi.rbuild [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi.rbuild [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -3,12 +3,14 @@ <include base="iphlpapi">.</include> <include base="ReactOS">include/reactos/wine</include> <include base="dhcp">include</include> + <include base="tdilib">.</include> <library>wine</library> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> <library>ws2_32</library> <library>dhcpcsvc</library> + <library>tdilib</library> <file>dhcp_reactos.c</file> <file>ifenum_reactos.c</file> <file>ipstats_reactos.c</file> Modified: branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -36,6 +36,8 @@ //#include "ntddndis.h" #include "ddk/tdiinfo.h" #include "tcpioctl.h" + +#include "tdilib.h" #ifndef ETH_ALEN #define ETH_ALEN 6 @@ -120,20 +122,9 @@ } IPHLPAddrType; /** Prototypes **/ -NTSTATUS openTcpFile(PHANDLE tcpFile); -VOID closeTcpFile(HANDLE tcpFile); -NTSTATUS tdiGetEntityIDSet( HANDLE tcpFile, TDIEntityID **entitySet, - PDWORD numEntities ); -NTSTATUS tdiGetSetOfThings( HANDLE tcpFile, DWORD toiClass, DWORD toiType, - DWORD toiId, DWORD teiEntity, DWORD teiInstance, - DWORD fixedPart, - DWORD entrySize, PVOID *tdiEntitySet, - PDWORD numEntries ); -VOID tdiFreeThingSet( PVOID things ); NTSTATUS getNthIpEntity( HANDLE tcpFile, DWORD index, TDIEntityID *ent ); NTSTATUS tdiGetIpAddrsForIpEntity( HANDLE tcpFile, TDIEntityID *ent, IPAddrEntry **addrs, PDWORD numAddrs ); - int GetLongestChildKeyName( HANDLE RegHandle ); LONG OpenChildKeyRead( HANDLE RegHandle, PWCHAR ChildKeyName, Modified: branches/aicom-network-branch/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -426,6 +426,22 @@ /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); + if (Socket->HelperEvents & WSH_NOTIFY_CLOSE) + { + Status = Socket->HelperData->WSHNotify(Socket->HelperContext, + Socket->Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + WSH_NOTIFY_CLOSE); + + if (Status) + { + if (lpErrno) *lpErrno = Status; + NtClose(SockEvent); + return SOCKET_ERROR; + } + } + /* If a Close is already in Process, give up */ if (Socket->SharedData.State == SocketClosed) { @@ -517,11 +533,10 @@ if (Status == STATUS_PENDING) { WaitForSingleObject(SockEvent, INFINITE); + Status = IoStatusBlock.Status; } } } - - /* FIXME: We should notify the Helper DLL of WSH_NOTIFY_CLOSE */ /* Cleanup Time! */ Socket->HelperContext = NULL; @@ -635,6 +650,21 @@ NtClose( SockEvent ); + if (Status == STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_BIND)) + { + Status = Socket->HelperData->WSHNotify(Socket->HelperContext, + Socket->Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + WSH_NOTIFY_BIND); + + if (Status) + { + if (lpErrno) *lpErrno = Status; + return SOCKET_ERROR; + } + } + return MsafdReturnWithErrno ( Status, lpErrno, 0, NULL ); } @@ -693,6 +723,21 @@ Socket->SharedData.Listening = TRUE; NtClose( SockEvent ); + + if (Status == STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_LISTEN)) + { + Status = Socket->HelperData->WSHNotify(Socket->HelperContext, + Socket->Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + WSH_NOTIFY_LISTEN); + + if (Status) + { + if (lpErrno) *lpErrno = Status; + return SOCKET_ERROR; + } + } return MsafdReturnWithErrno ( Status, lpErrno, 0, NULL ); } @@ -1277,6 +1322,21 @@ AFD_DbgPrint(MID_TRACE,("Socket %x\n", AcceptSocket)); + if (Status == STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_ACCEPT)) + { + Status = Socket->HelperData->WSHNotify(Socket->HelperContext, + Socket->Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + WSH_NOTIFY_ACCEPT); + + if (Status) + { + if (lpErrno) *lpErrno = Status; + return INVALID_SOCKET; + } + } + *lpErrno = 0; /* Return Socket */ @@ -1433,6 +1493,8 @@ Status = IOSB.Status; } + Socket->TdiConnectionHandle = (HANDLE)IOSB.Information; + /* Get any pending connect data */ if (lpCalleeData != NULL) { @@ -1463,6 +1525,35 @@ AFD_DbgPrint(MID_TRACE,("Ending\n")); NtClose( SockEvent ); + + if (Status == STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_CONNECT)) + { + Status = Socket->HelperData->WSHNotify(Socket->HelperContext, + Socket->Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + WSH_NOTIFY_CONNECT); + + if (Status) + { + if (lpErrno) *lpErrno = Status; + return SOCKET_ERROR; + } + } + else if (Status != STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_CONNECT_ERROR)) + { + Status = Socket->HelperData->WSHNotify(Socket->HelperContext, + Socket->Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + WSH_NOTIFY_CONNECT_ERROR); + + if (Status) + { + if (lpErrno) *lpErrno = Status; + return SOCKET_ERROR; + } + } return MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); } @@ -1850,11 +1941,52 @@ case IPPROTO_TCP: /* FIXME */ default: - *lpErrno = WSAEINVAL; - return SOCKET_ERROR; + *lpErrno = Socket->HelperData->WSHGetSocketInformation(Socket->HelperContext, + Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + Level, + OptionName, + OptionValue, + (LPINT)OptionLength); + return (*lpErrno == 0) ? 0 : SOCKET_ERROR; } } +INT +WSPAPI +WSPSetSockOpt( + IN SOCKET s, + IN INT level, + IN INT optname, + IN CONST CHAR FAR* optval, + IN INT optlen, + OUT LPINT lpErrno) +{ + PSOCKET_INFORMATION Socket; + + /* Get the Socket Structure associate to this Socket*/ + Socket = GetSocketStructure(s); + if (Socket == NULL) + { + *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + + + /* FIXME: We should handle some cases here */ + + + *lpErrno = Socket->HelperData->WSHSetSocketInformation(Socket->HelperContext, + s, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + level, + optname, + (PCHAR)optval, + optlen); + return (*lpErrno == 0) ? 0 : SOCKET_ERROR; +} /* * FUNCTION: Initialize service provider for a client Modified: branches/aicom-network-branch/dll/win32/msafd/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/msafd/misc/stubs.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/msafd/misc/stubs.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -100,22 +100,6 @@ return (SOCKET)0; } - -INT -WSPAPI -WSPSetSockOpt( - IN SOCKET s, - IN INT level, - IN INT optname, - IN CONST CHAR FAR* optval, - IN INT optlen, - OUT LPINT lpErrno) -{ - UNIMPLEMENTED - - return 0; -} - INT WSPAPI WSPStringToAddress( Modified: branches/aicom-network-branch/dll/win32/wshirda/wshirda.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/wshirda/wshirda.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/wshirda/wshirda.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -91,7 +91,7 @@ IN INT Level, IN INT OptionName, OUT PCHAR OptionValue, - OUT INT OptionLength) + OUT LPINT OptionLength) { UNIMPLEMENTED Modified: branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -156,9 +156,39 @@ return NO_ERROR; } - - - +UINT +GetAddressOption(INT Level, INT OptionName) +{ + switch (Level) + { + case IPPROTO_IP: + switch (OptionName) + { + case IP_TTL: + return AO_OPTION_TTL; + + case IP_DONTFRAGMENT: + return AO_OPTION_IP_DONTFRAGMENT; + +#if 0 + case IP_RECEIVE_BROADCAST: + return AO_OPTION_BROADCAST; +#endif + + case IP_HDRINCL: + return AO_OPTION_IP_HDRINCL; + + default: + DPRINT1("Unknown option name for IPPROTO_IP: %d\n", OptionName); + return 0; + } + break; + + default: + DPRINT1("Unknown level: %d\n", Level); + return 0; + } +} INT EXPORT @@ -170,7 +200,7 @@ IN INT Level, IN INT OptionName, OUT PCHAR OptionValue, - OUT INT OptionLength) + OUT LPINT OptionLength) { UNIMPLEMENTED @@ -309,6 +339,37 @@ return NO_ERROR; } +INT +SendRequest( + IN PVOID Request, + IN DWORD RequestSize, + IN DWORD IOCTL) +{ + BOOLEAN Status; + HANDLE TcpCC; + DWORD BytesReturned; + + if (openTcpFile(&TcpCC) != STATUS_SUCCESS) + return WSAEINVAL; + + Status = DeviceIoControl(TcpCC, + IOCTL, + Request, + RequestSize, + NULL, + 0, + &BytesReturned, + NULL); + + closeTcpFile(TcpCC); + + DPRINT("DeviceIoControl: %d\n", ((Status == TRUE) ? 0 : GetLastError())); + + if (!Status) + return WSAEINVAL; + + return NO_ERROR; +} INT EXPORT @@ -319,15 +380,86 @@ IN HANDLE TdiConnectionObjectHandle, IN DWORD NotifyEvent) { + PSOCKET_CONTEXT Context = HelperDllSocketContext; + NTSTATUS Status; + HANDLE TcpCC; + TDIEntityID *EntityIDs; + DWORD EntityCount, i; + PQUEUED_REQUEST QueuedRequest, NextQueuedRequest; + switch (NotifyEvent) { case WSH_NOTIFY_CLOSE: - HeapFree(GetProcessHeap(), 0, HelperDllSocketContext); - break; - + DPRINT("WSHNotify: WSH_NOTIFY_CLOSE\n"); + QueuedRequest = Context->RequestQueue; + while (QueuedRequest) + { + NextQueuedRequest = QueuedRequest->Next; + + HeapFree(GetProcessHeap(), 0, QueuedRequest->Info); + HeapFree(GetProcessHeap(), 0, QueuedRequest); + + QueuedRequest = NextQueuedRequest; + } + HeapFree(GetProcessHeap(), 0, HelperDllSocketContext); + break; + + + case WSH_NOTIFY_BIND: + DPRINT("WSHNotify: WSH_NOTIFY_BIND\n"); + Status = openTcpFile(&TcpCC); + if (Status != STATUS_SUCCESS) + return WSAEINVAL; + + Status = tdiGetEntityIDSet(TcpCC, + &EntityIDs, + &EntityCount); + + closeTcpFile(TcpCC); + + if (Status != STATUS_SUCCESS) + return WSAEINVAL; + + for (i = 0; i < EntityCount; i++) + { + if (EntityIDs[i].tei_entity == CO_TL_ENTITY || + EntityIDs[i].tei_entity == CL_TL_ENTITY || + EntityIDs[i].tei_entity == ER_ENTITY) + { + Context->AddrFileInstance = EntityIDs[i].tei_instance; + Context->AddrFileEntityType = EntityIDs[i].tei_entity; + } + } + + DPRINT("Instance: %x Type: %x\n", Context->AddrFileInstance, Context->AddrFileEntityType); + + tdiFreeThingSet(EntityIDs); + + Context->SocketState = SocketStateBound; + + QueuedRequest = Context->RequestQueue; + while (QueuedRequest) + { + QueuedRequest->Info->ID.toi_entity.tei_entity = Context->AddrFileEntityType; + QueuedRequest->Info->ID.toi_entity.tei_instance = Context->AddrFileInstance; + + SendRequest(QueuedRequest->Info, + sizeof(*QueuedRequest->Info) + QueuedRequest->Info->BufferSize, + IOCTL_TCP_SET_INFORMATION_EX); + + NextQueuedRequest = QueuedRequest->Next; + + HeapFree(GetProcessHeap(), 0, QueuedRequest->Info); + HeapFree(GetProcessHeap(), 0, QueuedRequest); + + QueuedRequest = NextQueuedRequest; + } + Context->RequestQueue = NULL; + break; + default: - DPRINT1("Unwanted notification received! (%d)\n", NotifyEvent); - break; + DPRINT1("Unwanted notification received! (%d)\n", NotifyEvent); + break; } return NO_ERROR; @@ -450,7 +582,7 @@ /* Setup a socket context area */ - Context = HeapAlloc(GetProcessHeap(), 0, sizeof(SOCKET_CONTEXT)); + Context = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SOCKET_CONTEXT)); if (!Context) { RtlFreeUnicodeString(TransportDeviceName); return WSAENOBUFS; @@ -460,13 +592,13 @@ Context->SocketType = *SocketType; Context->Protocol = *Protocol; Context->Flags = Flags; + Context->SocketState = SocketStateCreated; *HelperDllSocketContext = Context; - *NotificationEvents = WSH_NOTIFY_CLOSE; - - return NO_ERROR; -} - + *NotificationEvents = WSH_NOTIFY_CLOSE | WSH_NOTIFY_BIND; + + return NO_ERROR; +} INT EXPORT @@ -480,9 +612,74 @@ IN PCHAR OptionValue, IN INT OptionLength) { - UNIMPLEMENTED - - return NO_ERROR; + PSOCKET_CONTEXT Context = HelperDllSocketContext; + UINT RealOptionName; + INT Status; + PTCP_REQUEST_SET_INFORMATION_EX Info; + PQUEUED_REQUEST Queued, NextQueued; + + DPRINT("WSHSetSocketInformation\n"); + + /* FIXME: We only handle address file object here */ + + RealOptionName = GetAddressOption(Level, OptionName); + if (!RealOptionName) + return WSAEINVAL; + + Info = HeapAlloc(GetProcessHeap(), 0, sizeof(*Info) + OptionLength); + if (!Info) + return WSAENOBUFS; + + Info->ID.toi_entity.tei_entity = Context->AddrFileEntityType; + Info->ID.toi_entity.tei_instance = Context->AddrFileInstance; + Info->ID.toi_class = INFO_CLASS_PROTOCOL; + Info->ID.toi_type = INFO_TYPE_ADDRESS_OBJECT; + Info->ID.toi_id = RealOptionName; + Info->BufferSize = OptionLength; + memcpy(Info->Buffer, OptionValue, OptionLength); + + if (Context->SocketState == SocketStateCreated) + { + if (Context->RequestQueue) + { + Queued = Context->RequestQueue; + while ((NextQueued = Queued->Next)) + { + Queued = NextQueued; + } + + Queued->Next = HeapAlloc(GetProcessHeap(), 0, sizeof(QUEUED_REQUEST)); + if (!Queued->Next) + { + HeapFree(GetProcessHeap(), 0, Info); + return WSAENOBUFS; + } + + NextQueued = Queued->Next; + NextQueued->Next = NULL; + NextQueued->Info = Info; + } + else + { + Context->RequestQueue = HeapAlloc(GetProcessHeap(), 0, sizeof(QUEUED_REQUEST)); + if (!Context->RequestQueue) + { + HeapFree(GetProcessHeap(), 0, Info); + return WSAENOBUFS; + } + + Context->RequestQueue->Next = NULL; + Context->RequestQueue->Info = Info; + } + + return 0; + } + + Status = SendRequest(Info, sizeof(*Info) + Info->BufferSize, IOCTL_TCP_SET_INFORMATION_EX); + + HeapFree(GetProcessHeap(), 0, Info); + + return Status; } Modified: branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.h [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.h [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -9,6 +9,10 @@ #define WIN32_NO_STATUS #include <wsahelp.h> +#include <tdiinfo.h> +#include <tcpioctl.h> +#include <tdilib.h> +#include <ws2tcpip.h> #include <rtlfuncs.h> #define EXPORT WINAPI @@ -17,12 +21,27 @@ #define DD_UDP_DEVICE_NAME L"\\Device\\Udp" #define DD_RAW_IP_DEVICE_NAME L"\\Device\\RawIp" +typedef enum _SOCKET_STATE { + SocketStateCreated, + SocketStateBound, + SocketStateListening, + SocketStateConnected +} SOCKET_STATE, *PSOCKET_STATE; + +typedef struct _QUEUED_REQUEST { + PTCP_REQUEST_SET_INFORMATION_EX Info; + PVOID Next; +} QUEUED_REQUEST, *PQUEUED_REQUEST; typedef struct _SOCKET_CONTEXT { INT AddressFamily; INT SocketType; INT Protocol; DWORD Flags; + DWORD AddrFileEntityType; + DWORD AddrFileInstance; + SOCKET_STATE SocketState; + PQUEUED_REQUEST RequestQueue; } SOCKET_CONTEXT, *PSOCKET_CONTEXT; #endif /* __WSHTCPIP_H */ Modified: branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.rbuild [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.rbuild [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -3,9 +3,11 @@ <module name="wshtcpip" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_WSHTCPIP}" installbase="system32" installname="wshtcpip.dll" unicode="yes"> <importlibrary definition="wshtcpip.spec" /> <include base="wshtcpip">.</include> + <include base="tdilib">.</include> <library>ntdll</library> <library>kernel32</library> <library>ws2_32</library> + <library>tdilib</library> <file>wshtcpip.c</file> <file>wshtcpip.rc</file> </module> Modified: branches/aicom-network-branch/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/afd/afd/connect.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -302,7 +302,7 @@ NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); AFD_DbgPrint(MID_TRACE,("Completing connect %x\n", NextIrp)); NextIrp->IoStatus.Status = Status; - NextIrp->IoStatus.Information = 0; + NextIrp->IoStatus.Information = NT_SUCCESS(Status) ? ((ULONG_PTR)FCB->Connection.Handle) : 0; if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); Modified: branches/aicom-network-branch/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/tcpip/include/titypes.h [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/tcpip/include/titypes.h [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -136,6 +136,9 @@ USHORT Protocol; /* Protocol number */ USHORT Port; /* Network port (network byte order) */ UCHAR TTL; /* Time to live stored in packets sent from this address file */ + UINT DF; /* Don't fragment */ + UINT BCast; /* Receive broadcast packets */ + UINT HeaderIncl; /* Include header in RawIP packets */ WORK_QUEUE_ITEM WorkItem; /* Work queue item handle */ DATAGRAM_COMPLETION_ROUTINE Complete; /* Completion routine for delete request */ PVOID Context; /* Delete request context */ Modified: branches/aicom-network-branch/drivers/network/tcpip/tcpip/ainfo.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/tcpip/tcpip/ainfo.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/tcpip/tcpip/ainfo.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -13,21 +13,50 @@ PVOID Buffer, UINT BufferSize) { - //KIRQL OldIrql; + KIRQL OldIrql; switch (ID->toi_id) { -#if 0 case AO_OPTION_TTL: - if (BufferSize < sizeof(UCHAR)) + if (BufferSize < sizeof(UINT)) return TDI_INVALID_PARAMETER; - KeAcquireSpinLock(&AddrFile->Lock, &OldIrql); + LockObject(AddrFile, &OldIrql); AddrFile->TTL = *((PUCHAR)Buffer); - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return TDI_SUCCESS; -#endif + + case AO_OPTION_IP_DONTFRAGMENT: + if (BufferSize < sizeof(UINT)) + return TDI_INVALID_PARAMETER; + + LockObject(AddrFile, &OldIrql); + AddrFile->DF = *((PUINT)Buffer); + UnlockObject(AddrFile, OldIrql); + + return TDI_SUCCESS; + + case AO_OPTION_BROADCAST: + if (BufferSize < sizeof(UINT)) + return TDI_INVALID_PARAMETER; + + LockObject(AddrFile, &OldIrql); + AddrFile->BCast = *((PUINT)Buffer); + UnlockObject(AddrFile, OldIrql); + + return TDI_SUCCESS; + + case AO_OPTION_IP_HDRINCL: + if (BufferSize < sizeof(UINT)) + return TDI_INVALID_PARAMETER; + + LockObject(AddrFile, &OldIrql); + AddrFile->HeaderIncl = *((PUINT)Buffer); + UnlockObject(AddrFile, OldIrql); + + return TDI_SUCCESS; + default: DbgPrint("Unimplemented option %x\n", ID->toi_id); Modified: branches/aicom-network-branch/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -244,15 +244,16 @@ return STATUS_INSUFFICIENT_RESOURCES; } - TI_DbgPrint(DEBUG_ADDRFILE, ("Address file object allocated at (0x%X).\n", AddrFile)); - RtlZeroMemory(AddrFile, sizeof(ADDRESS_FILE)); AddrFile->RefCount = 1; AddrFile->Free = AddrFileFree; - /* Set our default TTL */ + /* Set our default options */ AddrFile->TTL = 128; + AddrFile->DF = 0; + AddrFile->BCast = 1; + AddrFile->HeaderIncl = 1; /* Make sure address is a local unicast address or 0 */ /* FIXME: IPv4 only */ Modified: branches/aicom-network-branch/include/psdk/tcpioctl.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/ps… ============================================================================== --- branches/aicom-network-branch/include/psdk/tcpioctl.h [iso-8859-1] (original) +++ branches/aicom-network-branch/include/psdk/tcpioctl.h [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -49,6 +49,46 @@ #define IP_MIB_ADDRTABLE_ENTRY_ID 0x102 #define IP_INTFC_INFO_ID 0x103 #define MAX_PHYSADDR_SIZE 8 + +/* Address Object Options */ +#define AO_OPTION_TTL 1 +#define AO_OPTION_MCASTTTL 2 +#define AO_OPTION_MCASTIF 3 +#define AO_OPTION_XSUM 4 +#define AO_OPTION_IPOPTIONS 5 +#define AO_OPTION_ADD_MCAST 6 +#define AO_OPTION_DEL_MCAST 7 +#define AO_OPTION_TOS 8 +#define AO_OPTION_IP_DONTFRAGMENT 9 +#define AO_OPTION_MCASTLOOP 10 +#define AO_OPTION_BROADCAST 11 +#define AO_OPTION_IP_HDRINCL 12 +#define AO_OPTION_RCVALL 13 +#define AO_OPTION_RCVALL_MCAST 14 +#define AO_OPTION_RCVALL_IGMPMCAST 15 +#define AO_OPTION_UNNUMBEREDIF 16 +#define AO_OPTION_IP_UCASTIF 17 +#define AO_OPTION_ABSORB_RTRALERT 18 +#define AO_OPTION_LIMIT_BCASTS 19 +#define AO_OPTION_INDEX_BIND 20 +#define AO_OPTION_INDEX_MCASTIF 21 +#define AO_OPTION_INDEX_ADD_MCAST 22 +#define AO_OPTION_INDEX_DEL_MCAST 23 +#define AO_OPTION_IFLIST 24 +#define AO_OPTION_ADD_IFLIST 25 +#define AO_OPTION_DEL_IFLIST 26 +#define AO_OPTION_IP_PKTINFO 27 +#define AO_OPTION_ADD_MCAST_SRC 28 +#define AO_OPTION_DEL_MCAST_SRC 29 +#define AO_OPTION_MCAST_FILTER 30 +#define AO_OPTION_BLOCK_MCAST_SRC 31 +#define AO_OPTION_UNBLOCK_MCAST_SRC 32 +#define AO_OPTION_UDP_CKSUM_COVER 33 +#define AO_OPTION_WINDOW 34 +#define AO_OPTION_SCALE_CWIN 35 +#define AO_OPTION_RCV_HOPLIMIT 36 +#define AO_OPTION_UNBIND 37 +#define AO_OPTION_PROTECT 38 typedef struct IFEntry { Modified: branches/aicom-network-branch/include/psdk/wsahelp.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/ps… ============================================================================== --- branches/aicom-network-branch/include/psdk/wsahelp.h [iso-8859-1] (original) +++ branches/aicom-network-branch/include/psdk/wsahelp.h [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -50,7 +50,7 @@ INT WINAPI WSHGetBroadcastSockaddr(PVOID,PSOCKADDR,PINT); INT WINAPI WSHGetProviderGuid(LPWSTR,LPGUID); INT WINAPI WSHGetSockaddrType(PSOCKADDR,DWORD,PSOCKADDR_INFO); -INT WINAPI WSHGetSocketInformation(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,INT); +INT WINAPI WSHGetSocketInformation(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,LPINT); INT WINAPI WSHGetWildcardSockaddr(PVOID,PSOCKADDR,PINT); DWORD WINAPI WSHGetWinsockMapping(PWINSOCK_MAPPING,DWORD); INT WINAPI WSHGetWSAProtocolInfo(LPWSTR,LPWSAPROTOCOL_INFOW*,LPDWORD); @@ -69,7 +69,7 @@ typedef INT (WINAPI *PWSH_GET_BROADCAST_SOCKADDR)(PVOID,PSOCKADDR,PINT); typedef INT (WINAPI *PWSH_GET_PROVIDER_GUID)(LPWSTR,LPGUID); typedef INT (WINAPI *PWSH_GET_SOCKADDR_TYPE)(PSOCKADDR,DWORD,PSOCKADDR_INFO); -typedef INT (WINAPI *PWSH_GET_SOCKET_INFORMATION)(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,INT); +typedef INT (WINAPI *PWSH_GET_SOCKET_INFORMATION)(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,LPINT); typedef INT (WINAPI *PWSH_GET_WILDCARD_SOCKEADDR)(PVOID,PSOCKADDR,PINT); typedef DWORD (WINAPI *PWSH_GET_WINSOCK_MAPPING)(PWINSOCK_MAPPING,DWORD); typedef INT (WINAPI *PWSH_GET_WSAPROTOCOL_INFO)(LPWSTR,LPWSAPROTOCOL_INFOW*,LPDWORD); Modified: branches/aicom-network-branch/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -91,8 +91,13 @@ } else { - /* Give client the IP header too if it is a raw IP file object */ - DataBuffer = IPPacket->Header; + if (AddrFile->HeaderIncl) + DataBuffer = IPPacket->Header; + else + { + DataBuffer = IPPacket->Data; + DataSize -= IPPacket->HeaderSize; + } } if (!IsListEmpty(&AddrFile->ReceiveQueue)) Modified: branches/aicom-network-branch/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/lib.rb… ============================================================================== --- branches/aicom-network-branch/lib/lib.rbuild [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/lib.rbuild [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -58,6 +58,9 @@ <directory name="smlib"> <xi:include href="smlib/smlib.rbuild" /> </directory> + <directory name="tdilib"> + <xi:include href="tdilib/tdilib.rbuild" /> + </directory> <directory name="win32ksys"> <xi:include href="win32ksys/win32ksys.rbuild" /> </directory> Added: branches/aicom-network-branch/lib/tdilib/enum.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/tdilib… ============================================================================== --- branches/aicom-network-branch/lib/tdilib/enum.c (added) +++ branches/aicom-network-branch/lib/tdilib/enum.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -1,0 +1,123 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS TDI interface + * FILE: enum.c + * PURPOSE: TDI entity enumeration + */ + +#include "iphlpapi_private.h" +#include "tdilib.h" + +/* A generic thing-getting function which interacts in the right way with + * TDI. This may seem oblique, but I'm using it to reduce code and hopefully + * make this thing easier to debug. + * + * The things returned can be any of: + * TDIEntityID + * TDIObjectID + * IFEntry + * IPSNMPInfo + * IPAddrEntry + * IPInterfaceInfo + */ +NTSTATUS tdiGetSetOfThings( HANDLE tcpFile, + DWORD toiClass, + DWORD toiType, + DWORD toiId, + DWORD teiEntity, + DWORD teiInstance, + DWORD fixedPart, + DWORD entrySize, + PVOID *tdiEntitySet, + PDWORD numEntries ) { + TCP_REQUEST_QUERY_INFORMATION_EX req = TCP_REQUEST_QUERY_INFORMATION_INIT; + PVOID entitySet = 0; + NTSTATUS status = STATUS_SUCCESS; + DWORD allocationSizeForEntityArray = entrySize * MAX_TDI_ENTITIES, + arraySize = entrySize * MAX_TDI_ENTITIES; + + req.ID.toi_class = toiClass; + req.ID.toi_type = toiType; + req.ID.toi_id = toiId; + req.ID.toi_entity.tei_entity = teiEntity; + req.ID.toi_entity.tei_instance = teiInstance; + + /* There's a subtle problem here... + * If an interface is added at this exact instant, (as if by a PCMCIA + * card insertion), the array will still not have enough entries after + * have allocated it after the first DeviceIoControl call. + * + * We'll get around this by repeating until the number of interfaces + * stabilizes. + */ + do { + status = DeviceIoControl( tcpFile, + IOCTL_TCP_QUERY_INFORMATION_EX, + &req, + sizeof(req), + 0, + 0, + &allocationSizeForEntityArray, + NULL ); + + if(!status) + { + return STATUS_UNSUCCESSFUL; + } + + arraySize = allocationSizeForEntityArray; + entitySet = HeapAlloc( GetProcessHeap(), 0, arraySize ); + + if( !entitySet ) { + status = STATUS_INSUFFICIENT_RESOURCES; + return status; + } + + status = DeviceIoControl( tcpFile, + IOCTL_TCP_QUERY_INFORMATION_EX, + &req, + sizeof(req), + entitySet, + arraySize, + &allocationSizeForEntityArray, + NULL ); + + /* This is why we have the loop -- we might have added an adapter */ + if( arraySize == allocationSizeForEntityArray ) + break; + + HeapFree( GetProcessHeap(), 0, entitySet ); + entitySet = 0; + + if(!status) + return STATUS_UNSUCCESSFUL; + } while( TRUE ); /* We break if the array we received was the size we + * expected. Therefore, we got here because it wasn't */ + + *numEntries = (arraySize - fixedPart) / entrySize; + *tdiEntitySet = entitySet; + + return STATUS_SUCCESS; +} + +VOID tdiFreeThingSet( PVOID things ) { + HeapFree( GetProcessHeap(), 0, things ); +} + +NTSTATUS tdiGetEntityIDSet( HANDLE tcpFile, + TDIEntityID **entitySet, + PDWORD numEntities ) { + NTSTATUS status = tdiGetSetOfThings( tcpFile, + INFO_CLASS_GENERIC, + INFO_TYPE_PROVIDER, + ENTITY_LIST_ID, + GENERIC_ENTITY, + 0, + 0, + sizeof(TDIEntityID), + (PVOID *)entitySet, + numEntities ); + + return status; +} + Propchange: branches/aicom-network-branch/lib/tdilib/enum.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/aicom-network-branch/lib/tdilib/handle.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/tdilib… ============================================================================== --- branches/aicom-network-branch/lib/tdilib/handle.c (added) +++ branches/aicom-network-branch/lib/tdilib/handle.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -1,0 +1,54 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS TDI interface + * FILE: handle.c + * PURPOSE: TDI transport handle management + */ + +#include "iphlpapi_private.h" + +const PWCHAR TcpFileName = L"\\Device\\Tcp"; + +NTSTATUS openTcpFile(PHANDLE tcpFile) +{ + UNICODE_STRING fileName; + OBJECT_ATTRIBUTES objectAttributes; + IO_STATUS_BLOCK ioStatusBlock; + NTSTATUS status; + + RtlInitUnicodeString( &fileName, TcpFileName ); + + InitializeObjectAttributes( &objectAttributes, + &fileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL ); + + status = ZwCreateFile( tcpFile, + SYNCHRONIZE | GENERIC_EXECUTE | + GENERIC_READ | GENERIC_WRITE, + &objectAttributes, + &ioStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN_IF, + FILE_SYNCHRONOUS_IO_NONALERT, + 0, + 0 ); + + /* String does not need to be freed: it points to the constant + * string we provided */ + + if (!NT_SUCCESS(status)) + *tcpFile = INVALID_HANDLE_VALUE; + + return status; +} + +VOID closeTcpFile( HANDLE h ) +{ + ASSERT(h != INVALID_HANDLE_VALUE); + + NtClose( h ); +} Propchange: branches/aicom-network-branch/lib/tdilib/handle.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/aicom-network-branch/lib/tdilib/tdilib.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/tdilib… ============================================================================== --- branches/aicom-network-branch/lib/tdilib/tdilib.h (added) +++ branches/aicom-network-branch/lib/tdilib/tdilib.h [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -1,0 +1,20 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS TDI interface + * FILE: tdilib.h + * PURPOSE: Shared TDI library header + */ + +#ifndef TDILIB_H +#define TDILIB_H +NTSTATUS openTcpFile(PHANDLE tcpFile); +VOID closeTcpFile(HANDLE tcpFile); +NTSTATUS tdiGetEntityIDSet( HANDLE tcpFile, TDIEntityID **entitySet, + PDWORD numEntities ); +NTSTATUS tdiGetSetOfThings( HANDLE tcpFile, DWORD toiClass, DWORD toiType, + DWORD toiId, DWORD teiEntity, DWORD teiInstance, + DWORD fixedPart, + DWORD entrySize, PVOID *tdiEntitySet, + PDWORD numEntries ); +VOID tdiFreeThingSet( PVOID things ); +#endif Propchange: branches/aicom-network-branch/lib/tdilib/tdilib.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/aicom-network-branch/lib/tdilib/tdilib.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/tdilib… ============================================================================== --- branches/aicom-network-branch/lib/tdilib/tdilib.rbuild (added) +++ branches/aicom-network-branch/lib/tdilib/tdilib.rbuild [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="tdilib" type="staticlibrary"> + <include base="iphlpapi">.</include> + <include base="tdilib">.</include> + <library>ntdll</library> + <file>enum.c</file> + <file>handle.c</file> +</module> Propchange: branches/aicom-network-branch/lib/tdilib/tdilib.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 8 months

[jimtabor] 45092: [User32] - Patch by Kusanagi Kouichi : Make DefWindowProc handle Shift+F10. - Keyboard hotkey issues need looking after. See bug 642, 1009, 3560 and 4609. - Input.c header modified.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jan 16 00:51:41 2010 New Revision: 45092 URL: http://svn.reactos.org/svn/reactos?rev=45092&view=rev Log: [User32] - Patch by Kusanagi Kouichi : Make DefWindowProc handle Shift+F10. - Keyboard hotkey issues need looking after. See bug 642, 1009, 3560 and 4609. - Input.c header modified. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/input.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat Jan 16 00:51:41 2010 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/window.c + * FILE: dll/win32/user32/windows/defwnd.c * PURPOSE: Window management * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY: @@ -1420,7 +1420,11 @@ } } else if( wParam == VK_F10 ) + { + if (GetKeyState(VK_SHIFT) & 0x8000) + SendMessageW( hWnd, WM_CONTEXTMENU, (WPARAM)hWnd, MAKELPARAM(-1, -1) ); iF10Key = 1; + } else if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000)) SendMessageW( hWnd, WM_SYSCOMMAND, SC_KEYMENU, ' ' ); break; Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Sat Jan 16 00:51:41 2010 @@ -16,10 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/input.c + * FILE: dll/win32/user32/windows/input.c * PURPOSE: Input * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY:

14 years, 8 months

[spetreolle] 45091: Disable spooler service. This allows bootcdregtest to start here under qemu-kvm.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Jan 15 23:17:16 2010 New Revision: 45091 URL: http://svn.reactos.org/svn/reactos?rev=45091&view=rev Log: Disable spooler service. This allows bootcdregtest to start here under qemu-kvm. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Jan 15 23:17:16 2010 @@ -1198,7 +1198,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Group",0x00000000,"SpoolerGroup" HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","ImagePath",0x00020000,"%SystemRoot%\system32\spoolsv.exe" HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Type",0x00010001,0x00000110 ; WLAN service

14 years, 8 months

[cgutman] 45090: - Fix a bug with our tei_instance selection (we could end up with the same tei_instance value on different entities of the same type if an entity of our type in the middle of the list was deleted previously)

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jan 15 22:00:50 2010 New Revision: 45090 URL: http://svn.reactos.org/svn/reactos?rev=45090&view=rev Log: - Fix a bug with our tei_instance selection (we could end up with the same tei_instance value on different entities of the same type if an entity of our type in the middle of the list was deleted previously) Modified: branches/aicom-network-branch/drivers/network/tcpip/tcpip/info.c Modified: branches/aicom-network-branch/drivers/network/tcpip/tcpip/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/tcpip/tcpip/info.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/tcpip/tcpip/info.c [iso-8859-1] Fri Jan 15 22:00:50 2010 @@ -15,16 +15,27 @@ VOID AddEntity(ULONG EntityType, PVOID Context, ULONG Flags) { KIRQL OldIrql; - ULONG i, Count = 0; + ULONG i, Instance = 0; + BOOLEAN ChoseIndex = FALSE; TcpipAcquireSpinLock(&EntityListLock, &OldIrql); - for (i = 0; i < EntityCount; i++) - if (EntityList[i].tei_entity == EntityType) - Count++; + while (!ChoseIndex) + { + ChoseIndex = TRUE; + for (i = 0; i < EntityCount; i++) + { + if (EntityList[i].tei_entity == EntityType && + EntityList[i].tei_instance == Instance) + { + Instance++; + ChoseIndex = FALSE; + } + } + } EntityList[EntityCount].tei_entity = EntityType; - EntityList[EntityCount].tei_instance = Count; + EntityList[EntityCount].tei_instance = Instance; EntityList[EntityCount].context = Context; EntityList[EntityCount].flags = Flags; EntityCount++;

14 years, 8 months

[tkreuzer] 45089: [CRT] Patch by Jose Catena: vsnprintf: added support for ll size specifier See issue #5122 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jan 15 22:00:20 2010 New Revision: 45089 URL: http://svn.reactos.org/svn/reactos?rev=45089&view=rev Log: [CRT] Patch by Jose Catena: vsnprintf: added support for ll size specifier See issue #5122 for more details. Modified: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=4508… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sprintf.c [iso-8859-1] Fri Jan 15 22:00:20 2010 @@ -451,7 +451,10 @@ /* get the conversion qualifier */ qualifier = -1; - if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'w') { + if (*fmt == 'l' && *(fmt+1) == 'l') { + qualifier = 'I'; + fmt += 2; + } else if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'w') { qualifier = *fmt; ++fmt; } else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') { Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=450… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/swprintf.c [iso-8859-1] Fri Jan 15 22:00:20 2010 @@ -449,7 +449,10 @@ /* get the conversion qualifier */ qualifier = -1; - if (*fmt == L'h' || *fmt == L'l' || *fmt == L'L' || *fmt == L'w') { + if (*fmt == L'l' && *(fmt+1) == L'l') { + qualifier = L'I'; + fmt += 2; + } else if (*fmt == L'h' || *fmt == L'l' || *fmt == L'L' || *fmt == L'w') { qualifier = *fmt; ++fmt; } else if (*fmt == L'I' && *(fmt+1) == L'6' && *(fmt+2) == L'4') {

14 years, 8 months

[tkreuzer] 45088: [CRT] Patch by Jose Catena: allmul produced wrong results when the higher 32 bits of any of the 64 bit operands are not zero. As the comment correctly said the definition of param locations must change since esp was altered, but the definitions were not actually changed See issue #5121 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jan 15 21:45:36 2010 New Revision: 45088 URL: http://svn.reactos.org/svn/reactos?rev=45088&view=rev Log: [CRT] Patch by Jose Catena: allmul produced wrong results when the higher 32 bits of any of the 64 bit operands are not zero. As the comment correctly said the definition of param locations must change since esp was altered, but the definitions were not actually changed See issue #5121 for more details. Modified: trunk/reactos/lib/sdk/crt/math/i386/allmul_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/allmul_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/allm… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/allmul_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/allmul_asm.s [iso-8859-1] Fri Jan 15 21:45:36 2010 @@ -93,10 +93,10 @@ // must redefine A and B since esp has been altered -#define A2LO [esp + 4] // stack address of a -#define A2HI [esp + 8] // stack address of a -#define B2LO [esp + 12] // stack address of b -#define B2HI [esp + 16] // stack address of b +#define A2LO [esp + 8] // stack address of a +#define A2HI [esp + 12] // stack address of a +#define B2LO [esp + 16] // stack address of b +#define B2HI [esp + 20] // stack address of b mul ecx //eax has AHI, ecx has BLO, so AHI * BLO mov ebx,eax //save result

14 years, 8 months

[cgutman] 45087: - Restore the worker in the loopback code because we can enter the loopback code from TCPPacketSend at a raised IRQL - Fixes a crash with TCP over loopback

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jan 15 19:01:52 2010 New Revision: 45087 URL: http://svn.reactos.org/svn/reactos?rev=45087&view=rev Log: - Restore the worker in the loopback code because we can enter the loopback code from TCPPacketSend at a raised IRQL - Fixes a crash with TCP over loopback Modified: branches/aicom-network-branch/lib/drivers/ip/network/loopback.c Modified: branches/aicom-network-branch/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/network/loopback.c [iso-8859-1] Fri Jan 15 19:01:52 2010 @@ -11,6 +11,17 @@ #include "precomp.h" PIP_INTERFACE Loopback = NULL; + +VOID LoopPassiveWorker( + PVOID Context) +{ + PIP_PACKET IPPacket = Context; + + IPReceive(Loopback, IPPacket); + FreeNdisPacket(IPPacket->NdisPacket); + + ExFreePool(Context); +} VOID LoopTransmit( PVOID Context, @@ -34,6 +45,7 @@ NDIS_STATUS NdisStatus; IP_PACKET IPPacket; PNDIS_BUFFER NdisBuffer; + PVOID WorkerBuffer; ASSERT_KM_POINTER(NdisPacket); ASSERT_KM_POINTER(PC(NdisPacket)); @@ -46,9 +58,6 @@ NdisStatus = AllocatePacketWithBuffer ( &XmitPacket, PacketBuffer, PacketLength ); - (PC(NdisPacket)->DLComplete) - ( PC(NdisPacket)->Context, NdisPacket, NdisStatus ); - if( NT_SUCCESS(NdisStatus) ) { IPInitializePacket(&IPPacket, 0); @@ -60,12 +69,23 @@ &IPPacket.ContigSize, &IPPacket.TotalSize); - IPReceive(Loopback, &IPPacket); - - FreeNdisPacket(XmitPacket); + + WorkerBuffer = ExAllocatePool(NonPagedPool, sizeof(IPPacket)); + if (WorkerBuffer) + { + RtlCopyMemory(WorkerBuffer, &IPPacket, sizeof(IPPacket)); + if (!ChewCreate(LoopPassiveWorker, WorkerBuffer)) + { + ExFreePool(WorkerBuffer); + NdisStatus = NDIS_STATUS_RESOURCES; + } + } + else + NdisStatus = NDIS_STATUS_RESOURCES; } - TI_DbgPrint(MAX_TRACE, ("Done\n")); + (PC(NdisPacket)->DLComplete) + ( PC(NdisPacket)->Context, NdisPacket, NdisStatus ); } NDIS_STATUS LoopRegisterAdapter(

14 years, 8 months

← Newer
1
...
25
26
27
28
29
30
31
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010