Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 44206: add 64 bit POOL_HEADER, to make pool allocations work here, too
by tkreuzer＠svn.reactos.org 16 Nov '09

16 Nov '09

Author: tkreuzer Date: Mon Nov 16 23:03:30 2009 New Revision: 44206 URL: http://svn.reactos.org/svn/reactos?rev=44206&view=rev Log: add 64 bit POOL_HEADER, to make pool allocations work here, too Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Nov 16 23:03:30 2009 @@ -62,6 +62,7 @@ LIST_ENTRY ListHeads[POOL_LISTS_PER_PAGE]; } POOL_DESCRIPTOR, *PPOOL_DESCRIPTOR; +#ifndef _WIN64 typedef struct _POOL_HEADER { union @@ -85,12 +86,37 @@ }; }; } POOL_HEADER, *PPOOL_HEADER; +#else +typedef struct _POOL_HEADER +{ + union + { + struct + { + ULONG PreviousSize : 8; + ULONG PoolIndex : 8; + ULONG BlockSize : 8; + ULONG PoolType : 8; + }; + ULONG Ulong1; + }; + ULONG PoolTag; + union + { + PEPROCESS* ProcessBilled; + struct + { + USHORT AllocatorBackTraceIndex; + USHORT PoolTagHash; + }; + }; +} POOL_HEADER, *PPOOL_HEADER; +#endif // // Everything depends on this // -C_ASSERT(sizeof(POOL_HEADER) == 8); -//C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY)); +C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY)); extern ULONG ExpNumberOfPagedPools; extern POOL_DESCRIPTOR NonPagedPoolDescriptor;

1 0

[tkreuzer] 44205: - add BAUDRATE=115000 to boot command line - Improve the code in wlmemory.c, no real functional change
by tkreuzer＠svn.reactos.org 16 Nov '09

16 Nov '09

Author: tkreuzer Date: Mon Nov 16 22:56:29 2009 New Revision: 44205 URL: http://svn.reactos.org/svn/reactos?rev=44205&view=rev Log: - add BAUDRATE=115000 to boot command line - Improve the code in wlmemory.c, no real functional change Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Mon Nov 16 22:56:29 2009 @@ -50,7 +50,7 @@ [SetupData] DefaultPath = \ReactOS OsLoadOptions = "/NOGUIBOOT /NODEBUG" -DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM2" +DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM2 /BAUDRATE=115200" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=SCREEN" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS" Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c [iso-8859-1] Mon Nov 16 22:56:29 2009 @@ -15,23 +15,13 @@ //extern ULONG LoaderPagesSpanned; -#define HYPER_SPACE_ENTRY 0x300 - -// This is needed only for SetProcessorContext routine -#pragma pack(2) - typedef struct - { - USHORT Limit; - ULONG Base; - } GDTIDT; -#pragma pack(4) +#define HYPER_SPACE_ENTRY 0x1EE /* GLOBALS ***************************************************************/ -//PHARDWARE_PTE PDE; +PHARDWARE_PTE PxeBase; //PHARDWARE_PTE HalPageTable; -PPAGE_DIRECTORY_AMD64 pPML4; /* FUNCTIONS **************************************************************/ @@ -44,8 +34,8 @@ DPRINTM(DPRINT_WINDOWS,">>> MempAllocatePageTables\n"); /* Allocate a page for the PML4 */ - pPML4 = MmAllocateMemoryWithType(PAGE_SIZE, LoaderMemoryData); - if (!pPML4) + PxeBase = MmAllocateMemoryWithType(PAGE_SIZE, LoaderMemoryData); + if (!PxeBase) { DPRINTM(DPRINT_WINDOWS,"failed to allocate PML4\n"); return FALSE; @@ -54,14 +44,14 @@ // FIXME: Physical PTEs = FirmwareTemporary ? /* Zero the PML4 */ - RtlZeroMemory(pPML4, PAGE_SIZE); + RtlZeroMemory(PxeBase, PAGE_SIZE); /* The page tables are located at 0xfffff68000000000 * We create a recursive self mapping through all 4 levels at * virtual address 0xfffff6fb7dbedf68 */ - pPML4->Pde[VAtoPXI(PXE_BASE)].Valid = 1; - pPML4->Pde[VAtoPXI(PXE_BASE)].Write = 1; - pPML4->Pde[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(pPML4); + PxeBase[VAtoPXI(PXE_BASE)].Valid = 1; + PxeBase[VAtoPXI(PXE_BASE)].Write = 1; + PxeBase[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(PxeBase); // FIXME: map PDE's for hals memory mapping @@ -70,57 +60,57 @@ return TRUE; } -PPAGE_DIRECTORY_AMD64 -MempGetOrCreatePageDir(PPAGE_DIRECTORY_AMD64 pDir, ULONG Index) -{ - PPAGE_DIRECTORY_AMD64 pSubDir; - - if (!pDir) +PHARDWARE_PTE +MempGetOrCreatePageDir(PHARDWARE_PTE PdeBase, ULONG Index) +{ + PHARDWARE_PTE SubDir; + + if (!PdeBase) return NULL; - if (!pDir->Pde[Index].Valid) - { - pSubDir = MmAllocateMemoryWithType(PAGE_SIZE, LoaderMemoryData); - if (!pSubDir) + if (!PdeBase[Index].Valid) + { + SubDir = MmAllocateMemoryWithType(PAGE_SIZE, LoaderMemoryData); + if (!SubDir) return NULL; - RtlZeroMemory(pSubDir, PAGE_SIZE); - pDir->Pde[Index].PageFrameNumber = PtrToPfn(pSubDir); - pDir->Pde[Index].Valid = 1; - pDir->Pde[Index].Write = 1; + RtlZeroMemory(SubDir, PAGE_SIZE); + PdeBase[Index].PageFrameNumber = PtrToPfn(SubDir); + PdeBase[Index].Valid = 1; + PdeBase[Index].Write = 1; } else { - pSubDir = (PPAGE_DIRECTORY_AMD64)((ULONGLONG)(pDir->Pde[Index].PageFrameNumber) * PAGE_SIZE); - } - return pSubDir; + SubDir = (PVOID)((ULONG64)(PdeBase[Index].PageFrameNumber) * PAGE_SIZE); + } + return SubDir; } BOOLEAN MempMapSinglePage(ULONG64 VirtualAddress, ULONG64 PhysicalAddress) { - PPAGE_DIRECTORY_AMD64 pDir3, pDir2, pDir1; + PHARDWARE_PTE PpeBase, PdeBase, PteBase; ULONG Index; - pDir3 = MempGetOrCreatePageDir(pPML4, VAtoPXI(VirtualAddress)); - pDir2 = MempGetOrCreatePageDir(pDir3, VAtoPPI(VirtualAddress)); - pDir1 = MempGetOrCreatePageDir(pDir2, VAtoPDI(VirtualAddress)); - - if (!pDir1) - { - DPRINTM(DPRINT_WINDOWS,"!!!No Dir %p, %p, %p, %p\n", pPML4, pDir3, pDir2, pDir1); + PpeBase = MempGetOrCreatePageDir(PxeBase, VAtoPXI(VirtualAddress)); + PdeBase = MempGetOrCreatePageDir(PpeBase, VAtoPPI(VirtualAddress)); + PteBase = MempGetOrCreatePageDir(PdeBase, VAtoPDI(VirtualAddress)); + + if (!PteBase) + { + DPRINTM(DPRINT_WINDOWS,"!!!No Dir %p, %p, %p, %p\n", PxeBase, PpeBase, PdeBase, PteBase); return FALSE; } Index = VAtoPTI(VirtualAddress); - if (pDir1->Pde[Index].Valid) + if (PteBase[Index].Valid) { DPRINTM(DPRINT_WINDOWS,"!!!Already mapped %ld\n", Index); return FALSE; } - pDir1->Pde[Index].Valid = 1; - pDir1->Pde[Index].Write = 1; - pDir1->Pde[Index].PageFrameNumber = PhysicalAddress / PAGE_SIZE; + PteBase[Index].Valid = 1; + PteBase[Index].Write = 1; + PteBase[Index].PageFrameNumber = PhysicalAddress / PAGE_SIZE; return TRUE; } @@ -128,34 +118,33 @@ BOOLEAN MempIsPageMapped(PVOID VirtualAddress) { - PPAGE_DIRECTORY_AMD64 pDir; + PHARDWARE_PTE PpeBase, PdeBase, PteBase; ULONG Index; - pDir = pPML4; Index = VAtoPXI(VirtualAddress); - if (!pDir->Pde[Index].Valid) - return FALSE; - - pDir = (PPAGE_DIRECTORY_AMD64)((ULONG64)(pDir->Pde[Index].PageFrameNumber) * PAGE_SIZE); + if (!PxeBase[Index].Valid) + return FALSE; + + PpeBase = (PVOID)((ULONG64)(PxeBase[Index].PageFrameNumber) * PAGE_SIZE); Index = VAtoPPI(VirtualAddress); - if (!pDir->Pde[Index].Valid) - return FALSE; - - pDir = (PPAGE_DIRECTORY_AMD64)((ULONG64)(pDir->Pde[Index].PageFrameNumber) * PAGE_SIZE); + if (!PpeBase[Index].Valid) + return FALSE; + + PdeBase = (PVOID)((ULONG64)(PpeBase[Index].PageFrameNumber) * PAGE_SIZE); Index = VAtoPDI(VirtualAddress); - if (!pDir->Pde[Index].Valid) - return FALSE; - - pDir = (PPAGE_DIRECTORY_AMD64)((ULONG64)(pDir->Pde[Index].PageFrameNumber) * PAGE_SIZE); + if (!PdeBase[Index].Valid) + return FALSE; + + PteBase = (PVOID)((ULONG64)(PdeBase[Index].PageFrameNumber) * PAGE_SIZE); Index = VAtoPTI(VirtualAddress); - if (!pDir->Pde[Index].Valid) + if (!PteBase[Index].Valid) return FALSE; return TRUE; } ULONG -MempMapRangeOfPages(ULONGLONG VirtualAddress, ULONGLONG PhysicalAddress, ULONG cPages) +MempMapRangeOfPages(ULONG64 VirtualAddress, ULONG64 PhysicalAddress, ULONG cPages) { ULONG i; @@ -333,10 +322,10 @@ __writeeflags(0); /* Set the new PML4 */ - __writecr3((ULONGLONG)pPML4); + __writecr3((ULONG64)PxeBase); /* Get kernel mode address of gdt / idt */ - GdtIdt = (PVOID)((LONG64)GdtIdt + KSEG0_BASE); + GdtIdt = (PVOID)((ULONG64)GdtIdt + KSEG0_BASE); /* Create gdt entries and load gdtr */ WinLdrSetupGdt(GdtIdt, Tss);

1 0

[tkreuzer] 44204: On amd64 the NextEntry member of MMPTE_LIST has 32 bits, but 36 would be required to cover the whole pte space. Therefore use MmSystemPtesStart[SystemPtePoolType] as base for the pfn linked list instead of MmSystemPteBase, which is set to PTE_BASE.
by tkreuzer＠svn.reactos.org 16 Nov '09

16 Nov '09

Author: tkreuzer Date: Mon Nov 16 20:35:36 2009 New Revision: 44204 URL: http://svn.reactos.org/svn/reactos?rev=44204&view=rev Log: On amd64 the NextEntry member of MMPTE_LIST has 32 bits, but 36 would be required to cover the whole pte space. Therefore use MmSystemPtesStart[SystemPtePoolType] as base for the pfn linked list instead of MmSystemPteBase, which is set to PTE_BASE. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/syspte.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Mon Nov 16 20:35:36 2009 @@ -64,7 +64,8 @@ // Now move to the first free system PTE cluster // PreviousPte = PointerPte; - PointerPte = MmSystemPteBase + PointerPte->u.List.NextEntry; + PointerPte = MmSystemPtesStart[SystemPtePoolType] + + PointerPte->u.List.NextEntry; // // Loop each cluster @@ -152,7 +153,8 @@ // Go to the next cluster // PreviousPte = PointerPte; - PointerPte = MmSystemPteBase + PointerPte->u.List.NextEntry; + PointerPte = MmSystemPtesStart[SystemPtePoolType] + + PointerPte->u.List.NextEntry; ASSERT(PointerPte > PreviousPte); } @@ -214,7 +216,7 @@ // Zero PTEs // RtlZeroMemory(StartingPte, NumberOfPtes * sizeof(MMPTE)); - CurrentSize = (ULONG_PTR)(StartingPte - MmSystemPteBase); + CurrentSize = (ULONG_PTR)(StartingPte - MmSystemPtesStart[SystemPtePoolType]); // // Acquire the system PTE lock @@ -235,7 +237,8 @@ // // Get the first real cluster of PTEs and check if it's ours // - PointerPte = MmSystemPteBase + CurrentPte->u.List.NextEntry; + PointerPte = MmSystemPtesStart[SystemPtePoolType] + + CurrentPte->u.List.NextEntry; if (CurrentSize < CurrentPte->u.List.NextEntry) { // @@ -395,7 +398,7 @@ StartingPte->u.List.NextEntry = ((ULONG)0xFFFFF); MmFirstFreeSystemPte[PoolType].u.Long = 0; MmFirstFreeSystemPte[PoolType].u.List.NextEntry = StartingPte - - MmSystemPteBase; + MmSystemPtesStart[PoolType]; // // The second entry stores the size of this PTE space

1 0

[dreimer] 44203: Revert yesterday's fix for now.
by dreimer＠svn.reactos.org 16 Nov '09

16 Nov '09

Author: dreimer Date: Mon Nov 16 19:32:30 2009 New Revision: 44203 URL: http://svn.reactos.org/svn/reactos?rev=44203&view=rev Log: Revert yesterday's fix for now. Modified: trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] Mon Nov 16 19:32:30 2009 @@ -5,7 +5,7 @@ LDFLAG_WINDOWS:=--subsystem=windows LDFLAG_NATIVE:=--subsystem=native -#(module, objs, deps, ldflags, output, def, libs, entry, base, extralibs) +#(module, objs, deps, ldflags, output, def, libs, entry, base) define RBUILD_LINK ifneq ($(6),) @@ -29,7 +29,7 @@ $(5): $(2) $$(if $(6),${call RBUILD_intermediate_path_noext,$(5)}.exp) $(7) $(3) $$(RSYM_TARGET) $$(PEFIXUP_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_LD) - $${ld} --entry=$(8) --image-base=$(9) $(2) $$(if $(6),${call RBUILD_intermediate_path_noext,$(5)}.exp) $(10) $(7) $(10) ${call RBUILD_ldflags,$(1),$(4)} -o $$@ + $${ld} --entry=$(8) --image-base=$(9) $(2) $$(if $(6),${call RBUILD_intermediate_path_noext,$(5)}.exp) $(7) ${call RBUILD_ldflags,$(1),$(4)} -o $$@ ifneq ($(or $(6),$$(MODULETYPE$$($(1)_TYPE)_KMODE)),) $$(ECHO_PEFIXUP) $$(Q)$$(PEFIXUP_TARGET) $$@ $(if $(6),-exports) $$(if $$(MODULETYPE$($(1)_TYPE)_KMODE),-sections) @@ -67,6 +67,4 @@ endef #(module, def, deps, ldflags, libs, entry, base) -#~ RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(5) $(value $(1)_LIBS) $(5),$(6),$(7)} -#(module, def, deps, ldflags, libs, entry, base, extralibs) -RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(value $(1)_LIBS),$(6),$(7),$(5)} +RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(5) $(value $(1)_LIBS) $(5),$(6),$(7)} Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Mon Nov 16 19:32:30 2009 @@ -479,8 +479,8 @@ // Would be nice to have our own C++ runtime fputs ( "BUILTIN_CXXINCLUDES+= $(TARGET_CPPFLAGS)\n", fMakefile ); - fprintf ( fMakefile, "PROJECT_CCLIBS := \"$(shell ${TARGET_CC} -print-libgcc-file-name)\"\n" ); - fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libgcc.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)\"\n" ); + fprintf ( fMakefile, "PROJECT_CCLIBS := $(shell ${TARGET_CC} -print-libgcc-file-name)\n" ); + fprintf ( fMakefile, "PROJECT_CXXLIBS := $(shell ${TARGET_CPP} -print-file-name=libstdc++.a) $(shell ${TARGET_CPP} -print-file-name=libgcc.a) $(shell ${TARGET_CPP} -print-file-name=libmingw32.a) $(shell ${TARGET_CPP} -print-file-name=libmingwex.a) $(shell ${TARGET_CPP} -print-file-name=libcoldname.a)\n" ); /* hack to get libgcc_eh.a, should check mingw version or something */ if (Environment::GetArch() == "amd64")

1 0

[janderwald] 44202: - Build fix by Pigglesworth
by janderwald＠svn.reactos.org 16 Nov '09

16 Nov '09

Author: janderwald Date: Mon Nov 16 19:24:36 2009 New Revision: 44202 URL: http://svn.reactos.org/svn/reactos?rev=44202&view=rev Log: - Build fix by Pigglesworth Modified: trunk/reactos/dll/directx/directx.rbuild Modified: trunk/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild… ============================================================================== --- trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] Mon Nov 16 19:24:36 2009 @@ -25,8 +25,8 @@ <directory name="dplayx"> <xi:include href="dplayx/dplayx.rbuild" /> </directory> - <directory name="dsound_new"> - <xi:include href="dsound_new/dsound_new.rbuild" /> + <directory name="dsound"> + <xi:include href="dsound/dsound.rbuild" /> </directory> <directory name="dxdiagn"> <xi:include href="dxdiagn/dxdiagn.rbuild" />

1 0

[janderwald] 44201: - Various bugfixes found by Amine48rz
by janderwald＠svn.reactos.org 16 Nov '09

16 Nov '09

Author: janderwald Date: Mon Nov 16 19:13:56 2009 New Revision: 44201 URL: http://svn.reactos.org/svn/reactos?rev=44201&view=rev Log: - Various bugfixes found by Amine48rz Modified: trunk/reactos/dll/directx/directx.rbuild trunk/reactos/dll/directx/dsound_new/devicelist.c trunk/reactos/dll/directx/dsound_new/enum.c trunk/reactos/dll/directx/dsound_new/notify.c Modified: trunk/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild… ============================================================================== --- trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] Mon Nov 16 19:13:56 2009 @@ -25,8 +25,8 @@ <directory name="dplayx"> <xi:include href="dplayx/dplayx.rbuild" /> </directory> - <directory name="dsound"> - <xi:include href="dsound/dsound.rbuild" /> + <directory name="dsound_new"> + <xi:include href="dsound_new/dsound_new.rbuild" /> </directory> <directory name="dxdiagn"> <xi:include href="dxdiagn/dxdiagn.rbuild" /> Modified: trunk/reactos/dll/directx/dsound_new/devicelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dev… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/devicelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/devicelist.c [iso-8859-1] Mon Nov 16 19:13:56 2009 @@ -408,7 +408,7 @@ } /* sanity check */ - ASSERT(OutRootInfo); + ASSERT(*OutRootInfo); CurInfo = *OutRootInfo; Modified: trunk/reactos/dll/directx/dsound_new/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/enu… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/enum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/enum.c [iso-8859-1] Mon Nov 16 19:13:56 2009 @@ -91,7 +91,11 @@ } DriverNameA[0] = 0; - WideCharToMultiByte(CP_ACP, 0, ProductName, -1, DriverNameA, sizeof(DriverNameA) / sizeof(char), NULL, NULL); + if (ProductName) + { + WideCharToMultiByte(CP_ACP, 0, ProductName, -1, DriverNameA, sizeof(DriverNameA) / sizeof(char), NULL, NULL); + DriverNameA[(sizeof(DriverNameA) / sizeof(char))-1] = 0; + } return lpDSEnumCallbackA(DeviceGuid, (LPSTR)Buffer, DriverNameA, lpContext); } Modified: trunk/reactos/dll/directx/dsound_new/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/not… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/notify.c [iso-8859-1] Mon Nov 16 19:13:56 2009 @@ -157,7 +157,6 @@ if (Result != ERROR_SUCCESS) { DPRINT1("Failed to enable event %p Position %u\n", pcPositionNotifies[Index].hEventNotify, pcPositionNotifies[Index].dwOffset); - return DSERR_GENERIC; } } }

1 0

[khornicek] 44200: - release the old bitmap when selecting a new one
by khornicek＠svn.reactos.org 16 Nov '09

16 Nov '09

Author: khornicek Date: Mon Nov 16 14:22:56 2009 New Revision: 44200 URL: http://svn.reactos.org/svn/reactos?rev=44200&view=rev Log: - release the old bitmap when selecting a new one Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Mon Nov 16 14:22:56 2009 @@ -221,6 +221,9 @@ /* Get a pointer to the DC and the bitmap*/ pDC = DC_Lock(physDev); pSurface = SURFACE_ShareLock(hBmpKern); + + /* Release the old bitmap */ + SURFACE_ShareUnlock(pDC->pBitmap); /* Select it */ pDC->pBitmap = pSurface;

1 0

[cgutman] 44199: - Implement OskitTCPGetSocketError which retreives so->so_error - Use OskitTCPGetSocketError to get the actual socket error which occurred when get SEL_FIN - Add more cases to TCPTranslateError
by cgutman＠svn.reactos.org 16 Nov '09

16 Nov '09

Author: cgutman Date: Mon Nov 16 08:39:52 2009 New Revision: 44199 URL: http://svn.reactos.org/svn/reactos?rev=44199&view=rev Log: - Implement OskitTCPGetSocketError which retreives so->so_error - Use OskitTCPGetSocketError to get the actual socket error which occurred when get SEL_FIN - Add more cases to TCPTranslateError Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Mon Nov 16 08:39:52 2009 @@ -27,6 +27,7 @@ PLIST_ENTRY Entry; PIRP Irp; PMDL Mdl; + ULONG SocketError; KeAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql); CurrentEntry = ConnectionEndpointListHead.Flink; @@ -44,8 +45,19 @@ Connection, Connection->SocketContext)); if( !Connection->SocketContext || Connection->SignalState & SEL_FIN ) { + TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n")); + + Connection->SignalState = 0; + + /* If OskitTCP initiated the disconnect, try to read the socket error that occurred */ + if (Connection->SocketContext) + SocketError = TCPTranslateError(OskitTCPGetSocketError(Connection->SocketContext)); + + /* Default to STATUS_CANCELLED if we initiated the disconnect or no socket error was reported */ + if (!Connection->SocketContext || !SocketError) + SocketError = STATUS_CANCELLED; + KeReleaseSpinLock(&Connection->Lock, OldIrql); - TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n")); while ((Entry = ExInterlockedRemoveHeadList( &Connection->ReceiveRequest, &Connection->Lock )) != NULL) @@ -53,7 +65,7 @@ Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; - Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); + Complete( Bucket->Request.RequestContext, SocketError, 0 ); exFreePool(Bucket); } @@ -64,7 +76,7 @@ Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; - Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); + Complete( Bucket->Request.RequestContext, SocketError, 0 ); exFreePool(Bucket); } @@ -75,7 +87,7 @@ Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; - Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); + Complete( Bucket->Request.RequestContext, SocketError, 0 ); exFreePool(Bucket); } @@ -86,7 +98,7 @@ Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; - Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); + Complete( Bucket->Request.RequestContext, SocketError, 0 ); exFreePool(Bucket); } @@ -573,8 +585,9 @@ case 0: Status = STATUS_SUCCESS; break; case OSK_EADDRNOTAVAIL: Status = STATUS_INVALID_ADDRESS; break; case OSK_EAFNOSUPPORT: Status = STATUS_INVALID_CONNECTION; break; - case OSK_ECONNREFUSED: - case OSK_ECONNRESET: Status = STATUS_REMOTE_NOT_LISTENING; break; + case OSK_ECONNREFUSED: Status = STATUS_REMOTE_NOT_LISTENING; break; + case OSK_ECONNRESET: + case OSK_ECONNABORTED: Status = STATUS_REMOTE_DISCONNECT; break; case OSK_EWOULDBLOCK: case OSK_EINPROGRESS: Status = STATUS_PENDING; break; case OSK_EINVAL: Status = STATUS_INVALID_PARAMETER; break; Modified: trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] Mon Nov 16 08:39:52 2009 @@ -164,6 +164,8 @@ int OskitTCPDisconnect(void *socket); +int OskitTCPGetSocketError(void *socket); + #undef errno void *fbsd_malloc( unsigned int bytes, char *file, unsigned line, ... ); Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Mon Nov 16 08:39:52 2009 @@ -595,6 +595,20 @@ return 0; } +int OskitTCPGetSocketError(void *socket) { + struct socket *so = socket; + int error; + + if (!socket) + return OSK_ESHUTDOWN; + + OSKLock(); + error = so->so_error; + OSKUnlock(); + + return error; +} + struct ifaddr *ifa_iffind(struct sockaddr *addr, int type) { if( OtcpEvent.FindInterface )

1 0

[dgorbachev] 44198: Remove MmVerifierData.
by dgorbachev＠svn.reactos.org 16 Nov '09

16 Nov '09

Author: dgorbachev Date: Mon Nov 16 02:57:59 2009 New Revision: 44198 URL: http://svn.reactos.org/svn/reactos?rev=44198&view=rev Log: Remove MmVerifierData. Modified: trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Mon Nov 16 02:57:59 2009 @@ -38,7 +38,6 @@ PVOID MmLastUnloadedDrivers; PVOID MmTriageActionTaken; PVOID KernelVerifier; -MM_DRIVER_VERIFIER_DATA MmVerifierData; /* FUNCTIONS *****************************************************************/

1 0

[dgorbachev] 44197: Fix a bug, silence GCC 4.5.x warnings.
by dgorbachev＠svn.reactos.org 16 Nov '09

16 Nov '09

Author: dgorbachev Date: Mon Nov 16 02:57:24 2009 New Revision: 44197 URL: http://svn.reactos.org/svn/reactos?rev=44197&view=rev Log: Fix a bug, silence GCC 4.5.x warnings. Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fastio.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] Mon Nov 16 02:57:24 2009 @@ -89,7 +89,7 @@ return TRUE; } - if (MAXLONGLONG < (LONGLONG) FileOffset->QuadPart + Length) + if (Length > MAXLONGLONG - FileOffset->QuadPart) { IoStatus->Status = STATUS_INVALID_PARAMETER; IoStatus->Information = 0; @@ -292,6 +292,11 @@ ASSERT(FileObject); ASSERT(FileObject->FsContext); + +#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ == 405) + /* Silence incorrect GCC 4.5.x warning */ + OldFileSize.LowPart = 0; +#endif /* Initialize some of the vars and pointers */ NewSize.QuadPart = 0; @@ -540,6 +545,11 @@ { LARGE_INTEGER OldFileSize; +#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ == 405) + /* Silence incorrect GCC 4.5.x warning */ + OldFileSize.QuadPart = 0; +#endif + /* Sanity check */ ASSERT(!KeIsExecutingDpc()); @@ -586,7 +596,7 @@ if ((FileObject->PrivateCacheMap != NULL) && (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && (FcbHeader->ValidDataLength.QuadPart + 0x2000 > Offset.QuadPart) && - (MAXLONGLONG > Offset.QuadPart + Length) && + (Length <= MAXLONGLONG - Offset.QuadPart) && (FcbHeader->AllocationSize.QuadPart >= NewSize.QuadPart)) { /* Check if we can keep the lock shared */ @@ -1349,7 +1359,7 @@ if ((FileObject->PrivateCacheMap) && (FcbHeader->IsFastIoPossible) && - (MAXLONGLONG >= (LONGLONG) FileOffset->QuadPart + Length) && + (Length <= MAXLONGLONG - FileOffset->QuadPart) && (NewSize.QuadPart <= FcbHeader->AllocationSize.QuadPart)) { /* Check if we can keep the lock shared */

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