Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 71401: Create the lwIP branch for Zuodian's work
by pschweitzer＠svn.reactos.org 25 May '16

25 May '16

Author: pschweitzer Date: Wed May 25 20:17:17 2016 New Revision: 71401 URL: http://svn.reactos.org/svn/reactos?rev=71401&view=rev Log: Create the lwIP branch for Zuodian's work Added: branches/GSoC_2016/lwIP/ (props changed) - copied from r71400, branches/network_stack/ Propchange: branches/GSoC_2016/lwIP/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed May 25 20:17:17 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/GSoC_2016/lwIP/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed May 25 20:17:17 2016 @@ -0,0 +1,23 @@ +/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/tcpip_revolution:65359-71023 +/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/GSoC_2016/lwIP/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[mjansen] 71400: [APPHELP_APITEST] Remove some code duplication.
by mjansen＠svn.reactos.org 25 May '16

25 May '16

Author: mjansen Date: Wed May 25 17:22:47 2016 New Revision: 71400 URL: http://svn.reactos.org/svn/reactos?rev=71400&view=rev Log: [APPHELP_APITEST] Remove some code duplication. Modified: trunk/rostests/apitests/apphelp/apphelp.c trunk/rostests/apitests/apphelp/data.c trunk/rostests/apitests/apphelp/layerapi.c Modified: trunk/rostests/apitests/apphelp/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/apphelp.… ============================================================================== --- trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] Wed May 25 17:22:47 2016 @@ -40,21 +40,22 @@ void test_create_exe_imp(const char* name, int skip_rsrc_exports); void test_create_file_imp(const char* name, const char* contents, size_t len); void test_create_ne_imp(const char* name, int skip_names); +DWORD get_host_winver(); #define test_create_exe (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_exe_imp #define test_create_file (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_file_imp #define test_create_ne (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_ne_imp -static DWORD g_Version; - -#define VERSION_ANY 0 -#define VERSION_WINXP 0x0501 -#define VERSION_2003 0x0502 -#define VERSION_VISTA 0x0600 -#define VERSION_WIN7 0x0601 -#define VERSION_WIN8 0x0602 -#define VERSION_WIN10 0x1000 +static DWORD g_WinVersion; + +#define WINVER_ANY 0 +#define WINVER_WINXP 0x0501 +#define WINVER_2003 0x0502 +#define WINVER_VISTA 0x0600 +#define WINVER_WIN7 0x0601 +#define WINVER_WIN8 0x0602 +#define WINVER_WIN10 0x1000 typedef WORD TAG; @@ -187,20 +188,20 @@ const char* tags[7*8]; } data[] = { { - TAG_TYPE_NULL, 0x1000, __LINE__, VERSION_ANY, VERSION_2003, + TAG_TYPE_NULL, 0x1000, __LINE__, WINVER_ANY, WINVER_2003, { "InvalidTag", "INCLUDE", "GENERAL", "MATCH_LOGIC_NOT", "APPLY_ALL_SHIMS", "USE_SERVICE_PACK_FILES", NULL } }, { - TAG_TYPE_NULL, 0x1000, __LINE__, VERSION_VISTA, VERSION_VISTA, + TAG_TYPE_NULL, 0x1000, __LINE__, WINVER_VISTA, WINVER_VISTA, { "InvalidTag", "INCLUDE", "GENERAL", "MATCH_LOGIC_NOT", "APPLY_ALL_SHIMS", "USE_SERVICE_PACK_FILES", "MITIGATION_OS", "BLOCK_UPGRADE", "INCLUDEEXCLUDEDLL", NULL } }, { - TAG_TYPE_NULL, 0x1000, __LINE__, VERSION_WIN7, VERSION_ANY, + TAG_TYPE_NULL, 0x1000, __LINE__, WINVER_WIN7, WINVER_ANY, { "InvalidTag", "INCLUDE", "GENERAL", "MATCH_LOGIC_NOT", "APPLY_ALL_SHIMS", "USE_SERVICE_PACK_FILES", "MITIGATION_OS", "BLOCK_UPGRADE", "INCLUDEEXCLUDEDLL", "RAC_EVENT_OFF", "TELEMETRY_OFF", "SHIM_ENGINE_OFF", "LAYER_PROPAGATION_OFF", "REINSTALL_UPGRADE", NULL @@ -208,33 +209,33 @@ }, { - TAG_TYPE_BYTE, 0x1000, __LINE__, VERSION_ANY, VERSION_ANY, + TAG_TYPE_BYTE, 0x1000, __LINE__, WINVER_ANY, WINVER_ANY, { "InvalidTag", NULL } }, { - TAG_TYPE_WORD, 0x800, __LINE__, VERSION_ANY, VERSION_WIN7, + TAG_TYPE_WORD, 0x800, __LINE__, WINVER_ANY, WINVER_WIN7, { "InvalidTag", "MATCH_MODE", NULL } }, { - TAG_TYPE_WORD, 0x800, __LINE__, VERSION_WIN8, VERSION_ANY, + TAG_TYPE_WORD, 0x800, __LINE__, WINVER_WIN8, WINVER_ANY, { "InvalidTag", "MATCH_MODE", "QUIRK_COMPONENT_CODE_ID", "QUIRK_CODE_ID", NULL } }, { - TAG_TYPE_WORD | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_ANY, + TAG_TYPE_WORD | 0x800, 0x800, __LINE__, WINVER_ANY, WINVER_ANY, { "InvalidTag", "TAG", "INDEX_TAG", "INDEX_KEY", NULL } }, { - TAG_TYPE_DWORD, 0x800, __LINE__, VERSION_ANY, VERSION_WINXP, + TAG_TYPE_DWORD, 0x800, __LINE__, WINVER_ANY, WINVER_WINXP, { "InvalidTag", "SIZE", "OFFSET", "CHECKSUM", "SHIM_TAGID", "PATCH_TAGID", "MODULE_TYPE", "VERFILEDATEHI", "VERFILEDATELO", "VERFILEOS", "VERFILETYPE", "PE_CHECKSUM", "PREVOSMAJORVERSION", "PREVOSMINORVERSION", "PREVOSPLATFORMID", "PREVOSBUILDNO", @@ -244,7 +245,7 @@ } }, { - TAG_TYPE_DWORD, 0x800, __LINE__, VERSION_2003, VERSION_2003, + TAG_TYPE_DWORD, 0x800, __LINE__, WINVER_2003, WINVER_2003, { "InvalidTag", "SIZE", "OFFSET", "CHECKSUM", "SHIM_TAGID", "PATCH_TAGID", "MODULE_TYPE", "VERFILEDATEHI", "VERFILEDATELO", "VERFILEOS", "VERFILETYPE", "PE_CHECKSUM", "PREVOSMAJORVERSION", "PREVOSMINORVERSION", "PREVOSPLATFORMID", "PREVOSBUILDNO", @@ -254,7 +255,7 @@ } }, { - TAG_TYPE_DWORD, 0x800, __LINE__, VERSION_VISTA, VERSION_VISTA, + TAG_TYPE_DWORD, 0x800, __LINE__, WINVER_VISTA, WINVER_VISTA, { "InvalidTag", "SIZE", "OFFSET", "CHECKSUM", "SHIM_TAGID", "PATCH_TAGID", "MODULE_TYPE", "VERDATEHI", "VERDATELO", "VERFILEOS", "VERFILETYPE", "PE_CHECKSUM", "PREVOSMAJORVER", "PREVOSMINORVER", "PREVOSPLATFORMID", "PREVOSBUILDNO", @@ -265,7 +266,7 @@ } }, { - TAG_TYPE_DWORD, 0x800, __LINE__, VERSION_WIN7, VERSION_ANY, + TAG_TYPE_DWORD, 0x800, __LINE__, WINVER_WIN7, WINVER_ANY, { "InvalidTag", "SIZE", "OFFSET", "CHECKSUM", "SHIM_TAGID", "PATCH_TAGID", "MODULE_TYPE", "VERDATEHI", "VERDATELO", "VERFILEOS", "VERFILETYPE", "PE_CHECKSUM", "PREVOSMAJORVER", "PREVOSMINORVER", "PREVOSPLATFORMID", "PREVOSBUILDNO", @@ -277,21 +278,21 @@ } }, { - TAG_TYPE_DWORD | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_ANY, + TAG_TYPE_DWORD | 0x800, 0x800, __LINE__, WINVER_ANY, WINVER_ANY, { "InvalidTag", "TAGID", NULL } }, { - TAG_TYPE_QWORD, 0x1000, __LINE__, VERSION_ANY, VERSION_WINXP, + TAG_TYPE_QWORD, 0x1000, __LINE__, WINVER_ANY, WINVER_WINXP, { "InvalidTag", "TIME", "BIN_FILE_VERSION", "BIN_PRODUCT_VERSION", "MODTIME", "FLAG_MASK_KERNEL", "UPTO_BIN_PRODUCT_VERSION", "DATA_QWORD", "FLAG_MASK_USER", "FLAGS_NTVDM1", "FLAGS_NTVDM2", "FLAGS_NTVDM3", "FLAG_MASK_SHELL", "UPTO_BIN_FILE_VERSION", NULL } }, { - TAG_TYPE_QWORD, 0x1000, __LINE__, VERSION_2003, VERSION_2003, + TAG_TYPE_QWORD, 0x1000, __LINE__, WINVER_2003, WINVER_2003, { "InvalidTag", "TIME", "BIN_FILE_VERSION", "BIN_PRODUCT_VERSION", "MODTIME", "FLAG_MASK_KERNEL", "UPTO_BIN_PRODUCT_VERSION", "DATA_QWORD", "FLAG_MASK_USER", "FLAGS_NTVDM1", "FLAGS_NTVDM2", "FLAGS_NTVDM3", "FLAG_MASK_SHELL", "UPTO_BIN_FILE_VERSION", "FLAG_MASK_FUSION", "FLAGS_PROCESSPARAM", @@ -299,7 +300,7 @@ } }, { - TAG_TYPE_QWORD, 0x1000, __LINE__, VERSION_VISTA, VERSION_ANY, + TAG_TYPE_QWORD, 0x1000, __LINE__, WINVER_VISTA, WINVER_ANY, { "InvalidTag", "TIME", "BIN_FILE_VERSION", "BIN_PRODUCT_VERSION", "MODTIME", "FLAG_MASK_KERNEL", "UPTO_BIN_PRODUCT_VERSION", "DATA_QWORD", "FLAG_MASK_USER", "FLAGS_NTVDM1", "FLAGS_NTVDM2", "FLAGS_NTVDM3", "FLAG_MASK_SHELL", "UPTO_BIN_FILE_VERSION", "FLAG_MASK_FUSION", "FLAG_PROCESSPARAM", @@ -308,7 +309,7 @@ }, { - TAG_TYPE_STRINGREF, 0x1000, __LINE__, VERSION_ANY, VERSION_2003, + TAG_TYPE_STRINGREF, 0x1000, __LINE__, WINVER_ANY, WINVER_2003, { "InvalidTag", "NAME", "DESCRIPTION", "MODULE", "API", "VENDOR", "APP_NAME", "InvalidTag", "COMMAND_LINE", "COMPANY_NAME", "DLLFILE", "WILDCARD_NAME", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", @@ -318,7 +319,7 @@ } }, { - TAG_TYPE_STRINGREF, 0x1000, __LINE__, VERSION_VISTA, VERSION_VISTA, + TAG_TYPE_STRINGREF, 0x1000, __LINE__, WINVER_VISTA, WINVER_VISTA, { "InvalidTag", "NAME", "DESCRIPTION", "MODULE", "API", "VENDOR", "APP_NAME", "InvalidTag", "COMMAND_LINE", "COMPANY_NAME", "DLLFILE", "WILDCARD_NAME", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", @@ -328,7 +329,7 @@ } }, { - TAG_TYPE_STRINGREF, 0x1000, __LINE__, VERSION_WIN7, VERSION_ANY, + TAG_TYPE_STRINGREF, 0x1000, __LINE__, WINVER_WIN7, WINVER_ANY, { "InvalidTag", "NAME", "DESCRIPTION", "MODULE", "API", "VENDOR", "APP_NAME", "InvalidTag", "COMMAND_LINE", "COMPANY_NAME", "DLLFILE", "WILDCARD_NAME", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", @@ -339,7 +340,7 @@ }, { - TAG_TYPE_LIST, 0x800, __LINE__, VERSION_ANY, VERSION_2003, + TAG_TYPE_LIST, 0x800, __LINE__, WINVER_ANY, WINVER_2003, { "InvalidTag", "DATABASE", "LIBRARY", "INEXCLUDE", "SHIM", "PATCH", "APP", "EXE", "MATCHING_FILE", "SHIM_REF", "PATCH_REF", "LAYER", "FILE", "APPHELP", "LINK", "DATA", @@ -347,7 +348,7 @@ } }, { - TAG_TYPE_LIST, 0x800, __LINE__, VERSION_VISTA, VERSION_VISTA, + TAG_TYPE_LIST, 0x800, __LINE__, WINVER_VISTA, WINVER_VISTA, { "InvalidTag", "DATABASE", "LIBRARY", "INEXCLUDE", "SHIM", "PATCH", "APP", "EXE", "MATCHING_FILE", "SHIM_REF", "PATCH_REF", "LAYER", "FILE", "APPHELP", "LINK", "DATA", @@ -356,7 +357,7 @@ } }, { - TAG_TYPE_LIST, 0x800, __LINE__, VERSION_WIN7, VERSION_ANY, + TAG_TYPE_LIST, 0x800, __LINE__, WINVER_WIN7, WINVER_ANY, { "InvalidTag", "DATABASE", "LIBRARY", "INEXCLUDE", "SHIM", "PATCH", "APP", "EXE", "MATCHING_FILE", "SHIM_REF", "PATCH_REF", "LAYER", "FILE", "APPHELP", "LINK", "DATA", @@ -366,26 +367,26 @@ } }, { - TAG_TYPE_LIST | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_ANY, + TAG_TYPE_LIST | 0x800, 0x800, __LINE__, WINVER_ANY, WINVER_ANY, { "InvalidTag", "STRINGTABLE", "INDEXES", "INDEX", NULL } }, { - TAG_TYPE_STRING, 0x800, __LINE__, VERSION_ANY, VERSION_ANY, + TAG_TYPE_STRING, 0x800, __LINE__, WINVER_ANY, WINVER_ANY, { "InvalidTag", NULL } }, { - TAG_TYPE_STRING | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_2003, + TAG_TYPE_STRING | 0x800, 0x800, __LINE__, WINVER_ANY, WINVER_2003, { "InvalidTag", "STRTAB_ITEM", NULL } }, { - TAG_TYPE_STRING | 0x800, 0x800, __LINE__, VERSION_VISTA, VERSION_ANY, + TAG_TYPE_STRING | 0x800, 0x800, __LINE__, WINVER_VISTA, WINVER_ANY, { "InvalidTag", "STRINGTABLE_ITEM", NULL } @@ -393,21 +394,21 @@ { - TAG_TYPE_BINARY, 0x800, __LINE__, VERSION_ANY, VERSION_2003, + TAG_TYPE_BINARY, 0x800, __LINE__, WINVER_ANY, WINVER_2003, { "InvalidTag", "InvalidTag", "PATCH_BITS", "FILE_BITS", "EXE_ID(GUID)", "DATA_BITS", "MSI_PACKAGE_ID(GUID)", "DATABASE_ID(GUID)", NULL } }, { - TAG_TYPE_BINARY, 0x800, __LINE__, VERSION_VISTA, VERSION_VISTA, + TAG_TYPE_BINARY, 0x800, __LINE__, WINVER_VISTA, WINVER_VISTA, { "InvalidTag", "InvalidTag", "PATCH_BITS", "FILE_BITS", "EXE_ID", "DATA_BITS", "MSI_PACKAGE_ID", "DATABASE_ID", NULL } }, { - TAG_TYPE_BINARY, 0x800, __LINE__, VERSION_WIN7, VERSION_ANY, + TAG_TYPE_BINARY, 0x800, __LINE__, WINVER_WIN7, WINVER_ANY, { "InvalidTag", "InvalidTag", "PATCH_BITS", "FILE_BITS", "EXE_ID", "DATA_BITS", "MSI_PACKAGE_ID", "DATABASE_ID", "CONTEXT_PLATFORM_ID", "CONTEXT_BRANCH_ID", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", @@ -415,7 +416,7 @@ } }, { - TAG_TYPE_BINARY | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_ANY, + TAG_TYPE_BINARY | 0x800, 0x800, __LINE__, WINVER_ANY, WINVER_ANY, { "InvalidTag", "INDEX_BITS", NULL } @@ -430,8 +431,8 @@ int n; for (n = 0; data[n].base; ++n) { - if ((data[n].min_ver == VERSION_ANY || g_Version >= data[n].min_ver) && - (data[n].max_ver == VERSION_ANY || g_Version <= data[n].max_ver)) + if ((data[n].min_ver == WINVER_ANY || g_WinVersion >= data[n].min_ver) && + (data[n].max_ver == WINVER_ANY || g_WinVersion <= data[n].max_ver)) { test_tag(data[n].base, data[n].tags, data[n].upper_limit, data[n].line); } @@ -846,15 +847,8 @@ START_TEST(apphelp) { - RTL_OSVERSIONINFOEXW rtlinfo; - rtlinfo.dwOSVersionInfoSize = sizeof(rtlinfo); -#ifdef __REACTOS__ - RtlGetVersion((PRTL_OSVERSIONINFOW)&rtlinfo); -#else - RtlGetVersion(&rtlinfo); -#endif - g_Version = (rtlinfo.dwMajorVersion << 8) | rtlinfo.dwMinorVersion; - trace("Detected version: 0x%x\n", g_Version); + g_WinVersion = get_host_winver(); + trace("Detected version: 0x%x\n", g_WinVersion); //SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "4"); //SetEnvironmentVariable("DEBUGCHANNEL", "+apphelp"); hdll = LoadLibraryA("apphelp.dll"); @@ -869,10 +863,10 @@ test_ApplicationAttributes(); test_SdbTagToString(); #ifdef __REACTOS__ - if (g_Version < VERSION_WIN7) - { - g_Version = VERSION_WIN7; - trace("Using version 0x%x for SdbTagToString tests\n", g_Version); + if (g_WinVersion < WINVER_WIN7) + { + g_WinVersion = WINVER_WIN7; + trace("Using version 0x%x for SdbTagToString tests\n", g_WinVersion); } #endif test_SdbTagToStringAllTags(); Modified: trunk/rostests/apitests/apphelp/data.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/data.c?r… ============================================================================== --- trunk/rostests/apitests/apphelp/data.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/data.c [iso-8859-1] Wed May 25 17:22:47 2016 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Mark Jansen + * Copyright 2015,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 @@ -783,3 +783,19 @@ } } +static DWORD g_WinVersion; +DWORD get_host_winver() +{ + if (!g_WinVersion) + { + RTL_OSVERSIONINFOEXW rtlinfo = {0}; + void (__stdcall* pRtlGetVersion)(RTL_OSVERSIONINFOEXW*); + pRtlGetVersion = (void (__stdcall*)(RTL_OSVERSIONINFOEXW*))GetProcAddress(GetModuleHandleA("ntdll"), "RtlGetVersion"); + + rtlinfo.dwOSVersionInfoSize = sizeof(rtlinfo); + pRtlGetVersion(&rtlinfo); + g_WinVersion = (rtlinfo.dwMajorVersion << 8) | rtlinfo.dwMinorVersion; + } + return g_WinVersion; +} + Modified: trunk/rostests/apitests/apphelp/layerapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/layerapi… ============================================================================== --- trunk/rostests/apitests/apphelp/layerapi.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/layerapi.c [iso-8859-1] Wed May 25 17:22:47 2016 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Mark Jansen + * Copyright 2015,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 @@ -31,6 +31,8 @@ #include "wine/test.h" +/* data.c */ +DWORD get_host_winver(); #define GPLK_USER 1 #define GPLK_MACHINE 2 @@ -45,10 +47,10 @@ static BOOL(WINAPI *pSetPermLayerState)(PCWSTR wszPath, PCWSTR wszLayer, DWORD dwFlags, BOOL bMachine, BOOL bEnable); -static DWORD g_Version; -#define APPHELP_VISTA 0x0600 -#define APPHELP_WIN8 0x0602 -#define APPHELP_WIN10 0x1000 +static DWORD g_WinVersion; +#define WINVER_VISTA 0x0600 +#define WINVER_WIN8 0x0602 +#define WINVER_WIN10 0x1000 /* Helper function to disable Wow64 redirection on an os that reports it being enabled. */ @@ -137,7 +139,7 @@ else winetest_ok(dwBufSize == lenResult || /* W2k3 is off by 2 when concatenating user / machine */ - broken(g_Version < APPHELP_VISTA && type == (GPLK_MACHINE|GPLK_USER) && (lenResult + 2) == dwBufSize), + broken(g_WinVersion < WINVER_VISTA && type == (GPLK_MACHINE|GPLK_USER) && (lenResult + 2) == dwBufSize), "Expected dwBufSize to be %u, was %u\n", lenResult, dwBufSize); if (result) { @@ -173,7 +175,7 @@ char drive_letter; UINT drivetype = 0; ok(pAllowPermLayer(NULL) == FALSE, "Expected AllowPermLayer to fail for NULL\n"); - if (g_Version < APPHELP_WIN8) + if (g_WinVersion < WINVER_WIN8) { ok(wrapAllowPermLayer("-:"), "Expected AllowPermLayer to succeed\n"); ok(wrapAllowPermLayer("@:"), "Expected AllowPermLayer to succeed\n"); @@ -371,7 +373,7 @@ ok(wrapSetPermLayerState(emptyString, "TEST", 0, bMachine, 0) == FALSE, "Expected SetPermLayerState to fail\n"); expect_LayerValue(bMachine, NULL, NULL); - if (g_Version <= APPHELP_WIN8) + if (g_WinVersion <= WINVER_WIN8) { ok(wrapSetPermLayerState(emptyString, "TEST", 0, bMachine, 1) == FALSE, "Expected SetPermLayerState to fail\n"); expect_LayerValue(bMachine, NULL, NULL); @@ -399,13 +401,13 @@ expect_LayerValue(bMachine, file, "TEST"); ok(wrapSetPermLayerState(fileW, "TEST1", 0, bMachine, 1) == TRUE, "Expected SetPermLayerState to succeed\n"); - expect_LayerValue2(bMachine, file, "TEST TEST1", g_Version >= APPHELP_WIN8, "TEST1 TEST"); + expect_LayerValue2(bMachine, file, "TEST TEST1", g_WinVersion >= WINVER_WIN8, "TEST1 TEST"); ok(wrapSetPermLayerState(fileW, "TEST2", 0, bMachine, 1) == TRUE, "Expected SetPermLayerState to succeed\n"); - expect_LayerValue2(bMachine, file, "TEST TEST1 TEST2", g_Version >= APPHELP_WIN8, "TEST2 TEST1 TEST"); + expect_LayerValue2(bMachine, file, "TEST TEST1 TEST2", g_WinVersion >= WINVER_WIN8, "TEST2 TEST1 TEST"); ok(wrapSetPermLayerState(fileW, "TEST1", 0, bMachine, 0) == TRUE, "Expected SetPermLayerState to succeed\n"); - expect_LayerValue2(bMachine, file, "TEST TEST2", g_Version >= APPHELP_WIN8, "TEST2 TEST"); + expect_LayerValue2(bMachine, file, "TEST TEST2", g_WinVersion >= WINVER_WIN8, "TEST2 TEST"); ok(wrapSetPermLayerState(fileW, "TEST", 0, bMachine, 0) == TRUE, "Expected SetPermLayerState to succeed\n"); expect_LayerValue(bMachine, file, "TEST2"); @@ -415,7 +417,7 @@ /* Valid flags until win8: !# */ /* Key is empty, now play around with the flags. */ - for (dwFlag = ((g_Version >= APPHELP_WIN8) ? 6 : 2); dwFlag < 32; ++dwFlag) + for (dwFlag = ((g_WinVersion >= WINVER_WIN8) ? 6 : 2); dwFlag < 32; ++dwFlag) { ok(wrapSetPermLayerState(fileW, "TEST", (1<<dwFlag), bMachine, 1) == FALSE, "Expected SetPermLayerState to fail on 0x%x\n", (1<<dwFlag)); } @@ -426,23 +428,23 @@ expect_LayerValue(bMachine, file, "# TEST"); ok(wrapSetPermLayerState(fileW, "TEST2", 2, bMachine, 1) == TRUE, "Expected SetPermLayerState to succeed\n"); - expect_LayerValue2(bMachine, file, "!# TEST TEST2", g_Version >= APPHELP_WIN8, "!# TEST2 TEST"); + expect_LayerValue2(bMachine, file, "!# TEST TEST2", g_WinVersion >= WINVER_WIN8, "!# TEST2 TEST"); ok(wrapSetPermLayerState(fileW, "TEST", 0, bMachine, 1) == TRUE, "Expected SetPermLayerState to succeed\n"); - expect_LayerValue2(bMachine, file, "!# TEST2 TEST", g_Version >= APPHELP_WIN8, "!# TEST TEST2"); + expect_LayerValue2(bMachine, file, "!# TEST2 TEST", g_WinVersion >= WINVER_WIN8, "!# TEST TEST2"); ok(wrapSetPermLayerState(fileW, "TEST3", 0, bMachine, 1) == TRUE, "Expected SetPermLayerState to succeed\n"); - expect_LayerValue2(bMachine, file, "!# TEST2 TEST TEST3", g_Version >= APPHELP_WIN8, "!# TEST3 TEST TEST2"); + expect_LayerValue2(bMachine, file, "!# TEST2 TEST TEST3", g_WinVersion >= WINVER_WIN8, "!# TEST3 TEST TEST2"); /* Remove on a flag removes that flag from the start. */ ok(wrapSetPermLayerState(fileW, "TEST2", 2, bMachine, 0) == TRUE, "Expected SetPermLayerState to succeed\n"); - expect_LayerValue2(bMachine, file, "# TEST TEST3", g_Version >= APPHELP_WIN8, "# TEST3 TEST"); + expect_LayerValue2(bMachine, file, "# TEST TEST3", g_WinVersion >= WINVER_WIN8, "# TEST3 TEST"); ok(wrapSetPermLayerState(fileW, "", LAYER_APPLY_TO_SYSTEM_EXES, bMachine, 0) == TRUE, "Expected SetPermLayerState to succeed\n"); - expect_LayerValue2(bMachine, file, "TEST TEST3", g_Version >= APPHELP_WIN8, "TEST3 TEST"); + expect_LayerValue2(bMachine, file, "TEST TEST3", g_WinVersion >= WINVER_WIN8, "TEST3 TEST"); ok(wrapSetPermLayerState(fileW, "", LAYER_APPLY_TO_SYSTEM_EXES | 2, bMachine, 1) == TRUE, "Expected SetPermLayerState to succeed\n"); - expect_LayerValue2(bMachine, file, "!# TEST TEST3", g_Version >= APPHELP_WIN8, "!# TEST3 TEST"); + expect_LayerValue2(bMachine, file, "!# TEST TEST3", g_WinVersion >= WINVER_WIN8, "!# TEST3 TEST"); ok(wrapSetPermLayerState(fileW, "TEST3", LAYER_APPLY_TO_SYSTEM_EXES, bMachine, 0) == TRUE, "Expected SetPermLayerState to succeed\n"); expect_LayerValue(bMachine, file, "! TEST"); @@ -468,17 +470,17 @@ setLayerValue(bMachine, file, "!#!# TEST2 TEST2 !# TEST "); ok(wrapSetPermLayerState(fileW, "TEST1", 0, bMachine, 1) == TRUE, "Expected SetPermLayerState to succeed\n"); - expect_LayerValue2(bMachine, file, "!# TEST2 TEST2 !# TEST TEST1", g_Version >= APPHELP_WIN8, "!# TEST1 TEST2 TEST2 !# TEST"); + expect_LayerValue2(bMachine, file, "!# TEST2 TEST2 !# TEST TEST1", g_WinVersion >= WINVER_WIN8, "!# TEST1 TEST2 TEST2 !# TEST"); /* Removing a duplicate entry will remove all instances of it */ ok(wrapSetPermLayerState(fileW, "TEST2", 0, bMachine, 0) == TRUE, "Expected SetPermLayerState to succeed\n"); - expect_LayerValue2(bMachine, file, "!# !# TEST TEST1", g_Version >= APPHELP_WIN8, "!# TEST1 !# TEST"); + expect_LayerValue2(bMachine, file, "!# !# TEST TEST1", g_WinVersion >= WINVER_WIN8, "!# TEST1 !# TEST"); /* Adding a flag cleans other flags (from the start) */ ok(wrapSetPermLayerState(fileW, "", LAYER_APPLY_TO_SYSTEM_EXES, bMachine, 1) == TRUE, "Expected SetPermLayerState to succeed\n"); - expect_LayerValue2(bMachine, file, "!# TEST TEST1", g_Version >= APPHELP_WIN8, "!# TEST1 !# TEST"); - - if(g_Version < APPHELP_WIN8) + expect_LayerValue2(bMachine, file, "!# TEST TEST1", g_WinVersion >= WINVER_WIN8, "!# TEST1 !# TEST"); + + if(g_WinVersion < WINVER_WIN8) { ok(wrapSetPermLayerState(fileW, "$%$%^^", 0, bMachine, 1) == TRUE, "Expected SetPermLayerState to succeed\n"); expect_LayerValue(bMachine, file, "!# TEST TEST1 $%$%^^"); @@ -491,12 +493,12 @@ /* Tabs are treated as spaces */ setLayerValue(bMachine, file, "!#!# TEST2 \t TEST2 !# \t TEST "); ok(wrapSetPermLayerState(fileW, "TEST2", 0, bMachine, 1) == TRUE, "Expected SetPermLayerState to succeed\n"); - expect_LayerValue2(bMachine, file, "!# !# TEST TEST2", g_Version >= APPHELP_WIN8, "!# TEST2 !# TEST"); + expect_LayerValue2(bMachine, file, "!# !# TEST TEST2", g_WinVersion >= WINVER_WIN8, "!# TEST2 !# TEST"); /* Newlines are left as-is */ setLayerValue(bMachine, file, "!#!# TEST2 \n TEST2 !# \r\n TEST "); ok(wrapSetPermLayerState(fileW, "TEST2", 0, bMachine, 1) == TRUE, "Expected SetPermLayerState to succeed\n"); - expect_LayerValue2(bMachine, file, "!# \n !# \r\n TEST TEST2", g_Version >= APPHELP_WIN8, "!# TEST2 \n !# \r\n TEST"); + expect_LayerValue2(bMachine, file, "!# \n !# \r\n TEST TEST2", g_WinVersion >= WINVER_WIN8, "!# TEST2 \n !# \r\n TEST"); /* Whitespace and duplicate flags are eaten from the start */ setLayerValue(bMachine, file, " !#!# TEST2 \t TEST2 !# \t TEST "); @@ -750,7 +752,7 @@ if(ret) { ret = RedirectIat("apphelp.dll", "kernel32.dll", "GetDriveTypeW", (ULONG_PTR)mGetDriveTypeW, (ULONG_PTR*)&pGetDriveTypeW); - if (g_Version < APPHELP_WIN8) + if (g_WinVersion < WINVER_WIN8) ok(ret, "Expected redirect_iat to succeed\n"); if(ret) { @@ -875,20 +877,13 @@ START_TEST(layerapi) { - RTL_OSVERSIONINFOEXW rtlinfo; /*SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "4");*/ hdll = LoadLibraryA("apphelp.dll"); pAllowPermLayer = (void *)GetProcAddress(hdll, "AllowPermLayer"); pSdbSetPermLayerKeys = (void *)GetProcAddress(hdll, "SdbSetPermLayerKeys"); pSdbGetPermLayerKeys = (void *)GetProcAddress(hdll, "SdbGetPermLayerKeys"); pSetPermLayerState = (void *)GetProcAddress(hdll, "SetPermLayerState"); - rtlinfo.dwOSVersionInfoSize = sizeof(rtlinfo); -#ifdef __REACTOS__ - RtlGetVersion((PRTL_OSVERSIONINFOW)&rtlinfo); -#else - RtlGetVersion(&rtlinfo); -#endif - g_Version = (rtlinfo.dwMajorVersion << 8) | rtlinfo.dwMinorVersion; + g_WinVersion = get_host_winver(); if (!pAllowPermLayer) {

1 0

[dquintana] 71399: [KERNEL32] * Return TRUE from SetThreadStackGuarantee. Allows .NET 2.0 setup to complete and consequently allows some .net apps to work in ReactOS. Patch by the self-proclaimed M...
by dquintana＠svn.reactos.org 25 May '16

25 May '16

Author: dquintana Date: Wed May 25 14:47:02 2016 New Revision: 71399 URL: http://svn.reactos.org/svn/reactos?rev=71399&view=rev Log: [KERNEL32] * Return TRUE from SetThreadStackGuarantee. Allows .NET 2.0 setup to complete and consequently allows some .net apps to work in ReactOS. Patch by the self-proclaimed Master of The Universe, Samuel Serapión. Modified: trunk/reactos/dll/win32/kernel32/client/thread.c Modified: trunk/reactos/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] Wed May 25 14:47:02 2016 @@ -978,8 +978,10 @@ WINAPI SetThreadStackGuarantee(IN OUT PULONG StackSizeInBytes) { - UNIMPLEMENTED; - return FALSE; + static int once; + if (once++ == 0) + DPRINT1("SetThreadStackGuarantee(%p): stub\n", StackSizeInBytes); + return TRUE; } /*

1 0

[tfaber] 71398: [NTOS:EX] - Use the calling thread instead of the passed-in thread to validate APC status in ExReleaseResourceForThreadLite. The latter can be user-set and might not be a KTHREAD at...
by tfaber＠svn.reactos.org 25 May '16

25 May '16

Author: tfaber Date: Wed May 25 10:27:17 2016 New Revision: 71398 URL: http://svn.reactos.org/svn/reactos?rev=71398&view=rev Log: [NTOS:EX] - Use the calling thread instead of the passed-in thread to validate APC status in ExReleaseResourceForThreadLite. The latter can be user-set and might not be a KTHREAD at all. CORE-11315 #resolve Modified: trunk/reactos/ntoskrnl/ex/resource.c trunk/rostests/kmtests/ntos_ex/ExResource.c Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Wed May 25 10:27:17 2016 @@ -1817,7 +1817,7 @@ ExReleaseResourceLite(IN PERESOURCE Resource) { /* Just call the For-Thread function */ - ExReleaseResourceForThreadLite(Resource, (ERESOURCE_THREAD)PsGetCurrentThread()); + ExReleaseResourceForThreadLite(Resource, ExGetCurrentResourceThread()); } /*++ @@ -1855,7 +1855,7 @@ /* Sanity checks */ ExpVerifyResource(Resource); - ExpCheckForApcsDisabled(LockHandle.OldIrql, Resource, (PKTHREAD)Thread); + ExpCheckForApcsDisabled(LockHandle.OldIrql, Resource, KeGetCurrentThread()); /* Check if it's exclusively owned */ if (IsOwnedExclusive(Resource)) Modified: trunk/rostests/kmtests/ntos_ex/ExResource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExResourc… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExResource.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExResource.c [iso-8859-1] Wed May 25 10:27:17 2016 @@ -505,6 +505,10 @@ KeEnterCriticalRegion(); ok_bool_true(ExAcquireResourceExclusiveLite(Res, FALSE), "ExAcquireResourceExclusiveLite returned"); + ExSetResourceOwnerPointer(Res, (PVOID)(ULONG_PTR)3); + ExReleaseResourceForThreadLite(Res, 3); + + ok_bool_true(ExAcquireResourceExclusiveLite(Res, FALSE), "ExAcquireResourceExclusiveLite returned"); ExSetResourceOwnerPointer(Res, (PVOID)((ULONG_PTR)Res | 3)); KeLeaveCriticalRegion();

1 0

[hbelusca] 71397: [NTDLL] Add exports for RtlOemStringToUnicodeSize, RtlUnicodeStringToAnsiSize and RtlUnicodeStringToOemSize as redirections to suitable Rtlx*** functions, as done in our ntoskrnl ...
by hbelusca＠svn.reactos.org 24 May '16

24 May '16

Author: hbelusca Date: Tue May 24 19:57:29 2016 New Revision: 71397 URL: http://svn.reactos.org/svn/reactos?rev=71397&view=rev Log: [NTDLL] Add exports for RtlOemStringToUnicodeSize, RtlUnicodeStringToAnsiSize and RtlUnicodeStringToOemSize as redirections to suitable Rtlx*** functions, as done in our ntoskrnl (and as on Windows either). This should fix MSYS2 start on ReactOS. CORE-10459 #comment Please retest! Modified: trunk/reactos/dll/ntdll/def/ntdll.spec Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Tue May 24 19:57:29 2016 @@ -791,7 +791,7 @@ 786 stdcall RtlNumberGenericTableElementsAvl(ptr) 787 stdcall RtlNumberOfClearBits(ptr) 788 stdcall RtlNumberOfSetBits(ptr) -# stdcall RtlOemStringToUnicodeSize(ptr) +789 stdcall RtlOemStringToUnicodeSize(ptr) RtlxOemStringToUnicodeSize 790 stdcall RtlOemStringToUnicodeString(ptr ptr long) 791 stdcall RtlOemToUnicodeN(ptr long ptr ptr long) 792 stdcall RtlOpenCurrentUser(long ptr) @@ -909,11 +909,11 @@ 903 stdcall RtlTryEnterCriticalSection(ptr) # stdcall RtlUnhandledExceptionFilter2 905 stdcall RtlUnhandledExceptionFilter(ptr) -# stdcall RtlUnicodeStringToAnsiSize(ptr) +906 stdcall RtlUnicodeStringToAnsiSize(ptr) RtlxUnicodeStringToAnsiSize 907 stdcall RtlUnicodeStringToAnsiString(ptr ptr long) 908 stdcall RtlUnicodeStringToCountedOemString(ptr ptr long) 909 stdcall RtlUnicodeStringToInteger(ptr long ptr) -# stdcall RtlUnicodeStringToOemSize(ptr) +910 stdcall RtlUnicodeStringToOemSize(ptr) RtlxUnicodeStringToOemSize 911 stdcall RtlUnicodeStringToOemString(ptr ptr long) 912 stdcall RtlUnicodeToCustomCPN(ptr ptr long ptr wstr long) 913 stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) @@ -969,7 +969,7 @@ 961 stdcall RtlxAnsiStringToUnicodeSize(ptr) 962 stdcall RtlxOemStringToUnicodeSize(ptr) 963 stdcall RtlxUnicodeStringToAnsiSize(ptr) -964 stdcall RtlxUnicodeStringToOemSize(ptr) ; RtlUnicodeStringToOemSize +964 stdcall RtlxUnicodeStringToOemSize(ptr) 965 stdcall -ret64 VerSetConditionMask(double long long) 966 stdcall ZwAcceptConnectPort(ptr long ptr long long ptr) NtAcceptConnectPort 967 stdcall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck

1 0

[mjansen] 71396: [CRT] Partially sync strtoi64 with Wine Staging 1.9.9. Patch by Samuel Serapión CORE-11174 #resolve #comment Thanks!
by mjansen＠svn.reactos.org 24 May '16

24 May '16

Author: mjansen Date: Tue May 24 19:27:57 2016 New Revision: 71396 URL: http://svn.reactos.org/svn/reactos?rev=71396&view=rev Log: [CRT] Partially sync strtoi64 with Wine Staging 1.9.9. Patch by Samuel Serapión CORE-11174 #resolve #comment Thanks! Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/lib/crt/libcntpr.cmake trunk/reactos/sdk/lib/crt/string/strtoi64.c trunk/reactos/sdk/lib/crt/string/strtoul.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue May 24 19:27:57 2016 @@ -291,7 +291,8 @@ reactos/lib/sdk/crt/process/_cwait.c # Synced to WineStaging-1.7.37 reactos/lib/sdk/crt/signal/xcptinfo.c # Synced to WineStaging-1.7.37 reactos/lib/sdk/crt/string/scanf.c/h # Synced to Wine-1.7.17 - reactos/lib/sdk/crt/string/strtoul.c # Synced to WineStaging-1.7.37 + reactos/lib/sdk/crt/string/strtoi64.c # Synced to WineStaging-1.9.9 + reactos/lib/sdk/crt/string/strtoul.c # Synced to WineStaging-1.9.9 reactos/lib/sdk/crt/strings/wcs.c # Synced at 20080611 reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 reactos/lib/sdk/crt/wine/undname.c # Synced to WineStaging-1.7.55 Modified: trunk/reactos/sdk/lib/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/sdk/lib/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/libcntpr.cmake [iso-8859-1] Tue May 24 19:27:57 2016 @@ -48,6 +48,7 @@ string/itoa.c string/itow.c string/mbstowcs_nt.c + string/strtoi64.c string/strtol.c string/strtoul.c string/strtoull.c Modified: trunk/reactos/sdk/lib/crt/string/strtoi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strtoi6… ============================================================================== --- trunk/reactos/sdk/lib/crt/string/strtoi64.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/strtoi64.c [iso-8859-1] Tue May 24 19:27:57 2016 @@ -1,13 +1,28 @@ #include <precomp.h> +/* Based on Wine Staging 1.9.9 - dlls/msvcrt/string.c */ -__int64 -_strtoi64(const char *nptr, char **endptr, int base) +/********************************************************************* +* _strtoi64_l (MSVCRT.@) +* +* FIXME: locale parameter is ignored +*/ +__int64 CDECL strtoi64_l(const char *nptr, char **endptr, int base, _locale_t locale) { + const char *p = nptr; BOOL negative = FALSE; + BOOL got_digit = FALSE; __int64 ret = 0; - while(isspace((unsigned char)*nptr)) nptr++; +#ifndef _LIBCNT_ + TRACE("(%s %p %d %p)\n", debugstr_a(nptr), endptr, base, locale); +#endif + + if (!MSVCRT_CHECK_PMT(nptr != NULL)) return 0; + if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; + if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; + + while (isspace(*nptr)) nptr++; if(*nptr == '-') { negative = TRUE; @@ -31,7 +46,7 @@ char cur = tolower(*nptr); int v; - if(isdigit((unsigned char)cur)) { + if(isdigit(cur)) { if(cur >= '0'+base) break; v = cur-'0'; @@ -40,6 +55,7 @@ break; v = cur-'a'+10; } + got_digit = TRUE; if(negative) v = -v; @@ -48,19 +64,31 @@ if(!negative && (ret>_I64_MAX/base || ret*base>_I64_MAX-v)) { ret = _I64_MAX; +#ifndef _LIBCNT_ *_errno() = ERANGE; - } else if(negative && (ret<_I64_MIN/base || ret*base<_I64_MIN-v)) { +#endif + } + else if (negative && (ret<_I64_MIN / base || ret*base<_I64_MIN - v)) { ret = _I64_MIN; +#ifndef _LIBCNT_ *_errno() = ERANGE; - } else +#endif + } + else ret = ret*base + v; } if(endptr) - *endptr = (char*)nptr; + *endptr = (char*)(got_digit ? nptr : p); return ret; } +__int64 +_strtoi64(const char *nptr, char **endptr, int base) +{ + return strtoi64_l(nptr, endptr, base, NULL); +} + /* EOF */ Modified: trunk/reactos/sdk/lib/crt/string/strtoul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strtoul… ============================================================================== --- trunk/reactos/sdk/lib/crt/string/strtoul.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/strtoul.c [iso-8859-1] Tue May 24 19:27:57 2016 @@ -1,83 +1,7 @@ #include <precomp.h> -/* Based on Wine Staging 1.7.37 - dlls/msvcrt/string.c */ - -/********************************************************************* - * _strtoi64_l (MSVCRT.@) - * - * FIXME: locale parameter is ignored - */ -__int64 CDECL strtoi64_l(const char *nptr, char **endptr, int base, _locale_t locale) -{ - BOOL negative = FALSE; - __int64 ret = 0; - -#ifndef _LIBCNT_ - TRACE("(%s %p %d %p)\n", debugstr_a(nptr), endptr, base, locale); -#endif - - if (!MSVCRT_CHECK_PMT(nptr != NULL)) return 0; - if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; - if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; - - while(isspace(*nptr)) nptr++; - - if(*nptr == '-') { - negative = TRUE; - nptr++; - } else if(*nptr == '+') - nptr++; - - if((base==0 || base==16) && *nptr=='0' && tolower(*(nptr+1))=='x') { - base = 16; - nptr += 2; - } - - if(base == 0) { - if(*nptr=='0') - base = 8; - else - base = 10; - } - - while(*nptr) { - char cur = tolower(*nptr); - int v; - - if(isdigit(cur)) { - if(cur >= '0'+base) - break; - v = cur-'0'; - } else { - if(cur<'a' || cur>='a'+base-10) - break; - v = cur-'a'+10; - } - - if(negative) - v = -v; - - nptr++; - - if(!negative && (ret>_I64_MAX/base || ret*base>_I64_MAX-v)) { - ret = _I64_MAX; -#ifndef _LIBCNT_ - *_errno() = ERANGE; -#endif - } else if(negative && (ret<_I64_MIN/base || ret*base<_I64_MIN-v)) { - ret = _I64_MIN; -#ifndef _LIBCNT_ - *_errno() = ERANGE; -#endif - } else - ret = ret*base + v; - } - - if(endptr) - *endptr = (char*)nptr; - - return ret; -} +/* Based on Wine Staging 1.9.9 - dlls/msvcrt/string.c */ +__int64 CDECL strtoi64_l(const char *nptr, char **endptr, int base, _locale_t locale); /****************************************************************** * _strtoul_l (MSVCRT.@)

1 0

[pschweitzer] 71395: [KMTESTS] Add test for ExSetResourceOwnerPointer() and ExReleaseResourceForThreadLite() CORE-11310
by pschweitzer＠svn.reactos.org 24 May '16

24 May '16

Author: pschweitzer Date: Tue May 24 08:13:17 2016 New Revision: 71395 URL: http://svn.reactos.org/svn/reactos?rev=71395&view=rev Log: [KMTESTS] Add test for ExSetResourceOwnerPointer() and ExReleaseResourceForThreadLite() CORE-11310 Modified: trunk/rostests/kmtests/ntos_ex/ExResource.c Modified: trunk/rostests/kmtests/ntos_ex/ExResource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExResourc… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExResource.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExResource.c [iso-8859-1] Tue May 24 08:13:17 2016 @@ -272,6 +272,7 @@ PACQUIRE_FUNCTION AcquireResource; BOOLEAN Wait; BOOLEAN RetExpected; + PKSTART_ROUTINE StartRoutine; } THREAD_DATA, *PTHREAD_DATA; static @@ -302,15 +303,27 @@ static VOID +InitThreadDataEx( + PTHREAD_DATA ThreadData, + PERESOURCE Res, + PACQUIRE_FUNCTION AcquireFunction, + PKSTART_ROUTINE StartRoutine) +{ + ThreadData->Res = Res; + KeInitializeEvent(&ThreadData->InEvent, NotificationEvent, FALSE); + KeInitializeEvent(&ThreadData->OutEvent, NotificationEvent, FALSE); + ThreadData->AcquireResource = AcquireFunction; + ThreadData->StartRoutine = StartRoutine; +} + +static +VOID InitThreadData( PTHREAD_DATA ThreadData, PERESOURCE Res, PACQUIRE_FUNCTION AcquireFunction) { - ThreadData->Res = Res; - KeInitializeEvent(&ThreadData->InEvent, NotificationEvent, FALSE); - KeInitializeEvent(&ThreadData->OutEvent, NotificationEvent, FALSE); - ThreadData->AcquireResource = AcquireFunction; + InitThreadDataEx(ThreadData, Res, AcquireFunction, AcquireResourceThread); } static @@ -327,7 +340,7 @@ ThreadData->Wait = Wait; ThreadData->RetExpected = RetExpected; InitializeObjectAttributes(&Attributes, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); - Status = PsCreateSystemThread(&ThreadData->Handle, GENERIC_ALL, &Attributes, NULL, NULL, AcquireResourceThread, ThreadData); + Status = PsCreateSystemThread(&ThreadData->Handle, GENERIC_ALL, &Attributes, NULL, NULL, ThreadData->StartRoutine, ThreadData); ok_eq_hex(Status, STATUS_SUCCESS); Status = ObReferenceObjectByHandle(ThreadData->Handle, SYNCHRONIZE, *PsThreadType, KernelMode, (PVOID *)&ThreadData->Thread, NULL); ok_eq_hex(Status, STATUS_SUCCESS); @@ -455,6 +468,52 @@ ok_eq_int(Res->ActiveCount, 0); } +static +VOID +NTAPI +TestOwnerRes( + PVOID Context) +{ + NTSTATUS Status = STATUS_SUCCESS; + PTHREAD_DATA ThreadData = Context; + BOOLEAN Ret; + + KeEnterCriticalRegion(); + Ret = ThreadData->AcquireResource(ThreadData->Res, ThreadData->Wait); + if (ThreadData->RetExpected) + ok_bool_true(Ret, "AcquireResource returned"); + else + ok_bool_false(Ret, "AcquireResource returned"); + KeLeaveCriticalRegion(); + + ExReleaseResourceForThreadLite(ThreadData->Res, (ULONG_PTR)ThreadData->Res | 3); + + ok_bool_false(KeSetEvent(&ThreadData->OutEvent, 0, TRUE), "KeSetEvent returned"); + Status = KeWaitForSingleObject(&ThreadData->InEvent, Executive, KernelMode, FALSE, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); +} + +static +VOID +TestResourceWithOwner( + IN PERESOURCE Res) +{ + NTSTATUS Status; + THREAD_DATA ThreadDataOwner; + + InitThreadDataEx(&ThreadDataOwner, Res, ExAcquireResourceExclusiveLite, TestOwnerRes); + + KeEnterCriticalRegion(); + ok_bool_true(ExAcquireResourceExclusiveLite(Res, FALSE), "ExAcquireResourceExclusiveLite returned"); + ExSetResourceOwnerPointer(Res, (PVOID)((ULONG_PTR)Res | 3)); + KeLeaveCriticalRegion(); + + Status = StartThread(&ThreadDataOwner, NULL, FALSE, FALSE); + ok_eq_hex(Status, STATUS_SUCCESS); + + FinishThread(&ThreadDataOwner); +} + START_TEST(ExResource) { NTSTATUS Status; @@ -512,6 +571,9 @@ Status = ExReinitializeResourceLite(&Res); ok_eq_hex(Status, STATUS_SUCCESS); CheckResourceFields((PERESOURCE_2K3)&Res, TRUE); + CheckResourceStatus(&Res, FALSE, 0LU, 0LU, 0LU); + + TestResourceWithOwner(&Res); CheckResourceStatus(&Res, FALSE, 0LU, 0LU, 0LU); Status = ExDeleteResourceLite(&Res);

1 0

[ekohl] 71394: [SERVICES] - RChangeServiceConfigA/W: Modify or delete password secrets. [ADVAPI32] - ChangeServiceConfigA, CreateServiceA: Convert passwords to Unicode before passing them to the re...
by ekohl＠svn.reactos.org 23 May '16

23 May '16

Author: ekohl Date: Mon May 23 21:48:32 2016 New Revision: 71394 URL: http://svn.reactos.org/svn/reactos?rev=71394&view=rev Log: [SERVICES] - RChangeServiceConfigA/W: Modify or delete password secrets. [ADVAPI32] - ChangeServiceConfigA, CreateServiceA: Convert passwords to Unicode before passing them to the remote functions. Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Mon May 23 21:48:32 2016 @@ -481,7 +481,7 @@ Status = LsaStorePrivateData(PolicyHandle, &ServiceName, - &Password); + pszPassword ? &Password : NULL); if (!NT_SUCCESS(Status)) { dwError = RtlNtStatusToDosError(Status); Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Mon May 23 21:48:32 2016 @@ -2022,7 +2022,27 @@ if (lpPassword != NULL) { - /* FIXME: Decrypt and write password */ + if (wcslen((LPWSTR)lpPassword) != 0) + { + /* FIXME: Decrypt the password */ + + /* Write the password */ + dwError = ScmSetServicePassword(lpService->szServiceName, + (LPCWSTR)lpPassword); + if (dwError != ERROR_SUCCESS) + goto done; + } + else + { + /* Delete the password */ + dwError = ScmSetServicePassword(lpService->szServiceName, + NULL); + if (dwError == ERROR_FILE_NOT_FOUND) + dwError = ERROR_SUCCESS; + + if (dwError != ERROR_SUCCESS) + goto done; + } } done: @@ -3460,11 +3480,34 @@ dwDependSize); HeapFree(GetProcessHeap(), 0, lpDependenciesW); + + if (dwError != ERROR_SUCCESS) + goto done; } if (lpPassword != NULL) { - /* FIXME: Decrypt and write password */ + if (wcslen((LPWSTR)lpPassword) != 0) + { + /* FIXME: Decrypt the password */ + + /* Write the password */ + dwError = ScmSetServicePassword(lpService->szServiceName, + (LPCWSTR)lpPassword); + if (dwError != ERROR_SUCCESS) + goto done; + } + else + { + /* Delete the password */ + dwError = ScmSetServicePassword(lpService->szServiceName, + NULL); + if (dwError == ERROR_FILE_NOT_FOUND) + dwError = ERROR_SUCCESS; + + if (dwError != ERROR_SUCCESS) + goto done; + } } done: Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Mon May 23 21:48:32 2016 @@ -287,6 +287,7 @@ SIZE_T cchLength; LPCSTR lpStr; DWORD dwPasswordLength = 0; + LPWSTR lpPasswordW = NULL; LPBYTE lpEncryptedPassword = NULL; TRACE("ChangeServiceConfigA() called\n"); @@ -304,9 +305,29 @@ dwDependenciesLength++; } - /* FIXME: Encrypt the password */ - lpEncryptedPassword = (LPBYTE)lpPassword; - dwPasswordLength = (DWORD)(lpPassword ? (strlen(lpPassword) + 1) * sizeof(CHAR) : 0); + if (lpPassword != NULL) + { + /* Convert the password to unicode */ + lpPasswordW = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + (strlen(lpPassword) + 1) * sizeof(WCHAR)); + if (lpPasswordW == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + MultiByteToWideChar(CP_ACP, + 0, + lpPassword, + -1, + lpPasswordW, + (int)(strlen(lpPassword) + 1)); + + /* FIXME: Encrypt the password */ + lpEncryptedPassword = (LPBYTE)lpPasswordW; + dwPasswordLength = (DWORD)(lpPasswordW ? (wcslen(lpPasswordW) + 1) * sizeof(WCHAR) : 0); + } RpcTryExcept { @@ -331,6 +352,9 @@ } RpcEndExcept; + if (lpPasswordW != NULL) + HeapFree(GetProcessHeap(), 0, lpPasswordW); + if (dwError != ERROR_SUCCESS) { TRACE("RChangeServiceConfigA() failed (Error %lu)\n", dwError); @@ -548,6 +572,7 @@ SIZE_T cchLength; LPCSTR lpStr; DWORD dwPasswordLength = 0; + LPWSTR lpPasswordW = NULL; LPBYTE lpEncryptedPassword = NULL; TRACE("CreateServiceA() called\n"); @@ -573,9 +598,29 @@ dwDependenciesLength++; } - /* FIXME: Encrypt the password */ - lpEncryptedPassword = (LPBYTE)lpPassword; - dwPasswordLength = (DWORD)(lpPassword ? (strlen(lpPassword) + 1) * sizeof(CHAR) : 0); + if (lpPassword != NULL) + { + /* Convert the password to unicode */ + lpPasswordW = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + (strlen(lpPassword) + 1) * sizeof(WCHAR)); + if (lpPasswordW == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + MultiByteToWideChar(CP_ACP, + 0, + lpPassword, + -1, + lpPasswordW, + (int)(strlen(lpPassword) + 1)); + + /* FIXME: Encrypt the password */ + lpEncryptedPassword = (LPBYTE)lpPasswordW; + dwPasswordLength = (DWORD)(lpPasswordW ? (wcslen(lpPasswordW) + 1) * sizeof(WCHAR) : 0); + } RpcTryExcept { @@ -602,6 +647,9 @@ dwError = ScmRpcStatusToWinError(RpcExceptionCode()); } RpcEndExcept; + + if (lpPasswordW != NULL) + HeapFree(GetProcessHeap(), 0, lpPasswordW); if (dwError != ERROR_SUCCESS) {

1 0

[pschweitzer] 71393: [NTOSKRNL] Fix misleading comment
by pschweitzer＠svn.reactos.org 23 May '16

23 May '16

Author: pschweitzer Date: Mon May 23 21:14:49 2016 New Revision: 71393 URL: http://svn.reactos.org/svn/reactos?rev=71393&view=rev Log: [NTOSKRNL] Fix misleading comment Modified: trunk/reactos/ntoskrnl/ex/resource.c Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Mon May 23 21:14:49 2016 @@ -141,7 +141,7 @@ !(Thread->CombinedApcDisable)) { /* Bad! */ - DPRINT1("EX: resource: APCs still enabled before resource %p acquire " + DPRINT1("EX: resource: APCs still enabled before resource %p acquire/release " "!!!\n", Resource); DbgBreakPoint(); }

1 0

[jgardou] 71392: [CDFS_NEW] - The usual second forgotten file
by jgardou＠svn.reactos.org 23 May '16

23 May '16

Author: jgardou Date: Mon May 23 20:35:33 2016 New Revision: 71392 URL: http://svn.reactos.org/svn/reactos?rev=71392&view=rev Log: [CDFS_NEW] - The usual second forgotten file Added: branches/TransitionPte/drivers/filesystems/cdfs_new/cdfs_reg.inf (with props) Added: branches/TransitionPte/drivers/filesystems/cdfs_new/cdfs_reg.inf URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/cdfs_reg.inf (added) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/cdfs_reg.inf [iso-8859-1] Mon May 23 20:35:33 2016 @@ -0,0 +1,7 @@ +; Cdfs (ISO96660) filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002 Propchange: branches/TransitionPte/drivers/filesystems/cdfs_new/cdfs_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs