Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 59719: Formatting fix only.
by hbelusca＠svn.reactos.org 13 Aug '13

13 Aug '13

Author: hbelusca Date: Tue Aug 13 11:06:02 2013 New Revision: 59719 URL: http://svn.reactos.org/svn/reactos?rev=59719&view=rev Log: Formatting fix only. Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Tue Aug 13 11:06:02 2013 @@ -716,7 +716,7 @@ }; /* Call the internal function */ - BiosScrollWindow((HIBYTE(Eax)== 0x06) + BiosScrollWindow((HIBYTE(Eax) == 0x06) ? SCROLL_DIRECTION_UP : SCROLL_DIRECTION_DOWN, LOBYTE(Eax), Rectangle,

1 0

[ion] 59718: [NTOSKRNL]: Add and fix more glue code for EMS/Headless support. The SAC driver is at least correctly able to initialize now when /redirect is enabled. [SACMSG]: SAC wants the message ...
by ion＠svn.reactos.org 13 Aug '13

13 Aug '13

Author: ion Date: Tue Aug 13 03:18:03 2013 New Revision: 59718 URL: http://svn.reactos.org/svn/reactos?rev=59718&view=rev Log: [NTOSKRNL]: Add and fix more glue code for EMS/Headless support. The SAC driver is at least correctly able to initialize now when /redirect is enabled. [SACMSG]: SAC wants the message tables as Unicode, but the CMakeList has an obscure comment that Unicode MC needs "testing". Well, I'll be the first to test it and confirm it works -- implement a UNICODE_SOURCE_REALLY to get Unicode-mc. [SACMSG]: Add a few more constants. [SACDRV]: Implement InitializeMachineInformation. [SACDRV]: Fix countless bugs. Now the entire driver initializes up to UTF8EncodeAndSend, which is unimplemented. We're almost there! Modified: trunk/reactos/drivers/sac/driver/data.c trunk/reactos/drivers/sac/driver/memory.c trunk/reactos/drivers/sac/driver/sacdrv.h trunk/reactos/drivers/sac/driver/util.c trunk/reactos/include/reactos/mc/CMakeLists.txt trunk/reactos/include/reactos/mc/sacmsg.mc trunk/reactos/ntoskrnl/ex/hdlsterm.c trunk/reactos/ntoskrnl/include/internal/hdl.h Modified: trunk/reactos/drivers/sac/driver/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/data.c?… ============================================================================== --- trunk/reactos/drivers/sac/driver/data.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/data.c [iso-8859-1] Tue Aug 13 03:18:03 2013 @@ -77,6 +77,8 @@ else { SAC_DBG(SAC_DBG_INIT, "SAC CreateDeviceSecurityDescriptor : Unable to create Raw ACL, error : %x\n", Status); + /* FIXME: Temporary hack */ + Status = STATUS_SUCCESS; goto CleanupPath; } @@ -377,7 +379,7 @@ SAC_DBG(SAC_DBG_ENTRY_EXIT, "Entering.\n"); /* If we already did this, bail out */ - if (!GlobalDataInitialized) goto SuccessExit; + if (GlobalDataInitialized) goto SuccessExit; /* Setup the symbolic link for Win32 support */ RtlInitUnicodeString(&LinkName, L"\\DosDevices\\SAC"); Modified: trunk/reactos/drivers/sac/driver/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/memory.… ============================================================================== --- trunk/reactos/drivers/sac/driver/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/memory.c [iso-8859-1] Tue Aug 13 03:18:03 2013 @@ -93,6 +93,11 @@ IN PCHAR File, IN ULONG Line) { + PVOID p; + p = ExAllocatePoolWithTag(NonPagedPool, PoolSize, Tag); + SAC_DBG(SAC_DBG_MM, "Returning block 0x%X.\n", p); + return p; +#if 0 KIRQL OldIrql; PSAC_MEMORY_LIST GlobalDescriptor, NewDescriptor; PSAC_MEMORY_ENTRY LocalDescriptor, NextDescriptor; @@ -102,7 +107,7 @@ SAC_DBG(SAC_DBG_MM, "Entering.\n"); /* Acquire the memory allocation lock and align the size request */ - KeAcquireSpinLock(&MemoryLock, &OldIrql);; + KeAcquireSpinLock(&MemoryLock, &OldIrql); PoolSize = ALIGN_UP(PoolSize, ULONGLONG); #if _USE_SAC_HEAP_ALLOCATOR_ @@ -220,12 +225,14 @@ Buffer = LocalDescriptor + 1; RtlZeroMemory(Buffer, PoolSize); return Buffer; +#endif } VOID NTAPI MyFreePool(IN PVOID *Block) { +#if 0 PSAC_MEMORY_ENTRY NextDescriptor; PSAC_MEMORY_ENTRY ThisDescriptor, FoundDescriptor; PSAC_MEMORY_ENTRY LocalDescriptor = (PVOID)((ULONG_PTR)(*Block) - sizeof(SAC_MEMORY_ENTRY)); @@ -323,10 +330,10 @@ LocalSize = GlobalSize = 0; ThisDescriptor = (PVOID)LocalSize; NextDescriptor = (PVOID)GlobalSize; - GlobalDescriptor = (PVOID) ThisDescriptor; + GlobalDescriptor = (PVOID)ThisDescriptor; FoundDescriptor = (PVOID)GlobalDescriptor; - GlobalDescriptor = (PVOID) NextDescriptor; - NextDescriptor = (PVOID) FoundDescriptor; + GlobalDescriptor = (PVOID)NextDescriptor; + NextDescriptor = (PVOID)FoundDescriptor; /* Use the NT pool allocator*/ ExFreePool(LocalDescriptor); @@ -334,6 +341,8 @@ /* Release the lock, delete the address, and return */ KeReleaseSpinLock(&MemoryLock, OldIrql); +#endif + ExFreePool(*Block); *Block = NULL; SAC_DBG(SAC_DBG_MM, "exiting.\n"); } Modified: trunk/reactos/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… ============================================================================== --- trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] Tue Aug 13 03:18:03 2013 @@ -35,6 +35,7 @@ #define SAC_DBG_UTIL 0x02 #define SAC_DBG_INIT 0x04 #define SAC_DBG_MM 0x1000 +#define SAC_DBG_MACHINE 0x2000 #define SAC_DBG(x, ...) \ if (SACDebug & x) \ { \ Modified: trunk/reactos/drivers/sac/driver/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/util.c?… ============================================================================== --- trunk/reactos/drivers/sac/driver/util.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/util.c [iso-8859-1] Tue Aug 13 03:18:03 2013 @@ -13,7 +13,7 @@ /* GLOBALS *******************************************************************/ PCHAR Utf8ConversionBuffer; -ULONG Utf8ConversionBufferSize; +ULONG Utf8ConversionBufferSize = PAGE_SIZE; PSAC_MACHINE_INFO MachineInformation; PVOID RequestSacCmdEventObjectBody; PKEVENT RequestSacCmdEventWaitObjectBody; @@ -122,7 +122,7 @@ NTAPI PreloadGlobalMessageTable(IN PVOID ImageBase) { - NTSTATUS Status; + NTSTATUS Status, Status2; ULONG MessageId, TotalLength, TextSize, i; PWCHAR StringBuffer; PMESSAGE_RESOURCE_ENTRY MessageEntry; @@ -130,6 +130,7 @@ SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC PreloadGlobalMessageTable: Entering.\n"); /* Nothing to do if we already have a table */ + Status = STATUS_SUCCESS; if (GlobalMessageTable) goto Exit; /* Loop through up to 200 messages */ @@ -137,12 +138,12 @@ for (MessageId = 1; MessageId != SAC_MAX_MESSAGES; MessageId++) { /* Find this message ID in the string table*/ - Status = RtlFindMessage(ImageBase, - 11, - LANG_NEUTRAL, - MessageId, - &MessageEntry); - if (NT_SUCCESS(Status)) + Status2 = RtlFindMessage(ImageBase, + 11, + LANG_NEUTRAL, + MessageId, + &MessageEntry); + if (NT_SUCCESS(Status2)) { /* Make sure it's Unicode */ ASSERT(MessageEntry->Flags & MESSAGE_RESOURCE_UNICODE); @@ -182,12 +183,12 @@ for (i = 0, MessageId = 1; MessageId != SAC_MAX_MESSAGES; MessageId++) { /* Make sure the message is still there...! */ - Status = RtlFindMessage(ImageBase, - 11, - LANG_NEUTRAL, - MessageId, - &MessageEntry); - if (NT_SUCCESS(Status)) + Status2 = RtlFindMessage(ImageBase, + 11, + LANG_NEUTRAL, + MessageId, + &MessageEntry); + if (NT_SUCCESS(Status2)) { /* Write the entry in the message table*/ GlobalMessageTable[i].Index = MessageId; @@ -202,7 +203,7 @@ ASSERT((ULONG)(wcslen(StringBuffer)*sizeof(WCHAR)) <= TextSize); /* Move to the next buffer space */ - StringBuffer += TextSize; + StringBuffer += (TextSize / sizeof(WCHAR)); /* Move to the next entry, make sure the status is full success */ i++; @@ -227,135 +228,6 @@ SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC TearDownGlobalMessageTable: Exiting\n"); return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -TranslateMachineInformationXML(IN PWCHAR *Buffer, - IN PWCHAR ExtraData) -{ - NTSTATUS Status; - ULONG Size; - PWCHAR p; - CHECK_PARAMETER1(Buffer); - - Status = STATUS_SUCCESS; - Size = wcslen(L"<machine-info>\r\n"); - - if (MachineInformation->MachineName) - { - Size += wcslen(MachineInformation->MachineName); - Size += wcslen(L"<name>%s</name>\r\n"); - } - - if (MachineInformation->MachineGuid) - { - Size += wcslen(MachineInformation->MachineGuid); - Size += wcslen(L"<guid>%s</guid>\r\n"); - } - - if (MachineInformation->ProcessorArchitecture) - { - Size += wcslen(MachineInformation->ProcessorArchitecture); - Size += wcslen(L"<processor-architecture>%s</processor-architecture>\r\n"); - } - - if (MachineInformation->MajorVersion) - { - Size += wcslen(MachineInformation->MajorVersion); - Size += wcslen(L"<os-version>%s</os-version>\r\n"); - } - - if (MachineInformation->BuildNumber) - { - Size += wcslen(MachineInformation->BuildNumber); - Size += wcslen(L"<os-build-number>%s</os-build-number>\r\n"); - } - - if (MachineInformation->ProductType) - { - Size += wcslen(MachineInformation->ProductType); - Size += wcslen(L"<os-product>%s</os-product>\r\n"); - } - - if (MachineInformation->ServicePack) - { - Size += wcslen(MachineInformation->ServicePack); - Size += wcslen(L"<os-service-pack>%s</os-service-pack>\r\n"); - } - - if (ExtraData) Size += wcslen(ExtraData); - - Size += wcslen(L"</machine-info>\r\n"); - - p = (PWCHAR)SacAllocatePool((Size + sizeof(ANSI_NULL)) * sizeof(WCHAR), GLOBAL_BLOCK_TAG); - - *Buffer = p; - if (!p) return STATUS_NO_MEMORY; - - Size = wcslen(L"<machine-info>\r\n"); - wcscpy(p, L"<machine-info>\r\n"); - - p += Size; - - if (MachineInformation->MachineName) - { - p += swprintf(p, L"<name>%s</name>\r\n", MachineInformation->MachineName); - } - - if (MachineInformation->MachineGuid) - { - p += swprintf(p, L"<guid>%s</guid>\r\n", MachineInformation->MachineGuid); - } - - if (MachineInformation->ProcessorArchitecture) - { - p += swprintf(p, L"<processor-architecture>%s</processor-architecture>\r\n", MachineInformation->ProcessorArchitecture); - } - - if (MachineInformation->MajorVersion) - { - p += swprintf(p, L"<os-version>%s</os-version>\r\n", MachineInformation->MajorVersion); - } - - if (MachineInformation->BuildNumber) - { - p += swprintf(p, L"<os-build-number>%s</os-build-number>\r\n", MachineInformation->BuildNumber); - } - - if (MachineInformation->ProductType) - { - p += swprintf(p, L"<os-product>%s</os-product>\r\n", MachineInformation->ProductType); - } - - if (MachineInformation->ServicePack) - { - p += swprintf(p, L"<os-service-pack>%s</os-service-pack>\r\n", MachineInformation->ServicePack); - } - - if (ExtraData) - { - Size = wcslen(ExtraData); - wcscpy(p, ExtraData); - p += Size; - } - - wcscpy(p, L"</machine-info>\r\n"); - ASSERT((((ULONG) wcslen(*Buffer) + 1) * sizeof(WCHAR)) <= Size); - return Status; -} - -VOID -NTAPI -InitializeMachineInformation(VOID) -{ - SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC Initialize Machine Information : Entering.\n"); - - /* FIXME: TODO */ - MachineInformation = NULL; - ASSERT(FALSE); - - SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC Initialize Machine Information : Exiting with error.\n"); } NTSTATUS @@ -479,7 +351,7 @@ NTSTATUS NTAPI -CopyRegistryValueData(IN PULONG* Buffer, +CopyRegistryValueData(IN PVOID* Buffer, IN PKEY_VALUE_PARTIAL_INFORMATION PartialInfo) { NTSTATUS Status = STATUS_SUCCESS; @@ -502,6 +374,446 @@ /* Return the result */ return Status; +} + +NTSTATUS +NTAPI +TranslateMachineInformationXML(IN PWCHAR *Buffer, + IN PWCHAR ExtraData) +{ + NTSTATUS Status; + ULONG Size; + PWCHAR p; + CHECK_PARAMETER1(Buffer); + + /* Start by believing the world is beautiful */ + Status = STATUS_SUCCESS; + + /* First, the header */ + Size = wcslen(L"<machine-info>\r\n"); + + /* Do we have a machine name? */ + if (MachineInformation->MachineName) + { + /* Go and add it in */ + Size += wcslen(MachineInformation->MachineName); + Size += wcslen(L"<name>%s</name>\r\n"); + } + + /* Do we have a GUID? */ + if (MachineInformation->MachineGuid) + { + /* Go and add it in */ + Size += wcslen(MachineInformation->MachineGuid); + Size += wcslen(L"<guid>%s</guid>\r\n"); + } + + /* Do we know the processor? */ + if (MachineInformation->ProcessorArchitecture) + { + /* Go and add it in */ + Size += wcslen(MachineInformation->ProcessorArchitecture); + Size += wcslen(L"<processor-architecture>%s</processor-architecture>\r\n"); + } + + /* Do we have the version? */ + if (MachineInformation->MajorVersion) + { + /* Go and add it in */ + Size += wcslen(MachineInformation->MajorVersion); + Size += wcslen(L"<os-version>%s</os-version>\r\n"); + } + + /* Do we have the build? */ + if (MachineInformation->BuildNumber) + { + /* Go and add it in */ + Size += wcslen(MachineInformation->BuildNumber); + Size += wcslen(L"<os-build-number>%s</os-build-number>\r\n"); + } + + /* Do we have the product type? */ + if (MachineInformation->ProductType) + { + /* Go and add it in */ + Size += wcslen(MachineInformation->ProductType); + Size += wcslen(L"<os-product>%s</os-product>\r\n"); + } + + /* Do we have a service pack? */ + if (MachineInformation->ServicePack) + { + /* Go and add it in */ + Size += wcslen(MachineInformation->ServicePack); + Size += wcslen(L"<os-service-pack>%s</os-service-pack>\r\n"); + } + + /* Anything else we need to know? Add it in too */ + if (ExtraData) Size += wcslen(ExtraData); + + /* Finally, add the footer */ + Size += wcslen(L"</machine-info>\r\n"); + + /* Convert to bytes and add a NULL */ + Size += sizeof(ANSI_NULL); + Size *= sizeof(WCHAR); + + /* Allocate space for the buffer */ + p = SacAllocatePool(Size, GLOBAL_BLOCK_TAG); + *Buffer = p; + if (!p) return STATUS_NO_MEMORY; + + wcscpy(p, L"<machine-info>\r\n"); + p += wcslen(L"<machine-info>\r\n");; + + if (MachineInformation->MachineName) + { + p += swprintf(p, + L"<name>%s</name>\r\n", + MachineInformation->MachineName); + } + + if (MachineInformation->MachineGuid) + { + p += swprintf(p, + L"<guid>%s</guid>\r\n", + MachineInformation->MachineGuid); + } + + if (MachineInformation->ProcessorArchitecture) + { + p += swprintf(p, + L"<processor-architecture>%s</processor-architecture>\r\n", + MachineInformation->ProcessorArchitecture); + } + + if (MachineInformation->MajorVersion) + { + p += swprintf(p, + L"<os-version>%s</os-version>\r\n", + MachineInformation->MajorVersion); + } + + if (MachineInformation->BuildNumber) + { + p += swprintf(p, + L"<os-build-number>%s</os-build-number>\r\n", + MachineInformation->BuildNumber); + } + + if (MachineInformation->ProductType) + { + p += swprintf(p, + L"<os-product>%s</os-product>\r\n", + MachineInformation->ProductType); + } + + if (MachineInformation->ServicePack) + { + p += swprintf(p, + L"<os-service-pack>%s</os-service-pack>\r\n", + MachineInformation->ServicePack); + } + + if (ExtraData) + { + wcscpy(p, ExtraData); + p += wcslen(ExtraData); + } + + wcscpy(p, L"</machine-info>\r\n"); + SAC_DBG(SAC_DBG_ENTRY_EXIT, "MachineInformation: %S\n", *Buffer); + ASSERT((((ULONG)wcslen(*Buffer) + 1) * sizeof(WCHAR)) <= Size); + return Status; +} + +VOID +NTAPI +InitializeMachineInformation(VOID) +{ + NTSTATUS Status; + PWCHAR GuidString, MajorVersion, ServicePack, BuildNumber, MessageBuffer; + PWCHAR ProductType; + ULONG SuiteTypeMessage; + BOOLEAN SetupInProgress = FALSE; + GUID SystemGuid; + ULONG RealSize, Size, OutputSize; + PKEY_VALUE_PARTIAL_INFORMATION PartialInfo; + RTL_OSVERSIONINFOEXW VersionInformation; + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC Initialize Machine Information : Entering.\n"); + + /* Don't do anything if we already quried this */ + if (MachineInformation) + { + SAC_DBG(SAC_DBG_MACHINE, "SAC Initialize Machine Information:: MachineInformationBuffer already initialzied.\n"); + return; + } + + /* Allocate the machine information */ + MachineInformation = SacAllocatePool(sizeof(*MachineInformation), + GLOBAL_BLOCK_TAG); + if (!MachineInformation) + { + goto Fail; + } + + /* Zero it out for now */ + RtlZeroMemory(MachineInformation, sizeof(*MachineInformation)); + + /* Query OS version */ + RtlZeroMemory(&VersionInformation, sizeof(VersionInformation)); + VersionInformation.dwOSVersionInfoSize = sizeof(VersionInformation); + Status = RtlGetVersion((PRTL_OSVERSIONINFOW)&VersionInformation); + if (!NT_SUCCESS(Status)) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC InitializeMachineInformation: Exiting (2).\n"); + goto Fail; + } + + /* Check if setup is in progress */ + Status = GetRegistryValueBuffer(L"\\Registry\\Machine\\System\\Setup", + L"SystemSetupInProgress", + &PartialInfo); + if (NT_SUCCESS(Status)) + { + /* The key is there, is the value set? */ + if (*(PULONG)PartialInfo->Data) SetupInProgress = TRUE; + SacFreePool(PartialInfo); + if (SetupInProgress) + { + /* Yes, so we'll use a special hostname to identify this */ + MessageBuffer = GetMessage(SAC_UNINITIALIZED_MSG); + Size = wcslen(MessageBuffer); + ASSERT(Size > 0); + RealSize = Size * sizeof(WCHAR) + sizeof(UNICODE_NULL); + + /* Make room for it and copy it in there */ + MachineInformation->MachineName = SacAllocatePool(RealSize, + GLOBAL_BLOCK_TAG); + if (MachineInformation->MachineName) + { + wcscpy(MachineInformation->MachineName, MessageBuffer); + } + } + } + + /* If we are not in setup mode, or if we failed to check... */ + if (!SetupInProgress) + { + /* Query the computer name */ + Status = GetRegistryValueBuffer(L"\\Registry\\Machine\\System\\" + L"CurrentControlSet\\Control\\" + L"ComputerName\\ComputerName", + L"ComputerName", + &PartialInfo); + if (!NT_SUCCESS(Status)) + { + /* It's not critical, but we won't have it */ + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC InitializeMachineInformation: Failed to get machine name.\n"); + } + else + { + /* We have the name, copy it from the registry */ + Status = CopyRegistryValueData((PVOID*)&MachineInformation-> + MachineName, + PartialInfo); + SacFreePool(PartialInfo); + if (!NT_SUCCESS(Status)) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC InitializeMachineInformation: Exiting (20).\n"); + goto Fail; + } + } + } + + /* Next step, try to get the machine GUID */ + RtlZeroMemory(&SystemGuid, sizeof(SystemGuid)); + OutputSize = sizeof(SystemGuid); + Status = HeadlessDispatch(HeadlessCmdQueryGUID, + NULL, + 0, + &SystemGuid, + &OutputSize); + if (!NT_SUCCESS(Status)) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC InitializeMachineInformation: Failed to get Machine GUID.\n"); + } + else + { + /* We have it -- make room for it */ + GuidString = SacAllocatePool(0x50, GLOBAL_BLOCK_TAG); + if (!GuidString) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC InitializeMachineInformation: Exiting (31).\n"); + goto Fail; + } + + /* Build the string with the GUID in it, and save the ppointer to it */ + swprintf(GuidString, + L"%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + SystemGuid.Data1, + SystemGuid.Data2, + SystemGuid.Data3, + SystemGuid.Data4[0], + SystemGuid.Data4[1], + SystemGuid.Data4[2], + SystemGuid.Data4[3], + SystemGuid.Data4[4], + SystemGuid.Data4[5], + SystemGuid.Data4[6], + SystemGuid.Data4[7]); + MachineInformation->MachineGuid = GuidString; + } + + /* Next, query the processor architecture */ + Status = GetRegistryValueBuffer(L"\\Registry\\Machine\\System\\" + L"CurrentControlSet\\Control\\" + L"Session Manager\\Environment", + L"PROCESSOR_ARCHITECTURE", + &PartialInfo); + if (!NT_SUCCESS(Status)) + { + /* It's not critical, but we won't have it */ + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC InitializeMachineInformation: Exiting (30).\n"); + } + else + { + /* We have it! Copy the value from the registry */ + Status = CopyRegistryValueData((PVOID*)&MachineInformation-> + ProcessorArchitecture, + PartialInfo); + SacFreePool(PartialInfo); + if (!NT_SUCCESS(Status)) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC InitializeMachineInformation: Exiting (30).\n"); + goto Fail; + } + } + + /* Now allocate a buffer for the OS version number */ + MajorVersion = SacAllocatePool(0x18, GLOBAL_BLOCK_TAG); + if (!MajorVersion) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC InitializeMachineInformation: Exiting (50).\n"); + goto Fail; + } + + /* Build the buffer and set a pointer to it */ + swprintf(MajorVersion, + L"%d.%d", + VersionInformation.dwMajorVersion, + VersionInformation.dwMinorVersion); + MachineInformation->MajorVersion = MajorVersion; + + /* Now allocate a buffer for the OS build number */ + BuildNumber = SacAllocatePool(0xC, GLOBAL_BLOCK_TAG); + if (!BuildNumber) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC InitializeMachineInformation: Exiting (60).\n"); + goto Fail; + } + + /* Build the buffer and set a pointer to it */ + swprintf(BuildNumber, L"%d", VersionInformation.dwBuildNumber); + MachineInformation->BuildNumber = BuildNumber; + + /* Now check what kind of SKU this is */ + if (ExVerifySuite(DataCenter)) + { + SuiteTypeMessage = SAC_DATACENTER_SUITE_MSG; + } + else if (ExVerifySuite(EmbeddedNT)) + { + SuiteTypeMessage = SAC_EMBEDDED_SUITE_MSG; + } + else if (ExVerifySuite(Enterprise)) + { + SuiteTypeMessage = SAC_ENTERPRISE_SUITE_MSG; + } + else + { + /* Unknown or perhaps a client SKU */ + SuiteTypeMessage = SAC_NO_SUITE_MSG; + } + + /* Get the string that correponds to the SKU type */ + MessageBuffer = GetMessage(SuiteTypeMessage); + if (!MessageBuffer) + { + /* We won't have it, but this isn't critical */ + SAC_DBG(SAC_DBG_INIT, "SAC InitializeMachineInformation: Failed to get product type.\n"); + } + else + { + /* Calculate the size we need to hold the string */ + Size = wcslen(MessageBuffer); + ASSERT(Size > 0); + RealSize = Size * sizeof(WCHAR) + sizeof(UNICODE_NULL); + + /* Allocate a buffer for it */ + ProductType = SacAllocatePool(RealSize, GLOBAL_BLOCK_TAG); + if (!ProductType) + { + SAC_DBG(SAC_DBG_INIT, "SAC InitializeMachineInformation: Failed product type memory allocation.\n"); + goto Fail; + } + + /* Copy the string and set the pointer */ + RtlCopyMemory(ProductType, MessageBuffer, RealSize); + MachineInformation->ProductType = ProductType; + } + + /* Check if this is a SP version or RTM version */ + if (VersionInformation.wServicePackMajor) + { + /* This is a service pack, allocate a buffer for the version */ + ServicePack = SacAllocatePool(0x18, GLOBAL_BLOCK_TAG); + if (ServicePack) + { + /* Build the buffer and set a pointer to it */ + swprintf(ServicePack, + L"%d.%d", + VersionInformation.wServicePackMajor, + VersionInformation.wServicePackMinor); + MachineInformation->ServicePack = ServicePack; + + /* We've collected all the machine info and are done! */ + return; + } + + /* This is the failure path */ + SAC_DBG(SAC_DBG_INIT, "SAC InitializeMachineInformation: Failed service pack memory allocation.\n"); + } + else + { + /* Get a generic string that indicates there's no service pack */ + MessageBuffer = GetMessage(SAC_NO_DATA_MSG); + Size = wcslen(MessageBuffer); + ASSERT(Size > 0); + RealSize = Size * sizeof(WCHAR) + sizeof(UNICODE_NULL); + + /* Allocate memory for the "no service pack" string */ + ServicePack = SacAllocatePool(RealSize, GLOBAL_BLOCK_TAG); + if (ServicePack) + { + /* Copy the buffer and set a pointer to it */ + RtlCopyMemory(ServicePack, MessageBuffer, RealSize); + MachineInformation->ServicePack = ServicePack; + + /* We've collected all the machine info and are done! */ + return; + } + + SAC_DBG(SAC_DBG_INIT, "SAC InitializeMachineInformation: Failed service pack memory allocation.\n"); + } + +Fail: + /* In the failure path, always cleanup the machine information buffer */ + if (MachineInformation) + { + SacFreePool(MachineInformation); + } + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC Initialize Machine Information : Exiting with error.\n"); } NTSTATUS @@ -549,7 +861,7 @@ if (!Buffer) return STATUS_UNSUCCESSFUL; /* Read the value */ - Status = CopyRegistryValueData(&Data, Buffer); + Status = CopyRegistryValueData((PVOID*)&Data, Buffer); SacFreePool(Buffer); if (!NT_SUCCESS(Status)) return Status; @@ -632,7 +944,7 @@ RegisterBlueScreenMachineInformation(VOID) { PWCHAR XmlBuffer; - PHEADLESS_BLUE_SCREEN_DATA BsBuffer; + PHEADLESS_CMD_SET_BLUE_SCREEN_DATA BsBuffer; ULONG Length, HeaderLength, TotalLength; NTSTATUS Status; ULONG i; @@ -653,15 +965,15 @@ CHECK_PARAMETER_WITH_STATUS(BsBuffer, STATUS_NO_MEMORY); /* Copy the XML property name */ - strcpy((PCHAR)BsBuffer->XMLData, "MACHINEINFO"); - BsBuffer->Property = (PUCHAR)HeaderLength + sizeof(ANSI_NULL); + strcpy((PCHAR)BsBuffer->Data, "MACHINEINFO"); + BsBuffer->ValueIndex = HeaderLength + sizeof(ANSI_NULL); /* Copy the data and NULL-terminate it */ for (i = 0; i < Length; i++) { - BsBuffer->XMLData[HeaderLength + sizeof(ANSI_NULL) + i] = XmlBuffer[i]; - } - BsBuffer->XMLData[HeaderLength + sizeof(ANSI_NULL) + i] = ANSI_NULL; + BsBuffer->Data[BsBuffer->ValueIndex + i] = XmlBuffer[i]; + } + BsBuffer->Data[BsBuffer->ValueIndex + i] = ANSI_NULL; /* Let the OS save the buffer for later */ Status = HeadlessDispatch(HeadlessCmdSetBlueScreenData, Modified: trunk/reactos/include/reactos/mc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/CMakeLi… ============================================================================== --- trunk/reactos/include/reactos/mc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/CMakeLists.txt [iso-8859-1] Tue Aug 13 03:18:03 2013 @@ -7,9 +7,12 @@ neteventmsg.mc ntiologc.mc ntstatus.mc - pciclass.mc + pciclass.mc) + +list(APPEND UNICODE_SOURCE_REALLY sacmsg.mc) add_message_headers(ANSI ${ANSI_SOURCE}) # FIXME: this needs testing before switching to unicode add_message_headers(ANSI ${UNICODE_SOURCE}) +add_message_headers(UNICODE ${UNICODE_SOURCE_REALLY}) Modified: trunk/reactos/include/reactos/mc/sacmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/sacmsg.… ============================================================================== --- trunk/reactos/include/reactos/mc/sacmsg.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/sacmsg.mc [iso-8859-1] Tue Aug 13 03:18:03 2013 @@ -461,7 +461,7 @@ . MessageId=98 -SymbolicName=SACDRV_98 +SymbolicName=SAC_NO_DATA_MSG Language=English None%0 . @@ -473,25 +473,25 @@ . MessageId=100 -SymbolicName=SACDRV_100 +SymbolicName=SAC_DATACENTER_SUITE_MSG Language=English Windows Server 2003 Datacenter Edition%0 . MessageId=101 -SymbolicName=SACDRV_101 +SymbolicName=SAC_EMBEDDED_SUITE_MSG Language=English Windows Server 2003 Embedded%0 . MessageId=102 -SymbolicName=SACDRV_102 +SymbolicName=SAC_ENTERPRISE_SUITE_MSG Language=English Windows Server 2003 Enterprise Edition%0 . MessageId=103 -SymbolicName=SACDRV_103 +SymbolicName=SAC_NO_SUITE_MSG Language=English Windows Server 2003%0 . @@ -695,7 +695,7 @@ . MessageId=153 -SymbolicName=SACDRV_153 +SymbolicName=SAC_UNINITIALIZED_MSG Language=English not yet initialized%0 . Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/hdlsterm.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] Tue Aug 13 03:18:03 2013 @@ -17,111 +17,156 @@ /* FUNCTIONS *****************************************************************/ +FORCEINLINE +KIRQL +HdlspAcquireGlobalLock(VOID) +{ + KIRQL OldIrql; + + /* Don't acquire the lock if we are bugchecking */ + if (!HeadlessGlobals->InBugCheck) + { + KeAcquireSpinLock(&HeadlessGlobals->SpinLock, &OldIrql); + } + else + { + OldIrql = 0xFF; + } + + return OldIrql; +} + +FORCEINLINE VOID -NTAPI -HdlspSendStringAtBaud( - IN PUCHAR String - ) -{ - /* Send every byte */ - while (*String++ != ANSI_NULL) - { - InbvPortPutByte(HeadlessGlobals->TerminalPort, *String); - } +HdlspReleaselobalLock(IN KIRQL OldIrql) +{ + /* Only release the lock if we aren't bugchecking */ + if (OldIrql != 0xFF) + { + KeReleaseSpinLock(&HeadlessGlobals->SpinLock, OldIrql); + } + else + { + ASSERT(HeadlessGlobals->InBugCheck == TRUE); + } +} + +VOID +NTAPI +HdlspSendStringAtBaud(IN PUCHAR String) +{ + /* Send every byte */ + while (*String++ != ANSI_NULL) + { + InbvPortPutByte(HeadlessGlobals->TerminalPort, *String); + } } NTSTATUS NTAPI -HdlspEnableTerminal( - IN BOOLEAN Enable - ) -{ - /* Enable if requested, as long as this isn't a PCI serial port crashing */ - if ((Enable) && - !(HeadlessGlobals->TerminalEnabled) && - !((HeadlessGlobals->IsMMIODevice) && (HeadlessGlobals->InBugCheck))) - { - /* Initialize the COM port with cportlib */ - HeadlessGlobals->TerminalEnabled = InbvPortInitialize( - HeadlessGlobals->TerminalBaudRate, - HeadlessGlobals->TerminalPortNumber, - HeadlessGlobals->TerminalPortAddress, - &HeadlessGlobals->TerminalPort, - HeadlessGlobals->IsMMIODevice); - if (!HeadlessGlobals->TerminalEnabled) return STATUS_UNSUCCESSFUL; - - /* Cleanup the screen and reset the cursor */ - HdlspSendStringAtBaud((PUCHAR)"\x1B[2J"); - HdlspSendStringAtBaud((PUCHAR)"\x1B[H"); - - /* Enable FIFO */ - InbvPortEnableFifo(HeadlessGlobals->TerminalPort, TRUE); - } - else if (!Enable) - { - /* Specific case when headless is being disabled */ - InbvPortTerminate(HeadlessGlobals->TerminalPort); - HeadlessGlobals->TerminalPort = 0; - HeadlessGlobals->TerminalEnabled = FALSE; - } - return STATUS_SUCCESS; +HdlspEnableTerminal(IN BOOLEAN Enable) +{ + /* Enable if requested, as long as this isn't a PCI serial port crashing */ + if ((Enable) && + !(HeadlessGlobals->TerminalEnabled) && + !((HeadlessGlobals->IsMMIODevice) && (HeadlessGlobals->InBugCheck))) + { + /* Initialize the COM port with cportlib */ + HeadlessGlobals->TerminalEnabled = InbvPortInitialize(HeadlessGlobals-> + TerminalBaudRate, + HeadlessGlobals-> + TerminalPortNumber, + HeadlessGlobals-> + TerminalPortAddress, + &HeadlessGlobals-> + TerminalPort, + HeadlessGlobals-> + IsMMIODevice); + if (!HeadlessGlobals->TerminalEnabled) + { + DPRINT1("Failed to initialize port through cportlib\n"); + return STATUS_UNSUCCESSFUL; + } + + /* Cleanup the screen and reset the cursor */ + HdlspSendStringAtBaud((PUCHAR)"\x1B[2J"); + HdlspSendStringAtBaud((PUCHAR)"\x1B[H"); + + /* Enable FIFO */ + InbvPortEnableFifo(HeadlessGlobals->TerminalPort, TRUE); + } + else if (!Enable) + { + /* Specific case when headless is being disabled */ + InbvPortTerminate(HeadlessGlobals->TerminalPort); + HeadlessGlobals->TerminalPort = 0; + HeadlessGlobals->TerminalEnabled = FALSE; + } + + /* All done */ + return STATUS_SUCCESS; } VOID NTAPI INIT_FUNCTION -HeadlessInit( - IN PLOADER_PARAMETER_BLOCK LoaderBlock - ) -{ - PHEADLESS_LOADER_BLOCK HeadlessBlock; - - HeadlessBlock = LoaderBlock->Extension->HeadlessLoaderBlock; - if (!HeadlessBlock) return; - if ((HeadlessBlock->PortNumber > 4) && (HeadlessBlock->UsedBiosSettings)) return; - - HeadlessGlobals = ExAllocatePoolWithTag( - NonPagedPool, - sizeof(HEADLESS_GLOBALS), - 'sldH'); - if (!HeadlessGlobals) return; - - /* Zero and copy loader data */ - RtlZeroMemory(HeadlessGlobals, sizeof(HEADLESS_GLOBALS)); - HeadlessGlobals->TerminalPortNumber = HeadlessBlock->PortNumber; - HeadlessGlobals->TerminalPortAddress = HeadlessBlock->PortAddress; - HeadlessGlobals->TerminalBaudRate = HeadlessBlock->BaudRate; - HeadlessGlobals->TerminalParity = HeadlessBlock->Parity; - HeadlessGlobals->TerminalStopBits = HeadlessBlock->StopBits; - HeadlessGlobals->UsedBiosSettings = HeadlessBlock->UsedBiosSettings; - HeadlessGlobals->IsMMIODevice = HeadlessBlock->IsMMIODevice; - HeadlessGlobals->TerminalType = HeadlessBlock->TerminalType; - HeadlessGlobals->SystemGUID = HeadlessBlock->SystemGUID; - - /* These two are opposites of each other */ - if (HeadlessGlobals->IsMMIODevice) HeadlessGlobals->IsNonLegacyDevice = TRUE; - - /* Check for a PCI device, warn that this isn't supported */ - if (HeadlessBlock->PciDeviceId != PCI_INVALID_VENDORID) - { - DPRINT1("PCI Serial Ports not supported\n"); - } - - /* Log entries are not yet supported */ - DPRINT1("FIXME: No Headless logging support\n"); - - /* Allocate temporary buffer */ - HeadlessGlobals->TmpBuffer = ExAllocatePoolWithTag(NonPagedPool, 80, 'sldH'); - if (!HeadlessGlobals->TmpBuffer) return; - - /* Windows seems to apply some special hacks for 9600 bps */ - if (HeadlessGlobals->TerminalBaudRate == 9600) - { - DPRINT1("Please use other baud rate than 9600bps for now\n"); - } - - /* Enable the terminal */ - HdlspEnableTerminal(TRUE); +HeadlessInit(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PHEADLESS_LOADER_BLOCK HeadlessBlock; + + /* Only initialize further if the loader found EMS enabled */ + HeadlessBlock = LoaderBlock->Extension->HeadlessLoaderBlock; + if (!HeadlessBlock) return; + + /* Ignore invalid EMS settings */ + if ((HeadlessBlock->PortNumber > 4) && (HeadlessBlock->UsedBiosSettings)) return; + + /* Allocate the global headless data */ + HeadlessGlobals = ExAllocatePoolWithTag(NonPagedPool, + sizeof(*HeadlessGlobals), + 'sldH'); + if (!HeadlessGlobals) return; + + /* Zero and copy loader data */ + RtlZeroMemory(HeadlessGlobals, sizeof(*HeadlessGlobals)); + HeadlessGlobals->TerminalPortNumber = HeadlessBlock->PortNumber; + HeadlessGlobals->TerminalPortAddress = HeadlessBlock->PortAddress; + HeadlessGlobals->TerminalBaudRate = HeadlessBlock->BaudRate; + HeadlessGlobals->TerminalParity = HeadlessBlock->Parity; + HeadlessGlobals->TerminalStopBits = HeadlessBlock->StopBits; + HeadlessGlobals->UsedBiosSettings = HeadlessBlock->UsedBiosSettings; + HeadlessGlobals->IsMMIODevice = HeadlessBlock->IsMMIODevice; + HeadlessGlobals->TerminalType = HeadlessBlock->TerminalType; + HeadlessGlobals->SystemGUID = HeadlessBlock->SystemGUID; + DPRINT1("EMS on Port %d (0x%lx) at %d bps\n", + HeadlessGlobals->TerminalPortNumber, + HeadlessGlobals->TerminalPortAddress, + HeadlessGlobals->TerminalBaudRate); + + /* These two are opposites of each other */ + if (HeadlessGlobals->IsMMIODevice) HeadlessGlobals->IsNonLegacyDevice = TRUE; + + /* Check for a PCI device, warn that this isn't supported */ + if (HeadlessBlock->PciDeviceId != PCI_INVALID_VENDORID) + { + DPRINT1("PCI Serial Ports not supported\n"); + } + + /* Log entries are not yet supported */ + DPRINT1("FIXME: No Headless logging support\n"); + + /* Allocate temporary buffer */ + HeadlessGlobals->TmpBuffer = ExAllocatePoolWithTag(NonPagedPool, 80, 'sldH'); + if (!HeadlessGlobals->TmpBuffer) return; + + /* Windows seems to apply some special hacks for 9600 bps */ + if (HeadlessGlobals->TerminalBaudRate == 9600) + { + DPRINT1("Please use other baud rate than 9600bps for now\n"); + } + + /* Enable the terminal */ + HdlspEnableTerminal(TRUE); } VOID @@ -197,59 +242,80 @@ NTSTATUS NTAPI -HdlspDispatch( - IN HEADLESS_CMD Command, - IN PVOID InputBuffer, - IN SIZE_T InputBufferSize, - OUT PVOID OutputBuffer, - OUT PSIZE_T OutputBufferSize - ) -{ - //NTSTATUS Status = STATUS_NOT_IMPLEMENTED; - ASSERT(HeadlessGlobals != NULL); +HdlspDispatch(IN HEADLESS_CMD Command, + IN PVOID InputBuffer, + IN SIZE_T InputBufferSize, + OUT PVOID OutputBuffer, + OUT PSIZE_T OutputBufferSize) +{ + KIRQL OldIrql; + PHEADLESS_RSP_QUERY_INFO HeadlessInfo; + PHEADLESS_CMD_PUT_STRING PutString; + PHEADLESS_CMD_ENABLE_TERMINAL EnableTerminal; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + ASSERT(HeadlessGlobals != NULL); // ASSERT(HeadlessGlobals->PageLockHandle != NULL); - /* FIXME: This should be using the headless spinlock */ - - /* Ignore non-reentrant commands */ - if ((Command != HeadlessCmdAddLogEntry) && - (Command != HeadlessCmdStartBugCheck) && - (Command != HeadlessCmdSendBlueScreenData) && - (Command != HeadlessCmdDoBugCheckProcessing)) - { - if (HeadlessGlobals->ProcessingCmd) return STATUS_UNSUCCESSFUL; - - /* Don't allow these commands next time */ - HeadlessGlobals->ProcessingCmd = TRUE; - } - - /* Handle each command */ - switch (Command) - { - case HeadlessCmdEnableTerminal: - break; + /* Ignore non-reentrant commands */ + if ((Command != HeadlessCmdAddLogEntry) && + (Command != HeadlessCmdStartBugCheck) && + (Command != HeadlessCmdSendBlueScreenData) && + (Command != HeadlessCmdDoBugCheckProcessing)) + { + OldIrql = HdlspAcquireGlobalLock(); + + if (HeadlessGlobals->ProcessingCmd) + { + HdlspReleaselobalLock(OldIrql); + return STATUS_UNSUCCESSFUL; + } + + /* Don't allow these commands next time */ + HeadlessGlobals->ProcessingCmd = TRUE; + HdlspReleaselobalLock(OldIrql); + } + + /* Handle each command */ + switch (Command) + { + case HeadlessCmdEnableTerminal: + + /* Make sure the caller passed valid data */ + if (!(InputBuffer) || + (InputBufferSize != sizeof(*EnableTerminal))) + { + DPRINT1("Invalid buffer\n"); + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Go and enable it */ + EnableTerminal = InputBuffer; + Status = HdlspEnableTerminal(EnableTerminal->Enable); + break; + case HeadlessCmdCheckForReboot: break; case HeadlessCmdPutString: - /* Validate the existence of an input buffer */ - if (!InputBuffer) - { - //Status = STATUS_INVALID_PARAMETER; - goto Reset; - } + /* Validate the existence of an input buffer */ + if (!InputBuffer) + { + Status = STATUS_INVALID_PARAMETER; + break; + } /* Terminal should be on */ if (HeadlessGlobals->TerminalEnabled) { /* Print each byte in the string making sure VT100 chars are used */ - PHEADLESS_CMD_PUT_STRING PutString = (PVOID)InputBuffer; + PutString = InputBuffer; HdlspPutString(PutString->String); } /* Return success either way */ - //Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; break; case HeadlessCmdClearDisplay: break; @@ -276,13 +342,62 @@ case HeadlessCmdDoBugCheckProcessing: break; case HeadlessCmdQueryInformation: - break; + + /* Make sure the caller passed valid data */ + if (!(OutputBuffer) || + !(OutputBufferSize) || + (*OutputBufferSize < sizeof(*HeadlessInfo))) + { + DPRINT1("Invalid buffer\n"); + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* If we got here, headless is enabled -- we know this much */ + HeadlessInfo = OutputBuffer; + HeadlessInfo->PortType = HeadlessSerialPort; + HeadlessInfo->Serial.TerminalAttached = TRUE; + HeadlessInfo->Serial.UsedBiosSettings = HeadlessGlobals->UsedBiosSettings; + HeadlessInfo->Serial.TerminalBaudRate = HeadlessGlobals->TerminalBaudRate; + HeadlessInfo->Serial.TerminalType = HeadlessGlobals->TerminalType; + + /* Now check on what port/baud it's enabled on */ + if ((HeadlessGlobals->TerminalPortNumber >= 1) || + (HeadlessGlobals->UsedBiosSettings)) + { + /* Get the EMS information */ + HeadlessInfo->Serial.TerminalPort = HeadlessGlobals-> + TerminalPortNumber; + HeadlessInfo->Serial.TerminalPortBaseAddress = HeadlessGlobals-> + TerminalPortAddress; + } + else + { + /* We don't know for sure */ + HeadlessInfo->Serial.TerminalPort = SerialPortUndefined; + HeadlessInfo->Serial.TerminalPortBaseAddress = 0; + } + + /* All done */ + Status = STATUS_SUCCESS; + break; case HeadlessCmdAddLogEntry: break; case HeadlessCmdDisplayLog: break; - case HeadlessCmdSetBlueScreenData: - break; + case HeadlessCmdSetBlueScreenData: + + /* Validate the existence of an input buffer */ + if (!InputBuffer) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Lie so that we can get Hdl bringup a little bit further */ + UNIMPLEMENTED; + Status = STATUS_SUCCESS; + break; case HeadlessCmdSendBlueScreenData: break; case HeadlessCmdQueryGUID: @@ -293,60 +408,60 @@ break; } -Reset: - /* Unset prcessing state */ - if ((Command != HeadlessCmdAddLogEntry) && - (Command != HeadlessCmdStartBugCheck) && - (Command != HeadlessCmdSendBlueScreenData) && - (Command != HeadlessCmdDoBugCheckProcessing)) - { - ASSERT(HeadlessGlobals->ProcessingCmd == TRUE); - HeadlessGlobals->ProcessingCmd = FALSE; - } - - //UNIMPLEMENTED; - return STATUS_SUCCESS; + /* Unset processing state */ + if ((Command != HeadlessCmdAddLogEntry) && + (Command != HeadlessCmdStartBugCheck) && + (Command != HeadlessCmdSendBlueScreenData) && + (Command != HeadlessCmdDoBugCheckProcessing)) + { + ASSERT(HeadlessGlobals->ProcessingCmd == TRUE); + HeadlessGlobals->ProcessingCmd = FALSE; + } + + /* All done */ + return Status; } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI -HeadlessDispatch( - IN HEADLESS_CMD Command, - IN PVOID InputBuffer, - IN SIZE_T InputBufferSize, - OUT PVOID OutputBuffer, - OUT PSIZE_T OutputBufferSize - ) -{ - /* Check for stubs that will expect something even with headless off */ - if (!HeadlessGlobals) - { - /* Don't allow the SAC to connect */ - if (Command == HeadlessCmdEnableTerminal) return STATUS_UNSUCCESSFUL; - - /* Send bogus reply */ - if ((Command == HeadlessCmdQueryInformation) || - (Command == HeadlessCmdGetByte) || - (Command == HeadlessCmdGetLine) || - (Command == HeadlessCmdCheckForReboot) || - (Command == HeadlessCmdTerminalPoll)) - { - if (!(OutputBuffer) || !(OutputBufferSize)) return STATUS_INVALID_PARAMETER; - RtlZeroMemory(OutputBuffer, *OutputBufferSize); - } - return STATUS_SUCCESS; - } - - /* Do the real work */ - return HdlspDispatch( - Command, - InputBuffer, - InputBufferSize, - OutputBuffer, - OutputBufferSize); -} +HeadlessDispatch(IN HEADLESS_CMD Command, + IN PVOID InputBuffer, + IN SIZE_T InputBufferSize, + OUT PVOID OutputBuffer, + OUT PSIZE_T OutputBufferSize) +{ + /* Check for stubs that will expect something even with headless off */ + if (!HeadlessGlobals) + { + /* Don't allow the SAC to connect */ + if (Command == HeadlessCmdEnableTerminal) return STATUS_UNSUCCESSFUL; + + /* Send bogus reply */ + if ((Command == HeadlessCmdQueryInformation) || + (Command == HeadlessCmdGetByte) || + (Command == HeadlessCmdGetLine) || + (Command == HeadlessCmdCheckForReboot) || + (Command == HeadlessCmdTerminalPoll)) + { + if (!(OutputBuffer) || !(OutputBufferSize)) + { + return STATUS_INVALID_PARAMETER; + } + + RtlZeroMemory(OutputBuffer, *OutputBufferSize); + } + return STATUS_SUCCESS; + } + + /* Do the real work */ + return HdlspDispatch(Command, + InputBuffer, + InputBufferSize, + OutputBuffer, + OutputBufferSize); +} /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/hdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] Tue Aug 13 03:18:03 2013 @@ -72,12 +72,11 @@ // // Headless Bugcheck Information // -typedef struct _HEADLESS_BLUE_SCREEN_DATA -{ - PUCHAR Property; - PUCHAR XMLData; - struct _HEADLESS_BLUE_SCREEN_DATA *Next; -} HEADLESS_BLUE_SCREEN_DATA, * PHEADLESS_BLUE_SCREEN_DATA; +typedef struct _HEADLESS_CMD_SET_BLUE_SCREEN_DATA +{ + ULONG ValueIndex; + UCHAR Data[ANYSIZE_ARRAY]; +} HEADLESS_CMD_SET_BLUE_SCREEN_DATA, *PHEADLESS_CMD_SET_BLUE_SCREEN_DATA; // // Headless Control Structure, mostly for !SAC @@ -89,7 +88,7 @@ PHEADLESS_LOG_ENTRY LogEntries; PUCHAR TmpBuffer; PUCHAR InputBuffer; - PHEADLESS_BLUE_SCREEN_DATA BlueScreenData; + PHEADLESS_CMD_SET_BLUE_SCREEN_DATA BlueScreenData; union { struct @@ -183,6 +182,11 @@ }; } HEADLESS_RSP_QUERY_INFO, *PHEADLESS_RSP_QUERY_INFO; +typedef struct _HEADLESS_CMD_ENABLE_TERMINAL +{ + BOOLEAN Enable; +} HEADLESS_CMD_ENABLE_TERMINAL, *PHEADLESS_CMD_ENABLE_TERMINAL; + typedef struct _HEADLESS_CMD_PUT_STRING { UCHAR String[1];

1 0

[ion] 59717: [NTOSKRNL]: RtlGetVersion in the kernel does not fail, does not return a CSD version, and should not be returning negative build numbers. Fix it so that it works as it should (and anyo...
by ion＠svn.reactos.org 13 Aug '13

13 Aug '13

Author: ion Date: Tue Aug 13 03:14:22 2013 New Revision: 59717 URL: http://svn.reactos.org/svn/reactos?rev=59717&view=rev Log: [NTOSKRNL]: RtlGetVersion in the kernel does not fail, does not return a CSD version, and should not be returning negative build numbers. Fix it so that it works as it should (and anyone that relied on correct build numbers will no longer fail). Modified: trunk/reactos/ntoskrnl/rtl/misc.c Modified: trunk/reactos/ntoskrnl/rtl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/misc.c?rev=59… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] Tue Aug 13 03:14:22 2013 @@ -33,51 +33,33 @@ } /* -* @implemented -*/ -NTSTATUS NTAPI + * @implemented + */ +NTSTATUS +NTAPI RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation) { - LONG i; - ULONG MaxLength; + PAGED_CODE(); - if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || - lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) + /* Return the basics */ + lpVersionInformation->dwMajorVersion = NtMajorVersion; + lpVersionInformation->dwMinorVersion = NtMinorVersion; + lpVersionInformation->dwBuildNumber = NtBuildNumber & 0x3FFF; + lpVersionInformation->dwPlatformId = VER_PLATFORM_WIN32_NT; + + /* Check if this is the extended version */ + if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) { - lpVersionInformation->dwMajorVersion = NtMajorVersion; - lpVersionInformation->dwMinorVersion = NtMinorVersion; - lpVersionInformation->dwBuildNumber = NtBuildNumber; - lpVersionInformation->dwPlatformId = VER_PLATFORM_WIN32_NT; - RtlZeroMemory(lpVersionInformation->szCSDVersion, sizeof(lpVersionInformation->szCSDVersion)); - - if(((CmNtCSDVersion >> 8) & 0xFF) != 0) - { - MaxLength = (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0])) - 1; - i = _snwprintf(lpVersionInformation->szCSDVersion, - MaxLength, - L"Service Pack %d", - ((CmNtCSDVersion >> 8) & 0xFF)); - if (i < 0) - { - /* Null-terminate if it was overflowed */ - lpVersionInformation->szCSDVersion[MaxLength] = L'\0'; - } - } - - if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) - { - PRTL_OSVERSIONINFOEXW InfoEx = (PRTL_OSVERSIONINFOEXW)lpVersionInformation; - InfoEx->wServicePackMajor = (USHORT)(CmNtCSDVersion >> 8) & 0xFF; - InfoEx->wServicePackMinor = (USHORT)(CmNtCSDVersion & 0xFF); - InfoEx->wSuiteMask = (USHORT)(SharedUserData->SuiteMask & 0xFFFF); - InfoEx->wProductType = SharedUserData->NtProductType; - InfoEx->wReserved = 0; - } - - return STATUS_SUCCESS; + PRTL_OSVERSIONINFOEXW InfoEx = (PRTL_OSVERSIONINFOEXW)lpVersionInformation; + InfoEx->wServicePackMajor = (USHORT)(CmNtCSDVersion >> 8) & 0xFF; + InfoEx->wServicePackMinor = (USHORT)(CmNtCSDVersion & 0xFF); + InfoEx->wSuiteMask = (USHORT)(SharedUserData->SuiteMask & 0xFFFF); + InfoEx->wProductType = SharedUserData->NtProductType; + InfoEx->wReserved = 0; } - return STATUS_INVALID_PARAMETER; + /* Always succeed */ + return STATUS_SUCCESS; } /* EOF */

1 0

[ion] 59716: [USETUP]: Add an entry in freeldr.ini for EMS testing. [HIVESYS]: Fix double-addition of "nmidebug". One of those should have been "sacdrv". [FREELDR]: Fix bugs in WinLdrSetupEms which...
by ion＠svn.reactos.org 13 Aug '13

13 Aug '13

Author: ion Date: Tue Aug 13 03:11:02 2013 New Revision: 59716 URL: http://svn.reactos.org/svn/reactos?rev=59716&view=rev Log: [USETUP]: Add an entry in freeldr.ini for EMS testing. [HIVESYS]: Fix double-addition of "nmidebug". One of those should have been "sacdrv". [FREELDR]: Fix bugs in WinLdrSetupEms which caused an invalid HEADLESS_LOADER_BLOCK to be created. [FERELDR]: Move WinLdrSetupEms in LoadWindowsCommon, so that setupldr can use EMS too. Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/freeldr/freeldr/windows/headless.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Tue Aug 13 03:11:02 2013 @@ -501,8 +501,14 @@ /* ReactOS_Ram */ CreateFreeLoaderEntry(IniCache, IniSection, L"ReactOS_Ram", L"\"ReactOS (RAM Disk)\"", - L"ReactOS", L"ramdisk(0)\\ReactOS", + L"Windows2003", L"ramdisk(0)\\ReactOS", L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256"); + + /* ReactOS_EMS */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_EMS", L"\"ReactOS (Emergency Management Services)\"", + L"Windows2003", ArcPath, + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /redirect=com2 /redirectbaudrate=115200"); #endif /* Save the ini file */ Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Tue Aug 13 03:11:02 2013 @@ -1345,11 +1345,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\DHCP\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dhcpcsvc.dll" ; EMS Serial Administration Console Driver -HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Group",0x00000000,"EMS" -HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","ImagePath",0x00020000,"system32\drivers\sacdrv.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","Group",0x00000000,"EMS" +HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","ImagePath",0x00020000,"system32\drivers\sacdrv.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","Type",0x00010001,0x00000001 ; Event logging service HKLM,"SYSTEM\CurrentControlSet\Services\EventLog",,0x00000010 Modified: trunk/reactos/boot/freeldr/freeldr/windows/headless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] Tue Aug 13 03:11:02 2013 @@ -246,7 +246,8 @@ /* Start fresh */ RtlZeroMemory(&LoaderRedirectionInformation, sizeof(HEADLESS_LOADER_BLOCK)); - + LoaderRedirectionInformation.PciDeviceId = PCI_INVALID_VENDORID; + /* Use a direction port if one was given, or use ACPI to detect one instead */ RedirectPort = strstr(BootOptions, "/redirect="); @@ -257,6 +258,7 @@ { RedirectPort += sizeof("com") - 1; LoaderRedirectionInformation.PortNumber = atoi(RedirectPort); + LoaderRedirectionInformation.TerminalType = 1; //HeadlessSerialPort } else { Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Tue Aug 13 03:11:02 2013 @@ -673,11 +673,6 @@ /* Allocate and minimalistic-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); -#ifdef _M_IX86 - /* Setup redirection support */ - WinLdrSetupEms(BootOptions); -#endif - /* Load Hive */ UiDrawBackdrop(); UiDrawProgressBarCenter(15, 100, "Loading system hive..."); @@ -711,6 +706,11 @@ LPCSTR SystemRoot; TRACE("LoadAndBootWindowsCommon()\n"); +#ifdef _M_IX86 + /* Setup redirection support */ + WinLdrSetupEms((PCHAR)BootOptions); +#endif + /* Convert BootPath to SystemRoot */ SystemRoot = strstr(BootPath, "\\");

1 0

[akhaldi] 59715: [PSDK] * Annotate shlobj.h.
by akhaldi＠svn.reactos.org 12 Aug '13

12 Aug '13

Author: akhaldi Date: Mon Aug 12 22:19:46 2013 New Revision: 59715 URL: http://svn.reactos.org/svn/reactos?rev=59715&view=rev Log: [PSDK] * Annotate shlobj.h. Modified: trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Mon Aug 12 22:19:46 2013 @@ -81,46 +81,171 @@ DECLARE_HANDLE(HPSXA); #endif -UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM); +UINT +WINAPI +SHAddFromPropSheetExtArray( + _In_ HPSXA, + _In_ LPFNADDPROPSHEETPAGE, + LPARAM); + LPVOID WINAPI SHAlloc(SIZE_T) __WINE_ALLOC_SIZE(1); -HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*); -HPSXA WINAPI SHCreatePropSheetExtArray(HKEY,LPCWSTR,UINT); + +HRESULT +WINAPI +SHCoCreateInstance( + _In_opt_ LPCWSTR, + _In_opt_ const CLSID*, + _In_opt_ IUnknown*, + _In_ REFIID, + _Outptr_ LPVOID*); + +HPSXA WINAPI SHCreatePropSheetExtArray(_In_ HKEY, _In_opt_ LPCWSTR, UINT); HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*); -HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); -DWORD WINAPI SHCLSIDFromStringA(LPCSTR,CLSID*); -DWORD WINAPI SHCLSIDFromStringW(LPCWSTR,CLSID*); + +HRESULT +WINAPI +SHCreateShellItem( + _In_opt_ LPCITEMIDLIST, + _In_opt_ IShellFolder*, + _In_ LPCITEMIDLIST, + _Outptr_ IShellItem**); + +DWORD WINAPI SHCLSIDFromStringA(_In_ LPCSTR, _Out_ CLSID*); +DWORD WINAPI SHCLSIDFromStringW(_In_ LPCWSTR, _Out_ CLSID*); #define SHCLSIDFromString WINELIB_NAME_AW(SHCLSIDFromString) -HRESULT WINAPI SHCreateStdEnumFmtEtc(UINT,const FORMATETC *,IEnumFORMATETC**); -void WINAPI SHDestroyPropSheetExtArray(HPSXA); -BOOL WINAPI SHFindFiles(LPCITEMIDLIST,LPCITEMIDLIST); -DWORD WINAPI SHFormatDrive(HWND,UINT,UINT,UINT); -void WINAPI SHFree(LPVOID); -BOOL WINAPI GetFileNameFromBrowse(HWND,LPWSTR,UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); -HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); -VOID WINAPI SHSetInstanceExplorer (IUnknown*); -HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); -HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); -#define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir); -BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); -BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); -#define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList) -INT WINAPI SHHandleUpdateImage(LPCITEMIDLIST); -HRESULT WINAPI SHILCreateFromPath(LPCWSTR,LPITEMIDLIST*,DWORD*); + +HRESULT +WINAPI +SHCreateStdEnumFmtEtc( + _In_ UINT cfmt, + _In_reads_(cfmt) const FORMATETC *, + _Outptr_ IEnumFORMATETC**); + +void WINAPI SHDestroyPropSheetExtArray(_In_ HPSXA); +BOOL WINAPI SHFindFiles(_In_opt_ LPCITEMIDLIST, _In_opt_ LPCITEMIDLIST); +DWORD WINAPI SHFormatDrive(_In_ HWND, UINT, UINT, UINT); +void WINAPI SHFree(_In_opt_ LPVOID); + +BOOL +WINAPI +GetFileNameFromBrowse( + _In_opt_ HWND, + _Inout_updates_(cchFilePath) LPWSTR, + UINT cchFilePath, + _In_opt_ LPCWSTR, + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_opt_ LPCWSTR); + +_Check_return_ HRESULT WINAPI SHGetInstanceExplorer(_Outptr_ IUnknown**); + +VOID WINAPI SHSetInstanceExplorer(_In_opt_ IUnknown*); + +HRESULT +WINAPI +SHGetFolderPathAndSubDirA( + _Reserved_ HWND, + _In_ int, + _In_opt_ HANDLE, + _In_ DWORD, + _In_opt_ LPCSTR, _Out_writes_(MAX_PATH) LPSTR); + +HRESULT +WINAPI +SHGetFolderPathAndSubDirW( + _Reserved_ HWND, + _In_ int, + _In_opt_ HANDLE, + _In_ DWORD, + _In_opt_ LPCWSTR, + _Out_writes_(MAX_PATH) LPWSTR); + +#define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir); + +_Success_(return != 0) +BOOL +WINAPI +SHGetPathFromIDListA( + _In_ LPCITEMIDLIST, + _Out_writes_(MAX_PATH) LPSTR); + +_Success_(return != 0) +BOOL +WINAPI +SHGetPathFromIDListW( + _In_ LPCITEMIDLIST, + _Out_writes_(MAX_PATH) LPWSTR); + +#define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList) + +INT WINAPI SHHandleUpdateImage(_In_ LPCITEMIDLIST); + +HRESULT +WINAPI +SHILCreateFromPath( + _In_ LPCWSTR, + _Outptr_ LPITEMIDLIST*, + _Inout_opt_ DWORD*); + HRESULT WINAPI SHLoadOLE(LPARAM); -HRESULT WINAPI SHParseDisplayName(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); -HRESULT WINAPI SHPathPrepareForWriteA(HWND,IUnknown*,LPCSTR,DWORD); -HRESULT WINAPI SHPathPrepareForWriteW(HWND,IUnknown*,LPCWSTR,DWORD); -#define SHPathPrepareForWrite WINELIB_NAME_AW(SHPathPrepareForWrite); -UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA,UINT,LPFNADDPROPSHEETPAGE,LPARAM); + +HRESULT +WINAPI +SHParseDisplayName( + _In_ LPCWSTR, + _In_opt_ IBindCtx*, + _Outptr_ LPITEMIDLIST*, + _In_ SFGAOF, + _Out_opt_ SFGAOF*); + +HRESULT +WINAPI +SHPathPrepareForWriteA( + _In_opt_ HWND, + _In_opt_ IUnknown*, + _In_ LPCSTR, DWORD); + +HRESULT +WINAPI +SHPathPrepareForWriteW( + _In_opt_ HWND, + _In_opt_ IUnknown*, + _In_ LPCWSTR, DWORD); + +#define SHPathPrepareForWrite WINELIB_NAME_AW(SHPathPrepareForWrite); + +UINT +WINAPI +SHReplaceFromPropSheetExtArray( + _In_ HPSXA, + UINT, + _In_ LPFNADDPROPSHEETPAGE, + LPARAM); + LPITEMIDLIST WINAPI SHSimpleIDListFromPath(LPCWSTR); -int WINAPI SHMapPIDLToSystemImageListIndex(IShellFolder*,LPCITEMIDLIST,int*); + +int +WINAPI +SHMapPIDLToSystemImageListIndex( + _In_ IShellFolder*, + _In_ LPCITEMIDLIST, + _Out_opt_ int*); + HRESULT WINAPI SHStartNetConnectionDialog(HWND,LPCSTR,DWORD); -VOID WINAPI SHUpdateImageA(LPCSTR,INT,UINT,INT); -VOID WINAPI SHUpdateImageW(LPCWSTR,INT,UINT,INT); -INT WINAPI PickIconDlg(HWND,LPWSTR,UINT,int *); +VOID WINAPI SHUpdateImageA(_In_ LPCSTR, INT, UINT, INT); +VOID WINAPI SHUpdateImageW(_In_ LPCWSTR, INT, UINT, INT); + +INT +WINAPI +PickIconDlg( + _In_opt_ HWND, + _Inout_updates_(cchIconPath) LPWSTR, + UINT cchIconPath, + _Inout_opt_ int *); + #define SHUpdateImage WINELIB_NAME_AW(SHUpdateImage) -int WINAPI RestartDialog(HWND,LPCWSTR,DWORD); -int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD); +int WINAPI RestartDialog(_In_opt_ HWND, _In_opt_ LPCWSTR, DWORD); +int WINAPI RestartDialogEx(_In_opt_ HWND, _In_opt_ LPCWSTR, DWORD, DWORD); BOOL WINAPI IsUserAnAdmin(void); #define SHFMT_ERROR 0xFFFFFFFFL /* Error on last format, drive may be formattable */ @@ -146,7 +271,13 @@ #define SHOP_FILEPATH 0x02 #define SHOP_VOLUMEGUID 0x04 -BOOL WINAPI SHObjectProperties(HWND,DWORD,LPCWSTR,LPCWSTR); +BOOL +WINAPI +SHObjectProperties( + _In_opt_ HWND, + _In_ DWORD, + _In_ LPCWSTR, + _In_opt_ LPCWSTR); #define PCS_FATAL 0x80000000 #define PCS_REPLACEDCHAR 0x00000001 @@ -154,7 +285,7 @@ #define PCS_TRUNCATED 0x00000004 #define PCS_PATHTOOLONG 0x00000008 -int WINAPI PathCleanupSpec(LPCWSTR,LPWSTR); +int WINAPI PathCleanupSpec(_In_opt_ LPCWSTR, _Inout_ LPWSTR); /***************************************************************************** * IContextMenu interface @@ -394,7 +525,7 @@ STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE; /*** IShellDetails methods ***/ - STDMETHOD(GetDetailsOf)(THIS_ PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *pDetails) PURE; + STDMETHOD(GetDetailsOf)(THIS_ _In_opt_ PCUITEMID_CHILD pidl, UINT iColumn, _Out_ SHELLDETAILS *pDetails) PURE; STDMETHOD(ColumnClick)(THIS_ UINT iColumn) PURE; }; #undef INTERFACE @@ -418,8 +549,8 @@ STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IQueryInfo methods ***/ - STDMETHOD(GetInfoTip)(THIS_ DWORD dwFlags, WCHAR** lppTips) PURE; - STDMETHOD(GetInfoFlags)(THIS_ DWORD* lpFlags) PURE; + STDMETHOD(GetInfoTip)(THIS_ DWORD dwFlags, _Outptr_ WCHAR** lppTips) PURE; + STDMETHOD(GetInfoFlags)(THIS_ _Out_ DWORD* lpFlags) PURE; }; #undef INTERFACE @@ -490,8 +621,8 @@ STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE; /*** IObjMgr methods ***/ - STDMETHOD(Append)(THIS_ LPUNKNOWN punk) PURE; - STDMETHOD(Remove)(THIS_ LPUNKNOWN punk) PURE; + STDMETHOD(Append)(THIS_ _In_ LPUNKNOWN punk) PURE; + STDMETHOD(Remove)(THIS_ _In_ LPUNKNOWN punk) PURE; }; #undef INTERFACE @@ -514,7 +645,7 @@ STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE; /*** IACList methods ***/ - STDMETHOD(Expand)(THIS_ LPCOLESTR str) PURE; + STDMETHOD(Expand)(THIS_ _In_ LPCOLESTR str) PURE; }; #undef INTERFACE @@ -539,7 +670,7 @@ STDMETHOD(Expand)(THIS_ LPCOLESTR str) PURE; /*** IACList2 methods ***/ STDMETHOD(SetOptions)(THIS_ DWORD dwFlag) PURE; - STDMETHOD(GetOptions)(THIS_ DWORD* pdwFlag) PURE; + STDMETHOD(GetOptions)(THIS_ _Out_ DWORD* pdwFlag) PURE; }; #undef INTERFACE @@ -605,33 +736,33 @@ /*** IShellFolderView methods ***/ STDMETHOD(Rearrange) (THIS_ LPARAM lParamSort) PURE; - STDMETHOD(GetArrangeParam) (THIS_ LPARAM *plParamSort) PURE; + STDMETHOD(GetArrangeParam) (THIS_ _Out_ LPARAM *plParamSort) PURE; STDMETHOD(ArrangeGrid) (THIS) PURE; STDMETHOD(AutoArrange) (THIS) PURE; STDMETHOD(GetAutoArrange) (THIS) PURE; - STDMETHOD(AddObject) (THIS_ PITEMID_CHILD pidl, UINT *puItem) PURE; - STDMETHOD(GetObject) (THIS_ PITEMID_CHILD *ppidl, UINT uItem) PURE; - STDMETHOD(RemoveObject) (THIS_ PITEMID_CHILD pidl, UINT *puItem) PURE; - STDMETHOD(GetObjectCount) (THIS_ UINT *puCount) PURE; + STDMETHOD(AddObject) (THIS_ _In_ PITEMID_CHILD pidl, _Out_ UINT *puItem) PURE; + STDMETHOD(GetObject) (THIS_ _Outptr_ PITEMID_CHILD *ppidl, UINT uItem) PURE; + STDMETHOD(RemoveObject) (THIS_ _In_opt_ PITEMID_CHILD pidl, _Out_ UINT *puItem) PURE; + STDMETHOD(GetObjectCount) (THIS_ _Out_ UINT *puCount) PURE; STDMETHOD(SetObjectCount) (THIS_ UINT uCount, UINT dwFlags) PURE; - STDMETHOD(UpdateObject) (THIS_ PITEMID_CHILD pidlOld, PITEMID_CHILD pidlNew, UINT *puItem) PURE; - STDMETHOD(RefreshObject) (THIS_ PITEMID_CHILD pidl, UINT *puItem) PURE; + STDMETHOD(UpdateObject) (THIS_ _In_ PITEMID_CHILD pidlOld, _In_ PITEMID_CHILD pidlNew, _Out_ UINT *puItem) PURE; + STDMETHOD(RefreshObject) (THIS_ _In_ PITEMID_CHILD pidl, _Out_ UINT *puItem) PURE; STDMETHOD(SetRedraw) (THIS_ BOOL bRedraw) PURE; - STDMETHOD(GetSelectedCount) (THIS_ UINT *puSelected) PURE; - STDMETHOD(GetSelectedObjects) (THIS_ PCITEMID_CHILD **pppidl, UINT *puItems) PURE; - STDMETHOD(IsDropOnSource) (THIS_ IDropTarget *pDropTarget) PURE; - STDMETHOD(GetDragPoint) (THIS_ POINT *ppt) PURE; - STDMETHOD(GetDropPoint) (THIS_ POINT *ppt) PURE; - STDMETHOD(MoveIcons) (THIS_ IDataObject *pDataObject) PURE; - STDMETHOD(SetItemPos) (THIS_ PCUITEMID_CHILD pidl, POINT *ppt) PURE; - STDMETHOD(IsBkDropTarget) (THIS_ IDropTarget *pDropTarget) PURE; + STDMETHOD(GetSelectedCount) (THIS_ _Out_ UINT *puSelected) PURE; + STDMETHOD(GetSelectedObjects) (THIS_ _Outptr_result_buffer_(*puItems) PCITEMID_CHILD **pppidl, _Out_ UINT *puItems) PURE; + STDMETHOD(IsDropOnSource) (THIS_ _In_opt_ IDropTarget *pDropTarget) PURE; + STDMETHOD(GetDragPoint) (THIS_ _Out_ POINT *ppt) PURE; + STDMETHOD(GetDropPoint) (THIS_ _Out_ POINT *ppt) PURE; + STDMETHOD(MoveIcons) (THIS_ _In_ IDataObject *pDataObject) PURE; + STDMETHOD(SetItemPos) (THIS_ _In_ PCUITEMID_CHILD pidl, _In_ POINT *ppt) PURE; + STDMETHOD(IsBkDropTarget) (THIS_ _In_opt_ IDropTarget *pDropTarget) PURE; STDMETHOD(SetClipboard) (THIS_ BOOL bMove) PURE; - STDMETHOD(SetPoints) (THIS_ IDataObject *pDataObject) PURE; - STDMETHOD(GetItemSpacing) (THIS_ ITEMSPACING *pSpacing) PURE; - STDMETHOD(SetCallback) (THIS_ IShellFolderViewCB* pNewCB, IShellFolderViewCB** ppOldCB) PURE; + STDMETHOD(SetPoints) (THIS_ _In_ IDataObject *pDataObject) PURE; + STDMETHOD(GetItemSpacing) (THIS_ _Out_ ITEMSPACING *pSpacing) PURE; + STDMETHOD(SetCallback) (THIS_ _In_opt_ IShellFolderViewCB* pNewCB, _Outptr_result_maybenull_ IShellFolderViewCB** ppOldCB) PURE; STDMETHOD(Select) ( THIS_ UINT dwFlags ) PURE; - STDMETHOD(QuerySupport) (THIS_ UINT * pdwSupport ) PURE; - STDMETHOD(SetAutomationObject)(THIS_ IDispatch* pdisp) PURE; + STDMETHOD(QuerySupport) (THIS_ _Inout_ UINT * pdwSupport) PURE; + STDMETHOD(SetAutomationObject)(THIS_ _In_opt_ IDispatch* pdisp) PURE; }; #undef INTERFACE @@ -693,16 +824,16 @@ STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE; /*** IProgressDialog methods ***/ - STDMETHOD(StartProgressDialog)(THIS_ HWND hwndParent, IUnknown *punkEnableModeless, DWORD dwFlags, LPCVOID reserved) PURE; + STDMETHOD(StartProgressDialog)(THIS_ _In_opt_ HWND hwndParent, _In_opt_ IUnknown *punkEnableModeless, DWORD dwFlags, _Reserved_ LPCVOID reserved) PURE; STDMETHOD(StopProgressDialog)(THIS) PURE; - STDMETHOD(SetTitle)(THIS_ LPCWSTR pwzTitle) PURE; - STDMETHOD(SetAnimation)(THIS_ HINSTANCE hInstance, UINT uiResourceId) PURE; + STDMETHOD(SetTitle)(THIS_ _In_ LPCWSTR pwzTitle) PURE; + STDMETHOD(SetAnimation)(THIS_ _In_opt_ HINSTANCE hInstance, UINT uiResourceId) PURE; STDMETHOD_(BOOL,HasUserCancelled)(THIS) PURE; STDMETHOD(SetProgress)(THIS_ DWORD dwCompleted, DWORD dwTotal) PURE; STDMETHOD(SetProgress64)(THIS_ ULONGLONG ullCompleted, ULONGLONG ullTotal) PURE; - STDMETHOD(SetLine)(THIS_ DWORD dwLineNum, LPCWSTR pwzString, BOOL bPath, LPCVOID reserved) PURE; - STDMETHOD(SetCancelMsg)(THIS_ LPCWSTR pwzCancelMsg, LPCVOID reserved) PURE; - STDMETHOD(Timer)(THIS_ DWORD dwTimerAction, LPCVOID reserved) PURE; + STDMETHOD(SetLine)(THIS_ DWORD dwLineNum, _In_ LPCWSTR pwzString, BOOL bPath, _Reserved_ LPCVOID reserved) PURE; + STDMETHOD(SetCancelMsg)(THIS_ _In_ LPCWSTR pwzCancelMsg, _Reserved_ LPCVOID reserved) PURE; + STDMETHOD(Timer)(THIS_ DWORD dwTimerAction, _Reserved_ LPCVOID reserved) PURE; }; #undef INTERFACE @@ -737,10 +868,10 @@ STDMETHOD_(HRESULT,GetWindow)(THIS_ HWND*) PURE; STDMETHOD_(HRESULT,ContextSensitiveHelp)(THIS_ BOOL) PURE; /*** IDeskBarClient methods ***/ - STDMETHOD_(HRESULT,SetDeskBarSite)(THIS_ IUnknown*) PURE; + STDMETHOD_(HRESULT,SetDeskBarSite)(THIS_ _In_opt_ IUnknown*) PURE; STDMETHOD_(HRESULT,SetModeDBC)(THIS_ DWORD) PURE; STDMETHOD_(HRESULT,UIActivateDBC)(THIS_ DWORD) PURE; - STDMETHOD_(HRESULT,GetSize)(THIS_ DWORD,LPRECT) PURE; + STDMETHOD_(HRESULT,GetSize)(THIS_ DWORD, _Out_ LPRECT) PURE; }; #undef INTERFACE @@ -775,7 +906,7 @@ #define SHARD_PATHW 0x00000003L #define SHARD_PATH WINELIB_NAME_AW(SHARD_PATH) -void WINAPI SHAddToRecentDocs(UINT,LPCVOID); +void WINAPI SHAddToRecentDocs(UINT, _In_opt_ LPCVOID); /**************************************************************************** * SHBrowseForFolder API @@ -846,9 +977,10 @@ #define BFFM_SETOKTEXT (WM_USER+105) #define BFFM_SETEXPANDED (WM_USER+106) -LPITEMIDLIST WINAPI SHBrowseForFolderA(LPBROWSEINFOA lpbi); -LPITEMIDLIST WINAPI SHBrowseForFolderW(LPBROWSEINFOW lpbi); -#define SHBrowseForFolder WINELIB_NAME_AW(SHBrowseForFolder) +LPITEMIDLIST WINAPI SHBrowseForFolderA(_In_ LPBROWSEINFOA lpbi); +LPITEMIDLIST WINAPI SHBrowseForFolderW(_In_ LPBROWSEINFOW lpbi); +#define SHBrowseForFolder WINELIB_NAME_AW(SHBrowseForFolder) + #define BFFM_SETSTATUSTEXT WINELIB_NAME_AW(BFFM_SETSTATUSTEXT) #define BFFM_SETSELECTION WINELIB_NAME_AW(BFFM_SETSELECTION) #define BFFM_VALIDATEFAILED WINELIB_NAME_AW(BFFM_VALIDATEFAILED) @@ -857,13 +989,14 @@ * SHCreateShellFolderViewEx API */ -typedef HRESULT (CALLBACK *LPFNVIEWCALLBACK)( - IShellView* dwUser, - IShellFolder* pshf, - HWND hWnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam); +typedef HRESULT +(CALLBACK *LPFNVIEWCALLBACK)( + _In_ IShellView* dwUser, + _In_ IShellFolder* pshf, + _In_ HWND hWnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam); #include <pshpack8.h> @@ -880,7 +1013,11 @@ #include <poppack.h> -HRESULT WINAPI SHCreateShellFolderViewEx(LPCSFV pshfvi, IShellView **ppshv); +HRESULT +WINAPI +SHCreateShellFolderViewEx( + _In_ LPCSFV pshfvi, + _Outptr_ IShellView **ppshv); /* SHCreateShellFolderViewEx callback messages */ #define SFVM_MERGEMENU 1 @@ -952,7 +1089,11 @@ #include <poppack.h> -HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pscfv, IShellView **ppsv); +HRESULT +WINAPI +SHCreateShellFolderView( + _In_ const SFV_CREATE *pscfv, + _Outptr_ IShellView **ppsv); /* Types and definitions for the SFM_* parameters */ #include <pshpack8.h> @@ -1000,10 +1141,12 @@ * SHShellFolderView_Message API */ -LRESULT WINAPI SHShellFolderView_Message( - HWND hwndCabinet, - UINT uMessage, - LPARAM lParam); +LRESULT +WINAPI +SHShellFolderView_Message( + _In_ HWND hwndCabinet, + UINT uMessage, + LPARAM lParam); /* SHShellFolderView_Message messages */ #define SFVM_REARRANGE 0x0001 @@ -1067,16 +1210,54 @@ #include <poppack.h> -HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID pv, int cb); -HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID pv, int cb); -#define SHGetDataFromIDList WINELIB_NAME_AW(SHGetDataFromIDList) - -LPITEMIDLIST WINAPI SHCloneSpecialIDList(HWND hwnd, int csidl, BOOL fCreate); -BOOL WINAPI SHGetSpecialFolderPathA (HWND hwndOwner, LPSTR szPath, int nFolder, BOOL bCreate); -BOOL WINAPI SHGetSpecialFolderPathW (HWND hwndOwner, LPWSTR szPath, int nFolder, BOOL bCreate); -#define SHGetSpecialFolderPath WINELIB_NAME_AW(SHGetSpecialFolderPath) - -HRESULT WINAPI SHGetMalloc(LPMALLOC *lpmal) ; +HRESULT +WINAPI +SHGetDataFromIDListA( + _In_ LPSHELLFOLDER psf, + _In_ LPCITEMIDLIST pidl, + int nFormat, + _Out_writes_bytes_(cb) LPVOID pv, + int cb); + +HRESULT +WINAPI +SHGetDataFromIDListW( + _In_ LPSHELLFOLDER psf, + _In_ LPCITEMIDLIST pidl, + int nFormat, + _Out_writes_bytes_(cb) LPVOID pv, + int cb); + +#define SHGetDataFromIDList WINELIB_NAME_AW(SHGetDataFromIDList) + +LPITEMIDLIST +WINAPI +SHCloneSpecialIDList( + _Reserved_ HWND hwnd, + _In_ int csidl, + _In_ BOOL fCreate); + +_Success_(return != 0) +BOOL +WINAPI +SHGetSpecialFolderPathA( + _Reserved_ HWND hwndOwner, + _Out_writes_(MAX_PATH) LPSTR szPath, + _In_ int nFolder, + _In_ BOOL bCreate); + +_Success_(return != 0) +BOOL +WINAPI +SHGetSpecialFolderPathW( + _Reserved_ HWND hwndOwner, + _Out_writes_(MAX_PATH) LPWSTR szPath, + _In_ int nFolder, + _In_ BOOL bCreate); + +#define SHGetSpecialFolderPath WINELIB_NAME_AW(SHGetSpecialFolderPath) + +_Check_return_ HRESULT WINAPI SHGetMalloc(_Outptr_ LPMALLOC *lpmal); /********************************************************************** * SHGetSetSettings () @@ -1141,7 +1322,7 @@ UINT :15; /* Required for proper binary layout with gcc */ } SHELLFLAGSTATE, * LPSHELLFLAGSTATE; -VOID WINAPI SHGetSettings(LPSHELLFLAGSTATE lpsfs, DWORD dwMask); +VOID WINAPI SHGetSettings(_Out_ LPSHELLFLAGSTATE lpsfs, DWORD dwMask); #define SSF_SHOWALLOBJECTS 0x0001 #define SSF_SHOWEXTENSIONS 0x0002 @@ -1520,28 +1701,75 @@ USHORT cbZero; } SHChangeProductKeyAsIDList, *LPSHChangeProductKeyAsIDList; -ULONG WINAPI SHChangeNotifyRegister(HWND hwnd, int fSources, LONG fEvents, UINT wMsg, - int cEntries, SHChangeNotifyEntry *pshcne); +ULONG +WINAPI +SHChangeNotifyRegister( + _In_ HWND hwnd, + int fSources, + LONG fEvents, + UINT wMsg, + int cEntries, + _In_ SHChangeNotifyEntry *pshcne); + BOOL WINAPI SHChangeNotifyDeregister(ULONG ulID); -HANDLE WINAPI SHChangeNotification_Lock(HANDLE hChangeNotification, DWORD dwProcessId, - LPITEMIDLIST **pppidl, LONG *plEvent); -BOOL WINAPI SHChangeNotification_Unlock(HANDLE hLock); - -HRESULT WINAPI SHGetRealIDL(IShellFolder *psf, LPCITEMIDLIST pidlSimple, LPITEMIDLIST * ppidlReal); + +HANDLE +WINAPI +SHChangeNotification_Lock( + _In_ HANDLE hChangeNotification, + DWORD dwProcessId, + _Outptr_opt_result_buffer_(2)_Outptr_opt_result_buffer_(2) LPITEMIDLIST **pppidl, + _Out_opt_ LONG *plEvent); + +BOOL WINAPI SHChangeNotification_Unlock(_In_ HANDLE hLock); + +HRESULT +WINAPI +SHGetRealIDL( + _In_ IShellFolder *psf, + _In_ LPCITEMIDLIST pidlSimple, + _Outptr_ LPITEMIDLIST * ppidlReal); /**************************************************************************** * SHCreateDirectory API */ -int WINAPI SHCreateDirectory(HWND, LPCWSTR); -int WINAPI SHCreateDirectoryExA(HWND, LPCSTR, LPSECURITY_ATTRIBUTES); -int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); -#define SHCreateDirectoryEx WINELIB_NAME_AW(SHCreateDirectoryEx) +int WINAPI SHCreateDirectory(_In_opt_ HWND, _In_ LPCWSTR); + +int +WINAPI +SHCreateDirectoryExA( + _In_opt_ HWND, + _In_ LPCSTR, + _In_opt_ LPSECURITY_ATTRIBUTES); + +int +WINAPI +SHCreateDirectoryExW( + _In_opt_ HWND, + _In_ LPCWSTR, + _In_opt_ LPSECURITY_ATTRIBUTES); + +#define SHCreateDirectoryEx WINELIB_NAME_AW(SHCreateDirectoryEx) /**************************************************************************** * SHGetSpecialFolderLocation API */ -HRESULT WINAPI SHGetSpecialFolderLocation(HWND hwndOwner, int nFolder, LPITEMIDLIST * ppidl); -HRESULT WINAPI SHGetFolderLocation(HWND hwndOwner, int nFolder, HANDLE hToken, DWORD dwReserved, LPITEMIDLIST *ppidl); +_Check_return_ +HRESULT +WINAPI +SHGetSpecialFolderLocation( + _Reserved_ HWND hwndOwner, + _In_ int nFolder, + _Outptr_ LPITEMIDLIST *ppidl); + +HRESULT +WINAPI +SHGetFolderLocation( + _Reserved_ HWND hwndOwner, + _In_ int nFolder, + _In_opt_ HANDLE hToken, + _In_ DWORD dwReserved, + _Outptr_ LPITEMIDLIST *ppidl); /**************************************************************************** * SHGetFolderPath API @@ -1551,9 +1779,25 @@ SHGFP_TYPE_DEFAULT = 1 } SHGFP_TYPE; -HRESULT WINAPI SHGetFolderPathA(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwFlags, LPSTR pszPath); -HRESULT WINAPI SHGetFolderPathW(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwFlags, LPWSTR pszPath); -#define SHGetFolderPath WINELIB_NAME_AW(SHGetFolderPath) +HRESULT +WINAPI +SHGetFolderPathA( + _Reserved_ HWND hwnd, + _In_ int nFolder, + _In_opt_ HANDLE hToken, + _In_ DWORD dwFlags, + _Out_writes_(MAX_PATH) LPSTR pszPath); + +HRESULT +WINAPI +SHGetFolderPathW( + _Reserved_ HWND hwnd, + _In_ int nFolder, + _In_opt_ HANDLE hToken, + _In_ DWORD dwFlags, + _Out_writes_(MAX_PATH) LPWSTR pszPath); + +#define SHGetFolderPath WINELIB_NAME_AW(SHGetFolderPath) #define CSIDL_DESKTOP 0x0000 #define CSIDL_INTERNET 0x0001 @@ -1624,21 +1868,43 @@ /**************************************************************************** * SHGetDesktopFolder API */ -HRESULT WINAPI SHGetDesktopFolder(IShellFolder * *); +_Check_return_ HRESULT WINAPI SHGetDesktopFolder(_Outptr_ IShellFolder * *); /**************************************************************************** * SHBindToParent API */ -HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast); +HRESULT +WINAPI +SHBindToParent( + _In_ LPCITEMIDLIST pidl, + _In_ REFIID riid, + _Outptr_ LPVOID *ppv, + _Outptr_opt_ LPCITEMIDLIST *ppidlLast); /**************************************************************************** * SHDefExtractIcon API */ -HRESULT WINAPI SHDefExtractIconA(LPCSTR pszIconFile, int iIndex, UINT uFlags, - HICON* phiconLarge, HICON* phiconSmall, UINT nIconSize); -HRESULT WINAPI SHDefExtractIconW(LPCWSTR pszIconFile, int iIndex, UINT uFlags, - HICON* phiconLarge, HICON* phiconSmall, UINT nIconSize); -#define SHDefExtractIcon WINELIB_NAME_AW(SHDefExtractIcon) +HRESULT +WINAPI +SHDefExtractIconA( + _In_ LPCSTR pszIconFile, + int iIndex, + UINT uFlags, + _Out_opt_ HICON* phiconLarge, + _Out_opt_ HICON* phiconSmall, + UINT nIconSize); + +HRESULT +WINAPI +SHDefExtractIconW( + _In_ LPCWSTR pszIconFile, + int iIndex, + UINT uFlags, + _Out_opt_ HICON* phiconLarge, + _Out_opt_ HICON* phiconSmall, + UINT nIconSize); + +#define SHDefExtractIcon WINELIB_NAME_AW(SHDefExtractIcon) /* * DROPFILES for CF_HDROP and CF_PRINTERS @@ -1724,8 +1990,13 @@ #define CABINETSTATE_VERSION 2 -BOOL WINAPI ReadCabinetState(CABINETSTATE *, int); -BOOL WINAPI WriteCabinetState(CABINETSTATE *); +BOOL +WINAPI +ReadCabinetState( + _Out_writes_bytes_(cLength) CABINETSTATE *, + int cLength); + +BOOL WINAPI WriteCabinetState(_In_ CABINETSTATE *); /**************************************************************************** * Path Manipulation Routines @@ -1747,9 +2018,24 @@ #define PRF_FIRSTDIRDEF 0x04 #define PRF_DONTFINDLINK 0x08 -VOID WINAPI PathGetShortPath(LPWSTR pszPath); -LONG WINAPI PathProcessCommand(LPCWSTR, LPWSTR, int, DWORD); -BOOL WINAPI PathYetAnotherMakeUniqueName(LPWSTR, LPCWSTR, LPCWSTR, LPCWSTR); +VOID WINAPI PathGetShortPath(_Inout_updates_(MAX_PATH) LPWSTR pszPath); + +LONG +WINAPI +PathProcessCommand( + _In_ LPCWSTR, + _Out_writes_(cchDest) LPWSTR, + int cchDest, + DWORD); + +_Success_(return != 0) +BOOL +WINAPI +PathYetAnotherMakeUniqueName( + _Out_writes_(MAX_PATH) LPWSTR, + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_opt_ LPCWSTR); /**************************************************************************** * Drag And Drop Routines @@ -1768,11 +2054,19 @@ BOOL WINAPI DAD_SetDragImage(HIMAGELIST,LPPOINT); BOOL WINAPI DAD_DragEnterEx(HWND,POINT); -BOOL WINAPI DAD_DragEnterEx2(HWND,POINT,IDataObject*); +BOOL WINAPI DAD_DragEnterEx2(_In_ HWND, POINT, _In_opt_ IDataObject*); BOOL WINAPI DAD_DragMove(POINT); BOOL WINAPI DAD_DragLeave(void); BOOL WINAPI DAD_AutoScroll(HWND,AUTO_SCROLL_DATA*,const POINT*); -HRESULT WINAPI SHDoDragDrop(HWND,IDataObject*,IDropSource*,DWORD,LPDWORD); + +HRESULT +WINAPI +SHDoDragDrop( + _In_opt_ HWND, + _In_ IDataObject*, + _In_opt_ IDropSource*, + _In_ DWORD, + _Out_ LPDWORD); /**************************************************************************** * Internet shortcut properties @@ -1791,23 +2085,23 @@ #define PID_IS_COMMENT 13 -LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST,LPCSHITEMID,BOOL); -LPITEMIDLIST WINAPI ILClone(LPCITEMIDLIST); -LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST); -LPITEMIDLIST WINAPI ILCreateFromPathA(LPCSTR); -LPITEMIDLIST WINAPI ILCreateFromPathW(LPCWSTR); +LPITEMIDLIST WINAPI ILAppendID(_In_opt_ LPITEMIDLIST, _In_ LPCSHITEMID, BOOL); +LPITEMIDLIST WINAPI ILClone(_In_ LPCITEMIDLIST); +LPITEMIDLIST WINAPI ILCloneFirst(_In_ LPCITEMIDLIST); +LPITEMIDLIST WINAPI ILCreateFromPathA(_In_ LPCSTR); +LPITEMIDLIST WINAPI ILCreateFromPathW(_In_ LPCWSTR); #define ILCreateFromPath WINELIB_NAME_AW(ILCreateFromPath) -LPITEMIDLIST WINAPI ILCombine(LPCITEMIDLIST,LPCITEMIDLIST); -LPITEMIDLIST WINAPI ILFindChild(LPCITEMIDLIST,LPCITEMIDLIST); -LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST); -void WINAPI ILFree(LPITEMIDLIST); -LPITEMIDLIST WINAPI ILGetNext(LPCITEMIDLIST); -UINT WINAPI ILGetSize(LPCITEMIDLIST); -BOOL WINAPI ILIsEqual(LPCITEMIDLIST,LPCITEMIDLIST); -BOOL WINAPI ILIsParent(LPCITEMIDLIST,LPCITEMIDLIST,BOOL); -HRESULT WINAPI ILLoadFromStream(LPSTREAM,LPITEMIDLIST*); -BOOL WINAPI ILRemoveLastID(LPITEMIDLIST); -HRESULT WINAPI ILSaveToStream(LPSTREAM,LPCITEMIDLIST); +LPITEMIDLIST WINAPI ILCombine(_In_opt_ LPCITEMIDLIST, _In_opt_ LPCITEMIDLIST); +LPITEMIDLIST WINAPI ILFindChild(_In_ LPCITEMIDLIST, _In_ LPCITEMIDLIST); +LPITEMIDLIST WINAPI ILFindLastID(_In_ LPCITEMIDLIST); +void WINAPI ILFree(_In_opt_ LPITEMIDLIST); +LPITEMIDLIST WINAPI ILGetNext(_In_opt_ LPCITEMIDLIST); +UINT WINAPI ILGetSize(_In_opt_ LPCITEMIDLIST); +BOOL WINAPI ILIsEqual(_In_ LPCITEMIDLIST, _In_ LPCITEMIDLIST); +BOOL WINAPI ILIsParent(_In_ LPCITEMIDLIST, _In_ LPCITEMIDLIST, BOOL); +HRESULT WINAPI ILLoadFromStream(_In_ LPSTREAM, _Inout_ LPITEMIDLIST*); +BOOL WINAPI ILRemoveLastID(_Inout_opt_ LPITEMIDLIST); +HRESULT WINAPI ILSaveToStream(_In_ LPSTREAM, _In_ LPCITEMIDLIST); #include <poppack.h> @@ -1818,7 +2112,15 @@ #define MM_SUBMENUSHAVEIDS 0x00000002L #define MM_DONTREMOVESEPS 0x00000004L -UINT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags); +UINT +WINAPI +Shell_MergeMenus( + _In_ HMENU hmDst, + _In_ HMENU hmSrc, + UINT uInsert, + UINT uIDAdjust, + UINT uIDAdjustMax, + ULONG uFlags); /**************************************************************************** @@ -1838,12 +2140,37 @@ const HKEY *aKeys; }DEFCONTEXTMENU; -HRESULT WINAPI SHCreateDefaultContextMenu(const DEFCONTEXTMENU *,REFIID,void **ppv); - -typedef HRESULT (CALLBACK * LPFNDFMCALLBACK)(IShellFolder*,HWND,IDataObject*,UINT,WPARAM,LPARAM); -HRESULT WINAPI CDefFolderMenu_Create2(LPCITEMIDLIST,HWND,UINT,LPCITEMIDLIST*,IShellFolder*,LPFNDFMCALLBACK,UINT,const HKEY *,IContextMenu **); +HRESULT +WINAPI +SHCreateDefaultContextMenu( + _In_ const DEFCONTEXTMENU *, + _In_ REFIID, + _Outptr_ void **ppv); + +typedef HRESULT +(CALLBACK * LPFNDFMCALLBACK)( + _In_opt_ IShellFolder*, + _In_opt_ HWND, + _In_opt_ IDataObject*, + UINT, + WPARAM, + LPARAM); + +HRESULT +WINAPI +CDefFolderMenu_Create2( + _In_opt_ LPCITEMIDLIST, + _In_opt_ HWND, + UINT cidl, + _In_reads_opt_(cidl) LPCITEMIDLIST*, + _In_opt_ IShellFolder*, + _In_opt_ LPFNDFMCALLBACK, + UINT nKeys, + _In_reads_opt_(nKeys) const HKEY *, + _Outptr_ IContextMenu **); + /**************************************************************************** - * SHCreateDefaultContextMenu API + * SHCreateDefaultExtractIcon API */ HRESULT WINAPI @@ -1855,22 +2182,22 @@ */ HRESULT WINAPI SHCreateDataObject( - LPCITEMIDLIST pidlFolder, - UINT cidl, - LPCITEMIDLIST* apidl, - IDataObject *pdtInner, - REFIID riid, - void **ppv); + _In_opt_ LPCITEMIDLIST pidlFolder, + _In_ UINT cidl, + _In_reads_opt_(cidl) LPCITEMIDLIST* apidl, + _In_opt_ IDataObject *pdtInner, + _In_ REFIID riid, + _Outptr_ void **ppv); /**************************************************************************** * CIDLData_CreateFromIDArray API */ HRESULT WINAPI CIDLData_CreateFromIDArray( - LPCITEMIDLIST pidlFolder, - UINT cidl, - LPCITEMIDLIST* apidl, - IDataObject **ppdtobj); + _In_ LPCITEMIDLIST pidlFolder, + _In_ UINT cidl, + _In_reads_opt_(cidl) LPCITEMIDLIST* apidl, + _Outptr_ IDataObject **ppdtobj); /**************************************************************************** * SHOpenWithDialog @@ -1896,10 +2223,11 @@ OPEN_AS_INFO_FLAGS oaifInFlags; } OPENASINFO; -HRESULT WINAPI SHOpenWithDialog( - HWND hwndParent, - const OPENASINFO *poainfo -); +HRESULT +WINAPI +SHOpenWithDialog( + _In_opt_ HWND hwndParent, + _In_ const OPENASINFO *poainfo); #define INTERFACE IShellIconOverlayIdentifier @@ -1909,9 +2237,9 @@ STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE; - STDMETHOD (IsMemberOf)(THIS_ LPCWSTR pwszPath, DWORD dwAttrib) PURE; - STDMETHOD (GetOverlayInfo)(THIS_ LPWSTR pwszIconFile, int cchMax, int * pIndex, DWORD * pdwFlags) PURE; - STDMETHOD (GetPriority)(THIS_ int * pIPriority) PURE; + STDMETHOD (IsMemberOf)(THIS_ _In_ LPCWSTR pwszPath, DWORD dwAttrib) PURE; + STDMETHOD (GetOverlayInfo)(THIS_ _Out_writes_(cchMax) LPWSTR pwszIconFile, int cchMax, _Out_ int * pIndex, _Out_ DWORD * pdwFlags) PURE; + STDMETHOD (GetPriority)(THIS_ _Out_ int * pIPriority) PURE; }; #if !defined(__cplusplus) || defined(CINTERFACE) @@ -1959,9 +2287,9 @@ STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL fEnterMode) PURE; // *** IDockingWindowSite methods *** - STDMETHOD(GetBorderDW)(THIS_ IUnknown *punkObj, LPRECT prcBorder) PURE; - STDMETHOD(RequestBorderSpaceDW)(THIS_ IUnknown *punkObj, LPCBORDERWIDTHS pbw) PURE; - STDMETHOD(SetBorderSpaceDW)(THIS_ IUnknown *punkObj, LPCBORDERWIDTHS pbw) PURE; + STDMETHOD(GetBorderDW)(THIS_ _In_ IUnknown *punkObj, _Out_ LPRECT prcBorder) PURE; + STDMETHOD(RequestBorderSpaceDW)(THIS_ _In_ IUnknown *punkObj, _In_ LPCBORDERWIDTHS pbw) PURE; + STDMETHOD(SetBorderSpaceDW)(THIS_ _In_ IUnknown *punkObj, _In_ LPCBORDERWIDTHS pbw) PURE; }; #undef INTERFACE

1 0

[akhaldi] 59714: [PSDK] * Update shlwapi.h. * Remove IUnknown_AtomicRelease() from shlwapi_undoc.h.
by akhaldi＠svn.reactos.org 12 Aug '13

12 Aug '13

Author: akhaldi Date: Mon Aug 12 22:08:17 2013 New Revision: 59714 URL: http://svn.reactos.org/svn/reactos?rev=59714&view=rev Log: [PSDK] * Update shlwapi.h. * Remove IUnknown_AtomicRelease() from shlwapi_undoc.h. Modified: trunk/reactos/include/psdk/shlwapi.h trunk/reactos/include/psdk/shlwapi_undoc.h Modified: trunk/reactos/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] Mon Aug 12 22:08:17 2013 @@ -319,7 +319,11 @@ #endif /* NO_SHLWAPI_REG */ +void WINAPI IUnknown_Set(IUnknown **ppunk, IUnknown *punk); +void WINAPI IUnknown_AtomicRelease(IUnknown **punk); +HRESULT WINAPI IUnknown_GetWindow(IUnknown *punk, HWND *phwnd); HRESULT WINAPI IUnknown_SetSite(IUnknown *punk, IUnknown *punkSite); +HRESULT WINAPI IUnknown_GetSite(IUnknown *punk, REFIID riid, void **ppv); HRESULT WINAPI IUnknown_QueryService(IUnknown *punk, REFGUID guidService, REFIID riid, void **ppvOut); /* Path functions */ @@ -368,16 +372,18 @@ int WINAPI PathCommonPrefixW(LPCWSTR,LPCWSTR,LPWSTR); #define PathCommonPrefix WINELIB_NAME_AW(PathCommonPrefix) -HRESULT WINAPI PathCreateFromUrlA(LPCSTR pszUrl, LPSTR pszPath, LPDWORD pcchPath, DWORD dwReserved); -HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, LPDWORD pcchPath, DWORD dwReserved); +HRESULT WINAPI PathCreateFromUrlA(LPCSTR,LPSTR,LPDWORD,DWORD); +HRESULT WINAPI PathCreateFromUrlW(LPCWSTR,LPWSTR,LPDWORD,DWORD); #define PathCreateFromUrl WINELIB_NAME_AW(PathCreateFromUrl) + +HRESULT WINAPI PathCreateFromUrlAlloc(LPCWSTR,LPWSTR*,DWORD); BOOL WINAPI PathFileExistsA(LPCSTR); BOOL WINAPI PathFileExistsW(LPCWSTR); #define PathFileExists WINELIB_NAME_AW(PathFileExists) -BOOL WINAPI PathFileExistsAndAttributesA(LPCSTR lpszPath, DWORD *dwAttr); -BOOL WINAPI PathFileExistsAndAttributesW(LPCWSTR lpszPath, DWORD *dwAttr); +BOOL WINAPI PathFileExistsAndAttributesA(LPCSTR,DWORD*); +BOOL WINAPI PathFileExistsAndAttributesW(LPCWSTR,DWORD*); #define PathFileExistsAndAttributes WINELIB_NAME_AW(PathFileExistsAndAttributes) LPSTR WINAPI PathFindExtensionA(LPCSTR); @@ -697,7 +703,7 @@ #define UrlIsOpaque WINELIB_NAME_AW(UrlIsOpaque) #define UrlIsFileUrlA(x) UrlIsA(x, URLIS_FILEURL) -#define UrlIsFileUrlW(y) UrlIsW(x, URLIS_FILEURL) +#define UrlIsFileUrlW(x) UrlIsW(x, URLIS_FILEURL) #define UrlIsFileUrl WINELIB_NAME_AW(UrlIsFileUrl) HRESULT WINAPI UrlUnescapeA(LPSTR,LPSTR,LPDWORD,DWORD); @@ -877,6 +883,9 @@ LPWSTR WINAPI StrStrIW(LPCWSTR,LPCWSTR); #define StrStrI WINELIB_NAME_AW(StrStrI) +LPWSTR WINAPI StrStrNW(LPCWSTR,LPCWSTR,UINT); +LPWSTR WINAPI StrStrNIW(LPCWSTR,LPCWSTR,UINT); + int WINAPI StrToIntA(LPCSTR); int WINAPI StrToIntW(LPCWSTR); #define StrToInt WINELIB_NAME_AW(StrToInt) @@ -926,6 +935,10 @@ HRESULT WINAPI StrRetToBSTR(STRRET*,LPCITEMIDLIST,BSTR*); +BOOL WINAPI IsCharSpaceA(CHAR); +BOOL WINAPI IsCharSpaceW(WCHAR); +#define IsCharSpace WINELIB_NAME_AW(IsCharSpace) + #endif /* NO_SHLWAPI_STRFCNS */ @@ -942,6 +955,8 @@ #endif /* NO_SHLWAPI_GDI */ +/* Security functions */ +BOOL WINAPI IsInternetESCEnabled(void); /* Stream functions */ #ifndef NO_SHLWAPI_STREAM @@ -981,6 +996,7 @@ HRESULT WINAPI SHAutoComplete(HWND,DWORD); /* Threads */ +HRESULT WINAPI SHCreateThreadRef(LONG*, IUnknown**); HRESULT WINAPI SHGetThreadRef(IUnknown**); HRESULT WINAPI SHSetThreadRef(IUnknown*); HRESULT WINAPI SHReleaseThreadRef(void); Modified: trunk/reactos/include/psdk/shlwapi_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi_undoc… ============================================================================== --- trunk/reactos/include/psdk/shlwapi_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlwapi_undoc.h [iso-8859-1] Mon Aug 12 22:08:17 2013 @@ -52,7 +52,6 @@ LONG WINAPI SHSetWindowBits(HWND hwnd, INT offset, UINT wMask, UINT wFlags); HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent); HRESULT WINAPI ConnectToConnectionPoint(IUnknown *lpUnkSink, REFIID riid, BOOL bAdviseOnly, IUnknown *lpUnknown, LPDWORD lpCookie, IConnectionPoint **lppCP); -DWORD WINAPI IUnknown_AtomicRelease(IUnknown **lpUnknown); BOOL WINAPI SHIsSameObject(IUnknown *lpInt1, IUnknown *lpInt2); HRESULT WINAPI IUnknown_GetWindow(IUnknown *lpUnknown, HWND *lphWnd); HRESULT WINAPI IUnknown_SetOwner(IUnknown *pUnk, ULONG arg);

1 0

[aandrejevic] 59713: [NTVDM] Synchronize with trunk again for SetConsolePalette. Implement VGA palettes for graphics mode and DAC register access.
by aandrejevic＠svn.reactos.org 12 Aug '13

12 Aug '13

Author: aandrejevic Date: Mon Aug 12 19:31:54 2013 New Revision: 59713 URL: http://svn.reactos.org/svn/reactos?rev=59713&view=rev Log: [NTVDM] Synchronize with trunk again for SetConsolePalette. Implement VGA palettes for graphics mode and DAC register access. Modified: branches/ntvdm/ (props changed) branches/ntvdm/CMakeLists.txt branches/ntvdm/base/services/umpnpmgr/umpnpmgr.c branches/ntvdm/dll/win32/kernel32/client/console/console.c branches/ntvdm/dll/win32/netapi32/access.c branches/ntvdm/dll/win32/netapi32/netapi32.spec branches/ntvdm/dll/win32/netapi32/user.c branches/ntvdm/dll/win32/setupapi/cfgmgr.c branches/ntvdm/dll/win32/setupapi/devinst.c branches/ntvdm/drivers/hid/hidparse/ (props changed) branches/ntvdm/drivers/hid/hidusb/ (props changed) branches/ntvdm/drivers/network/lan/include/net_wh.h branches/ntvdm/drivers/network/tcpip/include/fileobjs.h branches/ntvdm/drivers/network/tcpip/include/tcp.h branches/ntvdm/drivers/network/tcpip/include/tcpip.h branches/ntvdm/drivers/network/tcpip/include/titypes.h branches/ntvdm/drivers/network/tcpip/tcpip/fileobjs.c branches/ntvdm/drivers/usb/usbehci/ (props changed) branches/ntvdm/drivers/usb/usbhub/ (props changed) branches/ntvdm/drivers/usb/usbohci/ (props changed) branches/ntvdm/include/crt/mingw32/intrin_x86.h branches/ntvdm/include/crt/sec_api/tchar_s.h branches/ntvdm/include/psdk/mmsystem.h branches/ntvdm/include/psdk/vfw.h branches/ntvdm/include/psdk/wincon.h branches/ntvdm/include/psdk/winnls.h branches/ntvdm/include/reactos/subsys/win/conmsg.h branches/ntvdm/lib/drivers/ip/network/ip.c branches/ntvdm/lib/drivers/ip/network/neighbor.c branches/ntvdm/lib/drivers/ip/transport/tcp/event.c branches/ntvdm/lib/drivers/libusb/common_interfaces.h (props changed) branches/ntvdm/lib/drivers/libusb/hcd_controller.cpp (props changed) branches/ntvdm/lib/drivers/libusb/hub_controller.cpp (props changed) branches/ntvdm/lib/drivers/libusb/libusb.cpp (props changed) branches/ntvdm/lib/drivers/libusb/libusb.h (props changed) branches/ntvdm/lib/drivers/libusb/memory_manager.cpp (props changed) branches/ntvdm/lib/drivers/libusb/misc.cpp (props changed) branches/ntvdm/lib/drivers/libusb/purecall.cpp (props changed) branches/ntvdm/lib/drivers/libusb/usb_device.cpp (props changed) branches/ntvdm/lib/drivers/lwip/src/rostcp.c branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/vga.c branches/ntvdm/subsystems/ntvdm/vga.h branches/ntvdm/win32ss/user/winsrv/consrv/api.h branches/ntvdm/win32ss/user/winsrv/consrv/condrv/conoutput.c branches/ntvdm/win32ss/user/winsrv/consrv/conoutput.c branches/ntvdm/win32ss/user/winsrv/consrv/frontendctl.c branches/ntvdm/win32ss/user/winsrv/consrv/init.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/CMakeLists.txt?rev=59713&… Modified: branches/ntvdm/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/services/umpnpmgr/um… Modified: branches/ntvdm/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netapi32/access… Modified: branches/ntvdm/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netapi32/netapi… Modified: branches/ntvdm/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netapi32/user.c… Modified: branches/ntvdm/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/setupapi/cfgmgr… Modified: branches/ntvdm/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/setupapi/devins… Modified: branches/ntvdm/drivers/network/lan/include/net_wh.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/network/lan/inclu… Modified: branches/ntvdm/drivers/network/tcpip/include/fileobjs.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/network/tcpip/inc… Modified: branches/ntvdm/drivers/network/tcpip/include/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/network/tcpip/inc… Modified: branches/ntvdm/drivers/network/tcpip/include/tcpip.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/network/tcpip/inc… Modified: branches/ntvdm/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/network/tcpip/inc… Modified: branches/ntvdm/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/network/tcpip/tcp… Modified: branches/ntvdm/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/crt/mingw32/intri… Modified: branches/ntvdm/include/crt/sec_api/tchar_s.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/crt/sec_api/tchar… Modified: branches/ntvdm/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/mmsystem.h?r… Modified: branches/ntvdm/include/psdk/vfw.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/vfw.h?rev=59… Modified: branches/ntvdm/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/wincon.h?rev… Modified: branches/ntvdm/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/winnls.h?rev… Modified: branches/ntvdm/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/subsys/wi… Modified: branches/ntvdm/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/ip/network/ip… Modified: branches/ntvdm/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/ip/network/ne… Modified: branches/ntvdm/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/ip/transport/… Modified: branches/ntvdm/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/lwip/src/rost… Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… Modified: branches/ntvdm/subsystems/ntvdm/vga.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.h?re… Modified: branches/ntvdm/win32ss/user/winsrv/consrv/api.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/consr… Modified: branches/ntvdm/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/consr… Modified: branches/ntvdm/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/consr… Modified: branches/ntvdm/win32ss/user/winsrv/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/consr… Modified: branches/ntvdm/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/consr…

1 0

[hbelusca] 59712: Forgot this file (fixes all the builds).
by hbelusca＠svn.reactos.org 12 Aug '13

12 Aug '13

Author: hbelusca Date: Mon Aug 12 16:15:44 2013 New Revision: 59712 URL: http://svn.reactos.org/svn/reactos?rev=59712&view=rev Log: Forgot this file (fixes all the builds). Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Mon Aug 12 16:15:44 2013 @@ -65,7 +65,7 @@ ConsolepSetCursor, ConsolepShowCursor, ConsolepMenuControl, - // ConsolepSetPalette, + ConsolepSetPalette, ConsolepSetDisplayMode, // ConsolepRegisterVDM, ConsolepGetHardwareState, @@ -305,6 +305,13 @@ typedef struct { + HANDLE OutputHandle; + HPALETTE PaletteHandle; + UINT Usage; +} CONSOLE_SETPALETTE, *PCONSOLE_SETPALETTE; + +typedef struct +{ DWORD Length; PWCHAR Title; } CONSOLE_GETSETCONSOLETITLE, *PCONSOLE_GETSETCONSOLETITLE; @@ -664,6 +671,7 @@ /* Console window */ CONSOLE_INVALIDATEDIBITS InvalidateDIBitsRequest; + CONSOLE_SETPALETTE SetPaletteRequest; CONSOLE_GETSETCONSOLETITLE TitleRequest; CONSOLE_GETLARGESTWINDOWSIZE GetLargestWindowSizeRequest; CONSOLE_MENUCONTROL MenuControlRequest;

1 0

[hbelusca] 59711: [KERNEL32][CONSRV] Half-plement SetConsolePalette.
by hbelusca＠svn.reactos.org 12 Aug '13

12 Aug '13

Author: hbelusca Date: Mon Aug 12 16:12:58 2013 New Revision: 59711 URL: http://svn.reactos.org/svn/reactos?rev=59711&view=rev Log: [KERNEL32][CONSRV] Half-plement SetConsolePalette. Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c trunk/reactos/win32ss/user/winsrv/consrv/api.h trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c trunk/reactos/win32ss/user/winsrv/consrv/init.c Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] Mon Aug 12 16:12:58 2013 @@ -711,7 +711,7 @@ /* - * @unimplemented (Undocumented) + * @implemented (Undocumented) * @note See http://comments.gmane.org/gmane.comp.lang.harbour.devel/27844 * Usage example: https://github.com/harbour/core/commit/d79a1b7b812cbde6ddf718ebfd6939a24f63… */ @@ -721,9 +721,24 @@ HPALETTE hPalette, UINT dwUsage) { - DPRINT1("SetConsolePalette(0x%x, 0x%x, %d) UNIMPLEMENTED!\n", hConsoleOutput, hPalette, dwUsage); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - // Return TRUE so that we don't fail when being used by NTVDM even if not implemented. + NTSTATUS Status; + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_SETPALETTE SetPaletteRequest = &ApiMessage.Data.SetPaletteRequest; + + SetPaletteRequest->OutputHandle = hConsoleOutput; + SetPaletteRequest->PaletteHandle = hPalette; + SetPaletteRequest->Usage = dwUsage; + + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetPalette), + sizeof(CONSOLE_SETPALETTE)); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + return TRUE; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/api.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/api.h [iso-8859-1] Mon Aug 12 16:12:58 2013 @@ -25,6 +25,7 @@ /* conoutput.c */ CSR_API(SrvInvalidateBitMapRect); +CSR_API(SrvSetConsolePalette); CSR_API(SrvReadConsoleOutput); CSR_API(SrvWriteConsole); CSR_API(SrvWriteConsoleOutput); Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Mon Aug 12 16:12:58 2013 @@ -204,6 +204,16 @@ } NTSTATUS NTAPI +ConDrvSetConsolePalette(IN PCONSOLE Console, + IN PGRAPHICS_SCREEN_BUFFER Buffer, + IN HPALETTE PaletteHandle, + IN UINT Usage) +{ + DPRINT1("ConDrvSetConsolePalette is UNIMPLEMENTED but returns STATUS_SUCCESS\n"); + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI ConDrvGetConsoleCursorInfo(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER Buffer, OUT PCONSOLE_CURSOR_INFO CursorInfo) Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Mon Aug 12 16:12:58 2013 @@ -45,6 +45,36 @@ Status = ConDrvInvalidateBitMapRect(Buffer->Header.Console, Buffer, &InvalidateDIBitsRequest->Region); + + ConSrvReleaseScreenBuffer(Buffer, TRUE); + return Status; +} + +NTSTATUS NTAPI +ConDrvSetConsolePalette(IN PCONSOLE Console, + IN PGRAPHICS_SCREEN_BUFFER Buffer, + IN HPALETTE PaletteHandle, + IN UINT Usage); +CSR_API(SrvSetConsolePalette) +{ + NTSTATUS Status; + PCONSOLE_SETPALETTE SetPaletteRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetPaletteRequest; + // PCONSOLE_SCREEN_BUFFER Buffer; + PGRAPHICS_SCREEN_BUFFER Buffer; + + DPRINT("SrvSetConsolePalette\n"); + + // NOTE: Tests show that this function is used only for graphics screen buffers + // and otherwise it returns false + sets last error to invalid handle. + Status = ConSrvGetGraphicsBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + SetPaletteRequest->OutputHandle, + &Buffer, GENERIC_WRITE, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + Status = ConDrvSetConsolePalette(Buffer->Header.Console, + Buffer, + SetPaletteRequest->PaletteHandle, + SetPaletteRequest->Usage); ConSrvReleaseScreenBuffer(Buffer, TRUE); return Status; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] Mon Aug 12 16:12:58 2013 @@ -220,7 +220,7 @@ PCONSOLE_SCREEN_BUFFER Buff; // FIXME: Tests show that this function is used only for graphics screen buffers - // and otherwise it returns false + set last error to invalid handle. + // and otherwise it returns false + sets last error to invalid handle. // NOTE: I find that behaviour is ridiculous but ok, let's accept that at the moment... Status = ConSrvGetGraphicsBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetCursorRequest->OutputHandle, Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] Mon Aug 12 16:12:58 2013 @@ -75,7 +75,7 @@ SrvSetConsoleCursor, SrvShowConsoleCursor, SrvConsoleMenuControl, - // SrvSetConsolePalette, + SrvSetConsolePalette, SrvSetConsoleDisplayMode, // SrvRegisterConsoleVDM, SrvGetConsoleHardwareState, @@ -166,7 +166,7 @@ FALSE, // SrvSetConsoleCursor, FALSE, // SrvShowConsoleCursor, FALSE, // SrvConsoleMenuControl, - // FALSE, // SrvSetConsolePalette, + FALSE, // SrvSetConsolePalette, FALSE, // SrvSetConsoleDisplayMode, // FALSE, // SrvRegisterConsoleVDM, FALSE, // SrvGetConsoleHardwareState, @@ -257,7 +257,7 @@ "SetConsoleCursor", "ShowConsoleCursor", "ConsoleMenuControl", - // "SetConsolePalette", + "SetConsolePalette", "SetConsoleDisplayMode", // "RegisterConsoleVDM", "GetConsoleHardwareState",

1 0

[akhaldi] 59710: [PSDK] * Annotate vfw.h.
by akhaldi＠svn.reactos.org 12 Aug '13

12 Aug '13

Author: akhaldi Date: Mon Aug 12 11:52:50 2013 New Revision: 59710 URL: http://svn.reactos.org/svn/reactos?rev=59710&view=rev Log: [PSDK] * Annotate vfw.h. Modified: trunk/reactos/include/psdk/vfw.h Modified: trunk/reactos/include/psdk/vfw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/vfw.h?rev=597… ============================================================================== --- trunk/reactos/include/psdk/vfw.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/vfw.h [iso-8859-1] Mon Aug 12 11:52:50 2013 @@ -170,26 +170,36 @@ #define ICCOMPRESS_KEYFRAME 0x00000001L typedef struct { - DWORD dwFlags; - LPBITMAPINFOHEADER lpbiOutput; - LPVOID lpOutput; - LPBITMAPINFOHEADER lpbiInput; - LPVOID lpInput; - LPDWORD lpckid; - LPDWORD lpdwFlags; - LONG lFrameNum; - DWORD dwFrameSize; - DWORD dwQuality; - LPBITMAPINFOHEADER lpbiPrev; - LPVOID lpPrev; + DWORD dwFlags; + LPBITMAPINFOHEADER lpbiOutput; + _Field_size_bytes_(lpbiOutput->biSizeImage) LPVOID lpOutput; + LPBITMAPINFOHEADER lpbiInput; + _Field_size_bytes_(lpbiInput->biSizeImage) LPVOID lpInput; + LPDWORD lpckid; + LPDWORD lpdwFlags; + LONG lFrameNum; + DWORD dwFrameSize; + DWORD dwQuality; + LPBITMAPINFOHEADER lpbiPrev; + _Field_size_bytes_(lpbiPrev->biSizeImage) LPVOID lpPrev; } ICCOMPRESS; -DWORD VFWAPIV ICCompress( - HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiOutput,LPVOID lpData, - LPBITMAPINFOHEADER lpbiInput,LPVOID lpBits,LPDWORD lpckid, - LPDWORD lpdwFlags,LONG lFrameNum,DWORD dwFrameSize,DWORD dwQuality, - LPBITMAPINFOHEADER lpbiPrev,LPVOID lpPrev -); +DWORD +VFWAPIV +ICCompress( + _In_ HIC hic, + _In_ DWORD dwFlags, + _In_ LPBITMAPINFOHEADER lpbiOutput, + _Out_writes_bytes_(lpbiOutput->biSizeImage) LPVOID lpData, + _In_ LPBITMAPINFOHEADER lpbiInput, + _In_reads_bytes_(lpbiInput->biSizeImage) LPVOID lpBits, + _Out_opt_ LPDWORD lpckid, + _Out_opt_ LPDWORD lpdwFlags, + _In_ LONG lFrameNum, + _In_ DWORD dwFrameSize, + _In_ DWORD dwQuality, + _In_opt_ LPBITMAPINFOHEADER lpbiPrev, + _In_reads_bytes_opt_(lpbiPrev->biSizeImage) LPVOID lpPrev); #define ICCompressGetFormat(hic, lpbiInput, lpbiOutput) \ ICSendMessage( \ @@ -236,8 +246,8 @@ DWORD dwScale; DWORD dwOverheadPerFrame; DWORD dwReserved2; - LONG (CALLBACK *GetData)(LPARAM lInput,LONG lFrame,LPVOID lpBits,LONG len); - LONG (CALLBACK *PutData)(LPARAM lOutput,LONG lFrame,LPVOID lpBits,LONG len); + LONG (CALLBACK *GetData)(_In_ LPARAM lInput, _In_ LONG lFrame, _Out_writes_bytes_(len) LPVOID lpBits, _In_ LONG len); + LONG (CALLBACK *PutData)(_In_ LPARAM lOutput, _In_ LONG lFrame, _In_reads_bytes_(len) LPVOID lpBits, _In_ LONG len); } ICCOMPRESSFRAMES; typedef struct { @@ -321,12 +331,12 @@ #define ICDECOMPRESS_NOTKEYFRAME 0x08000000 /* this frame is not a key frame */ typedef struct { - DWORD dwFlags; /* flags (from AVI index...) */ - LPBITMAPINFOHEADER lpbiInput; /* BITMAPINFO of compressed data */ - LPVOID lpInput; /* compressed data */ - LPBITMAPINFOHEADER lpbiOutput; /* DIB to decompress to */ - LPVOID lpOutput; - DWORD ckid; /* ckid from AVI file */ + DWORD dwFlags; /* flags (from AVI index...) */ + LPBITMAPINFOHEADER lpbiInput; /* BITMAPINFO of compressed data */ + _Field_size_bytes_(lpbiInput->biSizeImage) LPVOID lpInput; /* compressed data */ + LPBITMAPINFOHEADER lpbiOutput; /* DIB to decompress to */ + _Field_size_bytes_(lpbiOutput->biSizeImage) LPVOID lpOutput; + DWORD ckid; /* ckid from AVI file */ } ICDECOMPRESS; typedef struct { @@ -348,7 +358,15 @@ INT dySrc; } ICDECOMPRESSEX; -DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,LPVOID lpData,LPBITMAPINFOHEADER lpbi,LPVOID lpBits); +DWORD +VFWAPIV +ICDecompress( + _In_ HIC hic, + _In_ DWORD dwFlags, + _In_ LPBITMAPINFOHEADER lpbiFormat, + _In_reads_bytes_(lpbiFormat->biSizeImage) LPVOID lpData, + _In_ LPBITMAPINFOHEADER lpbi, + _Out_writes_bytes_(lpbi->biSizeImage) LPVOID lpBits); #define ICDecompressBegin(hic, lpbiInput, lpbiOutput) \ ICSendMessage( \ @@ -385,13 +403,31 @@ #define ICDecompressEnd(hic) ICSendMessage(hic, ICM_DECOMPRESS_END, 0, 0) -LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD_PTR dw1, DWORD_PTR dw2); - -static inline LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags, - LPBITMAPINFOHEADER lpbiSrc, LPVOID lpSrc, - int xSrc, int ySrc, int dxSrc, int dySrc, - LPBITMAPINFOHEADER lpbiDst, LPVOID lpDst, - int xDst, int yDst, int dxDst, int dyDst) +LRESULT +VFWAPI +ICSendMessage( + _In_ HIC hic, + _In_ UINT msg, + _In_ DWORD_PTR dw1, + _In_ DWORD_PTR dw2); + +static inline +LRESULT +VFWAPI +ICDecompressEx(_In_ HIC hic, + _In_ DWORD dwFlags, + _In_ LPBITMAPINFOHEADER lpbiSrc, + _In_reads_bytes_(lpbiSrc->biSizeImage) LPVOID lpSrc, + _In_ int xSrc, + _In_ int ySrc, + _In_ int dxSrc, + _In_ int dySrc, + _In_ LPBITMAPINFOHEADER lpbiDst, + _Out_writes_bytes_(lpbiDst->biSizeImage) LPVOID lpDst, + _In_ int xDst, + _In_ int yDst, + _In_ int dxDst, + _In_ int dyDst) { ICDECOMPRESSEX ic; @@ -411,16 +447,23 @@ return ICSendMessage(hic, ICM_DECOMPRESSEX, (DWORD_PTR)&ic, sizeof(ic)); } -static inline LRESULT VFWAPI ICDecompressExBegin(HIC hic, DWORD dwFlags, - LPBITMAPINFOHEADER lpbiSrc, - LPVOID lpSrc, - int xSrc, int ySrc, int dxSrc, int dySrc, - LPBITMAPINFOHEADER lpbiDst, - LPVOID lpDst, - int xDst, - int yDst, - int dxDst, - int dyDst) +static inline +LRESULT +VFWAPI +ICDecompressExBegin(_In_ HIC hic, + _In_ DWORD dwFlags, + _In_ LPBITMAPINFOHEADER lpbiSrc, + _In_opt_ LPVOID lpSrc, + _In_ int xSrc, + _In_ int ySrc, + _In_ int dxSrc, + _In_ int dySrc, + _In_ LPBITMAPINFOHEADER lpbiDst, + _Out_opt_ LPVOID lpDst, + _In_ int xDst, + _In_ int yDst, + _In_ int dxDst, + _In_ int dyDst) { ICDECOMPRESSEX ic; @@ -439,16 +482,24 @@ ic.dyDst = dyDst; return ICSendMessage(hic, ICM_DECOMPRESSEX_BEGIN, (DWORD_PTR)&ic, sizeof(ic)); } -static inline LRESULT VFWAPI ICDecompressExQuery(HIC hic, DWORD dwFlags, - LPBITMAPINFOHEADER lpbiSrc, - LPVOID lpSrc, - int xSrc, int ySrc, int dxSrc, int dySrc, - LPBITMAPINFOHEADER lpbiDst, - LPVOID lpDst, - int xDst, - int yDst, - int dxDst, - int dyDst) + +static inline +LRESULT +VFWAPI +ICDecompressExQuery(_In_ HIC hic, + _In_ DWORD dwFlags, + _In_ LPBITMAPINFOHEADER lpbiSrc, + _Reserved_ LPVOID lpSrc, + _In_ int xSrc, + _In_ int ySrc, + _In_ int dxSrc, + _In_ int dySrc, + _In_opt_ LPBITMAPINFOHEADER lpbiDst, + _Out_opt_ LPVOID lpDst, + _In_ int xDst, + _In_ int yDst, + _In_ int dxDst, + _In_ int dyDst) { ICDECOMPRESSEX ic; @@ -487,23 +538,87 @@ #define ICDrawOpen(fccType, fccHandler, lpbiIn) \ ICLocate(fccType, fccHandler, lpbiIn, NULL, ICMODE_DRAW) -HANDLE VFWAPI ICImageCompress(HIC hic, UINT uiFlags, LPBITMAPINFO lpbiIn, - LPVOID lpBits, LPBITMAPINFO lpbiOut, LONG lQuality, - LONG* plSize); - -HANDLE VFWAPI ICImageDecompress(HIC hic, UINT uiFlags, LPBITMAPINFO lpbiIn, - LPVOID lpBits, LPBITMAPINFO lpbiOut); - -BOOL VFWAPI ICInfo(DWORD fccType, DWORD fccHandler, ICINFO * lpicinfo); -BOOL VFWAPI ICInstall(DWORD fccType, DWORD fccHandler, LPARAM lParam, LPSTR szDesc, UINT wFlags); -BOOL VFWAPI ICRemove(DWORD fccType, DWORD fccHandler, UINT wFlags); -LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO *picinfo, DWORD cb); -HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode); -HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPROC lpfnHandler); - -LRESULT VFWAPI ICClose(HIC hic); -HIC VFWAPI ICLocate(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, WORD wFlags); -HIC VFWAPI ICGetDisplayFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, int BitDepth, int dx, int dy); +HANDLE +VFWAPI +ICImageCompress( + _In_ HIC hic, + _In_ UINT uiFlags, + _In_ LPBITMAPINFO lpbiIn, + _In_ LPVOID lpBits, + _In_opt_ LPBITMAPINFO lpbiOut, + _In_ LONG lQuality, + _Inout_opt_ LONG* plSize); + +HANDLE +VFWAPI +ICImageDecompress( + _In_opt_ HIC hic, + _In_ UINT uiFlags, + _In_ LPBITMAPINFO lpbiIn, + _In_ LPVOID lpBits, + _In_opt_ LPBITMAPINFO lpbiOut); + +BOOL +VFWAPI +ICInfo( + _In_ DWORD fccType, + _In_ DWORD fccHandler, + _Out_ ICINFO * lpicinfo); + +BOOL +VFWAPI +ICInstall( + _In_ DWORD fccType, + _In_ DWORD fccHandler, + _In_ LPARAM lParam, + _In_ LPSTR szDesc, + _In_ UINT wFlags); + +BOOL +VFWAPI +ICRemove( + _In_ DWORD fccType, + _In_ DWORD fccHandler, + _In_ UINT wFlags); + +_Success_(return != 0) +LRESULT +VFWAPI +ICGetInfo( + _In_ HIC hic, + _Out_writes_bytes_to_(cb, return) ICINFO *picinfo, + _In_ DWORD cb); + +HIC VFWAPI ICOpen(_In_ DWORD fccType, _In_ DWORD fccHandler, _In_ UINT wMode); + +HIC +VFWAPI +ICOpenFunction( + _In_ DWORD fccType, + _In_ DWORD fccHandler, + _In_ UINT wMode, + _In_ DRIVERPROC lpfnHandler); + +LRESULT VFWAPI ICClose(_In_ HIC hic); + +HIC +VFWAPI +ICLocate( + _In_ DWORD fccType, + _In_ DWORD fccHandler, + _In_ LPBITMAPINFOHEADER lpbiIn, + _In_opt_ LPBITMAPINFOHEADER lpbiOut, + _In_ WORD wFlags); + +HIC +VFWAPI +ICGetDisplayFormat( + _In_opt_ HIC hic, + _In_ LPBITMAPINFOHEADER lpbiIn, + _Out_ LPBITMAPINFOHEADER lpbiOut, + _In_ int BitDepth, + _In_ int dx, + _In_ int dy); /* Values for wFlags of ICInstall() */ #define ICINSTALL_UNICODE 0x8000 @@ -555,24 +670,25 @@ LPPALETTEENTRY lppe; } ICPALETTE; -DWORD VFWAPIV ICDrawBegin( - HIC hic, - DWORD dwFlags,/* flags */ - HPALETTE hpal, /* palette to draw with */ - HWND hwnd, /* window to draw to */ - HDC hdc, /* HDC to draw to */ - INT xDst, /* destination rectangle */ - INT yDst, - INT dxDst, - INT dyDst, - LPBITMAPINFOHEADER lpbi, /* format of frame to draw */ - INT xSrc, /* source rectangle */ - INT ySrc, - INT dxSrc, - INT dySrc, - DWORD dwRate, /* frames/second = (dwRate/dwScale) */ - DWORD dwScale -); +DWORD +VFWAPIV +ICDrawBegin( + _In_ HIC hic, + _In_ DWORD dwFlags, + _In_opt_ HPALETTE hpal, + _In_opt_ HWND hwnd, + _In_opt_ HDC hdc, + _In_ INT xDst, + _In_ INT yDst, + _In_ INT dxDst, + _In_ INT dyDst, + _In_ LPBITMAPINFOHEADER lpbi, + _In_ INT xSrc, + _In_ INT ySrc, + _In_ INT dxSrc, + _In_ INT dySrc, + _In_ DWORD dwRate, + _In_ DWORD dwScale); /* as passed to ICM_DRAW_BEGIN */ typedef struct { @@ -607,13 +723,27 @@ LONG lTime; } ICDRAW; -DWORD VFWAPIV ICDraw(HIC hic,DWORD dwFlags,LPVOID lpFormat,LPVOID lpData,DWORD cbData,LONG lTime); - -static inline LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn, - LPBITMAPINFOHEADER lpbiOut, - int dxSrc, int dySrc, - int dxDst, int dyDst, - HIC hicDecomp) +DWORD +VFWAPIV +ICDraw( + _In_ HIC hic, + _In_ DWORD dwFlags, + _In_ LPVOID lpFormat, + _In_reads_bytes_opt_(cbData) LPVOID lpData, + _In_ DWORD cbData, + _In_ LONG lTime); + +static inline +LRESULT +VFWAPI +ICDrawSuggestFormat(_In_ HIC hic, + _In_ LPBITMAPINFOHEADER lpbiIn, + _Out_ LPBITMAPINFOHEADER lpbiOut, + _In_ int dxSrc, + _In_ int dySrc, + _In_ int dxDst, + _In_ int dyDst, + _In_ HIC hicDecomp) { ICDRAWSUGGEST ic; @@ -666,8 +796,13 @@ #define ICDrawRenderBuffer(hic) \ ICSendMessage(hic, ICM_DRAW_RENDERBUFFER, 0, 0) -static inline LRESULT VFWAPI ICSetStatusProc(HIC hic, DWORD dwFlags, LRESULT lParam, - LONG (CALLBACK *fpfnStatus)(LPARAM, UINT, LONG)) +static inline +LRESULT +VFWAPI +ICSetStatusProc(_In_ HIC hic, + _In_ DWORD dwFlags, + _In_ LRESULT lParam, + _In_ LONG(CALLBACK *fpfnStatus)(_In_ LPARAM, _In_ UINT, _In_ LONG)) { ICSETSTATUSPROC ic; @@ -700,20 +835,39 @@ #define ICMF_COMPVARS_VALID 0x00000001 -BOOL VFWAPI ICCompressorChoose(HWND hwnd, UINT uiFlags, LPVOID pvIn, LPVOID lpData, - PCOMPVARS pc, LPSTR lpszTitle); +BOOL +VFWAPI +ICCompressorChoose( + _In_opt_ HWND hwnd, + _In_ UINT uiFlags, + _In_opt_ LPVOID pvIn, + _In_opt_ LPVOID lpData, + _Inout_ PCOMPVARS pc, + _In_opt_ LPSTR lpszTitle); #define ICMF_CHOOSE_KEYFRAME 0x0001 #define ICMF_CHOOSE_DATARATE 0x0002 #define ICMF_CHOOSE_PREVIEW 0x0004 #define ICMF_CHOOSE_ALLCOMPRESSORS 0x0008 -BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn); -void VFWAPI ICSeqCompressFrameEnd(PCOMPVARS pc); - -LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, - BOOL *pfKey, LONG *plSize); -void VFWAPI ICCompressorFree(PCOMPVARS pc); +BOOL +VFWAPI +ICSeqCompressFrameStart( + _In_ PCOMPVARS pc, + _In_ LPBITMAPINFO lpbiIn); + +void VFWAPI ICSeqCompressFrameEnd(_In_ PCOMPVARS pc); + +LPVOID +VFWAPI +ICSeqCompressFrame( + _In_ PCOMPVARS pc, + _Reserved_ UINT uiFlags, + _In_ LPVOID lpBits, + _Out_ BOOL *pfKey, + _Inout_opt_ LONG *plSize); + +void VFWAPI ICCompressorFree(_In_ PCOMPVARS pc); /********************* AVIFILE function declarations *************************/ @@ -998,21 +1152,21 @@ DECLARE_INTERFACE_(IAVIStream,IUnknown) { /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, _Outptr_ void** ppvObject) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IAVIStream methods ***/ STDMETHOD(Create)(THIS_ LPARAM lParam1, LPARAM lParam2) PURE; - STDMETHOD(Info)(THIS_ AVISTREAMINFOW *psi, LONG lSize) PURE; - STDMETHOD_(LONG,FindSample)(THIS_ LONG lPos, LONG lFlags) PURE; - STDMETHOD(ReadFormat)(THIS_ LONG lPos, LPVOID lpFormat, LONG *lpcbFormat) PURE; - STDMETHOD(SetFormat)(THIS_ LONG lPos, LPVOID lpFormat, LONG cbFormat) PURE; - STDMETHOD(Read)(THIS_ LONG lStart, LONG lSamples, LPVOID lpBuffer, LONG cbBuffer, LONG *plBytes, LONG *plSamples) PURE; - STDMETHOD(Write)(THIS_ LONG lStart, LONG lSamples, LPVOID lpBuffer, LONG cbBuffer, DWORD dwFlags, LONG *plSampWritten, LONG *plBytesWritten) PURE; - STDMETHOD(Delete)(THIS_ LONG lStart, LONG lSamples) PURE; - STDMETHOD(ReadData)(THIS_ DWORD fcc, LPVOID lpBuffer, LONG *lpcbBuffer) PURE; - STDMETHOD(WriteData)(THIS_ DWORD fcc, LPVOID lpBuffer, LONG cbBuffer) PURE; - STDMETHOD(SetInfo)(THIS_ AVISTREAMINFOW *plInfo, LONG cbInfo) PURE; + STDMETHOD(Info)(THIS_ _Out_writes_bytes_(lSize) AVISTREAMINFOW *psi, _In_ LONG lSize) PURE; + STDMETHOD_(LONG,FindSample)(THIS_ _In_ LONG lPos, _In_ LONG lFlags) PURE; + STDMETHOD(ReadFormat)(THIS_ _In_ LONG lPos, _Out_writes_bytes_to_opt_(*lpcbFormat, *lpcbFormat) LPVOID lpFormat, _Inout_ LONG *lpcbFormat) PURE; + STDMETHOD(SetFormat)(THIS_ _In_ LONG lPos, _In_reads_bytes_(cbFormat) LPVOID lpFormat, _In_ LONG cbFormat) PURE; + STDMETHOD(Read)(THIS_ _In_ LONG lStart, _In_ LONG lSamples, _Out_writes_bytes_opt_(cbBuffer) LPVOID lpBuffer, _In_ LONG cbBuffer, _Out_opt_ LONG *plBytes, _Out_opt_ LONG *plSamples) PURE; + STDMETHOD(Write)(THIS_ _In_ LONG lStart, _In_ LONG lSamples, _In_reads_bytes_(cbBuffer) LPVOID lpBuffer, _In_ LONG cbBuffer, _In_ DWORD dwFlags, _Out_opt_ LONG *plSampWritten, _Out_opt_ LONG *plBytesWritten) PURE; + STDMETHOD(Delete)(THIS_ _In_ LONG lStart, _In_ LONG lSamples) PURE; + STDMETHOD(ReadData)(THIS_ _In_ DWORD fcc, _Out_writes_bytes_to_opt_(*lpcbBuffer, *lpcbBuffer) LPVOID lpBuffer, _Inout_ LONG *lpcbBuffer) PURE; + STDMETHOD(WriteData)(THIS_ _In_ DWORD fcc, _In_reads_bytes_(cbBuffer) LPVOID lpBuffer, _In_ LONG cbBuffer) PURE; + STDMETHOD(SetInfo)(THIS_ _In_reads_bytes_(cbInfo) AVISTREAMINFOW *plInfo, _In_ LONG cbInfo) PURE; }; #undef INTERFACE @@ -1039,65 +1193,237 @@ ULONG WINAPI AVIStreamAddRef(PAVISTREAM iface); ULONG WINAPI AVIStreamRelease(PAVISTREAM iface); -HRESULT WINAPI AVIStreamCreate(PAVISTREAM*,LONG,LONG,CLSID*); -HRESULT WINAPI AVIStreamInfoA(PAVISTREAM iface,AVISTREAMINFOA *asi,LONG size); -HRESULT WINAPI AVIStreamInfoW(PAVISTREAM iface,AVISTREAMINFOW *asi,LONG size); + +HRESULT +WINAPI +AVIStreamCreate( + _Outptr_ PAVISTREAM*, + _In_ LONG, + _In_ LONG, + _In_opt_ CLSID*); + +HRESULT +WINAPI +AVIStreamInfoA( + _In_ PAVISTREAM iface, + _Out_writes_bytes_(size) AVISTREAMINFOA *asi, + _In_ LONG size); + +HRESULT +WINAPI +AVIStreamInfoW( + _In_ PAVISTREAM iface, + _Out_writes_bytes_(size) AVISTREAMINFOW *asi, + _In_ LONG size); + #define AVIStreamInfo WINELIB_NAME_AW(AVIStreamInfo) -LONG WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, LONG flags); -HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM iface,LONG pos,LPVOID format,LONG *formatsize); -HRESULT WINAPI AVIStreamSetFormat(PAVISTREAM iface,LONG pos,LPVOID format,LONG formatsize); -HRESULT WINAPI AVIStreamRead(PAVISTREAM iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread); -HRESULT WINAPI AVIStreamWrite(PAVISTREAM iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten); -HRESULT WINAPI AVIStreamReadData(PAVISTREAM iface,DWORD fcc,LPVOID lp,LONG *lpread); -HRESULT WINAPI AVIStreamWriteData(PAVISTREAM iface,DWORD fcc,LPVOID lp,LONG size); - -PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM pavi,LPBITMAPINFOHEADER lpbiWanted); -LPVOID WINAPI AVIStreamGetFrame(PGETFRAME pg,LONG pos); -HRESULT WINAPI AVIStreamGetFrameClose(PGETFRAME pg); - -HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM*ppsCompressed,PAVISTREAM ppsSource,AVICOMPRESSOPTIONS *lpOptions,CLSID*pclsidHandler); -HRESULT WINAPI AVIMakeFileFromStreams(PAVIFILE *ppfile, int nStreams, PAVISTREAM *ppStreams); -HRESULT WINAPI AVIMakeStreamFromClipboard(UINT cfFormat, HANDLE hGlobal, PAVISTREAM * ppstream); - -HRESULT WINAPI AVIStreamOpenFromFileA(PAVISTREAM *ppavi, LPCSTR szFile, - DWORD fccType, LONG lParam, - UINT mode, CLSID *pclsidHandler); -HRESULT WINAPI AVIStreamOpenFromFileW(PAVISTREAM *ppavi, LPCWSTR szFile, - DWORD fccType, LONG lParam, - UINT mode, CLSID *pclsidHandler); + +LONG +WINAPI +AVIStreamFindSample( + _In_ PAVISTREAM pstream, + _In_ LONG pos, + _In_ LONG flags); + +HRESULT +WINAPI +AVIStreamReadFormat( + _In_ PAVISTREAM iface, + _In_ LONG pos, + _Out_writes_bytes_to_opt_(*formatsize, *formatsize) LPVOID format, + _Inout_ LONG *formatsize); + +HRESULT +WINAPI +AVIStreamSetFormat( + _In_ PAVISTREAM iface, + _In_ LONG pos, + _In_reads_bytes_(formatsize) LPVOID format, + _In_ LONG formatsize); + +HRESULT +WINAPI +AVIStreamRead( + _In_ PAVISTREAM iface, + _In_ LONG start, + _In_ LONG samples, + _Out_writes_bytes_opt_(buffersize) LPVOID buffer, + _In_ LONG buffersize, + _Out_opt_ LONG *bytesread, + _Out_opt_ LONG *samplesread); + +HRESULT +WINAPI +AVIStreamWrite( + _In_ PAVISTREAM iface, + _In_ LONG start, + _In_ LONG samples, + _In_reads_bytes_(buffersize) LPVOID buffer, + _In_ LONG buffersize, + _In_ DWORD flags, + _Out_opt_ LONG *sampwritten, + _Out_opt_ LONG *byteswritten); + +HRESULT +WINAPI +AVIStreamReadData( + _In_ PAVISTREAM iface, + _In_ DWORD fcc, + _Out_writes_bytes_to_opt_(*lpread, *lpread) LPVOID lp, + _Inout_ LONG *lpread); + +HRESULT +WINAPI +AVIStreamWriteData( + _In_ PAVISTREAM iface, + _In_ DWORD fcc, + _In_reads_bytes_(size) LPVOID lp, + _In_ LONG size); + +PGETFRAME +WINAPI +AVIStreamGetFrameOpen( + _In_ PAVISTREAM pavi, + _In_opt_ LPBITMAPINFOHEADER lpbiWanted); + +LPVOID WINAPI AVIStreamGetFrame(_In_ PGETFRAME pg, _In_ LONG pos); +HRESULT WINAPI AVIStreamGetFrameClose(_In_ PGETFRAME pg); + +HRESULT +WINAPI +AVIMakeCompressedStream( + _Outptr_ PAVISTREAM *ppsCompressed, + _In_ PAVISTREAM ppsSource, + _In_ AVICOMPRESSOPTIONS *lpOptions, + _In_opt_ CLSID *pclsidHandler); + +HRESULT +WINAPI +AVIMakeFileFromStreams( + _Outptr_ PAVIFILE *ppfile, + _In_ int nStreams, + _In_reads_(nStreams) PAVISTREAM *ppStreams); + +HRESULT +WINAPI +AVIMakeStreamFromClipboard( + UINT cfFormat, + _In_ HANDLE hGlobal, + _Outptr_ PAVISTREAM * ppstream); + +HRESULT +WINAPI +AVIStreamOpenFromFileA( + _Outptr_ PAVISTREAM *ppavi, + _In_ LPCSTR szFile, + _In_ DWORD fccType, + _In_ LONG lParam, + _In_ UINT mode, + _In_opt_ CLSID *pclsidHandler); + +HRESULT +WINAPI +AVIStreamOpenFromFileW( + _Outptr_ PAVISTREAM *ppavi, + _In_ LPCWSTR szFile, + _In_ DWORD fccType, + _In_ LONG lParam, + _In_ UINT mode, + _In_opt_ CLSID *pclsidHandler); + #define AVIStreamOpenFromFile WINELIB_NAME_AW(AVIStreamOpenFromFile) -LONG WINAPI AVIStreamBeginStreaming(PAVISTREAM pavi, LONG lStart, LONG lEnd, LONG lRate); -LONG WINAPI AVIStreamEndStreaming(PAVISTREAM pavi); - -HRESULT WINAPI AVIBuildFilterA(LPSTR szFilter, LONG cbFilter, BOOL fSaving); -HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving); +LONG +WINAPI +AVIStreamBeginStreaming( + _In_ PAVISTREAM pavi, + _In_ LONG lStart, + _In_ LONG lEnd, + _In_ LONG lRate); + +LONG WINAPI AVIStreamEndStreaming(_In_ PAVISTREAM pavi); + +HRESULT +WINAPI +AVIBuildFilterA( + _Out_writes_(cbFilter) LPSTR szFilter, + _In_ LONG cbFilter, + _In_ BOOL fSaving); + +HRESULT +WINAPI +AVIBuildFilterW( + _Out_writes_(cbFilter) LPWSTR szFilter, + _In_ LONG cbFilter, + _In_ BOOL fSaving); + #define AVIBuildFilter WINELIB_NAME_AW(AVIBuildFilter) -BOOL WINAPI AVISaveOptions(HWND hWnd,UINT uFlags,INT nStream, - PAVISTREAM *ppavi,LPAVICOMPRESSOPTIONS *ppOptions); -HRESULT WINAPI AVISaveOptionsFree(INT nStreams,LPAVICOMPRESSOPTIONS*ppOptions); - -HRESULT CDECL AVISaveA(LPCSTR szFile, CLSID *pclsidHandler, - AVISAVECALLBACK lpfnCallback, int nStreams, - PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...); -HRESULT CDECL AVISaveW(LPCWSTR szFile, CLSID *pclsidHandler, - AVISAVECALLBACK lpfnCallback, int nStreams, - PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...); +BOOL +WINAPI +AVISaveOptions( + _In_ HWND hWnd, + _In_ UINT uFlags, + _In_ INT nStream, + _In_reads_(nStream) PAVISTREAM *ppavi, + _Inout_updates_(nStream) LPAVICOMPRESSOPTIONS *ppOptions); + +HRESULT +WINAPI +AVISaveOptionsFree( + INT nStreams, + _In_reads_(nStreams) LPAVICOMPRESSOPTIONS *ppOptions); + +HRESULT +CDECL +AVISaveA( + LPCSTR szFile, + _In_opt_ CLSID *pclsidHandler, + _In_ AVISAVECALLBACK lpfnCallback, + _In_ int nStreams, + _In_ PAVISTREAM pavi, + _In_ LPAVICOMPRESSOPTIONS lpOptions, + ...); + +HRESULT +CDECL +AVISaveW( + LPCWSTR szFile, + _In_opt_ CLSID *pclsidHandler, + _In_ AVISAVECALLBACK lpfnCallback, + _In_ int nStreams, + _In_ PAVISTREAM pavi, + _In_ LPAVICOMPRESSOPTIONS lpOptions, + ...); + #define AVISave WINELIB_NAME_AW(AVISave) -HRESULT WINAPI AVISaveVA(LPCSTR szFile, CLSID *pclsidHandler, - AVISAVECALLBACK lpfnCallback, int nStream, - PAVISTREAM *ppavi, LPAVICOMPRESSOPTIONS *plpOptions); -HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler, - AVISAVECALLBACK lpfnCallback, int nStream, - PAVISTREAM *ppavi, LPAVICOMPRESSOPTIONS *plpOptions); +HRESULT +WINAPI +AVISaveVA( + LPCSTR szFile, + _In_opt_ CLSID *pclsidHandler, + _In_ AVISAVECALLBACK lpfnCallback, + _In_ int nStream, + _In_reads_(nStream) PAVISTREAM *ppavi, + _In_reads_(nStream) LPAVICOMPRESSOPTIONS *plpOptions); + +HRESULT +WINAPI +AVISaveVW( + LPCWSTR szFile, + _In_opt_ CLSID *pclsidHandler, + _In_ AVISAVECALLBACK lpfnCallback, + _In_ int nStream, + _In_reads_(nStream) PAVISTREAM *ppavi, + _In_reads_(nStream) LPAVICOMPRESSOPTIONS *plpOptions); + #define AVISaveV WINELIB_NAME_AW(AVISaveV) -LONG WINAPI AVIStreamStart(PAVISTREAM iface); -LONG WINAPI AVIStreamLength(PAVISTREAM iface); -LONG WINAPI AVIStreamSampleToTime(PAVISTREAM pstream, LONG lSample); -LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime); +LONG WINAPI AVIStreamStart(_In_ PAVISTREAM iface); +LONG WINAPI AVIStreamLength(_In_ PAVISTREAM iface); +LONG WINAPI AVIStreamSampleToTime(_In_ PAVISTREAM pstream, _In_ LONG lSample); +LONG WINAPI AVIStreamTimeToSample(_In_ PAVISTREAM pstream, _In_ LONG lTime); #define AVIFileClose(pavi) \ AVIFileRelease(pavi) @@ -1140,12 +1466,12 @@ DECLARE_INTERFACE_(IAVIStreaming,IUnknown) { /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, _Outptr_ void** ppvObject) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IAVIStreaming methods ***/ - STDMETHOD(Begin)(IAVIStreaming*iface,LONG lStart,LONG lEnd,LONG lRate) PURE; - STDMETHOD(End)(IAVIStreaming*iface) PURE; + STDMETHOD(Begin)(IAVIStreaming *iface, _In_ LONG lStart, _In_ LONG lEnd, _In_ LONG lRate) PURE; + STDMETHOD(End)(IAVIStreaming *iface) PURE; }; #undef INTERFACE @@ -1166,15 +1492,15 @@ DECLARE_INTERFACE_(IAVIEditStream,IUnknown) { /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, _Outptr_ void** ppvObject) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IAVIEditStream methods ***/ - STDMETHOD(Cut)(IAVIEditStream*iface,LONG*plStart,LONG*plLength,PAVISTREAM*ppResult) PURE; - STDMETHOD(Copy)(IAVIEditStream*iface,LONG*plStart,LONG*plLength,PAVISTREAM*ppResult) PURE; - STDMETHOD(Paste)(IAVIEditStream*iface,LONG*plStart,LONG*plLength,PAVISTREAM pSource,LONG lStart,LONG lEnd) PURE; - STDMETHOD(Clone)(IAVIEditStream*iface,PAVISTREAM*ppResult) PURE; - STDMETHOD(SetInfo)(IAVIEditStream*iface,LPAVISTREAMINFOW asi, LONG size) PURE; + STDMETHOD(Cut)(IAVIEditStream *iface, _Inout_ LONG *plStart, _Inout_ LONG *plLength, _Outptr_ PAVISTREAM *ppResult) PURE; + STDMETHOD(Copy)(IAVIEditStream *iface, _Inout_ LONG *plStart, _Inout_ LONG *plLength, _Outptr_ PAVISTREAM *ppResult) PURE; + STDMETHOD(Paste)(IAVIEditStream *iface, _Inout_ LONG *plStart, _Inout_ LONG *plLength, _Inout_ PAVISTREAM pSource, _In_ LONG lStart, _In_ LONG lEnd) PURE; + STDMETHOD(Clone)(IAVIEditStream *iface, _Outptr_ PAVISTREAM *ppResult) PURE; + STDMETHOD(SetInfo)(IAVIEditStream *iface, _In_reads_bytes_(size) LPAVISTREAMINFOW asi, _In_ LONG size) PURE; }; #undef INTERFACE @@ -1191,23 +1517,62 @@ #define IAVIEditStream_SetInfo(p,a,b) (p)->lpVtbl->SetInfo(p,a,b) #endif -HRESULT WINAPI CreateEditableStream(PAVISTREAM *ppEditable,PAVISTREAM pSource); -HRESULT WINAPI EditStreamClone(PAVISTREAM pStream, PAVISTREAM *ppResult); -HRESULT WINAPI EditStreamCopy(PAVISTREAM pStream, LONG *plStart, - LONG *plLength, PAVISTREAM *ppResult); -HRESULT WINAPI EditStreamCut(PAVISTREAM pStream, LONG *plStart, - LONG *plLength, PAVISTREAM *ppResult); -HRESULT WINAPI EditStreamPaste(PAVISTREAM pDest, LONG *plStart, LONG *plLength, - PAVISTREAM pSource, LONG lStart, LONG lEnd); - -HRESULT WINAPI EditStreamSetInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi, - LONG size); -HRESULT WINAPI EditStreamSetInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi, - LONG size); +HRESULT +WINAPI +CreateEditableStream( + _Outptr_ PAVISTREAM *ppEditable, + _In_ PAVISTREAM pSource); + +HRESULT +WINAPI +EditStreamClone( + _In_ PAVISTREAM pStream, + _Outptr_ PAVISTREAM *ppResult); + +HRESULT +WINAPI +EditStreamCopy( + _In_ PAVISTREAM pStream, + _Inout_ LONG *plStart, + _Inout_ LONG *plLength, + _Outptr_ PAVISTREAM *ppResult); + +HRESULT +WINAPI +EditStreamCut( + _In_ PAVISTREAM pStream, + _Inout_ LONG *plStart, + _Inout_ LONG *plLength, + _Outptr_ PAVISTREAM *ppResult); + +HRESULT +WINAPI +EditStreamPaste( + _In_ PAVISTREAM pDest, + _Inout_ LONG *plStart, + _Inout_ LONG *plLength, + _In_ PAVISTREAM pSource, + _In_ LONG lStart, + _In_ LONG lEnd); + +HRESULT +WINAPI +EditStreamSetInfoA( + _In_ PAVISTREAM pstream, + _In_reads_bytes_(size) LPAVISTREAMINFOA asi, + _In_ LONG size); + +HRESULT +WINAPI +EditStreamSetInfoW( + _In_ PAVISTREAM pstream, + _In_reads_bytes_(size) LPAVISTREAMINFOW asi, + _In_ LONG size); + #define EditStreamSetInfo WINELIB_NAME_AW(EditStreamSetInfo) -HRESULT WINAPI EditStreamSetNameA(PAVISTREAM pstream, LPCSTR szName); -HRESULT WINAPI EditStreamSetNameW(PAVISTREAM pstream, LPCWSTR szName); +HRESULT WINAPI EditStreamSetNameA(_In_ PAVISTREAM pstream, _In_ LPCSTR szName); +HRESULT WINAPI EditStreamSetNameW(_In_ PAVISTREAM pstream, _In_ LPCWSTR szName); #define EditStreamSetName WINELIB_NAME_AW(EditStreamSetName) /***************************************************************************** @@ -1218,17 +1583,17 @@ DECLARE_INTERFACE_(IAVIFile,IUnknown) { /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, _Outptr_ void** ppvObject) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IAVIFile methods ***/ - STDMETHOD(Info)(THIS_ AVIFILEINFOW *pfi, LONG lSize) PURE; - STDMETHOD(GetStream)(THIS_ PAVISTREAM *ppStream, DWORD fccType, LONG lParam) PURE; - STDMETHOD(CreateStream)(THIS_ PAVISTREAM *ppStream, AVISTREAMINFOW *psi) PURE; - STDMETHOD(WriteData)(THIS_ DWORD fcc, LPVOID lpBuffer, LONG cbBuffer) PURE; - STDMETHOD(ReadData)(THIS_ DWORD fcc, LPVOID lpBuffer, LONG *lpcbBuffer) PURE; + STDMETHOD(Info)(THIS_ _Out_writes_bytes_(lSize) AVIFILEINFOW *pfi, _In_ LONG lSize) PURE; + STDMETHOD(GetStream)(THIS_ _Outptr_ PAVISTREAM *ppStream, _In_ DWORD fccType, _In_ LONG lParam) PURE; + STDMETHOD(CreateStream)(THIS_ _Outptr_ PAVISTREAM *ppStream, _In_ AVISTREAMINFOW *psi) PURE; + STDMETHOD(WriteData)(THIS_ _In_ DWORD fcc, _In_reads_bytes_(cbBuffer) LPVOID lpBuffer, _In_ LONG cbBuffer) PURE; + STDMETHOD(ReadData)(THIS_ _In_ DWORD fcc, _Out_writes_bytes_to_(*lpcbBuffer, *lpcbBuffer) LPVOID lpBuffer, _Inout_ LONG *lpcbBuffer) PURE; STDMETHOD(EndRecord)(THIS) PURE; - STDMETHOD(DeleteStream)(THIS_ DWORD fccType, LONG lParam) PURE; + STDMETHOD(DeleteStream)(THIS_ _In_ DWORD fccType, _In_ LONG lParam) PURE; }; #undef INTERFACE @@ -1250,22 +1615,84 @@ void WINAPI AVIFileInit(void); void WINAPI AVIFileExit(void); -HRESULT WINAPI AVIFileOpenA(PAVIFILE* ppfile,LPCSTR szFile,UINT uMode,LPCLSID lpHandler); -HRESULT WINAPI AVIFileOpenW(PAVIFILE* ppfile,LPCWSTR szFile,UINT uMode,LPCLSID lpHandler); +HRESULT +WINAPI +AVIFileOpenA( + _Outptr_ PAVIFILE* ppfile, + _In_ LPCSTR szFile, + UINT uMode, + _In_opt_ LPCLSID lpHandler); + +HRESULT +WINAPI +AVIFileOpenW( + _Outptr_ PAVIFILE* ppfile, + _In_ LPCWSTR szFile, + UINT uMode, + _In_opt_ LPCLSID lpHandler); + #define AVIFileOpen WINELIB_NAME_AW(AVIFileOpen) ULONG WINAPI AVIFileAddRef(PAVIFILE pfile); ULONG WINAPI AVIFileRelease(PAVIFILE pfile); -HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile,PAVIFILEINFOA pfi,LONG lSize); -HRESULT WINAPI AVIFileInfoW(PAVIFILE pfile,PAVIFILEINFOW pfi,LONG lSize); + +HRESULT +WINAPI +AVIFileInfoA( + _In_ PAVIFILE pfile, + _Out_writes_bytes_(lSize) PAVIFILEINFOA pfi, + _In_ LONG lSize); + +HRESULT +WINAPI +AVIFileInfoW( + _In_ PAVIFILE pfile, + _Out_writes_bytes_(lSize) PAVIFILEINFOW pfi, + _In_ LONG lSize); + #define AVIFileInfo WINELIB_NAME_AW(AVIFileInfo) -HRESULT WINAPI AVIFileGetStream(PAVIFILE pfile,PAVISTREAM* avis,DWORD fccType,LONG lParam); -HRESULT WINAPI AVIFileCreateStreamA(PAVIFILE pfile,PAVISTREAM* ppavi,AVISTREAMINFOA* psi); -HRESULT WINAPI AVIFileCreateStreamW(PAVIFILE pfile,PAVISTREAM* ppavi,AVISTREAMINFOW* psi); + +HRESULT +WINAPI +AVIFileGetStream( + _In_ PAVIFILE pfile, + _Outptr_ PAVISTREAM* avis, + _In_ DWORD fccType, + _In_ LONG lParam); + +HRESULT +WINAPI +AVIFileCreateStreamA( + _In_ PAVIFILE pfile, + _Outptr_ PAVISTREAM* ppavi, + _In_ AVISTREAMINFOA* psi); + +HRESULT +WINAPI +AVIFileCreateStreamW( + _In_ PAVIFILE pfile, + _Outptr_ PAVISTREAM* ppavi, + _In_ AVISTREAMINFOW* psi); + #define AVIFileCreateStream WINELIB_NAME_AW(AVIFileCreateStream) -HRESULT WINAPI AVIFileWriteData(PAVIFILE pfile,DWORD fcc,LPVOID lp,LONG size); -HRESULT WINAPI AVIFileReadData(PAVIFILE pfile,DWORD fcc,LPVOID lp,LPLONG size); -HRESULT WINAPI AVIFileEndRecord(PAVIFILE pfile); + +HRESULT +WINAPI +AVIFileWriteData( + _In_ PAVIFILE pfile, + _In_ DWORD fcc, + _In_reads_bytes_(size) LPVOID lp, + _In_ LONG size); + +HRESULT +WINAPI +AVIFileReadData( + _In_ PAVIFILE pfile, + _In_ DWORD fcc, + _Out_writes_bytes_to_(*size, *size) LPVOID lp, + _Inout_ LPLONG size); + +HRESULT WINAPI AVIFileEndRecord(_In_ PAVIFILE pfile); /***************************************************************************** * IGetFrame interface @@ -1274,14 +1701,14 @@ DECLARE_INTERFACE_(IGetFrame,IUnknown) { /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, _Outptr_ void** ppvObject) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IGetFrame methods ***/ - STDMETHOD_(LPVOID,GetFrame)(THIS_ LONG lPos) PURE; - STDMETHOD(Begin)(THIS_ LONG lStart, LONG lEnd, LONG lRate) PURE; + STDMETHOD_(LPVOID,GetFrame)(THIS_ _In_ LONG lPos) PURE; + STDMETHOD(Begin)(THIS_ _In_ LONG lStart, _In_ LONG lEnd, _In_ LONG lRate) PURE; STDMETHOD(End)(THIS) PURE; - STDMETHOD(SetFormat)(THIS_ LPBITMAPINFOHEADER lpbi, LPVOID lpBits, INT x, INT y, INT dx, INT dy) PURE; + STDMETHOD(SetFormat)(THIS_ _In_ LPBITMAPINFOHEADER lpbi, _In_opt_ LPVOID lpBits, _In_ INT x, _In_ INT y, _In_ INT dx, _In_ INT dy) PURE; }; #undef INTERFACE @@ -1298,15 +1725,15 @@ #endif HRESULT WINAPI AVIClearClipboard(void); -HRESULT WINAPI AVIGetFromClipboard(PAVIFILE *ppfile); -HRESULT WINAPI AVIPutFileOnClipboard(PAVIFILE pfile); +HRESULT WINAPI AVIGetFromClipboard(_Outptr_ PAVIFILE *ppfile); +HRESULT WINAPI AVIPutFileOnClipboard(_In_ PAVIFILE pfile); #ifdef OFN_READONLY -BOOL WINAPI GetOpenFileNamePreviewA(LPOPENFILENAMEA lpofn); -BOOL WINAPI GetOpenFileNamePreviewW(LPOPENFILENAMEW lpofn); +BOOL WINAPI GetOpenFileNamePreviewA(_Inout_ LPOPENFILENAMEA lpofn); +BOOL WINAPI GetOpenFileNamePreviewW(_Inout_ LPOPENFILENAMEW lpofn); #define GetOpenFileNamePreview WINELIB_NAME_AW(GetOpenFileNamePreview) -BOOL WINAPI GetSaveFileNamePreviewA(LPOPENFILENAMEA lpofn); -BOOL WINAPI GetSaveFileNamePreviewW(LPOPENFILENAMEW lpofn); +BOOL WINAPI GetSaveFileNamePreviewA(_Inout_ LPOPENFILENAMEA lpofn); +BOOL WINAPI GetSaveFileNamePreviewW(_Inout_ LPOPENFILENAMEW lpofn); #define GetSaveFileNamePreview WINELIB_NAME_AW(GetSaveFileNamePreview) #endif @@ -1335,9 +1762,23 @@ BOOL VFWAPIV MCIWndRegisterClass(void); -HWND VFWAPIV MCIWndCreateA(HWND, HINSTANCE, DWORD, LPCSTR); -HWND VFWAPIV MCIWndCreateW(HWND, HINSTANCE, DWORD, LPCWSTR); -#define MCIWndCreate WINELIB_NAME_AW(MCIWndCreate) +HWND +VFWAPIV +MCIWndCreateA( + _In_opt_ HWND, + _In_opt_ HINSTANCE, + _In_ DWORD, + _In_opt_ LPCSTR); + +HWND +VFWAPIV +MCIWndCreateW( + _In_opt_ HWND, + _In_opt_ HINSTANCE, + _In_ DWORD, + _In_opt_ LPCWSTR); + +#define MCIWndCreate WINELIB_NAME_AW(MCIWndCreate) #define MCIWNDOPENF_NEW 0x0001 @@ -1574,14 +2015,42 @@ } DRAWDIBTIME, *LPDRAWDIBTIME; HDRAWDIB VFWAPI DrawDibOpen( void ); -UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground); - -BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd, HDC hdc, INT dxDst, INT dyDst, - LPBITMAPINFOHEADER lpbi, INT dxSrc, INT dySrc, UINT wFlags); - -BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, INT xDst, INT yDst, INT dxDst, INT dyDst, - LPBITMAPINFOHEADER lpbi, LPVOID lpBits, - INT xSrc, INT ySrc, INT dxSrc, INT dySrc, UINT wFlags); + +UINT +VFWAPI +DrawDibRealize( + _In_ HDRAWDIB hdd, + _In_ HDC hdc, + _In_ BOOL fBackground); + +BOOL +VFWAPI +DrawDibBegin( + _In_ HDRAWDIB hdd, + _In_opt_ HDC hdc, + _In_ INT dxDst, + _In_ INT dyDst, + _In_ LPBITMAPINFOHEADER lpbi, + _In_ INT dxSrc, + _In_ INT dySrc, + _In_ UINT wFlags); + +BOOL +VFWAPI +DrawDibDraw( + _In_ HDRAWDIB hdd, + _In_ HDC hdc, + _In_ INT xDst, + _In_ INT yDst, + _In_ INT dxDst, + _In_ INT dyDst, + _In_opt_ LPBITMAPINFOHEADER lpbi, + _In_opt_ LPVOID lpBits, + _In_ INT xSrc, + _In_ INT ySrc, + _In_ INT dxSrc, + _In_ INT dySrc, + _In_ UINT wFlags); /* DrawDibDraw flags */ @@ -1602,19 +2071,34 @@ #define DDF_SAME_DIB DDF_SAME_DRAW #define DDF_SAME_SIZE DDF_SAME_DRAW -BOOL VFWAPI DrawDibSetPalette(HDRAWDIB hdd, HPALETTE hpal); -HPALETTE VFWAPI DrawDibGetPalette(HDRAWDIB hdd); -BOOL VFWAPI DrawDibChangePalette(HDRAWDIB hdd, int iStart, int iLen, LPPALETTEENTRY lppe); -LPVOID VFWAPI DrawDibGetBuffer(HDRAWDIB hdd, LPBITMAPINFOHEADER lpbi, DWORD dwSize, DWORD dwFlags); - -BOOL VFWAPI DrawDibStart(HDRAWDIB hdd, DWORD rate); -BOOL VFWAPI DrawDibStop(HDRAWDIB hdd); +BOOL VFWAPI DrawDibSetPalette(_In_ HDRAWDIB hdd, _In_opt_ HPALETTE hpal); +HPALETTE VFWAPI DrawDibGetPalette(_In_ HDRAWDIB hdd); + +BOOL +VFWAPI +DrawDibChangePalette( + _In_ HDRAWDIB hdd, + _In_ int iStart, + _In_ int iLen, + _In_reads_(iLen) LPPALETTEENTRY lppe); + +LPVOID +VFWAPI +DrawDibGetBuffer( + _In_ HDRAWDIB hdd, + _Out_ LPBITMAPINFOHEADER lpbi, + _In_ DWORD dwSize, + _In_ DWORD dwFlags); + +BOOL VFWAPI DrawDibStart(_In_ HDRAWDIB hdd, _In_ DWORD rate); +BOOL VFWAPI DrawDibStop(_In_ HDRAWDIB hdd); + #define DrawDibUpdate(hdd, hdc, x, y) \ DrawDibDraw(hdd, hdc, x, y, 0, 0, NULL, NULL, 0, 0, 0, 0, DDF_UPDATE) -BOOL VFWAPI DrawDibEnd(HDRAWDIB hdd); -BOOL VFWAPI DrawDibClose(HDRAWDIB hdd); -BOOL VFWAPI DrawDibTime(HDRAWDIB hdd, LPDRAWDIBTIME lpddtime); +BOOL VFWAPI DrawDibEnd(_In_ HDRAWDIB hdd); +BOOL VFWAPI DrawDibClose(_In_ HDRAWDIB hdd); +BOOL VFWAPI DrawDibTime(_In_ HDRAWDIB hdd, _Out_ LPDRAWDIBTIME lpddtime); /* display profiling */ #define PD_CAN_DRAW_DIB 0x0001 @@ -1623,7 +2107,7 @@ #define PD_STRETCHDIB_1_2_OK 0x0008 #define PD_STRETCHDIB_1_N_OK 0x0010 -DWORD VFWAPI DrawDibProfileDisplay(LPBITMAPINFOHEADER lpbi); +DWORD VFWAPI DrawDibProfileDisplay(_In_ LPBITMAPINFOHEADER lpbi); DECLARE_HANDLE(HVIDEO); typedef HVIDEO *LPHVIDEO; @@ -1917,21 +2401,92 @@ UINT AVStreamMaster; } CAPTUREPARMS, *PCAPTUREPARMS, *LPCAPTUREPARMS; -typedef LRESULT (CALLBACK* CAPYIELDCALLBACK) (HWND hWnd); -typedef LRESULT (CALLBACK* CAPSTATUSCALLBACKW) (HWND hWnd, int nID, LPCWSTR lpsz); -typedef LRESULT (CALLBACK* CAPERRORCALLBACKW) (HWND hWnd, int nID, LPCWSTR lpsz); -typedef LRESULT (CALLBACK* CAPSTATUSCALLBACKA) (HWND hWnd, int nID, LPCSTR lpsz); -typedef LRESULT (CALLBACK* CAPERRORCALLBACKA) (HWND hWnd, int nID, LPCSTR lpsz); -typedef LRESULT (CALLBACK* CAPVIDEOCALLBACK) (HWND hWnd, LPVIDEOHDR lpVHdr); -typedef LRESULT (CALLBACK* CAPWAVECALLBACK) (HWND hWnd, LPWAVEHDR lpWHdr); -typedef LRESULT (CALLBACK* CAPCONTROLCALLBACK)(HWND hWnd, int nState); - -HWND VFWAPI capCreateCaptureWindowA(LPCSTR,DWORD,INT,INT,INT,INT,HWND,INT); -HWND VFWAPI capCreateCaptureWindowW(LPCWSTR,DWORD,INT,INT,INT,INT,HWND,INT); -#define capCreateCaptureWindow WINELIB_NAME_AW(capCreateCaptureWindow) -BOOL VFWAPI capGetDriverDescriptionA(WORD,LPSTR,INT,LPSTR,INT); -BOOL VFWAPI capGetDriverDescriptionW(WORD,LPWSTR,INT,LPWSTR,INT); -#define capGetDriverDescription WINELIB_NAME_AW(capGetDriverDescription) +typedef LRESULT (CALLBACK* CAPYIELDCALLBACK)(_In_ HWND hWnd); + +typedef LRESULT +(CALLBACK* CAPSTATUSCALLBACKW)( + _In_ HWND hWnd, + _In_ int nID, + _In_ LPCWSTR lpsz); + +typedef LRESULT +(CALLBACK* CAPERRORCALLBACKW)( + _In_ HWND hWnd, + _In_ int nID, + LPCWSTR lpsz); + +typedef LRESULT +(CALLBACK* CAPSTATUSCALLBACKA)( + _In_ HWND hWnd, + _In_ int nID, + LPCSTR lpsz); + +typedef LRESULT +(CALLBACK* CAPERRORCALLBACKA)( + _In_ HWND hWnd, + _In_ int nID, + LPCSTR lpsz); + +typedef LRESULT +(CALLBACK* CAPVIDEOCALLBACK)( + _In_ HWND hWnd, + _In_ LPVIDEOHDR lpVHdr); + +typedef LRESULT +(CALLBACK* CAPWAVECALLBACK)( + _In_ HWND hWnd, + _In_ LPWAVEHDR lpWHdr); + +typedef LRESULT +(CALLBACK* CAPCONTROLCALLBACK)( + _In_ HWND hWnd, + _In_ int nState); + +HWND +VFWAPI +capCreateCaptureWindowA( + LPCSTR, + _In_ DWORD, + _In_ INT, + _In_ INT, + _In_ INT, + _In_ INT, + _In_opt_ HWND, + _In_ INT); + +HWND +VFWAPI +capCreateCaptureWindowW( + LPCWSTR, + _In_ DWORD, + _In_ INT, + _In_ INT, + _In_ INT, + _In_ INT, + _In_opt_ HWND, + _In_ INT); + +#define capCreateCaptureWindow WINELIB_NAME_AW(capCreateCaptureWindow) + +BOOL +VFWAPI +capGetDriverDescriptionA( + WORD, + _Out_writes_(cbName) LPSTR, + _In_ INT cbName, + _Out_writes_(cbVer) LPSTR, + _In_ INT cbVer); + +BOOL +VFWAPI +capGetDriverDescriptionW( + WORD, + _Out_writes_(cbName) LPWSTR, + _In_ INT cbName, + _Out_writes_(cbVer) LPWSTR, + _In_ INT cbVer); + +#define capGetDriverDescription WINELIB_NAME_AW(capGetDriverDescription) #ifdef __cplusplus }

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