Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[tkreuzer] 53411: [FREELDR] Don't use RtlZeroMemory to initialize a pointer
by tkreuzer＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: tkreuzer Date: Wed Aug 24 09:59:35 2011 New Revision: 53411 URL: http://svn.reactos.org/svn/reactos?rev=53411&view=rev Log: [FREELDR] Don't use RtlZeroMemory to initialize a pointer Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] Wed Aug 24 09:59:35 2011 @@ -975,10 +975,9 @@ ULONG FunctionNumber; CHAR VendorIdString[8]; CHAR DeviceIdString[8]; - PCM_RESOURCE_LIST ResourceList; + PCM_RESOURCE_LIST ResourceList = NULL; NTSTATUS Status; - RtlZeroMemory(&ResourceList, sizeof(PCM_RESOURCE_LIST)); SlotNumber.u.AsULONG = 0; /* Loop through all devices */

1 0

[tfaber] 53410: [EVENTLOG] - Don't use sizeof for a variable-length structure - Fix string buffer building
by tfaber＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: tfaber Date: Wed Aug 24 09:45:50 2011 New Revision: 53410 URL: http://svn.reactos.org/svn/reactos?rev=53410&view=rev Log: [EVENTLOG] - Don't use sizeof for a variable-length structure - Fix string buffer building Modified: trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Wed Aug 24 09:45:50 2011 @@ -959,7 +959,7 @@ PEVENTLOGRECORD pRec; SYSTEMTIME SysTime; WCHAR *str; - UINT i, pos, nStrings; + UINT i, pos; PBYTE Buffer; dwRecSize = @@ -983,7 +983,7 @@ dwRecSize += 4; - Buffer = (BYTE *) HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, dwRecSize); + Buffer = HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, dwRecSize); if (!Buffer) { @@ -1002,7 +1002,6 @@ pRec->EventID = dwEventId; pRec->EventType = wType; - pRec->NumStrings = wNumStrings; pRec->EventCategory = wCategory; pos = sizeof(EVENTLOGRECORD); @@ -1024,14 +1023,13 @@ } pRec->StringOffset = pos; - for (i = 0, str = lpStrings, nStrings = 0; i < wNumStrings; i++) + for (i = 0, str = lpStrings; i < wNumStrings; i++) { lstrcpyW((WCHAR *) (Buffer + pos), str); pos += (lstrlenW(str) + 1) * sizeof(WCHAR); str += lstrlenW(str) + 1; - nStrings++; - } - pRec->NumStrings = nStrings; + } + pRec->NumStrings = wNumStrings; pRec->DataOffset = pos; if (dwDataSize) Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Wed Aug 24 09:45:50 2011 @@ -397,6 +397,7 @@ DWORD lastRec; DWORD recSize; DWORD dwStringsSize = 0; + DWORD dwUserSidLength = 0; DWORD dwError = ERROR_SUCCESS; WCHAR *lpStrings; int pos = 0; @@ -439,10 +440,10 @@ DPRINT1("Type %hu: %wZ\n", EventType, Strings[i]); break; } - dwStringsSize += (wcslen(Strings[i]->Buffer) + 1) * sizeof(WCHAR); - } - - lpStrings = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, dwStringsSize * 2); + dwStringsSize += Strings[i]->Length + sizeof UNICODE_NULL; + } + + lpStrings = HeapAlloc(GetProcessHeap(), 0, dwStringsSize); if (!lpStrings) { DPRINT1("Failed to allocate heap\n"); @@ -451,10 +452,14 @@ for (i = 0; i < NumStrings; i++) { - wcscpy((WCHAR*)(lpStrings + pos), Strings[i]->Buffer); - pos += (wcslen(Strings[i]->Buffer) + 1) * sizeof(WCHAR); - } - + CopyMemory(lpStrings + pos, Strings[i]->Buffer, Strings[i]->Length); + pos += Strings[i]->Length / sizeof(WCHAR); + lpStrings[pos] = UNICODE_NULL; + pos += sizeof UNICODE_NULL / sizeof(WCHAR); + } + + if (UserSID) + dwUserSidLength = FIELD_OFFSET(SID, SubAuthority[UserSID->SubAuthorityCount]); LogBuffer = LogfAllocAndBuildNewRecord(&recSize, lastRec, EventType, @@ -462,10 +467,10 @@ EventID, lpLogHandle->szName, ComputerName->Buffer, - sizeof(RPC_SID), - &UserSID, + dwUserSidLength, + UserSID, NumStrings, - (WCHAR*)lpStrings, + lpStrings, DataSize, Data);

1 0

[tkreuzer] 53409: [HAL/VIDEOPRT/EVENTLOG] Really fix some of the sizeof issues
by tkreuzer＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: tkreuzer Date: Wed Aug 24 09:41:16 2011 New Revision: 53409 URL: http://svn.reactos.org/svn/reactos?rev=53409&view=rev Log: [HAL/VIDEOPRT/EVENTLOG] Really fix some of the sizeof issues Modified: trunk/reactos/base/services/eventlog/rpc.c trunk/reactos/drivers/video/videoprt/services.c trunk/reactos/hal/halx86/generic/usage.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Wed Aug 24 09:41:16 2011 @@ -462,7 +462,7 @@ EventID, lpLogHandle->szName, ComputerName->Buffer, - sizeof(PRPC_SID), + sizeof(RPC_SID), &UserSID, NumStrings, (WCHAR*)lpStrings, Modified: trunk/reactos/drivers/video/videoprt/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/ser… ============================================================================== --- trunk/reactos/drivers/video/videoprt/services.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/services.c [iso-8859-1] Wed Aug 24 09:41:16 2011 @@ -111,6 +111,6 @@ return FALSE; } - RtlCopyMemory(AgpServices, &Interface.AgpReservePhysical, sizeof(PVIDEO_PORT_AGP_SERVICES)); + RtlCopyMemory(AgpServices, &Interface.AgpReservePhysical, sizeof(VIDEO_PORT_AGP_SERVICES)); return TRUE; } Modified: trunk/reactos/hal/halx86/generic/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/usage.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] Wed Aug 24 09:41:16 2011 @@ -132,7 +132,7 @@ RawDescriptor->u.Interrupt.Affinity = HalpActiveProcessors; /* The translated copy is identical */ - RtlCopyMemory(TranslatedDescriptor, RawDescriptor, sizeof(PCM_PARTIAL_RESOURCE_DESCRIPTOR)); + RtlCopyMemory(TranslatedDescriptor, RawDescriptor, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); /* But the vector and IRQL must be set correctly */ TranslatedDescriptor->u.Interrupt.Vector = Entry; @@ -180,7 +180,7 @@ } /* Make an identical copy to begin with */ - RtlCopyMemory(TranslatedDescriptor, RawDescriptor, sizeof(PCM_PARTIAL_RESOURCE_DESCRIPTOR)); + RtlCopyMemory(TranslatedDescriptor, RawDescriptor, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); /* Check what this is */ if (RawDescriptor->Type == CmResourceTypePort)

1 0

[tkreuzer] 53408: [USER32_WINETEST] Better fix by Tomas Faber (increases the performance ; -))
by tkreuzer＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: tkreuzer Date: Wed Aug 24 08:42:37 2011 New Revision: 53408 URL: http://svn.reactos.org/svn/reactos?rev=53408&view=rev Log: [USER32_WINETEST] Better fix by Tomas Faber (increases the performance ;-)) Modified: trunk/rostests/winetests/user32/cursoricon.c Modified: trunk/rostests/winetests/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/cursoric… ============================================================================== --- trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] Wed Aug 24 08:42:37 2011 @@ -186,7 +186,7 @@ 0, /* biClrUsed */ \ 0 /* biClrImportant */ \ }, \ - { {0}/* DIB data: left uninitialized */ } \ + /* DIB data: left uninitialized */ \ } \ }

1 0

[tkreuzer] 53407: [USER32_WINETEST] Fix MSVC build
by tkreuzer＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: tkreuzer Date: Wed Aug 24 08:36:18 2011 New Revision: 53407 URL: http://svn.reactos.org/svn/reactos?rev=53407&view=rev Log: [USER32_WINETEST] Fix MSVC build Modified: trunk/rostests/winetests/user32/cursoricon.c Modified: trunk/rostests/winetests/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/cursoric… ============================================================================== --- trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] Wed Aug 24 08:36:18 2011 @@ -186,7 +186,7 @@ 0, /* biClrUsed */ \ 0 /* biClrImportant */ \ }, \ - { /* DIB data: left uninitialized */ } \ + { {0}/* DIB data: left uninitialized */ } \ } \ }

1 0

[akhaldi] 53406: [NTDLL/LDR] * Fix a thinko.
by akhaldi＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: akhaldi Date: Wed Aug 24 03:02:03 2011 New Revision: 53406 URL: http://svn.reactos.org/svn/reactos?rev=53406&view=rev Log: [NTDLL/LDR] * Fix a thinko. Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Wed Aug 24 03:02:03 2011 @@ -1660,7 +1660,7 @@ { /* Get character */ p = *ActualSearchPath; - if (!(p) && (p == ';')) + if (!(p) || (p == ';')) { /* FIXME: We don't have a character, or is a semicolon.*/

1 0

[akhaldi] 53405: [EVENTLOG] * Fix a bad sizeof().
by akhaldi＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: akhaldi Date: Wed Aug 24 02:09:29 2011 New Revision: 53405 URL: http://svn.reactos.org/svn/reactos?rev=53405&view=rev Log: [EVENTLOG] * Fix a bad sizeof(). Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Wed Aug 24 02:09:29 2011 @@ -462,7 +462,7 @@ EventID, lpLogHandle->szName, ComputerName->Buffer, - sizeof(UserSID), + sizeof(PRPC_SID), &UserSID, NumStrings, (WCHAR*)lpStrings,

1 0

[akhaldi] 53404: [VIDEOPRT] * Fix a bad sizeof() that's been with us since r12860 (more than 6 years ago).
by akhaldi＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: akhaldi Date: Wed Aug 24 02:04:55 2011 New Revision: 53404 URL: http://svn.reactos.org/svn/reactos?rev=53404&view=rev Log: [VIDEOPRT] * Fix a bad sizeof() that's been with us since r12860 (more than 6 years ago). Modified: trunk/reactos/drivers/video/videoprt/services.c Modified: trunk/reactos/drivers/video/videoprt/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/ser… ============================================================================== --- trunk/reactos/drivers/video/videoprt/services.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/services.c [iso-8859-1] Wed Aug 24 02:04:55 2011 @@ -111,6 +111,6 @@ return FALSE; } - RtlCopyMemory(AgpServices, &Interface.AgpReservePhysical, sizeof(AgpServices)); + RtlCopyMemory(AgpServices, &Interface.AgpReservePhysical, sizeof(PVIDEO_PORT_AGP_SERVICES)); return TRUE; }

1 0

[akhaldi] 53403: [USER32] * Fix a bad sizeof().
by akhaldi＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: akhaldi Date: Wed Aug 24 02:00:14 2011 New Revision: 53403 URL: http://svn.reactos.org/svn/reactos?rev=53403&view=rev Log: [USER32] * Fix a bad sizeof(). Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Wed Aug 24 02:00:14 2011 @@ -1792,7 +1792,7 @@ UpdateLayeredWindowIndirect(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info) { - if (info && info->cbSize == sizeof(info)) + if (info && info->cbSize == sizeof(*info)) { return NtUserUpdateLayeredWindow( hwnd, info->hdcDst,

1 0

[akhaldi] 53402: [HAL] * Fix a couple bad sizeof().
by akhaldi＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: akhaldi Date: Wed Aug 24 01:52:12 2011 New Revision: 53402 URL: http://svn.reactos.org/svn/reactos?rev=53402&view=rev Log: [HAL] * Fix a couple bad sizeof(). Modified: trunk/reactos/hal/halx86/generic/usage.c Modified: trunk/reactos/hal/halx86/generic/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/usage.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] Wed Aug 24 01:52:12 2011 @@ -132,7 +132,7 @@ RawDescriptor->u.Interrupt.Affinity = HalpActiveProcessors; /* The translated copy is identical */ - RtlCopyMemory(TranslatedDescriptor, RawDescriptor, sizeof(TranslatedDescriptor)); + RtlCopyMemory(TranslatedDescriptor, RawDescriptor, sizeof(PCM_PARTIAL_RESOURCE_DESCRIPTOR)); /* But the vector and IRQL must be set correctly */ TranslatedDescriptor->u.Interrupt.Vector = Entry; @@ -180,7 +180,7 @@ } /* Make an identical copy to begin with */ - RtlCopyMemory(TranslatedDescriptor, RawDescriptor, sizeof(TranslatedDescriptor)); + RtlCopyMemory(TranslatedDescriptor, RawDescriptor, sizeof(PCM_PARTIAL_RESOURCE_DESCRIPTOR)); /* Check what this is */ if (RawDescriptor->Type == CmResourceTypePort)

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2011