Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[akhaldi] 68047: [LAUTUS] Revert r68045. Things are not always what they seem (tm).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 6 15:24:52 2015 New Revision: 68047 URL: http://svn.reactos.org/svn/reactos?rev=68047&view=rev Log: [LAUTUS] Revert r68045. Things are not always what they seem (tm). Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI (contents, props changed) trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI (contents, props changed) trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI (contents, props changed) Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1 +0,0 @@ -native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1 +0,0 @@ -native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1 +0,0 @@ -native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

9 years, 6 months

[akhaldi] 68046: [UDFS] Remove some unneeded headers, we have our own. CORE-9774

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 6 15:23:00 2015 New Revision: 68046 URL: http://svn.reactos.org/svn/reactos?rev=68046&view=rev Log: [UDFS] Remove some unneeded headers, we have our own. CORE-9774 Removed: trunk/reactos/drivers/filesystems/udfs/Include/mountmgr.h trunk/reactos/drivers/filesystems/udfs/Include/ntddscsi.h Removed: trunk/reactos/drivers/filesystems/udfs/Include/mountmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/mountmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/mountmgr.h (removed) @@ -1,169 +0,0 @@ -//////////////////////////////////////////////////////////////////// -// Copyright (C) Alexander Telyatnikov, Ivan Keliukh, Yegor Anchishkin, SKIF Software, 1999-2013. Kiev, Ukraine -// All rights reserved -//////////////////////////////////////////////////////////////////// -/*++ - -Copyright (c) 1997-1999 Microsoft Corporation - -Module Name: - - mountmgr.h - -Abstract: - - This file defines the external mount point interface for administering - mount points. - -Author: - - norbertk - -Revision History: - ---*/ - -#ifndef _MOUNTMGR_ -#define _MOUNTMGR_ - -#if _MSC_VER > 1000 -#pragma once -#endif - -#ifndef FAR -#define FAR -#endif - - -#define MOUNTMGR_DEVICE_NAME L"\\Device\\MountPointManager" -#define MOUNTMGR_DOS_DEVICE_NAME L"\\\\.\\MountPointManager" - -#define MOUNTMGRCONTROLTYPE ((ULONG) 'm') -#define MOUNTDEVCONTROLTYPE ((ULONG) 'M') - -// -// These are the IOCTLs supported by the mount point manager. -// - -#define IOCTL_MOUNTMGR_CREATE_POINT CTL_CODE(MOUNTMGRCONTROLTYPE, 0, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_DELETE_POINTS CTL_CODE(MOUNTMGRCONTROLTYPE, 1, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_QUERY_POINTS CTL_CODE(MOUNTMGRCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_MOUNTMGR_DELETE_POINTS_DBONLY CTL_CODE(MOUNTMGRCONTROLTYPE, 3, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_NEXT_DRIVE_LETTER CTL_CODE(MOUNTMGRCONTROLTYPE, 4, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_AUTO_DL_ASSIGNMENTS CTL_CODE(MOUNTMGRCONTROLTYPE, 5, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED CTL_CODE(MOUNTMGRCONTROLTYPE, 6, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_DELETED CTL_CODE(MOUNTMGRCONTROLTYPE, 7, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_CHANGE_NOTIFY CTL_CODE(MOUNTMGRCONTROLTYPE, 8, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_MOUNTMGR_KEEP_LINKS_WHEN_OFFLINE CTL_CODE(MOUNTMGRCONTROLTYPE, 9, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_CHECK_UNPROCESSED_VOLUMES CTL_CODE(MOUNTMGRCONTROLTYPE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_MOUNTMGR_VOLUME_ARRIVAL_NOTIFICATION CTL_CODE(MOUNTMGRCONTROLTYPE, 11, METHOD_BUFFERED, FILE_READ_ACCESS) - -// -// Input structure for IOCTL_MOUNTMGR_CREATE_POINT. -// - -typedef struct _MOUNTMGR_CREATE_POINT_INPUT { - USHORT SymbolicLinkNameOffset; - USHORT SymbolicLinkNameLength; - USHORT DeviceNameOffset; - USHORT DeviceNameLength; -} MOUNTMGR_CREATE_POINT_INPUT, *PMOUNTMGR_CREATE_POINT_INPUT; - -// -// Input structure for IOCTL_MOUNTMGR_DELETE_POINTS, -// IOCTL_MOUNTMGR_QUERY_POINTS, and IOCTL_MOUNTMGR_DELETE_POINTS_DBONLY. -// - -typedef struct _MOUNTMGR_MOUNT_POINT { - ULONG SymbolicLinkNameOffset; - USHORT SymbolicLinkNameLength; - ULONG UniqueIdOffset; - USHORT UniqueIdLength; - ULONG DeviceNameOffset; - USHORT DeviceNameLength; -} MOUNTMGR_MOUNT_POINT, *PMOUNTMGR_MOUNT_POINT; - -// -// Output structure for IOCTL_MOUNTMGR_DELETE_POINTS, -// IOCTL_MOUNTMGR_QUERY_POINTS, and IOCTL_MOUNTMGR_DELETE_POINTS_DBONLY. -// - -typedef struct _MOUNTMGR_MOUNT_POINTS { - ULONG Size; - ULONG NumberOfMountPoints; - MOUNTMGR_MOUNT_POINT MountPoints[1]; -} MOUNTMGR_MOUNT_POINTS, *PMOUNTMGR_MOUNT_POINTS; - -// -// Input structure for IOCTL_MOUNTMGR_NEXT_DRIVE_LETTER. -// - -typedef struct _MOUNTMGR_DRIVE_LETTER_TARGET { - USHORT DeviceNameLength; - WCHAR DeviceName[1]; -} MOUNTMGR_DRIVE_LETTER_TARGET, *PMOUNTMGR_DRIVE_LETTER_TARGET; - -// -// Output structure for IOCTL_MOUNTMGR_NEXT_DRIVE_LETTER. -// - -typedef struct _MOUNTMGR_DRIVE_LETTER_INFORMATION { - BOOLEAN DriveLetterWasAssigned; - UCHAR CurrentDriveLetter; -} MOUNTMGR_DRIVE_LETTER_INFORMATION, *PMOUNTMGR_DRIVE_LETTER_INFORMATION; - -// -// Input structure for IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED and -// IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_DELETED. -// - -typedef struct _MOUNTMGR_VOLUME_MOUNT_POINT { - USHORT SourceVolumeNameOffset; - USHORT SourceVolumeNameLength; - USHORT TargetVolumeNameOffset; - USHORT TargetVolumeNameLength; -} MOUNTMGR_VOLUME_MOUNT_POINT, *PMOUNTMGR_VOLUME_MOUNT_POINT; - -// -// Input structure for IOCTL_MOUNTMGR_CHANGE_NOTIFY. -// Output structure for IOCTL_MOUNTMGR_CHANGE_NOTIFY. -// - -typedef struct _MOUNTMGR_CHANGE_NOTIFY_INFO { - ULONG EpicNumber; -} MOUNTMGR_CHANGE_NOTIFY_INFO, *PMOUNTMGR_CHANGE_NOTIFY_INFO; - -// -// Input structure for IOCTL_MOUNTMGR_KEEP_LINKS_WHEN_OFFLINE and -// IOCTL_MOUNTMGR_VOLUME_ARRIVAL_NOTIFICATION. -// - -typedef struct _MOUNTMGR_TARGET_NAME { - USHORT DeviceNameLength; - WCHAR DeviceName[1]; -} MOUNTMGR_TARGET_NAME, *PMOUNTMGR_TARGET_NAME; - -// -// The following IOCTL is supported by mounted devices. -// - -#define IOCTL_MOUNTDEV_QUERY_DEVICE_NAME CTL_CODE(MOUNTDEVCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) - -// -// Output structure for IOCTL_MOUNTDEV_QUERY_DEVICE_NAME. -// - -typedef struct _MOUNTDEV_NAME { - USHORT NameLength; - WCHAR Name[1]; -} MOUNTDEV_NAME, *PMOUNTDEV_NAME; - -// -// Devices that wish to be mounted should report this GUID in -// IoRegisterDeviceInterface. -// - -//DEFINE_GUID(MOUNTDEV_MOUNTED_DEVICE_GUID, 0x53f5630d, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); - -#endif - Removed: trunk/reactos/drivers/filesystems/udfs/Include/ntddscsi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/ntddscsi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/ntddscsi.h (removed) @@ -1,235 +0,0 @@ -/*++ BUILD Version: 0001 // Increment this if a change has global effects - -Copyright (c) 1990-1993 Microsoft Corporation - -Module Name: - - ntddscsi.h - -Abstract: - - This is the include file that defines all constants and types for - accessing the SCSI port adapters. - -Author: - - Jeff Havens - -Revision History: - ---*/ - -#ifndef _NTDDSCSIH_ -#define _NTDDSCSIH_ - -#pragma pack(push, 8) - -// -// Device Name - this string is the name of the device. It is the name -// that should be passed to NtOpenFile when accessing the device. -// -// Note: For devices that support multiple units, it should be suffixed -// with the Ascii representation of the unit number. -// - -#define IOCTL_SCSI_BASE FILE_DEVICE_CONTROLLER - -#define DD_SCSI_DEVICE_NAME "\\Device\\ScsiPort" - - -// -// NtDeviceIoControlFile IoControlCode values for this device. -// -// Warning: Remember that the low two bits of the code specify how the -// buffers are passed to the driver! -// - -#define IOCTL_SCSI_PASS_THROUGH CTL_CODE(IOCTL_SCSI_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_SCSI_MINIPORT CTL_CODE(IOCTL_SCSI_BASE, 0x0402, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_SCSI_GET_INQUIRY_DATA CTL_CODE(IOCTL_SCSI_BASE, 0x0403, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SCSI_GET_CAPABILITIES CTL_CODE(IOCTL_SCSI_BASE, 0x0404, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SCSI_PASS_THROUGH_DIRECT CTL_CODE(IOCTL_SCSI_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_SCSI_GET_ADDRESS CTL_CODE(IOCTL_SCSI_BASE, 0x0406, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SCSI_RESCAN_BUS CTL_CODE(IOCTL_SCSI_BASE, 0x0407, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SCSI_GET_DUMP_POINTERS CTL_CODE(IOCTL_SCSI_BASE, 0x0408, METHOD_BUFFERED, FILE_ANY_ACCESS) - -// -// Define the SCSI pass through structure. -// - -typedef struct _SCSI_PASS_THROUGH { - USHORT Length; - UCHAR ScsiStatus; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - UCHAR CdbLength; - UCHAR SenseInfoLength; - UCHAR DataIn; - ULONG DataTransferLength; - ULONG TimeOutValue; - ULONG DataBufferOffset; - ULONG SenseInfoOffset; - UCHAR Cdb[16]; -}SCSI_PASS_THROUGH, *PSCSI_PASS_THROUGH; - -// -// Define the SCSI pass through direct structure. -// - -typedef struct _SCSI_PASS_THROUGH_DIRECT { - USHORT Length; - UCHAR ScsiStatus; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - UCHAR CdbLength; - UCHAR SenseInfoLength; - UCHAR DataIn; - ULONG DataTransferLength; - ULONG TimeOutValue; - PVOID DataBuffer; - ULONG SenseInfoOffset; - UCHAR Cdb[16]; -}SCSI_PASS_THROUGH_DIRECT, *PSCSI_PASS_THROUGH_DIRECT; - -// -// Define SCSI information. -// Used with the IOCTL_SCSI_GET_INQUIRY_DATA IOCTL. -// - -typedef struct _SCSI_BUS_DATA { - UCHAR NumberOfLogicalUnits; - UCHAR InitiatorBusId; - ULONG InquiryDataOffset; -}SCSI_BUS_DATA, *PSCSI_BUS_DATA; - -// -// Define SCSI adapter bus information structure.. -// Used with the IOCTL_SCSI_GET_INQUIRY_DATA IOCTL. -// - -typedef struct _SCSI_ADAPTER_BUS_INFO { - UCHAR NumberOfBuses; - SCSI_BUS_DATA BusData[1]; -} SCSI_ADAPTER_BUS_INFO, *PSCSI_ADAPTER_BUS_INFO; - -// -// Define SCSI adapter bus information. -// Used with the IOCTL_SCSI_GET_INQUIRY_DATA IOCTL. -// - -typedef struct _SCSI_INQUIRY_DATA { - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - BOOLEAN DeviceClaimed; - ULONG InquiryDataLength; - ULONG NextInquiryDataOffset; - UCHAR InquiryData[1]; -}SCSI_INQUIRY_DATA, *PSCSI_INQUIRY_DATA; - -// -// Define header for I/O control SRB. -// - -typedef struct _SRB_IO_CONTROL { - ULONG HeaderLength; - UCHAR Signature[8]; - ULONG Timeout; - ULONG ControlCode; - ULONG ReturnCode; - ULONG Length; -} SRB_IO_CONTROL, *PSRB_IO_CONTROL; - -// -// SCSI port driver capabilities structure. -// - -typedef struct _IO_SCSI_CAPABILITIES { - - // - // Length of this structure - // - - ULONG Length; - - // - // Maximum transfer size in single SRB - // - - ULONG MaximumTransferLength; - - // - // Maximum number of physical pages per data buffer - // - - ULONG MaximumPhysicalPages; - - // - // Async calls from port to class - // - - ULONG SupportedAsynchronousEvents; - - // - // Alignment mask for data transfers. - // - - ULONG AlignmentMask; - - // - // Supports tagged queuing - // - - BOOLEAN TaggedQueuing; - - // - // Host adapter scans down for bios devices. - // - - BOOLEAN AdapterScansDown; - - // - // The host adapter uses programmed I/O. - // - - BOOLEAN AdapterUsesPio; - -} IO_SCSI_CAPABILITIES, *PIO_SCSI_CAPABILITIES; - -typedef struct _SCSI_ADDRESS { - ULONG Length; - UCHAR PortNumber; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; -}SCSI_ADDRESS, *PSCSI_ADDRESS; - -// -// Define structure for returning crash dump pointers. -// - -struct _ADAPTER_OBJECT; - -typedef struct _DUMP_POINTERS { - struct _ADAPTER_OBJECT *AdapterObject; - PVOID MappedRegisterBase; - PVOID PortConfiguration; - PVOID CommonBufferVa; - LARGE_INTEGER CommonBufferPa; - ULONG CommonBufferSize; -} DUMP_POINTERS, *PDUMP_POINTERS; - -// -// Define values for pass-through DataIn field. -// - -#define SCSI_IOCTL_DATA_OUT 0 -#define SCSI_IOCTL_DATA_IN 1 -#define SCSI_IOCTL_DATA_UNSPECIFIED 2 - -#pragma pack(pop) - -#endif -

9 years, 6 months

[akhaldi] 68045: [LAUTUS] These ini files do not seem to be of application/octet-stream type.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 6 15:14:16 2015 New Revision: 68045 URL: http://svn.reactos.org/svn/reactos?rev=68045&view=rev Log: [LAUTUS] These ini files do not seem to be of application/octet-stream type. Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI (contents, props changed) trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI (contents, props changed) trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI (contents, props changed) Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream

9 years, 6 months

[akhaldi] 68044: [HIVECLS] Add the needed registry items for AssocGetPerceivedType. By Mark Jansen. CORE-9754

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 6 14:30:30 2015 New Revision: 68044 URL: http://svn.reactos.org/svn/reactos?rev=68044&view=rev Log: [HIVECLS] Add the needed registry items for AssocGetPerceivedType. By Mark Jansen. CORE-9754 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] Sat Jun 6 14:30:30 2015 @@ -35,7 +35,9 @@ ; Virtual Device Drivers HKCR,".386","",0x00000000,"vxdfile" +HKCR,".386","PerceivedType",0x00000000,"system" HKCR,".vxd","",0x00000000,"vxdfile" +HKCR,".vxd","PerceivedType",0x00000000,"system" HKCR,"vxdfile","",0x00000000,"Virtual Device Driver" HKCR,"vxdfile","NoOpen",0x00000000,"" HKCR,"vxdfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-157" @@ -134,8 +136,10 @@ ; set MIME type for .html and .htm because Tiny webserver needs it HKCR,".htm","",0x00000000,"htmlfile" HKCR,".htm","Content Type",0x00000000,"text/html" +HKCR,".htm","PerceivedType",0x00000000,"text" HKCR,".html","",0x00000000,"htmlfile" HKCR,".html","Content Type",0x00000000,"text/html" +HKCR,".html","PerceivedType",0x00000000,"text" HKCR,"htmlfile","",0x00000000,"HTML File" HKCR,"htmlfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\ieframe.dll,0" HKCR,"htmlfile\shell\open\command","",0x00020000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1" @@ -209,6 +213,11 @@ HKCR,".cpp","",0x00000000,"txtfile" HKCR,".h","",0x00000000,"txtfile" HKCR,".hpp","",0x00000000,"txtfile" +HKCR,".txt","PerceivedType",0x00000000,"text" +HKCR,".c","PerceivedType",0x00000000,"text" +HKCR,".cpp","PerceivedType",0x00000000,"text" +HKCR,".h","PerceivedType",0x00000000,"text" +HKCR,".hpp","PerceivedType",0x00000000,"text" HKCR,".txt\shellnew","",0x00000000,"" HKCR,".txt\shellnew","NullFile",0x00020000,"" HKCR,"txtfile","",0x00000000,"Text Document" @@ -338,6 +347,43 @@ HKCR,"Applications\notepad.exe\shell\open\command","",0x00000002,"notepad.exe %1" HKCR,"Applications\mspaint.exe\shell\open\command","",0x00000002,"mspaint.exe %1" HKCR,"Applications\wordpad.exe\shell\open\command","",0x00000002,"wordpad.exe %1" + +; Misc Perceived types +HKCR,".asm","PerceivedType",0x00000000,"text" +HKCR,".asmx","PerceivedType",0x00000000,"text" +HKCR,".aspx","PerceivedType",0x00000000,"text" +HKCR,".chk","PerceivedType",0x00000000,"system" +HKCR,".css","",0x00000000,"CSSfile" +HKCR,".css","PerceivedType",0x00000000,"text" +HKCR,".cxx","PerceivedType",0x00000000,"text" +HKCR,".def","PerceivedType",0x00000000,"text" +HKCR,".diz","PerceivedType",0x00000000,"text" +HKCR,".gz","PerceivedType",0x00000000,"compressed" +HKCR,".hxx","PerceivedType",0x00000000,"text" +HKCR,".inc","PerceivedType",0x00000000,"text" +HKCR,".java","PerceivedType",0x00000000,"text" +HKCR,".local","PerceivedType",0x00000000,"system" +HKCR,".manifest","PerceivedType",0x00000000,"system" +HKCR,".nvr","PerceivedType",0x00000000,"text" +HKCR,".ocx","",0x00000000,"ocxfile" +HKCR,".ocx","PerceivedType",0x00000000,"system" +HKCR,".php3","PerceivedType",0x00000000,"text" +HKCR,".pl","PerceivedType",0x00000000,"text" +HKCR,".plg","PerceivedType",0x00000000,"text" +HKCR,".ps1xml","PerceivedType",0x00000000,"text" +HKCR,".sed","PerceivedType",0x00000000,"text" +HKCR,".shtml","PerceivedType",0x00000000,"text" +HKCR,".sql","PerceivedType",0x00000000,"text" +HKCR,".tar","PerceivedType",0x00000000,"compressed" +HKCR,".text","PerceivedType",0x00000000,"text" +HKCR,".tgz","PerceivedType",0x00000000,"compressed" +HKCR,".tsv","PerceivedType",0x00000000,"text" +HKCR,".wdp","PerceivedType",0x00000000,"image" +HKCR,".wmz","",0x00000000,"WMZFile" +HKCR,".wmz","PerceivedType",0x00000000,"compressed" +HKCR,".wsz","PerceivedType",0x00000000,"compressed" +HKCR,".x","PerceivedType",0x00000000,"text" +HKCR,".z","PerceivedType",0x00000000,"compressed" ; For language support:

9 years, 6 months

[akhaldi] 68043: [SHLWAPI_WINETEST] Add tests for AssocGetPerceivedType. By Mark Jansen. CORE-9754

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 6 14:27:39 2015 New Revision: 68043 URL: http://svn.reactos.org/svn/reactos?rev=68043&view=rev Log: [SHLWAPI_WINETEST] Add tests for AssocGetPerceivedType. By Mark Jansen. CORE-9754 Modified: trunk/rostests/winetests/shlwapi/assoc.c Modified: trunk/rostests/winetests/shlwapi/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/assoc.c… ============================================================================== --- trunk/rostests/winetests/shlwapi/assoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/assoc.c [iso-8859-1] Sat Jun 6 14:27:39 2015 @@ -28,12 +28,13 @@ #include <shlwapi.h> #include <shlguid.h> -#define expect(expected, got) ok ( expected == got, "Expected %d, got %d\n", expected, got) -#define expect_hr(expected, got) ok ( expected == got, "Expected %08x, got %08x\n", expected, got) +#define expect(expected, got) ok( (expected) == (got), "Expected %d, got %d\n", (expected), (got)) +#define expect_hr(expected, got) ok( (expected) == (got), "Expected %08x, got %08x\n", (expected), (got)) static HRESULT (WINAPI *pAssocQueryStringA)(ASSOCF,ASSOCSTR,LPCSTR,LPCSTR,LPSTR,LPDWORD) = NULL; static HRESULT (WINAPI *pAssocQueryStringW)(ASSOCF,ASSOCSTR,LPCWSTR,LPCWSTR,LPWSTR,LPDWORD) = NULL; static HRESULT (WINAPI *pAssocCreate)(CLSID, REFIID, void **) = NULL; +static HRESULT (WINAPI *pAssocGetPerceivedType)(LPCWSTR, PERCEIVED *, INT *, LPWSTR *) = NULL; /* Every version of Windows with IE should have this association? */ static const WCHAR dotHtml[] = { '.','h','t','m','l',0 }; @@ -309,6 +310,283 @@ } } +/* Based on http://www.geoffchappell.com/studies/windows/shell/shlwapi/api/assocapi/get… */ +struct assoc_test_struct +{ + PCSTR extension; + PERCEIVED perceived; + INT flags; + PCSTR type; + DWORD minversion; + HRESULT hr; +}; + +#define HARDCODED_NATIVE_WMSDK (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_WMSDK) +#define HARDCODED_NATIVE_GDIPLUS (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_GDIPLUS) +#define HARDCODED_NATIVE_ZIPFLDR (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_ZIPFOLDER) +#define SOFTCODED_NATIVESUPPORT (PERCEIVEDFLAG_SOFTCODED | PERCEIVEDFLAG_NATIVESUPPORT) + +static const struct assoc_test_struct assoc_perceived_types[] = +{ + /* builtins */ + { ".aif", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".aifc", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".aiff", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".asf", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".asx", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".au", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".avi", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".bas", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".bat", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".bmp", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".cmd", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".com", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".cpl", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_HARDCODED, "system", 0x600 }, + { ".dib", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".dvr-ms", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".emf", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".exe", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".gif", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".hta", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + /* htm & html are PERCEIVED_TYPE_TEXT, PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_SOFTCODED in w2k3 */ + { ".htm", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_HARDCODED, "document", 0x600 }, + { ".html", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_HARDCODED, "document", 0x600 }, + { ".ico", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".IVF", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".jfif", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".jpe", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".jpeg", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".jpg", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".lnk", PERCEIVED_TYPE_UNSPECIFIED, PERCEIVEDFLAG_HARDCODED, NULL, 0x600, E_FAIL }, + { ".m1v", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".m3u", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".mht", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_HARDCODED, "document", 0x600 }, + { ".mid", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".midi", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".msi", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + /* below win8 this is defined to be video */ + { ".mp2", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio", 0x602 }, + { ".mp2v", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".mp3", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".mpa", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".mpe", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".mpeg", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".mpg", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".mpv2", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".pif", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".png", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".reg", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".rle", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".rmi", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".scr", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".search-ms", PERCEIVED_TYPE_UNSPECIFIED, PERCEIVEDFLAG_HARDCODED, NULL, 0x600, E_FAIL }, + { ".snd", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".tif", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".tiff", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".vb", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".wav", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".wax", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".wm", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".wma", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".wmf", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".wmv", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".wmx", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".wvx", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".zip", PERCEIVED_TYPE_COMPRESSED, HARDCODED_NATIVE_ZIPFLDR, "compressed" }, + /* found in the registry under HKEY_CLASSES_ROOT on a new Win7 VM */ + { ".386", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system" }, + { ".3g2", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".3gp", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".3gp2", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".3gpp", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".AAC", PERCEIVED_TYPE_AUDIO, PERCEIVEDFLAG_SOFTCODED, "audio", 0x601 }, + { ".ADT", PERCEIVED_TYPE_AUDIO, PERCEIVEDFLAG_SOFTCODED, "audio", 0x601 }, + { ".ADTS", PERCEIVED_TYPE_AUDIO, PERCEIVEDFLAG_SOFTCODED, "audio", 0x601 }, + { ".asm", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".asmx", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".aspx", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".c", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".cab", PERCEIVED_TYPE_COMPRESSED, PERCEIVEDFLAG_SOFTCODED, "compressed", 0x600 }, + { ".chk", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system" }, + { ".cpp", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".css", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".cxx", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".def", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".diz", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".docx", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x601 }, + { ".drv", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system", 0x600 }, + { ".gz", PERCEIVED_TYPE_COMPRESSED, PERCEIVEDFLAG_SOFTCODED, "compressed" }, + { ".h", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".hpp", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".hxx", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".inc", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".ini", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text", 0x600 }, + { ".java", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".local", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system" }, + { ".M2T", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".M2TS", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".M2V", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".m4a", PERCEIVED_TYPE_AUDIO, PERCEIVEDFLAG_SOFTCODED, "audio", 0x601 }, + { ".m4b", PERCEIVED_TYPE_AUDIO, PERCEIVEDFLAG_SOFTCODED, "audio", 0x601 }, + { ".m4p", PERCEIVED_TYPE_AUDIO, PERCEIVEDFLAG_SOFTCODED, "audio", 0x601 }, + { ".m4v", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".manifest", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system" }, + { ".MOD", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".mov", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".mp4", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".mp4v", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".MTS", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".nvr", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".ocx", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system" }, + { ".odt", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x601 }, + { ".php3", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".pl", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".plg", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".ps1xml", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "Text" }, + { ".rtf", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".sed", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".shtml", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".sql", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".sys", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system", 0x600 }, + { ".tar", PERCEIVED_TYPE_COMPRESSED, PERCEIVEDFLAG_SOFTCODED, "compressed" }, + { ".text", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".tgz", PERCEIVED_TYPE_COMPRESSED, PERCEIVEDFLAG_SOFTCODED, "compressed" }, + { ".TS", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".tsv", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".TTS", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".txt", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".vob", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".vxd", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system" }, + { ".wdp", PERCEIVED_TYPE_IMAGE, PERCEIVEDFLAG_SOFTCODED, "image" }, + { ".wmz", PERCEIVED_TYPE_COMPRESSED, PERCEIVEDFLAG_SOFTCODED, "compressed" }, + { ".wpl", PERCEIVED_TYPE_AUDIO, PERCEIVEDFLAG_SOFTCODED, "audio", 0x601 }, + { ".wsz", PERCEIVED_TYPE_COMPRESSED, PERCEIVEDFLAG_SOFTCODED, "compressed" }, + { ".x", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".xml", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text", 0x601 }, + { ".xsl", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text", 0x601 }, + { ".z", PERCEIVED_TYPE_COMPRESSED, PERCEIVEDFLAG_SOFTCODED, "compressed" }, + /* found in the registry under HKEY_CLASSES_ROOT\PerceivedType */ + { ".doc", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".dot", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".mhtml", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".pot", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".ppt", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".rtf", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".wri", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".xls", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".xlt", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + +}; + +static void test_assoc_one(const struct assoc_test_struct* test) +{ + LPWSTR extension, type_expected, type_returned; + PERCEIVED perceived; + HRESULT hr; + INT flags; + + /* if SHStrDupA receives a nullptr as input, it will null the output */ + SHStrDupA(test->extension, &extension); + SHStrDupA(test->type, &type_expected); + + perceived = 0xdeadbeef; + flags = 0xdeadbeef; + + hr = pAssocGetPerceivedType(extension, &perceived, &flags, NULL); + expect_hr(type_expected ? S_OK : test->hr, hr); + ok(perceived == test->perceived, "%s: got perceived 0x%x, expected 0x%x\n", + test->extension, perceived, test->perceived); + ok(flags == test->flags, "%s: got flags 0x%x, expected 0x%x\n", + test->extension, flags, test->flags); + + type_returned = (void *)0xdeadbeef; + perceived = 0xdeadbeef; + flags = 0xdeadbeef; + + hr = pAssocGetPerceivedType(extension, &perceived, &flags, &type_returned); + expect_hr(type_expected ? S_OK : test->hr, hr); + ok(perceived == test->perceived, "%s: got perceived 0x%x, expected 0x%x\n", + test->extension, perceived, test->perceived); + ok(flags == test->flags, "%s: got flags 0x%x, expected 0x%x\n", + test->extension, flags, test->flags); + + if (!type_expected) + { + ok(type_returned == (void *)0xdeadbeef || broken(type_returned == NULL) /* Win 8 */, + "%s: got type %p, expected 0xdeadbeef\n", test->extension, type_returned); + } + else if (type_returned == (void *)0xdeadbeef) + { + ok(type_returned != (void *)0xdeadbeef, "%s: got type %p, expected '%s'\n", + test->extension, type_returned, test->type); + } + else + { + ok(StrCmpIW(type_expected, type_returned) == 0, "%s: got type %s, expected '%s'\n", + test->extension, wine_dbgstr_w(type_returned), test->type); + } + + CoTaskMemFree(type_returned); + CoTaskMemFree(extension); + CoTaskMemFree(type_expected); +} + +static void test_assoc_perceived(void) +{ + static const struct assoc_test_struct should_not_exist = + { ".should_not_exist", PERCEIVED_TYPE_UNSPECIFIED, PERCEIVEDFLAG_UNDEFINED, NULL, 0, 0x80070002 }; + static const struct assoc_test_struct htm[] = + { + { ".htm", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text", 0x600 }, + { ".html", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text", 0x600 }, + }; + static const struct assoc_test_struct mp2 = + { ".mp2", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }; + + OSVERSIONINFOEXW osvi; + DWORD version; + size_t i; + + if (!pAssocGetPerceivedType) + { + win_skip("AssocGetPerceivedType() is missing\n"); + return; + } + + memset(&osvi, 0, sizeof(osvi)); + osvi.dwOSVersionInfoSize = sizeof(osvi); + GetVersionExW((LPOSVERSIONINFOW)&osvi); + version = (osvi.dwMajorVersion << 8) | osvi.dwMinorVersion; + + /* invalid entry results in HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) */ + test_assoc_one(&should_not_exist); + + for (i = 0; i < sizeof(assoc_perceived_types) / sizeof(assoc_perceived_types[0]); ++i) + { + if (assoc_perceived_types[i].minversion && assoc_perceived_types[i].minversion > version) + continue; + if (!(assoc_perceived_types[i].flags & PERCEIVEDFLAG_HARDCODED)) + todo_wine test_assoc_one(&assoc_perceived_types[i]); + else + test_assoc_one(&assoc_perceived_types[i]); + } + + /* below Vista */ + if (version < 0x600) + { + todo_wine + test_assoc_one(&htm[0]); + todo_wine + test_assoc_one(&htm[1]); + } + + /* below Win8 */ + if (version < 0x602) + { + test_assoc_one(&mp2); + } +} + START_TEST(assoc) { HMODULE hshlwapi; @@ -316,9 +594,11 @@ pAssocQueryStringA = (void*)GetProcAddress(hshlwapi, "AssocQueryStringA"); pAssocQueryStringW = (void*)GetProcAddress(hshlwapi, "AssocQueryStringW"); pAssocCreate = (void*)GetProcAddress(hshlwapi, "AssocCreate"); + pAssocGetPerceivedType = (void*)GetProcAddress(hshlwapi, "AssocGetPerceivedType"); test_getstring_bad(); test_getstring_basic(); test_getstring_no_extra(); test_assoc_create(); + test_assoc_perceived(); }

9 years, 6 months

[akhaldi] 68042: [SHLWAPI] Implement AssocGetPerceivedType. By Mark Jansen. CORE-9754

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 6 14:23:05 2015 New Revision: 68042 URL: http://svn.reactos.org/svn/reactos?rev=68042&view=rev Log: [SHLWAPI] Implement AssocGetPerceivedType. By Mark Jansen. CORE-9754 Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt trunk/reactos/dll/win32/shlwapi/assoc.c Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Sat Jun 6 14:23:05 2015 @@ -1,5 +1,8 @@ project(SHELL) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) add_definitions( -D__WINESRC__ Modified: trunk/reactos/dll/win32/shlwapi/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/assoc.c?… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/assoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/assoc.c [iso-8859-1] Sat Jun 6 14:23:05 2015 @@ -89,6 +89,172 @@ return SHCoCreateInstance( NULL, &clsid, NULL, refiid, lpInterface ); } +struct AssocPerceivedInfo +{ + PCWSTR Type; + PERCEIVED Perceived; + INT FlagHardcoded; + INT FlagSoftcoded; + PCWSTR Extensions; +}; + +static const WCHAR unspecified_exts[] = { + '.','l','n','k',0, + '.','s','e','a','r','c','h','-','m','s',0, + 0 +}; + +static const WCHAR image_exts[] = { + '.','b','m','p',0, + '.','d','i','b',0, + '.','e','m','f',0, + '.','g','i','f',0, + '.','i','c','o',0, + '.','j','f','i','f',0, + '.','j','p','e',0, + '.','j','p','e','g',0, + '.','j','p','g',0, + '.','p','n','g',0, + '.','r','l','e',0, + '.','t','i','f',0, + '.','t','i','f','f',0, + '.','w','m','f',0, + 0 +}; + +static const WCHAR audio_exts[] = { + '.','a','i','f',0, + '.','a','i','f','c',0, + '.','a','i','f','f',0, + '.','a','u',0, + '.','m','3','u',0, + '.','m','i','d',0, + '.','m','i','d','i',0, +#if _WIN32_WINNT > 0x602 + '.','m','p','2',0, +#endif + '.','m','p','3',0, + '.','r','m','i',0, + '.','s','n','d',0, + '.','w','a','v',0, + '.','w','a','x',0, + '.','w','m','a',0, + 0 +}; + +static const WCHAR video_exts[] = { + '.','a','s','f',0, + '.','a','s','x',0, + '.','a','v','i',0, + '.','d','v','r','-','m','s',0, + '.','I','V','F',0, + '.','m','1','v',0, +#if _WIN32_WINNT <= 0x602 + '.','m','p','2',0, +#endif + '.','m','p','2','v',0, + '.','m','p','a',0, + '.','m','p','e',0, + '.','m','p','e','g',0, + '.','m','p','g',0, + '.','m','p','v','2',0, + '.','w','m',0, + '.','w','m','v',0, + '.','w','m','x',0, + '.','w','v','x',0, + 0 +}; + +static const WCHAR compressed_exts[] = { + '.','z','i','p',0, + 0 +}; + +static const WCHAR document_exts[] = { +#if _WIN32_WINNT >= 0x600 + '.','h','t','m',0, + '.','h','t','m','l',0, +#endif + '.','m','h','t',0, + 0 +}; + +static const WCHAR system_exts[] = { + '.','c','p','l',0, + 0 +}; + +static const WCHAR application_exts[] = { + '.','b','a','s',0, + '.','b','a','t',0, + '.','c','m','d',0, + '.','c','o','m',0, + '.','e','x','e',0, + '.','h','t','a',0, + '.','m','s','i',0, + '.','p','i','f',0, + '.','r','e','g',0, + '.','s','c','r',0, + '.','v','b',0, + 0 +}; + +const WCHAR type_text[] = {'t','e','x','t',0}; +const WCHAR type_image[] = {'i','m','a','g','e',0}; +const WCHAR type_audio[] = {'a','u','d','i','o',0}; +const WCHAR type_video[] = {'v','i','d','e','o',0}; +const WCHAR type_compressed[] = {'c','o','m','p','r','e','s','s','e','d',0}; +const WCHAR type_document[] = {'d','o','c','u','m','e','n','t',0}; +const WCHAR type_system[] = {'s','y','s','t','e','m',0}; +const WCHAR type_application[] = {'a','p','p','l','i','c','a','t','i','o','n',0}; + +#define HARDCODED_NATIVE_WMSDK (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_WMSDK) +#define HARDCODED_NATIVE_GDIPLUS (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_GDIPLUS) +#define HARDCODED_NATIVE_ZIPFLDR (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_ZIPFOLDER) +#define SOFTCODED_NATIVESUPPORT (PERCEIVEDFLAG_SOFTCODED | PERCEIVEDFLAG_NATIVESUPPORT) + +static const struct AssocPerceivedInfo known_types[] = { + { NULL, PERCEIVED_TYPE_UNSPECIFIED, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, unspecified_exts }, + { type_text, PERCEIVED_TYPE_TEXT, PERCEIVEDFLAG_HARDCODED, SOFTCODED_NATIVESUPPORT, NULL }, + { type_image, PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, PERCEIVEDFLAG_SOFTCODED, image_exts }, + { type_audio, PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, PERCEIVEDFLAG_SOFTCODED, audio_exts }, + { type_video, PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, PERCEIVEDFLAG_SOFTCODED, video_exts }, + { type_compressed, PERCEIVED_TYPE_COMPRESSED, HARDCODED_NATIVE_ZIPFLDR, PERCEIVEDFLAG_SOFTCODED, compressed_exts }, + { type_document, PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, document_exts }, + { type_system, PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, system_exts }, + { type_application, PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, application_exts }, +}; + +static const struct AssocPerceivedInfo* AssocFindByBuiltinExtension(LPCWSTR pszExt) +{ + UINT n; + for (n = 0; n < sizeof(known_types) / sizeof(known_types[0]); ++n) + { + PCWSTR Ext = known_types[n].Extensions; + while (Ext && *Ext) + { + if (!StrCmpIW(Ext, pszExt)) + return &known_types[n]; + Ext += (strlenW(Ext) + 1); + } + } + return NULL; +} + +static const struct AssocPerceivedInfo* AssocFindByType(LPCWSTR pszType) +{ + UINT n; + for (n = 0; n < sizeof(known_types) / sizeof(known_types[0]); ++n) + { + if (known_types[n].Type) + { + if (!StrCmpIW(known_types[n].Type, pszType)) + return &known_types[n]; + } + } + return NULL; +} + /************************************************************************* * AssocGetPerceivedType [SHLWAPI.@] * @@ -110,19 +276,64 @@ * lppszType is optional and it can be NULL. * if lpType or lpFlag are NULL, the function will crash. * if lpszExt is NULL, an error is returned. - * - * BUGS - * Unimplemented. */ HRESULT WINAPI AssocGetPerceivedType(LPCWSTR lpszExt, PERCEIVED *lpType, INT *lpFlag, LPWSTR *lppszType) { - FIXME("(%s, %p, %p, %p) not supported\n", debugstr_w(lpszExt), lpType, lpFlag, lppszType); - - if (lpszExt == NULL) + static const WCHAR PerceivedTypeKey[] = {'P','e','r','c','e','i','v','e','d','T','y','p','e',0}; + static const WCHAR SystemFileAssociationsKey[] = {'S','y','s','t','e','m','F','i','l','e', + 'A','s','s','o','c','i','a','t','i','o','n','s','\\','%','s',0}; + const struct AssocPerceivedInfo *Info; + + TRACE("(%s,%p,%p,%p)\n", debugstr_w(lpszExt), lpType, lpFlag, lppszType); + + Info = AssocFindByBuiltinExtension(lpszExt); + if (Info) + { + *lpType = Info->Perceived; + *lpFlag = Info->FlagHardcoded; + } + else + { + WCHAR Buffer[100] = { 0 }; + DWORD Size = sizeof(Buffer); + if (RegGetValueW(HKEY_CLASSES_ROOT, lpszExt, PerceivedTypeKey, + RRF_RT_REG_SZ, NULL, Buffer, &Size) == ERROR_SUCCESS) + { + Info = AssocFindByType(Buffer); + } + if (!Info) + { + WCHAR KeyName[MAX_PATH] = { 0 }; + snprintfW(KeyName, MAX_PATH, SystemFileAssociationsKey, lpszExt); + Size = sizeof(Buffer); + if (RegGetValueW(HKEY_CLASSES_ROOT, KeyName, PerceivedTypeKey, + RRF_RT_REG_SZ, NULL, Buffer, &Size) == ERROR_SUCCESS) + { + Info = AssocFindByType(Buffer); + } + } + if (Info) + { + *lpType = Info->Perceived; + *lpFlag = Info->FlagSoftcoded; + } + } + + if (Info) + { + if (lppszType && Info->Type) + { + return SHStrDupW(Info->Type, lppszType); + } + return Info->Type ? S_OK : E_FAIL; + } + else + { + *lpType = PERCEIVED_TYPE_UNSPECIFIED; + *lpFlag = 0; + } return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - - return E_NOTIMPL; } /*************************************************************************

9 years, 6 months

[akhaldi] 68041: [UDFS] Enable the GCC build now. CORE-9774

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 6 14:05:59 2015 New Revision: 68041 URL: http://svn.reactos.org/svn/reactos?rev=68041&view=rev Log: [UDFS] Enable the GCC build now. CORE-9774 Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/CMakeL… ============================================================================== --- trunk/reactos/drivers/filesystems/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/CMakeLists.txt [iso-8859-1] Sat Jun 6 14:05:59 2015 @@ -8,7 +8,4 @@ add_subdirectory(mup) add_subdirectory(npfs) add_subdirectory(ntfs) -if(MSVC) - # FIXME: Make sure this compiles with the *nix builder before enabling it - add_subdirectory(udfs) -endif() +add_subdirectory(udfs)

9 years, 6 months

[akhaldi] 68040: [UDFS] Fix includes. CORE-9774

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 6 13:48:19 2015 New Revision: 68040 URL: http://svn.reactos.org/svn/reactos?rev=68040&view=rev Log: [UDFS] Fix includes. CORE-9774 Modified: trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt trunk/reactos/drivers/filesystems/udfs/devcntrl.cpp trunk/reactos/drivers/filesystems/udfs/mem.cpp trunk/reactos/drivers/filesystems/udfs/mem.h trunk/reactos/drivers/filesystems/udfs/misc.cpp trunk/reactos/drivers/filesystems/udfs/ntifs_ex.h trunk/reactos/drivers/filesystems/udfs/protos.h trunk/reactos/drivers/filesystems/udfs/struct.h trunk/reactos/drivers/filesystems/udfs/sys_spec.cpp trunk/reactos/drivers/filesystems/udfs/sys_spec.h trunk/reactos/drivers/filesystems/udfs/udf_info/physical.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/udf.h trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.h trunk/reactos/drivers/filesystems/udfs/udf_info/udf_rel.h trunk/reactos/drivers/filesystems/udfs/udffs.h trunk/reactos/drivers/filesystems/udfs/wcache.cpp trunk/reactos/drivers/filesystems/udfs/wcache.h Modified: trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -1,5 +1,5 @@ -include_directories(include) +include_directories(Include) set_cpp(WITH_RUNTIME) Modified: trunk/reactos/drivers/filesystems/udfs/devcntrl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/devcntrl.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/devcntrl.cpp [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -15,10 +15,10 @@ #include "udffs.h" -#include "..\CDRW\scsi_port.h" +#include "CDRW/scsi_port.h" #ifdef EVALUATION_TIME_LIMIT -#include "..\Include\protect.h" +#include "Include/protect.h" #endif //EVALUATION_TIME_LIMIT #define UDF_CURRENT_BUILD 123456789 Modified: trunk/reactos/drivers/filesystems/udfs/mem.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/mem.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/mem.cpp [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -7,4 +7,4 @@ // define the file specific bug-check id #define UDF_BUG_CHECK_ID UDF_FILE_MEM -#include "..\Include\Mem_tools.cpp" +#include "Include/mem_tools.cpp" Modified: trunk/reactos/drivers/filesystems/udfs/mem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/mem.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/mem.h [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -18,6 +18,6 @@ //#define MY_USE_INTERNAL_MEMMANAGER //#include "udffs.h" -#include "..\Include\Mem_tools.h" +#include "Include/mem_tools.h" #endif // __MY_MEM_H__ Modified: trunk/reactos/drivers/filesystems/udfs/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/misc.cpp [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -2591,5 +2591,6 @@ return ErrorInfo->Status; } -#include "..\include\misc_common.cpp" -#include "..\include\regtools.cpp" +#include "Include/misc_common.cpp" +#include "Include/regtools.cpp" + Modified: trunk/reactos/drivers/filesystems/udfs/ntifs_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/ntifs_ex.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/ntifs_ex.h [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -454,6 +454,6 @@ IN ULONG EventCode ); -#include "Include\ntddk_ex.h" +#include "Include/ntddk_ex.h" #endif //__NTIFS_EX_H__ Modified: trunk/reactos/drivers/filesystems/udfs/protos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/p… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/protos.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/protos.h [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -714,7 +714,7 @@ * Prototypes for the file NameSup.cpp *************************************************************************/ -#include "NameSup.h" +#include "namesup.h" /************************************************************************* * Prototypes for the file Udf_info\physical.cpp Modified: trunk/reactos/drivers/filesystems/udfs/struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/struct.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/struct.h [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -24,7 +24,7 @@ some useful definitions **************************************************************************/ -#include "..\Include\platform.h" +#include "Include/platform.h" /************************************************************************** some empty typedefs defined here so we can reference them easily @@ -48,7 +48,7 @@ /************************************************************************** include udf related structures *here* (because we need definition of Fcb) **************************************************************************/ -#include "udf_info\udf_rel.h" +#include "udf_info/udf_rel.h" /************************************************************************** each structure has a unique "node type" or signature associated with it @@ -329,7 +329,7 @@ #define _BROWSE_UDF_ // Common UDF-related definitions -#include "..\Include\udf_common.h" +#include "Include/udf_common.h" // One for root #define UDF_RESIDUAL_REFERENCE (2) Modified: trunk/reactos/drivers/filesystems/udfs/sys_spec.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/sys_spec.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/sys_spec.cpp [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -19,6 +19,6 @@ // define the file specific bug-check id #define UDF_BUG_CHECK_ID UDF_FILE_SYS_SPEC -#include "..\Include\Sys_spec_lib.cpp" +#include "Include/Sys_spec_lib.cpp" -//#include "..\Include\tools.cpp" +//#include "Include/tools.cpp" Modified: trunk/reactos/drivers/filesystems/udfs/sys_spec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/sys_spec.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/sys_spec.h [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -19,6 +19,6 @@ #ifndef _UDF_SYS_SPEC_H_ #define _UDF_SYS_SPEC_H_ -#include "..\Include\Sys_spec_lib.h" +#include "Include/Sys_spec_lib.h" #endif // _UDF_SYS_SPEC_H_ Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/physical.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/physical.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/physical.cpp [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -16,5 +16,5 @@ // define the file specific bug-check id #define UDF_BUG_CHECK_ID UDF_FILE_PHYSICAL -#include "..\Include\Phys_lib.cpp" +#include "Include/phys_lib.cpp" Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/udf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/udf.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/udf.h [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -3,6 +3,6 @@ // All rights reserved //////////////////////////////////////////////////////////////////// -#include "Include\platform.h" +#include "Include/platform.h" #include "udffs.h" -#include "NameSup.h" +#include "namesup.h" Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/udf_info.h [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -6,10 +6,10 @@ #ifndef __UDF_STRUCT_SUPPORT_H__ #define __UDF_STRUCT_SUPPORT_H__ -#include "Ecma_167.h" +#include "ecma_167.h" #include "osta_misc.h" #include "udf_rel.h" -#include "..\wcache.h" +#include "wcache.h" // memory re-allocation (returns new buffer size) uint32 UDFMemRealloc(IN int8* OldBuff, // old buffer Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/udf_rel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/udf_rel.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/udf_rel.h [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -19,8 +19,8 @@ #ifndef _UDF_REL_H_ #define _UDF_REL_H_ -#include "Include\platform.h" -#include "Ecma_167.h" +#include "Include/platform.h" +#include "ecma_167.h" #ifdef UDF_LIMIT_DIR_SIZE typedef uint8 uint_di; Modified: trunk/reactos/drivers/filesystems/udfs/udffs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udffs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udffs.h [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -121,7 +121,7 @@ #include <pseh/pseh2.h> -#include "..\Include\check_env.h" +#include "Include/check_env.h" #define PEXTENDED_IO_STACK_LOCATION PIO_STACK_LOCATION @@ -138,7 +138,7 @@ #ifndef _CONSOLE #include "ntdddisk.h" #include <devioctl.h> -#include "..\include\crossnt\crossnt.h" +#include "Include/CrossNt/CrossNt.h" #endif //_CONSOLE #include <stddef.h> @@ -147,13 +147,13 @@ //#include "ecma_167.h" //#include "osta_misc.h" #include "wcache.h" -#include "..\CDRW\cdrw_usr.h" - -#include "..\Include\regtools.h" +#include "CDRW/cdrw_usr.h" + +#include "Include/regtools.h" #ifdef _CONSOLE -#include "udf_info\udf_rel.h" -#include "..\include\udf_common.h" +#include "udf_info/udf_rel.h" +#include "Include/udf_common.h" #else #include "struct.h" #endif //_CONSOLE @@ -163,28 +163,28 @@ #ifndef _CONSOLE #include "env_spec.h" -#include "DLDetect.h" -#include "Udf_dbg.h" +#include "dldetect.h" +#include "udf_dbg.h" #else -#include "..\include\env_spec_w32.h" +#include "Include/env_spec_w32.h" #endif //_CONSOLE #include "sys_spec.h" -#include "Udf_info\Udf_info.h" +#include "udf_info/udf_info.h" #ifndef _CONSOLE #include "protos.h" #endif //_CONSOLE -#include "..\Include\phys_lib.h" +#include "Include/phys_lib.h" #include "errmsg.h" -//#include "..\Include\tools.h" -#include "Include\protect.h" +//#include "Include/tools.h" +#include "Include/protect.h" #include "udfpubl.h" //#include "ntifs.h" #include "mem.h" -#include "..\Include\key_lib.h" +#include "Include/key_lib.h" extern CCHAR DefLetter[]; @@ -376,7 +376,7 @@ //Device names -#include "../Include/udf_reg.h" +#include "Include/udf_reg.h" #include <ddk/mountmgr.h> Modified: trunk/reactos/drivers/filesystems/udfs/wcache.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/w… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/wcache.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/wcache.cpp [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -7,4 +7,4 @@ // define the file specific bug-check id #define UDF_BUG_CHECK_ID UDF_FILE_WCACHE -#include "..\Include\Wcache_lib.cpp" +#include "Include/wcache_lib.cpp" Modified: trunk/reactos/drivers/filesystems/udfs/wcache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/w… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/wcache.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/wcache.h [iso-8859-1] Sat Jun 6 13:48:19 2015 @@ -6,6 +6,6 @@ #ifndef __CDRW_WCACHE_H__ #define __CDRW_WCACHE_H__ -#include "..\Include\Wcache_lib.h" +#include "Include/wcache_lib.h" #endif // __CDRW_WCACHE_H__

9 years, 6 months

[hbelusca] 68039: [NTVDM]: Update the character height value in the BDA each time we set up a different graphics font. Also, update the ScreenRows variable accordingly (taken from dosbox).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 6 13:21:25 2015 New Revision: 68039 URL: http://svn.reactos.org/svn/reactos?rev=68039&view=rev Log: [NTVDM]: Update the character height value in the BDA each time we set up a different graphics font. Also, update the ScreenRows variable accordingly (taken from dosbox). Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Sat Jun 6 13:21:25 2015 @@ -3068,6 +3068,8 @@ { switch (getAL()) { + // FIXME: At the moment we support only graphics-mode functions! + /* Set User 8x8 Graphics Chars (Setup INT 1Fh Vector) */ case 0x20: { @@ -3077,11 +3079,56 @@ break; } + /* Set User Graphics Characters */ + case 0x21: + { + // /* Write the font to the VGA font plane */ + // VgaWriteFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); + + /* Update the BIOS INT 43h vector */ + ((PULONG)BaseAddress)[0x43] = MAKELONG(getBP(), getES()); + + /* Update BDA */ + Bda->CharacterHeight = getCX(); + switch (getBL()) + { + case 0x00: Bda->ScreenRows = getDL()-1; break; + case 0x01: Bda->ScreenRows = 13; break; + case 0x03: Bda->ScreenRows = 42; break; + case 0x02: + default : Bda->ScreenRows = 24; break; + } + + break; + } + + /* Setup ROM 8x14 Font for Graphics Mode */ + case 0x22: + { + /* Write the default font to the VGA font plane */ + VgaWriteFont(0, Font8x14, ARRAYSIZE(Font8x14) / VGA_FONT_CHARACTERS); + + /* Update the BIOS INT 43h vector */ + // Far pointer to the 8x14 characters 00h-... + ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x14_OFFSET, VIDEO_BIOS_DATA_SEG); + + /* Update BDA */ + Bda->CharacterHeight = 14; + switch (getBL()) + { + case 0x00: Bda->ScreenRows = getDL()-1; break; + case 0x01: Bda->ScreenRows = 13; break; + case 0x03: Bda->ScreenRows = 42; break; + case 0x02: + default : Bda->ScreenRows = 24; break; + } + + break; + } + /* Setup ROM 8x8 Font for Graphics Mode */ case 0x23: { - // FIXME: Use BL and DL for the number of screen rows - /* Write the default font to the VGA font plane */ VgaWriteFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); @@ -3089,20 +3136,40 @@ // Far pointer to the 8x8 characters 00h-... ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x8_OFFSET, VIDEO_BIOS_DATA_SEG); + /* Update BDA */ + Bda->CharacterHeight = 8; + switch (getBL()) + { + case 0x00: Bda->ScreenRows = getDL()-1; break; + case 0x01: Bda->ScreenRows = 13; break; + case 0x03: Bda->ScreenRows = 42; break; + case 0x02: + default : Bda->ScreenRows = 24; break; + } + break; } /* Setup ROM 8x16 Font for Graphics Mode */ case 0x24: { - // FIXME: Use BL and DL for the number of screen rows - /* Write the default font to the VGA font plane */ VgaWriteFont(0, Font8x16, ARRAYSIZE(Font8x16) / VGA_FONT_CHARACTERS); /* Update the BIOS INT 43h vector */ // Far pointer to the 8x16 characters 00h-... ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x16_OFFSET, VIDEO_BIOS_DATA_SEG); + + /* Update BDA */ + Bda->CharacterHeight = 16; + switch (getBL()) + { + case 0x00: Bda->ScreenRows = getDL()-1; break; + case 0x01: Bda->ScreenRows = 13; break; + case 0x03: Bda->ScreenRows = 42; break; + case 0x02: + default : Bda->ScreenRows = 24; break; + } break; }

9 years, 6 months

[akhaldi] 68038: [UDFS] Fix an include. CORE-9774

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 6 13:07:21 2015 New Revision: 68038 URL: http://svn.reactos.org/svn/reactos?rev=68038&view=rev Log: [UDFS] Fix an include. CORE-9774 Modified: trunk/reactos/drivers/filesystems/udfs/ntifs_ex.h Modified: trunk/reactos/drivers/filesystems/udfs/ntifs_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/ntifs_ex.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/ntifs_ex.h [iso-8859-1] Sat Jun 6 13:07:21 2015 @@ -454,6 +454,6 @@ IN ULONG EventCode ); -#include "..\Include\ntddk_ex.h" +#include "Include\ntddk_ex.h" #endif //__NTIFS_EX_H__

9 years, 6 months

← Newer
1
...
26
27
28
29
30
31
32
...
35
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 June 2015