Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 64243: [PSDK] * Add MSITRANSFORM_VALIDATE enum. CORE-8540
by akhaldi＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: akhaldi Date: Tue Sep 23 18:27:36 2014 New Revision: 64243 URL: http://svn.reactos.org/svn/reactos?rev=64243&view=rev Log: [PSDK] * Add MSITRANSFORM_VALIDATE enum. CORE-8540 Modified: trunk/reactos/include/psdk/msiquery.h Modified: trunk/reactos/include/psdk/msiquery.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msiquery.h?re… ============================================================================== --- trunk/reactos/include/psdk/msiquery.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msiquery.h [iso-8859-1] Tue Sep 23 18:27:36 2014 @@ -145,6 +145,21 @@ MSIDBSTATE_WRITE = 1 } MSIDBSTATE; +typedef enum tagMSITRANSFORM_VALIDATE +{ + MSITRANSFORM_VALIDATE_LANGUAGE = 0x00000001, + MSITRANSFORM_VALIDATE_PRODUCT = 0x00000002, + MSITRANSFORM_VALIDATE_PLATFORM = 0x00000004, + MSITRANSFORM_VALIDATE_MAJORVERSION = 0x00000008, + MSITRANSFORM_VALIDATE_MINORVERSION = 0x00000010, + MSITRANSFORM_VALIDATE_UPDATEVERSION = 0x00000020, + MSITRANSFORM_VALIDATE_NEWLESSBASEVERSION = 0x00000040, + MSITRANSFORM_VALIDATE_NEWLESSEQUALBASEVERSION = 0x00000080, + MSITRANSFORM_VALIDATE_NEWEQUALBASEVERSION = 0x00000100, + MSITRANSFORM_VALIDATE_NEWGREATEREQUALBASEVERSION = 0x00000200, + MSITRANSFORM_VALIDATE_NEWGREATERBASEVERSION = 0x00000400, + MSITRANSFORM_VALIDATE_UPGRADECODE = 0x00000800 +} MSITRANSFORM_VALIDATE; #ifdef __cplusplus extern "C" {

1 0

[jgardou] 64242: [NTOS/MM] - Simplify and fix MmCopyVirtualMemory, where the processes where not correctly detached on failure. Fixes a few "Process xyz.exe" is a zombie.
by jgardou＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: jgardou Date: Tue Sep 23 18:06:47 2014 New Revision: 64242 URL: http://svn.reactos.org/svn/reactos?rev=64242&view=rev Log: [NTOS/MM] - Simplify and fix MmCopyVirtualMemory, where the processes where not correctly detached on failure. Fixes a few "Process xyz.exe" is a zombie. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Sep 23 18:06:47 2014 @@ -774,10 +774,10 @@ PFN_NUMBER MdlBuffer[(sizeof(MDL) / sizeof(PFN_NUMBER)) + MI_MAPPED_COPY_PAGES + 1]; PMDL Mdl = (PMDL)MdlBuffer; SIZE_T TotalSize, CurrentSize, RemainingSize; - volatile BOOLEAN FailedInProbe = FALSE, FailedInMapping = FALSE, FailedInMoving; - volatile BOOLEAN PagesLocked; + volatile BOOLEAN FailedInProbe = FALSE; + volatile BOOLEAN PagesLocked = FALSE; PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; - volatile PVOID MdlAddress; + volatile PVOID MdlAddress = NULL; KAPC_STATE ApcState; BOOLEAN HaveBadAddress; ULONG_PTR BadAddress; @@ -808,11 +808,10 @@ KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); // - // Reset state for this pass - // - MdlAddress = NULL; - PagesLocked = FALSE; - FailedInMoving = FALSE; + // Check state for this pass + // + ASSERT(MdlAddress == NULL); + ASSERT(PagesLocked == FALSE); ASSERT(FailedInProbe == FALSE); // @@ -847,35 +846,47 @@ MmInitializeMdl(Mdl, CurrentAddress, CurrentSize); MmProbeAndLockPages(Mdl, PreviousMode, IoReadAccess); PagesLocked = TRUE; - - // - // Now map the pages - // - MdlAddress = MmMapLockedPagesSpecifyCache(Mdl, - KernelMode, - MmCached, - NULL, - FALSE, - HighPagePriority); - if (!MdlAddress) - { - // - // Use our SEH handler to pick this up - // - FailedInMapping = TRUE; - ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); - } - - // - // Now let go of the source and grab to the target process - // - KeUnstackDetachProcess(&ApcState); - KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); - + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + /* Detach from source process */ + KeUnstackDetachProcess(&ApcState); + + if (Status != STATUS_SUCCESS) + { + goto Exit; + } + + // + // Now map the pages + // + MdlAddress = MmMapLockedPagesSpecifyCache(Mdl, + KernelMode, + MmCached, + NULL, + FALSE, + HighPagePriority); + if (!MdlAddress) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Exit; + } + + // + // Grab to the target process + // + KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); + + _SEH2_TRY + { // // Check if this is our first time through // - if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) + if ((CurrentTargetAddress == TargetAddress) && (PreviousMode != KernelMode)) { // // Catch a failure here @@ -896,58 +907,27 @@ // // Now do the actual move // - FailedInMoving = TRUE; RtlCopyMemory(CurrentTargetAddress, MdlAddress, CurrentSize); } _SEH2_EXCEPT(MiGetExceptionInfo(_SEH2_GetExceptionInformation(), &HaveBadAddress, &BadAddress)) { - // - // Detach from whoever we may be attached to - // - KeUnstackDetachProcess(&ApcState); - - // - // Check if we had mapped the pages - // - if (MdlAddress) MmUnmapLockedPages(MdlAddress, Mdl); - - // - // Check if we had locked the pages - // - if (PagesLocked) MmUnlockPages(Mdl); - - // - // Check if we hit working set quota - // - if (_SEH2_GetExceptionCode() == STATUS_WORKING_SET_QUOTA) - { - // - // Return the error - // - _SEH2_YIELD(return STATUS_WORKING_SET_QUOTA); - } - - // - // Check if we failed during the probe or mapping - // - if ((FailedInProbe) || (FailedInMapping)) + *ReturnSize = BufferSize - RemainingSize; + // + // Check if we failed during the probe + // + if (FailedInProbe) { // // Exit // Status = _SEH2_GetExceptionCode(); - _SEH2_YIELD(return Status); - } - - // - // Otherwise, we failed probably during the move - // - *ReturnSize = BufferSize - RemainingSize; - if (FailedInMoving) - { - // + } + else + { + // + // Othewise we failed during the move. // Check if we know exactly where we stopped copying // if (HaveBadAddress) @@ -957,30 +937,32 @@ // *ReturnSize = BadAddress - (ULONG_PTR)SourceAddress; } - } - - // - // Return partial copy - // - Status = STATUS_PARTIAL_COPY; + // + // Return partial copy + // + Status = STATUS_PARTIAL_COPY; + } } _SEH2_END; + /* Detach from target process */ + KeUnstackDetachProcess(&ApcState); + // // Check for SEH status // - if (Status != STATUS_SUCCESS) return Status; - - // - // Detach from target - // - KeUnstackDetachProcess(&ApcState); + if (Status != STATUS_SUCCESS) + { + goto Exit; + } // // Unmap and unlock // MmUnmapLockedPages(MdlAddress, Mdl); + MdlAddress = NULL; MmUnlockPages(Mdl); + PagesLocked = FALSE; // // Update location and size @@ -990,11 +972,18 @@ CurrentTargetAddress = (PVOID)((ULONG_PTR)CurrentTargetAddress + CurrentSize); } +Exit: + if (MdlAddress != NULL) + MmUnmapLockedPages(MdlAddress, Mdl); + if (PagesLocked) + MmUnlockPages(Mdl); + // // All bytes read // - *ReturnSize = BufferSize; - return STATUS_SUCCESS; + if (Status == STATUS_SUCCESS) + *ReturnSize = BufferSize; + return Status; } NTSTATUS @@ -1009,7 +998,7 @@ { UCHAR StackBuffer[MI_POOL_COPY_BYTES]; SIZE_T TotalSize, CurrentSize, RemainingSize; - volatile BOOLEAN FailedInProbe = FALSE, FailedInMoving, HavePoolAddress = FALSE; + volatile BOOLEAN FailedInProbe = FALSE, HavePoolAddress = FALSE; PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; PVOID PoolAddress; KAPC_STATE ApcState; @@ -1018,6 +1007,9 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); + DPRINT("Copying %Iu bytes from process %p (address %p) to process %p (Address %p)\n", + BufferSize, SourceProcess, SourceAddress, TargetProcess, TargetAddress); + // // Calculate the maximum amount of data to move // @@ -1061,11 +1053,9 @@ // KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); - // - // Reset state for this pass - // - FailedInMoving = FALSE; + /* Check that state is sane */ ASSERT(FailedInProbe == FALSE); + ASSERT(Status == STATUS_SUCCESS); // // Protect user-mode copy @@ -1097,53 +1087,12 @@ // Do the copy // RtlCopyMemory(PoolAddress, CurrentAddress, CurrentSize); - - // - // Now let go of the source and grab to the target process - // - KeUnstackDetachProcess(&ApcState); - KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); - - // - // Check if this is our first time through - // - if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) - { - // - // Catch a failure here - // - FailedInProbe = TRUE; - - // - // Do the probe - // - ProbeForWrite(TargetAddress, BufferSize, sizeof(CHAR)); - - // - // Passed - // - FailedInProbe = FALSE; - } - - // - // Now do the actual move - // - FailedInMoving = TRUE; - RtlCopyMemory(CurrentTargetAddress, PoolAddress, CurrentSize); } _SEH2_EXCEPT(MiGetExceptionInfo(_SEH2_GetExceptionInformation(), &HaveBadAddress, &BadAddress)) { - // - // Detach from whoever we may be attached to - // - KeUnstackDetachProcess(&ApcState); - - // - // Check if we had allocated pool - // - if (HavePoolAddress) ExFreePoolWithTag(PoolAddress, 'VmRw'); + *ReturnSize = BufferSize - RemainingSize; // // Check if we failed during the probe @@ -1154,16 +1103,11 @@ // Exit // Status = _SEH2_GetExceptionCode(); - _SEH2_YIELD(return Status); - } - - // - // Otherwise, we failed, probably during the move - // - *ReturnSize = BufferSize - RemainingSize; - if (FailedInMoving) - { - // + } + else + { + // + // We failed during the move. // Check if we know exactly where we stopped copying // if (HaveBadAddress) @@ -1173,24 +1117,101 @@ // *ReturnSize = BadAddress - (ULONG_PTR)SourceAddress; } - } - - // - // Return partial copy - // - Status = STATUS_PARTIAL_COPY; + // + // Return partial copy + // + Status = STATUS_PARTIAL_COPY; + } + } + _SEH2_END + + /* Let go of the source */ + KeUnstackDetachProcess(&ApcState); + + if (Status != STATUS_SUCCESS) + { + goto Exit; + } + + /* Grab the target process */ + KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); + + _SEH2_TRY + { + // + // Check if this is our first time through + // + if ((CurrentTargetAddress == TargetAddress) && (PreviousMode != KernelMode)) + { + // + // Catch a failure here + // + FailedInProbe = TRUE; + + // + // Do the probe + // + ProbeForWrite(TargetAddress, BufferSize, sizeof(CHAR)); + + // + // Passed + // + FailedInProbe = FALSE; + } + + // + // Now do the actual move + // + RtlCopyMemory(CurrentTargetAddress, PoolAddress, CurrentSize); + } + _SEH2_EXCEPT(MiGetExceptionInfo(_SEH2_GetExceptionInformation(), + &HaveBadAddress, + &BadAddress)) + { + *ReturnSize = BufferSize - RemainingSize; + // + // Check if we failed during the probe + // + if (FailedInProbe) + { + // + // Exit + // + Status = _SEH2_GetExceptionCode(); + } + else + { + // + // Otherwise we failed during the move. + // Check if we know exactly where we stopped copying + // + if (HaveBadAddress) + { + // + // Return the exact number of bytes copied + // + *ReturnSize = BadAddress - (ULONG_PTR)SourceAddress; + } + // + // Return partial copy + // + Status = STATUS_PARTIAL_COPY; + } } _SEH2_END; // + // Detach from target + // + KeUnstackDetachProcess(&ApcState); + + // // Check for SEH status // - if (Status != STATUS_SUCCESS) return Status; - - // - // Detach from target - // - KeUnstackDetachProcess(&ApcState); + if (Status != STATUS_SUCCESS) + { + goto Exit; + } // // Update location and size @@ -1201,16 +1222,19 @@ CurrentSize); } +Exit: // // Check if we had allocated pool // - if (HavePoolAddress) ExFreePoolWithTag(PoolAddress, 'VmRw'); + if (HavePoolAddress) + ExFreePoolWithTag(PoolAddress, 'VmRw'); // // All bytes read // - *ReturnSize = BufferSize; - return STATUS_SUCCESS; + if (Status == STATUS_SUCCESS) + *ReturnSize = BufferSize; + return Status; } NTSTATUS

1 0

[jgardou] 64241: [HIVESFT] - Remove some useless certificates - Add the relevant root certificates for reactos.org and google.com
by jgardou＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: jgardou Date: Tue Sep 23 18:06:36 2014 New Revision: 64241 URL: http://svn.reactos.org/svn/reactos?rev=64241&view=rev Log: [HIVESFT] - Remove some useless certificates - Add the relevant root certificates for reactos.org and google.com Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Tue Sep 23 18:06:36 2014 @@ -249,130 +249,64 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","LastBootTimeFontCacheState",0x00010001,0x00000002 ; Certificates -; RapidSSL CA -HKLM,"SOFTWARE\Microsoft\SystemCertificates\CA\Certificates\C039A3269EE4B8E82D00C53FA797B5A19E836F47","Blob",0x00000001,\ - 0x20,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xD9,0x03,0x00,0x00,0x30,0x82,0x03,0xD5,\ - 0x30,0x82,0x02,0xBD,0xA0,0x03,0x02,0x01,0x02,0x02,0x03,0x02,0x36,0xD1,0x30,0x0D,\ +; GeoTrustGlobal CA (root) +HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\DE28F4A4FFE5B92FA3C503D1A349A7F9962A8212","Blob",0x00000001,\ + 0x20,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x58,0x03,0x00,0x00,0x30,0x82,0x03,0x54,\ + 0x30,0x82,0x02,0x3C,0xA0,0x03,0x02,0x01,0x02,0x02,0x03,0x02,0x34,0x56,0x30,0x0D,\ 0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,0x30,0x42,0x31,\ 0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x16,0x30,0x14,\ 0x06,0x03,0x55,0x04,0x0A,0x13,0x0D,0x47,0x65,0x6F,0x54,0x72,0x75,0x73,0x74,0x20,\ 0x49,0x6E,0x63,0x2E,0x31,0x1B,0x30,0x19,0x06,0x03,0x55,0x04,0x03,0x13,0x12,0x47,\ 0x65,0x6F,0x54,0x72,0x75,0x73,0x74,0x20,0x47,0x6C,0x6F,0x62,0x61,0x6C,0x20,0x43,\ - 0x41,0x30,0x1E,0x17,0x0D,0x31,0x30,0x30,0x32,0x31,0x39,0x32,0x32,0x34,0x35,0x30,\ - 0x35,0x5A,0x17,0x0D,0x32,0x30,0x30,0x32,0x31,0x38,0x32,0x32,0x34,0x35,0x30,0x35,\ - 0x5A,0x30,0x3C,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,\ - 0x31,0x17,0x30,0x15,0x06,0x03,0x55,0x04,0x0A,0x13,0x0E,0x47,0x65,0x6F,0x54,0x72,\ - 0x75,0x73,0x74,0x2C,0x20,0x49,0x6E,0x63,0x2E,0x31,0x14,0x30,0x12,0x06,0x03,0x55,\ - 0x04,0x03,0x13,0x0B,0x52,0x61,0x70,0x69,0x64,0x53,0x53,0x4C,0x20,0x43,0x41,0x30,\ - 0x82,0x01,0x22,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,\ - 0x05,0x00,0x03,0x82,0x01,0x0F,0x00,0x30,0x82,0x01,0x0A,0x02,0x82,0x01,0x01,0x00,\ - 0xC7,0x71,0xF8,0x56,0xC7,0x1E,0xD9,0xCC,0xB5,0xAD,0xF6,0xB4,0x97,0xA3,0xFB,0xA1,\ - 0xE6,0x0B,0x50,0x5F,0x50,0xAA,0x3A,0xDA,0x0F,0xFC,0x3D,0x29,0x24,0x43,0xC6,0x10,\ - 0x29,0xC1,0xFC,0x55,0x40,0x72,0xEE,0xBD,0xEA,0xDF,0x9F,0xB6,0x41,0xF4,0x48,0x4B,\ - 0xC8,0x6E,0xFE,0x4F,0x57,0x12,0x8B,0x5B,0xFA,0x92,0xDD,0x5E,0xE8,0xAD,0xF3,0xF0,\ - 0x1B,0xB1,0x7B,0x4D,0xFB,0xCF,0xFD,0xD1,0xE5,0xF8,0xE3,0xDC,0xE7,0xF5,0x73,0x7F,\ - 0xDF,0x01,0x49,0xCF,0x8C,0x56,0xC1,0xBD,0x37,0xE3,0x5B,0xBE,0xB5,0x4F,0x8B,0x8B,\ - 0xF0,0xDA,0x4F,0xC7,0xE3,0xDD,0x55,0x47,0x69,0xDF,0xF2,0x5B,0x7B,0x07,0x4F,0x3D,\ - 0xE5,0xAC,0x21,0xC1,0xC8,0x1D,0x7A,0xE8,0xE7,0xF6,0x0F,0xA1,0xAA,0xF5,0x6F,0xDE,\ - 0xA8,0x65,0x4F,0x10,0x89,0x9C,0x03,0xF3,0x89,0x7A,0xA5,0x5E,0x01,0x72,0x33,0xED,\ - 0xA9,0xE9,0x5A,0x1E,0x79,0xF3,0x87,0xC8,0xDF,0xC8,0xC5,0xFC,0x37,0xC8,0x9A,0x9A,\ - 0xD7,0xB8,0x76,0xCC,0xB0,0x3E,0xE7,0xFD,0xE6,0x54,0xEA,0xDF,0x5F,0x52,0x41,0x78,\ - 0x59,0x57,0xAD,0xF1,0x12,0xD6,0x7F,0xBC,0xD5,0x9F,0x70,0xD3,0x05,0x6C,0xFA,0xA3,\ - 0x7D,0x67,0x58,0xDD,0x26,0x62,0x1D,0x31,0x92,0x0C,0x79,0x79,0x1C,0x8E,0xCF,0xCA,\ - 0x7B,0xC1,0x66,0xAF,0xA8,0x74,0x48,0xFB,0x8E,0x82,0xC2,0x9E,0x2C,0x99,0x5C,0x7B,\ - 0x2D,0x5D,0x9B,0xBC,0x5B,0x57,0x9E,0x7C,0x3A,0x7A,0x13,0xAD,0xF2,0xA3,0x18,0x5B,\ - 0x2B,0x59,0x0F,0xCD,0x5C,0x3A,0xEB,0x68,0x33,0xC6,0x28,0x1D,0x82,0xD1,0x50,0x8B,\ - 0x02,0x03,0x01,0x00,0x01,0xA3,0x81,0xD9,0x30,0x81,0xD6,0x30,0x0E,0x06,0x03,0x55,\ - 0x1D,0x0F,0x01,0x01,0xFF,0x04,0x04,0x03,0x02,0x01,0x06,0x30,0x1D,0x06,0x03,0x55,\ - 0x1D,0x0E,0x04,0x16,0x04,0x14,0x6B,0x69,0x3D,0x6A,0x18,0x42,0x4A,0xDD,0x8F,0x02,\ - 0x65,0x39,0xFD,0x35,0x24,0x86,0x78,0x91,0x16,0x30,0x30,0x1F,0x06,0x03,0x55,0x1D,\ - 0x23,0x04,0x18,0x30,0x16,0x80,0x14,0xC0,0x7A,0x98,0x68,0x8D,0x89,0xFB,0xAB,0x05,\ - 0x64,0x0C,0x11,0x7D,0xAA,0x7D,0x65,0xB8,0xCA,0xCC,0x4E,0x30,0x12,0x06,0x03,0x55,\ - 0x1D,0x13,0x01,0x01,0xFF,0x04,0x08,0x30,0x06,0x01,0x01,0xFF,0x02,0x01,0x00,0x30,\ - 0x3A,0x06,0x03,0x55,0x1D,0x1F,0x04,0x33,0x30,0x31,0x30,0x2F,0xA0,0x2D,0xA0,0x2B,\ - 0x86,0x29,0x68,0x74,0x74,0x70,0x3A,0x2F,0x2F,0x63,0x72,0x6C,0x2E,0x67,0x65,0x6F,\ - 0x74,0x72,0x75,0x73,0x74,0x2E,0x63,0x6F,0x6D,0x2F,0x63,0x72,0x6C,0x73,0x2F,0x67,\ - 0x74,0x67,0x6C,0x6F,0x62,0x61,0x6C,0x2E,0x63,0x72,0x6C,0x30,0x34,0x06,0x08,0x2B,\ - 0x06,0x01,0x05,0x05,0x07,0x01,0x01,0x04,0x28,0x30,0x26,0x30,0x24,0x06,0x08,0x2B,\ - 0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x86,0x18,0x68,0x74,0x74,0x70,0x3A,0x2F,0x2F,\ - 0x6F,0x63,0x73,0x70,0x2E,0x67,0x65,0x6F,0x74,0x72,0x75,0x73,0x74,0x2E,0x63,0x6F,\ - 0x6D,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,\ - 0x03,0x82,0x01,0x01,0x00,0xAB,0xBC,0xBC,0x0A,0x5D,0x18,0x94,0xE3,0xC1,0xB1,0xC3,\ - 0xA8,0x4C,0x55,0xD6,0xBE,0xB4,0x98,0xF1,0xEE,0x3C,0x1C,0xCD,0xCF,0xF3,0x24,0x24,\ - 0x5C,0x96,0x03,0x27,0x58,0xFC,0x36,0xAE,0xA2,0x2F,0x8F,0xF1,0xFE,0xDA,0x2B,0x02,\ - 0xC3,0x33,0xBD,0xC8,0xDD,0x48,0x22,0x2B,0x60,0x0F,0xA5,0x03,0x10,0xFD,0x77,0xF8,\ - 0xD0,0xED,0x96,0x67,0x4F,0xFD,0xEA,0x47,0x20,0x70,0x54,0xDC,0xA9,0x0C,0x55,0x7E,\ - 0xE1,0x96,0x25,0x8A,0xD9,0xB5,0xDA,0x57,0x4A,0xBE,0x8D,0x8E,0x49,0x43,0x63,0xA5,\ - 0x6C,0x4E,0x27,0x87,0x25,0xEB,0x5B,0x6D,0xFE,0xA2,0x7F,0x38,0x28,0xE0,0x36,0xAB,\ - 0xAD,0x39,0xA5,0xA5,0x62,0xC4,0xB7,0x5C,0x58,0x2C,0xAA,0x5D,0x01,0x60,0xA6,0x62,\ - 0x67,0xA3,0xC0,0xC7,0x62,0x23,0xF4,0xE7,0x6C,0x46,0xEE,0xB5,0xD3,0x80,0x6A,0x22,\ - 0x13,0xD2,0x2D,0x3F,0x74,0x4F,0xEA,0xAF,0x8C,0x5F,0xB4,0x38,0x9C,0xDB,0xAE,0xCE,\ - 0xAF,0x84,0x1E,0xA6,0xF6,0x34,0x51,0x59,0x79,0xD3,0xE3,0x75,0xDC,0xBC,0xD7,0xF3,\ - 0x73,0xDF,0x92,0xEC,0xD2,0x20,0x59,0x6F,0x9C,0xFB,0x95,0xF8,0x92,0x76,0x18,0x0A,\ - 0x7C,0x0F,0x2C,0xA6,0xCA,0xDE,0x8A,0x62,0x7B,0xD8,0xF3,0xCE,0x5F,0x68,0xBD,0x8F,\ - 0x3E,0xC1,0x74,0xBB,0x15,0x72,0x3A,0x16,0x83,0xA9,0x0B,0xE6,0x4D,0x99,0x9C,0xD8,\ - 0x57,0xEC,0xA8,0x01,0x51,0xC7,0x6F,0x57,0x34,0x5E,0xAB,0x4A,0x2C,0x42,0xF6,0x4F,\ - 0x1C,0x89,0x78,0xDE,0x26,0x4E,0xF5,0x6F,0x93,0x4C,0x15,0x6B,0x27,0x56,0x4D,0x00,\ - 0x54,0x6C,0x7A,0xB7,0xB7 -; GeoTrustGlobal CA -HKLM,"SOFTWARE\Microsoft\SystemCertificates\CA\Certificates\7359755C6DF9A0ABC3060BCE369564C8EC4542A3","Blob",0x00000001,\ - 0x20,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x81,0x03,0x00,0x00,0x30,0x82,0x03,0x7D,\ - 0x30,0x82,0x02,0xE6,0xA0,0x03,0x02,0x01,0x02,0x02,0x03,0x12,0xBB,0xE6,0x30,0x0D,\ - 0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,0x30,0x4E,0x31,\ - 0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x10,0x30,0x0E,\ - 0x06,0x03,0x55,0x04,0x0A,0x13,0x07,0x45,0x71,0x75,0x69,0x66,0x61,0x78,0x31,0x2D,\ - 0x30,0x2B,0x06,0x03,0x55,0x04,0x0B,0x13,0x24,0x45,0x71,0x75,0x69,0x66,0x61,0x78,\ - 0x20,0x53,0x65,0x63,0x75,0x72,0x65,0x20,0x43,0x65,0x72,0x74,0x69,0x66,0x69,0x63,\ - 0x61,0x74,0x65,0x20,0x41,0x75,0x74,0x68,0x6F,0x72,0x69,0x74,0x79,0x30,0x1E,0x17,\ - 0x0D,0x30,0x32,0x30,0x35,0x32,0x31,0x30,0x34,0x30,0x30,0x30,0x30,0x5A,0x17,0x0D,\ - 0x31,0x38,0x30,0x38,0x32,0x31,0x30,0x34,0x30,0x30,0x30,0x30,0x5A,0x30,0x42,0x31,\ - 0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x16,0x30,0x14,\ - 0x06,0x03,0x55,0x04,0x0A,0x13,0x0D,0x47,0x65,0x6F,0x54,0x72,0x75,0x73,0x74,0x20,\ - 0x49,0x6E,0x63,0x2E,0x31,0x1B,0x30,0x19,0x06,0x03,0x55,0x04,0x03,0x13,0x12,0x47,\ - 0x65,0x6F,0x54,0x72,0x75,0x73,0x74,0x20,0x47,0x6C,0x6F,0x62,0x61,0x6C,0x20,0x43,\ - 0x41,0x30,0x82,0x01,0x22,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,\ - 0x01,0x01,0x05,0x00,0x03,0x82,0x01,0x0F,0x00,0x30,0x82,0x01,0x0A,0x02,0x82,0x01,\ - 0x01,0x00,0xDA,0xCC,0x18,0x63,0x30,0xFD,0xF4,0x17,0x23,0x1A,0x56,0x7E,0x5B,0xDF,\ - 0x3C,0x6C,0x38,0xE4,0x71,0xB7,0x78,0x91,0xD4,0xBC,0xA1,0xD8,0x4C,0xF8,0xA8,0x43,\ - 0xB6,0x03,0xE9,0x4D,0x21,0x07,0x08,0x88,0xDA,0x58,0x2F,0x66,0x39,0x29,0xBD,0x05,\ - 0x78,0x8B,0x9D,0x38,0xE8,0x05,0xB7,0x6A,0x7E,0x71,0xA4,0xE6,0xC4,0x60,0xA6,0xB0,\ - 0xEF,0x80,0xE4,0x89,0x28,0x0F,0x9E,0x25,0xD6,0xED,0x83,0xF3,0xAD,0xA6,0x91,0xC7,\ - 0x98,0xC9,0x42,0x18,0x35,0x14,0x9D,0xAD,0x98,0x46,0x92,0x2E,0x4F,0xCA,0xF1,0x87,\ - 0x43,0xC1,0x16,0x95,0x57,0x2D,0x50,0xEF,0x89,0x2D,0x80,0x7A,0x57,0xAD,0xF2,0xEE,\ - 0x5F,0x6B,0xD2,0x00,0x8D,0xB9,0x14,0xF8,0x14,0x15,0x35,0xD9,0xC0,0x46,0xA3,0x7B,\ - 0x72,0xC8,0x91,0xBF,0xC9,0x55,0x2B,0xCD,0xD0,0x97,0x3E,0x9C,0x26,0x64,0xCC,0xDF,\ - 0xCE,0x83,0x19,0x71,0xCA,0x4E,0xE6,0xD4,0xD5,0x7B,0xA9,0x19,0xCD,0x55,0xDE,0xC8,\ - 0xEC,0xD2,0x5E,0x38,0x53,0xE5,0x5C,0x4F,0x8C,0x2D,0xFE,0x50,0x23,0x36,0xFC,0x66,\ - 0xE6,0xCB,0x8E,0xA4,0x39,0x19,0x00,0xB7,0x95,0x02,0x39,0x91,0x0B,0x0E,0xFE,0x38,\ - 0x2E,0xD1,0x1D,0x05,0x9A,0xF6,0x4D,0x3E,0x6F,0x0F,0x07,0x1D,0xAF,0x2C,0x1E,0x8F,\ - 0x60,0x39,0xE2,0xFA,0x36,0x53,0x13,0x39,0xD4,0x5E,0x26,0x2B,0xDB,0x3D,0xA8,0x14,\ - 0xBD,0x32,0xEB,0x18,0x03,0x28,0x52,0x04,0x71,0xE5,0xAB,0x33,0x3D,0xE1,0x38,0xBB,\ - 0x07,0x36,0x84,0x62,0x9C,0x79,0xEA,0x16,0x30,0xF4,0x5F,0xC0,0x2B,0xE8,0x71,0x6B,\ - 0xE4,0xF9,0x02,0x03,0x01,0x00,0x01,0xA3,0x81,0xF0,0x30,0x81,0xED,0x30,0x1F,0x06,\ - 0x03,0x55,0x1D,0x23,0x04,0x18,0x30,0x16,0x80,0x14,0x48,0xE6,0x68,0xF9,0x2B,0xD2,\ - 0xB2,0x95,0xD7,0x47,0xD8,0x23,0x20,0x10,0x4F,0x33,0x98,0x90,0x9F,0xD4,0x30,0x1D,\ - 0x06,0x03,0x55,0x1D,0x0E,0x04,0x16,0x04,0x14,0xC0,0x7A,0x98,0x68,0x8D,0x89,0xFB,\ - 0xAB,0x05,0x64,0x0C,0x11,0x7D,0xAA,0x7D,0x65,0xB8,0xCA,0xCC,0x4E,0x30,0x0F,0x06,\ - 0x03,0x55,0x1D,0x13,0x01,0x01,0xFF,0x04,0x05,0x30,0x03,0x01,0x01,0xFF,0x30,0x0E,\ - 0x06,0x03,0x55,0x1D,0x0F,0x01,0x01,0xFF,0x04,0x04,0x03,0x02,0x01,0x06,0x30,0x3A,\ - 0x06,0x03,0x55,0x1D,0x1F,0x04,0x33,0x30,0x31,0x30,0x2F,0xA0,0x2D,0xA0,0x2B,0x86,\ - 0x29,0x68,0x74,0x74,0x70,0x3A,0x2F,0x2F,0x63,0x72,0x6C,0x2E,0x67,0x65,0x6F,0x74,\ - 0x72,0x75,0x73,0x74,0x2E,0x63,0x6F,0x6D,0x2F,0x63,0x72,0x6C,0x73,0x2F,0x73,0x65,\ - 0x63,0x75,0x72,0x65,0x63,0x61,0x2E,0x63,0x72,0x6C,0x30,0x4E,0x06,0x03,0x55,0x1D,\ - 0x20,0x04,0x47,0x30,0x45,0x30,0x43,0x06,0x04,0x55,0x1D,0x20,0x00,0x30,0x3B,0x30,\ - 0x39,0x06,0x08,0x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x01,0x16,0x2D,0x68,0x74,0x74,\ - 0x70,0x73,0x3A,0x2F,0x2F,0x77,0x77,0x77,0x2E,0x67,0x65,0x6F,0x74,0x72,0x75,0x73,\ - 0x74,0x2E,0x63,0x6F,0x6D,0x2F,0x72,0x65,0x73,0x6F,0x75,0x72,0x63,0x65,0x73,0x2F,\ - 0x72,0x65,0x70,0x6F,0x73,0x69,0x74,0x6F,0x72,0x79,0x30,0x0D,0x06,0x09,0x2A,0x86,\ - 0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,0x03,0x81,0x81,0x00,0x76,0xE1,0x12,\ - 0x6E,0x4E,0x4B,0x16,0x12,0x86,0x30,0x06,0xB2,0x81,0x08,0xCF,0xF0,0x08,0xC7,0xC7,\ - 0x71,0x7E,0x66,0xEE,0xC2,0xED,0xD4,0x3B,0x1F,0xFF,0xF0,0xF0,0xC8,0x4E,0xD6,0x43,\ - 0x38,0xB0,0xB9,0x30,0x7D,0x18,0xD0,0x55,0x83,0xA2,0x6A,0xCB,0x36,0x11,0x9C,0xE8,\ - 0x48,0x66,0xA3,0x6D,0x7F,0xB8,0x13,0xD4,0x47,0xFE,0x8B,0x5A,0x5C,0x73,0xFC,0xAE,\ - 0xD9,0x1B,0x32,0x19,0x38,0xAB,0x97,0x34,0x14,0xAA,0x96,0xD2,0xEB,0xA3,0x1C,0x14,\ - 0x08,0x49,0xB6,0xBB,0xE5,0x91,0xEF,0x83,0x36,0xEB,0x1D,0x56,0x6F,0xCA,0xDA,0xBC,\ - 0x73,0x63,0x90,0xE4,0x7F,0x7B,0x3E,0x22,0xCB,0x3D,0x07,0xED,0x5F,0x38,0x74,0x9C,\ - 0xE3,0x03,0x50,0x4E,0xA1,0xAF,0x98,0xEE,0x61,0xF2,0x84,0x3F,0x12 + 0x41,0x30,0x1E,0x17,0x0D,0x30,0x32,0x30,0x35,0x32,0x31,0x30,0x34,0x30,0x30,0x30,\ + 0x30,0x5A,0x17,0x0D,0x32,0x32,0x30,0x35,0x32,0x31,0x30,0x34,0x30,0x30,0x30,0x30,\ + 0x5A,0x30,0x42,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,\ + 0x31,0x16,0x30,0x14,0x06,0x03,0x55,0x04,0x0A,0x13,0x0D,0x47,0x65,0x6F,0x54,0x72,\ + 0x75,0x73,0x74,0x20,0x49,0x6E,0x63,0x2E,0x31,0x1B,0x30,0x19,0x06,0x03,0x55,0x04,\ + 0x03,0x13,0x12,0x47,0x65,0x6F,0x54,0x72,0x75,0x73,0x74,0x20,0x47,0x6C,0x6F,0x62,\ + 0x61,0x6C,0x20,0x43,0x41,0x30,0x82,0x01,0x22,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,\ + 0x86,0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,0x03,0x82,0x01,0x0F,0x00,0x30,0x82,0x01,\ + 0x0A,0x02,0x82,0x01,0x01,0x00,0xDA,0xCC,0x18,0x63,0x30,0xFD,0xF4,0x17,0x23,0x1A,\ + 0x56,0x7E,0x5B,0xDF,0x3C,0x6C,0x38,0xE4,0x71,0xB7,0x78,0x91,0xD4,0xBC,0xA1,0xD8,\ + 0x4C,0xF8,0xA8,0x43,0xB6,0x03,0xE9,0x4D,0x21,0x07,0x08,0x88,0xDA,0x58,0x2F,0x66,\ + 0x39,0x29,0xBD,0x05,0x78,0x8B,0x9D,0x38,0xE8,0x05,0xB7,0x6A,0x7E,0x71,0xA4,0xE6,\ + 0xC4,0x60,0xA6,0xB0,0xEF,0x80,0xE4,0x89,0x28,0x0F,0x9E,0x25,0xD6,0xED,0x83,0xF3,\ + 0xAD,0xA6,0x91,0xC7,0x98,0xC9,0x42,0x18,0x35,0x14,0x9D,0xAD,0x98,0x46,0x92,0x2E,\ + 0x4F,0xCA,0xF1,0x87,0x43,0xC1,0x16,0x95,0x57,0x2D,0x50,0xEF,0x89,0x2D,0x80,0x7A,\ + 0x57,0xAD,0xF2,0xEE,0x5F,0x6B,0xD2,0x00,0x8D,0xB9,0x14,0xF8,0x14,0x15,0x35,0xD9,\ + 0xC0,0x46,0xA3,0x7B,0x72,0xC8,0x91,0xBF,0xC9,0x55,0x2B,0xCD,0xD0,0x97,0x3E,0x9C,\ + 0x26,0x64,0xCC,0xDF,0xCE,0x83,0x19,0x71,0xCA,0x4E,0xE6,0xD4,0xD5,0x7B,0xA9,0x19,\ + 0xCD,0x55,0xDE,0xC8,0xEC,0xD2,0x5E,0x38,0x53,0xE5,0x5C,0x4F,0x8C,0x2D,0xFE,0x50,\ + 0x23,0x36,0xFC,0x66,0xE6,0xCB,0x8E,0xA4,0x39,0x19,0x00,0xB7,0x95,0x02,0x39,0x91,\ + 0x0B,0x0E,0xFE,0x38,0x2E,0xD1,0x1D,0x05,0x9A,0xF6,0x4D,0x3E,0x6F,0x0F,0x07,0x1D,\ + 0xAF,0x2C,0x1E,0x8F,0x60,0x39,0xE2,0xFA,0x36,0x53,0x13,0x39,0xD4,0x5E,0x26,0x2B,\ + 0xDB,0x3D,0xA8,0x14,0xBD,0x32,0xEB,0x18,0x03,0x28,0x52,0x04,0x71,0xE5,0xAB,0x33,\ + 0x3D,0xE1,0x38,0xBB,0x07,0x36,0x84,0x62,0x9C,0x79,0xEA,0x16,0x30,0xF4,0x5F,0xC0,\ + 0x2B,0xE8,0x71,0x6B,0xE4,0xF9,0x02,0x03,0x01,0x00,0x01,0xA3,0x53,0x30,0x51,0x30,\ + 0x0F,0x06,0x03,0x55,0x1D,0x13,0x01,0x01,0xFF,0x04,0x05,0x30,0x03,0x01,0x01,0xFF,\ + 0x30,0x1D,0x06,0x03,0x55,0x1D,0x0E,0x04,0x16,0x04,0x14,0xC0,0x7A,0x98,0x68,0x8D,\ + 0x89,0xFB,0xAB,0x05,0x64,0x0C,0x11,0x7D,0xAA,0x7D,0x65,0xB8,0xCA,0xCC,0x4E,0x30,\ + 0x1F,0x06,0x03,0x55,0x1D,0x23,0x04,0x18,0x30,0x16,0x80,0x14,0xC0,0x7A,0x98,0x68,\ + 0x8D,0x89,0xFB,0xAB,0x05,0x64,0x0C,0x11,0x7D,0xAA,0x7D,0x65,0xB8,0xCA,0xCC,0x4E,\ + 0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,0x03,\ + 0x82,0x01,0x01,0x00,0x35,0xE3,0x29,0x6A,0xE5,0x2F,0x5D,0x54,0x8E,0x29,0x50,0x94,\ + 0x9F,0x99,0x1A,0x14,0xE4,0x8F,0x78,0x2A,0x62,0x94,0xA2,0x27,0x67,0x9E,0xD0,0xCF,\ + 0x1A,0x5E,0x47,0xE9,0xC1,0xB2,0xA4,0xCF,0xDD,0x41,0x1A,0x05,0x4E,0x9B,0x4B,0xEE,\ + 0x4A,0x6F,0x55,0x52,0xB3,0x24,0xA1,0x37,0x0A,0xEB,0x64,0x76,0x2A,0x2E,0x2C,0xF3,\ + 0xFD,0x3B,0x75,0x90,0xBF,0xFA,0x71,0xD8,0xC7,0x3D,0x37,0xD2,0xB5,0x05,0x95,0x62,\ + 0xB9,0xA6,0xDE,0x89,0x3D,0x36,0x7B,0x38,0x77,0x48,0x97,0xAC,0xA6,0x20,0x8F,0x2E,\ + 0xA6,0xC9,0x0C,0xC2,0xB2,0x99,0x45,0x00,0xC7,0xCE,0x11,0x51,0x22,0x22,0xE0,0xA5,\ + 0xEA,0xB6,0x15,0x48,0x09,0x64,0xEA,0x5E,0x4F,0x74,0xF7,0x05,0x3E,0xC7,0x8A,0x52,\ + 0x0C,0xDB,0x15,0xB4,0xBD,0x6D,0x9B,0xE5,0xC6,0xB1,0x54,0x68,0xA9,0xE3,0x69,0x90,\ + 0xB6,0x9A,0xA5,0x0F,0xB8,0xB9,0x3F,0x20,0x7D,0xAE,0x4A,0xB5,0xB8,0x9C,0xE4,0x1D,\ + 0xB6,0xAB,0xE6,0x94,0xA5,0xC1,0xC7,0x83,0xAD,0xDB,0xF5,0x27,0x87,0x0E,0x04,0x6C,\ + 0xD5,0xFF,0xDD,0xA0,0x5D,0xED,0x87,0x52,0xB7,0x2B,0x15,0x02,0xAE,0x39,0xA6,0x6A,\ + 0x74,0xE9,0xDA,0xC4,0xE7,0xBC,0x4D,0x34,0x1E,0xA9,0x5C,0x4D,0x33,0x5F,0x92,0x09,\ + 0x2F,0x88,0x66,0x5D,0x77,0x97,0xC7,0x1D,0x76,0x13,0xA9,0xD5,0xE5,0xF1,0x16,0x09,\ + 0x11,0x35,0xD5,0xAC,0xDB,0x24,0x71,0x70,0x2C,0x98,0x56,0x0B,0xD9,0x17,0xB4,0xD1,\ + 0xE3,0x51,0x2B,0x5E,0x75,0xE8,0xD5,0xD0,0xDC,0x4F,0x34,0xED,0xC2,0x05,0x66,0x80,\ + 0xA1,0xCB,0xE6,0x33 + ; Equifax Secure CA (root) HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\D23209AD23D314232174E40D7F9D62139786633A","Blob",0x00000001,\ 0x20,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x24,0x03,0x00,0x00,0x30,0x82,0x03,0x20,\ @@ -427,6 +361,65 @@ 0x27,0xA0,0x0D,0xFA,0xA7,0x73,0x5C,0xEA,0x70,0xF1,0x94,0x21,0x65,0x44,0x5F,0xFA,\ 0xFC,0xEF,0x29,0x68,0xA9,0xA2,0x87,0x79,0xEF,0x79,0xEF,0x4F,0xAC,0x07,0x77,0x38 +;GlobalSign Root CA +HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\B1BC968BD4F49D622AA89A81F2150152A41D829C","Blob",0x00000001,\ + 0x20,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x79,0x03,0x00,0x00,0x30,0x82,0x03,0x75,\ + 0x30,0x82,0x02,0x5D,0xA0,0x03,0x02,0x01,0x02,0x02,0x0B,0x04,0x00,0x00,0x00,0x00,\ + 0x01,0x15,0x4B,0x5A,0xC3,0x94,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,\ + 0x01,0x01,0x05,0x05,0x00,0x30,0x57,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,\ + 0x13,0x02,0x42,0x45,0x31,0x19,0x30,0x17,0x06,0x03,0x55,0x04,0x0A,0x13,0x10,0x47,\ + 0x6C,0x6F,0x62,0x61,0x6C,0x53,0x69,0x67,0x6E,0x20,0x6E,0x76,0x2D,0x73,0x61,0x31,\ + 0x10,0x30,0x0E,0x06,0x03,0x55,0x04,0x0B,0x13,0x07,0x52,0x6F,0x6F,0x74,0x20,0x43,\ + 0x41,0x31,0x1B,0x30,0x19,0x06,0x03,0x55,0x04,0x03,0x13,0x12,0x47,0x6C,0x6F,0x62,\ + 0x61,0x6C,0x53,0x69,0x67,0x6E,0x20,0x52,0x6F,0x6F,0x74,0x20,0x43,0x41,0x30,0x1E,\ + 0x17,0x0D,0x39,0x38,0x30,0x39,0x30,0x31,0x31,0x32,0x30,0x30,0x30,0x30,0x5A,0x17,\ + 0x0D,0x32,0x38,0x30,0x31,0x32,0x38,0x31,0x32,0x30,0x30,0x30,0x30,0x5A,0x30,0x57,\ + 0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x42,0x45,0x31,0x19,0x30,\ + 0x17,0x06,0x03,0x55,0x04,0x0A,0x13,0x10,0x47,0x6C,0x6F,0x62,0x61,0x6C,0x53,0x69,\ + 0x67,0x6E,0x20,0x6E,0x76,0x2D,0x73,0x61,0x31,0x10,0x30,0x0E,0x06,0x03,0x55,0x04,\ + 0x0B,0x13,0x07,0x52,0x6F,0x6F,0x74,0x20,0x43,0x41,0x31,0x1B,0x30,0x19,0x06,0x03,\ + 0x55,0x04,0x03,0x13,0x12,0x47,0x6C,0x6F,0x62,0x61,0x6C,0x53,0x69,0x67,0x6E,0x20,\ + 0x52,0x6F,0x6F,0x74,0x20,0x43,0x41,0x30,0x82,0x01,0x22,0x30,0x0D,0x06,0x09,0x2A,\ + 0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,0x03,0x82,0x01,0x0F,0x00,0x30,\ + 0x82,0x01,0x0A,0x02,0x82,0x01,0x01,0x00,0xDA,0x0E,0xE6,0x99,0x8D,0xCE,0xA3,0xE3,\ + 0x4F,0x8A,0x7E,0xFB,0xF1,0x8B,0x83,0x25,0x6B,0xEA,0x48,0x1F,0xF1,0x2A,0xB0,0xB9,\ + 0x95,0x11,0x04,0xBD,0xF0,0x63,0xD1,0xE2,0x67,0x66,0xCF,0x1C,0xDD,0xCF,0x1B,0x48,\ + 0x2B,0xEE,0x8D,0x89,0x8E,0x9A,0xAF,0x29,0x80,0x65,0xAB,0xE9,0xC7,0x2D,0x12,0xCB,\ + 0xAB,0x1C,0x4C,0x70,0x07,0xA1,0x3D,0x0A,0x30,0xCD,0x15,0x8D,0x4F,0xF8,0xDD,0xD4,\ + 0x8C,0x50,0x15,0x1C,0xEF,0x50,0xEE,0xC4,0x2E,0xF7,0xFC,0xE9,0x52,0xF2,0x91,0x7D,\ + 0xE0,0x6D,0xD5,0x35,0x30,0x8E,0x5E,0x43,0x73,0xF2,0x41,0xE9,0xD5,0x6A,0xE3,0xB2,\ + 0x89,0x3A,0x56,0x39,0x38,0x6F,0x06,0x3C,0x88,0x69,0x5B,0x2A,0x4D,0xC5,0xA7,0x54,\ + 0xB8,0x6C,0x89,0xCC,0x9B,0xF9,0x3C,0xCA,0xE5,0xFD,0x89,0xF5,0x12,0x3C,0x92,0x78,\ + 0x96,0xD6,0xDC,0x74,0x6E,0x93,0x44,0x61,0xD1,0x8D,0xC7,0x46,0xB2,0x75,0x0E,0x86,\ + 0xE8,0x19,0x8A,0xD5,0x6D,0x6C,0xD5,0x78,0x16,0x95,0xA2,0xE9,0xC8,0x0A,0x38,0xEB,\ + 0xF2,0x24,0x13,0x4F,0x73,0x54,0x93,0x13,0x85,0x3A,0x1B,0xBC,0x1E,0x34,0xB5,0x8B,\ + 0x05,0x8C,0xB9,0x77,0x8B,0xB1,0xDB,0x1F,0x20,0x91,0xAB,0x09,0x53,0x6E,0x90,0xCE,\ + 0x7B,0x37,0x74,0xB9,0x70,0x47,0x91,0x22,0x51,0x63,0x16,0x79,0xAE,0xB1,0xAE,0x41,\ + 0x26,0x08,0xC8,0x19,0x2B,0xD1,0x46,0xAA,0x48,0xD6,0x64,0x2A,0xD7,0x83,0x34,0xFF,\ + 0x2C,0x2A,0xC1,0x6C,0x19,0x43,0x4A,0x07,0x85,0xE7,0xD3,0x7C,0xF6,0x21,0x68,0xEF,\ + 0xEA,0xF2,0x52,0x9F,0x7F,0x93,0x90,0xCF,0x02,0x03,0x01,0x00,0x01,0xA3,0x42,0x30,\ + 0x40,0x30,0x0E,0x06,0x03,0x55,0x1D,0x0F,0x01,0x01,0xFF,0x04,0x04,0x03,0x02,0x01,\ + 0x06,0x30,0x0F,0x06,0x03,0x55,0x1D,0x13,0x01,0x01,0xFF,0x04,0x05,0x30,0x03,0x01,\ + 0x01,0xFF,0x30,0x1D,0x06,0x03,0x55,0x1D,0x0E,0x04,0x16,0x04,0x14,0x60,0x7B,0x66,\ + 0x1A,0x45,0x0D,0x97,0xCA,0x89,0x50,0x2F,0x7D,0x04,0xCD,0x34,0xA8,0xFF,0xFC,0xFD,\ + 0x4B,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,\ + 0x03,0x82,0x01,0x01,0x00,0xD6,0x73,0xE7,0x7C,0x4F,0x76,0xD0,0x8D,0xBF,0xEC,0xBA,\ + 0xA2,0xBE,0x34,0xC5,0x28,0x32,0xB5,0x7C,0xFC,0x6C,0x9C,0x2C,0x2B,0xBD,0x09,0x9E,\ + 0x53,0xBF,0x6B,0x5E,0xAA,0x11,0x48,0xB6,0xE5,0x08,0xA3,0xB3,0xCA,0x3D,0x61,0x4D,\ + 0xD3,0x46,0x09,0xB3,0x3E,0xC3,0xA0,0xE3,0x63,0x55,0x1B,0xF2,0xBA,0xEF,0xAD,0x39,\ + 0xE1,0x43,0xB9,0x38,0xA3,0xE6,0x2F,0x8A,0x26,0x3B,0xEF,0xA0,0x50,0x56,0xF9,0xC6,\ + 0x0A,0xFD,0x38,0xCD,0xC4,0x0B,0x70,0x51,0x94,0x97,0x98,0x04,0xDF,0xC3,0x5F,0x94,\ + 0xD5,0x15,0xC9,0x14,0x41,0x9C,0xC4,0x5D,0x75,0x64,0x15,0x0D,0xFF,0x55,0x30,0xEC,\ + 0x86,0x8F,0xFF,0x0D,0xEF,0x2C,0xB9,0x63,0x46,0xF6,0xAA,0xFC,0xDF,0xBC,0x69,0xFD,\ + 0x2E,0x12,0x48,0x64,0x9A,0xE0,0x95,0xF0,0xA6,0xEF,0x29,0x8F,0x01,0xB1,0x15,0xB5,\ + 0x0C,0x1D,0xA5,0xFE,0x69,0x2C,0x69,0x24,0x78,0x1E,0xB3,0xA7,0x1C,0x71,0x62,0xEE,\ + 0xCA,0xC8,0x97,0xAC,0x17,0x5D,0x8A,0xC2,0xF8,0x47,0x86,0x6E,0x2A,0xC4,0x56,0x31,\ + 0x95,0xD0,0x67,0x89,0x85,0x2B,0xF9,0x6C,0xA6,0x5D,0x46,0x9D,0x0C,0xAA,0x82,0xE4,\ + 0x99,0x51,0xDD,0x70,0xB7,0xDB,0x56,0x3D,0x61,0xE4,0x6A,0xE1,0x5C,0xD6,0xF6,0xFE,\ + 0x3D,0xDE,0x41,0xCC,0x07,0xAE,0x63,0x52,0xBF,0x53,0x53,0xF4,0x2B,0xE9,0xC7,0xFD,\ + 0xB6,0xF7,0x82,0x5F,0x85,0xD2,0x41,0x18,0xDB,0x81,0xB3,0x04,0x1C,0xC5,0x1F,0xA4,\ + 0x80,0x6F,0x15,0x20,0xC9,0xDE,0x0C,0x88,0x0A,0x1D,0xD6,0x66,0x55,0xE2,0xFC,0x48,\ + 0xC9,0x29,0x26,0x69,0xE0 ; Time zone settings HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones",,0x00000012

1 0

[akhaldi] 64240: [D3D8][D3D9][DDRAW][WINED3D] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: akhaldi Date: Tue Sep 23 17:50:22 2014 New Revision: 64240 URL: http://svn.reactos.org/svn/reactos?rev=64240&view=rev Log: [D3D8][D3D9][DDRAW][WINED3D] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d9/buffer.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/palette.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c trunk/reactos/dll/directx/wine/ddraw/viewport.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cs.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/view.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/psdk/d3d8.h trunk/reactos/include/psdk/d3d8types.h trunk/reactos/include/psdk/d3d9.h trunk/reactos/include/psdk/d3d9types.h trunk/reactos/include/reactos/wine/wined3d.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/buff… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/buff… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Modified: trunk/reactos/dll/directx/wine/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/pal… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/psdk/d3d8.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d8.h?rev=64… Modified: trunk/reactos/include/psdk/d3d8types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d8types.h?r… Modified: trunk/reactos/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9.h?rev=64… Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9types.h?r… Modified: trunk/reactos/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 64239: [CMAKE/CLANG] * Enable PCH in Clang builds too now. CORE-8516
by akhaldi＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: akhaldi Date: Tue Sep 23 17:44:42 2014 New Revision: 64239 URL: http://svn.reactos.org/svn/reactos?rev=64239&view=rev Log: [CMAKE/CLANG] * Enable PCH in Clang builds too now. CORE-8516 Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=64239&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Tue Sep 23 17:44:42 2014 @@ -137,7 +137,7 @@ add_definitions(-D_WINKD_=1) endif() - if((CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) + if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") set(PCH 1 CACHE BOOL "Whether to use precompiled headers") else() set(PCH 0 CACHE BOOL "Whether to use precompiled headers")

1 0

[akhaldi] 64238: [CMAKE] * Use the full path of the PCH file when including it.
by akhaldi＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: akhaldi Date: Tue Sep 23 17:43:18 2014 New Revision: 64238 URL: http://svn.reactos.org/svn/reactos?rev=64238&view=rev Log: [CMAKE] * Use the full path of the PCH file when including it. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=64238&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue Sep 23 17:43:18 2014 @@ -371,7 +371,7 @@ # Include the gch in the specified source files, skipping the pch file itself list(REMOVE_ITEM ${_sources} ${_pch}) foreach(_src ${${_sources}}) - set_property(SOURCE ${_src} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_ccache_flag} -include ${_pch_final_name}") + set_property(SOURCE ${_src} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_ccache_flag} -include ${CMAKE_CURRENT_BINARY_DIR}/${_pch_final_name}") set_property(SOURCE ${_src} APPEND PROPERTY OBJECT_DEPENDS ${_gch}) endforeach() endmacro()

1 0

[jgardou] 64237: [NTDLL/LDR] - Mark module entries as "load in progress" when pinning them. CORE-7819 #comment Committed, as a lot of applications rely on this. Feel free to revert if you feel the ...
by jgardou＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: jgardou Date: Tue Sep 23 11:32:50 2014 New Revision: 64237 URL: http://svn.reactos.org/svn/reactos?rev=64237&view=rev Log: [NTDLL/LDR] - Mark module entries as "load in progress" when pinning them. CORE-7819 #comment Committed, as a lot of applications rely on this. Feel free to revert if you feel the change is not correct. Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Tue Sep 23 11:32:50 2014 @@ -235,7 +235,7 @@ ULONG i; /* Check the action we need to perform */ - if (Flags == LDRP_UPDATE_REFCOUNT) + if ((Flags == LDRP_UPDATE_REFCOUNT) || (Flags == LDRP_UPDATE_PIN)) { /* Make sure entry is not being loaded already */ if (LdrEntry->Flags & LDRP_LOAD_IN_PROGRESS)

1 0

[tkreuzer] 64236: [GDI32_APITEST] - Add tests for GetClipBox
by tkreuzer＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: tkreuzer Date: Tue Sep 23 11:16:56 2014 New Revision: 64236 URL: http://svn.reactos.org/svn/reactos?rev=64236&view=rev Log: [GDI32_APITEST] - Add tests for GetClipBox Added: trunk/rostests/apitests/gdi32/GetClipBox.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Tue Sep 23 11:16:56 2014 @@ -35,6 +35,7 @@ GdiGetLocalDC.c GdiReleaseLocalDC.c GdiSetAttrs.c + GetClipBox.c GetClipRgn.c GetCurrentObject.c GetDIBColorTable.c Added: trunk/rostests/apitests/gdi32/GetClipBox.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetClipBox… ============================================================================== --- trunk/rostests/apitests/gdi32/GetClipBox.c (added) +++ trunk/rostests/apitests/gdi32/GetClipBox.c [iso-8859-1] Tue Sep 23 11:16:56 2014 @@ -0,0 +1,138 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for GetClipBox + * PROGRAMMERS: Timo Kreuzer + */ + +#include <apitest.h> + +#include <wingdi.h> +#include <winuser.h> + +#define ok_rect(_prc, _left, _top, _right, _bottom) \ + ok_int((_prc)->left, _left); \ + ok_int((_prc)->top, _top); \ + ok_int((_prc)->right, _right); \ + ok_int((_prc)->bottom, _bottom); \ + +void Test_GetClipBox() +{ + HWND hWnd; + HDC hdc; + RECT rect; + HRGN hrgn, hrgn2; + int ret; + + /* Create a window */ + hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, 0, 0); + ok(hWnd != NULL, "CreateWindowW failed\n"); + if (hWnd == NULL) + { + return; + } + + hdc = GetDC(hWnd); + + /* Test invalid DC */ + SetLastError(ERROR_SUCCESS); + ret = GetClipBox((HDC)0x12345, &rect); + ok(ret == ERROR, "Expected ERROR, got %d\n", ret); + ok(GetLastError() == 0, "Expected 0, got %ld\n", GetLastError()); + + //ret = GetClipBox(hdc, &rect); + //ok_int(ret, SIMPLEREGION); + //ok_rect(&rect, 0, 0, 132, 68); + + /* Create a clip region */ + hrgn = CreateRectRgn(5, 7, 50, 50); + SelectClipRgn(hdc, hrgn); + DeleteObject(hrgn); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 5, 7, 50, 50); + + /* Set clip region as meta region */ + SetMetaRgn(hdc); + + /* Create a new clip region */ + hrgn = CreateRectRgn(10, 10, 100, 100); + SelectClipRgn(hdc, hrgn); + DeleteObject(hrgn); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 10, 10, 50, 50); + + /* Create an empty clip region */ + hrgn = CreateRectRgn(10, 10, 10, 30); + SelectClipRgn(hdc, hrgn); + DeleteObject(hrgn); + ret = GetClipBox(hdc, &rect); + ok_int(ret, NULLREGION); + ok_rect(&rect, 0, 0, 0, 0); + + /* Create a complex region */ + hrgn = CreateRectRgn(10, 10, 30, 30); + hrgn2 = CreateRectRgn(20, 20, 60, 60); + ok_int(CombineRgn(hrgn, hrgn, hrgn2, RGN_OR), COMPLEXREGION); + SelectClipRgn(hdc, hrgn); + DeleteObject(hrgn2); + ret = GetClipBox(hdc, &rect); + ok_int(ret, COMPLEXREGION); + ok_rect(&rect, 10, 10, 50, 50); + + /* Set scaling but keep the mapping mode (viewport should not be changed) */ + ok_int(SetViewportExtEx(hdc, 1000, 1000, NULL), 1); + ret = GetClipBox(hdc, &rect); + ok_int(ret, COMPLEXREGION); + ok_rect(&rect, 10, 10, 50, 50); + + /* Set unisotropic mode, ClipBox should be unchanged */ + ok_int(SetMapMode(hdc, MM_ANISOTROPIC), 1); + ret = GetClipBox(hdc, &rect); + ok_int(ret, COMPLEXREGION); + ok_rect(&rect, 10, 10, 50, 50); + + /* Now set viewport again */ + ok_int(SetViewportExtEx(hdc, 200, 400, NULL), 1); + ret = GetClipBox(hdc, &rect); + ok_int(ret, COMPLEXREGION); // obviously some special secret feature... + ok_rect(&rect, 0, 0, 0, 0); + + /* Reset clip region */ + SelectClipRgn(hdc, NULL); + SetMetaRgn(hdc); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 0, 0, 0, 0); + + hrgn = CreateRectRgn(10, 10, 190, 190); + SelectClipRgn(hdc, hrgn); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 0, 0, 0, 0); + + /* Now also set the window extension */ + ok_int(SetWindowExtEx(hdc, 400, 600, NULL), 1); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 20, 15, 100, 75); + + hrgn = CreateRectRgn(30, 30, 300, 300); + SelectClipRgn(hdc, hrgn); + SetMetaRgn(hdc); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 60, 45, 100, 75); + + ReleaseDC(hWnd, hdc); + DestroyWindow(hWnd); +} + +START_TEST(GetClipBox) +{ + Test_GetClipBox(); +} + Propchange: trunk/rostests/apitests/gdi32/GetClipBox.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Tue Sep 23 11:16:56 2014 @@ -36,6 +36,7 @@ extern void func_GdiGetLocalDC(void); extern void func_GdiReleaseLocalDC(void); extern void func_GdiSetAttrs(void); +extern void func_GetClipBox(void); extern void func_GetClipRgn(void); extern void func_GetCurrentObject(void); extern void func_GetDIBColorTable(void); @@ -95,6 +96,7 @@ { "GdiGetLocalDC", func_GdiGetLocalDC }, { "GdiReleaseLocalDC", func_GdiReleaseLocalDC }, { "GdiSetAttrs", func_GdiSetAttrs }, + { "GetClipBox", func_GetClipBox }, { "GetClipRgn", func_GetClipRgn }, { "GetCurrentObject", func_GetCurrentObject }, { "GetDIBColorTable", func_GetDIBColorTable },

1 0

[hbelusca] 64235: [NTVDM] Implement INT 10h, AH=0Bh function 01 (Set Palette) (for CGA modes), and half-plement INT 10h, AH=0Bh function 00 (Set Background/border color), adapted from DosBox. The c...
by hbelusca＠svn.reactos.org 22 Sep '14

22 Sep '14

Author: hbelusca Date: Mon Sep 22 23:34:41 2014 New Revision: 64235 URL: http://svn.reactos.org/svn/reactos?rev=64235&view=rev Log: [NTVDM] Implement INT 10h, AH=0Bh function 01 (Set Palette) (for CGA modes), and half-plement INT 10h, AH=0Bh function 00 (Set Background/border color), adapted from DosBox. The code needs a bit of cleaning. Needed for a certain Pacman game :) CORE-8436 #resolve #comment Fixed ;) Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Mon Sep 22 23:34:41 2014 @@ -264,7 +264,7 @@ &VideoMode_80x25_text, /* Mode 02h */ // 16 color (mono) &VideoMode_80x25_text, /* Mode 03h */ // 16 color &VideoMode_320x200_4color, /* Mode 04h */ // CGA 4 color - &VideoMode_320x200_4color, /* Mode 05h */ // CGA same (m) + &VideoMode_320x200_4color, /* Mode 05h */ // CGA same (m) (uses 3rd CGA palette) &VideoMode_640x200_2color, /* Mode 06h */ // CGA 640*200 2 color NULL, /* Mode 07h */ // MDA monochrome text 80*25 NULL, /* Mode 08h */ // PCjr @@ -369,6 +369,8 @@ RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF) }; +#if 0 + // Unused at the moment static CONST COLORREF CgaPalette[16] = { @@ -378,28 +380,69 @@ RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) }; -// Unused at the moment +/* CGA palette 1 */ +static CONST BYTE CgaPalette1[] = +{ + 0x00, /* 0 - Black */ + 0x03, /* 1 - Cyan */ + 0x05, /* 2- Magenta */ + 0x07, /* 3 - White */ +} + +/* CGA palette 1 bright */ +static CONST BYTE CgaPalette1i[] = +{ + 0x00, /* 0 - Black */ + 0x13, /* 1 - Light cyan */ + 0x15, /* 2 - Light magenta */ + 0x17, /* 3 - Bright White */ +}; + +/* CGA palette 2 */ +static CONST BYTE CgaPalette2[] = +{ + 0x00, /* 0 - Black */ + 0x02, /* 1 - Green */ + 0x04, /* 2 - Red */ + 0x06, /* 3 - Brown */ +}; + +/* CGA palette 2 bright */ +static CONST BYTE CgaPalette2i[] = +{ + 0x00, /* 0 - Black */ + 0x12, /* 1 - Light green */ + 0x14, /* 2 - Light red */ + 0x16, /* 3 - Yellow */ +}; + +// Unused at the moment; same palette as EgaPalette__16Colors static CONST COLORREF CgaPalette2[VGA_MAX_COLORS / 4] = { RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) }; -static CONST COLORREF EgaPalette___16ColorFixed_DOSBox[VGA_MAX_COLORS / 4] = +#endif + +static CONST COLORREF EgaPalette__16Colors[VGA_MAX_COLORS / 4] = { RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), @@ -740,6 +783,16 @@ return TRUE; } +static __inline VOID VgaSetSinglePaletteRegister(BYTE Index, BYTE Value) +{ + /* Write the index */ + IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state + IOWriteB(VGA_AC_INDEX, Index); + + /* Write the data */ + IOWriteB(VGA_AC_WRITE, Value); +} + static BOOLEAN VgaSetRegisters(PVGA_REGISTERS Registers) { INT i; @@ -803,9 +856,7 @@ // DbgPrint("\n"); for (i = 0; i < VGA_AC_MAX_REG; i++) { - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, i); - IOWriteB(VGA_AC_WRITE, Registers->Attribute[i]); + VgaSetSinglePaletteRegister(i, Registers->Attribute[i]); // DbgPrint("Registers->Attribute[%d] = %d\n", i, Registers->Attribute[i]); } // DbgPrint("\n"); @@ -864,17 +915,28 @@ Palette = VgaPalette; Size = sizeof(VgaPalette)/sizeof(VgaPalette[0]); } - else if (ModeNumber == 0x10) + else if (ModeNumber == 0x10) // || (ModeNumber == 0x0D) || (ModeNumber == 0x0E) { /* EGA HiRes mode */ Palette = EgaPalette__HiRes; Size = sizeof(EgaPalette__HiRes)/sizeof(EgaPalette__HiRes[0]); } +#if 0 + else if ((ModeNumber == 0x04) || (ModeNumber == 0x05)) + { + /* + * CGA modes; this palette contains both normal and + * bright versions of CGA palettes 0 and 1 + */ + Palette = CgaPalette2; + Size = sizeof(CgaPalette2)/sizeof(CgaPalette2[0]); + } +#endif else // if ((ModeNumber == 0x0D) || (ModeNumber == 0x0E)) { /* EGA modes */ - Palette = EgaPalette___16ColorFixed_DOSBox; - Size = sizeof(EgaPalette___16ColorFixed_DOSBox)/sizeof(EgaPalette___16ColorFixed_DOSBox[0]); + Palette = EgaPalette__16Colors; + Size = sizeof(EgaPalette__16Colors)/sizeof(EgaPalette__16Colors[0]); } VgaSetPalette(Palette, Size); @@ -1271,6 +1333,87 @@ break; } + /* Set Video Colors */ + case 0x0B: + { + if (Bda->VideoMode < 4 || Bda->VideoMode > 6) + { + DPRINT1("BIOS Function INT 10h, AH = 0Bh, BH = 0x%02X is unsupported for non-CGA modes\n", + getAH(), getBH()); + break; + } + + switch (getBH()) + { + case 0x00: /* Set Background/Border Color */ + { +#ifdef DOSBOX + BYTE Index = getBL(); + BYTE CrtColorPaletteMask = Bda->CrtColorPaletteMask; + CrtColorPaletteMask = (CrtColorPaletteMask & 0xE0) | (Index & 0x1F); + Bda->CrtColorPaletteMask = CrtColorPaletteMask; + + Index = ((Index << 1) & 0x10) | (Index & 0x7); + + /* Always set the overscan color */ + VgaSetSinglePaletteRegister(VGA_AC_OVERSCAN_REG, Index); + + /* Don't set any extra colors when in text mode */ + if (Bda->VideoMode <= 3) break; + + VgaSetSinglePaletteRegister(0x00, Index); + + Index = (CrtColorPaletteMask & 0x10) | 0x02 | ((CrtColorPaletteMask & 0x20) >> 5); + + VgaSetSinglePaletteRegister(0x01, Index); + Index += 2; + VgaSetSinglePaletteRegister(0x02, Index); + Index += 2; + VgaSetSinglePaletteRegister(0x03, Index); +#else + /* Background/Border Color is modifiable via the first index */ + VgaSetSinglePaletteRegister(0x00, getBL()); +#endif + + /* Enable screen and disable palette access */ + IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state + IOWriteB(VGA_AC_INDEX, 0x20); + break; + } + + case 0x01: /* Set Palette */ + { + BYTE Index = getBL(); + BYTE CrtColorPaletteMask = Bda->CrtColorPaletteMask; + CrtColorPaletteMask = (CrtColorPaletteMask & 0xDF) | ((Index & 1) ? 0x20 : 0x0); + Bda->CrtColorPaletteMask = CrtColorPaletteMask; + + /* Don't set any extra colors when in text mode */ + if (Bda->VideoMode <= 3) break; + + Index = (CrtColorPaletteMask & 0x10) | 0x02 | Index; + + VgaSetSinglePaletteRegister(0x01, Index); + Index += 2; + VgaSetSinglePaletteRegister(0x02, Index); + Index += 2; + VgaSetSinglePaletteRegister(0x03, Index); + + /* Enable screen and disable palette access */ + IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state + IOWriteB(VGA_AC_INDEX, 0x20); + break; + } + + default: + DPRINT1("BIOS Function INT 10h, AH = 0Bh, BH = 0x%02X NOT IMPLEMENTED\n", + getAH(), getBH()); + break; + } + + break; + } + /* Teletype Output */ case 0x0E: { @@ -1294,12 +1437,7 @@ /* Set Single Palette Register */ case 0x00: { - /* Write the index */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, getBL()); - - /* Write the data */ - IOWriteB(VGA_AC_WRITE, getBH()); + VgaSetSinglePaletteRegister(getBL(), getBH()); /* Enable screen and disable palette access */ IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state @@ -1310,12 +1448,7 @@ /* Set Overscan Color */ case 0x01: { - /* Write the index */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); - - /* Write the data */ - IOWriteB(VGA_AC_WRITE, getBH()); + VgaSetSinglePaletteRegister(VGA_AC_OVERSCAN_REG, getBH()); /* Enable screen and disable palette access */ IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state @@ -1332,15 +1465,11 @@ /* Set the palette registers */ for (i = 0; i <= VGA_AC_PAL_F_REG; i++) { - /* Write the index */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, i); - - /* Write the data */ - IOWriteB(VGA_AC_WRITE, Buffer[i]); + VgaSetSinglePaletteRegister(i, Buffer[i]); } /* Set the overscan register */ + // VgaSetSinglePaletteRegister(VGA_AC_OVERSCAN_REG, Buffer[VGA_AC_PAL_F_REG + 1]); IOWriteB(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); IOWriteB(VGA_AC_WRITE, Buffer[VGA_AC_PAL_F_REG + 1]); @@ -1509,7 +1638,7 @@ /* Display combination code */ case 0x1A: { - switch(getAL()) + switch (getAL()) { case 0x00: /* Get Display combiantion code */ setAX(MAKEWORD(0x1A, 0x1A)); @@ -1526,8 +1655,8 @@ default: { - DPRINT1("BIOS Function INT 10h, AH = 0x%02X NOT IMPLEMENTED\n", - getAH()); + DPRINT1("BIOS Function INT 10h, AH = 0x%02X, AL = 0x%02X, BH = 0x%02X NOT IMPLEMENTED\n", + getAH(), getAL(), getBH()); } } } @@ -1573,8 +1702,8 @@ ((PULONG)BaseAddress)[0x44] = (ULONG)NULL; /* Initialize the VGA BDA data */ - Bda->VGAOptions = 0x30; /* 256 KB Video RAM */ - Bda->VGASwitches = 0x09; /* High-resolution */ + Bda->VGAOptions = 0x30; /* 256 KB Video RAM */ + Bda->VGASwitches = 0x09; /* High-resolution */ // // FIXME: At the moment we always set a VGA mode. In the future,

1 0

[tkreuzer] 64234: [KSECDD] CORE-8542 #comment Disable read of performance counters until it has been investigated, what the exact CPU requirements are and how we can detect them. This will only low...
by tkreuzer＠svn.reactos.org 22 Sep '14

22 Sep '14

Author: tkreuzer Date: Mon Sep 22 22:46:10 2014 New Revision: 64234 URL: http://svn.reactos.org/svn/reactos?rev=64234&view=rev Log: [KSECDD] CORE-8542 #comment Disable read of performance counters until it has been investigated, what the exact CPU requirements are and how we can detect them. This will only lower the amount "random" entropy data, nothing severe. Should fix bugcheck on qemu. Modified: trunk/reactos/drivers/crypto/ksecdd/random.c Modified: trunk/reactos/drivers/crypto/ksecdd/random.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/rand… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/random.c [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/random.c [iso-8859-1] Mon Sep 22 22:46:10 2014 @@ -63,7 +63,7 @@ /* Read the TSC value */ MachineSpecificCounters->Tsc = __rdtsc(); } - +#if 0 // FIXME: investigate what the requirements are for these /* Read the CPU event counter MSRs */ //MachineSpecificCounters->Ctr0 = __readmsr(0x12); //MachineSpecificCounters->Ctr1 = __readmsr(0x13); @@ -75,6 +75,7 @@ MachineSpecificCounters->Pmc0 = __readpmc(0); MachineSpecificCounters->Pmc1 = __readpmc(1); } +#endif #else #error Implement me! #endif

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