Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[khornicek] 62667: [MAIN] - fix a memory leak CID #716340 - initialize the new cursor scheme name so it doesn't show garbage in the save dialog The previous commit fixed: CID #716120 CID #715936 CI...

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Apr 6 17:09:47 2014 New Revision: 62667 URL: http://svn.reactos.org/svn/reactos?rev=62667&view=rev Log: [MAIN] - fix a memory leak CID #716340 - initialize the new cursor scheme name so it doesn't show garbage in the save dialog The previous commit fixed: CID #716120 CID #715936 CID #515183 Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=6… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Sun Apr 6 17:09:47 2014 @@ -718,6 +718,7 @@ if (nSel == 0) { szSchemeName[0] = 0; + szNewSchemeName[0] = 0; } else { @@ -775,6 +776,9 @@ lpSchemeData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nLength * sizeof(TCHAR)); + if(!lpSchemeData) + return FALSE; + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) { CompressPath(szTempPath, g_CursorData[i].szCursorPath); @@ -784,11 +788,15 @@ } if (RegOpenCurrentUser(KEY_READ | KEY_SET_VALUE, &hCuKey) != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, lpSchemeData); return FALSE; + } if (RegOpenKeyEx(hCuKey, _T("Control Panel\\Cursors\\Schemes"), 0, KEY_READ | KEY_SET_VALUE, &hCuCursorKey) != ERROR_SUCCESS) { RegCloseKey(hCuKey); + HeapFree(GetProcessHeap(), 0, lpSchemeData); return FALSE; }

10 years, 5 months

[pschweitzer] 62666: [MMEBUDDY] Prevent double close of a handle CID #731736

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 16:55:53 2014 New Revision: 62666 URL: http://svn.reactos.org/svn/reactos?rev=62666&view=rev Log: [MMEBUDDY] Prevent double close of a handle CID #731736 Modified: trunk/reactos/lib/drivers/sound/mmebuddy/thread.c Modified: trunk/reactos/lib/drivers/sound/mmebuddy/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] Sun Apr 6 16:55:53 2014 @@ -143,10 +143,6 @@ WaitResult = WaitForSingleObject(Thread->Handle, INFINITE); SND_ASSERT( WaitResult == WAIT_OBJECT_0 ); - /* Close the thread and invalidate the handle */ - CloseHandle(Thread->Handle); /* Is this needed? */ - Thread->Handle = INVALID_HANDLE_VALUE; - return MMSYSERR_NOERROR; }

10 years, 5 months

[khornicek] 62665: [MAIN] - fix a copypasta - fix a possible buffer overrun (x5) - fix a negative array index access

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Apr 6 16:45:21 2014 New Revision: 62665 URL: http://svn.reactos.org/svn/reactos?rev=62665&view=rev Log: [MAIN] - fix a copypasta - fix a possible buffer overrun (x5) - fix a negative array index access Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=6… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Sun Apr 6 16:45:21 2014 @@ -499,7 +499,7 @@ /* Remove quotation marks */ if (szTempData[0] == _T('"')) { - lpStart = szValueData + 1; + lpStart = szTempData + 1; szTempData[_tcslen(szTempData) - 1] = 0; } else @@ -1022,9 +1022,9 @@ static VOID LoadInitialCursorScheme(HWND hwndDlg) { - TCHAR szSchemeName[256]; - TCHAR szSystemScheme[256]; - TCHAR szCursorPath[256]; + TCHAR szSchemeName[MAX_PATH]; + TCHAR szSystemScheme[MAX_PATH]; + TCHAR szCursorPath[MAX_PATH]; HKEY hCursorKey; LONG lError; DWORD dwDataSize; @@ -1057,7 +1057,7 @@ if (dwSchemeSource != 0) { - dwDataSize = 256 * sizeof(TCHAR); + dwDataSize = MAX_PATH * sizeof(TCHAR); lError = RegQueryValueEx(hCursorKey, NULL, NULL, @@ -1101,8 +1101,8 @@ else if (dwSchemeSource == 2) { LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); - _tcscat(szSchemeName, _T(" ")); - _tcscat(szSchemeName, szSystemScheme); + _tcsncat(szSchemeName, _T(" "), MAX_PATH - _tcslen(szSchemeName)); + _tcsncat(szSchemeName, szSystemScheme, MAX_PATH - _tcslen(szSchemeName)); } /* Search and select the curent scheme name from the scheme list */ @@ -1276,6 +1276,10 @@ { case LBN_SELCHANGE: nSel = SendMessage((HWND)lParam, LB_GETCURSEL, 0, 0); + + if(nSel == LB_ERR) + break; + SendDlgItemMessage(hwndDlg, IDC_IMAGE_CURRENT_CURSOR, STM_SETIMAGE, IMAGE_CURSOR, (LPARAM)g_CursorData[nSel].hCursor); EnableWindow(GetDlgItem(hwndDlg,IDC_BUTTON_USE_DEFAULT_CURSOR),

10 years, 5 months

[pschweitzer] 62664: [MOUNTMGR] - Fix broken logic in OnlineMountedVolumes() - Add missing return in MountMgrNotifyNameChange() CID #515247 CID #716002

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 16:30:29 2014 New Revision: 62664 URL: http://svn.reactos.org/svn/reactos?rev=62664&view=rev Log: [MOUNTMGR] - Fix broken logic in OnlineMountedVolumes() - Add missing return in MountMgrNotifyNameChange() CID #515247 CID #716002 Modified: trunk/reactos/drivers/filters/mountmgr/database.c trunk/reactos/drivers/filters/mountmgr/notify.c Modified: trunk/reactos/drivers/filters/mountmgr/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] Sun Apr 6 16:30:29 2014 @@ -746,10 +746,11 @@ return; } + RestartScan = TRUE; + /* Query mount points */ while (TRUE) { - RestartScan = TRUE; SymbolicName.Length = 0; SymbolicName.MaximumLength = sizeof(SymbolicNameBuffer); SymbolicName.Buffer = SymbolicNameBuffer; @@ -771,8 +772,7 @@ if (ReparsePointInformation.FileReference == SavedReparsePointInformation.FileReference && ReparsePointInformation.Tag == SavedReparsePointInformation.Tag) { - ZwClose(Handle); - return; + break; } } else @@ -782,8 +782,7 @@ if (!NT_SUCCESS(Status) || ReparsePointInformation.Tag != IO_REPARSE_TAG_MOUNT_POINT) { - ZwClose(Handle); - return; + break; } /* Get the volume name associated to the mount point */ @@ -813,6 +812,8 @@ PostOnlineNotification(DeviceExtension, &VolumeDeviceInformation->SymbolicName); } } + + ZwClose(Handle); } /* Modified: trunk/reactos/drivers/filters/mountmgr/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/n… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/notify.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/notify.c [iso-8859-1] Sun Apr 6 16:30:29 2014 @@ -414,6 +414,7 @@ { ObDereferenceObject(DeviceObject); ObDereferenceObject(FileObject); + return; } Stack = IoGetNextIrpStackLocation(Irp);

10 years, 5 months

[pschweitzer] 62663: [NPFS] - Also call NpQueryNameInfo() in FileAllInformation and return its status. This prevents from returning uninit status - By default, return STATUS_ILLEGAL_FUNCTION in NpI...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 16:15:06 2014 New Revision: 62663 URL: http://svn.reactos.org/svn/reactos?rev=62663&view=rev Log: [NPFS] - Also call NpQueryNameInfo() in FileAllInformation and return its status. This prevents from returning uninit status - By default, return STATUS_ILLEGAL_FUNCTION in NpImpersonate(). This prevents from returning uninit status - Fix comparison in NpQueryFsVolumeInfo() (remaining len is to be used) - Properly set the string without space. This allows setting the complete string with 18 bytes. CID #1102019 CID #1102505 CID #1102506 Modified: trunk/reactos/drivers/filesystems/npfs/fileinfo.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/npfs/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fileinfo.c [iso-8859-1] Sun Apr 6 16:15:06 2014 @@ -440,6 +440,7 @@ NpQueryInternalInfo(Ccb, &AllInfo->InternalInformation, &Length); NpQueryEaInfo(Ccb, &AllInfo->EaInformation, &Length); NpQueryPositionInfo(Ccb, &AllInfo->PositionInformation, &Length, NamedPipeEnd); + Status = NpQueryNameInfo(Ccb, &AllInfo->NameInformation, &Length); Length += 96; break; Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Sun Apr 6 16:15:06 2014 @@ -241,16 +241,13 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, NULL, &Ccb, &NamedPipeEnd); - if (NodeTypeCode == NPFS_NTC_CCB) - { - if (NamedPipeEnd == FILE_PIPE_SERVER_END) - { - Status = NpImpersonateClientContext(Ccb); - } - else - { - Status = STATUS_ILLEGAL_FUNCTION; - } + if (NodeTypeCode == NPFS_NTC_CCB && NamedPipeEnd == FILE_PIPE_SERVER_END) + { + Status = NpImpersonateClientContext(Ccb); + } + else + { + Status = STATUS_ILLEGAL_FUNCTION; } return Status; Modified: trunk/reactos/drivers/filesystems/npfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/volinfo.c [iso-8859-1] Sun Apr 6 16:15:06 2014 @@ -35,7 +35,7 @@ NameLength = 18; InfoBuffer->VolumeLabelLength = 18; - if (NameLength < 18) + if (*Length < 18) { NameLength = (USHORT)*Length; Status = STATUS_BUFFER_OVERFLOW; @@ -45,7 +45,7 @@ Status = STATUS_SUCCESS; } - RtlCopyMemory(InfoBuffer->VolumeLabel, L"Named Pipe", NameLength); + RtlCopyMemory(InfoBuffer->VolumeLabel, L"NamedPipe", NameLength); *Length -= NameLength; TRACE("Leaving, Status = %lx\n", Status);

10 years, 5 months

[hbelusca] 62662: [NTDLL_APITEST]: Add braces and remove an unneeded trace.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Apr 6 15:51:38 2014 New Revision: 62662 URL: http://svn.reactos.org/svn/reactos?rev=62662&view=rev Log: [NTDLL_APITEST]: Add braces and remove an unneeded trace. Modified: trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c Modified: trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetFull… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c [iso-8859-1] Sun Apr 6 15:51:38 2014 @@ -102,11 +102,13 @@ SIZE_T i; for (i = 0; i < Size; i++) + { if (Array[i] != Value) { trace("Expected %x, found %x at offset %lu\n", Value, Array[i], (ULONG)i); return FALSE; } + } return TRUE; } @@ -188,7 +190,6 @@ for (i = 0; i < TestCount; i++) { - trace("i = %d\n", i); switch (TestCases[i].PrefixType) { case PrefixNone:

10 years, 5 months

[pschweitzer] 62661: [FASTFAT] Remove dead code CID #502185

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 15:49:38 2014 New Revision: 62661 URL: http://svn.reactos.org/svn/reactos?rev=62661&view=rev Log: [FASTFAT] Remove dead code CID #502185 Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sun Apr 6 15:49:38 2014 @@ -617,8 +617,6 @@ vfatDestroyCCB(Ccb); if (DeviceObject) IoDeleteDevice(DeviceObject); - if (VolumeFcb) - vfatDestroyFCB(VolumeFcb); } return Status;

10 years, 5 months

[pschweitzer] 62660: [CDFS] - Fix broken if statement - Remove deadcode CID #502181 CID #502438 CID #716663

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 15:43:06 2014 New Revision: 62660 URL: http://svn.reactos.org/svn/reactos?rev=62660&view=rev Log: [CDFS] - Fix broken if statement - Remove deadcode CID #502181 CID #502438 CID #716663 Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Sun Apr 6 15:43:06 2014 @@ -303,7 +303,7 @@ if (FsRtlIsNameInExpression(&FileToFindUpcase, &LongName, TRUE, NULL) || FsRtlIsNameInExpression(&FileToFindUpcase, &ShortName, TRUE, NULL)) { - if (Parent && Parent->PathName) + if (Parent->PathName[0]) { len = wcslen(Parent->PathName); memcpy(Fcb->PathName, Parent->PathName, len*sizeof(WCHAR)); Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Sun Apr 6 15:43:06 2014 @@ -439,8 +439,6 @@ ObDereferenceObject(DeviceExt->StreamFileObject); if (Fcb) ExFreePool(Fcb); - if (Ccb) - ExFreePool(Ccb); if (NewDeviceObject) IoDeleteDevice(NewDeviceObject); }

10 years, 5 months

[pschweitzer] 62659: [SYSSETUP] Fix buffer overrun CID #716146

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 15:31:06 2014 New Revision: 62659 URL: http://svn.reactos.org/svn/reactos?rev=62659&view=rev Log: [SYSSETUP] Fix buffer overrun CID #716146 Modified: trunk/reactos/dll/win32/syssetup/logfile.c Modified: trunk/reactos/dll/win32/syssetup/logfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/logfile… ============================================================================== --- trunk/reactos/dll/win32/syssetup/logfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/logfile.c [iso-8859-1] Sun Apr 6 15:31:06 2014 @@ -45,11 +45,11 @@ { wcsncat(szFileName, L"\\", - MAX_PATH); + (sizeof(szFileName) / sizeof(szFileName[0])) - wcslen(szFileName)); } wcsncat(szFileName, L"setuplog.txt", - MAX_PATH); + (sizeof(szFileName) / sizeof(szFileName[0])) - wcslen(szFileName)); if (bDeleteOldLogFile) {

10 years, 5 months

[pschweitzer] 62658: [LSASRV] Fix broken if statements CID #513328 CID #1102024

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 6 15:11:09 2014 New Revision: 62658 URL: http://svn.reactos.org/svn/reactos?rev=62658&view=rev Log: [LSASRV] Fix broken if statements CID #513328 CID #1102024 Modified: trunk/reactos/dll/win32/lsasrv/privileges.c Modified: trunk/reactos/dll/win32/lsasrv/privileges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/privilege… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] Sun Apr 6 15:11:09 2014 @@ -101,7 +101,7 @@ NameBuffer->MaximumLength = NameBuffer->Length + sizeof(WCHAR); NameBuffer->Buffer = MIDL_user_allocate(NameBuffer->MaximumLength); - if (NameBuffer == NULL) + if (NameBuffer->Buffer == NULL) { MIDL_user_free(NameBuffer); return STATUS_NO_MEMORY; @@ -257,7 +257,7 @@ NameBuffer->MaximumLength = NameBuffer->Length + sizeof(WCHAR); NameBuffer->Buffer = MIDL_user_allocate(NameBuffer->MaximumLength); - if (NameBuffer == NULL) + if (NameBuffer->Buffer == NULL) { MIDL_user_free(NameBuffer); return STATUS_INSUFFICIENT_RESOURCES;

10 years, 5 months

← Newer
1
...
40
41
42
43
44
45
46
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2014