Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[tfaber] 58866: [PSDK] - Replace winsafer.h with a usable version CORE-6942

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Apr 27 09:01:02 2013 New Revision: 58866 URL: http://svn.reactos.org/svn/reactos?rev=58866&view=rev Log: [PSDK] - Replace winsafer.h with a usable version CORE-6942 Modified: trunk/reactos/include/psdk/winsafer.h Modified: trunk/reactos/include/psdk/winsafer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsafer.h?re… ============================================================================== --- trunk/reactos/include/psdk/winsafer.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsafer.h [iso-8859-1] Sat Apr 27 09:01:02 2013 @@ -1,37 +1,38 @@ /* - * Winsafer definitions - * - * Copyright (C) 2009 Nikolay Sivov - * - * 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 + * winsafer.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Thomas Faber (thomas.faber(a)reactos.org) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * */ - -#ifndef __WINE_WINSAFER_H -#define __WINE_WINSAFER_H +#pragma once + +#ifndef _WINSAFER_H +#define _WINSAFER_H #include <guiddef.h> #include <wincrypt.h> #ifdef __cplusplus extern "C" { -#endif +#endif /* __cplusplus */ DECLARE_HANDLE(SAFER_LEVEL_HANDLE); -#define SAFER_SCOPEID_MACHINE 1 -#define SAFER_SCOPEID_USER 2 +#define SAFER_SCOPEID_MACHINE 1 +#define SAFER_SCOPEID_USER 2 #define SAFER_LEVELID_DISALLOWED 0x00000 #define SAFER_LEVELID_UNTRUSTED 0x01000 @@ -39,22 +40,268 @@ #define SAFER_LEVELID_NORMALUSER 0x20000 #define SAFER_LEVELID_FULLYTRUSTED 0x40000 -#define SAFER_LEVEL_OPEN 1 - -WINADVAPI BOOL WINAPI SaferCreateLevel(DWORD,DWORD,DWORD,SAFER_LEVEL_HANDLE*,LPVOID); - -typedef enum _SAFER_POLICY_INFO_CLASS { +#define SAFER_LEVEL_OPEN 1 + +#define SAFER_MAX_HASH_SIZE 64 +#define SAFER_MAX_DESCRIPTION_SIZE 256 +#define SAFER_MAX_FRIENDLYNAME_SIZE 256 + +#define SAFER_TOKEN_NULL_IF_EQUAL 0x1 +#define SAFER_TOKEN_COMPARE_ONLY 0x2 +#define SAFER_TOKEN_MAKE_INERT 0x4 +#define SAFER_TOKEN_WANT_FLAGS 0x8 + +#define SAFER_CRITERIA_IMAGEPATH 0x0001 +#define SAFER_CRITERIA_NOSIGNEDHASH 0x0002 +#define SAFER_CRITERIA_IMAGEHASH 0x0004 +#define SAFER_CRITERIA_AUTHENTICODE 0x0008 +#define SAFER_CRITERIA_URLZONE 0x0010 +#define SAFER_CRITERIA_APPX_PACKAGE 0x0020 +#define SAFER_CRITERIA_IMAGEPATH_NT 0x1000 + +#define SAFER_POLICY_JOBID_UNTRUSTED 0x03000000 +#define SAFER_POLICY_JOBID_CONSTRAINED 0x04000000 +#define SAFER_POLICY_JOBID_MASK 0xFF000000 +#define SAFER_POLICY_ONLY_EXES 0x00010000 +#define SAFER_POLICY_SANDBOX_INERT 0x00020000 +#define SAFER_POLICY_HASH_DUPLICATE 0x00040000 +#define SAFER_POLICY_ONLY_AUDIT 0x00001000 +#define SAFER_POLICY_BLOCK_CLIENT_UI 0x00002000 +#define SAFER_POLICY_UIFLAGS_INFORMATION_PROMPT 0x00000001 +#define SAFER_POLICY_UIFLAGS_OPTION_PROMPT 0x00000002 +#define SAFER_POLICY_UIFLAGS_HIDDEN 0x00000004 +#define SAFER_POLICY_UIFLAGS_MASK 0x000000FF + + +#include <pshpack8.h> + +typedef struct _SAFER_CODE_PROPERTIES_V1 +{ + DWORD cbSize; + DWORD dwCheckFlags; + PCWSTR ImagePath; + HANDLE hImageFileHandle; + DWORD UrlZoneId; + BYTE ImageHash[SAFER_MAX_HASH_SIZE]; + DWORD dwImageHashSize; + LARGE_INTEGER ImageSize; + ALG_ID HashAlgorithm; + PBYTE pByteBlock; + HWND hWndParent; + DWORD dwWVTUIChoice; +} SAFER_CODE_PROPERTIES_V1, *PSAFER_CODE_PROPERTIES_V1; + +typedef struct _SAFER_CODE_PROPERTIES_V2 +{ + SAFER_CODE_PROPERTIES_V1; + PCWSTR PackageMoniker; + PCWSTR PackagePublisher; + PCWSTR PackageName; + ULONG64 PackageVersion; + BOOL PackageIsFramework; +} SAFER_CODE_PROPERTIES_V2, *PSAFER_CODE_PROPERTIES_V2; + +#include <poppack.h> + +/* NOTE: MS defines SAFER_CODE_PROPERTIES as V2 unconditionally, + * which is... not smart */ +#if _WIN32_WINNT >= 0x602 +typedef SAFER_CODE_PROPERTIES_V2 SAFER_CODE_PROPERTIES, *PSAFER_CODE_PROPERTIES; +#else /* _WIN32_WINNT */ +typedef SAFER_CODE_PROPERTIES_V1 SAFER_CODE_PROPERTIES, *PSAFER_CODE_PROPERTIES; +#endif /* _WIN32_WINNT */ + +typedef enum _SAFER_OBJECT_INFO_CLASS +{ + SaferObjectLevelId = 1, + SaferObjectScopeId = 2, + SaferObjectFriendlyName = 3, + SaferObjectDescription = 4, + SaferObjectBuiltin = 5, + SaferObjectDisallowed = 6, + SaferObjectDisableMaxPrivilege = 7, + SaferObjectInvertDeletedPrivileges = 8, + SaferObjectDeletedPrivileges = 9, + SaferObjectDefaultOwner = 10, + SaferObjectSidsToDisable = 11, + SaferObjectRestrictedSidsInverted = 12, + SaferObjectRestrictedSidsAdded = 13, + SaferObjectAllIdentificationGuids = 14, + SaferObjectSingleIdentification = 15, + SaferObjectExtendedError = 16, +} SAFER_OBJECT_INFO_CLASS; + +typedef enum _SAFER_POLICY_INFO_CLASS +{ SaferPolicyLevelList = 1, - SaferPolicyEnableTransparentEnforcement, - SaferPolicyDefaultLevel, - SaferPolicyEvaluateUserScope, - SaferPolicyScopeFlags + SaferPolicyEnableTransparentEnforcement = 2, + SaferPolicyDefaultLevel = 3, + SaferPolicyEvaluateUserScope = 4, + SaferPolicyScopeFlags = 5, + SaferPolicyDefaultLevelFlags = 6, + SaferPolicyAuthenticodeEnabled = 7, } SAFER_POLICY_INFO_CLASS; -WINADVAPI BOOL WINAPI SaferGetPolicyInformation(DWORD,SAFER_POLICY_INFO_CLASS,DWORD,PVOID,PDWORD,LPVOID); +typedef enum _SAFER_IDENTIFICATION_TYPES +{ + SaferIdentityDefault = 0, + SaferIdentityTypeImageName = 1, + SaferIdentityTypeImageHash = 2, + SaferIdentityTypeUrlZone = 3, + SaferIdentityTypeCertificate = 4, +} SAFER_IDENTIFICATION_TYPES; + +#include <pshpack8.h> + +typedef struct _SAFER_IDENTIFICATION_HEADER +{ + SAFER_IDENTIFICATION_TYPES dwIdentificationType; + DWORD cbStructSize; + GUID IdentificationGuid; + FILETIME lastModified; +} SAFER_IDENTIFICATION_HEADER, *PSAFER_IDENTIFICATION_HEADER; + +typedef struct _SAFER_PATHNAME_IDENTIFICATION +{ + SAFER_IDENTIFICATION_HEADER header; + WCHAR Description[SAFER_MAX_DESCRIPTION_SIZE]; + PWCHAR ImageName; + DWORD dwSaferFlags; +} SAFER_PATHNAME_IDENTIFICATION, *PSAFER_PATHNAME_IDENTIFICATION; + +typedef struct _SAFER_HASH_IDENTIFICATION +{ + SAFER_IDENTIFICATION_HEADER header; + WCHAR Description[SAFER_MAX_DESCRIPTION_SIZE]; + WCHAR FriendlyName[SAFER_MAX_FRIENDLYNAME_SIZE]; + DWORD HashSize; + BYTE ImageHash[SAFER_MAX_HASH_SIZE]; + ALG_ID HashAlgorithm; + LARGE_INTEGER ImageSize; + DWORD dwSaferFlags; +} SAFER_HASH_IDENTIFICATION, *PSAFER_HASH_IDENTIFICATION; + +typedef struct _SAFER_HASH_IDENTIFICATION2 +{ + SAFER_HASH_IDENTIFICATION hashIdentification; + DWORD HashSize; + BYTE ImageHash[SAFER_MAX_HASH_SIZE]; + ALG_ID HashAlgorithm; +} SAFER_HASH_IDENTIFICATION2, *PSAFER_HASH_IDENTIFICATION2; + +typedef struct _SAFER_URLZONE_IDENTIFICATION +{ + SAFER_IDENTIFICATION_HEADER header; + DWORD UrlZoneId; + DWORD dwSaferFlags; +} SAFER_URLZONE_IDENTIFICATION, *PSAFER_URLZONE_IDENTIFICATION; + +#include <poppack.h> + + +WINADVAPI +BOOL +WINAPI +SaferCloseLevel( + _In_ SAFER_LEVEL_HANDLE hLevelHandle); + +WINADVAPI +BOOL +WINAPI +SaferComputeTokenFromLevel( + _In_ SAFER_LEVEL_HANDLE LevelHandle, + _In_opt_ HANDLE InAccessToken, + _Out_ PHANDLE OutAccessToken, + _In_ DWORD dwFlags, + _Inout_opt_ PVOID pReserved); + +WINADVAPI +BOOL +WINAPI +SaferCreateLevel( + _In_ DWORD dwScopeId, + _In_ DWORD dwLevelId, + _In_ DWORD OpenFlags, + _Outptr_ SAFER_LEVEL_HANDLE *pLevelHandle, + _Reserved_ PVOID pReserved); + +WINADVAPI +BOOL +WINAPI +SaferGetLevelInformation( + _In_ SAFER_LEVEL_HANDLE LevelHandle, + _In_ SAFER_OBJECT_INFO_CLASS dwInfoType, + _Out_writes_bytes_opt_(dwInBufferSize) PVOID pQueryBuffer, + _In_ DWORD dwInBufferSize, + _Out_ PDWORD pdwOutBufferSize); + +WINADVAPI +BOOL +WINAPI +SaferGetPolicyInformation( + _In_ DWORD dwScopeId, + _In_ SAFER_POLICY_INFO_CLASS SaferPolicyInfoClass, + _In_ DWORD InfoBufferSize, + _Out_writes_bytes_opt_(InfoBufferSize) PVOID InfoBuffer, + _Out_ PDWORD InfoBufferRetSize, + _Reserved_ PVOID pReserved); + +WINADVAPI +BOOL +WINAPI +SaferIdentifyLevel( + _In_ DWORD dwNumProperties, + _In_reads_opt_(dwNumProperties) PSAFER_CODE_PROPERTIES pCodeProperties, + _Outptr_ SAFER_LEVEL_HANDLE *pLevelHandle, + _Reserved_ PVOID pReserved); + +WINADVAPI +BOOL +WINAPI +SaferiIsExecutableFileType( + _In_ PCWSTR szFullPath, + _In_ BOOLEAN bFromShellExecute); + +WINADVAPI +BOOL +WINAPI +SaferRecordEventLogEntry( + _In_ SAFER_LEVEL_HANDLE hLevel, + _In_ PCWSTR szTargetPath, + _Reserved_ PVOID pReserved); + +WINADVAPI +BOOL +WINAPI +SaferSetLevelInformation( + _In_ SAFER_LEVEL_HANDLE LevelHandle, + _In_ SAFER_OBJECT_INFO_CLASS dwInfoType, + _In_reads_bytes_(dwInBufferSize) PVOID pQueryBuffer, + _In_ DWORD dwInBufferSize); + +WINADVAPI +BOOL +WINAPI +SaferSetPolicyInformation( + _In_ DWORD dwScopeId, + _In_ SAFER_POLICY_INFO_CLASS SaferPolicyInfoClass, + _In_ DWORD InfoBufferSize, + _In_reads_bytes_(InfoBufferSize) PVOID InfoBuffer, + _Reserved_ PVOID pReserved); + + +#define SRP_POLICY_EXE L"EXE" +#define SRP_POLICY_DLL L"DLL" +#define SRP_POLICY_MSI L"MSI" +#define SRP_POLICY_SCRIPT L"SCRIPT" +#define SRP_POLICY_SHELL L"SHELL" +#define SRP_POLICY_NOV2 L"IGNORESRPV2" +#define SRP_POLICY_APPX L"APPX" +#define SRP_POLICY_WLDPMSI L"WLDPMSI" +#define SRP_POLICY_WLDPSCRIPT L"WLDPSCRIPT" #ifdef __cplusplus -} -#endif - -#endif /* __WINE_WINSAFER_H */ +} /* extern "C" */ +#endif /* __cplusplus */ + +#endif /* _WINSAFER_H */

11 years, 4 months

[tfaber] 58865: [BOOTDATA] - Add Themes folder during setup. Patch by Lee Schroeder. CORE-6987 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Apr 27 08:18:15 2013 New Revision: 58865 URL: http://svn.reactos.org/svn/reactos?rev=58865&view=rev Log: [BOOTDATA] - Add Themes folder during setup. Patch by Lee Schroeder. CORE-6987 #resolve Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Sat Apr 27 08:18:15 2013 @@ -28,6 +28,8 @@ 12 = Microsoft.NET\Framework\v1.0.3705 13 = Microsoft.NET\Framework\v1.1.4322 14 = Microsoft.NET\Framework\v2.0.50727 +15 = Resources +16 = Resources\Themes .InfEnd Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Apr 27 08:18:15 2013 @@ -111,6 +111,10 @@ set(${var} 13) elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727) set(${var} 14) + elseif(${dir} STREQUAL reactos/Resources) + set(${var} 15) + elseif(${dir} STREQUAL reactos/Resources/Themes) + set(${var} 16) else() message(ERROR "Wrong destination: ${dir}") endif()

11 years, 4 months

[tfaber] 58864: [KMTESTS:FSRTL] - Rework FsRtlExpression test to be more maintainable by using a table. Patch by Víctor Martínez Calvo, a few comments by me. CORE-7108 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Apr 27 07:44:28 2013 New Revision: 58864 URL: http://svn.reactos.org/svn/reactos?rev=58864&view=rev Log: [KMTESTS:FSRTL] - Rework FsRtlExpression test to be more maintainable by using a table. Patch by Víctor Martínez Calvo, a few comments by me. CORE-7108 #resolve Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlE… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] Sat Apr 27 07:44:28 2013 @@ -1,687 +1,238 @@ /* * PROJECT: ReactOS kernel-mode tests * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory - * PURPOSE: Kernel-Mode Test Suite FsRtl Test + * PURPOSE: Test for FsRtlIsNameInExpression/FsRtlIsDbcsInExpression * PROGRAMMER: Pierre Schweitzer <pierre.schweitzer(a)reactos.org> + * Víctor Martínez Calvo <vmartinez(a)reactos.org> */ - -/* TODO: most of these calls fail the Windows checked build's !islower assertion and others */ #include <kmt_test.h> #define NDEBUG #include <debug.h> +struct +{ /* API parameters */ + PCWSTR Expression; + PCWSTR Name; + BOOLEAN IgnoreCase; + /* Flag for tests which shouldn't be tested in checked builds */ + BOOLEAN AssertsInChecked; + /* Expected test result */ + BOOLEAN Expected; +} Tests[] = +{ + /* TODO: reorganize AssertsInChecked. This needs to be separate for *Name* and *Dbcs* or something. + * We currently fail a lot of them in Windows despite AssertsInChecked. + * E.g. *Dbcs* asserts !islower(Expression[i]) and FsRtlDoesDbcsContainWildCards(Expression) for some reason. + */ + { L"", L"", FALSE, TRUE, TRUE }, + { L"", L"a", FALSE, TRUE, FALSE }, + { L"*", L"a", FALSE, TRUE, TRUE }, + { L"*", L"", FALSE, TRUE, FALSE }, + { L"**", L"", FALSE, TRUE, FALSE }, + { L"**", L"a", FALSE, FALSE, TRUE }, + { L"ntdll.dll", L".", FALSE, TRUE, FALSE }, + { L"ntdll.dll", L"~1", FALSE, TRUE, FALSE }, + { L"ntdll.dll", L"..", FALSE, TRUE, FALSE }, + { L"ntdll.dll", L"ntdll.dll", FALSE, TRUE, TRUE }, + { L"smss.exe", L".", FALSE, TRUE, FALSE }, + { L"smss.exe", L"~1", FALSE, TRUE, FALSE }, + { L"smss.exe", L"..", FALSE, TRUE, FALSE }, + { L"smss.exe", L"ntdll.dll", FALSE, TRUE, FALSE }, + { L"smss.exe", L"NTDLL.DLL", FALSE, TRUE, FALSE }, + { L"nt??krnl.???", L"ntoskrnl.exe", FALSE, FALSE, TRUE }, + { L"he*o", L"hello", FALSE, FALSE, TRUE }, + { L"he*o", L"helo", FALSE, FALSE, TRUE }, + { L"he*o", L"hella", FALSE, FALSE, FALSE }, + { L"he*", L"hello", FALSE, FALSE, TRUE }, + { L"he*", L"helo", FALSE, FALSE, TRUE }, + { L"he*", L"hella", FALSE, FALSE, TRUE }, + { L"*.cpl", L"kdcom.dll", FALSE, FALSE, FALSE }, + { L"*.cpl", L"bootvid.dll", FALSE, FALSE, FALSE }, + { L"*.cpl", L"ntoskrnl.exe", FALSE, FALSE, FALSE }, + { L".", L"NTDLL.DLL", FALSE, FALSE, FALSE }, + { L"F0_*.*", L".", FALSE, FALSE, FALSE }, + { L"F0_*.*", L"..", FALSE, FALSE, FALSE }, + { L"F0_*.*", L"SETUP.EXE", FALSE, FALSE, FALSE }, + { L"F0_*.*", L"f0_", FALSE, FALSE, FALSE }, + { L"F0_*.*", L"f0_", TRUE, FALSE, FALSE }, + { L"F0_*.*", L"F0_", FALSE, FALSE, FALSE }, + { L"F0_*.*", L"f0_.", FALSE, FALSE, FALSE }, + { L"F0_*.*", L"f0_.", TRUE, FALSE, TRUE }, + { L"F0_*.*", L"F0_.", FALSE, FALSE, TRUE }, + { L"F0_*.*", L"F0_001", FALSE, FALSE, FALSE }, + { L"F0_*.*", L"F0_001", TRUE, FALSE, FALSE }, + { L"F0_*.*", L"f0_001", FALSE, FALSE, FALSE }, + { L"F0_*.*", L"f0_001", TRUE, FALSE, FALSE }, + { L"F0_*.*", L"F0_001.", FALSE, FALSE, TRUE }, + { L"F0_*.*", L"f0_001.txt", FALSE, FALSE, FALSE }, + { L"F0_*.*", L"f0_001.txt", TRUE, FALSE, TRUE }, + { L"F0_*.*", L"F0_001.txt", FALSE, FALSE, TRUE }, + { L"F0_*.*", L"F0_001.txt", TRUE, FALSE, TRUE }, + { L"F0_*.", L".", FALSE, FALSE, FALSE }, + { L"F0_*.", L"..", FALSE, FALSE, FALSE }, + { L"F0_*.", L"SETUP.EXE", FALSE, FALSE, FALSE }, + { L"F0_*.", L"f0_", FALSE, FALSE, FALSE }, + { L"F0_*.", L"f0_", TRUE, FALSE, FALSE }, + { L"F0_*.", L"F0_", FALSE, FALSE, FALSE }, + { L"F0_*.", L"f0_.", FALSE, FALSE, FALSE }, + { L"F0_*.", L"f0_.", TRUE, FALSE, TRUE }, + { L"F0_*.", L"F0_.", FALSE, FALSE, TRUE }, + { L"F0_*.", L"F0_001", FALSE, FALSE, FALSE }, + { L"F0_*.", L"F0_001", TRUE, FALSE, FALSE }, + { L"F0_*.", L"f0_001", FALSE, FALSE, FALSE }, + { L"F0_*.", L"f0_001", TRUE, FALSE, FALSE }, + { L"F0_*.", L"F0_001.", FALSE, FALSE, TRUE }, + { L"F0_*.", L"f0_001.txt", FALSE, FALSE, FALSE }, + { L"F0_*.", L"f0_001.txt", TRUE, FALSE, FALSE }, + { L"F0_*.", L"F0_001.txt", FALSE, FALSE, FALSE }, + { L"F0_*.", L"F0_001.txt", TRUE, FALSE, FALSE }, + { L"F0_<\"*", L".", FALSE, FALSE, FALSE }, + { L"F0_<\"*", L"..", FALSE, FALSE, FALSE }, + { L"F0_<\"*", L"SETUP.EXE", FALSE, FALSE, FALSE }, + { L"F0_<\"*", L"f0_", TRUE, FALSE, TRUE }, + { L"F0_<\"*", L"F0_", FALSE, FALSE, TRUE }, + { L"F0_<\"*", L"f0_.", FALSE, FALSE, FALSE }, + { L"F0_<\"*", L"f0_.", TRUE, FALSE, TRUE }, + { L"F0_<\"*", L"F0_.", FALSE, FALSE, TRUE }, + { L"F0_<\"*", L"F0_001", FALSE, FALSE, TRUE }, + { L"F0_<\"*", L"F0_001", TRUE, FALSE, TRUE }, + { L"F0_<\"*", L"f0_001", FALSE, FALSE, FALSE }, + { L"F0_<\"*", L"f0_001", TRUE, FALSE, TRUE }, + { L"F0_<\"*", L"F0_001.", FALSE, FALSE, TRUE }, + { L"F0_<\"*", L"f0_001.txt", FALSE, FALSE, FALSE }, + { L"F0_<\"*", L"f0_001.txt", TRUE, FALSE, TRUE }, + { L"F0_<\"*", L"F0_001.txt", FALSE, FALSE, TRUE }, + { L"F0_<\"*", L"F0_001.txt", TRUE, FALSE, TRUE }, + { L"*.TTF", L".", FALSE, FALSE, FALSE }, + { L"*.TTF", L"..", FALSE, FALSE, FALSE }, + { L"*.TTF", L"SETUP.INI", FALSE, FALSE, FALSE }, + { L"*", L".", FALSE, FALSE, TRUE }, + { L"*", L"..", FALSE, FALSE, TRUE }, + { L"*", L"SETUP.INI", FALSE, FALSE, TRUE }, + { L".*", L"1", FALSE, FALSE, FALSE }, + { L".*", L"01", FALSE, FALSE, FALSE }, + { L".*", L" ", FALSE, FALSE, FALSE }, + { L".*", L"", FALSE, TRUE, FALSE }, + { L".*", L".", FALSE, FALSE, TRUE }, + { L".*", L"1.txt", FALSE, FALSE, FALSE }, + { L".*", L" .txt", FALSE, FALSE, FALSE }, + { L".*", L".txt", FALSE, FALSE, TRUE }, + { L"\"ntoskrnl.exe", L"ntoskrnl.exe", FALSE, FALSE, FALSE }, + { L"ntoskrnl\"exe", L"ntoskrnl.exe", FALSE, FALSE, TRUE }, + { L"ntoskrn\".exe", L"ntoskrnl.exe", FALSE, FALSE, FALSE }, + { L"ntoskrn\"\"exe", L"ntoskrnl.exe", FALSE, FALSE, FALSE }, + { L"ntoskrnl.\"exe", L"ntoskrnl.exe", FALSE, FALSE, FALSE }, + { L"ntoskrnl.exe\"", L"ntoskrnl.exe", FALSE, FALSE, TRUE }, + { L"ntoskrnl.exe", L"ntoskrnl.exe", FALSE, FALSE, TRUE }, + { L"*.c.d", L"a.b.c.d", FALSE, FALSE, TRUE }, + { L"*.?.c.d", L"a.b.c.d", FALSE, FALSE, TRUE }, + { L"**.?.c.d", L"a.b.c.d", FALSE, FALSE, TRUE }, + { L"a.**.c.d", L"a.b.c.d", FALSE, FALSE, TRUE }, + { L"a.b.??.d", L"a.b.c1.d", FALSE, FALSE, TRUE }, + { L"a.b.??.d", L"a.b.c.d", FALSE, FALSE, FALSE }, + { L"a.b.*?.d", L"a.b.c.d", FALSE, FALSE, TRUE }, + { L"a.b.*??.d", L"a.b.ccc.d", FALSE, FALSE, TRUE }, + { L"a.b.*??.d", L"a.b.cc.d", FALSE, FALSE, TRUE }, + { L"a.b.*??.d", L"a.b.c.d", FALSE, FALSE, FALSE }, + { L"a.b.*?*.d", L"a.b.c.d", FALSE, FALSE, TRUE }, + { L"*?", L"", FALSE, TRUE, FALSE }, + { L"*?", L"a", FALSE, FALSE, TRUE }, + { L"*?", L"aa", FALSE, FALSE, TRUE }, + { L"*?", L"aaa", FALSE, FALSE, TRUE }, + { L"?*?", L"", FALSE, TRUE, FALSE }, + { L"?*?", L"a", FALSE, FALSE, FALSE }, + { L"?*?", L"aa", FALSE, FALSE, TRUE }, + { L"?*?", L"aaa", FALSE, FALSE, TRUE }, + { L"?*?", L"aaaa", FALSE, FALSE, TRUE }, + { L"C:\\ReactOS\\**", L"C:\\ReactOS\\dings.bmp", FALSE, FALSE, TRUE }, + { L"C:\\ReactOS\\***", L"C:\\ReactOS\\dings.bmp", FALSE, FALSE, TRUE }, + { L"C:\\Windows\\*a*", L"C:\\ReactOS\\dings.bmp", FALSE, FALSE, FALSE }, + { L"C:\\ReactOS\\*.bmp", L"C:\\Windows\\explorer.exe", FALSE, FALSE, FALSE }, + { L"*.bmp;*.dib", L"winhlp32.exe", FALSE, FALSE, FALSE }, + { L"*.*.*.*", L"127.0.0.1", FALSE, FALSE, TRUE }, + { L"*?*?*?*", L"1.0.0.1", FALSE, FALSE, TRUE }, + { L"?*?*?*?", L"1.0.0.1", FALSE, FALSE, TRUE }, + { L"?.?.?.?", L"1.0.0.1", FALSE, FALSE, TRUE }, + { L"*a*ab*abc", L"aabaabcdadabdabc", FALSE, FALSE, TRUE }, + { L"ab<exe", L"abcd.exe", FALSE, FALSE, TRUE }, + { L"ab<exe", L"ab.exe", FALSE, FALSE, TRUE }, + { L"ab<exe", L"abcdexe", FALSE, FALSE, TRUE }, + { L"ab<exe", L"acd.exe", FALSE, FALSE, FALSE }, + { L"a.b<exe", L"a.bcd.exe", FALSE, FALSE, TRUE }, + { L"a<b.exe", L"a.bcd.exe", FALSE, FALSE, FALSE }, + { L"a.b.exe", L"a.bcd.exe", FALSE, FALSE, FALSE }, + { L"abc.exe", L"abc.exe", FALSE, FALSE, TRUE }, + { L"abc.exe", L"abc.exe.", FALSE, FALSE, FALSE }, + { L"abc.exe", L"abc.exe.back", FALSE, FALSE, FALSE }, + { L"abc.exe", L"abc.exes", FALSE, FALSE, FALSE }, + { L"a>c.exe", L"abc.exe", FALSE, FALSE, TRUE }, + { L"a>c.exe", L"ac.exe", FALSE, FALSE, FALSE }, + { L"a>>>exe", L"abc.exe", FALSE, FALSE, FALSE }, + { L"a>>>exe", L"ac.exe", FALSE, FALSE, FALSE }, + { L"<.exe", L"test.exe", FALSE, FALSE, TRUE }, + { L"<.EXE", L"test.exe", TRUE, FALSE, TRUE }, +}; + static VOID FsRtlIsNameInExpressionTest() { - UNICODE_STRING Expression, Name; - - /* !Name->Length || !Expression->Length asserts */ - if (!KmtIsCheckedBuild) + ULONG i; + for (i = 0; i < sizeof(Tests) / sizeof(Tests[0]); i++) { - RtlInitUnicodeString(&Expression, L"*"); - RtlInitUnicodeString(&Name, L""); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Expression, L""); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + BOOLEAN TestResult; + UNICODE_STRING Expression; + UNICODE_STRING Name; + + /* Don't run Tests which are known to assert in checked builds */ + if (KmtIsCheckedBuild && Tests[i].AssertsInChecked) + continue; + + RtlInitUnicodeString(&Expression, Tests[i].Expression); + RtlInitUnicodeString(&Name, Tests[i].Name); + + TestResult = FsRtlIsNameInExpression(&Expression, &Name, Tests[i].IgnoreCase, NULL); + + ok(TestResult == Tests[i].Expected, "FsRtlIsNameInExpression(%wZ,%wZ,%s,NULL): Expected %s, got %s\n", + &Expression, &Name, Tests[i].IgnoreCase ? "TRUE" : "FALSE", Tests[i].Expected ? "TRUE" : "FALSE", TestResult ? "TRUE" : "FALSE"); } - RtlInitUnicodeString(&Expression, L"**"); - if (!KmtIsCheckedBuild) + /* TODO: test UpcaseTable */ +} + +static VOID FsRtlIsDbcsInExpressionTest() +{ + ULONG i; + for (i = 0; i < sizeof(Tests) / sizeof(Tests[0]); i++) { - RtlInitUnicodeString(&Name, L""); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + BOOLEAN TestResult; + UNICODE_STRING UExpression; + UNICODE_STRING UName; + ANSI_STRING Expression; + ANSI_STRING Name; + + /* Don't run Tests which are known to assert in checked builds */ + if (KmtIsCheckedBuild && Tests[i].AssertsInChecked) + continue; + + /* Ignore Tests flagged IgnoreCase==TRUE to avoid duplicated testing */ + if (Tests[i].IgnoreCase) + continue; + + RtlInitUnicodeString(&UExpression, Tests[i].Expression); + RtlInitUnicodeString(&UName, Tests[i].Name); + + RtlUnicodeStringToAnsiString(&Expression, &UExpression, TRUE); + RtlUnicodeStringToAnsiString(&Name, &UName, TRUE); + + TestResult = FsRtlIsDbcsInExpression(&Expression, &Name); + + ok(TestResult == Tests[i].Expected, "FsRtlIsDbcsInExpression(%Z,%Z): Expected %s, got %s\n", + &Expression, &Name, Tests[i].Expected ? "TRUE" : "FALSE", TestResult ? "TRUE" : "FALSE"); + + RtlFreeAnsiString(&Expression); + RtlFreeAnsiString(&Name); } - RtlInitUnicodeString(&Name, L"a"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitUnicodeString(&Expression, L"ntdll.dll"); - RtlInitUnicodeString(&Name, L"."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"~1"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L".."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"ntdll.dll"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitUnicodeString(&Expression, L"smss.exe"); - RtlInitUnicodeString(&Name, L"."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"~1"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L".."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"ntdll.dll"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"NTDLL.dll"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitUnicodeString(&Expression, L"nt??krnl.???"); - RtlInitUnicodeString(&Name, L"ntoskrnl.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitUnicodeString(&Expression, L"he*o"); - RtlInitUnicodeString(&Name, L"hello"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"helo"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"hella"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitUnicodeString(&Expression, L"he*"); - RtlInitUnicodeString(&Name, L"hello"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"helo"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"hella"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitUnicodeString(&Expression, L"*.cpl"); - RtlInitUnicodeString(&Name, L"kdcom.dll"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"bootvid.dll"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"ntoskrnl.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitUnicodeString(&Expression, L"."); - RtlInitUnicodeString(&Name, L"NTDLL.DLL"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitUnicodeString(&Expression, L"F0_*.*"); - RtlInitUnicodeString(&Name, L"."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L".."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"SETUP.EXE"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"F0_"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_."); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"F0_."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"F0_001"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"F0_001"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_001"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_001"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"F0_001."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"f0_001.txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_001.txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"F0_001.txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"F0_001.txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"F0_001.txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitUnicodeString(&Expression, L"F0_*."); - RtlInitUnicodeString(&Name, L"."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L".."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"SETUP.EXE"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"F0_"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_."); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"F0_."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"F0_001"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"F0_001"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_001"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_001"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"F0_OO1."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"f0_001.txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_001.txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"F0_001.txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"F0_001.txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitUnicodeString(&Expression, L"F0_<\"*"); - RtlInitUnicodeString(&Name, L"."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L".."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"SETUP.EXE"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"F0_"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"f0_."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_."); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"F0_."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"F0_001"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"F0_001"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"f0_001"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_001"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"F0_OO1."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"f0_001.txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"f0_001.txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"F0_001.txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"F0_001.txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitUnicodeString(&Expression, L"*.TTF"); - RtlInitUnicodeString(&Name, L"."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L".."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"SETUP.INI"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitUnicodeString(&Expression, L"*"); - RtlInitUnicodeString(&Name, L"."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L".."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"SETUP.INI"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitUnicodeString(&Expression, L".*"); - RtlInitUnicodeString(&Name, L"1"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"01"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L" "); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L""); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"1.txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L" .txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L".txt"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitUnicodeString(&Expression, L"\"ntoskrnl.exe"); - RtlInitUnicodeString(&Name, L"ntoskrnl.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Expression, L"ntoskrnl\"exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Expression, L"ntoskrn\".exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Expression, L"ntoskrn\"\"exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Expression, L"ntoskrnl.\"exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Expression, L"ntoskrnl.exe\""); - RtlInitUnicodeString(&Name, L"ntoskrnl.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"ntoskrnl.exe."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitUnicodeString(&Expression, L"*.c.d"); - RtlInitUnicodeString(&Name, L"a.b.c.d"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Expression, L"*.?.c.d"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Expression, L"*?"); - if (!KmtIsCheckedBuild) - { - RtlInitUnicodeString(&Name, L""); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - } - RtlInitUnicodeString(&Name, L"a"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"aa"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"aaa"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Expression, L"?*?"); - if (!KmtIsCheckedBuild) - { - RtlInitUnicodeString(&Name, L""); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - } - RtlInitUnicodeString(&Name, L"a"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"aa"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"aaa"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"aaaa"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - - /* Tests from #5923 */ - RtlInitUnicodeString(&Expression, L"C:\\ReactOS\\**"); - RtlInitUnicodeString(&Name, L"C:\\ReactOS\\dings.bmp"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Expression, L"C:\\ReactOS\\***"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Expression, L"C:\\Windows\\*a*"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitUnicodeString(&Expression, L"C:\\ReactOS\\*.bmp"); - RtlInitUnicodeString(&Name, L"C:\\Windows\\explorer.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Expression, L"*.bmp;*.dib"); - RtlInitUnicodeString(&Name, L"winhlp32.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - - /* Backtracking tests */ - RtlInitUnicodeString(&Expression, L"*.*.*.*"); - RtlInitUnicodeString(&Name, L"127.0.0.1"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitUnicodeString(&Expression, L"*?*?*?*"); - RtlInitUnicodeString(&Name, L"1.0.0.1"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Expression, L"?*?*?*?"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Expression, L"?.?.?.?"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitUnicodeString(&Expression, L"*a*ab*abc"); - RtlInitUnicodeString(&Name, L"aabaabcdadabdabc"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - - /* Tests for extra wildcards */ - RtlInitUnicodeString(&Expression, L"ab<exe"); - RtlInitUnicodeString(&Name, L"abcd.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"ab.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"abcdexe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"acd.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Expression, L"a.b<exe"); - RtlInitUnicodeString(&Name, L"a.bcd.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Expression, L"a<b.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"a.b.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitUnicodeString(&Expression, L"abc.exe\""); - RtlInitUnicodeString(&Name, L"abc.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"abc.exe."); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"abc.exe.back"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"abc.exes"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitUnicodeString(&Expression, L"a>c.exe"); - RtlInitUnicodeString(&Name, L"abc.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitUnicodeString(&Name, L"ac.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Expression, L"a>>>exe"); - RtlInitUnicodeString(&Name, L"abc.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitUnicodeString(&Name, L"ac.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitUnicodeString(&Expression, L"<.exe"); - RtlInitUnicodeString(&Name, L"test.exe"); - ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); -} - -static VOID FsRtlIsDbcsInExpressionTest() -{ - ANSI_STRING Expression, Name; - - if (!KmtIsCheckedBuild) - { - RtlInitAnsiString(&Expression, "*"); - RtlInitAnsiString(&Name, ""); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Expression, ""); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - } - - RtlInitAnsiString(&Expression, "**"); - if (!KmtIsCheckedBuild) - { - RtlInitAnsiString(&Name, ""); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - } - RtlInitAnsiString(&Name, "a"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitAnsiString(&Expression, "ntdll.dll"); - RtlInitAnsiString(&Name, "."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "~1"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, ".."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "ntdll.dll"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitAnsiString(&Expression, "smss.exe"); - RtlInitAnsiString(&Name, "."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "~1"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, ".."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "ntdll.dll"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "NTDLL.dll"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitAnsiString(&Expression, "nt??krnl.???"); - RtlInitAnsiString(&Name, "ntoskrnl.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitAnsiString(&Expression, "he*o"); - RtlInitAnsiString(&Name, "hello"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "helo"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "hella"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitAnsiString(&Expression, "he*"); - RtlInitAnsiString(&Name, "hello"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "helo"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "hella"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitAnsiString(&Expression, "*.cpl"); - RtlInitAnsiString(&Name, "kdcom.dll"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "bootvid.dll"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "ntoskrnl.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitAnsiString(&Expression, "."); - RtlInitAnsiString(&Name, "NTDLL.DLL"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitAnsiString(&Expression, "F0_*.*"); - RtlInitAnsiString(&Name, "."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, ".."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "SETUP.EXE"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "f0_"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "F0_"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "f0_."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "F0_."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "F0_001"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitAnsiString(&Name, "f0_001"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "F0_001."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "f0_001.txt"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "F0_001.txt"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitAnsiString(&Expression, "F0_*."); - RtlInitAnsiString(&Name, "."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, ".."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "SETUP.EXE"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "f0_"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "F0_"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "f0_."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "F0_."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "F0_001"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "f0_001"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "F0_OO1."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "f0_001.txt"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "F0_001.txt"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitAnsiString(&Expression, "F0_<\"*"); - RtlInitAnsiString(&Name, "."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, ".."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "SETUP.EXE"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "f0_"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "F0_"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "f0_."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "F0_."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "F0_001"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "f0_001"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "F0_OO1."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "f0_001.txt"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "F0_001.txt"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitAnsiString(&Expression, "*.TTF"); - RtlInitAnsiString(&Name, "."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, ".."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "SETUP.INI"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitAnsiString(&Expression, "*"); - RtlInitAnsiString(&Name, "."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, ".."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "SETUP.INI"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitAnsiString(&Expression, ".*"); - RtlInitAnsiString(&Name, "1"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "01"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, " "); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - - if (!KmtIsCheckedBuild) - { - RtlInitAnsiString(&Name, ""); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - } - RtlInitAnsiString(&Name, "."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "1.txt"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, " .txt"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, ".txt"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitAnsiString(&Expression, "\"ntoskrnl.exe"); - RtlInitAnsiString(&Name, "ntoskrnl.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Expression, "ntoskrnl\"exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Expression, "ntoskrn\".exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Expression, "ntoskrn\"\"exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Expression, "ntoskrnl.\"exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Expression, "ntoskrnl.exe\""); - RtlInitAnsiString(&Name, "ntoskrnl.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "ntoskrnl.exe."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitAnsiString(&Expression, "*.c.d"); - RtlInitAnsiString(&Name, "a.b.c.d"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Expression, "*.?.c.d"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Expression, "*?"); - if (!KmtIsCheckedBuild) - { - RtlInitAnsiString(&Name, ""); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - } - RtlInitAnsiString(&Name, "a"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "aa"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "aaa"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Expression, "?*?"); - if (!KmtIsCheckedBuild) - { - RtlInitAnsiString(&Name, ""); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - } - RtlInitAnsiString(&Name, "a"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "aa"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "aaa"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "aaaa"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - - /* Tests from #5923 */ - RtlInitAnsiString(&Expression, "C:\\ReactOS\\**"); - RtlInitAnsiString(&Name, "C:\\ReactOS\\dings.bmp"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Expression, "C:\\ReactOS\\***"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Expression, "C:\\Windows\\*a*"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitAnsiString(&Expression, "C:\\ReactOS\\*.bmp"); - RtlInitAnsiString(&Name, "C:\\Windows\\explorer.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Expression, "*.bmp;*.dib"); - RtlInitAnsiString(&Name, "winhlp32.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - - /* Backtracking tests */ - RtlInitAnsiString(&Expression, "*.*.*.*"); - RtlInitAnsiString(&Name, "127.0.0.1"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitAnsiString(&Expression, "*?*?*?*"); - RtlInitAnsiString(&Name, "1.0.0.1"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Expression, "?*?*?*?"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Expression, "?.?.?.?"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitAnsiString(&Expression, "*a*ab*abc"); - RtlInitAnsiString(&Name, "aabaabcdadabdabc"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - - /* Tests for extra wildcards */ - RtlInitAnsiString(&Expression, "ab<exe"); - RtlInitAnsiString(&Name, "abcd.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "ab.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "abcdexe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "acd.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Expression, "a.b<exe"); - RtlInitAnsiString(&Name, "a.bcd.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Expression, "a<b.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "a.b.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - - RtlInitAnsiString(&Expression, "abc.exe\""); - RtlInitAnsiString(&Name, "abc.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "abc.exe."); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "abc.exe.back"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "abc.exes"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitAnsiString(&Expression, "a>c.exe"); - RtlInitAnsiString(&Name, "abc.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); - RtlInitAnsiString(&Name, "ac.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Expression, "a>>>exe"); - RtlInitAnsiString(&Name, "abc.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, "ac.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - - RtlInitAnsiString(&Expression, "<.exe"); - RtlInitAnsiString(&Name, "test.exe"); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); } START_TEST(FsRtlExpression)

11 years, 4 months

[akhaldi] 58863: [SHELL32] * Fix the FVM_AUTO handing in CDefView::SetCurrentViewMode. Brought to you by Victor Martinez. CORE-7126 #resolve

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 26 23:05:51 2013 New Revision: 58863 URL: http://svn.reactos.org/svn/reactos?rev=58863&view=rev Log: [SHELL32] * Fix the FVM_AUTO handing in CDefView::SetCurrentViewMode. Brought to you by Victor Martinez. CORE-7126 #resolve Modified: trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Fri Apr 26 23:05:51 2013 @@ -2407,7 +2407,8 @@ DWORD dwStyle; TRACE("(%p)->(%u), stub\n", this, ViewMode); - if ((ViewMode < FVM_FIRST || ViewMode > FVM_LAST) /* && (ViewMode != FVM_AUTO) */ ) + /* It's not redundant to check FVM_AUTO because it's a (UINT)-1 */ + if ((ViewMode < FVM_FIRST || ViewMode > FVM_LAST) && (ViewMode != FVM_AUTO)) return E_INVALIDARG; /* Windows before Vista uses LVM_SETVIEW and possibly

11 years, 4 months

[akhaldi] 58862: [HAL] * Account for the asm source files in all the HAL flavors. Should fix compiling them with VS (which regressed recently).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 26 22:31:07 2013 New Revision: 58862 URL: http://svn.reactos.org/svn/reactos?rev=58862&view=rev Log: [HAL] * Account for the asm source files in all the HAL flavors. Should fix compiling them with VS (which regressed recently). Modified: trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/hal/halx86/apic.cmake trunk/reactos/hal/halx86/generic.cmake trunk/reactos/hal/halx86/minihal.cmake trunk/reactos/hal/halx86/pic.cmake Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Fri Apr 26 22:31:07 2013 @@ -80,5 +80,3 @@ add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi apic) endif() - - Modified: trunk/reactos/hal/halx86/apic.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic.cmake?rev=… ============================================================================== --- trunk/reactos/hal/halx86/apic.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic.cmake [iso-8859-1] Fri Apr 26 22:31:07 2013 @@ -10,5 +10,6 @@ apic/rtctimer.c apic/tsc.c) -add_object_library(lib_hal_apic ${HAL_APIC_SOURCE} ${HAL_APIC_ASM_SOURCE}) +add_asm_files(lib_hal_apic_asm ${HAL_APIC_ASM_SOURCE}) +add_object_library(lib_hal_apic ${HAL_APIC_SOURCE} ${lib_hal_apic_asm}) add_dependencies(lib_hal_apic asm) Modified: trunk/reactos/hal/halx86/generic.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic.cmake?r… ============================================================================== --- trunk/reactos/hal/halx86/generic.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic.cmake [iso-8859-1] Fri Apr 26 22:31:07 2013 @@ -21,7 +21,7 @@ generic/v86.S) endif() -add_asm_files(halacpi_asm ${HAL_PIC_ASM_SOURCE} generic/v86.S) -add_object_library(lib_hal_generic ${HAL_GENERIC_SOURCE} ${HAL_GENERIC_ASM_SOURCE}) +add_asm_files(lib_hal_generic_asm ${HAL_GENERIC_ASM_SOURCE}) +add_object_library(lib_hal_generic ${HAL_GENERIC_SOURCE} ${lib_hal_generic_asm}) add_dependencies(lib_hal_generic asm) add_pch(lib_hal_generic include/hal.h) Modified: trunk/reactos/hal/halx86/minihal.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/minihal.cmake?r… ============================================================================== --- trunk/reactos/hal/halx86/minihal.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/minihal.cmake [iso-8859-1] Fri Apr 26 22:31:07 2013 @@ -1,8 +1,6 @@ - list(APPEND MINI_HAL_SOURCE generic/portio.c - generic/systimer.S legacy/bus/bushndlr.c legacy/bus/cmosbus.c legacy/bus/isabus.c @@ -27,6 +25,7 @@ up/processor.c) # mini_hal -add_library(mini_hal ${MINI_HAL_SOURCE}) +add_asm_files(mini_hal_asm generic/systimer.S) +add_library(mini_hal ${MINI_HAL_SOURCE} ${mini_hal_asm}) add_target_compile_definitions(mini_hal _BLDR_ _MINIHAL_) add_dependencies(mini_hal psdk bugcodes asm) Modified: trunk/reactos/hal/halx86/pic.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/pic.cmake?rev=5… ============================================================================== --- trunk/reactos/hal/halx86/pic.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/pic.cmake [iso-8859-1] Fri Apr 26 22:31:07 2013 @@ -9,5 +9,6 @@ up/halinit_up.c up/pic.c) -add_object_library(lib_hal_pic ${HAL_PIC_SOURCE} ${HAL_PIC_ASM_SOURCE}) +add_asm_files(lib_hal_pic_asm ${HAL_PIC_ASM_SOURCE}) +add_object_library(lib_hal_pic ${HAL_PIC_SOURCE} ${lib_hal_pic_asm}) add_dependencies(lib_hal_pic asm)

11 years, 4 months

[spetreolle] 58861: [HIVESFT] Fix opening of http, https and gopher URLs.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Apr 26 14:15:28 2013 New Revision: 58861 URL: http://svn.reactos.org/svn/reactos?rev=58861&view=rev Log: [HIVESFT] Fix opening of http,https and gopher URLs. Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Fri Apr 26 14:15:28 2013 @@ -19,19 +19,28 @@ HKLM,"SOFTWARE\Classes\gopher","",0x00000000,"URL:Gopher Protocol" HKLM,"SOFTWARE\Classes\gopher\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9F53-0020AF0BA770}" HKLM,"SOFTWARE\Classes\gopher\URL Protocol","",0x00000000,"" -HKLM,"SOFTWARE\Classes\gopher\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" -nohome" +;see http +;HKLM,"SOFTWARE\Classes\gopher\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" -nohome" +HKLM,"SOFTWARE\Classes\gopher\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1" HKLM,"SOFTWARE\Classes\http","",0x00000000,"URL:HyperText Transfer Protocol" HKLM,"SOFTWARE\Classes\http\DefaultIcon","",0x00000000,"%systemroot%\system32\url.dll,0" HKLM,"SOFTWARE\Classes\http\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9F53-0020AF0BA770}" HKLM,"SOFTWARE\Classes\http\URL Protocol","",0x00000000,"" -HKLM,"SOFTWARE\Classes\http\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" -nohome" +HKLM,"SOFTWARE\Classes\http\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1" +;TODO : iexplore should use DDE +;HKLM,"SOFTWARE\Classes\http\shell\open\ddeexec","",0x00000000,"""%1"",,-1,0,,,," +;HKLM,"SOFTWARE\Classes\http\shell\open\ddeexec","NoActivateHandler",0x00000000,"" +;HKLM,"SOFTWARE\Classes\http\shell\open\ddeexec\Application","",0x00000000,"IExplore" +;HKLM,"SOFTWARE\Classes\http\shell\open\ddeexec\Topic","",0x00000000,"WWW_OpenURL" HKLM,"SOFTWARE\Classes\https","",0x00000000,"URL:HyperText Transfer Protocol with Privacy" HKLM,"SOFTWARE\Classes\https\DefaultIcon","",0x00000000,"%systemroot%\system32\url.dll,0" HKLM,"SOFTWARE\Classes\https\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9F53-0020AF0BA770}" HKLM,"SOFTWARE\Classes\https\URL Protocol","",0x00000000,"" -HKLM,"SOFTWARE\Classes\https\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" -nohome" +;see http +;HKLM,"SOFTWARE\Classes\https\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" -nohome" +HKLM,"SOFTWARE\Classes\https\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1" ; Register system default web browser HKLM,"SOFTWARE\Clients\StartMenuInternet","",0x00000000,"IEXPLORE.EXE"

11 years, 4 months

[akhaldi] 58860: [SHELL32] * Sync CommandLineToArgvW with Wine 1.5.26. Fixes issues spotted by Victor Martinez. CORE-7125 #resolve

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 26 12:10:27 2013 New Revision: 58860 URL: http://svn.reactos.org/svn/reactos?rev=58860&view=rev Log: [SHELL32] * Sync CommandLineToArgvW with Wine 1.5.26. Fixes issues spotted by Victor Martinez. CORE-7125 #resolve Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Fri Apr 26 12:10:27 2013 @@ -38,33 +38,31 @@ * '"a b"' -> 'a b' * - escaped quotes must be converted back to '"' * '\"' -> '"' - * - an odd number of '\'s followed by '"' correspond to half that number - * of '\' followed by a '"' (extension of the above) - * '\\\"' -> '\"' - * '\\\\\"' -> '\\"' - * - an even number of '\'s followed by a '"' correspond to half that number - * of '\', plus a regular quote serving as an argument delimiter (which - * means it does not appear in the result) - * 'a\\"b c"' -> 'a\b c' - * 'a\\\\"b c"' -> 'a\\b c' - * - '\' that are not followed by a '"' are copied literally + * - consecutive backslashes preceding a quote see their number halved with + * the remainder escaping the quote: + * 2n backslashes + quote -> n backslashes + quote as an argument delimiter + * 2n+1 backslashes + quote -> n backslashes + literal quote + * - backslashes that are not followed by a quote are copied literally: * 'a\b' -> 'a\b' * 'a\\b' -> 'a\\b' - * - * Note: - * '\t' == 0x0009 - * ' ' == 0x0020 - * '"' == 0x0022 - * '\\' == 0x005c + * - in quoted strings, consecutive quotes see their number divided by three + * with the remainder modulo 3 deciding whether to close the string or not. + * Note that the opening quote must be counted in the consecutive quotes, + * that's the (1+) below: + * (1+) 3n quotes -> n quotes + * (1+) 3n+1 quotes -> n quotes plus closes the quoted string + * (1+) 3n+2 quotes -> n+1 quotes plus closes the quoted string + * - in unquoted strings, the first quote opens the quoted string and the + * remaining consecutive quotes follow the above rule. */ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) { DWORD argc; LPWSTR *argv; - LPCWSTR cs; - LPWSTR arg,s,d; + LPCWSTR s; + LPWSTR d; LPWSTR cmdline; - int in_quotes,bcount; + int qcount,bcount; if(!numargs) { @@ -98,92 +96,155 @@ return argv; } - /* to get a writable copy */ - argc=0; - bcount=0; - in_quotes=0; - cs=lpCmdline; - while (1) - { - if (*cs==0 || ((*cs==0x0009 || *cs==0x0020) && !in_quotes)) - { - /* space */ - argc++; - /* skip the remaining spaces */ - while (*cs==0x0009 || *cs==0x0020) - { - cs++; - } - if (*cs==0) + /* --- First count the arguments */ + argc=1; + s=lpCmdline; + /* The first argument, the executable path, follows special rules */ + if (*s=='"') + { + /* The executable path ends at the next quote, no matter what */ + s++; + while (*s) + if (*s++=='"') break; + } + else + { + /* The executable path ends at the next space, no matter what */ + while (*s && *s!=' ' && *s!='\t') + s++; + } + /* skip to the first argument, if any */ + while (*s==' ' || *s=='\t') + s++; + if (*s) + argc++; + + /* Analyze the remaining arguments */ + qcount=bcount=0; + while (*s) + { + if ((*s==' ' || *s=='\t') && qcount==0) + { + /* skip to the next argument and count it if any */ + while (*s==' ' || *s=='\t') + s++; + if (*s) + argc++; bcount=0; - continue; - } - else if (*cs==0x005c) + } + else if (*s=='\\') { /* '\', count them */ bcount++; - } - else if ((*cs==0x0022) && ((bcount & 1)==0)) - { - /* unescaped '"' */ - in_quotes=!in_quotes; + s++; + } + else if (*s=='"') + { + /* '"' */ + if ((bcount & 1)==0) + qcount++; /* unescaped '"' */ + s++; bcount=0; + /* consecutive quotes, see comment in copying code below */ + while (*s=='"') + { + qcount++; + s++; + } + qcount=qcount % 3; + if (qcount==2) + qcount=0; } else { /* a regular character */ bcount=0; - } - cs++; - } - /* Allocate in a single lump, the string array, and the strings that go with it. - * This way the caller can make a single GlobalFree call to free both, as per MSDN. + s++; + } + } + + /* Allocate in a single lump, the string array, and the strings that go + * with it. This way the caller can make a single LocalFree() call to free + * both, as per MSDN. */ - argv=(LPWSTR *)LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(wcslen(lpCmdline)+1)*sizeof(WCHAR)); + argv=(LPWSTR *)LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(strlenW(lpCmdline)+1)*sizeof(WCHAR)); if (!argv) return NULL; cmdline=(LPWSTR)(argv+argc); - wcscpy(cmdline, lpCmdline); - - argc=0; - bcount=0; - in_quotes=0; - arg=d=s=cmdline; + strcpyW(cmdline, lpCmdline); + + /* --- Then split and copy the arguments */ + argv[0]=d=cmdline; + argc=1; + /* The first argument, the executable path, follows special rules */ + if (*d=='"') + { + /* The executable path ends at the next quote, no matter what */ + s=d+1; + while (*s) + { + if (*s=='"') + { + s++; + break; + } + *d++=*s++; + } + } + else + { + /* The executable path ends at the next space, no matter what */ + while (*d && *d!=' ' && *d!='\t') + d++; + s=d; + if (*s) + s++; + } + /* close the executable path */ + *d++=0; + /* skip to the first argument and initialize it if any */ + while (*s==' ' || *s=='\t') + s++; + if (!*s) + { + /* There are no parameters so we are all done */ + *numargs=argc; + return argv; + } + + /* Split and copy the remaining arguments */ + argv[argc++]=d; + qcount=bcount=0; while (*s) { - if ((*s==0x0009 || *s==0x0020) && !in_quotes) - { - /* Close the argument and copy it */ - *d=0; - argv[argc++]=arg; - - /* skip the remaining spaces */ + if ((*s==' ' || *s=='\t') && qcount==0) + { + /* close the argument */ + *d++=0; + bcount=0; + + /* skip to the next one and initialize it if any */ do { s++; - } while (*s==0x0009 || *s==0x0020); - - /* Start with a new argument */ - arg=d=s; - bcount=0; - } - else if (*s==0x005c) - { - /* '\\' */ + } while (*s==' ' || *s=='\t'); + if (*s) + argv[argc++]=d; + } + else if (*s=='\\') + { *d++=*s++; bcount++; } - else if (*s==0x0022) - { - /* '"' */ + else if (*s=='"') + { if ((bcount & 1)==0) { /* Preceded by an even number of '\', this is half that * number of '\', plus a quote which we erase. */ d-=bcount/2; - in_quotes=!in_quotes; - s++; + qcount++; } else { @@ -192,9 +253,24 @@ */ d=d-bcount/2-1; *d++='"'; + } + s++; + bcount=0; + /* Now count the number of consecutive quotes. Note that qcount + * already takes into account the opening quote if any, as well as + * the quote that lead us here. + */ + while (*s=='"') + { + if (++qcount==3) + { + *d++='"'; + qcount=0; + } s++; } - bcount=0; + if (qcount==2) + qcount=0; } else { @@ -203,11 +279,7 @@ bcount=0; } } - if (*arg) - { - *d='\0'; - argv[argc++]=arg; - } + *d='\0'; *numargs=argc; return argv;

11 years, 4 months

[tfaber] 58859: [KMTESTS:FSRTL] - Enable running FsRtlMcb by hand

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 26 09:31:12 2013 New Revision: 58859 URL: http://svn.reactos.org/svn/reactos?rev=58859&view=rev Log: [KMTESTS:FSRTL] - Enable running FsRtlMcb by hand Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Apr 26 09:31:12 2013 @@ -62,7 +62,8 @@ { "-ExTimer", Test_ExTimer }, { "Example", Test_Example }, { "FsRtlExpression", Test_FsRtlExpression }, -// { "FsRtlMcb", Test_FsRtlMcb }, + /* Skipped on testman. See ROSTESTS-106. */ + { "-FsRtlMcb", Test_FsRtlMcb }, { "IoDeviceInterface", Test_IoDeviceInterface }, { "IoEvent", Test_IoEvent }, { "IoInterrupt", Test_IoInterrupt },

11 years, 4 months

[pschweitzer] 58858: [NTOSKRNL] Disable FsRtlMcb for the moment, as they crash, don't provide any useful and prevent the VBox testbot to properly run

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Apr 26 06:47:42 2013 New Revision: 58858 URL: http://svn.reactos.org/svn/reactos?rev=58858&view=rev Log: [NTOSKRNL] Disable FsRtlMcb for the moment, as they crash, don't provide any useful and prevent the VBox testbot to properly run Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Apr 26 06:47:42 2013 @@ -62,7 +62,7 @@ { "-ExTimer", Test_ExTimer }, { "Example", Test_Example }, { "FsRtlExpression", Test_FsRtlExpression }, - { "FsRtlMcb", Test_FsRtlMcb }, +// { "FsRtlMcb", Test_FsRtlMcb }, { "IoDeviceInterface", Test_IoDeviceInterface }, { "IoEvent", Test_IoEvent }, { "IoInterrupt", Test_IoInterrupt },

11 years, 4 months

[hbelusca] 58857: Fix a check.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Apr 25 23:16:19 2013 New Revision: 58857 URL: http://svn.reactos.org/svn/reactos?rev=58857&view=rev Log: Fix a check. Modified: trunk/reactos/base/system/services/services.c Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Thu Apr 25 23:16:19 2013 @@ -327,7 +327,7 @@ /* Create the auto-start complete event */ hScmAutoStartCompleteEvent = CreateEventW(NULL, TRUE, FALSE, SCM_AUTOSTARTCOMPLETE_EVENT); - if (hScmAutoStartCompleteEvent = NULL) + if (hScmAutoStartCompleteEvent == NULL) { DPRINT1("SERVICES: Failed to create the auto-start complete event\n"); goto done;

11 years, 4 months

← Newer
1
2
3
4
5
6
7
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2013