Ros-diffs September 2016

ros-diffs@reactos.org

18 participants
342 discussions

[mjansen] 72550: [ADVAPI32] Do not report failure when closing a predefined registry key.

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Sep 3 16:31:27 2016 New Revision: 72550 URL: http://svn.reactos.org/svn/reactos?rev=72550&view=rev Log: [ADVAPI32] Do not report failure when closing a predefined registry key. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sat Sep 3 16:31:27 2016 @@ -425,9 +425,14 @@ NTSTATUS Status; /* don't close null handle or a pseudo handle */ - if ((!hKey) || (((ULONG_PTR)hKey & 0xF0000000) == 0x80000000)) + if (!hKey) { return ERROR_INVALID_HANDLE; + } + + if (((ULONG_PTR)hKey & 0xF0000000) == 0x80000000) + { + return ERROR_SUCCESS; } Status = NtClose(hKey);

8 years

[mjansen] 72549: [APPHELP][APPHELP_APITEST] Partially implement SdbGetMatchingExe, SdbInitDatabase and SdbTagRefToTagID. CORE-10367 - SdbGetMatchingExe, SdbInitDatabase partial implementation by Mi...

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Sep 3 16:20:52 2016 New Revision: 72549 URL: http://svn.reactos.org/svn/reactos?rev=72549&view=rev Log: [APPHELP][APPHELP_APITEST] Partially implement SdbGetMatchingExe, SdbInitDatabase and SdbTagRefToTagID. CORE-10367 - SdbGetMatchingExe, SdbInitDatabase partial implementation by Mislav Blažević - Tests by me, they pass on vista - win10. (Win2k3 has another struct layout) - Move shared test functions to a common header - SdbTagRefToTagID misses functionality related to multiple databases, but that is not supported anywhere yet. Added: trunk/reactos/dll/appcompat/apphelp/hsdb.c (with props) trunk/rostests/apitests/apphelp/apphelp_apitest.h (with props) Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt trunk/reactos/dll/appcompat/apphelp/apphelp.c 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/apphelp.c trunk/rostests/apitests/apphelp/data.c trunk/rostests/apitests/apphelp/db.c trunk/rostests/apitests/apphelp/layerapi.c Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/CMak… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] Sat Sep 3 16:20:52 2016 @@ -3,6 +3,7 @@ list(APPEND SOURCE apphelp.c + hsdb.c layer.c sdbapi.c sdbfileattr.c Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.c [iso-8859-1] Sat Sep 3 16:20:52 2016 @@ -40,7 +40,7 @@ { UNICODE_STRING DebugKey, DebugValue; NTSTATUS Status; - ULONG NewLevel = 0; + ULONG NewLevel = SHIM_ERR; WCHAR Buffer[40]; RtlInitUnicodeString(&DebugKey, L"SHIM_DEBUG_LEVEL"); 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] Sat Sep 3 16:20:52 2016 @@ -50,22 +50,58 @@ }; } ATTRINFO, *PATTRINFO; +#define SDB_MAX_SDBS 16 +#define SDB_MAX_EXES 16 +#define SDB_MAX_LAYERS 8 + +/* Flags for adwExeFlags */ +#define SHIMREG_DISABLE_SHIM (0x00000001) +#define SHIMREG_DISABLE_APPHELP (0x00000002) +#define SHIMREG_APPHELP_NOUI (0x00000004) +#define SHIMREG_APPHELP_CANCEL (0x10000000) +#define SHIMREG_DISABLE_SXS (0x00000010) +#define SHIMREG_DISABLE_LAYER (0x00000020) +#define SHIMREG_DISABLE_DRIVER (0x00000040) + +#define SDBGMEF_IGNORE_ENVIRONMENT (0x1) + +typedef struct tagSDBQUERYRESULT { + TAGREF atrExes[SDB_MAX_EXES]; + DWORD adwExeFlags[SDB_MAX_EXES]; + TAGREF atrLayers[SDB_MAX_LAYERS]; + DWORD dwLayerFlags; + TAGREF trApphelp; + DWORD dwExeCount; + DWORD dwLayerCount; + GUID guidID; + DWORD dwFlags; + DWORD dwCustomSDBMap; + GUID rgGuidDB[SDB_MAX_SDBS]; +} SDBQUERYRESULT, *PSDBQUERYRESULT; + /* apphelp.c */ #include "sdbpapi.h" PWSTR SdbpStrDup(LPCWSTR string); +HSDB WINAPI SdbInitDatabase(DWORD, LPCWSTR); +void WINAPI SdbReleaseDatabase(HSDB); PDB WINAPI SdbOpenDatabase(LPCWSTR path, PATH_TYPE type); void WINAPI SdbCloseDatabase(PDB); BOOL WINAPI SdbIsNullGUID(CONST GUID *Guid); +BOOL WINAPI SdbGetAppPatchDir(HSDB db, LPWSTR path, DWORD size); +LPWSTR WINAPI SdbGetStringTagPtr(PDB db, TAGID tagid); /* sdbread.c */ BOOL WINAPI SdbpReadData(PDB db, PVOID dest, DWORD offset, DWORD num); TAG WINAPI SdbGetTagFromTagID(PDB db, TAGID tagid); TAGID WINAPI SdbFindFirstTag(PDB db, TAGID parent, TAG tag); +TAGID WINAPI SdbFindNextTag(PDB db, TAGID parent, TAGID prev_child); BOOL WINAPI SdbGetDatabaseID(PDB db, GUID* Guid); +/* sdbfileattr.c*/ +BOOL WINAPI SdbFreeFileAttributes(PATTRINFO attr_info); /* layer.c */ BOOL WINAPI AllowPermLayer(PCWSTR path); 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] Sat Sep 3 16:20:52 2016 @@ -71,7 +71,7 @@ @ stub SdbGetLayerName @ stub SdbGetLayerTagRef @ stub SdbGetLocalPDB -@ stub SdbGetMatchingExe +@ stdcall SdbGetMatchingExe(ptr wstr wstr wstr long ptr) @ stub SdbGetMsiPackageInformation @ stub SdbGetNamedLayer @ stdcall SdbGetNextChild(ptr long long) @@ -87,7 +87,7 @@ @ stub SdbGrabMatchingInfoEx @ stdcall SdbGUIDFromString(wstr ptr) @ stdcall SdbGUIDToString(ptr wstr long) -@ stub SdbInitDatabase +@ stdcall SdbInitDatabase(long wstr) @ stub SdbInitDatabaseEx @ stdcall SdbIsNullGUID(ptr) @ stub SdbIsStandardDatabase @@ -129,7 +129,7 @@ @ stdcall SdbReadWORDTag(ptr long long) @ stub SdbReadWORDTagRef @ stub SdbRegisterDatabase -@ stub SdbReleaseDatabase +@ stdcall SdbReleaseDatabase(ptr) @ stub SdbReleaseMatchingExe @ stub SdbResolveDatabase @ stub SdbSetApphelpDebugParameters @@ -144,7 +144,7 @@ @ stub SdbStringReplace @ stub SdbStringReplaceArray @ stub SdbTagIDToTagRef -@ stub SdbTagRefToTagID +@ stdcall SdbTagRefToTagID(ptr long ptr ptr) @ stdcall SdbTagToString(long) @ stub SdbUnregisterDatabase @ stdcall SdbWriteBinaryTag(ptr long ptr long) Added: trunk/reactos/dll/appcompat/apphelp/hsdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/hsdb… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/hsdb.c (added) +++ trunk/reactos/dll/appcompat/apphelp/hsdb.c [iso-8859-1] Sat Sep 3 16:20:52 2016 @@ -0,0 +1,281 @@ +/* + * Copyright 2011 AndrÃ© Hentschel + * Copyright 2013 Mislav BlaÅ¾eviÄ + * 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 + * 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 + */ + +#define WIN32_NO_STATUS +#include "windows.h" +#include "ntndk.h" +#include "strsafe.h" +#include "apphelp.h" +//#include "sdbstringtable.h" + +#include "wine/unicode.h" + + +static BOOL WINAPI SdbpFileExists(LPCWSTR path) +{ + DWORD attr = GetFileAttributesW(path); + return (attr != INVALID_FILE_ATTRIBUTES && !(attr & FILE_ATTRIBUTE_DIRECTORY)); +} + + +/** + * Opens specified shim database file Handle returned by this function may only be used by + * functions which take HSDB param thus differing it from SdbOpenDatabase. + * + * @param [in] flags Specifies type of path or predefined database. + * @param [in] path Path to the shim database file. + * + * @return Success: Handle to the opened shim database, NULL otherwise. + */ +HSDB WINAPI SdbInitDatabase(DWORD flags, LPCWSTR path) +{ + static const WCHAR shim[] = {'\\','s','y','s','m','a','i','n','.','s','d','b',0}; + static const WCHAR msi[] = {'\\','m','s','i','m','a','i','n','.','s','d','b',0}; + static const WCHAR drivers[] = {'\\','d','r','v','m','a','i','n','.','s','d','b',0}; + LPCWSTR name; + WCHAR buffer[128]; + HSDB sdb; + + sdb = SdbAlloc(sizeof(SDB)); + if (!sdb) + return NULL; + sdb->auto_loaded = 0; + + /* Check for predefined databases */ + if ((flags & HID_DATABASE_TYPE_MASK) && path == NULL) + { + switch (flags & HID_DATABASE_TYPE_MASK) + { + case SDB_DATABASE_MAIN_SHIM: name = shim; break; + case SDB_DATABASE_MAIN_MSI: name = msi; break; + case SDB_DATABASE_MAIN_DRIVERS: name = drivers; break; + default: return NULL; + } + SdbGetAppPatchDir(NULL, buffer, 128); + memcpy(buffer + lstrlenW(buffer), name, SdbpStrlen(name)); + } + + sdb->db = SdbOpenDatabase(path ? path : buffer, (flags & 0xF) - 1); + + /* If database could not be loaded, a handle doesn't make sense either */ + if (!sdb->db) + { + SdbReleaseDatabase(sdb); + return NULL; + } + + return sdb; +} + +/** + * Closes shim database opened by SdbInitDatabase. + * + * @param [in] hsdb Handle to the shim database. + */ +void WINAPI SdbReleaseDatabase(HSDB hsdb) +{ + SdbCloseDatabase(hsdb->db); + SdbFree(hsdb); +} + +/** + * Queries database for a specified exe If hsdb is NULL default database shall be loaded and + * searched. + * + * @param [in] hsdb Handle to the shim database. + * @param [in] path Path to executable for which we query database. + * @param [in] module_name Unused. + * @param [in] env Unused. + * @param [in] flags 0 or SDBGMEF_IGNORE_ENVIRONMENT. + * @param [out] result Pointer to structure in which query result shall be stored. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbGetMatchingExe(HSDB hsdb, LPCWSTR path, LPCWSTR module_name, + LPCWSTR env, DWORD flags, PSDBQUERYRESULT result) +{ + static const WCHAR fmt[] = {'%','s','%','s',0}; + BOOL ok, ret; + TAGID database, iter, attr; + PATTRINFO attribs = NULL; + /*DWORD attr_count;*/ + LPWSTR file_name; + WCHAR dir_path[128]; + WCHAR buffer[256]; + PDB db; + + /* Load default database if one is not specified */ + if (!hsdb) + { + /* To reproduce windows behaviour HID_DOS_PATHS needs + * to be specified when loading default database */ + hsdb = SdbInitDatabase(HID_DOS_PATHS | SDB_DATABASE_MAIN_SHIM, NULL); + if(hsdb) + hsdb->auto_loaded = TRUE; + } + + /* No database could be loaded */ + if (!hsdb) + return FALSE; + + db = hsdb->db; + + /* Extract file name */ + file_name = strrchrW(path, '\\') + 1; + + /* Extract directory path */ + memcpy(dir_path, path, (size_t)(file_name - path) * sizeof(WCHAR)); + + /* Get information about executable required to match it with database entry */ + /*if (!SdbGetFileAttributes(path, &attribs, &attr_count)) + return FALSE;*/ + + /* DATABASE is list TAG which contains all executables */ + database = SdbFindFirstTag(db, TAGID_ROOT, TAG_DATABASE); + if (database == TAGID_NULL) + return FALSE; + + /* EXE is list TAG which contains data required to match executable */ + iter = SdbFindFirstTag(db, database, TAG_EXE); + + /* Search for entry in database */ + while (iter != TAGID_NULL) + { + /* Check if exe name matches */ + attr = SdbFindFirstTag(db, iter, TAG_NAME); + if (lstrcmpiW(SdbGetStringTagPtr(db, attr), file_name) == 0) + { + /* Assume that entry is found (in case there are no "matching files") */ + ok = TRUE; + + /* Check if all "matching files" exist */ + /* TODO: check size/checksum as well */ + for (attr = SdbFindFirstTag(db, attr, TAG_MATCHING_FILE); + attr != TAGID_NULL; attr = SdbFindNextTag(db, iter, attr)) + { + snprintfW(buffer, 256, fmt, dir_path, SdbGetStringTagPtr(db, attr)); + if (!SdbpFileExists(buffer)) + ok = FALSE; + } + + /* Found it! */ + if (ok) + { + /* TODO: fill result data */ + /* TODO: there may be multiple matches */ + ret = TRUE; + goto cleanup; + } + } + + /* Continue iterating */ + iter = SdbFindNextTag(db, database, iter); + } + + /* Exe not found */ + ret = FALSE; + +cleanup: + SdbFreeFileAttributes(attribs); + if (hsdb->auto_loaded) SdbReleaseDatabase(hsdb); + return ret; +} + +/** + * Retrieves AppPatch directory. + * + * @param [in] db Handle to the shim database. + * @param [out] path Pointer to memory in which path shall be written. + * @param [in] size Size of the buffer in characters. + */ +BOOL WINAPI SdbGetAppPatchDir(HSDB db, LPWSTR path, DWORD size) +{ + static WCHAR* default_dir = NULL; + static CONST WCHAR szAppPatch[] = {'\\','A','p','p','P','a','t','c','h',0}; + + /* In case function fails, path holds empty string */ + if (size > 0) + *path = 0; + + if (!default_dir) + { + WCHAR* tmp = NULL; + UINT len = GetSystemWindowsDirectoryW(NULL, 0) + lstrlenW(szAppPatch); + tmp = SdbAlloc((len + 1)* sizeof(WCHAR)); + if (tmp) + { + UINT r = GetSystemWindowsDirectoryW(tmp, len+1); + if (r && r < len) + { + if (SUCCEEDED(StringCchCatW(tmp, len+1, szAppPatch))) + { + if (InterlockedCompareExchangePointer((void**)&default_dir, tmp, NULL) == NULL) + tmp = NULL; + } + } + if (tmp) + SdbFree(tmp); + } + if (!default_dir) + { + SHIM_ERR("Unable to obtain default AppPatch directory\n"); + return FALSE; + } + } + + if (!db) + { + return SUCCEEDED(StringCchCopyW(path, size, default_dir)); + } + else + { + SHIM_ERR("Unimplemented for db != NULL\n"); + return FALSE; + } +} + + +/** + * Translates the given trWhich to a specific database / tagid + * + * @param [in] hsdb Handle to the database. + * @param [in] trWhich Path to executable for which we query database. + * @param [out,opt] ppdb The Shim database that trWhich belongs to. + * @param [out,opt] ptiWhich The tagid that trWhich corresponds to. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbTagRefToTagID(HSDB hSDB, TAGREF trWhich, PDB* ppdb, TAGID* ptiWhich) +{ + if (trWhich & 0xf0000000) + { + SHIM_ERR("Multiple shim databases not yet implemented!\n"); + return FALSE; + } + + /* There seems to be no range checking on trWhich.. */ + if (ppdb) + *ppdb = hSDB->db; + if (ptiWhich) + *ptiWhich = trWhich & 0x0fffffff; + + return TRUE; +} + Propchange: trunk/reactos/dll/appcompat/apphelp/hsdb.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Sat Sep 3 16:20:52 2016 @@ -458,59 +458,6 @@ SdbpTableDestroy(&db->string_lookup); SdbFree(db->data); SdbFree(db); -} - -/** - * Retrieves AppPatch directory. - * - * @param [in] db Handle to the shim database. - * @param [out] path Pointer to memory in which path shall be written. - * @param [in] size Size of the buffer in characters. - */ -BOOL WINAPI SdbGetAppPatchDir(HSDB db, LPWSTR path, DWORD size) -{ - static WCHAR* default_dir = NULL; - static CONST WCHAR szAppPatch[] = {'\\','A','p','p','P','a','t','c','h',0}; - - /* In case function fails, path holds empty string */ - if (size > 0) - *path = 0; - - if (!default_dir) - { - WCHAR* tmp = NULL; - UINT len = GetSystemWindowsDirectoryW(NULL, 0) + lstrlenW(szAppPatch); - tmp = SdbAlloc((len + 1)* sizeof(WCHAR)); - if (tmp) - { - UINT r = GetSystemWindowsDirectoryW(tmp, len+1); - if (r && r < len) - { - if (SUCCEEDED(StringCchCatW(tmp, len+1, szAppPatch))) - { - if (InterlockedCompareExchangePointer((void**)&default_dir, tmp, NULL) == NULL) - tmp = NULL; - } - } - if (tmp) - SdbFree(tmp); - } - if (!default_dir) - { - SHIM_ERR("Unable to obtain default AppPatch directory\n"); - return FALSE; - } - } - - if (!db) - { - return SUCCEEDED(StringCchCopyW(path, size, default_dir)); - } - else - { - /* fixme */ - return FALSE; - } } /** 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] Sat Sep 3 16:20:52 2016 @@ -36,26 +36,7 @@ #include "wine/test.h" -/* data.c */ -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(void); - -#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_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 +#include "apphelp_apitest.h" typedef WORD TAG; @@ -848,6 +829,8 @@ { g_WinVersion = get_host_winver(); trace("Detected version: 0x%x\n", g_WinVersion); + silence_debug_output(); + //SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "4"); //SetEnvironmentVariable("DEBUGCHANNEL", "+apphelp"); hdll = LoadLibraryA("apphelp.dll"); Added: trunk/rostests/apitests/apphelp/apphelp_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/apphelp_… ============================================================================== --- trunk/rostests/apitests/apphelp/apphelp_apitest.h (added) +++ trunk/rostests/apitests/apphelp/apphelp_apitest.h [iso-8859-1] Sat Sep 3 16:20:52 2016 @@ -0,0 +1,31 @@ +#ifndef APPHELP_APITEST_H +#define APPHELP_APITEST_H + + +/* data.c */ +void test_create_db_imp(const char* name); +DWORD test_get_db_size(); +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(void); +void silence_debug_output(void); // Silence output if the environment variable is not set. + +#define test_create_db (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_db_imp +#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_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 0x0a00 + + +#endif // APPHELP_APITEST_H Propchange: trunk/rostests/apitests/apphelp/apphelp_apitest.h ------------------------------------------------------------------------------ svn:eol-style = native 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] Sat Sep 3 16:20:52 2016 @@ -771,11 +771,16 @@ 0x21, 0x00, 0x00, 0x00 }; +DWORD test_get_db_size() +{ + return sizeof(rawData); +} + void test_create_db_imp(const char* name) { HANDLE file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "can't create file\n"); - if(file != INVALID_HANDLE_VALUE) + winetest_ok(file != INVALID_HANDLE_VALUE, "can't create file '%s'\n", name); + if (file != INVALID_HANDLE_VALUE) { DWORD size; WriteFile(file, rawData, sizeof(rawData), &size, NULL); @@ -799,3 +804,11 @@ return g_WinVersion; } +void silence_debug_output(void) +{ + if (GetEnvironmentVariableA("SHIM_DEBUG_LEVEL", NULL, 0) == ERROR_ENVVAR_NOT_FOUND) + SetEnvironmentVariableA("SHIM_DEBUG_LEVEL", "0"); + if (GetEnvironmentVariableA("SHIMENG_DEBUG_LEVEL", NULL, 0) == ERROR_ENVVAR_NOT_FOUND) + SetEnvironmentVariableA("SHIMENG_DEBUG_LEVEL", "0"); +} + Modified: trunk/rostests/apitests/apphelp/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/db.c?rev… ============================================================================== --- trunk/rostests/apitests/apphelp/db.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/db.c [iso-8859-1] Sat Sep 3 16:20:52 2016 @@ -36,18 +36,23 @@ #include "wine/test.h" -/* data.c */ -void test_create_db_imp(const char* name); - -#define test_create_db (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_db_imp +#include "apphelp_apitest.h" + + typedef WORD TAG; typedef DWORD TAGID; typedef DWORD TAGREF; typedef UINT64 QWORD; typedef VOID* PDB; +typedef VOID* HSDB; typedef INT PATH_TYPE; + #define DOS_PATH 0 +#define HID_DATABASE_FULLPATH 2 + +#define SDB_DATABASE_MAIN_SHIM 0x80030000 + #define TAGID_NULL 0x0 #define TAGID_ROOT 0x0 @@ -133,6 +138,26 @@ #define TAG_DATA_BITS (0x5 | TAG_TYPE_BINARY) #define TAG_DATABASE_ID (0x7 | TAG_TYPE_BINARY) + +#define SDB_MAX_SDBS 16 +#define SDB_MAX_EXES 16 +#define SDB_MAX_LAYERS 8 + +#define SDBQUERYRESULT_EXPECTED_SIZE 456 + +typedef struct tagSDBQUERYRESULT { + TAGREF atrExes[SDB_MAX_EXES]; + DWORD adwExeFlags[SDB_MAX_EXES]; + TAGREF atrLayers[SDB_MAX_LAYERS]; + DWORD dwLayerFlags; + TAGREF trApphelp; + DWORD dwExeCount; + DWORD dwLayerCount; + GUID guidID; + DWORD dwFlags; + DWORD dwCustomSDBMap; + GUID rgGuidDB[SDB_MAX_SDBS]; +} SDBQUERYRESULT, *PSDBQUERYRESULT; static HMODULE hdll; @@ -166,6 +191,10 @@ static TAGID (WINAPI *pSdbGetNextChild)(PDB, TAGID, TAGID); static BOOL (WINAPI *pSdbGetDatabaseID)(PDB, GUID*); static BOOL (WINAPI *pSdbGUIDToString)(CONST GUID *, PCWSTR, SIZE_T); +static HSDB (WINAPI *pSdbInitDatabase)(DWORD, LPCWSTR); +static void (WINAPI *pSdbReleaseDatabase)(HSDB); +static BOOL(WINAPI *pSdbGetMatchingExe)(HSDB hsdb, LPCWSTR path, LPCWSTR module_name, LPCWSTR env, DWORD flags, PSDBQUERYRESULT result); +static BOOL (WINAPI *pSdbTagRefToTagID)(HSDB hSDB, TAGREF trWhich, PDB *ppdb, TAGID *ptiWhich); static LONGLONG(WINAPI* pSdbMakeIndexKeyFromString)(LPCWSTR); @@ -717,6 +746,9 @@ } } +// "C:\WINDOWS\system32\pcaui.exe" /g {bf39e0e6-c61c-4a22-8802-3ea8ad00b655} /x {4e50c93f-b863-4dfa-bae2-d80ef4ce5c89} /a "apphelp_name_allow" /v "apphelp_vendor_allow" /s "Allow it!" /b 1 /f 0 /k 0 /e "C:\Users\Mark\AppData\Local\Temp\apphelp_test\test_allow.exe" /u "http://reactos.org/allow" /c +// "C:\WINDOWS\system32\pcaui.exe" /g {fa150915-1244-4169-a4ba-fc098c442840} /x {156720e1-ef98-4d04-965a-d85de05e6d9f} /a "apphelp_name_disallow" /v "apphelp_vendor_disallow" /s "Not allowed!" /b 2 /f 0 /k 0 /e "C:\Users\Mark\AppData\Local\Temp\apphelp_test\test_disallow.exe" /u "http://reactos.org/disallow" /c + static void check_matching_apphelp(PDB pdb, TAGID apphelp, int num) { if(num == 0) @@ -789,8 +821,11 @@ const char* extra_file; DWORD dwLayerCount; TAGREF atrExes_0; + DWORD adwExeFlags_0; TAGREF atrLayers_0; -} test_exedata[4] = { + TAGREF trApphelp; + const char* env_var; +} test_exedata[5] = { { "test_allow.exe", "apphelp_name_allow", @@ -799,7 +834,10 @@ NULL, 0, 0x1c6, + 0x1000, 0, + 0x1c6, + NULL, }, { "test_disallow.exe", @@ -809,7 +847,10 @@ NULL, 0, 0x256, + 0x3000, 0, + 0x256, + NULL, }, { "test_new.exe", @@ -819,7 +860,10 @@ "test_checkfile.txt", 1, 0x2ec, + 0, 0x18e, + 0, + NULL, }, { "test_w2k3.exe", @@ -830,6 +874,22 @@ 0, 0x37c, 0, + 0, + 0, + NULL, + }, + { + "test_unknown_file.exe", + "apphelp_name_allow", + "apphelp_vendor_allow", + {0x00000000,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}, + NULL, + 1, + 0, + 0, + 0x18e, + 0, + "TestNewMode", }, }; @@ -967,6 +1027,314 @@ pSdbCloseDatabase(pdb); DeleteFileA("test_db.sdb"); } + +static void test_is_testdb(PDB pdb) +{ + if(pdb) + { + GUID guid; + memset(&guid, 0, sizeof(guid)); + ok(pSdbGetDatabaseID(pdb, &guid),"expected SdbGetDatabaseID not to fail.\n"); + ok(IsEqualGUID(&guid, &GUID_DATABASE_TEST), "Expected SdbGetDatabaseID to return the test db GUID, was: %s\n", wine_dbgstr_guid(&guid)); + } + else + { + skip("Not checking DB GUID, received a null pdb\n"); + } +} + + +static void test_mode_generic(const char* workdir, HSDB hsdb, int cur) +{ + char exename[MAX_PATH], testfile[MAX_PATH]; + WCHAR exenameW[MAX_PATH]; + BOOL ret; + SDBQUERYRESULT query; + PDB pdb; + TAGID tagid; + TAGREF trApphelp; + DWORD expect_flags = 0, adwExeFlags_0, exe_count; + int n; + + memset(&query, 0xab, sizeof(query)); + + sprintf(exename, "%s\\%s", workdir, test_exedata[cur].name); + if (test_exedata[cur].extra_file) + sprintf(testfile, "%s\\%s", workdir, test_exedata[cur].extra_file); + test_create_exe(exename, 0); + MultiByteToWideChar(CP_ACP, 0, exename, -1, exenameW, MAX_PATH); + + if (test_exedata[cur].extra_file) + { + /* First we try without the file at all. */ + DeleteFileA(testfile); + ret = pSdbGetMatchingExe(hsdb, exenameW, NULL, NULL, 0, &query); + ok(ret == 0, "SdbGetMatchingExe should have failed for %d.\n", cur); + /* Now re-try with the correct file */ + test_create_file(testfile, "aaaa", 4); + } + +#if 0 + // Results seem to be cached based on filename, until we can invalidate this, do not test the same filename twice! + DeleteFileA(exename); + // skip exports + test_create_exe(exename, 1); + ret = pSdbGetMatchingExe(hsdb, exenameW, NULL, NULL, 0, &query); + ok(ret == 0, "SdbGetMatchingExe should have failed for %d.\n", cur); + + DeleteFileA(exename); + test_create_exe(exename, 0); +#endif + + if (test_exedata[cur].env_var) + { + SetEnvironmentVariableA("__COMPAT_LAYER", test_exedata[cur].env_var); + } + + ret = pSdbGetMatchingExe(hsdb, exenameW, NULL, NULL, 0, &query); + ok(ret, "SdbGetMatchingExe should not fail for %d.\n", cur); + + exe_count = (test_exedata[cur].env_var == NULL) ? 1 : 0; + + ok(query.dwExeCount == exe_count, "Expected dwExeCount to be %d, was %d for %d\n", exe_count, query.dwExeCount, cur); + ok(query.dwLayerCount == test_exedata[cur].dwLayerCount, "Expected dwLayerCount to be %d, was %d for %d\n", test_exedata[cur].dwLayerCount, query.dwLayerCount, cur); + ok(query.dwCustomSDBMap == 1, "Expected dwCustomSDBMap to be 1, was %d for %d\n", query.dwCustomSDBMap, cur); + ok(query.dwLayerFlags == 0, "Expected dwLayerFlags to be 0, was 0x%x for %d\n", query.dwLayerFlags, cur); + trApphelp = (g_WinVersion < WINVER_WIN10) ? 0 : test_exedata[cur].trApphelp; + ok(query.trApphelp == trApphelp, "Expected trApphelp to be 0x%x, was 0x%x for %d\n", trApphelp, query.trApphelp, cur); + + if (g_WinVersion < WINVER_WIN7) + expect_flags = 0; + else if (g_WinVersion < WINVER_WIN8) + expect_flags = 1; + else if (g_WinVersion < WINVER_WIN10) + expect_flags = 0x101; + else + expect_flags = 0x121; + + if (test_exedata[cur].env_var) + expect_flags &= ~0x100; + + ok(query.dwFlags == expect_flags, "Expected dwFlags to be 0x%x, was 0x%x for %d\n", expect_flags, query.dwFlags, cur); + + ok(query.atrExes[0] == test_exedata[cur].atrExes_0, "Expected atrExes[0] to be 0x%x, was: 0x%x for %d\n", test_exedata[cur].atrExes_0, query.atrExes[0], cur); + for (n = 1; n < SDB_MAX_EXES; ++n) + ok(query.atrExes[n] == 0, "Expected atrExes[%d] to be 0, was: %x for %d\n", n, query.atrExes[n], cur); + + adwExeFlags_0 = (g_WinVersion < WINVER_WIN10) ? 0 : test_exedata[cur].adwExeFlags_0; + ok(query.adwExeFlags[0] == adwExeFlags_0, "Expected adwExeFlags[0] to be 0x%x, was: 0x%x for %d\n", adwExeFlags_0, query.adwExeFlags[0], cur); + for (n = 1; n < SDB_MAX_EXES; ++n) + ok(query.adwExeFlags[n] == 0, "Expected adwExeFlags[%d] to be 0, was: %x for %d\n", n, query.adwExeFlags[0], cur); + + ok(query.atrLayers[0] == test_exedata[cur].atrLayers_0, "Expected atrLayers[0] to be 0x%x, was: %x for %d\n", test_exedata[cur].atrLayers_0, query.atrLayers[0], cur); + for (n = 1; n < SDB_MAX_LAYERS; ++n) + ok(query.atrLayers[n] == 0, "Expected atrLayers[%d] to be 0, was: %x for %d\n", n, query.atrLayers[0], cur); + + ok(IsEqualGUID(&query.rgGuidDB[0], &GUID_DATABASE_TEST), "Expected rgGuidDB[0] to be the test db GUID, was: %s for %d\n", wine_dbgstr_guid(&query.rgGuidDB[0]), cur); + for (n = 1; n < SDB_MAX_SDBS; ++n) + ok(IsEqualGUID(&query.rgGuidDB[n], &GUID_NULL), "Expected rgGuidDB[%d] to be GUID_NULL, was: %s for %d\n", n, wine_dbgstr_guid(&query.rgGuidDB[n]), cur); + + if (query.atrExes[0]) + { + pdb = (PDB)0x12345678; + tagid = 0x76543210; + ret = pSdbTagRefToTagID(hsdb, query.atrExes[0], &pdb, &tagid); + ok(ret, "SdbTagRefToTagID failed for %d.\n", cur); + ok(pdb != NULL && pdb != (PDB)0x12345678, "SdbTagRefToTagID failed to return a pdb for %d.\n", cur); + ok(tagid != 0 && tagid != 0x76543210, "SdbTagRefToTagID failed to return a tagid for %d.\n", cur); + + if (pdb && pdb != (PDB)0x12345678) + { + TAG tag = pSdbGetTagFromTagID(pdb, tagid); + test_is_testdb(pdb); + ok(tag == TAG_EXE, "Expected tag to be TAG_EXE, was 0x%x for %d.\n", tag, cur); + match_str_attr(pdb, tagid, TAG_NAME, test_exedata[cur].name); + } + else + { + skip("Skipping a bunch of tests because of an invalid pointer\n"); + } + } + + if (test_exedata[cur].atrLayers_0) + { + pdb = (PDB)0x12345678; + tagid = 0x76543210; + ret = pSdbTagRefToTagID(hsdb, query.atrLayers[0], &pdb, &tagid); + ok(ret, "SdbTagRefToTagID failed for %d.\n", cur); + ok(pdb != NULL && pdb != (PDB)0x12345678, "SdbTagRefToTagID failed to return a pdb for %d.\n", cur); + ok(tagid != 0 && tagid != 0x76543210, "SdbTagRefToTagID failed to return a tagid for %d.\n", cur); + + if (pdb && pdb != (PDB)0x12345678) + { + TAG tag = pSdbGetTagFromTagID(pdb, tagid); + test_is_testdb(pdb); + ok(tag == TAG_LAYER, "Expected tag to be TAG_LAYER, was 0x%x for %d.\n", tag, cur); + match_str_attr(pdb, tagid, TAG_NAME, "TestNewMode"); + } + else + { + skip("Skipping a bunch of tests because of an invalid pointer\n"); + } + } + + pdb = (PDB)0x12345678; + tagid = 0x76543210; + ret = pSdbTagRefToTagID(hsdb, 0, &pdb, &tagid); + ok(pdb != NULL && pdb != (PDB)0x12345678, "Expected pdb to be set to a valid pdb, was: %p\n", pdb); + ok(tagid == 0, "Expected tagid to be set to 0, was: 0x%x\n", tagid); + + if (test_exedata[cur].extra_file) + DeleteFileA(testfile); + DeleteFileA(exename); + + if (test_exedata[cur].env_var) + { + SetEnvironmentVariableA("__COMPAT_LAYER", NULL); + } +} + + +static void test_MatchApplications(void) +{ + char workdir[MAX_PATH], dbpath[MAX_PATH]; + WCHAR dbpathW[MAX_PATH]; + BOOL ret; + HSDB hsdb; + + ret = GetTempPathA(MAX_PATH, workdir); + ok(ret, "GetTempPathA error: %d\n", GetLastError()); + lstrcatA(workdir, "apphelp_test"); + + ret = CreateDirectoryA(workdir, NULL); + ok(ret, "CreateDirectoryA error: %d\n", GetLastError()); + + /* SdbInitDatabase needs an nt-path */ + sprintf(dbpath, "\\??\\%s\\test.sdb", workdir); + + test_create_db(dbpath + 4); + + MultiByteToWideChar(CP_ACP, 0, dbpath, -1, dbpathW, MAX_PATH); + hsdb = pSdbInitDatabase(HID_DATABASE_FULLPATH, dbpathW); + + ok(hsdb != NULL, "Expected a valid database handle\n"); + + if (!hsdb) + { + skip("SdbInitDatabase not implemented?\n"); + } + else + { + /* now that our enviroment is setup, let's go ahead and run the actual tests.. */ + int n; + for (n = 0; n < _countof(test_exedata); ++n) + test_mode_generic(workdir, hsdb, n); + pSdbReleaseDatabase(hsdb); + } + + DeleteFileA(dbpath + 4); + + ret = RemoveDirectoryA(workdir); + ok(ret, "RemoveDirectoryA error: %d\n", GetLastError()); +} + +static void test_TagRef(void) +{ + char tmpdir[MAX_PATH], dbpath[MAX_PATH]; + WCHAR dbpathW[MAX_PATH]; + BOOL ret; + HSDB hsdb; + PDB pdb; + TAGID db; + DWORD size; + + ret = GetTempPathA(MAX_PATH, tmpdir); + ok(ret, "GetTempPathA error: %d\n", GetLastError()); + + /* SdbInitDatabase needs an nt-path */ + sprintf(dbpath, "\\??\\%stest.sdb", tmpdir); + + test_create_db(dbpath + 4); + + MultiByteToWideChar(CP_ACP, 0, dbpath, -1, dbpathW, MAX_PATH); + hsdb = pSdbInitDatabase(HID_DATABASE_FULLPATH, dbpathW); + + /* HSDB is the only arg that can't be null */ + ret = pSdbTagRefToTagID(hsdb, 0, NULL, NULL); + ok(ret == TRUE, "Expected ret to be TRUE, was: %d\n", ret); + + size = test_get_db_size(); + + pdb = (PDB)&db; + db = 12345; + ret = pSdbTagRefToTagID(hsdb, size - 1, &pdb, &db); + ok(ret == TRUE, "Expected ret to be TRUE, was: %d\n", ret); + ok(pdb != NULL, "Expected a result, got: %p\n", pdb); + ok(db == (size - 1), "Expected %u, got: %u\n", size - 1, db); + + pdb = (PDB)&db; + db = 12345; + ret = pSdbTagRefToTagID(hsdb, size, &pdb, &db); + ok(ret == TRUE, "Expected ret to be TRUE, was: %d\n", ret); + ok(pdb != NULL, "Expected a result, got: %p\n", pdb); + ok(db == (size), "Expected %u, got: %u\n", size, db); + + pdb = (PDB)&db; + db = 12345; + ret = pSdbTagRefToTagID(hsdb, size + 1, &pdb, &db); + ok(ret == TRUE, "Expected ret to be TRUE, was: %d\n", ret); + ok(pdb != NULL, "Expected a result, got: %p\n", pdb); + ok(db == (size + 1), "Expected %u, got: %u\n", size + 1, db); + + pdb = (PDB)&db; + db = 12345; + ret = pSdbTagRefToTagID(hsdb, 0x0fffffff, &pdb, &db); + ok(ret == TRUE, "Expected ret to be TRUE, was: %d\n", ret); + ok(pdb != NULL, "Expected a result, got: %p\n", pdb); + ok(db == 0x0fffffff, "Expected %u, got: %u\n", 0x0fffffff, db); + + pdb = (PDB)&db; + db = 12345; + ret = pSdbTagRefToTagID(hsdb, 0x10000000, &pdb, &db); + ok(ret == FALSE, "Expected ret to be FALSE, was: %d\n", ret); + ok(pdb == NULL, "Expected no result, got: %p\n", pdb); + ok(db == 0, "Expected no result, got: 0x%x\n", db); + + pdb = NULL; + db = TAGID_NULL; + ret = pSdbTagRefToTagID(hsdb, TAGID_ROOT, &pdb, NULL); + ok(ret != FALSE, "Expected ret to be TRUE, was: %d\n", ret); + ok(pdb != NULL, "Expected pdb to be valid\n"); + + if(pdb == NULL) + { + skip("Cannot run tests without pdb\n"); + } + else + { + db = pSdbFindFirstTag(pdb, TAGID_ROOT, TAG_DATABASE); + if(db != TAGID_NULL) + { + TAGID child; + child = pSdbGetFirstChild(pdb, db); + while(child != TAGID_NULL) + { + PDB pdb_res; + TAGID tagid_res; + ret = pSdbTagRefToTagID(hsdb, child, &pdb_res, &tagid_res); + ok(ret, "Expected SdbTagRefToTagID to succeed\n"); + child = pSdbGetNextChild(pdb, db, child); + } + } + else + { + skip("Cannot run tests without valid db tag\n"); + } + } + + DeleteFileA(dbpath + 4); +} + static void expect_indexA_imp(const char* text, LONGLONG expected) @@ -1051,10 +1419,39 @@ wine_dbgstr_longlong(0xbc414044444444), wine_dbgstr_longlong(result)); } +static int validate_SDBQUERYRESULT_size() +{ + unsigned char buffer[SDBQUERYRESULT_EXPECTED_SIZE * 2]; + WCHAR path[MAX_PATH]; + HSDB hsdb; + + memset(buffer, 0xab, sizeof(buffer)); + hsdb = pSdbInitDatabase(SDB_DATABASE_MAIN_SHIM, NULL); + if (hsdb) + { + GetModuleFileNameW(NULL, path, MAX_PATH); + pSdbGetMatchingExe(hsdb, path, NULL, NULL, 0, (SDBQUERYRESULT*)buffer); + pSdbReleaseDatabase(hsdb); + if (buffer[0] == buffer[1] && buffer[1] == 0xab) + { + trace("SdbGetMatchingExe didnt do anything, cannot determine SDBQUERYRESULT size\n"); + return 1; + } + return buffer[SDBQUERYRESULT_EXPECTED_SIZE] == 0xab && buffer[SDBQUERYRESULT_EXPECTED_SIZE-1] != 0xab; + } + + return 1; +} + START_TEST(db) { + g_WinVersion = get_host_winver(); + trace("Detected version: 0x%x\n", g_WinVersion); + silence_debug_output(); + //SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "4"); + //SetEnvironmentVariable("SHIMENG_DEBUG_LEVEL", "4"); //SetEnvironmentVariable("DEBUGCHANNEL", "+apphelp"); hdll = LoadLibraryA("apphelp.dll"); pSdbTagToString = (void *) GetProcAddress(hdll, "SdbTagToString"); @@ -1087,11 +1484,21 @@ pSdbGetNextChild = (void *) GetProcAddress(hdll, "SdbGetNextChild"); pSdbGetDatabaseID = (void *) GetProcAddress(hdll, "SdbGetDatabaseID"); pSdbGUIDToString = (void *) GetProcAddress(hdll, "SdbGUIDToString"); - pSdbMakeIndexKeyFromString = (void*) GetProcAddress(hdll, "SdbMakeIndexKeyFromString"); + pSdbInitDatabase = (void *) GetProcAddress(hdll, "SdbInitDatabase"); + pSdbReleaseDatabase = (void *) GetProcAddress(hdll, "SdbReleaseDatabase"); + pSdbGetMatchingExe = (void *) GetProcAddress(hdll, "SdbGetMatchingExe"); + pSdbTagRefToTagID = (void *) GetProcAddress(hdll, "SdbTagRefToTagID"); + pSdbMakeIndexKeyFromString = (void *) GetProcAddress(hdll, "SdbMakeIndexKeyFromString"); test_Sdb(); test_write_ex(); test_stringtable(); test_CheckDatabaseManually(); + if (validate_SDBQUERYRESULT_size()) + test_MatchApplications(); + else + skip("Skipping tests with SDBQUERYRESULT due to a wrong size reported\n"); + test_TagRef(); + skip("test_SecondaryDB()\n"); test_IndexKeyFromString(); } 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] Sat Sep 3 16:20:52 2016 @@ -31,8 +31,7 @@ #include "wine/test.h" -/* data.c */ -DWORD get_host_winver(void); +#include "apphelp_apitest.h" #define GPLK_USER 1 #define GPLK_MACHINE 2 @@ -45,12 +44,6 @@ static BOOL(WINAPI *pSdbSetPermLayerKeys)(PCWSTR wszPath, PCWSTR wszLayers, BOOL bMachine); static BOOL(WINAPI *pSdbGetPermLayerKeys)(PCWSTR wszPath, PWSTR pwszLayers, PDWORD pdwBytes, DWORD dwFlags); static BOOL(WINAPI *pSetPermLayerState)(PCWSTR wszPath, PCWSTR wszLayer, DWORD dwFlags, BOOL bMachine, BOOL bEnable); - - -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. */ @@ -877,6 +870,7 @@ START_TEST(layerapi) { + silence_debug_output(); /*SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "4");*/ hdll = LoadLibraryA("apphelp.dll"); pAllowPermLayer = (void *)GetProcAddress(hdll, "AllowPermLayer");

8 years

[dchapyshev] 72548: [NTOS:IO] - Fix potential null-pointer dereferencing (we call IopCleanupAfterException in IopDeviceFsIoControl with Irp == NULL)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 3 15:49:55 2016 New Revision: 72548 URL: http://svn.reactos.org/svn/reactos?rev=72548&view=rev Log: [NTOS:IO] - Fix potential null-pointer dereferencing (we call IopCleanupAfterException in IopDeviceFsIoControl with Irp == NULL) Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sat Sep 3 15:49:55 2016 @@ -22,25 +22,28 @@ VOID NTAPI IopCleanupAfterException(IN PFILE_OBJECT FileObject, - IN PIRP Irp, + IN PIRP Irp OPTIONAL, IN PKEVENT Event OPTIONAL, IN PKEVENT LocalEvent OPTIONAL) { PAGED_CODE(); IOTRACE(IO_API_DEBUG, "IRP: %p. FO: %p \n", Irp, FileObject); - /* Check if we had a buffer */ - if (Irp->AssociatedIrp.SystemBuffer) - { - /* Free it */ - ExFreePool(Irp->AssociatedIrp.SystemBuffer); - } - - /* Free the mdl */ - if (Irp->MdlAddress) IoFreeMdl(Irp->MdlAddress); - - /* Free the IRP */ - IoFreeIrp(Irp); + if (Irp) + { + /* Check if we had a buffer */ + if (Irp->AssociatedIrp.SystemBuffer) + { + /* Free it */ + ExFreePool(Irp->AssociatedIrp.SystemBuffer); + } + + /* Free the mdl */ + if (Irp->MdlAddress) IoFreeMdl(Irp->MdlAddress); + + /* Free the IRP */ + IoFreeIrp(Irp); + } /* Check if we had a file lock */ if (FileObject->Flags & FO_SYNCHRONOUS_IO)

8 years

[ekohl] 72547: [SAMSRV] SamrQuerySecurityObject: Return security information according to the SecurityInformation parameter.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Sep 3 15:06:20 2016 New Revision: 72547 URL: http://svn.reactos.org/svn/reactos?rev=72547&view=rev Log: [SAMSRV] SamrQuerySecurityObject: Return security information according to the SecurityInformation parameter. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Sep 3 15:06:20 2016 @@ -218,10 +218,12 @@ OUT PSAMPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor) { PSAM_DB_OBJECT SamObject; - PSAMPR_SR_SECURITY_DESCRIPTOR SamSD = NULL; - PSECURITY_DESCRIPTOR SdBuffer = NULL; + PSAMPR_SR_SECURITY_DESCRIPTOR SdData = NULL; + PSECURITY_DESCRIPTOR RelativeSd = NULL; + PSECURITY_DESCRIPTOR ResultSd = NULL; ACCESS_MASK DesiredAccess = 0; - ULONG Length = 0; + ULONG RelativeSdSize = 0; + ULONG ResultSdSize = 0; NTSTATUS Status; TRACE("(%p %lx %p)\n", @@ -248,64 +250,98 @@ if (!NT_SUCCESS(Status)) goto done; - SamSD = midl_user_allocate(sizeof(SAMPR_SR_SECURITY_DESCRIPTOR)); - if (SamSD == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - + /* Get the size of the SD */ Status = SampGetObjectAttribute(SamObject, L"SecDesc", NULL, NULL, - &Length); + &RelativeSdSize); if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) { TRACE("Status 0x%08lx\n", Status); goto done; } - TRACE("SD Length: %lu\n", Length); - - SdBuffer = midl_user_allocate(Length); - if (SdBuffer == NULL) + /* Allocate a buffer for the SD */ + RelativeSd = midl_user_allocate(RelativeSdSize); + if (RelativeSd == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; goto done; } + /* Get the SD */ Status = SampGetObjectAttribute(SamObject, L"SecDesc", NULL, - SdBuffer, - &Length); + RelativeSd, + &RelativeSdSize); if (!NT_SUCCESS(Status)) { TRACE("Status 0x%08lx\n", Status); goto done; } - /* FIXME: Use SecurityInformation to return only the requested information */ - - SamSD->Length = Length; - SamSD->SecurityDescriptor = SdBuffer; + /* Invalidate the SD information that was not requested */ + if (!(SecurityInformation & OWNER_SECURITY_INFORMATION)) + ((PISECURITY_DESCRIPTOR)RelativeSd)->Owner = NULL; + + if (!(SecurityInformation & GROUP_SECURITY_INFORMATION)) + ((PISECURITY_DESCRIPTOR)RelativeSd)->Group = NULL; + + if (!(SecurityInformation & DACL_SECURITY_INFORMATION)) + ((PISECURITY_DESCRIPTOR)RelativeSd)->Control &= ~SE_DACL_PRESENT; + + if (!(SecurityInformation & SACL_SECURITY_INFORMATION)) + ((PISECURITY_DESCRIPTOR)RelativeSd)->Control &= ~SE_SACL_PRESENT; + + /* Calculate the required SD size */ + Status = RtlMakeSelfRelativeSD(RelativeSd, + NULL, + &ResultSdSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + goto done; + + /* Allocate a buffer for the new SD */ + ResultSd = MIDL_user_allocate(ResultSdSize); + if (ResultSd == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Build the new SD */ + Status = RtlMakeSelfRelativeSD(RelativeSd, + ResultSd, + &ResultSdSize); + if (!NT_SUCCESS(Status)) + goto done; + + /* Allocate the SD data buffer */ + SdData = midl_user_allocate(sizeof(SAMPR_SR_SECURITY_DESCRIPTOR)); + if (SdData == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Fill the SD data buffer and return it to the caller */ + SdData->Length = RelativeSdSize; + SdData->SecurityDescriptor = (PBYTE)ResultSd; + + *SecurityDescriptor = SdData; done: RtlReleaseResource(&SampResource); - if (NT_SUCCESS(Status)) - { - *SecurityDescriptor = SamSD; - } - else - { - if (SdBuffer != NULL) - midl_user_free(SdBuffer); - - if (SamSD != NULL) - midl_user_free(SamSD); - } + if (!NT_SUCCESS(Status)) + { + if (ResultSd != NULL) + MIDL_user_free(ResultSd); + } + + if (RelativeSd != NULL) + MIDL_user_free(RelativeSd); return Status; }

8 years

[dchapyshev] 72546: [NTOS:IO] - IopDeviceFsIoControl is paged code - Incorrect logic at when processing the IsDevIoCtl parameter

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 3 15:02:57 2016 New Revision: 72546 URL: http://svn.reactos.org/svn/reactos?rev=72546&view=rev Log: [NTOS:IO] - IopDeviceFsIoControl is paged code - Incorrect logic at when processing the IsDevIoCtl parameter Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sat Sep 3 15:02:57 2016 @@ -210,6 +210,9 @@ ACCESS_MASK DesiredAccess; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); ULONG BufferLength; + + PAGED_CODE(); + IOTRACE(IO_CTL_DEBUG, "Handle: %p. CTL: %lx. Type: %lx \n", DeviceHandle, IoControlCode, IsDevIoCtl); @@ -343,7 +346,7 @@ } /* If that's FS I/O, try to do it with FastIO path */ - if (!IsDevIoCtl) + if (IsDevIoCtl) { PFAST_IO_DISPATCH FastIoDispatch = DeviceObject->DriverObject->FastIoDispatch;

8 years

[dchapyshev] 72545: [NTOS:IO] - It is paged code - We do not compare with TRUE

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 3 13:26:27 2016 New Revision: 72545 URL: http://svn.reactos.org/svn/reactos?rev=72545&view=rev Log: [NTOS:IO] - It is paged code - We do not compare with TRUE Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Sat Sep 3 13:26:27 2016 @@ -2089,7 +2089,7 @@ FILE_READ_ATTRIBUTES, &OpenPacket, &Handle); - if (OpenPacket.ParseCheck != TRUE) + if (OpenPacket.ParseCheck == FALSE) { /* Parse failed */ DPRINT("IopQueryAttributesFile failed for '%wZ' with 0x%lx\n", @@ -2181,6 +2181,7 @@ PNAMED_PIPE_CREATE_PARAMETERS NamedPipeCreateParameters; POPEN_PACKET OpenPacket; ULONG EaErrorOffset; + PAGED_CODE(); IOTRACE(IO_FILE_DEBUG, "FileName: %wZ\n", ObjectAttributes->ObjectName); @@ -2487,7 +2488,7 @@ if (OpenPacket->EaBuffer) ExFreePool(OpenPacket->EaBuffer); /* Now check for Ob or Io failure */ - if (!(NT_SUCCESS(Status)) || (OpenPacket->ParseCheck != TRUE)) + if (!(NT_SUCCESS(Status)) || (OpenPacket->ParseCheck == FALSE)) { /* Check if Ob thinks well went well */ if (NT_SUCCESS(Status)) @@ -2524,7 +2525,7 @@ _SEH2_END; } } - else if ((OpenPacket->FileObject) && (OpenPacket->ParseCheck != 1)) + else if ((OpenPacket->FileObject) && (OpenPacket->ParseCheck == FALSE)) { /* * This can happen in the very bizarre case where the parse routine

8 years

[akhaldi] 72544: [CRT] Apply Wine commit 21fd1d3 by Nikolay Sivov: Fix calloc() prototype. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 3 13:23:43 2016 New Revision: 72544 URL: http://svn.reactos.org/svn/reactos?rev=72544&view=rev Log: [CRT] Apply Wine commit 21fd1d3 by Nikolay Sivov: Fix calloc() prototype. CORE-11866 Modified: trunk/reactos/sdk/lib/crt/stdio/file.c trunk/reactos/sdk/lib/crt/stdlib/atexit.c trunk/reactos/sdk/lib/crt/wine/heap.c Modified: trunk/reactos/sdk/lib/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/sdk/lib/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/stdio/file.c [iso-8859-1] Sat Sep 3 13:23:43 2016 @@ -410,7 +410,7 @@ ioinfo* fdinfo; *size = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * fdend; - *block = calloc(*size, 1); + *block = calloc(1, *size); if (!*block) { *size = 0; @@ -547,7 +547,7 @@ && _isatty(file->_file)) return FALSE; - file->_base = calloc(MSVCRT_INTERNAL_BUFSIZ,1); + file->_base = calloc(1, MSVCRT_INTERNAL_BUFSIZ); if(file->_base) { file->_bufsiz = MSVCRT_INTERNAL_BUFSIZ; file->_flag |= _IOMYBUF; Modified: trunk/reactos/sdk/lib/crt/stdlib/atexit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/stdlib/atexit.… ============================================================================== --- trunk/reactos/sdk/lib/crt/stdlib/atexit.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/stdlib/atexit.c [iso-8859-1] Sat Sep 3 13:23:43 2016 @@ -69,7 +69,7 @@ { _onexit_t *newtable; TRACE("expanding table\n"); - newtable = calloc(sizeof(void *),atexit_table_size + 32); + newtable = calloc(atexit_table_size + 32, sizeof(void *)); if (!newtable) { TRACE("failed!\n"); Modified: trunk/reactos/sdk/lib/crt/wine/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/wine/heap.c?re… ============================================================================== --- trunk/reactos/sdk/lib/crt/wine/heap.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/wine/heap.c [iso-8859-1] Sat Sep 3 13:23:43 2016 @@ -288,9 +288,9 @@ /********************************************************************* * calloc (MSVCRT.@) */ -void* CDECL calloc(size_t size, size_t count) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size * count ); +void* CDECL calloc(size_t count, size_t size) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, count * size ); } /*********************************************************************

8 years

[akhaldi] 72543: [CRT] Reduce difference of file.c with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 3 12:40:59 2016 New Revision: 72543 URL: http://svn.reactos.org/svn/reactos?rev=72543&view=rev Log: [CRT] Reduce difference of file.c with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/sdk/lib/crt/stdio/file.c trunk/reactos/sdk/lib/crt/stdio/popen.c Modified: trunk/reactos/sdk/lib/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/sdk/lib/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/stdio/file.c [iso-8859-1] Sat Sep 3 12:40:59 2016 @@ -141,8 +141,8 @@ } file_crit; FILE _iob[_IOB_ENTRIES] = { { 0 } }; -static file_crit* fstream[MAX_FILES/FD_BLOCK_SIZE] = { NULL }; -static int max_streams = 512, stream_idx; +static file_crit* MSVCRT_fstream[MAX_FILES/FD_BLOCK_SIZE] = { NULL }; +static int MSVCRT_max_streams = 512, MSVCRT_stream_idx; /* INTERNAL: process umask */ static int MSVCRT_umask = 0; @@ -152,21 +152,21 @@ /* This critical section protects the tables __pioinfo and fstreams, * and their related indexes, fdstart, fdend, - * and stream_idx, from race conditions. + * and MSVCRT_stream_idx, from race conditions. * It doesn't protect against race conditions manipulating the underlying files * or flags; doing so would probably be better accomplished with per-file * protection, rather than locking the whole table for every change. */ -static CRITICAL_SECTION file_cs; -static CRITICAL_SECTION_DEBUG file_cs_debug = -{ - 0, 0, &file_cs, - { &file_cs_debug.ProcessLocksList, &file_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": file_cs") } +static CRITICAL_SECTION MSVCRT_file_cs; +static CRITICAL_SECTION_DEBUG MSVCRT_file_cs_debug = +{ + 0, 0, &MSVCRT_file_cs, + { &MSVCRT_file_cs_debug.ProcessLocksList, &MSVCRT_file_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": MSVCRT_file_cs") } }; -static CRITICAL_SECTION file_cs = { &file_cs_debug, -1, 0, 0, 0, 0 }; -#define LOCK_FILES() do { EnterCriticalSection(&file_cs); } while (0) -#define UNLOCK_FILES() do { LeaveCriticalSection(&file_cs); } while (0) +static CRITICAL_SECTION MSVCRT_file_cs = { &MSVCRT_file_cs_debug, -1, 0, 0, 0, 0 }; +#define LOCK_FILES() do { EnterCriticalSection(&MSVCRT_file_cs); } while (0) +#define UNLOCK_FILES() do { LeaveCriticalSection(&MSVCRT_file_cs); } while (0) static inline ioinfo* get_ioinfo_nolock(int fd) { @@ -190,26 +190,26 @@ return ret + (fd%FD_BLOCK_SIZE); } -static inline FILE* get_file(int i) +static inline FILE* msvcrt_get_file(int i) { file_crit *ret; - if(i >= max_streams) + if(i >= MSVCRT_max_streams) return NULL; if(i < _IOB_ENTRIES) return &_iob[i]; - ret = fstream[i/FD_BLOCK_SIZE]; + ret = MSVCRT_fstream[i/FD_BLOCK_SIZE]; if(!ret) { - fstream[i/FD_BLOCK_SIZE] = calloc(FD_BLOCK_SIZE, sizeof(file_crit)); - if(!fstream[i/FD_BLOCK_SIZE]) { + MSVCRT_fstream[i/FD_BLOCK_SIZE] = calloc(FD_BLOCK_SIZE, sizeof(file_crit)); + if(!MSVCRT_fstream[i/FD_BLOCK_SIZE]) { ERR("out of memory\n"); *_errno() = ENOMEM; return NULL; } - ret = fstream[i/FD_BLOCK_SIZE] + (i%FD_BLOCK_SIZE); + ret = MSVCRT_fstream[i/FD_BLOCK_SIZE] + (i%FD_BLOCK_SIZE); } else ret += i%FD_BLOCK_SIZE; @@ -242,7 +242,7 @@ } /* INTERNAL: free a file entry fd */ -static void free_fd(int fd) +static void msvcrt_free_fd(int fd) { ioinfo *fdinfo; @@ -280,7 +280,7 @@ /* INTERNAL: Allocate an fd slot from a Win32 HANDLE, starting from fd */ /* caller must hold the files lock */ -static int set_fd(HANDLE hand, int flag, int fd) +static int msvcrt_set_fd(HANDLE hand, int flag, int fd) { ioinfo *fdinfo; @@ -338,33 +338,33 @@ } /* INTERNAL: Allocate an fd slot from a Win32 HANDLE */ -/*static*/ int alloc_fd(HANDLE hand, int flag) +/*static*/ int msvcrt_alloc_fd(HANDLE hand, int flag) { int ret; LOCK_FILES(); TRACE(":handle (%p) allocating fd (%d)\n",hand,fdstart); - ret = set_fd(hand, flag, fdstart); + ret = msvcrt_set_fd(hand, flag, fdstart); UNLOCK_FILES(); return ret; } /* INTERNAL: Allocate a FILE* for an fd slot */ /* caller must hold the files lock */ -static FILE* alloc_fp(void) -{ - unsigned int i; +static FILE* msvcrt_alloc_fp(void) +{ + int i; FILE *file; - for (i = 3; i < (unsigned int)max_streams; i++) - { - file = get_file(i); + for (i = 3; i < MSVCRT_max_streams; i++) + { + file = msvcrt_get_file(i); if (!file) return NULL; if (file->_flag == 0) { - if (i == stream_idx) stream_idx++; + if (i == MSVCRT_stream_idx) MSVCRT_stream_idx++; return file; } } @@ -373,7 +373,7 @@ } /* INTERNAL: initialize a FILE* from an open fd */ -static int init_fp(FILE* file, int fd, unsigned stream_flags) +static int msvcrt_init_fp(FILE* file, int fd, unsigned stream_flags) { TRACE(":fd (%d) allocating FILE*\n",fd); if (!is_valid_fd(fd)) @@ -464,7 +464,7 @@ for (i = 0; i < count; i++) { if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE) - set_fd(*handle_ptr, *wxflag_ptr, i); + msvcrt_set_fd(*handle_ptr, *wxflag_ptr, i); wxflag_ptr++; handle_ptr++; } @@ -478,7 +478,7 @@ HANDLE h = GetStdHandle(STD_INPUT_HANDLE); DWORD type = GetFileType(h); - set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), STDIN_FILENO); } @@ -487,7 +487,7 @@ HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE); DWORD type = GetFileType(h); - set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), STDOUT_FILENO); } @@ -496,7 +496,7 @@ HANDLE h = GetStdHandle(STD_ERROR_HANDLE); DWORD type = GetFileType(h); - set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), STDERR_FILENO); } @@ -512,11 +512,11 @@ _iob[i]._tmpfname = NULL; _iob[i]._flag = (i == 0) ? _IOREAD : _IOWRT; } - stream_idx = 3; + MSVCRT_stream_idx = 3; } /* INTERNAL: Flush stdio file buffer */ -static int flush_buffer(FILE* file) +static int msvcrt_flush_buffer(FILE* file) { if(file->_flag & (_IOMYBUF | _USERBUF)) { int cnt=file->_ptr-file->_base; @@ -579,13 +579,13 @@ /* Only call this function when add_std_buffer returned TRUE */ static void remove_std_buffer(FILE *file) { - flush_buffer(file); + msvcrt_flush_buffer(file); file->_ptr = file->_base = NULL; file->_bufsiz = file->_cnt = 0; } /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ -static int int_to_base32(int num, char *str) +static int msvcrt_int_to_base32(int num, char *str) { char *p; int n = num; @@ -609,8 +609,8 @@ return digits; } -/* INTERNAL: wide character version of int_to_base32 */ -static int int_to_base32_w(int num, wchar_t *str) +/* INTERNAL: wide character version of msvcrt_int_to_base32 */ +static int msvcrt_int_to_base32_w(int num, wchar_t *str) { wchar_t *p; int n = num; @@ -791,18 +791,46 @@ return -1; } +/********************************************************************* + * _commit (MSVCRT.@) + */ +int CDECL _commit(int fd) +{ + HANDLE hand = fdtoh(fd); + + TRACE(":fd (%d) handle (%p)\n",fd,hand); + if (hand == INVALID_HANDLE_VALUE) + return -1; + + if (!FlushFileBuffers(hand)) + { + if (GetLastError() == ERROR_INVALID_HANDLE) + { + /* FlushFileBuffers fails for console handles + * so we ignore this error. + */ + return 0; + } + TRACE(":failed-last error (%d)\n",GetLastError()); + _dosmaperr(GetLastError()); + return -1; + } + TRACE(":ok\n"); + return 0; +} + /* _flushall calls fflush which calls _flushall */ int CDECL fflush(FILE* file); /* INTERNAL: Flush all stream buffer */ -static int flush_all_buffers(int mask) +static int msvcrt_flush_all_buffers(int mask) { int i, num_flushed = 0; FILE *file; LOCK_FILES(); - for (i = 0; i < stream_idx; i++) { - file = get_file(i); + for (i = 0; i < MSVCRT_stream_idx; i++) { + file = msvcrt_get_file(i); if (file->_flag) { @@ -823,7 +851,7 @@ */ int CDECL _flushall(void) { - return flush_all_buffers(_IOWRT | _IOREAD); + return msvcrt_flush_all_buffers(_IOWRT | _IOREAD); } /********************************************************************* @@ -832,12 +860,12 @@ int CDECL fflush(FILE* file) { if(!file) { - flush_all_buffers(_IOWRT); + msvcrt_flush_all_buffers(_IOWRT); } else if(file->_flag & _IOWRT) { int res; _lock_file(file); - res = flush_buffer(file); + res = msvcrt_flush_buffer(file); /* FIXME if(!res && (file->_flag & _IOCOMMIT)) res = _commit(file->_file) ? EOF : 0; @@ -877,40 +905,12 @@ } else { - free_fd(fd); + msvcrt_free_fd(fd); ret = 0; } UNLOCK_FILES(); TRACE(":ok\n"); return ret; -} - -/********************************************************************* - * _commit (MSVCRT.@) - */ -int CDECL _commit(int fd) -{ - HANDLE hand = fdtoh(fd); - - TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand == INVALID_HANDLE_VALUE) - return -1; - - if (!FlushFileBuffers(hand)) - { - if (GetLastError() == ERROR_INVALID_HANDLE) - { - /* FlushFileBuffers fails for console handles - * so we ignore this error. - */ - return 0; - } - TRACE(":failed-last error (%d)\n",GetLastError()); - _dosmaperr(GetLastError()); - return -1; - } - TRACE(":ok\n"); - return 0; } /********************************************************************* @@ -937,7 +937,7 @@ if (is_valid_fd(nd)) _close(nd); - ret = set_fd(handle, wxflag, nd); + ret = msvcrt_set_fd(handle, wxflag, nd); if (ret == -1) { CloseHandle(handle); @@ -1021,8 +1021,8 @@ FILE *file; LOCK_FILES(); - for (i = 3; i < stream_idx; i++) { - file = get_file(i); + for (i = 3; i < MSVCRT_stream_idx; i++) { + file = msvcrt_get_file(i); if (file->_flag && !fclose(file)) num_closed++; @@ -1045,9 +1045,9 @@ for(i=0; i<sizeof(__pioinfo)/sizeof(__pioinfo[0]); i++) free(__pioinfo[i]); - for(j=0; j<stream_idx; j++) - { - FILE *file = get_file(j); + for(j=0; j<MSVCRT_stream_idx; j++) + { + FILE *file = msvcrt_get_file(j); if(file<_iob || file>=_iob+_IOB_ENTRIES) { ((file_crit*)file)->crit.DebugInfo->Spare[0] = 0; @@ -1055,8 +1055,8 @@ } } - for(i=0; i<sizeof(fstream)/sizeof(fstream[0]); i++) - free(fstream[i]); + for(i=0; i<sizeof(MSVCRT_fstream)/sizeof(MSVCRT_fstream[0]); i++) + free(MSVCRT_fstream[i]); } /********************************************************************* @@ -1196,7 +1196,7 @@ _lock_file(file); /* Flush output if needed */ if(file->_flag & _IOWRT) - flush_buffer(file); + msvcrt_flush_buffer(file); if(whence == SEEK_CUR && file->_flag & _IOREAD ) { whence = SEEK_SET; @@ -1441,9 +1441,9 @@ if (get_flags(mode, &open_flags, &stream_flags) == -1) return NULL; LOCK_FILES(); - if (!(file = alloc_fp())) + if (!(file = msvcrt_alloc_fp())) file = NULL; - else if (init_fp(file, fd, stream_flags) == -1) + else if (msvcrt_init_fp(file, fd, stream_flags) == -1) { file->_flag = 0; file = NULL; @@ -1634,11 +1634,11 @@ int fd; LOCK_FILES(); - fd = alloc_fd(readHandle, wxflags); + fd = msvcrt_alloc_fd(readHandle, wxflags); if (fd != -1) { pfds[0] = fd; - fd = alloc_fd(writeHandle, wxflags); + fd = msvcrt_alloc_fd(writeHandle, wxflags); if (fd != -1) { pfds[1] = fd; @@ -1833,7 +1833,7 @@ else if (type == FILE_TYPE_PIPE) wxflag |= WX_PIPE; - *fd = alloc_fd(hand, wxflag); + *fd = msvcrt_alloc_fd(hand, wxflag); if (*fd == -1) return *_errno(); @@ -1998,7 +1998,7 @@ flags = 0; flags |= split_oflags(oflags); - fd = alloc_fd((HANDLE)handle, flags); + fd = msvcrt_alloc_fd((HANDLE)handle, flags); TRACE(":handle (%ld) fd (%d) flags 0x%08x\n", handle, fd, flags); return fd; } @@ -2012,8 +2012,8 @@ FILE *file; LOCK_FILES(); - for (i = 3; i < stream_idx; i++) { - file = get_file(i); + for (i = 3; i < MSVCRT_stream_idx; i++) { + file = msvcrt_get_file(i); if (file->_tmpfname) { @@ -2481,7 +2481,7 @@ */ int CDECL _umask(int umask) { - int old_umask = umask; + int old_umask = MSVCRT_umask; TRACE("(%d)\n",umask); MSVCRT_umask = umask; return old_umask; @@ -2701,10 +2701,10 @@ if(file<_iob || file>=_iob+_IOB_ENTRIES) DeleteCriticalSection(&((file_crit*)file)->crit); - if(file == get_file(stream_idx-1)) { - while(stream_idx>3 && !file->_flag) { - stream_idx--; - file = get_file(stream_idx-1); + if(file == msvcrt_get_file(MSVCRT_stream_idx-1)) { + while(MSVCRT_stream_idx>3 && !file->_flag) { + MSVCRT_stream_idx--; + file = msvcrt_get_file(MSVCRT_stream_idx-1); } } @@ -3012,7 +3012,7 @@ pcnt = (wrcnt / bufsiz) * bufsiz; - if(flush_buffer(file) == EOF) + if(msvcrt_flush_buffer(file) == EOF) break; if(_write(file->_file, ptr, pcnt) <= 0) { @@ -3097,7 +3097,7 @@ fd = _wsopen(path, open_flags, share, _S_IREAD | _S_IWRITE); if (fd < 0) file = NULL; - else if ((file = alloc_fp()) && init_fp(file, fd, stream_flags) + else if ((file = msvcrt_alloc_fp()) && msvcrt_init_fp(file, fd, stream_flags) != -1) TRACE(":fd (%d) mode (%s) FILE* (%p)\n", fd, debugstr_w(mode), file); else if (file) @@ -3209,7 +3209,7 @@ file->_cnt--; if (c == '\n') { - res = flush_buffer(file); + res = msvcrt_flush_buffer(file); _unlock_file(file); return res ? res : c; } @@ -3336,7 +3336,7 @@ fd = _wopen(path, open_flags, _S_IREAD | _S_IWRITE); if (fd < 0) file = NULL; - else if (init_fp(file, fd, stream_flags) == -1) + else if (msvcrt_init_fp(file, fd, stream_flags) == -1) { file->_flag = 0; WARN(":failed-last error (%d)\n",GetLastError()); @@ -3382,7 +3382,7 @@ _lock_file(file); /* Note that all this has been lifted 'as is' from fseek */ if(file->_flag & _IOWRT) - flush_buffer(file); + msvcrt_flush_buffer(file); /* Discard buffered input */ file->_cnt = 0; @@ -3760,11 +3760,11 @@ s = data->tmpnam_buffer; } - int_to_base32(GetCurrentProcessId(), tmpstr); + msvcrt_int_to_base32(GetCurrentProcessId(), tmpstr); p = s + sprintf(s, "\\s%s.", tmpstr); for (count = 0; count < TMP_MAX; count++) { - size = int_to_base32(tmpnam_unique++, tmpstr); + size = msvcrt_int_to_base32(tmpnam_unique++, tmpstr); memcpy(p, tmpstr, size); p[size] = '\0'; if (GetFileAttributesA(s) == INVALID_FILE_ATTRIBUTES && @@ -3792,11 +3792,11 @@ s = data->wtmpnam_buffer; } - int_to_base32_w(GetCurrentProcessId(), tmpstr); + msvcrt_int_to_base32_w(GetCurrentProcessId(), tmpstr); p = s + _snwprintf(s, MAX_PATH, format, tmpstr); for (count = 0; count < TMP_MAX; count++) { - size = int_to_base32_w(tmpnam_unique++, tmpstr); + size = msvcrt_int_to_base32_w(tmpnam_unique++, tmpstr); memcpy(p, tmpstr, size*sizeof(wchar_t)); p[size] = '\0'; if (GetFileAttributesW(s) == INVALID_FILE_ATTRIBUTES && @@ -3818,9 +3818,9 @@ LOCK_FILES(); fd = _open(filename, _O_CREAT | _O_BINARY | _O_RDWR | _O_TEMPORARY, _S_IREAD | _S_IWRITE); - if (fd != -1 && (file = alloc_fp())) - { - if (init_fp(file, fd, _IORW) == -1) + if (fd != -1 && (file = msvcrt_alloc_fp())) + { + if (msvcrt_init_fp(file, fd, _IORW) == -1) { file->_flag = 0; file = NULL; @@ -3925,7 +3925,7 @@ */ int CDECL _getmaxstdio(void) { - return max_streams; + return MSVCRT_max_streams; } /********************************************************************* @@ -3935,9 +3935,9 @@ { TRACE("%d\n", newmax); - if(newmax<_IOB_ENTRIES || newmax>MAX_FILES || newmax<stream_idx) + if(newmax<_IOB_ENTRIES || newmax>MAX_FILES || newmax<MSVCRT_stream_idx) return -1; - max_streams = newmax; - return max_streams; -} + MSVCRT_max_streams = newmax; + return MSVCRT_max_streams; +} Modified: trunk/reactos/sdk/lib/crt/stdio/popen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/stdio/popen.c?… ============================================================================== --- trunk/reactos/sdk/lib/crt/stdio/popen.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/stdio/popen.c [iso-8859-1] Sat Sep 3 12:40:59 2016 @@ -18,7 +18,7 @@ #define MK_STR(s) #s -int alloc_fd(HANDLE hand, int flag); //FIXME: Remove +int msvcrt_alloc_fd(HANDLE hand, int flag); //FIXME: Remove unsigned split_oflags(unsigned oflags); //FIXME: Remove #ifndef _UNICODE @@ -121,12 +121,12 @@ if ( *md == 'r' ) { - pf = _tfdopen(alloc_fd(hReadPipe, split_oflags(_fmode)) , _T("r")); + pf = _tfdopen(msvcrt_alloc_fd(hReadPipe, split_oflags(_fmode)) , _T("r")); CloseHandle(hWritePipe); } else { - pf = _tfdopen( alloc_fd(hWritePipe, split_oflags(_fmode)) , _T("w")); + pf = _tfdopen( msvcrt_alloc_fd(hWritePipe, split_oflags(_fmode)) , _T("w")); CloseHandle(hReadPipe); }

8 years

[dchapyshev] 72542: [NTOS:FSRTL] - Rework FsRtlIsHpfsDbcsLegal is similar FsRtlIsFatDbcsLegal * Fixes 30 tests for kmtest FsRtlLegal

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 3 10:47:21 2016 New Revision: 72542 URL: http://svn.reactos.org/svn/reactos?rev=72542&view=rev Log: [NTOS:FSRTL] - Rework FsRtlIsHpfsDbcsLegal is similar FsRtlIsFatDbcsLegal * Fixes 30 tests for kmtest FsRtlLegal Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Sat Sep 3 10:47:21 2016 @@ -603,13 +603,27 @@ IN BOOLEAN PathNamePermissible, IN BOOLEAN LeadingBackslashPermissible) { - ANSI_STRING FirstPart, RemainingPart, Name; + ANSI_STRING FirstPart, RemainingPart; USHORT i; PAGED_CODE(); /* Just quit if the string is empty */ if (!DbcsName.Length) return FALSE; + + /* Accept special filename if wildcards are allowed */ + if (WildCardsPermissible && (DbcsName.Length == 1 || DbcsName.Length == 2) && DbcsName.Buffer[0] == '.') + { + if (DbcsName.Length == 2) + { + if (DbcsName.Buffer[1] == '.') + return TRUE; + } + else + { + return TRUE; + } + } /* DbcsName wasn't supposed to be started with \ */ if (!LeadingBackslashPermissible && DbcsName.Buffer[0] == '\\') @@ -622,64 +636,56 @@ DbcsName.MaximumLength = DbcsName.MaximumLength - 1; } - /* Extract first part of the DbcsName to work on */ - FsRtlDissectDbcs(DbcsName, &FirstPart, &RemainingPart); - while (FirstPart.Length > 0) - { - /* Accept special filename if wildcards are allowed */ - if (WildCardsPermissible && (FirstPart.Length == 1 || FirstPart.Length == 2) && FirstPart.Buffer[0] == '.') - { - if (FirstPart.Length == 2) - { - if (FirstPart.Buffer[1] == '.') - { - goto EndLoop; - } - } - else - { - goto EndLoop; - } - } - - /* Filename must be 255 bytes maximum */ - if (FirstPart.Length > 255) + if (PathNamePermissible) + { + /* We copy the buffer for FsRtlDissectDbcs call */ + RemainingPart.Buffer = DbcsName.Buffer; + RemainingPart.Length = DbcsName.Length; + RemainingPart.MaximumLength = DbcsName.MaximumLength; + + while (RemainingPart.Length > 0) + { + if (RemainingPart.Buffer[0] == '\\') + return FALSE; + + /* Call once again our dissect function */ + FsRtlDissectDbcs(RemainingPart, &FirstPart, &RemainingPart); + + if (!FsRtlIsHpfsDbcsLegal(FirstPart, + WildCardsPermissible, + FALSE, + FALSE)) + { + return FALSE; + } + } + + return TRUE; + } + + if (DbcsName.Length > 255) + return FALSE; + + for (i = 0; i < DbcsName.Length; i++) + { + /* First make sure the character it's not the Lead DBCS */ + if (FsRtlIsLeadDbcsCharacter(DbcsName.Buffer[i])) + { + if (i == (DbcsName.Length - 1)) + return FALSE; + i++; + } + /* Then check for bad characters */ + else if (!FsRtlIsAnsiCharacterLegalHpfs(DbcsName.Buffer[i], WildCardsPermissible)) + { return FALSE; - - /* Now, we will parse the filename to find everything bad in */ - for (i = 0; i < FirstPart.Length; i++) - { - /* First make sure the character it's not the Lead DBCS */ - if (FsRtlIsLeadDbcsCharacter(FirstPart.Buffer[i])) - { - if (i == (FirstPart.Length) - 1) - return FALSE; - i++; - } - /* Then check for bad characters */ - else if (!FsRtlIsAnsiCharacterLegalHpfs(FirstPart.Buffer[i], WildCardsPermissible)) - { - return FALSE; - } - } - + } /* Filename mustn't finish with a space or a dot */ - if ((FirstPart.Buffer[FirstPart.Length - 1] == ' ') || - (FirstPart.Buffer[FirstPart.Length - 1] == '.')) + else if ((DbcsName.Buffer[i] == ' ' || DbcsName.Buffer[i] == '.') && i == (DbcsName.Length - 1)) + { return FALSE; - - EndLoop: - /* Preparing next loop */ - Name.Buffer = RemainingPart.Buffer; - Name.Length = RemainingPart.Length; - Name.MaximumLength = RemainingPart.MaximumLength; - - /* Call once again our dissect function */ - FsRtlDissectDbcs(Name, &FirstPart, &RemainingPart); - - /* We found a pathname, it wasn't allowed */ - if (FirstPart.Length > 0 && !PathNamePermissible) - return FALSE; - } + } + } + return TRUE; }

8 years

[akhaldi] 72541: [RTL] Partially sync actctx.c with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 3 10:46:01 2016 New Revision: 72541 URL: http://svn.reactos.org/svn/reactos?rev=72541&view=rev Log: [RTL] Partially sync actctx.c with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/lib/rtl/actctx.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] Sat Sep 3 10:46:01 2016 @@ -254,7 +254,7 @@ reactos/sdk/lib/3rdparty/strmbase # Synced to WineStaging-1.9.16 -reactos/sdk/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.55 +reactos/sdk/lib/rtl/actctx.c # Partly synced with WineStaging-1.9.16 reactos/sdk/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55 reactos/sdk/lib/rtl/wait.c # Partly synced with WineStaging-1.7.55 Modified: trunk/reactos/sdk/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/actctx.c?rev=7… ============================================================================== --- trunk/reactos/sdk/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/actctx.c [iso-8859-1] Sat Sep 3 10:46:01 2016 @@ -2579,11 +2579,7 @@ attr.ObjectName = name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - return NtOpenFile(handle, - GENERIC_READ | SYNCHRONIZE, - &attr, &io, - FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_ALERT); + return NtOpenFile( handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); } static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, USHORT extra_len ) @@ -2837,9 +2833,8 @@ ai->version.major, ai->version.minor, lang ); RtlInitUnicodeString( &lookup_us, lookup ); - NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), - FileBothDirectoryInformation, FALSE, &lookup_us, TRUE ); - if (io.Status == STATUS_SUCCESS) + if (!NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), + FileBothDirectoryInformation, FALSE, &lookup_us, TRUE )) { ULONG min_build = ai->version.build, min_revision = ai->version.revision; FILE_BOTH_DIR_INFORMATION *dir_info; @@ -2852,9 +2847,9 @@ { if (data_pos >= data_len) { - NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), - FileBothDirectoryInformation, FALSE, &lookup_us, FALSE ); - if (io.Status != STATUS_SUCCESS) break; + if (NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), + FileBothDirectoryInformation, FALSE, &lookup_us, FALSE )) + break; data_len = (ULONG)io.Information; data_pos = 0; } @@ -2933,11 +2928,8 @@ attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (!NtOpenFile(&handle, - GENERIC_READ | SYNCHRONIZE, - &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT)) + if (!NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT )) { sxs_ai = *ai; file = lookup_manifest_file( handle, &sxs_ai ); @@ -4764,7 +4756,7 @@ } ret = RtlDosPathNameToNtPathName_U(source ? source : pActCtx->lpSource, &nameW, NULL, NULL); - if (source) RtlFreeHeap( RtlGetProcessHeap(), 0, source ); + RtlFreeHeap( RtlGetProcessHeap(), 0, source ); if (!ret) { status = STATUS_NO_SUCH_FILE;

8 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2016