Ros-diffs July 2016

ros-diffs@reactos.org

18 participants
358 discussions

[hbelusca] 71826: [REGEDIT]: We resize 4 windows --> BeginDeferWindowPos(4).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jul 5 21:13:48 2016 New Revision: 71826 URL: http://svn.reactos.org/svn/reactos?rev=71826&view=rev Log: [REGEDIT]: We resize 4 windows --> BeginDeferWindowPos(4). Modified: trunk/reactos/base/applications/regedit/childwnd.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Tue Jul 5 21:13:48 2016 @@ -40,7 +40,7 @@ extern void ResizeWnd(int cx, int cy) { - HDWP hdwp = BeginDeferWindowPos(3); + HDWP hdwp = BeginDeferWindowPos(4); RECT rt, rs, rb; const int tHeight = 22; SetRect(&rt, 0, 0, cx, cy);

8 years, 5 months

[dreimer] 71825: [BOOTDATA] CA roots update

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jul 5 20:54:34 2016 New Revision: 71825 URL: http://svn.reactos.org/svn/reactos?rev=71825&view=rev Log: [BOOTDATA] CA roots update Modified: trunk/reactos/boot/bootdata/caroots.inf Modified: trunk/reactos/boot/bootdata/caroots.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/caroots.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/caroots.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/caroots.inf [iso-8859-1] Tue Jul 5 20:54:34 2016 @@ -1,13 +1,529 @@ ; Automatically-generated list of fresh Root CA certificates ; with the data coming from Mozilla's NSS library. ; -- -; Created on 2016-03-28T23:12:50Z UTC with swyter's script. +; Created on 2016-07-05T20:52:12Z UTC with swyter's script. ; Data licensed under MPL 2.0 <https://mozilla.org/MPL/2.0/> [Version] Signature = "$ReactOS$" [AddReg] +; "OpenTrust Root CA G3" (549 bytes) +HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\6E2664F356BF3455BFD1933F7C01DED813DA8AA6","Blob",0x00000001,\ + 0x20,0x00,0x00,0x00,\ + 0x01,0x00,0x00,0x00,\ + 0x25,0x02,0x00,0x00,\ + 0x30,0x82,0x02,0x21,0x30,0x82,0x01,0xA6,0xA0,0x03,0x02,0x01,0x02,0x02,0x12,0x11,\ + 0x20,0xE6,0xF8,0x4C,0xFC,0x24,0xB0,0xBE,0x05,0x40,0xAC,0xDA,0x83,0x1B,0x34,0x60,\ + 0x3F,0x30,0x0A,0x06,0x08,0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x03,0x30,0x40,0x31,\ + 0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x46,0x52,0x31,0x12,0x30,0x10,\ + 0x06,0x03,0x55,0x04,0x0A,0x0C,0x09,0x4F,0x70,0x65,0x6E,0x54,0x72,0x75,0x73,0x74,\ + 0x31,0x1D,0x30,0x1B,0x06,0x03,0x55,0x04,0x03,0x0C,0x14,0x4F,0x70,0x65,0x6E,0x54,\ + 0x72,0x75,0x73,0x74,0x20,0x52,0x6F,0x6F,0x74,0x20,0x43,0x41,0x20,0x47,0x33,0x30,\ + 0x1E,0x17,0x0D,0x31,0x34,0x30,0x35,0x32,0x36,0x30,0x30,0x30,0x30,0x30,0x30,0x5A,\ + 0x17,0x0D,0x33,0x38,0x30,0x31,0x31,0x35,0x30,0x30,0x30,0x30,0x30,0x30,0x5A,0x30,\ + 0x40,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x46,0x52,0x31,0x12,\ + 0x30,0x10,0x06,0x03,0x55,0x04,0x0A,0x0C,0x09,0x4F,0x70,0x65,0x6E,0x54,0x72,0x75,\ + 0x73,0x74,0x31,0x1D,0x30,0x1B,0x06,0x03,0x55,0x04,0x03,0x0C,0x14,0x4F,0x70,0x65,\ + 0x6E,0x54,0x72,0x75,0x73,0x74,0x20,0x52,0x6F,0x6F,0x74,0x20,0x43,0x41,0x20,0x47,\ + 0x33,0x30,0x76,0x30,0x10,0x06,0x07,0x2A,0x86,0x48,0xCE,0x3D,0x02,0x01,0x06,0x05,\ + 0x2B,0x81,0x04,0x00,0x22,0x03,0x62,0x00,0x04,0x4A,0xEE,0x58,0xAE,0x4D,0xCA,0x66,\ + 0xDE,0x06,0x3A,0xA3,0x11,0xFC,0xE0,0x18,0xF0,0x6E,0x1C,0xBA,0x2D,0x30,0x0C,0x89,\ + 0xD9,0xD6,0xEE,0x9B,0x73,0x83,0xA9,0x23,0x15,0x8C,0x2F,0x59,0x8A,0x5A,0xDD,0x14,\ + 0xEA,0x9D,0x59,0x2B,0x43,0xB7,0x06,0xEC,0x32,0xB6,0xBA,0xEE,0x41,0xB5,0xAD,0x5D,\ + 0xA1,0x85,0xCC,0xEA,0x1D,0x14,0x66,0xA3,0x67,0x7E,0x46,0xE2,0x94,0xF3,0xE7,0xB6,\ + 0x56,0xA1,0x15,0x59,0xA1,0x4F,0x37,0x97,0xB9,0x22,0x1E,0xBD,0x11,0xEB,0xF4,0xB2,\ + 0x1F,0x5E,0xC3,0x14,0x9A,0xE5,0xD9,0x97,0x99,0xA3,0x63,0x30,0x61,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,0x47,0x77,0xC3,0x14,0x8B,0x62,0x39,\ + 0x0C,0xC9,0x6F,0xE1,0x50,0x4D,0xD0,0x10,0x58,0xDC,0x95,0x88,0x6D,0x30,0x1F,0x06,\ + 0x03,0x55,0x1D,0x23,0x04,0x18,0x30,0x16,0x80,0x14,0x47,0x77,0xC3,0x14,0x8B,0x62,\ + 0x39,0x0C,0xC9,0x6F,0xE1,0x50,0x4D,0xD0,0x10,0x58,0xDC,0x95,0x88,0x6D,0x30,0x0A,\ + 0x06,0x08,0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x03,0x03,0x69,0x00,0x30,0x66,0x02,\ + 0x31,0x00,0x8F,0xA8,0xDC,0x9D,0xBA,0x0C,0x04,0x17,0xFA,0x15,0xE9,0x3D,0x2F,0x29,\ + 0x01,0x97,0xBF,0x81,0x16,0x33,0x40,0x93,0x6C,0xFC,0xF9,0xED,0x80,0x70,0x6F,0xAA,\ + 0x8F,0xDB,0x84,0xC2,0x8B,0xF5,0x35,0xCA,0x06,0xDC,0x64,0x6F,0x68,0x16,0xE1,0x8F,\ + 0x91,0xB9,0x02,0x31,0x00,0xD8,0x4B,0xA5,0xCB,0xC2,0xD0,0x08,0x6C,0xE9,0x18,0xFB,\ + 0x5A,0xDD,0x4D,0x5F,0x24,0x0B,0xB0,0x00,0x21,0x25,0xEF,0x8F,0xA7,0x04,0x26,0x71,\ + 0xE2,0x7C,0x69,0xE5,0x5D,0x9A,0xF8,0x41,0x1F,0x3B,0x39,0x93,0x93,0x9D,0x55,0xEA,\ + 0xCD,0x8D,0xF1,0xFB,0xC1 + +; "OpenTrust Root CA G2" (1395 bytes) +HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\795F8860C5AB7C3D92E6CBF48DE145CD11EF600B","Blob",0x00000001,\ + 0x20,0x00,0x00,0x00,\ + 0x01,0x00,0x00,0x00,\ + 0x73,0x05,0x00,0x00,\ + 0x30,0x82,0x05,0x6F,0x30,0x82,0x03,0x57,0xA0,0x03,0x02,0x01,0x02,0x02,0x12,0x11,\ + 0x20,0xA1,0x69,0x1B,0xBF,0xBD,0xB9,0xBD,0x52,0x96,0x8F,0x23,0xE8,0x48,0xBF,0x26,\ + 0x11,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0D,0x05,0x00,\ + 0x30,0x40,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x46,0x52,0x31,\ + 0x12,0x30,0x10,0x06,0x03,0x55,0x04,0x0A,0x0C,0x09,0x4F,0x70,0x65,0x6E,0x54,0x72,\ + 0x75,0x73,0x74,0x31,0x1D,0x30,0x1B,0x06,0x03,0x55,0x04,0x03,0x0C,0x14,0x4F,0x70,\ + 0x65,0x6E,0x54,0x72,0x75,0x73,0x74,0x20,0x52,0x6F,0x6F,0x74,0x20,0x43,0x41,0x20,\ + 0x47,0x32,0x30,0x1E,0x17,0x0D,0x31,0x34,0x30,0x35,0x32,0x36,0x30,0x30,0x30,0x30,\ + 0x30,0x30,0x5A,0x17,0x0D,0x33,0x38,0x30,0x31,0x31,0x35,0x30,0x30,0x30,0x30,0x30,\ + 0x30,0x5A,0x30,0x40,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x46,\ + 0x52,0x31,0x12,0x30,0x10,0x06,0x03,0x55,0x04,0x0A,0x0C,0x09,0x4F,0x70,0x65,0x6E,\ + 0x54,0x72,0x75,0x73,0x74,0x31,0x1D,0x30,0x1B,0x06,0x03,0x55,0x04,0x03,0x0C,0x14,\ + 0x4F,0x70,0x65,0x6E,0x54,0x72,0x75,0x73,0x74,0x20,0x52,0x6F,0x6F,0x74,0x20,0x43,\ + 0x41,0x20,0x47,0x32,0x30,0x82,0x02,0x22,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,\ + 0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,0x03,0x82,0x02,0x0F,0x00,0x30,0x82,0x02,0x0A,\ + 0x02,0x82,0x02,0x01,0x00,0xCC,0xB6,0x57,0xA5,0x33,0x94,0x10,0x81,0x32,0x53,0xDF,\ + 0x61,0x7E,0x0F,0x76,0x39,0xCF,0x5C,0xC2,0x53,0x75,0x1D,0x49,0x7A,0x96,0x38,0xDD,\ + 0xA2,0x73,0x6A,0xF1,0x6F,0xDE,0x5E,0xA2,0x5A,0xB9,0x71,0x21,0xBE,0x36,0xD9,0xA1,\ + 0xFC,0xBC,0xEE,0x6C,0xA8,0x7C,0x34,0x1A,0x71,0x1A,0xE8,0x1A,0xD8,0x5F,0x0E,0x44,\ + 0x06,0xED,0xA7,0xE0,0xF3,0xD2,0x61,0x0B,0xE0,0x32,0xA2,0x96,0xD1,0x38,0xF0,0xC2,\ + 0xDA,0x01,0x17,0xFC,0xE4,0xAC,0x4F,0xE8,0xEE,0x89,0x1E,0x74,0xAB,0x4F,0xBF,0x1E,\ + 0x09,0xB6,0x36,0x6A,0x56,0xF3,0xE1,0xEE,0x96,0x89,0x66,0x24,0x06,0xE4,0xCD,0x42,\ + 0x3A,0x4A,0xDD,0xE0,0x9A,0xB0,0xC4,0x82,0x45,0xB3,0xFE,0xC9,0xAB,0x5C,0x7C,0x3E,\ + 0xC9,0xEB,0x17,0x2F,0x0C,0x7D,0x6E,0xAE,0xA5,0x8F,0xC8,0xAC,0x25,0x0A,0x6F,0xFA,\ + 0xD5,0x45,0x98,0xD2,0x35,0x09,0xF6,0x03,0x43,0x94,0xFE,0xD9,0xBF,0x20,0x95,0x79,\ + 0x80,0x98,0x8A,0xD9,0x89,0x35,0xBB,0x51,0x1B,0xA4,0x37,0x7D,0xFC,0x99,0x3B,0xAB,\ + 0xFF,0xBF,0xAC,0x0D,0x8F,0x43,0xB1,0x99,0x7B,0x16,0x10,0x7E,0x1D,0x6F,0x47,0xC4,\ + 0x15,0x8F,0x04,0x96,0x08,0x06,0x42,0x04,0xF8,0x84,0xD6,0x1D,0xBC,0x91,0xA6,0x42,\ + 0xBE,0x49,0xD5,0x6A,0x88,0x3F,0xBC,0x2D,0x51,0xD1,0x9E,0x8D,0xE0,0x52,0xCC,0x57,\ + 0xDD,0x35,0x35,0x58,0xDB,0xB4,0x8F,0x24,0x88,0xE4,0x8B,0xDF,0xDC,0x6B,0x54,0xD2,\ + 0x81,0x2B,0xB2,0xCE,0x92,0x4B,0x1C,0x1F,0x46,0xFA,0x1D,0xD8,0x92,0xCB,0x76,0x67,\ + 0xB5,0x09,0x99,0x09,0xE5,0xAC,0x17,0x14,0x55,0x70,0xC6,0x3C,0xA0,0x56,0x0A,0x03,\ + 0xB3,0xDC,0x62,0x19,0xDF,0xC8,0xB5,0x30,0x7F,0xF5,0x3C,0x26,0x75,0x11,0xBD,0xD7,\ + 0x1B,0xB3,0x87,0x9E,0x07,0xAF,0x65,0x71,0xE5,0xA0,0xCF,0x1A,0xA7,0x09,0x10,0x1D,\ + 0x93,0x89,0x66,0x5B,0xE8,0x3C,0x62,0x32,0xB5,0xB5,0x3A,0x6E,0xE9,0x85,0x01,0x8B,\ + 0x9E,0x43,0x8C,0x67,0x73,0x28,0x59,0x5B,0xEB,0xE3,0xDC,0x2C,0xCC,0xA5,0x26,0x72,\ + 0x62,0x12,0xB4,0xE6,0x9C,0x83,0x44,0xF6,0x51,0xA4,0xE2,0xC0,0x7A,0x24,0x57,0xCA,\ + 0x0E,0xA5,0x3F,0x3A,0xB5,0x3B,0x8B,0xE5,0x76,0xEE,0x70,0xE6,0x92,0xDE,0x16,0x5C,\ + 0x28,0x5B,0x97,0x19,0x27,0x92,0xFE,0x7A,0x92,0x54,0xCE,0x93,0x39,0x0A,0x16,0x87,\ + 0xBC,0x63,0xB3,0xF5,0xB1,0x93,0x5C,0xE0,0x6E,0xB7,0xD0,0xEA,0xF9,0x62,0x32,0x88,\ + 0x44,0xFB,0xBF,0x27,0x28,0xB6,0x30,0x95,0x5D,0x12,0x28,0xB9,0x95,0xBE,0x8F,0x53,\ + 0x18,0xE5,0xA2,0x18,0x16,0xE2,0x56,0xA4,0xB2,0x2C,0x10,0xF5,0x1D,0x37,0xA6,0xF8,\ + 0xB7,0xF6,0xD0,0x59,0x5C,0x89,0xF7,0xC2,0xD5,0xB5,0x94,0x74,0xD1,0xD5,0xFE,0x1B,\ + 0xB6,0xF0,0xE6,0xD6,0x1E,0x7B,0xD2,0x3C,0xCB,0xA8,0xE3,0xF5,0x18,0xF3,0x21,0x1F,\ + 0x6E,0xEF,0x4D,0x68,0x06,0x7B,0x2D,0x5D,0x6E,0x43,0x89,0xA6,0xC0,0xF9,0xA0,0xBF,\ + 0x82,0x1E,0xCF,0x53,0x7F,0xB4,0xEB,0x2C,0xDB,0x5D,0xF6,0x6A,0x7D,0x40,0x24,0x05,\ + 0x72,0x89,0x38,0x01,0x93,0xCB,0x71,0xC2,0x39,0x5D,0x06,0x11,0xF6,0x6F,0x78,0xF8,\ + 0x37,0x0D,0x39,0x84,0x27,0x02,0x03,0x01,0x00,0x01,0xA3,0x63,0x30,0x61,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,0x6A,0x39,0xFA,0x42,0x22,0xF7,\ + 0xE6,0x89,0x00,0x4D,0x5E,0x7D,0x33,0x83,0xCB,0xB8,0x6E,0x77,0x86,0xAF,0x30,0x1F,\ + 0x06,0x03,0x55,0x1D,0x23,0x04,0x18,0x30,0x16,0x80,0x14,0x6A,0x39,0xFA,0x42,0x22,\ + 0xF7,0xE6,0x89,0x00,0x4D,0x5E,0x7D,0x33,0x83,0xCB,0xB8,0x6E,0x77,0x86,0xAF,0x30,\ + 0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0D,0x05,0x00,0x03,0x82,\ + 0x02,0x01,0x00,0x98,0xCB,0xAB,0x40,0x3C,0xE5,0x33,0x02,0x97,0x7F,0x2D,0x87,0xA6,\ + 0x8F,0xD4,0x5E,0x4A,0xAF,0xB8,0x1E,0xE7,0xBB,0x71,0xFB,0x80,0x64,0x25,0xA9,0xB3,\ + 0x1A,0x3E,0x68,0x5D,0x27,0x26,0xA7,0xBA,0x2A,0xE1,0xF0,0x57,0x83,0x0A,0x64,0x4F,\ + 0x1E,0x22,0x74,0x1B,0xE9,0x90,0x5F,0xF0,0xAC,0xCF,0xFF,0x4F,0x68,0x7A,0x38,0xA4,\ + 0x10,0x6C,0x0D,0xB1,0xC7,0xA4,0x77,0x80,0x18,0xB6,0xA2,0x28,0x44,0x76,0xA7,0x34,\ + 0x9D,0x71,0x84,0x2F,0xCA,0x59,0xD2,0x47,0x88,0x99,0x41,0x22,0xC9,0x30,0x98,0x61,\ + 0x6E,0x3D,0xA8,0xA8,0x05,0x6D,0xD1,0x1F,0xC0,0x51,0x44,0x56,0x7F,0x27,0x35,0x02,\ + 0xDD,0x5E,0x98,0x0A,0x42,0xEB,0x30,0xBF,0x8D,0xA1,0x9B,0x51,0xAA,0x3B,0xEA,0x93,\ + 0x46,0x64,0xC5,0x00,0x79,0xDE,0x21,0x6B,0xF6,0x57,0xA0,0x86,0xD7,0x06,0x72,0xEC,\ + 0x70,0x46,0x4B,0x8B,0x73,0xDD,0xA0,0x21,0x75,0x3E,0xDC,0x1D,0xC0,0x8F,0xD3,0x4F,\ + 0x73,0x1C,0x85,0xD9,0xFE,0x7F,0x62,0xC8,0x95,0x6F,0xB6,0xD3,0x7B,0x8C,0xBA,0x53,\ + 0xC2,0x6F,0x9B,0x44,0x4C,0x79,0xD0,0x1D,0x70,0xB3,0xD7,0x9F,0x02,0xF4,0xB2,0x07,\ + 0xB0,0xC7,0xE5,0xF8,0xAD,0x23,0x0E,0xA6,0x56,0xC9,0x29,0x12,0x77,0x48,0xD9,0x2F,\ + 0x46,0xFD,0x3B,0xF0,0xFC,0x74,0x70,0x92,0xA5,0x8E,0x38,0x08,0x1F,0x64,0x30,0xB6,\ + 0xB7,0x4B,0xFB,0x36,0xAC,0x10,0x8E,0xA0,0x52,0x33,0x63,0x9D,0x03,0x35,0x56,0xC5,\ + 0x69,0xBD,0xC6,0x23,0x5A,0x27,0x94,0xF6,0xA4,0x12,0xF8,0x2D,0x33,0x3C,0xA1,0x56,\ + 0xA5,0x5F,0xD6,0x19,0xE9,0xED,0x7C,0x08,0xBD,0x77,0xCD,0x27,0x64,0xCC,0x94,0xDA,\ + 0x4E,0x46,0x50,0x87,0xE0,0xF9,0xC1,0x53,0x80,0x1E,0xBB,0xAD,0xFB,0x47,0x52,0x8B,\ + 0x1B,0xFD,0xA2,0xF9,0xDE,0x0E,0x22,0xB7,0x3D,0x33,0x59,0x6C,0xD4,0xDE,0xF5,0x95,\ + 0x06,0x32,0x0D,0x51,0x19,0x41,0x5C,0x3E,0x4F,0x06,0xF7,0xB9,0x2B,0x80,0x27,0xF6,\ + 0xA3,0xAA,0x7A,0x7C,0x06,0xE1,0x43,0xC3,0x13,0x39,0x62,0x1A,0x36,0xBD,0xE0,0x28,\ + 0x2E,0x94,0x02,0xE4,0x29,0x2E,0x60,0x55,0xAE,0x40,0x3D,0xB0,0x74,0x92,0x5E,0xF0,\ + 0x20,0x64,0x96,0x3F,0x5F,0x45,0x5D,0x88,0xB5,0x8A,0xDA,0x02,0xA0,0x5B,0x45,0x54,\ + 0xDE,0x38,0x3D,0x09,0xC0,0xA8,0x4A,0x65,0x46,0x16,0xFC,0xAA,0xBF,0x54,0x4E,0x4D,\ + 0x5B,0xBE,0x38,0x43,0xB7,0x28,0xCA,0x8B,0x33,0xAA,0x1A,0x25,0xBA,0x25,0x5C,0x29,\ + 0x2F,0x5B,0x4A,0x6E,0x8C,0xEA,0x2D,0x9C,0x2A,0xF6,0x05,0x76,0xE0,0x77,0x97,0x80,\ + 0x88,0xDD,0x67,0x13,0x6F,0x1D,0x68,0x24,0x8B,0x4F,0xB7,0x74,0x81,0xE5,0xF4,0x60,\ + 0x9F,0x7A,0x55,0xD7,0x3E,0x37,0xDA,0x16,0x6B,0x3E,0x77,0xAC,0xAE,0x18,0x70,0x95,\ + 0x08,0x79,0x29,0x03,0x8A,0xFE,0xC1,0x3B,0xB3,0x3F,0x1A,0x0F,0xA4,0x3B,0x5E,0x1F,\ + 0x58,0xA1,0x95,0xC9,0xAB,0x2F,0x73,0x4A,0xD0,0x2D,0x6E,0x9A,0x59,0x0F,0x55,0x18,\ + 0x78,0x2D,0x3C,0x51,0xA6,0x97,0x8B,0xE6,0xBB,0xB2,0x70,0xAA,0x4C,0x11,0xDE,0xFF,\ + 0x7C,0x2B,0x37,0xD4,0x7A,0xD1,0x77,0x34,0x8F,0xE7,0xF9,0x42,0xF7,0x3C,0x81,0x0C,\ + 0x4B,0x52,0x0A + +; "OpenTrust Root CA G1" (1395 bytes) +HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\7991E834F7E2EEDD08950152E9552D14E958D57E","Blob",0x00000001,\ + 0x20,0x00,0x00,0x00,\ + 0x01,0x00,0x00,0x00,\ + 0x73,0x05,0x00,0x00,\ + 0x30,0x82,0x05,0x6F,0x30,0x82,0x03,0x57,0xA0,0x03,0x02,0x01,0x02,0x02,0x12,0x11,\ + 0x20,0xB3,0x90,0x55,0x39,0x7D,0x7F,0x36,0x6D,0x64,0xC2,0xA7,0x9F,0x6B,0x63,0x8E,\ + 0x67,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,0x05,0x00,\ + 0x30,0x40,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x46,0x52,0x31,\ + 0x12,0x30,0x10,0x06,0x03,0x55,0x04,0x0A,0x0C,0x09,0x4F,0x70,0x65,0x6E,0x54,0x72,\ + 0x75,0x73,0x74,0x31,0x1D,0x30,0x1B,0x06,0x03,0x55,0x04,0x03,0x0C,0x14,0x4F,0x70,\ + 0x65,0x6E,0x54,0x72,0x75,0x73,0x74,0x20,0x52,0x6F,0x6F,0x74,0x20,0x43,0x41,0x20,\ + 0x47,0x31,0x30,0x1E,0x17,0x0D,0x31,0x34,0x30,0x35,0x32,0x36,0x30,0x38,0x34,0x35,\ + 0x35,0x30,0x5A,0x17,0x0D,0x33,0x38,0x30,0x31,0x31,0x35,0x30,0x30,0x30,0x30,0x30,\ + 0x30,0x5A,0x30,0x40,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x46,\ + 0x52,0x31,0x12,0x30,0x10,0x06,0x03,0x55,0x04,0x0A,0x0C,0x09,0x4F,0x70,0x65,0x6E,\ + 0x54,0x72,0x75,0x73,0x74,0x31,0x1D,0x30,0x1B,0x06,0x03,0x55,0x04,0x03,0x0C,0x14,\ + 0x4F,0x70,0x65,0x6E,0x54,0x72,0x75,0x73,0x74,0x20,0x52,0x6F,0x6F,0x74,0x20,0x43,\ + 0x41,0x20,0x47,0x31,0x30,0x82,0x02,0x22,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,\ + 0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,0x03,0x82,0x02,0x0F,0x00,0x30,0x82,0x02,0x0A,\ + 0x02,0x82,0x02,0x01,0x00,0xF8,0x79,0x46,0xDA,0x96,0xC5,0x30,0x5E,0x8A,0x71,0x03,\ + 0x2D,0x70,0xA4,0xBB,0xB0,0xC5,0x08,0xDC,0xCD,0xE6,0x35,0xC0,0x80,0xA4,0x11,0x2D,\ + 0xDD,0xE6,0x87,0xAE,0x5D,0x3D,0x91,0xD2,0x87,0x6C,0x37,0xB7,0xDA,0x62,0x9E,0x9B,\ + 0xC2,0x24,0xD7,0x8F,0xF1,0xDB,0xA6,0xA6,0xDF,0x46,0x6F,0x51,0xA6,0x71,0xCB,0x3E,\ + 0x1B,0x31,0x67,0x62,0xF7,0x11,0x5B,0x34,0x27,0xD5,0x79,0x4E,0x8C,0x9B,0x58,0xBD,\ + 0x22,0x10,0x0D,0x5C,0x27,0x0C,0xDD,0x30,0xE5,0xA8,0xD3,0x5D,0x21,0x38,0x74,0x17,\ + 0xFE,0xE3,0x1F,0xB6,0x4F,0x3B,0x6B,0x2D,0xDB,0x7D,0x60,0x1F,0x8C,0x7D,0x4C,0x05,\ + 0xC2,0xEB,0x01,0x16,0x15,0x98,0x14,0x8E,0xD1,0x90,0x77,0x22,0x3F,0xEC,0xC2,0x39,\ + 0xB8,0x79,0x3A,0xF0,0x49,0x24,0xE2,0x95,0x91,0xDC,0x61,0x34,0x92,0x8C,0x54,0x74,\ + 0xEF,0xB1,0x7D,0x8C,0x01,0xE2,0x38,0x7D,0xC1,0x5F,0x6A,0x5F,0x24,0xB2,0x8E,0x62,\ + 0x17,0xAD,0x79,0x20,0xAD,0xAB,0x1D,0xB7,0xE0,0xB4,0x96,0x48,0x4F,0x66,0x43,0x10,\ + 0x06,0x16,0x24,0x03,0xE1,0xE0,0x9C,0x8E,0xC6,0x46,0x4F,0x8E,0x1A,0x99,0xE1,0x8F,\ + 0xB9,0x8E,0x33,0x6C,0x69,0xDE,0x58,0xAD,0xA0,0x0E,0xA7,0x64,0x54,0x11,0x69,0x44,\ + 0x66,0x4F,0x4C,0x12,0xA7,0x8E,0x2C,0x7D,0xC4,0xD4,0x5B,0xC5,0x00,0x34,0x30,0xC1,\ + 0xD9,0x99,0xFE,0x32,0xCE,0x07,0x84,0xB4,0x4E,0xCD,0x0A,0xFF,0x36,0x4D,0x62,0xF1,\ + 0xA7,0x63,0x57,0xE4,0xDB,0x6A,0xA7,0xAE,0xBF,0x2B,0xB9,0xC9,0xE6,0xB2,0x27,0x89,\ + 0xE5,0x7E,0x9A,0x1C,0x4D,0x68,0xC6,0xC1,0x18,0xDE,0x33,0x2B,0x51,0x46,0x4B,0x1C,\ + 0x8E,0xF7,0x3D,0x0C,0xF9,0x8A,0x34,0x14,0xC4,0xFB,0x33,0x35,0x23,0xF1,0xCC,0xF1,\ + 0x2A,0xC7,0xA5,0xBB,0xB0,0xA2,0xCE,0xFE,0x53,0x6B,0x4D,0x41,0x1B,0x66,0x28,0xB2,\ + 0x96,0xFA,0xA7,0xAE,0x0A,0x4E,0xB9,0x39,0x33,0x44,0x9C,0x74,0xC1,0x93,0x1C,0xF8,\ + 0xE0,0x9E,0x24,0x25,0x43,0xF1,0x9B,0x23,0x82,0xAA,0xDF,0x2C,0x20,0xB0,0xDC,0x36,\ + 0x4E,0x03,0xB3,0x7C,0x02,0xD4,0xE6,0x7B,0x1A,0xAA,0x87,0x13,0xBF,0x3E,0xA1,0x74,\ + 0xBB,0x9B,0x0E,0xE1,0xC0,0x93,0x9F,0xD7,0xA4,0x66,0xCA,0xBB,0x1B,0x3B,0xE3,0x30,\ + 0xF4,0x33,0x59,0x8A,0x07,0x72,0x03,0x55,0xE7,0x73,0x6A,0x03,0x31,0x6E,0x6F,0x96,\ + 0x1B,0xE3,0xA2,0x9F,0xAF,0x92,0xC7,0xED,0xF5,0x42,0xB7,0x25,0x4C,0x3B,0x13,0x04,\ + 0xCF,0x1C,0x96,0xAF,0x1C,0x22,0xA3,0xD0,0xAB,0x05,0xB2,0x4C,0x12,0x23,0x52,0xDC,\ + 0xFD,0x19,0x5B,0x27,0x9C,0x1E,0x3B,0x7A,0xFD,0x42,0x23,0xDB,0x23,0x80,0x13,0xF0,\ + 0xBC,0x51,0x15,0x54,0x94,0xA6,0x77,0x3E,0xD0,0x74,0x51,0xBD,0x51,0x14,0x08,0x39,\ + 0x37,0xCB,0x1F,0x34,0xA9,0x30,0x9D,0x52,0x84,0x2E,0x55,0x90,0xB1,0xBA,0xDF,0x55,\ + 0x00,0x0B,0xD8,0x56,0x2D,0xB1,0x49,0x49,0x72,0x80,0xA9,0x62,0xD7,0xC0,0xF6,0x18,\ + 0x11,0x04,0x55,0xCD,0x74,0x7B,0xCF,0x61,0x70,0x79,0xF4,0x7B,0x2C,0x5C,0x5C,0x92,\ + 0xFC,0xE5,0xB8,0x5A,0xAB,0x4C,0x93,0x95,0xA1,0x27,0xEE,0xA5,0xBE,0xCF,0x71,0x23,\ + 0x42,0xBA,0x9B,0x76,0x2D,0x02,0x03,0x01,0x00,0x01,0xA3,0x63,0x30,0x61,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,0x97,0x46,0x21,0x57,0x21,0x35,\ + 0xDA,0x36,0x55,0xC7,0xF3,0xF1,0x37,0x70,0xE5,0x08,0xF6,0x93,0x29,0xB6,0x30,0x1F,\ + 0x06,0x03,0x55,0x1D,0x23,0x04,0x18,0x30,0x16,0x80,0x14,0x97,0x46,0x21,0x57,0x21,\ + 0x35,0xDA,0x36,0x55,0xC7,0xF3,0xF1,0x37,0x70,0xE5,0x08,0xF6,0x93,0x29,0xB6,0x30,\ + 0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,0x05,0x00,0x03,0x82,\ + 0x02,0x01,0x00,0x1D,0xDD,0x02,0x60,0x7C,0xE0,0x35,0xA7,0xE6,0x98,0x7B,0xEA,0x44,\ + 0xCE,0x67,0x40,0x4F,0xF2,0x93,0x6E,0x66,0xD4,0x39,0x89,0x26,0xAC,0xD3,0x4D,0x04,\ + 0x3C,0xBB,0x87,0x21,0x3F,0x37,0xF4,0x71,0x25,0xDA,0x4B,0xBA,0xAB,0x96,0x82,0x81,\ + 0x91,0xB6,0xED,0xD9,0xB1,0xA4,0x65,0x97,0xE2,0x6F,0x64,0x59,0xA4,0x96,0xEE,0x60,\ + 0xCA,0x1F,0x23,0xFB,0x45,0xBA,0xFF,0x8F,0x24,0xF0,0xCA,0xA9,0x31,0x7F,0x79,0x1F,\ + 0x80,0xB3,0x2D,0x32,0xBA,0x64,0x67,0x60,0xAF,0xB9,0x59,0xCD,0xDF,0x9A,0x49,0xD3,\ + 0xA8,0x82,0xB1,0xF9,0x98,0x94,0x8A,0xCC,0xE0,0xBB,0xE0,0x04,0x1B,0x99,0x60,0xB1,\ + 0x46,0x65,0xDC,0x08,0xA2,0xB2,0x46,0x9E,0x44,0x88,0xEA,0x93,0x7E,0x57,0x16,0xD2,\ + 0x15,0x72,0x5F,0x2E,0x4B,0xAB,0xD4,0x9D,0x63,0xB8,0xE3,0x48,0xE5,0xFE,0x84,0x2E,\ + 0x58,0x0A,0x9F,0x43,0x1D,0xFE,0xB7,0x18,0x92,0x86,0x43,0x4B,0x0E,0x9C,0x32,0x86,\ + 0x2C,0x60,0xF5,0xE9,0x48,0xEA,0x95,0xED,0x70,0x29,0xF1,0xD5,0x2F,0xFD,0x35,0xB4,\ + 0x57,0xCF,0xDB,0x85,0x48,0x99,0xB9,0xC2,0x6F,0x6C,0x8F,0xCD,0x78,0x95,0xAC,0x64,\ + 0x28,0xFD,0x56,0xB0,0xC3,0x6F,0xC3,0xBE,0x59,0x52,0xE1,0x5F,0x84,0x8F,0x80,0xF2,\ + 0xF4,0x0D,0x36,0xAD,0x76,0xB3,0xA3,0xB5,0xE1,0x64,0x76,0x3A,0x58,0xDC,0x7D,0x4F,\ + 0x5E,0x56,0x6C,0xE5,0x55,0x59,0x57,0xA5,0xDF,0xF1,0x8A,0x66,0x30,0x8C,0xD4,0x52,\ + 0x62,0x38,0x77,0xB4,0xBE,0x28,0xD7,0xCA,0x36,0xC4,0x9B,0x05,0xF0,0xF8,0x15,0xDB,\ + 0xDB,0xF1,0xEF,0x34,0x9D,0x1D,0x78,0x4A,0x88,0x56,0x67,0x6E,0x60,0xFF,0x8F,0xC8,\ + 0x8B,0xE1,0x8E,0xBD,0x42,0xA9,0x33,0x0A,0x59,0x42,0x12,0x12,0x2A,0xFA,0xB1,0x9D,\ + 0x43,0x8E,0x05,0x9B,0x99,0xDA,0x62,0xAD,0x57,0x36,0xB3,0x1D,0xB6,0x0D,0x79,0x2D,\ + 0x96,0xB8,0xEB,0xF2,0x0C,0x4B,0x0C,0xA5,0x94,0xC6,0x30,0xA7,0x26,0x19,0x2D,0xED,\ + 0x4C,0x06,0x50,0x30,0xF1,0xFD,0x58,0x3D,0xB9,0x4B,0x17,0x5F,0x19,0xB4,0x6A,0x84,\ + 0x54,0xB4,0x38,0x4F,0x39,0xA2,0x0D,0x96,0x68,0xC3,0x28,0x94,0xFD,0xED,0x2D,0x1F,\ + 0x4A,0x6B,0x43,0x96,0x2E,0x90,0x01,0x10,0xFB,0x38,0xA6,0x81,0x0B,0xD0,0xBF,0x75,\ + 0xD3,0xD4,0xB9,0xCE,0xF1,0x3F,0x6F,0x0E,0x1C,0x1E,0x37,0x71,0xE5,0x18,0x87,0x75,\ + 0x19,0x3F,0x50,0xB9,0x5E,0xA4,0x45,0x34,0xAD,0xB0,0xCA,0xE6,0xE5,0x13,0x76,0x0F,\ + 0x31,0x14,0xA9,0x8E,0x2D,0x94,0xD6,0xD5,0x85,0x4D,0x73,0x15,0x4F,0x4B,0xF2,0xB2,\ + 0x3E,0xED,0x6C,0xBD,0xFD,0x0E,0x9D,0x66,0x73,0xB0,0x3D,0xB4,0xF7,0xBF,0xA8,0xE0,\ + 0x11,0xA4,0xC4,0xAE,0x75,0x09,0x4A,0x63,0x00,0x48,0x20,0xA6,0xC6,0x9D,0x0B,0x09,\ + 0x8A,0xB4,0xE0,0xE6,0xCE,0x3E,0xC7,0x3E,0x26,0x38,0xE9,0x2B,0xDE,0xA6,0x08,0x49,\ + 0x03,0x04,0x90,0x8A,0xE9,0x8F,0xBF,0xE8,0xB6,0xB4,0x2A,0xA3,0x23,0x8D,0x1C,0x1C,\ + 0xB2,0x39,0x92,0xA8,0x8F,0x02,0x5C,0x40,0x39,0x75,0xD4,0x73,0x41,0x02,0x77,0xDE,\ + 0xCD,0xE0,0x43,0x87,0xD6,0xE4,0xBA,0x4A,0xC3,0x6C,0x12,0x7F,0xFE,0x2A,0xE6,0x23,\ + 0xD6,0x8C,0x71 + +; "Certplus Root CA G2" (544 bytes) +HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\4F658E1FE906D82802E9544741C954255D69CC1A","Blob",0x00000001,\ + 0x20,0x00,0x00,0x00,\ + 0x01,0x00,0x00,0x00,\ + 0x20,0x02,0x00,0x00,\ + 0x30,0x82,0x02,0x1C,0x30,0x82,0x01,0xA2,0xA0,0x03,0x02,0x01,0x02,0x02,0x12,0x11,\ + 0x20,0xD9,0x91,0xCE,0xAE,0xA3,0xE8,0xC5,0xE7,0xFF,0xE9,0x02,0xAF,0xCF,0x73,0xBC,\ + 0x55,0x30,0x0A,0x06,0x08,0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x03,0x30,0x3E,0x31,\ + 0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x46,0x52,0x31,0x11,0x30,0x0F,\ + 0x06,0x03,0x55,0x04,0x0A,0x0C,0x08,0x43,0x65,0x72,0x74,0x70,0x6C,0x75,0x73,0x31,\ + 0x1C,0x30,0x1A,0x06,0x03,0x55,0x04,0x03,0x0C,0x13,0x43,0x65,0x72,0x74,0x70,0x6C,\ + 0x75,0x73,0x20,0x52,0x6F,0x6F,0x74,0x20,0x43,0x41,0x20,0x47,0x32,0x30,0x1E,0x17,\ + 0x0D,0x31,0x34,0x30,0x35,0x32,0x36,0x30,0x30,0x30,0x30,0x30,0x30,0x5A,0x17,0x0D,\ + 0x33,0x38,0x30,0x31,0x31,0x35,0x30,0x30,0x30,0x30,0x30,0x30,0x5A,0x30,0x3E,0x31,\ + 0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x46,0x52,0x31,0x11,0x30,0x0F,\ + 0x06,0x03,0x55,0x04,0x0A,0x0C,0x08,0x43,0x65,0x72,0x74,0x70,0x6C,0x75,0x73,0x31,\ + 0x1C,0x30,0x1A,0x06,0x03,0x55,0x04,0x03,0x0C,0x13,0x43,0x65,0x72,0x74,0x70,0x6C,\ + 0x75,0x73,0x20,0x52,0x6F,0x6F,0x74,0x20,0x43,0x41,0x20,0x47,0x32,0x30,0x76,0x30,\ + 0x10,0x06,0x07,0x2A,0x86,0x48,0xCE,0x3D,0x02,0x01,0x06,0x05,0x2B,0x81,0x04,0x00,\ + 0x22,0x03,0x62,0x00,0x04,0xCD,0x0F,0x5B,0x56,0x82,0xDF,0xF0,0x45,0x1A,0xD6,0xAD,\ + 0xF7,0x79,0xF0,0x1D,0xC9,0xAC,0x96,0xD6,0x9E,0x4E,0x9C,0x1F,0xB4,0x42,0x11,0xCA,\ + 0x86,0xBF,0x6D,0xFB,0x85,0xA3,0xC5,0xE5,0x19,0x5C,0xD7,0xEE,0xA6,0x3F,0x69,0x67,\ + 0xD8,0x78,0xE2,0xA6,0xC9,0xC4,0xDB,0x2D,0x79,0x2E,0xE7,0x8B,0x8D,0x02,0x6F,0x31,\ + 0x22,0x4D,0x06,0xE3,0x60,0x72,0x45,0x9D,0x0E,0x42,0x77,0x9E,0xCE,0xCF,0xE5,0x7F,\ + 0x85,0x9B,0x18,0xE4,0xFC,0xCC,0x2E,0x72,0xD3,0x16,0x93,0x4E,0xCA,0x99,0x63,0x5C,\ + 0xA1,0x05,0x2A,0x6C,0x06,0xA3,0x63,0x30,0x61,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,0xDA,0x83,0x63,0x02,0x79,0x8E,0xDA,0x4C,0xC6,0x3C,0x23,\ + 0x14,0xD8,0x8F,0xC3,0x20,0xAB,0x28,0x60,0x59,0x30,0x1F,0x06,0x03,0x55,0x1D,0x23,\ + 0x04,0x18,0x30,0x16,0x80,0x14,0xDA,0x83,0x63,0x02,0x79,0x8E,0xDA,0x4C,0xC6,0x3C,\ + 0x23,0x14,0xD8,0x8F,0xC3,0x20,0xAB,0x28,0x60,0x59,0x30,0x0A,0x06,0x08,0x2A,0x86,\ + 0x48,0xCE,0x3D,0x04,0x03,0x03,0x03,0x68,0x00,0x30,0x65,0x02,0x30,0x70,0xFE,0xB0,\ + 0x0B,0xD9,0xF7,0x83,0x97,0xEC,0xF3,0x55,0x1D,0xD4,0xDC,0xB3,0x06,0x0E,0xFE,0x33,\ + 0x98,0x9D,0x8B,0x39,0x90,0x6B,0x94,0x21,0xED,0xB6,0xD7,0x5D,0xD6,0x4C,0xD7,0x21,\ + 0xA7,0xE7,0xBF,0x21,0x0F,0x2B,0xCD,0xF7,0x2A,0xDC,0x85,0x07,0x9D,0x02,0x31,0x00,\ + 0x86,0x14,0x16,0xE5,0xDC,0xB0,0x65,0xC2,0xC0,0x8E,0x14,0x9F,0xBF,0x24,0x16,0x68,\ + 0xE5,0xBC,0xF9,0x79,0x69,0xDC,0xAD,0x45,0x2B,0xF7,0xB6,0x31,0x73,0xCC,0x06,0xA5,\ + 0x53,0x93,0x91,0x1A,0x93,0xAE,0x70,0x6A,0x67,0xBA,0xD7,0x9E,0xE5,0x61,0x1A,0x5F + +; "Certplus Root CA G1" (1391 bytes) +HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\22FDD0B7FDA24E0DAC492CA0ACA67B6A1FE3F766","Blob",0x00000001,\ + 0x20,0x00,0x00,0x00,\ + 0x01,0x00,0x00,0x00,\ + 0x6F,0x05,0x00,0x00,\ + 0x30,0x82,0x05,0x6B,0x30,0x82,0x03,0x53,0xA0,0x03,0x02,0x01,0x02,0x02,0x12,0x11,\ + 0x20,0x55,0x83,0xE4,0x2D,0x3E,0x54,0x56,0x85,0x2D,0x83,0x37,0xB7,0x2C,0xDC,0x46,\ + 0x11,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0D,0x05,0x00,\ + 0x30,0x3E,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x46,0x52,0x31,\ + 0x11,0x30,0x0F,0x06,0x03,0x55,0x04,0x0A,0x0C,0x08,0x43,0x65,0x72,0x74,0x70,0x6C,\ + 0x75,0x73,0x31,0x1C,0x30,0x1A,0x06,0x03,0x55,0x04,0x03,0x0C,0x13,0x43,0x65,0x72,\ + 0x74,0x70,0x6C,0x75,0x73,0x20,0x52,0x6F,0x6F,0x74,0x20,0x43,0x41,0x20,0x47,0x31,\ + 0x30,0x1E,0x17,0x0D,0x31,0x34,0x30,0x35,0x32,0x36,0x30,0x30,0x30,0x30,0x30,0x30,\ + 0x5A,0x17,0x0D,0x33,0x38,0x30,0x31,0x31,0x35,0x30,0x30,0x30,0x30,0x30,0x30,0x5A,\ + 0x30,0x3E,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x46,0x52,0x31,\ + 0x11,0x30,0x0F,0x06,0x03,0x55,0x04,0x0A,0x0C,0x08,0x43,0x65,0x72,0x74,0x70,0x6C,\ + 0x75,0x73,0x31,0x1C,0x30,0x1A,0x06,0x03,0x55,0x04,0x03,0x0C,0x13,0x43,0x65,0x72,\ + 0x74,0x70,0x6C,0x75,0x73,0x20,0x52,0x6F,0x6F,0x74,0x20,0x43,0x41,0x20,0x47,0x31,\ + 0x30,0x82,0x02,0x22,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,\ + 0x01,0x05,0x00,0x03,0x82,0x02,0x0F,0x00,0x30,0x82,0x02,0x0A,0x02,0x82,0x02,0x01,\ + 0x00,0xDA,0x50,0x87,0xB6,0xDA,0xB8,0xA9,0x3E,0x9D,0x64,0xFA,0x56,0x33,0x9A,0x56,\ + 0x3D,0x16,0xE5,0x03,0x95,0xB2,0x34,0x1C,0x9A,0x6D,0x62,0x05,0xD4,0xD8,0x8F,0xE7,\ + 0x89,0x64,0x9F,0xBA,0xDB,0x64,0x8B,0x64,0xE6,0x79,0x2A,0x61,0xCD,0xAF,0x8F,0x5A,\ + 0x89,0x91,0x65,0xB9,0x58,0xFC,0xB4,0x03,0x5F,0x91,0x3F,0x2D,0x10,0x15,0xE0,0x7E,\ + 0xCF,0xBC,0xFC,0x7F,0x43,0x67,0xA8,0xAD,0x5E,0x36,0x23,0xD8,0x98,0xB3,0x4D,0xF3,\ + 0x43,0x9E,0x39,0x7C,0x2A,0xFC,0xEC,0x88,0xD5,0x88,0xEE,0x70,0xBD,0x85,0x16,0x2D,\ + 0xEA,0x4B,0x89,0x3C,0xA3,0x71,0x42,0xFE,0x1C,0xFD,0xD3,0x1C,0x2D,0x10,0xB8,0x86,\ + 0x54,0xEA,0x43,0xB8,0xDB,0xC6,0x87,0xDA,0xA8,0xAE,0x80,0x25,0xCF,0x7A,0x26,0x1D,\ + 0xAA,0x91,0xB0,0x48,0x6F,0xAE,0xB5,0xDE,0x9E,0xD8,0xD7,0xFA,0x00,0xFD,0xC6,0x8F,\ + 0xD0,0x51,0xBB,0x62,0x7D,0xA4,0xB1,0x8C,0xB2,0xFF,0x20,0x11,0xBA,0x35,0x63,0x05,\ + 0x86,0x47,0x60,0x43,0x33,0x90,0xF6,0x47,0xA2,0x03,0x4F,0x96,0x4D,0x9D,0x4F,0xC1,\ + 0xEA,0xEA,0x9C,0xA2,0xFE,0x34,0x2E,0xDE,0xB7,0xCA,0x1B,0x76,0xA4,0xB7,0xAD,0x9F,\ + 0xE9,0xA8,0xD4,0x78,0x3F,0x78,0xFE,0xF2,0x38,0x09,0x36,0x1D,0xD2,0x16,0x02,0xC8,\ + 0xEC,0x2A,0x68,0xAF,0xF5,0x8E,0x94,0xEF,0x2D,0x13,0x7A,0x1E,0x42,0x4A,0x1D,0x15,\ + 0x31,0xAE,0x0C,0x04,0x57,0xFC,0x61,0x73,0xF3,0x31,0x56,0x86,0x31,0x80,0xA0,0xC4,\ + 0x11,0x6E,0x30,0x76,0xE3,0x94,0xF0,0x5F,0x04,0xC4,0xAC,0x87,0x72,0x89,0x98,0xC5,\ + 0x9D,0xCC,0x57,0x08,0x9A,0xF4,0x0C,0xFC,0x7D,0x7A,0x05,0x3A,0xFA,0x47,0x80,0x39,\ + 0xB6,0xCF,0x84,0x13,0x77,0x6F,0x27,0xEA,0xFF,0x96,0x67,0x17,0x08,0x6D,0xE9,0x0D,\ + 0xD6,0x23,0x50,0x30,0xB0,0x15,0x74,0x13,0x3E,0xE5,0x2F,0xFF,0x0E,0xCD,0xC4,0x0B,\ + 0x4A,0x5D,0xF0,0xD8,0x00,0x33,0x49,0x66,0xEB,0xA1,0x18,0x7C,0x59,0x2E,0x3D,0x28,\ + 0xB9,0x61,0x71,0xCB,0xB5,0xA5,0xBA,0xB8,0xEA,0xDC,0xE2,0x70,0x6F,0x08,0x6A,0xDC,\ + 0x87,0x67,0x34,0xEF,0xDF,0x30,0x72,0xDD,0xF3,0xC9,0x3F,0x23,0xFF,0x35,0xE1,0xBE,\ + 0x21,0x29,0x20,0x30,0x81,0xE4,0x19,0xA5,0x20,0xE9,0x25,0xCA,0x73,0x31,0x74,0x29,\ + 0xBE,0xE2,0x42,0xD5,0xF3,0xB2,0x26,0x66,0xC7,0x68,0xFD,0x19,0xB3,0xE7,0x20,0x93,\ + 0x99,0xE8,0x5D,0xE0,0x5E,0x87,0xE7,0x46,0xE8,0x25,0x9C,0x0A,0x29,0x24,0xD4,0xCD,\ + 0x58,0x86,0x52,0x40,0x24,0xB2,0x7B,0x0F,0x98,0x12,0x20,0x24,0xF6,0x90,0x6C,0x47,\ + 0xC8,0x0D,0xBB,0x18,0x20,0x2E,0xD9,0xFD,0xFC,0x8B,0xF2,0x29,0xEA,0x87,0x74,0x95,\ + 0xE0,0x42,0x50,0x78,0x84,0x04,0x41,0x61,0xB0,0xF4,0x21,0x23,0x8F,0x2D,0xCB,0x28,\ + 0x21,0xF2,0x6A,0x6C,0xF4,0x1A,0xA6,0xC5,0x14,0xB4,0x37,0x65,0x4F,0x95,0xFD,0x80,\ + 0xC8,0xF8,0x72,0xE5,0x25,0x6B,0xC4,0x60,0xB1,0x7B,0x6D,0x8E,0x4A,0x8A,0x73,0xCE,\ + 0x59,0xFB,0x70,0x7A,0x73,0x06,0x13,0xD9,0xD3,0x74,0x37,0x24,0x41,0x0A,0x11,0x6F,\ + 0x97,0xDC,0xE7,0xE4,0x7E,0xA1,0xBD,0x15,0xF2,0xBA,0x87,0x0F,0x3D,0x68,0x8A,0x16,\ + 0x07,0x02,0x03,0x01,0x00,0x01,0xA3,0x63,0x30,0x61,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,0xA8,0xC1,0xC0,0x9B,0x91,0xA8,0x43,0x15,0x7C,0x5D,\ + 0x06,0x27,0xB4,0x2A,0x51,0xD8,0x97,0x0B,0x81,0xB1,0x30,0x1F,0x06,0x03,0x55,0x1D,\ + 0x23,0x04,0x18,0x30,0x16,0x80,0x14,0xA8,0xC1,0xC0,0x9B,0x91,0xA8,0x43,0x15,0x7C,\ + 0x5D,0x06,0x27,0xB4,0x2A,0x51,0xD8,0x97,0x0B,0x81,0xB1,0x30,0x0D,0x06,0x09,0x2A,\ + 0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0D,0x05,0x00,0x03,0x82,0x02,0x01,0x00,0x9C,\ + 0x56,0x6F,0x01,0x7E,0xD1,0xBD,0x4C,0xF5,0x8A,0xC6,0xF0,0x26,0x1F,0xE4,0xE0,0x38,\ + 0x18,0xCC,0x32,0xC3,0x29,0x3B,0x9D,0x41,0x29,0x34,0x61,0xC6,0xD7,0xF0,0x00,0xA1,\ + 0xEB,0xA4,0x72,0x8F,0x94,0x17,0xBC,0x13,0x2C,0x75,0xB4,0x57,0xEE,0x0A,0x7C,0x09,\ + 0x7A,0xDC,0xD5,0xCA,0xA1,0xD0,0x34,0x13,0xF8,0x77,0xAB,0x9F,0xE5,0xFE,0xD8,0x1E,\ + 0x74,0x8A,0x85,0x07,0x8F,0x7F,0xCC,0x79,0x7A,0xCA,0x96,0xCD,0xCD,0xFD,0x4F,0xFB,\ + 0xFD,0x23,0x0D,0x90,0xF5,0xF4,0x5E,0xD3,0xC6,0x61,0x7D,0x9E,0x11,0xE0,0x02,0xEE,\ + 0x09,0x04,0xD9,0x07,0xDD,0xA6,0x8A,0xB7,0x0C,0x83,0x24,0xBB,0x83,0x50,0x92,0xFE,\ + 0x60,0x75,0x11,0x3E,0xD8,0x9D,0xB0,0x8A,0x7A,0xB5,0xE0,0x9D,0x9B,0xCB,0x90,0x52,\ + 0x4B,0xB0,0x93,0x2A,0xD4,0x3E,0x16,0x33,0xE5,0x9E,0xC6,0x65,0x15,0x3E,0x64,0x3B,\ + 0x04,0x3F,0xDB,0x0C,0x8F,0x5F,0x5C,0x1D,0x69,0x1F,0xAF,0xF3,0xE9,0x21,0x8C,0xF3,\ + 0xEF,0x97,0xF6,0x9A,0xB7,0x19,0xB6,0x84,0x74,0x9C,0xA3,0x54,0xB5,0x70,0x4E,0x63,\ + 0xD8,0x57,0x5D,0x53,0x21,0x9B,0x40,0x92,0x43,0xFA,0xD6,0x77,0x55,0x33,0x4F,0x64,\ + 0xD5,0xFB,0xD0,0x2C,0x6A,0x8E,0x6D,0x25,0xA6,0xEF,0x85,0xE8,0x02,0xC4,0x53,0x3E,\ + 0xB9,0x9E,0x87,0xBC,0xCC,0x35,0x1A,0xDE,0xA1,0xE9,0x8A,0x63,0x87,0x65,0x1E,0x11,\ + 0x2A,0xDB,0x63,0x77,0x97,0x14,0xBE,0x9A,0x14,0x99,0x11,0xB2,0xC0,0xEE,0xB0,0x4F,\ + 0xF8,0x14,0x21,0x32,0x43,0x4F,0x9F,0xAB,0xA2,0xCB,0xA8,0x0F,0xAA,0x3B,0x06,0x55,\ + 0xC6,0x12,0x29,0x57,0x08,0xD4,0x37,0xD7,0x87,0x27,0xAD,0x49,0x59,0xA7,0x91,0xAB,\ + 0x44,0x7A,0x5E,0x8D,0x70,0xDB,0x97,0xCE,0x48,0x50,0xB1,0x73,0x93,0xF6,0xF0,0x83,\ + 0x60,0xF9,0xCD,0xF1,0xE1,0x31,0xFD,0x5B,0x7C,0x71,0x21,0x63,0x14,0x14,0xAA,0xAF,\ + 0xC5,0xDE,0x93,0x7E,0x68,0xB1,0xEC,0x22,0xA2,0xAA,0x90,0x75,0x9E,0xB5,0x43,0x72,\ + 0xEA,0x64,0xA3,0x84,0x4B,0xFD,0x0C,0xA8,0x26,0x6B,0x71,0x97,0xEE,0x56,0x63,0x66,\ + 0xE8,0x42,0x54,0xF9,0xC7,0x1D,0xDF,0xD0,0x8F,0x5B,0xDF,0xC8,0x30,0x6F,0x88,0xFE,\ + 0x0D,0xC4,0x33,0x1C,0x53,0xA8,0xA3,0xFD,0x48,0x10,0xF2,0xE4,0x0A,0x4E,0xE1,0x15,\ + 0x57,0xFC,0x6E,0x64,0x30,0xC2,0x55,0x11,0xDC,0xEA,0xA9,0xCD,0x4A,0x54,0xAC,0x29,\ + 0x63,0x44,0xCF,0x4A,0x40,0xA0,0xD6,0x68,0x59,0x1B,0x33,0xF9,0xEF,0x3A,0x8B,0xDB,\ + 0x20,0x92,0xDC,0x42,0x84,0xBF,0x01,0xAB,0x87,0xC0,0xD5,0x20,0x82,0xDB,0xC6,0xB9,\ + 0x83,0x85,0x42,0x5C,0x0F,0x43,0x3B,0x6A,0x49,0x35,0xD5,0x98,0xF4,0x15,0xBF,0xFA,\ + 0x61,0x81,0x0C,0x09,0x20,0x18,0xD2,0xD0,0x17,0x0C,0xCB,0x48,0x00,0x50,0xE9,0x76,\ + 0x82,0x8C,0x64,0xD7,0x3A,0xA0,0x07,0x55,0xCC,0x1E,0x31,0xC0,0xEF,0x3A,0xB4,0x65,\ + 0xFB,0xE3,0xBF,0x42,0x6B,0x9E,0x0F,0xA8,0xBD,0x6B,0x98,0xDC,0xD8,0xDB,0xCB,0x8B,\ + 0xA4,0xDD,0xD7,0x59,0xF4,0x6E,0xDD,0xFE,0xAA,0xC3,0x91,0xD0,0x2E,0x42,0x07,0xC0,\ + 0x0C,0x4D,0x53,0xCD,0x24,0xB1,0x4C,0x5B,0x1E,0x51,0xF4,0xDF,0xE9,0x92,0xFA + +; "Hellenic Academic and Research Institutions ECC RootCA 2015" (711 bytes) +HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\9FF1718D92D59AF37D7497B4BC6F84680BBAB666","Blob",0x00000001,\ + 0x20,0x00,0x00,0x00,\ + 0x01,0x00,0x00,0x00,\ + 0xC7,0x02,0x00,0x00,\ + 0x30,0x82,0x02,0xC3,0x30,0x82,0x02,0x4A,0xA0,0x03,0x02,0x01,0x02,0x02,0x01,0x00,\ + 0x30,0x0A,0x06,0x08,0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x02,0x30,0x81,0xAA,0x31,\ + 0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x47,0x52,0x31,0x0F,0x30,0x0D,\ + 0x06,0x03,0x55,0x04,0x07,0x13,0x06,0x41,0x74,0x68,0x65,0x6E,0x73,0x31,0x44,0x30,\ + 0x42,0x06,0x03,0x55,0x04,0x0A,0x13,0x3B,0x48,0x65,0x6C,0x6C,0x65,0x6E,0x69,0x63,\ + 0x20,0x41,0x63,0x61,0x64,0x65,0x6D,0x69,0x63,0x20,0x61,0x6E,0x64,0x20,0x52,0x65,\ + 0x73,0x65,0x61,0x72,0x63,0x68,0x20,0x49,0x6E,0x73,0x74,0x69,0x74,0x75,0x74,0x69,\ + 0x6F,0x6E,0x73,0x20,0x43,0x65,0x72,0x74,0x2E,0x20,0x41,0x75,0x74,0x68,0x6F,0x72,\ + 0x69,0x74,0x79,0x31,0x44,0x30,0x42,0x06,0x03,0x55,0x04,0x03,0x13,0x3B,0x48,0x65,\ + 0x6C,0x6C,0x65,0x6E,0x69,0x63,0x20,0x41,0x63,0x61,0x64,0x65,0x6D,0x69,0x63,0x20,\ + 0x61,0x6E,0x64,0x20,0x52,0x65,0x73,0x65,0x61,0x72,0x63,0x68,0x20,0x49,0x6E,0x73,\ + 0x74,0x69,0x74,0x75,0x74,0x69,0x6F,0x6E,0x73,0x20,0x45,0x43,0x43,0x20,0x52,0x6F,\ + 0x6F,0x74,0x43,0x41,0x20,0x32,0x30,0x31,0x35,0x30,0x1E,0x17,0x0D,0x31,0x35,0x30,\ + 0x37,0x30,0x37,0x31,0x30,0x33,0x37,0x31,0x32,0x5A,0x17,0x0D,0x34,0x30,0x30,0x36,\ + 0x33,0x30,0x31,0x30,0x33,0x37,0x31,0x32,0x5A,0x30,0x81,0xAA,0x31,0x0B,0x30,0x09,\ + 0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x47,0x52,0x31,0x0F,0x30,0x0D,0x06,0x03,0x55,\ + 0x04,0x07,0x13,0x06,0x41,0x74,0x68,0x65,0x6E,0x73,0x31,0x44,0x30,0x42,0x06,0x03,\ + 0x55,0x04,0x0A,0x13,0x3B,0x48,0x65,0x6C,0x6C,0x65,0x6E,0x69,0x63,0x20,0x41,0x63,\ + 0x61,0x64,0x65,0x6D,0x69,0x63,0x20,0x61,0x6E,0x64,0x20,0x52,0x65,0x73,0x65,0x61,\ + 0x72,0x63,0x68,0x20,0x49,0x6E,0x73,0x74,0x69,0x74,0x75,0x74,0x69,0x6F,0x6E,0x73,\ + 0x20,0x43,0x65,0x72,0x74,0x2E,0x20,0x41,0x75,0x74,0x68,0x6F,0x72,0x69,0x74,0x79,\ + 0x31,0x44,0x30,0x42,0x06,0x03,0x55,0x04,0x03,0x13,0x3B,0x48,0x65,0x6C,0x6C,0x65,\ + 0x6E,0x69,0x63,0x20,0x41,0x63,0x61,0x64,0x65,0x6D,0x69,0x63,0x20,0x61,0x6E,0x64,\ + 0x20,0x52,0x65,0x73,0x65,0x61,0x72,0x63,0x68,0x20,0x49,0x6E,0x73,0x74,0x69,0x74,\ + 0x75,0x74,0x69,0x6F,0x6E,0x73,0x20,0x45,0x43,0x43,0x20,0x52,0x6F,0x6F,0x74,0x43,\ + 0x41,0x20,0x32,0x30,0x31,0x35,0x30,0x76,0x30,0x10,0x06,0x07,0x2A,0x86,0x48,0xCE,\ + 0x3D,0x02,0x01,0x06,0x05,0x2B,0x81,0x04,0x00,0x22,0x03,0x62,0x00,0x04,0x92,0xA0,\ + 0x41,0xE8,0x4B,0x82,0x84,0x5C,0xE2,0xF8,0x31,0x11,0x99,0x86,0x64,0x4E,0x09,0x25,\ + 0x2F,0x9D,0x41,0x2F,0x0A,0xAE,0x35,0x4F,0x74,0x95,0xB2,0x51,0x64,0x6B,0x8D,0x6B,\ + 0xE6,0x3F,0x70,0x95,0xF0,0x05,0x44,0x47,0xA6,0x72,0x38,0x50,0x76,0x95,0x02,0x5A,\ + 0x8E,0xAE,0x28,0x9E,0xF9,0x2D,0x4E,0x99,0xEF,0x2C,0x48,0x6F,0x4C,0x25,0x29,0xE8,\ + 0xD1,0x71,0x5B,0xDF,0x1D,0xC1,0x75,0x37,0xB4,0xD7,0xFA,0x7B,0x7A,0x42,0x9C,0x6A,\ + 0x0A,0x56,0x5A,0x7C,0x69,0x0B,0xAA,0x80,0x09,0x24,0x6C,0x7E,0xC1,0x46,0xA3,0x42,\ + 0x30,0x40,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,0x1D,0x06,0x03,0x55,0x1D,0x0E,0x04,0x16,0x04,0x14,0xB4,0x22,\ + 0x0B,0x82,0x99,0x24,0x01,0x0E,0x9C,0xBB,0xE4,0x0E,0xFD,0xBF,0xFB,0x97,0x20,0x93,\ + 0x99,0x2A,0x30,0x0A,0x06,0x08,0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x02,0x03,0x67,\ + 0x00,0x30,0x64,0x02,0x30,0x67,0xCE,0x16,0x62,0x38,0xA2,0xAC,0x62,0x45,0xA7,0xA9,\ + 0x95,0x24,0xC0,0x1A,0x27,0x9C,0x32,0x3B,0xC0,0xC0,0xD5,0xBA,0xA9,0xE7,0xF8,0x04,\ + 0x43,0x53,0x85,0xEE,0x52,0x21,0xDE,0x9D,0xF5,0x25,0x83,0x3E,0x9E,0x58,0x4B,0x2F,\ + 0xD7,0x67,0x13,0x0E,0x21,0x02,0x30,0x05,0xE1,0x75,0x01,0xDE,0x68,0xED,0x2A,0x1F,\ + 0x4D,0x4C,0x09,0x08,0x0D,0xEC,0x4B,0xAD,0x64,0x17,0x28,0xE7,0x75,0xCE,0x45,0x65,\ + 0x72,0x21,0x17,0xCB,0x22,0x41,0x0E,0x8C,0x13,0x98,0x38,0x9A,0x54,0x6D,0x9B,0xCA,\ + 0xE2,0x7C,0xEA,0x02,0x58,0x22,0x91 + +; "Hellenic Academic and Research Institutions RootCA 2015" (1551 bytes) +HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\010C0695A6981914FFBF5FC6B0B695EA29E912A6","Blob",0x00000001,\ + 0x20,0x00,0x00,0x00,\ + 0x01,0x00,0x00,0x00,\ + 0x0F,0x06,0x00,0x00,\ + 0x30,0x82,0x06,0x0B,0x30,0x82,0x03,0xF3,0xA0,0x03,0x02,0x01,0x02,0x02,0x01,0x00,\ + 0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,0x05,0x00,0x30,\ + 0x81,0xA6,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x47,0x52,0x31,\ + 0x0F,0x30,0x0D,0x06,0x03,0x55,0x04,0x07,0x13,0x06,0x41,0x74,0x68,0x65,0x6E,0x73,\ + 0x31,0x44,0x30,0x42,0x06,0x03,0x55,0x04,0x0A,0x13,0x3B,0x48,0x65,0x6C,0x6C,0x65,\ + 0x6E,0x69,0x63,0x20,0x41,0x63,0x61,0x64,0x65,0x6D,0x69,0x63,0x20,0x61,0x6E,0x64,\ + 0x20,0x52,0x65,0x73,0x65,0x61,0x72,0x63,0x68,0x20,0x49,0x6E,0x73,0x74,0x69,0x74,\ + 0x75,0x74,0x69,0x6F,0x6E,0x73,0x20,0x43,0x65,0x72,0x74,0x2E,0x20,0x41,0x75,0x74,\ + 0x68,0x6F,0x72,0x69,0x74,0x79,0x31,0x40,0x30,0x3E,0x06,0x03,0x55,0x04,0x03,0x13,\ + 0x37,0x48,0x65,0x6C,0x6C,0x65,0x6E,0x69,0x63,0x20,0x41,0x63,0x61,0x64,0x65,0x6D,\ + 0x69,0x63,0x20,0x61,0x6E,0x64,0x20,0x52,0x65,0x73,0x65,0x61,0x72,0x63,0x68,0x20,\ + 0x49,0x6E,0x73,0x74,0x69,0x74,0x75,0x74,0x69,0x6F,0x6E,0x73,0x20,0x52,0x6F,0x6F,\ + 0x74,0x43,0x41,0x20,0x32,0x30,0x31,0x35,0x30,0x1E,0x17,0x0D,0x31,0x35,0x30,0x37,\ + 0x30,0x37,0x31,0x30,0x31,0x31,0x32,0x31,0x5A,0x17,0x0D,0x34,0x30,0x30,0x36,0x33,\ + 0x30,0x31,0x30,0x31,0x31,0x32,0x31,0x5A,0x30,0x81,0xA6,0x31,0x0B,0x30,0x09,0x06,\ + 0x03,0x55,0x04,0x06,0x13,0x02,0x47,0x52,0x31,0x0F,0x30,0x0D,0x06,0x03,0x55,0x04,\ + 0x07,0x13,0x06,0x41,0x74,0x68,0x65,0x6E,0x73,0x31,0x44,0x30,0x42,0x06,0x03,0x55,\ + 0x04,0x0A,0x13,0x3B,0x48,0x65,0x6C,0x6C,0x65,0x6E,0x69,0x63,0x20,0x41,0x63,0x61,\ + 0x64,0x65,0x6D,0x69,0x63,0x20,0x61,0x6E,0x64,0x20,0x52,0x65,0x73,0x65,0x61,0x72,\ + 0x63,0x68,0x20,0x49,0x6E,0x73,0x74,0x69,0x74,0x75,0x74,0x69,0x6F,0x6E,0x73,0x20,\ + 0x43,0x65,0x72,0x74,0x2E,0x20,0x41,0x75,0x74,0x68,0x6F,0x72,0x69,0x74,0x79,0x31,\ + 0x40,0x30,0x3E,0x06,0x03,0x55,0x04,0x03,0x13,0x37,0x48,0x65,0x6C,0x6C,0x65,0x6E,\ + 0x69,0x63,0x20,0x41,0x63,0x61,0x64,0x65,0x6D,0x69,0x63,0x20,0x61,0x6E,0x64,0x20,\ + 0x52,0x65,0x73,0x65,0x61,0x72,0x63,0x68,0x20,0x49,0x6E,0x73,0x74,0x69,0x74,0x75,\ + 0x74,0x69,0x6F,0x6E,0x73,0x20,0x52,0x6F,0x6F,0x74,0x43,0x41,0x20,0x32,0x30,0x31,\ + 0x35,0x30,0x82,0x02,0x22,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,\ + 0x01,0x01,0x05,0x00,0x03,0x82,0x02,0x0F,0x00,0x30,0x82,0x02,0x0A,0x02,0x82,0x02,\ + 0x01,0x00,0xC2,0xF8,0xA9,0x3F,0x1B,0x89,0xFC,0x3C,0x3C,0x04,0x5D,0x3D,0x90,0x36,\ + 0xB0,0x91,0x3A,0x79,0x3C,0x66,0x5A,0xEF,0x6D,0x39,0x01,0x49,0x1A,0xB4,0xB7,0xCF,\ + 0x7F,0x4D,0x23,0x53,0xB7,0x90,0x00,0xE3,0x13,0x2A,0x28,0xA6,0x31,0xF1,0x91,0x00,\ + 0xE3,0x28,0xEC,0xAE,0x21,0x41,0xCE,0x1F,0xDA,0xFD,0x7D,0x12,0x5B,0x01,0x83,0x0F,\ + 0xB9,0xB0,0x5F,0x99,0xE1,0xF2,0x12,0x83,0x80,0x4D,0x06,0x3E,0xDF,0xAC,0xAF,0xE7,\ + 0xA1,0x88,0x6B,0x31,0xAF,0xF0,0x8B,0xD0,0x18,0x33,0xB8,0xDB,0x45,0x6A,0x34,0xF4,\ + 0x02,0x80,0x24,0x28,0x0A,0x02,0x15,0x95,0x5E,0x76,0x2A,0x0D,0x99,0x3A,0x14,0x5B,\ + 0xF6,0xCB,0xCB,0x53,0xBC,0x13,0x4D,0x01,0x88,0x37,0x94,0x25,0x1B,0x42,0xBC,0x22,\ + 0xD8,0x8E,0xA3,0x96,0x5E,0x3A,0xD9,0x32,0xDB,0x3E,0xE8,0xF0,0x10,0x65,0xED,0x74,\ + 0xE1,0x2F,0xA7,0x7C,0xAF,0x27,0x34,0xBB,0x29,0x7D,0x9B,0xB6,0xCF,0x09,0xC8,0xE5,\ + 0xD3,0x0A,0xFC,0x88,0x65,0x65,0x74,0x0A,0xDC,0x73,0x1C,0x5C,0xCD,0x40,0xB1,0x1C,\ + 0xD4,0xB6,0x84,0x8C,0x4C,0x50,0xCF,0x68,0x8E,0xA8,0x59,0xAE,0xC2,0x27,0x4E,0x82,\ + 0xA2,0x35,0xDD,0x14,0xF4,0x1F,0xFF,0xB2,0x77,0xD5,0x87,0x2F,0xAA,0x6E,0x7D,0x24,\ + 0x27,0xE7,0xC6,0xCB,0x26,0xE6,0xE5,0xFE,0x67,0x07,0x63,0xD8,0x45,0x0D,0xDD,0x3A,\ + 0x59,0x65,0x39,0x58,0x7A,0x92,0x99,0x72,0x3D,0x9C,0x84,0x5E,0x88,0x21,0xB8,0xD5,\ + 0xF4,0x2C,0xFC,0xD9,0x70,0x52,0x4F,0x78,0xB8,0xBD,0x3C,0x2B,0x8B,0x95,0x98,0xF5,\ + 0xB3,0xD1,0x68,0xCF,0x20,0x14,0x7E,0x4C,0x5C,0x5F,0xE7,0x8B,0xE5,0xF5,0x35,0x81,\ + 0x19,0x37,0xD7,0x11,0x08,0xB7,0x66,0xBE,0xD3,0x4A,0xCE,0x83,0x57,0x00,0x3A,0xC3,\ + 0x81,0xF8,0x17,0xCB,0x92,0x36,0x5D,0xD1,0xA3,0xD8,0x75,0x1B,0xE1,0x8B,0x27,0xEA,\ + 0x7A,0x48,0x41,0xFD,0x45,0x19,0x06,0xAD,0x27,0x99,0x4E,0xC1,0x70,0x47,0xDD,0xB5,\ + 0x9F,0x81,0x53,0x12,0xE5,0xB1,0x8C,0x48,0x5D,0x31,0x43,0x17,0xE3,0x8C,0xC6,0x7A,\ + 0x63,0x96,0x4B,0x29,0x30,0x4E,0x84,0x4E,0x62,0x19,0x5E,0x3C,0xCE,0x97,0x90,0xA5,\ + 0x7F,0x01,0xEB,0x9D,0xE0,0xF8,0x8B,0x89,0xDD,0x25,0x98,0x3D,0x92,0xB6,0x7E,0xEF,\ + 0xD9,0xF1,0x51,0x51,0x7D,0x2D,0x26,0xC8,0x69,0x59,0x61,0xE0,0xAC,0x6A,0xB8,0x2A,\ + 0x36,0x11,0x04,0x7A,0x50,0xBD,0x32,0x84,0xBE,0x2F,0xDC,0x72,0xD5,0xD7,0x1D,0x16,\ + 0x47,0xE4,0x47,0x66,0x20,0x3F,0xF4,0x96,0xC5,0xAF,0x8E,0x01,0x7A,0xA5,0x0F,0x7A,\ + 0x64,0xF5,0x0D,0x18,0x87,0xD9,0xAE,0x88,0xD5,0xFA,0x84,0xC1,0x3A,0xC0,0x69,0x28,\ + 0x2D,0xF2,0x0D,0x68,0x51,0xAA,0xE3,0xA5,0x77,0xC6,0xA4,0x90,0x0E,0xA1,0x37,0x8B,\ + 0x31,0x23,0x47,0xC1,0x09,0x08,0xEB,0x6E,0xF7,0x78,0x9B,0xD7,0x82,0xFC,0x84,0x20,\ + 0x99,0x49,0x19,0xB6,0x12,0x46,0xB1,0xFB,0x45,0x55,0x16,0xA9,0xA3,0x65,0xAC,0x9C,\ + 0x07,0x0F,0xEA,0x6B,0xDC,0x1F,0x2E,0x06,0x72,0xEC,0x86,0x88,0x12,0xE4,0x2D,0xDB,\ + 0x5F,0x05,0x2F,0xE4,0xF0,0x03,0xD3,0x26,0x33,0xE7,0x80,0xC2,0xCD,0x42,0xA1,0x17,\ + 0x34,0x0B,0x02,0x03,0x01,0x00,0x01,0xA3,0x42,0x30,0x40,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,0x1D,0x06,0x03,\ + 0x55,0x1D,0x0E,0x04,0x16,0x04,0x14,0x71,0x15,0x67,0xC8,0xC8,0xC9,0xBD,0x75,0x5D,\ + 0x72,0xD0,0x38,0x18,0x6A,0x9D,0xF3,0x71,0x24,0x54,0x0B,0x30,0x0D,0x06,0x09,0x2A,\ + 0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,0x05,0x00,0x03,0x82,0x02,0x01,0x00,0x75,\ + 0xBB,0x6D,0x54,0x4B,0xAA,0x10,0x58,0x46,0x34,0xF2,0x62,0xD7,0x16,0x36,0x5D,0x08,\ + 0x5E,0xD5,0x6C,0xC8,0x87,0xBD,0xB4,0x2E,0x46,0xF2,0x31,0xF8,0x7C,0xEA,0x42,0xB5,\ + 0x93,0x16,0x55,0xDC,0xA1,0x0C,0x12,0xA0,0xDA,0x61,0x7E,0x0F,0x58,0x58,0x73,0x64,\ + 0x72,0xC7,0xE8,0x45,0x8E,0xDC,0xA9,0xF2,0x26,0x3F,0xC6,0x79,0x8C,0xB1,0x53,0x08,\ + 0x33,0x81,0xB0,0x56,0x13,0xBE,0xE6,0x51,0x5C,0xD8,0x9B,0x0A,0x4F,0x4B,0x9C,0x56,\ + 0x53,0x02,0xE9,0x4F,0xF6,0x0D,0x60,0xEA,0x4D,0x42,0x55,0xE8,0x7C,0x1B,0x21,0x21,\ + 0xD3,0x1B,0x3A,0xCC,0x77,0xF2,0xB8,0x90,0xF1,0x68,0xC7,0xF9,0x5A,0xFE,0xFA,0x2D,\ + 0xF4,0xBF,0xC9,0xF5,0x45,0x1B,0xCE,0x38,0x10,0x2A,0x37,0x8A,0x79,0xA3,0xB4,0xE3,\ + 0x09,0x6C,0x85,0x86,0x93,0xFF,0x89,0x96,0x27,0x78,0x81,0x8F,0x67,0xE3,0x46,0x74,\ + 0x54,0x8E,0xD9,0x0D,0x69,0xE2,0x4A,0xF4,0x4D,0x74,0x03,0xFF,0xB2,0x77,0xED,0x95,\ + 0x67,0x97,0xE4,0xB1,0xC5,0xAB,0xBF,0x6A,0x23,0xE8,0xD4,0x94,0xE2,0x44,0x28,0x62,\ + 0xC4,0x4B,0xE2,0xF0,0xD8,0xE2,0x29,0x6B,0x1A,0x70,0x7E,0x24,0x61,0x93,0x7B,0x4F,\ + 0x03,0x32,0x25,0x0D,0x45,0x24,0x2B,0x96,0xB4,0x46,0x6A,0xBF,0x4A,0x0B,0xF7,0x9A,\ + 0x8F,0xC1,0xAC,0x1A,0xC5,0x67,0xF3,0x6F,0x34,0xD2,0xFA,0x73,0x63,0x8C,0xEF,0x16,\ + 0xB0,0xA8,0xA4,0x46,0x2A,0xF8,0xEB,0x12,0xEC,0x72,0xB4,0xEF,0xF8,0x2B,0x7E,0x8C,\ + 0x52,0xC0,0x8B,0x84,0x54,0xF9,0x2F,0x3E,0xE3,0x55,0xA8,0xDC,0x66,0xB1,0xD9,0xE1,\ + 0x5F,0xD8,0xB3,0x8C,0x59,0x34,0x59,0xA4,0xAB,0x4F,0x6C,0xBB,0x1F,0x18,0xDB,0x75,\ + 0xAB,0xD8,0xCB,0x92,0xCD,0x94,0x38,0x61,0x0E,0x07,0x06,0x1F,0x4B,0x46,0x10,0xF1,\ + 0x15,0xBE,0x8D,0x85,0x5C,0x3B,0x4A,0x2B,0x81,0x79,0x0F,0xB4,0x69,0x9F,0x49,0x50,\ + 0x97,0x4D,0xF7,0x0E,0x56,0x5D,0xC0,0x95,0x6A,0xC2,0x36,0xC3,0x1B,0x68,0xC9,0xF5,\ + 0x2A,0xDC,0x47,0x9A,0xBE,0xB2,0xCE,0xC5,0x25,0xE8,0xFA,0x03,0xB9,0xDA,0xF9,0x16,\ + 0x6E,0x91,0x84,0xF5,0x1C,0x28,0xC8,0xFC,0x26,0xCC,0xD7,0x1C,0x90,0x56,0xA7,0x5F,\ + 0x6F,0x3A,0x04,0xBC,0xCD,0x78,0x89,0x0B,0x8E,0x0F,0x2F,0xA3,0xAA,0x4F,0xA2,0x1B,\ + 0x12,0x3D,0x16,0x08,0x40,0x0F,0xF1,0x46,0x4C,0xD7,0xAA,0x7B,0x08,0xC1,0x0A,0xF5,\ + 0x6D,0x27,0xDE,0x02,0x8F,0xCA,0xC3,0xB5,0x2B,0xCA,0xE9,0xEB,0xC8,0x21,0x53,0x38,\ + 0xA5,0xCC,0x3B,0xD8,0x77,0x37,0x30,0xA2,0x4F,0xD9,0x6F,0xD1,0xF2,0x40,0xAD,0x41,\ + 0x7A,0x17,0xC5,0xD6,0x4A,0x35,0x89,0xB7,0x41,0xD5,0x7C,0x86,0x7F,0x55,0x4D,0x83,\ + 0x4A,0xA5,0x73,0x20,0xC0,0x3A,0xAF,0x90,0xF1,0x9A,0x24,0x8E,0xD9,0x8E,0x71,0xCA,\ + 0x7B,0xB8,0x86,0xDA,0xB2,0x8F,0x99,0x3E,0x1D,0x13,0x0D,0x12,0x11,0xEE,0xD4,0xAB,\ + 0xF0,0xE9,0x15,0x76,0x02,0xE4,0xE0,0xDF,0xAA,0x20,0x1E,0x5B,0x61,0x85,0x64,0x40,\ + 0xA9,0x90,0x97,0x0D,0xAD,0x53,0xD2,0x5A,0x1D,0x87,0x6A,0x00,0x97,0x65,0x62,0xB4,\ + 0xBE,0x6F,0x6A,0xA7,0xF5,0x2C,0x42,0xED,0x32,0xAD,0xB6,0x21,0x9E,0xBE,0xBC + ; "Certum Trusted Network CA 2" (1494 bytes) HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\D3DD483E2BBF4C05E8AF10F5FA7626CFD3DC3092","Blob",0x00000001,\ 0x20,0x00,0x00,0x00,\

8 years, 5 months

[hbelusca] 71824: [SHORTCUTS]: Add a Task-Manager shortcut in the System Tools menu, for usability purposes. CORE-11512 #resolve

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jul 5 18:43:08 2016 New Revision: 71824 URL: http://svn.reactos.org/svn/reactos?rev=71824&view=rev Log: [SHORTCUTS]: Add a Task-Manager shortcut in the System Tools menu, for usability purposes. CORE-11512 #resolve Modified: trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/media/inf/shortcuts.inf Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Tue Jul 5 18:43:08 2016 @@ -76,6 +76,7 @@ add_livecd_shortcut("Keyboard Layout Switcher" kbswitch.exe "Profiles/All Users/Start Menu/Programs/System Tools") add_livecd_shortcut("ReactX Diagnostic" dxdiag.exe "Profiles/All Users/Start Menu/Programs/System Tools") add_livecd_shortcut("Regedit" regedit.exe "Profiles/All Users/Start Menu/Programs/System Tools") +add_livecd_shortcut("Task Manager" taskmgr.exe "Profiles/All Users/Start Menu/Programs/System Tools") add_livecd_shortcut("ReactOS Explorer" explorer.exe "Profiles/All Users/Start Menu/Programs") add_custom_target(livecd_links DEPENDS ${LIVECD_SHORTCUTS}) Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Tue Jul 5 18:43:08 2016 @@ -44,6 +44,7 @@ %SystemRoot%\system32\clipbrd.exe, %CLIPBRD_TITLE%, %CLIPBRD_DESC%, 0 %SystemRoot%\system32\kbswitch.exe, %KBSWITCH_TITLE%, %KBSWITCH_DESC%, 0 %SystemRoot%\regedit.exe, %REGEDIT_TITLE%, %REGEDIT_DESC%, 0 +%SystemRoot%\system32\taskmgr.exe, %TASKMGR_TITLE%, %TASKMGR_DESC%, 0 %SystemRoot%\system32\dxdiag.exe, %DXDIAG_TITLE%, %DXDIAG_DESC%, 0 [AccessibilityShortcuts] @@ -109,6 +110,8 @@ KBSWITCH_DESC=Keyboard Layout Switcher REGEDIT_TITLE=Registry Editor REGEDIT_DESC=Launch Registry Editor +TASKMGR_TITLE=Task Manager +TASKMGR_DESC=Launch the Task Manager DXDIAG_TITLE=ReactX Diagnostic DXDIAG_DESC=Launch ReactX-Diagnostic program MAGNIFY_TITLE=Magnify @@ -559,6 +562,8 @@ KBSWITCH_DESC=SÃ©lecteur de configuration clavier REGEDIT_TITLE=Ãditeur de Registre REGEDIT_DESC=Lancer l'Ãditeur de Registre +TASKMGR_TITLE=Gestionnaire des tÃ¢ches +TASKMGR_DESC=Lancer le Gestionnaire des tÃ¢ches DXDIAG_TITLE=Diagnostic ReactX DXDIAG_DESC=Lancer le prorgramme de diagnostic ReactX MAGNIFY_TITLE=Loupe

8 years, 5 months

[zhu] 71823: Fixed crash on client and server exit: Corrected some NULL data marking and checking. Moved some cleanup code so they actually execute on function failure (incomplete). Removed redunda...

by zhu＠svn.reactos.org

Author: zhu Date: Tue Jul 5 18:35:17 2016 New Revision: 71823 URL: http://svn.reactos.org/svn/reactos?rev=71823&view=rev Log: Fixed crash on client and server exit: Corrected some NULL data marking and checking. Moved some cleanup code so they actually execute on function failure (incomplete). Removed redundant tcp_close() call in error callback. Changed listen request cancel mode from ABORT to CLOSE, since ABORT is illegal for a listening pcb. Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] Tue Jul 5 18:35:17 2016 @@ -106,11 +106,10 @@ PTCP_REQUEST Request; KIRQL OldIrql; - DPRINT1("IRP Cancel on IRP at %08x\n", Irp); - IoReleaseCancelSpinLock(Irp->CancelIrql); IrpSp = IoGetCurrentIrpStackLocation(Irp); + DPRINT1("IRP Cancel on IRP at %08x, with MinorFunction %08x\n", Irp, IrpSp->MinorFunction); switch ((ULONG)IrpSp->FileObject->FsContext2) { case TDI_TRANSPORT_ADDRESS_FILE : @@ -357,15 +356,15 @@ KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); - if (Context->lwip_tcp_pcb != Context->AddressFile->lwip_tcp_pcb) + if (Context->lwip_tcp_pcb == Context->AddressFile->lwip_tcp_pcb); { - tcp_close(Context->lwip_tcp_pcb); + Context->AddressFile->lwip_tcp_pcb = NULL; } Context->lwip_tcp_pcb = NULL; return; default : - DPRINT1("Invalid argument\n"); + DPRINT1("Invalid argument: %08x\n", arg); return; } } @@ -520,7 +519,9 @@ ExFreePoolWithTag(Request, TAG_TCP_REQUEST); return ERR_ABRT; } - + + Request->PendingIrp = NULL; + IoSetCancelRoutine(Irp, NULL); Irp->Cancel = FALSE; @@ -667,6 +668,7 @@ UCHAR *CurrentSrceLocation; PLIST_ENTRY Head; PLIST_ENTRY Entry; + NTSTATUS Status; DPRINT1("lwIP TCP Receive Callback\n"); @@ -719,6 +721,7 @@ DPRINT1("IRP at %08x\n", Irp); IrpSp = IoGetCurrentIrpStackLocation(Irp); + DPRINT1("IrpSp: %08x\n", IrpSp); IoSetCancelRoutine(Irp, NULL); Irp->Cancel = FALSE; @@ -769,15 +772,30 @@ RemainingDestBytes = Buffer->ByteCount; // NdisQueryBuffer(Buffer, &CurrentDestLocation, &RemainingDestBytes); - DPRINT1("\n PTDI_REQUEST_KERNEL_RECEIVE->ReceiveLength = %d\n NDIS_BUFFER length = %d\n pbuf->tot_len = %d\n", - ReceiveInfo->ReceiveLength, - RemainingDestBytes, - p->tot_len); + if (p) + { + DPRINT1("\n PTDI_REQUEST_KERNEL_RECEIVE->ReceiveLength = %d\n NDIS_BUFFER length = %d\n pbuf->tot_len = %d\n", + ReceiveInfo->ReceiveLength, + RemainingDestBytes, + p->tot_len); + } + else + { + DPRINT1("\n The pbuf pointer p is NULL\n"); + } + + if (!p) + { + CopiedLength = 0; + Status = STATUS_ADDRESS_CLOSED; + goto BAD; + } if (RemainingDestBytes <= p->len) { RtlCopyMemory(CurrentDestLocation, p->payload, RemainingDestBytes); CopiedLength = RemainingDestBytes; + Status = STATUS_SUCCESS; goto RETURN; } else @@ -808,6 +826,7 @@ } else { + Status = STATUS_SUCCESS; goto RETURN; } } @@ -816,6 +835,7 @@ RtlCopyMemory(CurrentDestLocation, CurrentSrceLocation, RemainingDestBytes); CopiedLength += RemainingDestBytes; + Status = STATUS_SUCCESS; goto RETURN; } } @@ -826,23 +846,24 @@ tcp_recved(tpcb, CopiedLength); + while (Entry != Head) + { + Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); + if (Request->PendingMode == TCP_REQUEST_PENDING_RECEIVE) + { + tcp_recv(tpcb, lwip_tcp_receive_callback); + break; + } + } + +BAD: RemoveEntryList(&Request->ListEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - while (Entry != Head) - { - Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); - if (Request->PendingMode == TCP_REQUEST_PENDING_RECEIVE) - { - tcp_recv(tpcb, lwip_tcp_receive_callback); - break; - } - } - KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); IoReleaseCancelSpinLock(OldIrql); - - Irp->IoStatus.Status = STATUS_SUCCESS; + + Irp->IoStatus.Status = Status; Irp->IoStatus.Information = CopiedLength; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); @@ -1613,11 +1634,11 @@ DPRINT1("TcpIpAssociateAddress Exiting\n"); + Context->TcpState = TCP_STATE_BOUND; + +LEAVE: KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); - Context->TcpState = TCP_STATE_BOUND; - -LEAVE: return Status; } @@ -1631,6 +1652,9 @@ PADDRESS_FILE AddressFile; KIRQL OldIrql; + PLIST_ENTRY Head; + PLIST_ENTRY Entry; + PTCP_REQUEST Request; IrpSp = IoGetCurrentIrpStackLocation(Irp); if ((ULONG)IrpSp->FileObject->FsContext2 != TDI_CONNECTION_FILE) @@ -1666,6 +1690,21 @@ if (!(IsListEmpty(&Context->RequestListHead))) { DPRINT1("Disassociating context with outstanding requests\n"); + Head = &Context->RequestListHead; + Entry = Head->Flink; + while (Entry != Head) + { + Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); + if (Request->PendingIrp) + { + IrpSp = IoGetCurrentIrpStackLocation(Request->PendingIrp); + DPRINT1("Pending IRP Control Code: %08x\n", IrpSp->MinorFunction); + } + else + { + DPRINT1("IRP is NULL\n"); + } + } } KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); @@ -1737,7 +1776,7 @@ PrepareIrpForCancel( Irp, CancelRequestRoutine, - TCP_REQUEST_CANCEL_MODE_ABORT, + TCP_REQUEST_CANCEL_MODE_CLOSE, TCP_REQUEST_PENDING_GENERAL); Context->TcpState = TCP_STATE_LISTENING; return STATUS_PENDING;

8 years, 5 months

[apriyadarshi] 71822: - Handled DET = 03h case. - Registered (Interrupt enable and SERR clear) working port. Everything is working now! :D

by apriyadarshi＠svn.reactos.org

Author: apriyadarshi Date: Tue Jul 5 16:51:17 2016 New Revision: 71822 URL: http://svn.reactos.org/svn/reactos?rev=71822&view=rev Log: - Handled DET = 03h case. - Registered (Interrupt enable and SERR clear) working port. Everything is working now! :D Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Tue Jul 5 16:51:17 2016 @@ -209,6 +209,8 @@ { ULONG index; AHCI_PORT_CMD cmd; + AHCI_TASK_FILE_DATA tfd; + AHCI_INTERRUPT_ENABLE ie; AHCI_SERIAL_ATA_STATUS ssts; AHCI_SERIAL_ATA_CONTROL sctl; PAHCI_ADAPTER_EXTENSION AdapterExtension; @@ -268,13 +270,104 @@ } ssts.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->SSTS); - if (ssts.DET == 0x4) - { - // no device found - return FALSE; - } - - DebugPrint("\tDET: %d %d\n", ssts.DET, cmd.ST); + switch (ssts.DET) + { + case 0x0: + case 0x1: + case 0x2: + default: + // unhandled case + DebugPrint("\tDET == %x Unsupported\n", ssts.DET); + return FALSE; + case 0x3: + { + NT_ASSERT(cmd.ST == 0); + + // make sure FIS Recieve is enabled (cmd.FRE) + index = 0; + do + { + StorPortStallExecution(10000); + cmd.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->CMD); + cmd.FRE = 1; + StorPortWriteRegisterUlong(AdapterExtension, &PortExtension->Port->CMD, cmd.Status); + index++; + } + while((cmd.FR != 1) && (index < 3)); + + if (cmd.FR != 1) + { + // failed to start FIS DMA engine + // it can crash the driver later + return FALSE; + } + + // start port channel + // set cmd.ST + + NT_ASSERT(cmd.FRE == 1); + NT_ASSERT(cmd.CR == 0); + + // why assert? well If we face such condition on DET = 0x3 + // then we don't have port in idle state and hence before executing this part of code + // we must have restarted it. + tfd.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->TFD); + + if ((tfd.STS.BSY) || (tfd.STS.DRQ)) + { + DebugPrint("\tUnhandled Case BSY-DRQ\n"); + } + + // clear pending interrupts + StorPortWriteRegisterUlong(AdapterExtension, &PortExtension->Port->SERR, (ULONG)~0); + StorPortWriteRegisterUlong(AdapterExtension, &PortExtension->Port->IS, (ULONG)~0); + StorPortWriteRegisterUlong(AdapterExtension, AdapterExtension->IS, (1 << PortExtension->PortNumber)); + + // set IE + ie.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->IE); + ie.DHRE = 1; + ie.PSE = 1; + ie.DSE = 1; + ie.SDBE = 1; + + ie.UFE = 0; + ie.DPE = 0; + ie.PCE = 1; + + ie.DMPE = 0; + + ie.PRCE = 1; + ie.IPME = 0; + ie.OFE = 1; + ie.INFE = 1; + ie.IFE = 1; + ie.HBDE = 1; + ie.HBFE = 1; + ie.TFEE = 1; + + cmd.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->CMD); + ie.CPDE = cmd.CPD; + + StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->IE, ie.Status); + + cmd.ST = 1; + StorPortWriteRegisterUlong(AdapterExtension, &PortExtension->Port->CMD, cmd.Status); + cmd.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->CMD); + + if (cmd.ST != 1) + { + DebugPrint("\tFailed to start Port\n"); + return FALSE; + } + + return TRUE; + } + case 0x4: + // no device found + return FALSE; + } + + DebugPrint("\tInvalid DET value: %x\n", ssts.DET); return FALSE; }// -- AhciStartPort(); @@ -322,10 +415,6 @@ { PortExtension = &adapterExtension->PortExtension[index]; PortExtension->IsActive = AhciStartPort(PortExtension); - if (PortExtension->IsActive == FALSE) - { - DebugPrint("\tPort Disabled: %d\n", index); - } } } @@ -516,6 +605,7 @@ portPending = StorPortReadRegisterUlong(AdapterExtension, AdapterExtension->IS); // we process interrupt for implemented ports only portCount = AdapterExtension->PortCount; + DebugPrint("\tPortPending: %d\n", portPending); portPending = portPending & AdapterExtension->PortImplemented; if (portPending == 0) @@ -1207,7 +1297,9 @@ cmd.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->CMD); if (cmd.ST == 0) // PxCMD.ST == 0 + { return; + } // get the lowest set bit tmp = QueueSlots & (QueueSlots - 1); @@ -1223,6 +1315,8 @@ // mark this CommandIssuedSlots // to validate in completeIssuedCommand PortExtension->CommandIssuedSlots |= slotToActivate; + + DebugPrint("\tslotToActivate: %d\n", slotToActivate); // tell the HBA to issue this Command Slot to the given port StorPortWriteRegisterUlong(AdapterExtension, &PortExtension->Port->CI, slotToActivate); Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Tue Jul 5 16:51:17 2016 @@ -66,7 +66,7 @@ #define AHCI_Global_Port_CAP_NCS(x) (((x) & 0xF00) >> 8) #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) -#if DEBUG +#ifdef DBG #define DebugPrint(format, ...) StorPortDebugPrint(0, format, __VA_ARGS__) #endif @@ -295,6 +295,25 @@ ULONG Status; } AHCI_SERIAL_ATA_STATUS; +typedef union _AHCI_TASK_FILE_DATA +{ + struct + { + struct _STS + { + UCHAR ERR : 1; + UCHAR CS1 : 2; + UCHAR DRQ : 1; + UCHAR CS2 : 3; + UCHAR BSY : 1; + } STS; + UCHAR ERR; + USHORT RSV; + }; + + ULONG Status; +} AHCI_TASK_FILE_DATA; + typedef struct _AHCI_PRDT { ULONG DBA; @@ -365,27 +384,32 @@ ULONG Vendor[4]; // 0x70 ~ 0x7F, vendor specific } AHCI_PORT, *PAHCI_PORT; -#ifdef DEBUG - C_ASSERT(FIELD_OFFSET(AHCI_PORT, CLB) == 0x00); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, CLBU) == 0x04); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, FB) == 0x08); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, FBU) == 0x0C); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, IS) == 0x10); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, IE) == 0x14); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, CMD) == 0x18); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, RSV0) == 0x1C); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, TFD) == 0x20); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, SIG) == 0x24); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, SSTS) == 0x28); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, SCTL) == 0x2C); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, SERR) == 0x30); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, SACT) == 0x34); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, CI) == 0x38); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, SNTF) == 0x3C); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, FBS) == 0x40); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, RSV1) == 0x44); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, Vendor) == 0x70); -#endif +typedef struct _AHCI_INTERRUPT_ENABLE +{ + struct + { + ULONG DHRE :1; + ULONG PSE :1; + ULONG DSE :1; + ULONG SDBE :1; + ULONG UFE :1; + ULONG DPE :1; + ULONG PCE :1; + ULONG DMPE :1; + ULONG DW5_Reserved :14; + ULONG PRCE :1; + ULONG IPME :1; + ULONG OFE :1; + ULONG DW5_Reserved2 :1; + ULONG INFE :1; + ULONG IFE :1; + ULONG HBDE :1; + ULONG HBFE :1; + ULONG TFEE :1; + ULONG CPDE :1; + }; + ULONG Status; +} AHCI_INTERRUPT_ENABLE; typedef struct _AHCI_MEMORY_REGISTERS { @@ -406,22 +430,6 @@ AHCI_PORT PortList[MAXIMUM_AHCI_PORT_COUNT]; } AHCI_MEMORY_REGISTERS, *PAHCI_MEMORY_REGISTERS; -#ifdef DEBUG - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CAP) == 0x00); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, GHC) == 0x04); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, IS) == 0x08); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, PI) == 0x0C); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, VS) == 0x10); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CCC_CTL) == 0x14); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CCC_PTS) == 0x18); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, EM_LOC) == 0x1C); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, EM_CTL) == 0x20); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CAP2) == 0x24); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, BOHC) == 0x28); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, Reserved) == 0x2C); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, VendorSpecific) == 0xA0); -#endif - // Holds information for each attached attached port to a given adapter. typedef struct _AHCI_PORT_EXTENSION { @@ -559,3 +567,42 @@ GetSrbExtension( __in PSCSI_REQUEST_BLOCK Srb ); + +////////////////////////////////////////////////////////////// +// Assertions // +////////////////////////////////////////////////////////////// + +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CAP) == 0x00); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, GHC) == 0x04); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, IS) == 0x08); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, PI) == 0x0C); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, VS) == 0x10); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CCC_CTL) == 0x14); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CCC_PTS) == 0x18); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, EM_LOC) == 0x1C); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, EM_CTL) == 0x20); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CAP2) == 0x24); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, BOHC) == 0x28); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, Reserved) == 0x2C); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, VendorSpecific) == 0xA0); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, PortList) == 0x100); + +C_ASSERT(FIELD_OFFSET(AHCI_PORT, CLB) == 0x00); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, CLBU) == 0x04); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, FB) == 0x08); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, FBU) == 0x0C); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, IS) == 0x10); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, IE) == 0x14); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, CMD) == 0x18); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, RSV0) == 0x1C); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, TFD) == 0x20); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, SIG) == 0x24); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, SSTS) == 0x28); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, SCTL) == 0x2C); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, SERR) == 0x30); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, SACT) == 0x34); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, CI) == 0x38); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, SNTF) == 0x3C); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, FBS) == 0x40); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, RSV1) == 0x44); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, Vendor) == 0x70);

8 years, 5 months

[akhaldi] 71821: [SCHANNEL] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jul 5 10:38:15 2016 New Revision: 71821 URL: http://svn.reactos.org/svn/reactos?rev=71821&view=rev Log: [SCHANNEL] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/schannel/lsamode.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/schannel/lsamode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/lsamode… ============================================================================== --- trunk/reactos/dll/win32/schannel/lsamode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/lsamode.c [iso-8859-1] Tue Jul 5 10:38:15 2016 @@ -104,6 +104,7 @@ NULL, /* GetCredUIContext */ NULL, /* UpdateCredentials */ NULL, /* ValidateTargetInfo */ + NULL, /* PostLogonUser */ }, { NULL, /* InitializePackage */ NULL, /* LsaLogonUser */ @@ -140,6 +141,7 @@ NULL, /* GetCredUIContext */ NULL, /* UpdateCredentials */ NULL, /* ValidateTargetInfo */ + NULL, /* PostLogonUser */ } }; @@ -151,7 +153,7 @@ { TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); - *PackageVersion = SECPKG_INTERFACE_VERSION_6; + *PackageVersion = SECPKG_INTERFACE_VERSION_7; *pcTables = 2; *ppTables = secPkgFunctionTable; 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 Jul 5 10:38:15 2016 @@ -167,7 +167,7 @@ reactos/dll/win32/rsabase # Synced to WineStaging-1.9.11 reactos/dll/win32/rsaenh # Synced to WineStaging-1.9.11 reactos/dll/win32/sccbase # Synced to WineStaging-1.9.11 -reactos/dll/win32/schannel # Synced to WineStaging-1.9.4 +reactos/dll/win32/schannel # Synced to WineStaging-1.9.11 reactos/dll/win32/scrrun # Synced to WineStaging-1.9.11 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec)

8 years, 5 months

[tthompson] 71820: [NTFS] Add ability to write to resident attributes. SetAttributeDataLength() - Check if the file is memory mapped before truncating +InternalSetResidentAttributeLength() - Used b...

by tthompson＠svn.reactos.org

Author: tthompson Date: Tue Jul 5 07:00:43 2016 New Revision: 71820 URL: http://svn.reactos.org/svn/reactos?rev=71820&view=rev Log: [NTFS] Add ability to write to resident attributes. SetAttributeDataLength() - Check if the file is memory mapped before truncating +InternalSetResidentAttributeLength() - Used by SetAttributeDataLength() Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Tue Jul 5 07:00:43 2016 @@ -509,6 +509,8 @@ DbgPrint(" logical clusters: %I64u - %I64u\n", lcn, lcn + runcount - 1); } + else + DbgPrint(" %u bytes of data\n", Attribute->Resident.ValueLength); } } Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Tue Jul 5 07:00:43 2016 @@ -135,6 +135,8 @@ DPRINT("Found context\n"); *AttrCtx = PrepareAttributeContext(Attribute); + (*AttrCtx)->FileMFTIndex = MftRecord->MFTRecordNumber; + if (Offset != NULL) *Offset = Context.Offset; @@ -170,6 +172,50 @@ return AttrRecord->Resident.ValueLength; } +void +InternalSetResidentAttributeLength(PNTFS_ATTR_CONTEXT AttrContext, + PFILE_RECORD_HEADER FileRecord, + ULONG AttrOffset, + ULONG DataSize) +{ + ULONG EndMarker = AttributeEnd; + ULONG FinalMarker = FILE_RECORD_END; + ULONG NextAttributeOffset; + ULONG Offset; + USHORT Padding; + + DPRINT("InternalSetResidentAttributeLength( %p, %p, %lu, %lu )\n", AttrContext, FileRecord, AttrOffset, DataSize); + + // update ValueLength Field + AttrContext->Record.Resident.ValueLength = DataSize; + Offset = AttrOffset + FIELD_OFFSET(NTFS_ATTR_RECORD, Resident.ValueLength); + RtlCopyMemory((PCHAR)FileRecord + Offset, &DataSize, sizeof(ULONG)); + + // calculate the record length and end marker offset + AttrContext->Record.Length = DataSize + AttrContext->Record.Resident.ValueOffset; + NextAttributeOffset = AttrOffset + AttrContext->Record.Length; + + // Ensure NextAttributeOffset is aligned to an 8-byte boundary + if (NextAttributeOffset % 8 != 0) + { + Padding = 8 - (NextAttributeOffset % 8); + NextAttributeOffset += Padding; + AttrContext->Record.Length += Padding; + } + + // update the record length + Offset = AttrOffset + FIELD_OFFSET(NTFS_ATTR_RECORD, Length); + RtlCopyMemory((PCHAR)FileRecord + Offset, &AttrContext->Record.Length, sizeof(ULONG)); + + // write the end marker + RtlCopyMemory((PCHAR)FileRecord + NextAttributeOffset, &EndMarker, sizeof(ULONG)); + + // write the final marker + Offset = NextAttributeOffset + sizeof(ULONG); + RtlCopyMemory((PCHAR)FileRecord + Offset, &FinalMarker, sizeof(ULONG)); + + FileRecord->BytesInUse = Offset + sizeof(ULONG); +} NTSTATUS SetAttributeDataLength(PFILE_OBJECT FileObject, @@ -179,6 +225,18 @@ PFILE_RECORD_HEADER FileRecord, PLARGE_INTEGER DataSize) { + NTSTATUS Status = STATUS_SUCCESS; + + // are we truncating the file? + if (DataSize->QuadPart < AttributeDataLength(&AttrContext->Record) + { + if (!MmCanFileBeTruncated(FileObject->SectionObjectPointer, (PLARGE_INTEGER)&AllocationSize)) + { + DPRINT1("Can't truncate a memory-mapped file!\n"); + return STATUS_USER_MAPPED_FILE; + } + } + if (AttrContext->Record.IsNonResident) { ULONG BytesPerCluster = Fcb->Vcb->NtfsInfo.BytesPerCluster; @@ -238,28 +296,59 @@ AttrContext->Record.NonResident.DataSize = DataSize->QuadPart; AttrContext->Record.NonResident.InitializedSize = DataSize->QuadPart; + // copy the attribute record back into the FileRecord + RtlCopyMemory((PCHAR)FileRecord + AttrOffset, &AttrContext->Record, AttrContext->Record.Length); + } + else + { + // resident attribute + + // find the next attribute + ULONG NextAttributeOffset = AttrOffset + AttrContext->Record.Length; + PNTFS_ATTR_RECORD NextAttribute = (PNTFS_ATTR_RECORD)((PCHAR)FileRecord + NextAttributeOffset); + + //NtfsDumpFileAttributes(Fcb->Vcb, FileRecord); + + // Do we need to increase the data length? + if (DataSize->QuadPart > AttrContext->Record.Resident.ValueLength) + { + // There's usually padding at the end of a record. Do we need to extend past it? + ULONG MaxValueLength = AttrContext->Record.Length - AttrContext->Record.Resident.ValueOffset; + if (MaxValueLength < DataSize->LowPart) + { + // If this is the last attribute, we could move the end marker to the very end of the file record + MaxValueLength += Fcb->Vcb->NtfsInfo.BytesPerFileRecord - NextAttributeOffset - (sizeof(ULONG) * 2); + + if (MaxValueLength < DataSize->LowPart || NextAttribute->Type != AttributeEnd) + { + DPRINT1("FIXME: Need to convert attribute to non-resident!\n"); + return STATUS_NOT_IMPLEMENTED; + } + } + } + else if (DataSize->LowPart < AttrContext->Record.Resident.ValueLength) + { + // we need to decrease the length + if (NextAttribute->Type != AttributeEnd) + { + DPRINT1("FIXME: Don't know how to decrease length of resident attribute unless it's the final attribute!\n"); + return STATUS_NOT_IMPLEMENTED; + } + } + + InternalSetResidentAttributeLength(AttrContext, FileRecord, AttrOffset, DataSize->LowPart); + } + + //NtfsDumpFileAttributes(Fcb->Vcb, FileRecord); + + // write the updated file record back to disk + Status = UpdateFileRecord(Fcb->Vcb, Fcb->MFTIndex, FileRecord); + + if (NT_SUCCESS(Status)) + { Fcb->RFCB.FileSize = *DataSize; Fcb->RFCB.ValidDataLength = *DataSize; - - DPRINT("Data Size: %I64u\n", Fcb->RFCB.FileSize.QuadPart); - - //NtfsDumpFileAttributes(Fcb->Vcb, FileRecord); - - // copy the attribute back into the FileRecord - RtlCopyMemory((PCHAR)FileRecord + AttrOffset, &AttrContext->Record, AttrContext->Record.Length); - - //NtfsDumpFileAttributes(Fcb->Vcb, FileRecord); - - // write the updated file record back to disk - UpdateFileRecord(Fcb->Vcb, Fcb->MFTIndex, FileRecord); - CcSetFileSizes(FileObject, (PCC_FILE_SIZES)&Fcb->RFCB.AllocationSize); - } - else - { - // we can't yet handle resident attributes - DPRINT1("FixMe: Can't handle increasing length of resident attribute\n"); - return STATUS_NOT_IMPLEMENTED; } return STATUS_SUCCESS; @@ -501,28 +590,75 @@ DPRINT("WriteAttribute(%p, %p, %I64u, %p, %lu, %p)\n", Vcb, Context, Offset, Buffer, Length, RealLengthWritten); + *RealLengthWritten = 0; + // is this a resident attribute? if (!Context->Record.IsNonResident) { - DPRINT1("FIXME: Writing to resident NTFS records (small files) is not supported at this time.\n"); - // (TODO: This should be really easy to implement) - - /* LeftOver code from ReadAttribute(), may be helpful: - if (Offset > Context->Record.Resident.ValueLength) - return 0; + ULONG AttributeOffset; + PNTFS_ATTR_CONTEXT FoundContext; + PFILE_RECORD_HEADER FileRecord; + if (Offset + Length > Context->Record.Resident.ValueLength) - Length = (ULONG)(Context->Record.Resident.ValueLength - Offset); - RtlCopyMemory(Buffer, (PCHAR)&Context->Record + Context->Record.Resident.ValueOffset + Offset, Length); - return Length;*/ - - return STATUS_NOT_IMPLEMENTED; // until we implement it + { + DPRINT1("DRIVER ERROR: Attribute is too small!\n"); + return STATUS_INVALID_PARAMETER; + } + + FileRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + + if (!FileRecord) + { + DPRINT1("Error: Couldn't allocate file record!\n"); + return STATUS_NO_MEMORY; + } + + // read the file record + ReadFileRecord(Vcb, Context->FileMFTIndex, FileRecord); + + // find where to write the attribute data to + Status = FindAttribute(Vcb, FileRecord, + Context->Record.Type, + (PCWSTR)((PCHAR)&Context->Record + Context->Record.NameOffset), + Context->Record.NameLength, + &FoundContext, + &AttributeOffset); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't find matching attribute!\n"); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return Status; + } + + DPRINT("Offset: %I64u, AttributeOffset: %u, ValueOffset: %u\n", Offset, AttributeOffset, Context->Record.Resident.ValueLength); + Offset += AttributeOffset + Context->Record.Resident.ValueOffset; + + if (Offset + Length > Vcb->NtfsInfo.BytesPerFileRecord) + { + DPRINT1("DRIVER ERROR: Data being written extends past end of file record!\n"); + ReleaseAttributeContext(FoundContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return STATUS_INVALID_PARAMETER; + } + + // copy the data being written into the file record + RtlCopyMemory((PCHAR)FileRecord + Offset, Buffer, Length); + + Status = UpdateFileRecord(Vcb, Context->FileMFTIndex, FileRecord); + + ReleaseAttributeContext(FoundContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + + if (NT_SUCCESS(Status)) + *RealLengthWritten = Length; + + return Status; } // This is a non-resident attribute. // I. Find the corresponding start data run. - - *RealLengthWritten = 0; // FIXME: Cache seems to be non-working. Disable it for now //if(Context->CacheRunOffset <= Offset && Offset < Context->CacheRunOffset + Context->CacheRunLength * Volume->ClusterSize) @@ -718,6 +854,7 @@ } /* Apply update sequence array fixups. */ + DPRINT("Sequence number: %u\n", file->SequenceNumber); return FixupUpdateSequenceArray(Vcb, &file->Ntfs); } @@ -948,8 +1085,6 @@ // write the file record to the master file table Status = WriteAttribute(Vcb, Vcb->MFTContext, index * Vcb->NtfsInfo.BytesPerFileRecord, (const PUCHAR)file, Vcb->NtfsInfo.BytesPerFileRecord, &BytesWritten); - // TODO: Update MFT mirror - if (!NT_SUCCESS(Status)) { DPRINT1("UpdateFileRecord failed: %I64u written, %u expected\n", BytesWritten, Vcb->NtfsInfo.BytesPerFileRecord); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Tue Jul 5 07:00:43 2016 @@ -174,6 +174,10 @@ AttributeLoggedUtilityStream = 0x100, AttributeEnd = 0xFFFFFFFF } ATTRIBUTE_TYPE, *PATTRIBUTE_TYPE; + +// FILE_RECORD_END seems to follow AttributeEnd in every file record starting with $Quota. +// No clue what data is being represented here. +#define FILE_RECORD_END 0x11477982 #define NTFS_FILE_MFT 0 #define NTFS_FILE_MFTMIRR 1 @@ -433,6 +437,7 @@ ULONGLONG CacheRunLength; LONGLONG CacheRunLastLCN; ULONGLONG CacheRunCurrentOffset; + ULONGLONG FileMFTIndex; NTFS_ATTR_RECORD Record; } NTFS_ATTR_CONTEXT, *PNTFS_ATTR_CONTEXT; Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] Tue Jul 5 07:00:43 2016 @@ -116,7 +116,6 @@ ULONGLONG BitmapDataSize; PCHAR BitmapData; ULONGLONG FreeClusters = 0; - ULONG Read = 0; RTL_BITMAP Bitmap; DPRINT1("NtfsAllocateClusters(%p, %lu, %lu, %p, %p)\n", DeviceExt, FirstDesiredCluster, DesiredClusters, FirstAssignedCluster, AssignedClusters); @@ -158,7 +157,7 @@ DPRINT1("Total clusters in bitmap: %I64x\n", BitmapDataSize * 8); DPRINT1("Diff in size: %I64d B\n", ((BitmapDataSize * 8) - DeviceExt->NtfsInfo.ClusterCount) * DeviceExt->NtfsInfo.SectorsPerCluster * DeviceExt->NtfsInfo.BytesPerSector); - ReadAttribute(DeviceExt, DataContext, Read, (PCHAR)((ULONG_PTR)BitmapData + Read), (ULONG)BitmapDataSize); + ReadAttribute(DeviceExt, DataContext, 0, (PCHAR)BitmapData, (ULONG)BitmapDataSize); RtlInitializeBitMap(&Bitmap, (PULONG)BitmapData, DeviceExt->NtfsInfo.ClusterCount); FreeClusters = RtlNumberOfClearBits(&Bitmap);

8 years, 5 months

[hbelusca] 71819: [RTL]: Follow what I guess might be Alex' coding standards.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jul 5 00:38:28 2016 New Revision: 71819 URL: http://svn.reactos.org/svn/reactos?rev=71819&view=rev Log: [RTL]: Follow what I guess might be Alex' coding standards. Modified: trunk/reactos/sdk/lib/rtl/process.c Modified: trunk/reactos/sdk/lib/rtl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/process.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/process.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/process.c [iso-8859-1] Tue Jul 5 00:38:28 2016 @@ -75,7 +75,7 @@ PVOID BaseAddress = NULL; SIZE_T EnviroSize; SIZE_T Size; - PWCHAR Environment = 0; + PWCHAR Environment = NULL; DPRINT("RtlpInitEnvironment(ProcessHandle: %p, Peb: %p Params: %p)\n", ProcessHandle, Peb, ProcessParameters); @@ -301,7 +301,9 @@ DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); if (!NT_SUCCESS(Status)) + { _SEH2_LEAVE; + } } if (ProcessParameters->StandardOutput) @@ -315,7 +317,9 @@ DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); if (!NT_SUCCESS(Status)) + { _SEH2_LEAVE; + } } if (ProcessParameters->StandardError) @@ -329,7 +333,9 @@ DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); if (!NT_SUCCESS(Status)) + { _SEH2_LEAVE; + } } } _SEH2_FINALLY

8 years, 5 months

[hbelusca] 71818: Fix misspelling "Detatch" --> "Detach"

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jul 4 22:35:15 2016 New Revision: 71818 URL: http://svn.reactos.org/svn/reactos?rev=71818&view=rev Log: Fix misspelling "Detatch" --> "Detach" Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] Mon Jul 4 22:35:15 2016 @@ -385,13 +385,13 @@ } FLTMGR_DEVICE_EXTENSION, *PFLTMGR_DEVICE_EXTENSION; -typedef struct _DETATCH_DEVICE_WORK_ITEM +typedef struct _DETACH_DEVICE_WORK_ITEM { WORK_QUEUE_ITEM WorkItem; PDEVICE_OBJECT SourceDevice; PDEVICE_OBJECT TargetDevice; -} DETATCH_DEVICE_WORK_ITEM, *PDETATCH_DEVICE_WORK_ITEM; +} DETACH_DEVICE_WORK_ITEM, *PDETACH_DEVICE_WORK_ITEM; /* DISPATCH ROUTINES **********************************************/ @@ -975,21 +975,21 @@ VOID NTAPI -FltpFastIoDetatchDeviceWorker(_In_ PVOID Parameter) -{ - PDETATCH_DEVICE_WORK_ITEM DetatchDeviceWorkItem = Parameter; +FltpFastIoDetachDeviceWorker(_In_ PVOID Parameter) +{ + PDETACH_DEVICE_WORK_ITEM DetachDeviceWorkItem = Parameter; /* Run any cleanup routines */ - FltpCleanupDeviceObject(DetatchDeviceWorkItem->SourceDevice); - - /* Detatch from the target device */ - IoDetachDevice(DetatchDeviceWorkItem->TargetDevice); + FltpCleanupDeviceObject(DetachDeviceWorkItem->SourceDevice); + + /* Detach from the target device */ + IoDetachDevice(DetachDeviceWorkItem->TargetDevice); /* Delete the source */ - IoDeleteDevice(DetatchDeviceWorkItem->SourceDevice); + IoDeleteDevice(DetachDeviceWorkItem->SourceDevice); /* Free the pool we allocated in FltpFastIoDetachDevice */ - ExFreePoolWithTag(DetatchDeviceWorkItem, 0x1234); + ExFreePoolWithTag(DetachDeviceWorkItem, 0x1234); } VOID @@ -997,29 +997,29 @@ FltpFastIoDetachDevice(_In_ PDEVICE_OBJECT SourceDevice, _In_ PDEVICE_OBJECT TargetDevice) { - PDETATCH_DEVICE_WORK_ITEM DetatchDeviceWorkItem; + PDETACH_DEVICE_WORK_ITEM DetachDeviceWorkItem; PAGED_CODE(); /* - * Detatching and deleting devices is a lot of work and takes too long + * Detaching and deleting devices is a lot of work and takes too long * to be a worthwhile FastIo candidate, so we defer this call to speed * it up. There's no return value so we're okay to do this. */ /* Allocate the work item and it's corresponding data */ - DetatchDeviceWorkItem = ExAllocatePoolWithTag(NonPagedPool, - sizeof(DETATCH_DEVICE_WORK_ITEM), - 0x1234); - if (DetatchDeviceWorkItem) + DetachDeviceWorkItem = ExAllocatePoolWithTag(NonPagedPool, + sizeof(DETACH_DEVICE_WORK_ITEM), + 0x1234); + if (DetachDeviceWorkItem) { /* Initialize the work item */ - ExInitializeWorkItem(&DetatchDeviceWorkItem->WorkItem, - FltpFastIoDetatchDeviceWorker, - DetatchDeviceWorkItem); + ExInitializeWorkItem(&DetachDeviceWorkItem->WorkItem, + FltpFastIoDetachDeviceWorker, + DetachDeviceWorkItem); /* Queue the work item and return the call */ - ExQueueWorkItem(&DetatchDeviceWorkItem->WorkItem, + ExQueueWorkItem(&DetachDeviceWorkItem->WorkItem, DelayedWorkQueue); } else @@ -1948,7 +1948,7 @@ } else { - /* Run the detatch routine */ + /* Run the detach routine */ FltpDetachFromFileSystemDevice(DeviceObject); } Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Jul 4 22:35:15 2016 @@ -2841,7 +2841,7 @@ ZeroBits, AllocationType); - /* Detatch if needed, then return status */ + /* Detach if needed, then return status */ if (Attached) KeUnstackDetachProcess(&ApcState); return Status; }

8 years, 5 months

[hbelusca] 71817: [NTOS]: Add a human-readable description for ObInitProcess as well.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jul 4 22:30:40 2016 New Revision: 71817 URL: http://svn.reactos.org/svn/reactos?rev=71817&view=rev Log: [NTOS]: Add a human-readable description for ObInitProcess as well. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Mon Jul 4 22:30:40 2016 @@ -2066,15 +2066,17 @@ /*++ * @name ObInitProcess * -* The ObInitProcess routine <FILLMEIN> +* The ObInitProcess routine initializes the handle table for the process +* to be initialized, by either creating a new one or duplicating it from +* the parent process. * * @param Parent -* <FILLMEIN>. +* A parent process (optional). * * @param Process -* <FILLMEIN>. -* -* @return <FILLMEIN>. +* The process to initialize. +* +* @return Success or failure. * * @remarks None. *

8 years, 5 months

← Newer
1
...
22
23
24
25
26
27
28
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2016