Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[hbelusca] 64030: [USBHUB]: Fix a typo, corrected by kikidee! CORE-8501 #resolve #comment Corrected, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Sep 2 18:40:08 2014 New Revision: 64030 URL: http://svn.reactos.org/svn/reactos?rev=64030&view=rev Log: [USBHUB]: Fix a typo, corrected by kikidee! CORE-8501 #resolve #comment Corrected, thanks! Modified: trunk/reactos/drivers/usb/usbhub/fdo.c Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Tue Sep 2 18:40:08 2014 @@ -1291,7 +1291,7 @@ if (ConfigDesc.bNumInterfaces > 1) { - DPRINT1("Warning: Device has more that one interface. Only one interface (the first) is currently supported\n"); + DPRINT1("Warning: Device has more than one interface. Only one interface (the first) is currently supported\n"); } ConfigDescSize = ConfigDesc.wTotalLength; @@ -1328,7 +1328,7 @@ //DumpFullConfigurationDescriptor(UsbChildExtension->FullConfigDesc); // - // Construct all the strings that will described the device to PNP + // Construct all the strings that will describe the device to PNP // Status = CreateDeviceIds(NewChildDeviceObject); if (!NT_SUCCESS(Status))

10 years, 3 months

[dquintana] 64029: [BROWSEUI_APITEST] * Improve SHExplorerParseCmdLine tests with whole bunch of new lines, and update the EXPLORER_INFO struct to match the findings.

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Sep 2 00:50:15 2014 New Revision: 64029 URL: http://svn.reactos.org/svn/reactos?rev=64029&view=rev Log: [BROWSEUI_APITEST] * Improve SHExplorerParseCmdLine tests with whole bunch of new lines, and update the EXPLORER_INFO struct to match the findings. Modified: trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c Modified: trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/SHExplo… ============================================================================== --- trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c [iso-8859-1] Tue Sep 2 00:50:15 2014 @@ -11,48 +11,57 @@ #include <strsafe.h> #include <shlobj.h> -#define UNKNOWN_SIZE 0x100 +#define PADDING_SIZE 0x100 typedef struct _EXPLORER_INFO { PWSTR FileName; PIDLIST_ABSOLUTE pidl; - DWORD dwFlags; /* TODO: make some constants */ - ULONG Unknown[UNKNOWN_SIZE]; /* TODO: find out more */ + DWORD dwFlags; + ULONG Unknown1[5]; + PIDLIST_ABSOLUTE pidlRoot; + ULONG Unknown3[4]; + GUID guidInproc; + ULONG Padding[PADDING_SIZE]; } EXPLORER_INFO, *PEXPLORER_INFO; -PVOID +UINT WINAPI SHExplorerParseCmdLine( - _Out_ PEXPLORER_INFO Info); +_Out_ PEXPLORER_INFO Info); #define PIDL_IS_UNTOUCHED -1 #define PIDL_IS_NULL -2 #define PIDL_IS_PATH -3 +#define PIDL_IS_EMPTY -4 +#define PIDL_PATH_EQUALS_PATH -5 #define InvalidPointer ((PVOID)0x5555555555555555ULL) static VOID TestCommandLine( - _In_ INT ExpectedRet, - _In_ INT ExpectedCsidl, - _In_ DWORD ExpectedFlags, - _In_ PCWSTR ExpectedFileName, - _In_ PCWSTR PidlPath) +_In_ INT ExpectedRet, +_In_ INT ExpectedCsidl, +_In_ DWORD ExpectedFlags, +_In_ PCWSTR ExpectedFileName, +_In_ PCWSTR PidlPath, +_Out_opt_ PUINT PWriteEnd) { EXPLORER_INFO Info; - PVOID Ret; + UINT Ret; ULONG i; + PDWORD InfoWords = (PDWORD) &Info; FillMemory(&Info, sizeof(Info), 0x55); Info.dwFlags = 0x00000000; Ret = SHExplorerParseCmdLine(&Info); + // Special case for empty cmdline: Ret is the PIDL for the selected folder. if (ExpectedRet == -1) - ok(Ret == Info.pidl, "Ret = %p, expected %p\n", Ret, Info.pidl); + ok((LPITEMIDLIST) Ret == Info.pidl, "Ret = %x, expected %p\n", Ret, Info.pidl); else - ok(Ret == (PVOID)ExpectedRet, "Ret = %p, expected %p\n", Ret, (PVOID)ExpectedRet); + ok(Ret == ExpectedRet, "Ret = %x, expected %p\n", Ret, (PVOID) ExpectedRet); if (ExpectedFileName == NULL) ok(Info.FileName == InvalidPointer, "FileName = %p\n", Info.FileName); @@ -78,76 +87,273 @@ ok(Info.pidl != NULL, "pidl = %p\n", Info.pidl); if (Info.pidl != NULL && Info.pidl != InvalidPointer) { - if (ExpectedCsidl == PIDL_IS_PATH) - { - ExpectedPidl = SHSimpleIDListFromPath(PidlPath); - hr = ExpectedPidl == NULL ? E_FAIL : S_OK; - ok(ExpectedPidl != NULL, "SHSimpleIDListFromPath failed\n"); + WCHAR pidlPathName[MAX_PATH] = L""; + + if (Info.pidl != NULL && Info.pidl != (LPITEMIDLIST) 0x55555555) + { + SHGetPathFromIDListW(Info.pidl, pidlPathName); + } + + if (ExpectedCsidl == PIDL_PATH_EQUALS_PATH) + { + ok(wcsicmp(pidlPathName, PidlPath) == 0, "Path from pidl does not match; pidlPathName=%S\n", pidlPathName); + } + else if (ExpectedCsidl == PIDL_IS_EMPTY) + { + ok(wcslen(pidlPathName) == 0, "Unexpected non-empty path from pidl; pidlPathName=%S\n", pidlPathName); } else { - hr = SHGetFolderLocation(NULL, ExpectedCsidl, NULL, 0, &ExpectedPidl); - ok(hr == S_OK, "SHGetFolderLocation returned %08lx\n", hr); - } - if (SUCCEEDED(hr)) - { - ok(ILIsEqual(Info.pidl, ExpectedPidl), "Unexpected pidl value\n"); - ILFree(ExpectedPidl); + if (ExpectedCsidl == PIDL_IS_PATH) + { + ExpectedPidl = SHSimpleIDListFromPath(PidlPath); + hr = ExpectedPidl == NULL ? E_FAIL : S_OK; + ok(ExpectedPidl != NULL, "SHSimpleIDListFromPath(%S) failed. pidlPathName=%S\n", PidlPath, pidlPathName); + if (SUCCEEDED(hr)) + { + ok(ILIsEqual(Info.pidl, ExpectedPidl), "Unexpected pidl value %p; pidlPathName=%S PidlPath=%S\n", Info.pidl, pidlPathName, PidlPath); + ILFree(ExpectedPidl); + } + } + else + { + hr = SHGetFolderLocation(NULL, ExpectedCsidl, NULL, 0, &ExpectedPidl); + ok(hr == S_OK, "SHGetFolderLocation returned %08lx\n", hr); + if (SUCCEEDED(hr)) + { + BOOL eq = ILIsEqual(Info.pidl, ExpectedPidl); + ILFree(ExpectedPidl); + + ok(eq, "Unexpected pidl value %p; pidlPathName=%S CSIDL=%d\n", Info.pidl, pidlPathName, ExpectedCsidl); + } + } } ILFree(Info.pidl); } } ok(Info.dwFlags == ExpectedFlags, "dwFlags = %08lx, expected %08lx\n", Info.dwFlags, ExpectedFlags); - for (i = 0; i < sizeof(Info.Unknown) / sizeof(Info.Unknown[0]); i++) - ok(Info.Unknown[i] == 0x55555555, "Unknown[%lu] = %08lx\n", i, Info.Unknown[i]); + for (i = 0; i < sizeof(Info) / sizeof(DWORD); i++) + { + switch (i*4) + { + case 0x00: // FileName + case 0x04: // pidl + case 0x08: // dwFlags + case 0x20: // pidlRoot + case 0x34: // guidInproc (1/4) + case 0x38: // guidInproc (2/4) + case 0x3C: // guidInproc (3/4) + case 0x40: // guidInproc (4/4) + break; + default: + ok(InfoWords[i] == 0x55555555, "Word 0x%02lx has been set to 0x%08lx\n", i * 4, InfoWords[i]); + } + } + + if (PWriteEnd) + { + PBYTE data = (PBYTE)&Info; + + *PWriteEnd = 0; + + for (i = sizeof(Info); i > 0; i--) + { + if (data[i - 1] != 0x55) + { + *PWriteEnd = i; + break; + } + } + } } START_TEST(SHExplorerParseCmdLine) { - struct - { + static struct + { + INT TestLine; PCWSTR CommandLine; INT ExpectedRet; INT ExpectedCsidl; DWORD ExpectedFlags; PCWSTR ExpectedFileName; PCWSTR PidlPath; - } Tests[] = - { - { L"", -1, CSIDL_MYDOCUMENTS, 0x00000009 }, - { L"/e", TRUE, PIDL_IS_UNTOUCHED, 0x00000008 }, - { L"/n", TRUE, PIDL_IS_UNTOUCHED, 0x00004001 }, - { L"/x", TRUE, PIDL_IS_NULL, 0x02000000, L"/x" }, - { L"-e", TRUE, PIDL_IS_NULL, 0x02000000, L"-e" }, - { L"C:\\", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\" }, - { L"/e,C:\\", TRUE, PIDL_IS_PATH, 0x00000208, NULL, L"C:\\" }, - { L"/select,C:\\", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\" }, - { L"/e,::{20d04fe0-3aea-1069-a2d8-08002b30309d}", TRUE, PIDL_IS_PATH, 0x00000208, NULL, L"::{20d04fe0-3aea-1069-a2d8-08002b30309d}" }, - { L"::{645ff040-5081-101b-9f08-00aa002f954e}", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"::{645ff040-5081-101b-9f08-00aa002f954e}" }, - { L"/select,::{450d8fba-ad25-11d0-98a8-0800361b1103}", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"::{450d8fba-ad25-11d0-98a8-0800361b1103}" }, - { L"=", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"::{20d04fe0-3aea-1069-a2d8-08002b30309d}" }, - /* TODO: needs a lot more testcases */ + } Tests [] = + { + { __LINE__, L"", -1, CSIDL_MYDOCUMENTS, 0x00000009 }, + { __LINE__, L"/e", TRUE, PIDL_IS_UNTOUCHED, 0x00000008 }, + { __LINE__, L"/n", TRUE, PIDL_IS_UNTOUCHED, 0x00004001 }, + { __LINE__, L"/x", TRUE, PIDL_IS_NULL, 0x02000000, L"/x" }, + { __LINE__, L"-e", TRUE, PIDL_IS_NULL, 0x02000000, L"-e" }, + { __LINE__, L"C:\\", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\" }, + { __LINE__, L"/e,C:\\", TRUE, PIDL_IS_PATH, 0x00000208, NULL, L"C:\\" }, + { __LINE__, L"/select,C:\\", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\" }, + { __LINE__, L"/e,::{20d04fe0-3aea-1069-a2d8-08002b30309d}", TRUE, PIDL_IS_PATH, 0x00000208, NULL, L"::{20d04fe0-3aea-1069-a2d8-08002b30309d}" }, + { __LINE__, L"::{645ff040-5081-101b-9f08-00aa002f954e}", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"::{645ff040-5081-101b-9f08-00aa002f954e}" }, + { __LINE__, L"/select,::{450d8fba-ad25-11d0-98a8-0800361b1103}", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"::{450d8fba-ad25-11d0-98a8-0800361b1103}" }, + { __LINE__, L"=", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"::{20d04fe0-3aea-1069-a2d8-08002b30309d}" }, + { __LINE__, L".", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Documents and Settings\\gigaherz\\Desktop" }, + { __LINE__, L"..", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Documents and Settings\\gigaherz" }, + { __LINE__, L"wrongpath", TRUE, PIDL_IS_NULL, 0x02000000, L"wrongpath"}, + { __LINE__, L"%wrongdir%", TRUE, PIDL_IS_NULL, 0x02000000, L"%wrongdir%"}, + { __LINE__, L"%programfiles#", TRUE, PIDL_IS_NULL, 0x02000000, L"%programfiles#"}, + { __LINE__, L",", TRUE, PIDL_IS_EMPTY, 0x00000200}, + { __LINE__, L"c:\\", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\" }, + { __LINE__, L"c:", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\" }, + { __LINE__, L"c", TRUE, PIDL_IS_NULL, 0x02000000, L"c"}, + { __LINE__, L"c:\\Program Files", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Program Files" }, + { __LINE__, L"c:\\Program Files\\", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Program Files" }, + { __LINE__, L"c:\\Program Files/", TRUE, PIDL_IS_NULL, 0x02000000, L"c:\\Program Files/"}, + { __LINE__, L"c:/Program Files/", TRUE, PIDL_IS_NULL, 0x02000000, L"c:/Program Files/"}, + { __LINE__, L"c:\\ntldr", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\ntldr" }, + { __LINE__, L"\"c:\\\"\"program files\"", TRUE, PIDL_IS_NULL, 0x02000000, L"c:\\\"program files"}, + { __LINE__, L"\"c:\\\"program files", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Program Files" }, + { __LINE__, L"\"c:\\ \"program files", TRUE, PIDL_IS_NULL, 0x02000000, L"c:\\ program files"}, + { __LINE__, L"\"c:\\\" program files", TRUE, PIDL_IS_NULL, 0x02000000, L"c:\\ program files"}, + { __LINE__, L"\"c:\\\", \"c:\\program files\"", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Program Files" }, + { __LINE__, L"c:\\,c:\\program files", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Program Files" }, + { __LINE__, L"/root", 0, CSIDL_MYDOCUMENTS, 0x00000000}, + { __LINE__, L"\"/root\"", 0, CSIDL_MYDOCUMENTS, 0x00000000}, + { __LINE__, L"/root,", TRUE, CSIDL_MYDOCUMENTS, 0x00000000}, + { __LINE__, L"/root,c", TRUE, CSIDL_MYDOCUMENTS, 0x00000000}, + { __LINE__, L"/root,\"\"", TRUE, CSIDL_MYDOCUMENTS, 0x00000000}, + { __LINE__, L"/root,wrong", TRUE, CSIDL_MYDOCUMENTS, 0x00000000}, + { __LINE__, L"/root,0", TRUE, CSIDL_MYDOCUMENTS, 0x00000000}, + { __LINE__, L"/root,c:\\", TRUE, PIDL_PATH_EQUALS_PATH, 0x00000000, NULL, L"c:\\" }, + { __LINE__, L"/root,\"c:\\\"", TRUE, PIDL_PATH_EQUALS_PATH, 0x00000000, NULL, L"c:\\" }, + { __LINE__, L"/root \"c:\\\"", TRUE, PIDL_IS_NULL, 0x02000000, L"/root c:\\"}, + { __LINE__, L"/root,\"c:\\\"\"program files\"", TRUE, PIDL_IS_PATH, 0x00000000}, + { __LINE__, L"/root,\"c:\\\"program files", TRUE, PIDL_PATH_EQUALS_PATH, 0x00000000, NULL, L"c:\\Program Files" }, + { __LINE__, L"/root,c:\\,c:\\Program Files", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Program Files" }, + { __LINE__, L"/root,c:\\,Program Files", TRUE, PIDL_IS_NULL, 0x02000000, L"Program Files"}, + { __LINE__, L"/root,\"c:\\\"", TRUE, PIDL_PATH_EQUALS_PATH, 0x00000000, NULL, L"c:\\" }, + { __LINE__, L"c:\\Program Files,/root,c:\\", TRUE, PIDL_PATH_EQUALS_PATH, 0x00000200, NULL, L"c:\\" }, + { __LINE__, L"a:\\,/root,c:\\", TRUE, PIDL_PATH_EQUALS_PATH, 0x00000200, NULL, L"c:\\" }, + { __LINE__, L"a:\\,/root,c", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"A:\\" }, + { __LINE__, L"c:\\,/root,c", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\" }, + { __LINE__, L"/select", TRUE, CSIDL_MYDOCUMENTS, 0x00000040}, + { __LINE__, L"/select,", TRUE, CSIDL_DRIVES, 0x00000240 }, + { __LINE__, L"/select,c", TRUE, PIDL_IS_NULL, 0x02000040, L"c"}, + { __LINE__, L"/select,0", TRUE, PIDL_IS_NULL, 0x02000040, L"0"}, + { __LINE__, L"/select,c:\\", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\" }, + { __LINE__, L"c:\\,/select", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\" }, + { __LINE__, L"/select,c:\\ntldr", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\ntldr" }, + { __LINE__, L"/select,c:\\Program Files,c:\\Documents and settings", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\Documents and Settings" }, + { __LINE__, L"c:\\,/select,ntldr", TRUE, PIDL_IS_NULL, 0x02000240, L"ntldr"}, + { __LINE__, L"c:\\,/select,c:\\ntldr", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\ntldr" }, + { __LINE__, L"a:\\,/select,c:\\ntldr", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\ntldr" }, + { __LINE__, L"z:\\,/select,c:\\ntldr", TRUE, PIDL_IS_PATH, 0x02000240, L"z:\\", L"C:\\ntldr" }, + { __LINE__, L"select,c:\\ ", TRUE, PIDL_IS_PATH, 0x02000200, L"select", L"C:\\" }, + { __LINE__, L"/select c:\\ ", TRUE, PIDL_IS_NULL, 0x02000000, L"/select c:\\"}, + { __LINE__, L"a:\\,/select,c:\\", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\" }, + { __LINE__, L"a:\\,/select,c", TRUE, PIDL_IS_NULL, 0x02000240, L"c"}, + { __LINE__, L"c:\\,/select,c", TRUE, PIDL_IS_NULL, 0x02000240, L"c"}, + { __LINE__, L"/e", TRUE, CSIDL_MYDOCUMENTS, 0x00000008}, + { __LINE__, L"/e,", TRUE, CSIDL_DRIVES, 0x00000208 }, + { __LINE__, L"/e,\"", TRUE, CSIDL_DRIVES, 0x00000208 }, + { __LINE__, L"/e,\"\"", TRUE, CSIDL_DRIVES, 0x00000208 }, + { __LINE__, L"/e,c:\\", TRUE, PIDL_IS_PATH, 0x00000208, NULL, L"C:\\" }, + { __LINE__, L"c:\\,/e", TRUE, PIDL_IS_PATH, 0x00000208, NULL, L"C:\\" }, + { __LINE__, L"/e,c", TRUE, PIDL_IS_NULL, 0x02000008, L"c"}, + { __LINE__, L"/root,c:\\,/select,ntldr", TRUE, PIDL_IS_NULL, 0x02000040, L"ntldr"}, + { __LINE__, L"/select,ntldr,/root,c:\\", TRUE, PIDL_PATH_EQUALS_PATH, 0x02000040, L"ntldr", L"c:\\" }, + { __LINE__, L"/root,c:\\,/select,c:\\ntldr", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\ntldr" }, + { __LINE__, L"/select,c:\\ntldr,/root,c:\\", TRUE, PIDL_PATH_EQUALS_PATH, 0x00000240, NULL, L"c:\\" }, + { __LINE__, L"/e,/select,ntldr,/root,c:\\", TRUE, PIDL_PATH_EQUALS_PATH, 0x02000048, L"ntldr", L"c:\\" }, + { __LINE__, L"/e,/root,c:\\,/select,ntldr", TRUE, PIDL_IS_NULL, 0x02000048, L"ntldr"}, + { __LINE__, L"/e,/root,c:\\", TRUE, PIDL_PATH_EQUALS_PATH, 0x00000008, NULL, L"c:\\" }, + { __LINE__, L"/e,c:\\,/select,ntldr", TRUE, PIDL_IS_NULL, 0x02000248, L"ntldr"}, + { __LINE__, L"c:\\,/e,/select,ntldr", TRUE, PIDL_IS_NULL, 0x02000248, L"ntldr"}, + { __LINE__, L"c:\\,/select,ntldr,/e", TRUE, PIDL_IS_NULL, 0x02000248, L"ntldr"}, + { __LINE__, L"http:\\\\www.reactos.org", TRUE, PIDL_IS_NULL, 0x02000000, L"http:\\\\www.reactos.org"}, + { __LINE__, L"/e,http:\\\\www.reactos.org", TRUE, PIDL_IS_NULL, 0x02000008, L"http:\\\\www.reactos.org"}, + { __LINE__, L"/root,c:\\,http:\\\\www.reactos.org", TRUE, PIDL_IS_NULL, 0x02000000, L"http:\\\\www.reactos.org"}, + { __LINE__, L"/separate ", TRUE, CSIDL_MYDOCUMENTS, 0x00020000}, + { __LINE__, L"/separate,c:\\ program files", TRUE, PIDL_IS_NULL, 0x02020000, L"c:\\ program files"}, + { __LINE__, L"/separate, c:\\program files", TRUE, PIDL_IS_PATH, 0x00020200, NULL, L"C:\\Program Files" }, + { __LINE__, L"/separate, c:\\program files ,/e", TRUE, PIDL_IS_PATH, 0x00020208, NULL, L"C:\\Program Files" }, + { __LINE__, L"/separate, c:\\program files ,\\e", TRUE, PIDL_IS_NULL, 0x02020200, L"\\e"}, + { __LINE__, L"c:\\Documents and settings,/separate,/n,/e,/root,c:\\,/select,c:\\Program files,", TRUE, CSIDL_DRIVES, 0x00024249 }, + { __LINE__, L"c:\\Documents and settings,/separate,/n,/e,/root,{450D8FBA-AD25-11D0-98A8-0800361B1103, 0},test,/select,c:\\Program files,", TRUE, CSIDL_DRIVES, 0x02024249, L"test" }, + { __LINE__, L"c:\\Documents and settings,/inproc,/noui,/s,/separate,/n,/e,/root,{450D8FBA-AD25-11D0-98A8-0800361B1103, 0},test,/select,c:\\Program files,", FALSE, PIDL_PATH_EQUALS_PATH, 0x00000200, NULL, L"C:\\Documents and Settings" }, + { __LINE__, L"=", TRUE, CSIDL_DRIVES, 0x00000200 }, + { __LINE__, L"=c:\\", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\" }, + { __LINE__, L"=c:\\ntldr", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\ntldr" }, + { __LINE__, L"/root,=", TRUE, CSIDL_DRIVES, 0x00000200 }, + { __LINE__, L"/root=c:\\", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\" }, + { __LINE__, L"/root=c:\\Program files", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Program Files" }, + { __LINE__, L"/root=\"c:\\Program files\"", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Program Files" }, + { __LINE__, L"/root=\"\"c:\\Program files\"\"", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Program Files" }, + { __LINE__, L"c:\\=/root=\"c:\\Program files\"", TRUE, PIDL_PATH_EQUALS_PATH, 0x00000000, NULL, L"C:\\Program Files" }, + { __LINE__, L"/select=c:\\", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\" }, + { __LINE__, L"/select=c:\\Program files", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Program Files" }, + { __LINE__, L"=,/select,c:\\", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\" }, + { __LINE__, L"/select,c:\\,=", TRUE, CSIDL_DRIVES, 0x00000240 }, + { __LINE__, L"c:\\=/select=c:\\windows\\system32", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\WINDOWS\\system32" }, + { __LINE__, L"/select=c:\\windows\\system32", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\WINDOWS\\system32" }, + { __LINE__, L"=/select=c:\\windows\\system32", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\WINDOWS\\system32" }, + { __LINE__, L"/e,=", TRUE, CSIDL_DRIVES, 0x00000208 }, + { __LINE__, L"/e=", TRUE, CSIDL_DRIVES, 0x00000200 }, + { __LINE__, L"/e=\"", TRUE, CSIDL_DRIVES, 0x00000200 }, + { __LINE__, L"/e=\"\"", TRUE, CSIDL_DRIVES, 0x00000200 }, + { __LINE__, L"=\"=\"", TRUE, PIDL_IS_NULL, 0x02000000, L"="}, + { __LINE__, L"==\"=\"", TRUE, PIDL_IS_NULL, 0x02000200, L"="}, + { __LINE__, L"===\"=\"", TRUE, PIDL_IS_NULL, 0x02000200, L"="}, + { __LINE__, L"=\"=\"", TRUE, PIDL_IS_NULL, 0x02000000, L"="}, + { __LINE__, L"==\"==\"", TRUE, PIDL_IS_NULL, 0x02000200, L"=="}, + { __LINE__, L"===\"===\"", TRUE, PIDL_IS_NULL, 0x02000200, L"==="}, + { __LINE__, L"=\"=a\"", TRUE, PIDL_IS_NULL, 0x02000000, L"=a"}, + { __LINE__, L"==\"=a=\"", TRUE, PIDL_IS_NULL, 0x02000200, L"=a="}, + { __LINE__, L"===\"=a=a=\"", TRUE, PIDL_IS_NULL, 0x02000200, L"=a=a="}, + { __LINE__, L"=\"=a\"==", TRUE, CSIDL_DRIVES, 0x02000200, L"=a" }, + { __LINE__, L"==\"=a=\"=", TRUE, CSIDL_DRIVES, 0x02000200, L"=a=" }, + { __LINE__, L"===\"=a=a=\"===", TRUE, CSIDL_DRIVES, 0x02000200, L"=a=a=" }, + { __LINE__, L"=,=,=,\"=a=a=\",=,=,=", TRUE, CSIDL_DRIVES, 0x02000200, L"=a=a=" }, + { __LINE__, L"\"", TRUE, CSIDL_DRIVES, 0x00000200 }, + { __LINE__, L"\"\"", TRUE, CSIDL_DRIVES, 0x00000200 }, + { __LINE__, L"\"\"\"", TRUE, PIDL_IS_NULL, 0x02000000, L"\""}, + { __LINE__, L"\"\"\"\"", TRUE, PIDL_IS_NULL, 0x02000000, L"\""}, + { __LINE__, L"\"\"\"\"\"", TRUE, PIDL_IS_NULL, 0x02000000, L"\"\""}, + { __LINE__, L"/s", TRUE, CSIDL_MYDOCUMENTS, 0x00000002}, + { __LINE__, L"/noui", TRUE, CSIDL_MYDOCUMENTS, 0x00001000}, + { __LINE__, L"/idlist", TRUE, PIDL_IS_UNTOUCHED, 0x00000000}, + { __LINE__, L"-embedding", TRUE, CSIDL_MYDOCUMENTS, 0x00000080 }, + { __LINE__, L"/inproc", FALSE, PIDL_IS_UNTOUCHED, 0x00000000 }, + { __LINE__, L"/inproc,1", FALSE, PIDL_IS_UNTOUCHED, 0x00000000 }, + { __LINE__, L"/inproc,a", FALSE, PIDL_IS_UNTOUCHED, 0x00000000 }, + { __LINE__, L"/inproc,c:\\", FALSE, PIDL_IS_UNTOUCHED, 0x00000000 }, + { __LINE__, L"/inproc,\"c:\\\"", FALSE, PIDL_IS_UNTOUCHED, 0x00000000 }, + { __LINE__, L"/inproc,{20d04fe0-3aea-1069-a2d8-08002b30309d}", TRUE, PIDL_IS_UNTOUCHED, 0x00000400 }, }; const int TestCount = sizeof(Tests) / sizeof(Tests[0]); PWSTR CommandLine; WCHAR OriginalCommandLine[1024]; int i; + UINT maxWrite = 0; CommandLine = GetCommandLineW(); StringCbCopyW(OriginalCommandLine, sizeof(OriginalCommandLine), CommandLine); for (i = 0; i < TestCount; i++) { + UINT cWrite; + wcscpy(CommandLine, L"browseui_apitest.exe "); wcscat(CommandLine, Tests[i].CommandLine); - trace("Command line: %ls\n", CommandLine); + trace("Command line (%d): %ls\n", Tests[i].TestLine, CommandLine); TestCommandLine(Tests[i].ExpectedRet, Tests[i].ExpectedCsidl, Tests[i].ExpectedFlags, Tests[i].ExpectedFileName, - Tests[i].PidlPath); - } + Tests[i].PidlPath, + &cWrite); + + if (cWrite > maxWrite) + maxWrite = cWrite; + } + + trace("Writes reached the byte right before 0x%08x\n", maxWrite); wcscpy(CommandLine, OriginalCommandLine); }

10 years, 3 months

[jgardou] 64028: [KMTESTS] - Test what happens to the 'base' of memory allocated with ZwAllocateVirtualMemory - Fix some tests according to w2k3sp2 behaviour. Thanks Amine for testing ; -)

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Sep 1 22:41:36 2014 New Revision: 64028 URL: http://svn.reactos.org/svn/reactos?rev=64028&view=rev Log: [KMTESTS] - Test what happens to the 'base' of memory allocated with ZwAllocateVirtualMemory - Fix some tests according to w2k3sp2 behaviour. Thanks Amine for testing ;-) Modified: trunk/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c Modified: trunk/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/ZwAllocat… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c [iso-8859-1] Mon Sep 1 22:41:36 2014 @@ -31,8 +31,13 @@ #define ALLOC_MEMORY_WITH_FREE(ProcessHandle, BaseAddress, ZeroBits, RegionSize, AllocationType, Protect, RetStatus, FreeStatus) \ do { \ + PVOID __BaseSave = BaseAddress; \ Status = ZwAllocateVirtualMemory(ProcessHandle, &BaseAddress, ZeroBits, &RegionSize, AllocationType, Protect); \ ok_eq_hex(Status, RetStatus); \ + if (__BaseSave != NULL) \ + ok_eq_pointer(BaseAddress, __BaseSave); \ + else if (!NT_SUCCESS(Status)) \ + ok_eq_pointer(BaseAddress, NULL); \ RegionSize = 0; \ Status = ZwFreeVirtualMemory(ProcessHandle, &BaseAddress, &RegionSize, MEM_RELEASE); \ if (FreeStatus != IGNORE) ok_eq_hex(Status, FreeStatus); \ @@ -104,7 +109,7 @@ //BASE ADDRESS TESTS Base = (PVOID)0x00567A20; - ALLOC_MEMORY_WITH_FREE(NtCurrentProcess(), Base, 0, RegionSize, (MEM_COMMIT | MEM_RESERVE), PAGE_READWRITE, STATUS_CONFLICTING_ADDRESSES, STATUS_FREE_VM_NOT_AT_BASE); + ALLOC_MEMORY_WITH_FREE(NtCurrentProcess(), Base, 0, RegionSize, (MEM_COMMIT | MEM_RESERVE), PAGE_READWRITE, STATUS_CONFLICTING_ADDRESSES, STATUS_UNABLE_TO_DELETE_SECTION); Base = (PVOID) 0x60000000; ALLOC_MEMORY_WITH_FREE(NtCurrentProcess(), Base, 0, RegionSize, (MEM_COMMIT | MEM_RESERVE), PAGE_READWRITE, STATUS_SUCCESS, STATUS_SUCCESS); @@ -501,7 +506,7 @@ Status = STATUS_SUCCESS; Status = StressTesting(MEM_COMMIT); - ok_eq_hex(Status, STATUS_COMMITMENT_LIMIT); + ok_eq_hex(Status, STATUS_NO_MEMORY); SystemProcessTest(); }

10 years, 3 months

[hbelusca] 64027: [INCLUDE/SUBSYS]: Un-anonymous CSR structures.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Sep 1 21:59:53 2014 New Revision: 64027 URL: http://svn.reactos.org/svn/reactos?rev=64027&view=rev Log: [INCLUDE/SUBSYS]: Un-anonymous CSR structures. Modified: branches/condrv_restructure/include/reactos/subsys/win/basemsg.h branches/condrv_restructure/include/reactos/subsys/win/conmsg.h Modified: branches/condrv_restructure/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… ============================================================================== --- branches/condrv_restructure/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/reactos/subsys/win/basemsg.h [iso-8859-1] Mon Sep 1 21:59:53 2014 @@ -86,7 +86,7 @@ UNICODE_STRING AssemblyName; } BASE_SXS_CREATEPROCESS_MSG, *PBASE_SXS_CREATEPROCESS_MSG; -typedef struct +typedef struct _BASE_CREATE_PROCESS { // // NT-type structure (BASE_CREATEPROCESS_MSG) @@ -104,23 +104,23 @@ USHORT ProcessorArchitecture; } BASE_CREATE_PROCESS, *PBASE_CREATE_PROCESS; -typedef struct +typedef struct _BASE_CREATE_THREAD { HANDLE ThreadHandle; CLIENT_ID ClientId; } BASE_CREATE_THREAD, *PBASE_CREATE_THREAD; -typedef struct +typedef struct _BASE_GET_TEMP_FILE { UINT UniqueID; } BASE_GET_TEMP_FILE, *PBASE_GET_TEMP_FILE; -typedef struct +typedef struct _BASE_EXIT_PROCESS { UINT uExitCode; } BASE_EXIT_PROCESS, *PBASE_EXIT_PROCESS; -typedef struct +typedef struct _BASE_CHECK_VDM { ULONG iTask; HANDLE ConsoleHandle; @@ -152,7 +152,7 @@ USHORT VDMState; } BASE_CHECK_VDM, *PBASE_CHECK_VDM; -typedef struct +typedef struct _BASE_UPDATE_VDM_ENTRY { ULONG iTask; ULONG BinaryType; @@ -163,7 +163,7 @@ USHORT VDMCreationState; } BASE_UPDATE_VDM_ENTRY, *PBASE_UPDATE_VDM_ENTRY; -typedef struct +typedef struct _BASE_GET_NEXT_VDM_COMMAND { ULONG iTask; HANDLE ConsoleHandle; @@ -196,80 +196,80 @@ ULONG fComingFromBat; } BASE_GET_NEXT_VDM_COMMAND, *PBASE_GET_NEXT_VDM_COMMAND; -typedef struct +typedef struct _BASE_EXIT_VDM { HANDLE ConsoleHandle; ULONG iWowTask; HANDLE WaitObjectForVDM; } BASE_EXIT_VDM, *PBASE_EXIT_VDM; -typedef struct +typedef struct _BASE_IS_FIRST_VDM { ULONG FirstVDM; } BASE_IS_FIRST_VDM, *PBASE_IS_FIRST_VDM; -typedef struct +typedef struct _BASE_GET_VDM_EXIT_CODE { HANDLE ConsoleHandle; HANDLE hParent; ULONG ExitCode; } BASE_GET_VDM_EXIT_CODE, *PBASE_GET_VDM_EXIT_CODE; -typedef struct +typedef struct _BASE_SET_REENTER_COUNT { HANDLE ConsoleHandle; ULONG fIncDec; } BASE_SET_REENTER_COUNT, *PBASE_SET_REENTER_COUNT; -typedef struct +typedef struct _BASE_GETSET_PROCESS_SHUTDOWN_PARAMS { ULONG ShutdownLevel; ULONG ShutdownFlags; } BASE_GETSET_PROCESS_SHUTDOWN_PARAMS, *PBASE_GETSET_PROCESS_SHUTDOWN_PARAMS; -typedef struct +typedef struct _BASE_GETSET_VDM_CURDIRS { HANDLE ConsoleHandle; PCHAR lpszzCurDirs; ULONG cchCurDirs; } BASE_GETSET_VDM_CURDIRS, *PBASE_GETSET_VDM_CURDIRS; -typedef struct +typedef struct _BASE_BAT_NOTIFICATION { HANDLE ConsoleHandle; ULONG fBeginEnd; } BASE_BAT_NOTIFICATION, *PBASE_BAT_NOTIFICATION; -typedef struct +typedef struct _BASE_REGISTER_WOWEXEC { HANDLE hwndWowExec; } BASE_REGISTER_WOWEXEC, *PBASE_REGISTER_WOWEXEC; -typedef struct +typedef struct _BASE_SOUND_SENTRY { ULONG VideoMode; } BASE_SOUND_SENTRY, *PBASE_SOUND_SENTRY; -typedef struct +typedef struct _BASE_REFRESH_INIFILE_MAPPING { UNICODE_STRING IniFileName; } BASE_REFRESH_INIFILE_MAPPING, *PBASE_REFRESH_INIFILE_MAPPING; -typedef struct +typedef struct _BASE_DEFINE_DOS_DEVICE { ULONG Flags; UNICODE_STRING DeviceName; UNICODE_STRING TargetPath; } BASE_DEFINE_DOS_DEVICE, *PBASE_DEFINE_DOS_DEVICE; -typedef struct +typedef struct _BASE_NLS_CREATE_SECTION { HANDLE SectionHandle; ULONG Type; ULONG LocaleId; } BASE_NLS_CREATE_SECTION, *PBASE_NLS_CREATE_SECTION; -typedef struct +typedef struct _BASE_NLS_GET_USER_INFO { PVOID /*PNLS_USER_INFO*/ NlsUserInfo; ULONG Size; Modified: branches/condrv_restructure/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… ============================================================================== --- branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] Mon Sep 1 21:59:53 2014 @@ -196,28 +196,28 @@ C_ASSERT(sizeof(CONSRV_API_CONNECTINFO) == 0x638); #endif -typedef struct +typedef struct _CONSOLE_GETPROCESSLIST { HANDLE ConsoleHandle; ULONG ProcessCount; PDWORD ProcessIdsList; } CONSOLE_GETPROCESSLIST, *PCONSOLE_GETPROCESSLIST; -typedef struct +typedef struct _CONSOLE_GENERATECTRLEVENT { HANDLE ConsoleHandle; DWORD CtrlEvent; DWORD ProcessGroupId; } CONSOLE_GENERATECTRLEVENT, *PCONSOLE_GENERATECTRLEVENT; -typedef struct +typedef struct _CONSOLE_NOTIFYLASTCLOSE { HANDLE ConsoleHandle; } CONSOLE_NOTIFYLASTCLOSE, *PCONSOLE_NOTIFYLASTCLOSE; -typedef struct +typedef struct _CONSOLE_WRITECONSOLE { HANDLE ConsoleHandle; HANDLE OutputHandle; @@ -236,7 +236,7 @@ CHAR Reserved2[6]; } CONSOLE_WRITECONSOLE, *PCONSOLE_WRITECONSOLE; -typedef struct +typedef struct _CONSOLE_READCONSOLE { HANDLE ConsoleHandle; HANDLE InputHandle; @@ -255,7 +255,7 @@ BOOLEAN Unicode; } CONSOLE_READCONSOLE, *PCONSOLE_READCONSOLE; -typedef struct +typedef struct _CONSOLE_ALLOCCONSOLE { PCONSOLE_START_INFO ConsoleStartInfo; @@ -268,7 +268,7 @@ LPTHREAD_START_ROUTINE PropDispatcher; } CONSOLE_ALLOCCONSOLE, *PCONSOLE_ALLOCCONSOLE; -typedef struct +typedef struct _CONSOLE_ATTACHCONSOLE { DWORD ProcessId; // If ProcessId == ATTACH_PARENT_PROCESS == -1, then attach the current process to its parent process console. HANDLE ConsoleHandle; @@ -280,12 +280,12 @@ LPTHREAD_START_ROUTINE PropDispatcher; } CONSOLE_ATTACHCONSOLE, *PCONSOLE_ATTACHCONSOLE; -typedef struct +typedef struct _CONSOLE_FREECONSOLE { HANDLE ConsoleHandle; } CONSOLE_FREECONSOLE, *PCONSOLE_FREECONSOLE; -typedef struct +typedef struct _CONSOLE_GETSCREENBUFFERINFO { HANDLE ConsoleHandle; HANDLE OutputHandle; @@ -297,14 +297,14 @@ COORD MaximumViewSize; } CONSOLE_GETSCREENBUFFERINFO, *PCONSOLE_GETSCREENBUFFERINFO; -typedef struct +typedef struct _CONSOLE_SETCURSORPOSITION { HANDLE ConsoleHandle; HANDLE OutputHandle; COORD Position; } CONSOLE_SETCURSORPOSITION, *PCONSOLE_SETCURSORPOSITION; -typedef struct +typedef struct _CONSOLE_SHOWCURSOR { HANDLE ConsoleHandle; HANDLE OutputHandle; @@ -312,14 +312,14 @@ INT RefCount; } CONSOLE_SHOWCURSOR, *PCONSOLE_SHOWCURSOR; -typedef struct +typedef struct _CONSOLE_SETCURSOR { HANDLE ConsoleHandle; HANDLE OutputHandle; HCURSOR CursorHandle; } CONSOLE_SETCURSOR, *PCONSOLE_SETCURSOR; -typedef struct +typedef struct _CONSOLE_GETSETCURSORINFO { HANDLE ConsoleHandle; HANDLE OutputHandle; @@ -330,33 +330,33 @@ */ } CONSOLE_GETSETCURSORINFO, *PCONSOLE_GETSETCURSORINFO; -typedef struct +typedef struct _CONSOLE_GETMOUSEINFO { HANDLE ConsoleHandle; ULONG NumButtons; } CONSOLE_GETMOUSEINFO, *PCONSOLE_GETMOUSEINFO; -typedef struct +typedef struct _CONSOLE_SETTEXTATTRIB { HANDLE ConsoleHandle; HANDLE OutputHandle; WORD Attributes; } CONSOLE_SETTEXTATTRIB, *PCONSOLE_SETTEXTATTRIB; -typedef struct +typedef struct _CONSOLE_GETSETCONSOLEMODE { HANDLE ConsoleHandle; HANDLE Handle; DWORD Mode; } CONSOLE_GETSETCONSOLEMODE, *PCONSOLE_GETSETCONSOLEMODE; -typedef struct +typedef struct _CONSOLE_GETDISPLAYMODE { HANDLE ConsoleHandle; DWORD DisplayMode; // ModeFlags } CONSOLE_GETDISPLAYMODE, *PCONSOLE_GETDISPLAYMODE; -typedef struct +typedef struct _CONSOLE_SETDISPLAYMODE { HANDLE ConsoleHandle; HANDLE OutputHandle; @@ -371,7 +371,7 @@ #define CONSOLE_HARDWARE_STATE_GDI_MANAGED 0 #define CONSOLE_HARDWARE_STATE_DIRECT 1 -typedef struct +typedef struct _CONSOLE_GETSETHWSTATE { HANDLE ConsoleHandle; HANDLE OutputHandle; @@ -381,7 +381,7 @@ -typedef struct +typedef struct _CONSOLE_CREATESCREENBUFFER { HANDLE ConsoleHandle; DWORD DesiredAccess; @@ -399,20 +399,20 @@ HANDLE OutputHandle; /* Handle to newly created screen buffer */ } CONSOLE_CREATESCREENBUFFER, *PCONSOLE_CREATESCREENBUFFER; -typedef struct +typedef struct _CONSOLE_SETACTIVESCREENBUFFER { HANDLE ConsoleHandle; HANDLE OutputHandle; /* Handle to screen buffer to switch to */ } CONSOLE_SETACTIVESCREENBUFFER, *PCONSOLE_SETACTIVESCREENBUFFER; -typedef struct +typedef struct _CONSOLE_INVALIDATEDIBITS { HANDLE ConsoleHandle; HANDLE OutputHandle; SMALL_RECT Region; } CONSOLE_INVALIDATEDIBITS, *PCONSOLE_INVALIDATEDIBITS; -typedef struct +typedef struct _CONSOLE_SETPALETTE { HANDLE ConsoleHandle; HANDLE OutputHandle; @@ -420,7 +420,7 @@ UINT Usage; } CONSOLE_SETPALETTE, *PCONSOLE_SETPALETTE; -typedef struct +typedef struct _CONSOLE_GETSETCONSOLETITLE { HANDLE ConsoleHandle; ULONG Length; @@ -428,13 +428,13 @@ BOOLEAN Unicode; } CONSOLE_GETSETCONSOLETITLE, *PCONSOLE_GETSETCONSOLETITLE; -typedef struct +typedef struct _CONSOLE_FLUSHINPUTBUFFER { HANDLE ConsoleHandle; HANDLE InputHandle; } CONSOLE_FLUSHINPUTBUFFER, *PCONSOLE_FLUSHINPUTBUFFER; -typedef struct +typedef struct _CONSOLE_SCROLLSCREENBUFFER { HANDLE ConsoleHandle; HANDLE OutputHandle; @@ -466,7 +466,7 @@ WORD Attribute; } CODE_ELEMENT; -typedef struct +typedef struct _CONSOLE_OUTPUTCODE { HANDLE ConsoleHandle; HANDLE OutputHandle; @@ -487,7 +487,7 @@ } CONSOLE_READOUTPUTCODE , *PCONSOLE_READOUTPUTCODE, CONSOLE_WRITEOUTPUTCODE, *PCONSOLE_WRITEOUTPUTCODE; -typedef struct +typedef struct _CONSOLE_FILLOUTPUTCODE { HANDLE ConsoleHandle; HANDLE OutputHandle; @@ -499,7 +499,7 @@ ULONG NumCodes; } CONSOLE_FILLOUTPUTCODE, *PCONSOLE_FILLOUTPUTCODE; -typedef struct +typedef struct _CONSOLE_GETINPUT { HANDLE ConsoleHandle; HANDLE InputHandle; @@ -510,7 +510,7 @@ BOOLEAN Unicode; } CONSOLE_GETINPUT, *PCONSOLE_GETINPUT; -typedef struct +typedef struct _CONSOLE_WRITEINPUT { HANDLE ConsoleHandle; HANDLE InputHandle; @@ -521,7 +521,7 @@ BOOLEAN AppendToEnd; } CONSOLE_WRITEINPUT, *PCONSOLE_WRITEINPUT; -typedef struct +typedef struct _CONSOLE_READOUTPUT { HANDLE ConsoleHandle; HANDLE OutputHandle; @@ -533,7 +533,7 @@ BOOLEAN Unicode; } CONSOLE_READOUTPUT, *PCONSOLE_READOUTPUT; -typedef struct +typedef struct _CONSOLE_WRITEOUTPUT { HANDLE ConsoleHandle; HANDLE OutputHandle; @@ -552,7 +552,7 @@ BOOLEAN UseVirtualMemory; } CONSOLE_WRITEOUTPUT, *PCONSOLE_WRITEOUTPUT; -typedef struct +typedef struct _CONSOLE_GETNUMINPUTEVENTS { HANDLE ConsoleHandle; HANDLE InputHandle; @@ -561,20 +561,20 @@ -typedef struct +typedef struct _CONSOLE_CLOSEHANDLE { HANDLE ConsoleHandle; HANDLE Handle; } CONSOLE_CLOSEHANDLE, *PCONSOLE_CLOSEHANDLE; -typedef struct +typedef struct _CONSOLE_VERIFYHANDLE { BOOL IsValid; HANDLE ConsoleHandle; HANDLE Handle; } CONSOLE_VERIFYHANDLE, *PCONSOLE_VERIFYHANDLE; -typedef struct +typedef struct _CONSOLE_DUPLICATEHANDLE { HANDLE ConsoleHandle; HANDLE SourceHandle; @@ -584,14 +584,14 @@ HANDLE TargetHandle; } CONSOLE_DUPLICATEHANDLE, *PCONSOLE_DUPLICATEHANDLE; -typedef struct +typedef struct _CONSOLE_GETHANDLEINFO { HANDLE ConsoleHandle; HANDLE Handle; DWORD Flags; } CONSOLE_GETHANDLEINFO, *PCONSOLE_GETHANDLEINFO; -typedef struct +typedef struct _CONSOLE_SETHANDLEINFO { HANDLE ConsoleHandle; HANDLE Handle; @@ -608,7 +608,7 @@ HANDLE_OUTPUT = 0x02 } CONSOLE_HANDLE_TYPE; -typedef struct +typedef struct _CONSOLE_OPENCONSOLE { HANDLE ConsoleHandle; CONSOLE_HANDLE_TYPE HandleType; @@ -620,14 +620,14 @@ -typedef struct +typedef struct _CONSOLE_GETLARGESTWINDOWSIZE { HANDLE ConsoleHandle; HANDLE OutputHandle; COORD Size; } CONSOLE_GETLARGESTWINDOWSIZE, *PCONSOLE_GETLARGESTWINDOWSIZE; -typedef struct +typedef struct _CONSOLE_MENUCONTROL { HANDLE ConsoleHandle; HANDLE OutputHandle; @@ -636,13 +636,13 @@ HMENU MenuHandle; } CONSOLE_MENUCONTROL, *PCONSOLE_MENUCONTROL; -typedef struct +typedef struct _CONSOLE_SETMENUCLOSE { HANDLE ConsoleHandle; BOOL Enable; } CONSOLE_SETMENUCLOSE, *PCONSOLE_SETMENUCLOSE; -typedef struct +typedef struct _CONSOLE_SETWINDOWINFO { HANDLE ConsoleHandle; HANDLE OutputHandle; @@ -651,13 +651,13 @@ // or in the old window position frame (Absolute == FALSE). } CONSOLE_SETWINDOWINFO, *PCONSOLE_SETWINDOWINFO; -typedef struct +typedef struct _CONSOLE_GETWINDOW { HANDLE ConsoleHandle; HWND WindowHandle; } CONSOLE_GETWINDOW, *PCONSOLE_GETWINDOW; -typedef struct +typedef struct _CONSOLE_SETICON { HANDLE ConsoleHandle; HICON IconHandle; @@ -665,7 +665,7 @@ -typedef struct +typedef struct _CONSOLE_ADDGETALIAS { HANDLE ConsoleHandle; USHORT SourceLength; @@ -678,7 +678,7 @@ BOOLEAN Unicode2; } CONSOLE_ADDGETALIAS, *PCONSOLE_ADDGETALIAS; -typedef struct +typedef struct _CONSOLE_GETALLALIASES { HANDLE ConsoleHandle; USHORT ExeLength; @@ -689,7 +689,7 @@ PVOID AliasesBuffer; } CONSOLE_GETALLALIASES, *PCONSOLE_GETALLALIASES; -typedef struct +typedef struct _CONSOLE_GETALLALIASESLENGTH { HANDLE ConsoleHandle; USHORT ExeLength; @@ -699,7 +699,7 @@ BOOLEAN Unicode2; } CONSOLE_GETALLALIASESLENGTH, *PCONSOLE_GETALLALIASESLENGTH; -typedef struct +typedef struct _CONSOLE_GETALIASESEXES { HANDLE ConsoleHandle; ULONG Length ; // ExeLength; // ExesLength @@ -707,7 +707,7 @@ BOOLEAN Unicode; } CONSOLE_GETALIASESEXES, *PCONSOLE_GETALIASESEXES; -typedef struct +typedef struct _CONSOLE_GETALIASESEXESLENGTH { HANDLE ConsoleHandle; ULONG Length; @@ -716,7 +716,7 @@ -typedef struct +typedef struct _CONSOLE_GETCOMMANDHISTORY { HANDLE ConsoleHandle; ULONG HistoryLength; @@ -727,7 +727,7 @@ BOOLEAN Unicode2; } CONSOLE_GETCOMMANDHISTORY, *PCONSOLE_GETCOMMANDHISTORY; -typedef struct +typedef struct _CONSOLE_GETCOMMANDHISTORYLENGTH { HANDLE ConsoleHandle; ULONG HistoryLength; @@ -737,7 +737,7 @@ BOOLEAN Unicode2; } CONSOLE_GETCOMMANDHISTORYLENGTH, *PCONSOLE_GETCOMMANDHISTORYLENGTH; -typedef struct +typedef struct _CONSOLE_EXPUNGECOMMANDHISTORY { HANDLE ConsoleHandle; USHORT ExeLength; @@ -746,14 +746,14 @@ BOOLEAN Unicode2; } CONSOLE_EXPUNGECOMMANDHISTORY, *PCONSOLE_EXPUNGECOMMANDHISTORY; -typedef struct +typedef struct _CONSOLE_GETSETHISTORYINFO { UINT HistoryBufferSize; UINT NumberOfHistoryBuffers; DWORD dwFlags; } CONSOLE_GETSETHISTORYINFO, *PCONSOLE_GETSETHISTORYINFO; -typedef struct +typedef struct _CONSOLE_SETHISTORYNUMBERCOMMANDS { HANDLE ConsoleHandle; ULONG NumCommands; @@ -763,7 +763,7 @@ BOOLEAN Unicode2; } CONSOLE_SETHISTORYNUMBERCOMMANDS, *PCONSOLE_SETHISTORYNUMBERCOMMANDS; -typedef struct +typedef struct _CONSOLE_SETHISTORYMODE { HANDLE ConsoleHandle; ULONG Mode; @@ -771,27 +771,27 @@ -typedef struct +typedef struct _CONSOLE_SETSCREENBUFFERSIZE { HANDLE ConsoleHandle; HANDLE OutputHandle; COORD Size; } CONSOLE_SETSCREENBUFFERSIZE, *PCONSOLE_SETSCREENBUFFERSIZE; -typedef struct +typedef struct _CONSOLE_GETSELECTIONINFO { HANDLE ConsoleHandle; CONSOLE_SELECTION_INFO Info; } CONSOLE_GETSELECTIONINFO, *PCONSOLE_GETSELECTIONINFO; -typedef struct +typedef struct _CONSOLE_GETINPUTOUTPUTCP { HANDLE ConsoleHandle; UINT CodePage; BOOL OutputCP; // TRUE : Output Code Page ; FALSE : Input Code Page } CONSOLE_GETINPUTOUTPUTCP, *PCONSOLE_GETINPUTOUTPUTCP; -typedef struct +typedef struct _CONSOLE_SETINPUTOUTPUTCP { HANDLE ConsoleHandle; UINT CodePage; @@ -799,14 +799,14 @@ HANDLE EventHandle; } CONSOLE_SETINPUTOUTPUTCP, *PCONSOLE_SETINPUTOUTPUTCP; -typedef struct +typedef struct _CONSOLE_GETKBDLAYOUTNAME { HANDLE ConsoleHandle; CHAR LayoutBuffer[KL_NAMELENGTH * sizeof(WCHAR)]; // Can hold up to 9 wchars BOOL Ansi; } CONSOLE_GETKBDLAYOUTNAME, *PCONSOLE_GETKBDLAYOUTNAME; -typedef struct +typedef struct _CONSOLE_REGISTERVDM { HANDLE ConsoleHandle; ULONG RegisterFlags;

10 years, 3 months

[jgardou] 64026: [CRYPT32] - Merge the "Root" and the "AuthRoot" certificate stores This, with the now almost faaous gnutls DLLs, allows mshtml:events test to not hang

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Sep 1 20:58:41 2014 New Revision: 64026 URL: http://svn.reactos.org/svn/reactos?rev=64026&view=rev Log: [CRYPT32] - Merge the "Root" and the "AuthRoot" certificate stores This, with the now almost faaous gnutls DLLs, allows mshtml:events test to not hang Modified: trunk/reactos/dll/win32/crypt32/rootstore.c Modified: trunk/reactos/dll/win32/crypt32/rootstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/rootstor… ============================================================================== --- trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] Mon Sep 1 20:58:41 2014 @@ -800,6 +800,18 @@ read_trusted_roots_from_known_locations(memStore); add_ms_root_certs(memStore); root = CRYPT_ProvCreateStore(0, memStore, &provInfo); +#ifdef __REACTOS__ + { + HCERTSTORE regStore = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE, L"AuthRoot"); + if (regStore) + { + HCERTSTORE collStore = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + CertAddStoreToCollection(collStore, regStore, 0, 0); + root = collStore; + } + } +#endif } TRACE("returning %p\n", root); return root;

10 years, 3 months

[jgardou] 64025: [HIVESFT] - Import various certificates required to open secure connection to www.winehq.org

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Sep 1 20:58:32 2014 New Revision: 64025 URL: http://svn.reactos.org/svn/reactos?rev=64025&view=rev Log: [HIVESFT] - Import various certificates required to open secure connection to www.winehq.org 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] Mon Sep 1 20:58:32 2014 @@ -246,6 +246,186 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","OEMFONT.FON",0x00000002,"vgaoem.fon" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","DisableRemoteFontBootCache",0x00010001,0x00000000 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,\ + 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 +; 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,\ + 0x30,0x82,0x02,0x89,0xA0,0x03,0x02,0x01,0x02,0x02,0x04,0x35,0xDE,0xF4,0xCF,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,0x39,0x38,0x30,0x38,0x32,0x32,0x31,0x36,0x34,0x31,0x35,0x31,0x5A,0x17,\ + 0x0D,0x31,0x38,0x30,0x38,0x32,0x32,0x31,0x36,0x34,0x31,0x35,0x31,0x5A,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,0x81,\ + 0x9F,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,\ + 0x03,0x81,0x8D,0x00,0x30,0x81,0x89,0x02,0x81,0x81,0x00,0xC1,0x5D,0xB1,0x58,0x67,\ + 0x08,0x62,0xEE,0xA0,0x9A,0x2D,0x1F,0x08,0x6D,0x91,0x14,0x68,0x98,0x0A,0x1E,0xFE,\ + 0xDA,0x04,0x6F,0x13,0x84,0x62,0x21,0xC3,0xD1,0x7C,0xCE,0x9F,0x05,0xE0,0xB8,0x01,\ + 0xF0,0x4E,0x34,0xEC,0xE2,0x8A,0x95,0x04,0x64,0xAC,0xF1,0x6B,0x53,0x5F,0x05,0xB3,\ + 0xCB,0x67,0x80,0xBF,0x42,0x02,0x8E,0xFE,0xDD,0x01,0x09,0xEC,0xE1,0x00,0x14,0x4F,\ + 0xFC,0xFB,0xF0,0x0C,0xDD,0x43,0xBA,0x5B,0x2B,0xE1,0x1F,0x80,0x70,0x99,0x15,0x57,\ + 0x93,0x16,0xF1,0x0F,0x97,0x6A,0xB7,0xC2,0x68,0x23,0x1C,0xCC,0x4D,0x59,0x30,0xAC,\ + 0x51,0x1E,0x3B,0xAF,0x2B,0xD6,0xEE,0x63,0x45,0x7B,0xC5,0xD9,0x5F,0x50,0xD2,0xE3,\ + 0x50,0x0F,0x3A,0x88,0xE7,0xBF,0x14,0xFD,0xE0,0xC7,0xB9,0x02,0x03,0x01,0x00,0x01,\ + 0xA3,0x82,0x01,0x09,0x30,0x82,0x01,0x05,0x30,0x70,0x06,0x03,0x55,0x1D,0x1F,0x04,\ + 0x69,0x30,0x67,0x30,0x65,0xA0,0x63,0xA0,0x61,0xA4,0x5F,0x30,0x5D,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,0x31,0x0D,0x30,0x0B,0x06,\ + 0x03,0x55,0x04,0x03,0x13,0x04,0x43,0x52,0x4C,0x31,0x30,0x1A,0x06,0x03,0x55,0x1D,\ + 0x10,0x04,0x13,0x30,0x11,0x81,0x0F,0x32,0x30,0x31,0x38,0x30,0x38,0x32,0x32,0x31,\ + 0x36,0x34,0x31,0x35,0x31,0x5A,0x30,0x0B,0x06,0x03,0x55,0x1D,0x0F,0x04,0x04,0x03,\ + 0x02,0x01,0x06,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,0x48,\ + 0xE6,0x68,0xF9,0x2B,0xD2,0xB2,0x95,0xD7,0x47,0xD8,0x23,0x20,0x10,0x4F,0x33,0x98,\ + 0x90,0x9F,0xD4,0x30,0x0C,0x06,0x03,0x55,0x1D,0x13,0x04,0x05,0x30,0x03,0x01,0x01,\ + 0xFF,0x30,0x1A,0x06,0x09,0x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x41,0x00,0x04,0x0D,\ + 0x30,0x0B,0x1B,0x05,0x56,0x33,0x2E,0x30,0x63,0x03,0x02,0x06,0xC0,0x30,0x0D,0x06,\ + 0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,0x03,0x81,0x81,0x00,\ + 0x58,0xCE,0x29,0xEA,0xFC,0xF7,0xDE,0xB5,0xCE,0x02,0xB9,0x17,0xB5,0x85,0xD1,0xB9,\ + 0xE3,0xE0,0x95,0xCC,0x25,0x31,0x0D,0x00,0xA6,0x92,0x6E,0x7F,0xB6,0x92,0x63,0x9E,\ + 0x50,0x95,0xD1,0x9A,0x6F,0xE4,0x11,0xDE,0x63,0x85,0x6E,0x98,0xEE,0xA8,0xFF,0x5A,\ + 0xC8,0xD3,0x55,0xB2,0x66,0x71,0x57,0xDE,0xC0,0x21,0xEB,0x3D,0x2A,0xA7,0x23,0x49,\ + 0x01,0x04,0x86,0x42,0x7B,0xFC,0xEE,0x7F,0xA2,0x16,0x52,0xB5,0x67,0x67,0xD3,0x40,\ + 0xDB,0x3B,0x26,0x58,0xB2,0x28,0x77,0x3D,0xAE,0x14,0x77,0x61,0xD6,0xFA,0x2A,0x66,\ + 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 + ; Time zone settings HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones",,0x00000012

10 years, 3 months

[hbelusca] 64024: [HAL] Update the PCI hardware IDs. Extracted from the pci.ids database from http://pciids.sourceforge.net/ from 2014.08.30 Maintained by Martin Mares <mj@ucw.cz> and other volunte...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Sep 1 16:42:58 2014 New Revision: 64024 URL: http://svn.reactos.org/svn/reactos?rev=64024&view=rev Log: [HAL] Update the PCI hardware IDs. Extracted from the pci.ids database from http://pciids.sourceforge.net/ from 2014.08.30 Maintained by Martin Mares <mj(a)ucw.cz> and other volunteers from the PCI ID Project at http://pci-ids.ucw.cz/. Modified: trunk/reactos/hal/halx86/legacy/bus/pci_classes.ids trunk/reactos/hal/halx86/legacy/bus/pci_vendors.ids [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/hal/halx86/legacy/bus/pci_classes.ids URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pci_… Modified: trunk/reactos/hal/halx86/legacy/bus/pci_vendors.ids URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pci_…

10 years, 3 months

[jgardou] 64023: [SCHANNEL] - Restore a few function forwarders to secur32 Noticed by Timo. Thanks!

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Sep 1 16:32:26 2014 New Revision: 64023 URL: http://svn.reactos.org/svn/reactos?rev=64023&view=rev Log: [SCHANNEL] - Restore a few function forwarders to secur32 Noticed by Timo. Thanks! Modified: trunk/reactos/dll/win32/schannel/CMakeLists.txt trunk/reactos/dll/win32/schannel/schannel.spec trunk/reactos/dll/win32/schannel/schannel_wine.c trunk/reactos/dll/win32/schannel/stubs.c Modified: trunk/reactos/dll/win32/schannel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/schannel/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/CMakeLists.txt [iso-8859-1] Mon Sep 1 16:32:26 2014 @@ -25,6 +25,6 @@ set_module_type(schannel win32dll) target_link_libraries(schannel wine) -add_importlibs(schannel crypt32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(schannel crypt32 secur32 advapi32 msvcrt kernel32 ntdll) add_pch(schannel precomp.h SOURCE) add_cd_file(TARGET schannel DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/schannel/schannel.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel.spec [iso-8859-1] Mon Sep 1 16:32:26 2014 @@ -15,14 +15,14 @@ @ stdcall InitSecurityInterfaceW() schan_InitSecurityInterfaceW @ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) schan_InitializeSecurityContextA @ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) schan_InitializeSecurityContextW -@ stdcall MakeSignature(ptr long ptr long) schan_MakeSignature +@ stdcall MakeSignature(ptr long ptr long) secur32.MakeSignature @ stub OpenSslPerformanceData -@ stdcall QueryContextAttributesA(ptr long ptr) schan_QueryContextAttributesA -@ stdcall QueryContextAttributesW(ptr long ptr) schan_QueryContextAttributesW -@ stdcall QuerySecurityPackageInfoA(str ptr) schan_QuerySecurityPackageInfoA -@ stdcall QuerySecurityPackageInfoW(wstr ptr) schan_QuerySecurityPackageInfoW -@ stdcall RevertSecurityContext(ptr) schan_RevertSecurityContext -@ stdcall SealMessage(ptr long ptr long) schan_EncryptMessage +@ stdcall QueryContextAttributesA(ptr long ptr) secur32.QueryContextAttributesA +@ stdcall QueryContextAttributesW(ptr long ptr) secur32.QueryContextAttributesW +@ stdcall QuerySecurityPackageInfoA(str ptr) secur32.QuerySecurityPackageInfoA +@ stdcall QuerySecurityPackageInfoW(wstr ptr) secur32.QuerySecurityPackageInfoW +@ stdcall RevertSecurityContext(ptr) secur32.RevertSecurityContext +@ stdcall SealMessage(ptr long ptr long) secur32.SealMessage @ stdcall SpLsaModeInitialize(long ptr ptr ptr) @ stdcall SpUserModeInitialize(long ptr ptr ptr) @ stub SslCrackCertificate @@ -33,5 +33,5 @@ @ stub SslGenerateRandomBits @ stub SslGetMaximumKeySize @ stub SslLoadCertificate -@ stdcall UnsealMessage(ptr ptr long ptr) schan_DecryptMessage -@ stdcall VerifySignature(ptr ptr long ptr) schan_VerifySignature +@ stdcall UnsealMessage(ptr ptr long ptr) secur32.UnsealMessage +@ stdcall VerifySignature(ptr ptr long ptr) secur32.VerifySignature Modified: trunk/reactos/dll/win32/schannel/schannel_wine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel_wine.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel_wine.c [iso-8859-1] Mon Sep 1 16:32:26 2014 @@ -932,6 +932,7 @@ return ret; } +static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( PCtxtHandle context_handle, ULONG attribute, PVOID buffer) { @@ -1002,6 +1003,7 @@ } } +static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesA( PCtxtHandle context_handle, ULONG attribute, PVOID buffer) { @@ -1068,7 +1070,7 @@ return -1; } -SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle, +static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle, ULONG quality, PSecBufferDesc message, ULONG message_seq_no) { struct schan_transport transport; @@ -1190,7 +1192,7 @@ buffer->cbBuffer = size; } -SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, +static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, PSecBufferDesc message, ULONG message_seq_no, PULONG quality) { struct schan_transport transport; Modified: trunk/reactos/dll/win32/schannel/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/schannel/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/stubs.c [iso-8859-1] Mon Sep 1 16:32:26 2014 @@ -25,32 +25,3 @@ { return SEC_E_UNSUPPORTED_FUNCTION; } - -SECURITY_STATUS WINAPI schan_MakeSignature(PCtxtHandle phContext, ULONG fQOP, - PSecBufferDesc pMessage, ULONG MessageSeqNo) -{ - return SEC_E_UNSUPPORTED_FUNCTION; -} - -SECURITY_STATUS WINAPI schan_QuerySecurityPackageInfoA(SEC_CHAR *pszPackageName, - PSecPkgInfoA *ppPackageInfo) -{ - return SEC_E_UNSUPPORTED_FUNCTION; -} - -SECURITY_STATUS WINAPI schan_QuerySecurityPackageInfoW(SEC_WCHAR *pszPackageName, - PSecPkgInfoW *ppPackageInfo) -{ - return SEC_E_UNSUPPORTED_FUNCTION; -} - -SECURITY_STATUS WINAPI schan_RevertSecurityContext(PCtxtHandle phContext) -{ - return SEC_E_UNSUPPORTED_FUNCTION; -} - -SECURITY_STATUS WINAPI schan_VerifySignature(PCtxtHandle phContext, - PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) -{ - return SEC_E_UNSUPPORTED_FUNCTION; -}

10 years, 3 months

[jgardou] 64022: [SECUR32] - Update spec file [SCHANNEL] - Update stubs list Please blame binutils

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Sep 1 12:21:16 2014 New Revision: 64022 URL: http://svn.reactos.org/svn/reactos?rev=64022&view=rev Log: [SECUR32] - Update spec file [SCHANNEL] - Update stubs list Please blame binutils Modified: trunk/reactos/dll/win32/schannel/schannel.spec trunk/reactos/dll/win32/schannel/schannel_wine.c trunk/reactos/dll/win32/schannel/stubs.c trunk/reactos/dll/win32/secur32/secur32.spec Modified: trunk/reactos/dll/win32/schannel/schannel.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel.spec [iso-8859-1] Mon Sep 1 12:21:16 2014 @@ -15,14 +15,14 @@ @ stdcall InitSecurityInterfaceW() schan_InitSecurityInterfaceW @ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) schan_InitializeSecurityContextA @ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) schan_InitializeSecurityContextW -@ stdcall MakeSignature(ptr long ptr long) secur32.MakeSignature +@ stdcall MakeSignature(ptr long ptr long) schan_MakeSignature @ stub OpenSslPerformanceData @ stdcall QueryContextAttributesA(ptr long ptr) schan_QueryContextAttributesA @ stdcall QueryContextAttributesW(ptr long ptr) schan_QueryContextAttributesW -@ stdcall QuerySecurityPackageInfoA(str ptr) secur32.QuerySecurityPackageInfoA -@ stdcall QuerySecurityPackageInfoW(wstr ptr) secur32.QuerySecurityPackageInfoW -@ stdcall RevertSecurityContext(ptr) secur32.RevertSecurityContext -@ stdcall SealMessage(ptr long ptr long) secur32.SealMessage +@ stdcall QuerySecurityPackageInfoA(str ptr) schan_QuerySecurityPackageInfoA +@ stdcall QuerySecurityPackageInfoW(wstr ptr) schan_QuerySecurityPackageInfoW +@ stdcall RevertSecurityContext(ptr) schan_RevertSecurityContext +@ stdcall SealMessage(ptr long ptr long) schan_EncryptMessage @ stdcall SpLsaModeInitialize(long ptr ptr ptr) @ stdcall SpUserModeInitialize(long ptr ptr ptr) @ stub SslCrackCertificate @@ -33,5 +33,5 @@ @ stub SslGenerateRandomBits @ stub SslGetMaximumKeySize @ stub SslLoadCertificate -@ stdcall UnsealMessage(ptr ptr long ptr) secur32.UnsealMessage -@ stdcall VerifySignature(ptr ptr long ptr) secur32.VerifySignature +@ stdcall UnsealMessage(ptr ptr long ptr) schan_DecryptMessage +@ stdcall VerifySignature(ptr ptr long ptr) schan_VerifySignature Modified: trunk/reactos/dll/win32/schannel/schannel_wine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel_wine.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel_wine.c [iso-8859-1] Mon Sep 1 12:21:16 2014 @@ -1068,7 +1068,7 @@ return -1; } -static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle, +SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle, ULONG quality, PSecBufferDesc message, ULONG message_seq_no) { struct schan_transport transport; @@ -1190,7 +1190,7 @@ buffer->cbBuffer = size; } -static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, +SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, PSecBufferDesc message, ULONG message_seq_no, PULONG quality) { struct schan_transport transport; Modified: trunk/reactos/dll/win32/schannel/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/schannel/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/stubs.c [iso-8859-1] Mon Sep 1 12:21:16 2014 @@ -26,3 +26,31 @@ return SEC_E_UNSUPPORTED_FUNCTION; } +SECURITY_STATUS WINAPI schan_MakeSignature(PCtxtHandle phContext, ULONG fQOP, + PSecBufferDesc pMessage, ULONG MessageSeqNo) +{ + return SEC_E_UNSUPPORTED_FUNCTION; +} + +SECURITY_STATUS WINAPI schan_QuerySecurityPackageInfoA(SEC_CHAR *pszPackageName, + PSecPkgInfoA *ppPackageInfo) +{ + return SEC_E_UNSUPPORTED_FUNCTION; +} + +SECURITY_STATUS WINAPI schan_QuerySecurityPackageInfoW(SEC_WCHAR *pszPackageName, + PSecPkgInfoW *ppPackageInfo) +{ + return SEC_E_UNSUPPORTED_FUNCTION; +} + +SECURITY_STATUS WINAPI schan_RevertSecurityContext(PCtxtHandle phContext) +{ + return SEC_E_UNSUPPORTED_FUNCTION; +} + +SECURITY_STATUS WINAPI schan_VerifySignature(PCtxtHandle phContext, + PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) +{ + return SEC_E_UNSUPPORTED_FUNCTION; +} Modified: trunk/reactos/dll/win32/secur32/secur32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/secur32.spec [iso-8859-1] Mon Sep 1 12:21:16 2014 @@ -68,8 +68,8 @@ @ stub SecpFreeMemory @ stub SecpTranslateName @ stub SecpTranslateNameEx -@ stub SetContextAttributesA -@ stub SetContextAttributesW +@ stdcall SetContextAttributesA(ptr long ptr long) +@ stdcall SetContextAttributesW(ptr long ptr long) @ stdcall TranslateNameA(str long long ptr ptr) @ stdcall TranslateNameW(wstr long long ptr ptr) @ stdcall UnsealMessage(ptr ptr long ptr) DecryptMessage

10 years, 3 months

[jgardou] 64021: [SCHANNEL] - Uglier but (hopefully) functioning hack for Visual Studio compilers

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Sep 1 12:00:20 2014 New Revision: 64021 URL: http://svn.reactos.org/svn/reactos?rev=64021&view=rev Log: [SCHANNEL] - Uglier but (hopefully) functioning hack for Visual Studio compilers Added: trunk/reactos/dll/win32/schannel/msvc_typeof_hack.h (with props) Modified: trunk/reactos/dll/win32/schannel/schannel_gnutls.c Added: trunk/reactos/dll/win32/schannel/msvc_typeof_hack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/msvc_ty… ============================================================================== --- trunk/reactos/dll/win32/schannel/msvc_typeof_hack.h (added) +++ trunk/reactos/dll/win32/schannel/msvc_typeof_hack.h [iso-8859-1] Mon Sep 1 12:00:20 2014 @@ -0,0 +1,48 @@ + +#pragma once + +#define typeof(_X) __typeof_ ## _X + +typedef gnutls_alert_description_t (__cdecl typeof(gnutls_alert_get))(gnutls_session_t session); +typedef const char* (__cdecl typeof(gnutls_alert_get_name))(gnutls_alert_description_t alert); +typedef void (__cdecl typeof(gnutls_certificate_free_credentials))(gnutls_certificate_credentials_t sc); +typedef int (__cdecl typeof(gnutls_certificate_allocate_credentials))(gnutls_certificate_credentials_t + * res); +typedef const gnutls_datum_t* (__cdecl typeof(gnutls_certificate_get_peers))(gnutls_session_t + session, unsigned int + *list_size); +typedef gnutls_cipher_algorithm_t (__cdecl typeof(gnutls_cipher_get))(gnutls_session_t session); +typedef size_t (__cdecl typeof(gnutls_cipher_get_key_size))(gnutls_cipher_algorithm_t algorithm); +typedef int (__cdecl typeof(gnutls_credentials_set))(gnutls_session_t session, + gnutls_credentials_type_t type, void *cred); +typedef void (__cdecl typeof(gnutls_deinit))(gnutls_session_t session); +typedef int (__cdecl typeof(gnutls_global_init))(void); +typedef void (__cdecl typeof(gnutls_global_deinit))(void); +typedef void (__cdecl typeof(gnutls_global_set_log_function))(gnutls_log_func log_func); +typedef void (__cdecl typeof(gnutls_global_set_log_level))(int level); +typedef int (__cdecl typeof(gnutls_handshake))(gnutls_session_t session); +typedef int (__cdecl typeof(gnutls_init))(gnutls_session_t * session, unsigned int flags); +typedef gnutls_kx_algorithm_t (__cdecl typeof(gnutls_kx_get))(gnutls_session_t session); +typedef gnutls_mac_algorithm_t (__cdecl typeof(gnutls_mac_get))(gnutls_session_t session); +typedef size_t (__cdecl typeof(gnutls_mac_get_key_size))(gnutls_mac_algorithm_t algorithm); +typedef void (__cdecl typeof(gnutls_perror))(int error); +typedef gnutls_protocol_t (__cdecl typeof(gnutls_protocol_get_version))(gnutls_session_t session); +typedef int (__cdecl typeof(gnutls_priority_set_direct))(gnutls_session_t session, + const char *priorities, + const char **err_pos); +typedef size_t (__cdecl typeof(gnutls_record_get_max_size))(gnutls_session_t session); +typedef ssize_t (__cdecl typeof(gnutls_record_recv))(gnutls_session_t session, void *data, + size_t data_size); +typedef ssize_t (__cdecl typeof(gnutls_record_send))(gnutls_session_t session, const void *data, + size_t data_size); +typedef int (__cdecl typeof(gnutls_server_name_set))(gnutls_session_t session, + gnutls_server_name_type_t type, + const void *name, size_t name_length); +typedef gnutls_transport_ptr_t (__cdecl typeof(gnutls_transport_get_ptr))(gnutls_session_t session); +typedef void (__cdecl typeof(gnutls_transport_set_errno))(gnutls_session_t session, int err); +typedef void (__cdecl typeof(gnutls_transport_set_ptr))(gnutls_session_t session, + gnutls_transport_ptr_t ptr); +typedef void (__cdecl typeof(gnutls_transport_set_push_function))(gnutls_session_t session, + gnutls_push_func push_func); +typedef void (__cdecl typeof(gnutls_transport_set_pull_function))(gnutls_session_t session, + gnutls_pull_func pull_func); Propchange: trunk/reactos/dll/win32/schannel/msvc_typeof_hack.h ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/reactos/dll/win32/schannel/msvc_typeof_hack.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/schannel/msvc_typeof_hack.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/schannel/schannel_gnutls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel_gnutls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel_gnutls.c [iso-8859-1] Mon Sep 1 12:00:20 2014 @@ -35,11 +35,12 @@ #if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H) static void *libgnutls_handle; -#if (_MSC_VER >= 1600) -#define MAKE_FUNCPTR(f) static decltype(f) p##f -#else + +#ifdef _MSC_VER +#include "msvc_typeof_hack.h" +#endif + #define MAKE_FUNCPTR(f) static typeof(f) * p##f -#endif MAKE_FUNCPTR(gnutls_alert_get); MAKE_FUNCPTR(gnutls_alert_get_name); MAKE_FUNCPTR(gnutls_certificate_allocate_credentials);

10 years, 3 months

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 September 2014