Ros-diffs August 2017

ros-diffs@reactos.org

22 participants
262 discussions

[mjansen] 75596: [SHIMENG] Enable the Application Compatibility framework by default. - Also add disabled keys to configure the logging - Demote a noisy print used in the shim engine. At this point...
by mjansen＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: mjansen Date: Thu Aug 17 16:42:29 2017 New Revision: 75596 URL: http://svn.reactos.org/svn/reactos?rev=75596&view=rev Log: [SHIMENG] Enable the Application Compatibility framework by default. - Also add disabled keys to configure the logging - Demote a noisy print used in the shim engine. At this point the shim engine should be functional enough to be used. One thing that remains is creating more shims(fixes) to use, and implement more features for the already existing ones. CORE-13284 Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/appcompat/apphelp/shimeng.c 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] Thu Aug 17 16:42:29 2017 @@ -1667,8 +1667,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","TransmissionRetryTimeout",0x00000000,"90" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","USERProcessHandleQuota",0x00010001,0x2710 -; App Compat -- Disable on ReactOS -HKLM,"SOFTWARE\Policies\Microsoft\Windows\AppCompat","DisableEngine",0x00010003, 0x00000001 +; App Compat -- Enable on ReactOS +;HKLM,"SOFTWARE\Policies\Microsoft\Windows\AppCompat","DisableEngine",0x00010003, 0x00000001 ;-------------------------------- STRINGS ------------------------------- Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Thu Aug 17 16:42:29 2017 @@ -1417,6 +1417,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020002,"%SystemRoot%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020002,"%SystemRoot%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020002,"%SystemRoot%" +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","SHIMENG_DEBUG_LEVEL",0x00000000,"4" +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","SHIM_DEBUG_LEVEL",0x00000000,"4" ; Known DLLs Modified: trunk/reactos/dll/appcompat/apphelp/shimeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/shim… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/shimeng.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/shimeng.c [iso-8859-1] Thu Aug 17 16:42:29 2017 @@ -1201,13 +1201,13 @@ VOID WINAPI SE_DllUnloaded(PLDR_DATA_TABLE_ENTRY LdrEntry) { - SHIMENG_MSG("(%p)\n", LdrEntry); + SHIMENG_INFO("(%p)\n", LdrEntry); NotifyShims(SHIM_REASON_DLL_UNLOAD, LdrEntry); } BOOL WINAPI SE_IsShimDll(PVOID BaseAddress) { - SHIMENG_MSG("(%p)\n", BaseAddress); + SHIMENG_INFO("(%p)\n", BaseAddress); return SeiGetShimModuleInfo(BaseAddress) != NULL; }

1 0

[gadamopoulos] 75595: [SHELL32] -AddFSClassKeysToArray: Increase the size of the buffer for the value read from the registry. There are cases when 40 are not enough.
by gadamopoulos＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: gadamopoulos Date: Thu Aug 17 16:35:16 2017 New Revision: 75595 URL: http://svn.reactos.org/svn/reactos?rev=75595&view=rev Log: [SHELL32] -AddFSClassKeysToArray: Increase the size of the buffer for the value read from the registry. There are cases when 40 are not enough. Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Thu Aug 17 16:35:16 2017 @@ -288,7 +288,7 @@ { AddClassKeyToArray(extension, array, cKeys); - WCHAR wszClass[40], wszClass2[40]; + WCHAR wszClass[MAX_PATH], wszClass2[MAX_PATH]; DWORD dwSize = sizeof(wszClass); if (RegGetValueW(HKEY_CLASSES_ROOT, extension, NULL, RRF_RT_REG_SZ, NULL, wszClass, &dwSize) == ERROR_SUCCESS) {

1 0

[mjansen] 75594: [ACLAYERS] Add a compatibility shim + layer for the VMWare Horizon setup. This fixes the setup trying to print some debug strings. For now the shim has to be applied manually, howe...
by mjansen＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: mjansen Date: Thu Aug 17 16:27:56 2017 New Revision: 75594 URL: http://svn.reactos.org/svn/reactos?rev=75594&view=rev Log: [ACLAYERS] Add a compatibility shim + layer for the VMWare Horizon setup. This fixes the setup trying to print some debug strings. For now the shim has to be applied manually, however the setup does not complete yet. Patch bits & fixes by Thomas. CORE-13434 Added: trunk/reactos/dll/appcompat/shims/layer/vmhorizon.c (with props) Modified: trunk/reactos/dll/appcompat/shims/layer/CMakeLists.txt trunk/reactos/media/sdb/sysmain.xml Modified: trunk/reactos/dll/appcompat/shims/layer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/… ============================================================================== --- trunk/reactos/dll/appcompat/shims/layer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/layer/CMakeLists.txt [iso-8859-1] Thu Aug 17 16:27:56 2017 @@ -6,6 +6,7 @@ list(APPEND SOURCE dispmode.c versionlie.c + vmhorizon.c main.c layer.spec) Added: trunk/reactos/dll/appcompat/shims/layer/vmhorizon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/… ============================================================================== --- trunk/reactos/dll/appcompat/shims/layer/vmhorizon.c (added) +++ trunk/reactos/dll/appcompat/shims/layer/vmhorizon.c [iso-8859-1] Thu Aug 17 16:27:56 2017 @@ -0,0 +1,142 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shim library + * FILE: dll/appcompat/shims/layer/vmhorizon.c + * PURPOSE: Shim for VMWare Horizon setup + * PROGRAMMER: Thomas Faber (thomas.faber(a)reactos.org) + * Mark Jansen (mark.jansen(a)reactos.org) + */ + +#define WIN32_NO_STATUS +#include <windows.h> +#include <shimlib.h> +#include "ntndk.h" + +static BOOL Write(PBYTE Address, PBYTE Data, SIZE_T Size) +{ + PVOID BaseAddress = Address; + SIZE_T RegionSize = Size; + ULONG OldProtection; + NTSTATUS Status = NtProtectVirtualMemory(NtCurrentProcess(), &BaseAddress, &RegionSize, PAGE_EXECUTE_READWRITE, &OldProtection); + if (NT_SUCCESS(Status)) + { + SIZE_T Bytes; + Status = NtWriteVirtualMemory(NtCurrentProcess(), Address, Data, Size, &Bytes); + if (NT_SUCCESS(Status) && Bytes != Size) + Status = STATUS_MEMORY_NOT_ALLOCATED; + NtProtectVirtualMemory(NtCurrentProcess(), &BaseAddress, &RegionSize, OldProtection, &OldProtection); + } + return NT_SUCCESS(Status); +} + +static void FixupDll(PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + static const UCHAR Match1[5] = { 0x0C, 0x8B, 0xFC, 0xF3, 0xA5 }; + static const UCHAR Match2[5] = { 0x0C, 0x8B, 0xFC, 0xF3, 0xA5 }; + static const UCHAR Match3[5] = { 0xB0, 0x8B, 0xFC, 0xF3, 0xA5 }; + UCHAR Replacement1[5] = { 0x10, 0x89, 0x34, 0x24, 0x90 }; + UCHAR Replacement2[5] = { 0x10, 0x89, 0x34, 0x24, 0x90 }; + UCHAR Replacement3[5] = { 0xB4, 0x89, 0x34, 0x24, 0x90 }; +#define OFFSET_1 0x21A6E +#define OFFSET_2 0x21B04 +#define OFFSET_3 0x21C3C + + + UCHAR Buffer[5]; + PBYTE Base = LdrEntry->DllBase; + SIZE_T Bytes; + + /* + 00020E6E: 0C 8B FC F3 A5 --> 10 89 34 24 90 F11A6E - ef0000 = 21A6E + 00020F04: 0C 8B FC F3 A5 --> 10 89 34 24 90 F11B04 - ef0000 = 21B04 + 00021C3C: B0 8B FC F3 A5 --> B4 89 34 24 90 F11C3C - ef0000 = 21C3C + */ + do { + DbgPrint("Module %wZ Loaded at 0x%p, we should patch!\n", &LdrEntry->BaseDllName, LdrEntry->DllBase); + if (!NT_SUCCESS(NtReadVirtualMemory(NtCurrentProcess(), Base + OFFSET_1, Buffer, 5, &Bytes)) || Bytes != 5) + break; + if (memcmp(Buffer, Match1, sizeof(Match1))) + break; + + if (!NT_SUCCESS(NtReadVirtualMemory(NtCurrentProcess(), Base + OFFSET_2, Buffer, 5, &Bytes)) || Bytes != 5) + break; + if (memcmp(Buffer, Match2, sizeof(Match2))) + break; + + if (!NT_SUCCESS(NtReadVirtualMemory(NtCurrentProcess(), Base + OFFSET_3, Buffer, 5, &Bytes)) || Bytes != 5) + break; + if (memcmp(Buffer, Match3, sizeof(Match3))) + break; + + DbgPrint("Module %wZ Loaded at 0x%p, OK to patch!\n", &LdrEntry->BaseDllName, LdrEntry->DllBase); + if (!Write(Base + OFFSET_1, Replacement1, sizeof(Replacement1))) + break; + if (!Write(Base + OFFSET_2, Replacement2, sizeof(Replacement2))) + break; + if (!Write(Base + OFFSET_3, Replacement3, sizeof(Replacement3))) + break; + + NtFlushInstructionCache(NtCurrentProcess(), Base, 0x22000); + + DbgPrint("Module %wZ Loaded at 0x%p, patched!\n", &LdrEntry->BaseDllName, LdrEntry->DllBase); + } while (0); +} + +static BOOLEAN PostfixUnicodeString(const UNICODE_STRING* String1, const UNICODE_STRING* String2) +{ + PWCHAR pc1; + PWCHAR pc2; + ULONG NumChars; + + if (String2->Length < String1->Length) + return FALSE; + + if (!String1->Buffer || !String2->Buffer) + return FALSE; + + NumChars = String1->Length / sizeof(WCHAR); + pc1 = String1->Buffer; + pc2 = String2->Buffer + (String2->Length / sizeof(WCHAR)) - NumChars; + + while (NumChars--) + { + if (RtlUpcaseUnicodeChar(*pc1++) != RtlUpcaseUnicodeChar(*pc2++)) + return FALSE; + } + + return TRUE; +} + +#define SHIM_NS VMHorizonSetup +#include <setup_shim.inl> + +#define SHIM_NUM_HOOKS 0 +#define SHIM_NOTIFY_FN SHIM_OBJ_NAME(Notify) + +BOOL WINAPI SHIM_OBJ_NAME(Notify)(DWORD fdwReason, PVOID ptr) +{ + if (fdwReason == SHIM_REASON_DLL_LOAD) + { + static const UNICODE_STRING DllPrefix = RTL_CONSTANT_STRING(L"msi"); + static const UNICODE_STRING DllPostfix = RTL_CONSTANT_STRING(L".tmp"); + PLDR_DATA_TABLE_ENTRY LdrEntry = ptr; + + BOOLEAN Prefix = RtlPrefixUnicodeString(&DllPrefix, &LdrEntry->BaseDllName, TRUE); + BOOLEAN Postfix = PostfixUnicodeString(&DllPostfix, &LdrEntry->BaseDllName); + ULONG ExtraChars = (LdrEntry->BaseDllName.Length - DllPrefix.Length - DllPostfix.Length) / sizeof(WCHAR); + + /* msiN[N].tmp */ + if (Prefix && Postfix && ExtraChars <= 2) + { + PIMAGE_NT_HEADERS ImageNtHeader = RtlImageNtHeader(LdrEntry->DllBase); + if (ImageNtHeader && ImageNtHeader->OptionalHeader.CheckSum == 0x176241) + { + SHIM_MSG("Module %wZ is a match, applying fixups\n", &LdrEntry->BaseDllName); + FixupDll(LdrEntry); + } + } + } + return TRUE; +} + +#include <implement_shim.inl> Propchange: trunk/reactos/dll/appcompat/shims/layer/vmhorizon.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/sdb/sysmain.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/sdb/sysmain.xml?rev=… ============================================================================== --- trunk/reactos/media/sdb/sysmain.xml [iso-8859-1] (original) +++ trunk/reactos/media/sdb/sysmain.xml [iso-8859-1] Thu Aug 17 16:27:56 2017 @@ -170,6 +170,9 @@ <SHIM NAME="DisableThemes"> <DLLFILE>acgenral.dll</DLLFILE> </SHIM> + <SHIM NAME="VMHorizonSetup"> + <DLLFILE>aclayers.dll</DLLFILE> + </SHIM> <SHIM NAME="HideShimEnv"> <DLLFILE>aclayers.dll</DLLFILE> @@ -280,6 +283,10 @@ <LAYER NAME="DisableThemes"> <SHIM_REF NAME="DisableThemes" /> </LAYER> + <LAYER NAME="VMHorizonSetup"> +  + <SHIM_REF NAME="VMHorizonSetup" /> + </LAYER> </DATABASE> </SDB>

1 0

[gadamopoulos] 75593: [COM_APITEST] -Add tests for CLSID_AttachmentServices.
by gadamopoulos＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: gadamopoulos Date: Thu Aug 17 16:01:29 2017 New Revision: 75593 URL: http://svn.reactos.org/svn/reactos?rev=75593&view=rev Log: [COM_APITEST] -Add tests for CLSID_AttachmentServices. Modified: trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/shdocvw.c Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Thu Aug 17 16:01:29 2017 @@ -454,7 +454,8 @@ { ID_NAME(IID_IDriveFolderExtOld), TRUE }, { ID_NAME(IID_IDriveFolderExt), TRUE }, { ID_NAME(IID_IPinnedListOld), TRUE }, - { ID_NAME(IID_IPinnedList), TRUE } + { ID_NAME(IID_IPinnedList), TRUE }, + { ID_NAME(IID_IAttachmentExecute), TRUE } }; static const INT KnownInterfaceCount = RTL_NUMBER_OF(KnownInterfaces); Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Thu Aug 17 16:01:29 2017 @@ -106,6 +106,7 @@ DEFINE_GUID(CLSID_TrackShellMenu, 0x8278F931, 0x2A3E, 0x11d2, 0x83, 0x8F, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0); DEFINE_GUID(CLSID_UserAssist, 0xdd313e04, 0xfeff, 0x11d1, 0x8e, 0xcd, 0x00, 0x00, 0xf8, 0x7a, 0x47, 0x0c); DEFINE_GUID(CLSID_WebSearchExt, 0x07798131, 0xaf23, 0x11d1, 0x91, 0x11, 0x00, 0xa0, 0xc9, 0x8b, 0xa6, 0x7d); +DEFINE_GUID(CLSID_AttachmentServices, 0x4125dd96, 0xe03a, 0x4103, 0x8f, 0x70, 0xe0, 0x59, 0x7d, 0x80, 0x3b, 0x9c); DEFINE_GUID(IID_IADesktopP2, 0xb22754e2, 0x4574, 0x11d1, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); DEFINE_GUID(IID_IAccessControl, 0xeedd23e0, 0x8410, 0x11ce, 0xa1, 0xc3, 0x08, 0x00, 0x2b, 0x2b, 0x8d, 0x8f); @@ -115,6 +116,7 @@ DEFINE_GUID(IID_IActiveDesktop, 0xf490eb00, 0x1240, 0x11d1, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); DEFINE_GUID(IID_IActiveDesktopP, 0x52502ee0, 0xec80, 0x11d0, 0x89, 0xab, 0x00, 0xc0, 0x4f, 0xc2, 0x97, 0x2d); DEFINE_GUID(IID_IAddressBarParser, 0xc9d81948, 0x443a, 0x40c7, 0x94, 0x5c, 0x5e, 0x17, 0x1b, 0x8c, 0x66, 0xb4); +DEFINE_GUID(IID_IAttachmentExecute, 0x73db1241, 0x1e85, 0x4581, 0x8e, 0x4f, 0xa8, 0x1e, 0x1d, 0x0f, 0x8c, 0x57); DEFINE_GUID(IID_IAugmentedShellFolder, 0x91ea3f8c, 0xc99b, 0x11d0, 0x98, 0x15, 0x00, 0xc0, 0x4f, 0xd9, 0x19, 0x72); DEFINE_GUID(IID_IAugmentedShellFolder2, 0x8db3b3f4, 0x6cfe, 0x11d1, 0x8a, 0xe9, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); DEFINE_GUID(IID_IBandHost, 0xb9075c7c, 0xd48e, 0x403f, 0xab, 0x99, 0xd6, 0xc7, 0x7a, 0x10, 0x84, 0xac); Modified: trunk/rostests/apitests/com/shdocvw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shdocvw.c?re… ============================================================================== --- trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] Thu Aug 17 16:01:29 2017 @@ -230,6 +230,13 @@ { 0x0, &IID_IUnknown }, } }, + { + ID_NAME(CLSID_AttachmentServices ), + { + { 0x0, &IID_IAttachmentExecute }, + { 0x0, &IID_IUnknown }, + } + }, }; static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces);

1 0

[gadamopoulos] 75592: [ADVAPI32] -RegOpenKeyExW: Call NtOpenKey again with aligned parameters if STATUS_DATATYPE_MISALIGNMENT was returned the first time. CORE-13689
by gadamopoulos＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: gadamopoulos Date: Thu Aug 17 14:37:24 2017 New Revision: 75592 URL: http://svn.reactos.org/svn/reactos?rev=75592&view=rev Log: [ADVAPI32] -RegOpenKeyExW: Call NtOpenKey again with aligned parameters if STATUS_DATATYPE_MISALIGNMENT was returned the first time. CORE-13689 Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Thu Aug 17 14:37:24 2017 @@ -3429,6 +3429,39 @@ samDesired, &ObjectAttributes); + if (Status == STATUS_DATATYPE_MISALIGNMENT) + { + HANDLE hAligned; + UNICODE_STRING AlignedString; + + Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &SubKeyString, + &AlignedString); + if (NT_SUCCESS(Status)) + { + /* Try again with aligned parameters */ + InitializeObjectAttributes(&ObjectAttributes, + &AlignedString, + Attributes, + KeyHandle, + NULL); + + Status = NtOpenKey(&hAligned, + samDesired, + &ObjectAttributes); + + RtlFreeUnicodeString(&AlignedString); + + if (NT_SUCCESS(Status)) + *phkResult = hAligned; + } + else + { + /* Restore the original error */ + Status = STATUS_DATATYPE_MISALIGNMENT; + } + } + if (!NT_SUCCESS(Status)) { ErrorCode = RtlNtStatusToDosError(Status);

1 0

[cfinck] 75591: [CDFS] - Add a basic CDFS filesystem library "cdfslib" for checking and formatting a CDFS volume. Checking is unimplemented and formatting not supported anyway :) - Use this library...
by cfinck＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: cfinck Date: Thu Aug 17 12:21:27 2017 New Revision: 75591 URL: http://svn.reactos.org/svn/reactos?rev=75591&view=rev Log: [CDFS] - Add a basic CDFS filesystem library "cdfslib" for checking and formatting a CDFS volume. Checking is unimplemented and formatting not supported anyway :) - Use this library in the new "ucdfs" DLL and that DLL in "autochk". Fixes the "Unable to verify a CDFS volume" message at boot. - Return the right device type (FILE_DEVICE_CD_ROM or FILE_DEVICE_DISK) in when querying volume information in cdfs.sys to get the proper icon in Explorer. Added: trunk/reactos/dll/win32/ucdfs/ trunk/reactos/dll/win32/ucdfs/CMakeLists.txt (with props) trunk/reactos/dll/win32/ucdfs/ucdfs.c (with props) trunk/reactos/dll/win32/ucdfs/ucdfs.rc (with props) trunk/reactos/dll/win32/ucdfs/ucdfs.spec (with props) trunk/reactos/sdk/lib/fslib/cdfslib/ trunk/reactos/sdk/lib/fslib/cdfslib/CMakeLists.txt (with props) trunk/reactos/sdk/lib/fslib/cdfslib/cdfslib.c (with props) Modified: trunk/reactos/base/system/autochk/autochk.c trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/drivers/filesystems/cdfs/volinfo.c trunk/reactos/sdk/lib/fslib/CMakeLists.txt Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Thu Aug 17 12:21:27 2017 @@ -283,7 +283,11 @@ { RtlInitUnicodeString(&ProviderDll, L"uffs.dll"); } - else + else if (wcscmp(FileSystem, L"CDFS") == 0) + { + RtlInitUnicodeString(&ProviderDll, L"ucdfs.dll"); + } + else { return NULL; } Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Thu Aug 17 12:21:27 2017 @@ -206,6 +206,7 @@ add_subdirectory(traffic) add_subdirectory(twain_32) add_subdirectory(ubtrfs) +add_subdirectory(ucdfs) add_subdirectory(uext2) add_subdirectory(ufat) add_subdirectory(ufatx) Added: trunk/reactos/dll/win32/ucdfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ucdfs/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/ucdfs/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/ucdfs/CMakeLists.txt [iso-8859-1] Thu Aug 17 12:21:27 2017 @@ -0,0 +1,13 @@ + +spec2def(ucdfs.dll ucdfs.spec) + +list(APPEND SOURCE + ucdfs.c + ucdfs.rc + ${CMAKE_CURRENT_BINARY_DIR}/ucdfs.def) + +add_library(ucdfs SHARED ${SOURCE}) +set_module_type(ucdfs nativedll) +target_link_libraries(ucdfs cdfslib) +add_importlibs(ucdfs ntdll) +add_cd_file(TARGET ucdfs DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/ucdfs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ucdfs/ucdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ucdfs/ucdfs.c?re… ============================================================================== --- trunk/reactos/dll/win32/ucdfs/ucdfs.c (added) +++ trunk/reactos/dll/win32/ucdfs/ucdfs.c [iso-8859-1] Thu Aug 17 12:21:27 2017 @@ -0,0 +1,20 @@ +/* + * PROJECT: CDFS File System Management + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: DLL Initialization + * COPYRIGHT: Copyright 2017 Colin Finck <colin(a)reactos.org> + */ + +#include <windef.h> + +INT WINAPI +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(hinstDLL); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(lpvReserved); + + return TRUE; +} Propchange: trunk/reactos/dll/win32/ucdfs/ucdfs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ucdfs/ucdfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ucdfs/ucdfs.rc?r… ============================================================================== --- trunk/reactos/dll/win32/ucdfs/ucdfs.rc (added) +++ trunk/reactos/dll/win32/ucdfs/ucdfs.rc [iso-8859-1] Thu Aug 17 12:21:27 2017 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "CDFS File System Management" +#define REACTOS_STR_INTERNAL_NAME "ucdfs" +#define REACTOS_STR_ORIGINAL_FILENAME "ucdfs.dll" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/ucdfs/ucdfs.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ucdfs/ucdfs.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ucdfs/ucdfs.spec… ============================================================================== --- trunk/reactos/dll/win32/ucdfs/ucdfs.spec (added) +++ trunk/reactos/dll/win32/ucdfs/ucdfs.spec [iso-8859-1] Thu Aug 17 12:21:27 2017 @@ -0,0 +1,2 @@ +@ stdcall ChkdskEx(ptr long long long long ptr) CdfsChkdsk +@ stdcall FormatEx(ptr long ptr long long ptr) CdfsFormat Propchange: trunk/reactos/dll/win32/ucdfs/ucdfs.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] Thu Aug 17 12:21:27 2017 @@ -159,7 +159,11 @@ if (*BufferLength < sizeof(FILE_FS_DEVICE_INFORMATION)) return STATUS_BUFFER_OVERFLOW; - FsDeviceInfo->DeviceType = FILE_DEVICE_CD_ROM; + if (DeviceObject->DeviceType == FILE_DEVICE_CD_ROM_FILE_SYSTEM) + FsDeviceInfo->DeviceType = FILE_DEVICE_CD_ROM; + else + FsDeviceInfo->DeviceType = FILE_DEVICE_DISK; + FsDeviceInfo->Characteristics = DeviceObject->Characteristics; DPRINT("FsdGetFsDeviceInformation() finished.\n"); Modified: trunk/reactos/sdk/lib/fslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/CMakeLists.t… ============================================================================== --- trunk/reactos/sdk/lib/fslib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/fslib/CMakeLists.txt [iso-8859-1] Thu Aug 17 12:21:27 2017 @@ -1,5 +1,6 @@ add_subdirectory(btrfslib) +add_subdirectory(cdfslib) add_subdirectory(ext2lib) add_subdirectory(ffslib) add_subdirectory(ntfslib) Added: trunk/reactos/sdk/lib/fslib/cdfslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/cdfslib/CMak… ============================================================================== --- trunk/reactos/sdk/lib/fslib/cdfslib/CMakeLists.txt (added) +++ trunk/reactos/sdk/lib/fslib/cdfslib/CMakeLists.txt [iso-8859-1] Thu Aug 17 12:21:27 2017 @@ -0,0 +1,3 @@ + +add_library(cdfslib cdfslib.c) +add_dependencies(cdfslib psdk) Propchange: trunk/reactos/sdk/lib/fslib/cdfslib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/sdk/lib/fslib/cdfslib/cdfslib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/cdfslib/cdfs… ============================================================================== --- trunk/reactos/sdk/lib/fslib/cdfslib/cdfslib.c (added) +++ trunk/reactos/sdk/lib/fslib/cdfslib/cdfslib.c [iso-8859-1] Thu Aug 17 12:21:27 2017 @@ -0,0 +1,37 @@ +/* + * PROJECT: ReactOS CDFS library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Checking and Formatting CDFS volumes + * COPYRIGHT: Copyright 2017 Colin Finck <colin(a)reactos.org> + */ + +#define NTOS_MODE_USER +#include <ndk/umtypes.h> +#include <fmifs/fmifs.h> + +#define NDEBUG +#include <debug.h> + +NTSTATUS NTAPI +CdfsChkdsk(IN PUNICODE_STRING DriveRoot, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +CdfsFormat(IN PUNICODE_STRING DriveRoot, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PUNICODE_STRING Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback) +{ + // Not possible for CDFS (ISO-9660). + return STATUS_NOT_SUPPORTED; +} Propchange: trunk/reactos/sdk/lib/fslib/cdfslib/cdfslib.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 75590: [FORMATTING] Convert all tabs to spaces in ntdddisk.h
by cfinck＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: cfinck Date: Thu Aug 17 12:18:28 2017 New Revision: 75590 URL: http://svn.reactos.org/svn/reactos?rev=75590&view=rev Log: [FORMATTING] Convert all tabs to spaces in ntdddisk.h Modified: trunk/reactos/sdk/include/psdk/ntdddisk.h Modified: trunk/reactos/sdk/include/psdk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ntdddisk.… ============================================================================== --- trunk/reactos/sdk/include/psdk/ntdddisk.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ntdddisk.h [iso-8859-1] Thu Aug 17 12:18:28 2017 @@ -239,40 +239,40 @@ #ifdef __REACTOS__ #define IsRecognizedPartition(PartitionType) ( \ - (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT_12)) || \ - (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_HUGE)) || \ - (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_IFS)) || \ - (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT32)) || \ - (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT32_XINT13)) || \ - (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_XINT13)) || \ - ((PartitionType) == PARTITION_FAT_12) || \ - ((PartitionType) == PARTITION_FAT_16) || \ - ((PartitionType) == PARTITION_HUGE) || \ - ((PartitionType) == PARTITION_IFS) || \ - ((PartitionType) == PARTITION_FAT32) || \ - ((PartitionType) == PARTITION_FAT32_XINT13) || \ - ((PartitionType) == PARTITION_XINT13) || \ - ((PartitionType) == PARTITION_LINUX) || \ - ((PartitionType) == PARTITION_OLD_LINUX) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT_12)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_HUGE)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_IFS)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT32)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT32_XINT13)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_XINT13)) || \ + ((PartitionType) == PARTITION_FAT_12) || \ + ((PartitionType) == PARTITION_FAT_16) || \ + ((PartitionType) == PARTITION_HUGE) || \ + ((PartitionType) == PARTITION_IFS) || \ + ((PartitionType) == PARTITION_FAT32) || \ + ((PartitionType) == PARTITION_FAT32_XINT13) || \ + ((PartitionType) == PARTITION_XINT13) || \ + ((PartitionType) == PARTITION_LINUX) || \ + ((PartitionType) == PARTITION_OLD_LINUX) || \ ((PartitionType) == PARTITION_ISO9660) || \ - ((PartitionType) == PARTITION_FREEBSD) || \ - ((PartitionType) == PARTITION_OPENBSD) || \ - ((PartitionType) == PARTITION_NETBSD)) + ((PartitionType) == PARTITION_FREEBSD) || \ + ((PartitionType) == PARTITION_OPENBSD) || \ + ((PartitionType) == PARTITION_NETBSD)) #else #define IsRecognizedPartition(PartitionType) ( \ - (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT_12)) || \ - (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_HUGE)) || \ - (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_IFS)) || \ - (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT32)) || \ - (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT32_XINT13)) || \ - (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_XINT13)) || \ - ((PartitionType) == PARTITION_FAT_12) || \ - ((PartitionType) == PARTITION_FAT_16) || \ - ((PartitionType) == PARTITION_HUGE) || \ - ((PartitionType) == PARTITION_IFS) || \ - ((PartitionType) == PARTITION_FAT32) || \ - ((PartitionType) == PARTITION_FAT32_XINT13) || \ - ((PartitionType) == PARTITION_XINT13)) + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT_12)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_HUGE)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_IFS)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT32)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT32_XINT13)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_XINT13)) || \ + ((PartitionType) == PARTITION_FAT_12) || \ + ((PartitionType) == PARTITION_FAT_16) || \ + ((PartitionType) == PARTITION_HUGE) || \ + ((PartitionType) == PARTITION_IFS) || \ + ((PartitionType) == PARTITION_FAT32) || \ + ((PartitionType) == PARTITION_FAT32_XINT13) || \ + ((PartitionType) == PARTITION_XINT13)) #endif #if(_WIN32_WINNT >= 0x0500) @@ -531,12 +531,12 @@ #define CAP_SMART_CMD 4 typedef struct _GETVERSIONINPARAMS { - UCHAR bVersion; - UCHAR bRevision; - UCHAR bReserved; - UCHAR bIDEDeviceMap; - ULONG fCapabilities; - ULONG dwReserved[4]; + UCHAR bVersion; + UCHAR bRevision; + UCHAR bReserved; + UCHAR bIDEDeviceMap; + ULONG fCapabilities; + ULONG dwReserved[4]; } GETVERSIONINPARAMS, *PGETVERSIONINPARAMS, *LPGETVERSIONINPARAMS; /* IDEREGS.bCommandReg constants */ @@ -548,24 +548,24 @@ #define SMART_CYL_HI 0xC2 typedef struct _IDEREGS { - UCHAR bFeaturesReg; - UCHAR bSectorCountReg; - UCHAR bSectorNumberReg; - UCHAR bCylLowReg; - UCHAR bCylHighReg; - UCHAR bDriveHeadReg; - UCHAR bCommandReg; - UCHAR bReserved; + UCHAR bFeaturesReg; + UCHAR bSectorCountReg; + UCHAR bSectorNumberReg; + UCHAR bCylLowReg; + UCHAR bCylHighReg; + UCHAR bDriveHeadReg; + UCHAR bCommandReg; + UCHAR bReserved; } IDEREGS, *PIDEREGS, *LPIDEREGS; #include <pshpack1.h> typedef struct _SENDCMDINPARAMS { - ULONG cBufferSize; - IDEREGS irDriveRegs; - UCHAR bDriveNumber; - UCHAR bReserved[3]; - ULONG dwReserved[4]; - UCHAR bBuffer[1]; + ULONG cBufferSize; + IDEREGS irDriveRegs; + UCHAR bDriveNumber; + UCHAR bReserved[3]; + ULONG dwReserved[4]; + UCHAR bBuffer[1]; } SENDCMDINPARAMS, *PSENDCMDINPARAMS, *LPSENDCMDINPARAMS; #include <poppack.h> @@ -590,10 +590,10 @@ #define SMART_EXTENDED_SELFTEST_CAPTIVE 130 typedef struct _DRIVERSTATUS { - UCHAR bDriverError; - UCHAR bIDEError; - UCHAR bReserved[2]; - ULONG dwReserved[2]; + UCHAR bDriverError; + UCHAR bIDEError; + UCHAR bReserved[2]; + ULONG dwReserved[2]; } DRIVERSTATUS, *PDRIVERSTATUS, *LPDRIVERSTATUS; #define READ_ATTRIBUTE_BUFFER_SIZE 512 @@ -603,9 +603,9 @@ #include <pshpack1.h> typedef struct _SENDCMDOUTPARAMS { - ULONG cBufferSize; - DRIVERSTATUS DriverStatus; - UCHAR bBuffer[1]; + ULONG cBufferSize; + DRIVERSTATUS DriverStatus; + UCHAR bBuffer[1]; } SENDCMDOUTPARAMS, *PSENDCMDOUTPARAMS, *LPSENDCMDOUTPARAMS; #include <poppack.h>

1 0

[ekohl] 75589: [ADVAPI32] RegQueryInfoKey: Initializing *lpcbSecurityDescriptor before calling NtQueryKey fixes the remaining api tests.
by ekohl＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: ekohl Date: Thu Aug 17 12:11:10 2017 New Revision: 75589 URL: http://svn.reactos.org/svn/reactos?rev=75589&view=rev Log: [ADVAPI32] RegQueryInfoKey: Initializing *lpcbSecurityDescriptor before calling NtQueryKey fixes the remaining api tests. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Thu Aug 17 12:11:10 2017 @@ -3729,6 +3729,9 @@ FullInfo = &FullInfoBuffer; } + if (lpcbSecurityDescriptor != NULL) + *lpcbSecurityDescriptor = 0; + Status = NtQueryKey(KeyHandle, KeyFullInformation, FullInfo, @@ -3786,10 +3789,7 @@ NULL, 0, lpcbSecurityDescriptor); - if (Status != STATUS_BUFFER_TOO_SMALL) - { - *lpcbSecurityDescriptor = 0; - } + TRACE("NtQuerySecurityObject() returned status 0x%X\n", Status); } if (lpftLastWriteTime != NULL)

1 0

[mjansen] 75588: [NTDLL_APITEST] Test unaligned pointers for NtOpenKey CORE-13689
by mjansen＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: mjansen Date: Thu Aug 17 11:42:13 2017 New Revision: 75588 URL: http://svn.reactos.org/svn/reactos?rev=75588&view=rev Log: [NTDLL_APITEST] Test unaligned pointers for NtOpenKey CORE-13689 Added: trunk/rostests/apitests/ntdll/NtOpenKey.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] Thu Aug 17 11:42:13 2017 @@ -13,6 +13,7 @@ NtLoadUnloadKey.c NtMapViewOfSection.c NtMutant.c + NtOpenKey.c NtOpenProcessToken.c NtOpenThreadToken.c NtProtectVirtualMemory.c Added: trunk/rostests/apitests/ntdll/NtOpenKey.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtOpenKey.… ============================================================================== --- trunk/rostests/apitests/ntdll/NtOpenKey.c (added) +++ trunk/rostests/apitests/ntdll/NtOpenKey.c [iso-8859-1] Thu Aug 17 11:42:13 2017 @@ -0,0 +1,58 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for NtOpenKey data alignment + * PROGRAMMER: Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include <apitest.h> + +#include <ntndk.h> + + +#define TEST_STR L"\\Registry\\Machine\\SOFTWARE" + + + +START_TEST(NtOpenKey) +{ + OBJECT_ATTRIBUTES Object; + UNICODE_STRING String; + char GccShouldNotAlignThis[40 * 2]; + char GccShouldNotAlignThis2[20]; + PVOID Alias = GccShouldNotAlignThis + 1; + PVOID UnalignedKey = GccShouldNotAlignThis2 + 1; + + HANDLE KeyHandle; + NTSTATUS Status; + + memcpy(Alias, TEST_STR, sizeof(TEST_STR)); + + + RtlInitUnicodeString(&String, TEST_STR); + InitializeObjectAttributes(&Object, &String, OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &Object); + ok_ntstatus(Status, STATUS_SUCCESS); + + if (!NT_SUCCESS(Status)) + return; + + NtClose(KeyHandle); + + String.Buffer = Alias; + ok_hex(((ULONG_PTR)String.Buffer) % 2, 1); + Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &Object); + ok_ntstatus(Status, STATUS_DATATYPE_MISALIGNMENT); // FIXME: Later windows versions succeed here. + if (NT_SUCCESS(Status)) + NtClose(KeyHandle); + + RtlInitUnicodeString(&String, TEST_STR); + ok_hex(((ULONG_PTR)UnalignedKey) % 2, 1); + Status = NtOpenKey(UnalignedKey, KEY_QUERY_VALUE, &Object); + ok_ntstatus(Status, STATUS_SUCCESS); + if (NT_SUCCESS(Status)) + { + NtClose(*(HANDLE*)(UnalignedKey)); + } +} Propchange: trunk/rostests/apitests/ntdll/NtOpenKey.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] Thu Aug 17 11:42:13 2017 @@ -16,6 +16,7 @@ extern void func_NtLoadUnloadKey(void); extern void func_NtMapViewOfSection(void); extern void func_NtMutant(void); +extern void func_NtOpenKey(void); extern void func_NtOpenProcessToken(void); extern void func_NtOpenThreadToken(void); extern void func_NtProtectVirtualMemory(void); @@ -72,6 +73,7 @@ { "NtLoadUnloadKey", func_NtLoadUnloadKey }, { "NtMapViewOfSection", func_NtMapViewOfSection }, { "NtMutant", func_NtMutant }, + { "NtOpenKey", func_NtOpenKey }, { "NtOpenProcessToken", func_NtOpenProcessToken }, { "NtOpenThreadToken", func_NtOpenThreadToken }, { "NtProtectVirtualMemory", func_NtProtectVirtualMemory },

1 0

[mjansen] 75587: [ADVAPI32_APITEST] Addendum to 75585, use void pointers to work around gcc ignoring pshpack1.
by mjansen＠svn.reactos.org 17 Aug '17

17 Aug '17

Author: mjansen Date: Thu Aug 17 11:06:46 2017 New Revision: 75587 URL: http://svn.reactos.org/svn/reactos?rev=75587&view=rev Log: [ADVAPI32_APITEST] Addendum to 75585, use void pointers to work around gcc ignoring pshpack1. Modified: trunk/rostests/apitests/advapi32/RegOpenKeyExW.c Modified: trunk/rostests/apitests/advapi32/RegOpenKeyExW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/RegOpen… ============================================================================== --- trunk/rostests/apitests/advapi32/RegOpenKeyExW.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/RegOpenKeyExW.c [iso-8859-1] Thu Aug 17 11:06:46 2017 @@ -2,25 +2,12 @@ * PROJECT: ReactOS api tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Test for the RegOpenKeyExW alignment - * PROGRAMMER: Mark Jansen <mark.jansen(a)reactos.org> + * PROGRAMMER: Mark Jansen (mark.jansen(a)reactos.org) */ #include <apitest.h> #define WIN32_NO_STATUS #include <winreg.h> - -#include <pshpack1.h> -struct Unalignment1 -{ - char dum; - WCHAR buffer[20]; -} Unalignment1; -struct Unalignment2 -{ - char dum; - HKEY hk; -} Unalignment2; -#include <poppack.h> #define TEST_STR L".exe" @@ -28,13 +15,14 @@ START_TEST(RegOpenKeyExW) { - struct Unalignment1 un; - struct Unalignment2 un2; + char GccShouldNotAlignThis[20 * 2]; + char GccShouldNotAlignThis2[20]; + PVOID Alias = GccShouldNotAlignThis + 1; + PVOID UnalignedKey = GccShouldNotAlignThis2 + 1; HKEY hk; LONG lRes; - memcpy(un.buffer, TEST_STR, sizeof(TEST_STR)); - un2.hk = 0; + memcpy(Alias, TEST_STR, sizeof(TEST_STR)); lRes = RegOpenKeyExW(HKEY_CLASSES_ROOT, TEST_STR, 0, KEY_READ, &hk); ok_int(lRes, ERROR_SUCCESS); @@ -42,18 +30,17 @@ return; RegCloseKey(hk); - ok_hex(((ULONG_PTR)un.buffer) % 2, 1); - lRes = RegOpenKeyExW(HKEY_CLASSES_ROOT, un.buffer, 0, KEY_READ, &hk); + ok_hex(((ULONG_PTR)Alias) % 2, 1); + lRes = RegOpenKeyExW(HKEY_CLASSES_ROOT, Alias, 0, KEY_READ, &hk); ok_int(lRes, ERROR_SUCCESS); if (!lRes) RegCloseKey(hk); - ok_hex(((ULONG_PTR)&un2.hk) % 2, 1); - lRes = RegOpenKeyExW(HKEY_CLASSES_ROOT, TEST_STR, 0, KEY_READ, &un2.hk); + ok_hex(((ULONG_PTR)UnalignedKey) % 2, 1); + lRes = RegOpenKeyExW(HKEY_CLASSES_ROOT, TEST_STR, 0, KEY_READ, UnalignedKey); ok_int(lRes, ERROR_SUCCESS); if (!lRes) { - hk = un2.hk; - RegCloseKey(hk); + RegCloseKey(*(HKEY*)(UnalignedKey)); } }

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2017