Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 74303: [USBSTOR] - Avoid MDL leak in USBSTOR_SendIrp. Patch by Lesan Ilie. CORE-13061 #resolve
by tfaber＠svn.reactos.org 14 Apr '17

14 Apr '17

Author: tfaber Date: Fri Apr 14 10:24:41 2017 New Revision: 74303 URL: http://svn.reactos.org/svn/reactos?rev=74303&view=rev Log: [USBSTOR] - Avoid MDL leak in USBSTOR_SendIrp. Patch by Lesan Ilie. CORE-13061 #resolve Modified: trunk/reactos/drivers/usb/usbstor/pdo.c Modified: trunk/reactos/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] Fri Apr 14 10:24:41 2017 @@ -1183,6 +1183,7 @@ // free resources // ExFreePoolWithTag(Request, USB_STOR_TAG); + IoFreeMdl(Irp->MdlAddress); IoFreeIrp(Irp); return Status; }

1 0

[tfaber] 74302: [HIDCLASS] Patch by Lesan Ilie: - Avoid over-allocating the DEVICE_RELATIONS structure in HidClassPDO_CreatePDO - Allocate device relations from paged pool CORE-13052 #resolve
by tfaber＠svn.reactos.org 14 Apr '17

14 Apr '17

Author: tfaber Date: Fri Apr 14 09:55:17 2017 New Revision: 74302 URL: http://svn.reactos.org/svn/reactos?rev=74302&view=rev Log: [HIDCLASS] Patch by Lesan Ilie: - Avoid over-allocating the DEVICE_RELATIONS structure in HidClassPDO_CreatePDO - Allocate device relations from paged pool CORE-13052 #resolve Modified: trunk/reactos/drivers/hid/hidclass/pdo.c Modified: trunk/reactos/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/pdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] Fri Apr 14 09:55:17 2017 @@ -652,8 +652,8 @@ // // first allocate device relations // - Length = sizeof(DEVICE_RELATIONS) + sizeof(PDEVICE_OBJECT) * FDODeviceExtension->Common.DeviceDescription.CollectionDescLength; - DeviceRelations = ExAllocatePoolWithTag(NonPagedPool, Length, HIDCLASS_TAG); + Length = FIELD_OFFSET(DEVICE_RELATIONS, Objects) + sizeof(PDEVICE_OBJECT) * FDODeviceExtension->Common.DeviceDescription.CollectionDescLength; + DeviceRelations = ExAllocatePoolWithTag(PagedPool, Length, HIDCLASS_TAG); if (!DeviceRelations) { //

1 0

[tfaber] 74301: [CABMAN] - Fix leaks in ExtractFile and avoid double frees from failure cases of AddFile. Patch by Serge Gautherie. CORE-7307 #resolve
by tfaber＠svn.reactos.org 14 Apr '17

14 Apr '17

Author: tfaber Date: Fri Apr 14 09:50:37 2017 New Revision: 74301 URL: http://svn.reactos.org/svn/reactos?rev=74301&view=rev Log: [CABMAN] - Fix leaks in ExtractFile and avoid double frees from failure cases of AddFile. Patch by Serge Gautherie. CORE-7307 #resolve Modified: trunk/reactos/sdk/tools/cabman/cabinet.cxx Modified: trunk/reactos/sdk/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/cabman/cabinet.c… ============================================================================== --- trunk/reactos/sdk/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/cabman/cabinet.cxx [iso-8859-1] Fri Apr 14 09:50:37 2017 @@ -1163,6 +1163,7 @@ { DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_INVALID_CAB; } #else @@ -1170,6 +1171,7 @@ { DPRINT(MIN_TRACE, ("fseek() failed.\n")); CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_FAILURE; } Offset = ftell(FileHandle); @@ -1252,7 +1254,11 @@ if (CFData.UncompSize == 0) { if (strlen(DiskNext) == 0) + { + CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_NOFILE; + } /* CloseCabinet() will destroy all file entries so in case FileName refers to the FileName field of a CFFOLDER_NODE @@ -1267,7 +1273,11 @@ Status = Open(); if (Status != CAB_STATUS_SUCCESS) + { + CloseFile(DestFile); + FreeMemory(Buffer); return Status; + } /* The first data block of the file will not be found as it is located in the previous file */ @@ -1275,6 +1285,8 @@ if (Status == CAB_STATUS_NOFILE) { DPRINT(MID_TRACE, ("Cannot locate file (%u).\n", (UINT)Status)); + CloseFile(DestFile); + FreeMemory(Buffer); return Status; } @@ -1289,12 +1301,16 @@ FILE_BEGIN) == INVALID_SET_FILE_POINTER ) { DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); + CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_INVALID_CAB; } #else if (fseek(FileHandle, (off_t)File->DataBlock->AbsoluteOffset, SEEK_SET) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); + CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_INVALID_CAB; } #endif @@ -1329,6 +1345,8 @@ { DPRINT(MID_TRACE, ("BytesToWrite (%u) != CFData.UncompSize (%d)\n", (UINT)BytesToWrite, CFData.UncompSize)); + CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_INVALID_CAB; } @@ -1364,6 +1382,8 @@ FILE_BEGIN) == INVALID_SET_FILE_POINTER ) { DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); + CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_INVALID_CAB; } #else @@ -1371,6 +1391,8 @@ CurrentDataNode->Data.CompSize, SEEK_SET) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); + CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_INVALID_CAB; } #endif @@ -2060,7 +2082,6 @@ if (FileNode->File.FileSize == (ULONG)-1) { DPRINT(MIN_TRACE, ("Cannot read from file.\n")); - FreeMemory(NewFileName); CloseFile(SrcFile); return CAB_STATUS_CANNOT_READ; } @@ -2068,7 +2089,6 @@ if (GetFileTimes(SrcFile, FileNode) != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot read file times.\n")); - FreeMemory(NewFileName); CloseFile(SrcFile); return CAB_STATUS_CANNOT_READ; } @@ -2076,7 +2096,6 @@ if (GetAttributesOnFile(FileNode) != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot read file attributes.\n")); - FreeMemory(NewFileName); CloseFile(SrcFile); return CAB_STATUS_CANNOT_READ; }

1 0

[tfaber] 74300: [ACPI] - Ensure null termination of the method name passed to AcpiEvaluateObject in Bus_PDO_EvalMethod. Spotted by ReactCoder. CORE-13068 #resolve
by tfaber＠svn.reactos.org 14 Apr '17

14 Apr '17

Author: tfaber Date: Fri Apr 14 09:32:47 2017 New Revision: 74300 URL: http://svn.reactos.org/svn/reactos?rev=74300&view=rev Log: [ACPI] - Ensure null termination of the method name passed to AcpiEvaluateObject in Bus_PDO_EvalMethod. Spotted by ReactCoder. CORE-13068 #resolve Modified: trunk/reactos/drivers/bus/acpi/eval.c Modified: trunk/reactos/drivers/bus/acpi/eval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/eval.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/eval.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/eval.c [iso-8859-1] Fri Apr 14 09:32:47 2017 @@ -17,6 +17,7 @@ PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); ACPI_EVAL_INPUT_BUFFER_SIMPLE_INTEGER *SimpleInt; ACPI_EVAL_INPUT_BUFFER_SIMPLE_STRING *SimpleStr; + CHAR MethodName[5]; if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < sizeof(ULONG)) return STATUS_INVALID_PARAMETER; @@ -67,8 +68,12 @@ return STATUS_NOT_IMPLEMENTED; } + RtlCopyMemory(MethodName, + EvalInputBuff->MethodName, + sizeof(EvalInputBuff->MethodName)); + MethodName[4] = ANSI_NULL; Status = AcpiEvaluateObject(DeviceData->AcpiHandle, - (CHAR*)EvalInputBuff->MethodName, + MethodName, &ParamList, &RetBuff);

1 0

[rnaumann] 74299: [CRT] remove a self assignment. CORE-8215 #resolve
by rnaumann＠svn.reactos.org 13 Apr '17

13 Apr '17

Author: rnaumann Date: Thu Apr 13 19:09:31 2017 New Revision: 74299 URL: http://svn.reactos.org/svn/reactos?rev=74299&view=rev Log: [CRT] remove a self assignment. CORE-8215 #resolve Modified: trunk/reactos/sdk/lib/crt/stdlib/qsort.c Modified: trunk/reactos/sdk/lib/crt/stdlib/qsort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/stdlib/qsort.c… ============================================================================== --- trunk/reactos/sdk/lib/crt/stdlib/qsort.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/stdlib/qsort.c [iso-8859-1] Thu Apr 13 19:09:31 2017 @@ -189,7 +189,6 @@ if (size == 0) return; - compar = compar; thresh = size * THRESH; max = base + n * size; if (n >= THRESH)

1 0

[rnaumann] 74298: [UXTHEME] DrawNCPreview(): Fix copypasta
by rnaumann＠svn.reactos.org 13 Apr '17

13 Apr '17

Author: rnaumann Date: Thu Apr 13 17:41:27 2017 New Revision: 74298 URL: http://svn.reactos.org/svn/reactos?rev=74298&view=rev Log: [UXTHEME] DrawNCPreview(): Fix copypasta Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Thu Apr 13 17:41:27 2017 @@ -1105,7 +1105,7 @@ if (!context.theme) return E_FAIL; context.scrolltheme = OpenThemeDataFromFile(hThemeFile, hwndDummy, L"SCROLLBAR", 0); - if (!context.theme) + if (!context.scrolltheme) return E_FAIL; context.Active = TRUE; context.wi.cbSize = sizeof(context.wi);

1 0

[cfinck] 74297: [SPOOLSS] Implement the undocumented AlignRpcPtr and UndoAlignRpcPtr functions used by many Rpc* functions in spoolsv according to traced callchains. I could reverse engineer them e...
by cfinck＠svn.reactos.org 13 Apr '17

13 Apr '17

Author: cfinck Date: Thu Apr 13 16:48:40 2017 New Revision: 74297 URL: http://svn.reactos.org/svn/reactos?rev=74297&view=rev Log: [SPOOLSS] Implement the undocumented AlignRpcPtr and UndoAlignRpcPtr functions used by many Rpc* functions in spoolsv according to traced callchains. I could reverse engineer them entirely using rohitab.com's API Monitor and black-box testing. I also add documented tests covering all cases I found out. We now pass 17/17 tests on Windows Server 2003 and ReactOS. Also const-ify a parameter in PackStrings. Added: trunk/rostests/apitests/spoolss/AlignRpcPtr.c (with props) Modified: trunk/reactos/win32ss/printing/base/spoolss/memory.c trunk/reactos/win32ss/printing/base/spoolss/spoolss.spec trunk/reactos/win32ss/printing/base/spoolss/tools.c trunk/reactos/win32ss/printing/include/spoolss.h trunk/rostests/apitests/spoolss/CMakeLists.txt trunk/rostests/apitests/spoolss/testlist.c Modified: trunk/reactos/win32ss/printing/base/spoolss/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolss/memory.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolss/memory.c [iso-8859-1] Thu Apr 13 16:48:40 2017 @@ -2,11 +2,41 @@ * PROJECT: ReactOS Spooler Router * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation * PURPOSE: Functions for allocating and freeing memory - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" + +/** + * @name AlignRpcPtr + * + * Checks if the input buffer and buffer size are 4-byte aligned. + * If the buffer size is not 4-byte aligned, it is aligned down. + * If the input buffer is not 4-byte aligned, a 4-byte aligned buffer of the aligned down buffer size is allocated and returned. + * + * @param pBuffer + * The buffer to check. + * + * @param pcbBuffer + * Pointer to the buffer size to check. Its value is aligned down if needed. + * + * @return + * pBuffer if pBuffer is already 4-byte aligned, or a newly allocated 4-byte aligned buffer of the aligned down buffer size otherwise. + * If a buffer was allocated, you have to free it using UndoAlignRpcPtr. + */ +PVOID WINAPI +AlignRpcPtr(PVOID pBuffer, PDWORD pcbBuffer) +{ + // Align down the buffer size in pcbBuffer to a 4-byte boundary. + *pcbBuffer -= *pcbBuffer % sizeof(DWORD); + + // Check if pBuffer is 4-byte aligned. If not, allocate a 4-byte aligned buffer. + if ((ULONG_PTR)pBuffer % sizeof(DWORD)) + pBuffer = DllAllocSplMem(*pcbBuffer); + + return pBuffer; +} /** * @name AllocSplStr @@ -163,6 +193,59 @@ DllFreeSplStr(*ppwszString); *ppwszString = AllocSplStr(pwszInput); - + return TRUE; } + +/** + * @name UndoAlignRpcPtr + * + * Copies the data from the aligned buffer previously allocated by AlignRpcPtr back to the original unaligned buffer. + * The aligned buffer is freed. + * + * Also aligns up the returned required buffer size of a function to a 4-byte boundary. + * + * @param pDestinationBuffer + * The original unaligned buffer, which you input as pBuffer to AlignRpcPtr. + * The data from pSourceBuffer is copied into this buffer before pSourceBuffer is freed. + * If AlignRpcPtr did not allocate a buffer, pDestinationBuffer equals pSourceBuffer and no memory is copied or freed. + * This parameter may be NULL if pSourceBuffer is NULL. + * + * @param pSourceBuffer + * The aligned buffer, which is returned by AlignRpcPtr. + * Its data is copied into pDestinationBuffer and then pSourceBuffer is freed. + * If AlignRpcPtr did not allocate a buffer, pDestinationBuffer equals pSourceBuffer and no memory is copied or freed. + * This parameter may be NULL. + * + * @param cbBuffer + * Number of bytes to copy. + * Set this to the size returned by AlignRpcPtr's pcbBuffer or less. + * + * @param pcbNeeded + * Let this parameter point to your variable calculating the needed bytes for a buffer and returning this value to the user. + * It is then aligned up to a 4-byte boundary, so that the user supplies a large enough buffer in the next call. + * Otherwise, AlignRpcPtr would align down the buffer size in the next call and your buffer would be smaller than intended. + * This parameter may be NULL. + * + * @return + * pcbNeeded + */ +PDWORD WINAPI +UndoAlignRpcPtr(PVOID pDestinationBuffer, PVOID pSourceBuffer, DWORD cbBuffer, PDWORD pcbNeeded) +{ + // If pSourceBuffer is given, and source and destination pointers don't match, + // we assume that pSourceBuffer is the buffer allocated by AlignRpcPtr. + if (pSourceBuffer && pSourceBuffer != pDestinationBuffer) + { + // Copy back the buffer data to the (usually unaligned) destination buffer + // and free the buffer allocated by AlignRpcPtr. + CopyMemory(pDestinationBuffer, pSourceBuffer, cbBuffer); + DllFreeSplMem(pSourceBuffer); + } + + // If pcbNeeded is given, align it up to a 4-byte boundary. + if (pcbNeeded && *pcbNeeded % sizeof(DWORD)) + *pcbNeeded += sizeof(DWORD) - *pcbNeeded % sizeof(DWORD); + + return pcbNeeded; +} Modified: trunk/reactos/win32ss/printing/base/spoolss/spoolss.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] Thu Apr 13 16:48:40 2017 @@ -16,7 +16,7 @@ @ stub AdjustPointers @ stub AdjustPointersInStructuresArray @ stub AlignKMPtr -@ stub AlignRpcPtr +@ stdcall AlignRpcPtr(ptr ptr) @ stdcall AllocSplStr(ptr) @ stub AllowRemoteCalls @ stub AppendPrinterNotifyInfoData @@ -165,7 +165,7 @@ @ stdcall StartDocPrinterW(long long ptr) @ stdcall StartPagePrinter(long) @ stub UndoAlignKMPtr -@ stub UndoAlignRpcPtr +@ stdcall UndoAlignRpcPtr(ptr ptr long ptr) @ stub UnloadDriver @ stub UnloadDriverFile @ stub UpdateBufferSize Modified: trunk/reactos/win32ss/printing/base/spoolss/tools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolss/tools.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolss/tools.c [iso-8859-1] Thu Apr 13 16:48:40 2017 @@ -86,7 +86,7 @@ * The strings are copied in reverse order, so this pointer will point to the last copied string of pSource. */ PBYTE WINAPI -PackStrings(PCWSTR* pSource, PBYTE pDest, PDWORD DestOffsets, PBYTE pEnd) +PackStrings(PCWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd) { DWORD cbString; ULONG_PTR StringAddress; Modified: trunk/reactos/win32ss/printing/include/spoolss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/include/s… ============================================================================== --- trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] Thu Apr 13 16:48:40 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Printing Include files * LICENSE: GNU LGPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Undocumented APIs of the Spooler Router "spoolss.dll" - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #ifndef _REACTOS_SPOOLSS_H @@ -19,14 +19,16 @@ } MARSHALL_DOWN_INFO, *PMARSHALL_DOWN_INFO; +PVOID WINAPI AlignRpcPtr(PVOID pBuffer, PDWORD pcbBuffer); PWSTR WINAPI AllocSplStr(PCWSTR pwszInput); PVOID WINAPI DllAllocSplMem(DWORD dwBytes); BOOL WINAPI DllFreeSplMem(PVOID pMem); BOOL WINAPI DllFreeSplStr(PWSTR pwszString); BOOL WINAPI MarshallDownStructure(PVOID pStructure, PMARSHALL_DOWN_INFO pParameters, DWORD cbStructureSize, BOOL bSomeBoolean); -PBYTE WINAPI PackStrings(PCWSTR* pSource, PBYTE pDest, PDWORD DestOffsets, PBYTE pEnd); +PBYTE WINAPI PackStrings(PCWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd); PVOID WINAPI ReallocSplMem(PVOID pOldMem, DWORD cbOld, DWORD cbNew); BOOL WINAPI ReallocSplStr(PWSTR* ppwszString, PCWSTR pwszInput); BOOL WINAPI SplInitializeWinSpoolDrv(PVOID* pTable); +PDWORD WINAPI UndoAlignRpcPtr(PVOID pDestinationBuffer, PVOID pSourceBuffer, DWORD cbBuffer, PDWORD pcbNeeded); #endif Added: trunk/rostests/apitests/spoolss/AlignRpcPtr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/AlignRpc… ============================================================================== --- trunk/rostests/apitests/spoolss/AlignRpcPtr.c (added) +++ trunk/rostests/apitests/spoolss/AlignRpcPtr.c [iso-8859-1] Thu Apr 13 16:48:40 2017 @@ -0,0 +1,84 @@ +/* + * PROJECT: ReactOS Spooler Router API Tests + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Tests for AlignRpcPtr/UndoAlignRpcPtr + * COPYRIGHT: Copyright 2017 Colin Finck <colin(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <spoolss.h> + +START_TEST(AlignRpcPtr) +{ + char* pMemory; + char* pInputBuffer; + char* pOutputBuffer; + DWORD cbBuffer; + PDWORD pcbBuffer; + + // Allocate memory with GlobalAlloc. It is guaranteed to be aligned to a 8-byte boundary. + pMemory = (char*)GlobalAlloc(GMEM_FIXED, 16); + + // First try AlignRpcPtr with already aligned memory and buffer size. It should leave everything unchanged. + pInputBuffer = pMemory; + cbBuffer = 8; + pOutputBuffer = (char*)AlignRpcPtr(pInputBuffer, &cbBuffer); + ok(pOutputBuffer == pInputBuffer, "pOutputBuffer != pInputBuffer\n"); + ok(cbBuffer == 8, "cbBuffer is %lu\n", cbBuffer); + + // Now try it with unaligned buffer size. The size should be aligned down while the buffer stays the same. + pInputBuffer = pMemory; + cbBuffer = 7; + pOutputBuffer = (char*)AlignRpcPtr(pInputBuffer, &cbBuffer); + ok(pOutputBuffer == pInputBuffer, "pOutputBuffer != pInputBuffer\n"); + ok(cbBuffer == 4, "cbBuffer is %lu\n", cbBuffer); + + // Now try with unaligned memory, but aligned buffer size. A new buffer is allocated while the size stays the same. + // The allocated buffer is then freed with UndoAlignRpcPtr. It is important to specify 0 as the size here, otherwise + // the NULL pointer for pDestinationBuffer is accessed. + pInputBuffer = pMemory + 1; + cbBuffer = 8; + pOutputBuffer = (char*)AlignRpcPtr(pInputBuffer, &cbBuffer); + ok(pOutputBuffer != pInputBuffer, "pOutputBuffer == pInputBuffer\n"); + ok(cbBuffer == 8, "cbBuffer is %lu\n", cbBuffer); + ok(!UndoAlignRpcPtr(NULL, pOutputBuffer, 0, NULL), "UndoAlignRpcPtr returns something\n"); + + // Now try with memory and buffer size unaligned. A new buffer of the aligned down size is allocated. + pInputBuffer = pMemory + 1; + cbBuffer = 7; + pOutputBuffer = (char*)AlignRpcPtr(pInputBuffer, &cbBuffer); + ok(pOutputBuffer != pInputBuffer, "pOutputBuffer == pInputBuffer\n"); + ok(cbBuffer == 4, "cbBuffer is %lu\n", cbBuffer); + + // We can also test all parameters of UndoAlignRpcPtr here. + // Because pOutputBuffer != pInputBuffer, it copies the given 4 bytes from (aligned) pOutputBuffer to (unaligned) pInputBuffer + // while aligning up the given 7 bytes in our passed &cbBuffer. + // &cbBuffer is also returned. + strcpy(pOutputBuffer, "abc"); + strcpy(pInputBuffer, "XXXXXXXXX"); + cbBuffer = 7; + pcbBuffer = UndoAlignRpcPtr(pInputBuffer, pOutputBuffer, 4, &cbBuffer); + ok(strcmp(pInputBuffer, "abc") == 0, "pInputBuffer is %s\n", pInputBuffer); + ok(pcbBuffer == &cbBuffer, "pcbBuffer != &cbBuffer\n"); + ok(cbBuffer == 8, "cbBuffer is %lu\n", cbBuffer); + + // Prove that UndoAlignRpcPtr works without any parameters and doesn't try to copy data from NULL pointers. + ok(!UndoAlignRpcPtr(NULL, NULL, 0, NULL), "UndoAlignRpcPtr returns something\n"); + ok(!UndoAlignRpcPtr(NULL, NULL, 4, NULL), "UndoAlignRpcPtr returns something\n"); + + // Prove that UndoAlignRpcPtr doesn't access source and destination memory at all when they are equal. + // If it did, it should crash here, because I'm giving invalid memory addresses. + ok(!UndoAlignRpcPtr((PVOID)1, (PVOID)1, 4, NULL), "UndoAlignRpcPtr returns something\n"); + + // Prove that the pcbNeeded parameter of UndoAlignRpcPtr works independently and aligns up everything up to a DWORD. + cbBuffer = 0xFFFFFFFF; + pcbBuffer = UndoAlignRpcPtr(NULL, NULL, 0, &cbBuffer); + ok(pcbBuffer == &cbBuffer, "pcbBuffer != &cbBuffer\n"); + ok(cbBuffer == 0, "cbBuffer is %lu\n", cbBuffer); + + GlobalFree(pMemory); +} Propchange: trunk/rostests/apitests/spoolss/AlignRpcPtr.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/CMakeLis… ============================================================================== --- trunk/rostests/apitests/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/spoolss/CMakeLists.txt [iso-8859-1] Thu Apr 13 16:48:40 2017 @@ -2,6 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/win32ss/printing/include) list(APPEND SOURCE + AlignRpcPtr.c PackStrings.c ReallocSplStr.c SplInitializeWinSpoolDrv.c Modified: trunk/rostests/apitests/spoolss/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/testlist… ============================================================================== --- trunk/rostests/apitests/spoolss/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/spoolss/testlist.c [iso-8859-1] Thu Apr 13 16:48:40 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Print Spooler Router API Tests * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Test list - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #define __ROS_LONG64__ @@ -10,12 +10,14 @@ #define STANDALONE #include <apitest.h> +extern void func_AlignRpcPtr(void); extern void func_PackStrings(void); extern void func_ReallocSplStr(void); extern void func_SplInitializeWinSpoolDrv(void); const struct test winetest_testlist[] = { + { "AlignRpcPtr", func_AlignRpcPtr }, { "PackStrings", func_PackStrings }, { "ReallocSplStr", func_ReallocSplStr }, { "SplInitializeWinSpoolDrv", func_SplInitializeWinSpoolDrv },

1 0

[ekohl] 74296: [NTOS:OB] - Move device map code into a separate file. - Create and inherit device maps instead of using a single global device map.
by ekohl＠svn.reactos.org 11 Apr '17

11 Apr '17

Author: ekohl Date: Tue Apr 11 19:58:05 2017 New Revision: 74296 URL: http://svn.reactos.org/svn/reactos?rev=74296&view=rev Log: [NTOS:OB] - Move device map code into a separate file. - Create and inherit device maps instead of using a single global device map. Added: trunk/reactos/ntoskrnl/ob/devicemap.c (with props) Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ntos.cmake trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Tue Apr 11 19:58:05 2017 @@ -387,6 +387,12 @@ // // DOS Devices Functions // +NTSTATUS +NTAPI +ObpCreateDeviceMap( + IN HANDLE DirectoryHandle +); + VOID NTAPI ObDereferenceDeviceMap( @@ -396,7 +402,7 @@ VOID FASTCALL ObfDereferenceDeviceMap( - IN PVOID DeviceMap + IN PDEVICE_MAP DeviceMap ); VOID Modified: trunk/reactos/ntoskrnl/ntos.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntos.cmake?rev=74… ============================================================================== --- trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] Tue Apr 11 19:58:05 2017 @@ -225,6 +225,7 @@ ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/region.c ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/rmap.c ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/section.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/devicemap.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obdir.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obhandle.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obinit.c Added: trunk/reactos/ntoskrnl/ob/devicemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/devicemap.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ob/devicemap.c (added) +++ trunk/reactos/ntoskrnl/ob/devicemap.c [iso-8859-1] Tue Apr 11 19:58:05 2017 @@ -0,0 +1,227 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ob/devicemap.c + * PURPOSE: Device map implementation + * PROGRAMMERS: Eric Kohl (eric.kohl(a)reactos.org) + * Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ***************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS ******************************************************/ + +NTSTATUS +NTAPI +ObpCreateDeviceMap(IN HANDLE DirectoryHandle) +{ + POBJECT_DIRECTORY DirectoryObject = NULL; + PDEVICE_MAP DeviceMap = NULL; + NTSTATUS Status; + + Status = ObReferenceObjectByHandle(DirectoryHandle, + DIRECTORY_TRAVERSE, + ObDirectoryType, + KeGetPreviousMode(), + (PVOID*)&DirectoryObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Allocate and initialize a new device map */ + DeviceMap = ExAllocatePoolWithTag(NonPagedPool, + sizeof(*DeviceMap), + 'mDbO'); + if (DeviceMap == NULL) + { + ObDereferenceObject(DirectoryObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Initialize the device map */ + RtlZeroMemory(DeviceMap, sizeof(*DeviceMap)); + DeviceMap->ReferenceCount = 1; + DeviceMap->DosDevicesDirectory = DirectoryObject; + + /* Acquire the device map lock */ + KeAcquireGuardedMutex(&ObpDeviceMapLock); + + /* Attach the device map to the directory object */ + DirectoryObject->DeviceMap = DeviceMap; + + /* Attach the device map to the process */ + ObSystemDeviceMap = DeviceMap; + PsGetCurrentProcess()->DeviceMap = DeviceMap; + + /* Release the device map lock */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); + + return STATUS_SUCCESS; +} + + +VOID +NTAPI +ObDereferenceDeviceMap(IN PEPROCESS Process) +{ + PDEVICE_MAP DeviceMap; + + DPRINT("ObDereferenceDeviceMap()\n"); + + /* Get the pointer to this process devicemap and reset it + holding the device map lock */ + KeAcquireGuardedMutex(&ObpDeviceMapLock); + DeviceMap = Process->DeviceMap; + Process->DeviceMap = NULL; + KeReleaseGuardedMutex(&ObpDeviceMapLock); + + /* Continue only if there is a device map */ + if (DeviceMap == NULL) + return; + + /* Acquire the device map lock again */ + KeAcquireGuardedMutex(&ObpDeviceMapLock); + + /* Decrement the reference counter */ + DeviceMap->ReferenceCount--; + DPRINT("ReferenceCount: %lu\n", DeviceMap->ReferenceCount); + + /* Leave, if there are still references to this device map */ + if (DeviceMap->ReferenceCount != 0) + { + /* Release the device map lock and leave */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); + return; + } + + /* Nobody is referencing it anymore, unlink the DOS directory */ + DeviceMap->DosDevicesDirectory->DeviceMap = NULL; + + /* Release the device map lock */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); + + /* Dereference the DOS Devices Directory and free the DeviceMap */ + ObDereferenceObject(DeviceMap->DosDevicesDirectory); + ExFreePoolWithTag(DeviceMap, 'mDbO'); +} + + +VOID +FASTCALL +ObfDereferenceDeviceMap(IN PDEVICE_MAP DeviceMap) +{ + DPRINT("ObfDereferenceDeviceMap()\n"); + + /* Acquire the device map lock */ + KeAcquireGuardedMutex(&ObpDeviceMapLock); + + /* Decrement the reference counter */ + DeviceMap->ReferenceCount--; + DPRINT("ReferenceCount: %lu\n", DeviceMap->ReferenceCount); + + /* Leave, if there are still references to this device map */ + if (DeviceMap->ReferenceCount != 0) + { + /* Release the device map lock and leave */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); + return; + } + + /* Nobody is referencing it anymore, unlink the DOS directory */ + DeviceMap->DosDevicesDirectory->DeviceMap = NULL; + + /* Release the devicemap lock */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); + + /* Dereference the DOS Devices Directory and free the Device Map */ + ObDereferenceObject(DeviceMap->DosDevicesDirectory ); + ExFreePoolWithTag(DeviceMap, 'mDbO'); +} + + +VOID +NTAPI +ObInheritDeviceMap(IN PEPROCESS Parent, + IN PEPROCESS Process) +{ + PDEVICE_MAP DeviceMap; + + DPRINT("ObInheritDeviceMap()\n"); + + /* Acquire the device map lock */ + KeAcquireGuardedMutex(&ObpDeviceMapLock); + + /* Get the parent process device map or the system device map */ + DeviceMap = (Parent != NULL) ? Parent->DeviceMap : ObSystemDeviceMap; + if (DeviceMap != NULL) + { + /* Reference the device map and attach it to the new process */ + DeviceMap->ReferenceCount++; + DPRINT("ReferenceCount: %lu\n", DeviceMap->ReferenceCount); + + Process->DeviceMap = DeviceMap; + } + + /* Release the device map lock */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); +} + + +VOID +NTAPI +ObQueryDeviceMapInformation(IN PEPROCESS Process, + IN PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo) +{ + PDEVICE_MAP DeviceMap; + + /* Acquire the device map lock */ + KeAcquireGuardedMutex(&ObpDeviceMapLock); + + /* Get the process device map or the system device map */ + DeviceMap = (Process != NULL) ? Process->DeviceMap : ObSystemDeviceMap; + if (DeviceMap != NULL) + { + /* Make a copy */ + DeviceMapInfo->Query.DriveMap = DeviceMap->DriveMap; + RtlCopyMemory(DeviceMapInfo->Query.DriveType, + DeviceMap->DriveType, + sizeof(DeviceMap->DriveType)); + } + + /* Release the device map lock */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); +} + + +#if 0 +NTSTATUS +NTAPI +ObIsDosDeviceLocallyMapped( + IN ULONG Index, + OUT PUCHAR DosDeviceState) +{ + /* Check the index */ + if (Index < 1 || Index > 26) + return STATUS_INVALID_PARAMETER; + + /* Acquire the device map lock */ + KeAcquireGuardedMutex(&ObpDeviceMapLock); + + /* Get drive mapping status */ + *DosDeviceState = (ObSystemDeviceMap->DriveMap & (1 << Index)) != 0; + + /* Release the device map lock */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); + + return STATUS_SUCCESS; +} +#endif + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/ob/devicemap.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Tue Apr 11 19:58:05 2017 @@ -152,6 +152,11 @@ &ObjectAttributes); ExFreePoolWithTag(DosDevicesSD, TAG_SD); if (!NT_SUCCESS(Status)) return Status; + + /* Create the system device map */ + Status = ObpCreateDeviceMap(Handle); + if (!NT_SUCCESS(Status)) + return Status; /*********************************************\ |*** HACK until we support device mappings ***| @@ -230,62 +235,8 @@ &RootName); if (NT_SUCCESS(Status)) NtClose(SymHandle); - /* FIXME: Hack Hack! */ - ObSystemDeviceMap = ExAllocatePoolWithTag(NonPagedPool, - sizeof(*ObSystemDeviceMap), - 'mDbO'); - if (!ObSystemDeviceMap) return STATUS_INSUFFICIENT_RESOURCES; - RtlZeroMemory(ObSystemDeviceMap, sizeof(*ObSystemDeviceMap)); - /* Return status */ return Status; -} - -VOID -NTAPI -ObDereferenceDeviceMap(IN PEPROCESS Process) -{ - PDEVICE_MAP DeviceMap; - - /* Get the pointer to this process devicemap and reset it - holding devicemap lock */ - KeAcquireGuardedMutex(&ObpDeviceMapLock); - DeviceMap = Process->DeviceMap; - Process->DeviceMap = NULL; - KeReleaseGuardedMutex(&ObpDeviceMapLock); - - /* Continue only if there is a devicemap to dereference */ - if (DeviceMap) - { - KeAcquireGuardedMutex(&ObpDeviceMapLock); - - /* Delete the device map link and dereference it */ - if (--DeviceMap->ReferenceCount) - { - /* Nobody is referencing it anymore, unlink the DOS directory */ - DeviceMap->DosDevicesDirectory->DeviceMap = NULL; - - /* Release the devicemap lock */ - KeReleaseGuardedMutex(&ObpDeviceMapLock); - - /* Dereference the DOS Devices Directory and free the Device Map */ - ObDereferenceObject(DeviceMap->DosDevicesDirectory); - ExFreePool(DeviceMap); - } - else - { - /* Release the devicemap lock */ - KeReleaseGuardedMutex(&ObpDeviceMapLock); - } - } -} - -VOID -NTAPI -ObInheritDeviceMap(IN PEPROCESS Parent, - IN PEPROCESS Process) -{ - /* FIXME: Devicemap Support */ } /*++ @@ -1322,51 +1273,4 @@ return Status; } -VOID -NTAPI -ObQueryDeviceMapInformation(IN PEPROCESS Process, - IN PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo) -{ - /* - * FIXME: This is an ugly hack for now, to always return the System Device Map - * instead of returning the Process Device Map. Not important yet since we don't use it - */ - - KeAcquireGuardedMutex(&ObpDeviceMapLock); - - /* Make a copy */ - DeviceMapInfo->Query.DriveMap = ObSystemDeviceMap->DriveMap; - RtlCopyMemory(DeviceMapInfo->Query.DriveType, - ObSystemDeviceMap->DriveType, - sizeof(ObSystemDeviceMap->DriveType)); - - KeReleaseGuardedMutex(&ObpDeviceMapLock); -} - -NTSTATUS -NTAPI -ObIsDosDeviceLocallyMapped( - IN ULONG Index, - OUT PUCHAR DosDeviceState) -{ - /* check parameters */ - if (Index < 1 || Index > 26) - { - /* invalid index */ - return STATUS_INVALID_PARAMETER; - } - - /* acquire lock */ - KeAcquireGuardedMutex(&ObpDeviceMapLock); - - /* get drive mapping status */ - *DosDeviceState = (ObSystemDeviceMap->DriveMap & (1 << Index)) != 0; - - /* release lock */ - KeReleaseGuardedMutex(&ObpDeviceMapLock); - - /* done */ - return STATUS_SUCCESS; -} - /* EOF */

1 0

[ekohl] 74295: [SETUPAPI] Implement CMP_GetServerSideDeviceInstallFlags().
by ekohl＠svn.reactos.org 10 Apr '17

10 Apr '17

Author: ekohl Date: Mon Apr 10 19:17:17 2017 New Revision: 74295 URL: http://svn.reactos.org/svn/reactos?rev=74295&view=rev Log: [SETUPAPI] Implement CMP_GetServerSideDeviceInstallFlags(). Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/sdk/include/psdk/cfgmgr32.h Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Mon Apr 10 19:17:17 2017 @@ -149,17 +149,69 @@ /*********************************************************************** - * CMP_Init_Detection [SETUPAPI.@] - */ -CONFIGRET WINAPI CMP_Init_Detection( - DWORD dwMagic) + * CMP_GetServerSideDeviceInstallFlags [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CMP_GetServerSideDeviceInstallFlags( + _Out_ PULONG pulSSDIFlags, + _In_ ULONG ulFlags, + _In_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - TRACE("%lu\n", dwMagic); - - if (dwMagic != CMP_MAGIC) + TRACE("CMP_GetServerSideDeviceInstallFlags(%p %lx %p)\n", + pulSSDIFlags, ulFlags, hMachine); + + if (pulSSDIFlags == NULL) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + RpcTryExcept + { + ret = PNP_GetServerSideDeviceInstallFlags(BindingHandle, + pulSSDIFlags, + ulFlags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + return ret; +} + + +/*********************************************************************** + * CMP_Init_Detection [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CMP_Init_Detection( + _In_ ULONG ulMagic) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + CONFIGRET ret; + + TRACE("CMP_Init_Detection(%lu)\n", ulMagic); + + if (ulMagic != CMP_MAGIC) return CR_INVALID_DATA; if (!PnpGetLocalHandles(&BindingHandle, NULL)) @@ -185,23 +237,24 @@ CONFIGRET WINAPI CMP_RegisterNotification( - IN HANDLE hRecipient, - IN LPVOID lpvNotificationFilter, - IN DWORD dwFlags, - OUT PHDEVNOTIFY phDevNotify) + _In_ HANDLE hRecipient, + _In_ LPVOID lpvNotificationFilter, + _In_ ULONG ulFlags, + _Out_ PHDEVNOTIFY phDevNotify) { RPC_BINDING_HANDLE BindingHandle = NULL; PNOTIFY_DATA pNotifyData = NULL; CONFIGRET ret = CR_SUCCESS; - TRACE("CMP_RegisterNotification(%p %p %lu %p)\n", hRecipient, lpvNotificationFilter, dwFlags, phDevNotify); + TRACE("CMP_RegisterNotification(%p %p %lu %p)\n", + hRecipient, lpvNotificationFilter, ulFlags, phDevNotify); if ((hRecipient == NULL) || (lpvNotificationFilter == NULL) || (phDevNotify == NULL)) return CR_INVALID_POINTER; - if (dwFlags & ~0x7) + if (ulFlags & ~0x7) return CR_INVALID_FLAG; if (((PDEV_BROADCAST_HDR)lpvNotificationFilter)->dbch_size < sizeof(DEV_BROADCAST_HDR)) @@ -232,7 +285,7 @@ RpcTryExcept { ret = PNP_RegisterNotification(BindingHandle, - dwFlags, + ulFlags, &pNotifyData->ulNotifyData); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -260,9 +313,11 @@ /*********************************************************************** * CMP_Report_LogOn [SETUPAPI.@] */ -CONFIGRET WINAPI CMP_Report_LogOn( - DWORD dwMagic, - DWORD dwProcessId) +CONFIGRET +WINAPI +CMP_Report_LogOn( + _In_ DWORD dwMagic, + _In_ DWORD dwProcessId) { RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret = CR_SUCCESS; @@ -309,7 +364,7 @@ CONFIGRET WINAPI CMP_UnregisterNotification( - IN HDEVNOTIFY hDevNotify) + _In_ HDEVNOTIFY hDevNotify) { RPC_BINDING_HANDLE BindingHandle = NULL; PNOTIFY_DATA pNotifyData; @@ -347,11 +402,15 @@ /*********************************************************************** * CMP_WaitNoPendingInstallEvents [SETUPAPI.@] */ -DWORD WINAPI CMP_WaitNoPendingInstallEvents( - DWORD dwTimeout) +DWORD +WINAPI +CMP_WaitNoPendingInstallEvents( + _In_ DWORD dwTimeout) { HANDLE hEvent; DWORD ret; + + TRACE("CMP_WaitNoPendingInstallEvents(%lu)\n", dwTimeout); hEvent = OpenEventW(SYNCHRONIZE, FALSE, L"Global\\PnP_No_Pending_Install_Events"); if (hEvent == NULL) @@ -368,11 +427,14 @@ */ CONFIGRET WINAPI -CMP_WaitServicesAvailable(HMACHINE hMachine) +CMP_WaitServicesAvailable( + _In_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret = CR_SUCCESS; WORD Version; + + TRACE("CMP_WaitServicesAvailable(%p)\n", hMachine); if (!PnpGetLocalHandles(&BindingHandle, NULL)) return CR_FAILURE; Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Mon Apr 10 19:17:17 2017 @@ -1,6 +1,6 @@ # Functions exported by Win2003 SP1 @ stub CMP_GetBlockedDriverInfo -@ stub CMP_GetServerSideDeviceInstallFlags +@ stdcall CMP_GetServerSideDeviceInstallFlags(ptr long ptr) @ stdcall CMP_Init_Detection(long) @ stdcall CMP_RegisterNotification(ptr ptr long ptr) @ stdcall CMP_Report_LogOn(long long) Modified: trunk/reactos/sdk/include/psdk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/cfgmgr32.… ============================================================================== --- trunk/reactos/sdk/include/psdk/cfgmgr32.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/cfgmgr32.h [iso-8859-1] Mon Apr 10 19:17:17 2017 @@ -921,33 +921,44 @@ CMAPI CONFIGRET WINAPI -CMP_Init_Detection(IN DWORD dwMagic); +CMP_GetServerSideDeviceInstallFlags( + _Out_ PULONG pulSSDIFlags, + _In_ ULONG ulFlags, + _In_ HMACHINE hMachine) + +CMAPI +CONFIGRET +WINAPI +CMP_Init_Detection( + _In_ DWORD dwMagic); CMAPI CONFIGRET WINAPI CMP_RegisterNotification( - IN HANDLE hRecipient, - IN LPVOID lpvNotificationFilter, - IN DWORD dwFlags, - OUT PULONG pluhDevNotify); + _In_ HANDLE hRecipient, + _In_ LPVOID lpvNotificationFilter, + _In_ DWORD dwFlags, + _Out_ PULONG pluhDevNotify); CMAPI CONFIGRET WINAPI CMP_Report_LogOn( - IN DWORD dwMagic, - IN DWORD dwProcessId); - -CMAPI -CONFIGRET -WINAPI -CMP_UnregisterNotification(IN ULONG luhDevNotify); - -CMAPI -CONFIGRET -WINAPI -CMP_WaitServicesAvailable(IN HMACHINE hMachine); + _In_ DWORD dwMagic, + _In_ DWORD dwProcessId); + +CMAPI +CONFIGRET +WINAPI +CMP_UnregisterNotification( + _In_ ULONG luhDevNotify); + +CMAPI +CONFIGRET +WINAPI +CMP_WaitServicesAvailable( + _In_ IN HMACHINE hMachine); */ CMAPI

1 0

[ekohl] 74294: [UMPNPMGR] Implement most of PNP_GetServerSideDeviceInstallFlags().
by ekohl＠svn.reactos.org 10 Apr '17

10 Apr '17

Author: ekohl Date: Mon Apr 10 19:12:17 2017 New Revision: 74294 URL: http://svn.reactos.org/svn/reactos?rev=74294&view=rev Log: [UMPNPMGR] Implement most of PNP_GetServerSideDeviceInstallFlags(). Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Mon Apr 10 19:12:17 2017 @@ -3004,6 +3004,8 @@ handle_t hBinding, WORD *pwVersion) { + UNREFERENCED_PARAMETER(hBinding); + *pwVersion = 0x501; return CR_SUCCESS; } @@ -3032,8 +3034,21 @@ DWORD *pulSSDIFlags, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + UNREFERENCED_PARAMETER(hBinding); + + DPRINT1("PNP_GetServerSideDeviceInstallFlags(%p %p %lu)\n", + hBinding, pulSSDIFlags, ulFlags); + + if (pulSSDIFlags == NULL) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + /* FIXME */ + *pulSSDIFlags = 0; + + return CR_SUCCESS; }

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