Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[ekohl] 74604: [INF] Make language (locale) names translatable. CORE-11885

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat May 20 09:53:15 2017 New Revision: 74604 URL: http://svn.reactos.org/svn/reactos?rev=74604&view=rev Log: [INF] Make language (locale) names translatable. CORE-11885 Modified: trunk/reactos/media/inf/intl.inf Modified: trunk/reactos/media/inf/intl.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/intl.inf?rev=746… ============================================================================== Binary files - no diff available.

7 years, 4 months

[tfaber] 74603: [HAL] - Fix a broken DPRINT

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri May 19 21:37:50 2017 New Revision: 74603 URL: http://svn.reactos.org/svn/reactos?rev=74603&view=rev Log: [HAL] - Fix a broken DPRINT Modified: trunk/reactos/hal/halx86/generic/bios.c Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Fri May 19 21:37:50 2017 @@ -63,8 +63,8 @@ PUCHAR Inst = (PUCHAR)(BiosFrame->CsBase + BiosFrame->Eip); /* Print error message */ - DPRINT1("HAL: An invalid V86 opcode was encountered at address %X:%X\n", - "Opcode: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", + DPRINT1("HAL: An invalid V86 opcode was encountered at address %X:%X\n" + "Opcode: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", BiosFrame->SegCs, BiosFrame->Eip, Inst[0], Inst[1], Inst[2], Inst[3], Inst[4], Inst[5], Inst[6], Inst[7], Inst[8], Inst[9]);

7 years, 4 months

[mjansen] 74602: [GDI32_APITEST] Improve GetFontResourceInfoW tests. Patch by Katayama Hirofumi MZ. ROSTESTS-269 #resolve #comment Thanks!

by mjansen＠svn.reactos.org

Author: mjansen Date: Fri May 19 20:26:49 2017 New Revision: 74602 URL: http://svn.reactos.org/svn/reactos?rev=74602&view=rev Log: [GDI32_APITEST] Improve GetFontResourceInfoW tests. Patch by Katayama Hirofumi MZ. ROSTESTS-269 #resolve #comment Thanks! Added: trunk/rostests/apitests/gdi32/ExampleFont.ttf (with props) Modified: trunk/rostests/apitests/gdi32/GetFontResourceInfoW.c trunk/rostests/apitests/gdi32/resource.rc Added: trunk/rostests/apitests/gdi32/ExampleFont.ttf URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExampleFon… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/gdi32/ExampleFont.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rostests/apitests/gdi32/GetFontResourceInfoW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetFontRes… ============================================================================== --- trunk/rostests/apitests/gdi32/GetFontResourceInfoW.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetFontResourceInfoW.c [iso-8859-1] Fri May 19 20:26:49 2017 @@ -5,6 +5,7 @@ * PROGRAMMERS: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include <apitest.h> +#include <winuser.h> #include <wingdi.h> #include <winnls.h> #include <stdio.h> @@ -16,6 +17,7 @@ typedef struct GFRI_ENTRY { LPCWSTR File; + BOOL Preinstalled; WCHAR FontInfo[64]; INT FontCount; WCHAR FaceNames[10][64]; @@ -24,9 +26,9 @@ /* test entries */ static const GFRI_ENTRY TestEntries[] = { - { L"symbol.ttf", L"Symbol|", 1, { L"Symbol" } }, - { L"tahoma.ttf", L"Tahoma|", 1, { L"Tahoma" } }, - { L"tahomabd.ttf", L"Tahoma Bold|", 1, { L"Tahoma" } } + { L"symbol.ttf", TRUE, L"Symbol|", 1, { L"Symbol" } }, + { L"tahoma.ttf", TRUE, L"Tahoma|", 1, { L"Tahoma" } }, + { L"tahomabd.ttf", TRUE, L"Tahoma Bold|", 1, { L"Tahoma" } } }; /* Japanese */ @@ -34,7 +36,7 @@ { { /* MS Gothic & MS UI Gothic & MS PGothic */ - L"msgothic.ttc", + L"msgothic.ttc", TRUE, { 0xFF2D, 0xFF33, 0x0020, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0x0020, 0x0026, 0x0020, 0x004D, 0x0053, 0x0020, 0x0055, 0x0049, 0x0020, @@ -51,6 +53,14 @@ { 0xFF2D, 0xFF33, 0x0020, 0xFF30, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 }, { L'@', 0xFF2D, 0xFF33, 0x0020, 0xFF30, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 } } + }, + { + L"ExampleFont.ttf", FALSE, + L"JapaneseDisplayName|", + 1, + { + L"JapaneseFamilyName" + } } }; @@ -59,7 +69,7 @@ { { /* MS Gothic & MS UI Gothic & MS PGothic */ - L"msgothic.ttc", + L"msgothic.ttc", TRUE, L"MS Gothic & MS UI Gothic & MS PGothic|", 6, { @@ -70,6 +80,14 @@ L"MS PGothic", L"@MS PGothic" } + }, + { + L"ExampleFont.ttf", FALSE, + L"EnglishDisplayName|", + 1, + { + L"EnglishFamilyName" + } } }; @@ -381,14 +399,56 @@ static void DoEntry(const GFRI_ENTRY *Entry) { - WCHAR szPath[MAX_PATH]; - - GetSystemFontPath(szPath, Entry->File); - printf("GetSystemFontPath: %S\n", szPath); - if (GetFileAttributesW(szPath) == 0xFFFFFFFF) - { - skip("Font file \"%S\" was not found\n", szPath); - return; + WCHAR szPath[MAX_PATH], szTempPath[MAX_PATH]; + BOOL Installed = FALSE; + + if (Entry->Preinstalled) + { + GetSystemFontPath(szPath, Entry->File); + printf("GetSystemFontPath: %S\n", szPath); + if (GetFileAttributesW(szPath) == INVALID_FILE_ATTRIBUTES) + { + skip("Font file \"%S\" was not found\n", szPath); + return; + } + } + else + { + /* load font data from resource */ + HANDLE hFile; + HMODULE hMod = GetModuleHandleW(NULL); + HRSRC hRsrc = FindResourceW(hMod, Entry->File, (LPCWSTR)RT_RCDATA); + HGLOBAL hGlobal = LoadResource(hMod, hRsrc); + DWORD Size = SizeofResource(hMod, hRsrc); + LPVOID pFont = LockResource(hGlobal); + + /* get temporary file name */ + GetTempPathW(_countof(szTempPath), szTempPath); + GetTempFileNameW(szTempPath, L"FNT", 0, szPath); + printf("GetTempFileNameW: %S\n", szPath); + + /* write to file */ + hFile = CreateFileW(szPath, GENERIC_WRITE, FILE_SHARE_READ, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + WriteFile(hFile, pFont, Size, &Size, NULL); + CloseHandle(hFile); + + /* check existence */ + if (GetFileAttributesW(szPath) == INVALID_FILE_ATTRIBUTES) + { + skip("Font file \"%S\" was not stored\n", szPath); + return; + } + + /* install */ + Installed = !!AddFontResourceW(szPath); + if (!Installed) + { + skip("Font file \"%S\" was not installed\n", szPath); + RemoveFontResourceW(szPath); + DeleteFileW(szPath); + return; + } } Test_GetFontResourceInfoW_case0(szPath, Entry); @@ -397,6 +457,15 @@ Test_GetFontResourceInfoW_case3(szPath, Entry); Test_GetFontResourceInfoW_case4(szPath, Entry); Test_GetFontResourceInfoW_case5(szPath, Entry); + + if (!Entry->Preinstalled) + { + if (Installed) + { + RemoveFontResourceW(szPath); + DeleteFileW(szPath); + } + } } START_TEST(GetFontResourceInfoW) Modified: trunk/rostests/apitests/gdi32/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/resource.r… ============================================================================== --- trunk/rostests/apitests/gdi32/resource.rc [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/resource.rc [iso-8859-1] Fri May 19 20:26:49 2017 @@ -4,3 +4,4 @@ PanosePitchTest.ttf RCDATA PanosePitchTest.ttf TTCTestV.ttc RCDATA TTCTestV.ttc Shadows_Into_Light.ttf RCDATA Shadows_Into_Light.ttf +ExampleFont.ttf RCDATA ExampleFont.ttf

7 years, 4 months

[mjansen] 74601: [APPHELP] Initial implementation of ApphelpCheckRunAppEx. CORE-10368

by mjansen＠svn.reactos.org

Author: mjansen Date: Fri May 19 20:13:08 2017 New Revision: 74601 URL: http://svn.reactos.org/svn/reactos?rev=74601&view=rev Log: [APPHELP] Initial implementation of ApphelpCheckRunAppEx. CORE-10368 Modified: 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/hsdb.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] Fri May 19 20:13:08 2017 @@ -1,7 +1,7 @@ /* * Copyright 2011 AndrÃ© Hentschel * Copyright 2013 Mislav BlaÅ¾eviÄ - * Copyright 2015 Mark Jansen + * Copyright 2015-2017 Mark Jansen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,8 +24,9 @@ #include "winver.h" #include "strsafe.h" #include "apphelp.h" - -#include "wine/winternl.h" +#include "ndk/rtlfuncs.h" +#include "ndk/kdtypes.h" + /* from dpfilter.h */ #define DPFLTR_APPCOMPAT_ID 123 @@ -35,23 +36,19 @@ #endif ULONG g_ShimDebugLevel = 0xffffffff; +HMODULE g_hInstance; void ApphelppInitDebugLevel(void) { - UNICODE_STRING DebugKey, DebugValue; + static const UNICODE_STRING DebugKey = RTL_CONSTANT_STRING(L"SHIM_DEBUG_LEVEL"); + UNICODE_STRING DebugValue; NTSTATUS Status; ULONG NewLevel = SHIM_ERR; WCHAR Buffer[40]; - RtlInitUnicodeString(&DebugKey, L"SHIM_DEBUG_LEVEL"); - DebugValue.MaximumLength = sizeof(Buffer); - DebugValue.Buffer = Buffer; - DebugValue.Length = 0; - - /* Hold the lock as short as possible. */ - RtlAcquirePebLock(); + RtlInitEmptyUnicodeString(&DebugValue, Buffer, sizeof(Buffer)); + Status = RtlQueryEnvironmentVariable_U(NULL, &DebugKey, &DebugValue); - RtlReleasePebLock(); if (NT_SUCCESS(Status)) { @@ -60,6 +57,7 @@ } g_ShimDebugLevel = NewLevel; } + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { @@ -70,6 +68,7 @@ return FALSE; /* prefer native version */ #endif case DLL_PROCESS_ATTACH: + g_hInstance = hinst; DisableThreadLibraryCalls( hinst ); SdbpHeapInit(); break; @@ -145,9 +144,11 @@ break; } StringCchPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, "[%s][%-20s] ", LevelStr, FunctionName); + va_start(ArgList, Format); StringCchVPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, Format, ArgList); va_end(ArgList); + #if defined(APPCOMPAT_USE_DBGPRINTEX) && APPCOMPAT_USE_DBGPRINTEX return NT_SUCCESS(DbgPrintEx(DPFLTR_APPCOMPAT_ID, Level, "%s", Buffer)); #else @@ -156,3 +157,102 @@ #endif } + +#define APPHELP_DONTWRITE_REASON 2 +#define APPHELP_CLEARBITS 0x100 /* TODO: Investigate */ +#define APPHELP_IGNORE_ENVIRONMENT 0x400 + +#define APPHELP_VALID_RESULT 0x10000 +#define APPHELP_RESULT_NOTFOUND 0x20000 +#define APPHELP_RESULT_FOUND 0x40000 + +/** + * Lookup Shims / Fixes for the specified application + * + * @param [in] FileHandle Handle to the file to check. + * @param [in] Unk1 + * @param [in] Unk2 + * @param [in] ApplicationName Exe to check + * @param [in] Environment The environment variables to use, or NULL to use the current environment. + * @param [in] ExeType Exe type (MACHINE_TYPE_XXXX) + * @param [in,out] Reason Input/output flags + * @param [in] SdbQueryAppCompatData The resulting data. + * @param [in] SdbQueryAppCompatDataSize The resulting data size. + * @param [in] SxsData TODO + * @param [in] SxsDataSize TODO + * @param [in] FusionFlags TODO + * @param [in] SomeFlag1 TODO + * @param [in] SomeFlag2 TODO + * + * @return TRUE if the application is allowed to run. + */ +BOOL +WINAPI +ApphelpCheckRunAppEx( + _In_ HANDLE FileHandle, + _In_opt_ PVOID Unk1, + _In_opt_ PVOID Unk2, + _In_opt_z_ PWCHAR ApplicationName, + _In_opt_ PVOID Environment, + _In_opt_ USHORT ExeType, + _Inout_opt_ PULONG Reason, + _Out_opt_ PVOID* SdbQueryAppCompatData, + _Out_opt_ PULONG SdbQueryAppCompatDataSize, + _Out_opt_ PVOID* SxsData, + _Out_opt_ PULONG SxsDataSize, + _Out_opt_ PULONG FusionFlags, + _Out_opt_ PULONG64 SomeFlag1, + _Out_opt_ PULONG SomeFlag2) +{ + SDBQUERYRESULT* result = NULL; + HSDB hsdb = NULL; + DWORD dwFlags = 0; + + if (SxsData) + *SxsData = NULL; + if (SxsDataSize) + *SxsDataSize = 0; + if (FusionFlags) + *FusionFlags = 0; + if (SomeFlag1) + *SomeFlag1 = 0; + if (SomeFlag2) + *SomeFlag2 = 0; + if (Reason) + dwFlags = *Reason; + + dwFlags &= ~APPHELP_CLEARBITS; + + *SdbQueryAppCompatData = result = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SDBQUERYRESULT)); + if (SdbQueryAppCompatDataSize) + *SdbQueryAppCompatDataSize = sizeof(*result); + + + hsdb = SdbInitDatabase(HID_DOS_PATHS | SDB_DATABASE_MAIN_SHIM, NULL); + if (hsdb) + { + BOOL FoundMatch; + DWORD MatchingExeFlags = 0; + + if (dwFlags & APPHELP_IGNORE_ENVIRONMENT) + MatchingExeFlags |= SDBGMEF_IGNORE_ENVIRONMENT; + + FoundMatch = SdbGetMatchingExe(hsdb, ApplicationName, NULL, Environment, MatchingExeFlags, result); + if (FileHandle != INVALID_HANDLE_VALUE) + { + dwFlags |= APPHELP_VALID_RESULT; + dwFlags |= (FoundMatch ? APPHELP_RESULT_FOUND : APPHELP_RESULT_NOTFOUND); + } + + SdbReleaseDatabase(hsdb); + } + + if (Reason && !(dwFlags & APPHELP_DONTWRITE_REASON)) + *Reason = dwFlags; + + + /* We should _ALWAYS_ return TRUE here, unless we want to block an application from starting! */ + return TRUE; +} + + 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] Fri May 19 20:13:08 2017 @@ -1,6 +1,6 @@ /* * Copyright 2013 Mislav BlaÅ¾eviÄ - * Copyright 2015,2016 Mark Jansen + * Copyright 2015-2017 Mark Jansen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -63,6 +63,10 @@ #define SHIMREG_DISABLE_LAYER (0x00000020) #define SHIMREG_DISABLE_DRIVER (0x00000040) +/* Flags for dwFlags */ +#define SHIMREG_HAS_ENVIRONMENT (0x1) + +/* Flags for SdbGetMatchingExe */ #define SDBGMEF_IGNORE_ENVIRONMENT (0x1) typedef struct tagSDBQUERYRESULT { @@ -100,6 +104,7 @@ 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); +DWORD WINAPI SdbReadDWORDTag(PDB db, TAGID tagid, DWORD ret); /* sdbfileattr.c*/ BOOL WINAPI SdbFreeFileAttributes(PATTRINFO attr_info); @@ -110,6 +115,7 @@ BOOL WINAPI SetPermLayerState(PCWSTR wszPath, PCWSTR wszLayer, DWORD dwFlags, BOOL bMachine, BOOL bEnable); /* hsdb.c */ +BOOL WINAPI SdbGetMatchingExe(HSDB hsdb, LPCWSTR path, LPCWSTR module_name, LPCWSTR env, DWORD flags, PSDBQUERYRESULT result); BOOL WINAPI SdbTagIDToTagRef(HSDB hsdb, PDB pdb, TAGID tiWhich, TAGREF* ptrWhich); 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] Fri May 19 20:13:08 2017 @@ -3,7 +3,7 @@ @ stdcall ApphelpCheckInstallShieldPackage(ptr wstr) @ stub ApphelpCheckMsiPackage @ stub ApphelpCheckRunApp -@ stub ApphelpCheckRunAppEx +@ stdcall ApphelpCheckRunAppEx(ptr ptr ptr wstr ptr long ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall ApphelpCheckShellObject(ptr long ptr) @ stub ApphelpCreateAppcompatData @ stub ApphelpFixMsiPackage Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/hsdb.c [iso-8859-1] Fri May 19 20:13:08 2017 @@ -1,7 +1,7 @@ /* * Copyright 2011 AndrÃ© Hentschel * Copyright 2013 Mislav BlaÅ¾eviÄ - * Copyright 2015,2016 Mark Jansen + * Copyright 2015-2017 Mark Jansen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,12 +26,214 @@ #include "wine/unicode.h" +#define MAX_LAYER_LENGTH 256 +#define GPLK_USER 1 +#define GPLK_MACHINE 2 static BOOL WINAPI SdbpFileExists(LPCWSTR path) { DWORD attr = GetFileAttributesW(path); return (attr != INVALID_FILE_ATTRIBUTES && !(attr & FILE_ATTRIBUTE_DIRECTORY)); } + +static BOOL WINAPI SdbpMatchExe(PDB db, TAGID exe, WCHAR* dir) +{ + static const WCHAR fmt[] = {'%','s','%','s',0}; + WCHAR buffer[256]; /* FIXME: rewrite using a buffer that can grow if needed, f.e. RtlInitBuffer stuff! */ + TAGID matching_file; + + /* TODO: check size/checksum from the main exe as well as from the extra files */ + for (matching_file = SdbFindFirstTag(db, exe, TAG_MATCHING_FILE); + matching_file != TAGID_NULL; matching_file = SdbFindNextTag(db, exe, matching_file)) + { + TAGID tagName = SdbFindFirstTag(db, matching_file, TAG_NAME); + LPWSTR name = SdbGetStringTagPtr(db, tagName); + + if (!wcscmp(name, L"*")) + { + // if attributes dont match main file, return FALSE! + continue; + } + + snprintfW(buffer, _countof(buffer), fmt, dir, name); + if (!SdbpFileExists(buffer)) + return FALSE; + } + + return TRUE; +} + +static void SdbpAddDatabaseGuid(PDB db, PSDBQUERYRESULT result) +{ + size_t n; + + for (n = 0; n < _countof(result->rgGuidDB); ++n) + { + if (!memcmp(&result->rgGuidDB[n], &db->database_id, sizeof(db->database_id))) + return; + + if (result->dwCustomSDBMap & (1<<n)) + continue; + + memcpy(&result->rgGuidDB[n], &db->database_id, sizeof(result->rgGuidDB[n])); + result->dwCustomSDBMap |= (1<<n); + return; + } +} + +static BOOL SdbpAddSingleLayerMatch(TAGREF layer, PSDBQUERYRESULT result) +{ + size_t n; + + for (n = 0; n < result->dwLayerCount; ++n) + { + if (result->atrLayers[n] == layer) + return FALSE; + } + + if (n >= _countof(result->atrLayers)) + return FALSE; + + result->atrLayers[n] = layer; + result->dwLayerCount++; + + return TRUE; +} + + +static BOOL SdbpAddNamedLayerMatch(HSDB hsdb, PCWSTR layerName, PSDBQUERYRESULT result) +{ + TAGID database, layer; + TAGREF tr; + PDB db = hsdb->db; + + database = SdbFindFirstTag(db, TAGID_ROOT, TAG_DATABASE); + if (database == TAGID_NULL) + return FALSE; + + layer = SdbFindFirstNamedTag(db, database, TAG_LAYER, TAG_NAME, layerName); + if (layer == TAGID_NULL) + return FALSE; + + if (!SdbTagIDToTagRef(hsdb, db, layer, &tr)) + return FALSE; + + if (!SdbpAddSingleLayerMatch(tr, result)) + return FALSE; + + SdbpAddDatabaseGuid(db, result); + return TRUE; +} + +static void SdbpAddExeLayers(HSDB hsdb, PDB db, TAGID tagExe, PSDBQUERYRESULT result) +{ + TAGID layer = SdbFindFirstTag(db, tagExe, TAG_LAYER); + + while (layer != TAGID_NULL) + { + TAGREF tr; + TAGID layerIdTag = SdbFindFirstTag(db, layer, TAG_LAYER_TAGID); + DWORD tagId = SdbReadDWORDTag(db, layerIdTag, TAGID_NULL); + + if (layerIdTag != TAGID_NULL && + tagId != TAGID_NULL && + SdbTagIDToTagRef(hsdb, db, tagId, &tr)) + { + SdbpAddSingleLayerMatch(tr, result); + } + else + { + /* Try a name lookup */ + TAGID layerTag = SdbFindFirstTag(db, layer, TAG_NAME); + if (layerTag != TAGID_NULL) + { + LPCWSTR layerName = SdbGetStringTagPtr(db, layerTag); + if (layerName) + { + SdbpAddNamedLayerMatch(hsdb, layerName, result); + } + } + } + + layer = SdbFindNextTag(db, tagExe, layer); + } +} + +static void SdbpAddExeMatch(HSDB hsdb, PDB db, TAGID tagExe, PSDBQUERYRESULT result) +{ + size_t n; + TAGREF tr; + + if (!SdbTagIDToTagRef(hsdb, db, tagExe, &tr)) + return; + + for (n = 0; n < result->dwExeCount; ++n) + { + if (result->atrExes[n] == tr) + return; + } + + if (n >= _countof(result->atrExes)) + return; + + result->atrExes[n] = tr; + result->dwExeCount++; + + SdbpAddExeLayers(hsdb, db, tagExe, result); + + SdbpAddDatabaseGuid(db, result); +} + +static ULONG SdbpAddLayerMatches(HSDB hsdb, PWSTR pwszLayers, DWORD pdwBytes, PSDBQUERYRESULT result) +{ + PWSTR start = pwszLayers, p; + ULONG Added = 0; + + const PWSTR end = pwszLayers + (pdwBytes / sizeof(WCHAR)); + while (start < end && (*start == L'!' || *start == L'#' || *start == L' ' || *start == L'\t')) + start++; + + if (start == end) + return 0; + + do + { + while (*start == L' ' || *start == L'\t') + ++start; + + if (*start == UNICODE_NULL) + break; + p = wcspbrk(start, L" \t"); + + if (p) + *p = UNICODE_NULL; + + if (SdbpAddNamedLayerMatch(hsdb, start, result)) + Added++; + + start = p + 1; + } while (start < end && p); + + return Added; +} + +static BOOL SdbpPropagateEnvLayers(HSDB hsdb, LPWSTR Environment, PSDBQUERYRESULT Result) +{ + static const UNICODE_STRING EnvKey = RTL_CONSTANT_STRING(L"__COMPAT_LAYER"); + UNICODE_STRING EnvValue; + NTSTATUS Status; + WCHAR Buffer[MAX_LAYER_LENGTH]; + + RtlInitEmptyUnicodeString(&EnvValue, Buffer, sizeof(Buffer)); + + Status = RtlQueryEnvironmentVariable_U(Environment, &EnvKey, &EnvValue); + + if (!NT_SUCCESS(Status)) + return FALSE; + + return SdbpAddLayerMatches(hsdb, Buffer, EnvValue.Length, Result) > 0; +} + /** @@ -50,12 +252,12 @@ 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) + HSDB hsdb; + + hsdb = SdbAlloc(sizeof(SDB)); + if (!hsdb) return NULL; - sdb->auto_loaded = 0; + hsdb->auto_loaded = 0; /* Check for predefined databases */ if ((flags & HID_DATABASE_TYPE_MASK) && path == NULL) @@ -66,23 +268,24 @@ case SDB_DATABASE_MAIN_MSI: name = msi; break; case SDB_DATABASE_MAIN_DRIVERS: name = drivers; break; default: - SdbReleaseDatabase(sdb); + SdbReleaseDatabase(hsdb); return NULL; } SdbGetAppPatchDir(NULL, buffer, 128); - memcpy(buffer + lstrlenW(buffer), name, SdbpStrlen(name)); - } - - sdb->db = SdbOpenDatabase(path ? path : buffer, (flags & 0xF) - 1); + memcpy(buffer + lstrlenW(buffer), name, SdbpStrsize(name)); + flags = HID_DOS_PATHS; + } + + hsdb->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); + if (!hsdb->db) + { + SdbReleaseDatabase(hsdb); return NULL; } - return sdb; + return hsdb; } /** @@ -103,7 +306,7 @@ * @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] env The environment block to use * @param [in] flags 0 or SDBGMEF_IGNORE_ENVIRONMENT. * @param [out] result Pointer to structure in which query result shall be stored. * @@ -112,14 +315,16 @@ 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; + BOOL ret = FALSE; + TAGID database, iter, name; PATTRINFO attribs = NULL; /*DWORD attr_count;*/ + RTL_UNICODE_STRING_BUFFER DosApplicationName = { { 0 } }; + WCHAR DosPathBuffer[MAX_PATH]; + ULONG PathType = 0; LPWSTR file_name; - WCHAR dir_path[128]; - WCHAR buffer[256]; + WCHAR wszLayers[MAX_LAYER_LENGTH]; + DWORD dwSize; PDB db; /* Load default database if one is not specified */ @@ -128,21 +333,49 @@ /* 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) + if (hsdb) hsdb->auto_loaded = TRUE; } + ZeroMemory(result, sizeof(*result)); + /* No database could be loaded */ - if (!hsdb) - return FALSE; - + if (!hsdb || !path) + return FALSE; + + /* We do not support multiple db's yet! */ db = hsdb->db; + RtlInitUnicodeString(&DosApplicationName.String, path); + RtlInitBuffer(&DosApplicationName.ByteBuffer, (PUCHAR)DosPathBuffer, sizeof(DosPathBuffer)); + if (!NT_SUCCESS(RtlEnsureBufferSize(RTL_SKIP_BUFFER_COPY, &DosApplicationName.ByteBuffer, DosApplicationName.String.MaximumLength))) + { + SHIM_ERR("Failed to convert allocate buffer."); + goto Cleanup; + } + /* Update the internal buffer to contain the string */ + memcpy(DosApplicationName.ByteBuffer.Buffer, path, DosApplicationName.String.MaximumLength); + /* Make sure the string uses our internal buffer (we want to modify the buffer, + and RtlNtPathNameToDosPathName does not always modify the String to point to the Buffer)! */ + DosApplicationName.String.Buffer = (PWSTR)DosApplicationName.ByteBuffer.Buffer; + + if (!NT_SUCCESS(RtlNtPathNameToDosPathName(0, &DosApplicationName, &PathType, NULL))) + { + SHIM_ERR("Failed to convert %S to DOS Path.", path); + goto Cleanup; + } + + /* Extract file name */ - file_name = strrchrW(path, '\\') + 1; - - /* Extract directory path */ - memcpy(dir_path, path, (size_t)(file_name - path) * sizeof(WCHAR)); + file_name = strrchrW(DosApplicationName.String.Buffer, '\\'); + if (!file_name) + { + SHIM_ERR("Failed to find Exe name in %wZ.", &DosApplicationName.String); + goto Cleanup; + } + + /* We will use the buffer for exe name and directory. */ + *(file_name++) = UNICODE_NULL; /* Get information about executable required to match it with database entry */ /*if (!SdbGetFileAttributes(path, &attribs, &attr_count)) @@ -151,38 +384,28 @@ /* DATABASE is list TAG which contains all executables */ database = SdbFindFirstTag(db, TAGID_ROOT, TAG_DATABASE); if (database == TAGID_NULL) - return FALSE; + { + goto Cleanup; + } /* EXE is list TAG which contains data required to match executable */ iter = SdbFindFirstTag(db, database, TAG_EXE); - /* Search for entry in database */ + /* Search for entry in database, we should look into indexing tags! */ while (iter != TAGID_NULL) { + LPWSTR foundName; /* 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)) + name = SdbFindFirstTag(db, iter, TAG_NAME); + /* If this is a malformed DB, (no TAG_NAME), we should not crash. */ + foundName = SdbGetStringTagPtr(db, name); + if (foundName && !lstrcmpiW(foundName, file_name)) + { + /* We have a null terminator before the application name, so DosApplicationName only contains the path. */ + if (SdbpMatchExe(db, iter, DosApplicationName.String.Buffer)) { - 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; + SdbpAddExeMatch(hsdb, db, iter, result); } } @@ -190,12 +413,31 @@ iter = SdbFindNextTag(db, database, iter); } - /* Exe not found */ - ret = FALSE; - -cleanup: - SdbFreeFileAttributes(attribs); - if (hsdb->auto_loaded) SdbReleaseDatabase(hsdb); + /* Restore the full path. */ + *(--file_name) = L'\\'; + + dwSize = sizeof(wszLayers); + if (SdbGetPermLayerKeys(DosApplicationName.String.Buffer, wszLayers, &dwSize, GPLK_MACHINE | GPLK_USER)) + { + SdbpAddLayerMatches(hsdb, wszLayers, dwSize, result); + ret = TRUE; + } + + if (!(flags & SDBGMEF_IGNORE_ENVIRONMENT)) + { + if (SdbpPropagateEnvLayers(hsdb, (LPWSTR)env, result)) + { + ret = TRUE; + result->dwFlags |= SHIMREG_HAS_ENVIRONMENT; + } + } + +Cleanup: + RtlFreeBuffer(&DosApplicationName.ByteBuffer); + if (attribs) + SdbFreeFileAttributes(attribs); + if (hsdb->auto_loaded) + SdbReleaseDatabase(hsdb); return ret; }

7 years, 4 months

[tfaber] 74600: [NTDLL:LDR] - Fix logic error in LdrpInit that caused us to busy-wait instead of sleep. This makes LibreOffice start up in a few seconds instead of sitting around at 100% CPU for a ...

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri May 19 19:11:14 2017 New Revision: 74600 URL: http://svn.reactos.org/svn/reactos?rev=74600&view=rev Log: [NTDLL:LDR] - Fix logic error in LdrpInit that caused us to busy-wait instead of sleep. This makes LibreOffice start up in a few seconds instead of sitting around at 100% CPU for a minute or two. CORE-13268 #resolve Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Fri May 19 19:11:14 2017 @@ -2223,11 +2223,11 @@ 1, 0) == 1) { - /* Set the timeout to 30 seconds */ + /* Set the timeout to 30 milliseconds */ Timeout.QuadPart = Int32x32To64(30, -10000); /* Make sure the status hasn't changed */ - while (!LdrpProcessInitialized) + while (LdrpProcessInitialized == 1) { /* Do the wait */ ZwDelayExecution(FALSE, &Timeout);

7 years, 4 months

[tfaber] 74599: [RTL] - Do not change RTL_HANDLE_TABLE::CommittedHandles when committing a new page of handle entries. This value must always point to the beginning of the allocation, to correctly ...

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri May 19 18:22:46 2017 New Revision: 74599 URL: http://svn.reactos.org/svn/reactos?rev=74599&view=rev Log: [RTL] - Do not change RTL_HANDLE_TABLE::CommittedHandles when committing a new page of handle entries. This value must always point to the beginning of the allocation, to correctly track the entire committed range. Fixes LibreOffice Writer (and ntdll_apitest) crash. CORE-13271 #resolve Modified: trunk/reactos/sdk/lib/rtl/handle.c Modified: trunk/reactos/sdk/lib/rtl/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/handle.c?rev=7… ============================================================================== --- trunk/reactos/sdk/lib/rtl/handle.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/handle.c [iso-8859-1] Fri May 19 18:22:46 2017 @@ -89,6 +89,7 @@ return NULL; /* Update handle array pointers */ + HandleTable->CommittedHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; HandleTable->UnCommittedHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; HandleTable->MaxReservedHandles = (PRTL_HANDLE_TABLE_ENTRY)((ULONG_PTR)ArrayPointer + ArraySize); } @@ -107,7 +108,6 @@ /* Update handle array pointers */ HandleTable->FreeHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; - HandleTable->CommittedHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; HandleTable->UnCommittedHandles = (PRTL_HANDLE_TABLE_ENTRY)((ULONG_PTR)ArrayPointer + ArraySize); /* Calculate the number of entries we can store in the array */

7 years, 4 months

[tfaber] 74598: [NTDLL_APITEST] - Add a test for RTL handle tables CORE-13271

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri May 19 18:05:12 2017 New Revision: 74598 URL: http://svn.reactos.org/svn/reactos?rev=74598&view=rev Log: [NTDLL_APITEST] - Add a test for RTL handle tables CORE-13271 Added: trunk/rostests/apitests/ntdll/RtlHandle.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Fri May 19 18:05:12 2017 @@ -40,6 +40,7 @@ RtlGetFullPathName_UstrEx.c RtlGetLengthWithoutTrailingPathSeperators.c RtlGetLongestNtPathLength.c + RtlHandle.c RtlImageRvaToVa.c RtlInitializeBitMap.c RtlIsNameLegalDOS8Dot3.c Added: trunk/rostests/apitests/ntdll/RtlHandle.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlHandle.… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlHandle.c (added) +++ trunk/rostests/apitests/ntdll/RtlHandle.c [iso-8859-1] Fri May 19 18:05:12 2017 @@ -0,0 +1,201 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for Rtl handle tables + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <ndk/rtlfuncs.h> +#include <stdio.h> + +typedef struct _TEST_HANDLE_ENTRY +{ + RTL_HANDLE_TABLE_ENTRY HandleEntry; + ULONG Data; +} TEST_HANDLE_ENTRY, *PTEST_HANDLE_ENTRY; + +START_TEST(RtlHandle) +{ + const ULONG MaxHandles = 2048; + RTL_HANDLE_TABLE HandleTable; + PUCHAR HandleBase; + PRTL_HANDLE_TABLE_ENTRY HandleEntry; + PTEST_HANDLE_ENTRY TestEntry; + PTEST_HANDLE_ENTRY TestEntry2; + ULONG Index; + BOOLEAN Valid; + ULONG i; + + /* Initialize handle table */ + RtlFillMemory(&HandleTable, sizeof(HandleTable), 0x55); + RtlInitializeHandleTable(MaxHandles, sizeof(TEST_HANDLE_ENTRY), &HandleTable); + ok(HandleTable.MaximumNumberOfHandles == MaxHandles, "MaximumNumberOfHandles = %lu\n", HandleTable.MaximumNumberOfHandles); + ok(HandleTable.SizeOfHandleTableEntry == sizeof(TEST_HANDLE_ENTRY), + "SizeOfHandleTableEntry = %lu\n", HandleTable.SizeOfHandleTableEntry); + ok(HandleTable.Reserved[0] == 0, "Reserved[0] = 0x%lx\n", HandleTable.Reserved[0]); + ok(HandleTable.Reserved[1] == 0, "Reserved[1] = 0x%lx\n", HandleTable.Reserved[1]); + ok(HandleTable.CommittedHandles == NULL, "CommittedHandles = %p\n", HandleTable.CommittedHandles); + ok(HandleTable.UnCommittedHandles == NULL, "UnCommittedHandles = %p\n", HandleTable.UnCommittedHandles); + ok(HandleTable.MaxReservedHandles == NULL, "MaxReservedHandles = %p\n", HandleTable.MaxReservedHandles); + ok(HandleTable.FreeHandles == NULL, "FreeHandles = %p\n", HandleTable.FreeHandles); + + /* Allocate a handle, now we have a committed page */ + HandleEntry = RtlAllocateHandle(&HandleTable, &Index); + + ok(HandleTable.CommittedHandles != NULL, "CommittedHandles = %p\n", HandleTable.CommittedHandles); + HandleBase = (PUCHAR)HandleTable.CommittedHandles; + + trace("CommittedHandles = %p\n", HandleBase); + ok((PUCHAR)HandleTable.UnCommittedHandles == HandleBase + PAGE_SIZE, "UnCommittedHandles = %p\n", HandleTable.UnCommittedHandles); + ok((PUCHAR)HandleTable.MaxReservedHandles == HandleBase + MaxHandles * sizeof(TEST_HANDLE_ENTRY), "MaxReservedHandles = %p\n", HandleTable.MaxReservedHandles); + ok((PUCHAR)HandleTable.FreeHandles == HandleBase + sizeof(TEST_HANDLE_ENTRY), "FreeHandles = %p\n", HandleTable.FreeHandles); + + ok((PUCHAR)HandleEntry == HandleBase, "HandleEntry = %p\n", HandleEntry); + ok(Index == 0, "Index = %lu\n", Index); + + ok(HandleEntry->Flags == 0, "Flags = 0x%lx\n", HandleEntry->Flags); + + TestEntry = (PTEST_HANDLE_ENTRY)HandleEntry; + ok(TestEntry->Data == 0, "Data = %lu\n", TestEntry->Data); + TestEntry->Data = 0x87654321; + + /* Handle is not recognized as valid unless we set the valid flag */ + Valid = RtlIsValidHandle(&HandleTable, &TestEntry->HandleEntry); + ok(Valid == FALSE, "Valid = %u\n", Valid); + HandleEntry = InvalidPointer; + Valid = RtlIsValidIndexHandle(&HandleTable, 0, &HandleEntry); + ok(Valid == FALSE, "Valid = %u\n", Valid); + ok(HandleEntry == InvalidPointer, "HandleEntry = %p\n", HandleEntry); + + TestEntry->HandleEntry.Flags = RTL_HANDLE_VALID; + Valid = RtlIsValidHandle(&HandleTable, &TestEntry->HandleEntry); + ok(Valid == TRUE, "Valid = %u\n", Valid); + HandleEntry = InvalidPointer; + Valid = RtlIsValidIndexHandle(&HandleTable, 0, &HandleEntry); + ok(Valid == TRUE, "Valid = %u\n", Valid); + ok(HandleEntry == &TestEntry->HandleEntry, "HandleEntry = %p\n", HandleEntry); + + /* Allocate a second handle */ + HandleEntry = RtlAllocateHandle(&HandleTable, &Index); + + ok((PUCHAR)HandleTable.CommittedHandles == HandleBase, "CommittedHandles = %p\n", HandleTable.CommittedHandles); + ok((PUCHAR)HandleTable.UnCommittedHandles == HandleBase + PAGE_SIZE, "UnCommittedHandles = %p\n", HandleTable.UnCommittedHandles); + ok((PUCHAR)HandleTable.MaxReservedHandles == HandleBase + MaxHandles * sizeof(TEST_HANDLE_ENTRY), "MaxReservedHandles = %p\n", HandleTable.MaxReservedHandles); + ok((PUCHAR)HandleTable.FreeHandles == HandleBase + 2 * sizeof(TEST_HANDLE_ENTRY), "FreeHandles = %p\n", HandleTable.FreeHandles); + + ok((PUCHAR)HandleEntry == HandleBase + sizeof(TEST_HANDLE_ENTRY), "HandleEntry = %p\n", HandleEntry); + ok(Index == 1, "Index = %lu\n", Index); + + TestEntry2 = (PTEST_HANDLE_ENTRY)HandleEntry; + ok(TestEntry2->Data == 0, "Data = %lu\n", TestEntry2->Data); + TestEntry2->Data = 0x87604321; + + TestEntry2->HandleEntry.Flags = RTL_HANDLE_VALID; + Valid = RtlIsValidHandle(&HandleTable, &TestEntry2->HandleEntry); + ok(Valid == TRUE, "Valid = %u\n", Valid); + HandleEntry = NULL; + Valid = RtlIsValidIndexHandle(&HandleTable, 1, &HandleEntry); + ok(Valid == TRUE, "Valid = %u\n", Valid); + ok(HandleEntry == &TestEntry2->HandleEntry, "HandleEntry = %p\n", HandleEntry); + + /* Free the first and allocate another */ + Valid = RtlFreeHandle(&HandleTable, &TestEntry->HandleEntry); + ok(Valid == TRUE, "Valid = %u\n", Valid); + + HandleEntry = RtlAllocateHandle(&HandleTable, &Index); + ok((PUCHAR)HandleEntry == HandleBase, "HandleEntry = %p\n", HandleEntry); + ok(Index == 0, "Index = %lu\n", Index); + ok(HandleEntry->Flags == 0, "Flags = 0x%lx\n", HandleEntry->Flags); + + TestEntry = (PTEST_HANDLE_ENTRY)HandleEntry; + ok(TestEntry->Data == 0, "Data = %lu\n", TestEntry->Data); + TestEntry->Data = 0x87650321; + + Valid = RtlFreeHandle(&HandleTable, &TestEntry2->HandleEntry); + ok(Valid == TRUE, "Valid = %u\n", Valid); + TestEntry->HandleEntry.Flags = RTL_HANDLE_VALID; + Valid = RtlFreeHandle(&HandleTable, &TestEntry->HandleEntry); + ok(Valid == TRUE, "Valid = %u\n", Valid); + + ok((PUCHAR)HandleTable.FreeHandles == HandleBase, "FreeHandles = %p\n", HandleTable.FreeHandles); + + /* Allocate all possible handles */ + for (i = 0; i < MaxHandles; i++) + { + const ULONG EntriesPerPage = PAGE_SIZE / sizeof(TEST_HANDLE_ENTRY); + + HandleEntry = RtlAllocateHandle(&HandleTable, &Index); + ok(Index == i, "[%lu] Index = %lu\n", i, Index); + ok((PUCHAR)HandleEntry == HandleBase + i * sizeof(TEST_HANDLE_ENTRY), + "[%lu] HandleEntry = %p\n", i, HandleEntry); + + ok((PUCHAR)HandleTable.CommittedHandles == HandleBase, "[%lu] CommittedHandles = %p\n", i, HandleTable.CommittedHandles); + ok((PUCHAR)HandleTable.UnCommittedHandles == HandleBase + PAGE_SIZE * (i / EntriesPerPage + 1) , "[%lu] UnCommittedHandles = %p\n", i, HandleTable.UnCommittedHandles); + ok((PUCHAR)HandleTable.MaxReservedHandles == HandleBase + MaxHandles * sizeof(TEST_HANDLE_ENTRY), "[%lu] MaxReservedHandles = %p\n", i, HandleTable.MaxReservedHandles); + if ((i + 1) % EntriesPerPage == 0) + { + ok(HandleTable.FreeHandles == NULL, "[%lu] FreeHandles = %p\n", i, HandleTable.FreeHandles); + } + else + { + ok((PUCHAR)HandleTable.FreeHandles == HandleBase + (i + 1) * sizeof(TEST_HANDLE_ENTRY), "[%lu] FreeHandles = %p\n", i, HandleTable.FreeHandles); + } + + TestEntry = (PTEST_HANDLE_ENTRY)HandleEntry; + ok(TestEntry->Data == 0, "[%lu] Data = 0x%lx\n", i, TestEntry->Data); + TestEntry->Data = (i << 16) + (i + 1); + + Valid = RtlIsValidHandle(&HandleTable, &TestEntry->HandleEntry); + ok(Valid == FALSE, "[%lu] Valid = %u\n", i, Valid); + HandleEntry = InvalidPointer; + Valid = RtlIsValidIndexHandle(&HandleTable, i, &HandleEntry); + ok(Valid == FALSE, "[%lu] Valid = %u\n", i, Valid); + ok(HandleEntry == InvalidPointer, "[%lu] HandleEntry = %p\n", i, HandleEntry); + } + + /* Try one more */ + Index = 0x55555555; + HandleEntry = RtlAllocateHandle(&HandleTable, &Index); + ok(HandleEntry == NULL, "HandleEntry = %p\n", HandleEntry); + ok(Index == 0x55555555, "Index = 0x%lx\n", Index); + + /* Free them all */ + for (i = 0; i < MaxHandles; i++) + { + TestEntry = (PTEST_HANDLE_ENTRY)HandleBase + i; + + ok(TestEntry->Data == (i << 16) + (i + 1), "[%lu] Data = %lu\n", i, TestEntry->Data); + + TestEntry->HandleEntry.Flags = RTL_HANDLE_VALID; + + Valid = RtlIsValidHandle(&HandleTable, &TestEntry->HandleEntry); + ok(Valid == TRUE, "[%lu] Valid = %u\n", i, Valid); + HandleEntry = InvalidPointer; + Valid = RtlIsValidIndexHandle(&HandleTable, i, &HandleEntry); + ok(Valid == TRUE, "[%lu] Valid = %u\n", i, Valid); + ok(HandleEntry == &TestEntry->HandleEntry, "[%lu] HandleEntry = %p\n", i, HandleEntry); + + Valid = RtlFreeHandle(&HandleTable, &TestEntry->HandleEntry); + ok(Valid == TRUE, "[%lu] Valid = %u\n", i, Valid); + + Valid = RtlIsValidHandle(&HandleTable, &TestEntry->HandleEntry); + ok(Valid == FALSE, "[%lu] Valid = %u\n", i, Valid); + HandleEntry = InvalidPointer; + Valid = RtlIsValidIndexHandle(&HandleTable, i, &HandleEntry); + ok(Valid == FALSE, "[%lu] Valid = %u\n", i, Valid); + ok(HandleEntry == InvalidPointer, "[%lu] HandleEntry = %p\n", i, HandleEntry); + } + + /* Check the memory commit once again */ + ok((PUCHAR)HandleTable.CommittedHandles == HandleBase, "[%lu] CommittedHandles = %p\n", i, HandleTable.CommittedHandles); + ok((PUCHAR)HandleTable.UnCommittedHandles == HandleBase + MaxHandles * sizeof(TEST_HANDLE_ENTRY), "[%lu] UnCommittedHandles = %p\n", i, HandleTable.UnCommittedHandles); + ok((PUCHAR)HandleTable.MaxReservedHandles == HandleBase + MaxHandles * sizeof(TEST_HANDLE_ENTRY), "[%lu] MaxReservedHandles = %p\n", i, HandleTable.MaxReservedHandles); + ok((PUCHAR)HandleTable.FreeHandles == HandleBase + (i - 1) * sizeof(TEST_HANDLE_ENTRY), "[%lu] FreeHandles = %p\n", i, HandleTable.FreeHandles); + + /* Finally, destroy the table */ + RtlDestroyHandleTable(&HandleTable); + ok((PUCHAR)HandleTable.CommittedHandles == HandleBase, "CommittedHandles = %p\n", HandleTable.CommittedHandles); +} Propchange: trunk/rostests/apitests/ntdll/RtlHandle.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Fri May 19 18:05:12 2017 @@ -44,6 +44,7 @@ extern void func_RtlGetFullPathName_UstrEx(void); extern void func_RtlGetLengthWithoutTrailingPathSeperators(void); extern void func_RtlGetLongestNtPathLength(void); +extern void func_RtlHandle(void); extern void func_RtlImageRvaToVa(void); extern void func_RtlInitializeBitMap(void); extern void func_RtlIsNameLegalDOS8Dot3(void); @@ -98,6 +99,7 @@ { "RtlGetFullPathName_UstrEx", func_RtlGetFullPathName_UstrEx }, { "RtlGetLengthWithoutTrailingPathSeperators", func_RtlGetLengthWithoutTrailingPathSeperators }, { "RtlGetLongestNtPathLength", func_RtlGetLongestNtPathLength }, + { "RtlHandle", func_RtlHandle }, { "RtlImageRvaToVa", func_RtlImageRvaToVa }, { "RtlInitializeBitMap", func_RtlInitializeBitMap }, { "RtlIsNameLegalDOS8Dot3", func_RtlIsNameLegalDOS8Dot3 },

7 years, 4 months

[hbelusca] 74597: [SCSIPORT]: Fixes: - In SpiScanAdapter(), after an SCSI INQUIRY command has succeeded and we are setting up a LUN extension structure, cache in its InquiryData member the inquiry ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri May 19 16:14:10 2017 New Revision: 74597 URL: http://svn.reactos.org/svn/reactos?rev=74597&view=rev Log: [SCSIPORT]: Fixes: - In SpiScanAdapter(), after an SCSI INQUIRY command has succeeded and we are setting up a LUN extension structure, cache in its InquiryData member the inquiry data retrieved from the INQUIRY command (alternatively we might just cache a pointer to a valid "LunInfo" since the latter are also cached elsewhere). - This allows SpiBuildDeviceMap(), which is called just after SpiScanAdapter(), to correctly report in the registry SCSI tree the correct Identifier and DeviceType values for the enumerated logical units. - Use ExFreePoolWithTag in SpiScanAdapter(). Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Fri May 19 16:14:10 2017 @@ -101,7 +101,7 @@ IN OUT PSCSI_LUN_INFO LunInfo); static VOID -SpiScanAdapter (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); +SpiScanAdapter(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); static NTSTATUS SpiGetInquiryData (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, @@ -3911,6 +3911,14 @@ DPRINT("SpiScanAdapter(): Found device of type %d at bus %d tid %d lun %d\n", InquiryData->DeviceType, Bus, Target, Lun); + /* + * Cache the inquiry data into the LUN extension (or alternatively + * we could save a pointer to LunInfo within the LunExtension?) + */ + RtlCopyMemory(&LunExtension->InquiryData, + InquiryData, + INQUIRYDATABUFFERSIZE); + /* Add this info to the linked list */ LunInfo->Next = NULL; if (LastLunInfo) @@ -3956,10 +3964,10 @@ /* Free allocated buffers */ if (LunExtension) - ExFreePool(LunExtension); + ExFreePoolWithTag(LunExtension, TAG_SCSIPORT); if (LunInfo) - ExFreePool(LunInfo); + ExFreePoolWithTag(LunInfo, TAG_SCSIPORT); /* Sum what we found */ BusScanInfo->LogicalUnitsCount += (UCHAR)DevicesFound;

7 years, 4 months

[hbelusca] 74596: [SCSIPORT]: Code formatting only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri May 19 16:08:40 2017 New Revision: 74596 URL: http://svn.reactos.org/svn/reactos?rev=74596&view=rev Log: [SCSIPORT]: Code formatting only. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Fri May 19 16:08:40 2017 @@ -83,7 +83,7 @@ PVOID MapRegisterBase, PVOID Context); static PSCSI_PORT_LUN_EXTENSION -SpiAllocateLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); +SpiAllocateLunExtension(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); static PSCSI_PORT_LUN_EXTENSION SpiGetLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, @@ -97,8 +97,8 @@ PSCSI_REQUEST_BLOCK Srb); static NTSTATUS -SpiSendInquiry (IN PDEVICE_OBJECT DeviceObject, - IN PSCSI_LUN_INFO LunInfo); +SpiSendInquiry(IN PDEVICE_OBJECT DeviceObject, + IN OUT PSCSI_LUN_INFO LunInfo); static VOID SpiScanAdapter (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); @@ -136,8 +136,8 @@ IN PVOID Context); static NTSTATUS -SpiBuildDeviceMap (PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - PUNICODE_STRING RegistryPath); +SpiBuildDeviceMap(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, + IN PUNICODE_STRING RegistryPath); static NTSTATUS SpiStatusSrbToNt(UCHAR SrbStatus); @@ -3322,17 +3322,16 @@ } static PSCSI_PORT_LUN_EXTENSION -SpiAllocateLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) +SpiAllocateLunExtension(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) { PSCSI_PORT_LUN_EXTENSION LunExtension; ULONG LunExtensionSize; - DPRINT("SpiAllocateLunExtension (%p)\n", - DeviceExtension); + DPRINT("SpiAllocateLunExtension(%p)\n", DeviceExtension); /* Round LunExtensionSize first to the sizeof LONGLONG */ LunExtensionSize = (DeviceExtension->LunExtensionSize + - sizeof(LONGLONG) - 1) & ~(sizeof(LONGLONG) - 1); + sizeof(LONGLONG) - 1) & ~(sizeof(LONGLONG) - 1); LunExtensionSize += sizeof(SCSI_PORT_LUN_EXTENSION); DPRINT("LunExtensionSize %lu\n", LunExtensionSize); @@ -3357,7 +3356,7 @@ LunExtension->MaxQueueCount = 256; /* Initialize request queue */ - KeInitializeDeviceQueue (&LunExtension->DeviceQueue); + KeInitializeDeviceQueue(&LunExtension->DeviceQueue); return LunExtension; } @@ -3547,8 +3546,8 @@ static NTSTATUS -SpiSendInquiry (IN PDEVICE_OBJECT DeviceObject, - IN PSCSI_LUN_INFO LunInfo) +SpiSendInquiry(IN PDEVICE_OBJECT DeviceObject, + IN OUT PSCSI_LUN_INFO LunInfo) { IO_STATUS_BLOCK IoStatusBlock; PIO_STACK_LOCATION IrpStack; @@ -3677,9 +3676,9 @@ DPRINT("SpiSendInquiry(): the queue is frozen at TargetId %d\n", Srb.TargetId); LunExtension = SpiGetLunExtension(DeviceExtension, - LunInfo->PathId, - LunInfo->TargetId, - LunInfo->Lun); + LunInfo->PathId, + LunInfo->TargetId, + LunInfo->Lun); /* Clear frozen flag */ LunExtension->Flags &= ~LUNEX_FROZEN_QUEUE; @@ -3711,7 +3710,7 @@ KeepTrying = FALSE; } else if ((Srb.SrbStatus & SRB_STATUS_AUTOSENSE_VALID) && - SenseBuffer->SenseKey == SCSI_SENSE_ILLEGAL_REQUEST) + SenseBuffer->SenseKey == SCSI_SENSE_ILLEGAL_REQUEST) { /* LUN is not valid, but some device responds there. Mark it as invalid anyway */ @@ -3801,7 +3800,6 @@ { /* We need to allocate this buffer */ BusScanInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(SCSI_BUS_SCAN_INFO), TAG_SCSIPORT); - if (!BusScanInfo) { DPRINT1("Out of resources!\n"); @@ -3823,8 +3821,7 @@ /* Create LUN information structure */ LunInfo = ExAllocatePoolWithTag(PagedPool, sizeof(SCSI_LUN_INFO), TAG_SCSIPORT); - - if (LunInfo == NULL) + if (!LunInfo) { DPRINT1("Out of resources!\n"); return; @@ -3833,7 +3830,7 @@ RtlZeroMemory(LunInfo, sizeof(SCSI_LUN_INFO)); /* Create LunExtension */ - LunExtension = SpiAllocateLunExtension (DeviceExtension); + LunExtension = SpiAllocateLunExtension(DeviceExtension); /* And send INQUIRY to every target */ for (Target = 0; Target < DeviceExtension->PortConfig->MaximumNumberOfTargets; Target++) @@ -3878,7 +3875,7 @@ /* Fill Path, Target, Lun fields */ LunExtension->PathId = LunInfo->PathId = (UCHAR)Bus; - LunExtension->TargetId = LunInfo->TargetId = (UCHAR) Target; + LunExtension->TargetId = LunInfo->TargetId = (UCHAR)Target; LunExtension->Lun = LunInfo->Lun = (UCHAR)Lun; /* Set flag to prevent race conditions */ @@ -3929,7 +3926,6 @@ /* Allocate another buffer */ LunInfo = ExAllocatePoolWithTag(PagedPool, sizeof(SCSI_LUN_INFO), TAG_SCSIPORT); - if (!LunInfo) { DPRINT1("Out of resources!\n"); @@ -3966,11 +3962,11 @@ ExFreePool(LunInfo); /* Sum what we found */ - BusScanInfo->LogicalUnitsCount += (UCHAR) DevicesFound; + BusScanInfo->LogicalUnitsCount += (UCHAR)DevicesFound; DPRINT(" Found %d devices on bus %d\n", DevicesFound, Bus); } - DPRINT ("SpiScanAdapter() done\n"); + DPRINT("SpiScanAdapter() done\n"); } @@ -4008,8 +4004,7 @@ sizeof(ULONG) - 1) & ~(sizeof(ULONG) - 1)); /* Calculate data size */ - Length = sizeof(SCSI_ADAPTER_BUS_INFO) + (BusCount - 1) * - sizeof(SCSI_BUS_DATA); + Length = sizeof(SCSI_ADAPTER_BUS_INFO) + (BusCount - 1) * sizeof(SCSI_BUS_DATA); Length += InquiryDataSize * LunCount; @@ -4031,7 +4026,7 @@ /* Point InquiryData to the corresponding place inside Buffer */ InquiryData = (PSCSI_INQUIRY_DATA)(Buffer + sizeof(SCSI_ADAPTER_BUS_INFO) + - (BusCount - 1) * sizeof(SCSI_BUS_DATA)); + (BusCount - 1) * sizeof(SCSI_BUS_DATA)); /* Loop each bus */ for (Bus = 0; Bus < BusCount; Bus++) @@ -4056,7 +4051,7 @@ while (LunInfo != NULL) { DPRINT("(Bus %lu Target %lu Lun %lu)\n", - Bus, LunInfo->TargetId, LunInfo->Lun); + Bus, LunInfo->TargetId, LunInfo->Lun); /* Fill InquiryData with values */ InquiryData->PathId = LunInfo->PathId; @@ -4079,7 +4074,7 @@ /* Either mark the end, or set offset to 0 */ if (BusData->NumberOfLogicalUnits != 0) - ((PSCSI_INQUIRY_DATA) ((PCHAR) InquiryData - InquiryDataSize))->NextInquiryDataOffset = 0; + ((PSCSI_INQUIRY_DATA) ((PCHAR)InquiryData - InquiryDataSize))->NextInquiryDataOffset = 0; else BusData->InquiryDataOffset = 0; }

7 years, 4 months

[hbelusca] 74595: [SCSIPORT]: Fixes + documentation: - In SpiSendInquiry(): * use ExFreePoolWithTag; * if IoBuildDeviceIoControlRequest() fails, exit correctly the loop so that the allocated buffer...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri May 19 15:02:02 2017 New Revision: 74595 URL: http://svn.reactos.org/svn/reactos?rev=74595&view=rev Log: [SCSIPORT]: Fixes + documentation: - In SpiSendInquiry(): * use ExFreePoolWithTag; * if IoBuildDeviceIoControlRequest() fails, exit correctly the loop so that the allocated buffers are cleaned up; - In SpiBuildDeviceMap(): * support new peripheral type names, as documented in the links in the comments; * fix the "CommunicationsPeripheral" name (communication'S') as documented, and as done in windows' scsiport driver. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Fri May 19 15:02:02 2017 @@ -3565,7 +3565,7 @@ PSCSI_PORT_LUN_EXTENSION LunExtension; PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; - DPRINT ("SpiSendInquiry() called\n"); + DPRINT("SpiSendInquiry() called\n"); DeviceExtension = (PSCSI_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -3576,7 +3576,7 @@ SenseBuffer = ExAllocatePoolWithTag(NonPagedPool, SENSE_BUFFER_SIZE, TAG_SCSIPORT); if (SenseBuffer == NULL) { - ExFreePool(InquiryBuffer); + ExFreePoolWithTag(InquiryBuffer, TAG_SCSIPORT); return STATUS_INSUFFICIENT_RESOURCES; } @@ -3600,7 +3600,11 @@ if (Irp == NULL) { DPRINT("IoBuildDeviceIoControlRequest() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; + + /* Quit the loop */ + Status = STATUS_INSUFFICIENT_RESOURCES; + KeepTrying = FALSE; + continue; } /* Prepare SRB */ @@ -3656,6 +3660,7 @@ InquiryBuffer, INQUIRYDATABUFFERSIZE); + /* Quit the loop */ Status = STATUS_SUCCESS; KeepTrying = FALSE; continue; @@ -3701,6 +3706,7 @@ (Srb.DataTransferLength > INQUIRYDATABUFFERSIZE) ? INQUIRYDATABUFFERSIZE : Srb.DataTransferLength); + /* Quit the loop */ Status = STATUS_SUCCESS; KeepTrying = FALSE; } @@ -3710,6 +3716,7 @@ /* LUN is not valid, but some device responds there. Mark it as invalid anyway */ + /* Quit the loop */ Status = STATUS_INVALID_DEVICE_REQUEST; KeepTrying = FALSE; } @@ -3725,7 +3732,7 @@ } else { - /* That's all, go to exit */ + /* That's all, quit the loop */ KeepTrying = FALSE; /* Set status according to SRB status */ @@ -3743,8 +3750,8 @@ } /* Free buffers */ - ExFreePool(InquiryBuffer); - ExFreePool(SenseBuffer); + ExFreePoolWithTag(InquiryBuffer, TAG_SCSIPORT); + ExFreePoolWithTag(SenseBuffer, TAG_SCSIPORT); DPRINT("SpiSendInquiry() done with Status 0x%08X\n", Status); @@ -5574,6 +5581,11 @@ } /* Set 'Type' (REG_SZ) value */ + /* + * See https://docs.microsoft.com/en-us/windows-hardware/drivers/install/identifie… + * and https://docs.microsoft.com/en-us/windows-hardware/drivers/install/identifie… + * for a list of types with their human-readable forms. + */ switch (LunExtension->InquiryData.DeviceType) { case 0: @@ -5585,6 +5597,7 @@ case 2: TypeName = L"PrinterPeripheral"; break; + // case 3: "ProcessorPeripheral", classified as 'other': fall back to default case. case 4: TypeName = L"WormPeripheral"; break; @@ -5601,8 +5614,29 @@ TypeName = L"MediumChangerPeripheral"; break; case 9: - TypeName = L"CommunicationPeripheral"; + TypeName = L"CommunicationsPeripheral"; break; + + /* New peripheral types (SCSI only) */ + case 10: case 11: + TypeName = L"ASCPrePressGraphicsPeripheral"; + break; + case 12: + TypeName = L"ArrayPeripheral"; + break; + case 13: + TypeName = L"EnclosurePeripheral"; + break; + case 14: + TypeName = L"RBCPeripheral"; + break; + case 15: + TypeName = L"CardReaderPeripheral"; + break; + case 16: + TypeName = L"BridgePeripheral"; + break; + default: TypeName = L"OtherPeripheral"; break;

7 years, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2017