Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 71202: [BTRFS] Don't remove an entry list twice in add_to_space_list(). This fixes a BSOD when trying to create a new file on a Btrfs volume. Already sent upstream. Delayed due to ina...
by pschweitzer＠svn.reactos.org 24 Apr '16

24 Apr '16

Author: pschweitzer Date: Sun Apr 24 19:58:15 2016 New Revision: 71202 URL: http://svn.reactos.org/svn/reactos?rev=71202&view=rev Log: [BTRFS] Don't remove an entry list twice in add_to_space_list(). This fixes a BSOD when trying to create a new file on a Btrfs volume. Already sent upstream. Delayed due to inactivity. CORE-11057 #resolve #comment Fixed with r71202 Modified: trunk/reactos/drivers/filesystems/btrfs/write.c Modified: trunk/reactos/drivers/filesystems/btrfs/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… ============================================================================== --- trunk/reactos/drivers/filesystems/btrfs/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/btrfs/write.c [iso-8859-1] Sun Apr 24 19:58:15 2016 @@ -263,8 +263,6 @@ } if (s->offset >= offset && s->offset + s->size <= offset + size) { // delete entirely - RemoveEntryList(&s->list_entry); - if (s->offset + s->size == offset + size) { insbef = s->list_entry.Flink; RemoveEntryList(&s->list_entry);

1 0

[spetreolle] 71201: [CDMAKE] Don't check for extension length on Joliet images. Encountered with AHK binaries. ONLINE-567
by spetreolle＠svn.reactos.org 24 Apr '16

24 Apr '16

Author: spetreolle Date: Sun Apr 24 18:59:33 2016 New Revision: 71201 URL: http://svn.reactos.org/svn/reactos?rev=71201&view=rev Log: [CDMAKE] Don't check for extension length on Joliet images. Encountered with AHK binaries. ONLINE-567 Modified: trunk/reactos/sdk/tools/cdmake/cdmake.c Modified: trunk/reactos/sdk/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/cdmake/cdmake.c?… ============================================================================== --- trunk/reactos/sdk/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/cdmake/cdmake.c [iso-8859-1] Sun Apr 24 18:59:33 2016 @@ -692,7 +692,8 @@ error_exit("'%s' is not ISO-9660, aborting...", filename); s++; } - if (strlen(s) > MAX_EXTENSION_LENGTH) + // Check for extension length + if (!joliet && strlen(s) > MAX_EXTENSION_LENGTH) { error_exit("'%s' has too long extension, aborting...", filename); }

1 0

[mjansen] 71200: [APPHELP][APPHELP_APITEST] Update SdbTagToString tests to check all known tags CORE-10367 - Add a list of hardcoded tags, for all versions up to win7 they are checked against windo...
by mjansen＠svn.reactos.org 24 Apr '16

24 Apr '16

Author: mjansen Date: Sun Apr 24 17:19:09 2016 New Revision: 71200 URL: http://svn.reactos.org/svn/reactos?rev=71200&view=rev Log: [APPHELP][APPHELP_APITEST] Update SdbTagToString tests to check all known tags CORE-10367 - Add a list of hardcoded tags, for all versions up to win7 they are checked against windows. - Update SdbTagToString with a few missing strings - Hardcode the used version to Win7 for now, as backporting these strings would not make much sense. Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/rostests/apitests/apphelp/apphelp.c Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] Sun Apr 24 17:19:09 2016 @@ -169,6 +169,7 @@ #define TAG_PARAMETER1_RC_ID (0x29 | TAG_TYPE_DWORD) #define TAG_CONTEXT_TAGID (0x30 | TAG_TYPE_DWORD) #define TAG_EXE_WRAPPER (0x31 | TAG_TYPE_DWORD) +#define TAG_URL_ID (0x32 | TAG_TYPE_DWORD) #define TAG_TAGID (0x801 | TAG_TYPE_DWORD) /* TAG_TYPE_QWORD */ @@ -222,6 +223,7 @@ #define TAG_COMPILER_VERSION (0x22 | TAG_TYPE_STRINGREF) #define TAG_ACTION_TYPE (0x23 | TAG_TYPE_STRINGREF) #define TAG_EXPORT_NAME (0x24 | TAG_TYPE_STRINGREF) +#define TAG_URL (0x25 | TAG_TYPE_STRINGREF) /* TAG_TYPE_LIST */ #define TAG_DATABASE (0x1 | TAG_TYPE_LIST) @@ -249,6 +251,7 @@ #define TAG_LOOKUP (0x17 | TAG_TYPE_LIST) #define TAG_CONTEXT (0x18 | TAG_TYPE_LIST) #define TAG_CONTEXT_REF (0x19 | TAG_TYPE_LIST) +#define TAG_SPC (0x20 | TAG_TYPE_LIST) #define TAG_STRINGTABLE (0x801 | TAG_TYPE_LIST) #define TAG_INDEXES (0x802 | TAG_TYPE_LIST) #define TAG_INDEX (0x803 | TAG_TYPE_LIST) Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Sun Apr 24 17:19:09 2016 @@ -213,7 +213,7 @@ LPCWSTR WINAPI SdbTagToString(TAG tag) { /* lookup tables for tags in range 0x1 -> 0xFF | TYPE */ - static const WCHAR table[9][0x31][25] = { + static const WCHAR table[9][0x32][25] = { { /* TAG_TYPE_NULL */ {'I','N','C','L','U','D','E',0}, {'G','E','N','E','R','A','L',0}, @@ -284,7 +284,8 @@ {'I','n','v','a','l','i','d','T','a','g',0}, {'I','n','v','a','l','i','d','T','a','g',0}, {'C','O','N','T','E','X','T','_','T','A','G','I','D',0}, - {'E','X','E','_','W','R','A','P','P','E','R',0} + {'E','X','E','_','W','R','A','P','P','E','R',0}, + {'U','R','L','_','I','D',0} }, { /* TAG_TYPE_QWORD */ {'T','I','M','E',0}, @@ -341,7 +342,8 @@ {'L','A','Y','E','R','_','D','I','S','P','L','A','Y','N','A','M','E',0}, {'C','O','M','P','I','L','E','R','_','V','E','R','S','I','O','N',0}, {'A','C','T','I','O','N','_','T','Y','P','E',0}, - {'E','X','P','O','R','T','_','N','A','M','E',0} + {'E','X','P','O','R','T','_','N','A','M','E',0}, + {'U','R','L',0} }, { /* TAG_TYPE_LIST */ {'D','A','T','A','B','A','S','E',0}, @@ -368,7 +370,14 @@ {'A','C','T','I','O','N',0}, {'L','O','O','K','U','P',0}, {'C','O','N','T','E','X','T',0}, - {'C','O','N','T','E','X','T','_','R','E','F',0} + {'C','O','N','T','E','X','T','_','R','E','F',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'S','P','C',0} }, { /* TAG_TYPE_STRING */ {'I','n','v','a','l','i','d','T','a','g',0} @@ -400,10 +409,10 @@ TAG_REINSTALL_UPGRADE & 0xFF, 1, TAG_MATCH_MODE & 0xFF, - TAG_EXE_WRAPPER & 0xFF, + TAG_URL_ID & 0xFF, TAG_FLAG_INSTALL & 0xFF, - TAG_EXPORT_NAME & 0xFF, - TAG_CONTEXT_REF & 0xFF, + TAG_URL & 0xFF, + TAG_SPC & 0xFF, 1, TAG_APP_ID & 0xFF }; 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] Sun Apr 24 17:19:09 2016 @@ -1,6 +1,7 @@ /* * Copyright 2012 Detlef Riekenberg - * Copyright 2013 Mislav Blaevic + * Copyright 2013 Mislav BlaÅ¾eviÄ + * 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 @@ -35,6 +36,17 @@ #include "wine/test.h" +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 + + typedef WORD TAG; #define TAG_TYPE_MASK 0xF000 @@ -73,9 +85,311 @@ } } +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), 0, 0); + return lstrcmpA(buf, stra); +} + +void test_tag(TAG base, const char* names[], size_t upperlimit, int line) +{ + TAG n; + for (n = 0; names[n]; ++n) + { + LPCWSTR tagstr = pSdbTagToString(base | n); + ok_(__FILE__, line + 2)(!strcmp_wa(tagstr, names[n]), "Got %s instead of '%s' for %x\n", wine_dbgstr_w(tagstr), names[n], base | n); + } + for (; n < upperlimit; ++n) + { + LPCWSTR tagstr = pSdbTagToString(base | n); + ok_(__FILE__, line + 2)(!strcmp_wa(tagstr, "InvalidTag"), "Got %s instead of 'InvalidTag' for %x\n", wine_dbgstr_w(tagstr), base | n); + } +} + +static struct +{ + TAG base; + DWORD upper_limit; + DWORD line; + DWORD min_ver; + DWORD max_ver; + const char* tags[7*8]; +} data[] = { + { + TAG_TYPE_NULL, 0x1000, __LINE__, VERSION_ANY, VERSION_2003, + { + "InvalidTag", "INCLUDE", "GENERAL", "MATCH_LOGIC_NOT", "APPLY_ALL_SHIMS", "USE_SERVICE_PACK_FILES", NULL + } + }, + { + TAG_TYPE_NULL, 0x1000, __LINE__, VERSION_VISTA, VERSION_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, + { + "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 + } + }, + + { + TAG_TYPE_BYTE, 0x1000, __LINE__, VERSION_ANY, VERSION_ANY, + { + "InvalidTag", NULL + } + }, + + { + TAG_TYPE_WORD, 0x800, __LINE__, VERSION_ANY, VERSION_WIN7, + { + "InvalidTag", "MATCH_MODE", NULL + } + }, + { + TAG_TYPE_WORD, 0x800, __LINE__, VERSION_WIN8, VERSION_ANY, + { + "InvalidTag", "MATCH_MODE", "QUIRK_COMPONENT_CODE_ID", "QUIRK_CODE_ID", NULL + } + }, + { + TAG_TYPE_WORD | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_ANY, + { + "InvalidTag", "TAG", "INDEX_TAG", "INDEX_KEY", NULL + } + }, + + { + TAG_TYPE_DWORD, 0x800, __LINE__, VERSION_ANY, VERSION_WINXP, + { + "InvalidTag", "SIZE", "OFFSET", "CHECKSUM", "SHIM_TAGID", "PATCH_TAGID", "MODULE_TYPE", "VERFILEDATEHI", + "VERFILEDATELO", "VERFILEOS", "VERFILETYPE", "PE_CHECKSUM", "PREVOSMAJORVERSION", "PREVOSMINORVERSION", "PREVOSPLATFORMID", "PREVOSBUILDNO", + "PROBLEM_SEVERITY", "APPHELP_LANGID", "VER_LANGUAGE", "InvalidTag", "ENGINE", "HTMLHELPID", "INDEXFLAGS", "FLAGS", + "VALUETYPE", "DATA_DWORD", "LAYER_TAGID", "MSI_TRANSFORM_TAGID", "LINKER_VERSION", "LINK_DATE", "UPTO_LINK_DATE", "OS_SERVICE_PACK", + "FLAG_TAGID", "RUNTIME_PLATFORM", "OS_SKU", NULL + } + }, + { + TAG_TYPE_DWORD, 0x800, __LINE__, VERSION_2003, VERSION_2003, + { + "InvalidTag", "SIZE", "OFFSET", "CHECKSUM", "SHIM_TAGID", "PATCH_TAGID", "MODULE_TYPE", "VERFILEDATEHI", + "VERFILEDATELO", "VERFILEOS", "VERFILETYPE", "PE_CHECKSUM", "PREVOSMAJORVERSION", "PREVOSMINORVERSION", "PREVOSPLATFORMID", "PREVOSBUILDNO", + "PROBLEM_SEVERITY", "APPHELP_LANGID", "VER_LANGUAGE", "InvalidTag", "ENGINE", "HTMLHELPID", "INDEXFLAGS", "FLAGS", + "VALUETYPE", "DATA_DWORD", "LAYER_TAGID", "MSI_TRANSFORM_TAGID", "LINKER_VERSION", "LINK_DATE", "UPTO_LINK_DATE", "OS_SERVICE_PACK", + "FLAG_TAGID", "RUNTIME_PLATFORM", "OS_SKU", "OS_PLATFORM", NULL + } + }, + { + TAG_TYPE_DWORD, 0x800, __LINE__, VERSION_VISTA, VERSION_VISTA, + { + "InvalidTag", "SIZE", "OFFSET", "CHECKSUM", "SHIM_TAGID", "PATCH_TAGID", "MODULE_TYPE", "VERDATEHI", + "VERDATELO", "VERFILEOS", "VERFILETYPE", "PE_CHECKSUM", "PREVOSMAJORVER", "PREVOSMINORVER", "PREVOSPLATFORMID", "PREVOSBUILDNO", + "PROBLEMSEVERITY", "LANGID", "VER_LANGUAGE", "InvalidTag", "ENGINE", "HTMLHELPID", "INDEX_FLAGS", "FLAGS", + "DATA_VALUETYPE", "DATA_DWORD", "LAYER_TAGID", "MSI_TRANSFORM_TAGID", "LINKER_VERSION", "LINK_DATE", "UPTO_LINK_DATE", "OS_SERVICE_PACK", + "FLAG_TAGID", "RUNTIME_PLATFORM", "OS_SKU", "OS_PLATFORM", "APP_NAME_RC_ID", "VENDOR_NAME_RC_ID", "SUMMARY_MSG_RC_ID", "VISTA_SKU", + NULL + } + }, + { + TAG_TYPE_DWORD, 0x800, __LINE__, VERSION_WIN7, VERSION_ANY, + { + "InvalidTag", "SIZE", "OFFSET", "CHECKSUM", "SHIM_TAGID", "PATCH_TAGID", "MODULE_TYPE", "VERDATEHI", + "VERDATELO", "VERFILEOS", "VERFILETYPE", "PE_CHECKSUM", "PREVOSMAJORVER", "PREVOSMINORVER", "PREVOSPLATFORMID", "PREVOSBUILDNO", + "PROBLEMSEVERITY", "LANGID", "VER_LANGUAGE", "InvalidTag", "ENGINE", "HTMLHELPID", "INDEX_FLAGS", "FLAGS", + "DATA_VALUETYPE", "DATA_DWORD", "LAYER_TAGID", "MSI_TRANSFORM_TAGID", "LINKER_VERSION", "LINK_DATE", "UPTO_LINK_DATE", "OS_SERVICE_PACK", + "FLAG_TAGID", "RUNTIME_PLATFORM", "OS_SKU", "OS_PLATFORM", "APP_NAME_RC_ID", "VENDOR_NAME_RC_ID", "SUMMARY_MSG_RC_ID", "VISTA_SKU", + "DESCRIPTION_RC_ID", "PARAMETER1_RC_ID", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", + "CONTEXT_TAGID", "EXE_WRAPPER", "URL_ID", NULL + } + }, + { + TAG_TYPE_DWORD | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_ANY, + { + "InvalidTag", "TAGID", NULL + } + }, + + { + TAG_TYPE_QWORD, 0x1000, __LINE__, VERSION_ANY, VERSION_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, + { + "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", + NULL + } + }, + { + TAG_TYPE_QWORD, 0x1000, __LINE__, VERSION_VISTA, VERSION_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", + "FLAG_LUA", "FLAG_INSTALL", NULL + } + }, + + { + TAG_TYPE_STRINGREF, 0x1000, __LINE__, VERSION_ANY, VERSION_2003, + { + "InvalidTag", "NAME", "DESCRIPTION", "MODULE", "API", "VENDOR", "APP_NAME", "InvalidTag", + "COMMAND_LINE", "COMPANY_NAME", "DLLFILE", "WILDCARD_NAME", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", + "PRODUCT_NAME", "PRODUCT_VERSION", "FILE_DESCRIPTION", "FILE_VERSION", "ORIGINAL_FILENAME", "INTERNAL_NAME", "LEGAL_COPYRIGHT", "S16BIT_DESCRIPTION", + "PROBLEM_DETAILS", "LINK_URL", "LINK_TEXT", "APPHELP_TITLE", "APPHELP_CONTACT", "SXS_MANIFEST", "DATA_STRING", "MSI_TRANSFORM_FILE", + "S16BIT_MODULE_NAME", "LAYER_DISPLAYNAME", "COMPILER_VERSION", "ACTION_TYPE", NULL + } + }, + { + TAG_TYPE_STRINGREF, 0x1000, __LINE__, VERSION_VISTA, VERSION_VISTA, + { + "InvalidTag", "NAME", "DESCRIPTION", "MODULE", "API", "VENDOR", "APP_NAME", "InvalidTag", + "COMMAND_LINE", "COMPANY_NAME", "DLLFILE", "WILDCARD_NAME", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", + "PRODUCT_NAME", "PRODUCT_VERSION", "FILE_DESCRIPTION", "FILE_VERSION", "ORIGINAL_FILENAME", "INTERNAL_NAME", "LEGAL_COPYRIGHT", "16BIT_DESCRIPTION", + "APPHELP_DETAILS", "LINK_URL", "LINK_TEXT", "APPHELP_TITLE", "APPHELP_CONTACT", "SXS_MANIFEST", "DATA_STRING", "MSI_TRANSFORM_FILE", + "16BIT_MODULE_NAME", "LAYER_DISPLAYNAME", "COMPILER_VERSION", "ACTION_TYPE", "EXPORT_NAME", NULL + } + }, + { + TAG_TYPE_STRINGREF, 0x1000, __LINE__, VERSION_WIN7, VERSION_ANY, + { + "InvalidTag", "NAME", "DESCRIPTION", "MODULE", "API", "VENDOR", "APP_NAME", "InvalidTag", + "COMMAND_LINE", "COMPANY_NAME", "DLLFILE", "WILDCARD_NAME", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", + "PRODUCT_NAME", "PRODUCT_VERSION", "FILE_DESCRIPTION", "FILE_VERSION", "ORIGINAL_FILENAME", "INTERNAL_NAME", "LEGAL_COPYRIGHT", "16BIT_DESCRIPTION", + "APPHELP_DETAILS", "LINK_URL", "LINK_TEXT", "APPHELP_TITLE", "APPHELP_CONTACT", "SXS_MANIFEST", "DATA_STRING", "MSI_TRANSFORM_FILE", + "16BIT_MODULE_NAME", "LAYER_DISPLAYNAME", "COMPILER_VERSION", "ACTION_TYPE", "EXPORT_NAME", "URL", NULL + } + }, + + { + TAG_TYPE_LIST, 0x800, __LINE__, VERSION_ANY, VERSION_2003, + { + "InvalidTag", "DATABASE", "LIBRARY", "INEXCLUDE", "SHIM", "PATCH", "APP", "EXE", + "MATCHING_FILE", "SHIM_REF", "PATCH_REF", "LAYER", "FILE", "APPHELP", "LINK", "DATA", + "MSI TRANSFORM", "MSI TRANSFORM REF", "MSI PACKAGE", "FLAG", "MSI CUSTOM ACTION", "FLAG_REF", "ACTION", NULL + } + }, + { + TAG_TYPE_LIST, 0x800, __LINE__, VERSION_VISTA, VERSION_VISTA, + { + "InvalidTag", "DATABASE", "LIBRARY", "INEXCLUDE", "SHIM", "PATCH", "APP", "EXE", + "MATCHING_FILE", "SHIM_REF", "PATCH_REF", "LAYER", "FILE", "APPHELP", "LINK", "DATA", + "MSI_TRANSFORM", "MSI_TRANSFORM_REF", "MSI_PACKAGE", "FLAG", "MSI_CUSTOM_ACTION", "FLAG_REF", "ACTION", "LOOKUP", + NULL + } + }, + { + TAG_TYPE_LIST, 0x800, __LINE__, VERSION_WIN7, VERSION_ANY, + { + "InvalidTag", "DATABASE", "LIBRARY", "INEXCLUDE", "SHIM", "PATCH", "APP", "EXE", + "MATCHING_FILE", "SHIM_REF", "PATCH_REF", "LAYER", "FILE", "APPHELP", "LINK", "DATA", + "MSI_TRANSFORM", "MSI_TRANSFORM_REF", "MSI_PACKAGE", "FLAG", "MSI_CUSTOM_ACTION", "FLAG_REF", "ACTION", "LOOKUP", + "CONTEXT", "CONTEXT_REF", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", + "SPC", NULL + } + }, + { + TAG_TYPE_LIST | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_ANY, + { + "InvalidTag", "STRINGTABLE", "INDEXES", "INDEX", NULL + } + }, + + { + TAG_TYPE_STRING, 0x800, __LINE__, VERSION_ANY, VERSION_ANY, + { + "InvalidTag", NULL + } + }, + { + TAG_TYPE_STRING | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_2003, + { + "InvalidTag", "STRTAB_ITEM", NULL + } + }, + { + TAG_TYPE_STRING | 0x800, 0x800, __LINE__, VERSION_VISTA, VERSION_ANY, + { + "InvalidTag", "STRINGTABLE_ITEM", NULL + } + }, + + + { + TAG_TYPE_BINARY, 0x800, __LINE__, VERSION_ANY, VERSION_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, + { + "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, + { + "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", + "FIX_ID", "APP_ID", NULL + } + }, + { + TAG_TYPE_BINARY | 0x800, 0x800, __LINE__, VERSION_ANY, VERSION_ANY, + { + "InvalidTag", "INDEX_BITS", NULL + } + }, + + { 0, 0, 0, 0, 0, { NULL } } +}; + + +static void test_SdbTagToStringAllTags(void) +{ + 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)) + { + test_tag(data[n].base, data[n].tags, data[n].upper_limit, data[n].line); + } + } +} + 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); + //SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "4"); + //SetEnvironmentVariable("DEBUGCHANNEL", "+apphelp"); hdll = LoadLibraryA("apphelp.dll"); pSdbTagToString = (void *) GetProcAddress(hdll, "SdbTagToString"); test_SdbTagToString(); -} +#ifdef __REACTOS__ + if (g_Version < VERSION_WIN7) + { + g_Version = VERSION_WIN7; + trace("Using version 0x%x for SdbTagToString tests\n", g_Version); + } +#endif + test_SdbTagToStringAllTags(); +}

1 0

[spetreolle] 71199: [NDIS] Revert r71188
by spetreolle＠svn.reactos.org 24 Apr '16

24 Apr '16

Author: spetreolle Date: Sun Apr 24 15:50:25 2016 New Revision: 71199 URL: http://svn.reactos.org/svn/reactos?rev=71199&view=rev Log: [NDIS] Revert r71188 Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Sun Apr 24 15:50:25 2016 @@ -321,7 +321,7 @@ PLOGICAL_ADAPTER Adapter; PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)NdisRequest->MacReserved; - NDIS_DbgPrint(MIN_TRACE, ("Called.\n")); + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); ASSERT(MacBindingHandle); AdapterBinding = GET_ADAPTER_BINDING(MacBindingHandle);

1 0

[mjansen] 71198: Nothing to see here.
by mjansen＠svn.reactos.org 24 Apr '16

24 Apr '16

Author: mjansen Date: Sun Apr 24 13:27:22 2016 New Revision: 71198 URL: http://svn.reactos.org/svn/reactos?rev=71198&view=rev Log: Nothing to see here. Modified: trunk/rostests/apitests/apphelp/testlist.c Modified: trunk/rostests/apitests/apphelp/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/testlist… ============================================================================== --- trunk/rostests/apitests/apphelp/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/testlist.c [iso-8859-1] Sun Apr 24 13:27:22 2016 @@ -3,12 +3,12 @@ #define STANDALONE #include <wine/test.h> +extern void func_apphelp(void); extern void func_layerapi(void); -extern void func_apphelp(void); const struct test winetest_testlist[] = { + { "apphelp", func_apphelp }, { "layerapi", func_layerapi }, - { "apphelp", func_apphelp }, { 0, 0 } };

1 0

[mjansen] 71197: [APPHELP][APPHELP_APITEST] Add SdbTagToString + test by Mislav Blažević CORE-10367
by mjansen＠svn.reactos.org 24 Apr '16

24 Apr '16

Author: mjansen Date: Sun Apr 24 13:05:00 2016 New Revision: 71197 URL: http://svn.reactos.org/svn/reactos?rev=71197&view=rev Log: [APPHELP][APPHELP_APITEST] Add SdbTagToString + test by Mislav Blažević CORE-10367 Added: trunk/rostests/apitests/apphelp/apphelp.c (with props) Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/appcompat/apphelp/apphelp.spec trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/rostests/apitests/apphelp/CMakeLists.txt trunk/rostests/apitests/apphelp/testlist.c Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] Sun Apr 24 13:05:00 2016 @@ -24,6 +24,14 @@ extern "C" { #endif +typedef WORD TAG; +typedef DWORD TAGID; +typedef DWORD TAGREF; +typedef UINT64 QWORD; + +#define TAGREF_NULL (0) +#define TAGREF_ROOT (0) + typedef enum _SHIM_LOG_LEVEL { SHIM_ERR = 1, SHIM_WARN = 2, @@ -71,6 +79,196 @@ BOOL WINAPI SetPermLayerState(PCWSTR wszPath, PCWSTR wszLayer, DWORD dwFlags, BOOL bMachine, BOOL bEnable); +#define TAGID_NULL 0x0 +#define TAGID_ROOT 0x0 + +/* The above definition of TAGID_ROOT is used in winapi and can be found + * on msdn it but doesn't make sense, especially internally, because + * TAGID represents offset into database data and there is a header at + * offset 0, NOT a tag. Therfore, this definition should be used internally + * to represent first valid TAGID. Header size is 12 bytes. */ +#define _TAGID_ROOT 12 + +#define TAG_TYPE_MASK 0xF000 + +#define TAG_TYPE_NULL 0x1000 +#define TAG_TYPE_BYTE 0x2000 +#define TAG_TYPE_WORD 0x3000 +#define TAG_TYPE_DWORD 0x4000 +#define TAG_TYPE_QWORD 0x5000 +#define TAG_TYPE_STRINGREF 0x6000 +#define TAG_TYPE_LIST 0x7000 +#define TAG_TYPE_STRING 0x8000 +#define TAG_TYPE_BINARY 0x9000 + +#define TAG_NULL 0x0 + +/* TAG_TYPE_NULL */ +#define TAG_INCLUDE (0x1 | TAG_TYPE_NULL) +#define TAG_GENERAL (0x2 | TAG_TYPE_NULL) +#define TAG_MATCH_LOGIC_NOT (0x3 | TAG_TYPE_NULL) +#define TAG_APPLY_ALL_SHIMS (0x4 | TAG_TYPE_NULL) +#define TAG_USE_SERVICE_PACK_FILES (0x5 | TAG_TYPE_NULL) +#define TAG_MITIGATION_OS (0x6 | TAG_TYPE_NULL) +#define TAG_BLOCK_UPGRADE (0x7 | TAG_TYPE_NULL) +#define TAG_INCLUDEEXCLUDEDLL (0x8 | TAG_TYPE_NULL) +#define TAG_RAC_EVENT_OFF (0x9 | TAG_TYPE_NULL) +#define TAG_TELEMETRY_OFF (0xA | TAG_TYPE_NULL) +#define TAG_SHIM_ENGINE_OFF (0xB | TAG_TYPE_NULL) +#define TAG_LAYER_PROPAGATION_OFF (0xC | TAG_TYPE_NULL) +#define TAG_REINSTALL_UPGRADE (0xD | TAG_TYPE_NULL) + +/* TAG_TYPE_BYTE */ + +/* TAG_TYPE_WORD */ +#define TAG_MATCH_MODE (0x1 | TAG_TYPE_WORD) +#define TAG_TAG (0x801 | TAG_TYPE_WORD) +#define TAG_INDEX_TAG (0x802 | TAG_TYPE_WORD) +#define TAG_INDEX_KEY (0x803 | TAG_TYPE_WORD) + +/* TAG_TYPE_DWORD */ +#define TAG_SIZE (0x1 | TAG_TYPE_DWORD) +#define TAG_OFFSET (0x2 | TAG_TYPE_DWORD) +#define TAG_CHECKSUM (0x3 | TAG_TYPE_DWORD) +#define TAG_SHIM_TAGID (0x4 | TAG_TYPE_DWORD) +#define TAG_PATCH_TAGID (0x5 | TAG_TYPE_DWORD) +#define TAG_MODULE_TYPE (0x6 | TAG_TYPE_DWORD) +#define TAG_VERDATEHI (0x7 | TAG_TYPE_DWORD) +#define TAG_VERDATELO (0x8 | TAG_TYPE_DWORD) +#define TAG_VERFILEOS (0x9 | TAG_TYPE_DWORD) +#define TAG_VERFILETYPE (0xA | TAG_TYPE_DWORD) +#define TAG_PE_CHECKSUM (0xB | TAG_TYPE_DWORD) +#define TAG_PREVOSMAJORVER (0xC | TAG_TYPE_DWORD) +#define TAG_PREVOSMINORVER (0xD | TAG_TYPE_DWORD) +#define TAG_PREVOSPLATFORMID (0xE | TAG_TYPE_DWORD) +#define TAG_PREVOSBUILDNO (0xF | TAG_TYPE_DWORD) +#define TAG_PROBLEMSEVERITY (0x10 | TAG_TYPE_DWORD) +#define TAG_LANGID (0x11 | TAG_TYPE_DWORD) +#define TAG_VER_LANGUAGE (0x12 | TAG_TYPE_DWORD) +#define TAG_ENGINE (0x14 | TAG_TYPE_DWORD) +#define TAG_HTMLHELPID (0x15 | TAG_TYPE_DWORD) +#define TAG_INDEX_FLAGS (0x16 | TAG_TYPE_DWORD) +#define TAG_FLAGS (0x17 | TAG_TYPE_DWORD) +#define TAG_DATA_VALUETYPE (0x18 | TAG_TYPE_DWORD) +#define TAG_DATA_DWORD (0x19 | TAG_TYPE_DWORD) +#define TAG_LAYER_TAGID (0x1A | TAG_TYPE_DWORD) +#define TAG_MSI_TRANSFORM_TAGID (0x1B | TAG_TYPE_DWORD) +#define TAG_LINKER_VERSION (0x1C | TAG_TYPE_DWORD) +#define TAG_LINK_DATE (0x1D | TAG_TYPE_DWORD) +#define TAG_UPTO_LINK_DATE (0x1E | TAG_TYPE_DWORD) +#define TAG_OS_SERVICE_PACK (0x1F | TAG_TYPE_DWORD) +#define TAG_FLAG_TAGID (0x20 | TAG_TYPE_DWORD) +#define TAG_RUNTIME_PLATFORM (0x21 | TAG_TYPE_DWORD) +#define TAG_OS_SKU (0x22 | TAG_TYPE_DWORD) +#define TAG_OS_PLATFORM (0x23 | TAG_TYPE_DWORD) +#define TAG_APP_NAME_RC_ID (0x24 | TAG_TYPE_DWORD) +#define TAG_VENDOR_NAME_RC_ID (0x25 | TAG_TYPE_DWORD) +#define TAG_SUMMARY_MSG_RC_ID (0x26 | TAG_TYPE_DWORD) +#define TAG_VISTA_SKU (0x27 | TAG_TYPE_DWORD) +#define TAG_DESCRIPTION_RC_ID (0x28 | TAG_TYPE_DWORD) +#define TAG_PARAMETER1_RC_ID (0x29 | TAG_TYPE_DWORD) +#define TAG_CONTEXT_TAGID (0x30 | TAG_TYPE_DWORD) +#define TAG_EXE_WRAPPER (0x31 | TAG_TYPE_DWORD) +#define TAG_TAGID (0x801 | TAG_TYPE_DWORD) + +/* TAG_TYPE_QWORD */ +#define TAG_TIME (0x1 | TAG_TYPE_QWORD) +#define TAG_BIN_FILE_VERSION (0x2 | TAG_TYPE_QWORD) +#define TAG_BIN_PRODUCT_VERSION (0x3 | TAG_TYPE_QWORD) +#define TAG_MODTIME (0x4 | TAG_TYPE_QWORD) +#define TAG_FLAG_MASK_KERNEL (0x5 | TAG_TYPE_QWORD) +#define TAG_UPTO_BIN_PRODUCT_VERSION (0x6 | TAG_TYPE_QWORD) +#define TAG_DATA_QWORD (0x7 | TAG_TYPE_QWORD) +#define TAG_FLAG_MASK_USER (0x8 | TAG_TYPE_QWORD) +#define TAG_FLAGS_NTVDM1 (0x9 | TAG_TYPE_QWORD) +#define TAG_FLAGS_NTVDM2 (0xA | TAG_TYPE_QWORD) +#define TAG_FLAGS_NTVDM3 (0xB | TAG_TYPE_QWORD) +#define TAG_FLAG_MASK_SHELL (0xC | TAG_TYPE_QWORD) +#define TAG_UPTO_BIN_FILE_VERSION (0xD | TAG_TYPE_QWORD) +#define TAG_FLAG_MASK_FUSION (0xE | TAG_TYPE_QWORD) +#define TAG_FLAG_PROCESSPARAM (0xF | TAG_TYPE_QWORD) +#define TAG_FLAG_LUA (0x10 | TAG_TYPE_QWORD) +#define TAG_FLAG_INSTALL (0x11 | TAG_TYPE_QWORD) + +/* TAG_TYPE_STRINGREF */ +#define TAG_NAME (0x1 | TAG_TYPE_STRINGREF) +#define TAG_DESCRIPTION (0x2 | TAG_TYPE_STRINGREF) +#define TAG_MODULE (0x3 | TAG_TYPE_STRINGREF) +#define TAG_API (0x4 | TAG_TYPE_STRINGREF) +#define TAG_VENDOR (0x5 | TAG_TYPE_STRINGREF) +#define TAG_APP_NAME (0x6 | TAG_TYPE_STRINGREF) +#define TAG_COMMAND_LINE (0x8 | TAG_TYPE_STRINGREF) +#define TAG_COMPANY_NAME (0x9 | TAG_TYPE_STRINGREF) +#define TAG_DLLFILE (0xA | TAG_TYPE_STRINGREF) +#define TAG_WILDCARD_NAME (0xB | TAG_TYPE_STRINGREF) +#define TAG_PRODUCT_NAME (0x10 | TAG_TYPE_STRINGREF) +#define TAG_PRODUCT_VERSION (0x11 | TAG_TYPE_STRINGREF) +#define TAG_FILE_DESCRIPTION (0x12 | TAG_TYPE_STRINGREF) +#define TAG_FILE_VERSION (0x13 | TAG_TYPE_STRINGREF) +#define TAG_ORIGINAL_FILENAME (0x14 | TAG_TYPE_STRINGREF) +#define TAG_INTERNAL_NAME (0x15 | TAG_TYPE_STRINGREF) +#define TAG_LEGAL_COPYRIGHT (0x16 | TAG_TYPE_STRINGREF) +#define TAG_16BIT_DESCRIPTION (0x17 | TAG_TYPE_STRINGREF) +#define TAG_APPHELP_DETAILS (0x18 | TAG_TYPE_STRINGREF) +#define TAG_LINK_URL (0x19 | TAG_TYPE_STRINGREF) +#define TAG_LINK_TEXT (0x1A | TAG_TYPE_STRINGREF) +#define TAG_APPHELP_TITLE (0x1B | TAG_TYPE_STRINGREF) +#define TAG_APPHELP_CONTACT (0x1C | TAG_TYPE_STRINGREF) +#define TAG_SXS_MANIFEST (0x1D | TAG_TYPE_STRINGREF) +#define TAG_DATA_STRING (0x1E | TAG_TYPE_STRINGREF) +#define TAG_MSI_TRANSFORM_FILE (0x1F | TAG_TYPE_STRINGREF) +#define TAG_16BIT_MODULE_NAME (0x20 | TAG_TYPE_STRINGREF) +#define TAG_LAYER_DISPLAYNAME (0x21 | TAG_TYPE_STRINGREF) +#define TAG_COMPILER_VERSION (0x22 | TAG_TYPE_STRINGREF) +#define TAG_ACTION_TYPE (0x23 | TAG_TYPE_STRINGREF) +#define TAG_EXPORT_NAME (0x24 | TAG_TYPE_STRINGREF) + +/* TAG_TYPE_LIST */ +#define TAG_DATABASE (0x1 | TAG_TYPE_LIST) +#define TAG_LIBRARY (0x2 | TAG_TYPE_LIST) +#define TAG_INEXCLUD (0x3 | TAG_TYPE_LIST) +#define TAG_SHIM (0x4 | TAG_TYPE_LIST) +#define TAG_PATCH (0x5 | TAG_TYPE_LIST) +#define TAG_APP (0x6 | TAG_TYPE_LIST) +#define TAG_EXE (0x7 | TAG_TYPE_LIST) +#define TAG_MATCHING_FILE (0x8 | TAG_TYPE_LIST) +#define TAG_SHIM_REF (0x9| TAG_TYPE_LIST) +#define TAG_PATCH_REF (0xA | TAG_TYPE_LIST) +#define TAG_LAYER (0xB | TAG_TYPE_LIST) +#define TAG_FILE (0xC | TAG_TYPE_LIST) +#define TAG_APPHELP (0xD | TAG_TYPE_LIST) +#define TAG_LINK (0xE | TAG_TYPE_LIST) +#define TAG_DATA (0xF | TAG_TYPE_LIST) +#define TAG_MSI_TRANSFORM (0x10 | TAG_TYPE_LIST) +#define TAG_MSI_TRANSFORM_REF (0x11 | TAG_TYPE_LIST) +#define TAG_MSI_PACKAGE (0x12 | TAG_TYPE_LIST) +#define TAG_FLAG (0x13 | TAG_TYPE_LIST) +#define TAG_MSI_CUSTOM_ACTION (0x14 | TAG_TYPE_LIST) +#define TAG_FLAG_REF (0x15 | TAG_TYPE_LIST) +#define TAG_ACTION (0x16 | TAG_TYPE_LIST) +#define TAG_LOOKUP (0x17 | TAG_TYPE_LIST) +#define TAG_CONTEXT (0x18 | TAG_TYPE_LIST) +#define TAG_CONTEXT_REF (0x19 | TAG_TYPE_LIST) +#define TAG_STRINGTABLE (0x801 | TAG_TYPE_LIST) +#define TAG_INDEXES (0x802 | TAG_TYPE_LIST) +#define TAG_INDEX (0x803 | TAG_TYPE_LIST) + +/* TAG_TYPE_STRING */ +#define TAG_STRINGTABLE_ITEM (0x801 | TAG_TYPE_STRING) + +/* TAG_TYPE_BINARY */ +#define TAG_PATCH_BITS (0x2 | TAG_TYPE_BINARY) +#define TAG_FILE_BITS (0x3 | TAG_TYPE_BINARY) +#define TAG_EXE_ID (0x4 | TAG_TYPE_BINARY) +#define TAG_DATA_BITS (0x5 | TAG_TYPE_BINARY) +#define TAG_MSI_PACKAGE_ID (0x6 | TAG_TYPE_BINARY) +#define TAG_DATABASE_ID (0x7 | TAG_TYPE_BINARY) +#define TAG_CONTEXT_PLATFORM_ID (0x8 | TAG_TYPE_BINARY) +#define TAG_CONTEXT_BRANCH_ID (0x9 | TAG_TYPE_BINARY) +#define TAG_FIX_ID (0x10 | TAG_TYPE_BINARY) +#define TAG_APP_ID (0x11 | TAG_TYPE_BINARY) +#define TAG_INDEX_BITS (0x801 | TAG_TYPE_BINARY) + #ifdef __cplusplus } // extern "C" #endif Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] Sun Apr 24 13:05:00 2016 @@ -145,7 +145,7 @@ @ stub SdbStringReplaceArray @ stub SdbTagIDToTagRef @ stub SdbTagRefToTagID -@ stub SdbTagToString +@ stdcall SdbTagToString(long) @ stub SdbUnregisterDatabase @ stub SdbWriteBinaryTag @ stub SdbWriteBinaryTagFromFile Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Sun Apr 24 13:05:00 2016 @@ -202,3 +202,267 @@ #endif HeapFree(SdbpHeap(), 0, mem); } + +/** + * Converts specified tag into a string. + * + * @param [in] tag The tag which will be converted to a string. + * + * @return Success: Pointer to the string matching specified tag, or L"InvalidTag" on failure. + */ +LPCWSTR WINAPI SdbTagToString(TAG tag) +{ + /* lookup tables for tags in range 0x1 -> 0xFF | TYPE */ + static const WCHAR table[9][0x31][25] = { + { /* TAG_TYPE_NULL */ + {'I','N','C','L','U','D','E',0}, + {'G','E','N','E','R','A','L',0}, + {'M','A','T','C','H','_','L','O','G','I','C','_','N','O','T',0}, + {'A','P','P','L','Y','_','A','L','L','_','S','H','I','M','S',0}, + {'U','S','E','_','S','E','R','V','I','C','E','_','P','A','C','K','_','F','I','L','E','S',0}, + {'M','I','T','I','G','A','T','I','O','N','_','O','S',0}, + {'B','L','O','C','K','_','U','P','G','R','A','D','E',0}, + {'I','N','C','L','U','D','E','E','X','C','L','U','D','E','D','L','L',0}, + {'R','A','C','_','E','V','E','N','T','_','O','F','F',0}, + {'T','E','L','E','M','E','T','R','Y','_','O','F','F',0}, + {'S','H','I','M','_','E','N','G','I','N','E','_','O','F','F',0}, + {'L','A','Y','E','R','_','P','R','O','P','A','G','A','T','I','O','N','_','O','F','F',0}, + {'R','E','I','N','S','T','A','L','L','_','U','P','G','R','A','D','E',0} + }, + { /* TAG_TYPE_BYTE */ + {'I','n','v','a','l','i','d','T','a','g',0} + }, + { /* TAG_TYPE_WORD */ + {'M','A','T','C','H','_','M','O','D','E',0} + }, + { /* TAG_TYPE_DWORD */ + {'S','I','Z','E',0}, + {'O','F','F','S','E','T',0}, + {'C','H','E','C','K','S','U','M',0}, + {'S','H','I','M','_','T','A','G','I','D',0}, + {'P','A','T','C','H','_','T','A','G','I','D',0}, + {'M','O','D','U','L','E','_','T','Y','P','E',0}, + {'V','E','R','D','A','T','E','H','I',0}, + {'V','E','R','D','A','T','E','L','O',0}, + {'V','E','R','F','I','L','E','O','S',0}, + {'V','E','R','F','I','L','E','T','Y','P','E',0}, + {'P','E','_','C','H','E','C','K','S','U','M',0}, + {'P','R','E','V','O','S','M','A','J','O','R','V','E','R',0}, + {'P','R','E','V','O','S','M','I','N','O','R','V','E','R',0}, + {'P','R','E','V','O','S','P','L','A','T','F','O','R','M','I','D',0}, + {'P','R','E','V','O','S','B','U','I','L','D','N','O',0}, + {'P','R','O','B','L','E','M','S','E','V','E','R','I','T','Y',0}, + {'L','A','N','G','I','D',0}, + {'V','E','R','_','L','A','N','G','U','A','G','E',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'E','N','G','I','N','E',0}, + {'H','T','M','L','H','E','L','P','I','D',0}, + {'I','N','D','E','X','_','F','L','A','G','S',0}, + {'F','L','A','G','S',0}, + {'D','A','T','A','_','V','A','L','U','E','T','Y','P','E',0}, + {'D','A','T','A','_','D','W','O','R','D',0}, + {'L','A','Y','E','R','_','T','A','G','I','D',0}, + {'M','S','I','_','T','R','A','N','S','F','O','R','M','_','T','A','G','I','D',0}, + {'L','I','N','K','E','R','_','V','E','R','S','I','O','N',0}, + {'L','I','N','K','_','D','A','T','E',0}, + {'U','P','T','O','_','L','I','N','K','_','D','A','T','E',0}, + {'O','S','_','S','E','R','V','I','C','E','_','P','A','C','K',0}, + {'F','L','A','G','_','T','A','G','I','D',0}, + {'R','U','N','T','I','M','E','_','P','L','A','T','F','O','R','M',0}, + {'O','S','_','S','K','U',0}, + {'O','S','_','P','L','A','T','F','O','R','M',0}, + {'A','P','P','_','N','A','M','E','_','R','C','_','I','D',0}, + {'V','E','N','D','O','R','_','N','A','M','E','_','R','C','_','I','D',0}, + {'S','U','M','M','A','R','Y','_','M','S','G','_','R','C','_','I','D',0}, + {'V','I','S','T','A','_','S','K','U',0}, + {'D','E','S','C','R','I','P','T','I','O','N','_','R','C','_','I','D',0}, + {'P','A','R','A','M','E','T','E','R','1','_','R','C','_','I','D',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'C','O','N','T','E','X','T','_','T','A','G','I','D',0}, + {'E','X','E','_','W','R','A','P','P','E','R',0} + }, + { /* TAG_TYPE_QWORD */ + {'T','I','M','E',0}, + {'B','I','N','_','F','I','L','E','_','V','E','R','S','I','O','N',0}, + {'B','I','N','_','P','R','O','D','U','C','T','_','V','E','R','S','I','O','N',0}, + {'M','O','D','T','I','M','E',0}, + {'F','L','A','G','_','M','A','S','K','_','K','E','R','N','E','L',0}, + {'U','P','T','O','_','B','I','N','_','P','R','O','D','U','C','T','_','V','E','R','S','I','O','N',0}, + {'D','A','T','A','_','Q','W','O','R','D',0}, + {'F','L','A','G','_','M','A','S','K','_','U','S','E','R',0}, + {'F','L','A','G','S','_','N','T','V','D','M','1',0}, + {'F','L','A','G','S','_','N','T','V','D','M','2',0}, + {'F','L','A','G','S','_','N','T','V','D','M','3',0}, + {'F','L','A','G','_','M','A','S','K','_','S','H','E','L','L',0}, + {'U','P','T','O','_','B','I','N','_','F','I','L','E','_','V','E','R','S','I','O','N',0}, + {'F','L','A','G','_','M','A','S','K','_','F','U','S','I','O','N',0}, + {'F','L','A','G','_','P','R','O','C','E','S','S','P','A','R','A','M',0}, + {'F','L','A','G','_','L','U','A',0}, + {'F','L','A','G','_','I','N','S','T','A','L','L',0} + }, + { /* TAG_TYPE_STRINGREF */ + {'N','A','M','E',0}, + {'D','E','S','C','R','I','P','T','I','O','N',0}, + {'M','O','D','U','L','E',0}, + {'A','P','I',0}, + {'V','E','N','D','O','R',0}, + {'A','P','P','_','N','A','M','E',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'C','O','M','M','A','N','D','_','L','I','N','E',0}, + {'C','O','M','P','A','N','Y','_','N','A','M','E',0}, + {'D','L','L','F','I','L','E',0}, + {'W','I','L','D','C','A','R','D','_','N','A','M','E',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'P','R','O','D','U','C','T','_','N','A','M','E',0}, + {'P','R','O','D','U','C','T','_','V','E','R','S','I','O','N',0}, + {'F','I','L','E','_','D','E','S','C','R','I','P','T','I','O','N',0}, + {'F','I','L','E','_','V','E','R','S','I','O','N',0}, + {'O','R','I','G','I','N','A','L','_','F','I','L','E','N','A','M','E',0}, + {'I','N','T','E','R','N','A','L','_','N','A','M','E',0}, + {'L','E','G','A','L','_','C','O','P','Y','R','I','G','H','T',0}, + {'1','6','B','I','T','_','D','E','S','C','R','I','P','T','I','O','N',0}, + {'A','P','P','H','E','L','P','_','D','E','T','A','I','L','S',0}, + {'L','I','N','K','_','U','R','L',0}, + {'L','I','N','K','_','T','E','X','T',0}, + {'A','P','P','H','E','L','P','_','T','I','T','L','E',0}, + {'A','P','P','H','E','L','P','_','C','O','N','T','A','C','T',0}, + {'S','X','S','_','M','A','N','I','F','E','S','T',0}, + {'D','A','T','A','_','S','T','R','I','N','G',0}, + {'M','S','I','_','T','R','A','N','S','F','O','R','M','_','F','I','L','E',0}, + {'1','6','B','I','T','_','M','O','D','U','L','E','_','N','A','M','E',0}, + {'L','A','Y','E','R','_','D','I','S','P','L','A','Y','N','A','M','E',0}, + {'C','O','M','P','I','L','E','R','_','V','E','R','S','I','O','N',0}, + {'A','C','T','I','O','N','_','T','Y','P','E',0}, + {'E','X','P','O','R','T','_','N','A','M','E',0} + }, + { /* TAG_TYPE_LIST */ + {'D','A','T','A','B','A','S','E',0}, + {'L','I','B','R','A','R','Y',0}, + {'I','N','E','X','C','L','U','D','E',0}, + {'S','H','I','M',0}, + {'P','A','T','C','H',0}, + {'A','P','P',0}, + {'E','X','E',0}, + {'M','A','T','C','H','I','N','G','_','F','I','L','E',0}, + {'S','H','I','M','_','R','E','F',0}, + {'P','A','T','C','H','_','R','E','F',0}, + {'L','A','Y','E','R',0}, + {'F','I','L','E',0}, + {'A','P','P','H','E','L','P',0}, + {'L','I','N','K',0}, + {'D','A','T','A',0}, + {'M','S','I','_','T','R','A','N','S','F','O','R','M',0}, + {'M','S','I','_','T','R','A','N','S','F','O','R','M','_','R','E','F',0}, + {'M','S','I','_','P','A','C','K','A','G','E',0}, + {'F','L','A','G',0}, + {'M','S','I','_','C','U','S','T','O','M','_','A','C','T','I','O','N',0}, + {'F','L','A','G','_','R','E','F',0}, + {'A','C','T','I','O','N',0}, + {'L','O','O','K','U','P',0}, + {'C','O','N','T','E','X','T',0}, + {'C','O','N','T','E','X','T','_','R','E','F',0} + }, + { /* TAG_TYPE_STRING */ + {'I','n','v','a','l','i','d','T','a','g',0} + }, + { /* TAG_TYPE_BINARY */ + {'I','n','v','a','l','i','d','T','a','g',0}, + {'P','A','T','C','H','_','B','I','T','S',0}, + {'F','I','L','E','_','B','I','T','S',0}, + {'E','X','E','_','I','D',0}, + {'D','A','T','A','_','B','I','T','S',0}, + {'M','S','I','_','P','A','C','K','A','G','E','_','I','D',0}, + {'D','A','T','A','B','A','S','E','_','I','D',0}, + {'C','O','N','T','E','X','T','_','P','L','A','T','F','O','R','M','_','I','D',0}, + {'C','O','N','T','E','X','T','_','B','R','A','N','C','H','_','I','D',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'I','n','v','a','l','i','d','T','a','g',0}, + {'F','I','X','_','I','D',0}, + {'A','P','P','_','I','D',0} + } + }; + + /* sizes of tables in above array (# strings per type) */ + static const WORD limits[9] = { + /* switch off TYPE_* nibble of last tag for each type */ + TAG_REINSTALL_UPGRADE & 0xFF, + 1, + TAG_MATCH_MODE & 0xFF, + TAG_EXE_WRAPPER & 0xFF, + TAG_FLAG_INSTALL & 0xFF, + TAG_EXPORT_NAME & 0xFF, + TAG_CONTEXT_REF & 0xFF, + 1, + TAG_APP_ID & 0xFF + }; + + /* lookup tables for tags in range 0x800 + (0x1 -> 0xFF) | TYPE */ + static const WCHAR table2[9][3][17] = { + { {'I','n','v','a','l','i','d','T','a','g',0} }, /* TAG_TYPE_NULL */ + { {'I','n','v','a','l','i','d','T','a','g',0} }, /* TAG_TYPE_BYTE */ + { + {'T','A','G',0}, /* TAG_TYPE_WORD */ + {'I','N','D','E','X','_','T','A','G',0}, + {'I','N','D','E','X','_','K','E','Y',0} + }, + { {'T','A','G','I','D',0} }, /* TAG_TYPE_DWORD */ + { {'I','n','v','a','l','i','d','T','a','g',0} }, /* TAG_TYPE_QWORD */ + { {'I','n','v','a','l','i','d','T','a','g',0} }, /* TAG_TYPE_STRINGREF */ + { + {'S','T','R','I','N','G','T','A','B','L','E',0}, /* TAG_TYPE_LIST */ + {'I','N','D','E','X','E','S',0}, + {'I','N','D','E','X',0} + }, + { {'S','T','R','I','N','G','T','A','B','L','E','_','I','T','E','M',0}, }, /* TAG_TYPE_STRING */ + { {'I','N','D','E','X','_','B','I','T','S',0} } /* TAG_TYPE_BINARY */ + }; + + /* sizes of tables in above array, hardcoded for simplicity */ + static const WORD limits2[9] = { 0, 0, 3, 1, 0, 0, 3, 1, 1 }; + + static const WCHAR null[] = {'N','U','L','L',0}; + static const WCHAR invalid[] = {'I','n','v','a','l','i','d','T','a','g',0}; + + BOOL switch_table; /* should we use table2 and limits2? */ + WORD index, type_index; + + /* special case: null tag */ + if (tag == TAG_NULL) + return null; + + /* tags with only type mask or no type mask are invalid */ + if ((tag & ~TAG_TYPE_MASK) == 0 || (tag & TAG_TYPE_MASK) == 0) + return invalid; + + /* some valid tags are in range 0x800 + (0x1 -> 0xF) | TYPE */ + if ((tag & 0xF00) == 0x800) + switch_table = TRUE; + else if ((tag & 0xF00) == 0) + switch_table = FALSE; + else return invalid; + + /* index of table in array is type nibble */ + type_index = (tag >> 12) - 1; + + /* index of string in table is low byte */ + index = (tag & 0xFF) - 1; + + /* bound check */ + if (type_index >= 9 || index >= (switch_table ? limits2[type_index] : limits[type_index])) + return invalid; + + /* tag is valid */ + return switch_table ? table2[type_index][index] : table[type_index][index]; +} Modified: trunk/rostests/apitests/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/CMakeLis… ============================================================================== --- trunk/rostests/apitests/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/CMakeLists.txt [iso-8859-1] Sun Apr 24 13:05:00 2016 @@ -3,6 +3,7 @@ list(APPEND SOURCE layerapi.c + apphelp.c testlist.c) add_executable(apphelp_apitest ${SOURCE}) Added: trunk/rostests/apitests/apphelp/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/apphelp.… ============================================================================== --- trunk/rostests/apitests/apphelp/apphelp.c (added) +++ trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] Sun Apr 24 13:05:00 2016 @@ -0,0 +1,81 @@ +/* + * Copyright 2012 Detlef Riekenberg + * Copyright 2013 Mislav Blaevic + * + * 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 St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include <shlwapi.h> +#include <winnt.h> +#ifdef __REACTOS__ +#include <ntndk.h> +#else +#include <winternl.h> +#endif + +#include <winerror.h> +#include <stdio.h> + +#include "wine/test.h" + + +typedef WORD TAG; + +#define TAG_TYPE_MASK 0xF000 + +#define TAG_TYPE_NULL 0x1000 +#define TAG_TYPE_BYTE 0x2000 +#define TAG_TYPE_WORD 0x3000 +#define TAG_TYPE_DWORD 0x4000 +#define TAG_TYPE_QWORD 0x5000 +#define TAG_TYPE_STRINGREF 0x6000 +#define TAG_TYPE_LIST 0x7000 +#define TAG_TYPE_STRING 0x8000 +#define TAG_TYPE_BINARY 0x9000 + + +static HMODULE hdll; +static LPCWSTR (WINAPI *pSdbTagToString)(TAG); + +static void test_SdbTagToString(void) +{ + static const TAG invalid_values[] = { + 1, TAG_TYPE_WORD, TAG_TYPE_MASK, + TAG_TYPE_DWORD | 0xFF, + TAG_TYPE_DWORD | (0x800 + 0xEE), + 0x900, 0xFFFF, 0xDEAD, 0xBEEF + }; + static const WCHAR invalid[] = {'I','n','v','a','l','i','d','T','a','g',0}; + LPCWSTR ret; + WORD i; + + for (i = 0; i < 9; ++i) + { + ret = pSdbTagToString(invalid_values[i]); + ok(lstrcmpW(ret, invalid) == 0, "unexpected string %s, should be %s\n", + wine_dbgstr_w(ret), wine_dbgstr_w(invalid)); + } +} + +START_TEST(apphelp) +{ + hdll = LoadLibraryA("apphelp.dll"); + pSdbTagToString = (void *) GetProcAddress(hdll, "SdbTagToString"); + test_SdbTagToString(); +} Propchange: trunk/rostests/apitests/apphelp/apphelp.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/apphelp/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/testlist… ============================================================================== --- trunk/rostests/apitests/apphelp/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/testlist.c [iso-8859-1] Sun Apr 24 13:05:00 2016 @@ -4,9 +4,11 @@ #include <wine/test.h> extern void func_layerapi(void); +extern void func_apphelp(void); const struct test winetest_testlist[] = { { "layerapi", func_layerapi }, + { "apphelp", func_apphelp }, { 0, 0 } };

1 0

[pschweitzer] 71196: Create the NTFS branch for Trevor's work
by pschweitzer＠svn.reactos.org 24 Apr '16

24 Apr '16

Author: pschweitzer Date: Sun Apr 24 12:50:40 2016 New Revision: 71196 URL: http://svn.reactos.org/svn/reactos?rev=71196&view=rev Log: Create the NTFS branch for Trevor's work Added: branches/GSoC_2016/NTFS/ (props changed) - copied from r71195, trunk/reactos/ Propchange: branches/GSoC_2016/NTFS/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 24 12:50:40 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/NTFS/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Apr 24 12:50:40 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/GSoC_2016/NTFS/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[pschweitzer] 71195: Create the GSoC 2016 branch
by pschweitzer＠svn.reactos.org 24 Apr '16

24 Apr '16

Author: pschweitzer Date: Sun Apr 24 12:48:04 2016 New Revision: 71195 URL: http://svn.reactos.org/svn/reactos?rev=71195&view=rev Log: Create the GSoC 2016 branch Added: branches/GSoC_2016/

1 0

[ekohl] 71194: [SYSSETUP] Rename SetAccountDomain to SetAccountsDomainSid and export it.
by ekohl＠svn.reactos.org 24 Apr '16

24 Apr '16

Author: ekohl Date: Sun Apr 24 11:29:40 2016 New Revision: 71194 URL: http://svn.reactos.org/svn/reactos?rev=71194&view=rev Log: [SYSSETUP] Rename SetAccountDomain to SetAccountsDomainSid and export it. Modified: trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/security.c trunk/reactos/dll/win32/syssetup/syssetup.spec trunk/reactos/dll/win32/syssetup/wizard.c trunk/reactos/sdk/include/reactos/libs/syssetup/syssetup.h Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Sun Apr 24 11:29:40 2016 @@ -74,8 +74,7 @@ BOOL RegisterTypeLibraries (HINF hinf, LPCWSTR szSection); /* security.c */ -NTSTATUS SetAccountDomain(LPCWSTR DomainName, - PSID DomainSid); + VOID InstallSecurity(VOID); NTSTATUS SetAdministratorPassword(LPCWSTR Password); Modified: trunk/reactos/dll/win32/syssetup/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/securit… ============================================================================== --- trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] Sun Apr 24 11:29:40 2016 @@ -21,8 +21,10 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS -SetAccountDomain(LPCWSTR DomainName, - PSID DomainSid) +WINAPI +SetAccountsDomainSid( + PSID DomainSid, + LPCWSTR DomainName) { PPOLICY_ACCOUNT_DOMAIN_INFO OrigInfo = NULL; POLICY_ACCOUNT_DOMAIN_INFO Info; @@ -35,7 +37,7 @@ NTSTATUS Status; - DPRINT("SYSSETUP: SetAccountDomain\n"); + DPRINT("SYSSETUP: SetAccountsDomainSid\n"); memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); Modified: trunk/reactos/dll/win32/syssetup/syssetup.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] Sun Apr 24 11:29:40 2016 @@ -38,7 +38,7 @@ @ stub ReportError @ stub RunOEMExtraTasks @ stdcall ScsiClassInstaller(long ptr ptr) -@ stub SetAccountDomainSid +@ stdcall SetAccountsDomainSid(ptr wstr) @ stub SetupAddOrRemoveTestCertificate @ stdcall SetupChangeFontSize(ptr wstr) @ stdcall SetupChangeLocale(ptr long) Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sun Apr 24 11:29:40 2016 @@ -587,8 +587,8 @@ /* Try to also set DNS hostname */ SetComputerNameExW(ComputerNamePhysicalDnsHostname, ComputerName); - /* Set the account domain name */ - SetAccountDomain(ComputerName, NULL); + /* Set the accounts domain name */ + SetAccountsDomainSid(NULL, ComputerName); return TRUE; } Modified: trunk/reactos/sdk/include/reactos/libs/syssetup/syssetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/s… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] Sun Apr 24 11:29:40 2016 @@ -25,9 +25,16 @@ /* System setup APIs */ -DWORD WINAPI -InstallReactOS (HINSTANCE hInstance); +DWORD +WINAPI +InstallReactOS( + HINSTANCE hInstance); +NTSTATUS +WINAPI +SetAccountsDomainSid( + PSID DomainSid, + LPCWSTR DomainName); /* Log File APIs */

1 0

[mjansen] 71193: * Addendum to r71192, which was based on the research of Jared Smudde, Sylvain Deverre and Robert Naumann. CORE-10837
by mjansen＠svn.reactos.org 23 Apr '16

23 Apr '16

Author: mjansen Date: Sat Apr 23 23:20:44 2016 New Revision: 71193 URL: http://svn.reactos.org/svn/reactos?rev=71193&view=rev Log: * Addendum to r71192, which was based on the research of Jared Smudde, Sylvain Deverre and Robert Naumann. CORE-10837 Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Apr 23 23:20:44 2016 @@ -3207,6 +3207,7 @@ SHEnableMenuItem(theMenu, IDM_TOOLS_MAPNETWORKDRIVE, FALSE); SHEnableMenuItem(theMenu, IDM_TOOLS_DISCONNECTNETWORKDRIVE, FALSE); SHEnableMenuItem(theMenu, IDM_TOOLS_SYNCHRONIZE, FALSE); + FIXME("Folder options dialog is stubbed: CORE-11141\n"); SHEnableMenuItem(theMenu, IDM_TOOLS_FOLDEROPTIONS, FALSE); // Remove when CORE-11141 is fixed. menuIndex = 4; }

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