Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 62634: [WIN32SS] Don't dereference an object that wasn't referenced CID #1102086
by pschweitzer＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: pschweitzer Date: Sat Apr 5 21:42:48 2014 New Revision: 62634 URL: http://svn.reactos.org/svn/reactos?rev=62634&view=rev Log: [WIN32SS] Don't dereference an object that wasn't referenced CID #1102086 Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Sat Apr 5 21:42:48 2014 @@ -304,10 +304,10 @@ pMemObj->cbData = sizeof(LCID); *((LCID*)pMemObj->Data) = NtCurrentTeb()->CurrentLocale; IntAddFormatedData(pWinStaObj, CF_LOCALE, hMem, TRUE, TRUE); - } - - /* Release the extra reference (UserCreateObject added 2 references) */ - UserDereferenceObject(pMemObj); + + /* Release the extra reference (UserCreateObject added 2 references) */ + UserDereferenceObject(pMemObj); + } } /* Add CF_TEXT. Note: it is synthesized in user32.dll */

1 0

[pschweitzer] 62633: [SVCHOST] Fix buffer overruns in LanaFlagIsSet() and SetLanaFlag(). Normally, i shouldn't be > 7, MAX_LANA is set to 254. CID #1102306 CID #1102305
by pschweitzer＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: pschweitzer Date: Sat Apr 5 21:27:12 2014 New Revision: 62633 URL: http://svn.reactos.org/svn/reactos?rev=62633&view=rev Log: [SVCHOST] Fix buffer overruns in LanaFlagIsSet() and SetLanaFlag(). Normally, i shouldn't be > 7, MAX_LANA is set to 254. CID #1102306 CID #1102305 Modified: trunk/reactos/base/services/svchost/netbios.c Modified: trunk/reactos/base/services/svchost/netbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/netb… ============================================================================== --- trunk/reactos/base/services/svchost/netbios.c [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/netbios.c [iso-8859-1] Sat Apr 5 21:27:12 2014 @@ -64,7 +64,7 @@ DWORD i = Lana / 32; /* Clear the flag for this LANA */ - return (i <= 8) ? LanaFlags[i] & (1 << (Lana - 32 * i)) : FALSE; + return (i <= 7) ? LanaFlags[i] & (1 << (Lana - 32 * i)) : FALSE; } VOID @@ -76,7 +76,7 @@ DWORD i = Lana / 32; /* Set the flag for this LANA */ - if (i <= 8) LanaFlags[i] |= 1 << (Lana - 32 * i); + if (i <= 7) LanaFlags[i] |= 1 << (Lana - 32 * i); } VOID

1 0

[pschweitzer] 62632: [MMEBUDDY] Fix use after free. CID #716804
by pschweitzer＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: pschweitzer Date: Sat Apr 5 21:08:10 2014 New Revision: 62632 URL: http://svn.reactos.org/svn/reactos?rev=62632&view=rev Log: [MMEBUDDY] Fix use after free. CID #716804 Modified: trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c Modified: trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] Sat Apr 5 21:08:10 2014 @@ -306,15 +306,16 @@ IN PSOUND_DEVICE SoundDevice) { MMRESULT Result; - PSOUND_DEVICE_INSTANCE SoundDeviceInstance; + PSOUND_DEVICE_INSTANCE SoundDeviceInstance, NextDeviceInstance; SoundDeviceInstance = SoundDevice->HeadInstance; while ( SoundDeviceInstance ) { + NextDeviceInstance = SoundDeviceInstance->Next; Result = DestroySoundDeviceInstance(SoundDeviceInstance); SND_ASSERT( MMSUCCESS(Result) ); - SoundDeviceInstance = SoundDeviceInstance->Next; + SoundDeviceInstance = NextDeviceInstance; } return MMSYSERR_NOERROR;

1 0

[tfaber] 62631: [NDK][DDK][XDK] - Move BITMAP_RANGE structure to NDK where it belongs
by tfaber＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: tfaber Date: Sat Apr 5 17:17:47 2014 New Revision: 62631 URL: http://svn.reactos.org/svn/reactos?rev=62631&view=rev Log: [NDK][DDK][XDK] - Move BITMAP_RANGE structure to NDK where it belongs Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/cctypes.h trunk/reactos/include/xdk/ntifs.template.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=62… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sat Apr 5 17:17:47 2014 @@ -11290,15 +11290,6 @@ LARGE_INTEGER CreationTime; } OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; -typedef struct _BITMAP_RANGE { - LIST_ENTRY Links; - LONGLONG BasePage; - ULONG FirstDirtyPage; - ULONG LastDirtyPage; - ULONG DirtyPages; - PULONG Bitmap; -} BITMAP_RANGE, *PBITMAP_RANGE; - typedef struct _FILE_COPY_ON_WRITE_INFORMATION { BOOLEAN ReplaceIfExists; HANDLE RootDirectory; Modified: trunk/reactos/include/ndk/cctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cctypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cctypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cctypes.h [iso-8859-1] Sat Apr 5 17:17:47 2014 @@ -81,7 +81,18 @@ LIST_ENTRY PrivateLinks; } PRIVATE_CACHE_MAP, *PPRIVATE_CACHE_MAP; -typedef struct _MBCB { +typedef struct _BITMAP_RANGE +{ + LIST_ENTRY Links; + LONGLONG BasePage; + ULONG FirstDirtyPage; + ULONG LastDirtyPage; + ULONG DirtyPages; + PULONG Bitmap; +} BITMAP_RANGE, *PBITMAP_RANGE; + +typedef struct _MBCB +{ CSHORT NodeTypeCode; CSHORT NodeIsInZone; ULONG PagesToWrite; Modified: trunk/reactos/include/xdk/ntifs.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntifs.template… ============================================================================== --- trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] Sat Apr 5 17:17:47 2014 @@ -1408,15 +1408,6 @@ ULONG SecurityDescriptorSize; LARGE_INTEGER CreationTime; } OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; - -typedef struct _BITMAP_RANGE { - LIST_ENTRY Links; - LONGLONG BasePage; - ULONG FirstDirtyPage; - ULONG LastDirtyPage; - ULONG DirtyPages; - PULONG Bitmap; -} BITMAP_RANGE, *PBITMAP_RANGE; typedef struct _FILE_COPY_ON_WRITE_INFORMATION { BOOLEAN ReplaceIfExists;

1 0

[tkreuzer] 62630: [PSEH3] Make sure _abnormal_termination() returns the correct result and make sure the compiler does not rely on register values in the finally and filter function. The C++ PSEH t...
by tkreuzer＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: tkreuzer Date: Sat Apr 5 16:56:00 2014 New Revision: 62630 URL: http://svn.reactos.org/svn/reactos?rev=62630&view=rev Log: [PSEH3] Make sure _abnormal_termination() returns the correct result and make sure the compiler does not rely on register values in the finally and filter function. The C++ PSEH tests now all pass. => We now have PSEH support for C++. Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sat Apr 5 16:56:00 2014 @@ -230,17 +230,19 @@ #define _SEH3$_NESTED_FUNC_RETURN(_Result) \ /* Restore esp and return to the caller */ \ asm volatile ("movl %[FixedEsp], %%esp\nret\n" \ - : : "a"(_Result), [FixedEsp]"m"(_SEH3$_TrylevelFrame.AllocaFrame) : "memory") + : : "a"(_Result), [FixedEsp]"m"(_SEH3$_TrylevelFrame.AllocaFrame) : "ebx", "ecx", "edx", "esi", "edi", "flags", "memory") /* The filter "function" */ #define _SEH3$_DEFINE_FILTER_FUNC(_Name, expression) \ { \ /* Evaluate and return the filter expression */ \ + asm volatile ("#\n" : : : "eax", "ebx", "ecx", "edx", "esi", "edi", "flags", "memory"); \ _SEH3$_NESTED_FUNC_RETURN((expression)); \ } #define _SEH3$_FINALLY_FUNC_OPEN(_Name) \ { \ + asm volatile ("#\n" : : : "eax", "ebx", "ecx", "edx", "esi", "edi", "flags", "memory"); \ /* This construct makes sure that the finally function returns */ \ /* a proper value at the end */ \ for (; ; (void)({_SEH3$_NESTED_FUNC_RETURN(0); 0;})) @@ -429,6 +431,7 @@ /* Register the registration record. */ \ if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \ else _SEH3$_RegisterTryLevel_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \ + _SEH3$_TrylevelFrame.ExceptionPointers = (PSEH3$_EXCEPTION_POINTERS)1; \ \ goto _SEH3$_l_DoTry; \ \

1 0

[tkreuzer] 62629: [PSEH_TEST] #if out a test for C++. This test only shows the limitations of PSEH and does not provide a satisfying result anyway.
by tkreuzer＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: tkreuzer Date: Sat Apr 5 16:49:17 2014 New Revision: 62629 URL: http://svn.reactos.org/svn/reactos?rev=62629&view=rev Log: [PSEH_TEST] #if out a test for C++. This test only shows the limitations of PSEH and does not provide a satisfying result anyway. Modified: trunk/rostests/tests/pseh2/psehtest.c Modified: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Sat Apr 5 16:49:17 2014 @@ -2447,6 +2447,15 @@ return (val == 3) || (val == 4) || (val == 5); } +/* This test is mainly for documentation purpose. As can be seen it doesn't + provide a satisfying result. In fact the compiler could do even more + crazy things like reusing val1 between the assignment to 0 and the last + assignment to 3. This DOES happen with C++ and it's NOT a PSEH bug, but + rather an unavoidable consequence of how the compiler works. + The conclusion: Do not use assignments to a variable inside a __try block + that is being used later inside the __except block, unless it is declared + volatile! */ +#ifndef __cplusplus DEFINE_TEST(test_unvolatile_3) { int register val1 = 0, val2 = 0; @@ -2494,6 +2503,7 @@ return FALSE; } +#endif // __cplusplus DEFINE_TEST(test_unvolatile_4) { @@ -2840,7 +2850,9 @@ USE_TEST(test_unvolatile), USE_TEST(test_unvolatile_2), +#ifndef __cplusplus USE_TEST(test_unvolatile_3), +#endif USE_TEST(test_unvolatile_4), USE_TEST(test_finally_goto), USE_TEST(test_nested_exception),

1 0

[tfaber] 62628: [NTOS:INVB] - Do not use KeDelayExecutionThread while holding a spin lock CORE-8052 #resolve
by tfaber＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: tfaber Date: Sat Apr 5 16:46:40 2014 New Revision: 62628 URL: http://svn.reactos.org/svn/reactos?rev=62628&view=rev Log: [NTOS:INVB] - Do not use KeDelayExecutionThread while holding a spin lock CORE-8052 #resolve Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Sat Apr 5 16:46:40 2014 @@ -39,7 +39,7 @@ static RGBQUAD _MainPalette[16]; #define PALETTE_FADE_STEPS 15 -#define PALETTE_FADE_TIME 20 * 10000 /* 20ms */ +#define PALETTE_FADE_TIME 20 * 1000 /* 20ms */ /** From bootvid/precomp.h **/ // @@ -76,9 +76,6 @@ LPRGBQUAD Palette = (LPRGBQUAD)(PaletteBitmapBuffer + sizeof(BITMAPINFOHEADER)); ULONG Iteration, Index, ClrUsed; - LARGE_INTEGER Interval; - - Interval.QuadPart = -PALETTE_FADE_TIME; /* Check if we're installed and we own it */ if ((InbvBootDriverInstalled) && @@ -115,14 +112,14 @@ VidBitBlt(PaletteBitmapBuffer, 0, 0); /* Wait for a bit. */ - KeDelayExecutionThread(KernelMode, FALSE, &Interval); + KeStallExecutionProcessor(PALETTE_FADE_TIME); } /* Release the lock */ InbvReleaseLock(); /* Wait for a bit. */ - KeDelayExecutionThread(KernelMode, FALSE, &Interval); + KeStallExecutionProcessor(PALETTE_FADE_TIME); } }

1 0

[pschweitzer] 62627: [SETUP16] Fix invalid free CID #715830
by pschweitzer＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: pschweitzer Date: Sat Apr 5 15:47:49 2014 New Revision: 62627 URL: http://svn.reactos.org/svn/reactos?rev=62627&view=rev Log: [SETUP16] Fix invalid free CID #715830 Modified: trunk/reactos/base/applications/setup16/main.c Modified: trunk/reactos/base/applications/setup16/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/setup16/… ============================================================================== --- trunk/reactos/base/applications/setup16/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/setup16/main.c [iso-8859-1] Sat Apr 5 15:47:49 2014 @@ -48,7 +48,7 @@ fileop.hNameMappings = NULL; ret = SHFileOperation(&fileop); - HeapFree(GetProcessHeap(), 0, &pszFrom); + HeapFree(GetProcessHeap(), 0, pszFrom); return (ret == 0); }

1 0

[tkreuzer] 62626: [PSEH3] Implement __finally support for C++
by tkreuzer＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: tkreuzer Date: Sat Apr 5 15:41:03 2014 New Revision: 62626 URL: http://svn.reactos.org/svn/reactos?rev=62626&view=rev Log: [PSEH3] Implement __finally support for C++ Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h trunk/reactos/lib/pseh/i386/pseh3.c Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sat Apr 5 15:41:03 2014 @@ -10,7 +10,7 @@ #pragma once #define _PSEH3_H_ -#include "excpt.h" +#include <excpt.h> #ifdef __cplusplus extern "C" { @@ -111,7 +111,7 @@ #endif /* This attribute allows automatic cleanup of the registered frames */ -#define _SEH3$_AUTO_CLEANUP __attribute__((cleanup(_SEH3$_Unregister))) +#define _SEH3$_AUTO_CLEANUP __attribute__((cleanup(_SEH3$_AutoCleanup))) /* CLANG specific definitions! */ #ifdef __clang__ @@ -217,7 +217,7 @@ /* Use the global unregister function */ void __attribute__((regparm(1))) -_SEH3$_Unregister( +_SEH3$_AutoCleanup( volatile SEH3$_REGISTRATION_FRAME *Frame); /* These are only dummies here */ @@ -251,7 +251,7 @@ #define _SEH3$_DECLARE_EXCEPT_INTRINSICS() /* Since we cannot use nested functions, we declare these globally as macros */ -#define _abnormal_termination() (_SEH3$_TrylevelFrame.ScopeTable != 0) +#define _abnormal_termination() (_SEH3$_TrylevelFrame.ExceptionPointers != 0) #define _exception_code() (_SEH3$_TrylevelFrame.ExceptionPointers->ExceptionRecord->ExceptionCode) #define _exception_info() (_SEH3$_TrylevelFrame.ExceptionPointers) @@ -294,7 +294,7 @@ _SEH3$_NESTED_FUNC_OPEN(_Name) \ /* Declare the intrinsics for the finally function */ \ inline __attribute__((always_inline, gnu_inline)) \ - int _abnormal_termination() { return (_SEH3$_TrylevelFrame.ScopeTable != 0); } \ + int _abnormal_termination() { return (_SEH3$_TrylevelFrame.ExceptionPointers != 0); } \ \ /* This construct makes sure that the finally function returns */ \ /* a proper value at the end */ \ @@ -351,7 +351,7 @@ }; \ \ /* Forward declaration of the auto cleanup function */ \ - _SEH3$_DECLARE_CLEANUP_FUNC(_SEH3$_Unregister); \ + _SEH3$_DECLARE_CLEANUP_FUNC(_SEH3$_AutoCleanup); \ \ /* Allocate a registration frame */ \ volatile SEH3$_REGISTRATION_FRAME _SEH3$_AUTO_CLEANUP _SEH3$_TrylevelFrame; \ @@ -412,8 +412,8 @@ /* End the try block */ \ while (0); \ _SEH3$_l_AfterTry: (void)0; \ - /* Set ScopeTable to 0, this is used by _abnormal_termination() */ \ - _SEH3$_TrylevelFrame.ScopeTable = 0; \ + /* Set ExceptionPointers to 0, this is used by _abnormal_termination() */ \ + _SEH3$_TrylevelFrame.ExceptionPointers = 0; \ \ goto _SEH3$_l_EndTry; \ \ @@ -454,7 +454,7 @@ _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ \ /* Implementation of the auto cleanup function */ \ - _SEH3$_DEFINE_CLEANUP_FUNC(_SEH3$_Unregister); \ + _SEH3$_DEFINE_CLEANUP_FUNC(_SEH3$_AutoCleanup); \ \ /* Close the outer scope */ \ } while (0); Modified: trunk/reactos/lib/pseh/i386/pseh3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3.c?rev=… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] Sat Apr 5 15:41:03 2014 @@ -130,6 +130,23 @@ return FilterResult; } +void +__attribute__((regparm(1))) +_SEH3$_AutoCleanup( + SEH3$_REGISTRATION_FRAME *Frame) +{ + /* Check for __finally frames */ + if (Frame->ScopeTable->Target == NULL) + { + _SEH3$_InvokeFilter(Frame, Frame->ScopeTable->Filter); + } + + if (Frame->Handler) + _SEH3$_UnregisterFrame(Frame); + else + _SEH3$_UnregisterTryLevel(Frame); +} + static inline LONG _SEH3$_GetFilterResult(

1 0

[pschweitzer] 62625: [VFATLIB] --MagicValues;
by pschweitzer＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: pschweitzer Date: Sat Apr 5 15:39:09 2014 New Revision: 62625 URL: http://svn.reactos.org/svn/reactos?rev=62625&view=rev Log: [VFATLIB] --MagicValues; Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c trunk/reactos/lib/fslib/vfatlib/fat16.c trunk/reactos/lib/fslib/vfatlib/fat32.c Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat12.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] Sat Apr 5 15:39:09 2014 @@ -72,7 +72,7 @@ /* Copy FAT16 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - 59); /* FAT16 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); /* FAT16 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000; Modified: trunk/reactos/lib/fslib/vfatlib/fat16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat16.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] Sat Apr 5 15:39:09 2014 @@ -72,7 +72,7 @@ /* Copy FAT16 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - 59); /* FAT16 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); /* FAT16 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000; Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] Sat Apr 5 15:39:09 2014 @@ -72,7 +72,7 @@ /* Copy FAT32 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - 87); /* FAT32 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT32_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT32_BOOT_SECTOR, OEMName)); /* FAT32 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000;

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