Ros-diffs August 2013

ros-diffs@reactos.org

10 participants
327 discussions

[ekohl] 59812: [SAMLIB] NetUserSetInfo: Use the proper access rights to open the domain object.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Aug 24 20:22:05 2013 New Revision: 59812 URL: http://svn.reactos.org/svn/reactos?rev=59812&view=rev Log: [SAMLIB] NetUserSetInfo: Use the proper access rights to open the domain object. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sat Aug 24 20:22:05 2013 @@ -3644,7 +3644,7 @@ /* Open the Account Domain */ Status = OpenAccountDomain(ServerHandle, (servername != NULL) ? &ServerName : NULL, - DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP | DOMAIN_READ_PASSWORD_PARAMETERS, &AccountDomainHandle); if (!NT_SUCCESS(Status)) {

11 years, 4 months

[hbelusca] 59811: [CONSRV] Fix "Select All" functionality.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 24 17:44:19 2013 New Revision: 59811 URL: http://svn.reactos.org/svn/reactos?rev=59811&view=rev Log: [CONSRV] Fix "Select All" functionality. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sat Aug 24 17:44:19 2013 @@ -314,10 +314,14 @@ LPWSTR WindowTitle = NULL; SIZE_T Length = 0; + /* + * We select all the characters from line 1 to + * the line where the cursor is positioned. + */ Console->Selection.dwSelectionAnchor.X = 0; Console->Selection.dwSelectionAnchor.Y = 0; Console->dwSelectionCursor.X = ActiveBuffer->ViewSize.X - 1; - Console->dwSelectionCursor.Y = ActiveBuffer->ViewSize.Y - 1; + Console->dwSelectionCursor.Y = ActiveBuffer->CursorPosition.Y; Console->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS | CONSOLE_MOUSE_SELECTION; GuiConsoleUpdateSelection(Console, &Console->dwSelectionCursor);

11 years, 4 months

[aandrejevic] 59810: [SOFT386] Implement prefix support.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Aug 24 11:48:38 2013 New Revision: 59810 URL: http://svn.reactos.org/svn/reactos?rev=59810&view=rev Log: [SOFT386] Implement prefix support. Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h branches/ntvdm/lib/soft386/common.c branches/ntvdm/lib/soft386/common.h branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h branches/ntvdm/lib/soft386/soft386.c Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft… ============================================================================== --- branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] Sat Aug 24 11:48:38 2013 @@ -33,6 +33,13 @@ #define SOFT386_IDT_TRAP_GATE 0x7 #define SOFT386_IDT_INT_GATE_32 0xE #define SOFT386_IDT_TRAP_GATE_32 0xF + +#define SOFT386_PREFIX_SEG (1 << 0) +#define SOFT386_PREFIX_OPSIZE (1 << 1) +#define SOFT386_PREFIX_ADSIZE (1 << 2) +#define SOFT386_PREFIX_LOCK (1 << 3) +#define SOFT386_PREFIX_REPNZ (1 << 4) +#define SOFT386_PREFIX_REP (1 << 5) struct _SOFT386_STATE; typedef struct _SOFT386_STATE SOFT386_STATE, *PSOFT386_STATE; @@ -282,6 +289,8 @@ ULONG ControlRegisters[SOFT386_NUM_CTRL_REGS]; ULONG DebugRegisters[SOFT386_NUM_DBG_REGS]; ULONG ExceptionCount; + ULONG PrefixFlags; + INT SegmentOverride; }; /* FUNCTIONS ******************************************************************/ Modified: branches/ntvdm/lib/soft386/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.c [iso-8859-1] Sat Aug 24 11:48:38 2013 @@ -197,7 +197,8 @@ { BOOLEAN Size = State->SegmentRegs[SOFT386_REG_SS].Size; - // TODO: Handle OPSIZE prefix. + /* The OPSIZE prefix toggles the size */ + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) Size = !Size; if (Size) { @@ -253,7 +254,8 @@ USHORT ShortValue; BOOLEAN Size = State->SegmentRegs[SOFT386_REG_SS].Size; - // TODO: Handle OPSIZE prefix. + /* The OPSIZE prefix toggles the size */ + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) Size = !Size; if (Size) { @@ -706,7 +708,7 @@ } VOID -__fastcall +FASTCALL Soft386Exception(PSOFT386_STATE State, INT ExceptionCode) { SOFT386_IDT_ENTRY IdtEntry; Modified: branches/ntvdm/lib/soft386/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.h [iso-8859-1] Sat Aug 24 11:48:38 2013 @@ -10,6 +10,10 @@ #define _COMMON_H_ /* DEFINES ********************************************************************/ + +#ifndef FASTCALL +#define FASTCALL __fastcall +#endif #define GET_SEGMENT_RPL(s) ((s) & 3) #define GET_SEGMENT_INDEX(s) ((s) & 0xFFF8) Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Sat Aug 24 11:48:38 2013 @@ -24,5 +24,423 @@ SOFT386_OPCODE_HANDLER_PROC Soft386OpcodeHandlers[SOFT386_NUM_OPCODE_HANDLERS] = { - NULL + NULL, // TODO: OPCODE 0x00 NOT SUPPORTED + NULL, // TODO: OPCODE 0x01 NOT SUPPORTED + NULL, // TODO: OPCODE 0x02 NOT SUPPORTED + NULL, // TODO: OPCODE 0x03 NOT SUPPORTED + NULL, // TODO: OPCODE 0x04 NOT SUPPORTED + NULL, // TODO: OPCODE 0x05 NOT SUPPORTED + NULL, // TODO: OPCODE 0x06 NOT SUPPORTED + NULL, // TODO: OPCODE 0x07 NOT SUPPORTED + NULL, // TODO: OPCODE 0x08 NOT SUPPORTED + NULL, // TODO: OPCODE 0x09 NOT SUPPORTED + NULL, // TODO: OPCODE 0x0A NOT SUPPORTED + NULL, // TODO: OPCODE 0x0B NOT SUPPORTED + NULL, // TODO: OPCODE 0x0C NOT SUPPORTED + NULL, // TODO: OPCODE 0x0D NOT SUPPORTED + NULL, // TODO: OPCODE 0x0E NOT SUPPORTED + NULL, // TODO: OPCODE 0x0F NOT SUPPORTED + NULL, // TODO: OPCODE 0x10 NOT SUPPORTED + NULL, // TODO: OPCODE 0x11 NOT SUPPORTED + NULL, // TODO: OPCODE 0x12 NOT SUPPORTED + NULL, // TODO: OPCODE 0x13 NOT SUPPORTED + NULL, // TODO: OPCODE 0x14 NOT SUPPORTED + NULL, // TODO: OPCODE 0x15 NOT SUPPORTED + NULL, // TODO: OPCODE 0x16 NOT SUPPORTED + NULL, // TODO: OPCODE 0x17 NOT SUPPORTED + NULL, // TODO: OPCODE 0x18 NOT SUPPORTED + NULL, // TODO: OPCODE 0x19 NOT SUPPORTED + NULL, // TODO: OPCODE 0x1A NOT SUPPORTED + NULL, // TODO: OPCODE 0x1B NOT SUPPORTED + NULL, // TODO: OPCODE 0x1C NOT SUPPORTED + NULL, // TODO: OPCODE 0x1D NOT SUPPORTED + NULL, // TODO: OPCODE 0x1E NOT SUPPORTED + NULL, // TODO: OPCODE 0x1F NOT SUPPORTED + NULL, // TODO: OPCODE 0x20 NOT SUPPORTED + NULL, // TODO: OPCODE 0x21 NOT SUPPORTED + NULL, // TODO: OPCODE 0x22 NOT SUPPORTED + NULL, // TODO: OPCODE 0x23 NOT SUPPORTED + NULL, // TODO: OPCODE 0x24 NOT SUPPORTED + NULL, // TODO: OPCODE 0x25 NOT SUPPORTED + Soft386OpcodePrefix, + NULL, // TODO: OPCODE 0x27 NOT SUPPORTED + NULL, // TODO: OPCODE 0x28 NOT SUPPORTED + NULL, // TODO: OPCODE 0x29 NOT SUPPORTED + NULL, // TODO: OPCODE 0x2A NOT SUPPORTED + NULL, // TODO: OPCODE 0x2B NOT SUPPORTED + NULL, // TODO: OPCODE 0x2C NOT SUPPORTED + NULL, // TODO: OPCODE 0x2D NOT SUPPORTED + Soft386OpcodePrefix, + NULL, // TODO: OPCODE 0x2F NOT SUPPORTED + NULL, // TODO: OPCODE 0x30 NOT SUPPORTED + NULL, // TODO: OPCODE 0x31 NOT SUPPORTED + NULL, // TODO: OPCODE 0x32 NOT SUPPORTED + NULL, // TODO: OPCODE 0x33 NOT SUPPORTED + NULL, // TODO: OPCODE 0x34 NOT SUPPORTED + NULL, // TODO: OPCODE 0x35 NOT SUPPORTED + Soft386OpcodePrefix, + NULL, // TODO: OPCODE 0x37 NOT SUPPORTED + NULL, // TODO: OPCODE 0x38 NOT SUPPORTED + NULL, // TODO: OPCODE 0x39 NOT SUPPORTED + NULL, // TODO: OPCODE 0x3A NOT SUPPORTED + NULL, // TODO: OPCODE 0x3B NOT SUPPORTED + NULL, // TODO: OPCODE 0x3C NOT SUPPORTED + NULL, // TODO: OPCODE 0x3D NOT SUPPORTED + Soft386OpcodePrefix, + NULL, // TODO: OPCODE 0x3F NOT SUPPORTED + NULL, // TODO: OPCODE 0x40 NOT SUPPORTED + NULL, // TODO: OPCODE 0x41 NOT SUPPORTED + NULL, // TODO: OPCODE 0x42 NOT SUPPORTED + NULL, // TODO: OPCODE 0x43 NOT SUPPORTED + NULL, // TODO: OPCODE 0x44 NOT SUPPORTED + NULL, // TODO: OPCODE 0x45 NOT SUPPORTED + NULL, // TODO: OPCODE 0x46 NOT SUPPORTED + NULL, // TODO: OPCODE 0x47 NOT SUPPORTED + NULL, // TODO: OPCODE 0x48 NOT SUPPORTED + NULL, // TODO: OPCODE 0x49 NOT SUPPORTED + NULL, // TODO: OPCODE 0x4A NOT SUPPORTED + NULL, // TODO: OPCODE 0x4B NOT SUPPORTED + NULL, // TODO: OPCODE 0x4C NOT SUPPORTED + NULL, // TODO: OPCODE 0x4D NOT SUPPORTED + NULL, // TODO: OPCODE 0x4E NOT SUPPORTED + NULL, // TODO: OPCODE 0x4F NOT SUPPORTED + NULL, // TODO: OPCODE 0x50 NOT SUPPORTED + NULL, // TODO: OPCODE 0x51 NOT SUPPORTED + NULL, // TODO: OPCODE 0x52 NOT SUPPORTED + NULL, // TODO: OPCODE 0x53 NOT SUPPORTED + NULL, // TODO: OPCODE 0x54 NOT SUPPORTED + NULL, // TODO: OPCODE 0x55 NOT SUPPORTED + NULL, // TODO: OPCODE 0x56 NOT SUPPORTED + NULL, // TODO: OPCODE 0x57 NOT SUPPORTED + NULL, // TODO: OPCODE 0x58 NOT SUPPORTED + NULL, // TODO: OPCODE 0x59 NOT SUPPORTED + NULL, // TODO: OPCODE 0x5A NOT SUPPORTED + NULL, // TODO: OPCODE 0x5B NOT SUPPORTED + NULL, // TODO: OPCODE 0x5C NOT SUPPORTED + NULL, // TODO: OPCODE 0x5D NOT SUPPORTED + NULL, // TODO: OPCODE 0x5E NOT SUPPORTED + NULL, // TODO: OPCODE 0x5F NOT SUPPORTED + NULL, // TODO: OPCODE 0x60 NOT SUPPORTED + NULL, // TODO: OPCODE 0x61 NOT SUPPORTED + NULL, // TODO: OPCODE 0x62 NOT SUPPORTED + NULL, // TODO: OPCODE 0x63 NOT SUPPORTED + Soft386OpcodePrefix, + Soft386OpcodePrefix, + Soft386OpcodePrefix, + Soft386OpcodePrefix, + NULL, // TODO: OPCODE 0x68 NOT SUPPORTED + NULL, // TODO: OPCODE 0x69 NOT SUPPORTED + NULL, // TODO: OPCODE 0x6A NOT SUPPORTED + NULL, // TODO: OPCODE 0x6B NOT SUPPORTED + NULL, // TODO: OPCODE 0x6C NOT SUPPORTED + NULL, // TODO: OPCODE 0x6D NOT SUPPORTED + NULL, // TODO: OPCODE 0x6E NOT SUPPORTED + NULL, // TODO: OPCODE 0x6F NOT SUPPORTED + NULL, // TODO: OPCODE 0x70 NOT SUPPORTED + NULL, // TODO: OPCODE 0x71 NOT SUPPORTED + NULL, // TODO: OPCODE 0x72 NOT SUPPORTED + NULL, // TODO: OPCODE 0x73 NOT SUPPORTED + NULL, // TODO: OPCODE 0x74 NOT SUPPORTED + NULL, // TODO: OPCODE 0x75 NOT SUPPORTED + NULL, // TODO: OPCODE 0x76 NOT SUPPORTED + NULL, // TODO: OPCODE 0x77 NOT SUPPORTED + NULL, // TODO: OPCODE 0x78 NOT SUPPORTED + NULL, // TODO: OPCODE 0x79 NOT SUPPORTED + NULL, // TODO: OPCODE 0x7A NOT SUPPORTED + NULL, // TODO: OPCODE 0x7B NOT SUPPORTED + NULL, // TODO: OPCODE 0x7C NOT SUPPORTED + NULL, // TODO: OPCODE 0x7D NOT SUPPORTED + NULL, // TODO: OPCODE 0x7E NOT SUPPORTED + NULL, // TODO: OPCODE 0x7F NOT SUPPORTED + NULL, // TODO: OPCODE 0x80 NOT SUPPORTED + NULL, // TODO: OPCODE 0x81 NOT SUPPORTED + NULL, // TODO: OPCODE 0x82 NOT SUPPORTED + NULL, // TODO: OPCODE 0x83 NOT SUPPORTED + NULL, // TODO: OPCODE 0x84 NOT SUPPORTED + NULL, // TODO: OPCODE 0x85 NOT SUPPORTED + NULL, // TODO: OPCODE 0x86 NOT SUPPORTED + NULL, // TODO: OPCODE 0x87 NOT SUPPORTED + NULL, // TODO: OPCODE 0x88 NOT SUPPORTED + NULL, // TODO: OPCODE 0x89 NOT SUPPORTED + NULL, // TODO: OPCODE 0x8A NOT SUPPORTED + NULL, // TODO: OPCODE 0x8B NOT SUPPORTED + NULL, // TODO: OPCODE 0x8C NOT SUPPORTED + NULL, // TODO: OPCODE 0x8D NOT SUPPORTED + NULL, // TODO: OPCODE 0x8E NOT SUPPORTED + NULL, // TODO: OPCODE 0x8F NOT SUPPORTED + NULL, // TODO: OPCODE 0x90 NOT SUPPORTED + NULL, // TODO: OPCODE 0x91 NOT SUPPORTED + NULL, // TODO: OPCODE 0x92 NOT SUPPORTED + NULL, // TODO: OPCODE 0x93 NOT SUPPORTED + NULL, // TODO: OPCODE 0x94 NOT SUPPORTED + NULL, // TODO: OPCODE 0x95 NOT SUPPORTED + NULL, // TODO: OPCODE 0x96 NOT SUPPORTED + NULL, // TODO: OPCODE 0x97 NOT SUPPORTED + NULL, // TODO: OPCODE 0x98 NOT SUPPORTED + NULL, // TODO: OPCODE 0x99 NOT SUPPORTED + NULL, // TODO: OPCODE 0x9A NOT SUPPORTED + NULL, // TODO: OPCODE 0x9B NOT SUPPORTED + NULL, // TODO: OPCODE 0x9C NOT SUPPORTED + NULL, // TODO: OPCODE 0x9D NOT SUPPORTED + NULL, // TODO: OPCODE 0x9E NOT SUPPORTED + NULL, // TODO: OPCODE 0x9F NOT SUPPORTED + NULL, // TODO: OPCODE 0xA0 NOT SUPPORTED + NULL, // TODO: OPCODE 0xA1 NOT SUPPORTED + NULL, // TODO: OPCODE 0xA2 NOT SUPPORTED + NULL, // TODO: OPCODE 0xA3 NOT SUPPORTED + NULL, // TODO: OPCODE 0xA4 NOT SUPPORTED + NULL, // TODO: OPCODE 0xA5 NOT SUPPORTED + NULL, // TODO: OPCODE 0xA6 NOT SUPPORTED + NULL, // TODO: OPCODE 0xA7 NOT SUPPORTED + NULL, // TODO: OPCODE 0xA8 NOT SUPPORTED + NULL, // TODO: OPCODE 0xA9 NOT SUPPORTED + NULL, // TODO: OPCODE 0xAA NOT SUPPORTED + NULL, // TODO: OPCODE 0xAB NOT SUPPORTED + NULL, // TODO: OPCODE 0xAC NOT SUPPORTED + NULL, // TODO: OPCODE 0xAD NOT SUPPORTED + NULL, // TODO: OPCODE 0xAE NOT SUPPORTED + NULL, // TODO: OPCODE 0xAF NOT SUPPORTED + NULL, // TODO: OPCODE 0xB0 NOT SUPPORTED + NULL, // TODO: OPCODE 0xB1 NOT SUPPORTED + NULL, // TODO: OPCODE 0xB2 NOT SUPPORTED + NULL, // TODO: OPCODE 0xB3 NOT SUPPORTED + NULL, // TODO: OPCODE 0xB4 NOT SUPPORTED + NULL, // TODO: OPCODE 0xB5 NOT SUPPORTED + NULL, // TODO: OPCODE 0xB6 NOT SUPPORTED + NULL, // TODO: OPCODE 0xB7 NOT SUPPORTED + NULL, // TODO: OPCODE 0xB8 NOT SUPPORTED + NULL, // TODO: OPCODE 0xB9 NOT SUPPORTED + NULL, // TODO: OPCODE 0xBA NOT SUPPORTED + NULL, // TODO: OPCODE 0xBB NOT SUPPORTED + NULL, // TODO: OPCODE 0xBC NOT SUPPORTED + NULL, // TODO: OPCODE 0xBD NOT SUPPORTED + NULL, // TODO: OPCODE 0xBE NOT SUPPORTED + NULL, // TODO: OPCODE 0xBF NOT SUPPORTED + NULL, // TODO: OPCODE 0xC0 NOT SUPPORTED + NULL, // TODO: OPCODE 0xC1 NOT SUPPORTED + NULL, // TODO: OPCODE 0xC2 NOT SUPPORTED + NULL, // TODO: OPCODE 0xC3 NOT SUPPORTED + NULL, // TODO: OPCODE 0xC4 NOT SUPPORTED + NULL, // TODO: OPCODE 0xC5 NOT SUPPORTED + NULL, // TODO: OPCODE 0xC6 NOT SUPPORTED + NULL, // TODO: OPCODE 0xC7 NOT SUPPORTED + NULL, // TODO: OPCODE 0xC8 NOT SUPPORTED + NULL, // TODO: OPCODE 0xC9 NOT SUPPORTED + NULL, // TODO: OPCODE 0xCA NOT SUPPORTED + NULL, // TODO: OPCODE 0xCB NOT SUPPORTED + NULL, // TODO: OPCODE 0xCC NOT SUPPORTED + NULL, // TODO: OPCODE 0xCD NOT SUPPORTED + NULL, // TODO: OPCODE 0xCE NOT SUPPORTED + NULL, // TODO: OPCODE 0xCF NOT SUPPORTED + NULL, // TODO: OPCODE 0xD0 NOT SUPPORTED + NULL, // TODO: OPCODE 0xD1 NOT SUPPORTED + NULL, // TODO: OPCODE 0xD2 NOT SUPPORTED + NULL, // TODO: OPCODE 0xD3 NOT SUPPORTED + NULL, // TODO: OPCODE 0xD4 NOT SUPPORTED + NULL, // TODO: OPCODE 0xD5 NOT SUPPORTED + NULL, // TODO: OPCODE 0xD6 NOT SUPPORTED + NULL, // TODO: OPCODE 0xD7 NOT SUPPORTED + NULL, // TODO: OPCODE 0xD8 NOT SUPPORTED + NULL, // TODO: OPCODE 0xD9 NOT SUPPORTED + NULL, // TODO: OPCODE 0xDA NOT SUPPORTED + NULL, // TODO: OPCODE 0xDB NOT SUPPORTED + NULL, // TODO: OPCODE 0xDC NOT SUPPORTED + NULL, // TODO: OPCODE 0xDD NOT SUPPORTED + NULL, // TODO: OPCODE 0xDE NOT SUPPORTED + NULL, // TODO: OPCODE 0xDF NOT SUPPORTED + NULL, // TODO: OPCODE 0xE0 NOT SUPPORTED + NULL, // TODO: OPCODE 0xE1 NOT SUPPORTED + NULL, // TODO: OPCODE 0xE2 NOT SUPPORTED + NULL, // TODO: OPCODE 0xE3 NOT SUPPORTED + NULL, // TODO: OPCODE 0xE4 NOT SUPPORTED + NULL, // TODO: OPCODE 0xE5 NOT SUPPORTED + NULL, // TODO: OPCODE 0xE6 NOT SUPPORTED + NULL, // TODO: OPCODE 0xE7 NOT SUPPORTED + NULL, // TODO: OPCODE 0xE8 NOT SUPPORTED + NULL, // TODO: OPCODE 0xE9 NOT SUPPORTED + NULL, // TODO: OPCODE 0xEA NOT SUPPORTED + NULL, // TODO: OPCODE 0xEB NOT SUPPORTED + NULL, // TODO: OPCODE 0xEC NOT SUPPORTED + NULL, // TODO: OPCODE 0xED NOT SUPPORTED + NULL, // TODO: OPCODE 0xEE NOT SUPPORTED + NULL, // TODO: OPCODE 0xEF NOT SUPPORTED + Soft386OpcodePrefix, + NULL, // Invalid + Soft386OpcodePrefix, + Soft386OpcodePrefix, + NULL, // TODO: OPCODE 0xF4 NOT SUPPORTED + NULL, // TODO: OPCODE 0xF5 NOT SUPPORTED + NULL, // TODO: OPCODE 0xF6 NOT SUPPORTED + NULL, // TODO: OPCODE 0xF7 NOT SUPPORTED + NULL, // TODO: OPCODE 0xF8 NOT SUPPORTED + NULL, // TODO: OPCODE 0xF9 NOT SUPPORTED + NULL, // TODO: OPCODE 0xFA NOT SUPPORTED + NULL, // TODO: OPCODE 0xFB NOT SUPPORTED + NULL, // TODO: OPCODE 0xFC NOT SUPPORTED + NULL, // TODO: OPCODE 0xFD NOT SUPPORTED + NULL, // TODO: OPCODE 0xFE NOT SUPPORTED + NULL, // TODO: OPCODE 0xFF NOT SUPPORTED }; + +BOOLEAN +FASTCALL +Soft386OpcodePrefix(PSOFT386_STATE State, UCHAR Opcode) +{ + BOOLEAN Valid = FALSE; + + switch (Opcode) + { + /* ES: */ + case 0x26: + { + if (!(State->PrefixFlags & SOFT386_PREFIX_SEG)) + { + State->PrefixFlags |= SOFT386_PREFIX_SEG; + State->SegmentOverride = SOFT386_REG_ES; + Valid = TRUE; + } + + break; + } + + /* CS: */ + case 0x2E: + { + if (!(State->PrefixFlags & SOFT386_PREFIX_SEG)) + { + State->PrefixFlags |= SOFT386_PREFIX_SEG; + State->SegmentOverride = SOFT386_REG_CS; + Valid = TRUE; + } + + break; + } + + /* SS: */ + case 0x36: + { + if (!(State->PrefixFlags & SOFT386_PREFIX_SEG)) + { + State->PrefixFlags |= SOFT386_PREFIX_SEG; + State->SegmentOverride = SOFT386_REG_SS; + Valid = TRUE; + } + + break; + } + + /* DS: */ + case 0x3E: + { + if (!(State->PrefixFlags & SOFT386_PREFIX_SEG)) + { + State->PrefixFlags |= SOFT386_PREFIX_SEG; + State->SegmentOverride = SOFT386_REG_DS; + Valid = TRUE; + } + + break; + } + + /* FS: */ + case 0x64: + { + if (!(State->PrefixFlags & SOFT386_PREFIX_SEG)) + { + State->PrefixFlags |= SOFT386_PREFIX_SEG; + State->SegmentOverride = SOFT386_REG_FS; + Valid = TRUE; + } + + break; + } + + /* GS: */ + case 0x65: + { + if (!(State->PrefixFlags & SOFT386_PREFIX_SEG)) + { + State->PrefixFlags |= SOFT386_PREFIX_SEG; + State->SegmentOverride = SOFT386_REG_GS; + Valid = TRUE; + } + + break; + } + + /* OPSIZE */ + case 0x66: + { + if (!(State->PrefixFlags & SOFT386_PREFIX_OPSIZE)) + { + State->PrefixFlags |= SOFT386_PREFIX_OPSIZE; + Valid = TRUE; + } + + break; + } + + /* ADSIZE */ + case 0x67: + { + if (!(State->PrefixFlags & SOFT386_PREFIX_ADSIZE)) + { + State->PrefixFlags |= SOFT386_PREFIX_ADSIZE; + Valid = TRUE; + } + break; + } + + /* LOCK */ + case 0xF0: + { + if (!(State->PrefixFlags & SOFT386_PREFIX_LOCK)) + { + State->PrefixFlags |= SOFT386_PREFIX_LOCK; + Valid = TRUE; + } + + break; + } + + /* REPNZ */ + case 0xF2: + { + /* Mutually exclusive with REP */ + if (!(State->PrefixFlags + & (SOFT386_PREFIX_REPNZ | SOFT386_PREFIX_REP))) + { + State->PrefixFlags |= SOFT386_PREFIX_REPNZ; + Valid = TRUE; + } + + break; + } + + /* REP / REPZ */ + case 0xF3: + { + /* Mutually exclusive with REPNZ */ + if (!(State->PrefixFlags + & (SOFT386_PREFIX_REPNZ | SOFT386_PREFIX_REP))) + { + State->PrefixFlags |= SOFT386_PREFIX_REP; + Valid = TRUE; + } + + break; + } + } + + if (!Valid) + { + /* Clear all prefixes */ + State->PrefixFlags = 0; + + /* Throw an exception */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + return TRUE; +} Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Sat Aug 24 11:48:38 2013 @@ -11,12 +11,24 @@ /* DEFINES ********************************************************************/ +#ifndef FASTCALL +#define FASTCALL __fastcall +#endif + #define SOFT386_NUM_OPCODE_HANDLERS 256 -typedef BOOLEAN (__fastcall *SOFT386_OPCODE_HANDLER_PROC)(PSOFT386_STATE); +typedef BOOLEAN (FASTCALL *SOFT386_OPCODE_HANDLER_PROC)(PSOFT386_STATE, UCHAR); extern SOFT386_OPCODE_HANDLER_PROC Soft386OpcodeHandlers[SOFT386_NUM_OPCODE_HANDLERS]; +BOOLEAN +FASTCALL +Soft386OpcodePrefix +( + PSOFT386_STATE State, + UCHAR Opcode +); + #endif // _OPCODES_H_ Modified: branches/ntvdm/lib/soft386/soft386.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/soft386.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] Sat Aug 24 11:48:38 2013 @@ -37,7 +37,7 @@ NTAPI Soft386ExecutionControl(PSOFT386_STATE State, INT Command) { - BYTE Opcode; + UCHAR Opcode; INT ProcedureCallCount = 0; /* Main execution loop */ @@ -51,7 +51,7 @@ if (Soft386OpcodeHandlers[Opcode] != NULL) { /* Call the opcode handler */ - Soft386OpcodeHandlers[Opcode](State); + Soft386OpcodeHandlers[Opcode](State, Opcode); } else {

11 years, 4 months

[akhaldi] 59809: [CRT] * Apply a consistent annotation to wcstombs_s(), _splitpath_s() and _wsplitpath_s().

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Aug 24 11:13:44 2013 New Revision: 59809 URL: http://svn.reactos.org/svn/reactos?rev=59809&view=rev Log: [CRT] * Apply a consistent annotation to wcstombs_s(), _splitpath_s() and _wsplitpath_s(). Modified: trunk/reactos/include/crt/sec_api/stdlib_s.h Modified: trunk/reactos/include/crt/sec_api/stdlib_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/stdlib… ============================================================================== --- trunk/reactos/include/crt/sec_api/stdlib_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/stdlib_s.h [iso-8859-1] Sat Aug 24 11:13:44 2013 @@ -108,16 +108,17 @@ _In_ wchar_t _WCh, _In_opt_ _locale_t _Locale); + _Success_(return!=EINVAL) _Check_return_wat_ _CRTIMP errno_t __cdecl wcstombs_s( - _Out_opt_ size_t *_PtNumOfCharConverted, - _Out_writes_bytes_to_opt_(_DstSizeInBytes, *_PtNumOfCharConverted) char *_Dst, - _In_ size_t _DstSizeInBytes, - _In_z_ const wchar_t *_Src, - _In_ size_t _MaxCountInBytes); + _Out_opt_ size_t *pcchConverted, + _Out_writes_bytes_to_opt_(cjDstSize, *pcchConverted) char *pmbstrDst, + _In_ size_t cjDstSize, + _In_z_ const wchar_t *pwszSrc, + _In_ size_t cjMaxCount); _Check_return_wat_ _CRTIMP @@ -274,15 +275,15 @@ errno_t __cdecl _splitpath_s( - _In_z_ const char *_FullPath, - _Out_writes_opt_z_(_DriveSize) char *_Drive, - _In_ size_t _DriveSize, - _Out_writes_opt_z_(_DirSize) char *_Dir, - _In_ size_t _DirSize, - _Out_writes_opt_z_(_FilenameSize) char *_Filename, - _In_ size_t _FilenameSize, - _Out_writes_opt_z_(_ExtSize) char *_Ext, - _In_ size_t _ExtSize); + _In_z_ const char *path, + _Out_writes_opt_z_(drive_size) char *drive, + _In_ size_t drive_size, + _Out_writes_opt_z_(dir_size) char *dir, + _In_ size_t dir_size, + _Out_writes_opt_z_(fname_size) char *fname, + _In_ size_t fname_size, + _Out_writes_opt_z_(ext_size) char *ext, + _In_ size_t ext_size); #ifndef _WSTDLIBP_S_DEFINED #define _WSTDLIBP_S_DEFINED @@ -320,15 +321,15 @@ errno_t __cdecl _wsplitpath_s( - _In_z_ const wchar_t *_FullPath, - _Out_writes_opt_z_(_DriveSizeInWords) wchar_t *_Drive, - _In_ size_t _DriveSizeInWords, - _Out_writes_opt_z_(_DirSizeInWords) wchar_t *_Dir, - _In_ size_t _DirSizeInWords, - _Out_writes_opt_z_(_FilenameSizeInWords) wchar_t *_Filename, - _In_ size_t _FilenameSizeInWords, - _Out_writes_opt_z_(_ExtSizeInWords) wchar_t *_Ext, - _In_ size_t _ExtSizeInWords); + _In_z_ const wchar_t *path, + _Out_writes_opt_z_(drive_size) wchar_t *drive, + _In_ size_t drive_size, + _Out_writes_opt_z_(dir_size) wchar_t *dir, + _In_ size_t dir_size, + _Out_writes_opt_z_(fname_size) wchar_t *fname, + _In_ size_t fname_size, + _Out_writes_opt_z_(ext_size) wchar_t *ext, + _In_ size_t ext_size); #endif /* _WSTDLIBP_S_DEFINED */

11 years, 4 months

[akhaldi] 59808: [CRT] * Apply a consistent annotation to wcsncpy_s().

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Aug 24 11:05:35 2013 New Revision: 59808 URL: http://svn.reactos.org/svn/reactos?rev=59808&view=rev Log: [CRT] * Apply a consistent annotation to wcsncpy_s(). Modified: trunk/reactos/include/crt/string.h Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Sat Aug 24 11:05:35 2013 @@ -978,10 +978,10 @@ errno_t __cdecl wcsncpy_s( - _Out_writes_z_(SizeInWords) wchar_t *_Dest, - _In_ size_t SizeInWords, - _In_z_ const wchar_t *_Source, - _In_ size_t _Count); + _Out_writes_z_(_DstSizeInChars) wchar_t *_Dst, + _In_ size_t _DstSizeInChars, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount); _Check_return_wat_ _CRTIMP

11 years, 4 months

[hbelusca] 59807: [CMD] Fix some French conjugation.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 24 10:20:47 2013 New Revision: 59807 URL: http://svn.reactos.org/svn/reactos?rev=59807&view=rev Log: [CMD] Fix some French conjugation. Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc 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.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Sat Aug 24 10:20:47 2013 @@ -582,18 +582,18 @@ help commande\n\ commande /? Pour plus d'informations sur une commande spÃ©cifique\n\n\ ? Liste toutes les commandes disponibles sans leur description).\n\ -ALIAS DÃ©fini, supprime ou montre les alias.\n\ +ALIAS DÃ©finit, supprime ou montre les alias.\n\ ATTRIB Affiche ou change les attributs d'un fichier.\n\ BEEP Ãmet un bip par le haut-parleur systÃ¨me.\n\ CALL Appelle un programme batch Ã partir d'un autre.\n\ CD Affiche ou change le rÃ©pertoire courant.\n\ -CHCP Affiche ou dÃ©fini le numÃ©ro de page de codes.\n\ +CHCP Affiche ou dÃ©finit le numÃ©ro de page de codes.\n\ CHOICE Attend aprÃ¨s l'utilisateur pour un choix parmi un ensemble de propositions.\n\ CLS Efface l'Ã©cran.\n\ CMD DÃ©marre une nouvelle instance de l'interprÃ©teur de commandes de ReactOS.\n\ -COLOR DÃ©fini les couleurs par dÃ©faut pour le premier plan et l'arriÃ¨re-plan de la console.\n\ +COLOR DÃ©finit les couleurs par dÃ©faut pour le premier plan et l'arriÃ¨re-plan de la console.\n\ COPY Copie un ou plusieurs fichiers vers une autre destination.\n\ -DATE Affiche ou dÃ©fini la date.\n\ +DATE Affiche ou dÃ©finit la date.\n\ DELETE Supprime un ou plusieurs fichiers.\n\ DIR Affiche la liste des fichiers et des sous-rÃ©pertoires du dossier.\n\ ECHO Affiche des messages, ou bascule l'affichage des commandes sur on ou off.\n\ @@ -606,13 +606,13 @@ HELP Fournit des informations d'aide pour les commandes de ReactOS.\n\ HISTORY Liste toutes les commandes qui ont Ã©tÃ© utilisÃ©es\n\ IF ExÃ©cute un traitement conditionnel dans des programmes batch.\n\ -LABEL CrÃ©Ã©, change, ou supprime le nom de volume d'un disque.\n\ -MD CrÃ©Ã© un rÃ©pertoire.\n\ -MKDIR CrÃ©Ã© un rÃ©pertoire.\n\ -MKLINK Creates a filesystem link object.\n\ +LABEL CrÃ©e, change, ou supprime le nom de volume d'un disque.\n\ +MD CrÃ©e un rÃ©pertoire.\n\ +MKDIR CrÃ©e un rÃ©pertoire.\n\ +MKLINK CrÃ©e des liens symboliques ou rÃ©els.\n\ MOVE DÃ©place un ou plusieurs fichiers d'un rÃ©pertoire vers un autre\n\ rÃ©pertoire.\n\ -PATH Affiche ou dÃ©fini un chemin de recherche pour les fichiers exÃ©cutables.\n\ +PATH Affiche ou dÃ©finit un chemin de recherche pour les fichiers exÃ©cutables.\n\ PAUSE Suspend l'exÃ©cution d'un fichier batch et affiche un message.\n\ POPD Restaure la prÃ©cÃ©dente valeur du rÃ©pertoire courant sauvegardÃ©e par\n\ PUSHD.\n\ @@ -625,13 +625,13 @@ REPLACE Remplace un fichier.\n\ RMDIR Supprime un rÃ©pertoire.\n\ SCREEN DÃ©place le curseur, optionnellement affiche du texte.\n\ -SET Affiche, dÃ©fini, ou supprime des variables d'environnement de ReactOS.\n\ +SET Affiche, dÃ©finit, ou supprime des variables d'environnement de ReactOS.\n\ SHIFT DÃ©place la position des paramÃ¨tres remplacables dans un fichier batch.\n" STRING_HELP2, "START DÃ©marre une fenÃªtre sÃ©parÃ©e pour lancer un programme spÃ©cifiÃ© ou une commande.\n\ ExÃ©cute la commande.\n\ -TIME Affiche ou dÃ©fini l'heure du systÃ¨me.\n\ +TIME Affiche ou dÃ©finit l'heure du systÃ¨me.\n\ TIMER Permet l'utilisation de dix chronomÃ¨tres.\n\ -TITLE DÃ©fini le titre de la fenÃªtre pour une session de CMD.EXE.\n\ +TITLE DÃ©finit le titre de la fenÃªtre pour une session de CMD.EXE.\n\ TYPE Affiche le contenu d'un fichier texte.\n\ VER Affiche la version de ReactOS.\n\ VERIFY SpÃ©cifie Ã ReactOS s'il faut vÃ©rifier que les fichiers sont correctement\n\

11 years, 4 months

[hbelusca] 59806: [BOOTDATA] Add system.ini into C:\ReactOS. Patch by Lee Schroeder. CORE-7402 #resolve #comment Committed in revision 59806, thanks :)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 24 09:21:08 2013 New Revision: 59806 URL: http://svn.reactos.org/svn/reactos?rev=59806&view=rev Log: [BOOTDATA] Add system.ini into C:\ReactOS. Patch by Lee Schroeder. CORE-7402 #resolve #comment Committed in revision 59806, thanks :) Modified: trunk/reactos/boot/bootdata/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Sat Aug 24 09:21:08 2013 @@ -56,6 +56,9 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/readme.txt DESTINATION root NO_CAB FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/readme.txt DESTINATION reactos FOR all) +#system.ini +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/system.ini DESTINATION reactos FOR all) + #freeldr.ini add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd.ini DESTINATION root NO_CAB NAME_ON_CD freeldr.ini FOR bootcd regtest) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd.ini DESTINATION root NAME_ON_CD freeldr.ini FOR livecd)

11 years, 4 months

[akhaldi] 59805: [PSDK] * Add some missing definitions to winspool.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Aug 24 00:37:30 2013 New Revision: 59805 URL: http://svn.reactos.org/svn/reactos?rev=59805&view=rev Log: [PSDK] * Add some missing definitions to winspool.h. Modified: trunk/reactos/include/psdk/winspool.h Modified: trunk/reactos/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winspool.h?re… ============================================================================== --- trunk/reactos/include/psdk/winspool.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winspool.h [iso-8859-1] Sat Aug 24 00:37:30 2013 @@ -361,6 +361,66 @@ DWORD PagesPrinted; } JOB_INFO_2W, *PJOB_INFO_2W, *LPJOB_INFO_2W; +typedef struct _JOB_INFO_3 { + DWORD JobId; + DWORD NextJobId; + DWORD Reserved; +} JOB_INFO_3, *PJOB_INFO_3, *LPJOB_INFO_3; + +typedef struct _JOB_INFO_4A { + DWORD JobId; + LPSTR pPrinterName; + LPSTR pMachineName; + LPSTR pUserName; + LPSTR pDocument; + LPSTR pNotifyName; + LPSTR pDatatype; + LPSTR pPrintProcessor; + LPSTR pParameters; + LPSTR pDriverName; + LPDEVMODEA pDevMode; + LPSTR pStatus; + PSECURITY_DESCRIPTOR pSecurityDescriptor; + DWORD Status; + DWORD Priority; + DWORD Position; + DWORD StartTime; + DWORD UntilTime; + DWORD TotalPages; + DWORD Size; + SYSTEMTIME Submitted; + DWORD Time; + DWORD PagesPrinted; + LONG SizeHigh; +} JOB_INFO_4A, *PJOB_INFO_4A, *LPJOB_INFO_4A; + +typedef struct _JOB_INFO_4W { + DWORD JobId; + LPWSTR pPrinterName; + LPWSTR pMachineName; + LPWSTR pUserName; + LPWSTR pDocument; + LPWSTR pNotifyName; + LPWSTR pDatatype; + LPWSTR pPrintProcessor; + LPWSTR pParameters; + LPWSTR pDriverName; + LPDEVMODEW pDevMode; + LPWSTR pStatus; + PSECURITY_DESCRIPTOR pSecurityDescriptor; + DWORD Status; + DWORD Priority; + DWORD Position; + DWORD StartTime; + DWORD UntilTime; + DWORD TotalPages; + DWORD Size; + SYSTEMTIME Submitted; + DWORD Time; + DWORD PagesPrinted; + LONG SizeHigh; +} JOB_INFO_4W, *PJOB_INFO_4W, *LPJOB_INFO_4W; + typedef struct _DOC_INFO_1A { LPSTR pDocName; LPSTR pOutputFile; @@ -763,6 +823,32 @@ DWORD dwStatus; } PRINTER_INFO_6, *PPRINTER_INFO_6, *LPPRINTER_INFO_6; +typedef struct _PRINTER_INFO_7A { + LPSTR pszObjectGUID; + DWORD dwAction; +} PRINTER_INFO_7A, *PPRINTER_INFO_7A, *LPPRINTER_INFO_7A; + +typedef struct _PRINTER_INFO_7W { + LPWSTR pszObjectGUID; + DWORD dwAction; +} PRINTER_INFO_7W, *PPRINTER_INFO_7W, *LPPRINTER_INFO_7W; + +typedef struct _PRINTER_INFO_8A { + LPDEVMODEA pDevMode; +} PRINTER_INFO_8A, *PPRINTER_INFO_8A, *LPPRINTER_INFO_8A; + +typedef struct _PRINTER_INFO_8W { + LPDEVMODEW pDevMode; +} PRINTER_INFO_8W, *PPRINTER_INFO_8W, *LPPRINTER_INFO_8W; + +typedef struct _PRINTER_INFO_9A { + LPDEVMODEA pDevMode; +} PRINTER_INFO_9A, *PPRINTER_INFO_9A, *LPPRINTER_INFO_9A; + +typedef struct _PRINTER_INFO_9W { + LPDEVMODEW pDevMode; +} PRINTER_INFO_9W, *PPRINTER_INFO_9W, *LPPRINTER_INFO_9W; + typedef struct _PRINTPROCESSOR_INFO_1A { LPSTR pName; } PRINTPROCESSOR_INFO_1A, *PPRINTPROCESSOR_INFO_1A, *LPPRINTPROCESSOR_INFO_1A; @@ -806,6 +892,36 @@ RECTL ImageableArea; } FORM_INFO_1W, *PFORM_INFO_1W, *LPFORM_INFO_1W; +#if (NTDDI_VERSION >= NTDDI_VISTA) + +typedef struct _FORM_INFO_2A { + DWORD Flags; + LPCSTR pName; + SIZEL Size; + RECTL ImageableArea; + LPCSTR pKeyword; + DWORD StringType; + LPCSTR pMuiDll; + DWORD dwResourceId; + LPCSTR pDisplayName; + LANGID wLangId; +} FORM_INFO_2A, *PFORM_INFO_2A, *LPFORM_INFO_2A; + +typedef struct _FORM_INFO_2W { + DWORD Flags; + LPCWSTR pName; + SIZEL Size; + RECTL ImageableArea; + LPCSTR pKeyword; + DWORD StringType; + LPCWSTR pMuiDll; + DWORD dwResourceId; + LPCWSTR pDisplayName; + LANGID wLangId; +} FORM_INFO_2W, *PFORM_INFO_2W, *LPFORM_INFO_2W; + +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ + typedef struct _PRINTER_DEFAULTSA { LPSTR pDatatype; LPDEVMODE pDevMode; @@ -885,6 +1001,7 @@ typedef JOB_INFO_1W JOB_INFO_1, *PJOB_INFO_1, *LPJOB_INFO_1; typedef JOB_INFO_2W JOB_INFO_2, *PJOB_INFO_2, *LPJOB_INFO_2; +typedef JOB_INFO_4W JOB_INFO_4, *PJOB_INFO_4, *LPJOB_INFO_4; typedef ADDJOB_INFO_1W ADDJOB_INFO_1, *PADDJOB_INFO_1, *LPADDJOB_INFO_1; typedef DATATYPES_INFO_1W DATATYPES_INFO_1, *PDATATYPES_INFO_1, *LPDATATYPES_INFO_1; typedef MONITOR_INFO_1W MONITOR_INFO_1, *PMONITOR_INFO_1, *LPMONITOR_INFO_1; @@ -903,18 +1020,23 @@ typedef PRINTER_INFO_2W PRINTER_INFO_2, *PPRINTER_INFO_2, *LPPRINTER_INFO_2; typedef PRINTER_INFO_4W PRINTER_INFO_4, *PPRINTER_INFO_4, *LPPRINTER_INFO_4; typedef PRINTER_INFO_5W PRINTER_INFO_5, *PPRINTER_INFO_5, *LPPRINTER_INFO_5; +typedef PRINTER_INFO_7W PRINTER_INFO_7, *PPRINTER_INFO_7, *LPPRINTER_INFO_7; +typedef PRINTER_INFO_8W PRINTER_INFO_8, *PPRINTER_INFO_8, *LPPRINTER_INFO_8; +typedef PRINTER_INFO_9W PRINTER_INFO_9, *PPRINTER_INFO_9, *LPPRINTER_INFO_9; typedef PRINTPROCESSOR_INFO_1W PRINTPROCESSOR_INFO_1, *PPRINTPROCESSOR_INFO_1, *LPPRINTPROCESSOR_INFO_1; typedef FORM_INFO_1W FORM_INFO_1, *PFORM_INFO_1, *LPFORM_INFO_1; +#if (NTDDI_VERSION >= NTDDI_VISTA) +typedef FORM_INFO_2W FORM_INFO_2, *PFORM_INFO_2, *LPFORM_INFO_2; +#endif typedef PRINTER_DEFAULTSW PRINTER_DEFAULTS, *PPRINTER_DEFAULTS, *LPPRINTER_DEFAULTS; -typedef PROVIDOR_INFO_1W PROVIDOR_INFO_1; -typedef LPPROVIDOR_INFO_1W LPPROVIDOR_INFO_1; -typedef PROVIDOR_INFO_2W PROVIDOR_INFO_2; -typedef LPPROVIDOR_INFO_2W LPPROVIDOR_INFO_2; +typedef PROVIDOR_INFO_1W PROVIDOR_INFO_1, *PPROVIDOR_INFO_1, *LPPROVIDOR_INFO_1; +typedef PROVIDOR_INFO_2W PROVIDOR_INFO_2, *PPROVIDOR_INFO_2, *LPPROVIDOR_INFO_2; #else /* UNICODE */ typedef JOB_INFO_1A JOB_INFO_1, *PJOB_INFO_1, *LPJOB_INFO_1; typedef JOB_INFO_2A JOB_INFO_2, *PJOB_INFO_2, *LPJOB_INFO_2; +typedef JOB_INFO_4A JOB_INFO_4, *PJOB_INFO_4, *LPJOB_INFO_4; typedef ADDJOB_INFO_1A ADDJOB_INFO_1, *PADDJOB_INFO_1, *LPADDJOB_INFO_1; typedef DATATYPES_INFO_1A DATATYPES_INFO_1, *PDATATYPES_INFO_1, *LPDATATYPES_INFO_1; typedef MONITOR_INFO_1A MONITOR_INFO_1, *PMONITOR_INFO_1, *LPMONITOR_INFO_1; @@ -933,9 +1055,17 @@ typedef PRINTER_INFO_2A PRINTER_INFO_2, *PPRINTER_INFO_2, *LPPRINTER_INFO_2; typedef PRINTER_INFO_4A PRINTER_INFO_4, *PPRINTER_INFO_4, *LPPRINTER_INFO_4; typedef PRINTER_INFO_5A PRINTER_INFO_5, *PPRINTER_INFO_5, *LPPRINTER_INFO_5; +typedef PRINTER_INFO_7A PRINTER_INFO_7, *PPRINTER_INFO_7, *LPPRINTER_INFO_7; +typedef PRINTER_INFO_8A PRINTER_INFO_8, *PPRINTER_INFO_8, *LPPRINTER_INFO_8; +typedef PRINTER_INFO_9A PRINTER_INFO_9, *PPRINTER_INFO_9, *LPPRINTER_INFO_9; typedef PRINTPROCESSOR_INFO_1A PRINTPROCESSOR_INFO_1, *PPRINTPROCESSOR_INFO_1, *LPPRINTPROCESSOR_INFO_1; typedef FORM_INFO_1A FORM_INFO_1, *PFORM_INFO_1, *LPFORM_INFO_1; +#if (NTDDI_VERSION >= NTDDI_VISTA) +typedef FORM_INFO_2A FORM_INFO_2, *PFORM_INFO_2, *LPFORM_INFO_2; +#endif typedef PRINTER_DEFAULTSA PRINTER_DEFAULTS, *PPRINTER_DEFAULTS, *LPPRINTER_DEFAULTS; +typedef PROVIDOR_INFO_1A PROVIDOR_INFO_1, *PPROVIDOR_INFO_1, *LPPROVIDOR_INFO_1; +typedef PROVIDOR_INFO_2A PROVIDOR_INFO_2, *PPROVIDOR_INFO_2, *LPPROVIDOR_INFO_2; #endif /* UNICODE */ @@ -947,7 +1077,9 @@ _In_ HANDLE hPrinter, _In_range_(1, 2) DWORD Level, _When_(Level == 1, _In_reads_bytes_(sizeof(FORM_INFO_1A))) +#if (NTDDI_VERSION >= NTDDI_VISTA) _When_(Level == 2, _In_reads_bytes_(sizeof(FORM_INFO_2A))) +#endif LPBYTE pForm); BOOL @@ -956,7 +1088,9 @@ _In_ HANDLE hPrinter, _In_range_(1, 2) DWORD Level, _When_(Level == 1, _In_reads_bytes_(sizeof(FORM_INFO_1W))) +#if (NTDDI_VERSION >= NTDDI_VISTA) _When_(Level == 2, _In_reads_bytes_(sizeof(FORM_INFO_2W))) +#endif LPBYTE pForm); BOOL @@ -1616,8 +1750,8 @@ _When_(Level == 0, _Reserved_) _When_(Level == 1, _In_reads_bytes_opt_(sizeof(JOB_INFO_1))) _When_(Level == 2, _In_reads_bytes_opt_(sizeof(JOB_INFO_2))) + _When_(Level == 3, _In_reads_bytes_opt_(sizeof(JOB_INFO_3))) _When_(Level == 4, _In_reads_bytes_opt_(sizeof(JOB_INFO_4))) - _When_(Level == 3, _In_reads_bytes_opt_(sizeof(JOB_INFO_3))) LPBYTE pJob, _In_ DWORD Command); @@ -1630,8 +1764,8 @@ _When_(Level == 0, _Reserved_) _When_(Level == 1, _In_reads_bytes_opt_(sizeof(JOB_INFO_1))) _When_(Level == 2, _In_reads_bytes_opt_(sizeof(JOB_INFO_2))) + _When_(Level == 3, _In_reads_bytes_opt_(sizeof(JOB_INFO_3))) _When_(Level == 4, _In_reads_bytes_opt_(sizeof(JOB_INFO_4))) - _When_(Level == 3, _In_reads_bytes_opt_(sizeof(JOB_INFO_3))) LPBYTE pJob, _In_ DWORD Command);

11 years, 4 months

[akhaldi] 59804: [WINSPOOL.DRV] * Correct the FindNextPrinterChangeNotification() stub. [PSDK] * Annotate winspool.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Aug 23 22:58:29 2013 New Revision: 59804 URL: http://svn.reactos.org/svn/reactos?rev=59804&view=rev Log: [WINSPOOL.DRV] * Correct the FindNextPrinterChangeNotification() stub. [PSDK] * Annotate winspool.h. Modified: trunk/reactos/dll/win32/winspool/stubs.c trunk/reactos/include/psdk/winspool.h Modified: trunk/reactos/dll/win32/winspool/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/winspool/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/stubs.c [iso-8859-1] Fri Aug 23 22:58:29 2013 @@ -962,14 +962,14 @@ /* * @unimplemented */ -HANDLE -WINAPI -FindNextPrinterChangeNotification(HANDLE Printer, PDWORD Change, PVOID NotifyOptions, PVOID* NotifyInfo) +BOOL +WINAPI +FindNextPrinterChangeNotification(HANDLE Printer, PDWORD Change, LPVOID NotifyOptions, LPVOID* NotifyInfo) { OutputDebugStringW(L"winspool FindNextPrinterChangeNotification stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return INVALID_HANDLE_VALUE; + return FALSE; } Modified: trunk/reactos/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winspool.h?re… ============================================================================== --- trunk/reactos/include/psdk/winspool.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winspool.h [iso-8859-1] Fri Aug 23 22:58:29 2013 @@ -939,125 +939,800 @@ #endif /* UNICODE */ -BOOL WINAPI AbortPrinter(HANDLE); -BOOL WINAPI AddFormA(HANDLE,DWORD,PBYTE); -BOOL WINAPI AddFormW(HANDLE,DWORD,PBYTE); -BOOL WINAPI AddJobA(HANDLE,DWORD,PBYTE,DWORD,PDWORD); -BOOL WINAPI AddJobW(HANDLE,DWORD,PBYTE,DWORD,PDWORD); -BOOL WINAPI AddMonitorA(LPSTR,DWORD,PBYTE); -BOOL WINAPI AddMonitorW(LPWSTR,DWORD,PBYTE); -BOOL WINAPI AddPortA(LPSTR,HWND,LPSTR); -BOOL WINAPI AddPortW(LPWSTR,HWND,LPWSTR); -HANDLE WINAPI AddPrinterA(LPSTR,DWORD,PBYTE); -HANDLE WINAPI AddPrinterW(LPWSTR,DWORD,PBYTE); -BOOL WINAPI AddPrinterConnectionA(LPSTR); -BOOL WINAPI AddPrinterConnectionW(LPWSTR); -BOOL WINAPI AddPrinterDriverA(LPSTR,DWORD,PBYTE); -BOOL WINAPI AddPrinterDriverW(LPWSTR,DWORD,PBYTE); -BOOL WINAPI AddPrintProcessorA(LPSTR,LPSTR,LPSTR,LPSTR); -BOOL WINAPI AddPrintProcessorW(LPWSTR,LPWSTR,LPWSTR,LPWSTR); -BOOL WINAPI AddPrintProvidorA(LPSTR,DWORD,PBYTE); -BOOL WINAPI AddPrintProvidorW(LPWSTR,DWORD,PBYTE); -LONG WINAPI AdvancedDocumentPropertiesA(HWND,HANDLE,LPSTR,PDEVMODEA,PDEVMODEA); -LONG WINAPI AdvancedDocumentPropertiesW(HWND,HANDLE,LPWSTR,PDEVMODEW,PDEVMODEW); -BOOL WINAPI ClosePrinter(HANDLE); -BOOL WINAPI ConfigurePortA(LPSTR,HWND,LPSTR); -BOOL WINAPI ConfigurePortW(LPWSTR,HWND,LPWSTR); -HANDLE WINAPI ConnectToPrinterDlg(HWND,DWORD); -BOOL WINAPI DeleteFormA(HANDLE,LPSTR); -BOOL WINAPI DeleteFormW(HANDLE,LPWSTR); -BOOL WINAPI DeleteMonitorA(LPSTR,LPSTR,LPSTR); -BOOL WINAPI DeleteMonitorW(LPWSTR,LPWSTR,LPWSTR); -BOOL WINAPI DeletePortA(LPSTR,HWND,LPSTR); -BOOL WINAPI DeletePortW(LPWSTR,HWND,LPWSTR); -BOOL WINAPI DeletePrinter(HANDLE); -BOOL WINAPI DeletePrinterConnectionA(LPSTR); -BOOL WINAPI DeletePrinterConnectionW(LPWSTR); -DWORD WINAPI DeletePrinterDataA(HANDLE,LPSTR); -DWORD WINAPI DeletePrinterDataW(HANDLE,LPWSTR); -BOOL WINAPI DeletePrinterDriverA(LPSTR,LPSTR,LPSTR); -BOOL WINAPI DeletePrinterDriverW(LPWSTR,LPWSTR,LPWSTR); -BOOL WINAPI DeletePrintProcessorA(LPSTR,LPSTR,LPSTR); -BOOL WINAPI DeletePrintProcessorW(LPWSTR,LPWSTR,LPWSTR); -BOOL WINAPI DeletePrintProvidorA(LPSTR,LPSTR,LPSTR); -BOOL WINAPI DeletePrintProvidorW(LPWSTR,LPWSTR,LPWSTR); -LONG WINAPI DocumentPropertiesA(HWND,HANDLE,LPSTR,PDEVMODEA,PDEVMODEA,DWORD); -LONG WINAPI DocumentPropertiesW(HWND,HANDLE,LPWSTR,PDEVMODEW,PDEVMODEW,DWORD); -BOOL WINAPI EndDocPrinter(HANDLE); -BOOL WINAPI EndPagePrinter(HANDLE); -BOOL WINAPI EnumFormsA(HANDLE,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumFormsW(HANDLE,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumJobsA(HANDLE,DWORD,DWORD,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumJobsW(HANDLE,DWORD,DWORD,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumMonitorsA(LPSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumMonitorsW(LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumPortsA(LPSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumPortsW(LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -DWORD WINAPI EnumPrinterDataA(HANDLE,DWORD,LPSTR,DWORD,PDWORD,PDWORD,PBYTE,DWORD,PDWORD); -DWORD WINAPI EnumPrinterDataW(HANDLE,DWORD,LPWSTR,DWORD,PDWORD,PDWORD,PBYTE,DWORD,PDWORD); -BOOL WINAPI EnumPrinterDriversA(LPSTR,LPSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumPrinterDriversW(LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumPrintersA(DWORD,LPSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumPrintersW(DWORD,LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumPrintProcessorDatatypesA(LPSTR,LPSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumPrintProcessorDatatypesW(LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumPrintProcessorsA(LPSTR,LPSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumPrintProcessorsW(LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); -LONG WINAPI ExtDeviceMode(HWND,HANDLE,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,DWORD); -BOOL WINAPI FindClosePrinterChangeNotification(HANDLE); -HANDLE WINAPI FindFirstPrinterChangeNotification(HANDLE,DWORD,DWORD,PVOID); -HANDLE WINAPI FindNextPrinterChangeNotification(HANDLE,PDWORD,PVOID,PVOID*); -BOOL WINAPI FreePrinterNotifyInfo(PPRINTER_NOTIFY_INFO); +BOOL WINAPI AbortPrinter(_In_ HANDLE); + +BOOL +WINAPI +AddFormA( + _In_ HANDLE hPrinter, + _In_range_(1, 2) DWORD Level, + _When_(Level == 1, _In_reads_bytes_(sizeof(FORM_INFO_1A))) + _When_(Level == 2, _In_reads_bytes_(sizeof(FORM_INFO_2A))) + LPBYTE pForm); + +BOOL +WINAPI +AddFormW( + _In_ HANDLE hPrinter, + _In_range_(1, 2) DWORD Level, + _When_(Level == 1, _In_reads_bytes_(sizeof(FORM_INFO_1W))) + _When_(Level == 2, _In_reads_bytes_(sizeof(FORM_INFO_2W))) + LPBYTE pForm); + +BOOL +WINAPI +AddJobA( + _In_ HANDLE hPrinter, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pData, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + +BOOL +WINAPI +AddJobW( + _In_ HANDLE hPrinter, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pData, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + +BOOL +WINAPI +AddMonitorA( + _In_opt_ LPSTR pName, + _In_ DWORD Level, + _In_reads_bytes_opt_(sizeof(MONITOR_INFO_2)) LPBYTE pMonitors); + +BOOL +WINAPI +AddMonitorW( + _In_opt_ LPWSTR pName, + _In_ DWORD Level, + _In_reads_bytes_opt_(sizeof(MONITOR_INFO_2)) LPBYTE pMonitors); + +BOOL WINAPI AddPortA(_In_opt_ LPSTR, _In_ HWND, _In_ LPSTR); +BOOL WINAPI AddPortW(_In_opt_ LPWSTR, _In_ HWND, _In_ LPWSTR); + +HANDLE +WINAPI +AddPrinterA( + _In_opt_ LPSTR pName, + _In_range_(1, 2) DWORD Level, + _When_(Level == 1, _In_reads_bytes_(sizeof(PRINTER_INFO_1))) + _When_(Level == 2, _In_reads_bytes_(sizeof(PRINTER_INFO_2))) + LPBYTE pPrinter); + +HANDLE +WINAPI +AddPrinterW( + _In_opt_ LPWSTR pName, + _In_range_(1, 2) DWORD Level, + _When_(Level == 1, _In_reads_bytes_(sizeof(PRINTER_INFO_1))) + _When_(Level == 2, _In_reads_bytes_(sizeof(PRINTER_INFO_2))) + LPBYTE pPrinter); + +BOOL WINAPI AddPrinterConnectionA(_In_ LPSTR); +BOOL WINAPI AddPrinterConnectionW(_In_ LPWSTR); +BOOL WINAPI AddPrinterDriverA(_In_opt_ LPSTR, _In_ DWORD, _In_ PBYTE); +BOOL WINAPI AddPrinterDriverW(_In_opt_ LPWSTR, _In_ DWORD, _In_ PBYTE); + +BOOL +WINAPI +AddPrintProcessorA( + _In_opt_ LPSTR pName, + _In_opt_ LPSTR pEnvironment, + _In_ LPSTR pPathName, + _In_ LPSTR pPrintProcessorName); + +BOOL +WINAPI +AddPrintProcessorW( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ LPWSTR pPathName, + _In_ LPWSTR pPrintProcessorName); + +BOOL +WINAPI +AddPrintProvidorA( + _In_opt_ LPSTR pName, + _In_range_(1, 2) DWORD Level, + _When_(Level == 1, _In_reads_bytes_(sizeof(PROVIDOR_INFO_1))) + _When_(Level == 2, _In_reads_bytes_(sizeof(PROVIDOR_INFO_2))) + LPBYTE pProvidorInfo); + +BOOL +WINAPI +AddPrintProvidorW( + _In_opt_ LPWSTR pName, + _In_range_(1, 2) DWORD Level, + _When_(Level == 1, _In_reads_bytes_(sizeof(PROVIDOR_INFO_1))) + _When_(Level == 2, _In_reads_bytes_(sizeof(PROVIDOR_INFO_2))) + LPBYTE pProvidorInfo); + +LONG +WINAPI +AdvancedDocumentPropertiesA( + _In_ HWND hWnd, + _In_ HANDLE hPrinter, + _In_ LPSTR pDeviceName, + _Inout_opt_ PDEVMODEA pDevModeOutput, + _In_opt_ PDEVMODEA pDevModeInput); + +LONG +WINAPI +AdvancedDocumentPropertiesW( + _In_ HWND hWnd, + _In_ HANDLE hPrinter, + _In_ LPWSTR pDeviceName, + _Inout_opt_ PDEVMODEW pDevModeOutput, + _In_opt_ PDEVMODEW pDevModeInput); + +BOOL WINAPI ClosePrinter(_In_ HANDLE); +BOOL WINAPI ConfigurePortA(_In_opt_ LPSTR, _In_ HWND, _In_ LPSTR); +BOOL WINAPI ConfigurePortW(_In_opt_ LPWSTR, _In_ HWND, _In_ LPWSTR); +HANDLE WINAPI ConnectToPrinterDlg(_In_ HWND, _In_ DWORD); +BOOL WINAPI DeleteFormA(_In_ HANDLE, _In_ LPSTR); +BOOL WINAPI DeleteFormW(_In_ HANDLE, _In_ LPWSTR); +BOOL WINAPI DeleteMonitorA(_In_opt_ LPSTR, _In_opt_ LPSTR, _In_ LPSTR); +BOOL WINAPI DeleteMonitorW(_In_opt_ LPWSTR, _In_opt_ LPWSTR, _In_ LPWSTR); +BOOL WINAPI DeletePortA(_In_opt_ LPSTR, _In_ HWND, _In_ LPSTR); +BOOL WINAPI DeletePortW(_In_opt_ LPWSTR, _In_ HWND, _In_ LPWSTR); +BOOL WINAPI DeletePrinter(_Inout_ HANDLE); +BOOL WINAPI DeletePrinterConnectionA(_In_ LPSTR); +BOOL WINAPI DeletePrinterConnectionW(_In_ LPWSTR); +DWORD WINAPI DeletePrinterDataA(_In_ HANDLE, _In_ LPSTR); +DWORD WINAPI DeletePrinterDataW(_In_ HANDLE, _In_ LPWSTR); + +BOOL +WINAPI +DeletePrinterDriverA( + _In_opt_ LPSTR pName, + _In_opt_ LPSTR pEnvironment, + _In_ LPSTR pDriverName); + +BOOL +WINAPI +DeletePrinterDriverW( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ LPWSTR pDriverName); + +BOOL +WINAPI +DeletePrintProcessorA( + _In_opt_ LPSTR pName, + _In_opt_ LPSTR pEnvironment, + _In_ LPSTR pPrintProcessorName); + +BOOL +WINAPI +DeletePrintProcessorW( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ LPWSTR pPrintProcessorName); + +BOOL +WINAPI +DeletePrintProvidorA( + _In_opt_ LPSTR pName, + _In_opt_ LPSTR pEnvironment, + _In_ LPSTR pPrintProvidorName); + +BOOL +WINAPI +DeletePrintProvidorW( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ LPWSTR pPrintProvidorName); + +LONG +WINAPI +DocumentPropertiesA( + _In_opt_ HWND hWnd, + _In_ HANDLE hPrinter, + _In_ LPSTR pDeviceName, + _Out_opt_ PDEVMODEA pDevModeOutput, + _In_opt_ PDEVMODEA pDevModeInput, + _In_ DWORD fMode); + +LONG +WINAPI +DocumentPropertiesW( + _In_opt_ HWND hWnd, + _In_ HANDLE hPrinter, + _In_ LPWSTR pDeviceName, + _Out_opt_ PDEVMODEW pDevModeOutput, + _In_opt_ PDEVMODEW pDevModeInput, + _In_ DWORD fMode); + +BOOL WINAPI EndDocPrinter(_In_ HANDLE); +BOOL WINAPI EndPagePrinter(_In_ HANDLE); + +BOOL +WINAPI +EnumFormsA( + _In_ HANDLE hPrinter, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pForm, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +BOOL +WINAPI +EnumFormsW( + _In_ HANDLE hPrinter, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pForm, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +BOOL +WINAPI +EnumJobsA( + _In_ HANDLE hPrinter, + _In_ DWORD FirstJob, + _In_ DWORD NoJobs, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pJob, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +BOOL +WINAPI +EnumJobsW( + _In_ HANDLE hPrinter, + _In_ DWORD FirstJob, + _In_ DWORD NoJobs, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pJob, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +BOOL +WINAPI +EnumMonitorsA( + _In_opt_ LPSTR pName, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pMonitor, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +BOOL +WINAPI +EnumMonitorsW( + _In_opt_ LPWSTR pName, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pMonitor, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +BOOL +WINAPI +EnumPortsA( + _In_opt_ LPSTR pName, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pPort, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +BOOL +WINAPI +EnumPortsW( + _In_opt_ LPWSTR pName, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pPort, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +DWORD +WINAPI +EnumPrinterDataA( + _In_ HANDLE hPrinter, + _In_ DWORD dwIndex, + _Out_writes_bytes_(cbValueName) LPSTR pValueName, + _In_ DWORD cbValueName, + _Out_ LPDWORD pcbValueName, + _Out_opt_ LPDWORD pType, + _Out_writes_to_opt_(cbData, *pcbData) LPBYTE pData, + _In_ DWORD cbData, + _When_(pData != NULL, _Pre_notnull_) _Out_opt_ LPDWORD pcbData); + +DWORD +WINAPI +EnumPrinterDataW( + _In_ HANDLE hPrinter, + _In_ DWORD dwIndex, + _Out_writes_bytes_(cbValueName) LPWSTR pValueName, + _In_ DWORD cbValueName, + _Out_ LPDWORD pcbValueName, + _Out_opt_ LPDWORD pType, + _Out_writes_to_opt_(cbData, *pcbData) LPBYTE pData, + _In_ DWORD cbData, + _When_(pData != NULL, _Pre_notnull_) _Out_opt_ LPDWORD pcbData); + +BOOL +WINAPI +EnumPrinterDriversA( + _In_opt_ LPSTR pName, + _In_opt_ LPSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pDriverInfo, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +BOOL +WINAPI +EnumPrinterDriversW( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pDriverInfo, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +_Success_(return != 0) +BOOL +WINAPI +EnumPrintersA( + _In_ DWORD Flags, + _In_opt_ LPSTR Name, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pPrinterEnum, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +_Success_(return != 0) +BOOL +WINAPI +EnumPrintersW( + _In_ DWORD Flags, + _In_opt_ LPWSTR Name, + _In_ DWORD Level, + _Out_writes_bytes_to_opt_(cbBuf, *pcbNeeded) LPBYTE pPrinterEnum, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +_Success_(return != 0) +BOOL +WINAPI +EnumPrintProcessorDatatypesA( + _In_opt_ LPSTR pName, + _In_ LPSTR pPrintProcessorName, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pDatatypes, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +_Success_(return != 0) +BOOL +WINAPI +EnumPrintProcessorDatatypesW( + _In_opt_ LPWSTR pName, + _In_ LPWSTR pPrintProcessorName, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pDatatypes, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +BOOL +WINAPI +EnumPrintProcessorsA( + _In_opt_ LPSTR pName, + _In_opt_ LPSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pPrintProcessorInfo, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +BOOL +WINAPI +EnumPrintProcessorsW( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pPrintProcessorInfo, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded, + _Out_ LPDWORD pcReturned); + +LONG +WINAPI +ExtDeviceMode( + _In_opt_ HWND hWnd, + _In_opt_ HANDLE hInst, + _Inout_opt_ LPDEVMODEA pDevModeOutput, + _In_opt_ LPSTR pDeviceName, + _In_opt_ LPSTR pPort, + _In_opt_ LPDEVMODEA pDevModeInput, + _In_opt_ LPSTR pProfile, + _In_ DWORD fMode); + +BOOL WINAPI FindClosePrinterChangeNotification(_In_ HANDLE); + +HANDLE +WINAPI +FindFirstPrinterChangeNotification( + _In_ HANDLE hPrinter, + DWORD fdwFilter, + DWORD fdwOptions, + _In_opt_ PVOID pPrinterNotifyOptions); + +BOOL +WINAPI +FindNextPrinterChangeNotification( + _In_ HANDLE hChange, + _Out_opt_ PDWORD pdwChange, + _In_opt_ LPVOID pvReserved, + _Out_opt_ LPVOID *ppPrinterNotifyInfo); + +BOOL WINAPI FreePrinterNotifyInfo(_In_ PPRINTER_NOTIFY_INFO); + #if _WIN32_WINNT >= 0x0500 -BOOL WINAPI GetDefaultPrinterA(LPSTR,LPDWORD); -BOOL WINAPI GetDefaultPrinterW(LPWSTR,LPDWORD); + +BOOL +WINAPI +GetDefaultPrinterA( + _Out_writes_opt_(*pcchBuffer) LPSTR pszBuffer, + _Inout_ LPDWORD pcchBuffer); + +BOOL +WINAPI +GetDefaultPrinterW( + _Out_writes_opt_(*pcchBuffer) LPWSTR pszBuffer, + _Inout_ LPDWORD pcchBuffer); + #endif -BOOL WINAPI GetFormA(HANDLE,LPSTR,DWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI GetFormW(HANDLE,LPWSTR,DWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI GetJobA(HANDLE,DWORD,DWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI GetJobW(HANDLE,DWORD,DWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI GetPrinterA(HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI GetPrinterW(HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); -DWORD WINAPI GetPrinterDataA(HANDLE,LPSTR,PDWORD,LPBYTE,DWORD,LPDWORD); -DWORD WINAPI GetPrinterDataW(HANDLE,LPWSTR,LPDWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI GetPrinterDriverA(HANDLE,LPSTR,DWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI GetPrinterDriverW(HANDLE,LPWSTR,DWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR,LPSTR,DWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR,LPWSTR,DWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI GetPrintProcessorDirectoryA(LPSTR,LPSTR,DWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI GetPrintProcessorDirectoryW(LPWSTR,LPWSTR,DWORD,LPBYTE,DWORD,LPDWORD); + +BOOL +WINAPI +GetFormA( + _In_ HANDLE hPrinter, + _In_ LPSTR pFormName, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pForm, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + +BOOL +WINAPI +GetFormW( + _In_ HANDLE hPrinter, + _In_ LPWSTR pFormName, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pForm, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + +BOOL +WINAPI +GetJobA( + _In_ HANDLE hPrinter, + _In_ DWORD JobId, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pJob, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + +BOOL +WINAPI +GetJobW( + _In_ HANDLE hPrinter, + _In_ DWORD JobId, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pJob, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + +BOOL +WINAPI +GetPrinterA( + _In_ HANDLE hPrinter, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pPrinter, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + +BOOL +WINAPI +GetPrinterW( + _In_ HANDLE hPrinter, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pPrinter, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + +DWORD +WINAPI +GetPrinterDataA( + _In_ HANDLE hPrinter, + _In_ LPSTR pValueName, + _Out_opt_ LPDWORD pType, + _Out_writes_bytes_opt_(nSize) LPBYTE pData, + _In_ DWORD nSize, + _Out_ LPDWORD pcbNeeded); + +DWORD +WINAPI +GetPrinterDataW( + _In_ HANDLE hPrinter, + _In_ LPWSTR pValueName, + _Out_opt_ LPDWORD pType, + _Out_writes_bytes_opt_(nSize) LPBYTE pData, + _In_ DWORD nSize, + _Out_ LPDWORD pcbNeeded); + +BOOL +WINAPI +GetPrinterDriverA( + _In_ HANDLE hPrinter, + _In_opt_ LPSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pDriverInfo, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + +BOOL +WINAPI +GetPrinterDriverW( + _In_ HANDLE hPrinter, + _In_opt_ LPWSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pDriverInfo, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + +BOOL +WINAPI +GetPrinterDriverDirectoryA( + _In_opt_ LPSTR pName, + _In_opt_ LPSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pDriverDirectory, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + +BOOL +WINAPI +GetPrinterDriverDirectoryW( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pDriverDirectory, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + +BOOL +WINAPI +GetPrintProcessorDirectoryA( + _In_opt_ LPSTR pName, + _In_opt_ LPSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pPrintProcessorInfo, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + +BOOL +WINAPI +GetPrintProcessorDirectoryW( + _In_opt_ LPWSTR pName, + _In_opt_ LPWSTR pEnvironment, + _In_ DWORD Level, + _Out_writes_bytes_opt_(cbBuf) LPBYTE pPrintProcessorInfo, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcbNeeded); + #if NTDDI_VERSION >= NTDDI_WINXPSP2 -BOOL WINAPI IsValidDevmodeA(PDEVMODEA,size_t); -BOOL WINAPI IsValidDevmodeW(PDEVMODEW,size_t); +BOOL WINAPI IsValidDevmodeA(_In_opt_ PDEVMODEA, size_t); +BOOL WINAPI IsValidDevmodeW(_In_opt_ PDEVMODEW, size_t); #endif -BOOL WINAPI OpenPrinterA(LPSTR,PHANDLE,LPPRINTER_DEFAULTSA); -BOOL WINAPI OpenPrinterW(LPWSTR,PHANDLE,LPPRINTER_DEFAULTSW); -DWORD WINAPI PrinterMessageBoxA(HANDLE,DWORD,HWND,LPSTR,LPSTR,DWORD); -DWORD WINAPI PrinterMessageBoxW(HANDLE,DWORD,HWND,LPWSTR,LPWSTR,DWORD); -BOOL WINAPI PrinterProperties(HWND,HANDLE); -BOOL WINAPI ReadPrinter(HANDLE,PVOID,DWORD,PDWORD); -BOOL WINAPI ResetPrinterA(HANDLE,LPPRINTER_DEFAULTSA); -BOOL WINAPI ResetPrinterW(HANDLE,LPPRINTER_DEFAULTSW); -BOOL WINAPI ScheduleJob(HANDLE,DWORD); -BOOL WINAPI SetFormA(HANDLE,LPSTR,DWORD,PBYTE); -BOOL WINAPI SetFormW(HANDLE,LPWSTR,DWORD,PBYTE); -BOOL WINAPI SetJobA(HANDLE,DWORD,DWORD,PBYTE,DWORD); -BOOL WINAPI SetJobW(HANDLE,DWORD,DWORD,PBYTE,DWORD); -BOOL WINAPI SetPrinterA(HANDLE,DWORD,PBYTE,DWORD); -BOOL WINAPI SetPrinterW(HANDLE,DWORD,PBYTE,DWORD); -BOOL WINAPI SetPrinterDataA(HANDLE,LPSTR,DWORD,PBYTE,DWORD); -BOOL WINAPI SetPrinterDataW(HANDLE,LPWSTR,DWORD,PBYTE,DWORD); + +BOOL +WINAPI +OpenPrinterA( + _In_opt_ LPSTR pPrinterName, + _Out_ LPHANDLE phPrinter, + _In_opt_ LPPRINTER_DEFAULTSA pDefault); + +BOOL +WINAPI +OpenPrinterW( + _In_opt_ LPWSTR pPrinterName, + _Out_ LPHANDLE phPrinter, + _In_opt_ LPPRINTER_DEFAULTSW pDefault); + +DWORD +WINAPI +PrinterMessageBoxA( + _In_ HANDLE hPrinter, + DWORD Error, + _In_ HWND hWnd, + _In_ LPSTR pText, + _In_ LPSTR pCaption, + DWORD dwType); + +DWORD +WINAPI +PrinterMessageBoxW( + _In_ HANDLE hPrinter, + DWORD Error, + _In_ HWND hWnd, + _In_ LPWSTR pText, + _In_ LPWSTR pCaption, + DWORD dwType); + +BOOL WINAPI PrinterProperties(_In_ HWND, _In_ HANDLE); + +BOOL +WINAPI +ReadPrinter( + _In_ HANDLE hPrinter, + _Out_writes_bytes_(cbBuf) LPVOID pBuf, + _In_ DWORD cbBuf, + _Out_ LPDWORD pNoBytesRead); + +BOOL WINAPI ResetPrinterA(_In_ HANDLE, _In_opt_ LPPRINTER_DEFAULTSA); +BOOL WINAPI ResetPrinterW(_In_ HANDLE, _In_opt_ LPPRINTER_DEFAULTSW); +BOOL WINAPI ScheduleJob(_In_ HANDLE, _In_ DWORD); + +BOOL +WINAPI +SetFormA( + _In_ HANDLE hPrinter, + _In_ LPSTR pFormName, + _In_range_(1, 2) DWORD Level, + _When_(Level == 1, _In_reads_bytes_(sizeof(FORM_INFO_1A))) LPBYTE pForm); + +BOOL +WINAPI +SetFormW( + _In_ HANDLE hPrinter, + _In_ LPWSTR pFormName, + _In_range_(1, 2) DWORD Level, + _When_(Level == 1, _In_reads_bytes_(sizeof(FORM_INFO_1W))) LPBYTE pForm); + +BOOL +WINAPI +SetJobA( + _In_ HANDLE hPrinter, + _In_ DWORD JobId, + _In_range_(0, 4) DWORD Level, + _When_(Level == 0, _Reserved_) + _When_(Level == 1, _In_reads_bytes_opt_(sizeof(JOB_INFO_1))) + _When_(Level == 2, _In_reads_bytes_opt_(sizeof(JOB_INFO_2))) + _When_(Level == 4, _In_reads_bytes_opt_(sizeof(JOB_INFO_4))) + _When_(Level == 3, _In_reads_bytes_opt_(sizeof(JOB_INFO_3))) + LPBYTE pJob, + _In_ DWORD Command); + +BOOL +WINAPI +SetJobW( + _In_ HANDLE hPrinter, + _In_ DWORD JobId, + _In_range_(0, 4) DWORD Level, + _When_(Level == 0, _Reserved_) + _When_(Level == 1, _In_reads_bytes_opt_(sizeof(JOB_INFO_1))) + _When_(Level == 2, _In_reads_bytes_opt_(sizeof(JOB_INFO_2))) + _When_(Level == 4, _In_reads_bytes_opt_(sizeof(JOB_INFO_4))) + _When_(Level == 3, _In_reads_bytes_opt_(sizeof(JOB_INFO_3))) + LPBYTE pJob, + _In_ DWORD Command); + +BOOL +WINAPI +SetPrinterA( + _In_ HANDLE hPrinter, + _In_range_(0, 9) DWORD Level, + _When_(Level == 0 && Command == PRINTER_CONTROL_SET_STATUS, _In_reads_bytes_(sizeof(DWORD))) + _When_(Level == 0 && Command != PRINTER_CONTROL_SET_STATUS, _In_opt_) + _When_(Level == 1, _In_reads_bytes_(sizeof(PRINTER_INFO_1))) + _When_(Level == 2, _In_reads_bytes_(sizeof(PRINTER_INFO_2))) + _When_(Level == 3, _In_reads_bytes_(sizeof(PRINTER_INFO_3))) + _When_(Level == 4, _In_reads_bytes_(sizeof(PRINTER_INFO_4))) + _When_(Level == 5, _In_reads_bytes_(sizeof(PRINTER_INFO_5))) + _When_(Level == 6, _In_reads_bytes_(sizeof(PRINTER_INFO_6))) + _When_(Level == 7, _In_reads_bytes_(sizeof(PRINTER_INFO_7))) + _When_(Level == 8, _In_reads_bytes_(sizeof(PRINTER_INFO_8))) + _When_(Level == 9, _In_reads_bytes_(sizeof(PRINTER_INFO_9))) + LPBYTE pPrinter, + _In_ DWORD Command); + +BOOL +WINAPI +SetPrinterW( + _In_ HANDLE hPrinter, + _In_range_(0, 9) DWORD Level, + _When_(Level == 0 && Command == PRINTER_CONTROL_SET_STATUS, _In_reads_bytes_(sizeof(DWORD))) + _When_(Level == 0 && Command != PRINTER_CONTROL_SET_STATUS, _In_opt_) + _When_(Level == 1, _In_reads_bytes_(sizeof(PRINTER_INFO_1))) + _When_(Level == 2, _In_reads_bytes_(sizeof(PRINTER_INFO_2))) + _When_(Level == 3, _In_reads_bytes_(sizeof(PRINTER_INFO_3))) + _When_(Level == 4, _In_reads_bytes_(sizeof(PRINTER_INFO_4))) + _When_(Level == 5, _In_reads_bytes_(sizeof(PRINTER_INFO_5))) + _When_(Level == 6, _In_reads_bytes_(sizeof(PRINTER_INFO_6))) + _When_(Level == 7, _In_reads_bytes_(sizeof(PRINTER_INFO_7))) + _When_(Level == 8, _In_reads_bytes_(sizeof(PRINTER_INFO_8))) + _When_(Level == 9, _In_reads_bytes_(sizeof(PRINTER_INFO_9))) + LPBYTE pPrinter, + _In_ DWORD Command); + +BOOL +WINAPI +SetPrinterDataA( + _In_ HANDLE hPrinter, + _In_ LPSTR pValueName, + _In_ DWORD Type, + _In_reads_bytes_(cbData) LPBYTE pData, + _In_ DWORD cbData); + +BOOL +WINAPI +SetPrinterDataW( + _In_ HANDLE hPrinter, + _In_ LPWSTR pValueName, + _In_ DWORD Type, + _In_reads_bytes_(cbData) LPBYTE pData, + _In_ DWORD cbData); + #ifdef _WINE LPSTR WINAPI StartDocDlgA(HANDLE hPrinter, DOCINFOA *doc); LPWSTR WINAPI StartDocDlgW(HANDLE hPrinter, DOCINFOW *doc); #define StartDocDlg WINELIB_NAME_AW(StartDocDlg) #endif -DWORD WINAPI StartDocPrinterA(HANDLE,DWORD,PBYTE); -DWORD WINAPI StartDocPrinterW(HANDLE,DWORD,PBYTE); -BOOL WINAPI StartPagePrinter(HANDLE); -DWORD WINAPI WaitForPrinterChange(HANDLE,DWORD); -BOOL WINAPI WritePrinter(HANDLE,PVOID,DWORD,PDWORD); -BOOL WINAPI XcvDataW(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD); + +DWORD +WINAPI +StartDocPrinterA( + _In_ HANDLE hPrinter, + _In_range_(1, 3) DWORD Level, + _When_(Level == 1, _In_reads_bytes_(sizeof(DOC_INFO_1))) LPBYTE pDocInfo); + +DWORD +WINAPI +StartDocPrinterW( + _In_ HANDLE hPrinter, + _In_range_(1, 3) DWORD Level, + _When_(Level == 1, _In_reads_bytes_(sizeof(DOC_INFO_1))) LPBYTE pDocInfo); + +BOOL WINAPI StartPagePrinter(_In_ HANDLE); +DWORD WINAPI WaitForPrinterChange(_In_ HANDLE, _In_ DWORD); + +BOOL +WINAPI +WritePrinter( + _In_ HANDLE hPrinter, + _In_reads_bytes_(cbBuf) LPVOID pBuf, + _In_ DWORD cbBuf, + _Out_ LPDWORD pcWritten); + +BOOL +WINAPI +XcvDataW( + _In_ HANDLE hXcv, + _In_ PCWSTR pszDataName, + _In_reads_bytes_opt_(cbInputData) PBYTE pInputData, + DWORD cbInputData, + _Out_writes_bytes_opt_(cbOutputData) PBYTE pOutputData, + DWORD cbOutputData, + _Out_ PDWORD pcbOutputNeeded, + _Out_opt_ PDWORD pdwStatus); #ifdef UNICODE

11 years, 4 months

[hbelusca] 59803: [NTOSKRNL] We aim at being compatible with Windows Server 2003... Do it better! Use the \GLOBAL?? dos-devices object directory instead of \??, as used in Windows NT and 2000 (whic...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Aug 23 21:18:46 2013 New Revision: 59803 URL: http://svn.reactos.org/svn/reactos?rev=59803&view=rev Log: [NTOSKRNL] We aim at being compatible with Windows Server 2003... Do it better! Use the \GLOBAL?? dos-devices object directory instead of \??, as used in Windows NT and 2000 (which becomes per-session in Windows >= XP), but add a temporary hack (i.e. create a symbolic link \?? <---> \GLOBAL??) since we don't support yet Ob device mappings which are needed for this mapping, in particular. As a side-effect, fix starting of DeviceTree v2.30 on ReactOS. Now it works correctly, as on Win2k3 :) CORE-6572 #resolve #comment Finally fix loading of the objinfo driver, which failed at creating a symbolic link in \GLOBAL??\ for its device. Modified: trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Fri Aug 23 21:18:46 2013 @@ -37,25 +37,48 @@ ObpCreateDosDevicesDirectory(VOID) { OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING Name, LinkName; + UNICODE_STRING RootName, TargetName, LinkName; HANDLE Handle, SymHandle; NTSTATUS Status; - /* Create the '\??' directory */ - RtlInitUnicodeString(&Name, L"\\??"); + /* Create the global DosDevices directory \?? */ + RtlInitUnicodeString(&RootName, L"\\GLOBAL??"); InitializeObjectAttributes(&ObjectAttributes, - &Name, + &RootName, OBJ_PERMANENT, NULL, NULL); Status = NtCreateDirectoryObject(&Handle, DIRECTORY_ALL_ACCESS, &ObjectAttributes); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Initialize the GLOBALROOT path */ + if (!NT_SUCCESS(Status)) return Status; + + /*********************************************\ + |*** HACK until we support device mappings ***| + |*** Add a symlink \??\ <--> \GLOBAL??\ ***| + \*********************************************/ + RtlInitUnicodeString(&LinkName, L"\\??"); + InitializeObjectAttributes(&ObjectAttributes, + &LinkName, + OBJ_PERMANENT, + NULL, + NULL); + Status = NtCreateSymbolicLinkObject(&SymHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &RootName); + if (NT_SUCCESS(Status)) NtClose(SymHandle); + /*********************************************\ + \*********************************************/ + + // FIXME: Create a device mapping for the global \?? directory + + /* + * Initialize the \??\GLOBALROOT symbolic link + * pointing to the root directory \ . + */ RtlInitUnicodeString(&LinkName, L"GLOBALROOT"); - RtlInitUnicodeString(&Name, L""); + RtlInitUnicodeString(&TargetName, L""); InitializeObjectAttributes(&ObjectAttributes, &LinkName, OBJ_PERMANENT, @@ -64,12 +87,16 @@ Status = NtCreateSymbolicLinkObject(&SymHandle, SYMBOLIC_LINK_ALL_ACCESS, &ObjectAttributes, - &Name); + &TargetName); if (NT_SUCCESS(Status)) NtClose(SymHandle); - /* Link \??\Global to \?? */ + /* + * Initialize the \??\Global symbolic link pointing to the global + * DosDevices directory \?? . It is used to access the global \?? + * by user-mode components which, by default, use a per-session + * DosDevices directory. + */ RtlInitUnicodeString(&LinkName, L"Global"); - RtlInitUnicodeString(&Name, L"\\??"); InitializeObjectAttributes(&ObjectAttributes, &LinkName, OBJ_PERMANENT, @@ -78,15 +105,20 @@ Status = NtCreateSymbolicLinkObject(&SymHandle, SYMBOLIC_LINK_ALL_ACCESS, &ObjectAttributes, - &Name); + &RootName); if (NT_SUCCESS(Status)) NtClose(SymHandle); /* Close the directory handle */ NtClose(Handle); if (!NT_SUCCESS(Status)) return Status; - /* Create link from '\DosDevices' to '\??' directory */ + /* + * Initialize the \DosDevices symbolic link pointing to the global + * DosDevices directory \?? , for backward compatibility with + * Windows NT-2000 systems. + */ RtlCreateUnicodeString(&LinkName, L"\\DosDevices"); + RtlInitUnicodeString(&RootName, (PCWSTR)&ObpDosDevicesShortNameRoot); InitializeObjectAttributes(&ObjectAttributes, &LinkName, OBJ_PERMANENT, @@ -95,7 +127,7 @@ Status = NtCreateSymbolicLinkObject(&SymHandle, SYMBOLIC_LINK_ALL_ACCESS, &ObjectAttributes, - &Name); + &RootName); if (NT_SUCCESS(Status)) NtClose(SymHandle); /* FIXME: Hack Hack! */

11 years, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
33
Older →

Jump to page:

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