Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[tfaber] 75021: [WIN32K:NTUSER] - Close the clipboard when a thread is destroyed. Fixes 148 user32:clipboard tests CORE-13414
by tfaber＠svn.reactos.org 13 Jun '17

13 Jun '17

Author: tfaber Date: Tue Jun 13 13:27:03 2017 New Revision: 75021 URL: http://svn.reactos.org/svn/reactos?rev=75021&view=rev Log: [WIN32K:NTUSER] - Close the clipboard when a thread is destroyed. Fixes 148 user32:clipboard tests CORE-13414 Modified: trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Tue Jun 13 13:27:03 2017 @@ -707,6 +707,8 @@ ptiCurrent->TIF_flags |= TIF_DONTATTACHQUEUE; ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; + + UserCloseClipboard(); /* Decrement thread count and check if its 0 */ ppiCurrent->cThreads--;

1 0

[tfaber] 75020: [WIN32K:NTUSER] - Avoid crash on invalid format in UserEnumClipboardFormats. This is covered by user32_winetest but we currently fail that call before it can crash. The next commit ...
by tfaber＠svn.reactos.org 13 Jun '17

13 Jun '17

Author: tfaber Date: Tue Jun 13 13:12:55 2017 New Revision: 75020 URL: http://svn.reactos.org/svn/reactos?rev=75020&view=rev Log: [WIN32K:NTUSER] - Avoid crash on invalid format in UserEnumClipboardFormats. This is covered by user32_winetest but we currently fail that call before it can crash. The next commit will change that. CORE-13414 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] Tue Jun 13 13:12:55 2017 @@ -448,9 +448,14 @@ { /* Return next format */ pElement = IntGetFormatElement(pWinStaObj, fmt); - ++pElement; - if (pElement < &pWinStaObj->pClipBase[pWinStaObj->cNumClipFormats]) - Ret = pElement->fmt; + if (pElement != NULL) + { + ++pElement; + if (pElement < &pWinStaObj->pClipBase[pWinStaObj->cNumClipFormats]) + { + Ret = pElement->fmt; + } + } } cleanup:

1 0

[tfaber] 75019: [NTMARTA] - Add support for CURRENT_USER trustee in AccpGetTrusteeSid. Fixes crash in advapi32_winetest:security CORE-13420 #resolve
by tfaber＠svn.reactos.org 13 Jun '17

13 Jun '17

Author: tfaber Date: Tue Jun 13 10:10:57 2017 New Revision: 75019 URL: http://svn.reactos.org/svn/reactos?rev=75019&view=rev Log: [NTMARTA] - Add support for CURRENT_USER trustee in AccpGetTrusteeSid. Fixes crash in advapi32_winetest:security CORE-13420 #resolve Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c [iso-8859-1] Tue Jun 13 10:10:57 2017 @@ -444,6 +444,51 @@ } static DWORD +AccpLookupCurrentUser(OUT PSID *ppSid) +{ + DWORD Ret; + CHAR Buffer[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; + DWORD Length; + HANDLE Token; + PSID pSid; + + *ppSid = NULL; + if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &Token)) + { + Ret = GetLastError(); + if (Ret != ERROR_NO_TOKEN) + { + return Ret; + } + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &Token)) + { + return GetLastError(); + } + } + + Length = sizeof(Buffer); + if (!GetTokenInformation(Token, TokenUser, Buffer, Length, &Length)) + { + Ret = GetLastError(); + CloseHandle(Token); + return Ret; + } + CloseHandle(Token); + + pSid = ((PTOKEN_USER)Buffer)->User.Sid; + Length = GetLengthSid(pSid); + *ppSid = LocalAlloc(LMEM_FIXED, Length); + if (!*ppSid) + { + return ERROR_NOT_ENOUGH_MEMORY; + } + CopyMemory(*ppSid, pSid, Length); + + return ERROR_SUCCESS; +} + +static DWORD AccpLookupSidByName(IN LSA_HANDLE PolicyHandle, IN LPWSTR Name, OUT PSID *pSid) @@ -509,6 +554,7 @@ OUT BOOL *Allocated) { DWORD Ret = ERROR_SUCCESS; + LPWSTR TrusteeName; *ppSid = NULL; *Allocated = FALSE; @@ -535,6 +581,18 @@ /* fall through */ case TRUSTEE_IS_NAME: + TrusteeName = AccpGetTrusteeName(Trustee); + if (!wcscmp(TrusteeName, L"CURRENT_USER")) + { + Ret = AccpLookupCurrentUser(ppSid); + if (Ret == ERROR_SUCCESS) + { + ASSERT(*ppSid != NULL); + *Allocated = TRUE; + } + break; + } + if (*pPolicyHandle == NULL) { Ret = AccpOpenLSAPolicyHandle(NULL, /* FIXME - always local? */ @@ -547,7 +605,7 @@ } Ret = AccpLookupSidByName(*pPolicyHandle, - AccpGetTrusteeName(Trustee), + TrusteeName, ppSid); if (Ret == ERROR_SUCCESS) {

1 0

[tfaber] 75018: [BOOTDATA] - Add Print context menu item for .rtf files. Patch by Nikolay Burshtyn. CORE-13342 #resolve
by tfaber＠svn.reactos.org 13 Jun '17

13 Jun '17

Author: tfaber Date: Tue Jun 13 06:45:39 2017 New Revision: 75018 URL: http://svn.reactos.org/svn/reactos?rev=75018&view=rev Log: [BOOTDATA] - Add Print context menu item for .rtf files. Patch by Nikolay Burshtyn. CORE-13342 #resolve Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Tue Jun 13 06:45:39 2017 @@ -34,6 +34,7 @@ HKCR,"rtffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\wordpad.exe,-103" HKCR,"rtffile\shell\open","",0x00000000,"Open" HKCR,"rtffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\wordpad.exe %1" +HKCR,"rtffile\shell\print\command","",0x00020000,"%SystemRoot%\system32\wordpad.exe /p ""%1""" ; Virtual Device Drivers HKCR,".386","",0x00000000,"vxdfile"

1 0

[tfaber] 75017: [KMTESTS] - Add test for hidparse's descriptor parsing CORE-11538
by tfaber＠svn.reactos.org 13 Jun '17

13 Jun '17

Author: tfaber Date: Tue Jun 13 05:48:28 2017 New Revision: 75017 URL: http://svn.reactos.org/svn/reactos?rev=75017&view=rev Log: [KMTESTS] - Add test for hidparse's descriptor parsing CORE-11538 Added: trunk/rostests/kmtests/hidparse/ trunk/rostests/kmtests/hidparse/CMakeLists.txt (with props) trunk/rostests/kmtests/hidparse/HidP.h (with props) trunk/rostests/kmtests/hidparse/HidPDescription.c (with props) trunk/rostests/kmtests/hidparse/HidP_drv.c (with props) trunk/rostests/kmtests/hidparse/HidP_user.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Tue Jun 13 05:48:28 2017 @@ -5,6 +5,7 @@ # subdirectories containing special-purpose drivers # add_subdirectory(example) +add_subdirectory(hidparse) add_subdirectory(kernel32) add_subdirectory(ntos_cc) add_subdirectory(ntos_io) @@ -123,6 +124,7 @@ kmtest/testlist.c example/Example_user.c + hidparse/HidP_user.c kernel32/FindFile_user.c ntos_cc/CcCopyRead_user.c ntos_io/IoCreateFile_user.c @@ -154,6 +156,7 @@ kmtest_drv example_drv findfile_drv + hidp_drv iocreatefile_drv iodeviceobject_drv iohelper_drv Added: trunk/rostests/kmtests/hidparse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/hidparse/CMakeLis… ============================================================================== --- trunk/rostests/kmtests/hidparse/CMakeLists.txt (added) +++ trunk/rostests/kmtests/hidparse/CMakeLists.txt [iso-8859-1] Tue Jun 13 05:48:28 2017 @@ -0,0 +1,18 @@ + +include_directories(../include) + +# +# HidP +# +list(APPEND HIDP_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + HidP_drv.c + HidPDescription.c) + +add_library(hidp_drv SHARED ${HIDP_DRV_SOURCE}) +set_module_type(hidp_drv kernelmodedriver) +target_link_libraries(hidp_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(hidp_drv hidparse ntoskrnl hal) +add_target_compile_definitions(hidp_drv KMT_STANDALONE_DRIVER) +#add_pch(hidp_drv ../include/kmt_test.h) +add_rostests_file(TARGET hidp_drv) Propchange: trunk/rostests/kmtests/hidparse/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/hidparse/HidP.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/hidparse/HidP.h?r… ============================================================================== --- trunk/rostests/kmtests/hidparse/HidP.h (added) +++ trunk/rostests/kmtests/hidparse/HidP.h [iso-8859-1] Tue Jun 13 05:48:28 2017 @@ -0,0 +1,13 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: HidParser test declarations + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#ifndef _KMTEST_HIDP_H_ +#define _KMTEST_HIDP_H_ + +#define IOCTL_TEST_DESCRIPTION 1 + +#endif /* !defined _KMTEST_HIDP_H_ */ Propchange: trunk/rostests/kmtests/hidparse/HidP.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/hidparse/HidPDescription.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/hidparse/HidPDesc… ============================================================================== --- trunk/rostests/kmtests/hidparse/HidPDescription.c (added) +++ trunk/rostests/kmtests/hidparse/HidPDescription.c [iso-8859-1] Tue Jun 13 05:48:28 2017 @@ -0,0 +1,258 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: HidParser description test + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <kmt_test.h> +#include <hidpddi.h> + +#define NDEBUG +#include <debug.h> + +#include "HidP.h" + +static UCHAR ExampleKeyboardDescriptor[] = { + 0x05, 0x01, /* Usage Page (Generic Desktop), */ + 0x09, 0x06, /* Usage (Keyboard), */ + 0xA1, 0x01, /* Collection (Application), */ + 0x05, 0x07, /* Usage Page (Key Codes); */ + 0x19, 0xE0, /* Usage Minimum (224), */ + 0x29, 0xE7, /* Usage Maximum (231), */ + 0x15, 0x00, /* Logical Minimum (0), */ + 0x25, 0x01, /* Logical Maximum (1), */ + 0x75, 0x01, /* Report Size (1), */ + 0x95, 0x08, /* Report Count (8), */ + 0x81, 0x02, /* Input (Data, Variable, Absolute), ;Modifier byte */ + 0x95, 0x01, /* Report Count (1), */ + 0x75, 0x08, /* Report Size (8), */ + 0x81, 0x01, /* Input (Constant), ;Reserved byte */ + 0x95, 0x05, /* Report Count (5), */ + 0x75, 0x01, /* Report Size (1), */ + 0x05, 0x08, /* Usage Page (Page# for LEDs), */ + 0x19, 0x01, /* Usage Minimum (1), */ + 0x29, 0x05, /* Usage Maximum (5), */ + 0x91, 0x02, /* Output (Data, Variable, Absolute), ;LED report */ + 0x95, 0x01, /* Report Count (1), */ + 0x75, 0x03, /* Report Size (3), */ + 0x91, 0x01, /* Output (Constant), ;LED report padding */ + 0x95, 0x06, /* Report Count (6), */ + 0x75, 0x08, /* Report Size (8), */ + 0x15, 0x00, /* Logical Minimum (0), */ + 0x25, 0x65, /* Logical Maximum (101), */ + 0x05, 0x07, /* Usage Page (Key Codes), */ + 0x19, 0x00, /* Usage Minimum (0), */ + 0x29, 0x65, /* Usage Maximum (101) */ + 0x81, 0x00, /* Input (Data, Array), ;Key arrays (6 bytes) */ + 0xC0 /* End Collection */ +}; + +static UCHAR PowerProEliteDescriptor[] = { + 0x05, 0x01, /* Usage Page (Generic Desktop), */ + 0x09, 0x04, /* Usage (Joystick), */ + 0xa1, 0x01, /* Collection (Application), */ + 0xa1, 0x02, /* Collection (Logical), */ + 0x85, 0x01, /* Report ID (1) */ + 0x75, 0x08, /* Report Size (8), */ + 0x95, 0x01, /* Report Count (1), */ + 0x15, 0x00, /* Logical Minimum (0), */ + 0x26, 0xff, 0x00, /* Logical Maximum (255), */ + 0x81, 0x03, /* Input (Constant, Variable, Absolute), */ + 0x75, 0x01, /* Report Size (1), */ + 0x95, 0x13, /* Report Count (19), */ + 0x15, 0x00, /* Logical Minimum (0), */ + 0x25, 0x01, /* Logical Maximum (1), */ + 0x35, 0x00, /* Physical Minimum (0), */ + 0x45, 0x01, /* Physical Maximum (1), */ + 0x05, 0x09, /* Usage Page (Button), */ + 0x19, 0x01, /* Usage Minimum (1), */ + 0x29, 0x13, /* Usage Maximum (19), */ + 0x81, 0x02, /* Input (Data, Variable, Absolute), */ + 0x75, 0x01, /* Report Size (1), */ + 0x95, 0x0d, /* Report Count (13), */ + 0x06, 0x00, 0xff, /* Usage Page (Vendor-defined FF00), */ + 0x81, 0x03, /* Input (Constant, Variable, Absolute), */ + 0x15, 0x00, /* Logical Minimum (0), */ + 0x26, 0xff, 0x00, /* Logical Maximum (255), */ + 0x05, 0x01, /* Usage Page (Generic Desktop), */ + 0x09, 0x01, /* Usage (Pointer), */ + 0xa1, 0x00, /* Collection (Physical), */ + 0x75, 0x08, /* Report Size (8), */ + 0x95, 0x04, /* Report Count (4), */ + 0x35, 0x00, /* Physical Minimum (0), */ + 0x46, 0xff, 0x00, /* Physical Maximum (255), */ + 0x09, 0x30, /* Usage (X), */ + 0x09, 0x31, /* Usage (Y), */ + 0x09, 0x32, /* Usage (Z), */ + 0x09, 0x35, /* Usage (Rz), */ + 0x81, 0x02, /* Input (Data, Variable, Absolute), */ + 0xc0, /* End Collection */ + 0x05, 0x01, /* Usage Page (Generic Desktop), */ + 0x75, 0x08, /* Report Size (8), */ + 0x95, 0x27, /* Report Count (39), */ + 0x09, 0x01, /* Usage (Pointer), */ + 0x81, 0x02, /* Input (Data, Variable, Absolute), */ + 0x75, 0x08, /* Report Size (8), */ + 0x95, 0x30, /* Report Count (48), */ + 0x09, 0x01, /* Usage (Pointer), */ + 0x91, 0x02, /* Output (Data, Variable, Absolute), */ + 0x75, 0x08, /* Report Size (8), */ + 0x95, 0x30, /* Report Count (48), */ + 0x09, 0x01, /* Usage (Pointer), */ + 0xb1, 0x02, /* Feature (Data, Variable, Absolute), */ + 0xc0, /* End Collection */ + + 0xa1, 0x02, /* Collection (Logical), */ + 0x85, 0x02, /* Report ID (2) */ + 0x75, 0x08, /* Report Size (8), */ + 0x95, 0x30, /* Report Count (48), */ + 0x09, 0x01, /* Usage (Pointer), */ + 0xb1, 0x02, /* Feature (Data, Variable, Absolute), */ + 0xc0, /* End Collection */ + 0xa1, 0x02, /* Collection (Logical), */ + 0x85, 0xee, /* Report ID (238) */ + 0x75, 0x08, /* Report Size (8), */ + 0x95, 0x30, /* Report Count (48), */ + 0x09, 0x01, /* Usage (Pointer), */ + 0xb1, 0x02, /* Feature (Data, Variable, Absolute), */ + 0xc0, /* End Collection */ + 0xa1, 0x02, /* Collection (Logical), */ + 0x85, 0xef, /* Report ID (239) */ + 0x75, 0x08, /* Report Size (8), */ + 0x95, 0x30, /* Report Count (48), */ + 0x09, 0x01, /* Usage (Pointer), */ + 0xb1, 0x02, /* Feature (Data, Variable, Absolute), */ + 0xc0, /* End Collection */ + 0xc0, /* End Collection */ +}; +C_ASSERT(sizeof(PowerProEliteDescriptor) == 148); + +static +VOID +TestGetCollectionDescription(VOID) +{ + NTSTATUS Status; + HIDP_DEVICE_DESC DeviceDescription; + + /* Empty report descriptor */ + RtlFillMemory(&DeviceDescription, sizeof(DeviceDescription), 0x55); + Status = HidP_GetCollectionDescription(NULL, + 0, + NonPagedPool, + &DeviceDescription); + ok_eq_hex(Status, STATUS_NO_DATA_DETECTED); + ok_eq_pointer(DeviceDescription.CollectionDesc, NULL); + ok_eq_ulong(DeviceDescription.CollectionDescLength, 0); + ok_eq_pointer(DeviceDescription.ReportIDs, NULL); + ok_eq_ulong(DeviceDescription.ReportIDsLength, 0); + if (NT_SUCCESS(Status)) HidP_FreeCollectionDescription(&DeviceDescription); + + /* Sample keyboard report descriptor from the HID spec */ + Status = HidP_GetCollectionDescription(ExampleKeyboardDescriptor, + sizeof(ExampleKeyboardDescriptor), + NonPagedPool, + &DeviceDescription); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_ulong(DeviceDescription.CollectionDescLength, 1); + ok_eq_ulong(DeviceDescription.ReportIDsLength, 1); + if (!skip(NT_SUCCESS(Status), "Parsing failure\n")) + { + if (!skip(DeviceDescription.CollectionDescLength >= 1, "No collection\n")) + { + ok_eq_uint(DeviceDescription.CollectionDesc[0].UsagePage, HID_USAGE_PAGE_GENERIC); + ok_eq_uint(DeviceDescription.CollectionDesc[0].Usage, HID_USAGE_GENERIC_KEYBOARD); + ok_eq_uint(DeviceDescription.CollectionDesc[0].CollectionNumber, 1); + ok_eq_uint(DeviceDescription.CollectionDesc[0].InputLength, 9); + ok_eq_uint(DeviceDescription.CollectionDesc[0].OutputLength, 2); + ok_eq_uint(DeviceDescription.CollectionDesc[0].FeatureLength, 0); + ok_eq_uint(DeviceDescription.CollectionDesc[0].PreparsedDataLength, 476); + } + if (!skip(DeviceDescription.ReportIDsLength >= 1, "No report IDs\n")) + { + ok_eq_uint(DeviceDescription.ReportIDs[0].ReportID, 0); + ok_eq_uint(DeviceDescription.ReportIDs[0].CollectionNumber, 1); + ok_eq_uint(DeviceDescription.ReportIDs[0].InputLength, 8); + ok_eq_uint(DeviceDescription.ReportIDs[0].OutputLength, 1); + ok_eq_uint(DeviceDescription.ReportIDs[0].FeatureLength, 0); + } + HidP_FreeCollectionDescription(&DeviceDescription); + } + + /* Regression test for CORE-11538 */ + Status = HidP_GetCollectionDescription(PowerProEliteDescriptor, + sizeof(PowerProEliteDescriptor), + NonPagedPool, + &DeviceDescription); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_ulong(DeviceDescription.CollectionDescLength, 1); + ok_eq_ulong(DeviceDescription.ReportIDsLength, 4); + if (!skip(NT_SUCCESS(Status), "Parsing failure\n")) + { + if (!skip(DeviceDescription.CollectionDescLength >= 1, "No collection\n")) + { + ok_eq_uint(DeviceDescription.CollectionDesc[0].UsagePage, HID_USAGE_PAGE_GENERIC); + ok_eq_uint(DeviceDescription.CollectionDesc[0].Usage, HID_USAGE_GENERIC_JOYSTICK); + ok_eq_uint(DeviceDescription.CollectionDesc[0].CollectionNumber, 1); + ok_eq_uint(DeviceDescription.CollectionDesc[0].InputLength, 49); + ok_eq_uint(DeviceDescription.CollectionDesc[0].OutputLength, 49); + ok_eq_uint(DeviceDescription.CollectionDesc[0].FeatureLength, 49); + ok_eq_uint(DeviceDescription.CollectionDesc[0].PreparsedDataLength, 1388); + } + if (!skip(DeviceDescription.ReportIDsLength >= 1, "No first report ID\n")) + { + ok_eq_uint(DeviceDescription.ReportIDs[0].ReportID, 1); + ok_eq_uint(DeviceDescription.ReportIDs[0].CollectionNumber, 1); + ok_eq_uint(DeviceDescription.ReportIDs[0].InputLength, 49); + ok_eq_uint(DeviceDescription.ReportIDs[0].OutputLength, 49); + ok_eq_uint(DeviceDescription.ReportIDs[0].FeatureLength, 49); + } + if (!skip(DeviceDescription.ReportIDsLength >= 2, "No second report ID\n")) + { + ok_eq_uint(DeviceDescription.ReportIDs[1].ReportID, 2); + ok_eq_uint(DeviceDescription.ReportIDs[1].CollectionNumber, 1); + ok_eq_uint(DeviceDescription.ReportIDs[1].InputLength, 0); + ok_eq_uint(DeviceDescription.ReportIDs[1].OutputLength, 0); + ok_eq_uint(DeviceDescription.ReportIDs[1].FeatureLength, 49); + } + if (!skip(DeviceDescription.ReportIDsLength >= 3, "No third report ID\n")) + { + ok_eq_uint(DeviceDescription.ReportIDs[2].ReportID, 238); + ok_eq_uint(DeviceDescription.ReportIDs[2].CollectionNumber, 1); + ok_eq_uint(DeviceDescription.ReportIDs[2].InputLength, 0); + ok_eq_uint(DeviceDescription.ReportIDs[2].OutputLength, 0); + ok_eq_uint(DeviceDescription.ReportIDs[2].FeatureLength, 49); + } + if (!skip(DeviceDescription.ReportIDsLength >= 4, "No fourth report ID\n")) + { + ok_eq_uint(DeviceDescription.ReportIDs[3].ReportID, 239); + ok_eq_uint(DeviceDescription.ReportIDs[3].CollectionNumber, 1); + ok_eq_uint(DeviceDescription.ReportIDs[3].InputLength, 0); + ok_eq_uint(DeviceDescription.ReportIDs[3].OutputLength, 0); + ok_eq_uint(DeviceDescription.ReportIDs[3].FeatureLength, 49); + } + HidP_FreeCollectionDescription(&DeviceDescription); + } +} + +NTSTATUS +TestHidPDescription( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG ControlCode, + IN PVOID Buffer OPTIONAL, + IN SIZE_T InLength, + IN OUT PSIZE_T OutLength) +{ + UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(Buffer); + UNREFERENCED_PARAMETER(InLength); + UNREFERENCED_PARAMETER(OutLength); + + PAGED_CODE(); + + NT_VERIFY(ControlCode == IOCTL_TEST_DESCRIPTION); + + TestGetCollectionDescription(); + + return STATUS_SUCCESS; +} Propchange: trunk/rostests/kmtests/hidparse/HidPDescription.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/hidparse/HidP_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/hidparse/HidP_drv… ============================================================================== --- trunk/rostests/kmtests/hidparse/HidP_drv.c (added) +++ trunk/rostests/kmtests/hidparse/HidP_drv.c [iso-8859-1] Tue Jun 13 05:48:28 2017 @@ -0,0 +1,41 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test driver for HidParser functionality + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +#include "HidP.h" + +KMT_MESSAGE_HANDLER TestHidPDescription; + +NTSTATUS +TestEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PCUNICODE_STRING RegistryPath, + _Out_ PCWSTR *DeviceName, + _Inout_ INT *Flags) +{ + UNREFERENCED_PARAMETER(RegistryPath); + + PAGED_CODE(); + + *DeviceName = L"HidP"; + *Flags = TESTENTRY_NO_EXCLUSIVE_DEVICE; + + KmtRegisterMessageHandler(IOCTL_TEST_DESCRIPTION, NULL, TestHidPDescription); + + return STATUS_SUCCESS; +} + +VOID +TestUnload( + _In_ PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); +} Propchange: trunk/rostests/kmtests/hidparse/HidP_drv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/hidparse/HidP_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/hidparse/HidP_use… ============================================================================== --- trunk/rostests/kmtests/hidparse/HidP_user.c (added) +++ trunk/rostests/kmtests/hidparse/HidP_user.c [iso-8859-1] Tue Jun 13 05:48:28 2017 @@ -0,0 +1,33 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite Driver Object test user-mode part + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <kmt_test.h> +#include "HidP.h" + +DWORD +KmtStartService( + IN PCWSTR ServiceName OPTIONAL, + IN OUT SC_HANDLE *ServiceHandle); + +START_TEST(HidPDescription) +{ + SC_HANDLE ServiceHandle; + DWORD Error; + + ServiceHandle = NULL; + KmtStartService(L"hidusb", &ServiceHandle); + CloseServiceHandle(ServiceHandle); + + KmtLoadDriver(L"HidP", FALSE); + KmtOpenDriver(); + + Error = KmtSendToDriver(IOCTL_TEST_DESCRIPTION); + ok(Error == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %lx\n", Error); + + KmtCloseDriver(); + KmtUnloadDriver(); +} Propchange: trunk/rostests/kmtests/hidparse/HidP_user.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Tue Jun 13 05:48:28 2017 @@ -10,6 +10,7 @@ KMT_TESTFUNC Test_CcCopyRead; KMT_TESTFUNC Test_Example; KMT_TESTFUNC Test_FindFile; +KMT_TESTFUNC Test_HidPDescription; KMT_TESTFUNC Test_IoCreateFile; KMT_TESTFUNC Test_IoDeviceObject; KMT_TESTFUNC Test_IoReadWrite; @@ -34,6 +35,7 @@ { "CcCopyRead", Test_CcCopyRead }, { "-Example", Test_Example }, { "FindFile", Test_FindFile }, + { "HidPDescription", Test_HidPDescription }, { "IoCreateFile", Test_IoCreateFile }, { "IoDeviceObject", Test_IoDeviceObject }, { "IoReadWrite", Test_IoReadWrite },

1 0

[jimtabor] 75016: [GDI32|Metafile] - Instead of debug breaking, use wine code anyway. Should fix CORE-12911.
by jimtabor＠svn.reactos.org 12 Jun '17

12 Jun '17

Author: jimtabor Date: Mon Jun 12 22:42:45 2017 New Revision: 75016 URL: http://svn.reactos.org/svn/reactos?rev=75016&view=rev Log: [GDI32|Metafile] - Instead of debug breaking, use wine code anyway. Should fix CORE-12911. Modified: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c Modified: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/ros… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] Mon Jun 12 22:42:45 2017 @@ -402,13 +402,33 @@ ASSERT(hdcLink == hdc); } +/*********************************************************************** + * bitmap_info_size + * + * Return the size of the bitmap info structure including color table. + */ int bitmap_info_size( const BITMAPINFO * info, WORD coloruse) { - __debugbreak(); - return 0; + unsigned int colors, size, masks = 0; + + if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)info; + colors = (core->bcBitCount <= 8) ? 1 << core->bcBitCount : 0; + return sizeof(BITMAPCOREHEADER) + colors * + ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBTRIPLE) : sizeof(WORD)); + } + else /* assume BITMAPINFOHEADER */ + { + if (info->bmiHeader.biClrUsed) colors = min( info->bmiHeader.biClrUsed, 256 ); + else colors = info->bmiHeader.biBitCount > 8 ? 0 : 1 << info->bmiHeader.biBitCount; + if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; + size = max( info->bmiHeader.biSize, sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) ); + return size + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); + } } BOOL

1 0

[tfaber] 75015: [HDAUDBUS] - Initialize the correct variable in HDA_FDOQueryBusRelations. Should fix random crashes due to uninitialized value use. CORE-12707 #resolve
by tfaber＠svn.reactos.org 12 Jun '17

12 Jun '17

Author: tfaber Date: Mon Jun 12 19:51:29 2017 New Revision: 75015 URL: http://svn.reactos.org/svn/reactos?rev=75015&view=rev Log: [HDAUDBUS] - Initialize the correct variable in HDA_FDOQueryBusRelations. Should fix random crashes due to uninitialized value use. CORE-12707 #resolve Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp [iso-8859-1] Mon Jun 12 19:51:29 2017 @@ -662,7 +662,7 @@ if (!DeviceRelations) return STATUS_INSUFFICIENT_RESOURCES; - DeviceCount = 0; + DeviceRelations->Count = 0; for (CodecIndex = 0; CodecIndex < HDA_MAX_CODECS; CodecIndex++) { if (DeviceExtension->Codecs[CodecIndex] == NULL)

1 0

[tfaber] 75014: [WIN32K:NTUSER] - Add a hack to avoid doubly freeing a DCE in IntDestroyClass. Since we don't implement W32PF_OWNDCCLEANUP and always free DCEs unconditionally in DceFreeDCE, it is ...
by tfaber＠svn.reactos.org 12 Jun '17

12 Jun '17

Author: tfaber Date: Mon Jun 12 19:37:58 2017 New Revision: 75014 URL: http://svn.reactos.org/svn/reactos?rev=75014&view=rev Log: [WIN32K:NTUSER] - Add a hack to avoid doubly freeing a DCE in IntDestroyClass. Since we don't implement W32PF_OWNDCCLEANUP and always free DCEs unconditionally in DceFreeDCE, it is not safe to access the class DCE here (and probably other places) since it could have been deleted by a dying thread. CORE-13415 #resolve Modified: trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/dce.h trunk/reactos/win32ss/user/ntuser/windc.c Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Mon Jun 12 19:37:58 2017 @@ -261,7 +261,7 @@ if (Class->pdce) { - DceFreeClassDCE(((PDCE)Class->pdce)->hDC); + DceFreeClassDCE(Class->pdce); Class->pdce = NULL; } Modified: trunk/reactos/win32ss/user/ntuser/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/dce.h?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/dce.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/dce.h [iso-8859-1] Mon Jun 12 19:37:58 2017 @@ -47,7 +47,7 @@ void FASTCALL DceFreeDCE(PDCE dce, BOOLEAN Force); void FASTCALL DceEmptyCache(void); VOID FASTCALL DceResetActiveDCEs(PWND Window); -void FASTCALL DceFreeClassDCE(HDC); +void FASTCALL DceFreeClassDCE(PDCE); HWND FASTCALL UserGethWnd(HDC,PWNDOBJ*); void FASTCALL DceFreeWindowDCE(PWND); void FASTCALL DceFreeThreadDCE(PTHREADINFO); Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Mon Jun 12 19:37:58 2017 @@ -766,7 +766,7 @@ } void FASTCALL -DceFreeClassDCE(HDC hDC) +DceFreeClassDCE(PDCE pdceClass) { PDCE pDCE; PLIST_ENTRY ListEntry; @@ -776,7 +776,7 @@ { pDCE = CONTAINING_RECORD(ListEntry, DCE, List); ListEntry = ListEntry->Flink; - if (pDCE->hDC == hDC) + if (pDCE == pdceClass) { DceFreeDCE(pDCE, TRUE); // Might have gone cheap! }

1 0

[gadamopoulos] 75013: [SHELL32] -Add Comments as the 2nd column in CDesktopFolder, CDrivesFolder and CRegFolder. Add Type as the 3rd column in CRegFolder. This is not entirely correct. Our columns ...
by gadamopoulos＠svn.reactos.org 12 Jun '17

12 Jun '17

Author: gadamopoulos Date: Mon Jun 12 18:38:26 2017 New Revision: 75013 URL: http://svn.reactos.org/svn/reactos?rev=75013&view=rev Log: [SHELL32] -Add Comments as the 2nd column in CDesktopFolder, CDrivesFolder and CRegFolder. Add Type as the 3rd column in CRegFolder. This is not entirely correct. Our columns support is rudimentary, however we now show the comments stuff in the right place and the reg folder items have a type. Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Mon Jun 12 18:38:26 2017 @@ -64,12 +64,14 @@ static const shvheader DesktopSFHeader[] = { {IDS_SHV_COLUMN_NAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, + {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 10}, + {IDS_SHV_COLUMN_TYPE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10}, {IDS_SHV_COLUMN_SIZE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, - {IDS_SHV_COLUMN_TYPE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10}, {IDS_SHV_COLUMN_MODIFIED, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 12}, + {IDS_SHV_COLUMN_ATTRIBUTES, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10} }; -#define DESKTOPSHELLVIEWCOLUMNS 4 +#define DESKTOPSHELLVIEWCOLUMNS 6 static const DWORD dwDesktopAttributes = SFGAO_HASSUBFOLDER | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Mon Jun 12 18:38:26 2017 @@ -183,12 +183,13 @@ static const shvheader MyComputerSFHeader[] = { {IDS_SHV_COLUMN_NAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, + {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 10}, {IDS_SHV_COLUMN_TYPE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10}, {IDS_SHV_COLUMN_DISK_CAPACITY, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, {IDS_SHV_COLUMN_DISK_AVAILABLE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, }; -#define MYCOMPUTERSHELLVIEWCOLUMNS 4 +#define MYCOMPUTERSHELLVIEWCOLUMNS 5 static const DWORD dwComputerAttributes = SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | @@ -460,13 +461,16 @@ hres = MAKE_COMPARE_HRESULT(result); break; } - case 1: /* Type */ + case 1: /* comments */ + hres = MAKE_COMPARE_HRESULT(0); + break; + case 2: /* Type */ { /* We want to return immediately because SHELL32_CompareDetails also compares children. */ return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } - case 2: /* Size */ - case 3: /* Size Available */ + case 3: /* Size */ + case 4: /* Size Available */ { ULARGE_INTEGER Drive1Available, Drive1Total, Drive2Available, Drive2Total; @@ -481,7 +485,7 @@ Drive2Available.QuadPart = Drive2Total.QuadPart = 0; LARGE_INTEGER Diff; - if (lParam == 2) /* Size */ + if (lParam == 3) /* Size */ Diff.QuadPart = Drive1Total.QuadPart - Drive2Total.QuadPart; else /* Size available */ Diff.QuadPart = Drive1Available.QuadPart - Drive2Available.QuadPart; @@ -842,11 +846,14 @@ case 0: /* name */ hr = GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); break; - case 1: /* type */ + case 1: /* FIXME: comments */ + hr = SHSetStrRet(&psd->str, ""); + break; + case 2: /* type */ hr = SHSetStrRet(&psd->str, iDriveTypeIds[DriveType]); break; - case 2: /* total size */ - case 3: /* free size */ + case 3: /* total size */ + case 4: /* free size */ psd->str.cStr[0] = 0x00; psd->str.uType = STRRET_CSTR; if (GetVolumeInformationA(pszDrive, NULL, 0, NULL, NULL, NULL, NULL, 0)) Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Mon Jun 12 18:38:26 2017 @@ -81,13 +81,14 @@ static const shvheader GenericSFHeader[] = { {IDS_SHV_COLUMN_NAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, + {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 0}, + {IDS_SHV_COLUMN_TYPE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10}, {IDS_SHV_COLUMN_SIZE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, - {IDS_SHV_COLUMN_TYPE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10}, {IDS_SHV_COLUMN_MODIFIED, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 12}, {IDS_SHV_COLUMN_ATTRIBUTES, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10} }; -#define GENERICSHELLVIEWCOLUMNS 5 +#define GENERICSHELLVIEWCOLUMNS 6 /************************************************************************** * SHELL32_CreatePidlFromBindCtx [internal] @@ -328,20 +329,23 @@ case 0: /* Name */ result = wcsicmp(pDataW1->wszName, pDataW2->wszName); break; + case 1: /* Comments */ + result = 0; + break; case 2: /* Type */ pExtension1 = PathFindExtensionW(pDataW1->wszName); pExtension2 = PathFindExtensionW(pDataW2->wszName); result = wcsicmp(pExtension1, pExtension2); break; - case 1: /* Size */ + case 3: /* Size */ result = pData1->u.file.dwFileSize - pData2->u.file.dwFileSize; break; - case 3: /* Modified */ + case 4: /* Modified */ result = pData1->u.file.uFileDate - pData2->u.file.uFileDate; if (result == 0) result = pData1->u.file.uFileTime - pData2->u.file.uFileTime; break; - case 4: /* Attributes */ + case 5: /* Attributes */ return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } @@ -825,19 +829,21 @@ switch (iColumn) { case 0: /* name */ - hr = GetDisplayNameOf (pidl, - SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); + hr = GetDisplayNameOf (pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); break; - case 1: /* size */ - _ILGetFileSize(pidl, psd->str.cStr, MAX_PATH); + case 1: /* FIXME: comments */ + psd->str.cStr[0] = 0; break; case 2: /* type */ _ILGetFileType(pidl, psd->str.cStr, MAX_PATH); break; - case 3: /* date */ + case 3: /* size */ + _ILGetFileSize(pidl, psd->str.cStr, MAX_PATH); + break; + case 4: /* date */ _ILGetFileDate(pidl, psd->str.cStr, MAX_PATH); break; - case 4: /* attributes */ + case 5: /* attributes */ _ILGetFileAttributes(pidl, psd->str.cStr, MAX_PATH); break; } Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Mon Jun 12 18:38:26 2017 @@ -637,7 +637,7 @@ HRESULT WINAPI CRegFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { - if (!psd || iColumn >= 2) + if (!psd) return E_INVALIDARG; GUID const *clsid = _ILGetGUIDPointer (pidl); @@ -646,22 +646,33 @@ { ERR("Pidl is not reg item!\n"); return E_INVALIDARG; + } + + if (iColumn >= 3) + { + /* Return an empty string when we area asked for a column we don't support. + Only the regfolder is supposed to do this as it supports less columns compared to other folder + and its contents are supposed to be presented alongside items that support more columns. */ + return SHSetStrRet(&psd->str, ""); } switch(iColumn) { case 0: /* name */ return GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); - case 1: /* comment */ + case 1: /* comments */ HKEY hKey; - if (HCR_RegOpenClassIDKey(*clsid, &hKey)) - { - psd->str.cStr[0] = 0x00; - psd->str.uType = STRRET_CSTR; - RegLoadMUIStringA(hKey, "InfoTip", psd->str.cStr, MAX_PATH, NULL, 0, NULL); - RegCloseKey(hKey); - return S_OK; - } + if (!HCR_RegOpenClassIDKey(*clsid, &hKey)) + return SHSetStrRet(&psd->str, ""); + + psd->str.cStr[0] = 0x00; + psd->str.uType = STRRET_CSTR; + RegLoadMUIStringA(hKey, "InfoTip", psd->str.cStr, MAX_PATH, NULL, 0, NULL); + RegCloseKey(hKey); + return S_OK; + case 2: /* type */ + //return SHSetStrRet(&psd->str, resource_id); /* FIXME: translate */ + return SHSetStrRet(&psd->str, "System Folder"); } return E_FAIL; }

1 0

[gadamopoulos] 75012: Fix build.
by gadamopoulos＠svn.reactos.org 12 Jun '17

12 Jun '17

Author: gadamopoulos Date: Mon Jun 12 10:11:39 2017 New Revision: 75012 URL: http://svn.reactos.org/svn/reactos?rev=75012&view=rev Log: Fix build. Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Mon Jun 12 10:11:39 2017 @@ -757,15 +757,15 @@ // FIXME: We should in fact use a UNICODE version of _ILGetFileType szTypeName[0] = L'\0'; wcscpy(buffer, PathFindExtensionW(pFileDetails->szName)); - if (!( HCR_MapTypeToValueW(buffer, buffer, ARRAYSIZE(buffer), TRUE) && - HCR_MapTypeToValueW(buffer, szTypeName, ARRAYSIZE(szTypeName), FALSE ))) + if (!( HCR_MapTypeToValueW(buffer, buffer, _countof(buffer), TRUE) && + HCR_MapTypeToValueW(buffer, szTypeName, _countof(szTypeName), FALSE ))) { /* load localized file string */ szTypeName[0] = '\0'; - if(LoadStringW(shell32_hInstance, IDS_ANY_FILE, szTypeName, ARRAYSIZE(szTypeName))) + if(LoadStringW(shell32_hInstance, IDS_ANY_FILE, szTypeName, _countof(szTypeName))) { szTypeName[63] = '\0'; - StringCchPrintfW(buffer, ARRAYSIZE(buffer), szTypeName, PathFindExtensionW(pFileDetails->szName)); + StringCchPrintfW(buffer, _countof(buffer), szTypeName, PathFindExtensionW(pFileDetails->szName)); } } return SHSetStrRet(&pDetails->str, szTypeName);

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
53
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 June 2017