Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 44246: - GetDC(): Always clip the root window, instead of trying to attach a non-existing in SWM child window. Fixes visual glitches when browsing through menus.
by fireball＠svn.reactos.org 20 Nov '09

20 Nov '09

Author: fireball Date: Fri Nov 20 22:36:47 2009 New Revision: 44246 URL: http://svn.reactos.org/svn/reactos?rev=44246&view=rev Log: - GetDC(): Always clip the root window, instead of trying to attach a non-existing in SWM child window. Fixes visual glitches when browsing through menus. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Fri Nov 20 22:36:47 2009 @@ -216,6 +216,8 @@ INT CDECL RosDrv_ExtEscape( NTDRV_PDEVICE *physDev, INT escape, INT in_count, LPCVOID in_data, INT out_count, LPVOID out_data ) { + HWND hwnd; + switch(escape) { case NTDRV_ESCAPE: @@ -227,10 +229,13 @@ if (in_count >= sizeof(struct ntdrv_escape_set_drawable)) { const struct ntdrv_escape_set_drawable *data = in_data; + RosGdiSetDcRects(physDev->hKernelDC, (RECT*)&data->dc_rect, (RECT*)&data->drawable_rect); + hwnd = GetAncestor(data->hwnd, GA_ROOT); + if (!data->release) - RosGdiGetDC(physDev->hKernelDC, data->hwnd, data->clip_children); + RosGdiGetDC(physDev->hKernelDC, hwnd, data->clip_children); else RosGdiReleaseDC(physDev->hKernelDC);

1 0

[arty] 44245: Take trunk definition of FsRtlIsNameInExpression.
by arty＠svn.reactos.org 20 Nov '09

20 Nov '09

Author: arty Date: Fri Nov 20 21:51:17 2009 New Revision: 44245 URL: http://svn.reactos.org/svn/reactos?rev=44245&view=rev Log: Take trunk definition of FsRtlIsNameInExpression. Modified: branches/arty-newcc/ntoskrnl/fsrtl/name.c Modified: branches/arty-newcc/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/name.… ============================================================================== --- branches/arty-newcc/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/fsrtl/name.c [iso-8859-1] Fri Nov 20 21:51:17 2009 @@ -31,7 +31,7 @@ { if ((Expression->Buffer[i] == (IgnoreCase ? UpcaseTable[Name->Buffer[k]] : Name->Buffer[k])) || (Expression->Buffer[i] == L'?') || (Expression->Buffer[i] == DOS_QM) || - (Expression->Buffer[i] == DOS_DOT && (Name->Buffer[k] == L'.' || Name->Buffer[k] == L'0'))) + (Expression->Buffer[i] == DOS_DOT && (Name->Buffer[k] == L'.' || Name->Buffer[k]== L'0'))) { k++; } @@ -304,31 +304,80 @@ IN BOOLEAN IgnoreCase, IN PWCHAR UpcaseTable OPTIONAL) { - BOOLEAN Result; - NTSTATUS Status; - UNICODE_STRING IntName; - - if (IgnoreCase && !UpcaseTable) - { - Status = RtlUpcaseUnicodeString(&IntName, Name, TRUE); - if (Status != STATUS_SUCCESS) - { - ExRaiseStatus(Status); - } - Name = &IntName; - IgnoreCase = FALSE; - } - else - { - IntName.Buffer = NULL; - } - - Result = FsRtlIsNameInExpressionPrivate(Expression, Name, IgnoreCase, UpcaseTable); - - if (IntName.Buffer != NULL) - { - RtlFreeUnicodeString(&IntName); - } - - return Result; -} + USHORT ExpressionPosition, NamePosition; + UNICODE_STRING TempExpression, TempName; + + ExpressionPosition = 0; + NamePosition = 0; + while (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && + NamePosition < (Name->Length / sizeof(WCHAR))) + { + if (Expression->Buffer[ExpressionPosition] == L'*') + { + ExpressionPosition++; + if (ExpressionPosition == (Expression->Length / sizeof(WCHAR))) + { + return TRUE; + } + while (NamePosition < (Name->Length / sizeof(WCHAR))) + { + TempExpression.Length = + TempExpression.MaximumLength = + Expression->Length - (ExpressionPosition * sizeof(WCHAR)); + TempExpression.Buffer = Expression->Buffer + ExpressionPosition; + TempName.Length = + TempName.MaximumLength = + Name->Length - (NamePosition * sizeof(WCHAR)); + TempName.Buffer = Name->Buffer + NamePosition; + /* FIXME: Rewrite to get rid of recursion */ + if (FsRtlIsNameInExpression(&TempExpression, &TempName, + IgnoreCase, UpcaseTable)) + { + return TRUE; + } + NamePosition++; + } + } + else + { + /* FIXME: Take UpcaseTable into account! */ + if (Expression->Buffer[ExpressionPosition] == L'?' || + (IgnoreCase && + RtlUpcaseUnicodeChar(Expression->Buffer[ExpressionPosition]) == + RtlUpcaseUnicodeChar(Name->Buffer[NamePosition])) || + (!IgnoreCase && + Expression->Buffer[ExpressionPosition] == + Name->Buffer[NamePosition])) + { + NamePosition++; + ExpressionPosition++; + } + else + { + return FALSE; + } + } + } + + /* Handle matching of "f0_*.*" expression to "f0_000" file name. */ + if (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && + Expression->Buffer[ExpressionPosition] == L'.') + { + while (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && + (Expression->Buffer[ExpressionPosition] == L'.' || + Expression->Buffer[ExpressionPosition] == L'*' || + Expression->Buffer[ExpressionPosition] == L'?')) + { + ExpressionPosition++; + } + } + + if (ExpressionPosition == (Expression->Length / sizeof(WCHAR)) && + NamePosition == (Name->Length / sizeof(WCHAR))) + { + return TRUE; + } + + return FALSE; +} +

1 0

[arty] 44244: Make sure to try to map sections only in the address space we live in.
by arty＠svn.reactos.org 20 Nov '09

20 Nov '09

Author: arty Date: Fri Nov 20 21:31:09 2009 New Revision: 44244 URL: http://svn.reactos.org/svn/reactos?rev=44244&view=rev Log: Make sure to try to map sections only in the address space we live in. Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c branches/arty-newcc/ntoskrnl/mm/section/image.c Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] Fri Nov 20 21:31:09 2009 @@ -829,7 +829,7 @@ End.LowPart = PAGE_ROUND_DOWN(End.LowPart); FileOffset.LowPart = PAGE_ROUND_UP(FileOffset.LowPart); FirstMapped.QuadPart = MemoryArea->Data.SectionData.ViewOffset.QuadPart; - DPRINT1 + DPRINT ("Pulling zero pages for %08x%08x-%08x%08x\n", FileOffset.u.HighPart, FileOffset.u.LowPart, End.u.HighPart, End.u.LowPart); @@ -2878,9 +2878,7 @@ if (Section->AllocationAttributes & SEC_IMAGE) { - DPRINT1("Mapping as image: %wZ\n", &Section->FileObject->FileName); Status = MiMapImageFileSection(AddressSpace, Section, BaseAddress); - DPRINT1("Mapping %x\n", Status); } else { @@ -2938,7 +2936,6 @@ } MmLockSectionSegment(Section->Segment); - DPRINT1("Mapping as data\n"); Status = MiMapViewOfSegment(AddressSpace, Section, Section->Segment, @@ -2947,13 +2944,10 @@ Protect, &ViewOffset, AllocationType & (MEM_TOP_DOWN|SEC_NO_CHANGE)); - DPRINT1("Status %x\n", Status); MmUnlockSectionSegment(Section->Segment); } - DPRINT1("Unlock address space\n"); MmUnlockAddressSpace(AddressSpace); - DPRINT1("Done\n"); return(Status); } Modified: branches/arty-newcc/ntoskrnl/mm/section/image.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] Fri Nov 20 21:31:09 2009 @@ -1689,7 +1689,9 @@ ImageSectionObject->ImageSize = ImageSize; /* Check there is enough space to map the section at that point. */ - if (MmLocateMemoryAreaByRegion(AddressSpace, (PVOID)ImageBase, + if ((AddressSpace != MmGetKernelAddressSpace() && + (ULONG_PTR)ImageBase >= (ULONG_PTR)MM_HIGHEST_USER_ADDRESS) || + MmLocateMemoryAreaByRegion(AddressSpace, (PVOID)ImageBase, PAGE_ROUND_UP(ImageSize)) != NULL) { /* Fail if the user requested a fixed base address. */

1 0

[arty] 44243: Clean up locking in section mapping. This fixes the bugcheck at failure. Prep work for fixing another problem re: relocating image sections.
by arty＠svn.reactos.org 20 Nov '09

20 Nov '09

Author: arty Date: Fri Nov 20 19:49:23 2009 New Revision: 44243 URL: http://svn.reactos.org/svn/reactos?rev=44243&view=rev Log: Clean up locking in section mapping. This fixes the bugcheck at failure. Prep work for fixing another problem re: relocating image sections. Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c branches/arty-newcc/ntoskrnl/mm/section/image.c Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] Fri Nov 20 19:49:23 2009 @@ -2878,7 +2878,9 @@ if (Section->AllocationAttributes & SEC_IMAGE) { + DPRINT1("Mapping as image: %wZ\n", &Section->FileObject->FileName); Status = MiMapImageFileSection(AddressSpace, Section, BaseAddress); + DPRINT1("Mapping %x\n", Status); } else { @@ -2886,18 +2888,21 @@ if ((Protect & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)) && !(Section->SectionPageProtection & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE))) { + MmUnlockAddressSpace(AddressSpace); return STATUS_SECTION_PROTECTION; } /* check for read access */ if ((Protect & (PAGE_READONLY|PAGE_WRITECOPY|PAGE_EXECUTE_READ|PAGE_EXECUTE_WRITECOPY)) && !(Section->SectionPageProtection & (PAGE_READONLY|PAGE_READWRITE|PAGE_WRITECOPY|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY))) { + MmUnlockAddressSpace(AddressSpace); return STATUS_SECTION_PROTECTION; } /* check for execute access */ if ((Protect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY)) && !(Section->SectionPageProtection & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY))) { + MmUnlockAddressSpace(AddressSpace); return STATUS_SECTION_PROTECTION; } @@ -2933,6 +2938,7 @@ } MmLockSectionSegment(Section->Segment); + DPRINT1("Mapping as data\n"); Status = MiMapViewOfSegment(AddressSpace, Section, Section->Segment, @@ -2941,17 +2947,14 @@ Protect, &ViewOffset, AllocationType & (MEM_TOP_DOWN|SEC_NO_CHANGE)); + DPRINT1("Status %x\n", Status); MmUnlockSectionSegment(Section->Segment); - if (!NT_SUCCESS(Status)) - { - MmUnlockAddressSpace(AddressSpace); - return(Status); - } - } - + } + + DPRINT1("Unlock address space\n"); MmUnlockAddressSpace(AddressSpace); - - return(STATUS_SUCCESS); + DPRINT1("Done\n"); + return(Status); } /* Modified: branches/arty-newcc/ntoskrnl/mm/section/image.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] Fri Nov 20 19:49:23 2009 @@ -1660,6 +1660,7 @@ ULONG NrSegments; ULONG_PTR ImageBase; ULONG ImageSize; + NTSTATUS Status = STATUS_SUCCESS; PMM_IMAGE_SECTION_OBJECT ImageSectionObject; PMM_SECTION_SEGMENT SectionSegments; @@ -1694,14 +1695,12 @@ /* Fail if the user requested a fixed base address. */ if ((*BaseAddress) != NULL) { - MmUnlockAddressSpace(AddressSpace); return(STATUS_UNSUCCESSFUL); } /* Otherwise find a gap to map the image. */ ImageBase = (ULONG_PTR)MmFindGap(AddressSpace, PAGE_ROUND_UP(ImageSize), PAGE_SIZE, FALSE); if (ImageBase == 0) { - MmUnlockAddressSpace(AddressSpace); return(STATUS_UNSUCCESSFUL); } } @@ -1710,7 +1709,6 @@ { if (!(SectionSegments[i].Image.Characteristics & IMAGE_SCN_TYPE_NOLOAD)) { - NTSTATUS Status; PVOID SBaseAddress = (PVOID) ((char*)ImageBase + (ULONG_PTR)SectionSegments[i].Image.VirtualAddress); MmLockSectionSegment(&SectionSegments[i]); @@ -1723,16 +1721,13 @@ 0, 0); MmUnlockSectionSegment(&SectionSegments[i]); - if (!NT_SUCCESS(Status)) - { - MmUnlockAddressSpace(AddressSpace); - return(Status); - } } } - *BaseAddress = (PVOID)ImageBase; - return STATUS_SUCCESS; + if (NT_SUCCESS(Status)) + *BaseAddress = (PVOID)ImageBase; + + return Status; } VOID static

1 0

[pschweitzer] 44242: Hackish fix to make Ext3Fsd link. Removed useless code in init.c And added Ext3Fsd.sys to build
by pschweitzer＠svn.reactos.org 20 Nov '09

20 Nov '09

Author: pschweitzer Date: Fri Nov 20 19:40:58 2009 New Revision: 44242 URL: http://svn.reactos.org/svn/reactos?rev=44242&view=rev Log: Hackish fix to make Ext3Fsd link. Removed useless code in init.c And added Ext3Fsd.sys to build Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext3Fsd.rbuild branches/pierre-fsd/drivers/filesystems/Ext3Fsd/init.c branches/pierre-fsd/drivers/filesystems/directory.rbuild Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext3Fsd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext3Fsd.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext3Fsd.rbuild [iso-8859-1] Fri Nov 20 19:40:58 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ext3fsd" type="kernelmodedriver" installbase="system32/drivers" installname="Ext3Fsd.sys" allowwarnings="true"> +<module name="ext3fsd" type="kernelmodedriver" installbase="system32/drivers" installname="Ext3Fsd.sys" allowwarnings="true" entrypoint="DriverEntry"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="ext3fsd">.</include> <include base="ext3fsd">include</include> @@ -9,6 +9,7 @@ <library>hal</library> <library>pseh</library> <library>libcntpr</library> + <file>init.c</file> <file>block.c</file> <file>cleanup.c</file> <file>close.c</file> @@ -23,7 +24,6 @@ <file>fileinfo.c</file> <file>flush.c</file> <file>fsctl.c</file> - <file>init.c</file> <file>linux.c</file> <file>lock.c</file> <file>memory.c</file> Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/init.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/Ext3Fsd/init.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/init.c [iso-8859-1] Fri Nov 20 19:40:58 2009 @@ -24,14 +24,10 @@ /* DEFINITIONS ***********************************************************/ -#if 1 NTSTATUS NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath ); -#else -DRIVER_INITIALIZE DriverEntry; -#endif #ifdef ALLOC_PRAGMA #pragma alloc_text(INIT, Ext2QueryGlobalParameters) Modified: branches/pierre-fsd/drivers/filesystems/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/directory.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/directory.rbuild [iso-8859-1] Fri Nov 20 19:40:58 2009 @@ -7,9 +7,9 @@ <directory name="ext2"> <xi:include href="ext2/ext2.rbuild" /> </directory> - +</directory> <directory name="fs_rec"> <xi:include href="fs_rec/fs_rec.rbuild" /> </directory>

1 0

[spetreolle] 44241: Fix build, spotted by HeisSpiter.
by spetreolle＠svn.reactos.org 20 Nov '09

20 Nov '09

Author: spetreolle Date: Fri Nov 20 19:18:34 2009 New Revision: 44241 URL: http://svn.reactos.org/svn/reactos?rev=44241&view=rev Log: Fix build, spotted by HeisSpiter. Modified: branches/pierre-fsd/include/ddk/ntifs.h Modified: branches/pierre-fsd/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/ntifs.h?… ============================================================================== --- branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] Fri Nov 20 19:18:34 2009 @@ -3925,6 +3925,13 @@ NTKERNELAPI VOID NTAPI +FsRtlTeardownPerStreamContexts ( + IN PFSRTL_ADVANCED_FCB_HEADER AdvancedHeader +); + +NTKERNELAPI +VOID +NTAPI FsRtlTruncateBaseMcb ( IN PBASE_MCB Mcb, IN LONGLONG Vbn

1 0

[spetreolle] 44240: ext3fsd now fully builds, but fails to find DriverEntry at linking time.
by spetreolle＠svn.reactos.org 20 Nov '09

20 Nov '09

Author: spetreolle Date: Fri Nov 20 19:06:54 2009 New Revision: 44240 URL: http://svn.reactos.org/svn/reactos?rev=44240&view=rev Log: ext3fsd now fully builds, but fails to find DriverEntry at linking time. Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext3Fsd.rbuild branches/pierre-fsd/drivers/filesystems/Ext3Fsd/block.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/cleanup.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/close.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/create.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/devctl.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/dirctl.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/dispatch.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/generic.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/fastio.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/fileinfo.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/flush.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/fsctl.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/common.h branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/ext2fs.h branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/fs.h branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/module.h branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/types.h branches/pierre-fsd/drivers/filesystems/Ext3Fsd/init.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/lock.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/memory.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/pnp.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/read.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/shutdown.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/volinfo.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/write.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext3Fsd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/block.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/cleanup.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/close.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/create.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/devctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/generic.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/fileinfo.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/flush.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/common.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/ext2fs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/fs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/module.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/types.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/init.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/memory.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/read.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/write.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/…

1 0

[fireball] 44239: [wininet] - Revert 44236 (sync wininet to Wine-1.1.33) and 43948 (sync wininet to Wine-1.1.32). Part 1/3 of rapps unregressing. See issue #4934 for more details.
by fireball＠svn.reactos.org 20 Nov '09

20 Nov '09

Author: fireball Date: Fri Nov 20 17:50:05 2009 New Revision: 44239 URL: http://svn.reactos.org/svn/reactos?rev=44239&view=rev Log: [wininet] - Revert 44236 (sync wininet to Wine-1.1.33) and 43948 (sync wininet to Wine-1.1.32). Part 1/3 of rapps unregressing. See issue #4934 for more details. Removed: trunk/reactos/dll/win32/wininet/wininet_Lt.rc Modified: trunk/reactos/dll/win32/wininet/cookie.c trunk/reactos/dll/win32/wininet/dialogs.c trunk/reactos/dll/win32/wininet/ftp.c trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/internet.h trunk/reactos/dll/win32/wininet/netconnection.c trunk/reactos/dll/win32/wininet/resource.h trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/utility.c trunk/reactos/dll/win32/wininet/wininet.rbuild trunk/reactos/dll/win32/wininet/wininet.spec trunk/reactos/dll/win32/wininet/wininet_Bg.rc trunk/reactos/dll/win32/wininet/wininet_Cs.rc trunk/reactos/dll/win32/wininet/wininet_Da.rc trunk/reactos/dll/win32/wininet/wininet_De.rc trunk/reactos/dll/win32/wininet/wininet_En.rc trunk/reactos/dll/win32/wininet/wininet_Eo.rc trunk/reactos/dll/win32/wininet/wininet_Es.rc trunk/reactos/dll/win32/wininet/wininet_Fi.rc trunk/reactos/dll/win32/wininet/wininet_Fr.rc trunk/reactos/dll/win32/wininet/wininet_Hu.rc trunk/reactos/dll/win32/wininet/wininet_It.rc trunk/reactos/dll/win32/wininet/wininet_Ja.rc trunk/reactos/dll/win32/wininet/wininet_Ko.rc trunk/reactos/dll/win32/wininet/wininet_Nl.rc trunk/reactos/dll/win32/wininet/wininet_No.rc trunk/reactos/dll/win32/wininet/wininet_Pl.rc trunk/reactos/dll/win32/wininet/wininet_Pt.rc trunk/reactos/dll/win32/wininet/wininet_Ro.rc trunk/reactos/dll/win32/wininet/wininet_Ru.rc trunk/reactos/dll/win32/wininet/wininet_Si.rc trunk/reactos/dll/win32/wininet/wininet_Sv.rc trunk/reactos/dll/win32/wininet/wininet_Tr.rc trunk/reactos/dll/win32/wininet/wininet_Uk.rc trunk/reactos/dll/win32/wininet/wininet_Zh.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c… Modified: trunk/reactos/dll/win32/wininet/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/dialogs.… Modified: trunk/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?re… Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… Modified: trunk/reactos/dll/win32/wininet/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/resource… Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… Modified: trunk/reactos/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/utility.… Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… Modified: trunk/reactos/dll/win32/wininet/wininet.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… Modified: trunk/reactos/dll/win32/wininet/wininet_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Removed: trunk/reactos/dll/win32/wininet/wininet_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_…

1 0

[arty] 44238: Fix checking the wrong pointer for allocation failure, caught by Amine.
by arty＠svn.reactos.org 20 Nov '09

20 Nov '09

Author: arty Date: Fri Nov 20 17:00:35 2009 New Revision: 44238 URL: http://svn.reactos.org/svn/reactos?rev=44238&view=rev Log: Fix checking the wrong pointer for allocation failure, caught by Amine. Modified: branches/arty-newcc/ntoskrnl/fsrtl/filelock.c Modified: branches/arty-newcc/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/filel… ============================================================================== --- branches/arty-newcc/ntoskrnl/fsrtl/filelock.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/fsrtl/filelock.c [iso-8859-1] Fri Nov 20 17:00:35 2009 @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ @@ -261,7 +261,7 @@ PLOCK_INFORMATION LockInfo; BOOLEAN InsertedNew; - DPRINT1("FsRtlPrivateLock(FileLock %x,FileObject %x,FileOffset %x,Length %x,Process %x, Key %x, FailImmediately %x, Exclusive %x)\n", + DPRINT("FsRtlPrivateLock(FileLock %x,FileObject %x,FileOffset %x,Length %x,Process %x, Key %x, FailImmediately %x, Exclusive %x)\n", FileLock, FileObject, FileOffset->LowPart, @@ -277,7 +277,7 @@ { LockInfo = ExAllocatePool(PagedPool, sizeof(LOCK_INFORMATION)); FileLock->LockInformation = LockInfo; - if (!FileLock) + if (!LockInfo) { DPRINT("out of memory\n"); return FALSE;

1 0

[arty] 44237: We don't use this ERESOURCE yet, but it'll be used to synchronize access to the filelocks.
by arty＠svn.reactos.org 20 Nov '09

20 Nov '09

Author: arty Date: Fri Nov 20 16:22:05 2009 New Revision: 44237 URL: http://svn.reactos.org/svn/reactos?rev=44237&view=rev Log: We don't use this ERESOURCE yet, but it'll be used to synchronize access to the filelocks. Modified: branches/arty-newcc/include/ddk/ntifs.h Modified: branches/arty-newcc/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/ntifs.h?… ============================================================================== --- branches/arty-newcc/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/arty-newcc/include/ddk/ntifs.h [iso-8859-1] Fri Nov 20 16:22:05 2009 @@ -1273,16 +1273,14 @@ /* raw internal file lock struct returned from FsRtlGetNextFileLock */ typedef struct _FILE_SHARED_LOCK_ENTRY { - PVOID Unknown1; - PVOID Unknown2; + ERESOURCE Resource; FILE_LOCK_INFO FileLock; } FILE_SHARED_LOCK_ENTRY, *PFILE_SHARED_LOCK_ENTRY; /* raw internal file lock struct returned from FsRtlGetNextFileLock */ typedef struct _FILE_EXCLUSIVE_LOCK_ENTRY { LIST_ENTRY ListEntry; - PVOID Unknown1; - PVOID Unknown2; + ERESOURCE Resource; FILE_LOCK_INFO FileLock; } FILE_EXCLUSIVE_LOCK_ENTRY, *PFILE_EXCLUSIVE_LOCK_ENTRY;

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