Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 68031: [NTOSKRNL] do not set ReturnLength in ProcessWow64Information error case add size check in PROCESSOR_POWER_INFORMATION stub
by cwittich＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: cwittich Date: Sat Jun 6 09:36:01 2015 New Revision: 68031 URL: http://svn.reactos.org/svn/reactos?rev=68031&view=rev Log: [NTOSKRNL] do not set ReturnLength in ProcessWow64Information error case add size check in PROCESSOR_POWER_INFORMATION stub Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat Jun 6 09:36:01 2015 @@ -1839,6 +1839,13 @@ /* Class 42 - Power Information */ QSI_DEF(SystemPowerInformation) { + *ReqSize = sizeof(PROCESSOR_POWER_INFORMATION) * KeNumberProcessors; + + if (sizeof(PROCESSOR_POWER_INFORMATION) * KeNumberProcessors > Size) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + /* FIXME */ DPRINT1("NtQuerySystemInformation - SystemPowerInformation not implemented\n"); return STATUS_NOT_IMPLEMENTED; Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=68… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sat Jun 6 09:36:01 2015 @@ -960,6 +960,7 @@ Length = sizeof(ULONG_PTR); if (ProcessInformationLength != Length) { + Length = 0; Status = STATUS_INFO_LENGTH_MISMATCH; break; }

1 0

[cwittich] 68030: [HAL] fix a typo add BusAddress to DPRINT
by cwittich＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: cwittich Date: Sat Jun 6 08:37:53 2015 New Revision: 68030 URL: http://svn.reactos.org/svn/reactos?rev=68030&view=rev Log: [HAL] fix a typo add BusAddress to DPRINT Modified: trunk/reactos/hal/halx86/legacy/bus/sysbus.c trunk/reactos/hal/halx86/legacy/bussupp.c Modified: trunk/reactos/hal/halx86/legacy/bus/sysbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/sysb… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bus/sysbus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bus/sysbus.c [iso-8859-1] Sat Jun 6 08:37:53 2015 @@ -32,7 +32,7 @@ /* Memory address */ case 0: - /* Loop all prefetech memory */ + /* Loop all prefetch memory */ for (Range = &BusHandler->BusAddresses->PrefetchMemory; Range; Range = Range->Next) Modified: trunk/reactos/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] Sat Jun 6 08:37:53 2015 @@ -1266,7 +1266,7 @@ Handler = HalReferenceHandlerForBus(InterfaceType, BusNumber); if (!(Handler) || !(Handler->TranslateBusAddress)) { - DPRINT1("No translator Interface: %x, Bus: %x, Handler: %p!\n", InterfaceType, BusNumber, Handler); + DPRINT1("No translator Interface: %x, Bus: %x, Handler: %p, BusAddress: %x!\n", InterfaceType, BusNumber, Handler, BusAddress); return FALSE; }

1 0

[aandrejevic] 68029: [NTVDM] Programs don't expect the XMS function AH = 07h to access the keyboard controller, since the specification says it's done in a hardware-independent way. So, reimplement...
by aandrejevic＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: aandrejevic Date: Sat Jun 6 02:22:36 2015 New Revision: 68029 URL: http://svn.reactos.org/svn/reactos?rev=68029&view=rev Log: [NTVDM] Programs don't expect the XMS function AH = 07h to access the keyboard controller, since the specification says it's done in a hardware-independent way. So, reimplement this function by calling EmulatorGetA20() instead. Also, for the sake of simplicity, use EmulatorSetA20 instead of PCAT_A20Control to change the A20 state. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Sat Jun 6 02:22:36 2015 @@ -76,47 +76,13 @@ /* HELPERS FOR A20 LINE *******************************************************/ -static BOOLEAN PCAT_A20Control(BYTE Control, PBOOLEAN A20Status) -{ - BYTE ControllerOutput; - - /* Retrieve PS/2 controller output byte */ - IOWriteB(PS2_CONTROL_PORT, 0xD0); - ControllerOutput = IOReadB(PS2_DATA_PORT); - - switch (Control) - { - case 0: /* Disable A20 line */ - ControllerOutput &= ~0x02; - IOWriteB(PS2_CONTROL_PORT, 0xD1); - IOWriteB(PS2_DATA_PORT, ControllerOutput); - break; - - case 1: /* Enable A20 line */ - ControllerOutput |= 0x02; - IOWriteB(PS2_CONTROL_PORT, 0xD1); - IOWriteB(PS2_DATA_PORT, ControllerOutput); - break; - - default: /* Get A20 status */ - break; - } - - if (A20Status) - *A20Status = (ControllerOutput & 0x02) != 0; - - /* Return success */ - return TRUE; -} - static VOID XmsLocalEnableA20(VOID) { /* Enable A20 only if we can do so, otherwise make the caller believe we enabled it */ if (!CanChangeA20) goto Quit; /* The count is zero so enable A20 */ - if (A20EnableCount == 0 && !PCAT_A20Control(1, NULL)) - goto Fail; + if (A20EnableCount == 0) EmulatorSetA20(TRUE); ++A20EnableCount; @@ -124,55 +90,30 @@ setAX(0x0001); /* Line successfully enabled */ setBL(XMS_STATUS_SUCCESS); return; +} + +static VOID XmsLocalDisableA20(VOID) +{ + /* Disable A20 only if we can do so, otherwise make the caller believe we disabled it */ + if (!CanChangeA20) goto Quit; + + /* If the count is already zero, fail */ + if (A20EnableCount == 0) goto Fail; + + --A20EnableCount; + + /* The count is zero so disable A20 */ + if (A20EnableCount == 0) EmulatorSetA20(FALSE); + +Quit: + setAX(0x0001); /* Line successfully disabled */ + setBL(XMS_STATUS_SUCCESS); + return; Fail: setAX(0x0000); /* Line failed to be enabled */ setBL(XMS_STATUS_A20_ERROR); return; -} - -static VOID XmsLocalDisableA20(VOID) -{ - /* Disable A20 only if we can do so, otherwise make the caller believe we disabled it */ - if (!CanChangeA20) goto Quit; - - /* If the count is already zero, fail */ - if (A20EnableCount == 0) goto Fail; - - --A20EnableCount; - - /* The count is zero so disable A20 */ - if (A20EnableCount == 0 && !PCAT_A20Control(0, NULL)) - goto Fail; - -Quit: - setAX(0x0001); /* Line successfully disabled */ - setBL(XMS_STATUS_SUCCESS); - return; - -Fail: - setAX(0x0000); /* Line failed to be enabled */ - setBL(XMS_STATUS_A20_ERROR); - return; -} - -static VOID XmsGetA20State(VOID) -{ - BOOLEAN A20Status = FALSE; - - /* - * NOTE: The XMS specification explicitely says that this check is done - * in a hardware-independent manner, by checking whether high memory wraps. - * For our purposes we just call the emulator API. - */ - - /* Get A20 status */ - if (PCAT_A20Control(2, &A20Status)) - setBL(XMS_STATUS_SUCCESS); - else - setBL(XMS_STATUS_A20_ERROR); - - setAX(A20Status); } /* PRIVATE FUNCTIONS **********************************************************/ @@ -395,8 +336,8 @@ /* Query A20 State */ case 0x07: { - /* This call sets AX and BL to their correct values */ - XmsGetA20State(); + setAX(EmulatorGetA20()); + setBL(XMS_STATUS_SUCCESS); break; }

1 0

[aandrejevic] 68028: [NTVDM] - Implement the DOS idle interrupt. - Link to the parent's environment block by default in DosCreatePsp. - Fix INT 21h/36h (Get Free Space) to report 0xFFFF if the numb...
by aandrejevic＠svn.reactos.org 05 Jun '15

05 Jun '15

Author: aandrejevic Date: Fri Jun 5 22:22:04 2015 New Revision: 68028 URL: http://svn.reactos.org/svn/reactos?rev=68028&view=rev Log: [NTVDM] - Implement the DOS idle interrupt. - Link to the parent's environment block by default in DosCreatePsp. - Fix INT 21h/36h (Get Free Space) to report 0xFFFF if the number of clusters is too high to fit in a word. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri Jun 5 22:22:04 2015 @@ -825,8 +825,8 @@ { setAX(LOWORD(SectorsPerCluster)); setCX(LOWORD(BytesPerSector)); - setBX(LOWORD(NumberOfFreeClusters)); - setDX(LOWORD(TotalNumberOfClusters)); + setBX(min(NumberOfFreeClusters, 0xFFFF)); + setDX(min(TotalNumberOfClusters, 0xFFFF)); } else { @@ -1871,6 +1871,15 @@ VOID WINAPI DosInt27h(LPWORD Stack) { DosTerminateProcess(getCS(), 0, (getDX() + 0x0F) >> 4); +} + +VOID WINAPI DosIdle(LPWORD Stack) +{ + /* + * This will set the carry flag on the first call (to repeat the BOP), + * and clear it in the next, so that exactly one HLT occurs. + */ + setCF(!getCF()); } VOID WINAPI DosFastConOut(LPWORD Stack) @@ -2070,10 +2079,13 @@ RegisterDosInt32(0x23, DosBreakInterrupt); // Ctrl-C / Ctrl-Break // RegisterDosInt32(0x24, DosInt24h ); // Critical Error RegisterDosInt32(0x27, DosInt27h ); // Terminate and Stay Resident + RegisterDosInt32(0x28, DosIdle ); // DOS Idle Interrupt RegisterDosInt32(0x29, DosFastConOut ); // DOS 2+ Fast Console Output RegisterDosInt32(0x2F, DosInt2Fh ); /* Unimplemented DOS interrupts */ + RegisterDosInt32(0x25, NULL); // Absolute Disk Read + RegisterDosInt32(0x26, NULL); // Absolute Disk Write RegisterDosInt32(0x2A, NULL); // Network - Installation Check /* Load the CON driver */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Fri Jun 5 22:22:04 2015 @@ -212,8 +212,11 @@ /* Set the parent PSP */ PspBlock->ParentPsp = Sda->CurrentPsp; - /* No environment block yet */ - PspBlock->EnvBlock = 0; + if (Sda->CurrentPsp != SYSTEM_PSP) + { + /* Link to the parent's environment block */ + PspBlock->EnvBlock = SEGMENT_TO_PSP(Sda->CurrentPsp)->EnvBlock; + } /* Copy the parent handle table */ DosCopyHandleTable(PspBlock->HandleTable);

1 0

[aandrejevic] 68027: [FAST486] opgroups.c: We shouldn't restore SP in the opcode handler as that might interfere with triple faults. Also, in this case it's also wrong because the exception procedu...
by aandrejevic＠svn.reactos.org 05 Jun '15

05 Jun '15

Author: aandrejevic Date: Fri Jun 5 20:03:55 2015 New Revision: 68027 URL: http://svn.reactos.org/svn/reactos?rev=68027&view=rev Log: [FAST486] opgroups.c: We shouldn't restore SP in the opcode handler as that might interfere with triple faults. Also, in this case it's also wrong because the exception procedure already restores the stack pointer. common.c: Fix a comment, no code changes. Modified: trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/opgroups.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Fri Jun 5 20:03:55 2015 @@ -579,7 +579,7 @@ /* Restore the IP to the saved IP */ State->InstPtr = State->SavedInstPtr; - /* Restore the SP to the saved SP */ + /* Restore the SP to the saved SP */ State->GeneralRegs[FAST486_REG_ESP] = State->SavedStackPtr; /* Get the interrupt vector */ Modified: trunk/reactos/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] Fri Jun 5 20:03:55 2015 @@ -494,10 +494,7 @@ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) { - /* Exception occurred - restore SP */ - if (OperandSize) State->GeneralRegs[FAST486_REG_ESP].Long -= sizeof(ULONG); - else State->GeneralRegs[FAST486_REG_ESP].LowWord -= sizeof(USHORT); - + /* Exception occurred */ return; }

1 0

[ekohl] 68026: [SYSSETUP] - Add missing VolumeClassInstaller export. - Implement TapeClassInstaller and VolumeClassInstaller.
by ekohl＠svn.reactos.org 05 Jun '15

05 Jun '15

Author: ekohl Date: Fri Jun 5 19:09:41 2015 New Revision: 68026 URL: http://svn.reactos.org/svn/reactos?rev=68026&view=rev Log: [SYSSETUP] - Add missing VolumeClassInstaller export. - Implement TapeClassInstaller and VolumeClassInstaller. Modified: trunk/reactos/dll/win32/syssetup/classinst.c trunk/reactos/dll/win32/syssetup/syssetup.spec Modified: trunk/reactos/dll/win32/syssetup/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/classin… ============================================================================== --- trunk/reactos/dll/win32/syssetup/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/classinst.c [iso-8859-1] Fri Jun 5 19:09:41 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS system libraries * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/storage/mountmgr/database.c + * FILE: dll/win32/syssetup/classinst.c * PURPOSE: Class installers * PROGRAMMERS: Copyright 2006 Hervé Poussineau (hpoussin(a)reactos.org) */ @@ -99,6 +99,7 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { + DPRINT("HdcClassInstaller()\n"); return ERROR_DI_DO_DEFAULT; } @@ -200,7 +201,7 @@ /* - * @unimplemented + * @implemented */ DWORD WINAPI @@ -209,12 +210,23 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { - switch (InstallFunction) - { - default: - DPRINT("Install function %u ignored\n", InstallFunction); - return ERROR_DI_DO_DEFAULT; - } + DPRINT("TapeClassInstaller()\n"); + return ERROR_DI_DO_DEFAULT; +} + + +/* + * @implemented + */ +DWORD +WINAPI +VolumeClassInstaller( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + DPRINT("VolumeClassInstaller()\n"); + return ERROR_DI_DO_DEFAULT; } /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/syssetup.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] Fri Jun 5 19:09:41 2015 @@ -82,5 +82,6 @@ @ stub UpdatePnpDeviceDrivers @ stub UpgradePrinters @ stub ViewSetupActionLog +@ stdcall VolumeClassInstaller(long ptr ptr) @ stub pSetupDebugPrint @ stub pSetuplogSfcError

1 0

[cfinck] 68025: [PRINTING] Add an include directory for all printing components containing definitions not found in the public headers. For now, that's just PackStrings in spoolss.h. [SPOOLSS_APITE...
by cfinck＠svn.reactos.org 05 Jun '15

05 Jun '15

Author: cfinck Date: Fri Jun 5 18:16:51 2015 New Revision: 68025 URL: http://svn.reactos.org/svn/reactos?rev=68025&view=rev Log: [PRINTING] Add an include directory for all printing components containing definitions not found in the public headers. For now, that's just PackStrings in spoolss.h. [SPOOLSS_APITEST] Use the new spoolss.h header. [WINPRINT_APITEST] Add an API-Test for the winprint Print Processor, so far for its EnumPrintProcessorDatatypesW function. Tests succeed in Windows Server 2003. winspool.drv also provides functions that go into winprint.dll, but as these tests show, they behave slightly different in terms of error codes due to the involved RPC and routing. Windows Server 2003 has winprint functions in localspl.dll, so you have to copy its localspl.dll to winprint.dll for testing. [WINPRINT] - Use PackStrings to simplify the code. - Fix test failures. Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/include/ (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/include/spoolss.h (with props) branches/colins-printing-for-freedom/rostests/apitests/winprint/ (with props) branches/colins-printing-for-freedom/rostests/apitests/winprint/CMakeLists.txt (with props) branches/colins-printing-for-freedom/rostests/apitests/winprint/EnumPrintProcessorDatatypesW.c (with props) branches/colins-printing-for-freedom/rostests/apitests/winprint/testlist.c (with props) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/precomp.h branches/colins-printing-for-freedom/rostests/apitests/CMakeLists.txt branches/colins-printing-for-freedom/rostests/apitests/spoolss/CMakeLists.txt branches/colins-printing-for-freedom/rostests/apitests/spoolss/PackStrings.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/CMakeLists.txt [iso-8859-1] Fri Jun 5 18:16:51 2015 @@ -1,3 +1,5 @@ +include_directories(include) + add_subdirectory(base) #add_subdirectory(drivers) add_subdirectory(monitors) Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/include/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Jun 5 18:16:51 2015 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/include/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/include/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/include/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/include/spoolss.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/include/spoolss.h (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] Fri Jun 5 18:16:51 2015 @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS Printing Include files + * LICENSE: GNU LGPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Undocumented APIs of the Spooler Router "spoolss.dll" + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#ifndef _REACTOS_SPOOLSS_H +#define _REACTOS_SPOOLSS_H + +PBYTE WINAPI +PackStrings(PCWSTR* pSource, PBYTE pDest, PDWORD DestOffsets, PBYTE pEnd); + +#endif Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/include/spoolss.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/CMakeLists.txt [iso-8859-1] Fri Jun 5 18:16:51 2015 @@ -13,6 +13,6 @@ set_module_type(winprint win32dll UNICODE) target_link_libraries(winprint wine) -add_importlibs(winprint kernel32 msvcrt ntdll) +add_importlibs(winprint spoolss msvcrt kernel32 ntdll) add_pch(winprint precomp.h SOURCE) add_cd_file(TARGET winprint DESTINATION reactos/system32/spool/prtprocs/w32x86 FOR all) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] Fri Jun 5 18:16:51 2015 @@ -48,18 +48,14 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(LPWSTR pName, LPWSTR pPrintProcessorName, DWORD Level, LPBYTE pDatatypes, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { - DATATYPES_INFO_1W DatatypesInfo1; DWORD cbDatatype; - PBYTE pCurrentOutputDatatype; - PBYTE pCurrentOutputDatatypeInfo; + DWORD dwOffsets[_countof(pwszDatatypes)]; PCWSTR* pCurrentDatatype; + PDWORD pCurrentOffset = dwOffsets; // Sanity checks if (Level != 1 || !pcbNeeded || !pcReturned) - { - SetLastError(ERROR_INVALID_PARAMETER); return FALSE; - } // Count the required buffer size and the number of datatypes. *pcbNeeded = 0; @@ -69,7 +65,12 @@ { cbDatatype = (wcslen(*pCurrentDatatype) + 1) * sizeof(WCHAR); *pcbNeeded += sizeof(DATATYPES_INFO_1W) + cbDatatype; + + // Also calculate the offset in the output buffer of the pointer to this datatype string. + *pCurrentOffset = *pcReturned * sizeof(DATATYPES_INFO_1W) + FIELD_OFFSET(DATATYPES_INFO_1W, pName); + *pcReturned++; + pCurrentOffset++; } // Check if the supplied buffer is large enough. @@ -79,25 +80,16 @@ return FALSE; } - // Put the datatype strings right after the last DATATYPES_INFO_1W structure. - pCurrentOutputDatatypeInfo = pDatatypes; - pCurrentOutputDatatype = pDatatypes + *pcReturned * sizeof(DATATYPES_INFO_1W); + // Check if a buffer was supplied at all. + if (!pDatatypes) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } // Copy over all datatypes. - for (pCurrentDatatype = pwszDatatypes; *pCurrentDatatype; pCurrentDatatype++) - { - // Copy the datatype string into the output buffer. - cbDatatype = (wcslen(*pCurrentDatatype) + 1) * sizeof(WCHAR); - CopyMemory(pCurrentOutputDatatype, *pCurrentDatatype, cbDatatype); - - // Fill and copy the DATATYPES_INFO_1W structure belonging to this datatype. - DatatypesInfo1.pName = (PWSTR)pCurrentOutputDatatype; - CopyMemory(pCurrentOutputDatatypeInfo, &DatatypesInfo1, sizeof(DATATYPES_INFO_1W)); - - // Advance to the next DATATYPES_INFO_1W location and string location in the output buffer. - pCurrentOutputDatatype += cbDatatype; - pCurrentOutputDatatypeInfo += sizeof(DATATYPES_INFO_1W); - } + *pCurrentOffset = MAXDWORD; + PackStrings(pwszDatatypes, pDatatypes, dwOffsets, &pDatatypes[*pcbNeeded]); return TRUE; } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/precomp.h [iso-8859-1] Fri Jun 5 18:16:51 2015 @@ -9,6 +9,7 @@ #define _PRECOMP_H #define WIN32_NO_STATUS +#include <stdlib.h> #include <windef.h> #include <winbase.h> #include <wingdi.h> @@ -16,6 +17,8 @@ #include <winspool.h> #include <winsplp.h> +#include <spoolss.h> + #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winprint); Modified: branches/colins-printing-for-freedom/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/CMakeLists.txt [iso-8859-1] Fri Jun 5 18:16:51 2015 @@ -25,5 +25,6 @@ endif() add_subdirectory(winhttp) add_subdirectory(wininet) +add_subdirectory(winprint) add_subdirectory(winspool) add_subdirectory(ws2_32) Modified: branches/colins-printing-for-freedom/rostests/apitests/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/spoolss/CMakeLists.txt [iso-8859-1] Fri Jun 5 18:16:51 2015 @@ -1,3 +1,5 @@ + +include_directories(${REACTOS_SOURCE_DIR}/win32ss/printing/include) list(APPEND SOURCE PackStrings.c Modified: branches/colins-printing-for-freedom/rostests/apitests/spoolss/PackStrings.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/spoolss/PackStrings.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/spoolss/PackStrings.c [iso-8859-1] Fri Jun 5 18:16:51 2015 @@ -10,8 +10,7 @@ #define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> - -PBYTE WINAPI PackStrings(PCWSTR*, PBYTE, PDWORD, PBYTE); +#include <spoolss.h> typedef struct _EXAMPLE_STRUCT { Propchange: branches/colins-printing-for-freedom/rostests/apitests/winprint/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Jun 5 18:16:51 2015 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/colins-printing-for-freedom/rostests/apitests/winprint/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/colins-printing-for-freedom/rostests/apitests/winprint/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: branches/colins-printing-for-freedom/rostests/apitests/winprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/winprint/CMakeLists.txt (added) +++ branches/colins-printing-for-freedom/rostests/apitests/winprint/CMakeLists.txt [iso-8859-1] Fri Jun 5 18:16:51 2015 @@ -0,0 +1,10 @@ + +list(APPEND SOURCE + EnumPrintProcessorDatatypesW.c + testlist.c) + +add_executable(winprint_apitest ${SOURCE}) +target_link_libraries(winprint_apitest wine ${PSEH_LIB}) +set_module_type(winprint_apitest win32cui) +add_importlibs(winprint_apitest winprint msvcrt kernel32 ntdll) +add_cd_file(TARGET winprint_apitest DESTINATION reactos/bin FOR all) Propchange: branches/colins-printing-for-freedom/rostests/apitests/winprint/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/rostests/apitests/winprint/EnumPrintProcessorDatatypesW.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/winprint/EnumPrintProcessorDatatypesW.c (added) +++ branches/colins-printing-for-freedom/rostests/apitests/winprint/EnumPrintProcessorDatatypesW.c [iso-8859-1] Fri Jun 5 18:16:51 2015 @@ -0,0 +1,81 @@ +/* + * PROJECT: ReactOS Standard Print Processor API Tests + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Tests for EnumPrintProcessorDatatypesW + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winspool.h> + +START_TEST(EnumPrintProcessorDatatypesW) +{ + DWORD cbNeeded; + DWORD cbTemp; + DWORD dwReturned; + PDATATYPES_INFO_1W pDatatypesInfo1; + + // Try with an invalid level. The error needs to be set by winspool, but not by the Print Processor. + SetLastError(0xDEADBEEF); + ok(!EnumPrintProcessorDatatypesW(NULL, NULL, 0, NULL, 0, NULL, NULL), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(GetLastError() == 0xDEADBEEF, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); + + // Now try with valid level, but no pcbNeeded and no pcReturned. The error needs to be set by RPC. + SetLastError(0xDEADBEEF); + ok(!EnumPrintProcessorDatatypesW(NULL, NULL, 1, NULL, 0, NULL, NULL), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(GetLastError() == 0xDEADBEEF, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); + + // Now try with pcbNeeded and pcReturned, but give no Print Processor. Show that winprint actually ignores the given Print Processor. + SetLastError(0xDEADBEEF); + ok(!EnumPrintProcessorDatatypesW(NULL, NULL, 1, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); + ok(cbNeeded > 0, "cbNeeded is 0!\n"); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); + + // Same error has to occur when looking for an invalid Print Processor. + SetLastError(0xDEADBEEF); + ok(!EnumPrintProcessorDatatypesW(NULL, L"invalid", 1, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); + ok(cbNeeded > 0, "cbNeeded is 0!\n"); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); + + // Now get the required buffer size by supplying all information. This needs to fail with ERROR_INSUFFICIENT_BUFFER. + SetLastError(0xDEADBEEF); + ok(!EnumPrintProcessorDatatypesW(NULL, L"winprint", 1, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); + ok(cbNeeded > 0, "cbNeeded is 0!\n"); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); + + // Same error has to occur with a size to small. + SetLastError(0xDEADBEEF); + ok(!EnumPrintProcessorDatatypesW(NULL, L"winprint", 1, NULL, 1, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu!\n", GetLastError()); + ok(cbNeeded > 0, "cbNeeded is 0!\n"); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); + + // Now provide the demanded size, but no buffer. Show that winprint returns a different error than the same function in winspool. + SetLastError(0xDEADBEEF); + ok(!EnumPrintProcessorDatatypesW(NULL, L"winprint", 1, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); + ok(cbTemp == cbNeeded, "cbTemp is %lu!\n", cbTemp); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); + + // This also has to fail the same way when no Print Processor was given at all. + SetLastError(0xDEADBEEF); + ok(!EnumPrintProcessorDatatypesW(NULL, NULL, 1, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); + ok(cbTemp == cbNeeded, "cbTemp is %lu!\n", cbTemp); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); + + // Finally use the function as intended and aim for success! Show that winprint doesn't modify the error code at all. + pDatatypesInfo1 = HeapAlloc(GetProcessHeap(), 0, cbNeeded); + SetLastError(0xDEADBEEF); + ok(EnumPrintProcessorDatatypesW(NULL, L"winprint", 1, (PBYTE)pDatatypesInfo1, cbNeeded, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns FALSE!\n"); + ok(GetLastError() == 0xDEADBEEF, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, pDatatypesInfo1); +} Propchange: branches/colins-printing-for-freedom/rostests/apitests/winprint/EnumPrintProcessorDatatypesW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/rostests/apitests/winprint/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/winprint/testlist.c (added) +++ branches/colins-printing-for-freedom/rostests/apitests/winprint/testlist.c [iso-8859-1] Fri Jun 5 18:16:51 2015 @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS Standard Print Processor API Tests + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Test list + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +/* + * These tests are developed and tested against the Windows Server 2003 counterpart of winprint. + * While ReactOS implements the Standard Print Processor in a separate module winprint.dll, + * Windows Server 2003 puts it into the Local Print Spooler localspl.dll. + * + * To test against Windows, simply run these tests under Windows Server 2003, but copy its + * localspl.dll to winprint.dll in advance. + * + * winspool.drv also provides functions that go into winprint.dll, but as these tests show, + * they behave slightly different in terms of error codes due to the involved RPC and routing. + */ + +#define __ROS_LONG64__ + +#define STANDALONE +#include <apitest.h> + +extern void func_EnumPrintProcessorDatatypesW(void); + +const struct test winetest_testlist[] = +{ + { "EnumPrintProcessorDatatypesW", func_EnumPrintProcessorDatatypesW }, + + { 0, 0 } +}; Propchange: branches/colins-printing-for-freedom/rostests/apitests/winprint/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 68024: [NTOSKRNL] Fix NtQuerySystemInformation not returning correct ResultLength for SystemFileCacheInformation. Fixes tons of ntdll:info tests. Brought to you by Tetsui Ohkubo. CORE-9757
by akhaldi＠svn.reactos.org 05 Jun '15

05 Jun '15

Author: akhaldi Date: Fri Jun 5 17:57:28 2015 New Revision: 68024 URL: http://svn.reactos.org/svn/reactos?rev=68024&view=rev Log: [NTOSKRNL] Fix NtQuerySystemInformation not returning correct ResultLength for SystemFileCacheInformation. Fixes tons of ntdll:info tests. Brought to you by Tetsui Ohkubo. CORE-9757 Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Fri Jun 5 17:57:28 2015 @@ -1291,9 +1291,10 @@ { SYSTEM_FILECACHE_INFORMATION *Sci = (SYSTEM_FILECACHE_INFORMATION *) Buffer; - if (Size < sizeof(SYSTEM_FILECACHE_INFORMATION)) - { - *ReqSize = sizeof(SYSTEM_FILECACHE_INFORMATION); + *ReqSize = sizeof(SYSTEM_FILECACHE_INFORMATION); + + if (Size < *ReqSize) + { return STATUS_INFO_LENGTH_MISMATCH; }

1 0

[cfinck] 68023: [SPOOLSS] In an attempt to simplify the code for further functions that return information structures, implement and document the undocumented PackStrings function. Hints were taken...
by cfinck＠svn.reactos.org 05 Jun '15

05 Jun '15

Author: cfinck Date: Fri Jun 5 15:52:39 2015 New Revision: 68023 URL: http://svn.reactos.org/svn/reactos?rev=68023&view=rev Log: [SPOOLSS] In an attempt to simplify the code for further functions that return information structures, implement and document the undocumented PackStrings function. Hints were taken from an XP DDK sample and own testing. [SPOOLSS_APITEST] Add some tests for PackStrings that succeed under Windows Server 2003. Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/tools.c (with props) branches/colins-printing-for-freedom/rostests/apitests/spoolss/ (with props) branches/colins-printing-for-freedom/rostests/apitests/spoolss/CMakeLists.txt (with props) branches/colins-printing-for-freedom/rostests/apitests/spoolss/PackStrings.c (with props) branches/colins-printing-for-freedom/rostests/apitests/spoolss/testlist.c (with props) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec branches/colins-printing-for-freedom/rostests/apitests/CMakeLists.txt Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt [iso-8859-1] Fri Jun 5 15:52:39 2015 @@ -4,7 +4,8 @@ list(APPEND SOURCE context.c main.c - precomp.h) + precomp.h + tools.c) add_library(spoolss SHARED ${SOURCE} Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] Fri Jun 5 15:52:39 2015 @@ -106,7 +106,7 @@ @ stub OpenPrinterExW @ stub OpenPrinterPortW @ stdcall OpenPrinterW(wstr ptr ptr) -@ stub PackStrings +@ stdcall PackStrings(ptr ptr ptr ptr) @ stub PartialReplyPrinterChangeNotification @ stub PlayGdiScriptOnPrinterIC @ stub PrinterHandleRundown Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/tools.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/tools.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/tools.c [iso-8859-1] Fri Jun 5 15:52:39 2015 @@ -0,0 +1,70 @@ +/* + * PROJECT: ReactOS Spooler Router + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Miscellaneous tool functions + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + + +/** + * @name PackStrings + * + * Takes an array of Unicode strings and fills an output buffer with these strings at the end and pointers to each string at specific offsets. + * Useful helper for functions that copy an information structure including strings into a given buffer (like PRINTER_INFO_1). + * + * @param pSource + * The array of Unicode strings to copy. Needs to have at least as many elements as the DestOffsets array. + * + * @param pDest + * Pointer to the beginning of the output buffer. + * The caller is responsible for verifying that this buffer is large enough to hold all strings and pointers. + * + * @param DestOffsets + * Array of byte offsets in the output buffer. For each element of DestOffsets, the function will copy the address of the corresponding copied + * string of pSource to this location in the output buffer. If a string in pSource is NULL, the function will set the pointer address to NULL + * in the output buffer. + * Use macros like FIELD_OFFSET to calculate the offsets for this array. + * The last element of the array must have the value MAXDWORD to let the function detect the end of the array. + * + * @param pEnd + * Pointer to the end of the output buffer. That means the first element outside of the buffer given in pDest. + * + * @return + * Returns a pointer to the beginning of the strings in pDest. + * The strings are copied in reverse order, so this pointer will point to the last copied string of pSource. + */ +PBYTE WINAPI +PackStrings(PCWSTR* pSource, PBYTE pDest, PDWORD DestOffsets, PBYTE pEnd) +{ + DWORD cbString; + ULONG_PTR StringAddress; + + // Loop until we reach an element with offset set to MAXDWORD. + while (*DestOffsets != MAXDWORD) + { + StringAddress = 0; + + if (*pSource) + { + // Determine the length of the source string. + cbString = (wcslen(*pSource) + 1) * sizeof(WCHAR); + + // Copy it before the last string. + pEnd -= cbString; + StringAddress = (ULONG_PTR)pEnd; + CopyMemory(pEnd, *pSource, cbString); + } + + // Copy the address of the copied string to the location given by the offset. + CopyMemory(&pDest[*DestOffsets], &StringAddress, sizeof(ULONG_PTR)); + + // Advance to the next source string and destination offset. + pSource++; + DestOffsets++; + } + + // pEnd is now at the last string we copied. Return this value as a pointer to the beginning of all strings in the output buffer. + return pEnd; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/tools.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/CMakeLists.txt [iso-8859-1] Fri Jun 5 15:52:39 2015 @@ -17,6 +17,7 @@ add_subdirectory(setupapi) add_subdirectory(shell32) add_subdirectory(psapi) +add_subdirectory(spoolss) add_subdirectory(user32) if(NOT ARCH STREQUAL "amd64") add_subdirectory(w32kdll) Propchange: branches/colins-printing-for-freedom/rostests/apitests/spoolss/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Jun 5 15:52:39 2015 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/colins-printing-for-freedom/rostests/apitests/spoolss/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/colins-printing-for-freedom/rostests/apitests/spoolss/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: branches/colins-printing-for-freedom/rostests/apitests/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/spoolss/CMakeLists.txt (added) +++ branches/colins-printing-for-freedom/rostests/apitests/spoolss/CMakeLists.txt [iso-8859-1] Fri Jun 5 15:52:39 2015 @@ -0,0 +1,10 @@ + +list(APPEND SOURCE + PackStrings.c + testlist.c) + +add_executable(spoolss_apitest ${SOURCE}) +target_link_libraries(spoolss_apitest wine ${PSEH_LIB}) +set_module_type(spoolss_apitest win32cui) +add_importlibs(spoolss_apitest spoolss msvcrt kernel32 ntdll) +add_cd_file(TARGET spoolss_apitest DESTINATION reactos/bin FOR all) Propchange: branches/colins-printing-for-freedom/rostests/apitests/spoolss/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/rostests/apitests/spoolss/PackStrings.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/spoolss/PackStrings.c (added) +++ branches/colins-printing-for-freedom/rostests/apitests/spoolss/PackStrings.c [iso-8859-1] Fri Jun 5 15:52:39 2015 @@ -0,0 +1,48 @@ +/* + * PROJECT: ReactOS Spooler Router API Tests + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Tests for PackStrings + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> + +PBYTE WINAPI PackStrings(PCWSTR*, PBYTE, PDWORD, PBYTE); + +typedef struct _EXAMPLE_STRUCT +{ + PWSTR String1; + PWSTR String2; +} +EXAMPLE_STRUCT, *PEXAMPLE_STRUCT; + +START_TEST(PackStrings) +{ + PCWSTR Source1[] = { L"Test", L"String" }; + PCWSTR Source2[] = { L"Test", NULL }; + + BYTE Buffer[50]; + PBYTE pEnd; + PEXAMPLE_STRUCT pStruct = (PEXAMPLE_STRUCT)Buffer; + DWORD Offsets[] = { + FIELD_OFFSET(EXAMPLE_STRUCT, String1), + FIELD_OFFSET(EXAMPLE_STRUCT, String2), + MAXDWORD + }; + + // Try a usual case with two strings. Verify that they are copied in reverse order. + pEnd = PackStrings(Source1, Buffer, Offsets, &Buffer[sizeof(Buffer)]); + ok(wcscmp(pStruct->String1, Source1[0]) == 0, "String1 and Source1[0] don't match!\n"); + ok(wcscmp(pStruct->String2, Source1[1]) == 0, "String2 and Source1[1] don't match!\n"); + ok(wcscmp((PWSTR)pEnd, Source1[1]) == 0, "pEnd and Source1[1] don't match!\n"); + + // Now verify that the corresponding pointer is set to NULL if a string is NULL. + pEnd = PackStrings(Source2, Buffer, Offsets, &Buffer[sizeof(Buffer)]); + ok(wcscmp(pStruct->String1, Source2[0]) == 0, "String1 and Source2[0] don't match!\n"); + ok(!pStruct->String2, "String2 is %p!\n", pStruct->String2); + ok(wcscmp((PWSTR)pEnd, Source2[0]) == 0, "pEnd and Source2[0] don't match!\n"); +} Propchange: branches/colins-printing-for-freedom/rostests/apitests/spoolss/PackStrings.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/rostests/apitests/spoolss/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/spoolss/testlist.c (added) +++ branches/colins-printing-for-freedom/rostests/apitests/spoolss/testlist.c [iso-8859-1] Fri Jun 5 15:52:39 2015 @@ -0,0 +1,20 @@ +/* + * PROJECT: ReactOS Print Spooler Router API Tests + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Test list + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#define __ROS_LONG64__ + +#define STANDALONE +#include <apitest.h> + +extern void func_PackStrings(void); + +const struct test winetest_testlist[] = +{ + { "PackStrings", func_PackStrings }, + + { 0, 0 } +}; Propchange: branches/colins-printing-for-freedom/rostests/apitests/spoolss/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 68022: [SYSSETUP] Add CoInstaller stubs.
by ekohl＠svn.reactos.org 05 Jun '15

05 Jun '15

Author: ekohl Date: Fri Jun 5 15:19:09 2015 New Revision: 68022 URL: http://svn.reactos.org/svn/reactos?rev=68022&view=rev Log: [SYSSETUP] Add CoInstaller stubs. Modified: trunk/reactos/dll/win32/syssetup/classinst.c trunk/reactos/dll/win32/syssetup/syssetup.spec Modified: trunk/reactos/dll/win32/syssetup/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/classin… ============================================================================== --- trunk/reactos/dll/win32/syssetup/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/classinst.c [iso-8859-1] Fri Jun 5 15:19:09 2015 @@ -35,6 +35,26 @@ */ DWORD WINAPI +CriticalDeviceCoInstaller( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN OUT PCOINSTALLER_CONTEXT_DATA Context) +{ + switch (InstallFunction) + { + default: + DPRINT1("Install function %u ignored\n", InstallFunction); + return ERROR_SUCCESS; + } +} + + +/* + * @unimplemented + */ +DWORD +WINAPI DeviceBayClassInstaller( IN DI_FUNCTION InstallFunction, IN HDEVINFO DeviceInfoSet, @@ -50,6 +70,26 @@ /* + * @unimplemented + */ +DWORD +WINAPI +EisaUpHalCoInstaller( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN OUT PCOINSTALLER_CONTEXT_DATA Context) +{ + switch (InstallFunction) + { + default: + DPRINT1("Install function %u ignored\n", InstallFunction); + return ERROR_SUCCESS; + } +} + + +/* * @implemented */ DWORD @@ -144,6 +184,26 @@ */ DWORD WINAPI +StorageCoInstaller( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN OUT PCOINSTALLER_CONTEXT_DATA Context) +{ + switch (InstallFunction) + { + default: + DPRINT1("Install function %u ignored\n", InstallFunction); + return ERROR_SUCCESS; + } +} + + +/* + * @unimplemented + */ +DWORD +WINAPI TapeClassInstaller( IN DI_FUNCTION InstallFunction, IN HDEVINFO DeviceInfoSet, Modified: trunk/reactos/dll/win32/syssetup/syssetup.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] Fri Jun 5 15:19:09 2015 @@ -12,12 +12,12 @@ @ stub CreateLocalAdminAccount @ stub CreateLocalAdminAccountEx @ stub CreateLocalUserAccount -@ stub CriticalDeviceCoInstaller +@ stdcall CriticalDeviceCoInstaller(long ptr ptr ptr) @ stub DevInstallW @ stdcall DeviceBayClassInstaller(long ptr ptr) @ stub DiskPropPageProvider @ stub DoInstallComponentInfs -@ stub EisaUpHalCoInstaller +@ stdcall EisaUpHalCoInstaller(long ptr ptr ptr) @ stub EisaUpHalPropPageProvider @ stub GenerateName @ stdcall HdcClassInstaller(long ptr ptr) @@ -74,7 +74,7 @@ @ stub SetupShellSettings @ stdcall SetupStartService(wstr long) @ stub SetupUnregisterOsComponent -@ stub StorageCoInstaller +@ stdcall StorageCoInstaller(long ptr ptr ptr) @ stub SystemUpdateUserProfileDirectory @ stdcall TapeClassInstaller(long ptr ptr) @ stub TapePropPageProvider

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs