Ros-diffs March 2016

ros-diffs@reactos.org

13 participants
263 discussions

[hbelusca] 70837: [USETUP] - bootsup.c/.h, usetup.c: Save the old MBR sector in the system partition (this makes easier to restore the old one). - fslist.c/.h, usetup.h: Fix header inclusion order....
by hbelusca＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: hbelusca Date: Tue Mar 1 15:00:56 2016 New Revision: 70837 URL: http://svn.reactos.org/svn/reactos?rev=70837&view=rev Log: [USETUP] - bootsup.c/.h, usetup.c: Save the old MBR sector in the system partition (this makes easier to restore the old one). - fslist.c/.h, usetup.h: Fix header inclusion order. - partlist.c/.h, usetup.c: On BIOS-PC architectures, the system partition can be formatted in any FS as long as it is the active partition (on the contrary, on architectures where such system partition is required, it is formatted in FAT). We currently do not have write support for all FSes out there (apart for FAT until now), so do a "clever" "trick" to work around this problem: on initialized disks, find the active partition and check its FS. If we support write access to this FS then we're OK, otherwise we change the (active) system partition for the one on which we are going to install ReactOS (which is, by construction, formatted with a FS on which we support write access). The MBR (resp. the VBR) of the disk (resp. of the system partition) are always saved into files, making easy for people to boot on them (using FreeLdr) or restoring them. CORE-10898 Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/bootsup.h trunk/reactos/base/setup/usetup/fslist.c trunk/reactos/base/setup/usetup/fslist.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -626,7 +626,6 @@ return STATUS_SUCCESS; } -static BOOLEAN IsThereAValidBootSector(PWSTR RootPath) { @@ -695,9 +694,8 @@ return (Instruction != 0x00000000); } -static NTSTATUS -SaveCurrentBootSector( +SaveBootSector( PWSTR RootPath, PWSTR DstPath, ULONG Length) @@ -1210,7 +1208,7 @@ NULL, &IoStatusBlock, OrigBootSector, - SECTORSIZE, + sizeof(PARTITION_SECTOR), &FileOffset, NULL); NtClose(FileHandle); @@ -1306,7 +1304,7 @@ NULL, &IoStatusBlock, NewBootSector, - SECTORSIZE, + sizeof(PARTITION_SECTOR), &FileOffset, NULL); NtClose(FileHandle); @@ -2447,10 +2445,10 @@ wcscat(DstPath, BootSectorFileName); DPRINT1("Save bootsector: %S ==> %S\n", SystemRootPath->Buffer, DstPath); - Status = SaveCurrentBootSector(SystemRootPath->Buffer, DstPath, SECTORSIZE); + Status = SaveBootSector(SystemRootPath->Buffer, DstPath, SECTORSIZE); if (!NT_SUCCESS(Status)) { - DPRINT1("SaveCurrentBootSector() failed (Status %lx)\n", Status); + DPRINT1("SaveBootSector() failed (Status %lx)\n", Status); return Status; } } @@ -2582,10 +2580,10 @@ wcscat(DstPath, L"\\bootsect.old"); DPRINT1("Save bootsector: %S ==> %S\n", SystemRootPath->Buffer, DstPath); - Status = SaveCurrentBootSector(SystemRootPath->Buffer, DstPath, sizeof(EXT2_BOOTSECTOR)); + Status = SaveBootSector(SystemRootPath->Buffer, DstPath, sizeof(EXT2_BOOTSECTOR)); if (!NT_SUCCESS(Status)) { - DPRINT1("SaveCurrentBootSector() failed (Status %lx)\n", Status); + DPRINT1("SaveBootSector() failed (Status %lx)\n", Status); return Status; } } Modified: trunk/reactos/base/setup/usetup/bootsup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -26,6 +26,15 @@ #pragma once +BOOLEAN +IsThereAValidBootSector(PWSTR RootPath); + +NTSTATUS +SaveBootSector( + PWSTR RootPath, + PWSTR DstPath, + ULONG Length); + NTSTATUS InstallMbrBootCodeToDisk( PWSTR SrcPath, Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -91,7 +91,7 @@ PFILE_SYSTEM_ITEM GetFileSystem( IN PFILE_SYSTEM_LIST FileSystemList, - IN PPARTENTRY PartEntry) + IN struct _PARTENTRY* PartEntry) { PFILE_SYSTEM_ITEM CurrentFileSystem; LPWSTR FileSystemName = NULL; @@ -101,6 +101,8 @@ /* We have a file system, return it */ if (CurrentFileSystem != NULL && CurrentFileSystem->FileSystemName != NULL) return CurrentFileSystem; + + DPRINT1("File system not found, try to guess one...\n"); CurrentFileSystem = NULL; @@ -121,9 +123,9 @@ */ if ((PartEntry->PartitionType == PARTITION_FAT_12) || (PartEntry->PartitionType == PARTITION_FAT_16) || - (PartEntry->PartitionType == PARTITION_HUGE) || + (PartEntry->PartitionType == PARTITION_HUGE ) || (PartEntry->PartitionType == PARTITION_XINT13) || - (PartEntry->PartitionType == PARTITION_FAT32) || + (PartEntry->PartitionType == PARTITION_FAT32 ) || (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) { FileSystemName = L"FAT"; @@ -139,9 +141,9 @@ FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */ } - // WARNING: We cannot write on this FS yet! + // HACK: WARNING: We cannot write on this FS yet! if (PartEntry->PartitionType == PARTITION_EXT2 || PartEntry->PartitionType == PARTITION_IFS) - DPRINT1("Recognized FileSystem %S that doesn't support write support yet!\n", FileSystemName); + DPRINT1("Recognized file system %S that doesn't support write support yet!\n", FileSystemName); DPRINT1("GetFileSystem -- PartitionType: 0x%02X ; FileSystemName (guessed): %S\n", PartEntry->PartitionType, FileSystemName); Modified: trunk/reactos/base/setup/usetup/fslist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.h… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.h [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -57,10 +57,11 @@ IN PFILE_SYSTEM_LIST List, IN LPWSTR FileSystemName); +struct _PARTENTRY; // Defined in partlist.h PFILE_SYSTEM_ITEM GetFileSystem( IN PFILE_SYSTEM_LIST FileSystemList, - IN PPARTENTRY PartEntry); + IN struct _PARTENTRY* PartEntry); PFILE_SYSTEM_LIST CreateFileSystemList( Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -1731,8 +1731,11 @@ return SELECT_PARTITION_PAGE; } - if (PartitionList->CurrentPartition->BootIndicator) + if (PartitionList->CurrentPartition->BootIndicator || + PartitionList->CurrentPartition == PartitionList->SystemPartition) + { return CONFIRM_DELETE_SYSTEM_PARTITION_PAGE; + } return DELETE_PARTITION_PAGE; } @@ -2553,8 +2556,21 @@ return QUIT_PAGE; } + /*** HACK! ***/ + if (FileSystemList == NULL) + { + FileSystemList = CreateFileSystemList(6, 26, PartitionList->CurrentPartition->New, L"FAT"); + if (FileSystemList == NULL) + { + /* FIXME: show an error dialog */ + return QUIT_PAGE; + } + + /* FIXME: Add file systems to list */ + } + /* Find or set the active system partition */ - CheckActiveSystemPartition(PartitionList); + CheckActiveSystemPartition(PartitionList, FileSystemList); if (PartitionList->SystemDisk == NULL || PartitionList->SystemPartition == NULL) @@ -4130,7 +4146,7 @@ PartitionList->SystemDisk->DiskNumber, PartitionList->SystemPartition->PartitionNumber); RtlCreateUnicodeString(&SystemRootPath, PathBuffer); - DPRINT("SystemRootPath: %wZ\n", &SystemRootPath); + DPRINT1("SystemRootPath: %wZ\n", &SystemRootPath); PartitionType = PartitionList->SystemPartition->PartitionType; @@ -4382,6 +4398,7 @@ NTSTATUS Status; WCHAR DestinationDevicePathBuffer[MAX_PATH]; WCHAR SourceMbrPathBuffer[MAX_PATH]; + WCHAR DstPath[MAX_PATH]; /* Step 1: Write the VBR */ PartitionType = PartitionList->SystemPartition->PartitionType; @@ -4404,8 +4421,23 @@ wcscpy(SourceMbrPathBuffer, SourceRootPath.Buffer); wcscat(SourceMbrPathBuffer, L"\\loader\\dosmbr.bin"); - DPRINT("Install MBR bootcode: %S ==> %S\n", + DPRINT1("Install MBR bootcode: %S ==> %S\n", SourceMbrPathBuffer, DestinationDevicePathBuffer); + + if (IsThereAValidBootSector(DestinationDevicePathBuffer)) + { + /* Save current MBR */ + wcscpy(DstPath, SystemRootPath.Buffer); + wcscat(DstPath, L"\\mbr.old"); + + DPRINT1("Save MBR: %S ==> %S\n", DestinationDevicePathBuffer, DstPath); + Status = SaveBootSector(DestinationDevicePathBuffer, DstPath, sizeof(PARTITION_SECTOR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SaveBootSector() failed (Status %lx)\n", Status); + // Don't care if we succeeded or not saving the old MBR, just go ahead. + } + } Status = InstallMbrBootCodeToDisk(SourceMbrPathBuffer, DestinationDevicePathBuffer); Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -1430,6 +1430,8 @@ List->SystemDisk = NULL; List->SystemPartition = NULL; + List->OriginalSystemDisk = NULL; + List->OriginalSystemPartition = NULL; List->TempDisk = NULL; List->TempPartition = NULL; @@ -3111,28 +3113,25 @@ VOID CheckActiveSystemPartition( - PPARTLIST List) + IN PPARTLIST List, + IN PFILE_SYSTEM_LIST FileSystemList /* Needed for checking the FS of the candidate system partition */ + ) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; PLIST_ENTRY ListEntry; + PFILE_SYSTEM_ITEM FileSystem; + /* Check for empty disk list */ if (IsListEmpty(&List->DiskListHead)) { List->SystemDisk = NULL; List->SystemPartition = NULL; + List->OriginalSystemDisk = NULL; + List->OriginalSystemPartition = NULL; return; } - -#if 0 - if (List->SystemDisk != NULL && - List->SystemPartition != NULL) - { - /* We already have an active system partition */ - return; - } -#endif /* Choose the currently selected disk */ DiskEntry = List->CurrentDisk; @@ -3142,64 +3141,226 @@ { List->SystemDisk = NULL; List->SystemPartition = NULL; + List->OriginalSystemDisk = NULL; + List->OriginalSystemPartition = NULL; return; } - /* - * Check the first partition of the disk in case it is fresh new, - * and if so, use it as the system partition. - */ - + if (List->SystemDisk != NULL && List->SystemPartition != NULL) + { + /* We already have an active system partition */ + DPRINT1("Use the current system partition %lu in disk %lu, drive letter %c\n", + List->SystemPartition->PartitionNumber, + List->SystemDisk->DiskNumber, + (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + return; + } + + DPRINT1("We are here (1)!\n"); + + List->SystemDisk = NULL; + List->SystemPartition = NULL; + List->OriginalSystemDisk = NULL; + List->OriginalSystemPartition = NULL; + + /* Retrieve the first partition of the disk */ PartEntry = CONTAINING_RECORD(DiskEntry->PrimaryPartListHead.Flink, PARTENTRY, ListEntry); - - /* Set active system partition */ - if ((DiskEntry->NewDisk == TRUE) || - (PartEntry->BootIndicator == FALSE)) - { - PartEntry->BootIndicator = TRUE; - DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].BootIndicator = TRUE; - DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE; - DiskEntry->Dirty = TRUE; - - /* FIXME: Might be incorrect if partitions were created by Linux FDISK */ - List->SystemDisk = DiskEntry; - List->SystemPartition = PartEntry; - - return; - } - - /* Disk is not new, scan all partitions to find a bootable one */ - List->SystemDisk = NULL; - List->SystemPartition = NULL; - + List->SystemDisk = DiskEntry; + List->SystemPartition = PartEntry; + + // + // See: https://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlis… + // + + /* Check if the disk is new and if so, use its first partition as the active system partition */ + if (DiskEntry->NewDisk) + { + if (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED || PartEntry->BootIndicator == FALSE) + { + /* FIXME: Might be incorrect if partitions were created by Linux FDISK */ + List->SystemDisk = DiskEntry; + List->SystemPartition = PartEntry; + + List->OriginalSystemDisk = List->SystemDisk; + List->OriginalSystemPartition = List->SystemPartition; + + DPRINT1("Use new first active system partition %lu in disk %lu, drive letter %c\n", + List->SystemPartition->PartitionNumber, + List->SystemDisk->DiskNumber, + (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + + goto SetSystemPartition; + } + + // FIXME: What to do?? + DPRINT1("NewDisk TRUE but first partition is used?\n"); + } + + DPRINT1("We are here (2)!\n"); + + /* + * The disk is not new, check if any partition is initialized; + * if not, the first one becomes the system partition. + */ ListEntry = DiskEntry->PrimaryPartListHead.Flink; while (ListEntry != &DiskEntry->PrimaryPartListHead) { + /* Retrieve the partition and go to the next one */ PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); - /* Check if it is partitioned */ - if (PartEntry->IsPartitioned) - { - if (PartEntry->PartitionType != PARTITION_ENTRY_UNUSED && - PartEntry->BootIndicator) + /* Check if the partition is partitioned and is used */ + if (PartEntry->PartitionType != PARTITION_ENTRY_UNUSED || PartEntry->BootIndicator != FALSE) + { + break; + } + + /* Go to the next one */ + ListEntry = ListEntry->Flink; + } + if (ListEntry == &DiskEntry->PrimaryPartListHead) + { + /* + * OK we haven't encountered any used and active partition, + * so use the first one as the system partition. + */ + + /* FIXME: Might be incorrect if partitions were created by Linux FDISK */ + List->OriginalSystemDisk = List->SystemDisk; // DiskEntry + List->OriginalSystemPartition = List->SystemPartition; // First PartEntry + + DPRINT1("Use first active system partition %lu in disk %lu, drive letter %c\n", + List->SystemPartition->PartitionNumber, + List->SystemDisk->DiskNumber, + (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + + goto SetSystemPartition; + } + + List->SystemDisk = NULL; + List->SystemPartition = NULL; + List->OriginalSystemDisk = NULL; + List->OriginalSystemPartition = NULL; + + DPRINT1("We are here (3)!\n"); + + /* The disk is not new, scan all partitions to find the (active) system partition */ + ListEntry = DiskEntry->PrimaryPartListHead.Flink; + while (ListEntry != &DiskEntry->PrimaryPartListHead) + { + /* Retrieve the partition and go to the next one */ + PartEntry = CONTAINING_RECORD(ListEntry, + PARTENTRY, + ListEntry); + ListEntry = ListEntry->Flink; + + /* Check if the partition is partitioned and used */ + if (PartEntry->IsPartitioned && + PartEntry->PartitionType != PARTITION_ENTRY_UNUSED) + { + /* Check if the partition is active */ + if (PartEntry->BootIndicator) { /* Yes, we found it */ List->SystemDisk = DiskEntry; List->SystemPartition = PartEntry; - DPRINT("Found bootable partition disk %d, drive letter %c\n", - DiskEntry->DiskNumber, PartEntry->DriveLetter); + DPRINT1("Found active system partition %lu in disk %lu, drive letter %c\n", + PartEntry->PartitionNumber, + DiskEntry->DiskNumber, + (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter); break; } } - - /* Go to the next one */ - ListEntry = ListEntry->Flink; - } + } + + /* Check if we have found the system partition */ + if (List->SystemDisk == NULL || List->SystemPartition == NULL) + { + /* Nothing, use the alternative system partition */ + DPRINT1("No system partition found, use the alternative partition!\n"); + goto UseAlternativeSystemPartition; + } + + /* Save them */ + List->OriginalSystemDisk = List->SystemDisk; + List->OriginalSystemPartition = List->SystemPartition; + + /* + * ADDITIONAL CHECKS / BIG HACK: + * + * Retrieve its file system and check whether we have + * write support for it. If that is the case we are fine + * and we can use it directly. However if we don't have + * write support we will need to change the active system + * partition. + * + * NOTE that this is completely useless on architectures + * where a real system partition is required, as on these + * architectures the partition uses the FAT FS, for which + * we do have write support. + * NOTE also that for those architectures looking for a + * partition boot indicator is insufficient. + */ + FileSystem = GetFileSystem(FileSystemList, List->OriginalSystemPartition); + if (FileSystem == NULL) + { + DPRINT1("System partition %lu in disk %lu with no FS?!\n", + List->OriginalSystemPartition->PartitionNumber, + List->OriginalSystemDisk->DiskNumber); + goto FindAndUseAlternativeSystemPartition; + } + // HACK: WARNING: We cannot write on this FS yet! + // See fslist.c:GetFileSystem() + if (List->OriginalSystemPartition->PartitionType == PARTITION_EXT2 || + List->OriginalSystemPartition->PartitionType == PARTITION_IFS) + { + DPRINT1("Recognized file system %S that doesn't support write support yet!\n", + FileSystem->FileSystemName); + goto FindAndUseAlternativeSystemPartition; + } + + DPRINT1("Use existing active system partition %lu in disk %lu, drive letter %c\n", + List->SystemPartition->PartitionNumber, + List->SystemDisk->DiskNumber, + (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + + return; + +FindAndUseAlternativeSystemPartition: + /* + * We are here because we have not found any (active) candidate + * system partition that we know how to support. What we are going + * to do is to change the existing system partition and use the + * partition on which we install ReactOS as the new system partition, + * and then we will need to add in FreeLdr's entry a boot entry to boot + * from the original system partition. + */ + + /* Unset the old system partition */ + List->SystemPartition->BootIndicator = FALSE; + List->SystemDisk->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].BootIndicator = FALSE; + List->SystemDisk->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].RewritePartition = TRUE; + List->SystemDisk->Dirty = TRUE; + +UseAlternativeSystemPartition: + List->SystemDisk = List->CurrentDisk; + List->SystemPartition = List->CurrentPartition; + + DPRINT1("Use alternative active system partition %lu in disk %lu, drive letter %c\n", + List->SystemPartition->PartitionNumber, + List->SystemDisk->DiskNumber, + (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + +SetSystemPartition: + /* Set the new active system partition */ + List->SystemPartition->BootIndicator = TRUE; + List->SystemDisk->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].BootIndicator = TRUE; + List->SystemDisk->LayoutBuffer->PartitionEntry[List->SystemPartition->PartitionIndex].RewritePartition = TRUE; + List->SystemDisk->Dirty = TRUE; } Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -155,6 +155,15 @@ /* The system disk and partition where the boot manager resides */ PDISKENTRY SystemDisk; PPARTENTRY SystemPartition; + /* + * The original system disk and partition in case we are redefining them + * because we do not have write support on them. + * Please not that this is partly a HACK and MUST NEVER happen on + * architectures where real system partitions are mandatory (because then + * they are formatted in FAT FS and we support write operation on them). + */ + PDISKENTRY OriginalSystemDisk; + PPARTENTRY OriginalSystemPartition; PDISKENTRY TempDisk; PPARTENTRY TempPartition; @@ -258,7 +267,8 @@ VOID CheckActiveSystemPartition( - PPARTLIST List); + IN PPARTLIST List, + IN PFILE_SYSTEM_LIST FileSystemList); BOOLEAN WritePartitionsToDisk( Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Tue Mar 1 15:00:56 2016 @@ -60,7 +60,6 @@ /* Internal Headers */ #include "interface/consup.h" -#include "partlist.h" #include "inffile.h" #include "inicache.h" #include "progress.h" @@ -70,6 +69,7 @@ #endif #include "registry.h" #include "fslist.h" +#include "partlist.h" #include "cabinet.h" #include "filesup.h" #include "genlist.h"

1 0

[akhaldi] 70836: [STRMBASE] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 13:41:22 2016 New Revision: 70836 URL: http://svn.reactos.org/svn/reactos?rev=70836&view=rev Log: [STRMBASE] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/lib/3rdparty/strmbase/transform.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/3rdparty/strmbase/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/tran… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] Tue Mar 1 13:41:22 2016 @@ -347,6 +347,8 @@ This->filter.state = State_Stopped; if (This->pFuncsTable->pfnStopStreaming) hr = This->pFuncsTable->pfnStopStreaming(This); + if (SUCCEEDED(hr)) + hr = BaseOutputPinImpl_Inactive(impl_BaseOutputPin_from_IPin(This->ppPins[1])); } LeaveCriticalSection(&This->csReceive); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Mar 1 13:41:22 2016 @@ -250,7 +250,7 @@ from Winehq CVS. If you are looking to update something in these files check Wine current sources first as it may already be fixed. -reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.7.55 +reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.9.4 reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.55 reactos/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55

1 0

[akhaldi] 70835: [PSDK] Update d3dcommon.idl. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 13:38:40 2016 New Revision: 70835 URL: http://svn.reactos.org/svn/reactos?rev=70835&view=rev Log: [PSDK] Update d3dcommon.idl. CORE-10912 Modified: trunk/reactos/include/psdk/d3dcommon.idl Modified: trunk/reactos/include/psdk/d3dcommon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dcommon.idl… ============================================================================== --- trunk/reactos/include/psdk/d3dcommon.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3dcommon.idl [iso-8859-1] Tue Mar 1 13:38:40 2016 @@ -21,8 +21,8 @@ typedef struct _D3D_SHADER_MACRO { - LPCSTR Name; - LPCSTR Definition; + const char *Name; + const char *Definition; } D3D_SHADER_MACRO; typedef struct _D3D_SHADER_MACRO* LPD3D_SHADER_MACRO; @@ -86,7 +86,24 @@ D3D_FEATURE_LEVEL_10_0 = 0xa000, D3D_FEATURE_LEVEL_10_1 = 0xa100, D3D_FEATURE_LEVEL_11_0 = 0xb000, + D3D_FEATURE_LEVEL_11_1 = 0xb100 } D3D_FEATURE_LEVEL; + +cpp_quote("#define D3D_FL9_1_REQ_TEXTURE1D_U_DIMENSION 2048") +cpp_quote("#define D3D_FL9_3_REQ_TEXTURE1D_U_DIMENSION 4096") +cpp_quote("#define D3D_FL9_1_REQ_TEXTURE2D_U_OR_V_DIMENSION 2048") +cpp_quote("#define D3D_FL9_3_REQ_TEXTURE2D_U_OR_V_DIMENSION 4096") +cpp_quote("#define D3D_FL9_1_REQ_TEXTURECUBE_DIMENSION 512") +cpp_quote("#define D3D_FL9_3_REQ_TEXTURECUBE_DIMENSION 4096") +cpp_quote("#define D3D_FL9_1_REQ_TEXTURE3D_U_V_OR_W_DIMENSION 256") +cpp_quote("#define D3D_FL9_1_DEFAULT_MAX_ANISOTROPY 2") +cpp_quote("#define D3D_FL9_1_IA_PRIMITIVE_MAX_COUNT 65535") +cpp_quote("#define D3D_FL9_2_IA_PRIMITIVE_MAX_COUNT 1048575") +cpp_quote("#define D3D_FL9_1_SIMULTANEOUS_RENDER_TARGET_COUNT 1") +cpp_quote("#define D3D_FL9_3_SIMULTANEOUS_RENDER_TARGET_COUNT 4") +cpp_quote("#define D3D_FL9_1_MAX_TEXTURE_REPEAT 128") +cpp_quote("#define D3D_FL9_2_MAX_TEXTURE_REPEAT 2048") +cpp_quote("#define D3D_FL9_3_MAX_TEXTURE_REPEAT 8192") typedef enum _D3D_SHADER_VARIABLE_CLASS { @@ -108,6 +125,19 @@ D3D11_SVC_INTERFACE_POINTER, D3D_SVC_FORCE_DWORD = 0x7fffffff, } D3D_SHADER_VARIABLE_CLASS; + +typedef enum _D3D_SHADER_VARIABLE_FLAGS +{ + D3D_SVF_USERPACKED = 0x01, + D3D_SVF_USED = 0x02, + D3D_SVF_INTERFACE_POINTER = 0x04, + D3D_SVF_INTERFACE_PARAMETER = 0x08, + D3D10_SVF_USERPACKED = D3D_SVF_USERPACKED, + D3D10_SVF_USED = D3D_SVF_USED, + D3D11_SVF_INTERFACE_POINTER = D3D_SVF_INTERFACE_POINTER, + D3D11_SVF_INTERFACE_PARAMETER = D3D_SVF_INTERFACE_PARAMETER, + D3D_SVF_FORCE_DWORD = 0x7fffffff +} D3D_SHADER_VARIABLE_FLAGS; typedef enum _D3D_SHADER_VARIABLE_TYPE { @@ -218,6 +248,22 @@ D3D_SVT_FORCE_DWORD = 0x7fffffff, } D3D_SHADER_VARIABLE_TYPE; +typedef enum _D3D_SHADER_INPUT_FLAGS +{ + D3D_SIF_USERPACKED = 0x01, + D3D_SIF_COMPARISON_SAMPLER = 0x02, + D3D_SIF_TEXTURE_COMPONENT_0 = 0x04, + D3D_SIF_TEXTURE_COMPONENT_1 = 0x08, + D3D_SIF_TEXTURE_COMPONENTS = 0x0C, + D3D_SIF_UNUSED = 0x10, + D3D10_SIF_USERPACKED = D3D_SIF_USERPACKED, + D3D10_SIF_COMPARISON_SAMPLER = D3D_SIF_COMPARISON_SAMPLER, + D3D10_SIF_TEXTURE_COMPONENT_0 = D3D_SIF_TEXTURE_COMPONENT_0, + D3D10_SIF_TEXTURE_COMPONENT_1 = D3D_SIF_TEXTURE_COMPONENT_1, + D3D10_SIF_TEXTURE_COMPONENTS = D3D_SIF_TEXTURE_COMPONENTS, + D3D_SIF_FORCE_DWORD = 0x7fffffff +} D3D_SHADER_INPUT_FLAGS; + typedef enum D3D_PRIMITIVE { D3D_PRIMITIVE_UNDEFINED, @@ -618,3 +664,12 @@ D3D11_SIT_UAV_CONSUME_STRUCTURED, D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER, } D3D_SHADER_INPUT_TYPE; + +typedef enum _D3D_SHADER_CBUFFER_FLAGS +{ + D3D_CBF_USERPACKED = 0x01, + D3D10_CBF_USERPACKED = D3D_CBF_USERPACKED, + D3D_CBF_FORCE_DWORD = 0x7fffffff +} D3D_SHADER_CBUFFER_FLAGS; + +cpp_quote("DEFINE_GUID(WKPDID_D3DDebugObjectName,0x429b8c22,0x9188,0x4b0c,0x87,0x42,0xac,0xb0,0xbf,0x85,0xc2,0x00);")

1 0

[akhaldi] 70834: [DXDIAGN_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 13:18:35 2016 New Revision: 70834 URL: http://svn.reactos.org/svn/reactos?rev=70834&view=rev Log: [DXDIAGN_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/dxdiagn/container.c Modified: trunk/rostests/winetests/dxdiagn/container.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dxdiagn/contain… ============================================================================== --- trunk/rostests/winetests/dxdiagn/container.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dxdiagn/container.c [iso-8859-1] Tue Mar 1 13:18:35 2016 @@ -959,6 +959,7 @@ static const WCHAR b3DAccelerationExists[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0}; static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; + static const WCHAR iAdapter[] = {'i','A','d','a','p','t','e','r',0}; static const struct property_test property_tests[] = { @@ -983,6 +984,7 @@ {b3DAccelerationExists, VT_BOOL}, {b3DAccelerationEnabled, VT_BOOL}, {bDDAccelerationEnabled, VT_BOOL}, + {iAdapter, VT_UI4}, }; IDxDiagContainer *display_cont = NULL;

1 0

[akhaldi] 70833: [DXDIAGN] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 13:17:52 2016 New Revision: 70833 URL: http://svn.reactos.org/svn/reactos?rev=70833&view=rev Log: [DXDIAGN] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/directx/wine/dxdiagn/provider.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dxdiagn/provider.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/p… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/provider.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/provider.c [iso-8859-1] Tue Mar 1 13:17:52 2016 @@ -48,6 +48,8 @@ static const WCHAR dwBpp[] = {'d','w','B','p','p',0}; static const WCHAR szDisplayMemoryLocalized[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','L','o','c','a','l','i','z','e','d',0}; static const WCHAR szDisplayMemoryEnglish[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','E','n','g','l','i','s','h',0}; +static const WCHAR szDisplayModeLocalized[] = {'s','z','D','i','s','p','l','a','y','M','o','d','e','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR szDisplayModeEnglish[] = {'s','z','D','i','s','p','l','a','y','M','o','d','e','E','n','g','l','i','s','h',0}; static const WCHAR szDriverName[] = {'s','z','D','r','i','v','e','r','N','a','m','e',0}; static const WCHAR szDriverVersion[] = {'s','z','D','r','i','v','e','r','V','e','r','s','i','o','n',0}; static const WCHAR szSubSysId[] = {'s','z','S','u','b','S','y','s','I','d',0}; @@ -57,6 +59,30 @@ static const WCHAR szChipType[] = {'s','z','C','h','i','p','T','y','p','e',0}; static const WCHAR szDACType[] = {'s','z','D','A','C','T','y','p','e',0}; static const WCHAR szRevision[] = {'s','z','R','e','v','i','s','i','o','n',0}; +static const WCHAR szMonitorName[] = {'s','z','M','o','n','i','t','o','r','N','a','m','e',0}; +static const WCHAR szMonitorMaxRes[] = {'s','z','M','o','n','i','t','o','r','M','a','x','R','e','s',0}; +static const WCHAR szDriverAttributes[] = {'s','z','D','r','i','v','e','r','A','t','t','r','i','b','u','t','e','s',0}; +static const WCHAR szDriverLanguageEnglish[] = {'s','z','D','r','i','v','e','r','L','a','n','g','u','a','g','e','E','n','g','l','i','s','h',0}; +static const WCHAR szDriverLanguageLocalized[] = {'s','z','D','r','i','v','e','r','L','a','n','g','u','a','g','e','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR szDriverDateEnglish[] = {'s','z','D','r','i','v','e','r','D','a','t','e','E','n','g','l','i','s','h',0}; +static const WCHAR szDriverDateLocalized[] = {'s','z','D','r','i','v','e','r','D','a','t','e','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR lDriverSize[] = {'l','D','r','i','v','e','r','S','i','z','e',0}; +static const WCHAR szMiniVdd[] = {'s','z','M','i','n','i','V','d','d',0}; +static const WCHAR szMiniVddDateLocalized[] = {'s','z','M','i','n','i','V','d','d','D','a','t','e','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR szMiniVddDateEnglish[] = {'s','z','M','i','n','i','V','d','d','D','a','t','e','E','n','g','l','i','s','h',0}; +static const WCHAR lMiniVddSize[] = {'l','M','i','n','i','V','d','d','S','i','z','e',0}; +static const WCHAR szVdd[] = {'s','z','V','d','d',0}; +static const WCHAR bCanRenderWindow[] = {'b','C','a','n','R','e','n','d','e','r','W','i','n','d','o','w',0}; +static const WCHAR bDriverBeta[] = {'b','D','r','i','v','e','r','B','e','t','a',0}; +static const WCHAR bDriverDebug[] = {'b','D','r','i','v','e','r','D','e','b','u','g',0}; +static const WCHAR bDriverSigned[] = {'b','D','r','i','v','e','r','S','i','g','n','e','d',0}; +static const WCHAR bDriverSignedValid[] = {'b','D','r','i','v','e','r','S','i','g','n','e','d','V','a','l','i','d',0}; +static const WCHAR szDriverSignDate[] = {'s','z','D','r','i','v','e','r','S','i','g','n','D','a','t','e',0}; +static const WCHAR dwDDIVersion[] = {'d','w','D','D','I','V','e','r','s','i','o','n',0}; +static const WCHAR szDDIVersionEnglish[] = {'s','z','D','D','I','V','e','r','s','i','o','n','E','n','g','l','i','s','h',0}; +static const WCHAR szDDIVersionLocalized[] = {'s','z','D','D','I','V','e','r','s','i','o','n','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR iAdapter[] = {'i','A','d','a','p','t','e','r',0}; +static const WCHAR dwWHQLLevel[] = {'d','w','W','H','Q','L','L','e','v','e','l',0}; struct IDxDiagProviderImpl { @@ -314,7 +340,7 @@ return S_OK; } -static inline HRESULT add_bool_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, BOOL data) +static inline HRESULT add_i4_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, LONG data) { IDxDiagContainerImpl_Property *prop; @@ -322,8 +348,8 @@ if (!prop) return E_OUTOFMEMORY; - V_VT(&prop->vProp) = VT_BOOL; - V_BOOL(&prop->vProp) = data ? VARIANT_TRUE : VARIANT_FALSE; + V_VT(&prop->vProp) = VT_I4; + V_I4(&prop->vProp) = data; list_add_tail(&node->properties, &prop->entry); ++node->nProperties; @@ -331,7 +357,7 @@ return S_OK; } -static inline HRESULT add_ull_as_bstr_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, ULONGLONG data ) +static inline HRESULT add_bool_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, BOOL data) { IDxDiagContainerImpl_Property *prop; @@ -339,10 +365,33 @@ if (!prop) return E_OUTOFMEMORY; + V_VT(&prop->vProp) = VT_BOOL; + V_BOOL(&prop->vProp) = data ? VARIANT_TRUE : VARIANT_FALSE; + + list_add_tail(&node->properties, &prop->entry); + ++node->nProperties; + + return S_OK; +} + +static inline HRESULT add_ull_as_bstr_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, ULONGLONG data ) +{ + IDxDiagContainerImpl_Property *prop; + HRESULT hr; + + prop = allocate_property_information(propName); + if (!prop) + return E_OUTOFMEMORY; + V_VT(&prop->vProp) = VT_UI8; V_UI8(&prop->vProp) = data; - VariantChangeType(&prop->vProp, &prop->vProp, 0, VT_BSTR); + hr = VariantChangeType(&prop->vProp, &prop->vProp, 0, VT_BSTR); + if (FAILED(hr)) + { + free_property_information(prop); + return hr; + } list_add_tail(&node->properties, &prop->entry); ++node->nProperties; @@ -907,6 +956,15 @@ static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; static const WCHAR bNoHardware[] = {'b','N','o','H','a','r','d','w','a','r','e',0}; + static const WCHAR mode_fmtW[] = {'%','d',' ','x',' ','%','d',' ','(','%','d',' ','b','i','t',')',' ','(','%','d','H','z',')',0}; + static const WCHAR gernericPNPMonitorW[] = {'G','e','n','e','r','i','c',' ','P','n','P',' ','M','o','n','i','t','o','r',0}; + static const WCHAR failedToGetParameterW[] = {'F','a','i','l','e','d',' ','t','o',' ','g','e','t',' ','p','a','r','a','m','e','t','e','r',0}; + static const WCHAR driverAttributesW[] = {'F','i','n','a','l',' ','R','e','t','a','i','l',0}; + static const WCHAR englishW[] = {'E','n','g','l','i','s','h',0}; + static const WCHAR driverDateEnglishW[] = {'1','/','1','/','2','0','1','6',' ','1','0',':','0','0',':','0','0',0}; + static const WCHAR driverDateLocalW[] = {'1','/','1','/','2','0','1','6',' ','1','0',':','0','0',':','0','0',' ','A','M',0}; + static const WCHAR naW[] = {'n','/','a',0}; + static const WCHAR ddi11W[] = {'1','1',0}; D3DADAPTER_IDENTIFIER9 adapter_info; D3DDISPLAYMODE adapter_mode; @@ -1003,6 +1061,17 @@ hr = add_ui4_property(display_adapter, dwBpp, depth_for_pixelformat(adapter_mode.Format)); if (FAILED(hr)) goto cleanup; + + snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), mode_fmtW, adapter_mode.Width, adapter_mode.Height, + depth_for_pixelformat(adapter_mode.Format), adapter_mode.RefreshRate); + + hr = add_bstr_property(display_adapter, szDisplayModeLocalized, buffer); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDisplayModeEnglish, buffer); + if (FAILED(hr)) + goto cleanup; } hr = add_bstr_property(display_adapter, szKeyDeviceKey, szEmpty); @@ -1054,6 +1123,102 @@ goto cleanup; hr = add_bool_property(display_adapter, bNoHardware, FALSE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bCanRenderWindow, TRUE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMonitorName, gernericPNPMonitorW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMonitorMaxRes, failedToGetParameterW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverAttributes, driverAttributesW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverLanguageEnglish, englishW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverLanguageLocalized, englishW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverDateEnglish, driverDateEnglishW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverDateLocalized, driverDateLocalW); + if (FAILED(hr)) + goto cleanup; + + hr = add_i4_property(display_adapter, lDriverSize, 10 * 1024 * 1024); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMiniVdd, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMiniVddDateLocalized, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMiniVddDateEnglish, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_i4_property(display_adapter, lMiniVddSize, 0); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szVdd, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDriverBeta, FALSE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDriverDebug, FALSE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDriverSigned, TRUE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDriverSignedValid, TRUE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverSignDate, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_ui4_property(display_adapter, dwDDIVersion, 11); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDDIVersionEnglish, ddi11W); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDDIVersionLocalized, ddi11W); + if (FAILED(hr)) + goto cleanup; + + hr = add_ui4_property(display_adapter, iAdapter, index); + if (FAILED(hr)) + goto cleanup; + + hr = add_ui4_property(display_adapter, dwWHQLLevel, 0); if (FAILED(hr)) goto cleanup; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Mar 1 13:17:52 2016 @@ -36,7 +36,7 @@ reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 -reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70832: [DPLAYX] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 12:30:17 2016 New Revision: 70832 URL: http://svn.reactos.org/svn/reactos?rev=70832&view=rev Log: [DPLAYX] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] Tue Mar 1 12:30:17 2016 @@ -1569,17 +1569,12 @@ player total */ lpPData = DP_CreatePlayer( This, lpidPlayer, lpPlayerName, dwCreateFlags, hEvent, bAnsi ); - - if( lpPData == NULL ) - { - return DPERR_CANTADDPLAYER; - } - /* Create the list object and link it in */ lpPList = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *lpPList ) ); - if( lpPList == NULL ) - { - FIXME( "Memory leak\n" ); + if( !lpPData || !lpPList ) + { + HeapFree( GetProcessHeap(), 0, lpPData ); + HeapFree( GetProcessHeap(), 0, lpPList ); return DPERR_CANTADDPLAYER; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Mar 1 12:30:17 2016 @@ -34,7 +34,7 @@ reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70831: [BCRYPT_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 12:28:40 2016 New Revision: 70831 URL: http://svn.reactos.org/svn/reactos?rev=70831&view=rev Log: [BCRYPT_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/bcrypt/CMakeLists.txt trunk/rostests/winetests/bcrypt/bcrypt.c Modified: trunk/rostests/winetests/bcrypt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/bcrypt/CMakeLis… ============================================================================== --- trunk/rostests/winetests/bcrypt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/bcrypt/CMakeLists.txt [iso-8859-1] Tue Mar 1 12:28:40 2016 @@ -1,5 +1,5 @@ add_executable(bcrypt_winetest bcrypt.c testlist.c) set_module_type(bcrypt_winetest win32cui) -add_importlibs(bcrypt_winetest user32 msvcrt kernel32) +add_importlibs(bcrypt_winetest bcrypt user32 msvcrt kernel32) add_cd_file(TARGET bcrypt_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/bcrypt/bcrypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/bcrypt/bcrypt.c… ============================================================================== --- trunk/rostests/winetests/bcrypt/bcrypt.c [iso-8859-1] (original) +++ trunk/rostests/winetests/bcrypt/bcrypt.c [iso-8859-1] Tue Mar 1 12:28:40 2016 @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include <ntstatus.h> #define WIN32_NO_STATUS #include <windows.h> @@ -25,57 +26,32 @@ #include "wine/test.h" -static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE hAlgorithm, PUCHAR pbBuffer, - ULONG cbBuffer, ULONG dwFlags); -static NTSTATUS (WINAPI *pBCryptGetFipsAlgorithmMode)(BOOLEAN *enabled); - -static BOOL Init(void) -{ - HMODULE hbcrypt = LoadLibraryA("bcrypt.dll"); - if (!hbcrypt) - { - win_skip("bcrypt library not available\n"); - return FALSE; - } - - pBCryptGenRandom = (void *)GetProcAddress(hbcrypt, "BCryptGenRandom"); - pBCryptGetFipsAlgorithmMode = (void *)GetProcAddress(hbcrypt, "BCryptGetFipsAlgorithmMode"); - - return TRUE; -} - static void test_BCryptGenRandom(void) { NTSTATUS ret; UCHAR buffer[256]; - if (!pBCryptGenRandom) - { - win_skip("BCryptGenRandom is not available\n"); - return; - } - - ret = pBCryptGenRandom(NULL, NULL, 0, 0); + ret = BCryptGenRandom(NULL, NULL, 0, 0); ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, buffer, 0, 0); + ret = BCryptGenRandom(NULL, buffer, 0, 0); ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), 0); + ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), 0); ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), + ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG|BCRYPT_RNG_USE_ENTROPY_IN_BUFFER); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, NULL, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = BCryptGenRandom(NULL, NULL, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); /* Zero sized buffer should work too */ - ret = pBCryptGenRandom(NULL, buffer, 0, BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = BCryptGenRandom(NULL, buffer, 0, BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); /* Test random number generation - It's impossible for a sane RNG to return 8 zeros */ memset(buffer, 0, 16); - ret = pBCryptGenRandom(NULL, buffer, 8, BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = BCryptGenRandom(NULL, buffer, 8, BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); ok(memcmp(buffer, buffer + 8, 8), "Expected a random number, got 0\n"); } @@ -85,24 +61,355 @@ NTSTATUS ret; BOOLEAN enabled; - if (!pBCryptGetFipsAlgorithmMode) + ret = BCryptGetFipsAlgorithmMode(&enabled); + ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret); + + ret = BCryptGetFipsAlgorithmMode(NULL); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); +} + +static void format_hash(const UCHAR *bytes, ULONG size, char *buf) +{ + ULONG i; + buf[0] = '\0'; + for (i = 0; i < size; i++) { - win_skip("BCryptGetFipsAlgorithmMode is not available\n"); - return; + sprintf(buf + i * 2, "%02x", bytes[i]); } - - ret = pBCryptGetFipsAlgorithmMode(&enabled); - ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret); - - ret = pBCryptGetFipsAlgorithmMode(NULL); - ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); + return; +} + +static int strcmp_wa(const WCHAR *strw, const char *stra) +{ + WCHAR buf[512]; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(buf[0])); + return lstrcmpW(strw, buf); +} + +#define test_hash_length(a,b) _test_hash_length(__LINE__,a,b) +static void _test_hash_length(unsigned line, void *handle, ULONG exlen) +{ + ULONG len = 0xdeadbeef, size = 0xdeadbeef; + NTSTATUS status; + + status = BCryptGetProperty(handle, BCRYPT_HASH_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %08x\n", status); + ok_(__FILE__,line)(size == sizeof(len), "got %u\n", size); + ok_(__FILE__,line)(len == exlen, "len = %u, expected %u\n", len, exlen); +} + +#define test_alg_name(a,b) _test_alg_name(__LINE__,a,b) +static void _test_alg_name(unsigned line, void *handle, const char *exname) +{ + ULONG size = 0xdeadbeef; + UCHAR buf[256]; + const WCHAR *name = (const WCHAR*)buf; + NTSTATUS status; + + status = BCryptGetProperty(handle, BCRYPT_ALGORITHM_NAME, buf, sizeof(buf), &size, 0); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %08x\n", status); + ok_(__FILE__,line)(size == (strlen(exname)+1)*sizeof(WCHAR), "got %u\n", size); + ok_(__FILE__,line)(!strcmp_wa(name, exname), "alg name = %s, expected %s\n", wine_dbgstr_w(name), exname); +} + +static void test_sha1(void) +{ + static const char expected[] = "961fa64958818f767707072755d7018dcd278e94"; + BCRYPT_ALG_HANDLE alg; + BCRYPT_HASH_HANDLE hash; + UCHAR buf[512], sha1[20]; + ULONG size, len; + char str[41]; + NTSTATUS ret; + + alg = NULL; + ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(alg != NULL, "alg not set\n"); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(len), "got %u\n", size); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(len == 0xdeadbeef, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len != 0xdeadbeef, "len not set\n"); + ok(size == sizeof(len), "got %u\n", size); + + test_hash_length(alg, 20); + test_alg_name(alg, "SHA1"); + + hash = NULL; + len = sizeof(buf); + ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(hash != NULL, "hash not set\n"); + + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + test_hash_length(hash, 20); + test_alg_name(hash, "SHA1"); + + memset(sha1, 0, sizeof(sha1)); + ret = BCryptFinishHash(hash, sha1, sizeof(sha1), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( sha1, sizeof(sha1), str ); + ok(!strcmp(str, expected), "got %s\n", str); + + ret = BCryptDestroyHash(hash); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = BCryptCloseAlgorithmProvider(alg, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} + +static void test_sha256(void) +{ + static const char expected[] = + "ceb73749c899693706ede1e30c9929b3fd5dd926163831c2fb8bd41e6efb1126"; + BCRYPT_ALG_HANDLE alg; + BCRYPT_HASH_HANDLE hash; + UCHAR buf[512], sha256[32]; + ULONG size, len; + char str[65]; + NTSTATUS ret; + + alg = NULL; + ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(alg != NULL, "alg not set\n"); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(len), "got %u\n", size); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(len == 0xdeadbeef, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len != 0xdeadbeef, "len not set\n"); + ok(size == sizeof(len), "got %u\n", size); + + test_hash_length(alg, 32); + test_alg_name(alg, "SHA256"); + + hash = NULL; + len = sizeof(buf); + ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(hash != NULL, "hash not set\n"); + + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + test_hash_length(hash, 32); + test_alg_name(hash, "SHA256"); + + memset(sha256, 0, sizeof(sha256)); + ret = BCryptFinishHash(hash, sha256, sizeof(sha256), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( sha256, sizeof(sha256), str ); + ok(!strcmp(str, expected), "got %s\n", str); + + ret = BCryptDestroyHash(hash); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = BCryptCloseAlgorithmProvider(alg, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} + +static void test_sha384(void) +{ + static const char expected[] = + "62b21e90c9022b101671ba1f808f8631a8149f0f12904055839a35c1ca78ae5363eed1e743a692d70e0504b0cfd12ef9"; + BCRYPT_ALG_HANDLE alg; + BCRYPT_HASH_HANDLE hash; + UCHAR buf[512], sha384[48]; + ULONG size, len; + char str[97]; + NTSTATUS ret; + + alg = NULL; + ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA384_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(alg != NULL, "alg not set\n"); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(len), "got %u\n", size); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(len == 0xdeadbeef, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len != 0xdeadbeef, "len not set\n"); + ok(size == sizeof(len), "got %u\n", size); + + test_hash_length(alg, 48); + test_alg_name(alg, "SHA384"); + + hash = NULL; + len = sizeof(buf); + ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(hash != NULL, "hash not set\n"); + + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + test_hash_length(hash, 48); + test_alg_name(hash, "SHA384"); + + memset(sha384, 0, sizeof(sha384)); + ret = BCryptFinishHash(hash, sha384, sizeof(sha384), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( sha384, sizeof(sha384), str ); + ok(!strcmp(str, expected), "got %s\n", str); + + ret = BCryptDestroyHash(hash); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = BCryptCloseAlgorithmProvider(alg, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} + +static void test_sha512(void) +{ + static const char expected[] = + "d55ced17163bf5386f2cd9ff21d6fd7fe576a915065c24744d09cfae4ec84ee1e" + "f6ef11bfbc5acce3639bab725b50a1fe2c204f8c820d6d7db0df0ecbc49c5ca"; + BCRYPT_ALG_HANDLE alg; + BCRYPT_HASH_HANDLE hash; + UCHAR buf[512], sha512[64]; + ULONG size, len; + char str[129]; + NTSTATUS ret; + + alg = NULL; + ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA512_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(alg != NULL, "alg not set\n"); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(len), "got %u\n", size); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(len == 0xdeadbeef, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len != 0xdeadbeef, "len not set\n"); + ok(size == sizeof(len), "got %u\n", size); + + test_hash_length(alg, 64); + test_alg_name(alg, "SHA512"); + + hash = NULL; + len = sizeof(buf); + ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(hash != NULL, "hash not set\n"); + + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + test_hash_length(hash, 64); + test_alg_name(hash, "SHA512"); + + memset(sha512, 0, sizeof(sha512)); + ret = BCryptFinishHash(hash, sha512, sizeof(sha512), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( sha512, sizeof(sha512), str ); + ok(!strcmp(str, expected), "got %s\n", str); + + ret = BCryptDestroyHash(hash); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = BCryptCloseAlgorithmProvider(alg, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } START_TEST(bcrypt) { - if (!Init()) - return; - test_BCryptGenRandom(); test_BCryptGetFipsAlgorithmMode(); -} + test_sha1(); + test_sha256(); + test_sha384(); + test_sha512(); +}

1 0

[akhaldi] 70830: [BCRYPT] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 12:27:13 2016 New Revision: 70830 URL: http://svn.reactos.org/svn/reactos?rev=70830&view=rev Log: [BCRYPT] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/bcrypt/CMakeLists.txt trunk/reactos/dll/win32/bcrypt/bcrypt.spec trunk/reactos/dll/win32/bcrypt/bcrypt_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/bcrypt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/bcrypt/CMakeLists.txt [iso-8859-1] Tue Mar 1 12:27:13 2016 @@ -1,7 +1,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(bcrypt.dll bcrypt.spec) +spec2def(bcrypt.dll bcrypt.spec ADD_IMPORTLIB) list(APPEND SOURCE bcrypt_main.c Modified: trunk/reactos/dll/win32/bcrypt/bcrypt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/bcrypt.sp… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/bcrypt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/bcrypt/bcrypt.spec [iso-8859-1] Tue Mar 1 12:27:13 2016 @@ -8,7 +8,7 @@ @ stub BCryptDecrypt @ stub BCryptDeleteContext @ stub BCryptDeriveKey -@ stub BCryptDestroyHash +@ stdcall BCryptDestroyHash(ptr) @ stub BCryptDestroyKey @ stub BCryptDestroySecret @ stub BCryptDuplicateHash @@ -22,14 +22,14 @@ @ stub BCryptEnumRegisteredProviders @ stub BCryptExportKey @ stub BCryptFinalizeKeyPair -@ stub BCryptFinishHash +@ stdcall BCryptFinishHash(ptr ptr long long) @ stub BCryptFreeBuffer @ stdcall BCryptGenRandom(ptr ptr long long) @ stub BCryptGenerateKeyPair @ stub BCryptGenerateSymmetricKey @ stdcall BCryptGetFipsAlgorithmMode(ptr) @ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) -@ stub BCryptHashData +@ stdcall BCryptHashData(ptr ptr long long) @ stub BCryptImportKey @ stub BCryptImportKeyPair @ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) Modified: trunk/reactos/dll/win32/bcrypt/bcrypt_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/bcrypt_ma… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/bcrypt_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/bcrypt/bcrypt_main.c [iso-8859-1] Tue Mar 1 12:27:13 2016 @@ -21,14 +21,92 @@ #include <ntstatus.h> #define WIN32_NO_STATUS - -#include <wine/debug.h> - +#include <windef.h> #include <winbase.h> #include <ntsecapi.h> #include <bcrypt.h> +#include <wine/debug.h> +#include <wine/unicode.h> + WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); + +static HINSTANCE instance; + +#if defined(HAVE_GNUTLS_HASH) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +WINE_DECLARE_DEBUG_CHANNEL(winediag); + +static void *libgnutls_handle; +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(gnutls_global_deinit); +MAKE_FUNCPTR(gnutls_global_init); +MAKE_FUNCPTR(gnutls_global_set_log_function); +MAKE_FUNCPTR(gnutls_global_set_log_level); +MAKE_FUNCPTR(gnutls_hash); +MAKE_FUNCPTR(gnutls_hash_deinit); +MAKE_FUNCPTR(gnutls_hash_init); +MAKE_FUNCPTR(gnutls_perror); +#undef MAKE_FUNCPTR + +static void gnutls_log( int level, const char *msg ) +{ + TRACE( "<%d> %s", level, msg ); +} + +static BOOL gnutls_initialize(void) +{ + int ret; + + if (!(libgnutls_handle = wine_dlopen( SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0 ))) + { + ERR_(winediag)( "failed to load libgnutls, no support for crypto hashes\n" ); + return FALSE; + } + +#define LOAD_FUNCPTR(f) \ + if (!(p##f = wine_dlsym( libgnutls_handle, #f, NULL, 0 ))) \ + { \ + ERR( "failed to load %s\n", #f ); \ + goto fail; \ + } + + LOAD_FUNCPTR(gnutls_global_deinit) + LOAD_FUNCPTR(gnutls_global_init) + LOAD_FUNCPTR(gnutls_global_set_log_function) + LOAD_FUNCPTR(gnutls_global_set_log_level) + LOAD_FUNCPTR(gnutls_hash); + LOAD_FUNCPTR(gnutls_hash_deinit); + LOAD_FUNCPTR(gnutls_hash_init); + LOAD_FUNCPTR(gnutls_perror) +#undef LOAD_FUNCPTR + + if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS) + { + pgnutls_perror( ret ); + goto fail; + } + + if (TRACE_ON( bcrypt )) + { + pgnutls_global_set_log_level( 4 ); + pgnutls_global_set_log_function( gnutls_log ); + } + + return TRUE; + +fail: + wine_dlclose( libgnutls_handle, NULL, 0 ); + libgnutls_handle = NULL; + return FALSE; +} + +static void gnutls_uninitialize(void) +{ + pgnutls_global_deinit(); + wine_dlclose( libgnutls_handle, NULL, 0 ); + libgnutls_handle = NULL; +} +#endif /* HAVE_GNUTLS_HASH && !HAVE_COMMONCRYPTO_COMMONDIGEST_H */ NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) @@ -77,24 +155,83 @@ return STATUS_NOT_IMPLEMENTED; } -NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *algorithm, LPCWSTR algorithmId, - LPCWSTR implementation, DWORD flags) -{ - FIXME("%p, %s, %s, %08x - stub\n", algorithm, wine_dbgstr_w(algorithmId), wine_dbgstr_w(implementation), flags); - - if (!algorithm) - return STATUS_INVALID_PARAMETER; - - *algorithm = NULL; - - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE algorithm, DWORD flags) -{ - FIXME("%p, %08x - stub\n", algorithm, flags); - - return STATUS_NOT_IMPLEMENTED; +#define MAGIC_ALG (('A' << 24) | ('L' << 16) | ('G' << 8) | '0') +#define MAGIC_HASH (('H' << 24) | ('A' << 16) | ('S' << 8) | 'H') +struct object +{ + ULONG magic; +}; + +enum alg_id +{ + ALG_ID_SHA1, + ALG_ID_SHA256, + ALG_ID_SHA384, + ALG_ID_SHA512 +}; + +static const struct { + ULONG hash_length; + const WCHAR *alg_name; +} alg_props[] = { + /* ALG_ID_SHA1 */ { 20, BCRYPT_SHA1_ALGORITHM }, + /* ALG_ID_SHA256 */ { 32, BCRYPT_SHA256_ALGORITHM }, + /* ALG_ID_SHA384 */ { 48, BCRYPT_SHA384_ALGORITHM }, + /* ALG_ID_SHA512 */ { 64, BCRYPT_SHA512_ALGORITHM } +}; + +struct algorithm +{ + struct object hdr; + enum alg_id id; +}; + +NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags ) +{ + struct algorithm *alg; + enum alg_id alg_id; + + TRACE( "%p, %s, %s, %08x\n", handle, wine_dbgstr_w(id), wine_dbgstr_w(implementation), flags ); + + if (!handle || !id) return STATUS_INVALID_PARAMETER; + if (flags) + { + FIXME( "unimplemented flags %08x\n", flags ); + return STATUS_NOT_IMPLEMENTED; + } + + if (!strcmpW( id, BCRYPT_SHA1_ALGORITHM )) alg_id = ALG_ID_SHA1; + else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256; + else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384; + else if (!strcmpW( id, BCRYPT_SHA512_ALGORITHM )) alg_id = ALG_ID_SHA512; + else + { + FIXME( "algorithm %s not supported\n", debugstr_w(id) ); + return STATUS_NOT_IMPLEMENTED; + } + if (implementation && strcmpW( implementation, MS_PRIMITIVE_PROVIDER )) + { + FIXME( "implementation %s not supported\n", debugstr_w(implementation) ); + return STATUS_NOT_IMPLEMENTED; + } + + if (!(alg = HeapAlloc( GetProcessHeap(), 0, sizeof(*alg) ))) return STATUS_NO_MEMORY; + alg->hdr.magic = MAGIC_ALG; + alg->id = alg_id; + + *handle = alg; + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptCloseAlgorithmProvider( BCRYPT_ALG_HANDLE handle, DWORD flags ) +{ + struct algorithm *alg = handle; + + TRACE( "%p, %08x\n", handle, flags ); + + if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; + HeapFree( GetProcessHeap(), 0, alg ); + return STATUS_SUCCESS; } NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *enabled) @@ -108,17 +245,391 @@ return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE obj, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags) -{ - FIXME("%p, %s, %p, %u, %p, %08x - stub\n", obj, wine_dbgstr_w(prop), buffer, count, res, flags); - +#ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H +struct hash +{ + struct object hdr; + enum alg_id alg_id; + union + { + CC_SHA1_CTX sha1_ctx; + CC_SHA256_CTX sha256_ctx; + CC_SHA512_CTX sha512_ctx; + } u; +}; + +static NTSTATUS hash_init( struct hash *hash ) +{ + switch (hash->alg_id) + { + case ALG_ID_SHA1: + CC_SHA1_Init( &hash->u.sha1_ctx ); + break; + + case ALG_ID_SHA256: + CC_SHA256_Init( &hash->u.sha256_ctx ); + break; + + case ALG_ID_SHA384: + CC_SHA384_Init( &hash->u.sha512_ctx ); + break; + + case ALG_ID_SHA512: + CC_SHA512_Init( &hash->u.sha512_ctx ); + break; + + default: + ERR( "unhandled id %u\n", hash->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + return STATUS_SUCCESS; +} + +static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size ) +{ + switch (hash->alg_id) + { + case ALG_ID_SHA1: + CC_SHA1_Update( &hash->u.sha1_ctx, input, size ); + break; + + case ALG_ID_SHA256: + CC_SHA256_Update( &hash->u.sha256_ctx, input, size ); + break; + + case ALG_ID_SHA384: + CC_SHA384_Update( &hash->u.sha512_ctx, input, size ); + break; + + case ALG_ID_SHA512: + CC_SHA512_Update( &hash->u.sha512_ctx, input, size ); + break; + + default: + ERR( "unhandled id %u\n", hash->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + return STATUS_SUCCESS; +} + +static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) +{ + switch (hash->alg_id) + { + case ALG_ID_SHA1: + CC_SHA1_Final( output, &hash->u.sha1_ctx ); + break; + + case ALG_ID_SHA256: + CC_SHA256_Final( output, &hash->u.sha256_ctx ); + break; + + case ALG_ID_SHA384: + CC_SHA384_Final( output, &hash->u.sha512_ctx ); + break; + + case ALG_ID_SHA512: + CC_SHA512_Final( output, &hash->u.sha512_ctx ); + break; + + default: + ERR( "unhandled id %u\n", hash->alg_id ); + break; + } + return STATUS_SUCCESS; +} +#elif defined(HAVE_GNUTLS_HASH) +struct hash +{ + struct object hdr; + enum alg_id alg_id; + gnutls_hash_hd_t handle; +}; + +static NTSTATUS hash_init( struct hash *hash ) +{ + gnutls_digest_algorithm_t alg; + + if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; + + switch (hash->alg_id) + { + case ALG_ID_SHA1: + alg = GNUTLS_DIG_SHA1; + break; + + case ALG_ID_SHA256: + alg = GNUTLS_DIG_SHA256; + break; + + case ALG_ID_SHA384: + alg = GNUTLS_DIG_SHA384; + break; + + case ALG_ID_SHA512: + alg = GNUTLS_DIG_SHA512; + break; + + default: + ERR( "unhandled id %u\n", hash->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + + if (pgnutls_hash_init( &hash->handle, alg )) return STATUS_INTERNAL_ERROR; + return STATUS_SUCCESS; +} + +static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size ) +{ + if (pgnutls_hash( hash->handle, input, size )) return STATUS_INTERNAL_ERROR; + return STATUS_SUCCESS; +} + +static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) +{ + pgnutls_hash_deinit( hash->handle, output ); + return STATUS_SUCCESS; +} +#else +struct hash +{ + struct object hdr; + enum alg_id alg_id; +}; + +static NTSTATUS hash_init( struct hash *hash ) +{ + ERR( "support for hashes not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } -NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE* hash, UCHAR* hashobject, - ULONG hashobjectlen, UCHAR *secret, ULONG secretlen, ULONG flags) -{ - FIXME("%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, hash, hashobject, hashobjectlen, secret, secretlen, flags); - +static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size ) +{ + ERR( "support for hashes not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } + +static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) +{ + ERR( "support for hashes not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} +#endif + +#define OBJECT_LENGTH_SHA1 278 +#define OBJECT_LENGTH_SHA256 286 +#define OBJECT_LENGTH_SHA384 382 +#define OBJECT_LENGTH_SHA512 382 + +static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) + { + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) + return STATUS_BUFFER_TOO_SMALL; + if(buf) + *(ULONG*)buf = alg_props[id].hash_length; + return STATUS_SUCCESS; + } + + if (!strcmpW( prop, BCRYPT_ALGORITHM_NAME )) + { + *ret_size = (strlenW(alg_props[id].alg_name)+1)*sizeof(WCHAR); + if (size < *ret_size) + return STATUS_BUFFER_TOO_SMALL; + if(buf) + memcpy(buf, alg_props[id].alg_name, *ret_size); + return STATUS_SUCCESS; + } + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + NTSTATUS status; + ULONG value; + + status = generic_alg_property( id, prop, buf, size, ret_size ); + if (status != STATUS_NOT_IMPLEMENTED) + return status; + + switch (id) + { + case ALG_ID_SHA1: + if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) + { + value = OBJECT_LENGTH_SHA1; + break; + } + FIXME( "unsupported sha1 algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + + case ALG_ID_SHA256: + if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) + { + value = OBJECT_LENGTH_SHA256; + break; + } + FIXME( "unsupported sha256 algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + + case ALG_ID_SHA384: + if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) + { + value = OBJECT_LENGTH_SHA384; + break; + } + FIXME( "unsupported sha384 algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + + case ALG_ID_SHA512: + if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) + { + value = OBJECT_LENGTH_SHA512; + break; + } + FIXME( "unsupported sha512 algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + + default: + FIXME( "unsupported algorithm %u\n", id ); + return STATUS_NOT_IMPLEMENTED; + } + + if (size < sizeof(ULONG)) + { + *ret_size = sizeof(ULONG); + return STATUS_BUFFER_TOO_SMALL; + } + if (buf) *(ULONG *)buf = value; + *ret_size = sizeof(ULONG); + + return STATUS_SUCCESS; +} + +static NTSTATUS get_hash_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + NTSTATUS status; + + status = generic_alg_property( id, prop, buf, size, ret_size ); + if (status == STATUS_NOT_IMPLEMENTED) + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return status; +} + +NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags ) +{ + struct object *object = handle; + + TRACE( "%p, %s, %p, %u, %p, %08x\n", handle, wine_dbgstr_w(prop), buffer, count, res, flags ); + + if (!object) return STATUS_INVALID_HANDLE; + if (!prop || !res) return STATUS_INVALID_PARAMETER; + + switch (object->magic) + { + case MAGIC_ALG: + { + const struct algorithm *alg = (const struct algorithm *)object; + return get_alg_property( alg->id, prop, buffer, count, res ); + } + case MAGIC_HASH: + { + const struct hash *hash = (const struct hash *)object; + return get_hash_property( hash->alg_id, prop, buffer, count, res ); + } + default: + WARN( "unknown magic %08x\n", object->magic ); + return STATUS_INVALID_HANDLE; + } +} + +NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE *handle, UCHAR *object, ULONG objectlen, + UCHAR *secret, ULONG secretlen, ULONG flags ) +{ + struct algorithm *alg = algorithm; + struct hash *hash; + NTSTATUS status; + + TRACE( "%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, handle, object, objectlen, + secret, secretlen, flags ); + if (flags) + { + FIXME( "unimplemented flags %08x\n", flags ); + return STATUS_NOT_IMPLEMENTED; + } + + if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; + if (object) FIXME( "ignoring object buffer\n" ); + + if (!(hash = HeapAlloc( GetProcessHeap(), 0, sizeof(*hash) ))) return STATUS_NO_MEMORY; + hash->hdr.magic = MAGIC_HASH; + hash->alg_id = alg->id; + if ((status = hash_init( hash )) != STATUS_SUCCESS) + { + HeapFree( GetProcessHeap(), 0, hash ); + return status; + } + + *handle = hash; + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptDestroyHash( BCRYPT_HASH_HANDLE handle ) +{ + struct hash *hash = handle; + + TRACE( "%p\n", handle ); + + if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; + HeapFree( GetProcessHeap(), 0, hash ); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptHashData( BCRYPT_HASH_HANDLE handle, UCHAR *input, ULONG size, ULONG flags ) +{ + struct hash *hash = handle; + + TRACE( "%p, %p, %u, %08x\n", handle, input, size, flags ); + + if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; + if (!input) return STATUS_INVALID_PARAMETER; + + return hash_update( hash, input, size ); +} + +NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULONG size, ULONG flags ) +{ + struct hash *hash = handle; + + TRACE( "%p, %p, %u, %08x\n", handle, output, size, flags ); + + if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; + if (!output) return STATUS_INVALID_PARAMETER; + + return hash_finish( hash, output, size ); +} + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinst; + DisableThreadLibraryCalls( hinst ); +#if defined(HAVE_GNUTLS_HASH) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) + gnutls_initialize(); +#endif + break; + + case DLL_PROCESS_DETACH: + if (reserved) break; +#if defined(HAVE_GNUTLS_HASH) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) + gnutls_uninitialize(); +#endif + break; + } + return TRUE; +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Mar 1 12:27:13 2016 @@ -49,7 +49,7 @@ reactos/dll/win32/atl80 # Synced to WineStaging-1.7.55 reactos/dll/win32/atl100 # Synced to WineStaging-1.7.55 reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/bcrypt # Synced to WineStaging-1.7.55 +reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.4 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to WineStaging-1.9.4 reactos/dll/win32/clusapi # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70829: [PSDK] Update bcrypt.h. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 12:24:32 2016 New Revision: 70829 URL: http://svn.reactos.org/svn/reactos?rev=70829&view=rev Log: [PSDK] Update bcrypt.h. CORE-10912 Modified: trunk/reactos/include/psdk/bcrypt.h Modified: trunk/reactos/include/psdk/bcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bcrypt.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] Tue Mar 1 12:24:32 2016 @@ -40,6 +40,34 @@ typedef NTSTATUS *PNTSTATUS; #endif +#define BCRYPT_ALGORITHM_NAME (const WCHAR []){'A','l','g','o','r','i','t','h','m','N','a','m','e',0} +#define BCRYPT_AUTH_TAG_LENGTH (const WCHAR []){'A','u','t','h','T','a','g','L','e','n','g','t','h',0} +#define BCRYPT_BLOCK_LENGTH (const WCHAR []){'B','l','o','c','k','L','e','n','g','t','h',0} +#define BCRYPT_BLOCK_SIZE_LIST (const WCHAR []){'B','l','o','c','k','S','i','z','e','L','i','s','t',0} +#define BCRYPT_CHAINING_MODE (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e',0} +#define BCRYPT_EFFECTIVE_KEY_LENGTH (const WCHAR []){'E','f','f','e','c','t','i','v','e','K','e','y','L','e','n','g','t','h',0} +#define BCRYPT_HASH_BLOCK_LENGTH (const WCHAR []){'H','a','s','h','B','l','o','c','k','L','e','n','g','t','h',0} +#define BCRYPT_HASH_LENGTH (const WCHAR []){'H','a','s','h','D','i','g','e','s','t','L','e','n','g','t','h',0} +#define BCRYPT_HASH_OID_LIST (const WCHAR []){'H','a','s','h','O','I','D','L','i','s','t',0} +#define BCRYPT_KEY_LENGTH (const WCHAR []){'K','e','y','L','e','n','g','t','h',0} +#define BCRYPT_KEY_LENGTHS (const WCHAR []){'K','e','y','L','e','n','g','t','h','s',0} +#define BCRYPT_KEY_OBJECT_LENGTH (const WCHAR []){'K','e','y','O','b','j','e','c','t','L','e','n','g','t','h',0} +#define BCRYPT_KEY_STRENGTH (const WCHAR []){'K','e','y','S','t','r','e','n','g','t','h',0} +#define BCRYPT_OBJECT_LENGTH (const WCHAR []){'O','b','j','e','c','t','L','e','n','g','t','h',0} +#define BCRYPT_PADDING_SCHEMES (const WCHAR []){'P','a','d','d','i','n','g','S','c','h','e','m','e','s',0} +#define BCRYPT_PROVIDER_HANDLE (const WCHAR []){'P','r','o','v','i','d','e','r','H','a','n','d','l','e',0} +#define BCRYPT_SIGNATURE_LENGTH (const WCHAR []){'S','i','g','n','a','t','u','r','e','L','e','n','g','t','h',0} + +#define MS_PRIMITIVE_PROVIDER (const WCHAR [])\ + {'M','i','c','r','o','s','o','f','t',' ','P','r','i','m','i','t','i','v','e',' ','P','r','o','v','i','d','e','r',0} +#define MS_PLATFORM_CRYPTO_PROVIDER (const WCHAR [])\ + {'M','i','c','r','o','s','o','f','t',' ','P','l','a','t','f','o','r','m',' ','C','r','y','p','t','o',' ','P','r','o','v','i','d','e','r',0} + +#define BCRYPT_SHA1_ALGORITHM (const WCHAR []){'S','H','A','1',0} +#define BCRYPT_SHA256_ALGORITHM (const WCHAR []){'S','H','A','2','5','6',0} +#define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0} +#define BCRYPT_SHA512_ALGORITHM (const WCHAR []){'S','H','A','5','1','2',0} + typedef struct _BCRYPT_ALGORITHM_IDENTIFIER { LPWSTR pszName; @@ -54,4 +82,15 @@ #define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001 #define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002 +NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); +NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); +NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE); +NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG); +NTSTATUS WINAPI BCryptFinishHash(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG); +NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *); +NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); +NTSTATUS WINAPI BCryptHashData(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG); + #endif /* __WINE_BCRYPT_H */

1 0

[akhaldi] 70828: [ATL100_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 01 Mar '16

01 Mar '16

Author: akhaldi Date: Tue Mar 1 12:16:06 2016 New Revision: 70828 URL: http://svn.reactos.org/svn/reactos?rev=70828&view=rev Log: [ATL100_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/atl100/atl.c Modified: trunk/rostests/winetests/atl100/atl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl100/atl.c?re… ============================================================================== --- trunk/rostests/winetests/atl100/atl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl100/atl.c [iso-8859-1] Tue Mar 1 12:16:06 2016 @@ -71,10 +71,58 @@ static const WCHAR html_fileW[] = {'t','e','s','t','.','h','t','m','l','\0'}; static const char html_str[] = "<html><body>test</body><html>"; +static BOOL is_token_admin(HANDLE token) +{ + PSID administrators = NULL; + SID_IDENTIFIER_AUTHORITY nt_authority = { SECURITY_NT_AUTHORITY }; + DWORD groups_size; + PTOKEN_GROUPS groups; + DWORD group_index; + + /* Create a well-known SID for the Administrators group. */ + if (! AllocateAndInitializeSid(&nt_authority, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, + &administrators)) + return FALSE; + + /* Get the group info from the token */ + groups_size = 0; + GetTokenInformation(token, TokenGroups, NULL, 0, &groups_size); + groups = HeapAlloc(GetProcessHeap(), 0, groups_size); + if (groups == NULL) + { + FreeSid(administrators); + return FALSE; + } + if (! GetTokenInformation(token, TokenGroups, groups, groups_size, &groups_size)) + { + HeapFree(GetProcessHeap(), 0, groups); + FreeSid(administrators); + return FALSE; + } + + /* Now check if the token groups include the Administrators group */ + for (group_index = 0; group_index < groups->GroupCount; group_index++) + { + if (EqualSid(groups->Groups[group_index].Sid, administrators)) + { + HeapFree(GetProcessHeap(), 0, groups); + FreeSid(administrators); + return TRUE; + } + } + + /* If we end up here we didn't find the Administrators group */ + HeapFree(GetProcessHeap(), 0, groups); + FreeSid(administrators); + return FALSE; +} + static BOOL is_process_limited(void) { static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; HANDLE token; + BOOL result=FALSE; if (!pOpenProcessToken) { @@ -91,10 +139,19 @@ DWORD size; ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + if (ret) + { + if (type == TokenElevationTypeDefault) + /* UAC is disabled, check for administrators group */ + result = !is_token_admin(token); + else if (type == TokenElevationTypeFull) + result = FALSE; + else if (type == TokenElevationTypeLimited) + result = TRUE; + } CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); - } - return FALSE; + } + return result; } static void test_winmodule(void)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2016