Ros-diffs October 2016

ros-diffs@reactos.org

20 participants
222 discussions

[tfaber] 72923: [DWNL] - Handle arbitrary console buffer width in write_status CORE-10228 #resolve
by tfaber＠svn.reactos.org 07 Oct '16

07 Oct '16

Author: tfaber Date: Fri Oct 7 15:25:20 2016 New Revision: 72923 URL: http://svn.reactos.org/svn/reactos?rev=72923&view=rev Log: [DWNL] - Handle arbitrary console buffer width in write_status CORE-10228 #resolve Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/dwnl/dwnl.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/dwnl/dwnl.c [iso-8859-1] Fri Oct 7 15:25:20 2016 @@ -2,6 +2,7 @@ #include <urlmon.h> #include <wininet.h> #include <tchar.h> +#include <strsafe.h> /* FIXME: add correct definitions to urlmon.idl */ #ifdef UNICODE @@ -41,21 +42,21 @@ write_status(LPCTSTR lpFmt, ...) { va_list args; - - /* FIXME: Determine line length! */ - TCHAR szTxt[80]; - int c; + TCHAR szTxt[128]; + CONSOLE_SCREEN_BUFFER_INFO csbi; va_start(args, lpFmt); - _vstprintf(szTxt, lpFmt, args); + StringCbVPrintf(szTxt, sizeof(szTxt), lpFmt, args); va_end(args); - c = _tcslen(szTxt); - while (c < (sizeof(szTxt) / sizeof(szTxt[0])) - 1) - szTxt[c++] = _T(' '); - szTxt[c] = _T('\0'); - - _tprintf(_T("\r%.79s"), szTxt); + if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) + { + _tprintf(_T("\r%*.*s"), -(csbi.dwSize.X - 1), csbi.dwSize.X - 1, szTxt); + } + else + { + _putts(szTxt); + } } static void

1 0

[hbelusca] 72922: [KD] - When enabling or disabling the kernel debugger and setting the KdDebuggerEnabled flag, also update the corresponding user-mode flag in SharedUserData->KdDebuggerEnabled. - ...
by hbelusca＠svn.reactos.org 06 Oct '16

06 Oct '16

Author: hbelusca Date: Thu Oct 6 19:01:33 2016 New Revision: 72922 URL: http://svn.reactos.org/svn/reactos?rev=72922&view=rev Log: [KD] - When enabling or disabling the kernel debugger and setting the KdDebuggerEnabled flag, also update the corresponding user-mode flag in SharedUserData->KdDebuggerEnabled. - Turn KdpGetMemorySizeInMBs into a INIT_FUNCTION. - Print kernel command line & ARC paths even in debug log file mode. [KD64] WinKD: Also print our nice ReactOS debug header (version, # of processors & memory MB, kernel command line and ARC paths). Modified: trunk/reactos/ntoskrnl/kd/kdinit.c trunk/reactos/ntoskrnl/kd/kdio.c trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/kd64/kdinit.c Modified: trunk/reactos/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdinit.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] Thu Oct 6 19:01:33 2016 @@ -118,8 +118,9 @@ KdpDebugMode.Gdb = TRUE; /* Enable Debugging */ + KdDebuggerNotPresent = FALSE; KdDebuggerEnabled = TRUE; - KdDebuggerNotPresent = FALSE; + SharedUserData->KdDebuggerEnabled = TRUE; WrapperInitRoutine = KdpGdbStubInit; } @@ -131,8 +132,9 @@ KdpDebugMode.Pice = TRUE; /* Enable Debugging */ + KdDebuggerNotPresent = FALSE; KdDebuggerEnabled = TRUE; - KdDebuggerNotPresent = FALSE; + SharedUserData->KdDebuggerEnabled = TRUE; } return p2; @@ -192,14 +194,17 @@ else if (strstr(CommandLine, "DEBUG")) { /* Enable the kernel debugger */ + KdDebuggerNotPresent = FALSE; KdDebuggerEnabled = TRUE; - KdDebuggerNotPresent = FALSE; #ifdef KDBG /* Get the KDBG Settings */ KdbpGetCommandLineSettings(LoaderBlock->LoadOptions); #endif } + /* Let user-mode know our state */ + SharedUserData->KdDebuggerEnabled = KdDebuggerEnabled; + /* Get the port and baud rate */ Port = strstr(CommandLine, "DEBUGPORT"); BaudRate = strstr(CommandLine, "BAUDRATE"); Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=729… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Thu Oct 6 19:01:33 2016 @@ -11,6 +11,7 @@ #include <ntoskrnl.h> #include <reactos/buildno.h> +#define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ @@ -53,9 +54,11 @@ * * Strongly inspired by: * mm\ARM3\mminit.c : MiScanMemoryDescriptors(...) + * + * See also: kd64\kdinit.c */ -SIZE_T -NTAPI +static SIZE_T +INIT_FUNCTION KdpGetMemorySizeInMBs(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { PLIST_ENTRY ListEntry; @@ -240,10 +243,15 @@ KeInitializeSpinLock(&KdpDebugLogSpinLock); /* Display separator + ReactOS version at start of the debug log */ - DPRINT1("---------------------------------------------------------------\n"); + DPRINT1("-----------------------------------------------------\n"); DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); MemSizeMBs = MmNumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; DPRINT1("%u System Processor [%u MB Memory]\n", KeNumberProcessors, MemSizeMBs); + DPRINT1("Command Line: %s\n", KeLoaderBlock->LoadOptions); + DPRINT1("ARC Paths: %s %s %s %s\n", KeLoaderBlock->ArcBootDeviceName, + KeLoaderBlock->NtHalPathName, + KeLoaderBlock->ArcHalDeviceName, + KeLoaderBlock->NtBootPathName); } else if (BootPhase == 2) { Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Thu Oct 6 19:01:33 2016 @@ -295,6 +295,7 @@ /* Disable the Debugger */ KdDebuggerEnabled = FALSE; + SharedUserData->KdDebuggerEnabled = FALSE; /* Lower the IRQL */ KeLowerIrql(OldIrql); @@ -319,6 +320,7 @@ /* Enable the Debugger */ KdDebuggerEnabled = TRUE; + SharedUserData->KdDebuggerEnabled = TRUE; /* Lower the IRQL */ KeLowerIrql(OldIrql); Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Thu Oct 6 19:01:33 2016 @@ -2013,7 +2013,7 @@ if (KdPreviouslyEnabled) { /* Reinitialize the Debugger */ - KdInitSystem(0, NULL) ; + KdInitSystem(0, NULL); KdpRestoreAllBreakpoints(); } } Modified: trunk/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] Thu Oct 6 19:01:33 2016 @@ -10,8 +10,60 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> +#include <reactos/buildno.h> #define NDEBUG #include <debug.h> + +/* UTILITY FUNCTIONS *********************************************************/ + +/* + * Get the total size of the memory before + * Mm is initialized, by counting the number + * of physical pages. Useful for debug logging. + * + * Strongly inspired by: + * mm\ARM3\mminit.c : MiScanMemoryDescriptors(...) + * + * See also: kd\kdio.c + */ +static SIZE_T +INIT_FUNCTION +KdpGetMemorySizeInMBs(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY ListEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Descriptor; + SIZE_T NumberOfPhysicalPages = 0; + + /* Loop the memory descriptors */ + for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + ListEntry != &LoaderBlock->MemoryDescriptorListHead; + ListEntry = ListEntry->Flink) + { + /* Get the descriptor */ + Descriptor = CONTAINING_RECORD(ListEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + + /* Check if this is invisible memory */ + if ((Descriptor->MemoryType == LoaderFirmwarePermanent) || + (Descriptor->MemoryType == LoaderSpecialMemory) || + (Descriptor->MemoryType == LoaderHALCachedMemory) || + (Descriptor->MemoryType == LoaderBBTMemory)) + { + /* Skip this descriptor */ + continue; + } + + /* Check if this is bad memory */ + if (Descriptor->MemoryType != LoaderBad) + { + /* Count this in the total of pages */ + NumberOfPhysicalPages += Descriptor->PageCount; + } + } + + return NumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; +} /* FUNCTIONS *****************************************************************/ @@ -80,6 +132,7 @@ PLIST_ENTRY NextEntry; ULONG i, j, Length; SIZE_T DebugOptionLength; + SIZE_T MemSizeMBs; CHAR NameBuffer[256]; PWCHAR Name; @@ -321,6 +374,20 @@ /* Let user-mode know that it's enabled as well */ SharedUserData->KdDebuggerEnabled = TRUE; + /* Display separator + ReactOS version at start of the debug log */ + DPRINT1("-----------------------------------------------------\n"); + DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); + MemSizeMBs = KdpGetMemorySizeInMBs(KeLoaderBlock); + DPRINT1("%u System Processor [%u MB Memory]\n", KeNumberProcessors, MemSizeMBs); + if (KeLoaderBlock) + { + DPRINT1("Command Line: %s\n", KeLoaderBlock->LoadOptions); + DPRINT1("ARC Paths: %s %s %s %s\n", KeLoaderBlock->ArcBootDeviceName, + KeLoaderBlock->NtHalPathName, + KeLoaderBlock->ArcHalDeviceName, + KeLoaderBlock->NtBootPathName); + } + /* Check if the debugger should be disabled initially */ if (DisableKdAfterInit) {

1 0

[akhaldi] 72921: [CONUTILS] Addendum to r72913. CORE-10504
by akhaldi＠svn.reactos.org 06 Oct '16

06 Oct '16

Author: akhaldi Date: Thu Oct 6 14:20:16 2016 New Revision: 72921 URL: http://svn.reactos.org/svn/reactos?rev=72921&view=rev Log: [CONUTILS] Addendum to r72913. CORE-10504 Modified: trunk/reactos/sdk/lib/conutils/CMakeLists.txt trunk/reactos/sdk/lib/conutils/conutils.c Modified: trunk/reactos/sdk/lib/conutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/CMakeList… ============================================================================== --- trunk/reactos/sdk/lib/conutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/conutils/CMakeLists.txt [iso-8859-1] Thu Oct 6 14:20:16 2016 @@ -1,8 +1,3 @@ - -## Temporary HACK before we cleanly support UNICODE functions -add_definitions(-DUNICODE -D_UNICODE) add_library(conutils conutils.c) -add_dependencies(conutils psdk) -target_link_libraries(conutils ${PSEH_LIB}) -# add_importlibs(conutils msvcrt kernel32) ## ntdll +add_dependencies(conutils xdk) Modified: trunk/reactos/sdk/lib/conutils/conutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/conutils.… ============================================================================== --- trunk/reactos/sdk/lib/conutils/conutils.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/conutils/conutils.c [iso-8859-1] Thu Oct 6 14:20:16 2016 @@ -18,27 +18,28 @@ /** NOTE: Experimental! Don't use USE_CRT yet because output to console is a bit broken **/ // #define USE_CRT +/* FIXME: Temporary HACK before we cleanly support UNICODE functions */ +#define UNICODE +#define _UNICODE + #include <stdlib.h> // limits.h // For MB_LEN_MAX #ifdef USE_CRT #include <fcntl.h> #include <io.h> -#endif /* defined(USE_CRT) */ +#endif /* USE_CRT */ #include <windef.h> #include <winbase.h> - #include <winnls.h> #include <winuser.h> // MAKEINTRESOURCEW, RT_STRING - #include <wincon.h> // Console APIs (only if kernel32 support included) - -#include "conutils.h" #include <strsafe.h> /* PSEH for SEH Support */ #include <pseh/pseh2.h> +#include "conutils.h" // #define RC_STRING_MAX_SIZE 4096 // #define MAX_BUFFER_SIZE 4096

1 0

[hbelusca] 72920: [RAPPS(_NEW)][SETUP]: Last russian translation fixes, by Kudratov Olimjon, amber, and Sergey Stopkin. CORE-11510 CORE-11636 #resolve #comment Fixed in r72920, thanks to you all!
by hbelusca＠svn.reactos.org 06 Oct '16

06 Oct '16

Author: hbelusca Date: Thu Oct 6 12:51:05 2016 New Revision: 72920 URL: http://svn.reactos.org/svn/reactos?rev=72920&view=rev Log: [RAPPS(_NEW)][SETUP]: Last russian translation fixes, by Kudratov Olimjon, amber, and Sergey Stopkin. CORE-11510 CORE-11636 #resolve #comment Fixed in r72920, thanks to you all! Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Thu Oct 6 12:51:05 2016 @@ -202,5 +202,5 @@ IDS_INTEG_CHECK_TITLE "ÐÑÐ¾Ð²ÐµÑÐºÐ° ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ..." IDS_INTEG_CHECK_FAIL "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¿ÑÐ¾ÑÐ»Ð¾ Ð¿ÑÐ¾Ð²ÐµÑÐºÑ ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð½Ð¾ Ð±ÑÐ»Ð¾ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ð¾ Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¼ÐµÐ½ÐµÐ½Ð¾. ÐÐ°Ð¿ÑÑÐº Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ." IDS_INTERRUPTED_DOWNLOAD "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð±ÑÐ»Ð° Ð¿ÑÐµÑÐ²Ð°Ð½Ð°. ÐÑÐ¾Ð²ÐµÑÑÑÐµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº ÑÐµÑÐ¸ ÐÐ½ÑÐµÑÐ½ÐµÑ." - IDS_UNABLE_TO_WRITE "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿Ð¸ÑÐ°ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð½Ð° Ð´Ð¸ÑÐº. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð¸ÑÐº Ð¿ÐµÑÐµÐ¿Ð¾Ð»Ð½ÐµÐ½." -END + IDS_UNABLE_TO_WRITE "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿Ð¸ÑÐ°ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð½Ð° Ð´Ð¸ÑÐº. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð½ÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑÐ° Ð½Ð° Ð´Ð¸ÑÐºÐµ." +END Modified: trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc [iso-8859-1] Thu Oct 6 12:51:05 2016 @@ -197,11 +197,11 @@ IDS_APP_REG_REMOVE "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð¾Ð± ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Ð¸Ð· ÑÐµÐµÑÑÑÐ°?" IDS_INFORMATION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" IDS_UNABLE_TO_DOWNLOAD "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐºÐ°ÑÐ°ÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ! ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð°Ð´ÑÐµÑ!" - IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Ð¸Ð· ÑÐµÐµÑÑÑÐ°!" IDS_CERT_DOES_NOT_MATCH "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ SSL ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ°." IDS_INTEG_CHECK_TITLE "ÐÑÐ¾Ð²ÐµÑÐºÐ° ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ..." IDS_INTEG_CHECK_FAIL "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¿ÑÐ¾ÑÐ»Ð¾ Ð¿ÑÐ¾Ð²ÐµÑÐºÑ ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð½Ð¾ Ð±ÑÐ»Ð¾ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ð¾ Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¼ÐµÐ½ÐµÐ½Ð¾. ÐÐ°Ð¿ÑÑÐº Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ." IDS_INTERRUPTED_DOWNLOAD "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð±ÑÐ»Ð° Ð¿ÑÐµÑÐ²Ð°Ð½Ð°. ÐÑÐ¾Ð²ÐµÑÑÑÐµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº ÑÐµÑÐ¸ ÐÐ½ÑÐµÑÐ½ÐµÑ." - IDS_UNABLE_TO_WRITE "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿Ð¸ÑÐ°ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð½Ð° Ð´Ð¸ÑÐº. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð¸ÑÐº Ð¿ÐµÑÐµÐ¿Ð¾Ð»Ð½ÐµÐ½." -END + IDS_UNABLE_TO_WRITE "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿Ð¸ÑÐ°ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð½Ð° Ð´Ð¸ÑÐº. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð½ÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑÐ° Ð½Ð° Ð´Ð¸ÑÐºÐµ." +END Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Thu Oct 6 12:51:05 2016 @@ -18,7 +18,7 @@ AUTORADIOBUTTON "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS", IDC_INSTALL, 7, 7, 277, 10 LTEXT "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð½Ð¾Ð²ÑÑ ÐºÐ¾Ð¿Ð¸Ñ ÑÐ¸ÑÑÐµÐ¼Ñ ReactOS. ÐÑÐ° Ð¾Ð¿ÑÐ¸Ñ ÐÐ ÑÐ¾ÑÑÐ°Ð½ÑÐµÑ ÑÐ°Ð¹Ð»Ñ, Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ Ð´Ð¸ÑÐºÐ¸ Ð¸ ÑÐ°Ð·Ð´ÐµÐ»Ñ.", IDC_INSTALLTEXT, 18, 18, 269, 25 AUTORADIOBUTTON "ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÐ¹ ÑÐ°Ð½ÐµÐµ ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ Ð¸Ð»Ð¸ Ð¿Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÑ ÐºÐ¾Ð¿Ð¸Ñ ÑÐ¸ÑÑÐµÐ¼Ñ ReactOS. ÐÑÐ° Ð¾Ð¿ÑÐ¸Ñ Ð¡ÐÐ¥Ð ÐÐÐ¯ÐÐ¢ ÑÐ°Ð¹Ð»Ñ, Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ. ÐÐ¾ÑÑÑÐ¿Ð½Ð¾ ÑÐ¾Ð»ÑÐºÐ¾ Ð¿ÑÐ¸ Ð½Ð°Ð»Ð¸ÑÐ¸Ð¸ ÑÐ¶Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¹ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ ReactOS.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ Ð¸Ð»Ð¸ Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÑ ÐºÐ¾Ð¿Ð¸Ñ ÑÐ¸ÑÑÐµÐ¼Ñ ReactOS. ÐÑÐ° Ð¾Ð¿ÑÐ¸Ñ Ð¡ÐÐ¥Ð ÐÐÐ¯ÐÐ¢ ÑÐ°Ð¹Ð»Ñ, Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ. ÐÐ¾ÑÑÑÐ¿Ð½Ð¾ ÑÐ¾Ð»ÑÐºÐ¾ Ð¿ÑÐ¸ Ð½Ð°Ð»Ð¸ÑÐ¸Ð¸ ÑÐ¶Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¹ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ ReactOS.", IDC_UPDATETEXT, 18, 61, 269, 30 LTEXT "ÐÐ»Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ ÑÑÑÑÐ¾Ð¹ÑÑÐ² Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ""ÐÐ°Ð»ÐµÐµ"".", IDC_STATIC, 7, 128, 297, 8 END @@ -70,7 +70,7 @@ CAPTION "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÐ°Ð·Ð¾Ð²ÑÐ¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 + CONTROL "ÐÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 EDITTEXT IDC_PATH, 10, 12, 283, 14, WS_VISIBLE CONTROL "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð³ÑÑÐ·ÑÐ¸ÐºÐ°", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 CONTROL "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð·Ð°Ð³ÑÑÐ·ÑÐ¸Ðº Ð½Ð° Ð´Ð¸ÑÐº (MBR Ð¸ VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 49, 278, 11 @@ -131,7 +131,7 @@ STRINGTABLE BEGIN - IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" - IDS_PARTITION_TYPE "Type" + IDS_PARTITION_NAME "ÐÐ¼Ñ" + IDS_PARTITION_SIZE "Ð Ð°Ð·Ð¼ÐµÑ" + IDS_PARTITION_TYPE "Ð¢Ð¸Ð¿" END

1 0

[hbelusca] 72919: [RAPPS_NEW]: Whitespace fix in taiwan chinese language.
by hbelusca＠svn.reactos.org 06 Oct '16

06 Oct '16

Author: hbelusca Date: Thu Oct 6 12:48:37 2016 New Revision: 72919 URL: http://svn.reactos.org/svn/reactos?rev=72919&view=rev Log: [RAPPS_NEW]: Whitespace fix in taiwan chinese language. Modified: trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc Modified: trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc [iso-8859-1] Thu Oct 6 12:48:37 2016 @@ -199,7 +199,7 @@ IDS_APP_REG_REMOVE "æ¨ç¢ºå®è¦å¾ç»éæªåªé¤è©²ç¨å¼çè³æåï¼" IDS_INFORMATION "è³è¨" IDS_UNABLE_TO_DOWNLOAD "ç¡æ³ä¸è¼å!æ¾ä¸å°çä½å!" - IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "ç¡æ³å¾ç»éæªåªé¤è©²ç¨å¼çè³æï¼" IDS_CERT_DOES_NOT_MATCH "SSL æèé©èå¤±æã" IDS_INTEG_CHECK_TITLE "é©èå¥è£è»é«çå®æ´æ§..."

1 0

[hbelusca] 72918: [RAPPS][RAPPS_NEW]: Try to not hardcode types of variables in sizeofs, and use _countof where possible.
by hbelusca＠svn.reactos.org 06 Oct '16

06 Oct '16

Author: hbelusca Date: Thu Oct 6 12:22:32 2016 New Revision: 72918 URL: http://svn.reactos.org/svn/reactos?rev=72918&view=rev Log: [RAPPS][RAPPS_NEW]: Try to not hardcode types of variables in sizeofs, and use _countof where possible. Modified: trunk/reactos/base/applications/rapps/installed.c trunk/reactos/base/applications/rapps/listview.c trunk/reactos/base/applications/rapps/loaddlg.c trunk/reactos/base/applications/rapps/misc.c trunk/reactos/base/applications/rapps/richedit.c trunk/reactos/base/applications/rapps/settingsdlg.c trunk/reactos/base/applications/rapps/splitter.c trunk/reactos/base/applications/rapps/toolbar.c trunk/reactos/base/applications/rapps/treeview.c trunk/reactos/base/applications/rapps/winmain.c trunk/reactos/base/applications/rapps_new/crichedit.h trunk/reactos/base/applications/rapps_new/gui.cpp trunk/reactos/base/applications/rapps_new/installed.cpp trunk/reactos/base/applications/rapps_new/loaddlg.cpp trunk/reactos/base/applications/rapps_new/misc.cpp trunk/reactos/base/applications/rapps_new/settingsdlg.cpp trunk/reactos/base/applications/rapps_new/splitter.cpp trunk/reactos/base/applications/rapps_new/winmain.cpp Modified: trunk/reactos/base/applications/rapps/installed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… ============================================================================== --- trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -104,10 +104,10 @@ ItemIndex = Index; } - ListView_GetItemText(hListView, ItemIndex, 0, szAppName, sizeof(szAppName) / sizeof(WCHAR)); + ListView_GetItemText(hListView, ItemIndex, 0, szAppName, _countof(szAppName)); WriteLogMessage(EVENTLOG_SUCCESS, MSG_SUCCESS_REMOVE, szAppName); - ZeroMemory(&Item, sizeof(LVITEM)); + ZeroMemory(&Item, sizeof(Item)); Item.mask = LVIF_PARAM; Item.iItem = ItemIndex; @@ -149,7 +149,7 @@ #define GET_INFO(a, b, c, d) \ if (GetApplicationString(Info->hSubKey, a, szInfo)) \ { \ - LoadStringW(hInst, b, szText, sizeof(szText) / sizeof(WCHAR)); \ + LoadStringW(hInst, b, szText, _countof(szText)); \ InsertRichEditText(szText, c); \ InsertRichEditText(szInfo, d); \ } \ @@ -190,8 +190,8 @@ Info = ListViewGetlParam(Index); if (!Info || !Info->hSubKey || (ItemIndex == -1)) return; - if (!LoadStringW(hInst, IDS_APP_REG_REMOVE, szMsgText, sizeof(szMsgText) / sizeof(WCHAR)) || - !LoadStringW(hInst, IDS_INFORMATION, szMsgTitle, sizeof(szMsgTitle) / sizeof(WCHAR))) + if (!LoadStringW(hInst, IDS_APP_REG_REMOVE, szMsgText, _countof(szMsgText)) || + !LoadStringW(hInst, IDS_INFORMATION, szMsgTitle, _countof(szMsgTitle))) return; if (MessageBoxW(hMainWnd, szMsgText, szMsgTitle, MB_YESNO | MB_ICONQUESTION) == IDYES) @@ -204,7 +204,7 @@ return; } - if (!LoadStringW(hInst, IDS_UNABLE_TO_REMOVE, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) + if (!LoadStringW(hInst, IDS_UNABLE_TO_REMOVE, szMsgText, _countof(szMsgText))) return; MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); Modified: trunk/reactos/base/applications/rapps/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/li… ============================================================================== --- trunk/reactos/base/applications/rapps/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/listview.c [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -28,7 +28,7 @@ ItemIndex = Index; } - ZeroMemory(&Item, sizeof(LVITEM)); + ZeroMemory(&Item, sizeof(Item)); Item.mask = LVIF_PARAM; Item.iItem = ItemIndex; @@ -43,7 +43,7 @@ { LV_COLUMN Column; - ZeroMemory(&Column, sizeof(LV_COLUMN)); + ZeroMemory(&Column, sizeof(Column)); Column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; Column.iSubItem = Index; @@ -59,7 +59,7 @@ { LV_ITEMW Item; - ZeroMemory(&Item, sizeof(LV_ITEM)); + ZeroMemory(&Item, sizeof(Item)); Item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; Item.pszText = lpText; @@ -82,11 +82,11 @@ IndexInfo.lParam = lParam1; Index = ListView_FindItem(hListView, -1, &IndexInfo); - ListView_GetItemText(hListView, Index, (INT)lParamSort, Item1, sizeof(Item1) / sizeof(WCHAR)); + ListView_GetItemText(hListView, Index, (INT)lParamSort, Item1, _countof(Item1)); IndexInfo.lParam = lParam2; Index = ListView_FindItem(hListView, -1, &IndexInfo); - ListView_GetItemText(hListView, Index, (INT)lParamSort, Item2, sizeof(Item2) / sizeof(WCHAR)); + ListView_GetItemText(hListView, Index, (INT)lParamSort, Item2, _countof(Item2)); if (bAscending) return wcscmp(Item2, Item1); Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -257,7 +257,7 @@ Ret = HttpSendRequestW(hRequest, L"", 0, NULL, 0); if (Ret) { - certInfoLength = sizeof(INTERNET_CERTIFICATE_INFOW); + certInfoLength = sizeof(certInfo); Ret = InternetQueryOptionW(hRequest, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, &certInfo, @@ -402,7 +402,7 @@ { WCHAR szMsgText[MAX_STR_LEN]; - if (!LoadStringW(hInst, IDS_UNABLE_TO_DOWNLOAD, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) + if (!LoadStringW(hInst, IDS_UNABLE_TO_DOWNLOAD, szMsgText, _countof(szMsgText))) goto end; MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); @@ -440,7 +440,7 @@ { WCHAR szMsgText[MAX_STR_LEN]; - if (!LoadStringW(hInst, IDS_CERT_DOES_NOT_MATCH, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) + if (!LoadStringW(hInst, IDS_CERT_DOES_NOT_MATCH, szMsgText, _countof(szMsgText))) goto end; MessageBoxW(Dlg, szMsgText, NULL, MB_OK | MB_ICONERROR); @@ -705,7 +705,7 @@ { APPLICATION_INFO IntInfo; - ZeroMemory(&IntInfo, sizeof(APPLICATION_INFO)); + ZeroMemory(&IntInfo, sizeof(IntInfo)); if (FAILED(StringCbCopyW(IntInfo.szUrlDownload, sizeof(IntInfo.szUrlDownload), lpUrl))) Modified: trunk/reactos/base/applications/rapps/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/mi… ============================================================================== --- trunk/reactos/base/applications/rapps/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/misc.c [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -55,7 +55,7 @@ DEVMODE pDevMode; INT ColorDepth; - pDevMode.dmSize = sizeof(DEVMODE); + pDevMode.dmSize = sizeof(pDevMode); pDevMode.dmDriverExtra = 0; if (!EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &pDevMode)) @@ -143,13 +143,13 @@ { WCHAR szText[MAX_STR_LEN*3]; - LoadStringW(hInst, IDS_WELCOME_TITLE, szText, sizeof(szText) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_WELCOME_TITLE, szText, _countof(szText)); NewRichEditText(szText, CFE_BOLD); - LoadStringW(hInst, IDS_WELCOME_TEXT, szText, sizeof(szText) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_WELCOME_TEXT, szText, _countof(szText)); InsertRichEditText(szText, 0); - LoadStringW(hInst, IDS_WELCOME_URL, szText, sizeof(szText) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_WELCOME_URL, szText, _countof(szText)); InsertRichEditText(szText, CFM_LINK); } @@ -272,7 +272,7 @@ pfnExtract = (void *) GetProcAddress(hCabinetDll, "Extract"); if (pfnExtract) { - ZeroMemory(&Dest, sizeof(SESSION)); + ZeroMemory(&Dest, sizeof(Dest)); WideCharToMultiByte(CP_ACP, 0, lpOutputPath, -1, Dest.Destination, MAX_PATH, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, lpCabName, -1, szCabName, MAX_PATH, NULL, NULL); @@ -315,7 +315,7 @@ return; } - if (!GetModuleFileName(NULL, szPath, sizeof(szPath) / sizeof(szPath[0]))) + if (!GetModuleFileNameW(NULL, szPath, _countof(szPath))) return; if (RegSetValueExW(hKey, Modified: trunk/reactos/base/applications/rapps/richedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ri… ============================================================================== --- trunk/reactos/base/applications/rapps/richedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/richedit.c [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -49,9 +49,9 @@ SendMessageW(hRichEdit, EM_SETSEL, Start, End); - ZeroMemory(&CharFormat, sizeof(CHARFORMAT2)); + ZeroMemory(&CharFormat, sizeof(CharFormat)); - CharFormat.cbSize = sizeof(CHARFORMAT2); + CharFormat.cbSize = sizeof(CharFormat); CharFormat.dwMask = dwEffects; CharFormat.dwEffects = dwEffects; Modified: trunk/reactos/base/applications/rapps/settingsdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/se… ============================================================================== --- trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -20,7 +20,7 @@ BROWSEINFO bi; WCHAR szPath[MAX_PATH], szBuf[MAX_STR_LEN]; - LoadStringW(hInst, IDS_CHOOSE_FOLDER_TEXT, szBuf, sizeof(szBuf) / sizeof(TCHAR)); + LoadStringW(hInst, IDS_CHOOSE_FOLDER_TEXT, szBuf, _countof(szBuf)); ZeroMemory(&bi, sizeof(bi)); bi.hwndOwner = hwnd; @@ -162,7 +162,7 @@ LoadStringW(hInst, IDS_CHOOSE_FOLDER_ERROR, - szMsgText, sizeof(szMsgText) / sizeof(WCHAR)); + szMsgText, _countof(szMsgText)); if (MessageBoxW(hDlg, szMsgText, NULL, MB_YESNO) == IDYES) { Modified: trunk/reactos/base/applications/rapps/splitter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/sp… ============================================================================== --- trunk/reactos/base/applications/rapps/splitter.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/splitter.c [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -123,7 +123,7 @@ WCHAR szWindowClass[] = L"HSplitterWindowClass"; WNDCLASSEXW WndClass = {0}; - WndClass.cbSize = sizeof(WNDCLASSEXW); + WndClass.cbSize = sizeof(WndClass); WndClass.lpszClassName = szWindowClass; WndClass.lpfnWndProc = HSplitterWindowProc; WndClass.hInstance = hInst; @@ -264,7 +264,7 @@ WCHAR szWindowClass[] = L"VSplitterWindowClass"; WNDCLASSEXW WndClass = {0}; - WndClass.cbSize = sizeof(WNDCLASSEXW); + WndClass.cbSize = sizeof(WndClass); WndClass.lpszClassName = szWindowClass; WndClass.lpfnWndProc = VSplitterWindowProc; WndClass.hInstance = hInst; Modified: trunk/reactos/base/applications/rapps/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/to… ============================================================================== --- trunk/reactos/base/applications/rapps/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/toolbar.c [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -137,7 +137,7 @@ SendMessageW(hSearchBar, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), 0); - LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, sizeof(szBuf) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, _countof(szBuf)); SetWindowTextW(hSearchBar, szBuf); SetParent(hSearchBar, hToolBar); @@ -148,12 +148,12 @@ BOOL CreateToolBar(HWND hwnd) { - INT NumButtons = sizeof(Buttons) / sizeof(Buttons[0]); + INT NumButtons = _countof(Buttons); HIMAGELIST hImageList; - LoadStringW(hInst, IDS_INSTALL, szInstallBtn, sizeof(szInstallBtn) / sizeof(WCHAR)); - LoadStringW(hInst, IDS_UNINSTALL, szUninstallBtn, sizeof(szUninstallBtn) / sizeof(WCHAR)); - LoadStringW(hInst, IDS_MODIFY, szModifyBtn, sizeof(szModifyBtn) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_INSTALL, szInstallBtn, _countof(szInstallBtn)); + LoadStringW(hInst, IDS_UNINSTALL, szUninstallBtn, _countof(szUninstallBtn)); + LoadStringW(hInst, IDS_MODIFY, szModifyBtn, _countof(szModifyBtn)); hToolBar = CreateWindowExW(0, TOOLBARCLASSNAMEW, Modified: trunk/reactos/base/applications/rapps/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/tr… ============================================================================== --- trunk/reactos/base/applications/rapps/treeview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/treeview.c [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -15,7 +15,7 @@ { TV_INSERTSTRUCTW Insert; - ZeroMemory(&Insert, sizeof(TV_INSERTSTRUCT)); + ZeroMemory(&Insert, sizeof(Insert)); Insert.item.mask = TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; Insert.hInsertAfter = TVI_LAST; Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -61,7 +61,7 @@ if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - dwSize = sizeof(SETTINGS_INFO); + dwSize = sizeof(SettingsInfo); if (RegQueryValueExW(hKey, L"Settings", NULL, NULL, (LPBYTE)&SettingsInfo, &dwSize) == ERROR_SUCCESS) { RegCloseKey(hKey); @@ -82,7 +82,7 @@ if (SettingsInfo.bSaveWndPos) { - wp.length = sizeof(WINDOWPLACEMENT); + wp.length = sizeof(wp); GetWindowPlacement(hwnd, &wp); SettingsInfo.Left = wp.rcNormalPosition.left; @@ -95,7 +95,7 @@ if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) { - RegSetValueExW(hKey, L"Settings", 0, REG_BINARY, (LPBYTE)&SettingsInfo, sizeof(SETTINGS_INFO)); + RegSetValueExW(hKey, L"Settings", 0, REG_BINARY, (LPBYTE)&SettingsInfo, sizeof(SettingsInfo)); RegCloseKey(hKey); } } @@ -943,7 +943,7 @@ InitCommonControls(); /* Create the window */ - WndClass.cbSize = sizeof(WNDCLASSEXW); + WndClass.cbSize = sizeof(WndClass); WndClass.lpszClassName = szWindowClass; WndClass.lpfnWndProc = MainWindowProc; WndClass.hInstance = hInstance; Modified: trunk/reactos/base/applications/rapps_new/crichedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/crichedit.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/crichedit.h [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -10,9 +10,9 @@ SendMessageW(EM_SETSEL, Start, End); - ZeroMemory(&CharFormat, sizeof(CHARFORMAT2)); + ZeroMemory(&CharFormat, sizeof(CharFormat)); - CharFormat.cbSize = sizeof(CHARFORMAT2); + CharFormat.cbSize = sizeof(CharFormat); CharFormat.dwMask = dwEffects; CharFormat.dwEffects = dwEffects; Modified: trunk/reactos/base/applications/rapps_new/gui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/gui.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/gui.cpp [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -129,12 +129,12 @@ { 6, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 } }; - INT NumButtons = sizeof(Buttons) / sizeof(Buttons[0]); + INT NumButtons = _countof(Buttons); HIMAGELIST hImageList; - LoadStringW(hInst, IDS_INSTALL, szInstallBtn, sizeof(szInstallBtn) / sizeof(WCHAR)); - LoadStringW(hInst, IDS_UNINSTALL, szUninstallBtn, sizeof(szUninstallBtn) / sizeof(WCHAR)); - LoadStringW(hInst, IDS_MODIFY, szModifyBtn, sizeof(szModifyBtn) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_INSTALL, szInstallBtn, _countof(szInstallBtn)); + LoadStringW(hInst, IDS_UNINSTALL, szUninstallBtn, _countof(szUninstallBtn)); + LoadStringW(hInst, IDS_MODIFY, szModifyBtn, _countof(szModifyBtn)); m_hWnd = CreateWindowExW(0, TOOLBARCLASSNAMEW, @@ -213,7 +213,7 @@ ItemIndex = Index; } - ZeroMemory(&Item, sizeof(LVITEM)); + ZeroMemory(&Item, sizeof(Item)); Item.mask = LVIF_PARAM; Item.iItem = ItemIndex; @@ -227,7 +227,7 @@ { LV_COLUMN Column; - ZeroMemory(&Column, sizeof(LV_COLUMN)); + ZeroMemory(&Column, sizeof(Column)); Column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; Column.iSubItem = Index; @@ -242,7 +242,7 @@ { LV_ITEMW Item; - ZeroMemory(&Item, sizeof(LV_ITEM)); + ZeroMemory(&Item, sizeof(Item)); Item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; Item.pszText = lpText; @@ -269,11 +269,11 @@ IndexInfo.lParam = lParam1; Index = FindItem(-1, &IndexInfo); - GetItemText(Index, iSubItem, Item1, sizeof(Item1) / sizeof(WCHAR)); + GetItemText(Index, iSubItem, Item1, _countof(Item1)); IndexInfo.lParam = lParam2; Index = FindItem(-1, &IndexInfo); - GetItemText(Index, iSubItem, Item2, sizeof(Item2) / sizeof(WCHAR)); + GetItemText(Index, iSubItem, Item2, _countof(Item2)); if (bAscending) return wcscmp(Item2, Item1); @@ -510,7 +510,7 @@ m_SearchBar->SendMessageW(WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); - LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, sizeof(szBuf) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, _countof(szBuf)); m_SearchBar->SetWindowTextW(szBuf); return hwnd != NULL; Modified: trunk/reactos/base/applications/rapps_new/installed.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/installed.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/installed.cpp [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -104,10 +104,10 @@ ItemIndex = Index; } - ListView_GetItemText(hListView, ItemIndex, 0, szAppName, sizeof(szAppName) / sizeof(WCHAR)); + ListView_GetItemText(hListView, ItemIndex, 0, szAppName, _countof(szAppName)); WriteLogMessage(EVENTLOG_SUCCESS, MSG_SUCCESS_REMOVE, szAppName); - ZeroMemory(&Item, sizeof(LVITEM)); + ZeroMemory(&Item, sizeof(Item)); Item.mask = LVIF_PARAM; Item.iItem = ItemIndex; @@ -149,7 +149,7 @@ #define GET_INFO(a, b, c, d) \ if (GetApplicationString(Info->hSubKey, a, szInfo)) \ { \ - LoadStringW(hInst, b, szText, sizeof(szText) / sizeof(WCHAR)); \ + LoadStringW(hInst, b, szText, _countof(szText)); \ InsertRichEditText(szText, c); \ InsertRichEditText(szInfo, d); \ } \ @@ -190,8 +190,8 @@ Info = (PINSTALLED_INFO) ListViewGetlParam(Index); if (!Info || !Info->hSubKey || (ItemIndex == -1)) return; - if (!LoadStringW(hInst, IDS_APP_REG_REMOVE, szMsgText, sizeof(szMsgText) / sizeof(WCHAR)) || - !LoadStringW(hInst, IDS_INFORMATION, szMsgTitle, sizeof(szMsgTitle) / sizeof(WCHAR))) + if (!LoadStringW(hInst, IDS_APP_REG_REMOVE, szMsgText, _countof(szMsgText)) || + !LoadStringW(hInst, IDS_INFORMATION, szMsgTitle, _countof(szMsgTitle))) return; if (MessageBoxW(hMainWnd, szMsgText, szMsgTitle, MB_YESNO | MB_ICONQUESTION) == IDYES) @@ -204,7 +204,7 @@ return; } - if (!LoadStringW(hInst, IDS_UNABLE_TO_REMOVE, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) + if (!LoadStringW(hInst, IDS_UNABLE_TO_REMOVE, szMsgText, _countof(szMsgText))) return; MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); Modified: trunk/reactos/base/applications/rapps_new/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/loaddlg.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/loaddlg.cpp [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -212,7 +212,7 @@ Ret = HttpSendRequestW(hRequest, L"", 0, NULL, 0); if (Ret) { - certInfoLength = sizeof(INTERNET_CERTIFICATE_INFOW); + certInfoLength = sizeof(certInfo); Ret = InternetQueryOptionW(hRequest, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, &certInfo, @@ -351,7 +351,7 @@ { WCHAR szMsgText[MAX_STR_LEN]; - if (!LoadStringW(hInst, IDS_UNABLE_TO_DOWNLOAD2, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) + if (!LoadStringW(hInst, IDS_UNABLE_TO_DOWNLOAD2, szMsgText, _countof(szMsgText))) goto end; MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); @@ -365,7 +365,7 @@ { WCHAR szMsgText[MAX_STR_LEN]; - if (!LoadStringW(hInst, IDS_UNABLE_TO_DOWNLOAD, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) + if (!LoadStringW(hInst, IDS_UNABLE_TO_DOWNLOAD, szMsgText, _countof(szMsgText))) goto end; MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); @@ -403,7 +403,7 @@ { WCHAR szMsgText[MAX_STR_LEN]; - if (!LoadStringW(hInst, IDS_CERT_DOES_NOT_MATCH, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) + if (!LoadStringW(hInst, IDS_CERT_DOES_NOT_MATCH, szMsgText, _countof(szMsgText))) goto end; MessageBoxW(Dlg, szMsgText, NULL, MB_OK | MB_ICONERROR); @@ -664,7 +664,7 @@ { APPLICATION_INFO IntInfo; - ZeroMemory(&IntInfo, sizeof(APPLICATION_INFO)); + ZeroMemory(&IntInfo, sizeof(IntInfo)); if (FAILED(StringCbCopyW(IntInfo.szUrlDownload, sizeof(IntInfo.szUrlDownload), lpUrl))) Modified: trunk/reactos/base/applications/rapps_new/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/misc.cpp [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -55,7 +55,7 @@ DEVMODE pDevMode; INT ColorDepth; - pDevMode.dmSize = sizeof(DEVMODE); + pDevMode.dmSize = sizeof(pDevMode); pDevMode.dmDriverExtra = 0; if (!EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &pDevMode)) @@ -143,13 +143,13 @@ { WCHAR szText[MAX_STR_LEN*3]; - LoadStringW(hInst, IDS_WELCOME_TITLE, szText, sizeof(szText) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_WELCOME_TITLE, szText, _countof(szText)); NewRichEditText(szText, CFE_BOLD); - LoadStringW(hInst, IDS_WELCOME_TEXT, szText, sizeof(szText) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_WELCOME_TEXT, szText, _countof(szText)); InsertRichEditText(szText, 0); - LoadStringW(hInst, IDS_WELCOME_URL, szText, sizeof(szText) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_WELCOME_URL, szText, _countof(szText)); InsertRichEditText(szText, CFM_LINK); } @@ -272,7 +272,7 @@ pfnExtract = (fnExtract) GetProcAddress(hCabinetDll, "Extract"); if (pfnExtract) { - ZeroMemory(&Dest, sizeof(SESSION)); + ZeroMemory(&Dest, sizeof(Dest)); WideCharToMultiByte(CP_ACP, 0, lpOutputPath, -1, Dest.Destination, MAX_PATH, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, lpCabName, -1, szCabName, MAX_PATH, NULL, NULL); @@ -315,7 +315,7 @@ return; } - if (!GetModuleFileName(NULL, szPath, sizeof(szPath) / sizeof(szPath[0]))) + if (!GetModuleFileNameW(NULL, szPath, _countof(szPath))) return; if (RegSetValueExW(hKey, Modified: trunk/reactos/base/applications/rapps_new/settingsdlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/settingsdlg.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/settingsdlg.cpp [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -20,7 +20,7 @@ BROWSEINFO bi; WCHAR szPath[MAX_PATH], szBuf[MAX_STR_LEN]; - LoadStringW(hInst, IDS_CHOOSE_FOLDER_TEXT, szBuf, sizeof(szBuf) / sizeof(TCHAR)); + LoadStringW(hInst, IDS_CHOOSE_FOLDER_TEXT, szBuf, _countof(szBuf)); ZeroMemory(&bi, sizeof(bi)); bi.hwndOwner = hwnd; @@ -162,7 +162,7 @@ LoadStringW(hInst, IDS_CHOOSE_FOLDER_ERROR, - szMsgText, sizeof(szMsgText) / sizeof(WCHAR)); + szMsgText, _countof(szMsgText)); if (MessageBoxW(hDlg, szMsgText, NULL, MB_YESNO) == IDYES) { Modified: trunk/reactos/base/applications/rapps_new/splitter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/splitter.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/splitter.cpp [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -123,7 +123,7 @@ WCHAR szWindowClass[] = L"HSplitterWindowClass"; WNDCLASSEXW WndClass = {0}; - WndClass.cbSize = sizeof(WNDCLASSEXW); + WndClass.cbSize = sizeof(WndClass); WndClass.lpszClassName = szWindowClass; WndClass.lpfnWndProc = HSplitterWindowProc; WndClass.hInstance = hInst; @@ -264,7 +264,7 @@ WCHAR szWindowClass[] = L"VSplitterWindowClass"; WNDCLASSEXW WndClass = {0}; - WndClass.cbSize = sizeof(WNDCLASSEXW); + WndClass.cbSize = sizeof(WndClass); WndClass.lpszClassName = szWindowClass; WndClass.lpfnWndProc = VSplitterWindowProc; WndClass.hInstance = hInst; Modified: trunk/reactos/base/applications/rapps_new/winmain.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/winmain.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/winmain.cpp [iso-8859-1] Thu Oct 6 12:22:32 2016 @@ -78,7 +78,7 @@ if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - dwSize = sizeof(SETTINGS_INFO); + dwSize = sizeof(SettingsInfo); if (RegQueryValueExW(hKey, L"Settings", NULL, NULL, (LPBYTE)&SettingsInfo, &dwSize) == ERROR_SUCCESS) { RegCloseKey(hKey); @@ -99,7 +99,7 @@ if (SettingsInfo.bSaveWndPos) { - wp.length = sizeof(WINDOWPLACEMENT); + wp.length = sizeof(wp); GetWindowPlacement(hwnd, &wp); SettingsInfo.Left = wp.rcNormalPosition.left; @@ -112,7 +112,7 @@ if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) { - RegSetValueExW(hKey, L"Settings", 0, REG_BINARY, (LPBYTE)&SettingsInfo, sizeof(SETTINGS_INFO)); + RegSetValueExW(hKey, L"Settings", 0, REG_BINARY, (LPBYTE)&SettingsInfo, sizeof(SettingsInfo)); RegCloseKey(hKey); } }

1 0

[akhaldi] 72917: [WS2_32_WINETEST] Sync with Wine Staging 1.9.20.
by akhaldi＠svn.reactos.org 06 Oct '16

06 Oct '16

Author: akhaldi Date: Thu Oct 6 11:15:59 2016 New Revision: 72917 URL: http://svn.reactos.org/svn/reactos?rev=72917&view=rev Log: [WS2_32_WINETEST] Sync with Wine Staging 1.9.20. Modified: trunk/rostests/winetests/ws2_32/sock.c Modified: trunk/rostests/winetests/ws2_32/sock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/sock.c?r… ============================================================================== --- trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] Thu Oct 6 11:15:59 2016 @@ -4079,7 +4079,7 @@ int ret; SOCKET server_socket, accepted = INVALID_SOCKET, connector; struct sockaddr_in address; - SOCKADDR_STORAGE ss; + SOCKADDR_STORAGE ss, ss_empty; int socklen; select_thread_params thread_params; HANDLE thread_handle = NULL; @@ -4210,6 +4210,19 @@ ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); ok(socklen != sizeof(ss), "unexpected length\n"); ok(ss.ss_family, "family not set\n"); + closesocket(accepted); + closesocket(connector); + accepted = connector = INVALID_SOCKET; + + socklen = sizeof(address); + connector = setup_connector_socket(&address, socklen, FALSE); + if (connector == INVALID_SOCKET) goto done; + + memset(&ss, 0, sizeof(ss)); + memset(&ss_empty, 0, sizeof(ss_empty)); + accepted = accept(server_socket, (struct sockaddr *)&ss, NULL); + ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); + ok(!memcmp(&ss, &ss_empty, sizeof(ss)), "structure is different\n"); done: if (accepted != INVALID_SOCKET) @@ -6698,7 +6711,6 @@ POLL_SET(fdWrite, POLLIN); ret = pWSAPoll(fds, ix, poll_timeout); ok(ret == 1, "expected 1, got %d\n", ret); -todo_wine ok(POLL_ISSET(fdWrite, POLLHUP), "fdWrite socket events incorrect\n"); ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0); ok(ret == 0, "expected 0, got %d\n", ret); @@ -6763,7 +6775,6 @@ POLL_SET(fdWrite, POLLIN); ret = pWSAPoll(fds, ix, poll_timeout); ok(ret == 1, "expected 1, got %d\n", ret); -todo_wine ok(POLL_ISSET(fdWrite, POLLNVAL), "fdWrite socket events incorrect\n"); WaitForSingleObject (thread_handle, 1000); closesocket(fdRead); @@ -8385,16 +8396,11 @@ struct in_addr net_address; WSAOVERLAPPED overlapped; struct hostent *h; - DWORD num_bytes; - SOCKET sock; + DWORD num_bytes, error, tick; + SOCKET sock, sock2, sock3; + WSAEVENT event2, event3; int acount; int ret; - - if (!winetest_interactive) - { - skip("Cannot test SIO_ADDRESS_LIST_CHANGE, interactive tests must be enabled\n"); - return; - } /* Use gethostbyname to find the list of local network interfaces */ h = gethostbyname(""); @@ -8410,40 +8416,188 @@ skip("Cannot test SIO_ADDRESS_LIST_CHANGE, test requires a network card.\n"); return; } + net_address.s_addr = *(ULONG *) h->h_addr_list[0]; + + sock = socket(AF_INET, 0, IPPROTO_TCP); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_addr.s_addr = net_address.s_addr; + SetLastError(0xdeadbeef); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok (!ret, "bind() failed with error %d\n", GetLastError()); + set_blocking(sock, FALSE); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); +todo_wine + ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); + + CloseHandle(overlapped.hEvent); + closesocket(sock); + + sock = socket(AF_INET, 0, IPPROTO_TCP); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + SetLastError(0xdeadbeef); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok (!ret, "bind() failed with error %d\n", GetLastError()); + set_blocking(sock, TRUE); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); + ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); + + CloseHandle(overlapped.hEvent); + closesocket(sock); + + sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + SetLastError(0xdeadbeef); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok (!ret, "bind() failed with error %d\n", GetLastError()); + set_blocking(sock, FALSE); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); +todo_wine + ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); + + CloseHandle(overlapped.hEvent); + closesocket(sock); + + sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + SetLastError(0xdeadbeef); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok (!ret, "bind() failed with error %d\n", GetLastError()); + set_blocking(sock, TRUE); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); + ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); + + CloseHandle(overlapped.hEvent); + closesocket(sock); + + /* When the socket is overlapped non-blocking and the list change is requested without + * an overlapped structure the error will be different. */ + sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + SetLastError(0xdeadbeef); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok (!ret, "bind() failed with error %d\n", GetLastError()); + set_blocking(sock, FALSE); + + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, NULL, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); + ok (error == WSAEWOULDBLOCK, "expected 10035, got %d\n", error); + + closesocket(sock); + + /* Misuse of the API by using a blocking socket and not using an overlapped structure, + * this leads to a hang forever. */ + if (0) + { + sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + + SetLastError(0xdeadbeef); + bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + + set_blocking(sock, TRUE); + WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, NULL, NULL); + /* hang */ + + closesocket(sock); + } + + if (!winetest_interactive) + { + skip("Cannot test SIO_ADDRESS_LIST_CHANGE, interactive tests must be enabled\n"); + return; + } /* Bind an overlapped socket to the first found network interface */ sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); ok(sock != INVALID_SOCKET, "Expected socket to return a valid socket\n"); - if (sock == INVALID_SOCKET) - { - skip("Cannot test SIO_ADDRESS_LIST_CHANGE, socket creation failed with %u\n", - WSAGetLastError()); - return; - } - memset(&bindAddress, 0, sizeof(bindAddress)); - bindAddress.sin_family = AF_INET; - bindAddress.sin_addr.s_addr = net_address.s_addr; + sock2 = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(sock2 != INVALID_SOCKET, "Expected socket to return a valid socket\n"); + sock3 = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(sock3 != INVALID_SOCKET, "Expected socket to return a valid socket\n"); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (ret != 0) - { - skip("Cannot test SIO_ADDRESS_LIST_CHANGE, failed to bind, error %u\n", WSAGetLastError()); - goto end; - } + ok(!ret, "bind failed unexpectedly\n"); + ret = bind(sock2, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok(!ret, "bind failed unexpectedly\n"); + ret = bind(sock3, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok(!ret, "bind failed unexpectedly\n"); + + set_blocking(sock2, FALSE); + set_blocking(sock3, FALSE); /* Wait for address changes, request that the user connects/disconnects an interface */ memset(&overlapped, 0, sizeof(overlapped)); overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); - ok(WSAGetLastError() == WSA_IO_PENDING, "Expected pending last error %d\n", WSAGetLastError()); + ok(WSAGetLastError() == WSA_IO_PENDING, "Expected pending last error, got %d\n", WSAGetLastError()); + + ret = WSAIoctl(sock2, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "Expected would block last error, got %d\n", WSAGetLastError()); + + event2 = WSACreateEvent(); + event3 = WSACreateEvent(); + ret = WSAEventSelect (sock2, event2, FD_ADDRESS_LIST_CHANGE); + ok(!ret, "WSAEventSelect failed with %d\n", WSAGetLastError()); + /* sock3 did not request SIO_ADDRESS_LIST_CHANGE but it is trying to wait anyway */ + ret = WSAEventSelect (sock3, event3, FD_ADDRESS_LIST_CHANGE); + ok(!ret, "WSAEventSelect failed with %d\n", WSAGetLastError()); + trace("Testing socket-based ipv4 address list change notification. Please connect/disconnect or" - " change the ipv4 address of any of the local network interfaces (10 second timeout).\n"); - ret = WaitForSingleObject(overlapped.hEvent, 10000); + " change the ipv4 address of any of the local network interfaces (15 second timeout).\n"); + tick = GetTickCount(); + ret = WaitForSingleObject(overlapped.hEvent, 15000); ok(ret == WAIT_OBJECT_0, "failed to get overlapped event %u\n", ret); -end: + ret = WaitForSingleObject(event2, 500); +todo_wine + ok(ret == WAIT_OBJECT_0, "failed to get change event %u\n", ret); + + ret = WaitForSingleObject(event3, 500); + ok(ret == WAIT_TIMEOUT, "unexpected change event\n"); + + trace("Spent %d ms waiting.\n", GetTickCount() - tick); + + WSACloseEvent(event2); + WSACloseEvent(event3); + closesocket(sock); + closesocket(sock2); + closesocket(sock3); } static void test_synchronous_WSAIoctl(void) @@ -9287,7 +9441,6 @@ CloseHandle(previous_port); } -/* WSHIoctl is not supported by wshtcpip.dll and crashes. Test should be fixed also! */ static void test_address_list_query(void) { SOCKET_ADDRESS_LIST *address_list;

1 0

[tfaber] 72916: [SYSSETUP] - Install the DHCP client service as part of nettcpip.inf. This ensures it does not try to run before tcpip is installed. CORE-12011 #resolve
by tfaber＠svn.reactos.org 06 Oct '16

06 Oct '16

Author: tfaber Date: Thu Oct 6 10:57:29 2016 New Revision: 72916 URL: http://svn.reactos.org/svn/reactos?rev=72916&view=rev Log: [SYSSETUP] - Install the DHCP client service as part of nettcpip.inf. This ensures it does not try to run before tcpip is installed. CORE-12011 #resolve Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/media/inf/nettcpip.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Thu Oct 6 10:57:29 2016 @@ -1470,17 +1470,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ImagePath",0x00020000,"system32\drivers\debugout.sys" HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Type",0x00010001,0x00000001 - -; DHCP client service -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","DisplayName",0x00000000,"DHCP Client" -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000,"Attempts to obtain network settings automatically from an available DHCP server" -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Group",0x00000000,"TDI" -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Start",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Type",0x00010001,0x00000020 -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dhcpcsvc.dll" ; EMS Serial Administration Console Driver HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","ErrorControl",0x00010001,0x00000000 Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu Oct 6 10:57:29 2016 @@ -834,6 +834,7 @@ { /* Start the TCP/IP protocol driver */ SetupStartService(L"Tcpip", FALSE); + SetupStartService(L"Dhcp", FALSE); } if (!CommonInstall()) @@ -1148,6 +1149,7 @@ { /* Start the TCP/IP protocol driver */ SetupStartService(L"Tcpip", FALSE); + SetupStartService(L"Dhcp", FALSE); } Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… ============================================================================== --- trunk/reactos/media/inf/nettcpip.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/nettcpip.inf [iso-8859-1] Thu Oct 6 10:57:29 2016 @@ -234,6 +234,7 @@ [MS_TCPIP.PrimaryInstall.Services] AddService = Tcpip, , tcpip_Service_Inst +AddService = DHCP, , dhcp_Service_Inst [tcpip_Service_Inst] ServiceType = 1 @@ -254,6 +255,20 @@ HKR,"Parameters","EnableSecurityFilters",0x00010001,0x00000000 ;HKR,"Parameters","PersistentRoutes",,0x00000010 +[dhcp_Service_Inst] +DisplayName = "DHCP Client" +Description = "Attempts to obtain network settings automatically from an available DHCP server" +ServiceType = 0x20 +StartType = 2 +ErrorControl = 1 +ServiceBinary = "%11%\svchost.exe -k netsvcs" +LoadOrderGroup = TDI +AddReg=dhcp_AddReg + +[dhcp_AddReg] +HKR,,"ObjectName",0x00000000,"LocalSystem" +HKR,"Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dhcpcsvc.dll" + ;-------------------------------- STRINGS ------------------------------- [Strings]

1 0

[dreimer] 72915: [INF] Update Root CAs removing "Juur-SK", "EBG Elektronik Sertifika Hizmet Saglayicisi" and "IGC/A"
by dreimer＠svn.reactos.org 05 Oct '16

05 Oct '16

Author: dreimer Date: Wed Oct 5 22:53:24 2016 New Revision: 72915 URL: http://svn.reactos.org/svn/reactos?rev=72915&view=rev Log: [INF] Update Root CAs removing "Juur-SK", "EBG Elektronik Sertifika Hizmet Saglayicisi" and "IGC/A" 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] Wed Oct 5 22:53:24 2016 @@ -1,7 +1,7 @@ ; Automatically-generated list of fresh Root CA certificates ; with the data coming from Mozilla's NSS library. ; -- -; Created on 2016-08-18T12:04:05Z UTC with swyter's script. +; Created on 2016-10-05T22:47:42Z UTC with swyter's script. ; Data licensed under MPL 2.0 <https://mozilla.org/MPL/2.0/> [Version] @@ -6799,91 +6799,6 @@ 0x9F,0x53,0xD8,0x43,0x0E,0x5D,0xD6,0x63,0x82,0x71,0x1D,0x80,0x74,0xCA,0xF6,0xE2,\ 0x02,0x6B,0xD9,0x5A -; "Juur-SK" (1258 bytes) -HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\409D4BD917B55C27B69B64CB9822440DCD09B889","Blob",0x00000001,\ - 0x20,0x00,0x00,0x00,\ - 0x01,0x00,0x00,0x00,\ - 0xEA,0x04,0x00,0x00,\ - 0x30,0x82,0x04,0xE6,0x30,0x82,0x03,0xCE,0xA0,0x03,0x02,0x01,0x02,0x02,0x04,0x3B,\ - 0x8E,0x4B,0xFC,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,\ - 0x05,0x00,0x30,0x5D,0x31,0x18,0x30,0x16,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,\ - 0x01,0x09,0x01,0x16,0x09,0x70,0x6B,0x69,0x40,0x73,0x6B,0x2E,0x65,0x65,0x31,0x0B,\ - 0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x45,0x45,0x31,0x22,0x30,0x20,0x06,\ - 0x03,0x55,0x04,0x0A,0x13,0x19,0x41,0x53,0x20,0x53,0x65,0x72,0x74,0x69,0x66,0x69,\ - 0x74,0x73,0x65,0x65,0x72,0x69,0x6D,0x69,0x73,0x6B,0x65,0x73,0x6B,0x75,0x73,0x31,\ - 0x10,0x30,0x0E,0x06,0x03,0x55,0x04,0x03,0x13,0x07,0x4A,0x75,0x75,0x72,0x2D,0x53,\ - 0x4B,0x30,0x1E,0x17,0x0D,0x30,0x31,0x30,0x38,0x33,0x30,0x31,0x34,0x32,0x33,0x30,\ - 0x31,0x5A,0x17,0x0D,0x31,0x36,0x30,0x38,0x32,0x36,0x31,0x34,0x32,0x33,0x30,0x31,\ - 0x5A,0x30,0x5D,0x31,0x18,0x30,0x16,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,\ - 0x09,0x01,0x16,0x09,0x70,0x6B,0x69,0x40,0x73,0x6B,0x2E,0x65,0x65,0x31,0x0B,0x30,\ - 0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x45,0x45,0x31,0x22,0x30,0x20,0x06,0x03,\ - 0x55,0x04,0x0A,0x13,0x19,0x41,0x53,0x20,0x53,0x65,0x72,0x74,0x69,0x66,0x69,0x74,\ - 0x73,0x65,0x65,0x72,0x69,0x6D,0x69,0x73,0x6B,0x65,0x73,0x6B,0x75,0x73,0x31,0x10,\ - 0x30,0x0E,0x06,0x03,0x55,0x04,0x03,0x13,0x07,0x4A,0x75,0x75,0x72,0x2D,0x53,0x4B,\ - 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,0x81,0x71,0x36,0x3E,0x33,0x07,0xD6,0xE3,0x30,0x8D,0x13,0x7E,0x77,0x32,0x46,\ - 0xCB,0xCF,0x19,0xB2,0x60,0x31,0x46,0x97,0x86,0xF4,0x98,0x46,0xA4,0xC2,0x65,0x45,\ - 0xCF,0xD3,0x40,0x7C,0xE3,0x5A,0x22,0xA8,0x10,0x78,0x33,0xCC,0x88,0xB1,0xD3,0x81,\ - 0x4A,0xF6,0x62,0x17,0x7B,0x5F,0x4D,0x0A,0x2E,0xD0,0xCF,0x8B,0x23,0xEE,0x4F,0x02,\ - 0x4E,0xBB,0xEB,0x0E,0xCA,0xBD,0x18,0x63,0xE8,0x80,0x1C,0x8D,0xE1,0x1C,0x8D,0x3D,\ - 0xE0,0xFF,0x5B,0x5F,0xEA,0x64,0xE5,0x97,0xE8,0x3F,0x99,0x7F,0x0C,0x0A,0x09,0x33,\ - 0x00,0x1A,0x53,0xA7,0x21,0xE1,0x38,0x4B,0xD6,0x83,0x1B,0xAD,0xAF,0x64,0xC2,0xF9,\ - 0x1C,0x7A,0x8C,0x66,0x48,0x4D,0x66,0x1F,0x18,0x0A,0xE2,0x3E,0xBB,0x1F,0x07,0x65,\ - 0x93,0x85,0xB9,0x1A,0xB0,0xB9,0xC4,0xFB,0x0D,0x11,0xF6,0xF5,0xD6,0xF9,0x1B,0xC7,\ - 0x2C,0x2B,0xB7,0x18,0x51,0xFE,0xE0,0x7B,0xF6,0xA8,0x48,0xAF,0x6C,0x3B,0x4F,0x2F,\ - 0xEF,0xF8,0xD1,0x47,0x1E,0x26,0x57,0xF0,0x51,0x1D,0x33,0x96,0xFF,0xEF,0x59,0x3D,\ - 0xDA,0x4D,0xD1,0x15,0x34,0xC7,0xEA,0x3F,0x16,0x48,0x7B,0x91,0x1C,0x80,0x43,0x0F,\ - 0x3D,0xB8,0x05,0x3E,0xD1,0xB3,0x95,0xCD,0xD8,0xCA,0x0F,0xC2,0x43,0x67,0xDB,0xB7,\ - 0x93,0xE0,0x22,0x82,0x2E,0xBE,0xF5,0x68,0x28,0x83,0xB9,0xC1,0x3B,0x69,0x7B,0x20,\ - 0xDA,0x4E,0x9C,0x6D,0xE1,0xBA,0xCD,0x8F,0x7A,0x6C,0xB0,0x09,0x22,0xD7,0x8B,0x0B,\ - 0xDB,0x1C,0xD5,0x5A,0x26,0x5B,0x0D,0xC0,0xEA,0xE5,0x60,0xD0,0x9F,0xFE,0x35,0xDF,\ - 0x3F,0x02,0x03,0x01,0x00,0x01,0xA3,0x82,0x01,0xAC,0x30,0x82,0x01,0xA8,0x30,0x0F,\ - 0x06,0x03,0x55,0x1D,0x13,0x01,0x01,0xFF,0x04,0x05,0x30,0x03,0x01,0x01,0xFF,0x30,\ - 0x82,0x01,0x16,0x06,0x03,0x55,0x1D,0x20,0x04,0x82,0x01,0x0D,0x30,0x82,0x01,0x09,\ - 0x30,0x82,0x01,0x05,0x06,0x0A,0x2B,0x06,0x01,0x04,0x01,0xCE,0x1F,0x01,0x01,0x01,\ - 0x30,0x81,0xF6,0x30,0x81,0xD0,0x06,0x08,0x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x02,\ - 0x30,0x81,0xC3,0x1E,0x81,0xC0,0x00,0x53,0x00,0x65,0x00,0x65,0x00,0x20,0x00,0x73,\ - 0x00,0x65,0x00,0x72,0x00,0x74,0x00,0x69,0x00,0x66,0x00,0x69,0x00,0x6B,0x00,0x61,\ - 0x00,0x61,0x00,0x74,0x00,0x20,0x00,0x6F,0x00,0x6E,0x00,0x20,0x00,0x76,0x00,0xE4,\ - 0x00,0x6C,0x00,0x6A,0x00,0x61,0x00,0x73,0x00,0x74,0x00,0x61,0x00,0x74,0x00,0x75,\ - 0x00,0x64,0x00,0x20,0x00,0x41,0x00,0x53,0x00,0x2D,0x00,0x69,0x00,0x73,0x00,0x20,\ - 0x00,0x53,0x00,0x65,0x00,0x72,0x00,0x74,0x00,0x69,0x00,0x66,0x00,0x69,0x00,0x74,\ - 0x00,0x73,0x00,0x65,0x00,0x65,0x00,0x72,0x00,0x69,0x00,0x6D,0x00,0x69,0x00,0x73,\ - 0x00,0x6B,0x00,0x65,0x00,0x73,0x00,0x6B,0x00,0x75,0x00,0x73,0x00,0x20,0x00,0x61,\ - 0x00,0x6C,0x00,0x61,0x00,0x6D,0x00,0x2D,0x00,0x53,0x00,0x4B,0x00,0x20,0x00,0x73,\ - 0x00,0x65,0x00,0x72,0x00,0x74,0x00,0x69,0x00,0x66,0x00,0x69,0x00,0x6B,0x00,0x61,\ - 0x00,0x61,0x00,0x74,0x00,0x69,0x00,0x64,0x00,0x65,0x00,0x20,0x00,0x6B,0x00,0x69,\ - 0x00,0x6E,0x00,0x6E,0x00,0x69,0x00,0x74,0x00,0x61,0x00,0x6D,0x00,0x69,0x00,0x73,\ - 0x00,0x65,0x00,0x6B,0x00,0x73,0x30,0x21,0x06,0x08,0x2B,0x06,0x01,0x05,0x05,0x07,\ - 0x02,0x01,0x16,0x15,0x68,0x74,0x74,0x70,0x3A,0x2F,0x2F,0x77,0x77,0x77,0x2E,0x73,\ - 0x6B,0x2E,0x65,0x65,0x2F,0x63,0x70,0x73,0x2F,0x30,0x2B,0x06,0x03,0x55,0x1D,0x1F,\ - 0x04,0x24,0x30,0x22,0x30,0x20,0xA0,0x1E,0xA0,0x1C,0x86,0x1A,0x68,0x74,0x74,0x70,\ - 0x3A,0x2F,0x2F,0x77,0x77,0x77,0x2E,0x73,0x6B,0x2E,0x65,0x65,0x2F,0x6A,0x75,0x75,\ - 0x72,0x2F,0x63,0x72,0x6C,0x2F,0x30,0x1D,0x06,0x03,0x55,0x1D,0x0E,0x04,0x16,0x04,\ - 0x14,0x04,0xAA,0x7A,0x47,0xA3,0xE4,0x89,0xAF,0x1A,0xCF,0x0A,0x40,0xA7,0x18,0x3F,\ - 0x6F,0xEF,0xE9,0x7D,0xBE,0x30,0x1F,0x06,0x03,0x55,0x1D,0x23,0x04,0x18,0x30,0x16,\ - 0x80,0x14,0x04,0xAA,0x7A,0x47,0xA3,0xE4,0x89,0xAF,0x1A,0xCF,0x0A,0x40,0xA7,0x18,\ - 0x3F,0x6F,0xEF,0xE9,0x7D,0xBE,0x30,0x0E,0x06,0x03,0x55,0x1D,0x0F,0x01,0x01,0xFF,\ - 0x04,0x04,0x03,0x02,0x01,0xE6,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,\ - 0x01,0x01,0x05,0x05,0x00,0x03,0x82,0x01,0x01,0x00,0x7B,0xC1,0x18,0x94,0x53,0xA2,\ - 0x09,0xF3,0xFE,0x26,0x67,0x9A,0x50,0xE4,0xC3,0x05,0x2F,0x2B,0x35,0x78,0x91,0x4C,\ - 0x7C,0xA8,0x11,0x11,0x79,0x4C,0x49,0x59,0xAC,0xC8,0xF7,0x85,0x65,0x5C,0x46,0xBB,\ - 0x3B,0x10,0xA0,0x02,0xAF,0xCD,0x4F,0xB5,0xCC,0x36,0x2A,0xEC,0x5D,0xFE,0xEF,0xA0,\ - 0x91,0xC9,0xB6,0x93,0x6F,0x7C,0x80,0x54,0xEC,0xC7,0x08,0x70,0x0D,0x8E,0xFB,0x82,\ - 0xEC,0x2A,0x60,0x78,0x69,0x36,0x36,0xD1,0xC5,0x9C,0x8B,0x69,0xB5,0x40,0xC8,0x94,\ - 0x65,0x77,0xF2,0x57,0x21,0x66,0x3B,0xCE,0x85,0x40,0xB6,0x33,0x63,0x1A,0xBF,0x79,\ - 0x1E,0xFC,0x5C,0x1D,0xD3,0x1D,0x93,0x1B,0x8B,0x0C,0x5D,0x85,0xBD,0x99,0x30,0x32,\ - 0x18,0x09,0x91,0x52,0xE9,0x7C,0xA1,0xBA,0xFF,0x64,0x92,0x9A,0xEC,0xFE,0x35,0xEE,\ - 0x8C,0x2F,0xAE,0xFC,0x20,0x86,0xEC,0x4A,0xDE,0x1B,0x78,0x32,0x37,0xA6,0x81,0xD2,\ - 0x9D,0xAF,0x5A,0x12,0x16,0xCA,0x99,0x5B,0xFC,0x6F,0x6D,0x0E,0xC5,0xA0,0x1E,0x86,\ - 0xC9,0x91,0xD0,0x5C,0x98,0x82,0x5F,0x63,0x0C,0x8A,0x5A,0xAB,0xD8,0x95,0xA6,0xCC,\ - 0xCB,0x8A,0xD6,0xBF,0x64,0x4B,0x8E,0xCA,0x8A,0xB2,0xB0,0xE9,0x21,0x32,0x9E,0xAA,\ - 0xA8,0x85,0x98,0x34,0x81,0x39,0x21,0x3B,0xA8,0x3A,0x52,0x32,0x3D,0xF6,0x6B,0x37,\ - 0x86,0x06,0x5A,0x15,0x98,0xDC,0xF0,0x11,0x66,0xFE,0x34,0x20,0xB7,0x03,0xF4,0x41,\ - 0x10,0x7D,0x39,0x84,0x79,0x96,0x72,0x63,0xB6,0x96,0x02,0xE5,0x6B,0xB9,0xAD,0x19,\ - 0x4D,0xBB,0xC6,0x44,0xDB,0x36,0xCB,0x2A,0x9C,0x8E - ; "Staat der Nederlanden Root CA - G2" (1486 bytes) HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\59AF82799186C7B47507CBCF035746EB04DDB716","Blob",0x00000001,\ 0x20,0x00,0x00,0x00,\ @@ -7623,107 +7538,6 @@ 0x91,0x0E,0x31,0xF9,0x9B,0x67,0x5D,0xE9,0x96,0x38,0x5E,0x5F,0xB3,0x73,0x4E,0x88,\ 0x15,0x67,0xDE,0x9E,0x76,0x10,0x62,0x20,0xBE,0x55,0x69,0x95,0x43,0x00,0x39,0x4D,\ 0xF6,0xEE,0xB0,0x5A,0x4E,0x49,0x44,0x54,0x58,0x5F,0x42,0x83 - -; "EBG Elektronik Sertifika Hizmet Saglayicisi" (1515 bytes) -HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\8C96BAEBDD2B070748EE303266A0F3986E7CAE58","Blob",0x00000001,\ - 0x20,0x00,0x00,0x00,\ - 0x01,0x00,0x00,0x00,\ - 0xEB,0x05,0x00,0x00,\ - 0x30,0x82,0x05,0xE7,0x30,0x82,0x03,0xCF,0xA0,0x03,0x02,0x01,0x02,0x02,0x08,0x4C,\ - 0xAF,0x73,0x42,0x1C,0x8E,0x74,0x02,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,\ - 0x0D,0x01,0x01,0x05,0x05,0x00,0x30,0x81,0x80,0x31,0x38,0x30,0x36,0x06,0x03,0x55,\ - 0x04,0x03,0x0C,0x2F,0x45,0x42,0x47,0x20,0x45,0x6C,0x65,0x6B,0x74,0x72,0x6F,0x6E,\ - 0x69,0x6B,0x20,0x53,0x65,0x72,0x74,0x69,0x66,0x69,0x6B,0x61,0x20,0x48,0x69,0x7A,\ - 0x6D,0x65,0x74,0x20,0x53,0x61,0xC4,0x9F,0x6C,0x61,0x79,0xC4,0xB1,0x63,0xC4,0xB1,\ - 0x73,0xC4,0xB1,0x31,0x37,0x30,0x35,0x06,0x03,0x55,0x04,0x0A,0x0C,0x2E,0x45,0x42,\ - 0x47,0x20,0x42,0x69,0x6C,0x69,0xC5,0x9F,0x69,0x6D,0x20,0x54,0x65,0x6B,0x6E,0x6F,\ - 0x6C,0x6F,0x6A,0x69,0x6C,0x65,0x72,0x69,0x20,0x76,0x65,0x20,0x48,0x69,0x7A,0x6D,\ - 0x65,0x74,0x6C,0x65,0x72,0x69,0x20,0x41,0x2E,0xC5,0x9E,0x2E,0x31,0x0B,0x30,0x09,\ - 0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x54,0x52,0x30,0x1E,0x17,0x0D,0x30,0x36,0x30,\ - 0x38,0x31,0x37,0x30,0x30,0x32,0x31,0x30,0x39,0x5A,0x17,0x0D,0x31,0x36,0x30,0x38,\ - 0x31,0x34,0x30,0x30,0x33,0x31,0x30,0x39,0x5A,0x30,0x81,0x80,0x31,0x38,0x30,0x36,\ - 0x06,0x03,0x55,0x04,0x03,0x0C,0x2F,0x45,0x42,0x47,0x20,0x45,0x6C,0x65,0x6B,0x74,\ - 0x72,0x6F,0x6E,0x69,0x6B,0x20,0x53,0x65,0x72,0x74,0x69,0x66,0x69,0x6B,0x61,0x20,\ - 0x48,0x69,0x7A,0x6D,0x65,0x74,0x20,0x53,0x61,0xC4,0x9F,0x6C,0x61,0x79,0xC4,0xB1,\ - 0x63,0xC4,0xB1,0x73,0xC4,0xB1,0x31,0x37,0x30,0x35,0x06,0x03,0x55,0x04,0x0A,0x0C,\ - 0x2E,0x45,0x42,0x47,0x20,0x42,0x69,0x6C,0x69,0xC5,0x9F,0x69,0x6D,0x20,0x54,0x65,\ - 0x6B,0x6E,0x6F,0x6C,0x6F,0x6A,0x69,0x6C,0x65,0x72,0x69,0x20,0x76,0x65,0x20,0x48,\ - 0x69,0x7A,0x6D,0x65,0x74,0x6C,0x65,0x72,0x69,0x20,0x41,0x2E,0xC5,0x9E,0x2E,0x31,\ - 0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x54,0x52,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,0xEE,0xA0,0x84,\ - 0x61,0xD0,0x3A,0x6A,0x66,0x10,0x32,0xD8,0x31,0x38,0x7F,0xA7,0xA7,0xE5,0xFD,0xA1,\ - 0xE1,0xFB,0x97,0x77,0xB8,0x71,0x96,0xE8,0x13,0x96,0x46,0x83,0x4F,0xB6,0xF2,0x5F,\ - 0x72,0x56,0x6E,0x13,0x60,0xA5,0x01,0x91,0xE2,0x5B,0xC5,0xCD,0x57,0x1F,0x77,0x63,\ - 0x51,0xFF,0x2F,0x3D,0xDB,0xB9,0x3F,0xAA,0xA9,0x35,0xE7,0x79,0xD0,0xF5,0xD0,0x24,\ - 0xB6,0x21,0xEA,0xEB,0x23,0x94,0xFE,0x29,0xBF,0xFB,0x89,0x91,0x0C,0x64,0x9A,0x05,\ - 0x4A,0x2B,0xCC,0x0C,0xEE,0xF1,0x3D,0x9B,0x82,0x69,0xA4,0x4C,0xF8,0x9A,0x6F,0xE7,\ - 0x22,0xDA,0x10,0xBA,0x5F,0x92,0xFC,0x18,0x27,0x0A,0xA8,0xAA,0x44,0xFA,0x2E,0x2C,\ - 0xB4,0xFB,0x46,0x9A,0x08,0x03,0x83,0x72,0xAB,0x88,0xE4,0x6A,0x72,0xC9,0xE5,0x65,\ - 0x1F,0x6E,0x2A,0x0F,0x9D,0xB3,0xE8,0x3B,0xE4,0x0C,0x6E,0x7A,0xDA,0x57,0xFD,0xD7,\ - 0xEB,0x79,0x8B,0x5E,0x20,0x06,0xD3,0x76,0x0B,0x6C,0x02,0x95,0xA3,0x96,0xE4,0xCB,\ - 0x76,0x51,0xD1,0x28,0x9D,0xA1,0x1A,0xFC,0x44,0xA2,0x4D,0xCC,0x7A,0x76,0xA8,0x0D,\ - 0x3D,0xBF,0x17,0x4F,0x22,0x88,0x50,0xFD,0xAE,0xB6,0xEC,0x90,0x50,0x4A,0x5B,0x9F,\ - 0x95,0x41,0xAA,0xCA,0x0F,0xB2,0x4A,0xFE,0x80,0x99,0x4E,0xA3,0x46,0x15,0xAB,0xF8,\ - 0x73,0x42,0x6A,0xC2,0x66,0x76,0xB1,0x0A,0x26,0x15,0xDD,0x93,0x92,0xEC,0xDB,0xA9,\ - 0x5F,0x54,0x22,0x52,0x91,0x70,0x5D,0x13,0xEA,0x48,0xEC,0x6E,0x03,0x6C,0xD9,0xDD,\ - 0x6C,0xFC,0xEB,0x0D,0x03,0xFF,0xA6,0x83,0x12,0x9B,0xF1,0xA9,0x93,0x0F,0xC5,0x26,\ - 0x4C,0x31,0xB2,0x63,0x99,0x61,0x72,0xE7,0x2A,0x64,0x99,0xD2,0xB8,0xE9,0x75,0xE2,\ - 0x7C,0xA9,0xA9,0x9A,0x1A,0xAA,0xC3,0x56,0xDB,0x10,0x9A,0x3C,0x83,0x52,0xB6,0x7B,\ - 0x96,0xB7,0xAC,0x87,0x77,0xA8,0xB9,0xF2,0x67,0x0B,0x94,0x43,0xB3,0xAF,0x3E,0x73,\ - 0xFA,0x42,0x36,0xB1,0x25,0xC5,0x0A,0x31,0x26,0x37,0x56,0x67,0xBA,0xA3,0x0B,0x7D,\ - 0xD6,0xF7,0x89,0xCD,0x67,0xA1,0xB7,0x3A,0x1E,0x66,0x4F,0xF6,0xA0,0x55,0x14,0x25,\ - 0x4C,0x2C,0x33,0x0D,0xA6,0x41,0x8C,0xBD,0x04,0x31,0x6A,0x10,0x72,0x0A,0x9D,0x0E,\ - 0x2E,0x76,0xBD,0x5E,0xF3,0x51,0x89,0x8B,0xA8,0x3F,0x55,0x73,0xBF,0xDB,0x3A,0xC6,\ - 0x24,0x05,0x96,0x92,0x48,0xAA,0x4B,0x8D,0x2A,0x03,0xE5,0x57,0x91,0x10,0xF4,0x6A,\ - 0x28,0x15,0x6E,0x47,0x77,0x84,0x5C,0x51,0x74,0x9F,0x19,0xE9,0xE6,0x1E,0x63,0x16,\ - 0x39,0xE3,0x11,0x15,0xE3,0x58,0x1A,0x44,0xBD,0xCB,0xC4,0x6C,0x66,0xD7,0x84,0x06,\ - 0xDF,0x30,0xF4,0x37,0xA2,0x43,0x22,0x79,0xD2,0x10,0x6C,0xDF,0xBB,0xE6,0x13,0x11,\ - 0xFC,0x9D,0x84,0x0A,0x13,0x7B,0xF0,0x3B,0xD0,0xFC,0xA3,0x0A,0xD7,0x89,0xEA,0x96,\ - 0x7E,0x8D,0x48,0x85,0x1E,0x64,0x5F,0xDB,0x54,0xA2,0xAC,0xD5,0x7A,0x02,0x79,0x6B,\ - 0xD2,0x8A,0xF0,0x67,0xDA,0x65,0x72,0x0D,0x14,0x70,0xE4,0xE9,0x8E,0x78,0x8F,0x32,\ - 0x74,0x7C,0x57,0xF2,0xD6,0xD6,0xF4,0x36,0x89,0x1B,0xF8,0x29,0x6C,0x8B,0xB9,0xF6,\ - 0x97,0xD1,0xA4,0x2E,0xAA,0xBE,0x0B,0x19,0xC2,0x45,0xE9,0x70,0x5D,0x02,0x03,0x00,\ - 0x9D,0xD9,0xA3,0x63,0x30,0x61,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,0xE7,0xCE,0xC6,0x4F,0xFC,0x16,0x67,0x96,0xFA,0x4A,0xA3,0x07,0xC1,0x04,\ - 0xA7,0xCB,0x6A,0xDE,0xDA,0x47,0x30,0x1F,0x06,0x03,0x55,0x1D,0x23,0x04,0x18,0x30,\ - 0x16,0x80,0x14,0xE7,0xCE,0xC6,0x4F,0xFC,0x16,0x67,0x96,0xFA,0x4A,0xA3,0x07,0xC1,\ - 0x04,0xA7,0xCB,0x6A,0xDE,0xDA,0x47,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,\ - 0x0D,0x01,0x01,0x05,0x05,0x00,0x03,0x82,0x02,0x01,0x00,0x9B,0x98,0x9A,0x5D,0xBE,\ - 0xF3,0x28,0x23,0x76,0xC6,0x6C,0xF7,0x7F,0xE6,0x40,0x9E,0xC0,0x36,0xDC,0x95,0x0D,\ - 0x1D,0xAD,0x15,0xC5,0x36,0xD8,0xD5,0x39,0xEF,0xF2,0x1E,0x22,0x5E,0xB3,0x82,0xB4,\ - 0x5D,0xBB,0x4C,0x1A,0xCA,0x92,0x0D,0xDF,0x47,0x24,0x1E,0xB3,0x24,0xDA,0x91,0x88,\ - 0xE9,0x83,0x70,0xDD,0x93,0xD7,0xE9,0xBA,0xB3,0xDF,0x16,0x5A,0x3E,0xDE,0xE0,0xC8,\ - 0xFB,0xD3,0xFD,0x6C,0x29,0xF8,0x15,0x46,0xA0,0x68,0x26,0xCC,0x93,0x52,0xAE,0x82,\ - 0x01,0x93,0x90,0xCA,0x77,0xCA,0x4D,0x49,0xEF,0xE2,0x5A,0xD9,0x2A,0xBD,0x30,0xCE,\ - 0x4C,0xB2,0x81,0xB6,0x30,0xCE,0x59,0x4F,0xDA,0x59,0x1D,0x6A,0x7A,0xA4,0x45,0xB0,\ - 0x82,0x26,0x81,0x86,0x76,0xF5,0xF5,0x10,0x00,0xB8,0xEE,0xB3,0x09,0xE8,0x4F,0x87,\ - 0x02,0x07,0xAE,0x24,0x5C,0xF0,0x5F,0xAC,0x0A,0x30,0xCC,0x8A,0x40,0xA0,0x73,0x04,\ - 0xC1,0xFB,0x89,0x24,0xF6,0x9A,0x1C,0x5C,0xB7,0x3C,0x0A,0x67,0x36,0x05,0x08,0x31,\ - 0xB3,0xAF,0xD8,0x01,0x68,0x2A,0xE0,0x78,0x8F,0x74,0xDE,0xB8,0x51,0xA4,0x8C,0x6C,\ - 0x20,0x3D,0xA2,0xFB,0xB3,0xD4,0x09,0xFD,0x7B,0xC2,0x80,0xAA,0x93,0x6C,0x29,0x98,\ - 0x21,0xA8,0xBB,0x16,0xF3,0xA9,0x12,0x5F,0x74,0xB5,0x87,0x98,0xF2,0x95,0x26,0xDF,\ - 0x34,0xEF,0x8A,0x53,0x91,0x88,0x5D,0x1A,0x94,0xA3,0x3F,0x7C,0x22,0xF8,0xD7,0x88,\ - 0xBA,0xA6,0x8C,0x96,0xA8,0x3D,0x52,0x34,0x62,0x9F,0x00,0x1E,0x54,0x55,0x42,0x67,\ - 0xC6,0x4D,0x46,0x8F,0xBB,0x14,0x45,0x3D,0x0A,0x96,0x16,0x8E,0x10,0xA1,0x97,0x99,\ - 0xD5,0xD3,0x30,0x85,0xCC,0xDE,0xB4,0x72,0xB7,0xBC,0x8A,0x3C,0x18,0x29,0x68,0xFD,\ - 0xDC,0x71,0x07,0xEE,0x24,0x39,0x6A,0xFA,0xED,0xA5,0xAC,0x38,0x2F,0xF9,0x1E,0x10,\ - 0x0E,0x06,0x71,0x1A,0x10,0x4C,0xFE,0x75,0x7E,0xFF,0x1E,0x57,0x39,0x42,0xCA,0xD7,\ - 0xE1,0x15,0xA1,0x56,0x55,0x59,0x1B,0xD1,0xA3,0xAF,0x11,0xD8,0x4E,0xC3,0xA5,0x2B,\ - 0xEF,0x90,0xBF,0xC0,0xEC,0x82,0x13,0x5B,0x8D,0xD6,0x72,0x2C,0x93,0x4E,0x8F,0x6A,\ - 0x29,0xDF,0x85,0x3C,0xD3,0x0D,0xE0,0xA2,0x18,0x12,0xCC,0x55,0x2F,0x47,0xB7,0xA7,\ - 0x9B,0x02,0xFE,0x41,0xF6,0x88,0x4C,0x6D,0xDA,0xA9,0x01,0x47,0x83,0x64,0x27,0x62,\ - 0x10,0x82,0xD6,0x12,0x7B,0x5E,0x03,0x1F,0x34,0xA9,0xC9,0x91,0xFE,0xAF,0x5D,0x6D,\ - 0x86,0x27,0xB7,0x23,0xAA,0x75,0x18,0xCA,0x20,0xE7,0xB0,0x0F,0xD7,0x89,0x0E,0xA6,\ - 0x67,0x22,0x63,0xF4,0x83,0x41,0x2B,0x06,0x4B,0xBB,0x58,0xD5,0xD1,0xD7,0xB7,0xB9,\ - 0x10,0x63,0xD8,0x89,0x4A,0xB4,0xAA,0xDD,0x16,0x63,0xF5,0x6E,0xBE,0x60,0xA1,0xF8,\ - 0xED,0xE8,0xD6,0x90,0x4F,0x1A,0xC6,0xC5,0xA0,0x29,0xD3,0xA7,0x21,0xA8,0xF5,0x5A,\ - 0x3C,0xF7,0xC7,0x49,0xA2,0x21,0x9A,0x4A,0x95,0x52,0x20,0x96,0x72,0x9A,0x66,0xCB,\ - 0xF7,0xD2,0x86,0x43,0x7C,0x22,0xBE,0x96,0xF9,0xBD,0x01,0xA8,0x47,0xDD,0xE5,0x3B,\ - 0x40,0xF9,0x75,0x2B,0x9B,0x2B,0x46,0x64,0x86,0x8D,0x1E,0xF4,0x8F,0xFB,0x07,0x77,\ - 0xD0,0xEA,0x49,0xA2,0x1C,0x8D,0x52,0x14,0xA6,0x0A,0x93 ; "Buypass Class 2 CA 1" (855 bytes) HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\A0A1AB90C9FC847B3B1261E8977D5FD32261D3CC","Blob",0x00000001,\ @@ -8427,77 +8241,6 @@ 0x54,0xBD,0x78,0x6C,0x88,0xEA,0xBF,0x9C,0x13,0x24,0xC2,0x70,0x69,0xA2,0x7F,0x0F,\ 0xC8,0x3C,0xAD,0x08,0xC9,0xB0,0x98,0x40,0xA3,0x2A,0xE7,0x88,0x83,0xED,0x77,0x8F,\ 0x74 - -; "IGC/A" (1030 bytes) -HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\60D68974B5C2659E8A0FC1887C88D246691B182C","Blob",0x00000001,\ - 0x20,0x00,0x00,0x00,\ - 0x01,0x00,0x00,0x00,\ - 0x06,0x04,0x00,0x00,\ - 0x30,0x82,0x04,0x02,0x30,0x82,0x02,0xEA,0xA0,0x03,0x02,0x01,0x02,0x02,0x05,0x39,\ - 0x11,0x45,0x10,0x94,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,\ - 0x05,0x05,0x00,0x30,0x81,0x85,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,\ - 0x02,0x46,0x52,0x31,0x0F,0x30,0x0D,0x06,0x03,0x55,0x04,0x08,0x13,0x06,0x46,0x72,\ - 0x61,0x6E,0x63,0x65,0x31,0x0E,0x30,0x0C,0x06,0x03,0x55,0x04,0x07,0x13,0x05,0x50,\ - 0x61,0x72,0x69,0x73,0x31,0x10,0x30,0x0E,0x06,0x03,0x55,0x04,0x0A,0x13,0x07,0x50,\ - 0x4D,0x2F,0x53,0x47,0x44,0x4E,0x31,0x0E,0x30,0x0C,0x06,0x03,0x55,0x04,0x0B,0x13,\ - 0x05,0x44,0x43,0x53,0x53,0x49,0x31,0x0E,0x30,0x0C,0x06,0x03,0x55,0x04,0x03,0x13,\ - 0x05,0x49,0x47,0x43,0x2F,0x41,0x31,0x23,0x30,0x21,0x06,0x09,0x2A,0x86,0x48,0x86,\ - 0xF7,0x0D,0x01,0x09,0x01,0x16,0x14,0x69,0x67,0x63,0x61,0x40,0x73,0x67,0x64,0x6E,\ - 0x2E,0x70,0x6D,0x2E,0x67,0x6F,0x75,0x76,0x2E,0x66,0x72,0x30,0x1E,0x17,0x0D,0x30,\ - 0x32,0x31,0x32,0x31,0x33,0x31,0x34,0x32,0x39,0x32,0x33,0x5A,0x17,0x0D,0x32,0x30,\ - 0x31,0x30,0x31,0x37,0x31,0x34,0x32,0x39,0x32,0x32,0x5A,0x30,0x81,0x85,0x31,0x0B,\ - 0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x46,0x52,0x31,0x0F,0x30,0x0D,0x06,\ - 0x03,0x55,0x04,0x08,0x13,0x06,0x46,0x72,0x61,0x6E,0x63,0x65,0x31,0x0E,0x30,0x0C,\ - 0x06,0x03,0x55,0x04,0x07,0x13,0x05,0x50,0x61,0x72,0x69,0x73,0x31,0x10,0x30,0x0E,\ - 0x06,0x03,0x55,0x04,0x0A,0x13,0x07,0x50,0x4D,0x2F,0x53,0x47,0x44,0x4E,0x31,0x0E,\ - 0x30,0x0C,0x06,0x03,0x55,0x04,0x0B,0x13,0x05,0x44,0x43,0x53,0x53,0x49,0x31,0x0E,\ - 0x30,0x0C,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x49,0x47,0x43,0x2F,0x41,0x31,0x23,\ - 0x30,0x21,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x01,0x16,0x14,0x69,\ - 0x67,0x63,0x61,0x40,0x73,0x67,0x64,0x6E,0x2E,0x70,0x6D,0x2E,0x67,0x6F,0x75,0x76,\ - 0x2E,0x66,0x72,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,0xB2,0x1F,0xD1,0xD0,0x62,0xC5,0x33,0x3B,0xC0,0x04,0x86,0x88,\ - 0xB3,0xDC,0xF8,0x88,0xF7,0xFD,0xDF,0x43,0xDF,0x7A,0x8D,0x9A,0x49,0x5C,0xF6,0x4E,\ - 0xAA,0xCC,0x1C,0xB9,0xA1,0xEB,0x27,0x89,0xF2,0x46,0xE9,0x3B,0x4A,0x71,0xD5,0x1D,\ - 0x8E,0x2D,0xCF,0xE6,0xAD,0xAB,0x63,0x50,0xC7,0x54,0x0B,0x6E,0x12,0xC9,0x90,0x36,\ - 0xC6,0xD8,0x2F,0xDA,0x91,0xAA,0x68,0xC5,0x72,0xFE,0x17,0x0A,0xB2,0x17,0x7E,0x79,\ - 0xB5,0x32,0x88,0x70,0xCA,0x70,0xC0,0x96,0x4A,0x8E,0xE4,0x55,0xCD,0x1D,0x27,0x94,\ - 0xBF,0xCE,0x72,0x2A,0xEC,0x5C,0xF9,0x73,0x20,0xFE,0xBD,0xF7,0x2E,0x89,0x67,0xB8,\ - 0xBB,0x47,0x73,0x12,0xF7,0xD1,0x35,0x69,0x3A,0xF2,0x0A,0xB9,0xAE,0xFF,0x46,0x42,\ - 0x46,0xA2,0xBF,0xA1,0x85,0x1A,0xF9,0xBF,0xE4,0xFF,0x49,0x85,0xF7,0xA3,0x70,0x86,\ - 0x32,0x1C,0x5D,0x9F,0x60,0xF7,0xA9,0xAD,0xA5,0xFF,0xCF,0xD1,0x34,0xF9,0x7D,0x5B,\ - 0x17,0xC6,0xDC,0xD6,0x0E,0x28,0x6B,0xC2,0xDD,0xF1,0xF5,0x33,0x68,0x9D,0x4E,0xFC,\ - 0x87,0x7C,0x36,0x12,0xD6,0xA3,0x80,0xE8,0x43,0x0D,0x55,0x61,0x94,0xEA,0x64,0x37,\ - 0x47,0xEA,0x77,0xCA,0xD0,0xB2,0x58,0x05,0xC3,0x5D,0x7E,0xB1,0xA8,0x46,0x90,0x31,\ - 0x56,0xCE,0x70,0x2A,0x96,0xB2,0x30,0xB8,0x77,0xE6,0x79,0xC0,0xBD,0x29,0x3B,0xFD,\ - 0x94,0x77,0x4C,0xBD,0x20,0xCD,0x41,0x25,0xE0,0x2E,0xC7,0x1B,0xBB,0xEE,0xA4,0x04,\ - 0x41,0xD2,0x5D,0xAD,0x12,0x6A,0x8A,0x9B,0x47,0xFB,0xC9,0xDD,0x46,0x40,0xE1,0x9D,\ - 0x3C,0x33,0xD0,0xB5,0x02,0x03,0x01,0x00,0x01,0xA3,0x77,0x30,0x75,0x30,0x0F,0x06,\ - 0x03,0x55,0x1D,0x13,0x01,0x01,0xFF,0x04,0x05,0x30,0x03,0x01,0x01,0xFF,0x30,0x0B,\ - 0x06,0x03,0x55,0x1D,0x0F,0x04,0x04,0x03,0x02,0x01,0x46,0x30,0x15,0x06,0x03,0x55,\ - 0x1D,0x20,0x04,0x0E,0x30,0x0C,0x30,0x0A,0x06,0x08,0x2A,0x81,0x7A,0x01,0x79,0x01,\ - 0x01,0x01,0x30,0x1D,0x06,0x03,0x55,0x1D,0x0E,0x04,0x16,0x04,0x14,0xA3,0x05,0x2F,\ - 0x18,0x60,0x50,0xC2,0x89,0x0A,0xDD,0x2B,0x21,0x4F,0xFF,0x8E,0x4E,0xA8,0x30,0x31,\ - 0x36,0x30,0x1F,0x06,0x03,0x55,0x1D,0x23,0x04,0x18,0x30,0x16,0x80,0x14,0xA3,0x05,\ - 0x2F,0x18,0x60,0x50,0xC2,0x89,0x0A,0xDD,0x2B,0x21,0x4F,0xFF,0x8E,0x4E,0xA8,0x30,\ - 0x31,0x36,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,\ - 0x00,0x03,0x82,0x01,0x01,0x00,0x05,0xDC,0x26,0xD8,0xFA,0x77,0x15,0x44,0x68,0xFC,\ - 0x2F,0x66,0x3A,0x74,0xE0,0x5D,0xE4,0x29,0xFF,0x06,0x07,0x13,0x84,0x4A,0xAB,0xCF,\ - 0x6D,0xA0,0x1F,0x51,0x94,0xF8,0x49,0xCB,0x74,0x36,0x14,0xBC,0x15,0xDD,0xDB,0x89,\ - 0x2F,0xDD,0x8F,0xA0,0x5D,0x7C,0xF5,0x12,0xEB,0x9F,0x9E,0x38,0xA4,0x47,0xCC,0xB3,\ - 0x96,0xD9,0xBE,0x9C,0x25,0xAB,0x03,0x7E,0x33,0x0F,0x95,0x81,0x0D,0xFD,0x16,0xE0,\ - 0x88,0xBE,0x37,0xF0,0x6C,0x5D,0xD0,0x31,0x9B,0x32,0x2B,0x5D,0x17,0x65,0x93,0x98,\ - 0x60,0xBC,0x6E,0x8F,0xB1,0xA8,0x3C,0x1E,0xD9,0x1C,0xF3,0xA9,0x26,0x42,0xF9,0x64,\ - 0x1D,0xC2,0xE7,0x92,0xF6,0xF4,0x1E,0x5A,0xAA,0x19,0x52,0x5D,0xAF,0xE8,0xA2,0xF7,\ - 0x60,0xA0,0xF6,0x8D,0xF0,0x89,0xF5,0x6E,0xE0,0x0A,0x05,0x01,0x95,0xC9,0x8B,0x20,\ - 0x0A,0xBA,0x5A,0xFC,0x9A,0x2C,0x3C,0xBD,0xC3,0xB7,0xC9,0x5D,0x78,0x25,0x05,0x3F,\ - 0x56,0x14,0x9B,0x0C,0xDA,0xFB,0x3A,0x48,0xFE,0x97,0x69,0x5E,0xCA,0x10,0x86,0xF7,\ - 0x4E,0x96,0x04,0x08,0x4D,0xEC,0xB0,0xBE,0x5D,0xDC,0x3B,0x8E,0x4F,0xC1,0xFD,0x9A,\ - 0x36,0x34,0x9A,0x4C,0x54,0x7E,0x17,0x03,0x48,0x95,0x08,0x11,0x1C,0x07,0x6F,0x85,\ - 0x08,0x7E,0x5D,0x4D,0xC4,0x9D,0xDB,0xFB,0xAE,0xCE,0xB2,0xD1,0xB3,0xB8,0x83,0x6C,\ - 0x1D,0xB2,0xB3,0x79,0xF1,0xD8,0x70,0x99,0x7E,0xF0,0x13,0x02,0xCE,0x5E,0xDD,0x51,\ - 0xD3,0xDF,0x36,0x81,0xA1,0x1B,0x78,0x2F,0x71,0xB3,0xF1,0x59,0x4C,0x46,0x18,0x28,\ - 0xAB,0x85,0xD2,0x60,0x56,0x5A ; "COMODO ECC Certification Authority" (653 bytes) HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\9F744E9F2B4DBAEC0F312C50B6563B8E2D93C311","Blob",0x00000001,\

1 0

[dreimer] 72914: [FONTS] Next time I will update the doc folder, too...
by dreimer＠svn.reactos.org 05 Oct '16

05 Oct '16

Author: dreimer Date: Wed Oct 5 22:48:51 2016 New Revision: 72914 URL: http://svn.reactos.org/svn/reactos?rev=72914&view=rev Log: [FONTS] Next time I will update the doc folder, too... Removed: trunk/reactos/media/fonts/doc/DejaVu/langcover-sans.txt trunk/reactos/media/fonts/doc/DejaVu/unicover-sans.txt Modified: trunk/reactos/media/fonts/doc/DejaVu/AUTHORS.txt trunk/reactos/media/fonts/doc/DejaVu/BUGS.txt trunk/reactos/media/fonts/doc/DejaVu/LICENSE.txt trunk/reactos/media/fonts/doc/DejaVu/NEWS.txt trunk/reactos/media/fonts/doc/DejaVu/README.txt trunk/reactos/media/fonts/doc/DejaVu/status.txt trunk/reactos/media/fonts/doc/DejaVu/unicover.txt trunk/reactos/media/fonts/doc/Ubuntu/FONTLOG.txt trunk/reactos/media/fonts/doc/Ubuntu/README.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/fonts/doc/DejaVu/AUTHORS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu/AUT… Modified: trunk/reactos/media/fonts/doc/DejaVu/BUGS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu/BUG… Modified: trunk/reactos/media/fonts/doc/DejaVu/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu/LIC… Modified: trunk/reactos/media/fonts/doc/DejaVu/NEWS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu/NEW… Modified: trunk/reactos/media/fonts/doc/DejaVu/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu/REA… Removed: trunk/reactos/media/fonts/doc/DejaVu/langcover-sans.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu/lan… Modified: trunk/reactos/media/fonts/doc/DejaVu/status.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu/sta… Removed: trunk/reactos/media/fonts/doc/DejaVu/unicover-sans.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu/uni… Modified: trunk/reactos/media/fonts/doc/DejaVu/unicover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu/uni… Modified: trunk/reactos/media/fonts/doc/Ubuntu/FONTLOG.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Ubuntu/FON… Modified: trunk/reactos/media/fonts/doc/Ubuntu/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Ubuntu/REA…

1 0

← Newer
1
...
15
16
17
18
19
20
21
22
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2016