Ros-diffs

ros-diffs@reactos.org

81390 discussions

[khornicek] 64845: [SETUPAPI] - actually use the icon source we get from registry instead of loading all icons from setupapi itself CORE-8614
by khornicek＠svn.reactos.org 20 Oct '14

20 Oct '14

Author: khornicek Date: Mon Oct 20 13:08:42 2014 New Revision: 64845 URL: http://svn.reactos.org/svn/reactos?rev=64845&view=rev Log: [SETUPAPI] - actually use the icon source we get from registry instead of loading all icons from setupapi itself CORE-8614 Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] Mon Oct 20 13:08:42 2014 @@ -22,6 +22,7 @@ #include "setupapi_private.h" #include <wingdi.h> +#include <shellapi.h> /* Unicode constants */ static const WCHAR BackSlash[] = {'\\',0}; @@ -76,6 +77,7 @@ }; #undef ADD_PARAM_HANDLER +#define UNKNOWN_ICON_INDEX 18 /*********************************************************************** * SetupDiDestroyClassImageList(SETUPAPI.@) @@ -330,9 +332,6 @@ return rc; } -/*********************************************************************** - * SetupDiGetClassImageIndex (SETUPAPI.@) - */ static BOOL SETUP_GetIconIndex( IN HKEY hClassKey, @@ -378,6 +377,9 @@ return ret; } +/*********************************************************************** + * SetupDiGetClassImageIndex (SETUPAPI.@) + */ BOOL WINAPI SetupDiGetClassImageIndex( IN PSP_CLASSIMAGELIST_DATA ClassImageListData, @@ -457,6 +459,102 @@ return ret; } + +static BOOL WINAPI +SETUP_GetClassIconInfo(IN CONST GUID *ClassGuid, OUT PINT OutIndex, OUT LPWSTR *OutDllName) +{ + LPWSTR Buffer = NULL; + INT iconIndex = -UNKNOWN_ICON_INDEX; + HKEY hKey = INVALID_HANDLE_VALUE; + BOOL ret = FALSE; + + if (ClassGuid) + { + hKey = SetupDiOpenClassRegKey(ClassGuid, KEY_QUERY_VALUE); + if (hKey != INVALID_HANDLE_VALUE) + { + SETUP_GetIconIndex(hKey, &iconIndex); + } + } + + if (iconIndex > 0) + { + /* Look up icon in dll specified by Installer32 or EnumPropPages32 key */ + PWCHAR Comma; + LONG rc; + DWORD dwRegType, dwLength; + rc = RegQueryValueExW(hKey, REGSTR_VAL_INSTALLER_32, NULL, &dwRegType, NULL, &dwLength); + if (rc == ERROR_SUCCESS && dwRegType == REG_SZ) + { + Buffer = MyMalloc(dwLength + sizeof(WCHAR)); + if (Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + rc = RegQueryValueExW(hKey, REGSTR_VAL_INSTALLER_32, NULL, NULL, (LPBYTE)Buffer, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + /* make sure the returned buffer is NULL-terminated */ + Buffer[dwLength / sizeof(WCHAR)] = 0; + } + else if + (ERROR_SUCCESS == (rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, &dwRegType, NULL, &dwLength)) + && dwRegType == REG_SZ) + { + Buffer = MyMalloc(dwLength + sizeof(WCHAR)); + if (Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, NULL, (LPBYTE)Buffer, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + /* make sure the returned buffer is NULL-terminated */ + Buffer[dwLength / sizeof(WCHAR)] = 0; + } + else + { + /* Unable to find where to load the icon */ + SetLastError(ERROR_FILE_NOT_FOUND); + goto cleanup; + } + Comma = strchrW(Buffer, ','); + if (!Comma) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + *Comma = '\0'; + *OutDllName = Buffer; + } + else + { + /* Look up icon in setupapi.dll */ + iconIndex = -iconIndex; + *OutDllName = NULL; + } + + *OutIndex = iconIndex; + ret = TRUE; + + TRACE("Icon index %d, dll name %s\n", iconIndex, debugstr_w(*OutDllName ? *OutDllName : SetupapiDll)); + +cleanup: + + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); + + return ret; +} + /*********************************************************************** * SetupDiGetClassImageListExW(SETUPAPI.@) @@ -570,24 +668,32 @@ for (i = 0; i < list->NumberOfGuids; i++) { INT miniIconIndex; - - ret = SetupDiLoadClassIcon( - &list->Guids[i], - NULL, - &miniIconIndex); - if (ret) - { - hIcon = LoadImage(hInstance, MAKEINTRESOURCE(miniIconIndex), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); - if (hIcon) + LPWSTR DllName = NULL; + + if (SETUP_GetClassIconInfo(&list->Guids[i], &miniIconIndex, &DllName)) + { + if (DllName && ExtractIconExW(DllName, -miniIconIndex, NULL, &hIcon, 1) == 1) { list->IconIndexes[i] = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); + } + else if(!DllName) + { + hIcon = LoadImage(hInstance, MAKEINTRESOURCE(miniIconIndex), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + list->IconIndexes[i] = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); + } + + if(hIcon) DestroyIcon(hIcon); - } else list->IconIndexes[i] = -1; + + if(DllName) + MyFree(DllName); } else + { list->IconIndexes[i] = -1; /* Special value to indicate that the icon is unavailable */ + } } /* Finally, add the overlay icons to the image list */ @@ -660,105 +766,43 @@ OUT HICON *LargeIcon OPTIONAL, OUT PINT MiniIconIndex OPTIONAL) { - LPWSTR Buffer = NULL; - LPCWSTR DllName; - INT iconIndex = -18; - HKEY hKey = INVALID_HANDLE_VALUE; - + INT iconIndex = 0; + LPWSTR DllName = NULL; BOOL ret = FALSE; - - if (ClassGuid) - { - hKey = SetupDiOpenClassRegKey(ClassGuid, KEY_QUERY_VALUE); - if (hKey != INVALID_HANDLE_VALUE) - SETUP_GetIconIndex(hKey, &iconIndex); - } - - if (iconIndex > 0) - { - /* Look up icon in dll specified by Installer32 or EnumPropPages32 key */ - PWCHAR Comma; - LONG rc; - DWORD dwRegType, dwLength; - rc = RegQueryValueExW(hKey, REGSTR_VAL_INSTALLER_32, NULL, &dwRegType, NULL, &dwLength); - if (rc == ERROR_SUCCESS && dwRegType == REG_SZ) - { - Buffer = MyMalloc(dwLength + sizeof(WCHAR)); - if (Buffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - rc = RegQueryValueExW(hKey, REGSTR_VAL_INSTALLER_32, NULL, NULL, (LPBYTE)Buffer, &dwLength); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - /* make sure the returned buffer is NULL-terminated */ - Buffer[dwLength / sizeof(WCHAR)] = 0; - } - else if - (ERROR_SUCCESS == (rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, &dwRegType, NULL, &dwLength)) - && dwRegType == REG_SZ) - { - Buffer = MyMalloc(dwLength + sizeof(WCHAR)); - if (Buffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, NULL, (LPBYTE)Buffer, &dwLength); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - /* make sure the returned buffer is NULL-terminated */ - Buffer[dwLength / sizeof(WCHAR)] = 0; + HICON hIcon = NULL; + + if (LargeIcon) + { + if(!SETUP_GetClassIconInfo(ClassGuid, &iconIndex, &DllName)) + return FALSE; + + if (DllName && ExtractIconExW(DllName, -iconIndex, &hIcon, NULL, 1) == 1 && hIcon != NULL) + { + ret = TRUE; } else { - /* Unable to find where to load the icon */ - SetLastError(ERROR_FILE_NOT_FOUND); - goto cleanup; - } - Comma = strchrW(Buffer, ','); - if (!Comma) - { - SetLastError(ERROR_GEN_FAILURE); - goto cleanup; - } - *Comma = '\0'; - DllName = Buffer; - } - else - { - /* Look up icon in setupapi.dll */ - DllName = SetupapiDll; - iconIndex = -iconIndex; - } - - TRACE("Icon index %d, dll name %s\n", iconIndex, debugstr_w(DllName)); - if (LargeIcon) - { - *LargeIcon = LoadImage(hInstance, MAKEINTRESOURCE(iconIndex), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); - if (!*LargeIcon) - { - SetLastError(ERROR_INVALID_INDEX); - goto cleanup; - } - } + /* load the default unknown device icon if ExtractIcon failed */ + if(DllName) + iconIndex = UNKNOWN_ICON_INDEX; + + hIcon = LoadImage(hInstance, MAKEINTRESOURCE(iconIndex), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + + if(!LargeIcon) + goto cleanup; + } + } + if (MiniIconIndex) *MiniIconIndex = iconIndex; + ret = TRUE; + *LargeIcon = hIcon; cleanup: - if (hKey != INVALID_HANDLE_VALUE) - RegCloseKey(hKey); - - if (Buffer != NULL) - MyFree(Buffer); + + if(DllName) + MyFree(DllName); TRACE("Returning %d\n", ret); return ret;

1 0

[cwittich] 64844: [explorer] DragQueryFile expects size in characters
by cwittich＠svn.reactos.org 20 Oct '14

20 Oct '14

Author: cwittich Date: Mon Oct 20 10:05:30 2014 New Revision: 64844 URL: http://svn.reactos.org/svn/reactos?rev=64844&view=rev Log: [explorer] DragQueryFile expects size in characters Modified: trunk/reactos/base/shell/explorer/desktop/desktop.h Modified: trunk/reactos/base/shell/explorer/desktop/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.h [iso-8859-1] Mon Oct 20 10:05:30 2014 @@ -110,7 +110,7 @@ UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0); for(UINT i=0; i<cFiles; ++i) { - DragQueryFile(hDrop, i, szFileName, sizeof(szFileName)); + DragQueryFile(hDrop, i, szFileName, sizeof(szFileName) / sizeof(szFileName[0])); if (DROPEFFECT_COPY & *pdwEffect) { // copy the file or dir

1 0

[tfaber] 64843: [FASTFAT] - Move FCB list removal to vfatDelFCBFromTable, since vfatAddFCBToTable does the insert. Fixes list corruption in vfatUpdateFCB.
by tfaber＠svn.reactos.org 20 Oct '14

20 Oct '14

Author: tfaber Date: Mon Oct 20 09:31:50 2014 New Revision: 64843 URL: http://svn.reactos.org/svn/reactos?rev=64843&view=rev Log: [FASTFAT] - Move FCB list removal to vfatDelFCBFromTable, since vfatAddFCBToTable does the insert. Fixes list corruption in vfatUpdateFCB. Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Mon Oct 20 09:31:50 2014 @@ -199,6 +199,8 @@ } entry->next = pFCB->Hash.next; } + + RemoveEntryList(&pFCB->FcbListEntry); } static @@ -302,7 +304,6 @@ { ASSERT(pFCB->OpenHandleCount == 0); tmpFcb = pFCB->parentFcb; - RemoveEntryList (&pFCB->FcbListEntry); vfatDelFCBFromTable(pVCB, pFCB); vfatDestroyFCB(pFCB); }

1 0

[cwittich] 64842: [cmd/help] do not call wcslen on uninitialized variable
by cwittich＠svn.reactos.org 20 Oct '14

20 Oct '14

Author: cwittich Date: Mon Oct 20 09:21:08 2014 New Revision: 64842 URL: http://svn.reactos.org/svn/reactos?rev=64842&view=rev Log: [cmd/help] do not call wcslen on uninitialized variable Modified: trunk/reactos/base/applications/cmdutils/help/help.c Modified: trunk/reactos/base/applications/cmdutils/help/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/help.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/help/help.c [iso-8859-1] Mon Oct 20 09:21:08 2014 @@ -16,6 +16,7 @@ #include <winbase.h> #include <winuser.h> #include <wincon.h> +#include <strsafe.h> #include "help.h" #include "resource.h" @@ -135,9 +136,8 @@ /* * Run "<command> /?" in the current command processor. */ - wcsncpy(CmdLine, argv[1], CMDLINE_LENGTH - wcslen(CmdLine)); - wcsncat(CmdLine, L" /?" , CMDLINE_LENGTH - wcslen(CmdLine)); - + StringCbPrintfW(CmdLine, sizeof(CmdLine), L"%ls /?", argv[1]); + _flushall(); return _wsystem(CmdLine); }

1 0

[cwittich] 64841: [cmd] GetDateFormat expects size in characters
by cwittich＠svn.reactos.org 20 Oct '14

20 Oct '14

Author: cwittich Date: Mon Oct 20 08:47:57 2014 New Revision: 64841 URL: http://svn.reactos.org/svn/reactos?rev=64841&view=rev Log: [cmd] GetDateFormat expects size in characters Modified: trunk/reactos/base/shell/cmd/locale.c Modified: trunk/reactos/base/shell/cmd/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/locale.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/locale.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/locale.c [iso-8859-1] Mon Oct 20 08:47:57 2014 @@ -62,7 +62,7 @@ INT len; GetLocalTime(&t); - len = GetDateFormat(LOCALE_USER_DEFAULT, 0, &t, _T("ddd"), szDate, sizeof szDate); + len = GetDateFormat(LOCALE_USER_DEFAULT, 0, &t, _T("ddd"), szDate, sizeof(szDate) / sizeof(szDate[0])); szDate[len - 1] = _T(' '); FormatDate(&szDate[len], &t, TRUE); return szDate;

1 0

[tfaber] 64840: [KERNEL32] - Fix MSVC build
by tfaber＠svn.reactos.org 20 Oct '14

20 Oct '14

Author: tfaber Date: Mon Oct 20 08:30:55 2014 New Revision: 64840 URL: http://svn.reactos.org/svn/reactos?rev=64840&view=rev Log: [KERNEL32] - Fix MSVC build Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] Mon Oct 20 08:30:55 2014 @@ -268,13 +268,13 @@ NewPathU.Buffer = NULL; ExistingPathU.Buffer = NULL; - _SEH3_TRY + _SEH2_TRY { /* Don't allow renaming to a disk */ if (lpNewFileName && RtlIsDosDeviceName_U(lpNewFileName)) { BaseSetLastNTError(STATUS_OBJECT_NAME_COLLISION); - _SEH3_LEAVE; + _SEH2_LEAVE; } ReplaceIfExists = !!(dwFlags & MOVEFILE_REPLACE_EXISTING); @@ -283,7 +283,7 @@ if (!RtlDosPathNameToNtPathName_U(lpExistingFileName, &ExistingPathU, NULL, NULL)) { BaseSetLastNTError(STATUS_OBJECT_PATH_NOT_FOUND); - _SEH3_LEAVE; + _SEH2_LEAVE; } /* Sanitize input */ @@ -291,7 +291,7 @@ if (DelayUntilReboot && (dwFlags & MOVEFILE_CREATE_HARDLINK)) { BaseSetLastNTError(STATUS_INVALID_PARAMETER); - _SEH3_LEAVE; + _SEH2_LEAVE; } /* Unless we manage a proper opening, we'll attempt to reopen without reparse support */ @@ -324,7 +324,7 @@ else if (Status != STATUS_INVALID_PARAMETER) { BaseSetLastNTError(Status); - _SEH3_LEAVE; + _SEH2_LEAVE; } } else @@ -341,7 +341,7 @@ if (Status != STATUS_NOT_IMPLEMENTED && Status != STATUS_INVALID_PARAMETER) { BaseSetLastNTError(Status); - _SEH3_LEAVE; + _SEH2_LEAVE; } /* Not a reparse point, no need to reopen, it's fine */ @@ -368,7 +368,7 @@ if (!NT_SUCCESS(Status)) { BaseSetLastNTError(Status); - _SEH3_LEAVE; + _SEH2_LEAVE; } } @@ -381,7 +381,7 @@ else if (!RtlDosPathNameToNtPathName_U(lpNewFileName, &NewPathU, 0, 0)) { BaseSetLastNTError(STATUS_OBJECT_PATH_NOT_FOUND); - _SEH3_LEAVE; + _SEH2_LEAVE; } /* Handle postponed renaming */ @@ -394,7 +394,7 @@ if (NewBuffer == NULL) { BaseSetLastNTError(STATUS_NO_MEMORY); - _SEH3_LEAVE; + _SEH2_LEAVE; } NewBuffer[0] = L'!'; @@ -431,11 +431,11 @@ if (!NT_SUCCESS(Status)) { BaseSetLastNTError(Status); - _SEH3_LEAVE; + _SEH2_LEAVE; } Ret = TRUE; - _SEH3_LEAVE; + _SEH2_LEAVE; } /* At that point, we MUST have a source handle */ @@ -446,7 +446,7 @@ if (RenameInfo == NULL) { BaseSetLastNTError(STATUS_NO_MEMORY); - _SEH3_LEAVE; + _SEH2_LEAVE; } RtlCopyMemory(&RenameInfo->FileName, NewPathU.Buffer, NewPathU.Length); @@ -465,7 +465,7 @@ { /* If it succeed, all fine, quit */ Ret = TRUE; - _SEH3_LEAVE; + _SEH2_LEAVE; } /* If we failed for any other reason than not the same device, fail * If we failed because of different devices, only allow renaming if user allowed copy @@ -482,7 +482,7 @@ else { BaseSetLastNTError(Status); - _SEH3_LEAVE; + _SEH2_LEAVE; } } @@ -558,7 +558,7 @@ } } } - _SEH3_FINALLY + _SEH2_FINALLY { if (SourceHandle != INVALID_HANDLE_VALUE) NtClose(SourceHandle); @@ -566,7 +566,7 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, ExistingPathU.Buffer); RtlFreeHeap(RtlGetProcessHeap(), 0, NewPathU.Buffer); } - _SEH3_END; + _SEH2_END; return Ret; }

1 0

[tfaber] 64839: [NPFS] - Correctly interpret SeCreateClientSecurity return value in NpInitializeSecurity - Always charge quota when allocating client context - Specify explicit 0 tag when freeing a...
by tfaber＠svn.reactos.org 20 Oct '14

20 Oct '14

Author: tfaber Date: Mon Oct 20 08:08:50 2014 New Revision: 64839 URL: http://svn.reactos.org/svn/reactos?rev=64839&view=rev Log: [NPFS] - Correctly interpret SeCreateClientSecurity return value in NpInitializeSecurity - Always charge quota when allocating client context - Specify explicit 0 tag when freeing allocations with unknown pool tag - Misc readability fixes Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/secursup.c trunk/reactos/drivers/filesystems/npfs/seinfo.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Mon Oct 20 08:08:50 2014 @@ -736,12 +736,12 @@ } SecurityContext = &AccessState->SubjectSecurityContext; - SeLockSubjectContext(&AccessState->SubjectSecurityContext); - - Status = SeAssignSecurity(0, + SeLockSubjectContext(SecurityContext); + + Status = SeAssignSecurity(NULL, AccessState->SecurityDescriptor, &SecurityDescriptor, - 0, + FALSE, SecurityContext, IoGetFileObjectGenericMapping(), PagedPool); @@ -756,7 +756,7 @@ Status = ObLogSecurityDescriptor(SecurityDescriptor, &CachedSecurityDescriptor, 1); - ExFreePool(SecurityDescriptor); + ExFreePoolWithTag(SecurityDescriptor, 0); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/drivers/filesystems/npfs/secursup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/secursup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/secursup.c [iso-8859-1] Mon Oct 20 08:08:50 2014 @@ -108,15 +108,19 @@ return Status; } - ClientContext = ExAllocatePoolWithTag(PagedPool, sizeof(*ClientContext), NPFS_CLIENT_SEC_CTX_TAG); + ClientContext = ExAllocatePoolWithQuotaTag(PagedPool | POOL_QUOTA_FAIL_INSTEAD_OF_RAISE, + sizeof(*ClientContext), + NPFS_CLIENT_SEC_CTX_TAG); Ccb->ClientContext = ClientContext; if (!ClientContext) return STATUS_INSUFFICIENT_RESOURCES; Status = SeCreateClientSecurity(Thread, &Ccb->ClientQos, 0, ClientContext); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + ExFreePool(Ccb->ClientContext); + Ccb->ClientContext = NULL; + } - ExFreePool(Ccb->ClientContext); - Ccb->ClientContext = NULL; return Status; } Modified: trunk/reactos/drivers/filesystems/npfs/seinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/seinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/seinfo.c [iso-8859-1] Mon Oct 20 08:08:50 2014 @@ -85,7 +85,8 @@ if (!NT_SUCCESS(Status)) return Status; Status = ObLogSecurityDescriptor(TempSecurityDescriptor, &NewSecurityDescriptor, 1); - ExFreePool(TempSecurityDescriptor); + ASSERT(TempSecurityDescriptor != OldSecurityDescriptor); + ExFreePoolWithTag(TempSecurityDescriptor, 0); if (!NT_SUCCESS(Status)) return Status;

1 0

[tfaber] 64838: [AFD] - Do not pass IO_STATUS_BLOCKs when creating IRPs for asynchronous use. Fixes a use-after-free where AfdCloseSocket would cancel IRPs without actually waiting for their comple...
by tfaber＠svn.reactos.org 19 Oct '14

19 Oct '14

Author: tfaber Date: Sun Oct 19 22:12:06 2014 New Revision: 64838 URL: http://svn.reactos.org/svn/reactos?rev=64838&view=rev Log: [AFD] - Do not pass IO_STATUS_BLOCKs when creating IRPs for asynchronous use. Fixes a use-after-free where AfdCloseSocket would cancel IRPs without actually waiting for their completion, and proceed to free the FCB, which contained these IO_STATUS_BLOCKs. Note that using TdiBuildInternalDeviceControlIrp for these requests is broken in the first place, since it is intended for synchronous requests and requires a guarantee about the calling thread's lifetime. These functions (and their completion routines) should use IoAllocateIrp/IoReuseIrp/IoFreeIrp instead. However this can be fixed later; the incredibly annoying nonpaged pool corruption due to this that has been around for 10 years should be fixed with this commit. CORE-8640 #resolve Modified: trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/afd/include/tdi_proto.h Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -56,7 +56,6 @@ FCB->Recv.Window, FCB->Recv.Size, FCB->AddressFrom, - &FCB->ReceiveIrp.Iosb, PacketSocketRecvComplete, FCB); Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -286,7 +286,6 @@ TDI_RECEIVE_NORMAL, FCB->Recv.Window, FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, ReceiveComplete, FCB ); @@ -518,7 +517,6 @@ FCB->Connection.Object, FCB->ConnectCallInfo, FCB->ConnectReturnInfo, - &FCB->ConnectIrp.Iosb, StreamSocketConnectComplete, FCB ); } Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -191,7 +191,6 @@ FCB->Connection.Object, &FCB->ListenIrp.ConnectionCallInfo, &FCB->ListenIrp.ConnectionReturnInfo, - &FCB->ListenIrp.Iosb, ListenComplete, FCB ); @@ -268,7 +267,6 @@ FCB->Connection.Object, &FCB->ListenIrp.ConnectionCallInfo, &FCB->ListenIrp.ConnectionReturnInfo, - &FCB->ListenIrp.Iosb, ListenComplete, FCB ); Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -662,7 +662,6 @@ FCB->Connection.Object, &FCB->DisconnectTimeout, FCB->DisconnectFlags, - &FCB->DisconnectIrp.Iosb, DisconnectComplete, FCB, FCB->ConnectCallInfo, Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -46,7 +46,6 @@ TDI_RECEIVE_NORMAL, FCB->Recv.Window + FCB->Recv.Content, FCB->Recv.Size - FCB->Recv.Content, - &FCB->ReceiveIrp.Iosb, ReceiveComplete, FCB ); } @@ -691,7 +690,6 @@ FCB->Recv.Window, FCB->Recv.Size, FCB->AddressFrom, - &FCB->ReceiveIrp.Iosb, PacketSocketRecvComplete, FCB ); } Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -329,7 +329,6 @@ PFILE_OBJECT ConnectionObject, PTDI_CONNECTION_INFORMATION ConnectionCallInfo, PTDI_CONNECTION_INFORMATION ConnectionReturnInfo, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext) /* @@ -362,7 +361,7 @@ DeviceObject, /* Device object */ ConnectionObject, /* File object */ NULL, /* Event */ - Iosb); /* Status */ + NULL); /* Status */ if (!*Irp) { return STATUS_INSUFFICIENT_RESOURCES; } @@ -376,7 +375,7 @@ ConnectionCallInfo, /* Request connection information */ ConnectionReturnInfo); /* Return connection information */ - TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, NULL); return STATUS_PENDING; } @@ -485,7 +484,6 @@ PFILE_OBJECT ConnectionObject, PTDI_CONNECTION_INFORMATION *RequestConnectionInfo, PTDI_CONNECTION_INFORMATION *ReturnConnectionInfo, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext) /* @@ -519,7 +517,7 @@ DeviceObject, /* Device object */ ConnectionObject, /* File object */ NULL, /* Event */ - Iosb); /* Status */ + NULL); /* Status */ if (*Irp == NULL) return STATUS_INSUFFICIENT_RESOURCES; @@ -532,7 +530,7 @@ *RequestConnectionInfo, /* Request connection information */ *ReturnConnectionInfo); /* Return connection information */ - TdiCall(*Irp, DeviceObject, NULL /* Don't wait for completion */, Iosb); + TdiCall(*Irp, DeviceObject, NULL /* Don't wait for completion */, NULL); return STATUS_PENDING; } @@ -892,7 +890,6 @@ USHORT Flags, PCHAR Buffer, UINT BufferLength, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext) { @@ -916,7 +913,7 @@ DeviceObject, /* Device object */ TransportObject, /* File object */ NULL, /* Event */ - Iosb); /* Status */ + NULL); /* Status */ if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -958,7 +955,7 @@ Flags, /* Flags */ BufferLength); /* Length of data */ - TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, NULL); /* Does not block... The MDL is deleted in the receive completion routine. */ @@ -971,7 +968,6 @@ USHORT Flags, PCHAR Buffer, UINT BufferLength, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext) { @@ -995,7 +991,7 @@ DeviceObject, /* Device object */ TransportObject, /* File object */ NULL, /* Event */ - Iosb); /* Status */ + NULL); /* Status */ if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1040,7 +1036,7 @@ BufferLength); /* Length of data */ - TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, NULL); /* Does not block... The MDL is deleted in the receive completion routine. */ @@ -1055,7 +1051,6 @@ PCHAR Buffer, UINT BufferLength, PTDI_CONNECTION_INFORMATION Addr, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext) /* @@ -1090,7 +1085,7 @@ DeviceObject, /* Device object */ TransportObject, /* File object */ NULL, /* Event */ - Iosb); /* Status */ + NULL); /* Status */ if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1134,7 +1129,7 @@ Addr, Flags); /* Length of data */ - TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, NULL); /* Does not block... The MDL is deleted in the receive completion routine. */ @@ -1148,7 +1143,6 @@ PCHAR Buffer, UINT BufferLength, PTDI_CONNECTION_INFORMATION Addr, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext) /* @@ -1185,7 +1179,7 @@ DeviceObject, /* Device object */ TransportObject, /* File object */ NULL, /* Event */ - Iosb); /* Status */ + NULL); /* Status */ if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1228,7 +1222,7 @@ BufferLength, /* Bytes to send */ Addr); /* Address */ - TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, NULL); /* Does not block... The MDL is deleted in the send completion routine. */ @@ -1240,7 +1234,6 @@ PFILE_OBJECT TransportObject, PLARGE_INTEGER Time, USHORT Flags, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext, PTDI_CONNECTION_INFORMATION RequestConnectionInfo, @@ -1264,7 +1257,7 @@ DeviceObject, /* Device object */ TransportObject, /* File object */ NULL, /* Event */ - Iosb); /* Status */ + NULL); /* Status */ if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1281,7 +1274,7 @@ RequestConnectionInfo, /* Indication of who to disconnect */ ReturnConnectionInfo); /* Indication of who disconnected */ - TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, NULL); return STATUS_PENDING; } Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -243,7 +243,6 @@ 0, FCB->Send.Window, FCB->Send.BytesUsed, - &FCB->SendIrp.Iosb, SendComplete, FCB ); } @@ -385,7 +384,6 @@ SendReq->BufferArray[0].buf, SendReq->BufferArray[0].len, TargetAddress, - &FCB->SendIrp.Iosb, PacketSocketSendComplete, FCB); } @@ -549,7 +547,6 @@ 0, FCB->Send.Window, FCB->Send.BytesUsed, - &FCB->SendIrp.Iosb, SendComplete, FCB); } @@ -645,7 +642,6 @@ SendReq->BufferArray[0].buf, SendReq->BufferArray[0].len, TargetAddress, - &FCB->SendIrp.Iosb, PacketSocketSendComplete, FCB); } Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -152,7 +152,6 @@ typedef struct _AFD_IN_FLIGHT_REQUEST { PIRP InFlightRequest; - IO_STATUS_BLOCK Iosb; PTDI_CONNECTION_INFORMATION ConnectionCallInfo; PTDI_CONNECTION_INFORMATION ConnectionReturnInfo; } AFD_IN_FLIGHT_REQUEST, *PAFD_IN_FLIGHT_REQUEST; @@ -369,7 +368,6 @@ PFILE_OBJECT ConnectionObject, PTDI_CONNECTION_INFORMATION *RequestConnectionInfo, PTDI_CONNECTION_INFORMATION *ReturnConnectionInfo, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext); @@ -379,7 +377,6 @@ USHORT Flags, PCHAR Buffer, UINT BufferLength, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext); @@ -389,7 +386,6 @@ USHORT Flags, PCHAR Buffer, UINT BufferLength, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext); @@ -400,7 +396,6 @@ PCHAR Buffer, UINT BufferLength, PTDI_CONNECTION_INFORMATION From, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext); @@ -410,7 +405,6 @@ PCHAR Buffer, UINT BufferLength, PTDI_CONNECTION_INFORMATION To, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext); Modified: trunk/reactos/drivers/network/afd/include/tdi_proto.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/tdi_proto.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/tdi_proto.h [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -4,7 +4,6 @@ PFILE_OBJECT ConnectionObject, PTDI_CONNECTION_INFORMATION ConnectionCallInfo, PTDI_CONNECTION_INFORMATION ConnectionReturnInfo, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext ); @@ -20,7 +19,6 @@ PFILE_OBJECT TransportObject, PLARGE_INTEGER Time, USHORT Flags, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext, PTDI_CONNECTION_INFORMATION RequestConnectionInfo,

1 0

[cwittich] 64837: [videoprt] fix uninitialized variable usage in error case
by cwittich＠svn.reactos.org 19 Oct '14

19 Oct '14

Author: cwittich Date: Sun Oct 19 21:57:29 2014 New Revision: 64837 URL: http://svn.reactos.org/svn/reactos?rev=64837&view=rev Log: [videoprt] fix uninitialized variable usage in error case Modified: trunk/reactos/win32ss/drivers/videoprt/registry.c Modified: trunk/reactos/win32ss/drivers/videoprt/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/r… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/registry.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/registry.c [iso-8859-1] Sun Oct 19 21:57:29 2014 @@ -59,7 +59,7 @@ if (InfoBuffer == NULL) { ERR_(VIDEOPRT, "Could not allocate buffer for key info\n"); - return Status; + return STATUS_INSUFFICIENT_RESOURCES; } }

1 0

[pschweitzer] 64836: [FASTFAT] - Implement vfatPrepareTargetForRename() that prepares for renaming. It tries to open target and deletes it if it exists and if allowed. And then, it opens the parent...
by pschweitzer＠svn.reactos.org 19 Oct '14

19 Oct '14

Author: pschweitzer Date: Sun Oct 19 21:38:32 2014 New Revision: 64836 URL: http://svn.reactos.org/svn/reactos?rev=64836&view=rev Log: [FASTFAT] - Implement vfatPrepareTargetForRename() that prepares for renaming. It tries to open target and deletes it if it exists and if allowed. And then, it opens the parent directory. - Implement VfatSetRenameInformation() that actually does the renaming (call as SetInformationFile). It handles cases we we have (or we don't have) TargetDirectory provided. It sends notifications as appropriated on demands. - Implement vfatRenameEntry() that renames an entry in place. So far, it only supports FATX entries renaming. FAT entries are a bit more complex. It falls back to vfatMoveEntry() in later cases. - Implement VfatMoveEntry() that will move an entry accross directories (or in place for FAT). Its principles are simple: it deletes the entry in old parent, and recreate it in new parent, keeping file metadata & data. - Modify VfatDelEntry() and VfatAddEntry() so that they can handle deleting an entry without touching its data and adding an entry with an already provided FCB and thus use the given metadata. - Implement vfatDelFCBFromTable() which is just old code moved to new routine to allow reuse. It deletes a FCB entry from hash table. Doesn't deal with references! - Implement vfatMakeFullName() which is mostly old code moved to new routine to allow reuse. It allocates buffer and copy data for FCB full name. - Implement vfatUpdateFCB() that will update a FCB with new names and parent. It will remove anything related to old name and will recreate using new data. It will adjust references count. - Modify vfatMakeFCBFromDirEntry() so that it calls vfatMakeFullName(). - Modify vfatReleaseFCB() so that it calls vfatDelFCBFromTable(). - Revert VfatOpenFile() to its previous features. - Modify VfatCreateFile() to reimplement support for SL_OPEN_TARGET_DIRECTORY. It is way less hackish than previously. It also properly opens parent now, by incrementing its handle count and by setting appropriate access rights. [KERNEL32] - Rewritten MoveFileWithProgressW() to implement all the missing features that are used in Windows 2k3 including links and reparse points. - Implemented BasepMoveFileDelayed() to replace deprecated add_boot_rename_entry(). This functions is matching the features implemented in SMSS. - Implemented BasepMoveFileCopyProgress() which is used in MoveFileWithProgressW(). - Stubbed BasepNotifyTrackingService() which is not use at the moment (FastFAT, even in Windows doesn't provide such feature). - Reimplemented ReplaceFileA(), MoveFileWithProgressA() to quit Winisms and use our internal helpers. - Make MoveFileX() use MoveFileWithProgressX() directly. - Fixed a few prototypes. TL;DR: This (huge) commit implements file and directory renaming in FastFAT driver. This allows getting rid of old implementation in kernel32 where files were force copied. A feature is still missing, but Jérôme should implement it anytime soon (he prototyped it already): moving directories across volumes. This requires some work in BasepCopyFileExW(). Kudos to all the devs who helped me on this: Christoph, Hervé, Jérôme, Thomas. This finally allows killing CR-52... It was about time! Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c trunk/reactos/drivers/filesystems/fastfat/close.c trunk/reactos/drivers/filesystems/fastfat/create.c trunk/reactos/drivers/filesystems/fastfat/dirwr.c trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/fastfat/vfat.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/drivers/filesystems/fastfat/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa…

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