Ros-diffs March 2016

ros-diffs@reactos.org

13 participants
263 discussions

[pschweitzer] 71027: [NTDLL_APITEST] Set correct locale in RtlGenerate8dot3Name test. This makes the test reproducible on every target plateform. Patch by Mark Jansen. ROSTESTS-218 #resolve #commen...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Mar 20 10:51:14 2016 New Revision: 71027 URL: http://svn.reactos.org/svn/reactos?rev=71027&view=rev Log: [NTDLL_APITEST] Set correct locale in RtlGenerate8dot3Name test. This makes the test reproducible on every target plateform. Patch by Mark Jansen. ROSTESTS-218 #resolve #comment Patch commited in r71027. Thanks! Modified: trunk/rostests/apitests/ntdll/RtlGenerate8dot3Name.c Modified: trunk/rostests/apitests/ntdll/RtlGenerate8dot3Name.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGenerat… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGenerate8dot3Name.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGenerate8dot3Name.c [iso-8859-1] Sun Mar 20 10:51:14 2016 @@ -9,6 +9,7 @@ #define WIN32_NO_STATUS #include <ndk/rtlfuncs.h> +#include <stdio.h> NTSYSAPI VOID @@ -24,10 +25,56 @@ PWSTR ShortNames2[] = { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT", L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT", L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X", L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2", L"LONGFI~2.TXT", L"LONGFI~2" }; PWSTR ExShortNames1[] = { L"MENUDÃ~1", L"SÃLECT~1.LNK", L"ÃÃÃÃÃ~1.TXT", L"ÃÃÃÃÃ~1.TXT", L"ÃÃÃÃ~1.TXT", L"ÃÃÃÃ~1.TXT", L"ÃÃÃÃÃE~1.TXT", L"ÃEÃÃÃC~1.TXT", L"TEST~1.ÃXÃ", L"TÂ£$TÂ¤~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1", L"LONGFI~1.TXT", L"LONGFI~1" }; PWSTR ExShortNames2[] = { L"MENUDÃ~2", L"SÃLECT~2.LNK", L"ÃÃÃÃÃ~2.TXT", L"ÃÃÃÃÃ~2.TXT", L"ÃÃÃÃ~2.TXT", L"ÃÃÃÃ~2.TXT", L"ÃÃÃÃÃE~2.TXT", L"ÃEÃÃÃC~2.TXT", L"TEST~2.ÃXÃ", L"TÂ£$TÂ¤~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2", L"LONGFI~2.TXT", L"LONGFI~2" }; + +PVOID LoadCodePageData(ULONG Code) +{ + char filename[MAX_PATH], sysdir[MAX_PATH]; + HANDLE hFile; + PVOID Data = NULL; + GetSystemDirectoryA(sysdir, MAX_PATH); + + if (Code != -1) + sprintf(filename, "%s\\c_%lu.nls", sysdir, Code); + else + sprintf(filename, "%s\\l_intl.nls", sysdir); + + hFile = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + DWORD dwRead; + DWORD dwFileSize = GetFileSize(hFile, NULL); + Data = malloc(dwFileSize); + ReadFile(hFile, Data, dwFileSize, &dwRead, NULL); + CloseHandle(hFile); + } + return Data; +} + +/* https://www.microsoft.com/resources/msdn/goglobal/default.mspx */ +void SetupLocale(ULONG AnsiCode, ULONG OemCode, ULONG Unicode) +{ + NLSTABLEINFO NlsTable; + PVOID AnsiCodePageData; + PVOID OemCodePageData; + PVOID UnicodeCaseTableData; + + AnsiCodePageData = LoadCodePageData(AnsiCode); + OemCodePageData = LoadCodePageData(OemCode); + UnicodeCaseTableData = LoadCodePageData(Unicode); + + RtlInitNlsTables(AnsiCodePageData, OemCodePageData, UnicodeCaseTableData, &NlsTable); + RtlResetRtlTranslations(&NlsTable); + /* Do NOT free the buffers here, they are directly used! + Yes, we leak the old buffers, but this is a test anyway... */ + +} START_TEST(RtlGenerate8dot3Name) { USHORT i; + + /* Set a french locale. */ + SetupLocale(1252, 850, -1); for (i = 0; i < 14; ++i) {

8 years, 6 months

[akhaldi] 71026: [RAPPS_NEW] Add menu to the main window. By Mark Jansen. CORE-10992

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 18 21:51:58 2016 New Revision: 71026 URL: http://svn.reactos.org/svn/reactos?rev=71026&view=rev Log: [RAPPS_NEW] Add menu to the main window. By Mark Jansen. CORE-10992 Modified: trunk/reactos/base/applications/rapps_new/gui.cpp 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] Fri Mar 18 21:51:58 2016 @@ -1224,7 +1224,7 @@ 0, 0, NULL, LoadIcon(_AtlBaseModule.GetModuleInstance(), MAKEINTRESOURCE(IDI_MAIN)), LoadCursor(NULL, IDC_ARROW), - (HBRUSH) (COLOR_BTNFACE + 1), NULL, + (HBRUSH) (COLOR_BTNFACE + 1), MAKEINTRESOURCE(IDR_MAINMENU), L"RAppsWnd", NULL }, NULL, NULL, IDC_ARROW, TRUE, 0, _T("") };

8 years, 6 months

[akhaldi] 71025: [TCPIP_REVOLUTION] The King is dead, long live The King!

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 18 18:27:47 2016 New Revision: 71025 URL: http://svn.reactos.org/svn/reactos?rev=71025&view=rev Log: [TCPIP_REVOLUTION] The King is dead, long live The King! Removed: branches/tcpip_revolution/

8 years, 6 months

[akhaldi] 71024: [NETWORK_STACK] Sync Jerome's work from the tcpip_revolution branch.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 18 18:21:48 2016 New Revision: 71024 URL: http://svn.reactos.org/svn/reactos?rev=71024&view=rev Log: [NETWORK_STACK] Sync Jerome's work from the tcpip_revolution branch. Added: branches/network_stack/drivers/network/tcpip/CMakeLists.txt - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/CMakeLists.txt branches/network_stack/drivers/network/tcpip/address.c - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/address.c branches/network_stack/drivers/network/tcpip/address.h - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/address.h branches/network_stack/drivers/network/tcpip/connection.c - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/connection.c branches/network_stack/drivers/network/tcpip/entities.c - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/entities.c branches/network_stack/drivers/network/tcpip/entities.h - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/entities.h branches/network_stack/drivers/network/tcpip/information.c - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/information.c branches/network_stack/drivers/network/tcpip/information.h - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/information.h branches/network_stack/drivers/network/tcpip/interface.c - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/interface.c branches/network_stack/drivers/network/tcpip/interface.h - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/interface.h branches/network_stack/drivers/network/tcpip/main.c - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/main.c branches/network_stack/drivers/network/tcpip/ndis_lwip.c - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/ndis_lwip.c branches/network_stack/drivers/network/tcpip/ndis_lwip.h - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/ndis_lwip.h branches/network_stack/drivers/network/tcpip/precomp.h - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/precomp.h branches/network_stack/drivers/network/tcpip/stubs.c - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/stubs.c branches/network_stack/drivers/network/tcpip/tcp.c - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/tcp.c branches/network_stack/drivers/network/tcpip/tcp.h - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/tcp.h branches/network_stack/drivers/network/tcpip/tcpip.rc - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/tcpip.rc branches/network_stack/drivers/network/tcpip/tcpip.spec - copied unchanged from r71023, branches/tcpip_revolution/drivers/network/tcpip/tcpip.spec Removed: branches/network_stack/drivers/network/tcpip/DIRS branches/network_stack/drivers/network/tcpip/datalink/SOURCES branches/network_stack/drivers/network/tcpip/include/address.h branches/network_stack/drivers/network/tcpip/include/arp.h branches/network_stack/drivers/network/tcpip/include/checksum.h branches/network_stack/drivers/network/tcpip/include/datagram.h branches/network_stack/drivers/network/tcpip/include/debug.h branches/network_stack/drivers/network/tcpip/include/fileobjs.h branches/network_stack/drivers/network/tcpip/include/icmp.h branches/network_stack/drivers/network/tcpip/include/info.h branches/network_stack/drivers/network/tcpip/include/ip.h branches/network_stack/drivers/network/tcpip/include/lan.h branches/network_stack/drivers/network/tcpip/include/linux.h branches/network_stack/drivers/network/tcpip/include/lock.h branches/network_stack/drivers/network/tcpip/include/loopback.h branches/network_stack/drivers/network/tcpip/include/neighbor.h branches/network_stack/drivers/network/tcpip/include/pool.h branches/network_stack/drivers/network/tcpip/include/ports.h branches/network_stack/drivers/network/tcpip/include/precomp.h branches/network_stack/drivers/network/tcpip/include/rawip.h branches/network_stack/drivers/network/tcpip/include/receive.h branches/network_stack/drivers/network/tcpip/include/route.h branches/network_stack/drivers/network/tcpip/include/router.h branches/network_stack/drivers/network/tcpip/include/routines.h branches/network_stack/drivers/network/tcpip/include/tags.h branches/network_stack/drivers/network/tcpip/include/tcp.h branches/network_stack/drivers/network/tcpip/include/tcpcore.h branches/network_stack/drivers/network/tcpip/include/tcpdef.h branches/network_stack/drivers/network/tcpip/include/tcpip.h branches/network_stack/drivers/network/tcpip/include/ticonsts.h branches/network_stack/drivers/network/tcpip/include/tilists.h branches/network_stack/drivers/network/tcpip/include/titypes.h branches/network_stack/drivers/network/tcpip/include/transmit.h branches/network_stack/drivers/network/tcpip/include/udp.h branches/network_stack/drivers/network/tcpip/include/wait.h branches/network_stack/drivers/network/tcpip/notes.txt branches/network_stack/drivers/network/tcpip/readme.txt branches/network_stack/drivers/network/tcpip/tcpip/SOURCES branches/network_stack/drivers/network/tcpip/tcpip/ainfo.c branches/network_stack/drivers/network/tcpip/tcpip/buffer.c branches/network_stack/drivers/network/tcpip/tcpip/cinfo.c branches/network_stack/drivers/network/tcpip/tcpip/fileobjs.c branches/network_stack/drivers/network/tcpip/tcpip/info.c branches/network_stack/drivers/network/tcpip/tcpip/lock.c branches/network_stack/drivers/network/tcpip/tcpip/mockbuffer.c branches/network_stack/drivers/network/tcpip/tcpip/mocklock.c branches/network_stack/drivers/network/tcpip/tcpip/mockpool.c branches/network_stack/drivers/network/tcpip/tcpip/mockwait.c branches/network_stack/drivers/network/tcpip/tcpip/ninfo.c branches/network_stack/drivers/network/tcpip/tcpip/proto.c branches/network_stack/drivers/network/tcpip/tcpip/resource.rc branches/network_stack/drivers/network/tcpip/tcpip/tcpip.def branches/network_stack/drivers/network/tcpip/tcpip/tinfo.c branches/network_stack/drivers/network/tcpip/tcpip/wait.c branches/network_stack/drivers/network/tcpip/tests/setup.c branches/network_stack/drivers/network/tcpip/tests/stubs.tst branches/network_stack/drivers/network/tcpip/tests/tests/ipreceive.c branches/network_stack/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c branches/network_stack/lib/drivers/ip/network/address.c branches/network_stack/lib/drivers/ip/network/arp.c branches/network_stack/lib/drivers/ip/network/checksum.c branches/network_stack/lib/drivers/ip/network/i386/checksum.S branches/network_stack/lib/drivers/ip/network/icmp.c branches/network_stack/lib/drivers/ip/network/ip.c branches/network_stack/lib/drivers/ip/network/loopback.c branches/network_stack/lib/drivers/ip/network/neighbor.c branches/network_stack/lib/drivers/ip/network/ports.c branches/network_stack/lib/drivers/ip/network/receive.c branches/network_stack/lib/drivers/ip/network/router.c branches/network_stack/lib/drivers/ip/network/transmit.c branches/network_stack/lib/drivers/ip/precomp.h branches/network_stack/lib/drivers/ip/transport/datagram/datagram.c branches/network_stack/lib/drivers/ip/transport/rawip/rawip.c branches/network_stack/lib/drivers/ip/transport/tcp/accept.c branches/network_stack/lib/drivers/ip/transport/tcp/if.c branches/network_stack/lib/drivers/ip/transport/tcp/tcp.c branches/network_stack/lib/drivers/ip/transport/udp/udp.c branches/network_stack/lib/drivers/lwip/src/rosip.c branches/network_stack/lib/drivers/lwip/src/rostcp.c Modified: branches/network_stack/ (props changed) branches/network_stack/lib/drivers/CMakeLists.txt branches/network_stack/lib/drivers/lwip/CMakeLists.txt branches/network_stack/lib/drivers/lwip/src/include/lwipopts.h branches/network_stack/lib/drivers/lwip/src/sys_arch.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/network_stack/drivers/network/tcpip/DIRS URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/datalink/SOURCES URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/address.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/arp.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/checksum.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/datagram.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/debug.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/fileobjs.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/icmp.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/info.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/ip.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/lan.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/linux.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/lock.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/loopback.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/neighbor.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/pool.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/ports.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/rawip.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/receive.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/route.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/router.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/routines.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/tags.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/tcpcore.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/tcpdef.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/tcpip.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/ticonsts.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/tilists.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/transmit.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/udp.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/include/wait.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/notes.txt URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/SOURCES URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/ainfo.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/cinfo.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/info.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/lock.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/mockbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/mocklock.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/mockpool.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/mockwait.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/proto.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/resource.rc URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/tcpip.def URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/tinfo.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tcpip/wait.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tests/setup.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tests/stubs.tst URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tests/tests/ipreceive.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Removed: branches/network_stack/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/drivers/network/t… Modified: branches/network_stack/lib/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/CMake… Removed: branches/network_stack/lib/drivers/ip/network/address.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/ne… Removed: branches/network_stack/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/ne… Removed: branches/network_stack/lib/drivers/ip/network/checksum.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/ne… Removed: branches/network_stack/lib/drivers/ip/network/i386/checksum.S URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/ne… Removed: branches/network_stack/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/ne… Removed: branches/network_stack/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/ne… Removed: branches/network_stack/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/ne… Removed: branches/network_stack/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/ne… Removed: branches/network_stack/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/ne… Removed: branches/network_stack/lib/drivers/ip/network/receive.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/ne… Removed: branches/network_stack/lib/drivers/ip/network/router.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/ne… Removed: branches/network_stack/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/ne… Removed: branches/network_stack/lib/drivers/ip/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/pr… Removed: branches/network_stack/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/tr… Removed: branches/network_stack/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/tr… Removed: branches/network_stack/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/tr… Removed: branches/network_stack/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/tr… Removed: branches/network_stack/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/tr… Removed: branches/network_stack/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/ip/tr… Modified: branches/network_stack/lib/drivers/lwip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/lwip/… Modified: branches/network_stack/lib/drivers/lwip/src/include/lwipopts.h URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/lwip/… Removed: branches/network_stack/lib/drivers/lwip/src/rosip.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/lwip/… Removed: branches/network_stack/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/lwip/… Modified: branches/network_stack/lib/drivers/lwip/src/sys_arch.c URL: http://svn.reactos.org/svn/reactos/branches/network_stack/lib/drivers/lwip/…

8 years, 6 months

[akhaldi] 71023: [NETWORK_STACK] Introduce a branch to base Jerome's network stack work from the tcpip_revolution branch on top of the latest ReactOS revisions. Explorer renaming issues prevented u...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 18 18:06:07 2016 New Revision: 71023 URL: http://svn.reactos.org/svn/reactos?rev=71023&view=rev Log: [NETWORK_STACK] Introduce a branch to base Jerome's network stack work from the tcpip_revolution branch on top of the latest ReactOS revisions. Explorer renaming issues prevented us from simply syncing that branch. Added: branches/network_stack/ (props changed) - copied from r71022, trunk/reactos/ Propchange: branches/network_stack/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Mar 18 18:06:07 2016 @@ -0,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/network_stack/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Mar 18 18:06:07 2016 @@ -0,0 +1,22 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/condrv_restructure:63104-65657 +/branches/header-work:45691-47721 +/branches/kd++:58883-58973 +/branches/kernel-fun/reactos:62291,62294,62301-62302,62304,62321-62322,62353,62531-62532,62853,64152,64173-64174,65253 +/branches/ntvdm:59241-63176 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_3_15-lt2013:59059 +/branches/ros-csrss:57561-58762 +/branches/shell-experiments:61927-65494 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 +/branches/wlan-bringup:54809-54998 Propchange: branches/network_stack/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

8 years, 6 months

[akhaldi] 71022: [INETCPL][MMSYS][MSTSC][REGEDIT][SHELL32] Minor icon fixes by Jared Smudde. CORE-10987

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 18 10:44:46 2016 New Revision: 71022 URL: http://svn.reactos.org/svn/reactos?rev=71022&view=rev Log: [INETCPL][MMSYS][MSTSC][REGEDIT][SHELL32] Minor icon fixes by Jared Smudde. CORE-10987 Modified: trunk/reactos/base/applications/mstsc/res/mstsc.ico trunk/reactos/base/applications/regedit/res/bin.ico trunk/reactos/base/applications/regedit/res/string.ico trunk/reactos/dll/cpl/inetcpl/resources/history.ico trunk/reactos/dll/cpl/mmsys/resources/4390.ico trunk/reactos/dll/cpl/mmsys/resources/4393.ico trunk/reactos/dll/win32/shell32/res/icons/25.ico Modified: trunk/reactos/base/applications/mstsc/res/mstsc.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/regedit/res/bin.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/regedit/res/string.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/inetcpl/resources/history.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resources/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/mmsys/resources/4390.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/mmsys/resources/4393.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/25.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available.

8 years, 6 months

[akhaldi] 71021: [MUP][NTOS] Fix some misspellings. By Jared Smudde. CORE-10984

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 18 10:29:46 2016 New Revision: 71021 URL: http://svn.reactos.org/svn/reactos?rev=71021&view=rev Log: [MUP][NTOS] Fix some misspellings. By Jared Smudde. CORE-10984 Modified: trunk/reactos/drivers/filesystems/mup/mup.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] Fri Mar 18 10:29:46 2016 @@ -2157,7 +2157,7 @@ ExReleaseResourceLite(&MasterQueryContext->QueryPathListLock); /* Query the provider !*/ - DPRINT1("Requeting UNC provider: %wZ\n", &UncProvider->DeviceName); + DPRINT1("Requesting UNC provider: %wZ\n", &UncProvider->DeviceName); DPRINT("Calling: %wZ\n", &UncProvider->DeviceObject->DriverObject->DriverName); Status = IoCallDriver(UncProvider->DeviceObject, QueryIrp); } Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Fri Mar 18 10:29:46 2016 @@ -704,7 +704,7 @@ /* Check if this was synch I/O */ if (!LocalEvent) { - /* Check if the requet is pending */ + /* Check if the request is pending */ if (Status == STATUS_PENDING) { /* Wait on the file object */ @@ -1217,7 +1217,7 @@ /* Check if this was synch I/O */ if (!LocalEvent) { - /* Check if the requet is pending */ + /* Check if the request is pending */ if (Status == STATUS_PENDING) { /* Wait on the file object */

8 years, 6 months

[zguo] 71020: Implement SHA1 checksum in new RAPPS. Patch by Mark Jansen. CORE-10908 #resolve

by zguo＠svn.reactos.org

Author: zguo Date: Fri Mar 18 06:40:39 2016 New Revision: 71020 URL: http://svn.reactos.org/svn/reactos?rev=71020&view=rev Log: Implement SHA1 checksum in new RAPPS. Patch by Mark Jansen. CORE-10908 #resolve Added: trunk/reactos/base/applications/rapps_new/integrity.cpp (with props) Modified: trunk/reactos/base/applications/rapps_new/CMakeLists.txt trunk/reactos/base/applications/rapps_new/available.cpp trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc trunk/reactos/base/applications/rapps_new/lang/de-DE.rc trunk/reactos/base/applications/rapps_new/lang/en-US.rc trunk/reactos/base/applications/rapps_new/lang/es-ES.rc trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc trunk/reactos/base/applications/rapps_new/lang/he-IL.rc trunk/reactos/base/applications/rapps_new/lang/it-IT.rc trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc trunk/reactos/base/applications/rapps_new/lang/no-NO.rc trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc trunk/reactos/base/applications/rapps_new/loaddlg.cpp trunk/reactos/base/applications/rapps_new/rapps.h trunk/reactos/base/applications/rapps_new/resource.h trunk/reactos/lib/cryptlib/sha1.h Modified: trunk/reactos/base/applications/rapps_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/CMakeLists.txt [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -3,6 +3,7 @@ set_cpp(WITH_RUNTIME) include_directories(${REACTOS_SOURCE_DIR}/lib/atl) +include_directories(${REACTOS_SOURCE_DIR}/lib/cryptlib) list(APPEND SOURCE aboutdlg.cpp @@ -10,6 +11,7 @@ gui.cpp installdlg.cpp installed.cpp + integrity.cpp loaddlg.cpp misc.cpp settingsdlg.cpp Modified: trunk/reactos/base/applications/rapps_new/available.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/available.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/available.cpp [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -260,6 +260,7 @@ GET_STRING2(L"Size", Info->szSize); GET_STRING2(L"URLSite", Info->szUrlSite); GET_STRING2(L"CDPath", Info->szCDPath); + GET_STRING2(L"SHA1", Info->szSHA1); } if (!lpEnumProc(Info)) Added: trunk/reactos/base/applications/rapps_new/integrity.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/integrity.cpp (added) +++ trunk/reactos/base/applications/rapps_new/integrity.cpp [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -0,0 +1,61 @@ +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/rapps_new/integrity.cpp + * PURPOSE: Various integrity check mechanisms + * PROGRAMMERS: Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) + * Mark Jansen + */ + +#include "rapps.h" +#include <sha1.h> + + +BOOL VerifyInteg(LPCWSTR lpSHA1Hash, LPCWSTR lpFileName) +{ + BOOL ret = FALSE; + + /* first off, does it exist at all? */ + HANDLE file = CreateFileW(lpFileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); + + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + /* let's grab the actual file size to organize the mmap'ing rounds */ + LARGE_INTEGER size; + GetFileSizeEx(file, &size); + + /* retrieve a handle to map the file contents to memory */ + HANDLE map = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL); + if (map) + { + /* map that thing in address space */ + const unsigned char *file_map = static_cast<const unsigned char *>(MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0)); + if (file_map) + { + SHA_CTX ctx; + /* initialize the SHA-1 context */ + A_SHAInit(&ctx); + + /* feed the data to the cookie monster */ + A_SHAUpdate(&ctx, file_map, size.LowPart); + + /* cool, we don't need this anymore */ + UnmapViewOfFile(file_map); + + /* we're done, compute the final hash */ + ULONG sha[5]; + A_SHAFinal(&ctx, sha); + + WCHAR buf[(sizeof(sha) * 2) + 1]; + for (UINT i = 0; i < sizeof(sha); i++) + swprintf(buf + 2 * i, L"%02x", ((unsigned char *)sha)[i]); + /* does the resulting SHA1 match with the provided one? */ + if (!_wcsicmp(buf, lpSHA1Hash)) + ret = TRUE; + } + CloseHandle(map); + } + CloseHandle(file); + return ret; +} Propchange: trunk/reactos/base/applications/rapps_new/integrity.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -201,4 +201,7 @@ IDS_INFORMATION "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ÐÑÐµÐ¼Ð°ÑÐ²Ð°Ð½ÐµÑÐ¾ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸ÑÐµ Ð·Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð¾Ñ ÑÐµÐ³Ð¸ÑÑÑÑÐ° Ðµ Ð½ÐµÐ²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END Modified: trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -202,4 +202,7 @@ IDS_INFORMATION "Informace" IDS_UNABLE_TO_DOWNLOAD "Soubor se nepodaÅilo stÃ¡hnout! Adresa nenalezena!" IDS_UNABLE_TO_REMOVE "NepodaÅilo se odstranit data programu z registru!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END Modified: trunk/reactos/base/applications/rapps_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/de-DE.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -197,4 +197,7 @@ IDS_INFORMATION "Informationen" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry lÃ¶schen!" -END + IDS_CERT_DOES_NOT_MATCH "ÃberprÃ¼fung des SSL-Zertifikats fehlgeschlagen." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END Modified: trunk/reactos/base/applications/rapps_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/en-US.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -197,4 +197,7 @@ IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END Modified: trunk/reactos/base/applications/rapps_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/es-ES.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -200,4 +200,7 @@ IDS_INFORMATION "InformaciÃ³n" IDS_UNABLE_TO_DOWNLOAD "No se pudo descargar el paquete. No se ha encontrado la direcciÃ³n de Internet." IDS_UNABLE_TO_REMOVE "No se pudieron borrar del Registro los datos de instalaciÃ³n del programa." -END + IDS_CERT_DOES_NOT_MATCH "Ha fallado la comprobaciÃ³n del certificado SSL." + IDS_INTEG_CHECK_TITLE "Verificando integridad del paquete..." + IDS_INTEG_CHECK_FAIL "El paquete no ha pasado la comprobaciÃ³n de integridad, puede haber sido alterado o estar corrupto. No se recomienda ejecutarlo." +END Modified: trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -197,4 +197,7 @@ IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Impossible de tÃ©lÃ©charger le paquet : adresse introuvable !" IDS_UNABLE_TO_REMOVE "Impossible de supprimer du registre les donnÃ©es du programme !" -END + IDS_CERT_DOES_NOT_MATCH "La vÃ©rification du certificat SSL a Ã©chouÃ©." + IDS_INTEG_CHECK_TITLE "VÃ©rification de l'intÃ©gritÃ© du paquet..." + IDS_INTEG_CHECK_FAIL "Le contrÃ´le d'intÃ©gritÃ© du paquet a Ã©chouÃ©, il se peut qu'il ait Ã©tÃ© corrompu ou altÃ©rÃ© au cours du tÃ©lÃ©chargement. L'exÃ©cution du programme n'est pas recommandÃ©e." +END Modified: trunk/reactos/base/applications/rapps_new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/he-IL.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -199,4 +199,7 @@ IDS_INFORMATION "××××¢" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END Modified: trunk/reactos/base/applications/rapps_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/it-IT.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -197,4 +197,7 @@ IDS_INFORMATION "Informazioni" IDS_UNABLE_TO_DOWNLOAD "Impossibile scaricare il pacchetto! Indirizzo non trovato!" IDS_UNABLE_TO_REMOVE "Impossibile cancellare i dati dal registro!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END Modified: trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -197,4 +197,7 @@ IDS_INFORMATION "æå ±" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ã¬ã¸ã¹ããªãããã®ããã°ã©ã ã«é¢ãããã¼ã¿ãåé¤ã§ãã¾ãã!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END Modified: trunk/reactos/base/applications/rapps_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/no-NO.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -197,4 +197,7 @@ IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END Modified: trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -205,4 +205,7 @@ IDS_INFORMATION "Informacja" IDS_UNABLE_TO_DOWNLOAD "Nie moÅ¼na pobraÄ pakietu! Nie znaleziono adresu!" IDS_UNABLE_TO_REMOVE "Nie moÅ¼na byÅo usunÄÄ wpisu z rejestru!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END Modified: trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -199,4 +199,7 @@ IDS_INFORMATION "InformaÃ§Ãµes" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "NÃ£o foi possÃvel remover as informaÃ§Ãµes do programa do registro!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END Modified: trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -203,4 +203,7 @@ IDS_INFORMATION "InformaÈie" IDS_UNABLE_TO_DOWNLOAD "Pachetul nu poate fi descÄrcat! Adresa nu este gÄsitÄ!" IDS_UNABLE_TO_REMOVE "Nu se pot elimina datele din registru pentru acest program!" -END + IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eÈuat." + IDS_INTEG_CHECK_TITLE "Se verificÄ integritatea pachetuluiâ¦" + IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandatÄ." +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] Fri Mar 18 06:40:39 2016 @@ -197,4 +197,7 @@ IDS_INFORMATION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Ð¸Ð· ÑÐµÐµÑÑÑÐ°!" -END + IDS_CERT_DOES_NOT_MATCH "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ SSL ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ°." + IDS_INTEG_CHECK_TITLE "ÐÑÐ¾Ð²ÐµÑÐºÐ° ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ..." + IDS_INTEG_CHECK_FAIL "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¿ÑÐ¾ÑÐ»Ð¾ Ð¿ÑÐ¾Ð²ÐµÑÐºÑ ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð½Ð¾ Ð±ÑÐ»Ð¾ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ð¾ Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¼ÐµÐ½ÐµÐ½Ð¾. ÐÐ°Ð¿ÑÑÐº Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ." +END Modified: trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -202,4 +202,7 @@ IDS_INFORMATION "InformÃ¡cie" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Nie je moÅ¾nÃ© odstrÃ¡niÅ¥ z registrov Ãºdaje o programe!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END Modified: trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -201,4 +201,7 @@ IDS_INFORMATION "Informacione" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "E pamundur te fshihen informacionet e programit nga regjistri!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END Modified: trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -204,4 +204,7 @@ IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Det gick ej att ta bort programmets data frÃ¥n registret!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END Modified: trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -199,4 +199,7 @@ IDS_INFORMATION "Bilgi" IDS_UNABLE_TO_DOWNLOAD "Paket indirilemez! Adres bulunamadÄ±!" IDS_UNABLE_TO_REMOVE "Ä°zlencenin giriÅi deÄer defterinden silinemiyor." -END + IDS_CERT_DOES_NOT_MATCH "SSL onay belgesi doÄrulamasÄ± baÅarÄ±sÄ±z." + IDS_INTEG_CHECK_TITLE "Paket bÃ¼tÃ¼nlÃ¼ÄÃ¼ doÄrulanÄ±yor..." + IDS_INTEG_CHECK_FAIL "Paket bÃ¼tÃ¼nlÃ¼k denetimini geÃ§medi, bozulmuÅ veyÃ¢ indirme esnÃ¢sÄ±nda oynanmÄ±Å olabilir. YazÄ±lÄ±mÄ± Ã§alÄ±ÅtÄ±rmak Ã¶nerilmez." +END Modified: trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -205,4 +205,7 @@ IDS_INFORMATION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð´Ð°Ð½Ñ Ð¿ÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð· ÑÐµÑÑÑÑÑ!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END Modified: trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -199,4 +199,7 @@ IDS_INFORMATION "ä¿¡æ¯" IDS_UNABLE_TO_DOWNLOAD "æ æ³ä¸è½½è¯¥è½¯ä»¶å ï¼æ¾ä¸å°ç½ç»çå°å ï¼" IDS_UNABLE_TO_REMOVE "æ æ³ä»æ³¨åè¡¨å é¤è¯¥ç¨åºçæ°æ®ï¼" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." +END 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] Fri Mar 18 06:40:39 2016 @@ -199,4 +199,7 @@ IDS_INFORMATION "è³è¨" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ç¡æ³å¾ç»éæªåªé¤è©²ç¨å¼çè³æï¼" -END + IDS_CERT_DOES_NOT_MATCH "SSL æèé©èå¤±æã" + IDS_INTEG_CHECK_TITLE "é©èå¥è£è»é«çå®æ´æ§..." + IDS_INTEG_CHECK_FAIL "åæ²æééå®æ´æ§æª¢æ¥ï¼å®å¯è½å·²æå£ï¼æèå¨ä¸è¼éç¨ä¸ç¯¡æ¹ãå»ºè°æ¨ä¸è¦éè¡è©²è»é«ã" +END 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] Fri Mar 18 06:40:39 2016 @@ -207,6 +207,13 @@ if (FAILED(StringCbCatW(path, sizeof(path), p + 1))) goto end; + if (!bCab && AppInfo->szSHA1[0] != 0 && GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES) + { + /* only open it in case of total correctness */ + if (VerifyInteg(AppInfo->szSHA1, path)) + goto run; + } + /* download it */ bTempfile = TRUE; CDownloadDialog_Constructor(Dlg, &bCancelled, IID_PPV_ARG(IBindStatusCallback, &dl)); @@ -293,8 +300,32 @@ if (bCancelled) goto end; + /* if this thing isn't a RAPPS update and it has a SHA-1 checksum + verify its integrity by using the native advapi32.A_SHA1 functions */ + if (!bCab && AppInfo->szSHA1[0] != 0) + { + WCHAR szMsgText[MAX_STR_LEN]; + + /* change a few strings in the download dialog to reflect the verification process */ + LoadStringW(hInst, IDS_INTEG_CHECK_TITLE, szMsgText, _countof(szMsgText)); + + SetWindowText(Dlg, szMsgText); + SendMessageW(GetDlgItem(Dlg, IDC_DOWNLOAD_STATUS), WM_SETTEXT, 0, (LPARAM)path); + + /* this may take a while, depending on the file size */ + if (!VerifyInteg(AppInfo->szSHA1, path)) + { + if (!LoadStringW(hInst, IDS_INTEG_CHECK_FAIL, szMsgText, _countof(szMsgText))) + goto end; + + MessageBoxW(Dlg, szMsgText, NULL, MB_OK | MB_ICONERROR); + goto end; + } + } + ShowWindow(Dlg, SW_HIDE); +run: /* run it */ if (!bCab) ShellExecuteW( NULL, L"open", path, NULL, NULL, SW_SHOWNORMAL ); Modified: trunk/reactos/base/applications/rapps_new/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/rapps.h [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -89,8 +89,8 @@ FILETIME ftCacheStamp; LIST_ENTRY List; - /* optional integrity checks */ - BYTE MD5Checksum[16]; + /* optional integrity checks (SHA-1 digests are 160 bit = 40 characters in hex string form) */ + WCHAR szSHA1[40 + 1]; } APPLICATION_INFO, *PAPPLICATION_INFO; @@ -185,6 +185,9 @@ extern HWND hListView; extern WCHAR szSearchPattern[MAX_STR_LEN]; +/* integrity.cpp */ +BOOL VerifyInteg(LPCWSTR lpSHA1Hash, LPCWSTR lpFileName); + //extern HWND hTreeView; //BOOL CreateTreeView(HWND hwnd); //HTREEITEM TreeViewAddItem(HTREEITEM hParent, LPWSTR lpText, INT Image, INT SelectedImage, LPARAM lParam); Modified: trunk/reactos/base/applications/rapps_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/resource.h [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -96,6 +96,9 @@ #define IDS_INFORMATION 117 #define IDS_UNABLE_TO_REMOVE 118 #define IDS_UNABLE_TO_DOWNLOAD 119 +#define IDS_CERT_DOES_NOT_MATCH 120 +#define IDS_INTEG_CHECK_TITLE 121 +#define IDS_INTEG_CHECK_FAIL 122 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200 Modified: trunk/reactos/lib/cryptlib/sha1.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cryptlib/sha1.h?rev=71… ============================================================================== --- trunk/reactos/lib/cryptlib/sha1.h [iso-8859-1] (original) +++ trunk/reactos/lib/cryptlib/sha1.h [iso-8859-1] Fri Mar 18 06:40:39 2016 @@ -1,5 +1,10 @@ #pragma once + +#ifdef __cplusplus +extern "C" { +#endif + #include <ntdef.h> @@ -21,4 +26,7 @@ VOID NTAPI A_SHAFinal(PSHA_CTX Context, PULONG Result); +#ifdef __cplusplus +} +#endif

8 years, 6 months

[pschweitzer] 71019: [MPR] Import Wine commit: - e8c8ddcbfc8bc4458add06062005a4022162deab, Don't send lpRemoteName when requesting network place. This is the end: ReactOS WNet is fully in sync with...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Mar 17 18:18:18 2016 New Revision: 71019 URL: http://svn.reactos.org/svn/reactos?rev=71019&view=rev Log: [MPR] Import Wine commit: - e8c8ddcbfc8bc4458add06062005a4022162deab, Don't send lpRemoteName when requesting network place. This is the end: ReactOS WNet is fully in sync with Wine, with all the features required for network providers in. Enjoy your VBox/VMware shared folders working with synced upstream! CORE-10878 CORE-10032 Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_ros.diff… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] Thu Mar 17 18:18:18 2016 @@ -45,29 +45,3 @@ 22 stdcall @(long) MPR_Alloc 23 stdcall @(ptr long) MPR_ReAlloc 24 stdcall @(ptr) MPR_Free -Index: wnet.c -=================================================================== ---- wnet.c (rÃ©vision 70645) -+++ wnet.c (copie de travail) -@@ -750,7 +750,12 @@ - providerTable->table[index].dwEnumScopes & WNNC_ENUM_GLOBAL) - { - HANDLE handle; -+ PVOID RemoteName = lpNet->lpRemoteName; - -+ if ((lpNet->dwUsage & RESOURCEUSAGE_CONTAINER) && -+ RemoteName && !strcmpW(RemoteName, lpNet->lpProvider)) -+ lpNet->lpRemoteName = NULL; -+ - ret = providerTable->table[index].openEnum( - dwScope, dwType, dwUsage, lpNet, &handle); - if (ret == WN_SUCCESS) -@@ -760,6 +765,8 @@ - ret = *lphEnum ? WN_SUCCESS : - WN_OUT_OF_MEMORY; - } -+ -+ lpNet->lpRemoteName = RemoteName; - } - else - ret = WN_NOT_SUPPORTED; Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Thu Mar 17 18:18:18 2016 @@ -750,7 +750,7 @@ providerTable->table[index].dwEnumScopes & WNNC_ENUM_GLOBAL) { HANDLE handle; - PVOID RemoteName = lpNet->lpRemoteName; + PWSTR RemoteName = lpNet->lpRemoteName; if ((lpNet->dwUsage & RESOURCEUSAGE_CONTAINER) && RemoteName && !strcmpW(RemoteName, lpNet->lpProvider))

8 years, 6 months

[gedmurphy] 71018: Implement CHeapPtr with a template allocator. Re-Implement CComHeapPtr by deriving from CHeapPtr with a COM allocator Patch by Mark Jansen CORE 10903

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Mar 17 18:05:44 2016 New Revision: 71018 URL: http://svn.reactos.org/svn/reactos?rev=71018&view=rev Log: Implement CHeapPtr with a template allocator. Re-Implement CComHeapPtr by deriving from CHeapPtr with a COM allocator Patch by Mark Jansen CORE 10903 Added: trunk/reactos/lib/atl/atlalloc.h (with props) Modified: trunk/reactos/lib/atl/atlbase.h Added: trunk/reactos/lib/atl/atlalloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlalloc.h?rev=710… ============================================================================== --- trunk/reactos/lib/atl/atlalloc.h (added) +++ trunk/reactos/lib/atl/atlalloc.h [iso-8859-1] Thu Mar 17 18:05:44 2016 @@ -0,0 +1,194 @@ +/* + * ReactOS ATL + * + * Copyright 2009 Andrew Hill <ash77(a)reactos.org> + * Copyright 2016 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#pragma once + +class CCRTAllocator +{ +public: + static void* Allocate(_In_ size_t size) + { + return malloc(size); + } + + static void* Reallocate(_In_opt_ void* ptr, _In_ size_t size) + { + return realloc(ptr, size); + } + + static void Free(_In_opt_ void* ptr) + { + free(ptr); + } +}; + +class CLocalAllocator +{ +public: + static void* Allocate(_In_ size_t size) + { + return ::LocalAlloc(LMEM_FIXED, size); + } + + static void* Reallocate(_In_opt_ void* ptr, _In_ size_t size) + { + if (!ptr) + return Allocate(size); + if (size == 0) + { + Free(ptr); + return NULL; + } + return ::LocalReAlloc(ptr, size, 0); + } + + static void Free(_In_opt_ void* ptr) + { + ::LocalFree(ptr); + } +}; + +class CGlobalAllocator +{ +public: + static void* Allocate(_In_ size_t size) + { + return ::GlobalAlloc(GMEM_FIXED, size); + } + + static void* Reallocate(_In_opt_ void* ptr, _In_ size_t size) + { + if (!ptr) + return Allocate(size); + if (size == 0) + { + Free(ptr); + return NULL; + } + return ::GlobalReAlloc(ptr, size, 0); + } + + static void Free(_In_opt_ void* ptr) + { + GlobalFree(ptr); + } +}; + + +template<class T, class Allocator = CCRTAllocator> +class CHeapPtr +{ +public: + CHeapPtr() : + m_Data(NULL) + { + } + + explicit CHeapPtr(T *lp) : + m_Data(lp) + { + } + + explicit CHeapPtr(CHeapPtr<T, Allocator> &lp) + { + m_Data = lp.Detach(); + } + + ~CHeapPtr() + { + Free(); + } + + CHeapPtr<T, Allocator>& operator = (CHeapPtr<T, Allocator> &lp) + { + if (lp.m_Data != m_Data) + Attach(lp.Detach()); + return *this; + } + + bool AllocateBytes(_In_ size_t nBytes) + { + ATLASSERT(m_Data == NULL); + m_Data = static_cast<T*>(Allocator::Allocate(nBytes)); + return m_Data != NULL; + } + + bool ReallocateBytes(_In_ size_t nBytes) + { + T* newData = static_cast<T*>(Allocator::Reallocate(m_Data, nBytes)); + if (newData == NULL) + return false; + m_Data = newData; + return true; + } + + bool Allocate(_In_ size_t nElements = 1) + { + return AllocateBytes(nElements * sizeof(T)); + } + + bool Reallocate(_In_ size_t nElements) + { + return ReallocateBytes(nElements * sizeof(T)); + } + + void Free() + { + if (m_Data) + { + Allocator::Free(m_Data); + m_Data = NULL; + } + } + + void Attach(T *lp) + { + Allocator::Free(m_Data); + m_Data = lp; + } + + T *Detach() + { + T *saveP = m_Data; + m_Data = NULL; + return saveP; + } + + T **operator &() + { + ATLASSERT(m_Data == NULL); + return &m_Data; + } + + operator T* () const + { + return m_Data; + } + + T* operator->() const + { + return m_Data; + } + +protected: + T *m_Data; +}; + Propchange: trunk/reactos/lib/atl/atlalloc.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlbase.h?rev=7101… ============================================================================== --- trunk/reactos/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlbase.h [iso-8859-1] Thu Mar 17 18:05:44 2016 @@ -23,6 +23,7 @@ #include "atlcore.h" #include "statreg.h" #include "atlcomcli.h" +#include "atlalloc.h" #ifdef _MSC_VER // It is common to use this in ATL constructors. They only store this for later use, so the usage is safe. @@ -817,91 +818,38 @@ extern CAtlWinModule _AtlWinModule; - -// TODO: When someone needs it, make the allocator a template, so you can use it for both -// CoTask* allocations, and CRT-like allocations (malloc, realloc, free) +class CComAllocator +{ +public: + static void* Allocate(_In_ size_t size) + { + return ::CoTaskMemAlloc(size); + } + + static void* Reallocate(_In_opt_ void* ptr, _In_ size_t size) + { + return ::CoTaskMemRealloc(ptr, size); + } + + static void Free(_In_opt_ void* ptr) + { + ::CoTaskMemFree(ptr); + } +}; + + template<class T> -class CComHeapPtr -{ -public: - CComHeapPtr() : - m_Data(NULL) +class CComHeapPtr : public CHeapPtr<T, CComAllocator> +{ +public: + CComHeapPtr() { } explicit CComHeapPtr(T *lp) : - m_Data(lp) - { - } - - explicit CComHeapPtr(CComHeapPtr<T> &lp) - { - m_Data = lp.Detach(); - } - - ~CComHeapPtr() - { - Release(); - } - - T *operator = (CComHeapPtr<T> &lp) - { - if (lp.m_Data != m_Data) - Attach(lp.Detach()); - return *this; - } - - bool Allocate(size_t nElements = 1) - { - ATLASSERT(m_Data == NULL); - m_Data = static_cast<T*>(::CoTaskMemAlloc(nElements * sizeof(T))); - return m_Data != NULL; - } - - bool Reallocate(_In_ size_t nElements) - { - T* newData = static_cast<T*>(::CoTaskMemRealloc(m_Data, nElements * sizeof(T))); - if (newData == NULL) - return false; - m_Data = newData; - return true; - } - - void Release() - { - if (m_Data) - { - ::CoTaskMemFree(m_Data); - m_Data = NULL; - } - } - - void Attach(T *lp) - { - Release(); - m_Data = lp; - } - - T *Detach() - { - T *saveP = m_Data; - m_Data = NULL; - return saveP; - } - - T **operator &() - { - ATLASSERT(m_Data == NULL); - return &m_Data; - } - - operator T* () const - { - return m_Data; - } - -protected: - T *m_Data; + CHeapPtr<T, CComAllocator>(lp) + { + } };

8 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2016