Ros-diffs August 2013

ros-diffs@reactos.org

10 participants
327 discussions

[ekohl] 59842: [ADVAPI32] GetSidSubAuthority and GetSidSubAuthorityCount: Set last error code to ERROR_SUCCESS before calling the Rtl function.
by ekohl＠svn.reactos.org 27 Aug '13

27 Aug '13

Author: ekohl Date: Tue Aug 27 20:58:29 2013 New Revision: 59842 URL: http://svn.reactos.org/svn/reactos?rev=59842&view=rev Log: [ADVAPI32] GetSidSubAuthority and GetSidSubAuthorityCount: Set last error code to ERROR_SUCCESS before calling the Rtl function. Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Tue Aug 27 20:58:29 2013 @@ -1499,6 +1499,7 @@ GetSidSubAuthority(PSID pSid, DWORD nSubAuthority) { + SetLastError(ERROR_SUCCESS); return (PDWORD)RtlSubAuthoritySid(pSid, nSubAuthority); } @@ -1510,6 +1511,7 @@ WINAPI GetSidSubAuthorityCount(PSID pSid) { + SetLastError(ERROR_SUCCESS); return RtlSubAuthorityCountSid(pSid); }

1 0

[akhaldi] 59841: [COM_APITEST] * Fix build.
by akhaldi＠svn.reactos.org 27 Aug '13

27 Aug '13

Author: akhaldi Date: Tue Aug 27 19:16:41 2013 New Revision: 59841 URL: http://svn.reactos.org/svn/reactos?rev=59841&view=rev Log: [COM_APITEST] * Fix build. Modified: trunk/rostests/apitests/com/com_apitest.h Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Tue Aug 27 19:16:41 2013 @@ -36,7 +36,6 @@ #include <ndk/rtlfuncs.h> #include <initguid.h> -#define RTL_NUMBER_OF(x) (sizeof(x) / sizeof(x[0])) typedef IUnknown *PUNKNOWN; typedef struct _CLASS_AND_INTERFACES

1 0

[ion] 59840: [PSDK]: Add a bunch of missing RTL_ macros.
by ion＠svn.reactos.org 27 Aug '13

27 Aug '13

Author: ion Date: Tue Aug 27 18:28:47 2013 New Revision: 59840 URL: http://svn.reactos.org/svn/reactos?rev=59840&view=rev Log: [PSDK]: Add a bunch of missing RTL_ macros. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Tue Aug 27 18:28:47 2013 @@ -1645,6 +1645,49 @@ #define CONTAINING_RECORD(address, type, field) \ ((type *)(((ULONG_PTR)address) - (ULONG_PTR)(&(((type *)0)->field)))) #endif + +#define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field)) +#define RTL_SIZEOF_THROUGH_FIELD(type, field) \ + (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(type, field)) +#define RTL_CONTAINS_FIELD(Struct, Size, Field) \ + ((((PCHAR) (&(Struct)->Field)) + sizeof((Struct)->Field)) <= (((PCHAR) (Struct)) + (Size))) +#define RTL_NUMBER_OF_V1(A) (sizeof(A)/sizeof((A)[0])) + +#if defined(__cplusplus) && \ + !defined(MIDL_PASS) && \ + !defined(RC_INVOKED) && \ + !defined(_PREFAST_) && \ + (_MSC_FULL_VER >= 13009466) && \ + !defined(SORTPP_PASS) +#define RTL_NUMBER_OF_V2(A) (sizeof(*RtlpNumberOf(A))) +#else +#define RTL_NUMBER_OF_V2(A) RTL_NUMBER_OF_V1(A) +#endif + +#ifdef ENABLE_RTL_NUMBER_OF_V2 +#define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V2(A) +#else +#define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V1(A) +#endif +//#define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A) +//#define _ARRAYSIZE(A) RTL_NUMBER_OF_V1(A) + +#define RTL_FIELD_TYPE(type, field) (((type*)0)->field) +#define RTL_NUMBER_OF_FIELD(type, field) (RTL_NUMBER_OF(RTL_FIELD_TYPE(type, field))) +#define RTL_PADDING_BETWEEN_FIELDS(T, F1, F2) \ + ((FIELD_OFFSET(T, F2) > FIELD_OFFSET(T, F1)) \ + ? (FIELD_OFFSET(T, F2) - FIELD_OFFSET(T, F1) - RTL_FIELD_SIZE(T, F1)) \ + : (FIELD_OFFSET(T, F1) - FIELD_OFFSET(T, F2) - RTL_FIELD_SIZE(T, F2))) + +#if defined(__cplusplus) +#define RTL_CONST_CAST(type) const_cast<type> +#else +#define RTL_CONST_CAST(type) (type) +#endif + +#define RTL_BITS_OF(sizeOfArg) (sizeof(sizeOfArg) * 8) +#define RTL_BITS_OF_FIELD(type, field) (RTL_BITS_OF(RTL_FIELD_TYPE(type, field))) + /* end winddk.h */ #define IMAGE_SIZEOF_FILE_HEADER 20 #define IMAGE_FILE_RELOCS_STRIPPED 1

1 0

[akhaldi] 59839: [KERNEL32] * Check more parameters in MultiByteToWideChar() and WideCharToMultibyte(). By Marcus Boillat. * Fixes 4 kernel32:codepage tests. CORE-7411 #resolve #comment Committed i...
by akhaldi＠svn.reactos.org 26 Aug '13

26 Aug '13

Author: akhaldi Date: Mon Aug 26 21:36:16 2013 New Revision: 59839 URL: http://svn.reactos.org/svn/reactos?rev=59839&view=rev Log: [KERNEL32] * Check more parameters in MultiByteToWideChar() and WideCharToMultibyte(). By Marcus Boillat. * Fixes 4 kernel32:codepage tests. CORE-7411 #resolve #comment Committed in r59839 with formatting fixes. Thanks. Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Mon Aug 26 21:36:16 2013 @@ -1465,6 +1465,7 @@ { /* Check the parameters. */ if (MultiByteString == NULL || + MultiByteCount == 0 || (WideCharString == NULL && WideCharCount > 0) || (PVOID)MultiByteString == (PVOID)WideCharString) { @@ -1899,6 +1900,7 @@ { /* Check the parameters. */ if (WideCharString == NULL || + WideCharCount == 0 || (MultiByteString == NULL && MultiByteCount > 0) || (PVOID)WideCharString == (PVOID)MultiByteString || MultiByteCount < 0) @@ -1916,6 +1918,11 @@ switch (CodePage) { case CP_UTF8: + if (DefaultChar != NULL || UsedDefaultChar != NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } return IntWideCharToMultiByteUTF8(CodePage, Flags, WideCharString,

1 0

[ion] 59838: [SACDRV]: Implement DoCrashCommand. [SACDRV]: Cleanups and fixes. You can now use "Shutdown", "crashdump" and "restart" in the !SAC and the commands work as expected. [SACDRV]: Impleme...
by ion＠svn.reactos.org 26 Aug '13

26 Aug '13

Author: ion Date: Mon Aug 26 19:45:16 2013 New Revision: 59838 URL: http://svn.reactos.org/svn/reactos?rev=59838&view=rev Log: [SACDRV]: Implement DoCrashCommand. [SACDRV]: Cleanups and fixes. You can now use "Shutdown", "crashdump" and "restart" in the !SAC and the commands work as expected. [SACDRV]: Implement GetTListInfo and DoTlistCommand. PrintTListInfo is next to actually show the output. Modified: trunk/reactos/drivers/sac/driver/concmd.c trunk/reactos/drivers/sac/driver/conmgr.c trunk/reactos/drivers/sac/driver/sacdrv.h trunk/reactos/drivers/sac/driver/vtutf8chan.c trunk/reactos/include/reactos/mc/sacmsg.mc Modified: trunk/reactos/drivers/sac/driver/concmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/concmd.… ============================================================================== --- trunk/reactos/drivers/sac/driver/concmd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/concmd.c [iso-8859-1] Mon Aug 26 19:45:16 2013 @@ -12,7 +12,7 @@ /* GLOBALS *******************************************************************/ -PWCHAR GlobalBuffer; +PVOID GlobalBuffer; ULONG GlobalBufferSize; /* FUNCTIONS *****************************************************************/ @@ -57,30 +57,269 @@ return STATUS_NOT_IMPLEMENTED; } +typedef struct _SAC_SYSTEM_INFORMATION +{ + SYSTEM_BASIC_INFORMATION BasicInfo; + SYSTEM_TIMEOFDAY_INFORMATION TimeInfo; + SYSTEM_FILECACHE_INFORMATION CacheInfo; + SYSTEM_PERFORMANCE_INFORMATION PerfInfo; + ULONG RemainingSize; + ULONG ProcessDataOffset; + // SYSTEM_PAGEFILE_INFORMATION PageFileInfo; + // SYSTEM_PROCESS_INFORMATINO ProcessInfo; +} SAC_SYSTEM_INFORMATION, *PSAC_SYSTEM_INFORMATION; + NTSTATUS -GetTListInfo( - IN PVOID TListData, - IN ULONG InputSize, - IN ULONG TotalSize - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -VOID -PrintTListInfo( - IN PVOID TListData - ) -{ - -} - -VOID -PutMore( - OUT PBOOLEAN ScreenFull - ) -{ - +NTAPI +GetTListInfo(IN PSAC_SYSTEM_INFORMATION SacInfo, + IN ULONG InputSize, + OUT PULONG TotalSize) +{ + NTSTATUS Status; + ULONG BufferLength, ReturnLength, RemainingSize; + PSYSTEM_PAGEFILE_INFORMATION PageFileInfo; + PSYSTEM_PROCESS_INFORMATION ProcessInfo; + ULONG_PTR P; + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Entering.\n"); + + /* Assume failure */ + *TotalSize = 0; + + /* Bail out if the buffer is way too small */ + if (InputSize < 4) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, no memory.\n"); + return STATUS_NO_MEMORY; + } + + /* Make sure it's at least big enough to hold the static structure */ + BufferLength = InputSize - sizeof(SAC_SYSTEM_INFORMATION); + if ((INT)InputSize - sizeof(SAC_SYSTEM_INFORMATION) < 0) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, no memory (2).\n"); + return STATUS_NO_MEMORY; + } + + /* Query the time */ + Status = ZwQuerySystemInformation(SystemTimeOfDayInformation, + &SacInfo->TimeInfo, + sizeof(SacInfo->TimeInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, error.\n"); + return Status; + } + + /* Query basic information */ + Status = ZwQuerySystemInformation(SystemBasicInformation, + &SacInfo->BasicInfo, + sizeof(SacInfo->BasicInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, error (2).\n"); + return Status; + } + + /* Now query the pagefile information, which comes right after */ + P = (ULONG_PTR)(SacInfo + 1); + PageFileInfo = (PSYSTEM_PAGEFILE_INFORMATION)P; + Status = ZwQuerySystemInformation(SystemPageFileInformation, + PageFileInfo, + BufferLength, + &ReturnLength); + if (!NT_SUCCESS(Status) || !(ReturnLength)) + { + /* We failed -- is it because our buffer was too small? */ + if (BufferLength < ReturnLength) + { + /* Bail out */ + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, no memory(5).\n"); + return STATUS_NO_MEMORY; + } + + /* Some other reason, assume the buffer is now full */ + SacInfo->RemainingSize = 0; + } + else + { + /* This is the leftover data */ + SacInfo->RemainingSize = InputSize - BufferLength; + + /* This much has now been consumed, and where we are now */ + BufferLength -= ReturnLength; + P += ReturnLength; + + /* Are we out of memory? */ + if ((LONG)BufferLength < 0) + { + /* Bail out */ + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, no memory(3).\n"); + return STATUS_NO_MEMORY; + } + + /* All good, loop the pagefile data now */ + while (TRUE) + { + /* Is the pagefile name too big to fit? */ + if (PageFileInfo->PageFileName.Length > (LONG)BufferLength) + { + /* Bail out */ + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, error(3).\n"); + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Copy the name into our own buffer */ + RtlCopyMemory((PVOID)P, + PageFileInfo->PageFileName.Buffer, + PageFileInfo->PageFileName.Length); + PageFileInfo->PageFileName.Buffer = (PWCHAR)P; + + /* Update buffer lengths and offset */ + BufferLength -= PageFileInfo->PageFileName.Length; + P += PageFileInfo->PageFileName.Length; + + /* Are we out of memory? */ + if ((LONG)BufferLength < 0) + { + /* Bail out */ + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, no memory(4).\n"); + return STATUS_NO_MEMORY; + } + + /* If this was the only pagefile, break out */ + if (!PageFileInfo->NextEntryOffset) break; + + /* Otherwise, move to the next one */ + PageFileInfo = (PVOID)((ULONG_PTR)PageFileInfo + + PageFileInfo->NextEntryOffset); + } + } + + /* Next, query the file cache information */ + Status = ZwQuerySystemInformation(SystemFileCacheInformation, + &SacInfo->CacheInfo, + sizeof(SacInfo->CacheInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, error (4).\n"); + return Status; + } + + /* And then the performance information */ + Status = ZwQuerySystemInformation(SystemPerformanceInformation, + &SacInfo->PerfInfo, + sizeof(SacInfo->PerfInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, error(5).\n"); + return Status; + } + + /* Finally, align the buffer to query process and thread information */ + P = ALIGN_UP(P, SYSTEM_PROCESS_INFORMATION); + RemainingSize = (ULONG_PTR)SacInfo + InputSize - P; + + /* Are we out of memory? */ + if ((LONG)RemainingSize < 0) + { + /* Bail out */ + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, no memory (6).\n"); + return STATUS_NO_MEMORY; + } + + /* Now query the processes and threads */ + ProcessInfo = (PSYSTEM_PROCESS_INFORMATION)P; + Status = ZwQuerySystemInformation(SystemProcessInformation, + ProcessInfo, + RemainingSize, + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, error(6).\n"); + return Status; + } + + /* The first process name will be right after this buffer */ + P += ReturnLength; + + /* The caller should look for process info over here */ + SacInfo->ProcessDataOffset = InputSize - RemainingSize; + + /* This is how much buffer data we have left -- are we out? */ + BufferLength = RemainingSize - ReturnLength; + if ((LONG)BufferLength < 0) + { + /* Bail out */ + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, no memory(7).\n"); + return STATUS_NO_MEMORY; + } + + /* All good and ready to parse the process and thread list */ + while (TRUE) + { + /* Does the process have a name? */ + if (ProcessInfo->ImageName.Buffer) + { + /* Is the process name too big to fit? */ + if ((LONG)BufferLength < ProcessInfo->ImageName.Length) + { + /* Bail out */ + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, error(7).\n"); + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Copy the name into our own buffer */ + RtlCopyMemory((PVOID)P, + ProcessInfo->ImageName.Buffer, + ProcessInfo->ImageName.Length); + ProcessInfo->ImageName.Buffer = (PWCHAR)P; + + /* Update buffer lengths and offset */ + BufferLength -= ProcessInfo->ImageName.Length; + P += ProcessInfo->ImageName.Length; + + /* Are we out of memory? */ + if ((LONG)BufferLength < 0) + { + /* Bail out */ + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, no memory(8).\n"); + return STATUS_NO_MEMORY; + } + } + + /* If this was the only process, break out */ + if (!ProcessInfo->NextEntryOffset) break; + + /* Otherwise, move to the next one */ + ProcessInfo = (PVOID)((ULONG_PTR)ProcessInfo + + ProcessInfo->NextEntryOffset); + } + + /* All done! */ + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting.\n"); + *TotalSize = InputSize - BufferLength; + return STATUS_SUCCESS; +} + +VOID +NTAPI +PrintTListInfo(IN PSAC_SYSTEM_INFORMATION SacInfo) +{ + SAC_DBG(1, "Testing: %d %d %I64d\n", + SacInfo->BasicInfo.NumberOfPhysicalPages, + SacInfo->PerfInfo.AvailablePages, + SacInfo->TimeInfo.BootTime); +} + +VOID +NTAPI +PutMore(OUT PBOOLEAN ScreenFull) +{ + *ScreenFull = FALSE; } BOOLEAN @@ -167,144 +406,234 @@ NTAPI DoFullInfoCommand(VOID) { - + /* Flip the flag */ + GlobalDoThreads = !GlobalDoThreads; + + /* Print out the new state */ + SacPutSimpleMessage(GlobalDoThreads ? 8 : 7); } VOID NTAPI DoPagingCommand(VOID) { - + /* Flip the flag */ + GlobalPagingNeeded = !GlobalPagingNeeded; + + /* Print out the new state */ + SacPutSimpleMessage(GlobalPagingNeeded ? 10 : 9); } VOID NTAPI DoSetTimeCommand(IN PCHAR InputTime) { - + SAC_DBG(1, "Entering\n"); } VOID NTAPI DoKillCommand(IN PCHAR KillString) { - + SAC_DBG(1, "Entering\n"); } VOID NTAPI DoLowerPriorityCommand(IN PCHAR PrioString) { - + SAC_DBG(1, "Entering\n"); } VOID NTAPI DoRaisePriorityCommand(IN PCHAR PrioString) { - + SAC_DBG(1, "Entering\n"); } VOID NTAPI DoLimitMemoryCommand(IN PCHAR LimitString) { - + SAC_DBG(1, "Entering\n"); } VOID NTAPI DoCrashCommand(VOID) { - + SAC_DBG(1, "SAC DoCrashCommand: Entering.\n"); + + /* Crash the machine */ + KeBugCheckEx(MANUALLY_INITIATED_CRASH, 0, 0, 0, 0); + __debugbreak(); } VOID NTAPI DoMachineInformationCommand(VOID) { - + SAC_DBG(1, "Entering\n"); } VOID NTAPI DoChannelCommand(IN PCHAR ChannelString) { - + SAC_DBG(1, "Entering\n"); } VOID NTAPI DoCmdCommand(IN PCHAR InputString) { - + SAC_DBG(1, "Entering\n"); } VOID NTAPI DoLockCommand(VOID) { - -} - -#define PRINT_HELP_MESSAGE(x) \ -{ \ - Count += NewCount; \ - NewCount = GetMessageLineCount(x); \ - if ( (NewCount + Count) > SAC_VTUTF8_COL_HEIGHT) \ - { \ - PutMore(&ScreenFull); \ - if (ScreenFull) return; \ - Count = 0; \ - } \ - SacPutSimpleMessage(x); \ + SAC_DBG(1, "Entering\n"); +} + +FORCEINLINE +BOOLEAN +PrintHelpMessage(IN ULONG MessageId, + IN OUT PULONG Count) +{ + BOOLEAN ScreenFull; + ULONG NewCount; + + /* Get the amount of lines this message will take */ + NewCount = GetMessageLineCount(MessageId); + if ((NewCount + *Count) > SAC_VTUTF8_ROW_HEIGHT) + { + /* We are going to overflow the screen, wait for input */ + PutMore(&ScreenFull); + if (ScreenFull) return FALSE; + *Count = 0; + } + + /* Print out the message and update the amount of lines printed */ + SacPutSimpleMessage(MessageId); + *Count += NewCount; + return TRUE; } VOID NTAPI DoHelpCommand(VOID) { - ULONG NewCount = 0, Count = 0; - BOOLEAN ScreenFull = FALSE; - - PRINT_HELP_MESSAGE(112); - PRINT_HELP_MESSAGE(12); - PRINT_HELP_MESSAGE(13); - PRINT_HELP_MESSAGE(14); - PRINT_HELP_MESSAGE(15); - PRINT_HELP_MESSAGE(16); - PRINT_HELP_MESSAGE(31); - PRINT_HELP_MESSAGE(18); - PRINT_HELP_MESSAGE(19); - PRINT_HELP_MESSAGE(32); - PRINT_HELP_MESSAGE(20); - PRINT_HELP_MESSAGE(21); - PRINT_HELP_MESSAGE(22); - PRINT_HELP_MESSAGE(23); - PRINT_HELP_MESSAGE(24); - PRINT_HELP_MESSAGE(25); - PRINT_HELP_MESSAGE(27); - PRINT_HELP_MESSAGE(28); - PRINT_HELP_MESSAGE(29); + ULONG Count = 0; + + /* Print out all the help messages */ + if (!PrintHelpMessage(112, &Count)) return; + if (!PrintHelpMessage(12, &Count)) return; + if (!PrintHelpMessage(13, &Count)) return; + if (!PrintHelpMessage(14, &Count)) return; + if (!PrintHelpMessage(15, &Count)) return; + if (!PrintHelpMessage(16, &Count)) return; + if (!PrintHelpMessage(31, &Count)) return; + if (!PrintHelpMessage(18, &Count)) return; + if (!PrintHelpMessage(19, &Count)) return; + if (!PrintHelpMessage(32, &Count)) return; + if (!PrintHelpMessage(20, &Count)) return; + if (!PrintHelpMessage(21, &Count)) return; + if (!PrintHelpMessage(22, &Count)) return; + if (!PrintHelpMessage(23, &Count)) return; + if (!PrintHelpMessage(24, &Count)) return; + if (!PrintHelpMessage(25, &Count)) return; + if (!PrintHelpMessage(27, &Count)) return; + if (!PrintHelpMessage(28, &Count)) return; + if (!PrintHelpMessage(29, &Count)) return; } VOID NTAPI DoGetNetInfo(IN BOOLEAN DoPrint) { - + SAC_DBG(1, "Entering\n"); } VOID NTAPI DoSetIpAddressCommand(IN PCHAR IpString) { - + SAC_DBG(1, "Entering\n"); } VOID NTAPI DoTlistCommand(VOID) { - -} + NTSTATUS Status; + PVOID NewGlobalBuffer; + ULONG Size; + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC DoTlistCommand: Entering.\n"); + + /* Check if a global buffer already exists */ + if (!GlobalBuffer) + { + /* It doesn't, allocate one */ + GlobalBuffer = SacAllocatePool(4096, GLOBAL_BLOCK_TAG); + if (GlobalBuffer) + { + /* Remember its current size */ + GlobalBufferSize = 4096; + } + else + { + /* Out of memory, bail out */ + SacPutSimpleMessage(11); + SAC_DBG(1, "SAC DoTlistCommand: Exiting.\n"); + return; + } + } + + /* Loop as long as the buffer is too small */ + while (TRUE) + { + /* Get the process list */ + Status = GetTListInfo(GlobalBuffer, GlobalBufferSize, &Size); + if ((Status != STATUS_NO_MEMORY) && + (Status != STATUS_INFO_LENGTH_MISMATCH)) + { + /* It fits! Bail out */ + break; + } + + /* We need a new bigger buffer */ + NewGlobalBuffer = SacAllocatePool(GlobalBufferSize + 4096, + GLOBAL_BLOCK_TAG); + if (!NewGlobalBuffer) + { + /* Out of memory, bail out */ + SacPutSimpleMessage(11); + SAC_DBG(1, "SAC DoTlistCommand: Exiting.\n"); + return; + } + + /* Free the old one, update state */ + SacFreePool(GlobalBuffer); + GlobalBufferSize += 4096; + GlobalBuffer = NewGlobalBuffer; + } + + /* Did we get here because we have the whole list? */ + if (!NT_SUCCESS(Status)) + { + /* Nope, print out a failure message */ + SacPutSimpleMessage(68); + swprintf(GlobalBuffer, GetMessage(48), Status); + SacPutString(GlobalBuffer); + } + else + { + /* Yep, print out the list */ + PrintTListInfo(GlobalBuffer); + } + + SAC_DBG(1, "SAC DoTlistCommand: Exiting.\n"); +} Modified: trunk/reactos/drivers/sac/driver/conmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/conmgr.… ============================================================================== --- trunk/reactos/drivers/sac/driver/conmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/conmgr.c [iso-8859-1] Mon Aug 26 19:45:16 2013 @@ -30,6 +30,8 @@ BOOLEAN InputInEscape, InputInEscTab, ConMgrLastCharWasCR; CHAR InputBuffer[80]; +BOOLEAN GlobalPagingNeeded, GlobalDoThreads; + /* FUNCTIONS *****************************************************************/ VOID @@ -447,11 +449,6 @@ return Status; } -#define Shutdown 1 -#define Restart 3 -#define Nothing 0 -BOOLEAN GlobalPagingNeeded; - VOID NTAPI ConMgrProcessInputLine(VOID) @@ -566,7 +563,7 @@ } else if ((InputBuffer[0] != '\n') && (InputBuffer[0] != ANSI_NULL)) { - SacPutSimpleMessage(105); + SacPutSimpleMessage(SAC_UNKNOWN_COMMAND); } } @@ -851,25 +848,25 @@ ConMgrSerialPortConsumer(); switch (ExecutePostConsumerCommand) { - case 1: + case Restart: /* A reboot was sent, do it */ DoRebootCommand(FALSE); break; - case 2: + case Close: /* A close was sent, do it */ ChanMgrCloseChannel(ExecutePostConsumerCommandData); ChanMgrReleaseChannel(ExecutePostConsumerCommandData); break; - case 3: + case Shutdown: /* A shutdown was sent, do it */ DoRebootCommand(TRUE); break; } /* Clear the serial port consumer state */ - ExecutePostConsumerCommand = 0; + ExecutePostConsumerCommand = Nothing; ExecutePostConsumerCommandData = NULL; } } 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] Mon Aug 26 19:45:16 2013 @@ -262,6 +262,17 @@ } SAC_ANSI_DISPATCH; // +// Commands that the consumer and producer share +// +typedef enum _SAC_POST_COMMANDS +{ + Nothing, + Shutdown, + Close, + Restart +} SAC_POST_COMMANDS; + +// // SAC supports 3 different channel output types // typedef enum _SAC_CHANNEL_TYPE @@ -1232,7 +1243,7 @@ extern PCHAR SerialPortBuffer; extern LONG SerialPortConsumerIndex, SerialPortProducerIndex; extern PCHAR Utf8ConversionBuffer; -extern BOOLEAN GlobalPagingNeeded; +extern BOOLEAN GlobalPagingNeeded, GlobalDoThreads; extern ULONG Utf8ConversionBufferSize; extern BOOLEAN CommandConsoleLaunchingEnabled; Modified: trunk/reactos/drivers/sac/driver/vtutf8chan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/vtutf8c… ============================================================================== --- trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] Mon Aug 26 19:45:16 2013 @@ -881,7 +881,6 @@ if (Utf8Count) { /* Write it out on the wire */ - SAC_DBG(1, "Row: %d\tCol : %d\t\tValue : (%c) -> (%c)\n", R, C, *TmpBuffer, *Utf8ConversionBuffer); Status = ConMgrWriteData(Channel, Utf8ConversionBuffer, Utf8Count); if (!NT_SUCCESS(Status)) goto Quickie; } @@ -949,7 +948,6 @@ { /* Check what the character is */ pwch = &String[i]; - SAC_DBG(1, "Writing on VT-UTF8: (%lx)\n", *pwch); switch (*pwch) { /* It's an escape sequence... */ @@ -1003,7 +1001,7 @@ /* Now we're left with the before-last row, zero it out */ ASSERT(R == (SAC_VTUTF8_ROW_HEIGHT - 1)); - RtlZeroMemory(&Cursor[R], sizeof(Cursor[R])); + RtlZeroMemory(&Cursor->Cell[R], sizeof(Cursor->Cell[R])); /* Reset the row back by one */ Channel->CursorRow--; @@ -1178,7 +1176,6 @@ CHECK_PARAMETER2(String); /* Call the lower level function */ - SAC_DBG(1, "Writing on VT-UTF8: %S\n", String); Status = VTUTF8ChannelOWrite2(Channel, (PWCHAR)String, Length / sizeof(WCHAR)); if (NT_SUCCESS(Status)) { 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] Mon Aug 26 19:45:16 2013 @@ -513,7 +513,7 @@ . MessageId=105 -SymbolicName=SACDRV_105 +SymbolicName=SAC_UNKNOWN_COMMAND Language=English Unrecognized command. Try the 'help' command for more details. .

1 0

[hbelusca] 59837: [BOOTDATA] [CMD] The default command prompt is $p$g. But still keep the information line by setting a system environment variable "PROMPT" set to $i$p$g. Therefore, if you are tir...
by hbelusca＠svn.reactos.org 26 Aug '13

26 Aug '13

Author: hbelusca Date: Mon Aug 26 18:35:29 2013 New Revision: 59837 URL: http://svn.reactos.org/svn/reactos?rev=59837&view=rev Log: [BOOTDATA] [CMD] The default command prompt is $p$g. But still keep the information line by setting a system environment variable "PROMPT" set to $i$p$g. Therefore, if you are tired of it, either remove the environement variable or redefine it to whatever you want. In a current command-line session, to restore the default command prompt, enter "prompt" without any other parameter. Modified: trunk/reactos/base/shell/cmd/prompt.c trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/base/shell/cmd/prompt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/prompt.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] Mon Aug 26 18:35:29 2013 @@ -52,7 +52,7 @@ static TCHAR InfoLine[] = _T(" ReactOS Command Prompt Type HELP = Help "); /* The default prompt */ -static TCHAR DefaultPrompt[] = _T("$I$P$G"); +static TCHAR DefaultPrompt[] = _T("$P$G"); /* @@ -256,18 +256,13 @@ } /* - * If 'param' is NULL, then we need to set it to default, - * because that means the user entered "prompt" only. - * So even if 'param' is null you _must_ still set prompt - * to the default. There seems to be some kind of difference - * between winxp and 2k in this matter and this way will - * cover both. Do not use fixed size of 'szParam' for 'param'; - * the buffers are 8192 bytes and will later change to dynamic buffer. + * Set the PROMPT environment variable. If 'param' is NULL or is + * an empty string (the user entered "prompt" only), then remove + * the environment variable and therefore use the default prompt. + * Otherwise, use the new prompt. */ - - /* Set the PROMPT environment variable */ if (!SetEnvironmentVariable(_T("PROMPT"), - (param[0] != _T('\0') ? param : DefaultPrompt))) + (param && param[0] != _T('\0') ? param : NULL))) { return 1; } 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] Mon Aug 26 18:35:29 2013 @@ -1211,10 +1211,11 @@ ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PATHEXT",0x00000000,".COM;.EXE;.BAT;.CMD" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PROMPT",0x00000000,"$I$P$G" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PATHEXT",0x00000000,".COM;.EXE;.BAT;.CMD" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" ; Known DLLs

1 0

[akhaldi] 59836: [PSDK] * Annotate winsplp.h.
by akhaldi＠svn.reactos.org 26 Aug '13

26 Aug '13

Author: akhaldi Date: Mon Aug 26 14:14:47 2013 New Revision: 59836 URL: http://svn.reactos.org/svn/reactos?rev=59836&view=rev Log: [PSDK] * Annotate winsplp.h. Modified: trunk/reactos/include/psdk/winsplp.h Modified: trunk/reactos/include/psdk/winsplp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsplp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winsplp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsplp.h [iso-8859-1] Mon Aug 26 14:14:47 2013 @@ -20,6 +20,9 @@ #pragma once +#ifndef _WINSPLP_ +#define _WINSPLP_ + #ifdef __cplusplus extern "C" { #endif @@ -86,183 +89,557 @@ } SPLCLIENT_INFO_2_LONGHORN; typedef struct _PRINTPROVIDOR { - BOOL (WINAPI *fpOpenPrinter)(PWSTR lpPrinterName, HANDLE *phPrinter, - PPRINTER_DEFAULTSW pDefault); - BOOL (WINAPI *fpSetJob)(HANDLE hPrinter, DWORD JobID, DWORD Level, - LPBYTE pJob, DWORD Command); - BOOL (WINAPI *fpGetJob)(HANDLE hPrinter, DWORD JobID, DWORD Level, - LPBYTE pJob, DWORD cbBuf, LPDWORD pcbNeeded); - BOOL (WINAPI *fpEnumJobs)(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, - DWORD Level, LPBYTE pJob, DWORD cbBuf, LPDWORD pcbNeeded, - LPDWORD pcReturned); - HANDLE (WINAPI *fpAddPrinter)(LPWSTR pName, DWORD Level, LPBYTE pPrinter); - BOOL (WINAPI *fpDeletePrinter)(HANDLE hPrinter); - BOOL (WINAPI *fpSetPrinter)(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, - DWORD Command); - BOOL (WINAPI *fpGetPrinter)(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, - DWORD cbBuf, LPDWORD pcbNeeded); - BOOL (WINAPI *fpEnumPrinters)(DWORD dwType, LPWSTR lpszName, DWORD dwLevel, - LPBYTE lpbPrinters, DWORD cbBuf, LPDWORD lpdwNeeded, - LPDWORD lpdwReturned); - BOOL (WINAPI *fpAddPrinterDriver)(LPWSTR pName, DWORD Level, LPBYTE pDriverInfo); - BOOL (WINAPI *fpEnumPrinterDrivers)(LPWSTR pName, LPWSTR pEnvironment, - DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, - LPDWORD pcbNeeded, LPDWORD pcbReturned); - BOOL (WINAPI *fpGetPrinterDriver)(HANDLE hPrinter, LPWSTR pEnvironment, - DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, - LPDWORD pcbNeeded); - BOOL (WINAPI *fpGetPrinterDriverDirectory)(LPWSTR pName, LPWSTR pEnvironment, - DWORD Level, LPBYTE pDriverDirectory, - DWORD cbBuf, LPDWORD pcbNeeded); - BOOL (WINAPI *fpDeletePrinterDriver)(LPWSTR pName, LPWSTR pEnvironment, - LPWSTR pDriverName); - BOOL (WINAPI *fpAddPrintProcessor)(LPWSTR pName, LPWSTR pEnvironment, - LPWSTR pPathName, LPWSTR pPrintProcessorName); - BOOL (WINAPI *fpEnumPrintProcessors)(LPWSTR pName, LPWSTR pEnvironment, - DWORD Level, LPBYTE pPrintProcessorInfo, - DWORD cbBuf, LPDWORD pcbNeeded, - LPDWORD pcbReturned); - BOOL (WINAPI *fpGetPrintProcessorDirectory)(LPWSTR pName, LPWSTR pEnvironment, - DWORD Level, LPBYTE pPrintProcessorInfo, - DWORD cbBuf, LPDWORD pcbNeeded); - BOOL (WINAPI *fpDeletePrintProcessor)(LPWSTR pName, LPWSTR pEnvironment, - LPWSTR pPrintProcessorName); - BOOL (WINAPI *fpEnumPrintProcessorDatatypes)(LPWSTR pName, - LPWSTR pPrintProcessorName, - DWORD Level, LPBYTE pDatatypes, - DWORD cbBuf, LPDWORD pcbNeeded, - LPDWORD pcbReturned); - DWORD (WINAPI *fpStartDocPrinter)(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo); - BOOL (WINAPI *fpStartPagePrinter)(HANDLE hPrinter); - BOOL (WINAPI *fpWritePrinter)(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, - LPDWORD pcWritten); - BOOL (WINAPI *fpEndPagePrinter)(HANDLE hPrinter); - BOOL (WINAPI *fpAbortPrinter)(HANDLE hPrinter); - BOOL (WINAPI *fpReadPrinter)(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, - LPDWORD pNoBytesRead); - BOOL (WINAPI *fpEndDocPrinter)(HANDLE hPrinter); - BOOL (WINAPI *fpAddJob)(HANDLE hPrinter, DWORD Level, LPBYTE pData, - DWORD cbBuf, LPDWORD pcbNeeded); - BOOL (WINAPI *fpScheduleJob)(HANDLE hPrinter, DWORD JobID); - DWORD (WINAPI *fpGetPrinterData)(HANDLE hPrinter, LPWSTR pValueName, - LPDWORD pType, LPBYTE pData, DWORD nSize, - LPDWORD pcbNeeded); - DWORD (WINAPI *fpSetPrinterData)(HANDLE hPrinter, LPWSTR pValueName, - DWORD Type, LPBYTE pData, DWORD cbData); - DWORD (WINAPI *fpWaitForPrinterChange)(HANDLE hPrinter, DWORD Flags); - BOOL (WINAPI *fpClosePrinter)(HANDLE phPrinter); - BOOL (WINAPI *fpAddForm)(HANDLE hPrinter, DWORD Level, LPBYTE pForm); - BOOL (WINAPI *fpDeleteForm)(HANDLE hPrinter, LPWSTR pFormName); - BOOL (WINAPI *fpGetForm)(HANDLE hPrinter, LPWSTR pFormName, DWORD Level, - LPBYTE pForm, DWORD cbBuf, LPDWORD pcbNeeded); - BOOL (WINAPI *fpSetForm)(HANDLE hPrinter, LPWSTR pFormName, DWORD Level, - LPBYTE pForm); - BOOL (WINAPI *fpEnumForms)(HANDLE hPrinter, DWORD Level, LPBYTE pForm, - DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); - BOOL (WINAPI *fpEnumMonitors)(LPWSTR pName, DWORD Level, LPBYTE pMonitors, - DWORD cbBuf, LPDWORD pcbNeeded, - LPDWORD pcReturned); - BOOL (WINAPI *fpEnumPorts)(LPWSTR pName, DWORD Level, LPBYTE pPorts, - DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); - BOOL (WINAPI *fpAddPort)(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName); - BOOL (WINAPI *fpConfigurePort)(LPWSTR pName, HWND hWnd, LPWSTR pPortName); - BOOL (WINAPI *fpDeletePort)(LPWSTR pName, HWND hWnd, LPWSTR pPortName); - HANDLE (WINAPI *fpCreatePrinterIC)(HANDLE hPrinter, LPDEVMODEW pDevMode); - BOOL (WINAPI *fpPlayGdiScriptOnPrinterIC)(HANDLE hPrinterIC, LPBYTE pIn, - DWORD cIn, LPBYTE pOut, DWORD cOut, - DWORD ul); - BOOL (WINAPI *fpDeletePrinterIC)(HANDLE hPrinterIC); - BOOL (WINAPI *fpAddPrinterConnection)(LPWSTR pName); - BOOL (WINAPI *fpDeletePrinterConnection)(LPWSTR pName); - DWORD (WINAPI *fpPrinterMessageBox)(HANDLE hPrinter, DWORD Error, HWND hWnd, - LPWSTR pText, LPWSTR pCaption, - DWORD dwType); - BOOL (WINAPI *fpAddMonitor)(LPWSTR pName, DWORD Level, LPBYTE pMonitors); - BOOL (WINAPI *fpDeleteMonitor)(LPWSTR pName, LPWSTR pEnvironment, - LPWSTR pMonitorName); - BOOL (WINAPI *fpResetPrinter)(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault); - BOOL (WINAPI *fpGetPrinterDriverEx)(HANDLE hPrinter, LPWSTR pEnvironment, - DWORD Level, LPBYTE pDriverInfo, - DWORD cbBuf, LPDWORD pcbNeeded, - DWORD dwClientMajorVersion, - DWORD dwClientMinorVersion, - PDWORD pdwServerMajorVersion, - PDWORD pdwServerMinorVersion); + + BOOL + (WINAPI *fpOpenPrinter)( + _In_opt_ PWSTR lpPrinterName, + _Out_ HANDLE *phPrinter, + _In_opt_ PPRINTER_DEFAULTSW pDefault); + + BOOL + (WINAPI *fpSetJob)( + _In_ HANDLE hPrinter, + _In_ DWORD JobID, + _In_ DWORD Level, + _In_reads_opt_(_Inexpressible_(0)) LPBYTE pJob, + _In_ DWORD Command); + + BOOL + (WINAPI *fpGetJob)( + _In_ HANDLE hPrinter, + _In_ DWORD JobID, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pJob, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + + BOOL + (WINAPI *fpEnumJobs)( + _In_ HANDLE hPrinter, + _In_ DWORD FirstJob, + _In_ DWORD NoJobs, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pJob, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + + HANDLE + (WINAPI *fpAddPrinter)( + _In_opt_ LPWSTR pName, + _In_ DWORD Level, + _In_reads_(_Inexpressible_(0)) LPBYTE pPrinter); + + BOOL (WINAPI *fpDeletePrinter)(_In_ HANDLE hPrinter); + + BOOL + (WINAPI *fpSetPrinter)( + _In_ HANDLE hPrinter, + _In_ DWORD Level, + _In_reads_(_Inexpressible_(0)) LPBYTE pPrinter, + _In_ DWORD Command); + + BOOL + (WINAPI *fpGetPrinter)( + _In_ HANDLE hPrinter, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pPrinter, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + + BOOL + (WINAPI *fpEnumPrinters)( + _In_ DWORD dwType, + _In_opt_ LPWSTR lpszName, + _In_ DWORD dwLevel, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE lpbPrinters, + _In_ DWORD cbBuf, + _Out_ LPDWORD lpdwNeeded, + _Out_ LPDWORD lpdwReturned); + + BOOL + (WINAPI *fpAddPrinterDriver)( + _In_opt_ LPWSTR pName, + _In_ DWORD Level, + _In_reads_(_Inexpressible_(0)) LPBYTE pDriverInfo); + + BOOL + (WINAPI *fpEnumPrinterDrivers)( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pDriverInfo, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcbReturned); + + BOOL + (WINAPI *fpGetPrinterDriver)( + _In_ HANDLE hPrinter, + _In_opt_ LPWSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pDriverInfo, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + + BOOL + (WINAPI *fpGetPrinterDriverDirectory)( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pDriverDirectory, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + + BOOL + (WINAPI *fpDeletePrinterDriver)( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ LPWSTR pDriverName); + + BOOL + (WINAPI *fpAddPrintProcessor)( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ LPWSTR pPathName, + _In_ LPWSTR pPrintProcessorName); + + BOOL + (WINAPI *fpEnumPrintProcessors)( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pPrintProcessorInfo, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcbReturned); + + BOOL + (WINAPI *fpGetPrintProcessorDirectory)( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pPrintProcessorInfo, + _In_ DWORD cbBuf, + _In_ LPDWORD pcbNeeded); + + BOOL + (WINAPI *fpDeletePrintProcessor)( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ LPWSTR pPrintProcessorName); + + BOOL + (WINAPI *fpEnumPrintProcessorDatatypes)( + _In_opt_ LPWSTR pName, + _In_ LPWSTR pPrintProcessorName, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pDatatypes, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcbReturned); + + DWORD + (WINAPI *fpStartDocPrinter)( + _In_ HANDLE hPrinter, + _In_ DWORD Level, + _In_reads_(_Inexpressible_(0)) LPBYTE pDocInfo); + + BOOL (WINAPI *fpStartPagePrinter)(_In_ HANDLE hPrinter); + + BOOL + (WINAPI *fpWritePrinter)( + _In_ HANDLE hPrinter, + _In_reads_bytes_(cbBuf) LPVOID pBuf, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcWritten); + + BOOL (WINAPI *fpEndPagePrinter)(_In_ HANDLE hPrinter); + + BOOL (WINAPI *fpAbortPrinter)(_In_ HANDLE hPrinter); + + BOOL + (WINAPI *fpReadPrinter)( + _In_ HANDLE hPrinter, + _Out_writes_bytes_to_opt_(cbBuf, *pNoBytesRead) LPVOID pBuf, + _In_ DWORD cbBuf, + _Out_ LPDWORD pNoBytesRead); + + BOOL (WINAPI *fpEndDocPrinter)(_In_ HANDLE hPrinter); + + BOOL + (WINAPI *fpAddJob)( + _In_ HANDLE hPrinter, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pData, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + + BOOL (WINAPI *fpScheduleJob)(_In_ HANDLE hPrinter, _In_ DWORD JobID); + + DWORD + (WINAPI *fpGetPrinterData)( + _In_ HANDLE hPrinter, + _In_ LPWSTR pValueName, + _Out_opt_ LPDWORD pType, + _Out_writes_bytes_to_opt_(nSize, *pcbNeeded) LPBYTE pData, + _In_ DWORD nSize, + _Out_ LPDWORD pcbNeeded); + + DWORD + (WINAPI *fpSetPrinterData)( + _In_ HANDLE hPrinter, + _In_ LPWSTR pValueName, + _In_ DWORD Type, + _In_reads_bytes_(cbData) LPBYTE pData, + _In_ DWORD cbData); + + DWORD + (WINAPI *fpWaitForPrinterChange)( + _In_ HANDLE hPrinter, + _In_ DWORD Flags); + + BOOL (WINAPI *fpClosePrinter)(_In_ HANDLE phPrinter); + + BOOL + (WINAPI *fpAddForm)( + _In_ HANDLE hPrinter, + _In_ DWORD Level, + _In_reads_(_Inexpressible_(0)) LPBYTE pForm); + + BOOL (WINAPI *fpDeleteForm)(_In_ HANDLE hPrinter, _In_ LPWSTR pFormName); + + BOOL + (WINAPI *fpGetForm)( + _In_ HANDLE hPrinter, + _In_ LPWSTR pFormName, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pForm, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + + BOOL + (WINAPI *fpSetForm)( + _In_ HANDLE hPrinter, + _In_ LPWSTR pFormName, + _In_ DWORD Level, + _In_reads_(_Inexpressible_(0)) LPBYTE pForm); + + BOOL + (WINAPI *fpEnumForms)( + _In_ HANDLE hPrinter, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pForm, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + + BOOL + (WINAPI *fpEnumMonitors)( + _In_opt_ LPWSTR pName, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pMonitors, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + + BOOL + (WINAPI *fpEnumPorts)( + _In_opt_ LPWSTR pName, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pPorts, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + + BOOL + (WINAPI *fpAddPort)( + _In_opt_ LPWSTR pName, + _In_ HWND hWnd, + _In_ LPWSTR pMonitorName); + + BOOL + (WINAPI *fpConfigurePort)( + _In_opt_ LPWSTR pName, + _In_ HWND hWnd, + _In_ LPWSTR pPortName); + + BOOL + (WINAPI *fpDeletePort)( + _In_opt_ LPWSTR pName, + _In_ HWND hWnd, + _In_ LPWSTR pPortName); + + HANDLE + (WINAPI *fpCreatePrinterIC)( + _In_ HANDLE hPrinter, + _In_opt_ LPDEVMODEW pDevMode); + + BOOL + (WINAPI *fpPlayGdiScriptOnPrinterIC)( + _In_ HANDLE hPrinterIC, + _In_reads_bytes_(cIn) LPBYTE pIn, + _In_ DWORD cIn, + _Out_writes_bytes_(cOut) LPBYTE pOut, + _In_ DWORD cOut, + _In_ DWORD ul); + + BOOL (WINAPI *fpDeletePrinterIC)(_In_ HANDLE hPrinterIC); + + BOOL (WINAPI *fpAddPrinterConnection)(_In_ LPWSTR pName); + + BOOL (WINAPI *fpDeletePrinterConnection)(_In_ LPWSTR pName); + + DWORD + (WINAPI *fpPrinterMessageBox)( + _In_ HANDLE hPrinter, + _In_ DWORD Error, + _In_ HWND hWnd, + _In_ LPWSTR pText, + _In_ LPWSTR pCaption, + _In_ DWORD dwType); + + BOOL + (WINAPI *fpAddMonitor)( + _In_opt_ LPWSTR pName, + _In_ DWORD Level, + _In_reads_(_Inexpressible_(0)) LPBYTE pMonitors); + + BOOL + (WINAPI *fpDeleteMonitor)( + _In_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ LPWSTR pMonitorName); + + BOOL + (WINAPI *fpResetPrinter)( + _In_ HANDLE hPrinter, + _In_ LPPRINTER_DEFAULTSW pDefault); + + BOOL + (WINAPI *fpGetPrinterDriverEx)( + _In_ HANDLE hPrinter, + _In_opt_ LPWSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pDriverInfo, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _In_ DWORD dwClientMajorVersion, + _In_ DWORD dwClientMinorVersion, + _Out_ PDWORD pdwServerMajorVersion, + _Out_ PDWORD pdwServerMinorVersion); + HANDLE (WINAPI *fpFindFirstPrinterChangeNotification)(HANDLE hPrinter, DWORD fdwFlags, DWORD fdwOptions, LPVOID pPrinterNotifyOptions); - BOOL (WINAPI *fpFindClosePrinterChangeNotification)(HANDLE hChange); - BOOL (WINAPI *fpAddPortEx)(LPWSTR pName, DWORD Level, LPBYTE lpBuffer, - LPWSTR lpMonitorName); - BOOL (WINAPI *fpShutDown)(LPVOID pvReserved); - BOOL (WINAPI *fpRefreshPrinterChangeNotification)(HANDLE hPrinter, - DWORD Reserved, - PVOID pvReserved, - PVOID pPrinterNotifyInfo); - BOOL (WINAPI *fpOpenPrinterEx)(LPWSTR pPrinterName, LPHANDLE phPrinter, - LPPRINTER_DEFAULTSW pDefault, LPBYTE pClientInfo, - DWORD Level); - HANDLE (WINAPI *fpAddPrinterEx)(LPWSTR pName, DWORD Level, LPBYTE pPrinter, - LPBYTE pClientInfo, DWORD ClientInfoLevel); - BOOL (WINAPI *fpSetPort)(LPWSTR pName, LPWSTR pPortName, DWORD dwLevel, - LPBYTE pPortInfo); - DWORD (WINAPI *fpEnumPrinterData)(HANDLE hPrinter, DWORD dwIndex, - LPWSTR pValueName, DWORD cbValueName, - LPDWORD pcbValueName, LPDWORD pType, - LPBYTE pData, DWORD cbData, LPDWORD pcbData); - DWORD (WINAPI *fpDeletePrinterData)(HANDLE hPrinter, LPWSTR pValueName); - DWORD (WINAPI *fpClusterSplOpen)(LPCWSTR pszServer, LPCWSTR pszResource, - PHANDLE phSpooler, LPCWSTR pszName, - LPCWSTR pszAddress); - DWORD (WINAPI *fpClusterSplClose)(HANDLE hSpooler); - DWORD (WINAPI *fpClusterSplIsAlive)(HANDLE hSpooler); - DWORD (WINAPI *fpSetPrinterDataEx)(HANDLE hPrinter, LPCWSTR pKeyName, - LPCWSTR pValueName, DWORD Type, - LPBYTE pData, DWORD cbData); - DWORD (WINAPI *fpGetPrinterDataEx)(HANDLE hPrinter, LPCWSTR pKeyName, - LPCWSTR pValueName, LPDWORD pType, - LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded); - DWORD (WINAPI *fpEnumPrinterDataEx)(HANDLE hPrinter, LPCWSTR pKeyName, - LPBYTE pEnumValues, DWORD cbEnumValues, - LPDWORD pcbEnumValues, LPDWORD pnEnumValues); - DWORD (WINAPI *fpEnumPrinterKey)(HANDLE hPrinter, LPCWSTR pKeyName, - LPWSTR pSubkey, DWORD cbSubkey, LPDWORD pcbSubkey); - DWORD (WINAPI *fpDeletePrinterDataEx)(HANDLE hPrinter, LPCWSTR pKeyName, - LPCWSTR pValueName); - DWORD (WINAPI *fpDeletePrinterKey)(HANDLE hPrinter, LPCWSTR pKeyName); - BOOL (WINAPI *fpSeekPrinter)(HANDLE hPrinter, LARGE_INTEGER liDistanceToMove, - PLARGE_INTEGER pliNewPointer, DWORD dwMoveMethod, - BOOL bWrite); - BOOL (WINAPI *fpDeletePrinterDriverEx)(LPWSTR pName, LPWSTR pEnvironment, - LPWSTR pDriverName, DWORD dwDeleteFlag, - DWORD dwVersionNum); - BOOL (WINAPI *fpAddPerMachineConnection)(LPCWSTR pServer, - LPCWSTR pPrinterName, LPCWSTR pPrintServer, - LPCWSTR pProvider); - BOOL (WINAPI *fpDeletePerMachineConnection)(LPCWSTR pServer, - LPCWSTR pPrinterName); - BOOL (WINAPI *fpEnumPerMachineConnections)(LPCWSTR pServer, - LPBYTE pPrinterEnum, DWORD cbBuf, - LPDWORD pcbNeeded, - LPDWORD pcReturned); - BOOL (WINAPI *fpXcvData)(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, - DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, - PDWORD pcbOutputNeeded, PDWORD pdwStatus); - BOOL (WINAPI *fpAddPrinterDriverEx)(LPWSTR pName, DWORD Level, - LPBYTE pDriverInfo, DWORD dwFileCopyFlags); - BOOL (WINAPI *fpSplReadPrinter)(HANDLE hPrinter, LPBYTE *pBuf, DWORD cbBuf); - BOOL (WINAPI *fpDriverUnloadComplete)(LPWSTR pDriverFile); - BOOL (WINAPI *fpGetSpoolFileInfo)(HANDLE hPrinter, LPWSTR *pSpoolDir, - LPHANDLE phFile, HANDLE hSpoolerProcess, - HANDLE hAppProcess); - BOOL (WINAPI *fpCommitSpoolData)(HANDLE hPrinter, DWORD cbCommit); - BOOL (WINAPI *fpCloseSpoolFileHandle)(HANDLE hPrinter); - BOOL (WINAPI *fpFlushPrinter)(HANDLE hPrinter, LPBYTE pBuf, DWORD cbBuf, - LPDWORD pcWritten, DWORD cSleep); - DWORD (WINAPI *fpSendRecvBidiData)(HANDLE hPort, LPCWSTR pAction, - LPBIDI_REQUEST_CONTAINER pReqData, - LPBIDI_RESPONSE_CONTAINER *ppResData); + + BOOL (WINAPI *fpFindClosePrinterChangeNotification)(_In_ HANDLE hChange); + + BOOL + (WINAPI *fpAddPortEx)( + _In_opt_ LPWSTR pName, + _In_ DWORD Level, + _In_reads_(_Inexpressible_(0)) LPBYTE lpBuffer, + _In_ LPWSTR lpMonitorName); + + BOOL (WINAPI *fpShutDown)(_In_opt_ LPVOID pvReserved); + + BOOL + (WINAPI *fpRefreshPrinterChangeNotification)( + _In_ HANDLE hPrinter, + _In_ DWORD Reserved, + _In_opt_ PVOID pvReserved, + _In_ PVOID pPrinterNotifyInfo); + + BOOL + (WINAPI *fpOpenPrinterEx)( + _In_opt_ LPWSTR pPrinterName, + _Out_ LPHANDLE phPrinter, + _In_opt_ LPPRINTER_DEFAULTSW pDefault, + _In_reads_opt_(_Inexpressible_(0)) LPBYTE pClientInfo, + _In_ DWORD Level); + + HANDLE + (WINAPI *fpAddPrinterEx)( + _In_opt_ LPWSTR pName, + _In_ DWORD Level, + _In_reads_(_Inexpressible_(0)) LPBYTE pPrinter, + _In_reads_opt_(_Inexpressible_(0)) LPBYTE pClientInfo, + _In_ DWORD ClientInfoLevel); + + BOOL + (WINAPI *fpSetPort)( + _In_opt_ LPWSTR pName, + _In_ LPWSTR pPortName, + _In_ DWORD dwLevel, + _In_reads_(_Inexpressible_(0)) LPBYTE pPortInfo); + + DWORD + (WINAPI *fpEnumPrinterData)( + _In_ HANDLE hPrinter, + _In_ DWORD dwIndex, + _Out_writes_bytes_to_opt_(cbValueName, *pcbValueName) LPWSTR pValueName, + _In_ DWORD cbValueName, + _Out_ LPDWORD pcbValueName, + _Out_opt_ LPDWORD pType, + _Out_writes_bytes_to_opt_(cbData, *pcbData) LPBYTE pData, + _In_ DWORD cbData, + _Out_ LPDWORD pcbData); + + DWORD + (WINAPI *fpDeletePrinterData)( + _In_ HANDLE hPrinter, + _In_ LPWSTR pValueName); + + DWORD + (WINAPI *fpClusterSplOpen)( + _In_ LPCWSTR pszServer, + _In_ LPCWSTR pszResource, + _Out_ PHANDLE phSpooler, + _In_ LPCWSTR pszName, + _In_ LPCWSTR pszAddress); + + DWORD (WINAPI *fpClusterSplClose)(_In_ HANDLE hSpooler); + + DWORD (WINAPI *fpClusterSplIsAlive)(_In_ HANDLE hSpooler); + + DWORD + (WINAPI *fpSetPrinterDataEx)( + _In_ HANDLE hPrinter, + _In_ LPCWSTR pKeyName, + _In_ LPCWSTR pValueName, + _In_ DWORD Type, + _In_reads_bytes_(cbData) LPBYTE pData, + _In_ DWORD cbData); + + DWORD + (WINAPI *fpGetPrinterDataEx)( + _In_ HANDLE hPrinter, + _In_ LPCWSTR pKeyName, + _In_ LPCWSTR pValueName, + _Out_opt_ LPDWORD pType, + _Out_writes_bytes_to_opt_(nSize, *pcbNeeded) LPBYTE pData, + _In_ DWORD nSize, + _Out_ LPDWORD pcbNeeded); + + DWORD + (WINAPI *fpEnumPrinterDataEx)( + _In_ HANDLE hPrinter, + _In_ LPCWSTR pKeyName, + _Out_writes_bytes_to_opt_(cbEnumValues, *pcbEnumValues) LPBYTE pEnumValues, + _In_ DWORD cbEnumValues, + _Out_ LPDWORD pcbEnumValues, + _Out_ LPDWORD pnEnumValues); + + DWORD + (WINAPI *fpEnumPrinterKey)( + _In_ HANDLE hPrinter, + _In_ LPCWSTR pKeyName, + _Out_writes_bytes_to_opt_(cbSubkey, *pcbSubkey) LPWSTR pSubkey, + _In_ DWORD cbSubkey, + _Out_ LPDWORD pcbSubkey); + + DWORD + (WINAPI *fpDeletePrinterDataEx)( + _In_ HANDLE hPrinter, + _In_ LPCWSTR pKeyName, + _In_ LPCWSTR pValueName); + + DWORD + (WINAPI *fpDeletePrinterKey)( + _In_ HANDLE hPrinter, + _In_ LPCWSTR pKeyName); + + BOOL + (WINAPI *fpSeekPrinter)( + _In_ HANDLE hPrinter, + _In_ LARGE_INTEGER liDistanceToMove, + _Out_ PLARGE_INTEGER pliNewPointer, + _In_ DWORD dwMoveMethod, + _In_ BOOL bWrite); + + BOOL + (WINAPI *fpDeletePrinterDriverEx)( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ LPWSTR pDriverName, + _In_ DWORD dwDeleteFlag, + _In_ DWORD dwVersionNum); + + BOOL + (WINAPI *fpAddPerMachineConnection)( + _In_opt_ LPCWSTR pServer, + _In_ LPCWSTR pPrinterName, + _In_ LPCWSTR pPrintServer, + _In_ LPCWSTR pProvider); + + BOOL + (WINAPI *fpDeletePerMachineConnection)( + _In_opt_ LPCWSTR pServer, + _In_ LPCWSTR pPrinterName); + + BOOL + (WINAPI *fpEnumPerMachineConnections)( + _In_opt_ LPCWSTR pServer, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pPrinterEnum, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + + BOOL + (WINAPI *fpXcvData)( + _In_ HANDLE hXcv, + _In_ LPCWSTR pszDataName, + _In_reads_bytes_(cbInputData) PBYTE pInputData, + _In_ DWORD cbInputData, + _Out_writes_bytes_to_opt_(cbOutputData, *pcbOutputNeeded) PBYTE pOutputData, + _In_ DWORD cbOutputData, + _Out_ PDWORD pcbOutputNeeded, + _Out_ PDWORD pdwStatus); + + BOOL + (WINAPI *fpAddPrinterDriverEx)( + _In_opt_ LPWSTR pName, + _In_ DWORD Level, + _In_reads_(_Inexpressible_(0)) LPBYTE pDriverInfo, + _In_ DWORD dwFileCopyFlags); + + BOOL + (WINAPI *fpSplReadPrinter)( + _In_ HANDLE hPrinter, + _Out_writes_bytes_(cbBuf) LPBYTE *pBuf, + _In_ DWORD cbBuf); + + BOOL (WINAPI *fpDriverUnloadComplete)(_In_ LPWSTR pDriverFile); + + BOOL + (WINAPI *fpGetSpoolFileInfo)( + _In_ HANDLE hPrinter, + _Outptr_result_maybenull_ LPWSTR *pSpoolDir, + _Out_ LPHANDLE phFile, + _In_ HANDLE hSpoolerProcess, + _In_ HANDLE hAppProcess); + + BOOL (WINAPI *fpCommitSpoolData)(_In_ HANDLE hPrinter, _In_ DWORD cbCommit); + + BOOL (WINAPI *fpCloseSpoolFileHandle)(_In_ HANDLE hPrinter); + + BOOL + (WINAPI *fpFlushPrinter)( + _In_ HANDLE hPrinter, + _In_reads_bytes_(cbBuf) LPBYTE pBuf, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcWritten, + _In_ DWORD cSleep); + + DWORD + (WINAPI *fpSendRecvBidiData)( + _In_ HANDLE hPort, + _In_ LPCWSTR pAction, + _In_ LPBIDI_REQUEST_CONTAINER pReqData, + _Outptr_ LPBIDI_RESPONSE_CONTAINER *ppResData); + BOOL (WINAPI *fpAddDriverCatalog)(HANDLE hPrinter, DWORD dwLevel, VOID *pvDriverInfCatInfo, DWORD dwCatalogCopyFlags); } PRINTPROVIDOR, *LPPRINTPROVIDOR; @@ -279,31 +656,90 @@ typedef struct _MONITORREG { DWORD cbSize; - LONG (WINAPI *fpCreateKey)(HANDLE hcKey, LPCWSTR pszSubKey, DWORD dwOptions, - REGSAM samDesired, - PSECURITY_ATTRIBUTES pSecurityAttributes, - PHANDLE phckResult, PDWORD pdwDisposition, - HANDLE hSpooler); - LONG (WINAPI *fpOpenKey)(HANDLE hcKey, LPCWSTR pszSubKey, REGSAM samDesired, - PHANDLE phkResult, HANDLE hSpooler); - LONG (WINAPI *fpCloseKey)(HANDLE hcKey, HANDLE hSpooler); - LONG (WINAPI *fpDeleteKey)(HANDLE hcKey, LPCWSTR pszSubKey, HANDLE hSpooler); - LONG (WINAPI *fpEnumKey)(HANDLE hcKey, DWORD dwIndex, LPWSTR pszName, - PDWORD pcchName, PFILETIME pftLastWriteTime, - HANDLE hSpooler); - LONG (WINAPI *fpQueryInfoKey)(HANDLE hcKey, PDWORD pcSubKeys, PDWORD pcbKey, - PDWORD pcValues, PDWORD pcbValue, PDWORD pcbData, - PDWORD pcbSecurityDescriptor, - PFILETIME pftLastWriteTime, - HANDLE hSpooler); - LONG (WINAPI *fpSetValue)(HANDLE hcKey, LPCWSTR pszValue, DWORD dwType, - const BYTE* pData, DWORD cbData, HANDLE hSpooler); - LONG (WINAPI *fpDeleteValue)(HANDLE hcKey, LPCWSTR pszValue, HANDLE hSpooler); - LONG (WINAPI *fpEnumValue)(HANDLE hcKey, DWORD dwIndex, LPWSTR pszValue, - PDWORD pcbValue, PDWORD pType, PBYTE pData, PDWORD pcbData, - HANDLE hSpooler); - LONG (WINAPI *fpQueryValue)(HANDLE hcKey, LPCWSTR pszValue, PDWORD pType, - PBYTE pData, PDWORD pcbData, HANDLE hSpooler); + + LONG + (WINAPI *fpCreateKey)( + _In_ HANDLE hcKey, + _In_ LPCWSTR pszSubKey, + _In_ DWORD dwOptions, + _In_ REGSAM samDesired, + _In_opt_ PSECURITY_ATTRIBUTES pSecurityAttributes, + _Out_ PHANDLE phckResult, + _Out_opt_ PDWORD pdwDisposition, + _In_ HANDLE hSpooler); + + LONG + (WINAPI *fpOpenKey)( + _In_ HANDLE hcKey, + _In_ LPCWSTR pszSubKey, + _In_ REGSAM samDesired, + _Out_ PHANDLE phkResult, + _In_ HANDLE hSpooler); + + LONG (WINAPI *fpCloseKey)(_In_ HANDLE hcKey, _In_ HANDLE hSpooler); + + LONG + (WINAPI *fpDeleteKey)( + _In_ HANDLE hcKey, + _In_ LPCWSTR pszSubKey, + _In_ HANDLE hSpooler); + + LONG + (WINAPI *fpEnumKey)( + _In_ HANDLE hcKey, + _In_ DWORD dwIndex, + _Inout_updates_to_(*pcchName, *pcchName) LPWSTR pszName, + _Inout_ PDWORD pcchName, + _Out_opt_ PFILETIME pftLastWriteTime, + _In_ HANDLE hSpooler); + + LONG + (WINAPI *fpQueryInfoKey)( + _In_ HANDLE hcKey, + _Out_opt_ PDWORD pcSubKeys, + _Out_opt_ PDWORD pcbKey, + _Out_opt_ PDWORD pcValues, + _Out_opt_ PDWORD pcbValue, + _Out_opt_ PDWORD pcbData, + _Out_opt_ PDWORD pcbSecurityDescriptor, + _Out_opt_ PFILETIME pftLastWriteTime, + _In_ HANDLE hSpooler); + + LONG + (WINAPI *fpSetValue)( + _In_ HANDLE hcKey, + _In_ LPCWSTR pszValue, + _In_ DWORD dwType, + _In_reads_bytes_(cbData) const BYTE *pData, + _In_ DWORD cbData, + _In_ HANDLE hSpooler); + + LONG + (WINAPI *fpDeleteValue)( + _In_ HANDLE hcKey, + _In_ LPCWSTR pszValue, + _In_ HANDLE hSpooler); + + LONG + (WINAPI *fpEnumValue)( + _In_ HANDLE hcKey, + _In_ DWORD dwIndex, + _Inout_updates_to_(*pcbValue, *pcbValue) LPWSTR pszValue, + _Inout_ PDWORD pcbValue, + _Out_opt_ PDWORD pType, + _Out_writes_bytes_to_opt_(*pcbData, *pcbData) PBYTE pData, + _Inout_ PDWORD pcbData, + _In_ HANDLE hSpooler); + + LONG + (WINAPI *fpQueryValue)( + _In_ HANDLE hcKey, + _In_ LPCWSTR pszValue, + _Out_opt_ PDWORD pType, + _Out_writes_bytes_to_opt_(*pcbData, *pcbData) PBYTE pData, + _Inout_ PDWORD pcbData, + _In_ HANDLE hSpooler); + } MONITORREG, *PMONITORREG; typedef struct _MONITORINIT { @@ -316,36 +752,111 @@ } MONITORINIT, *PMONITORINIT; typedef struct _MONITOR { - BOOL (WINAPI *pfnEnumPorts)(LPWSTR pName, DWORD Level, LPBYTE pPorts, - DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); - BOOL (WINAPI *pfnOpenPort)(LPWSTR pName, PHANDLE pHandle); - BOOL (WINAPI *pfnOpenPortEx)(LPWSTR pPortName, LPWSTR pPrinterName, - PHANDLE pHandle, struct _MONITOR *pMonitor); - BOOL (WINAPI *pfnStartDocPort)(HANDLE hPort, LPWSTR pPrinterName, - DWORD JobId, DWORD Level, LPBYTE pDocInfo); - BOOL (WINAPI *pfnWritePort)(HANDLE hPort, LPBYTE pBuffer, DWORD cbBuf, - LPDWORD pcbWritten); - BOOL (WINAPI *pfnReadPort)(HANDLE hPort, LPBYTE pBuffer, DWORD cbBuffer, - LPDWORD pcbRead); - BOOL (WINAPI *pfnEndDocPort)(HANDLE hPort); - BOOL (WINAPI *pfnClosePort)(HANDLE hPort); - BOOL (WINAPI *pfnAddPort)(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName); - BOOL (WINAPI *pfnAddPortEx)(LPWSTR pName, DWORD Level, LPBYTE lpBuffer, - LPWSTR lpMonitorName); - BOOL (WINAPI *pfnConfigurePort)(LPWSTR pName, HWND hWnd, LPWSTR pPortName); - BOOL (WINAPI *pfnDeletePort)(LPWSTR pName, HWND hWnd, LPWSTR pPortName); - BOOL (WINAPI *pfnGetPrinterDataFromPort)(HANDLE hPort, DWORD ControlID, - LPWSTR pValueName, LPWSTR lpInBuffer, - DWORD cbInBuffer, LPWSTR lpOutBuffer, - DWORD cbOutBuffer, LPDWORD lpcbReturned); - BOOL (WINAPI *pfnSetPortTimeOuts)(HANDLE hPort, LPCOMMTIMEOUTS lpCTO, - DWORD reserved); - BOOL (WINAPI *pfnXcvOpenPort)(LPCWSTR pszObject, ACCESS_MASK GrantedAccess, PHANDLE phXcv); - DWORD (WINAPI *pfnXcvDataPort)(HANDLE hXcv, LPCWSTR pszDataName, - PBYTE pInputData, DWORD cbInputData, - PBYTE pOutputData, DWORD cbOutputData, - PDWORD pcbOutputNeeded); - BOOL (WINAPI *pfnXcvClosePort)(HANDLE hXcv); + + BOOL + (WINAPI *pfnEnumPorts)( + _In_opt_ LPWSTR pName, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pPorts, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + + BOOL (WINAPI *pfnOpenPort)(_In_ LPWSTR pName, _Out_ PHANDLE pHandle); + + BOOL + (WINAPI *pfnOpenPortEx)( + _In_ LPWSTR pPortName, + _In_ LPWSTR pPrinterName, + _Out_ PHANDLE pHandle, + _In_ struct _MONITOR *pMonitor); + + BOOL + (WINAPI *pfnStartDocPort)( + _In_ HANDLE hPort, + _In_ LPWSTR pPrinterName, + _In_ DWORD JobId, + _In_ DWORD Level, + _In_reads_(_Inexpressible_(0)) LPBYTE pDocInfo); + + BOOL + (WINAPI *pfnWritePort)( + _In_ HANDLE hPort, + _In_reads_bytes_(cbBuf) LPBYTE pBuffer, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbWritten); + + BOOL + (WINAPI *pfnReadPort)( + _In_ HANDLE hPort, + _Out_writes_bytes_to_(cbBuffer, *pcbRead) LPBYTE pBuffer, + _In_ DWORD cbBuffer, + _Out_ LPDWORD pcbRead); + + BOOL (WINAPI *pfnEndDocPort)(_In_ HANDLE hPort); + + BOOL (WINAPI *pfnClosePort)(_In_ HANDLE hPort); + + BOOL + (WINAPI *pfnAddPort)( + _In_ LPWSTR pName, + _In_ HWND hWnd, + _In_ LPWSTR pMonitorName); + + BOOL + (WINAPI *pfnAddPortEx)( + _In_ LPWSTR pName, + _In_ DWORD Level, + _In_reads_(_Inexpressible_(0)) LPBYTE lpBuffer, + _In_ LPWSTR lpMonitorName); + + BOOL + (WINAPI *pfnConfigurePort)( + _In_ LPWSTR pName, + _In_ HWND hWnd, + _In_ LPWSTR pPortName); + + BOOL + (WINAPI *pfnDeletePort)( + _In_ LPWSTR pName, + _In_ HWND hWnd, + _In_ LPWSTR pPortName); + + BOOL + (WINAPI *pfnGetPrinterDataFromPort)( + _In_ HANDLE hPort, + _In_ DWORD ControlID, + _In_ LPWSTR pValueName, + _In_reads_bytes_(cbInBuffer) LPWSTR lpInBuffer, + _In_ DWORD cbInBuffer, + _Out_writes_bytes_to_opt_(cbOutBuffer, *lpcbReturned) LPWSTR lpOutBuffer, + _In_ DWORD cbOutBuffer, + _Out_ LPDWORD lpcbReturned); + + BOOL + (WINAPI *pfnSetPortTimeOuts)( + _In_ HANDLE hPort, + _In_ LPCOMMTIMEOUTS lpCTO, + _In_ DWORD reserved); + + BOOL + (WINAPI *pfnXcvOpenPort)( + _In_ LPCWSTR pszObject, + _In_ ACCESS_MASK GrantedAccess, + _Out_ PHANDLE phXcv); + + DWORD + (WINAPI *pfnXcvDataPort)( + _In_ HANDLE hXcv, + _In_ LPCWSTR pszDataName, + _In_reads_bytes_(cbInputData) PBYTE pInputData, + _In_ DWORD cbInputData, + _Out_writes_bytes_to_opt_(cbOutputData, *pcbOutputNeeded) PBYTE pOutputData, + _In_ DWORD cbOutputData, + _Out_ PDWORD pcbOutputNeeded); + + BOOL (WINAPI *pfnXcvClosePort)(_In_ HANDLE hXcv); + } MONITOR, *LPMONITOR; typedef struct _MONITOREX { @@ -355,60 +866,175 @@ typedef struct _MONITOR2 { DWORD cbSize; - BOOL (WINAPI *pfnEnumPorts)(LPWSTR pName, DWORD Level, LPBYTE pPorts, - DWORD cbBuf, LPDWORD pcbNeeded, - LPDWORD pcReturned); - BOOL (WINAPI *pfnOpenPort)(LPWSTR pName, PHANDLE pHandle); - BOOL (WINAPI *pfnOpenPortEx)(LPWSTR pPortName, LPWSTR pPrinterName, - PHANDLE pHandle, struct _MONITOR2 *pMonitor2); - BOOL (WINAPI *pfnStartDocPort)(HANDLE hPort, LPWSTR pPrinterName, - DWORD JobId, DWORD Level, LPBYTE pDocInfo); - BOOL (WINAPI *pfnWritePort)(HANDLE hPort, LPBYTE pBuffer, DWORD cbBuf, - LPDWORD pcbWritten); - BOOL (WINAPI *pfnReadPort)(HANDLE hPort, LPBYTE pBuffer, DWORD cbBuffer, - LPDWORD pcbRead); - BOOL (WINAPI *pfnEndDocPort)(HANDLE hPort); - BOOL (WINAPI *pfnClosePort)(HANDLE hPort); - BOOL (WINAPI *pfnAddPort)(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName); - BOOL (WINAPI *pfnAddPortEx)(LPWSTR pName, DWORD Level, LPBYTE lpBuffer, - LPWSTR lpMonitorName); - BOOL (WINAPI *pfnConfigurePort)(LPWSTR pName, HWND hWnd, LPWSTR pPortName); - BOOL (WINAPI *pfnDeletePort)(LPWSTR pName, HWND hWnd, LPWSTR pPortName); - BOOL (WINAPI *pfnGetPrinterDataFromPort)(HANDLE hPort, DWORD ControlID, - LPWSTR pValueName, LPWSTR lpInBuffer, - DWORD cbInBuffer, LPWSTR lpOutBuffer, - DWORD cbOutBuffer, LPDWORD lpcbReturned); - BOOL (WINAPI *pfnSetPortTimeOuts)(HANDLE hPort, LPCOMMTIMEOUTS lpCTO, - DWORD reserved); - BOOL (WINAPI *pfnXcvOpenPort)(HANDLE hMonitor, LPCWSTR pszObject, - ACCESS_MASK GrantedAccess, PHANDLE phXcv); - DWORD (WINAPI *pfnXcvDataPort)(HANDLE hXcv, LPCWSTR pszDataName, - PBYTE pInputData, DWORD cbInputData, - PBYTE pOutputData, DWORD cbOutputData, - PDWORD pcbOutputNeeded); - BOOL (WINAPI *pfnXcvClosePort)(HANDLE hXcv); - VOID (WINAPI *pfnShutdown)(HANDLE hMonitor); + + BOOL + (WINAPI *pfnEnumPorts)( + _In_ HANDLE hMonitor, + _In_opt_ LPWSTR pName, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pPorts, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + + BOOL + (WINAPI *pfnOpenPort)( + _In_ HANDLE hMonitor, + _In_ LPWSTR pName, + _Out_ PHANDLE pHandle); + + BOOL + (WINAPI *pfnOpenPortEx)( + _In_ HANDLE hMonitor, + _In_ HANDLE hMonitorPort, + _In_ LPWSTR pPortName, + _In_ LPWSTR pPrinterName, + _Out_ PHANDLE pHandle, + _In_ struct _MONITOR2 *pMonitor2); + + BOOL + (WINAPI *pfnStartDocPort)( + _In_ HANDLE hPort, + _In_ LPWSTR pPrinterName, + _In_ DWORD JobId, + _In_ DWORD Level, + _In_reads_(_Inexpressible_(0)) LPBYTE pDocInfo); + + BOOL + (WINAPI *pfnWritePort)( + _In_ HANDLE hPort, + _In_reads_bytes_(cbBuf) LPBYTE pBuffer, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbWritten); + + BOOL + (WINAPI *pfnReadPort)( + _In_ HANDLE hPort, + _Out_writes_bytes_to_opt_(cbBuffer, *pcbRead) LPBYTE pBuffer, + _In_ DWORD cbBuffer, + _Out_ LPDWORD pcbRead); + + BOOL (WINAPI *pfnEndDocPort)(_In_ HANDLE hPort); + + BOOL (WINAPI *pfnClosePort)(_In_ HANDLE hPort); + + BOOL + (WINAPI *pfnAddPort)( + _In_ HANDLE hMonitor, + _In_ LPWSTR pName, + _In_ HWND hWnd, + _In_ LPWSTR pMonitorName); + + BOOL + (WINAPI *pfnAddPortEx)( + _In_ HANDLE hMonitor, + _In_ LPWSTR pName, + _In_ DWORD Level, + _In_reads_(_Inexpressible_(0)) LPBYTE lpBuffer, + _In_ LPWSTR lpMonitorName); + + BOOL + (WINAPI *pfnConfigurePort)( + _In_ HANDLE hMonitor, + _In_ LPWSTR pName, + _In_ HWND hWnd, + _In_ LPWSTR pPortName); + + BOOL + (WINAPI *pfnDeletePort)( + _In_ HANDLE hMonitor, + _In_ LPWSTR pName, + _In_ HWND hWnd, + _In_ LPWSTR pPortName); + + BOOL + (WINAPI *pfnGetPrinterDataFromPort)( + _In_ HANDLE hPort, + _In_ DWORD ControlID, + _In_ LPWSTR pValueName, + _In_reads_bytes_(cbInBuffer) LPWSTR lpInBuffer, + _In_ DWORD cbInBuffer, + _Out_writes_bytes_to_opt_(cbOutBuffer, *lpcbReturned) LPWSTR lpOutBuffer, + _In_ DWORD cbOutBuffer, + _Out_ LPDWORD lpcbReturned); + + BOOL + (WINAPI *pfnSetPortTimeOuts)( + _In_ HANDLE hPort, + _In_ LPCOMMTIMEOUTS lpCTO, + _In_ DWORD reserved); + + BOOL + (WINAPI *pfnXcvOpenPort)( + _In_ HANDLE hMonitor, + _In_ LPCWSTR pszObject, + _In_ ACCESS_MASK GrantedAccess, + _Out_ PHANDLE phXcv); + + DWORD + (WINAPI *pfnXcvDataPort)( + _In_ HANDLE hXcv, + _In_ LPCWSTR pszDataName, + _In_reads_bytes_(cbInputData) PBYTE pInputData, + _In_ DWORD cbInputData, + _Out_writes_bytes_to_opt_(cbOutputData, *pcbOutputNeeded) PBYTE pOutputData, + _In_ DWORD cbOutputData, + _Out_ PDWORD pcbOutputNeeded); + + BOOL (WINAPI *pfnXcvClosePort)(_In_ HANDLE hXcv); + + VOID (WINAPI *pfnShutdown)(_In_ HANDLE hMonitor); + #if (NTDDI_VERSION >= NTDDI_WINXP) - DWORD (WINAPI *pfnSendRecvBidiDataFromPort)(HANDLE hPort, DWORD dwAccessBit, - LPCWSTR pAction, - PBIDI_REQUEST_CONTAINER pReqData, - PBIDI_RESPONSE_CONTAINER *ppResData); + DWORD + (WINAPI *pfnSendRecvBidiDataFromPort)( + _In_ HANDLE hPort, + _In_ DWORD dwAccessBit, + _In_ LPCWSTR pAction, + _In_ PBIDI_REQUEST_CONTAINER pReqData, + _Outptr_ PBIDI_RESPONSE_CONTAINER *ppResData); #endif + #if (NTDDI_VERSION >= NTDDI_WIN7) - DWORD (WINAPI *pfnNotifyUsedPorts)(HANDLE hMonitor, DWORD cPorts, - PCWSTR *ppszPorts); - - DWORD (WINAPI *pfnNotifyUnusedPorts)(HANDLE hMonitor, DWORD cPorts, - PCWSTR *ppszPorts); + + DWORD + (WINAPI *pfnNotifyUsedPorts)( + _In_ HANDLE hMonitor, + _In_ DWORD cPorts, + _In_reads_(cPorts) PCWSTR *ppszPorts); + + DWORD + (WINAPI *pfnNotifyUnusedPorts)( + _In_ HANDLE hMonitor, + _In_ DWORD cPorts, + _In_reads_(cPorts) PCWSTR *ppszPorts); + #endif + } MONITOR2, *LPMONITOR2, *PMONITOR2; typedef struct _MONITORUI { DWORD dwMonitorUISize; - BOOL (WINAPI *pfnAddPortUI)(PCWSTR pszServer, HWND hWnd, - PCWSTR pszPortNameIn, PWSTR *ppszPortNameOut); - BOOL (WINAPI *pfnConfigurePortUI)(PCWSTR pName, HWND hWnd, PCWSTR pPortName); - BOOL (WINAPI *pfnDeletePortUI)(PCWSTR pszServer, HWND hWnd, PCWSTR pszPortName); + + BOOL + (WINAPI *pfnAddPortUI)( + _At_(return, _Success_(return != 0)) _In_opt_ PCWSTR pszServer, + _In_ HWND hWnd, + _In_ PCWSTR pszPortNameIn, + _Out_opt_ PWSTR *ppszPortNameOut); + + BOOL + (WINAPI *pfnConfigurePortUI)( + _In_opt_ PCWSTR pName, + _In_ HWND hWnd, + _In_ PCWSTR pPortName); + + BOOL + (WINAPI *pfnDeletePortUI)( + _In_opt_ PCWSTR pszServer, + _In_ HWND hWnd, + _In_ PCWSTR pszPortName); + } MONITORUI, *PMONITORUI; #if (NTDDI_VERSION >= NTDDI_WINXP) @@ -455,12 +1081,12 @@ typedef BOOL (CALLBACK *ROUTER_NOTIFY_CALLBACK)( - IN DWORD dwCommand, - IN PVOID pContext, - IN DWORD dwColor, - IN PPRINTER_NOTIFY_INFO pNofityInfo, - IN DWORD fdwFlags, - OUT PDWORD pdwResult); + _In_ DWORD dwCommand, + _In_ PVOID pContext, + _In_ DWORD dwColor, + _In_ PPRINTER_NOTIFY_INFO pNofityInfo, + _In_ DWORD fdwFlags, + _Out_ PDWORD pdwResult); typedef enum _NOTIFICATION_CALLBACK_COMMANDS { NOTIFICATION_COMMAND_NOTIFY, @@ -542,182 +1168,236 @@ BOOL WINAPI InitializePrintProvidor( - OUT LPPRINTPROVIDOR pPrintProvidor, - IN DWORD cbPrintProvidor, - IN LPWSTR pFullRegistryPath OPTIONAL); + _Out_writes_bytes_(cbPrintProvidor) LPPRINTPROVIDOR pPrintProvidor, + _In_ DWORD cbPrintProvidor, + _In_opt_ LPWSTR pFullRegistryPath); HANDLE WINAPI OpenPrintProcessor( - IN LPWSTR pPrinterName, - IN PPRINTPROCESSOROPENDATA pPrintProcessorOpenData); + _In_ LPWSTR pPrinterName, + _In_ PPRINTPROCESSOROPENDATA pPrintProcessorOpenData); BOOL WINAPI PrintDocumentOnPrintProcessor( - IN HANDLE hPrintProcessor, - IN LPWSTR pDocumentName); + _In_ HANDLE hPrintProcessor, + _In_ LPWSTR pDocumentName); BOOL WINAPI ClosePrintProcessor( - IN OUT HANDLE hPrintProcessor); + _Inout_ HANDLE hPrintProcessor); BOOL WINAPI ControlPrintProcessor( - IN HANDLE hPrintProcessor, - IN DWORD Command); + _In_ HANDLE hPrintProcessor, + _In_ DWORD Command); DWORD WINAPI GetPrintProcessorCapabilities( - IN LPTSTR pValueName, - IN DWORD dwAttributes, - OUT LPBYTE pData, - IN DWORD nSize, - OUT LPDWORD pcbNeeded); + _In_ LPTSTR pValueName, + _In_ DWORD dwAttributes, + _Out_writes_bytes_(nSize) LPBYTE pData, + _In_ DWORD nSize, + _Out_ LPDWORD pcbNeeded); BOOL WINAPI InitializeMonitor( - IN LPWSTR pRegistryRoot); + _In_ LPWSTR pRegistryRoot); BOOL WINAPI OpenPort( - IN LPWSTR pName, - OUT PHANDLE pHandle); + _In_ LPWSTR pName, + _Out_ PHANDLE pHandle); BOOL WINAPI WritePort( - HANDLE hPort, - LPBYTE pBuffer, - DWORD cbBuf, - LPDWORD pcbWritten); + _In_ HANDLE hPort, + _In_reads_bytes_(cbBuf) LPBYTE pBuffer, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbWritten); BOOL WINAPI ReadPort( - HANDLE hPort, - LPBYTE pBuffer, - DWORD cbBuffer, - LPDWORD pcbRead); + _In_ HANDLE hPort, + _Out_writes_bytes_(cbBuffer) LPBYTE pBuffer, + _In_ DWORD cbBuffer, + _Out_ LPDWORD pcbRead); BOOL WINAPI ClosePort( - IN HANDLE hPort); + _In_ HANDLE hPort); BOOL WINAPI XcvOpenPort( - LPCWSTR pszObject, - ACCESS_MASK GrantedAccess, - PHANDLE phXcv); + _In_ LPCWSTR pszObject, + _In_ ACCESS_MASK GrantedAccess, + _Out_ PHANDLE phXcv); DWORD WINAPI XcvDataPort( - HANDLE hXcv, - LPCWSTR pszDataName, - PBYTE pInputData, - DWORD cbInputData, - PBYTE pOutputData, - DWORD cbOutputData, - PDWORD pcbOutputNeeded); + _In_ HANDLE hXcv, + _In_ LPCWSTR pszDataName, + _In_reads_bytes_(cbInputData) PBYTE pInputData, + _In_ DWORD cbInputData, + _Out_writes_bytes_(cbOutputData) PBYTE pOutputData, + _In_ DWORD cbOutputData, + _Out_ PDWORD pcbOutputNeeded); BOOL WINAPI XcvClosePort( - IN HANDLE hXcv); - + _In_ HANDLE hXcv); + +_Success_(return != 0) BOOL WINAPI AddPortUI( - IN PCWSTR pszServer OPTIONAL, - IN HWND hWnd, - IN PCWSTR pszMonitorNameIn, - OUT PWSTR *ppszPortNameOut OPTIONAL); + _In_opt_ PCWSTR pszServer, + _In_ HWND hWnd, + _In_ PCWSTR pszMonitorNameIn, + _Out_opt_ PWSTR *ppszPortNameOut); BOOL WINAPI ConfigurePortUI( - IN PCWSTR pszServer, - IN HWND hWnd, - IN PCWSTR pszPortName); + _In_ PCWSTR pszServer, + _In_ HWND hWnd, + _In_ PCWSTR pszPortName); BOOL WINAPI DeletePortUI( - IN PCWSTR pszServer, - IN HWND hWnd, - IN PCWSTR pszPortName); + _In_ PCWSTR pszServer, + _In_ HWND hWnd, + _In_ PCWSTR pszPortName); BOOL WINAPI SplDeleteSpoolerPortStart( - IN PCWSTR pPortName); + _In_ PCWSTR pPortName); BOOL WINAPI SplDeleteSpoolerPortEnd( - IN PCWSTR pName, - IN BOOL bDeletePort); + _In_ PCWSTR pName, + _In_ BOOL bDeletePort); BOOL WINAPI SpoolerCopyFileEvent( - IN LPWSTR pszPrinterName, - IN LPWSTR pszKey, - IN DWORD dwCopyFileEvent); + _In_ LPWSTR pszPrinterName, + _In_ LPWSTR pszKey, + _In_ DWORD dwCopyFileEvent); DWORD WINAPI GenerateCopyFilePaths( - IN LPCWSTR pszPrinterName, - IN LPCWSTR pszDirectory, - IN LPBYTE pSplClientInfo, - IN DWORD dwLevel, - IN OUT LPWSTR pszSourceDir, - IN OUT LPDWORD pcchSourceDirSize, - IN OUT LPWSTR pszTargetDir, - IN OUT LPDWORD pcchTargetDirSize, - IN DWORD dwFlags); - -HANDLE WINAPI CreatePrinterIC(HANDLE hPrinter, LPDEVMODEW pDevMode); -BOOL WINAPI PlayGdiScriptOnPrinterIC(HANDLE hPrinterIC, LPBYTE pIn, - DWORD cIn, LPBYTE pOut, DWORD cOut, DWORD ul); -BOOL WINAPI DeletePrinterIC(HANDLE hPrinterIC); -BOOL WINAPI DevQueryPrint(HANDLE hPrinter, LPDEVMODEW pDevMode, DWORD *pResID); + _In_ LPCWSTR pszPrinterName, + _In_ LPCWSTR pszDirectory, + _In_ LPBYTE pSplClientInfo, + _In_ DWORD dwLevel, + _Inout_updates_(*pcchSourceDirSize) LPWSTR pszSourceDir, + _Inout_ LPDWORD pcchSourceDirSize, + _Inout_updates_(*pcchTargetDirSize) LPWSTR pszTargetDir, + _Inout_ LPDWORD pcchTargetDirSize, + _In_ DWORD dwFlags); + +HANDLE +WINAPI +CreatePrinterIC( + _In_ HANDLE hPrinter, + _In_opt_ LPDEVMODEW pDevMode); + +BOOL +WINAPI +PlayGdiScriptOnPrinterIC( + _In_ HANDLE hPrinterIC, + _In_reads_bytes_(cIn) LPBYTE pIn, + _In_ DWORD cIn, + _Out_writes_bytes_(cOut) LPBYTE pOut, + _In_ DWORD cOut, + _In_ DWORD ul); + +BOOL WINAPI DeletePrinterIC(_In_ HANDLE hPrinterIC); + +BOOL +WINAPI +DevQueryPrint( + _In_ HANDLE hPrinter, + _In_ LPDEVMODEW pDevMode, + _Out_ DWORD *pResID); + HANDLE WINAPI RevertToPrinterSelf(VOID); -BOOL WINAPI ImpersonatePrinterClient(HANDLE hToken); -BOOL WINAPI ReplyPrinterChangeNotification(HANDLE hNotify, DWORD fdwFlags, - PDWORD pdwResult, PVOID pPrinterNotifyInfo); -BOOL WINAPI ReplyPrinterChangeNotificationEx(HANDLE hNotify, DWORD dwColor, - DWORD fdwFlags, PDWORD pdwResult, - PVOID pPrinterNotifyInfo); -BOOL WINAPI PartialReplyPrinterChangeNotification(HANDLE hNotify, - PPRINTER_NOTIFY_INFO_DATA pInfoDataSrc); -PPRINTER_NOTIFY_INFO WINAPI RouterAllocPrinterNotifyInfo(DWORD cPrinterNotifyInfoData); -BOOL WINAPI RouterFreePrinterNotifyInfo(PPRINTER_NOTIFY_INFO pInfo); - -BOOL WINAPI AppendPrinterNotifyInfoData(PPRINTER_NOTIFY_INFO pInfoDest, - PPRINTER_NOTIFY_INFO_DATA pInfoDataSrc, - DWORD fdwFlags); -DWORD WINAPI CallRouterFindFirstPrinterChangeNotification(HANDLE hPrinter, - DWORD fdwFlags, - DWORD fdwOptions, - HANDLE hNotify, - PPRINTER_NOTIFY_OPTIONS pPrinterNotifyOptions); -BOOL WINAPI ProvidorFindFirstPrinterChangeNotification(HANDLE hPrinter, - DWORD fdwFlags, - DWORD fdwOptions, - HANDLE hNotify, - PVOID pvReserved0, - PVOID pvReserved1); -BOOL WINAPI ProvidorFindClosePrinterChangeNotification(HANDLE hPrinter); +BOOL WINAPI ImpersonatePrinterClient(_In_ HANDLE hToken); + +BOOL +WINAPI +ReplyPrinterChangeNotification( + _In_ HANDLE hNotify, + _In_ DWORD fdwFlags, + _Out_opt_ PDWORD pdwResult, + _In_opt_ PVOID pPrinterNotifyInfo); + +BOOL +WINAPI +ReplyPrinterChangeNotificationEx( + _In_ HANDLE hNotify, + _In_ DWORD dwColor, + _In_ DWORD fdwFlags, + _Out_ PDWORD pdwResult, + _In_ PVOID pPrinterNotifyInfo); + +BOOL +WINAPI +PartialReplyPrinterChangeNotification( + _In_ HANDLE hNotify, + _In_opt_ PPRINTER_NOTIFY_INFO_DATA pInfoDataSrc); + +PPRINTER_NOTIFY_INFO +WINAPI +RouterAllocPrinterNotifyInfo( + _In_ DWORD cPrinterNotifyInfoData); + +BOOL WINAPI RouterFreePrinterNotifyInfo(_In_opt_ PPRINTER_NOTIFY_INFO pInfo); + +BOOL +WINAPI +AppendPrinterNotifyInfoData( + _In_ PPRINTER_NOTIFY_INFO pInfoDest, + _In_opt_ PPRINTER_NOTIFY_INFO_DATA pInfoDataSrc, + _In_ DWORD fdwFlags); + +DWORD +WINAPI +CallRouterFindFirstPrinterChangeNotification( + _In_ HANDLE hPrinter, + _In_ DWORD fdwFlags, + _In_ DWORD fdwOptions, + _In_ HANDLE hNotify, + _In_ PPRINTER_NOTIFY_OPTIONS pPrinterNotifyOptions); + +BOOL +WINAPI +ProvidorFindFirstPrinterChangeNotification( + _In_ HANDLE hPrinter, + _In_ DWORD fdwFlags, + _In_ DWORD fdwOptions, + _In_ HANDLE hNotify, + _In_opt_ PVOID pvReserved0, + _Out_opt_ PVOID pvReserved1); + +BOOL WINAPI ProvidorFindClosePrinterChangeNotification(_In_ HANDLE hPrinter); /* Spooler */ BOOL WINAPI SpoolerFindFirstPrinterChangeNotification(HANDLE hPrinter, @@ -726,41 +1406,65 @@ PHANDLE phEvent, PVOID pPrinterNotifyOptions, PVOID pvReserved); -BOOL WINAPI SpoolerFindNextPrinterChangeNotification(HANDLE hPrinter, - LPDWORD pfdwChange, - PVOID pvReserved0, - PVOID ppPrinterNotifyInfo); -VOID WINAPI SpoolerFreePrinterNotifyInfo(PPRINTER_NOTIFY_INFO pInfo); -BOOL WINAPI SpoolerFindClosePrinterChangeNotification(HANDLE hPrinter); + +BOOL +WINAPI +SpoolerFindNextPrinterChangeNotification( + _In_ HANDLE hPrinter, + _Out_ LPDWORD pfdwChange, + _In_opt_ LPVOID pPrinterNotifyOptions, + _Inout_opt_ LPVOID *ppPrinterNotifyInfo); + +VOID WINAPI SpoolerFreePrinterNotifyInfo(_In_ PPRINTER_NOTIFY_INFO pInfo); +BOOL WINAPI SpoolerFindClosePrinterChangeNotification(_In_ HANDLE hPrinter); /* Port monitor / Language monitor / Print monitor */ -LPMONITOR2 WINAPI InitializePrintMonitor2(PMONITORINIT pMonitorInit, - PHANDLE phMonitor); + +LPMONITOR2 +WINAPI +InitializePrintMonitor2( + _In_ PMONITORINIT pMonitorInit, + _Out_ PHANDLE phMonitor); + PMONITORUI WINAPI InitializePrintMonitorUI(VOID); -LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR pRegistryRoot); -BOOL WINAPI InitializeMonitorEx(LPWSTR pRegistryRoot, LPMONITOR pMonitor); +LPMONITOREX WINAPI InitializePrintMonitor(_In_ LPWSTR pRegistryRoot); + +BOOL +WINAPI +InitializeMonitorEx( + _In_ LPWSTR pRegistryRoot, + _Out_ LPMONITOR pMonitor); #if (NTDDI_VERSION >= NTDDI_WINXP) -PBIDI_RESPONSE_CONTAINER WINAPI RouterAllocBidiResponseContainer(DWORD Count); -PVOID WINAPI RouterAllocBidiMem(size_t NumBytes); -DWORD WINAPI RouterFreeBidiResponseContainer(PBIDI_RESPONSE_CONTAINER pData); -VOID WINAPI RouterFreeBidiMem(PVOID pMemPointer); +PBIDI_RESPONSE_CONTAINER +WINAPI +RouterAllocBidiResponseContainer( + _In_ DWORD Count); + +PVOID WINAPI RouterAllocBidiMem(_In_ size_t NumBytes); + +DWORD +WINAPI +RouterFreeBidiResponseContainer( + _In_ PBIDI_RESPONSE_CONTAINER pData); + +VOID WINAPI RouterFreeBidiMem(_In_ PVOID pMemPointer); BOOL WINAPI SplPromptUIInUsersSession( - IN HANDLE hPrinter, - IN DWORD JobId, - IN PSHOWUIPARAMS pUIParams, - OUT DWORD *pResponse); + _In_ HANDLE hPrinter, + _In_ DWORD JobId, + _In_ PSHOWUIPARAMS pUIParams, + _Out_ DWORD *pResponse); DWORD WINAPI SplIsSessionZero( - IN HANDLE hPrinter, - IN DWORD JobId, - OUT BOOL *pIsSessionZero); + _In_ HANDLE hPrinter, + _In_ DWORD JobId, + _Out_ BOOL *pIsSessionZero); #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ @@ -768,9 +1472,9 @@ BOOL WINAPI GetJobAttributes( - IN LPWSTR pPrinterName, - IN LPDEVMODEW pDevmode, - OUT PATTRIBUTE_INFO_3 pAttributeInfo); + _In_ LPWSTR pPrinterName, + _In_ LPDEVMODEW pDevmode, + _Out_ PATTRIBUTE_INFO_3 pAttributeInfo); #endif #if (NTDDI_VERSION >= NTDDI_VISTA) @@ -780,17 +1484,20 @@ BOOL WINAPI GetJobAttributesEx( - IN LPWSTR pPrinterName, - IN LPDEVMODEW pDevmode, - IN DWORD dwLevel, - OUT LPBYTE pAttributeInfo, - IN DWORD nSize, - IN DWORD dwFlags); - -BOOL WINAPI SpoolerRefreshPrinterChangeNotification(HANDLE hPrinter, - DWORD dwColor, - PPRINTER_NOTIFY_OPTIONS pOptions, - PPRINTER_NOTIFY_INFO *ppInfo); + _In_ LPWSTR pPrinterName, + _In_ LPDEVMODEW pDevmode, + _In_ DWORD dwLevel, + _Out_writes_bytes_(nSize) LPBYTE pAttributeInfo, + _In_ DWORD nSize, + _In_ DWORD dwFlags); + +BOOL +WINAPI +SpoolerRefreshPrinterChangeNotification( + _In_ HANDLE hPrinter, + _In_ DWORD dwColor, + _In_ PPRINTER_NOTIFY_OPTIONS pOptions, + _Inout_opt_ PPRINTER_NOTIFY_INFO *ppInfo); #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ @@ -804,3 +1511,5 @@ #ifdef __cplusplus } #endif + +#endif /* _WINSPLP_ */

1 0

[akhaldi] 59835: [MMC] * Fix MSVC build.
by akhaldi＠svn.reactos.org 26 Aug '13

26 Aug '13

Author: akhaldi Date: Mon Aug 26 14:10:59 2013 New Revision: 59835 URL: http://svn.reactos.org/svn/reactos?rev=59835&view=rev Log: [MMC] * Fix MSVC build. Modified: trunk/reactos/base/applications/mmc/resource.h Modified: trunk/reactos/base/applications/mmc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/reso… ============================================================================== --- trunk/reactos/base/applications/mmc/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/resource.h [iso-8859-1] Mon Aug 26 14:10:59 2013 @@ -14,4 +14,4 @@ #define IDM_WINDOWS_LIST 2001 #define IDM_HELP_ABOUT 9001 -#define IDM_MDI_FIRSTCHILD 9500 +#define IDM_MDI_FIRSTCHILD 9500

1 0

[hbelusca] 59834: [HELP] Fix a typo.
by hbelusca＠svn.reactos.org 26 Aug '13

26 Aug '13

Author: hbelusca Date: Mon Aug 26 13:19:31 2013 New Revision: 59834 URL: http://svn.reactos.org/svn/reactos?rev=59834&view=rev Log: [HELP] Fix a typo. Modified: trunk/reactos/base/applications/cmdutils/help/help.h Modified: trunk/reactos/base/applications/cmdutils/help/help.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/help.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/help/help.h [iso-8859-1] Mon Aug 26 13:19:31 2013 @@ -43,7 +43,7 @@ L"echos", L"echoserr", L"endlocal", - L"eease", + L"erase", L"exit", L"for", L"free", @@ -52,8 +52,8 @@ L"history", L"if", L"label", + L"md", L"memory", - L"md", L"mkdir", L"mklink", L"move",

1 0

[hbelusca] 59833: [CMD] Remove the help resources moved to the help utility. @ gigaherz (a.k.a. David Quintana): Don't worry! Your changes to fr-FR.rc were already moved to help.exe in the previous...
by hbelusca＠svn.reactos.org 26 Aug '13

26 Aug '13

Author: hbelusca Date: Mon Aug 26 13:12:46 2013 New Revision: 59833 URL: http://svn.reactos.org/svn/reactos?rev=59833&view=rev Log: [CMD] Remove the help resources moved to the help utility. @ gigaherz (a.k.a. David Quintana): Don't worry! Your changes to fr-FR.rc were already moved to help.exe in the previous commit :D Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc trunk/reactos/base/shell/cmd/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.… Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2013