Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [ROSLOAD]: Continue work on target preparation OslPrepareTarget 2/104. [ROSLOAD]: Stubplement OslpCheckForcedFailure, OslpGetSetBootStatusData, OslSetBootStatusData, OslGetBootStatusData. [ROSLOAD]: Stub OslpInitializeBootStatusDataLog, OslpReadWriteBootStatusData. [BOOTLIB]: Fix BlAppendBootOptionString to accept an actual BCD ID instead of hardcoding LibraryPath. [BOOTLIB]: Fix BlAppendBootOptionBoolean to accept an actual BOOLEAN value instead of hardcoding TRUE. [BOOTLIB]: Implement B
by Alex Ionescu 05 Feb '18

05 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ec85c29e31206918868e… commit 9ec85c29e31206918868e05beff71fa4ecb47559 Author: Alex Ionescu <aionescu(a)gmail.com> AuthorDate: Sun Feb 4 16:01:38 2018 -0800 Commit: Alex Ionescu <aionescu(a)gmail.com> CommitDate: Sun Feb 4 16:01:38 2018 -0800 [ROSLOAD]: Continue work on target preparation OslPrepareTarget 2/104. [ROSLOAD]: Stubplement OslpCheckForcedFailure, OslpGetSetBootStatusData, OslSetBootStatusData, OslGetBootStatusData. [ROSLOAD]: Stub OslpInitializeBootStatusDataLog, OslpReadWriteBootStatusData. [BOOTLIB]: Fix BlAppendBootOptionString to accept an actual BCD ID instead of hardcoding LibraryPath. [BOOTLIB]: Fix BlAppendBootOptionBoolean to accept an actual BOOLEAN value instead of hardcoding TRUE. [BOOTLIB]: Implement BlDeviceIsVirtualPartitionDevice. [BOOTLIB]: Add missing BcdOSLoaderInteger_ForceFailure BCD value. Add BCDE_OSLOADER_TYPE_BOOT_STATUS_POLICY based on BcdEdit.exe and Geoff Chappel site. --- boot/environ/app/bootmgr/bootmgr.c | 18 +- boot/environ/app/rosload/rosload.c | 554 ++++++++++++++++++++++++++++++++++++- boot/environ/app/rosload/rosload.h | 6 + boot/environ/include/bcd.h | 20 +- boot/environ/include/bl.h | 14 +- boot/environ/lib/io/device.c | 33 +++ boot/environ/lib/misc/bcdopt.c | 8 +- 7 files changed, 632 insertions(+), 21 deletions(-) diff --git a/boot/environ/app/bootmgr/bootmgr.c b/boot/environ/app/bootmgr/bootmgr.c index b63e63b201..85d501b310 100644 --- a/boot/environ/app/bootmgr/bootmgr.c +++ b/boot/environ/app/bootmgr/bootmgr.c @@ -1357,7 +1357,9 @@ BmpPopulateBootEntryList ( L"\\Windows\\System32\\winload.efi"; /* Add the path to the boot entry */ - Status = BlAppendBootOptionString(BootEntry, LoaderPath); + Status = BlAppendBootOptionString(BootEntry, + BcdLibraryString_ApplicationPath, + LoaderPath); if (!NT_SUCCESS(Status)) { goto Quickie; @@ -2511,7 +2513,8 @@ TryAgain: { /* Set the option this once */ BlAppendBootOptionBoolean(BootEntry, - BcdLibraryBoolean_DisplayAdvancedOptions); + BcdLibraryBoolean_DisplayAdvancedOptions, + TRUE); } else { @@ -2536,7 +2539,8 @@ TryAgain: { /* Set the option this once */ BlAppendBootOptionBoolean(BootEntry, - BcdLibraryBoolean_DisplayOptionsEdit); + BcdLibraryBoolean_DisplayOptionsEdit, + TRUE); } else { @@ -2686,12 +2690,16 @@ Quickie: case AdvancedOptions: /* Show the advanced options next iteration */ - BlAppendBootOptionBoolean(BootEntry, BcdOSLoaderBoolean_AdvancedOptionsOneTime); + BlAppendBootOptionBoolean(BootEntry, + BcdOSLoaderBoolean_AdvancedOptionsOneTime, + TRUE); goto TryAgain; case BootOptions: /* Show the options editor next iteration */ - BlAppendBootOptionBoolean(BootEntry, BcdOSLoaderBoolean_OptionsEditOneTime); + BlAppendBootOptionBoolean(BootEntry, + BcdOSLoaderBoolean_OptionsEditOneTime, + TRUE); goto TryAgain; case Recover: diff --git a/boot/environ/app/rosload/rosload.c b/boot/environ/app/rosload/rosload.c index 9eda2d31fe..65fa445c77 100644 --- a/boot/environ/app/rosload/rosload.c +++ b/boot/environ/app/rosload/rosload.c @@ -50,6 +50,88 @@ BOOLEAN OslImcProcessingValid; ULONG OslFreeMemoryDesctiptorsListSize; PVOID OslMemoryDescriptorBuffer; +BcdObjectType BlpSbdiCurrentApplicationType; + +PRTL_BSD_DATA BsdBootStatusData; + +OSL_BSD_ITEM_TABLE_ENTRY OslpBootStatusFields[RtlBsdItemMax] = +{ + { + FIELD_OFFSET(RTL_BSD_DATA, Version), + sizeof(&BsdBootStatusData->Version) + }, // RtlBsdItemVersionNumber + { + FIELD_OFFSET(RTL_BSD_DATA, ProductType), + sizeof(&BsdBootStatusData->ProductType) + }, // RtlBsdItemProductType + { + FIELD_OFFSET(RTL_BSD_DATA, AabEnabled), + sizeof(&BsdBootStatusData->AabEnabled) + }, // RtlBsdItemAabEnabled + { + FIELD_OFFSET(RTL_BSD_DATA, AabTimeout), + sizeof(&BsdBootStatusData->AabTimeout) + }, // RtlBsdItemAabTimeout + { + FIELD_OFFSET(RTL_BSD_DATA, LastBootSucceeded), + sizeof(&BsdBootStatusData->LastBootSucceeded) + }, // RtlBsdItemBootGood + { + FIELD_OFFSET(RTL_BSD_DATA, LastBootShutdown), + sizeof(&BsdBootStatusData->LastBootShutdown) + }, // RtlBsdItemBootShutdown + { + FIELD_OFFSET(RTL_BSD_DATA, SleepInProgress), + sizeof(&BsdBootStatusData->SleepInProgress) + }, // RtlBsdSleepInProgress + { + FIELD_OFFSET(RTL_BSD_DATA, PowerTransition), + sizeof(&BsdBootStatusData->PowerTransition) + }, // RtlBsdPowerTransition + { + FIELD_OFFSET(RTL_BSD_DATA, BootAttemptCount), + sizeof(&BsdBootStatusData->BootAttemptCount) + }, // RtlBsdItemBootAttemptCount + { + FIELD_OFFSET(RTL_BSD_DATA, LastBootCheckpoint), + sizeof(&BsdBootStatusData->LastBootCheckpoint) + }, // RtlBsdItemBootCheckpoint + { + FIELD_OFFSET(RTL_BSD_DATA, LastBootId), + sizeof(&BsdBootStatusData->LastBootId) + }, // RtlBsdItemBootId + { + FIELD_OFFSET(RTL_BSD_DATA, LastSuccessfulShutdownBootId), + sizeof(&BsdBootStatusData->LastSuccessfulShutdownBootId) + }, // RtlBsdItemShutdownBootId + { + FIELD_OFFSET(RTL_BSD_DATA, LastReportedAbnormalShutdownBootId), + sizeof(&BsdBootStatusData->LastReportedAbnormalShutdownBootId) + }, // RtlBsdItemReportedAbnormalShutdownBootId + { + FIELD_OFFSET(RTL_BSD_DATA, ErrorInfo), + sizeof(&BsdBootStatusData->ErrorInfo) + }, // RtlBsdItemErrorInfo + { + FIELD_OFFSET(RTL_BSD_DATA, PowerButtonPressInfo), + sizeof(&BsdBootStatusData->PowerButtonPressInfo) + }, // RtlBsdItemPowerButtonPressInfo + { + FIELD_OFFSET(RTL_BSD_DATA, Checksum), + sizeof(&BsdBootStatusData->Checksum) + }, // RtlBsdItemChecksum +}; + +ULONG OslBootAttemptCount; +ULONG OslBootCountUpdateRequestForAbort; +ULONG OslBootAttemptMaximum; + +ULONG OslBootCountUpdateIncrement; + +BOOLEAN OslCurrentBootCheckpoint; +BOOLEAN OslCurrentBootSucceeded; +BOOLEAN OslCurrentBootShutdown; + /* FUNCTIONS *****************************************************************/ VOID @@ -139,8 +221,8 @@ OslpRemoveInternalApplicationOptions ( _wcsupr(LoadString); /* Remove the existing one */ - //BlRemoveBootOption(BlpApplicationEntry.BcdData, - // BcdLibraryString_LoadOptionsString); + BlRemoveBootOption(BlpApplicationEntry.BcdData, + BcdLibraryString_LoadOptionsString); /* Sanitize strings we don't want */ OslpSanitizeLoadOptionsString(LoadString, L"DISABLE_INTEGRITY_CHECKS"); @@ -148,9 +230,9 @@ OslpRemoveInternalApplicationOptions ( OslpSanitizeLoadOptionsString(LoadString, L"DISABLEELAMDRIVERS"); /* Add the sanitized one back */ - //Status = BlAppendBootOptionsString(&BlpApplicationEntry, - // BcdLibraryString_LoadOptionsString, - // LoadString); + Status = BlAppendBootOptionString(&BlpApplicationEntry, + BcdLibraryString_LoadOptionsString, + LoadString); /* Free the original BCD one */ BlMmFreeHeap(LoadString); @@ -163,6 +245,288 @@ OslpRemoveInternalApplicationOptions ( return Status; } +NTSTATUS +OslpCheckForcedFailure ( + VOID + ) +{ + ULONG64 ForceReason; + NTSTATUS Status; + + /* Read the option */ + Status = BlGetBootOptionInteger(BlpApplicationEntry.BcdData, + BcdOSLoaderInteger_ForceFailure, + &ForceReason); + if (NT_SUCCESS(Status) && (ForceReason < 4)) + { + /* For reasons above 3, don't actually do anything */ + if (ForceReason > 3) + { + return STATUS_SUCCESS; + } + } + + /* If the option isn't there or invalid, always return success */ + return STATUS_SUCCESS; +} + +VOID +OslpInitializeBootStatusDataLog ( + VOID + ) +{ + /* TODO */ + return; +} + +NTSTATUS +OslpReadWriteBootStatusData ( + _In_ BOOLEAN WriteAccess + ) +{ + /* Are you trying to write? */ + if (WriteAccess) + { + /* Have we already read? */ + if (!BsdBootStatusData) + { + /* No -- fail */ + return STATUS_UNSUCCESSFUL; + } + } + else if (BsdBootStatusData) + { + /* No -- you're trying to read and we already have the data: no-op */ + return STATUS_SUCCESS; + } + + /* TODO */ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +OslpGetSetBootStatusData ( + _In_ BOOLEAN Read, + _In_ RTL_BSD_ITEM_TYPE DataClass, + _Out_ PVOID Buffer, + _Inout_ PULONG Size + ) +{ + NTSTATUS Status; + ULONG Length, Offset; + + /* No data has been read yet, fail */ + if (!BsdBootStatusData) + { + return STATUS_UNSUCCESSFUL; + } + + /* Invalid data item, fail */ + if (DataClass >= RtlBsdItemMax) + { + return STATUS_INVALID_PARAMETER; + } + + /* Capture the length and offset */ + Length = OslpBootStatusFields[DataClass].Size; + Offset = OslpBootStatusFields[DataClass].Offset; + + /* Make sure it doesn't overflow past the structure we've read */ + if ((Length + Offset) > BsdBootStatusData->Version) + { + return STATUS_REVISION_MISMATCH; + } + + /* Make sure we have enough space */ + if (*Size >= Length) + { + /* We do -- is this a read? */ + if (Read) + { + /* Yes, copy into the caller's buffer */ + RtlCopyMemory(Buffer, + (PVOID)((ULONG_PTR)BsdBootStatusData + Offset), + Length); + } + else + { + /* It's a write, copy from caller's buffer */ + RtlCopyMemory((PVOID)((ULONG_PTR)BsdBootStatusData + Offset), + Buffer, + Length); + } + + /* Set success */ + Status = STATUS_SUCCESS; + } + else + { + /* Return size needed and failure code */ + *Size = Length; + Status = STATUS_BUFFER_TOO_SMALL; + } + + /* All good */ + return Status; +} + +NTSTATUS +OslSetBootStatusData ( + _In_ BOOLEAN LastBootGood, + _In_ BOOLEAN LastBootShutdown, + _In_ BOOLEAN LastBootCheckpoint, + _In_ ULONG UpdateIncrement, + _In_ ULONG BootAttemptCount + ) +{ + NTSTATUS Status; + ULONG Size; + + /* Capture the BSD data in our globals, if needed */ + Status = OslpReadWriteBootStatusData(FALSE); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Write last boot shutdown */ + Size = sizeof(LastBootShutdown); + Status = OslpGetSetBootStatusData(FALSE, + RtlBsdItemBootShutdown, + &LastBootShutdown, + &Size); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Write last boot good */ + Size = sizeof(LastBootGood); + Status = OslpGetSetBootStatusData(FALSE, + RtlBsdItemBootGood, + &LastBootGood, + &Size); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Write last boot checkpoint */ + Size = sizeof(LastBootCheckpoint); + Status = OslpGetSetBootStatusData(FALSE, + RtlBsdItemBootCheckpoint, + &LastBootCheckpoint, + &Size); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Write boot attempt count */ + Size = sizeof(BootAttemptCount); + Status = OslpGetSetBootStatusData(FALSE, + RtlBsdItemBootAttemptCount, + &BootAttemptCount, + &Size); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* TODO: Update Boot ID*/ + + /* Now write the data */ + Status = OslpReadWriteBootStatusData(TRUE); + +Quickie: + return Status; +} + +NTSTATUS +OslGetBootStatusData ( + _Out_ PBOOLEAN LastBootGood, + _Out_ PBOOLEAN LastBootShutdown, + _Out_ PBOOLEAN LastBootCheckpoint, + _Out_ PULONG LastBootId, + _Out_ PBOOLEAN BootGood, + _Out_ PBOOLEAN BootShutdown + ) +{ + NTSTATUS Status; + ULONG Size; + ULONG64 BootStatusPolicy; + BOOLEAN localBootShutdown, localBootGood; + + /* Capture the BSD data in our globals, if needed */ + Status = OslpReadWriteBootStatusData(FALSE); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Read the last boot ID */ + Size = sizeof(*LastBootId); + Status = OslpGetSetBootStatusData(TRUE, RtlBsdItemBootId, LastBootId, &Size); + if (!NT_SUCCESS(Status)) + { + /* Set to zero if we couldn't find it */ + *LastBootId = 0; + } + + /* Get the boot status policy */ + Status = BlGetBootOptionInteger(BlpApplicationEntry.BcdData, + BcdOSLoaderInteger_BootStatusPolicy, + &BootStatusPolicy); + if (!NT_SUCCESS(Status)) + { + /* Apply a default if none exists */ + BootStatusPolicy = IgnoreShutdownFailures; + } + + /* Check if this was a good shutdown */ + Size = sizeof(localBootShutdown); + Status = OslpGetSetBootStatusData(TRUE, + RtlBsdItemBootShutdown, + &localBootShutdown, + &Size); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Tell the caller */ + *BootShutdown = localBootShutdown; + + /* Check if this was a good boot */ + Size = sizeof(localBootGood); + Status = OslpGetSetBootStatusData(TRUE, + RtlBsdItemBootGood, + &localBootGood, + &Size); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Tell the caller*/ + *BootGood = localBootGood; + + /* TODO: Additional logic for checkpoints and such */ + Status = STATUS_NOT_IMPLEMENTED; + +Quickie: + return Status; +} + +BOOLEAN +OslpAdvancedOptionsRequested ( + VOID + ) +{ + /* TODO */ + return FALSE; +} + NTSTATUS OslPrepareTarget ( _Out_ PULONG ReturnFlags, @@ -176,6 +540,16 @@ OslPrepareTarget ( SIZE_T RootLength, RootLengthWithSep; ULONG i; ULONG64 StartPerf, EndPerf; + RTL_BSD_DATA_POWER_TRANSITION PowerTransitionData; + PRTL_BSD_DATA_POWER_TRANSITION PowerBuffer; + ULONG OsDeviceHandle; + BOOLEAN LastBootGood, LastBootShutdown, LastBootCheckpoint; + ULONG BootId; + BOOLEAN BootGood, BootShutdown; + ULONG BsdSize; + + /* Initialize locals */ + PowerBuffer = NULL; /* Assume no flags */ *ReturnFlags = 0; @@ -214,9 +588,14 @@ OslPrepareTarget ( /* Capture the current TSC */ StartPerf = BlArchGetPerformanceCounter(); -#ifdef BL_TPM_SUPPORT - BlpSbdiCurrentApplicationType = 0x10200003; -#endif + /* Set our application type for SecureBoot/TPM purposes */ + BlpSbdiCurrentApplicationType.Application.ObjectCode = + BCD_OBJECT_TYPE_APPLICATION; + BlpSbdiCurrentApplicationType.Application.ImageCode = + BCD_IMAGE_TYPE_BOOT_APP; + BlpSbdiCurrentApplicationType.Application.ApplicationCode = + BCD_APPLICATION_TYPE_OSLOADER; + BlpSbdiCurrentApplicationType.Application.Reserved = 0; /* Register an error handler */ BlpStatusErrorHandler = OslBlStatusErrorHandler; @@ -237,6 +616,7 @@ OslPrepareTarget ( Status = OslpRemoveInternalApplicationOptions(); if (!NT_SUCCESS(Status)) { + EfiPrintf(L"Fail here: %d\r\n", __LINE__); goto Quickie; } @@ -247,6 +627,7 @@ OslPrepareTarget ( 0); if (!NT_SUCCESS(Status)) { + EfiPrintf(L"Fail here: %d\r\n", __LINE__); goto Quickie; } @@ -265,6 +646,7 @@ OslPrepareTarget ( &SystemRoot); if (!NT_SUCCESS(Status)) { + EfiPrintf(L"Fail here: %d\r\n", __LINE__); goto Quickie; } @@ -286,6 +668,7 @@ OslPrepareTarget ( { /* Bail out if we're out of memory */ Status = STATUS_NO_MEMORY; + EfiPrintf(L"Fail here: %d\r\n", __LINE__); goto Quickie; } @@ -297,7 +680,162 @@ OslPrepareTarget ( BlMmFreeHeap(SystemRoot); } + /* Initialize access to the BSD */ + OslpInitializeBootStatusDataLog(); + + /* Check if we're supposed to fail on purpose */ + Status = OslpCheckForcedFailure(); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"Fail here: %d\r\n", __LINE__); + goto Quickie; + } + + /* Always disable VGA mode */ + Status = BlAppendBootOptionBoolean(&BlpApplicationEntry, + BcdOSLoaderBoolean_DisableVgaMode, + TRUE); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"Fail here: %d\r\n", __LINE__); + goto Quickie; + } + + /* Get telemetry data from the last boot */ + Status = OslGetBootStatusData(&LastBootGood, + &LastBootShutdown, + &LastBootCheckpoint, + &BootId, + &BootGood, + &BootShutdown); + if (!NT_SUCCESS(Status)) + { + /* Assume this is the very first boot and everything went well */ + BootId = 0; + LastBootGood = TRUE; + LastBootShutdown = TRUE; + LastBootCheckpoint = TRUE; + BootGood = TRUE; + BootShutdown = TRUE; + + /* Set 0 boot attempts */ + OslBootAttemptCount = 0; + } + + /* Set more attempt variables to their initial state */ + OslResetBootStatus = TRUE; + OslBootCountUpdateRequestForAbort = 0; + + /* Read the current BSD data into the global buffer */ + Status = OslpReadWriteBootStatusData(FALSE); + if (NT_SUCCESS(Status)) + { + /* Get the power transition buffer from the BSD */ + BsdSize = sizeof(PowerTransitionData); + Status = OslpGetSetBootStatusData(TRUE, + RtlBsdPowerTransition, + &PowerTransitionData, + &BsdSize); + if (NT_SUCCESS(Status)) + { + /* Save the buffer */ + PowerBuffer = &PowerTransitionData; + } + } + + /* Check if this is VHD boot, which gets 3 boot attempts instead of 2 */ + OslBootAttemptMaximum = 2; + OslBootAttemptMaximum += BlDeviceIsVirtualPartitionDevice(OslLoadDevice, NULL); + + /* Check if the user wants to see the advanced menu */ + if (!OslpAdvancedOptionsRequested()) + { + /* The last boot failed more than the maximum */ + if (!(LastBootGood) && + (OslBootAttemptCount >= OslBootAttemptMaximum)) + { + /* Return failure due to boot -- launch recovery */ + *ReturnFlags |= 8; + + /* Update the attempt count and status variables */ + OslBootAttemptCount = OslBootAttemptMaximum - 1; + OslCurrentBootCheckpoint = LastBootCheckpoint; + OslCurrentBootSucceeded = FALSE; + OslCurrentBootShutdown = LastBootShutdown; + + /* Crash with code 15 and abort boot */ + OslFatalErrorEx(15, 0, 0, 0); + Status = STATUS_UNSUCCESSFUL; + EfiPrintf(L"Fail here: %d\r\n", __LINE__); + goto Quickie; + } + + /* We never made it far enough, more than the maximum */ + if (!(LastBootCheckpoint) && + (OslBootAttemptCount >= OslBootAttemptMaximum)) + { + /* Return crash/dirty shutdown during boot attempt */ + *ReturnFlags |= 0x10; + + /* Update the attempt count and status variables */ + OslBootAttemptCount = OslBootAttemptMaximum - 1; + OslCurrentBootSucceeded = LastBootGood; + OslCurrentBootShutdown = LastBootShutdown; + OslCurrentBootCheckpoint = FALSE; + + /* Crash with code 16 and abort boot */ + OslFatalErrorEx(16, 0, 0, 0); + Status = STATUS_UNSUCCESSFUL; + EfiPrintf(L"Fail here: %d\r\n", __LINE__); + goto Quickie; + } + + /* We failed to shutdown cleanly, and haven't booted yet */ + if (!(LastBootShutdown) && !(OslBootAttemptCount)) + { + /* Return crash/dirty shutdown */ + *ReturnFlags |= 0x10; + + /* There's no boot attempt, so only update shutdown variables */ + OslCurrentBootSucceeded = LastBootGood; + OslCurrentBootShutdown = TRUE; + OslCurrentBootCheckpoint = LastBootCheckpoint; + + /* Crash with code 16 and abort boot */ + OslFatalErrorEx(16, 0, 0, 0); + Status = STATUS_UNSUCCESSFUL; + EfiPrintf(L"Fail here: %d\r\n", __LINE__); + goto Quickie; + } + } + + /* Officially increment the number of boot attempts */ + OslBootAttemptCount++; + + /* No success yet, write to boot status file */ + OslCurrentBootCheckpoint = FALSE; + OslCurrentBootSucceeded = FALSE; + OslCurrentBootShutdown = FALSE; + OslSetBootStatusData(FALSE, + FALSE, + FALSE, + OslBootCountUpdateIncrement, + OslBootAttemptCount); + + /* Open the OS Loader Device for Read/Write access */ + Status = BlpDeviceOpen(OslLoadDevice, + BL_DEVICE_READ_ACCESS | BL_DEVICE_WRITE_ACCESS, + 0, + &OsDeviceHandle); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"Fail here: %d\r\n", __LINE__); + goto Quickie; + } + + /* That's all for now, folks */ Status = STATUS_NOT_IMPLEMENTED; + DBG_UNREFERENCED_LOCAL_VARIABLE(PowerBuffer); /* Printf perf */ EndPerf = BlArchGetPerformanceCounter(); diff --git a/boot/environ/app/rosload/rosload.h b/boot/environ/app/rosload/rosload.h index 5b19b4f161..c5cad3a493 100644 --- a/boot/environ/app/rosload/rosload.h +++ b/boot/environ/app/rosload/rosload.h @@ -34,6 +34,12 @@ /* STRUCTURES ****************************************************************/ +typedef struct _OSL_BSD_ITEM_TABLE_ENTRY +{ + ULONG Offset; + ULONG Size; +} OSL_BSD_ITEM_TABLE_ENTRY; + /* FUNCTIONS *****************************************************************/ VOID diff --git a/boot/environ/include/bcd.h b/boot/environ/include/bcd.h index cee8a0c79e..d0b8641cd3 100644 --- a/boot/environ/include/bcd.h +++ b/boot/environ/include/bcd.h @@ -150,8 +150,9 @@ typedef enum BcdOSLoaderElementTypes BcdOSLoaderBoolean_UsePlatformClock = 0x260000A2, BcdOSLoaderBoolean_ForceLegacyPlatform = 0x260000A3, BcdOSLoaderInteger_TscSyncPolicy = 0x250000A6, - BcdOSLoaderBoolean_EmsEnabled = 0x260000b0, - BcdOSLoaderInteger_DriverLoadFailurePolicy = 0x250000c1, + BcdOSLoaderBoolean_EmsEnabled = 0x260000B0, + BcdOSLoaderInteger_ForceFailure = 0x250000C0, + BcdOSLoaderInteger_DriverLoadFailurePolicy = 0x250000C1, BcdOSLoaderInteger_BootMenuPolicy = 0x250000C2, BcdOSLoaderBoolean_AdvancedOptionsOneTime = 0x260000C3, BcdOSLoaderBoolean_OptionsEditOneTime = 0x260000C4, /* Undocumented */ @@ -195,7 +196,8 @@ typedef enum BcdBootMgrElementTypes BcdBootMgrBoolean_PersistBootSequence = 0x26000031 } BcdBootMgrElementTypes; -typedef enum _BcdResumeElementTypes { +typedef enum _BcdResumeElementTypes +{ Reserved1 = 0x21000001, Reserved2 = 0x22000002, BcdResumeBoolean_UseCustomSettings = 0x26000003, @@ -204,6 +206,18 @@ typedef enum _BcdResumeElementTypes { BcdResumeInteger_BootMenuPolicy = 0x25000008 } BcdResumeElementTypes; +typedef enum _BCDE_OSLOADER_TYPE_BOOT_STATUS_POLICY +{ + DisplayAllFailures, + IgnoreAllFailures, + IgnoreShutdownFailures, + IgnoreBootFailures, + IgnoreCheckpointFailures, + DisplayShutdownFailures, + DisplayBootFailures, + DisplayCheckpointFailures +} BCDE_OSLOADER_TYPE_BOOT_STATUS_POLICY; + /* Undocumented */ typedef enum BcdStartupElementTypes { diff --git a/boot/environ/include/bl.h b/boot/environ/include/bl.h index 0e31deb8e9..82edfbcb00 100644 --- a/boot/environ/include/bl.h +++ b/boot/environ/include/bl.h @@ -923,7 +923,7 @@ typedef struct _BL_HARDDISK_DEVICE typedef struct _BL_LOCAL_DEVICE { - ULONG Type; + BL_LOCAL_DEVICE_TYPE Type; union { struct @@ -933,6 +933,8 @@ typedef struct _BL_LOCAL_DEVICE BL_HARDDISK_DEVICE HardDisk; + BL_HARDDISK_DEVICE VirtualHardDisk; + struct { PHYSICAL_ADDRESS ImageBase; @@ -2008,7 +2010,8 @@ BlCopyBootOptions ( NTSTATUS BlAppendBootOptionBoolean ( _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, - _In_ ULONG OptionId + _In_ ULONG OptionId, + _In_ BOOLEAN Value ); NTSTATUS @@ -2021,6 +2024,7 @@ BlAppendBootOptionInteger ( NTSTATUS BlAppendBootOptionString ( _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, + _In_ ULONG OptionId, _In_ PWCHAR OptionString ); @@ -2430,6 +2434,12 @@ BlDeviceClose ( _In_ ULONG DeviceId ); +BOOLEAN +BlDeviceIsVirtualPartitionDevice ( + _In_ PBL_DEVICE_DESCRIPTOR InputDevice, + _Outptr_ PBL_DEVICE_DESCRIPTOR* VirtualDevice + ); + NTSTATUS BlpDeviceOpen ( _In_ PBL_DEVICE_DESCRIPTOR Device, diff --git a/boot/environ/lib/io/device.c b/boot/environ/lib/io/device.c index 76dbed0674..b4fd38e178 100644 --- a/boot/environ/lib/io/device.c +++ b/boot/environ/lib/io/device.c @@ -608,6 +608,39 @@ BlockIoGetInformation ( return STATUS_SUCCESS; } +BOOLEAN +BlDeviceIsVirtualPartitionDevice ( + _In_ PBL_DEVICE_DESCRIPTOR InputDevice, + _Outptr_ PBL_DEVICE_DESCRIPTOR* VirtualDevice + ) +{ + BOOLEAN IsVirtual; + PBL_LOCAL_DEVICE ParentDisk; + + /* Assume it isn't */ + IsVirtual = FALSE; + + /* Check if this is a partition device */ + if ((InputDevice->DeviceType == LegacyPartitionDevice) || + (InputDevice->DeviceType == PartitionDevice)) + { + /* Check if the parent disk is a VHD */ + ParentDisk = &InputDevice->Partition.Disk; + if (ParentDisk->Type == VirtualDiskDevice) + { + /* This is a virtual partition device -- does the caller want it? */ + IsVirtual = TRUE; + if (VirtualDevice) + { + *VirtualDevice = (PBL_DEVICE_DESCRIPTOR)(&ParentDisk->VirtualHardDisk + 1); + } + } + } + + /* Return */ + return IsVirtual; +} + NTSTATUS BlDeviceSetInformation ( _In_ ULONG DeviceId, diff --git a/boot/environ/lib/misc/bcdopt.c b/boot/environ/lib/misc/bcdopt.c index 0b4f82e467..1b1600182c 100644 --- a/boot/environ/lib/misc/bcdopt.c +++ b/boot/environ/lib/misc/bcdopt.c @@ -624,7 +624,8 @@ BlCopyBootOptions ( NTSTATUS BlAppendBootOptionBoolean ( _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, - _In_ ULONG OptionId + _In_ ULONG OptionId, + _In_ BOOLEAN Value ) { NTSTATUS Status; @@ -642,7 +643,7 @@ BlAppendBootOptionBoolean ( Option->DataSize = sizeof(USHORT); Option->Type = OptionId; Option->DataOffset = sizeof(*Option); - *(PBOOLEAN)(Option + 1) = TRUE; + *(PBOOLEAN)(Option + 1) = Value; /* Append it */ Status = BlAppendBootOptions(AppEntry, Option); @@ -687,6 +688,7 @@ BlAppendBootOptionInteger ( NTSTATUS BlAppendBootOptionString ( _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, + _In_ ULONG OptionId, _In_ PWCHAR OptionString ) { @@ -719,7 +721,7 @@ BlAppendBootOptionString ( /* Initialize it and copy the string value */ RtlZeroMemory(Option, sizeof(*Option) + StringSize); Option->DataSize = StringSize; - Option->Type = BcdLibraryString_ApplicationPath; + Option->Type = OptionId; Option->DataOffset = sizeof(*Option); wcsncpy((PWCHAR)Option + 1, OptionString, StringSize / sizeof(WCHAR));

1 0

01/01: [SERVICES] Remove the synchronous service control pipe code
by Eric Kohl 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0c7db730c23a9201ef84… commit f0c7db730c23a9201ef84f29c7c7e60a5023d8b8 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 4 22:30:33 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 4 22:30:33 2018 +0100 [SERVICES] Remove the synchronous service control pipe code Remove the synchronous service control pipe code because we are using the asynchronous service control pipe code for years. --- base/system/services/database.c | 116 ---------------------------------------- 1 file changed, 116 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index aa176c0885..9822d6048e 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -19,12 +19,6 @@ #define NDEBUG #include <debug.h> -/* - * Uncomment the line below to use asynchronous IO operations - * on the service control pipes. - */ -#define USE_ASYNCHRONOUS_IO - /* GLOBALS *******************************************************************/ @@ -98,11 +92,7 @@ ScmCreateNewControlPipe(PSERVICE_IMAGE pServiceImage) DPRINT("PipeName: %S\n", szControlPipeName); pServiceImage->hControlPipe = CreateNamedPipeW(szControlPipeName, -#ifdef USE_ASYNCHRONOUS_IO PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, -#else - PIPE_ACCESS_DUPLEX, -#endif PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 100, 8000, @@ -1072,9 +1062,7 @@ ScmControlService(PSERVICE Service, PWSTR Ptr; DWORD dwError = ERROR_SUCCESS; BOOL bResult; -#ifdef USE_ASYNCHRONOUS_IO OVERLAPPED Overlapped = {0}; -#endif DPRINT("ScmControlService() called\n"); @@ -1106,7 +1094,6 @@ ScmControlService(PSERVICE Service, ControlPacket->dwArgumentsCount = 0; ControlPacket->dwArgumentsOffset = 0; -#ifdef USE_ASYNCHRONOUS_IO bResult = WriteFile(Service->lpImage->hControlPipe, ControlPacket, PacketSize, @@ -1212,43 +1199,6 @@ ScmControlService(PSERVICE Service, } } -#else - /* Send the control packet */ - bResult = WriteFile(Service->lpImage->hControlPipe, - ControlPacket, - PacketSize, - &dwWriteCount, - NULL); - if (bResult == FALSE) - { - dwError = GetLastError(); - DPRINT("WriteFile() failed (Error %lu)\n", dwError); - - if ((dwError == ERROR_GEN_FAILURE) && - (dwControl == SERVICE_CONTROL_STOP)) - { - /* Service is already terminated */ - Service->Status.dwCurrentState = SERVICE_STOPPED; - Service->Status.dwControlsAccepted = 0; - Service->Status.dwWin32ExitCode = ERROR_SERVICE_NOT_ACTIVE; - dwError = ERROR_SUCCESS; - } - goto Done; - } - - /* Read the reply */ - bResult = ReadFile(Service->lpImage->hControlPipe, - &ReplyPacket, - sizeof(SCM_REPLY_PACKET), - &dwReadCount, - NULL); - if (bResult == FALSE) - { - dwError = GetLastError(); - DPRINT("ReadFile() failed (Error %lu)\n", dwError); - } -#endif - Done: /* Release the control packet */ HeapFree(GetProcessHeap(), @@ -1291,9 +1241,7 @@ ScmSendStartCommand(PSERVICE Service, BOOL bResult; DWORD dwWriteCount = 0; DWORD dwReadCount = 0; -#ifdef USE_ASYNCHRONOUS_IO OVERLAPPED Overlapped = {0}; -#endif DPRINT("ScmSendStartCommand() called\n"); @@ -1363,7 +1311,6 @@ ScmSendStartCommand(PSERVICE Service, } } -#ifdef USE_ASYNCHRONOUS_IO bResult = WriteFile(Service->lpImage->hControlPipe, ControlPacket, PacketSize, @@ -1469,33 +1416,6 @@ ScmSendStartCommand(PSERVICE Service, } } -#else - /* Send the start command */ - bResult = WriteFile(Service->lpImage->hControlPipe, - ControlPacket, - PacketSize, - &dwWriteCount, - NULL); - if (bResult == FALSE) - { - dwError = GetLastError(); - DPRINT("WriteFile() failed (Error %lu)\n", dwError); - goto Done; - } - - /* Read the reply */ - bResult = ReadFile(Service->lpImage->hControlPipe, - &ReplyPacket, - sizeof(SCM_REPLY_PACKET), - &dwReadCount, - NULL); - if (bResult == FALSE) - { - dwError = GetLastError(); - DPRINT("ReadFile() failed (Error %lu)\n", dwError); - } -#endif - Done: /* Release the control packet */ HeapFree(GetProcessHeap(), @@ -1520,9 +1440,7 @@ ScmWaitForServiceConnect(PSERVICE Service) DWORD dwProcessId = 0; DWORD dwError = ERROR_SUCCESS; BOOL bResult; -#ifdef USE_ASYNCHRONOUS_IO OVERLAPPED Overlapped = {0}; -#endif #if 0 LPCWSTR lpLogStrings[3]; WCHAR szBuffer1[20]; @@ -1531,7 +1449,6 @@ ScmWaitForServiceConnect(PSERVICE Service) DPRINT("ScmWaitForServiceConnect()\n"); -#ifdef USE_ASYNCHRONOUS_IO Overlapped.hEvent = (HANDLE)NULL; bResult = ConnectNamedPipe(Service->lpImage->hControlPipe, @@ -1691,39 +1608,6 @@ ScmWaitForServiceConnect(PSERVICE Service) DPRINT("ScmWaitForServiceConnect() done\n"); return ERROR_SUCCESS; -#else - - /* Connect control pipe */ - if (ConnectNamedPipe(Service->lpImage->hControlPipe, NULL) ? - TRUE : (dwError = GetLastError()) == ERROR_PIPE_CONNECTED) - { - DPRINT("Control pipe connected!\n"); - - /* Read SERVICE_STATUS_HANDLE from pipe */ - bResult = ReadFile(Service->lpImage->hControlPipe, - (LPVOID)&dwProcessId, - sizeof(DWORD), - &dwRead, - NULL); - if (bResult == FALSE) - { - dwError = GetLastError(); - DPRINT1("Reading the service control pipe failed (Error %lu)\n", - dwError); - } - else - { - dwError = ERROR_SUCCESS; - DPRINT("Read control pipe successfully\n"); - } - } - else - { - DPRINT1("Connecting control pipe failed! (Error %lu)\n", dwError); - } - - return dwError; -#endif }

1 0

01/01: [SETUPAPI] Machine handles are pointers.
by Eric Kohl 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5870819a3d6ffac7095d… commit e5870819a3d6ffac7095d4ceac1eb0587bbf7cf6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 4 21:02:20 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 4 22:03:17 2018 +0100 [SETUPAPI] Machine handles are pointers. --- dll/win32/setupapi/setupapi.spec | 136 +++++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec index 350df6c76d..a3dab530a7 100644 --- a/dll/win32/setupapi/setupapi.spec +++ b/dll/win32/setupapi/setupapi.spec @@ -15,16 +15,16 @@ @ stdcall CM_Add_ID_ExW(ptr wstr long ptr) @ stdcall CM_Add_Range(int64 int64 ptr long) @ stdcall CM_Add_Res_Des(ptr ptr long ptr long long) -@ stdcall CM_Add_Res_Des_Ex(ptr ptr long ptr long long long) +@ stdcall CM_Add_Res_Des_Ex(ptr ptr long ptr long long ptr) @ stdcall CM_Connect_MachineA(str ptr) @ stdcall CM_Connect_MachineW(wstr ptr) @ stdcall CM_Create_DevNodeA(ptr str long long) @ stdcall CM_Create_DevNodeW(ptr wstr long long) -@ stdcall CM_Create_DevNode_ExA(ptr str long long long) -@ stdcall CM_Create_DevNode_ExW(ptr wstr long long long) +@ stdcall CM_Create_DevNode_ExA(ptr str long long ptr) +@ stdcall CM_Create_DevNode_ExW(ptr wstr long long ptr) @ stdcall CM_Create_Range_List(ptr long) @ stdcall CM_Delete_Class_Key(ptr long) -@ stdcall CM_Delete_Class_Key_Ex(ptr long long) +@ stdcall CM_Delete_Class_Key_Ex(ptr long ptr) @ stdcall CM_Delete_DevNode_Key(long long long) @ stdcall CM_Delete_DevNode_Key_Ex(long long long ptr) @ stdcall CM_Delete_Range(int64 int64 ptr long) @@ -32,7 +32,7 @@ @ stub CM_Detect_Resource_Conflict_Ex @ stdcall CM_Disable_DevNode(long long) @ stdcall CM_Disable_DevNode_Ex(long long ptr) -@ stdcall CM_Disconnect_Machine(long) +@ stdcall CM_Disconnect_Machine(ptr) @ stdcall CM_Dup_Range_List(ptr ptr long) @ stdcall CM_Enable_DevNode(long long) @ stdcall CM_Enable_DevNode_Ex(long long ptr) @@ -40,8 +40,8 @@ @ stdcall CM_Enumerate_Classes_Ex(long ptr long ptr) @ stdcall CM_Enumerate_EnumeratorsA(long str ptr long) @ stdcall CM_Enumerate_EnumeratorsW(long wstr ptr long) -@ stdcall CM_Enumerate_Enumerators_ExA(long str ptr long long) -@ stdcall CM_Enumerate_Enumerators_ExW(long wstr ptr long long) +@ stdcall CM_Enumerate_Enumerators_ExA(long str ptr long ptr) +@ stdcall CM_Enumerate_Enumerators_ExW(long wstr ptr long ptr) @ stdcall CM_Find_Range(ptr int64 long int64 int64 ptr long) @ stdcall CM_First_Range(ptr ptr ptr ptr long) @ stdcall CM_Free_Log_Conf(ptr long) @@ -49,51 +49,51 @@ @ stdcall CM_Free_Log_Conf_Handle(ptr) @ stdcall CM_Free_Range_List(ptr long) @ stdcall CM_Free_Res_Des(ptr ptr long) -@ stdcall CM_Free_Res_Des_Ex(ptr ptr long long) +@ stdcall CM_Free_Res_Des_Ex(ptr ptr long ptr) @ stdcall CM_Free_Res_Des_Handle(ptr) @ stub CM_Free_Resource_Conflict_Handle @ stdcall CM_Get_Child(ptr long long) -@ stdcall CM_Get_Child_Ex(ptr long long long) +@ stdcall CM_Get_Child_Ex(ptr long long ptr) @ stdcall CM_Get_Class_Key_NameA(ptr str ptr long) @ stdcall CM_Get_Class_Key_NameW(ptr wstr ptr long) -@ stdcall CM_Get_Class_Key_Name_ExA(ptr str ptr long long) -@ stdcall CM_Get_Class_Key_Name_ExW(ptr wstr ptr long long) +@ stdcall CM_Get_Class_Key_Name_ExA(ptr str ptr long ptr) +@ stdcall CM_Get_Class_Key_Name_ExW(ptr wstr ptr long ptr) @ stdcall CM_Get_Class_NameA(ptr str ptr long) @ stdcall CM_Get_Class_NameW(ptr wstr ptr long) -@ stdcall CM_Get_Class_Name_ExA(ptr str ptr long long) -@ stdcall CM_Get_Class_Name_ExW(ptr wstr ptr long long) +@ stdcall CM_Get_Class_Name_ExA(ptr str ptr long ptr) +@ stdcall CM_Get_Class_Name_ExW(ptr wstr ptr long ptr) @ stdcall CM_Get_Class_Registry_PropertyA(ptr long ptr ptr ptr long ptr) @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr ptr long ptr) @ stdcall CM_Get_Depth(ptr long long) -@ stdcall CM_Get_Depth_Ex(ptr long long long) +@ stdcall CM_Get_Depth_Ex(ptr long long ptr) @ stdcall CM_Get_DevNode_Custom_PropertyA(long str ptr ptr ptr long) @ stdcall CM_Get_DevNode_Custom_PropertyW(long wstr ptr ptr ptr long) @ stdcall CM_Get_DevNode_Custom_Property_ExA(long str ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Custom_Property_ExW(long wstr ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) -@ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long long) -@ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long long) +@ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) +@ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Status(ptr ptr long long) -@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long long) +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long ptr) @ stdcall CM_Get_Device_IDA(long str long long) @ stdcall CM_Get_Device_IDW(long wstr long long) -@ stdcall CM_Get_Device_ID_ExA(long str long long long) -@ stdcall CM_Get_Device_ID_ExW(long wstr long long long) +@ stdcall CM_Get_Device_ID_ExA(long str long long ptr) +@ stdcall CM_Get_Device_ID_ExW(long wstr long long ptr) @ stdcall CM_Get_Device_ID_ListA(str str long long) @ stdcall CM_Get_Device_ID_ListW(wstr wstr long long) -@ stdcall CM_Get_Device_ID_List_ExA(str str long long long) -@ stdcall CM_Get_Device_ID_List_ExW(wstr wstr long long long) +@ stdcall CM_Get_Device_ID_List_ExA(str str long long ptr) +@ stdcall CM_Get_Device_ID_List_ExW(wstr wstr long long ptr) @ stdcall CM_Get_Device_ID_List_SizeA(ptr str long) @ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) -@ stdcall CM_Get_Device_ID_List_Size_ExA(ptr str long long) -@ stdcall CM_Get_Device_ID_List_Size_ExW(ptr wstr long long) +@ stdcall CM_Get_Device_ID_List_Size_ExA(ptr str long ptr) +@ stdcall CM_Get_Device_ID_List_Size_ExW(ptr wstr long ptr) @ stdcall CM_Get_Device_ID_Size(ptr long long) -@ stdcall CM_Get_Device_ID_Size_Ex(ptr long long long) +@ stdcall CM_Get_Device_ID_Size_Ex(ptr long long ptr) @ stdcall CM_Get_Device_Interface_AliasA(str ptr str ptr long) @ stdcall CM_Get_Device_Interface_AliasW(wstr ptr wstr ptr long) -@ stdcall CM_Get_Device_Interface_Alias_ExA(str ptr str ptr long long) -@ stdcall CM_Get_Device_Interface_Alias_ExW(wstr ptr wstr ptr long long) +@ stdcall CM_Get_Device_Interface_Alias_ExA(str ptr str ptr long ptr) +@ stdcall CM_Get_Device_Interface_Alias_ExW(wstr ptr wstr ptr long ptr) @ stdcall CM_Get_Device_Interface_ListA(ptr str str long long) @ stdcall CM_Get_Device_Interface_ListW(ptr wstr wstr long long) @ stdcall CM_Get_Device_Interface_List_ExA(ptr str str long long ptr) @@ -108,105 +108,105 @@ @ stdcall CM_Get_Global_State_Ex(ptr long long) @ stdcall CM_Get_HW_Prof_FlagsA(str long ptr long) @ stdcall CM_Get_HW_Prof_FlagsW(wstr long ptr long) -@ stdcall CM_Get_HW_Prof_Flags_ExA(str long ptr long long) -@ stdcall CM_Get_HW_Prof_Flags_ExW(wstr long ptr long long) +@ stdcall CM_Get_HW_Prof_Flags_ExA(str long ptr long ptr) +@ stdcall CM_Get_HW_Prof_Flags_ExW(wstr long ptr long ptr) @ stdcall CM_Get_Hardware_Profile_InfoA(long ptr long) @ stdcall CM_Get_Hardware_Profile_InfoW(long ptr long) -@ stdcall CM_Get_Hardware_Profile_Info_ExA(long ptr long long) -@ stdcall CM_Get_Hardware_Profile_Info_ExW(long ptr long long) +@ stdcall CM_Get_Hardware_Profile_Info_ExA(long ptr long ptr) +@ stdcall CM_Get_Hardware_Profile_Info_ExW(long ptr long ptr) @ stdcall CM_Get_Log_Conf_Priority(ptr ptr long) -@ stdcall CM_Get_Log_Conf_Priority_Ex(ptr ptr long long) +@ stdcall CM_Get_Log_Conf_Priority_Ex(ptr ptr long ptr) @ stdcall CM_Get_Next_Log_Conf(ptr ptr long) -@ stdcall CM_Get_Next_Log_Conf_Ex(ptr ptr long long) +@ stdcall CM_Get_Next_Log_Conf_Ex(ptr ptr long ptr) @ stdcall CM_Get_Next_Res_Des(ptr ptr long ptr long) -@ stdcall CM_Get_Next_Res_Des_Ex(ptr ptr long ptr long long) +@ stdcall CM_Get_Next_Res_Des_Ex(ptr ptr long ptr long ptr) @ stdcall CM_Get_Parent(ptr long long) -@ stdcall CM_Get_Parent_Ex(ptr long long long) +@ stdcall CM_Get_Parent_Ex(ptr long long ptr) @ stdcall CM_Get_Res_Des_Data(ptr ptr long long) -@ stdcall CM_Get_Res_Des_Data_Ex(ptr ptr long long long) +@ stdcall CM_Get_Res_Des_Data_Ex(ptr ptr long long ptr) @ stdcall CM_Get_Res_Des_Data_Size(ptr ptr long) -@ stdcall CM_Get_Res_Des_Data_Size_Ex(ptr ptr long long) +@ stdcall CM_Get_Res_Des_Data_Size_Ex(ptr ptr long ptr) @ stub CM_Get_Resource_Conflict_Count @ stub CM_Get_Resource_Conflict_DetailsA @ stub CM_Get_Resource_Conflict_DetailsW @ stdcall CM_Get_Sibling(ptr long long) -@ stdcall CM_Get_Sibling_Ex(ptr long long long) +@ stdcall CM_Get_Sibling_Ex(ptr long long ptr) @ stdcall CM_Get_Version() -@ stdcall CM_Get_Version_Ex(long) +@ stdcall CM_Get_Version_Ex(ptr) @ stdcall CM_Intersect_Range_List(ptr ptr ptr long) @ stdcall CM_Invert_Range_List(ptr ptr int64 long) @ stdcall CM_Is_Dock_Station_Present(ptr) -@ stdcall CM_Is_Dock_Station_Present_Ex(ptr long) +@ stdcall CM_Is_Dock_Station_Present_Ex(ptr ptr) @ stdcall CM_Is_Version_Available(long) -@ stdcall CM_Is_Version_Available_Ex(long long) +@ stdcall CM_Is_Version_Available_Ex(long ptr) @ stdcall CM_Locate_DevNodeA(ptr str long) @ stdcall CM_Locate_DevNodeW(ptr wstr long) -@ stdcall CM_Locate_DevNode_ExA(ptr str long long) -@ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) +@ stdcall CM_Locate_DevNode_ExA(ptr str long ptr) +@ stdcall CM_Locate_DevNode_ExW(ptr wstr long ptr) @ stdcall CM_Merge_Range_List(ptr ptr ptr long) @ stdcall CM_Modify_Res_Des(ptr ptr long ptr long long) -@ stdcall CM_Modify_Res_Des_Ex(ptr ptr long ptr long long long) +@ stdcall CM_Modify_Res_Des_Ex(ptr ptr long ptr long long ptr) @ stdcall CM_Move_DevNode(long long long) -@ stdcall CM_Move_DevNode_Ex(long long long long) +@ stdcall CM_Move_DevNode_Ex(long long long ptr) @ stdcall CM_Next_Range(ptr ptr ptr long) @ stdcall CM_Open_Class_KeyA(ptr str long long ptr long) @ stdcall CM_Open_Class_KeyW(ptr wstr long long ptr long) -@ stdcall CM_Open_Class_Key_ExA(ptr str long long ptr long long) -@ stdcall CM_Open_Class_Key_ExW(ptr wstr long long ptr long long) +@ stdcall CM_Open_Class_Key_ExA(ptr str long long ptr long ptr) +@ stdcall CM_Open_Class_Key_ExW(ptr wstr long long ptr long ptr) @ stdcall CM_Open_DevNode_Key(ptr long long long ptr long) -@ stdcall CM_Open_DevNode_Key_Ex(ptr long long long ptr long long) +@ stdcall CM_Open_DevNode_Key_Ex(ptr long long long ptr long ptr) @ stdcall CM_Query_And_Remove_SubTreeA(long ptr str long long) @ stdcall CM_Query_And_Remove_SubTreeW(long ptr wstr long long) -@ stdcall CM_Query_And_Remove_SubTree_ExA(long ptr str long long long) -@ stdcall CM_Query_And_Remove_SubTree_ExW(long ptr wstr long long long) +@ stdcall CM_Query_And_Remove_SubTree_ExA(long ptr str long long ptr) +@ stdcall CM_Query_And_Remove_SubTree_ExW(long ptr wstr long long ptr) @ stdcall CM_Query_Arbitrator_Free_Data(ptr long long long long) @ stdcall CM_Query_Arbitrator_Free_Data_Ex(ptr long long long long ptr) @ stdcall CM_Query_Arbitrator_Free_Size(ptr long long long) @ stdcall CM_Query_Arbitrator_Free_Size_Ex(ptr long long long ptr) @ stdcall CM_Query_Remove_SubTree(long long) -@ stdcall CM_Query_Remove_SubTree_Ex(long long long) +@ stdcall CM_Query_Remove_SubTree_Ex(long long ptr) @ stub CM_Query_Resource_Conflict_List @ stdcall CM_Reenumerate_DevNode(long long) -@ stdcall CM_Reenumerate_DevNode_Ex(long long long) +@ stdcall CM_Reenumerate_DevNode_Ex(long long ptr) @ stdcall CM_Register_Device_Driver(long long) @ stdcall CM_Register_Device_Driver_Ex(long long ptr) @ stdcall CM_Register_Device_InterfaceA(long ptr str str ptr long) @ stdcall CM_Register_Device_InterfaceW(long ptr wstr wstr ptr long) -@ stdcall CM_Register_Device_Interface_ExA(long ptr str str ptr long long) -@ stdcall CM_Register_Device_Interface_ExW(long ptr wstr wstr ptr long long) +@ stdcall CM_Register_Device_Interface_ExA(long ptr str str ptr long ptr) +@ stdcall CM_Register_Device_Interface_ExW(long ptr wstr wstr ptr long ptr) @ stdcall CM_Remove_SubTree(long long) -@ stdcall CM_Remove_SubTree_Ex(long long long) +@ stdcall CM_Remove_SubTree_Ex(long long ptr) @ stdcall CM_Request_Device_EjectA(long ptr str long long) @ stdcall CM_Request_Device_EjectW(long ptr wstr long long) -@ stdcall CM_Request_Device_Eject_ExA(long ptr str long long long) -@ stdcall CM_Request_Device_Eject_ExW(long ptr wstr long long long) +@ stdcall CM_Request_Device_Eject_ExA(long ptr str long long ptr) +@ stdcall CM_Request_Device_Eject_ExW(long ptr wstr long long ptr) @ stdcall CM_Request_Eject_PC() -@ stdcall CM_Request_Eject_PC_Ex(long) +@ stdcall CM_Request_Eject_PC_Ex(ptr) @ stdcall CM_Run_Detection(long) -@ stdcall CM_Run_Detection_Ex(long long) +@ stdcall CM_Run_Detection_Ex(long ptr) @ stdcall CM_Set_Class_Registry_PropertyA(ptr long ptr long long ptr) @ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) @ stdcall CM_Set_DevNode_Problem(long long long) -@ stdcall CM_Set_DevNode_Problem_Ex(long long long long) +@ stdcall CM_Set_DevNode_Problem_Ex(long long long ptr) @ stdcall CM_Set_DevNode_Registry_PropertyA(long long ptr long long) @ stdcall CM_Set_DevNode_Registry_PropertyW(long long ptr long long) -@ stdcall CM_Set_DevNode_Registry_Property_ExA(long long ptr long long long) -@ stdcall CM_Set_DevNode_Registry_Property_ExW(long long ptr long long long) +@ stdcall CM_Set_DevNode_Registry_Property_ExA(long long ptr long long ptr) +@ stdcall CM_Set_DevNode_Registry_Property_ExW(long long ptr long long ptr) @ stdcall CM_Set_HW_Prof(long long) -@ stdcall CM_Set_HW_Prof_Ex(long long long) +@ stdcall CM_Set_HW_Prof_Ex(long long ptr) @ stdcall CM_Set_HW_Prof_FlagsA(str long long long) @ stdcall CM_Set_HW_Prof_FlagsW(wstr long long long) -@ stdcall CM_Set_HW_Prof_Flags_ExA(str long long long long) -@ stdcall CM_Set_HW_Prof_Flags_ExW(wstr long long long long) +@ stdcall CM_Set_HW_Prof_Flags_ExA(str long long long ptr) +@ stdcall CM_Set_HW_Prof_Flags_ExW(wstr long long long ptr) @ stdcall CM_Setup_DevNode(long long) -@ stdcall CM_Setup_DevNode_Ex(long long long) +@ stdcall CM_Setup_DevNode_Ex(long long ptr) @ stdcall CM_Test_Range_Available(int64 int64 ptr long) @ stdcall CM_Uninstall_DevNode(long long) -@ stdcall CM_Uninstall_DevNode_Ex(long long long) +@ stdcall CM_Uninstall_DevNode_Ex(long long ptr) @ stdcall CM_Unregister_Device_InterfaceA(str long) @ stdcall CM_Unregister_Device_InterfaceW(wstr long) -@ stdcall CM_Unregister_Device_Interface_ExA(str long long) -@ stdcall CM_Unregister_Device_Interface_ExW(wstr long long) +@ stdcall CM_Unregister_Device_Interface_ExA(str long ptr) +@ stdcall CM_Unregister_Device_Interface_ExW(wstr long ptr) @ stdcall DoesUserHavePrivilege(wstr) @ stub ExtensionPropSheetPageProc @ stdcall InstallCatalog(str str ptr)

1 0

01/01: [NTOSKRNL] Yet another ASSERT...
by Pierre Schweitzer 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41792c517ed0372e8342c… commit 41792c517ed0372e8342ce66163781871a59d078 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Feb 4 22:02:27 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Feb 4 22:02:27 2018 +0100 [NTOSKRNL] Yet another ASSERT... CORE-14285 --- ntoskrnl/cc/view.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 2e570a1ead..cf2fc328b1 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -696,6 +696,7 @@ CcRosUnmapVacb ( CcRosMarkDirtyVacb(Vacb); } + ASSERT(Vacb->MappedCount != 0); Vacb->MappedCount--; CcRosVacbDecRefCount(Vacb);

1 0

01/01: [NTOSKRNL] Add an assert against VACB reference count overflow. Very likely to be hit...
by Pierre Schweitzer 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8dc4ac369279672c6784b… commit 8dc4ac369279672c6784b7a77396b6a8283414df Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Feb 4 21:46:08 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Feb 4 21:46:08 2018 +0100 [NTOSKRNL] Add an assert against VACB reference count overflow. Very likely to be hit... CORE-14285 --- ntoskrnl/cc/view.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index f66f230c2d..2e570a1ead 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -94,6 +94,7 @@ static void CcRosVacbIncRefCount_(PROS_VACB vacb, const char* file, int line) } static void CcRosVacbDecRefCount_(PROS_VACB vacb, const char* file, int line) { + ASSERT(vacb->ReferenceCount != 0); --vacb->ReferenceCount; ASSERT(!(vacb->ReferenceCount == 0 && vacb->Dirty)); if (vacb->SharedCacheMap->Trace)

1 0

01/01: [SETUPAPI] Add a proper (SEH protected) check for LOG_CONF handles
by Eric Kohl 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19fc20f22254cb6cb0dc2… commit 19fc20f22254cb6cb0dc24da752b3ea26bd2954d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 4 20:23:51 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 4 20:23:51 2018 +0100 [SETUPAPI] Add a proper (SEH protected) check for LOG_CONF handles --- dll/win32/setupapi/cfgmgr.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index c2044d98fa..3a6c2e94b3 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -341,7 +341,7 @@ done: BOOL IsValidRangeList( - _In_ PINTERNAL_RANGE_LIST pRangeList) + _In_opt_ PINTERNAL_RANGE_LIST pRangeList) { BOOL bValid = TRUE; @@ -363,6 +363,30 @@ IsValidRangeList( } +BOOL +IsValidLogConf( + _In_opt_ PLOG_CONF_INFO pLogConfInfo) +{ + BOOL bValid = TRUE; + + if (pLogConfInfo == NULL) + return FALSE; + + _SEH2_TRY + { + if (pLogConfInfo->ulMagic != LOG_CONF_MAGIC) + bValid = FALSE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bValid = FALSE; + } + _SEH2_END; + + return bValid; +} + + /*********************************************************************** * CMP_GetBlockedDriverInfo [SETUPAPI.@] */ @@ -2049,7 +2073,7 @@ CM_Free_Log_Conf_Ex( return CR_ACCESS_DENIED; pLogConfInfo = (PLOG_CONF_INFO)lcLogConfToBeFreed; - if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC) + if (!IsValidLogConf(pLogConfInfo)) return CR_INVALID_LOG_CONF; if (ulFlags != 0) @@ -2103,7 +2127,7 @@ CM_Free_Log_Conf_Handle( TRACE("CM_Free_Log_Conf_Handle(%lx)\n", lcLogConf); pLogConfInfo = (PLOG_CONF_INFO)lcLogConf; - if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC) + if (!IsValidLogConf(pLogConfInfo)) return CR_INVALID_LOG_CONF; HeapFree(GetProcessHeap(), 0, pLogConfInfo); @@ -4709,7 +4733,7 @@ CM_Get_Log_Conf_Priority_Ex( lcLogConf, pPriority, ulFlags, hMachine); pLogConfInfo = (PLOG_CONF_INFO)lcLogConf; - if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC) + if (!IsValidLogConf(pLogConfInfo)) return CR_INVALID_LOG_CONF; if (pPriority == NULL) @@ -4800,7 +4824,7 @@ CM_Get_Next_Log_Conf_Ex( *plcLogConf = 0; pLogConfInfo = (PLOG_CONF_INFO)lcLogConf; - if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC) + if (!IsValidLogConf(pLogConfInfo)) return CR_INVALID_LOG_CONF; if (ulFlags != 0)

1 0

01/01: [SETUPAPI] Fix the coding style, annotations and debug messages
by Eric Kohl 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60a218948efe35180b351… commit 60a218948efe35180b351b0b5b1494fbb996dad9 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 4 17:47:37 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 4 20:16:46 2018 +0100 [SETUPAPI] Fix the coding style, annotations and debug messages * Fix the coding style. * Add missing annotations. * Add the function name to the debug messages. * Treat all machine handles like pointers. --- dll/win32/setupapi/cfgmgr.c | 962 +++++++++++++++++++++++++++++--------------- 1 file changed, 639 insertions(+), 323 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index c77d8fd8db..c2044d98fa 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -1396,7 +1396,7 @@ CM_Delete_Class_Key_Ex( RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - TRACE("CM_Delete_Class_Key_Ex(%p %lx %lx)\n", + TRACE("CM_Delete_Class_Key_Ex(%p %lx %p)\n", ClassGuid, ulFlags, hMachine); if (ClassGuid == NULL) @@ -1581,7 +1581,7 @@ CM_Disconnect_Machine( { PMACHINE_INFO pMachine; - TRACE("CM_Disconnect_Machine(%lx)\n", hMachine); + TRACE("CM_Disconnect_Machine(%p)\n", hMachine); pMachine = (PMACHINE_INFO)hMachine; if (pMachine == NULL) @@ -1839,7 +1839,7 @@ CM_Enumerate_Enumerators_ExA( ULONG ulLength; CONFIGRET ret = CR_SUCCESS; - TRACE("CM_Enumerate_Enumerators_ExA(%lu %p %p %lx %lx)\n", + TRACE("CM_Enumerate_Enumerators_ExA(%lu %p %p %lx %p)\n", ulEnumIndex, Buffer, pulLength, ulFlags, hMachine); if (Buffer == NULL || pulLength == NULL) @@ -1888,7 +1888,7 @@ CM_Enumerate_Enumerators_ExW( RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - TRACE("CM_Enumerate_Enumerators_ExW(%lu %p %p %lx %lx)\n", + TRACE("CM_Enumerate_Enumerators_ExW(%lu %p %p %lx %p)\n", ulEnumIndex, Buffer, pulLength, ulFlags, hMachine); if (Buffer == NULL || pulLength == NULL) @@ -2042,7 +2042,7 @@ CM_Free_Log_Conf_Ex( PLOG_CONF_INFO pLogConfInfo; CONFIGRET ret; - TRACE("CM_Free_Log_Conf_Ex(%lx %lx %lx)\n", + TRACE("CM_Free_Log_Conf_Ex(%lx %lx %p)\n", lcLogConfToBeFreed, ulFlags, hMachine); if (!pSetupIsUserAdmin()) @@ -2188,7 +2188,7 @@ CM_Free_Res_Des_Ex( _In_ ULONG ulFlags, _In_opt_ HMACHINE hMachine) { - FIXME("CM_Free_Res_Des_Ex(%p %p %lx %lx)\n", + FIXME("CM_Free_Res_Des_Ex(%p %p %lx %p)\n", prdResDes, rdResDes, ulFlags, hMachine); return CR_CALL_NOT_IMPLEMENTED; @@ -2244,7 +2244,7 @@ CM_Get_Child_Ex( DWORD dwIndex, dwLength = MAX_DEVICE_ID_LEN; CONFIGRET ret; - TRACE("CM_Get_Child_Ex(%p %lx %lx %lx)\n", + TRACE("CM_Get_Child_Ex(%p %lx %lx %p)\n", pdnDevInst, dnDevInst, ulFlags, hMachine); if (pdnDevInst == NULL) @@ -2363,7 +2363,7 @@ CM_Get_Class_Key_Name_ExA( ULONG ulLength; ULONG ulOrigLength; - TRACE("CM_Get_Class_Key_Name_ExA(%p %p %p %lx %lx)\n", + TRACE("CM_Get_Class_Key_Name_ExA(%p %p %p %lx %p)\n", ClassGuid, pszKeyName, pulLength, ulFlags, hMachine); if (ClassGuid == NULL || pszKeyName == NULL || pulLength == NULL) @@ -2406,7 +2406,7 @@ CM_Get_Class_Key_Name_ExW( _In_ ULONG ulFlags, _In_opt_ HMACHINE hMachine) { - TRACE("CM_Get_Class_Key_Name_ExW(%p %p %p %lx %lx)\n", + TRACE("CM_Get_Class_Key_Name_ExW(%p %p %p %lx %p)\n", ClassGuid, pszKeyName, pulLength, ulFlags, hMachine); if (ClassGuid == NULL || pszKeyName == NULL || pulLength == NULL) @@ -2485,7 +2485,7 @@ CM_Get_Class_Name_ExA( ULONG ulLength; ULONG ulOrigLength; - TRACE("CM_Get_Class_Name_ExA(%p %p %p %lx %lx)\n", + TRACE("CM_Get_Class_Name_ExA(%p %p %p %lx %p)\n", ClassGuid, Buffer, pulLength, ulFlags, hMachine); if (ClassGuid == NULL || Buffer == NULL || pulLength == NULL) @@ -2532,7 +2532,7 @@ CM_Get_Class_Name_ExW( RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - TRACE("CM_Get_Class_Name_ExW(%p %p %p %lx %lx\n", + TRACE("CM_Get_Class_Name_ExW(%p %p %p %lx %p\n", ClassGuid, Buffer, pulLength, ulFlags, hMachine); if (ClassGuid == NULL || Buffer == NULL || pulLength == NULL) @@ -2595,7 +2595,7 @@ CM_Get_Class_Registry_PropertyA( ULONG ulType; CONFIGRET ret; - TRACE("CM_Get_Class_Registry_PropertyA(%p %lu %p %p %p %lx %lx)\n", + TRACE("CM_Get_Class_Registry_PropertyA(%p %lu %p %p %p %lx %p)\n", ClassGuid, ulProperty, pulRegDataType, Buffer, pulLength, ulFlags, hMachine); @@ -2675,7 +2675,7 @@ CM_Get_Class_Registry_PropertyW( ULONG ulTransferLength = 0; CONFIGRET ret; - TRACE("CM_Get_Class_Registry_PropertyW(%p %lu %p %p %p %lx %lx)\n", + TRACE("CM_Get_Class_Registry_PropertyW(%p %lu %p %p %p %lx %p)\n", ClassGuid, ulProperty, pulRegDataType, Buffer, pulLength, ulFlags, hMachine); @@ -2767,7 +2767,7 @@ CM_Get_Depth_Ex( LPWSTR lpDevInst; CONFIGRET ret; - TRACE("CM_Get_Depth_Ex(%p %lx %lx %lx)\n", + TRACE("CM_Get_Depth_Ex(%p %lx %lx %p)\n", pulDepth, dnDevInst, ulFlags, hMachine); if (pulDepth == NULL) @@ -3098,7 +3098,7 @@ CM_Get_DevNode_Registry_Property_ExA( ULONG ulDataType = REG_NONE; CONFIGRET ret; - TRACE("CM_Get_DevNode_Registry_Property_ExA(%lx %lu %p %p %p %lx %lx)\n", + TRACE("CM_Get_DevNode_Registry_Property_ExA(%lx %lu %p %p %p %lx %p)\n", dnDevInst, ulProperty, pulRegDataType, Buffer, pulLength, ulFlags, hMachine); @@ -3180,7 +3180,7 @@ CM_Get_DevNode_Registry_Property_ExW( ULONG ulDataType = REG_NONE; ULONG ulTransferLength = 0; - TRACE("CM_Get_DevNode_Registry_Property_ExW(%lx %lu %p %p %p %lx %lx)\n", + TRACE("CM_Get_DevNode_Registry_Property_ExW(%lx %lu %p %p %p %lx %p)\n", dnDevInst, ulProperty, pulRegDataType, Buffer, pulLength, ulFlags, hMachine); @@ -3288,7 +3288,7 @@ CM_Get_DevNode_Status_Ex( LPWSTR lpDevInst; CONFIGRET ret; - TRACE("CM_Get_DevNode_Status_Ex(%p %p %lx %lx %lx)\n", + TRACE("CM_Get_DevNode_Status_Ex(%p %p %lx %lx %p)\n", pulStatus, pulProblemNumber, dnDevInst, ulFlags, hMachine); if (pulStatus == NULL || pulProblemNumber == NULL) @@ -3349,7 +3349,7 @@ CM_Get_Device_IDA( _In_ ULONG BufferLen, _In_ ULONG ulFlags) { - TRACE("CM_Get_Device_IDA(%lx %p %ld %lx)\n", + TRACE("CM_Get_Device_IDA(%lx %p %lu %lx)\n", dnDevInst, Buffer, BufferLen, ulFlags); return CM_Get_Device_ID_ExA(dnDevInst, Buffer, BufferLen, ulFlags, NULL); @@ -3367,7 +3367,7 @@ CM_Get_Device_IDW( _In_ ULONG BufferLen, _In_ ULONG ulFlags) { - TRACE("CM_Get_Device_IDW(%lx %p %ld %lx)\n", + TRACE("CM_Get_Device_IDW(%lx %p %lu %lx)\n", dnDevInst, Buffer, BufferLen, ulFlags); return CM_Get_Device_ID_ExW(dnDevInst, Buffer, BufferLen, ulFlags, NULL); @@ -3389,7 +3389,7 @@ CM_Get_Device_ID_ExA( WCHAR szBufferW[MAX_DEVICE_ID_LEN]; CONFIGRET ret = CR_SUCCESS; - TRACE("CM_Get_Device_ID_ExA(%lx %p %ld %ld %lx)\n", + TRACE("CM_Get_Device_ID_ExA(%lx %p %lu %lx %p)\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); if (Buffer == NULL) @@ -3431,7 +3431,7 @@ CM_Get_Device_ID_ExW( { HSTRING_TABLE StringTable = NULL; - TRACE("CM_Get_Device_ID_ExW(%lx %p %ld %lx %lx)\n", + TRACE("CM_Get_Device_ID_ExW(%lx %p %lu %lx %p)\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); if (dnDevInst == 0) @@ -3476,7 +3476,7 @@ CM_Get_Device_ID_ListA( _In_ ULONG BufferLen, _In_ ULONG ulFlags) { - TRACE("CM_Get_Device_ID_ListA(%p %p %ld %lx)\n", + TRACE("CM_Get_Device_ID_ListA(%p %p %lu %lx)\n", pszFilter, Buffer, BufferLen, ulFlags); return CM_Get_Device_ID_List_ExA(pszFilter, Buffer, BufferLen, @@ -3495,7 +3495,7 @@ CM_Get_Device_ID_ListW( _In_ ULONG BufferLen, _In_ ULONG ulFlags) { - TRACE("CM_Get_Device_ID_ListW(%p %p %ld %lx)\n", + TRACE("CM_Get_Device_ID_ListW(%p %p %lu %lx)\n", pszFilter, Buffer, BufferLen, ulFlags); return CM_Get_Device_ID_List_ExW(pszFilter, Buffer, BufferLen, @@ -3519,7 +3519,7 @@ CM_Get_Device_ID_List_ExA( LPWSTR pszFilterW = NULL; CONFIGRET ret = CR_SUCCESS; - TRACE("CM_Get_Device_ID_List_ExA(%p %p %ld %lx %lx)\n", + TRACE("CM_Get_Device_ID_List_ExA(%p %p %lu %lx %p)\n", pszFilter, Buffer, BufferLen, ulFlags, hMachine); BufferW = MyMalloc(BufferLen * sizeof(WCHAR)); @@ -3583,7 +3583,7 @@ CM_Get_Device_ID_List_ExW( RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - TRACE("CM_Get_Device_ID_List_ExW(%p %p %ld %lx %lx)\n", + TRACE("CM_Get_Device_ID_List_ExW(%p %p %lu %lx %p)\n", pszFilter, Buffer, BufferLen, ulFlags, hMachine); if (Buffer == NULL || BufferLen == 0) @@ -3672,7 +3672,7 @@ CM_Get_Device_ID_List_Size_ExA( LPWSTR pszFilterW = NULL; CONFIGRET ret = CR_SUCCESS; - FIXME("CM_Get_Device_ID_List_Size_ExA(%p %s %lx %lx)\n", + FIXME("CM_Get_Device_ID_List_Size_ExA(%p %s %lx %p)\n", pulLen, debugstr_a(pszFilter), ulFlags, hMachine); if (pszFilter == NULL) @@ -3713,7 +3713,7 @@ CM_Get_Device_ID_List_Size_ExW( RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - FIXME("CM_Get_Device_ID_List_Size_ExW(%p %s %lx %lx)\n", + FIXME("CM_Get_Device_ID_List_Size_ExW(%p %s %lx %p)\n", pulLen, debugstr_w(pszFilter), ulFlags, hMachine); if (pulLen == NULL) @@ -3784,7 +3784,7 @@ CM_Get_Device_ID_Size_Ex( HSTRING_TABLE StringTable = NULL; LPWSTR DeviceId; - TRACE("CM_Get_Device_ID_Size_Ex(%p %lx %lx %lx)\n", + TRACE("CM_Get_Device_ID_Size_Ex(%p %lx %lx %p)\n", pulLen, dnDevInst, ulFlags, hMachine); if (pulLen == NULL) @@ -3878,7 +3878,7 @@ CM_Get_Device_Interface_Alias_ExA( _In_ ULONG ulFlags, _In_opt_ HMACHINE hMachine) { - FIXME("CM_Get_Device_Interface_Alias_ExA(%p %p %p %p %lx %lx)\n", + FIXME("CM_Get_Device_Interface_Alias_ExA(%p %p %p %p %lx %p)\n", pszDeviceInterface, AliasInterfaceGuid, pszAliasDeviceInterface, pulLength, ulFlags, hMachine); @@ -3903,7 +3903,7 @@ CM_Get_Device_Interface_Alias_ExW( ULONG ulTransferLength; CONFIGRET ret = CR_SUCCESS; - TRACE("CM_Get_Device_Interface_Alias_ExW(%p %p %p %p %lx %lx)\n", + TRACE("CM_Get_Device_Interface_Alias_ExW(%p %p %p %p %lx %p)\n", pszDeviceInterface, AliasInterfaceGuid, pszAliasDeviceInterface, pulLength, ulFlags, hMachine); @@ -4287,7 +4287,7 @@ CM_Get_First_Log_Conf_Ex( ULONG ulTag; PLOG_CONF_INFO pLogConfInfo; - FIXME("CM_Get_First_Log_Conf_Ex(%p %lx %lx %lx)\n", + FIXME("CM_Get_First_Log_Conf_Ex(%p %lx %lx %p)\n", plcLogConf, dnDevInst, ulFlags, hMachine); if (dnDevInst == 0) @@ -4383,7 +4383,7 @@ CM_Get_Global_State_Ex( RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - TRACE("CM_Get_Global_State_Ex(%p %lx %lx)\n", + TRACE("CM_Get_Global_State_Ex(%p %lx %p)\n", pulState, ulFlags, hMachine); if (pulState == NULL) @@ -4471,7 +4471,7 @@ CM_Get_HW_Prof_Flags_ExA( DEVINSTID_W pszDevIdW = NULL; CONFIGRET ret = CR_SUCCESS; - TRACE("CM_Get_HW_Prof_Flags_ExA(%s %lu %p %lx %lx)\n", + TRACE("CM_Get_HW_Prof_Flags_ExA(%s %lu %p %lx %p)\n", debugstr_a(szDevInstName), ulHardwareProfile, pulValue, ulFlags, hMachine); if (szDevInstName != NULL) @@ -4505,7 +4505,7 @@ CM_Get_HW_Prof_Flags_ExW( RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - FIXME("CM_Get_HW_Prof_Flags_ExW(%s %lu %p %lx %lx)\n", + FIXME("CM_Get_HW_Prof_Flags_ExW(%s %lu %p %lx %p)\n", debugstr_w(szDevInstName), ulHardwareProfile, pulValue, ulFlags, hMachine); if ((szDevInstName == NULL) || (pulValue == NULL)) @@ -4546,10 +4546,15 @@ CM_Get_HW_Prof_Flags_ExW( /*********************************************************************** * CM_Get_Hardware_Profile_InfoA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Hardware_Profile_InfoA( - ULONG ulIndex, PHWPROFILEINFO_A pHWProfileInfo, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Get_Hardware_Profile_InfoA( + _In_ ULONG ulIndex, + _Out_ PHWPROFILEINFO_A pHWProfileInfo, + _In_ ULONG ulFlags) { - TRACE("%lu %p %lx\n", ulIndex, pHWProfileInfo, ulFlags); + TRACE("CM_Get_Hardware_Profile_InfoA(%lu %p %lx)\n", + ulIndex, pHWProfileInfo, ulFlags); return CM_Get_Hardware_Profile_Info_ExA(ulIndex, pHWProfileInfo, ulFlags, NULL); @@ -4559,10 +4564,15 @@ CONFIGRET WINAPI CM_Get_Hardware_Profile_InfoA( /*********************************************************************** * CM_Get_Hardware_Profile_InfoW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Hardware_Profile_InfoW( - ULONG ulIndex, PHWPROFILEINFO_W pHWProfileInfo, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Get_Hardware_Profile_InfoW( + _In_ ULONG ulIndex, + _Out_ PHWPROFILEINFO_W pHWProfileInfo, + _In_ ULONG ulFlags) { - TRACE("%lu %p %lx\n", ulIndex, pHWProfileInfo, ulFlags); + TRACE("CM_Get_Hardware_Profile_InfoW(%lu %p %lx)\n", + ulIndex, pHWProfileInfo, ulFlags); return CM_Get_Hardware_Profile_Info_ExW(ulIndex, pHWProfileInfo, ulFlags, NULL); @@ -4572,14 +4582,19 @@ CONFIGRET WINAPI CM_Get_Hardware_Profile_InfoW( /*********************************************************************** * CM_Get_Hardware_Profile_Info_ExA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Hardware_Profile_Info_ExA( - ULONG ulIndex, PHWPROFILEINFO_A pHWProfileInfo, ULONG ulFlags, - HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Get_Hardware_Profile_Info_ExA( + _In_ ULONG ulIndex, + _Out_ PHWPROFILEINFO_A pHWProfileInfo, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { HWPROFILEINFO_W LocalProfileInfo; CONFIGRET ret; - TRACE("%lu %p %lx %lx\n", ulIndex, pHWProfileInfo, ulFlags, hMachine); + TRACE("CM_Get_Hardware_Profile_Info_ExA(%lu %p %lx %p)\n", + ulIndex, pHWProfileInfo, ulFlags, hMachine); if (pHWProfileInfo == NULL) return CR_INVALID_POINTER; @@ -4609,14 +4624,19 @@ CONFIGRET WINAPI CM_Get_Hardware_Profile_Info_ExA( /*********************************************************************** * CM_Get_Hardware_Profile_Info_ExW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Hardware_Profile_Info_ExW( - ULONG ulIndex, PHWPROFILEINFO_W pHWProfileInfo, ULONG ulFlags, - HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Get_Hardware_Profile_Info_ExW( + _In_ ULONG ulIndex, + _Out_ PHWPROFILEINFO_W pHWProfileInfo, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - TRACE("%lu %p %lx %lx\n", ulIndex, pHWProfileInfo, ulFlags, hMachine); + TRACE("CM_Get_Hardware_Profile_Info_ExW(%lu %p %lx %p)\n", + ulIndex, pHWProfileInfo, ulFlags, hMachine); if (pHWProfileInfo == NULL) return CR_INVALID_POINTER; @@ -4654,10 +4674,16 @@ CONFIGRET WINAPI CM_Get_Hardware_Profile_Info_ExW( /*********************************************************************** * CM_Get_Log_Conf_Priority [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Log_Conf_Priority( - LOG_CONF lcLogConf, PPRIORITY pPriority, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Get_Log_Conf_Priority( + _In_ LOG_CONF lcLogConf, + _Out_ PPRIORITY pPriority, + _In_ ULONG ulFlags) { - TRACE("%p %p %lx\n", lcLogConf, pPriority, ulFlags); + TRACE("CM_Get_Log_Conf_Priority(%p %p %lx)\n", + lcLogConf, pPriority, ulFlags); + return CM_Get_Log_Conf_Priority_Ex(lcLogConf, pPriority, ulFlags, NULL); } @@ -4665,9 +4691,13 @@ CONFIGRET WINAPI CM_Get_Log_Conf_Priority( /*********************************************************************** * CM_Get_Log_Conf_Priority_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Log_Conf_Priority_Ex( - LOG_CONF lcLogConf, PPRIORITY pPriority, ULONG ulFlags, - HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Get_Log_Conf_Priority_Ex( + _In_ LOG_CONF lcLogConf, + _Out_ PPRIORITY pPriority, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; @@ -4675,7 +4705,8 @@ CONFIGRET WINAPI CM_Get_Log_Conf_Priority_Ex( LPWSTR lpDevInst; CONFIGRET ret; - FIXME("%p %p %lx %lx\n", lcLogConf, pPriority, ulFlags, hMachine); + FIXME("CM_Get_Log_Conf_Priority_Ex(%p %p %lx %p)\n", + lcLogConf, pPriority, ulFlags, hMachine); pLogConfInfo = (PLOG_CONF_INFO)lcLogConf; if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC) @@ -4729,10 +4760,16 @@ CONFIGRET WINAPI CM_Get_Log_Conf_Priority_Ex( /*********************************************************************** * CM_Get_Next_Log_Conf [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Next_Log_Conf( - PLOG_CONF plcLogConf, LOG_CONF lcLogConf, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Get_Next_Log_Conf( + _Out_opt_ PLOG_CONF plcLogConf, + _In_ LOG_CONF lcLogConf, + _In_ ULONG ulFlags) { - TRACE("%p %p %lx\n", plcLogConf, lcLogConf, ulFlags); + TRACE("CM_Get_Next_Log_Conf(%p %p %lx)\n", + plcLogConf, lcLogConf, ulFlags); + return CM_Get_Next_Log_Conf_Ex(plcLogConf, lcLogConf, ulFlags, NULL); } @@ -4740,9 +4777,13 @@ CONFIGRET WINAPI CM_Get_Next_Log_Conf( /*********************************************************************** * CM_Get_Next_Log_Conf_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex( - PLOG_CONF plcLogConf, LOG_CONF lcLogConf, ULONG ulFlags, - HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Get_Next_Log_Conf_Ex( + _Out_opt_ PLOG_CONF plcLogConf, + _In_ LOG_CONF lcLogConf, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; @@ -4752,7 +4793,8 @@ CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex( LPWSTR lpDevInst; CONFIGRET ret; - FIXME("%p %p %lx %lx\n", plcLogConf, lcLogConf, ulFlags, hMachine); + FIXME("CM_Get_Next_Log_Conf_Ex(%p %p %lx %p)\n", + plcLogConf, lcLogConf, ulFlags, hMachine); if (plcLogConf) *plcLogConf = 0; @@ -4823,12 +4865,18 @@ CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex( /*********************************************************************** * CM_Get_Next_Re_Des [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Next_Res_Des( - PRES_DES prdResDes, RES_DES rdResDes, RESOURCEID ForResource, - PRESOURCEID pResourceID, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Get_Next_Res_Des( + _Out_ PRES_DES prdResDes, + _In_ RES_DES rdResDes, + _In_ RESOURCEID ForResource, + _Out_opt_ PRESOURCEID pResourceID, + _In_ ULONG ulFlags) { - TRACE("%p %p %lu %p %lx\n", prdResDes, rdResDes, ForResource, - pResourceID, ulFlags); + TRACE("CM_Get_Next_Res_Des(%p %p %lu %p %lx)\n", + prdResDes, rdResDes, ForResource, pResourceID, ulFlags); + return CM_Get_Next_Res_Des_Ex(prdResDes, rdResDes, ForResource, pResourceID, ulFlags, NULL); } @@ -4837,12 +4885,18 @@ CONFIGRET WINAPI CM_Get_Next_Res_Des( /*********************************************************************** * CM_Get_Next_Re_Des_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Next_Res_Des_Ex( - PRES_DES prdResDes, RES_DES rdResDes, RESOURCEID ForResource, - PRESOURCEID pResourceID, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Get_Next_Res_Des_Ex( + _Out_ PRES_DES prdResDes, + _In_ RES_DES rdResDes, + _In_ RESOURCEID ForResource, + _Out_opt_ PRESOURCEID pResourceID, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { - FIXME("%p %p %lu %p %lx %lx\n", prdResDes, rdResDes, ForResource, - pResourceID, ulFlags, hMachine); + FIXME("CM_Get_Next_Res_Des_Ex(%p %p %lu %p %lx %p)\n", + prdResDes, rdResDes, ForResource, pResourceID, ulFlags, hMachine); return CR_CALL_NOT_IMPLEMENTED; } @@ -4851,10 +4905,16 @@ CONFIGRET WINAPI CM_Get_Next_Res_Des_Ex( /*********************************************************************** * CM_Get_Parent [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Parent( - PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Get_Parent( + _Out_ PDEVINST pdnDevInst, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags) { - TRACE("%p %p %lx\n", pdnDevInst, dnDevInst, ulFlags); + TRACE("CM_Get_Parent(%p %p %lx)\n", + pdnDevInst, dnDevInst, ulFlags); + return CM_Get_Parent_Ex(pdnDevInst, dnDevInst, ulFlags, NULL); } @@ -4862,8 +4922,13 @@ CONFIGRET WINAPI CM_Get_Parent( /*********************************************************************** * CM_Get_Parent_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Parent_Ex( - PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Get_Parent_Ex( + _Out_ PDEVINST pdnDevInst, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { WCHAR szRelatedDevInst[MAX_DEVICE_ID_LEN]; RPC_BINDING_HANDLE BindingHandle = NULL; @@ -4872,7 +4937,8 @@ CONFIGRET WINAPI CM_Get_Parent_Ex( DWORD dwIndex, dwLength = MAX_DEVICE_ID_LEN; CONFIGRET ret; - TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); + TRACE("CM_Get_Parent_Ex(%p %lx %lx %p)\n", + pdnDevInst, dnDevInst, ulFlags, hMachine); if (pdnDevInst == NULL) return CR_INVALID_POINTER; @@ -4938,10 +5004,17 @@ CONFIGRET WINAPI CM_Get_Parent_Ex( /*********************************************************************** * CM_Get_Res_Des_Data [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Res_Des_Data( - RES_DES rdResDes, PVOID Buffer, ULONG BufferLen, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Get_Res_Des_Data( + _In_ RES_DES rdResDes, + _Out_writes_bytes_(BufferLen) PVOID Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags) { - TRACE("%p %p %l %lx\n", rdResDes, Buffer, BufferLen, ulFlags); + TRACE("CM_Get_Res_Des_Data(%p %p %lu %lx)\n", + rdResDes, Buffer, BufferLen, ulFlags); + return CM_Get_Res_Des_Data_Ex(rdResDes, Buffer, BufferLen, ulFlags, NULL); } @@ -4949,11 +5022,18 @@ CONFIGRET WINAPI CM_Get_Res_Des_Data( /*********************************************************************** * CM_Get_Res_Des_Data_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Res_Des_Data_Ex( - RES_DES rdResDes, PVOID Buffer, ULONG BufferLen, ULONG ulFlags, - HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Get_Res_Des_Data_Ex( + _In_ RES_DES rdResDes, + _Out_writes_bytes_(BufferLen) PVOID Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { - FIXME("%p %p %l %lx %lx\n", rdResDes, Buffer, BufferLen, ulFlags, hMachine); + FIXME("CM_Get_Res_Des_Data_Ex(%p %p %lu %lx %p)\n", + rdResDes, Buffer, BufferLen, ulFlags, hMachine); + return CR_CALL_NOT_IMPLEMENTED; } @@ -4961,10 +5041,16 @@ CONFIGRET WINAPI CM_Get_Res_Des_Data_Ex( /*********************************************************************** * CM_Get_Res_Des_Size [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Res_Des_Data_Size( - PULONG pulSize, RES_DES rdResDes, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Get_Res_Des_Data_Size( + _Out_ PULONG pulSize, + _In_ RES_DES rdResDes, + _In_ ULONG ulFlags) { - TRACE("%p %p %lx\n", pulSize, rdResDes, ulFlags); + TRACE("CM_Get_Res_Des_Data_Size(%p %p %lx)\n", + pulSize, rdResDes, ulFlags); + return CM_Get_Res_Des_Data_Size_Ex(pulSize, rdResDes, ulFlags, NULL); } @@ -4972,10 +5058,17 @@ CONFIGRET WINAPI CM_Get_Res_Des_Data_Size( /*********************************************************************** * CM_Get_Res_Des_Size_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Res_Des_Data_Size_Ex( - PULONG pulSize, RES_DES rdResDes, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Get_Res_Des_Data_Size_Ex( + _Out_ PULONG pulSize, + _In_ RES_DES rdResDes, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { - TRACE("%p %p %lx %lx\n", pulSize, rdResDes, ulFlags, hMachine); + TRACE("CM_Get_Res_Des_Data_Size_Ex(%p %p %lx %p)\n", + pulSize, rdResDes, ulFlags, hMachine); + return CR_CALL_NOT_IMPLEMENTED; } @@ -4983,10 +5076,16 @@ CONFIGRET WINAPI CM_Get_Res_Des_Data_Size_Ex( /*********************************************************************** * CM_Get_Sibling [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Sibling( - PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Get_Sibling( + _Out_ PDEVINST pdnDevInst, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags) { - TRACE("%p %p %lx\n", pdnDevInst, dnDevInst, ulFlags); + TRACE("CM_Get_Sibling(%p %p %lx)\n", + pdnDevInst, dnDevInst, ulFlags); + return CM_Get_Sibling_Ex(pdnDevInst, dnDevInst, ulFlags, NULL); } @@ -4994,8 +5093,13 @@ CONFIGRET WINAPI CM_Get_Sibling( /*********************************************************************** * CM_Get_Sibling_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Get_Sibling_Ex( - PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Get_Sibling_Ex( + _Out_ PDEVINST pdnDevInst, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { WCHAR szRelatedDevInst[MAX_DEVICE_ID_LEN]; RPC_BINDING_HANDLE BindingHandle = NULL; @@ -5004,7 +5108,8 @@ CONFIGRET WINAPI CM_Get_Sibling_Ex( DWORD dwIndex, dwLength = MAX_DEVICE_ID_LEN; CONFIGRET ret; - TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); + TRACE("CM_Get_Sibling_Ex(%p %lx %lx %p)\n", + pdnDevInst, dnDevInst, ulFlags, hMachine); if (pdnDevInst == NULL) return CR_INVALID_POINTER; @@ -5070,9 +5175,12 @@ CONFIGRET WINAPI CM_Get_Sibling_Ex( /*********************************************************************** * CM_Get_Version [SETUPAPI.@] */ -WORD WINAPI CM_Get_Version(VOID) +WORD +WINAPI +CM_Get_Version(VOID) { - TRACE("\n"); + TRACE("CM_Get_Version()\n"); + return CM_Get_Version_Ex(NULL); } @@ -5080,13 +5188,16 @@ WORD WINAPI CM_Get_Version(VOID) /*********************************************************************** * CM_Get_Version_Ex [SETUPAPI.@] */ -WORD WINAPI CM_Get_Version_Ex(HMACHINE hMachine) +WORD +WINAPI +CM_Get_Version_Ex( + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; WORD Version = 0; CONFIGRET ret; - TRACE("%lx\n", hMachine); + TRACE("CM_Get_Version_Ex(%p)\n", hMachine); if (hMachine != NULL) { @@ -5180,7 +5291,7 @@ CM_Is_Dock_Station_Present_Ex( RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - TRACE("CM_Is_Dock_Station_Present_Ex(%p %lx)\n", + TRACE("CM_Is_Dock_Station_Present_Ex(%p %p)\n", pbPresent, hMachine); if (pbPresent == NULL) @@ -5243,7 +5354,7 @@ CM_Is_Version_Available_Ex( WORD wServerVersion; CONFIGRET ret; - TRACE("CM_Is_Version_Available_Ex(%hu %lx)\n", + TRACE("CM_Is_Version_Available_Ex(%hu %p)\n", wVersion, hMachine); if (wVersion <= 0x400) @@ -5288,8 +5399,8 @@ CM_Locate_DevNodeA( _In_opt_ DEVINSTID_A pDeviceID, _In_ ULONG ulFlags) { - TRACE("CM_Locate_DevNodeA(%p %s %lu)\n", - pdnDevInst, pDeviceID, ulFlags); + TRACE("CM_Locate_DevNodeA(%p %s %lx)\n", + pdnDevInst, debugstr_a(pDeviceID), ulFlags); return CM_Locate_DevNode_ExA(pdnDevInst, pDeviceID, ulFlags, NULL); } @@ -5305,7 +5416,7 @@ CM_Locate_DevNodeW( _In_opt_ DEVINSTID_W pDeviceID, _In_ ULONG ulFlags) { - TRACE("CM_Locate_DevNodeW(%p %s %lu)\n", + TRACE("CM_Locate_DevNodeW(%p %s %lx)\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags); return CM_Locate_DevNode_ExW(pdnDevInst, pDeviceID, ulFlags, NULL); @@ -5326,8 +5437,8 @@ CM_Locate_DevNode_ExA( DEVINSTID_W pDevIdW = NULL; CONFIGRET ret = CR_SUCCESS; - TRACE("CM_Locate_DevNode_ExA(%p %s %lu %lx)\n", - pdnDevInst, pDeviceID, ulFlags, hMachine); + TRACE("CM_Locate_DevNode_ExA(%p %s %lx %p)\n", + pdnDevInst, debugstr_a(pDeviceID), ulFlags, hMachine); if (pDeviceID != NULL) { @@ -5360,7 +5471,7 @@ CM_Locate_DevNode_ExW( HSTRING_TABLE StringTable = NULL; CONFIGRET ret = CR_SUCCESS; - TRACE("CM_Locate_DevNode_ExW(%p %s %lu %lx)\n", + TRACE("CM_Locate_DevNode_ExW(%p %s %lx %p)\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags, hMachine); if (pdnDevInst == NULL) @@ -5460,7 +5571,7 @@ CM_Modify_Res_Des( _Out_ PRES_DES prdResDes, _In_ RES_DES rdResDes, _In_ RESOURCEID ResourceID, - _In_ PCVOID ResourceData, + _In_reads_bytes_(ResourceLen) PCVOID ResourceData, _In_ ULONG ResourceLen, _In_ ULONG ulFlags) { @@ -5482,12 +5593,12 @@ CM_Modify_Res_Des_Ex( _Out_ PRES_DES prdResDes, _In_ RES_DES rdResDes, _In_ RESOURCEID ResourceID, - _In_ PCVOID ResourceData, + _In_reads_bytes_(ResourceLen) PCVOID ResourceData, _In_ ULONG ResourceLen, _In_ ULONG ulFlags, _In_opt_ HMACHINE hMachine) { - FIXME("CM_Modify_Res_Des_Ex(%p %p %lx %p %lu %lx %lx)\n", + FIXME("CM_Modify_Res_Des_Ex(%p %p %lx %p %lu %lx %p)\n", prdResDes, rdResDes, ResourceID, ResourceData, ResourceLen, ulFlags, hMachine); @@ -5529,7 +5640,7 @@ CM_Move_DevNode_Ex( LPWSTR lpToDevInst; CONFIGRET ret; - FIXME("CM_Move_DevNode_Ex(%lx %lx %lx %lx)\n", + FIXME("CM_Move_DevNode_Ex(%lx %lx %lx %p)\n", dnFromDevInst, dnToDevInst, ulFlags, hMachine); if (!pSetupIsUserAdmin()) @@ -5615,7 +5726,7 @@ CM_Open_Class_KeyA( _In_ ULONG ulFlags) { TRACE("CM_Open_Class_KeyA(%p %s %lx %lx %p %lx)\n", - debugstr_guid(pClassGuid), pszClassName, + debugstr_guid(pClassGuid), debugstr_a(pszClassName), samDesired, Disposition, phkClass, ulFlags); return CM_Open_Class_Key_ExA(pClassGuid, pszClassName, samDesired, @@ -5662,8 +5773,8 @@ CM_Open_Class_Key_ExA( LPWSTR pszClassNameW = NULL; CONFIGRET ret; - TRACE("CM_Open_Class_Key_ExA(%p %s %lx %lx %p %lx %lx)\n", - debugstr_guid(pClassGuid), pszClassName, + TRACE("CM_Open_Class_Key_ExA(%p %s %lx %lx %p %lx %p)\n", + debugstr_guid(pClassGuid), debugstr_a(pszClassName), samDesired, Disposition, phkClass, ulFlags, hMachine); if (pszClassName != NULL) @@ -5702,7 +5813,7 @@ CM_Open_Class_Key_ExW( DWORD dwError; HKEY hKey; - TRACE("CM_Open_Class_Key_ExW(%p %s %lx %lx %p %lx %lx)\n", + TRACE("CM_Open_Class_Key_ExW(%p %s %lx %lx %p %lx %p)\n", debugstr_guid(pClassGuid), debugstr_w(pszClassName), samDesired, Disposition, phkClass, ulFlags, hMachine); @@ -5828,7 +5939,7 @@ CM_Open_DevNode_Key_Ex( HKEY hRootKey = NULL; CONFIGRET ret = CR_CALL_NOT_IMPLEMENTED; - TRACE("CM_Open_DevNode_Key_Ex(%lx %lx %lu %lx %p %lx %lx)\n", + TRACE("CM_Open_DevNode_Key_Ex(%lx %lx %lu %lx %p %lx %p)\n", dnDevNode, samDesired, ulHardwareProfile, Disposition, phkDevice, ulFlags, hMachine); if (phkDevice == NULL) @@ -6010,7 +6121,7 @@ CM_Query_And_Remove_SubTree_ExA( LPWSTR lpLocalVetoName; CONFIGRET ret; - TRACE("CM_Query_And_Remove_SubTree_ExA(%lx %p %s %lu %lx %lx)\n", + TRACE("CM_Query_And_Remove_SubTree_ExA(%lx %p %s %lu %lx %p)\n", dnAncestor, pVetoType, debugstr_a(pszVetoName), ulNameLength, ulFlags, hMachine); @@ -6060,7 +6171,7 @@ CM_Query_And_Remove_SubTree_ExW( LPWSTR lpDevInst; CONFIGRET ret; - TRACE("CM_Query_And_Remove_SubTree_ExW(%lx %p %s %lu %lx %lx)\n", + TRACE("CM_Query_And_Remove_SubTree_ExW(%lx %p %s %lu %lx %p)\n", dnAncestor, pVetoType, debugstr_w(pszVetoName), ulNameLength, ulFlags, hMachine); @@ -6317,7 +6428,7 @@ CM_Query_Remove_SubTree_Ex( _In_ ULONG ulFlags, _In_opt_ HMACHINE hMachine) { - TRACE("CM_Query_Remove_SubTree_Ex(%lx %lx %lx)\n", + TRACE("CM_Query_Remove_SubTree_Ex(%lx %lx %p)\n", dnAncestor, ulFlags, hMachine); return CR_CALL_NOT_IMPLEMENTED; @@ -6354,7 +6465,7 @@ CM_Reenumerate_DevNode_Ex( LPWSTR lpDevInst; CONFIGRET ret; - FIXME("CM_Reenumerate_DevNode_Ex(%lx %lx %lx)\n", + FIXME("CM_Reenumerate_DevNode_Ex(%lx %lx %p)\n", dnDevInst, ulFlags, hMachine); if (dnDevInst == 0) @@ -6401,14 +6512,97 @@ CM_Reenumerate_DevNode_Ex( } +/*********************************************************************** + * CM_Register_Device_Driver [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Register_Device_Driver( + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags) +{ + TRACE("CM_Register_Device_Driver(%lx 0x%08lx)\n", + dnDevInst, ulFlags); + + return CM_Register_Device_Driver_Ex(dnDevInst, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Register_Device_Driver_Ex [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CM_Register_Device_Driver_Ex( + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + LPWSTR lpDevInst; + CONFIGRET ret; + + TRACE("CM_Register_Device_Driver_Ex(%lx 0x%08lx %p)\n", + dnDevInst, ulFlags, hMachine); + + if (dnDevInst == 0) + return CR_INVALID_DEVNODE; + + if (ulFlags & ~CM_REGISTER_DEVICE_DRIVER_BITS) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + RpcTryExcept + { + ret = PNP_RegisterDriver(BindingHandle, + lpDevInst, + ulFlags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + return ret; +} + + /*********************************************************************** * CM_Register_Device_InterfaceA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Register_Device_InterfaceA( - DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCSTR pszReference, - LPSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Register_Device_InterfaceA( + _In_ DEVINST dnDevInst, + _In_ LPGUID InterfaceClassGuid, + _In_opt_ LPCSTR pszReference, + _Out_writes_(*pulLength) LPSTR pszDeviceInterface, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags) { - TRACE("%lx %s %s %p %p %lx\n", dnDevInst, debugstr_guid(InterfaceClassGuid), + TRACE("CM_Register_Device_InterfaceA(%lx %s %s %p %p %lx)\n", + dnDevInst, debugstr_guid(InterfaceClassGuid), pszReference, pszDeviceInterface, pulLength, ulFlags); return CM_Register_Device_Interface_ExA(dnDevInst, InterfaceClassGuid, @@ -6420,11 +6614,18 @@ CONFIGRET WINAPI CM_Register_Device_InterfaceA( /*********************************************************************** * CM_Register_Device_InterfaceW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Register_Device_InterfaceW( - DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCWSTR pszReference, - LPWSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Register_Device_InterfaceW( + _In_ DEVINST dnDevInst, + _In_ LPGUID InterfaceClassGuid, + _In_opt_ LPCWSTR pszReference, + _Out_writes_(*pulLength) LPWSTR pszDeviceInterface, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags) { - TRACE("%lx %s %s %p %p %lx\n", dnDevInst, debugstr_guid(InterfaceClassGuid), + TRACE("CM_Register_Device_InterfaceW(%lx %s %s %p %p %lx)\n", + dnDevInst, debugstr_guid(InterfaceClassGuid), debugstr_w(pszReference), pszDeviceInterface, pulLength, ulFlags); return CM_Register_Device_Interface_ExW(dnDevInst, InterfaceClassGuid, @@ -6436,17 +6637,25 @@ CONFIGRET WINAPI CM_Register_Device_InterfaceW( /*********************************************************************** * CM_Register_Device_Interface_ExA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Register_Device_Interface_ExA( - DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCSTR pszReference, - LPSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Register_Device_Interface_ExA( + _In_ DEVINST dnDevInst, + _In_ LPGUID InterfaceClassGuid, + _In_opt_ LPCSTR pszReference, + _Out_writes_(*pulLength) LPSTR pszDeviceInterface, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { LPWSTR pszReferenceW = NULL; LPWSTR pszDeviceInterfaceW = NULL; ULONG ulLength; CONFIGRET ret; - TRACE("%lx %s %s %p %p %lx %lx\n", dnDevInst, debugstr_guid(InterfaceClassGuid), - pszReference, pszDeviceInterface, pulLength, ulFlags, hMachine); + TRACE("CM_Register_Device_Interface_ExA(%lx %s %s %p %p %lx %p)\n", + dnDevInst, debugstr_guid(InterfaceClassGuid), debugstr_a(pszReference), + pszDeviceInterface, pulLength, ulFlags, hMachine); if (pulLength == NULL || pszDeviceInterface == NULL) return CR_INVALID_POINTER; @@ -6502,9 +6711,16 @@ Done: /*********************************************************************** * CM_Register_Device_Interface_ExW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Register_Device_Interface_ExW( - DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCWSTR pszReference, - LPWSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Register_Device_Interface_ExW( + _In_ DEVINST dnDevInst, + _In_ LPGUID InterfaceClassGuid, + _In_opt_ LPCWSTR pszReference, + _Out_writes_(*pulLength) LPWSTR pszDeviceInterface, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; @@ -6512,8 +6728,9 @@ CONFIGRET WINAPI CM_Register_Device_Interface_ExW( ULONG ulTransferLength; CONFIGRET ret; - TRACE("%lx %s %s %p %p %lx %lx\n", dnDevInst, debugstr_guid(InterfaceClassGuid), - debugstr_w(pszReference), pszDeviceInterface, pulLength, ulFlags, hMachine); + TRACE("CM_Register_Device_Interface_ExW(%lx %s %s %p %p %lx %p)\n", + dnDevInst, debugstr_guid(InterfaceClassGuid), debugstr_w(pszReference), + pszDeviceInterface, pulLength, ulFlags, hMachine); if (dnDevInst == 0) return CR_INVALID_DEVNODE; @@ -6569,81 +6786,20 @@ CONFIGRET WINAPI CM_Register_Device_Interface_ExW( } -/*********************************************************************** - * CM_Register_Device_Driver [SETUPAPI.@] - */ -CONFIGRET WINAPI CM_Register_Device_Driver( - DEVINST dnDevInst, ULONG ulFlags) -{ - TRACE("%lx 0x%08lx\n", dnDevInst, ulFlags); - return CM_Register_Device_Driver_Ex(dnDevInst, ulFlags, NULL); -} - - -/*********************************************************************** - * CM_Register_Device_Driver [SETUPAPI.@] - */ -CONFIGRET WINAPI CM_Register_Device_Driver_Ex( - DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) -{ - RPC_BINDING_HANDLE BindingHandle = NULL; - HSTRING_TABLE StringTable = NULL; - LPWSTR lpDevInst; - CONFIGRET ret; - - TRACE("%lx 0x%08lx %p\n", dnDevInst, ulFlags, hMachine); - - if (dnDevInst == 0) - return CR_INVALID_DEVNODE; - - if (ulFlags & ~CM_REGISTER_DEVICE_DRIVER_BITS) - return CR_INVALID_FLAG; - - if (hMachine != NULL) - { - BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; - if (BindingHandle == NULL) - return CR_FAILURE; - - StringTable = ((PMACHINE_INFO)hMachine)->StringTable; - if (StringTable == 0) - return CR_FAILURE; - } - else - { - if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) - return CR_FAILURE; - } - - lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); - if (lpDevInst == NULL) - return CR_INVALID_DEVNODE; - - RpcTryExcept - { - ret = PNP_RegisterDriver(BindingHandle, - lpDevInst, - ulFlags); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - ret = RpcStatusToCmStatus(RpcExceptionCode()); - } - RpcEndExcept; - - return ret; -} - - /*********************************************************************** * CM_Remove_SubTree [SETUPAPI.@] * * This function is obsolete in Windows XP and above. */ -CONFIGRET WINAPI CM_Remove_SubTree( - DEVINST dnAncestor, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Remove_SubTree( + _In_ DEVINST dnAncestor, + _In_ ULONG ulFlags) { - TRACE("%lx %lx\n", dnAncestor, ulFlags); + TRACE("CM_Remove_SubTree(%lx %lx)\n", + dnAncestor, ulFlags); + return CR_CALL_NOT_IMPLEMENTED; } @@ -6653,10 +6809,16 @@ CONFIGRET WINAPI CM_Remove_SubTree( * * This function is obsolete in Windows XP and above. */ -CONFIGRET WINAPI CM_Remove_SubTree_Ex( - DEVINST dnAncestor, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Remove_SubTree_Ex( + _In_ DEVINST dnAncestor, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { - TRACE("%lx %lx %lx\n", dnAncestor, ulFlags, hMachine); + TRACE("CM_Remove_SubTree_Ex(%lx %lx %p)\n", + dnAncestor, ulFlags, hMachine); + return CR_CALL_NOT_IMPLEMENTED; } @@ -6664,12 +6826,18 @@ CONFIGRET WINAPI CM_Remove_SubTree_Ex( /*********************************************************************** * CM_Request_Device_EjectA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Request_Device_EjectA( - DEVINST dnDevInst, PPNP_VETO_TYPE pVetoType, LPSTR pszVetoName, - ULONG ulNameLength, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Request_Device_EjectA( + _In_ DEVINST dnDevInst, + _Out_opt_ PPNP_VETO_TYPE pVetoType, + _Out_writes_opt_(ulNameLength) LPSTR pszVetoName, + _In_ ULONG ulNameLength, + _In_ ULONG ulFlags) { - TRACE("%lx %p %s %lu %lx\n", dnDevInst, pVetoType, pszVetoName, - ulNameLength, ulFlags); + TRACE("CM_Request_Device_EjectA(%lx %p %s %lu %lx)\n", + dnDevInst, pVetoType, debugstr_a(pszVetoName), ulNameLength, ulFlags); + return CM_Request_Device_Eject_ExA(dnDevInst, pVetoType, pszVetoName, ulNameLength, ulFlags, NULL); } @@ -6678,12 +6846,18 @@ CONFIGRET WINAPI CM_Request_Device_EjectA( /*********************************************************************** * CM_Request_Device_EjectW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Request_Device_EjectW( - DEVINST dnDevInst, PPNP_VETO_TYPE pVetoType, LPWSTR pszVetoName, - ULONG ulNameLength, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Request_Device_EjectW( + _In_ DEVINST dnDevInst, + _Out_opt_ PPNP_VETO_TYPE pVetoType, + _Out_writes_opt_(ulNameLength) LPWSTR pszVetoName, + _In_ ULONG ulNameLength, + _In_ ULONG ulFlags) { - TRACE("%lx %p %s %lu %lx\n", dnDevInst, pVetoType, debugstr_w(pszVetoName), - ulNameLength, ulFlags); + TRACE("CM_Request_Device_EjectW(%lx %p %s %lu %lx)\n", + dnDevInst, pVetoType, debugstr_w(pszVetoName), ulNameLength, ulFlags); + return CM_Request_Device_Eject_ExW(dnDevInst, pVetoType, pszVetoName, ulNameLength, ulFlags, NULL); } @@ -6692,15 +6866,21 @@ CONFIGRET WINAPI CM_Request_Device_EjectW( /*********************************************************************** * CM_Request_Device_Eject_ExA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Request_Device_Eject_ExA( - DEVINST dnDevInst, PPNP_VETO_TYPE pVetoType, LPSTR pszVetoName, - ULONG ulNameLength, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Request_Device_Eject_ExA( + _In_ DEVINST dnDevInst, + _Out_opt_ PPNP_VETO_TYPE pVetoType, + _Out_writes_opt_(ulNameLength) LPSTR pszVetoName, + _In_ ULONG ulNameLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { LPWSTR lpLocalVetoName; CONFIGRET ret; - TRACE("%lx %p %s %lu %lx %lx\n", dnDevInst, pVetoType, pszVetoName, - ulNameLength, ulFlags, hMachine); + TRACE("CM_Request_Device_Eject_ExA(%lx %p %s %lu %lx %p)\n", + dnDevInst, pVetoType, debugstr_a(pszVetoName), ulNameLength, ulFlags, hMachine); if (pszVetoName == NULL && ulNameLength == 0) return CR_INVALID_POINTER; @@ -6733,17 +6913,23 @@ CONFIGRET WINAPI CM_Request_Device_Eject_ExA( /*********************************************************************** * CM_Request_Device_Eject_ExW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Request_Device_Eject_ExW( - DEVINST dnDevInst, PPNP_VETO_TYPE pVetoType, LPWSTR pszVetoName, - ULONG ulNameLength, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Request_Device_Eject_ExW( + _In_ DEVINST dnDevInst, + _Out_opt_ PPNP_VETO_TYPE pVetoType, + _Out_writes_opt_(ulNameLength) LPWSTR pszVetoName, + _In_ ULONG ulNameLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; LPWSTR lpDevInst; CONFIGRET ret; - TRACE("%lx %p %s %lu %lx %lx\n", dnDevInst, pVetoType, - debugstr_w(pszVetoName), ulNameLength, ulFlags, hMachine); + TRACE("CM_Request_Device_Eject_ExW(%lx %p %s %lu %lx %p)\n", + dnDevInst, pVetoType, debugstr_w(pszVetoName), ulNameLength, ulFlags, hMachine); if (dnDevInst == 0) return CR_INVALID_DEVNODE; @@ -6796,9 +6982,12 @@ CONFIGRET WINAPI CM_Request_Device_Eject_ExW( /*********************************************************************** * CM_Request_Eject_PC [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Request_Eject_PC(VOID) +CONFIGRET +WINAPI +CM_Request_Eject_PC(VOID) { - TRACE("\n"); + TRACE("CM_Request_Eject_PC()\n"); + return CM_Request_Eject_PC_Ex(NULL); } @@ -6806,13 +6995,15 @@ CONFIGRET WINAPI CM_Request_Eject_PC(VOID) /*********************************************************************** * CM_Request_Eject_PC_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Request_Eject_PC_Ex( - HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Request_Eject_PC_Ex( + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - TRACE("%lx\n", hMachine); + TRACE("CM_Request_Eject_PC_Ex(%p)\n", hMachine); if (hMachine != NULL) { @@ -6843,10 +7034,13 @@ CONFIGRET WINAPI CM_Request_Eject_PC_Ex( /*********************************************************************** * CM_Run_Detection [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Run_Detection( - ULONG ulFlags) +CONFIGRET +WINAPI +CM_Run_Detection( + _In_ ULONG ulFlags) { - TRACE("%lx\n", ulFlags); + TRACE("CM_Run_Detection(%lx)\n", ulFlags); + return CM_Run_Detection_Ex(ulFlags, NULL); } @@ -6854,13 +7048,17 @@ CONFIGRET WINAPI CM_Run_Detection( /*********************************************************************** * CM_Run_Detection_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Run_Detection_Ex( - ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Run_Detection_Ex( + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - TRACE("%lx %lx\n", ulFlags, hMachine); + TRACE("CM_Run_Detection_Ex(%lx %p)\n", + ulFlags, hMachine); if (!pSetupIsUserAdmin()) return CR_ACCESS_DENIED; @@ -6898,12 +7096,19 @@ CONFIGRET WINAPI CM_Run_Detection_Ex( /*********************************************************************** * CM_Set_Class_Registry_PropertyA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA( - LPGUID ClassGuid, ULONG ulProperty, PCVOID Buffer, ULONG ulLength, - ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Set_Class_Registry_PropertyA( + _In_ LPGUID ClassGuid, + _In_ ULONG ulProperty, + _In_reads_bytes_opt_(ulLength) PCVOID Buffer, + _In_ ULONG ulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { - FIXME("%p %lx %p %lu %lx %p\n", + FIXME("CM_Set_Class_Registry_PropertyA(%p %lx %p %lu %lx %p)\n", ClassGuid, ulProperty, Buffer, ulLength, ulFlags, hMachine); + return CR_CALL_NOT_IMPLEMENTED; } @@ -6911,12 +7116,19 @@ CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA( /*********************************************************************** * CM_Set_Class_Registry_PropertyW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Set_Class_Registry_PropertyW( - LPGUID ClassGuid, ULONG ulProperty, PCVOID Buffer, ULONG ulLength, - ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Set_Class_Registry_PropertyW( + _In_ LPGUID ClassGuid, + _In_ ULONG ulProperty, + _In_reads_bytes_opt_(ulLength) PCVOID Buffer, + _In_ ULONG ulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { - FIXME("%p %lx %p %lu %lx %p\n", + FIXME("CM_Set_Class_Registry_PropertyW(%p %lx %p %lu %lx %p)\n", ClassGuid, ulProperty, Buffer, ulLength, ulFlags, hMachine); + return CR_CALL_NOT_IMPLEMENTED; } @@ -6924,10 +7136,16 @@ CONFIGRET WINAPI CM_Set_Class_Registry_PropertyW( /*********************************************************************** * CM_Set_DevNode_Problem [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Set_DevNode_Problem( - DEVINST dnDevInst, ULONG ulProblem, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Set_DevNode_Problem( + _In_ DEVINST dnDevInst, + _In_ ULONG ulProblem, + _In_ ULONG ulFlags) { - TRACE("%lx %lx %lx\n", dnDevInst, ulProblem, ulFlags); + TRACE("CM_Set_DevNode_Problem(%lx %lx %lx)\n", + dnDevInst, ulProblem, ulFlags); + return CM_Set_DevNode_Problem_Ex(dnDevInst, ulProblem, ulFlags, NULL); } @@ -6935,15 +7153,21 @@ CONFIGRET WINAPI CM_Set_DevNode_Problem( /*********************************************************************** * CM_Set_DevNode_Problem_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Set_DevNode_Problem_Ex( - DEVINST dnDevInst, ULONG ulProblem, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Set_DevNode_Problem_Ex( + _In_ DEVINST dnDevInst, + _In_ ULONG ulProblem, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; LPWSTR lpDevInst; CONFIGRET ret; - TRACE("%lx %lx %lx %lx\n", dnDevInst, ulProblem, ulFlags, hMachine); + TRACE("CM_Set_DevNode_Problem_Ex(%lx %lx %lx %p)\n", + dnDevInst, ulProblem, ulFlags, hMachine); if (dnDevInst == 0) return CR_INVALID_DEVNODE; @@ -6991,12 +7215,18 @@ CONFIGRET WINAPI CM_Set_DevNode_Problem_Ex( /*********************************************************************** * CM_Set_DevNode_Registry_PropertyA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Set_DevNode_Registry_PropertyA( - DEVINST dnDevInst, ULONG ulProperty, PCVOID Buffer, ULONG ulLength, - ULONG ulFlags) +CONFIGRET +WINAPI +CM_Set_DevNode_Registry_PropertyA( + _In_ DEVINST dnDevInst, + _In_ ULONG ulProperty, + _In_reads_bytes_opt_(ulLength) PCVOID Buffer, + _In_ ULONG ulLength, + _In_ ULONG ulFlags) { - TRACE("%lx %lu %p %lx %lx\n", + TRACE("CM_Set_DevNode_Registry_PropertyA(%lx %lu %p %lx %lx)\n", dnDevInst, ulProperty, Buffer, ulLength, ulFlags); + return CM_Set_DevNode_Registry_Property_ExA(dnDevInst, ulProperty, Buffer, ulLength, ulFlags, NULL); @@ -7006,12 +7236,18 @@ CONFIGRET WINAPI CM_Set_DevNode_Registry_PropertyA( /*********************************************************************** * CM_Set_DevNode_Registry_PropertyW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Set_DevNode_Registry_PropertyW( - DEVINST dnDevInst, ULONG ulProperty, PCVOID Buffer, ULONG ulLength, - ULONG ulFlags) +CONFIGRET +WINAPI +CM_Set_DevNode_Registry_PropertyW( + _In_ DEVINST dnDevInst, + _In_ ULONG ulProperty, + _In_reads_bytes_opt_(ulLength) PCVOID Buffer, + _In_ ULONG ulLength, + _In_ ULONG ulFlags) { - TRACE("%lx %lu %p %lx %lx\n", + TRACE("CM_Set_DevNode_Registry_PropertyW(%lx %lu %p %lx %lx)\n", dnDevInst, ulProperty, Buffer, ulLength, ulFlags); + return CM_Set_DevNode_Registry_Property_ExW(dnDevInst, ulProperty, Buffer, ulLength, ulFlags, NULL); @@ -7021,15 +7257,21 @@ CONFIGRET WINAPI CM_Set_DevNode_Registry_PropertyW( /*********************************************************************** * CM_Set_DevNode_Registry_Property_ExA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Set_DevNode_Registry_Property_ExA( - DEVINST dnDevInst, ULONG ulProperty, PCVOID Buffer, ULONG ulLength, - ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Set_DevNode_Registry_Property_ExA( + _In_ DEVINST dnDevInst, + _In_ ULONG ulProperty, + _In_reads_bytes_opt_(ulLength) PCVOID Buffer, + _In_ ULONG ulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { CONFIGRET ret = CR_SUCCESS; LPWSTR lpBuffer; ULONG ulType; - FIXME("%lx %lu %p %lx %lx %lx\n", + FIXME("CM_Set_DevNode_Registry_Property_ExA(%lx %lu %p %lx %lx %p)\n", dnDevInst, ulProperty, Buffer, ulLength, ulFlags, hMachine); if (Buffer == NULL && ulLength != 0) @@ -7101,9 +7343,15 @@ CONFIGRET WINAPI CM_Set_DevNode_Registry_Property_ExA( /*********************************************************************** * CM_Set_DevNode_Registry_Property_ExW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Set_DevNode_Registry_Property_ExW( - DEVINST dnDevInst, ULONG ulProperty, PCVOID Buffer, ULONG ulLength, - ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Set_DevNode_Registry_Property_ExW( + _In_ DEVINST dnDevInst, + _In_ ULONG ulProperty, + _In_reads_bytes_opt_(ulLength) PCVOID Buffer, + _In_ ULONG ulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; @@ -7111,7 +7359,7 @@ CONFIGRET WINAPI CM_Set_DevNode_Registry_Property_ExW( ULONG ulType; CONFIGRET ret; - TRACE("%lx %lu %p %lx %lx %lx\n", + TRACE("CM_Set_DevNode_Registry_Property_ExW(%lx %lu %p %lx %lx %p)\n", dnDevInst, ulProperty, Buffer, ulLength, ulFlags, hMachine); if (dnDevInst == 0) @@ -7172,10 +7420,15 @@ CONFIGRET WINAPI CM_Set_DevNode_Registry_Property_ExW( /*********************************************************************** * CM_Set_HW_Prof [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Set_HW_Prof( - ULONG ulHardwareProfile, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Set_HW_Prof( + _In_ ULONG ulHardwareProfile, + _In_ ULONG ulFlags) { - TRACE("%lu %lu\n", ulHardwareProfile, ulFlags); + TRACE("CM_Set_HW_Prof(%lu %lx)\n", + ulHardwareProfile, ulFlags); + return CM_Set_HW_Prof_Ex(ulHardwareProfile, ulFlags, NULL); } @@ -7183,13 +7436,18 @@ CONFIGRET WINAPI CM_Set_HW_Prof( /*********************************************************************** * CM_Set_HW_Prof_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Set_HW_Prof_Ex( - ULONG ulHardwareProfile, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Set_HW_Prof_Ex( + _In_ ULONG ulHardwareProfile, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - TRACE("%lu %lu %lx\n", ulHardwareProfile, ulFlags, hMachine); + TRACE("CM_Set_HW_Prof_Ex(%lu %lx %p)\n", + ulHardwareProfile, ulFlags, hMachine); if (!pSetupIsUserAdmin()) return CR_ACCESS_DENIED; @@ -7226,12 +7484,17 @@ CONFIGRET WINAPI CM_Set_HW_Prof_Ex( /*********************************************************************** * CM_Set_HW_Prof_FlagsA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Set_HW_Prof_FlagsA( - DEVINSTID_A szDevInstName, ULONG ulConfig, ULONG ulValue, - ULONG ulFlags) +CONFIGRET +WINAPI +CM_Set_HW_Prof_FlagsA( + _In_ DEVINSTID_A szDevInstName, + _In_ ULONG ulConfig, + _In_ ULONG ulValue, + _In_ ULONG ulFlags) { - TRACE("%s %lu %lu %lx\n", szDevInstName, - ulConfig, ulValue, ulFlags); + TRACE("CM_Set_HW_Prof_FlagsA(%s %lu %lu %lx)\n", + debugstr_a(szDevInstName), ulConfig, ulValue, ulFlags); + return CM_Set_HW_Prof_Flags_ExA(szDevInstName, ulConfig, ulValue, ulFlags, NULL); } @@ -7240,12 +7503,17 @@ CONFIGRET WINAPI CM_Set_HW_Prof_FlagsA( /*********************************************************************** * CM_Set_HW_Prof_FlagsW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Set_HW_Prof_FlagsW( - DEVINSTID_W szDevInstName, ULONG ulConfig, ULONG ulValue, - ULONG ulFlags) +CONFIGRET +WINAPI +CM_Set_HW_Prof_FlagsW( + _In_ DEVINSTID_W szDevInstName, + _In_ ULONG ulConfig, + _In_ ULONG ulValue, + _In_ ULONG ulFlags) { - TRACE("%s %lu %lu %lx\n", debugstr_w(szDevInstName), - ulConfig, ulValue, ulFlags); + TRACE("CM_Set_HW_Prof_FlagsW(%s %lu %lu %lx)\n", + debugstr_w(szDevInstName), ulConfig, ulValue, ulFlags); + return CM_Set_HW_Prof_Flags_ExW(szDevInstName, ulConfig, ulValue, ulFlags, NULL); } @@ -7254,15 +7522,20 @@ CONFIGRET WINAPI CM_Set_HW_Prof_FlagsW( /*********************************************************************** * CM_Set_HW_Prof_Flags_ExA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Set_HW_Prof_Flags_ExA( - DEVINSTID_A szDevInstName, ULONG ulConfig, ULONG ulValue, - ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Set_HW_Prof_Flags_ExA( + _In_ DEVINSTID_A szDevInstName, + _In_ ULONG ulConfig, + _In_ ULONG ulValue, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { DEVINSTID_W pszDevIdW = NULL; CONFIGRET ret = CR_SUCCESS; - TRACE("%s %lu %lu %lx %lx\n", szDevInstName, - ulConfig, ulValue, ulFlags, hMachine); + TRACE("CM_Set_HW_Prof_Flags_ExA(%s %lu %lu %lx %p)\n", + debugstr_a(szDevInstName), ulConfig, ulValue, ulFlags, hMachine); if (szDevInstName != NULL) { @@ -7283,15 +7556,20 @@ CONFIGRET WINAPI CM_Set_HW_Prof_Flags_ExA( /*********************************************************************** * CM_Set_HW_Prof_Flags_ExW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Set_HW_Prof_Flags_ExW( - DEVINSTID_W szDevInstName, ULONG ulConfig, ULONG ulValue, - ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Set_HW_Prof_Flags_ExW( + _In_ DEVINSTID_W szDevInstName, + _In_ ULONG ulConfig, + _In_ ULONG ulValue, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - FIXME("%s %lu %lu %lx %lx\n", debugstr_w(szDevInstName), - ulConfig, ulValue, ulFlags, hMachine); + FIXME("CM_Set_HW_Prof_Flags_ExW(%s %lu %lu %lx %p)\n", + debugstr_w(szDevInstName), ulConfig, ulValue, ulFlags, hMachine); if (szDevInstName == NULL) return CR_INVALID_POINTER; @@ -7331,10 +7609,15 @@ CONFIGRET WINAPI CM_Set_HW_Prof_Flags_ExW( /*********************************************************************** * CM_Setup_DevNode [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Setup_DevNode( - DEVINST dnDevInst, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Setup_DevNode( + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags) { - TRACE("%lx %lx\n", dnDevInst, ulFlags); + TRACE("CM_Setup_DevNode(%lx %lx)\n", + dnDevInst, ulFlags); + return CM_Setup_DevNode_Ex(dnDevInst, ulFlags, NULL); } @@ -7342,15 +7625,20 @@ CONFIGRET WINAPI CM_Setup_DevNode( /*********************************************************************** * CM_Setup_DevNode_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Setup_DevNode_Ex( - DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Setup_DevNode_Ex( + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; LPWSTR lpDevInst; CONFIGRET ret; - FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine); + FIXME("CM_Setup_DevNode_Ex(%lx %lx %p)\n", + dnDevInst, ulFlags, hMachine); if (!pSetupIsUserAdmin()) return CR_ACCESS_DENIED; @@ -7419,10 +7707,15 @@ CM_Test_Range_Available( /*********************************************************************** * CM_Uninstall_DevNode [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Uninstall_DevNode( - DEVINST dnPhantom, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Uninstall_DevNode( + _In_ DEVINST dnPhantom, + _In_ ULONG ulFlags) { - TRACE("%lx %lx\n", dnPhantom, ulFlags); + TRACE("CM_Uninstall_DevNode(%lx %lx)\n", + dnPhantom, ulFlags); + return CM_Uninstall_DevNode_Ex(dnPhantom, ulFlags, NULL); } @@ -7430,15 +7723,20 @@ CONFIGRET WINAPI CM_Uninstall_DevNode( /*********************************************************************** * CM_Uninstall_DevNode_Ex [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Uninstall_DevNode_Ex( - DEVINST dnPhantom, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Uninstall_DevNode_Ex( + _In_ DEVINST dnPhantom, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; LPWSTR lpDevInst; CONFIGRET ret; - TRACE("%lx %lx %lx\n", dnPhantom, ulFlags, hMachine); + TRACE("CM_Uninstall_DevNode_Ex(%lx %lx %p)\n", + dnPhantom, ulFlags, hMachine); if (dnPhantom == 0) return CR_INVALID_DEVNODE; @@ -7485,10 +7783,14 @@ CONFIGRET WINAPI CM_Uninstall_DevNode_Ex( /*********************************************************************** * CM_Unregister_Device_InterfaceA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Unregister_Device_InterfaceA( - LPCSTR pszDeviceInterface, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Unregister_Device_InterfaceA( + _In_ LPCSTR pszDeviceInterface, + _In_ ULONG ulFlags) { - TRACE("%s %lx\n", pszDeviceInterface, ulFlags); + TRACE("CM_Unregister_Device_InterfaceA(%s %lx)\n", + debugstr_a(pszDeviceInterface), ulFlags); return CM_Unregister_Device_Interface_ExA(pszDeviceInterface, ulFlags, NULL); @@ -7498,10 +7800,14 @@ CONFIGRET WINAPI CM_Unregister_Device_InterfaceA( /*********************************************************************** * CM_Unregister_Device_InterfaceW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Unregister_Device_InterfaceW( - LPCWSTR pszDeviceInterface, ULONG ulFlags) +CONFIGRET +WINAPI +CM_Unregister_Device_InterfaceW( + _In_ LPCWSTR pszDeviceInterface, + _In_ ULONG ulFlags) { - TRACE("%s %lx\n", debugstr_w(pszDeviceInterface), ulFlags); + TRACE("CM_Unregister_Device_InterfaceW(%s %lx)\n", + debugstr_w(pszDeviceInterface), ulFlags); return CM_Unregister_Device_Interface_ExW(pszDeviceInterface, ulFlags, NULL); @@ -7511,13 +7817,18 @@ CONFIGRET WINAPI CM_Unregister_Device_InterfaceW( /*********************************************************************** * CM_Unregister_Device_Interface_ExA [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Unregister_Device_Interface_ExA( - LPCSTR pszDeviceInterface, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Unregister_Device_Interface_ExA( + _In_ LPCSTR pszDeviceInterface, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { LPWSTR pszDeviceInterfaceW = NULL; CONFIGRET ret; - TRACE("%s %lx %lx\n", pszDeviceInterface, ulFlags, hMachine); + TRACE("CM_Unregister_Device_Interface_ExA(%s %lx %p)\n", + debugstr_a(pszDeviceInterface), ulFlags, hMachine); if (pszDeviceInterface == NULL) return CR_INVALID_POINTER; @@ -7538,13 +7849,18 @@ CONFIGRET WINAPI CM_Unregister_Device_Interface_ExA( /*********************************************************************** * CM_Unregister_Device_Interface_ExW [SETUPAPI.@] */ -CONFIGRET WINAPI CM_Unregister_Device_Interface_ExW( - LPCWSTR pszDeviceInterface, ULONG ulFlags, HMACHINE hMachine) +CONFIGRET +WINAPI +CM_Unregister_Device_Interface_ExW( + _In_ LPCWSTR pszDeviceInterface, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; CONFIGRET ret; - TRACE("%s %lx %lx\n", debugstr_w(pszDeviceInterface), ulFlags, hMachine); + TRACE("CM_Unregister_Device_Interface_ExW(%s %lx %p)\n", + debugstr_w(pszDeviceInterface), ulFlags, hMachine); if (pszDeviceInterface == NULL) return CR_INVALID_POINTER;

1 0

01/01: [PSDK][XDK] Remove DECLSPEC_* from windef.h, protect against redefinition in winnt.h
by Thomas Faber 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9f88d594d9ec036474a0… commit b9f88d594d9ec036474a09c6f27a9b9e5c878a18 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 4 19:24:00 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 4 19:28:36 2018 +0100 [PSDK][XDK] Remove DECLSPEC_* from windef.h, protect against redefinition in winnt.h --- dll/win32/browseui/browseui.rc | 1 - sdk/include/psdk/windef.h | 23 ----------------------- sdk/include/xdk/ntbasedef.h | 12 ++++++++++-- 3 files changed, 10 insertions(+), 26 deletions(-) diff --git a/dll/win32/browseui/browseui.rc b/dll/win32/browseui/browseui.rc index 030d614112..aa8c3435a9 100644 --- a/dll/win32/browseui/browseui.rc +++ b/dll/win32/browseui/browseui.rc @@ -22,7 +22,6 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H #include <shlobj.h> -#undef DECLSPEC_IMPORT #include "resource.h" diff --git a/sdk/include/psdk/windef.h b/sdk/include/psdk/windef.h index 0166f3c832..a456269b55 100644 --- a/sdk/include/psdk/windef.h +++ b/sdk/include/psdk/windef.h @@ -107,29 +107,6 @@ typedef int INT; #define PACKED #endif -#ifdef __GNUC__ -#define DECLSPEC_NORETURN __declspec(noreturn) -#define DECLARE_STDCALL_P( type ) __stdcall type -#elif defined(__WATCOMC__) -#define DECLSPEC_NORETURN -#define DECLARE_STDCALL_P( type ) type __stdcall -#elif defined(_MSC_VER) -#define DECLSPEC_NORETURN __declspec(noreturn) -#define DECLARE_STDCALL_P( type ) type __stdcall -#endif /* __GNUC__/__WATCOMC__ */ - -#define DECLSPEC_IMPORT __declspec(dllimport) -#define DECLSPEC_EXPORT __declspec(dllexport) -#ifndef DECLSPEC_NOINLINE -#if (_MSC_VER >= 1300) -#define DECLSPEC_NOINLINE __declspec(noinline) -#elif defined(__GNUC__) -#define DECLSPEC_NOINLINE __attribute__((noinline)) -#else -#define DECLSPEC_NOINLINE -#endif -#endif - #undef far #undef near #undef pascal diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h index a1270d2428..7a1cded3cc 100644 --- a/sdk/include/xdk/ntbasedef.h +++ b/sdk/include/xdk/ntbasedef.h @@ -163,8 +163,16 @@ /* Import and Export Specifiers */ -/* Done the same way as in windef.h for now */ -#define DECLSPEC_IMPORT __declspec(dllimport) // MIDL? +#ifndef DECLSPEC_IMPORT + #define DECLSPEC_IMPORT __declspec(dllimport) // MIDL? +#endif /* DECLSPEC_IMPORT */ + +#ifndef DECLSPEC_EXPORT + #if defined(__REACTOS__) || defined(__WINESRC__) + #define DECLSPEC_EXPORT __declspec(dllexport) + #endif +#endif /* DECLSPEC_EXPORT */ + #define DECLSPEC_NORETURN __declspec(noreturn) #ifndef DECLSPEC_ADDRSAFE

1 0

01/01: [TRANSLATION] Polish translation update (#357)
by Adam Słaboń 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d838f40a3201dc282e50… commit 0d838f40a3201dc282e500e70b632537cad25cae Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Sun Feb 4 18:45:20 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 4 18:45:20 2018 +0100 [TRANSLATION] Polish translation update (#357) --- base/applications/fontview/lang/pl-PL.rc | 14 +++++++------- base/applications/mmc/lang/pl-PL.rc | 6 +++--- base/applications/mscutils/servman/lang/pl-PL.rc | 6 +++--- base/applications/notepad/lang/pl-PL.rc | 2 +- base/applications/rapps/lang/pl-PL.rc | 14 +++++++------- base/shell/explorer/lang/pl-PL.rc | 2 +- dll/shellext/acppage/lang/pl-PL.rc | 4 ++-- dll/shellext/deskmon/lang/pl-PL.rc | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/base/applications/fontview/lang/pl-PL.rc b/base/applications/fontview/lang/pl-PL.rc index 68098a0296..a06b32c656 100644 --- a/base/applications/fontview/lang/pl-PL.rc +++ b/base/applications/fontview/lang/pl-PL.rc @@ -18,13 +18,13 @@ BEGIN IDS_ERROR_NOMEM "Brakuje pamięci do ukończenia tej operacji." IDS_ERROR_NOFONT "Plik %1 nie jest poprawnym plikiem czcionki." IDS_ERROR_NOCLASS "Nie udało się zainicjować klasy window." - IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ -Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\ -TrueType Font (*.ttf)\0*.ttf\0\ -TrueType Font Collection (*.ttc)\0*.ttc\0\ -OpenType Font (*.otf)\0*.otf\0\ -OpenType Font Collection (*.otc)\0*.otc\0\ -All Files (*.*)\0*.*\0" + IDS_FILTER_LIST "Wszystkie obsługiwane czcionki (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ +Plik czcionki (*.fon;*.fnt)\0*.fon;*.fnt\0\ +Czcionka TrueType (*.ttf)\0*.ttf\0\ +Kolekcja czcionek TrueType (*.ttc)\0*.ttc\0\ +Czcionka OpenType (*.otf)\0*.otf\0\ +Kolekcja czcionek OpenType (*.otc)\0*.otc\0\ +Wszystkie pliki (*.*)\0*.*\0" IDS_PREVIOUS "< P&oprzednia" IDS_NEXT "&Następna >" END diff --git a/base/applications/mmc/lang/pl-PL.rc b/base/applications/mmc/lang/pl-PL.rc index 04c12fdbbb..e61c718dcc 100644 --- a/base/applications/mmc/lang/pl-PL.rc +++ b/base/applications/mmc/lang/pl-PL.rc @@ -18,7 +18,7 @@ BEGIN END POPUP "Pomo&c" BEGIN - MENUITEM "Konsola Zarządzania ReactOS - i&nformacje", IDM_HELP_ABOUT + MENUITEM "Konsola zarządzania ReactOS - i&nformacje", IDM_HELP_ABOUT END END @@ -39,12 +39,12 @@ BEGIN END POPUP "Pomo&c" BEGIN - MENUITEM "Konsola Zarządzania ReactOS - i&nformacje", IDM_HELP_ABOUT + MENUITEM "Konsola zarządzania ReactOS - i&nformacje", IDM_HELP_ABOUT END END STRINGTABLE BEGIN - IDS_APPTITLE "Konsola Zarządzania ReactOS" + IDS_APPTITLE "Konsola zarządzania ReactOS" IDS_CONSOLETITLE "Konsola%1!u!" END diff --git a/base/applications/mscutils/servman/lang/pl-PL.rc b/base/applications/mscutils/servman/lang/pl-PL.rc index a6e28b3cc3..30a564436c 100644 --- a/base/applications/mscutils/servman/lang/pl-PL.rc +++ b/base/applications/mscutils/servman/lang/pl-PL.rc @@ -74,11 +74,11 @@ BEGIN END IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "Menedżer Usług - informacje" +CAPTION "Menedżer usług - informacje" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Menedżer Usług v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 + LTEXT "Menedżer usług v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 PUSHBUTTON "Zamknij", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -336,7 +336,7 @@ END /* Application title */ STRINGTABLE BEGIN - IDS_APPNAME "Menedżer Usług ReactOS" + IDS_APPNAME "Menedżer usług ReactOS" END STRINGTABLE diff --git a/base/applications/notepad/lang/pl-PL.rc b/base/applications/notepad/lang/pl-PL.rc index 87b0e29736..aaad63e436 100644 --- a/base/applications/notepad/lang/pl-PL.rc +++ b/base/applications/notepad/lang/pl-PL.rc @@ -177,5 +177,5 @@ BEGIN STRING_LINE_COLUMN "Linia %d, kolumna %d" STRING_PRINTERROR "Nie można wydrukować pliku '%s'.\n\nUpewnij się, że drukarka jest włączona i poprawnie skonfigurowana." - STRING_TEXT_DOCUMENT "Text Document" + STRING_TEXT_DOCUMENT "Dokument tekstowy" END diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 4fb36efac6..2852d4b3c0 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -98,7 +98,7 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Pobierz %ls…" FONT 8, "MS Shell Dlg" @@ -160,13 +160,13 @@ END STRINGTABLE BEGIN IDS_AINFO_VERSION "\nWersja: " - IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: " + IDS_AINFO_AVAILABLEVERSION "\nDostępna wersja: " IDS_AINFO_DESCRIPTION "\nOpis: " IDS_AINFO_SIZE "\nRozmiar: " IDS_AINFO_URLSITE "\nStrona: " IDS_AINFO_LICENSE "\nLicencja: " IDS_AINFO_URLDOWNLOAD "\nPobieranie: " - IDS_AINFO_LANGUAGES "\nLanguages: " + IDS_AINFO_LANGUAGES "\nJęzyki: " END STRINGTABLE @@ -218,7 +218,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Nie można zapisać na dysku. Dysk może być pełny." IDS_SELECT_ALL "Zaznacz/Odznacz Wszystko" IDS_INSTALL_SELECTED "Instaluj Zaznaczone" - IDS_SELECTEDFORINST "Selected for installation" + IDS_SELECTEDFORINST "Wybrane do instalacji" END STRINGTABLE @@ -228,7 +228,7 @@ BEGIN IDS_STATUS_DOWNLOADED "Pobrane" IDS_STATUS_UPDATE_AVAILABLE "Dostępna aktualizacja" IDS_STATUS_DOWNLOADING "Pobieranie…" - IDS_STATUS_INSTALLING "Instalowanie……" + IDS_STATUS_INSTALLING "Instalowanie…" IDS_STATUS_WAITING "Oczekiwanie na instalację…" IDS_STATUS_FINISHED "Gotowe" END @@ -252,6 +252,6 @@ END STRINGTABLE BEGIN - IDS_DL_DIALOG_DB_DISP "Baza Programów" - IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Aktualizowanie bazy Programów…" + IDS_DL_DIALOG_DB_DISP "Baza programów" + IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Aktualizowanie bazy programów…" END diff --git a/base/shell/explorer/lang/pl-PL.rc b/base/shell/explorer/lang/pl-PL.rc index fc88968a62..062d743656 100644 --- a/base/shell/explorer/lang/pl-PL.rc +++ b/base/shell/explorer/lang/pl-PL.rc @@ -124,7 +124,7 @@ END IDD_CLASSICSTART_CUSTOMIZE DIALOGEX 0, 0, 232, 240, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Customize Classic Start Menu" +CAPTION "Dostosuj klasyczne menu Start" FONT 8, "MS Shell Dlg" { GROUPBOX "Menu Start", IDC_STATIC, 8, 7, 218, 114 diff --git a/dll/shellext/acppage/lang/pl-PL.rc b/dll/shellext/acppage/lang/pl-PL.rc index 60a6201087..411465f5f7 100644 --- a/dll/shellext/acppage/lang/pl-PL.rc +++ b/dll/shellext/acppage/lang/pl-PL.rc @@ -37,7 +37,7 @@ END STRINGTABLE BEGIN IDS_COMPAT_TITLE "Zgodność" - IDS_FAILED_NETWORK "Nie można ustawić trybu zgodnośći dla tego programu, ponieważ znajduje się na dysku sieciowym." - IDS_FAILED_PROTECTED "Nie można ustawić trybu zgodnośći dla tego programu, ponieważ jest częścią systemu ReactOS." + IDS_FAILED_NETWORK "Nie można ustawić trybu zgodności dla tego programu, ponieważ znajduje się na dysku sieciowym." + IDS_FAILED_PROTECTED "Nie można ustawić trybu zgodności dla tego programu, ponieważ jest częścią systemu ReactOS." IDS_YOU_DID_NOT_ADD "Nie dodałeś trybu zgodności, czy chcesz to zrobić teraz?" END diff --git a/dll/shellext/deskmon/lang/pl-PL.rc b/dll/shellext/deskmon/lang/pl-PL.rc index 8daa32b6ee..c6c14a26e5 100644 --- a/dll/shellext/deskmon/lang/pl-PL.rc +++ b/dll/shellext/deskmon/lang/pl-PL.rc @@ -19,7 +19,7 @@ BEGIN LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Właściwości", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED GROUPBOX "Ustawienia monitora", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 - LTEXT "&Częstotliwośći odświeżania ekranu:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + LTEXT "&Częstotliwości odświeżania ekranu:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT AUTOCHECKBOX "&Ukryj tryby, których ten monitor nie może wyświetlić", IDC_PRUNINGCHECK, 13, 106, 225, 10 END

1 0

02/02: Merge branch 'master' of https://github.com/reactos/reactos
by Alex Ionescu 04 Feb '18

04 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1683934cd8583bb4947c0… commit 1683934cd8583bb4947c035cd76ae08913053597 Merge: 16e0cca7e1 131678a025 Author: Alex Ionescu <aionescu(a)gmail.com> AuthorDate: Sun Feb 4 09:34:27 2018 -0800 Commit: Alex Ionescu <aionescu(a)gmail.com> CommitDate: Sun Feb 4 09:34:27 2018 -0800 Merge branch 'master' of https://github.com/reactos/reactos base/setup/usetup/CMakeLists.txt | 2 +- base/setup/usetup/cabinet.c | 1 + base/shell/explorer/syspager.cpp | 57 +- boot/environ/app/rosload/rosload.c | 2 +- dll/3rdparty/mbedtls/CMakeLists.txt | 1 - dll/shellext/netshell/lanstatusui.cpp | 4 +- dll/shellext/stobject/csystray.cpp | 2 +- dll/shellext/stobject/hotplug.cpp | 3 +- dll/win32/browseui/browseui.rc | 1 + dll/win32/setupapi/cfgmgr.c | 1201 +++++++++++++++++++++++---------- dll/win32/shell32/precomp.h | 5 + dll/win32/shell32/systray.cpp | 217 ++++-- sdk/include/psdk/shellapi.h | 15 +- sdk/include/reactos/undocshell.h | 31 +- 14 files changed, 1071 insertions(+), 471 deletions(-)

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