Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [RAMDISK] Implement missing IOCTLs
by Bernhard Feichtinger 16 Sep '18

16 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d1ee2400a64f14764edd… commit 9d1ee2400a64f14764edda1199828dd8467c62eb Author: Bernhard Feichtinger <43303168+BieHDC(a)users.noreply.github.com> AuthorDate: Sat Sep 15 23:08:30 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 16 11:46:24 2018 +0200 [RAMDISK] Implement missing IOCTLs --- drivers/storage/class/ramdisk/ramdisk.c | 64 ++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 8 deletions(-) diff --git a/drivers/storage/class/ramdisk/ramdisk.c b/drivers/storage/class/ramdisk/ramdisk.c index 0bef2ef247..de6d2d5ca1 100644 --- a/drivers/storage/class/ramdisk/ramdisk.c +++ b/drivers/storage/class/ramdisk/ramdisk.c @@ -702,7 +702,7 @@ RamdiskCreateRamdisk(IN PDEVICE_OBJECT DeviceObject, Irp->IoStatus.Information = STATUS_SUCCESS; } - /* We're done */ + /* We are done */ return Status; } @@ -1025,7 +1025,7 @@ DoCopy: CurrentOffset.QuadPart += BytesRead; CurrentBase = (PVOID)((ULONG_PTR)CurrentBase + BytesRead); - /* Check if we're done */ + /* Check if we are done */ if (!BytesLeft) return Status; } } @@ -1195,7 +1195,7 @@ RamdiskDeviceControl(IN PDEVICE_OBJECT DeviceObject, DiskGeometry->MediaType = DriveExtension->DiskOptions.Fixed ? FixedMedia : RemovableMedia; - /* We're done */ + /* We are done */ Status = STATUS_SUCCESS; Information = sizeof(DISK_GEOMETRY); break; @@ -1225,7 +1225,7 @@ RamdiskDeviceControl(IN PDEVICE_OBJECT DeviceObject, Toc->TrackData[0].Control = TOC_DATA_TRACK; Toc->TrackData[0].TrackNumber = 1; - /* We're done */ + /* We are done */ Status = STATUS_SUCCESS; Information = RAMDISK_TOC_SIZE; break; @@ -1260,13 +1260,62 @@ RamdiskDeviceControl(IN PDEVICE_OBJECT DeviceObject, goto CallWorker; } - /* We're done */ + /* We are done */ Information = Irp->IoStatus.Information; break; } - case IOCTL_DISK_GET_DRIVE_LAYOUT: case IOCTL_DISK_GET_LENGTH_INFO: + { + PGET_LENGTH_INFORMATION LengthInformation = Irp->AssociatedIrp.SystemBuffer; + + /* Validate the length */ + if (IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength < sizeof(GET_LENGTH_INFORMATION)) + { + /* Invalid length */ + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + /* Fill it out */ + LengthInformation->Length = DriveExtension->DiskLength; + + /* We are done */ + Status = STATUS_SUCCESS; + Information = sizeof(GET_LENGTH_INFORMATION); + break; + } + case IOCTL_VOLUME_GET_GPT_ATTRIBUTES: + { + PVOLUME_GET_GPT_ATTRIBUTES_INFORMATION GptInformation; + + /* Validate the length */ + if (IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength < sizeof(VOLUME_GET_GPT_ATTRIBUTES_INFORMATION)) + { + /* Invalid length */ + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + /* Fill it out */ + GptInformation = Irp->AssociatedIrp.SystemBuffer; + GptInformation->GptAttributes = 0; + + /* Translate the Attributes */ + if (DriveExtension->DiskOptions.Readonly) + GptInformation->GptAttributes |= GPT_BASIC_DATA_ATTRIBUTE_READ_ONLY; + if (DriveExtension->DiskOptions.Hidden) + GptInformation->GptAttributes |= GPT_BASIC_DATA_ATTRIBUTE_HIDDEN; + if (DriveExtension->DiskOptions.NoDriveLetter) + GptInformation->GptAttributes |= GPT_BASIC_DATA_ATTRIBUTE_NO_DRIVE_LETTER; + + /* We are done */ + Status = STATUS_SUCCESS; + Information = sizeof(VOLUME_GET_GPT_ATTRIBUTES_INFORMATION); + break; + } + + case IOCTL_DISK_GET_DRIVE_LAYOUT: case IOCTL_DISK_IS_WRITABLE: case IOCTL_SCSI_MINIPORT: case IOCTL_STORAGE_QUERY_PROPERTY: @@ -1274,7 +1323,6 @@ RamdiskDeviceControl(IN PDEVICE_OBJECT DeviceObject, case IOCTL_MOUNTDEV_QUERY_STABLE_GUID: case IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS: case IOCTL_VOLUME_SET_GPT_ATTRIBUTES: - case IOCTL_VOLUME_GET_GPT_ATTRIBUTES: case IOCTL_VOLUME_OFFLINE: { UNIMPLEMENTED_DBGBREAK("IOCTL: 0x%lx is UNIMPLEMENTED!\n", @@ -2456,7 +2504,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, Status = RamdiskAddDevice(DriverObject, PhysicalDeviceObject); if (NT_SUCCESS(Status)) { - /* We're done */ + /* We are done */ PhysicalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; Status = STATUS_SUCCESS; }

1 0

04/04: [KERNEL32] Ensure the PebLock is always released in FlsFree
by Mark Jansen 15 Sep '18

15 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12654d28522a70618de16… commit 12654d28522a70618de162912f6a97c3e59c0ff1 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri May 11 22:23:52 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Sep 15 17:56:03 2018 +0200 [KERNEL32] Ensure the PebLock is always released in FlsFree --- dll/win32/kernel32/client/fiber.c | 56 ++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/dll/win32/kernel32/client/fiber.c b/dll/win32/kernel32/client/fiber.c index 47d2616e66..1b1e1e37ac 100644 --- a/dll/win32/kernel32/client/fiber.c +++ b/dll/win32/kernel32/client/fiber.c @@ -1,12 +1,12 @@ /* - * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS System Libraries - * FILE: dll/win32/kernel32/client/fiber.c + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Fiber Implementation - * PROGRAMMERS: - * Alex Ionescu (alex(a)relsoft.net) - * KJK::Hyperion <noog(a)libero.it> + * COPYRIGHT: Copyright 2005-2011 Alex Ionescu (alex(a)relsoft.net) + * Copyright 2003-2008 KJK::Hyperion (noog(a)libero.it) + * Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) */ + #include <k32.h> #include <ndk/rtltypes.h> @@ -410,36 +410,44 @@ FlsFree(DWORD dwFlsIndex) RtlAcquirePebLock(); - ret = RtlAreBitsSet(Peb->FlsBitmap, dwFlsIndex, 1); - if (ret) + _SEH2_TRY { - PLIST_ENTRY Entry; - PFLS_CALLBACK_FUNCTION lpCallback; - - RtlClearBits(Peb->FlsBitmap, dwFlsIndex, 1); - lpCallback = Peb->FlsCallback[dwFlsIndex]; - Peb->FlsCallback[dwFlsIndex] = NULL; - - for (Entry = Peb->FlsListHead.Flink; Entry != &Peb->FlsListHead; Entry = Entry->Flink) + ret = RtlAreBitsSet(Peb->FlsBitmap, dwFlsIndex, 1); + if (ret) { - PRTL_FLS_DATA pFlsData; + PLIST_ENTRY Entry; + PFLS_CALLBACK_FUNCTION lpCallback; + + RtlClearBits(Peb->FlsBitmap, dwFlsIndex, 1); + lpCallback = Peb->FlsCallback[dwFlsIndex]; - pFlsData = CONTAINING_RECORD(Entry, RTL_FLS_DATA, ListEntry); - if (pFlsData->Data[dwFlsIndex]) + for (Entry = Peb->FlsListHead.Flink; Entry != &Peb->FlsListHead; Entry = Entry->Flink) { - if (lpCallback) + PRTL_FLS_DATA pFlsData; + + pFlsData = CONTAINING_RECORD(Entry, RTL_FLS_DATA, ListEntry); + if (pFlsData->Data[dwFlsIndex]) { - lpCallback(pFlsData->Data[dwFlsIndex]); + if (lpCallback) + { + lpCallback(pFlsData->Data[dwFlsIndex]); + } + pFlsData->Data[dwFlsIndex] = NULL; } - pFlsData->Data[dwFlsIndex] = NULL; } + Peb->FlsCallback[dwFlsIndex] = NULL; + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); } } - else + _SEH2_FINALLY { - SetLastError(ERROR_INVALID_PARAMETER); + RtlReleasePebLock(); } - RtlReleasePebLock(); + _SEH2_END; + return ret; }

1 0

03/04: [KERNEL32_APITEST] Test FLS locking & exception behavior.
by Mark Jansen 15 Sep '18

15 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6e3cf3c03633effca22e… commit b6e3cf3c03633effca22e9a2605187f8ea13f2d8 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri May 11 22:22:47 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Sep 15 17:56:03 2018 +0200 [KERNEL32_APITEST] Test FLS locking & exception behavior. --- modules/rostests/apitests/kernel32/FLS.c | 84 +++++++++++++++++++++++++++++--- 1 file changed, 76 insertions(+), 8 deletions(-) diff --git a/modules/rostests/apitests/kernel32/FLS.c b/modules/rostests/apitests/kernel32/FLS.c index 769b5be597..3d40df7608 100644 --- a/modules/rostests/apitests/kernel32/FLS.c +++ b/modules/rostests/apitests/kernel32/FLS.c @@ -24,6 +24,10 @@ PVOID g_FlsData1 = NULL; LONG g_FlsCalled1 = 0; PVOID g_FlsData2 = NULL; LONG g_FlsCalled2 = 0; +PVOID g_FlsData3 = NULL; +LONG g_FlsCalled3 = 0; +BOOL g_FlsExcept3 = FALSE; + VOID WINAPI FlsCallback1(PVOID lpFlsData) { @@ -37,6 +41,18 @@ VOID WINAPI FlsCallback2(PVOID lpFlsData) InterlockedIncrement(&g_FlsCalled2); } +VOID WINAPI FlsCallback3(PVOID lpFlsData) +{ + ok(lpFlsData == g_FlsData3, "Expected g_FlsData3(%p), got %p\n", g_FlsData3, lpFlsData); + + if (g_WinVersion <= WINVER_2003) + ok(RtlIsCriticalSectionLockedByThread(NtCurrentPeb()->FastPebLock), "Expected lock on PEB\n"); + InterlockedIncrement(&g_FlsCalled3); + if (g_FlsExcept3) + { + RaiseException(ERROR_INVALID_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, NULL); + } +} typedef struct _FLS_CALLBACK_INFO { @@ -78,11 +94,14 @@ void ok_fls_(DWORD dwIndex, PVOID pValue, PFLS_CALLBACK_FUNCTION lpCallback) dwIndex, lpCallback, FlsCallback[dwIndex].lpCallback); - winetest_ok(FlsCallback[dwIndex].Unknown == NULL, - "Expected FlsCallback[%lu].Unknown to be %p, was %p\n", - dwIndex, - NULL, - FlsCallback[dwIndex].Unknown); + if (lpCallback != &FlsCallback3 || !g_FlsExcept3) + { + winetest_ok(FlsCallback[dwIndex].Unknown == NULL, + "Expected FlsCallback[%lu].Unknown to be %p, was %p\n", + dwIndex, + NULL, + FlsCallback[dwIndex].Unknown); + } } winetest_ok(FlsData[dwIndex + 2] == pValue, "Expected FlsData[%lu + 2] to be %p, was %p\n", @@ -113,7 +132,8 @@ static VOID init_funcs(void) START_TEST(FLS) { RTL_OSVERSIONINFOW rtlinfo = { sizeof(rtlinfo) }; - DWORD dwIndex1, dwIndex2; + DWORD dwIndex1, dwIndex2, dwIndex3, dwErr; + BOOL bRet; init_funcs(); if (!pFlsAlloc || !pFlsFree || !pFlsGetValue || !pFlsSetValue) @@ -131,7 +151,11 @@ START_TEST(FLS) ok(dwIndex2 != FLS_OUT_OF_INDEXES, "Unable to allocate FLS index\n"); ok(dwIndex1 != dwIndex2, "Expected different indexes, got %lu\n", dwIndex1); - if (dwIndex1 == FLS_OUT_OF_INDEXES || dwIndex2 == FLS_OUT_OF_INDEXES) + dwIndex3 = pFlsAlloc(FlsCallback3); + ok(dwIndex3 != FLS_OUT_OF_INDEXES, "Unable to allocate FLS index\n"); + ok(dwIndex1 != dwIndex3, "Expected different indexes, got %lu\n", dwIndex1); + + if (dwIndex1 == FLS_OUT_OF_INDEXES || dwIndex2 == FLS_OUT_OF_INDEXES || dwIndex3 == FLS_OUT_OF_INDEXES) { skip("Unable to continue test\n"); return; @@ -139,31 +163,75 @@ START_TEST(FLS) ok_fls(dwIndex1, g_FlsData1, &FlsCallback1); ok_fls(dwIndex2, g_FlsData2, &FlsCallback2); + ok_fls(dwIndex3, g_FlsData3, &FlsCallback3); g_FlsData1 = (PVOID)0x123456; ok(pFlsSetValue(dwIndex1, g_FlsData1), "FlsSetValue(%lu, %p) failed\n", dwIndex1, g_FlsData1); ok_fls(dwIndex1, g_FlsData1, &FlsCallback1); ok_fls(dwIndex2, g_FlsData2, &FlsCallback2); + ok_fls(dwIndex3, g_FlsData3, &FlsCallback3); ok_int(g_FlsCalled1, 0); ok_int(g_FlsCalled2, 0); + ok_int(g_FlsCalled3, 0); g_FlsData2 = (PVOID)0x9876112; ok(pFlsSetValue(dwIndex2, g_FlsData2), "FlsSetValue(%lu, %p) failed\n", dwIndex2, g_FlsData2); ok_fls(dwIndex1, g_FlsData1, &FlsCallback1); ok_fls(dwIndex2, g_FlsData2, &FlsCallback2); + ok_fls(dwIndex3, g_FlsData3, &FlsCallback3); + ok_int(g_FlsCalled1, 0); ok_int(g_FlsCalled2, 0); + ok_int(g_FlsCalled3, 0); - ok(pFlsFree(dwIndex1), "FlsFree(%lu) failed\n", dwIndex1); + g_FlsData3 = (PVOID)0x98762; + ok(pFlsSetValue(dwIndex3, g_FlsData3), "FlsSetValue(%lu, %p) failed\n", dwIndex3, g_FlsData3); + + ok_fls(dwIndex1, g_FlsData1, &FlsCallback1); + ok_fls(dwIndex2, g_FlsData2, &FlsCallback2); + ok_fls(dwIndex3, g_FlsData3, &FlsCallback3); + + ok_int(g_FlsCalled1, 0); + ok_int(g_FlsCalled2, 0); + ok_int(g_FlsCalled3, 0); + + ok(pFlsFree(dwIndex1) == TRUE, "FlsFree(%lu) failed\n", dwIndex1); g_FlsData1 = NULL; ok_fls(dwIndex1, g_FlsData1, NULL); ok_fls(dwIndex2, g_FlsData2, &FlsCallback2); + ok_fls(dwIndex3, g_FlsData3, &FlsCallback3); + + ok_int(g_FlsCalled1, 1); + ok_int(g_FlsCalled2, 0); + ok_int(g_FlsCalled3, 0); + + g_FlsExcept3 = TRUE; + _SEH2_TRY + { + bRet = pFlsFree(dwIndex3); + dwErr = GetLastError(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bRet = 12345; + dwErr = 0xdeaddead; + } + _SEH2_END; + ok(RtlIsCriticalSectionLockedByThread(NtCurrentPeb()->FastPebLock) == FALSE, "Expected no lock on PEB\n"); + + ok(bRet == 12345, "FlsFree(%lu) should have failed, got %u\n", dwIndex3, bRet); + ok(dwErr == 0xdeaddead, "Expected GetLastError() to be 0xdeaddead, was %lx\n", dwErr); + + ok_fls(dwIndex1, g_FlsData1, NULL); + ok_fls(dwIndex2, g_FlsData2, &FlsCallback2); + ok_fls(dwIndex3, g_FlsData3, &FlsCallback3); ok_int(g_FlsCalled1, 1); ok_int(g_FlsCalled2, 0); + ok_int(g_FlsCalled3, 1); }

1 0

02/04: [NTDLL][KERNEL32] Implement FLS callbacks.
by Mark Jansen 15 Sep '18

15 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06eb99edefc821c932492… commit 06eb99edefc821c9324923eae9eeebf0cf6f9d48 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu May 10 22:23:16 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Sep 15 17:56:03 2018 +0200 [NTDLL][KERNEL32] Implement FLS callbacks. --- dll/ntdll/ldr/ldrinit.c | 26 +++++++++- dll/win32/kernel32/client/fiber.c | 101 ++++++++++++++++++++++++++++---------- sdk/include/ndk/rtltypes.h | 11 +++++ 3 files changed, 109 insertions(+), 29 deletions(-) diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index 14f0272dd3..e40db1717a 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -1207,8 +1207,29 @@ LdrShutdownThread(VOID) /* Check for FLS Data */ if (Teb->FlsData) { - /* FIXME */ - DPRINT1("We don't support FLS Data yet\n"); + /* Mimic BaseRundownFls */ + ULONG n, FlsHighIndex; + PRTL_FLS_DATA pFlsData; + PFLS_CALLBACK_FUNCTION lpCallback; + + pFlsData = Teb->FlsData; + + RtlAcquirePebLock(); + FlsHighIndex = NtCurrentPeb()->FlsHighIndex; + RemoveEntryList(&pFlsData->ListEntry); + RtlReleasePebLock(); + + for (n = 1; n <= FlsHighIndex; ++n) + { + lpCallback = NtCurrentPeb()->FlsCallback[n]; + if (lpCallback && pFlsData->Data[n]) + { + lpCallback(pFlsData->Data[n]); + } + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, pFlsData); + Teb->FlsData = NULL; } /* Check for Fiber data */ @@ -1786,6 +1807,7 @@ LdrpInitializeProcess(IN PCONTEXT Context, Peb->FlsBitmapBits, FLS_MAXIMUM_AVAILABLE); RtlSetBit(&FlsBitMap, 0); + InitializeListHead(&Peb->FlsListHead); /* Initialize TLS Bitmap */ RtlInitializeBitMap(&TlsBitMap, diff --git a/dll/win32/kernel32/client/fiber.c b/dll/win32/kernel32/client/fiber.c index a3a38ecd7f..47d2616e66 100644 --- a/dll/win32/kernel32/client/fiber.c +++ b/dll/win32/kernel32/client/fiber.c @@ -8,6 +8,7 @@ * KJK::Hyperion <noog(a)libero.it> */ #include <k32.h> +#include <ndk/rtltypes.h> #define NDEBUG #include <debug.h> @@ -21,6 +22,7 @@ C_ASSERT(FIELD_OFFSET(FIBER, FiberContext) == 0x14); C_ASSERT(FIELD_OFFSET(FIBER, GuaranteedStackBytes) == 0x2E0); C_ASSERT(FIELD_OFFSET(FIBER, FlsData) == 0x2E4); C_ASSERT(FIELD_OFFSET(FIBER, ActivationContextStackPointer) == 0x2E8); +C_ASSERT(RTL_FLS_MAXIMUM_AVAILABLE == FLS_MAXIMUM_AVAILABLE); #endif // _M_IX86 /* PRIVATE FUNCTIONS **********************************************************/ @@ -29,7 +31,27 @@ VOID WINAPI BaseRundownFls(_In_ PVOID FlsData) { - /* No FLS support yet */ + ULONG n, FlsHighIndex; + PRTL_FLS_DATA pFlsData; + PFLS_CALLBACK_FUNCTION lpCallback; + + pFlsData = FlsData; + + RtlAcquirePebLock(); + FlsHighIndex = NtCurrentPeb()->FlsHighIndex; + RemoveEntryList(&pFlsData->ListEntry); + RtlReleasePebLock(); + + for (n = 1; n <= FlsHighIndex; ++n) + { + lpCallback = NtCurrentPeb()->FlsCallback[n]; + if (lpCallback && pFlsData->Data[n]) + { + lpCallback(pFlsData->Data[n]); + } + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, FlsData); } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -61,7 +83,7 @@ ConvertFiberToThread(VOID) /* Free the fiber */ ASSERT(FiberData != NULL); - RtlFreeHeap(GetProcessHeap(), + RtlFreeHeap(RtlGetProcessHeap(), 0, FiberData); @@ -295,7 +317,7 @@ DeleteFiber(_In_ LPVOID lpFiber) RtlFreeActivationContextStack(Fiber->ActivationContextStackPointer); /* Free the fiber data */ - RtlFreeHeap(GetProcessHeap(), + RtlFreeHeap(RtlGetProcessHeap(), 0, lpFiber); } @@ -320,11 +342,11 @@ FlsAlloc(PFLS_CALLBACK_FUNCTION lpCallback) { DWORD dwFlsIndex; PPEB Peb = NtCurrentPeb(); - PVOID *ppFlsSlots; + PRTL_FLS_DATA pFlsData; RtlAcquirePebLock(); - ppFlsSlots = NtCurrentTeb()->FlsData; + pFlsData = NtCurrentTeb()->FlsData; if (!Peb->FlsCallback && !(Peb->FlsCallback = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, @@ -338,9 +360,8 @@ FlsAlloc(PFLS_CALLBACK_FUNCTION lpCallback) dwFlsIndex = RtlFindClearBitsAndSet(Peb->FlsBitmap, 1, 1); if (dwFlsIndex != FLS_OUT_OF_INDEXES) { - if (!ppFlsSlots && - !(ppFlsSlots = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, - (FLS_MAXIMUM_AVAILABLE + 2) * sizeof(PVOID)))) + if (!pFlsData && + !(pFlsData = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RTL_FLS_DATA)))) { RtlClearBits(Peb->FlsBitmap, dwFlsIndex, 1); dwFlsIndex = FLS_OUT_OF_INDEXES; @@ -349,13 +370,16 @@ FlsAlloc(PFLS_CALLBACK_FUNCTION lpCallback) else { if (!NtCurrentTeb()->FlsData) - NtCurrentTeb()->FlsData = ppFlsSlots; + { + NtCurrentTeb()->FlsData = pFlsData; + InsertTailList(&Peb->FlsListHead, &pFlsData->ListEntry); + } - if (lpCallback) - DPRINT1("FlsAlloc: Got lpCallback 0x%p, UNIMPLEMENTED!\n", lpCallback); - - ppFlsSlots[dwFlsIndex + 2] = NULL; /* clear the value */ + pFlsData->Data[dwFlsIndex] = NULL; /* clear the value */ Peb->FlsCallback[dwFlsIndex] = lpCallback; + + if (dwFlsIndex > Peb->FlsHighIndex) + Peb->FlsHighIndex = dwFlsIndex; } } else @@ -377,7 +401,6 @@ FlsFree(DWORD dwFlsIndex) { BOOL ret; PPEB Peb = NtCurrentPeb(); - PVOID *ppFlsSlots; if (dwFlsIndex >= FLS_MAXIMUM_AVAILABLE) { @@ -387,15 +410,30 @@ FlsFree(DWORD dwFlsIndex) RtlAcquirePebLock(); - ppFlsSlots = NtCurrentTeb()->FlsData; ret = RtlAreBitsSet(Peb->FlsBitmap, dwFlsIndex, 1); if (ret) { + PLIST_ENTRY Entry; + PFLS_CALLBACK_FUNCTION lpCallback; + RtlClearBits(Peb->FlsBitmap, dwFlsIndex, 1); - /* FIXME: call Fls callback */ - /* FIXME: add equivalent of ThreadZeroTlsCell here */ - if (ppFlsSlots) - ppFlsSlots[dwFlsIndex + 2] = NULL; + lpCallback = Peb->FlsCallback[dwFlsIndex]; + Peb->FlsCallback[dwFlsIndex] = NULL; + + for (Entry = Peb->FlsListHead.Flink; Entry != &Peb->FlsListHead; Entry = Entry->Flink) + { + PRTL_FLS_DATA pFlsData; + + pFlsData = CONTAINING_RECORD(Entry, RTL_FLS_DATA, ListEntry); + if (pFlsData->Data[dwFlsIndex]) + { + if (lpCallback) + { + lpCallback(pFlsData->Data[dwFlsIndex]); + } + pFlsData->Data[dwFlsIndex] = NULL; + } + } } else { @@ -413,17 +451,17 @@ PVOID WINAPI FlsGetValue(DWORD dwFlsIndex) { - PVOID *ppFlsSlots; + PRTL_FLS_DATA pFlsData; - ppFlsSlots = NtCurrentTeb()->FlsData; - if (!dwFlsIndex || dwFlsIndex >= FLS_MAXIMUM_AVAILABLE || !ppFlsSlots) + pFlsData = NtCurrentTeb()->FlsData; + if (!dwFlsIndex || dwFlsIndex >= FLS_MAXIMUM_AVAILABLE || !pFlsData) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } SetLastError(ERROR_SUCCESS); - return ppFlsSlots[dwFlsIndex + 2]; + return pFlsData->Data[dwFlsIndex]; } @@ -435,22 +473,31 @@ WINAPI FlsSetValue(DWORD dwFlsIndex, PVOID lpFlsData) { - PVOID *ppFlsSlots; + PRTL_FLS_DATA pFlsData; if (!dwFlsIndex || dwFlsIndex >= FLS_MAXIMUM_AVAILABLE) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + + pFlsData = NtCurrentTeb()->FlsData; + if (!NtCurrentTeb()->FlsData && !(NtCurrentTeb()->FlsData = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, - (FLS_MAXIMUM_AVAILABLE + 2) * sizeof(PVOID)))) + sizeof(RTL_FLS_DATA)))) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - ppFlsSlots = NtCurrentTeb()->FlsData; - ppFlsSlots[dwFlsIndex + 2] = lpFlsData; + if (!pFlsData) + { + pFlsData = NtCurrentTeb()->FlsData; + RtlAcquirePebLock(); + InsertTailList(&NtCurrentPeb()->FlsListHead, &pFlsData->ListEntry); + RtlReleasePebLock(); + } + pFlsData->Data[dwFlsIndex] = lpFlsData; return TRUE; } diff --git a/sdk/include/ndk/rtltypes.h b/sdk/include/ndk/rtltypes.h index 7070564389..02d65a2971 100644 --- a/sdk/include/ndk/rtltypes.h +++ b/sdk/include/ndk/rtltypes.h @@ -1210,6 +1210,17 @@ typedef struct _RTL_DEBUG_INFORMATION PVOID Reserved[4]; } RTL_DEBUG_INFORMATION, *PRTL_DEBUG_INFORMATION; +// +// Fiber local storage data +// +#define RTL_FLS_MAXIMUM_AVAILABLE 128 +typedef struct _RTL_FLS_DATA +{ + LIST_ENTRY ListEntry; + PVOID Data[RTL_FLS_MAXIMUM_AVAILABLE]; +} RTL_FLS_DATA, *PRTL_FLS_DATA; + + // // Unload Event Trace Structure for RtlGetUnloadEventTrace //

1 0

01/04: [KERNEL32_APITEST] Add test exposing FLS internals.
by Mark Jansen 15 Sep '18

15 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0f8f1c7d907f5fa27ad7… commit f0f8f1c7d907f5fa27ad7848e6ba9e82a9117361 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue May 8 22:09:04 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Sep 15 17:55:57 2018 +0200 [KERNEL32_APITEST] Add test exposing FLS internals. --- modules/rostests/apitests/kernel32/CMakeLists.txt | 1 + modules/rostests/apitests/kernel32/FLS.c | 169 ++++++++++++++++++++++ modules/rostests/apitests/kernel32/testlist.c | 2 + 3 files changed, 172 insertions(+) diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index 37c5b6adc8..455ee37920 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -11,6 +11,7 @@ list(APPEND SOURCE dosdev.c FindActCtxSectionStringW.c FindFiles.c + FLS.c FormatMessage.c GetComputerNameEx.c GetCurrentDirectory.c diff --git a/modules/rostests/apitests/kernel32/FLS.c b/modules/rostests/apitests/kernel32/FLS.c new file mode 100644 index 0000000000..769b5be597 --- /dev/null +++ b/modules/rostests/apitests/kernel32/FLS.c @@ -0,0 +1,169 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for FLS implementation details + * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" +#include <ndk/pstypes.h> +#include <ndk/rtlfuncs.h> + +/* XP does not have these functions */ +static DWORD (WINAPI *pFlsAlloc)(PFLS_CALLBACK_FUNCTION); +static BOOL (WINAPI *pFlsFree)(DWORD); +static PVOID (WINAPI *pFlsGetValue)(DWORD); +static BOOL (WINAPI *pFlsSetValue)(DWORD,PVOID); + + +#define NtCurrentPeb() (NtCurrentTeb()->ProcessEnvironmentBlock) +#define WINVER_2003 0x0502 + +static DWORD g_WinVersion = 0; +PVOID g_FlsData1 = NULL; +LONG g_FlsCalled1 = 0; +PVOID g_FlsData2 = NULL; +LONG g_FlsCalled2 = 0; + +VOID WINAPI FlsCallback1(PVOID lpFlsData) +{ + ok(lpFlsData == g_FlsData1, "Expected g_FlsData1(%p), got %p\n", g_FlsData1, lpFlsData); + InterlockedIncrement(&g_FlsCalled1); +} + +VOID WINAPI FlsCallback2(PVOID lpFlsData) +{ + ok(lpFlsData == g_FlsData2, "Expected g_FlsData2(%p), got %p\n", g_FlsData2, lpFlsData); + InterlockedIncrement(&g_FlsCalled2); +} + + +typedef struct _FLS_CALLBACK_INFO +{ + PFLS_CALLBACK_FUNCTION lpCallback; + PVOID Unknown; +} FLS_CALLBACK_INFO, *PFLS_CALLBACK_INFO; + + +void ok_fls_(DWORD dwIndex, PVOID pValue, PFLS_CALLBACK_FUNCTION lpCallback) +{ + PFLS_CALLBACK_INFO FlsCallback; + PVOID* FlsData; + PVOID gotValue; + + FlsCallback = (PFLS_CALLBACK_INFO)NtCurrentPeb()->FlsCallback; + FlsData = (PVOID*)NtCurrentTeb()->FlsData; + + winetest_ok(FlsData != NULL, "Expected FlsData\n"); + winetest_ok(FlsCallback != NULL, "Expected FlsCallback\n"); + + if (FlsData == NULL || FlsCallback == NULL) + { + winetest_skip("Unable to continue test\n"); + return; + } + + if (g_WinVersion <= WINVER_2003) + { + winetest_ok(NtCurrentPeb()->FlsCallback[dwIndex] == lpCallback, + "Expected NtCurrentPeb()->FlsCallback[%lu] to be %p, was %p\n", + dwIndex, + lpCallback, + NtCurrentPeb()->FlsCallback[dwIndex]); + } + else + { + winetest_ok(FlsCallback[dwIndex].lpCallback == lpCallback, + "Expected FlsCallback[%lu].lpCallback to be %p, was %p\n", + dwIndex, + lpCallback, + FlsCallback[dwIndex].lpCallback); + winetest_ok(FlsCallback[dwIndex].Unknown == NULL, + "Expected FlsCallback[%lu].Unknown to be %p, was %p\n", + dwIndex, + NULL, + FlsCallback[dwIndex].Unknown); + } + winetest_ok(FlsData[dwIndex + 2] == pValue, + "Expected FlsData[%lu + 2] to be %p, was %p\n", + dwIndex, + pValue, + FlsData[dwIndex + 2]); + + gotValue = pFlsGetValue(dwIndex); + winetest_ok(gotValue == pValue, "Expected FlsGetValue(%lu) to be %p, was %p\n", dwIndex, pValue, gotValue); +} + +#define ok_fls (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : ok_fls_ + +static VOID init_funcs(void) +{ + HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hKernel32, #f); + X(FlsAlloc); + X(FlsFree); + X(FlsGetValue); + X(FlsSetValue); +#undef X +} + + + +START_TEST(FLS) +{ + RTL_OSVERSIONINFOW rtlinfo = { sizeof(rtlinfo) }; + DWORD dwIndex1, dwIndex2; + + init_funcs(); + if (!pFlsAlloc || !pFlsFree || !pFlsGetValue || !pFlsSetValue) + { + skip("Fls functions not available\n"); + return; + } + + RtlGetVersion(&rtlinfo); + g_WinVersion = (rtlinfo.dwMajorVersion << 8) | rtlinfo.dwMinorVersion; + + dwIndex1 = pFlsAlloc(FlsCallback1); + ok(dwIndex1 != FLS_OUT_OF_INDEXES, "Unable to allocate FLS index\n"); + dwIndex2 = pFlsAlloc(FlsCallback2); + ok(dwIndex2 != FLS_OUT_OF_INDEXES, "Unable to allocate FLS index\n"); + ok(dwIndex1 != dwIndex2, "Expected different indexes, got %lu\n", dwIndex1); + + if (dwIndex1 == FLS_OUT_OF_INDEXES || dwIndex2 == FLS_OUT_OF_INDEXES) + { + skip("Unable to continue test\n"); + return; + } + + ok_fls(dwIndex1, g_FlsData1, &FlsCallback1); + ok_fls(dwIndex2, g_FlsData2, &FlsCallback2); + + g_FlsData1 = (PVOID)0x123456; + ok(pFlsSetValue(dwIndex1, g_FlsData1), "FlsSetValue(%lu, %p) failed\n", dwIndex1, g_FlsData1); + + ok_fls(dwIndex1, g_FlsData1, &FlsCallback1); + ok_fls(dwIndex2, g_FlsData2, &FlsCallback2); + + ok_int(g_FlsCalled1, 0); + ok_int(g_FlsCalled2, 0); + + g_FlsData2 = (PVOID)0x9876112; + ok(pFlsSetValue(dwIndex2, g_FlsData2), "FlsSetValue(%lu, %p) failed\n", dwIndex2, g_FlsData2); + + ok_fls(dwIndex1, g_FlsData1, &FlsCallback1); + ok_fls(dwIndex2, g_FlsData2, &FlsCallback2); + + ok_int(g_FlsCalled1, 0); + ok_int(g_FlsCalled2, 0); + + ok(pFlsFree(dwIndex1), "FlsFree(%lu) failed\n", dwIndex1); + g_FlsData1 = NULL; + + ok_fls(dwIndex1, g_FlsData1, NULL); + ok_fls(dwIndex2, g_FlsData2, &FlsCallback2); + + ok_int(g_FlsCalled1, 1); + ok_int(g_FlsCalled2, 0); +} diff --git a/modules/rostests/apitests/kernel32/testlist.c b/modules/rostests/apitests/kernel32/testlist.c index 6364cab804..8c671c1b68 100644 --- a/modules/rostests/apitests/kernel32/testlist.c +++ b/modules/rostests/apitests/kernel32/testlist.c @@ -10,6 +10,7 @@ extern void func_DeviceIoControl(void); extern void func_dosdev(void); extern void func_FindActCtxSectionStringW(void); extern void func_FindFiles(void); +extern void func_FLS(void); extern void func_FormatMessage(void); extern void func_GetComputerNameEx(void); extern void func_GetCurrentDirectory(void); @@ -41,6 +42,7 @@ const struct test winetest_testlist[] = { "dosdev", func_dosdev }, { "FindActCtxSectionStringW", func_FindActCtxSectionStringW }, { "FindFiles", func_FindFiles }, + { "FLS", func_FLS }, { "FormatMessage", func_FormatMessage }, { "GetComputerNameEx", func_GetComputerNameEx }, { "GetCurrentDirectory", func_GetCurrentDirectory },

1 0

01/01: [DESK] Add MonitorClassInstaller
by Eric Kohl 15 Sep '18

15 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e13ff1470ef2d78361b5b… commit e13ff1470ef2d78361b5b21cb3f5fe6641530b45 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Sep 15 14:10:01 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Sep 15 14:11:04 2018 +0200 [DESK] Add MonitorClassInstaller --- dll/cpl/desk/classinst.c | 11 ++++++++++- dll/cpl/desk/desk.spec | 1 + media/inf/monitor.inf | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dll/cpl/desk/classinst.c b/dll/cpl/desk/classinst.c index 8f34f834a4..576a6e7683 100644 --- a/dll/cpl/desk/classinst.c +++ b/dll/cpl/desk/classinst.c @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel * FILE: dll/cpl/desk/classinst.c - * PURPOSE: Display class installer + * PURPOSE: Class installers * * PROGRAMMERS: Herv� Poussineau (hpoussin(a)reactos.org) */ @@ -252,3 +252,12 @@ cleanup: return rc; } + +DWORD WINAPI +MonitorClassInstaller( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + return ERROR_DI_DO_DEFAULT; +} diff --git a/dll/cpl/desk/desk.spec b/dll/cpl/desk/desk.spec index 05de093688..ab02854516 100644 --- a/dll/cpl/desk/desk.spec +++ b/dll/cpl/desk/desk.spec @@ -3,3 +3,4 @@ @ stdcall DisplaySaveSettings(ptr ptr) @ stdcall InstallScreenSaverW(long long ptr long) @ stdcall InstallScreenSaverA(long long ptr long) +@ stdcall MonitorClassInstaller(long ptr ptr) diff --git a/media/inf/monitor.inf b/media/inf/monitor.inf index ef8aa6bcc2..3326510641 100644 --- a/media/inf/monitor.inf +++ b/media/inf/monitor.inf @@ -20,6 +20,7 @@ AddReg = MonitorClass.NT.AddReg [MonitorClass.NT.AddReg] HKR, , , 0, %MonitorClassName% HKR, , Icon, 0, "-1" +HKR, , Installer32, 0, "desk.cpl,MonitorClassInstaller" [Manufacturer] %StdMfg% = StdMfg

1 0

01/01: [SHELLBTRFS] Fix GCC build
by Pierre Schweitzer 15 Sep '18

15 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71ac5e6c654ad44db1eb5… commit 71ac5e6c654ad44db1eb5ba51e372540bc358309 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 15 10:54:00 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 15 10:54:00 2018 +0200 [SHELLBTRFS] Fix GCC build CORE-15048 --- dll/shellext/shellbtrfs/balance.cpp | 8 ++++++++ dll/shellext/shellbtrfs/contextmenu.cpp | 8 ++++++++ dll/shellext/shellbtrfs/recv.cpp | 8 ++++++++ dll/shellext/shellbtrfs/scrub.cpp | 8 ++++++++ dll/shellext/shellbtrfs/send.cpp | 16 ++++++++++++++++ 5 files changed, 48 insertions(+) diff --git a/dll/shellext/shellbtrfs/balance.cpp b/dll/shellext/shellbtrfs/balance.cpp index aa639a57d0..edcfecea51 100644 --- a/dll/shellext/shellbtrfs/balance.cpp +++ b/dll/shellext/shellbtrfs/balance.cpp @@ -1090,6 +1090,10 @@ static void unserialize(void* data, ULONG len, WCHAR* s) { } } +#ifdef __REACTOS__ +extern "C" { +#endif + void CALLBACK StartBalanceW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int nCmdShow) { WCHAR *s, *vol, *block; HANDLE h, token; @@ -1291,3 +1295,7 @@ void CALLBACK StopBalanceW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int n end: CloseHandle(token); } + +#ifdef __REACTOS__ +} /* extern "C" */ +#endif diff --git a/dll/shellext/shellbtrfs/contextmenu.cpp b/dll/shellext/shellbtrfs/contextmenu.cpp index a306190799..a5769be550 100644 --- a/dll/shellext/shellbtrfs/contextmenu.cpp +++ b/dll/shellext/shellbtrfs/contextmenu.cpp @@ -1718,6 +1718,10 @@ end: CloseHandle(source); } +#ifdef __REACTOS__ +extern "C" { +#endif + void CALLBACK ReflinkCopyW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int nCmdShow) { LPWSTR* args; int num_args; @@ -1796,3 +1800,7 @@ void CALLBACK ReflinkCopyW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int n end: LocalFree(args); } + +#ifdef __REACTOS__ +} /* extern "C" */ +#endif diff --git a/dll/shellext/shellbtrfs/recv.cpp b/dll/shellext/shellbtrfs/recv.cpp index 5c1ab3646e..f52a0092a4 100644 --- a/dll/shellext/shellbtrfs/recv.cpp +++ b/dll/shellext/shellbtrfs/recv.cpp @@ -1987,6 +1987,10 @@ void BtrfsRecv::Open(HWND hwnd, WCHAR* file, WCHAR* path, BOOL quiet) { } } +#ifdef __REACTOS__ +extern "C" { +#endif + void CALLBACK RecvSubvolGUIW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int nCmdShow) { OPENFILENAMEW ofn; WCHAR file[MAX_PATH]; @@ -2145,3 +2149,7 @@ void CALLBACK RecvSubvolW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int nC end: LocalFree(args); } + +#ifdef __REACTOS__ +} /* extern "C" */ +#endif diff --git a/dll/shellext/shellbtrfs/scrub.cpp b/dll/shellext/shellbtrfs/scrub.cpp index 87359a5561..1faaa9ec5d 100644 --- a/dll/shellext/shellbtrfs/scrub.cpp +++ b/dll/shellext/shellbtrfs/scrub.cpp @@ -566,6 +566,10 @@ static INT_PTR CALLBACK stub_ScrubDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam return FALSE; } +#ifdef __REACTOS__ +extern "C" { +#endif + void CALLBACK ShowScrubW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int nCmdShow) { HANDLE token; TOKEN_PRIVILEGES tp; @@ -694,3 +698,7 @@ void CALLBACK StopScrubW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int nCm end: LocalFree(args); } + +#ifdef __REACTOS__ +} /* extern "C" */ +#endif diff --git a/dll/shellext/shellbtrfs/send.cpp b/dll/shellext/shellbtrfs/send.cpp index cbe5f7e26c..a1ab8b49b6 100644 --- a/dll/shellext/shellbtrfs/send.cpp +++ b/dll/shellext/shellbtrfs/send.cpp @@ -547,6 +547,10 @@ void BtrfsSend::Open(HWND hwnd, LPWSTR path) { ShowError(hwnd, GetLastError()); } +#ifdef __REACTOS__ +extern "C" { +#endif + void CALLBACK SendSubvolGUIW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int nCmdShow) { HANDLE token; TOKEN_PRIVILEGES tp; @@ -585,6 +589,10 @@ void CALLBACK SendSubvolGUIW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int CloseHandle(token); } +#ifdef __REACTOS__ +} /* extern "C" */ +#endif + static void send_subvol(std::wstring subvol, std::wstring file, std::wstring parent, std::vector<std::wstring> clones) { char* buf; HANDLE dirh, stream; @@ -697,6 +705,10 @@ end3: free(buf); } +#ifdef __REACTOS__ +extern "C" { +#endif + void CALLBACK SendSubvolW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int nCmdShow) { LPWSTR* args; int num_args; @@ -755,3 +767,7 @@ void CALLBACK SendSubvolW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int nC end: LocalFree(args); } + +#ifdef __REACTOS__ +} /* extern "C" */ +#endif

1 0

01/01: [SHELLBTRFS] Add exports according to upstream .def file. CORE-15048
by Thomas Faber 15 Sep '18

15 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f47f2782901e5a13b13b… commit 0f47f2782901e5a13b13b6c0177cc76c09b7ac7f Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Sep 15 09:43:09 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Sep 15 09:43:31 2018 +0200 [SHELLBTRFS] Add exports according to upstream .def file. CORE-15048 --- dll/shellext/shellbtrfs/shellbtrfs.spec | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dll/shellext/shellbtrfs/shellbtrfs.spec b/dll/shellext/shellbtrfs/shellbtrfs.spec index b16365d0c9..38bd22fe9d 100644 --- a/dll/shellext/shellbtrfs/shellbtrfs.spec +++ b/dll/shellext/shellbtrfs/shellbtrfs.spec @@ -2,3 +2,22 @@ @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() +@ stdcall -private DllInstall(long wstr) +@ stdcall -private AddDeviceW(ptr ptr wstr long) +@ stdcall -private RemoveDeviceW(ptr ptr wstr long) +@ stdcall -private StartBalanceW(ptr ptr wstr long) +@ stdcall -private PauseBalanceW(ptr ptr wstr long) +@ stdcall -private StopBalanceW(ptr ptr wstr long) +@ stdcall -private ShowScrubW(ptr ptr wstr long) +@ stdcall -private ResetStatsW(ptr ptr wstr long) +@ stdcall -private ShowPropSheetW(ptr ptr wstr long) +@ stdcall -private RecvSubvolGUIW(ptr ptr wstr long) +@ stdcall -private SendSubvolGUIW(ptr ptr wstr long) +@ stdcall -private CreateSubvolW(ptr ptr wstr long) +@ stdcall -private CreateSnapshotW(ptr ptr wstr long) +@ stdcall -private ReflinkCopyW(ptr ptr wstr long) +@ stdcall -private StartScrubW(ptr ptr wstr long) +@ stdcall -private StopScrubW(ptr ptr wstr long) +@ stdcall -private SendSubvolW(ptr ptr wstr long) +@ stdcall -private RecvSubvolW(ptr ptr wstr long) +@ stdcall -private ResizeDeviceW(ptr ptr wstr long)

1 0

01/01: [MPR] Import Wine commit: 93fb279f4f3e150eee329b02ca5fb0251d8a239d Properly handle device-less connections.
by Pierre Schweitzer 14 Sep '18

14 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4da2bab03cbc627e750f… commit f4da2bab03cbc627e750f09c6580f75dd945215f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Sep 14 22:30:41 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Sep 14 22:34:02 2018 +0200 [MPR] Import Wine commit: 93fb279f4f3e150eee329b02ca5fb0251d8a239d Properly handle device-less connections. CORE-15012 --- dll/win32/mpr/wnet.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dll/win32/mpr/wnet.c b/dll/win32/mpr/wnet.c index 80375b837e..162b41f4b9 100644 --- a/dll/win32/mpr/wnet.c +++ b/dll/win32/mpr/wnet.c @@ -2652,6 +2652,7 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, DWORD WINAPI WNetClearConnections ( HWND owner ) { HANDLE connected; + PWSTR connection; DWORD ret, size, count; NETRESOURCEW * resources, * iter; @@ -2685,7 +2686,14 @@ DWORD WINAPI WNetClearConnections ( HWND owner ) if (ret == WN_SUCCESS || ret == WN_MORE_DATA) { for (iter = resources; count; count--, iter++) - WNetCancelConnection2W(iter->lpLocalName, 0, TRUE); + { + if (iter->lpLocalName && iter->lpLocalName[0]) + connection = iter->lpLocalName; + else + connection = iter->lpRemoteName; + + WNetCancelConnection2W(connection, 0, TRUE); + } } else break;

1 0

02/02: [USETUP] Make countdown progress bar smoother
by Stanislav Motylkov 14 Sep '18

14 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13310b3acf1dfd88ff27c… commit 13310b3acf1dfd88ff27c19526d3ca37b24e029c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Sep 9 16:50:27 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Sep 14 11:33:50 2018 +0200 [USETUP] Make countdown progress bar smoother --- base/setup/usetup/usetup.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 102db35f6d..944e8118e7 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -4548,7 +4548,7 @@ ProgressTimeOutStringHandler( (AlwaysUpdate || (Bar->Progress != OldProgress))) { RtlStringCchPrintfA(Buffer, cchBufferSize, - Bar->ProgressFormatText, Bar->Progress); + Bar->ProgressFormatText, Bar->Progress / max(1, Bar->Width) + 1); return TRUE; } @@ -4578,9 +4578,9 @@ ProgressCountdown( IN LONG TimeOut) { NTSTATUS Status; - ULONG StartTime; + ULONG StartTime, BarWidth, TimerDiv; LONG TimeElapsed; - LONG TimerValue = TimeOut, OldTimerValue; + LONG TimerValue, OldTimerValue; LARGE_INTEGER Timeout; PPROGRESSBAR ProgressBar; BOOLEAN RefreshProgress = TRUE; @@ -4598,14 +4598,20 @@ ProgressCountdown( 24, TRUE, FOREGROUND_RED | BACKGROUND_BLUE, - TimerValue, + 0, NULL, MUIGetString(STRING_REBOOTPROGRESSBAR), ProgressTimeOutStringHandler); + BarWidth = max(1, ProgressBar->Width); + TimerValue = TimeOut * BarWidth; + ProgressSetStepCount(ProgressBar, TimerValue); + StartTime = NtGetTickCount(); CONSOLE_Flush(); + TimerDiv = 1000 / BarWidth; + TimerDiv = max(1, TimerDiv); OldTimerValue = TimerValue; while (TRUE) { @@ -4617,11 +4623,11 @@ ProgressCountdown( * elapsed if something slowed down. */ TimeElapsed = NtGetTickCount() - StartTime; - if (TimeElapsed >= 1000) + if (TimeElapsed >= TimerDiv) { - /* Increase StartTime by steps of 1 second */ - TimeElapsed /= 1000; - StartTime += (1000 * TimeElapsed); + /* Increase StartTime by steps of 1 / ProgressBar->Width seconds */ + TimeElapsed /= TimerDiv; + StartTime += (TimerDiv * TimeElapsed); if (TimeElapsed <= TimerValue) TimerValue -= TimeElapsed; @@ -4651,10 +4657,10 @@ ProgressCountdown( /* Wait a maximum of 1 second for input events */ TimeElapsed = NtGetTickCount() - StartTime; - if (TimeElapsed < 1000) + if (TimeElapsed < TimerDiv) { /* Convert the time to NT Format */ - Timeout.QuadPart = (1000 - TimeElapsed) * -10000LL; + Timeout.QuadPart = (TimerDiv - TimeElapsed) * -10000LL; Status = NtWaitForSingleObject(StdInput, FALSE, &Timeout); } else

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs