Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[cwittich] 69010: [CHARMAP] assign the DC to the correct variable CID 1322245
by cwittich＠svn.reactos.org 04 Sep '15

04 Sep '15

Author: cwittich Date: Fri Sep 4 20:02:25 2015 New Revision: 69010 URL: http://svn.reactos.org/svn/reactos?rev=69010&view=rev Log: [CHARMAP] assign the DC to the correct variable CID 1322245 Modified: trunk/reactos/base/applications/charmap/map.c Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/map.c [iso-8859-1] Fri Sep 4 20:02:25 2015 @@ -487,7 +487,7 @@ { return; } - hdc = (HDC)wParam; + ps.hdc = (HDC)wParam; } else {

1 0

[cwittich] 69009: [IPCONFIG] fix format string issues and double free CID 502632 CID 502633 CID 502634 CID 1322301
by cwittich＠svn.reactos.org 04 Sep '15

04 Sep '15

Author: cwittich Date: Fri Sep 4 19:03:41 2015 New Revision: 69009 URL: http://svn.reactos.org/svn/reactos?rev=69009&view=rev Log: [IPCONFIG] fix format string issues and double free CID 502632 CID 502633 CID 502634 CID 1322301 Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] Fri Sep 4 19:03:41 2015 @@ -208,32 +208,35 @@ 0, dwDataSize); + if (ConTypeTmp == NULL) + return NULL; + ConType = (LPTSTR)HeapAlloc(ProcessHeap, 0, dwDataSize); - if (ConType && ConTypeTmp) - { - if(RegQueryValueEx(hKey, - _T("Name"), - NULL, - &dwType, - (PBYTE)ConTypeTmp, - &dwDataSize) != ERROR_SUCCESS) - { - HeapFree(ProcessHeap, - 0, - ConType); - - HeapFree(ProcessHeap, - 0, - ConTypeTmp); - - ConType = NULL; - } - - if (ConType) CharToOem(ConTypeTmp, ConType); + + if (ConType == NULL) + { HeapFree(ProcessHeap, 0, ConTypeTmp); - } + return NULL; + } + + if(RegQueryValueEx(hKey, + _T("Name"), + NULL, + &dwType, + (PBYTE)ConTypeTmp, + &dwDataSize) != ERROR_SUCCESS) + { + HeapFree(ProcessHeap, + 0, + ConType); + + ConType = NULL; + } + + if (ConType) CharToOem(ConTypeTmp, ConType); + HeapFree(ProcessHeap, 0, ConTypeTmp); } } @@ -580,12 +583,12 @@ for (i = 0; i < pInfo->NumAdapters; i++) { CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP)); - _tprintf(_T("name - %S\n"), pInfo->Adapter[i].Name); + _tprintf(_T("name - %ls\n"), pInfo->Adapter[i].Name); /* Call IpReleaseAddress to release the IP address on the specified adapter. */ if ((ret = IpReleaseAddress(&AdapterInfo)) != NO_ERROR) { - _tprintf(_T("\nAn error occured while releasing interface %S : \n"), AdapterInfo.Name); + _tprintf(_T("\nAn error occured while releasing interface %ls : \n"), AdapterInfo.Name); DoFormatMessage(ret); } } @@ -656,7 +659,7 @@ for (i = 0; i < pInfo->NumAdapters; i++) { CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP)); - _tprintf(_T("name - %S\n"), pInfo->Adapter[i].Name); + _tprintf(_T("name - %ls\n"), pInfo->Adapter[i].Name); /* Call IpRenewAddress to renew the IP address on the specified adapter. */

1 0

[tfaber] 69008: [HIDCLASS][USBHUB] - Fix IRP leaks in success case of hidclass!HidClassFDO_GetDescriptors and usbhub!FowardUrbToRootHub
by tfaber＠svn.reactos.org 04 Sep '15

04 Sep '15

Author: tfaber Date: Fri Sep 4 17:31:58 2015 New Revision: 69008 URL: http://svn.reactos.org/svn/reactos?rev=69008&view=rev Log: [HIDCLASS][USBHUB] - Fix IRP leaks in success case of hidclass!HidClassFDO_GetDescriptors and usbhub!FowardUrbToRootHub Modified: trunk/reactos/drivers/hid/hidclass/fdo.c trunk/reactos/drivers/usb/usbhub/pdo.c Modified: trunk/reactos/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/fdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] Fri Sep 4 17:31:58 2015 @@ -384,6 +384,7 @@ // // completed successfully // + IoFreeIrp(Irp); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Fri Sep 4 17:31:58 2015 @@ -47,6 +47,11 @@ // Complete the original Irp // IoCompleteRequest(OriginalIrp, IO_NO_INCREMENT); + + // + // Free our allocated IRP + // + IoFreeIrp(Irp); // // Return this status so the IO Manager doesnt mess with the Irp

1 0

[akhaldi] 69007: [SETUPAPI] Partially sync query.c with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 04 Sep '15

04 Sep '15

Author: akhaldi Date: Fri Sep 4 17:29:32 2015 New Revision: 69007 URL: http://svn.reactos.org/svn/reactos?rev=69007&view=rev Log: [SETUPAPI] Partially sync query.c with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/setupapi/query.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/setupapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/query.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/query.c [iso-8859-1] Fri Sep 4 17:29:32 2015 @@ -96,8 +96,13 @@ if (InfSpec && SearchControl >= INFINFO_INF_NAME_IS_ABSOLUTE) { - len = lstrlenA(InfSpec) + 1; + len = MultiByteToWideChar(CP_ACP, 0, InfSpec, -1, NULL, 0); inf = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!inf) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } MultiByteToWideChar(CP_ACP, 0, InfSpec, -1, inf, len); } @@ -112,7 +117,7 @@ /*********************************************************************** * SetupGetInfInformationW (SETUPAPI.@) - * + * * BUGS * Only handles the case when InfSpec is an INF handle. */ @@ -240,7 +245,7 @@ */ BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION InfInformation, UINT InfIndex, PWSTR ReturnBuffer, - DWORD ReturnBufferSize, PDWORD RequiredSize) + DWORD ReturnBufferSize, PDWORD RequiredSize) { DWORD len; LPWSTR ptr; @@ -257,7 +262,7 @@ if (InfIndex != 0) FIXME("Appended INF files are not handled\n"); - ptr = (LPWSTR)&InfInformation->VersionData[0]; + ptr = (LPWSTR)InfInformation->VersionData; len = lstrlenW(ptr); if (RequiredSize) @@ -589,7 +594,7 @@ else { SetLastError( ERROR_INSUFFICIENT_BUFFER ); - HeapFree( GetProcessHeap(), 0, dir ); + if (dir != systemdir) HeapFree( GetProcessHeap(), 0, dir ); return FALSE; } } @@ -656,7 +661,7 @@ return FALSE; } - inf_path = (LPWSTR)&InfInformation->VersionData[0]; + inf_path = (LPWSTR)InfInformation->VersionData; /* FIXME: we should get OriginalCatalogName from CatalogFile line in * the original inf file and cache it, but that would require building a Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Sep 4 17:29:32 2015 @@ -333,6 +333,7 @@ reactos/dll/win32/secur32/wrapper.c # Synced to WineStaging-1.7.37 setupapi - + reactos/dll/win32/setupapi/query.c # Partial sync to WineStaging-1.7.47 reactos/dll/win32/setupapi/setupcab.c # Synced to WineStaging-1.7.47 win32k -

1 0

[pschweitzer] 69006: [CRT] Fix memory allocation in __dllonexit CID 514138
by pschweitzer＠svn.reactos.org 04 Sep '15

04 Sep '15

Author: pschweitzer Date: Fri Sep 4 16:49:51 2015 New Revision: 69006 URL: http://svn.reactos.org/svn/reactos?rev=69006&view=rev Log: [CRT] Fix memory allocation in __dllonexit CID 514138 Modified: trunk/reactos/lib/sdk/crt/stdlib/atexit.c Modified: trunk/reactos/lib/sdk/crt/stdlib/atexit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/atexit.… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/atexit.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/atexit.c [iso-8859-1] Fri Sep 4 16:49:51 2015 @@ -44,7 +44,7 @@ if (++len <= 0) return NULL; - tmp = realloc(*start, len * sizeof(tmp)); + tmp = realloc(*start, len * sizeof(_onexit_t)); if (!tmp) return NULL; *start = tmp;

1 0

[pschweitzer] 69005: [CRT] Fix rand_s implementation so that it doesn't leak resources, so that it doesn't dereference null pointer, so that it matches MSDN documentation (https://msdn.microsoft.co...
by pschweitzer＠svn.reactos.org 04 Sep '15

04 Sep '15

Author: pschweitzer Date: Fri Sep 4 16:41:51 2015 New Revision: 69005 URL: http://svn.reactos.org/svn/reactos?rev=69005&view=rev Log: [CRT] Fix rand_s implementation so that it doesn't leak resources, so that it doesn't dereference null pointer, so that it matches MSDN documentation (https://msdn.microsoft.com/fr-fr/library/sxtz2fa8.aspx) CID 716561 CID 716668 Modified: trunk/reactos/lib/sdk/crt/math/rand.c Modified: trunk/reactos/lib/sdk/crt/math/rand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/rand.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/rand.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/rand.c [iso-8859-1] Fri Sep 4 16:41:51 2015 @@ -33,17 +33,41 @@ int CDECL rand_s(unsigned int *pval) { BOOLEAN (WINAPI *pSystemFunction036)(PVOID, ULONG); // RtlGenRandom - HINSTANCE hadvapi32 = LoadLibraryA("advapi32.dll"); - int ret = 0; - pSystemFunction036 = (void*)GetProcAddress(hadvapi32, "SystemFunction036"); -#if 1 - if (!pval || (pSystemFunction036 && !pSystemFunction036(pval, sizeof(*pval)))) + HINSTANCE hadvapi32; + + if (!pval) { _invalid_parameter(NULL,_CRT_WIDE("rand_s"),_CRT_WIDE(__FILE__),__LINE__, 0); *_errno() = EINVAL; - ret = EINVAL; + return EINVAL; } -#endif - if(hadvapi32) FreeLibrary(hadvapi32); - return ret; + + *pval = 0; + hadvapi32 = LoadLibraryA("advapi32.dll"); + if (!hadvapi32) + { + _invalid_parameter(NULL,_CRT_WIDE("rand_s"),_CRT_WIDE(__FILE__),__LINE__, 0); + *_errno() = EINVAL; + return EINVAL; + } + + pSystemFunction036 = (void*)GetProcAddress(hadvapi32, "SystemFunction036"); + if (!pSystemFunction036) + { + _invalid_parameter(NULL,_CRT_WIDE("rand_s"),_CRT_WIDE(__FILE__),__LINE__, 0); + *_errno() = EINVAL; + FreeLibrary(hadvapi32); + return EINVAL; + } + + if (!pSystemFunction036(pval, sizeof(*pval))) + { + _invalid_parameter(NULL,_CRT_WIDE("rand_s"),_CRT_WIDE(__FILE__),__LINE__, 0); + *_errno() = EINVAL; + FreeLibrary(hadvapi32); + return EINVAL; + } + + FreeLibrary(hadvapi32); + return 0; }

1 0

[tfaber] 69004: [NTOS] - Fix TAG_IRP
by tfaber＠svn.reactos.org 04 Sep '15

04 Sep '15

Author: tfaber Date: Fri Sep 4 16:16:48 2015 New Revision: 69004 URL: http://svn.reactos.org/svn/reactos?rev=69004&view=rev Log: [NTOS] - Fix TAG_IRP Modified: trunk/reactos/ntoskrnl/include/internal/tag.h Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] Fri Sep 4 16:16:48 2015 @@ -75,7 +75,7 @@ #define TAG_IOWI 'IWOI' /* formerly located in io/irp.c */ -#define TAG_IRP ' PRI' +#define TAG_IRP ' prI' #define TAG_SYS_BUF 'BSYS' /* formerly located in io/irq.c */

1 0

[tfaber] 69003: [CDROM] - Avoid IRP leaks
by tfaber＠svn.reactos.org 04 Sep '15

04 Sep '15

Author: tfaber Date: Fri Sep 4 16:01:46 2015 New Revision: 69003 URL: http://svn.reactos.org/svn/reactos?rev=69003&view=rev Log: [CDROM] - Avoid IRP leaks Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Fri Sep 4 16:01:46 2015 @@ -2139,7 +2139,6 @@ IoCompleteRequest(Irp, IO_DISK_INCREMENT); ExFreePool(senseBuffer); ExFreePool(srb); - IoFreeIrp(irp2); IoStartNextPacket(DeviceObject, FALSE); DebugPrint((2, "ScsiCdRomStartIo: [%lx] bailing with status %lx at line %s\n", Irp, Irp->IoStatus.Status, __LINE__)); return; @@ -2764,6 +2763,9 @@ // IoCompleteRequest(Irp, IO_NO_INCREMENT); + ExFreePool(senseBuffer); + ExFreePool(srb); + IoFreeIrp(irp2); return; } // end switch() @@ -2953,6 +2955,17 @@ (realIrpStack->MajorFunction == IRP_MJ_INTERNAL_DEVICE_CONTROL)) && (realIrpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_CDROM_CHECK_VERIFY)) { + ExFreePool(srb->SenseInfoBuffer); + if (srb->DataBuffer) { + ExFreePool(srb->DataBuffer); + } + ExFreePool(srb); + if (Irp->MdlAddress) { + IoFreeMdl(Irp->MdlAddress); + } + + IoFreeIrp(Irp); + // // Update the geometry information, as the media could have changed. // The completion routine for this will complete the real irp and start

1 0

[pschweitzer] 69002: [MOUNTMGR] Fix a nasty typo in QueryPointsFromMemory() which was like breaking the behavior of IOCTL_MOUNTMGR_QUERY_POINTS, IOCTL_MOUNTMGR_DELETE_POINTS CID 1321853
by pschweitzer＠svn.reactos.org 04 Sep '15

04 Sep '15

Author: pschweitzer Date: Fri Sep 4 15:58:44 2015 New Revision: 69002 URL: http://svn.reactos.org/svn/reactos?rev=69002&view=rev Log: [MOUNTMGR] Fix a nasty typo in QueryPointsFromMemory() which was like breaking the behavior of IOCTL_MOUNTMGR_QUERY_POINTS, IOCTL_MOUNTMGR_DELETE_POINTS CID 1321853 Modified: trunk/reactos/drivers/filters/mountmgr/point.c Modified: trunk/reactos/drivers/filters/mountmgr/point.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/p… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/point.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/point.c [iso-8859-1] Fri Sep 4 15:58:44 2015 @@ -356,7 +356,7 @@ /* Find back correct mount point */ if (UniqueId) { - if (!UniqueId->UniqueIdLength != DeviceInformation->UniqueId->UniqueIdLength) + if (UniqueId->UniqueIdLength != DeviceInformation->UniqueId->UniqueIdLength) { continue; }

1 0

[pschweitzer] 69001: [NTFS] Don't bother comparing names if they have null length
by pschweitzer＠svn.reactos.org 04 Sep '15

04 Sep '15

Author: pschweitzer Date: Fri Sep 4 15:52:19 2015 New Revision: 69001 URL: http://svn.reactos.org/svn/reactos?rev=69001&view=rev Log: [NTFS] Don't bother comparing names if they have null length Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Fri Sep 4 15:52:19 2015 @@ -87,22 +87,36 @@ ULONG NameLength, PNTFS_ATTR_CONTEXT * AttrCtx) { + BOOLEAN Found; NTSTATUS Status; FIND_ATTR_CONTXT Context; PNTFS_ATTR_RECORD Attribute; DPRINT("FindAttribute(%p, %p, 0x%x, %S, %u, %p)\n", Vcb, MftRecord, Type, Name, NameLength, AttrCtx); + Found = FALSE; Status = FindFirstAttribute(&Context, Vcb, MftRecord, FALSE, &Attribute); while (NT_SUCCESS(Status)) { if (Attribute->Type == Type && Attribute->NameLength == NameLength) { - PWCHAR AttrName; - - AttrName = (PWCHAR)((PCHAR)Attribute + Attribute->NameOffset); - DPRINT("%.*S, %.*S\n", Attribute->NameLength, AttrName, NameLength, Name); - if (RtlCompareMemory(AttrName, Name, NameLength << 1) == (NameLength << 1)) + if (NameLength != 0) + { + PWCHAR AttrName; + + AttrName = (PWCHAR)((PCHAR)Attribute + Attribute->NameOffset); + DPRINT("%.*S, %.*S\n", Attribute->NameLength, AttrName, NameLength, Name); + if (RtlCompareMemory(AttrName, Name, NameLength << 1) == (NameLength << 1)) + { + Found = TRUE; + } + } + else + { + Found = TRUE; + } + + if (Found) { /* Found it, fill up the context and return. */ DPRINT("Found context\n");

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
54
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 September 2015