Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 68241: [CMD][EXPLORER] Properly track resource file dependencies. CORE-9806
by akhaldi＠svn.reactos.org 22 Jun '15

22 Jun '15

Author: akhaldi Date: Mon Jun 22 18:39:14 2015 New Revision: 68241 URL: http://svn.reactos.org/svn/reactos?rev=68241&view=rev Log: [CMD][EXPLORER] Properly track resource file dependencies. CORE-9806 Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt trunk/reactos/base/shell/explorer/CMakeLists.txt Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/CMakeLists.… ============================================================================== --- trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] Mon Jun 22 18:39:14 2015 @@ -67,6 +67,7 @@ window.c precomp.h) +add_rc_deps(cmd.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/terminal.ico) add_executable(cmd ${SOURCE} cmd.rc) target_link_libraries(cmd wine) set_module_type(cmd win32cui UNICODE) Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Mon Jun 22 18:39:14 2015 @@ -23,6 +23,8 @@ util.cpp precomp.h) +file(GLOB explorer_rc_deps res/*.*) +add_rc_deps(explorer.rc ${explorer_rc_deps}) add_executable(explorer ${SOURCE} explorer.rc) target_link_libraries(explorer uuid atlnew wine) set_module_type(explorer win32gui UNICODE)

1 0

[akhaldi] 68240: [LIVECD] Add the required folder for the favorites menu to work. By Barrett Karish. CORE-9780
by akhaldi＠svn.reactos.org 22 Jun '15

22 Jun '15

Author: akhaldi Date: Mon Jun 22 18:33:49 2015 New Revision: 68240 URL: http://svn.reactos.org/svn/reactos?rev=68240&view=rev Log: [LIVECD] Add the required folder for the favorites menu to work. By Barrett Karish. CORE-9780 Modified: trunk/reactos/boot/CMakeLists.txt Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=68… ============================================================================== --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Mon Jun 22 18:33:49 2015 @@ -20,8 +20,9 @@ #clear it out file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "") -#create the empty Desktop and Start Menu folders +#create the empty Desktop, Favorites, and Start Menu folders file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Desktop\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Favorites\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Start Menu/Programs\n") add_custom_target(livecd @@ -33,8 +34,9 @@ #clear it out file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "") -#create the empty Desktop and Start Menu folders +#create the empty Desktop, Favorites, and Start Menu folders file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Desktop\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Favorites\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs\n") add_custom_target(hybridcd

1 0

[pschweitzer] 68239: [CDFS] Revamp r68233: - Don't duplicate code, implement checks in a helper function - When checking name content, do it earlier for better performances - Add extra checks to pr...
by pschweitzer＠svn.reactos.org 22 Jun '15

22 Jun '15

Author: pschweitzer Date: Mon Jun 22 17:27:47 2015 New Revision: 68239 URL: http://svn.reactos.org/svn/reactos?rev=68239&view=rev Log: [CDFS] Revamp r68233: - Don't duplicate code, implement checks in a helper function - When checking name content, do it earlier for better performances - Add extra checks to prevent a potential buffer overflow in case of Joliet names with illformed entries CORE-9254 Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/misc.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Mon Jun 22 17:27:47 2015 @@ -480,6 +480,10 @@ PUNICODE_STRING LongName, PUNICODE_STRING ShortName); +BOOLEAN +CdfsIsRecordValid(IN PDEVICE_EXTENSION DeviceExt, + IN PDIR_RECORD Record); + /* rw.c */ NTSTATUS Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Mon Jun 22 17:27:47 2015 @@ -290,9 +290,8 @@ return Status; } - if (Record->RecordLength < Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)) - { - DPRINT1("Found corrupted entry! %u - %u\n", Record->RecordLength, Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)); + if (!CdfsIsRecordValid(DeviceExt, Record)) + { RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return STATUS_DISK_CORRUPT_ERROR; @@ -301,14 +300,6 @@ DPRINT("Name '%S'\n", name); RtlInitUnicodeString(&LongName, name); - /* Was the entry degenerated? */ - if (LongName.Length < sizeof(WCHAR)) - { - DPRINT1("Found entry with invalid name!\n"); - RtlFreeUnicodeString(&FileToFindUpcase); - CcUnpinData(Context); - return STATUS_DISK_CORRUPT_ERROR; - } ShortName.Length = 0; ShortName.MaximumLength = 26; Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Mon Jun 22 17:27:47 2015 @@ -558,9 +558,8 @@ DPRINT("RecordLength %u ExtAttrRecordLength %u NameLength %u\n", Record->RecordLength, Record->ExtAttrRecordLength, Record->FileIdLength); - if (Record->RecordLength < Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)) - { - DPRINT1("Found corrupted entry! %u - %u\n", Record->RecordLength, Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)); + if (!CdfsIsRecordValid(DeviceExt, Record)) + { RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return STATUS_DISK_CORRUPT_ERROR; @@ -572,15 +571,6 @@ DPRINT ("Offset %lu\n", Offset); RtlInitUnicodeString(&LongName, Name); - /* Was the entry degenerated? */ - if (LongName.Length < sizeof(WCHAR)) - { - DPRINT1("Found entry with invalid name!\n"); - RtlFreeUnicodeString(&FileToFindUpcase); - CcUnpinData(Context); - return STATUS_DISK_CORRUPT_ERROR; - } - RtlInitEmptyUnicodeString(&ShortName, ShortNameBuffer, sizeof(ShortNameBuffer)); RtlZeroMemory(ShortNameBuffer, sizeof(ShortNameBuffer)); Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Mon Jun 22 17:27:47 2015 @@ -206,6 +206,55 @@ return FsRtlIsFatDbcsLegal(DbcsName, FALSE, FALSE, FALSE); } +BOOLEAN +CdfsIsRecordValid(IN PDEVICE_EXTENSION DeviceExt, + IN PDIR_RECORD Record) +{ + if (Record->RecordLength < Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)) + { + DPRINT1("Found corrupted entry! %u - %u\n", Record->RecordLength, Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)); + return FALSE; + } + + if (Record->FileIdLength == 0) + { + DPRINT1("Found corrupted entry (null size)!\n"); + return FALSE; + } + + if (DeviceExt->CdInfo.JolietLevel == 0) + { + if (Record->FileId[0] == ANSI_NULL && Record->FileIdLength != 1) + { + DPRINT1("Found corrupted entry!\n"); + return FALSE; + } + } + else + { + if (Record->FileIdLength & 1 && Record->FileIdLength != 1) + { + DPRINT1("Found corrupted entry! %u\n", Record->FileIdLength); + return FALSE; + } + + if (Record->FileIdLength == 1 && Record->FileId[0] != 0 && Record->FileId[0] != 1) + { + DPRINT1("Found corrupted entry! %c\n", Record->FileId[0]); + DPRINT1("%wc\n", ((PWSTR)Record->FileId)[0]); + return FALSE; + } + + if (((PWSTR)Record->FileId)[0] == UNICODE_NULL) + { + DPRINT1("Found corrupted entry!\n"); + return FALSE; + } + } + + return TRUE; +} + VOID CdfsShortNameCacheGet (PFCB DirectoryFcb,

1 0

[akhaldi] 68238: [EXPLORER] Explicitly request applications to re-register their systray icons as soon as explorer is started. By Joachim Henze. CORE-9824
by akhaldi＠svn.reactos.org 22 Jun '15

22 Jun '15

Author: akhaldi Date: Mon Jun 22 16:01:43 2015 New Revision: 68238 URL: http://svn.reactos.org/svn/reactos?rev=68238&view=rev Log: [EXPLORER] Explicitly request applications to re-register their systray icons as soon as explorer is started. By Joachim Henze. CORE-9824 Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Mon Jun 22 16:01:43 2015 @@ -434,6 +434,13 @@ LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { Toolbar.Initialize(m_hWnd); + + // Explicitly request running applications to re-register their systray icons + SendNotifyMessage(HWND_BROADCAST, + RegisterWindowMessage(TEXT("TaskbarCreated")), + 0, + 0); + return TRUE; }

1 0

[cfinck] 68237: [SPOOLSS] [SPOOLSV] [WINSPOOL] - Add RPC calls in winspool, Router calls in spoolsv and Local Spooler calls in spoolss for most of the APIs I've implemented in localspl. This is sti...
by cfinck＠svn.reactos.org 22 Jun '15

22 Jun '15

Author: cfinck Date: Mon Jun 22 14:31:47 2015 New Revision: 68237 URL: http://svn.reactos.org/svn/reactos?rev=68237&view=rev Log: [SPOOLSS] [SPOOLSV] [WINSPOOL] - Add RPC calls in winspool, Router calls in spoolsv and Local Spooler calls in spoolss for most of the APIs I've implemented in localspl. This is still Work-In-Progress and missing some sanity checks, but a first step into something usable from the documented Spooler API side. - Separate APIs into individual source files just like I did for localspl. Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/jobs.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printers.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printprocessors.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printers.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printprocessors.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printprocessors.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/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/precomp.h branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec 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] Mon Jun 22 14:31:47 2015 @@ -3,9 +3,12 @@ list(APPEND SOURCE context.c + jobs.c main.c memory.c precomp.h + printers.c + printprocessors.c tools.c) add_library(spoolss SHARED Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/jobs.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/jobs.c [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -0,0 +1,20 @@ +/* + * PROJECT: ReactOS Spooler Router + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions for managing print jobs + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +BOOL WINAPI +AddJob(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded) +{ + return LocalSplFuncs.fpAddJob(hPrinter, Level, pData, cbBuf, pcbNeeded); +} + +BOOL WINAPI +GetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, DWORD cbBuf, LPDWORD pcbNeeded) +{ + return LocalSplFuncs.fpGetJob(hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded); +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/jobs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/main.c [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -12,12 +12,6 @@ BOOL WINAPI -ClosePrinter(HANDLE hPrinter) -{ - return FALSE; -} - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch (fdwReason) @@ -29,42 +23,6 @@ } return TRUE; -} - -BOOL WINAPI -EndDocPrinter(HANDLE hPrinter) -{ - return FALSE; -} - -BOOL WINAPI -EndPagePrinter(HANDLE hPrinter) -{ - return FALSE; -} - -BOOL WINAPI -EnumPrintersW(DWORD Flags, LPWSTR Name, DWORD Level, LPBYTE pPrinterEnum, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) -{ - return FALSE; -} - -BOOL WINAPI -GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) -{ - return FALSE; -} - -BOOL WINAPI -GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) -{ - return FALSE; -} - -BOOL WINAPI -GetPrintProcessorDirectoryW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pPrintProcessorInfo, DWORD cbBuf, LPDWORD pcbNeeded) -{ - return FALSE; } BOOL WINAPI @@ -96,18 +54,6 @@ } return TRUE; -} - -BOOL WINAPI -OpenPrinterW(LPWSTR pPrinterName, LPHANDLE phPrinter, LPPRINTER_DEFAULTSW pDefault) -{ - return FALSE; -} - -DWORD WINAPI -StartDocPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo) -{ - return 0; } BOOL WINAPI @@ -154,21 +100,3 @@ // Nothing to do here yet return ERROR_SUCCESS; } - -BOOL WINAPI -StartPagePrinter(HANDLE hPrinter) -{ - return FALSE; -} - -BOOL WINAPI -WritePrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, LPDWORD pcWritten) -{ - return FALSE; -} - -BOOL WINAPI -XcvDataW(HANDLE hXcv, PCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded, PDWORD pdwStatus) -{ - return FALSE; -} Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/precomp.h [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -26,5 +26,6 @@ // main.c extern HANDLE hProcessHeap; +extern PRINTPROVIDOR LocalSplFuncs; #endif Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printers.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printers.c [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -0,0 +1,75 @@ +/* + * PROJECT: ReactOS Spooler Router + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to Printers and printing + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + + +BOOL WINAPI +ClosePrinter(HANDLE hPrinter) +{ + return FALSE; +} + +BOOL WINAPI +EndDocPrinter(HANDLE hPrinter) +{ + return FALSE; +} + +BOOL WINAPI +EndPagePrinter(HANDLE hPrinter) +{ + return FALSE; +} + +BOOL WINAPI +EnumPrintersW(DWORD Flags, LPWSTR Name, DWORD Level, LPBYTE pPrinterEnum, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + return LocalSplFuncs.fpEnumPrinters(Flags, Name, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); +} + +BOOL WINAPI +GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) +{ + return FALSE; +} + +BOOL WINAPI +GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) +{ + return FALSE; +} + +BOOL WINAPI +OpenPrinterW(LPWSTR pPrinterName, LPHANDLE phPrinter, LPPRINTER_DEFAULTSW pDefault) +{ + return LocalSplFuncs.fpOpenPrinter(pPrinterName, phPrinter, pDefault); +} + +DWORD WINAPI +StartDocPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo) +{ + return 0; +} + +BOOL WINAPI +StartPagePrinter(HANDLE hPrinter) +{ + return FALSE; +} + +BOOL WINAPI +WritePrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, LPDWORD pcWritten) +{ + return FALSE; +} + +BOOL WINAPI +XcvDataW(HANDLE hXcv, PCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded, PDWORD pdwStatus) +{ + return FALSE; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printers.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printprocessors.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printprocessors.c [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -0,0 +1,26 @@ +/* + * PROJECT: ReactOS Spooler Router + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to Print Processors + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +BOOL WINAPI +EnumPrintProcessorDatatypesW(LPWSTR pName, LPWSTR pPrintProcessorName, DWORD Level, LPBYTE pDatatypes, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + return LocalSplFuncs.fpEnumPrintProcessorDatatypes(pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned); +} + +BOOL WINAPI +EnumPrintProcessorsW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pPrintProcessorInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + return LocalSplFuncs.fpEnumPrintProcessors(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded, pcReturned); +} + +BOOL WINAPI +GetPrintProcessorDirectoryW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pPrintProcessorInfo, DWORD cbBuf, LPDWORD pcbNeeded) +{ + return LocalSplFuncs.fpGetPrintProcessorDirectory(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded); +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printprocessors.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Mon Jun 22 14:31:47 2015 @@ -1,7 +1,7 @@ @ stub AbortPrinter @ stub AddDriverCatalog @ stub AddFormW -@ stub AddJobW +@ stdcall AddJobW(long long ptr long ptr) @ stub AddMonitorW @ stub AddPerMachineConnectionW @ stub AddPortExW @@ -68,8 +68,8 @@ @ stub EnumPrinterDriversW @ stub EnumPrinterKeyW @ stdcall EnumPrintersW(long ptr long ptr long ptr ptr) -@ stub EnumPrintProcessorDatatypesW -@ stub EnumPrintProcessorsW +@ stdcall EnumPrintProcessorDatatypesW(ptr ptr long ptr long ptr ptr) +@ stdcall EnumPrintProcessorsW(ptr ptr long ptr long ptr ptr) @ stub FindClosePrinterChangeNotification @ stub FlushPrinter @ stub FormatPrinterForRegistryKey @@ -78,7 +78,7 @@ @ stub GetClientUserHandle @ stub GetFormW @ stub GetJobAttributes -@ stub GetJobW +@ stdcall GetJobW(long long long ptr long ptr) @ stub GetNetworkId @ stub GetPrinterDataExW @ stub GetPrinterDataW Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -4,10 +4,13 @@ list(APPEND SOURCE init.c + jobs.c main.c + printers.c + printprocessors.c + precomp.h rpcserver.c rpcstubs.c - precomp.h ${CMAKE_CURRENT_BINARY_DIR}/winspool_s.c) add_executable(spoolsv ${SOURCE} spoolsv.rc) Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -0,0 +1,68 @@ +/* + * PROJECT: ReactOS Print Spooler Service + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Functions for managing print jobs + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +DWORD +_RpcAddJob(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD Level, BYTE* pAddJob, DWORD cbBuf, DWORD* pcbNeeded) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + dwErrorCode = AddJobW(hPrinter, Level, pAddJob, cbBuf, pcbNeeded); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("AddJobW failed with error %lu!\n", dwErrorCode); + RpcRevertToSelf(); + return dwErrorCode; + } + + return RpcRevertToSelf(); +} + +DWORD +_RpcGetJob(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD JobId, DWORD Level, BYTE* pJob, DWORD cbBuf, DWORD* pcbNeeded) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + dwErrorCode = GetJobW(hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("GetJobW failed with error %lu!\n", dwErrorCode); + RpcRevertToSelf(); + return dwErrorCode; + } + + return RpcRevertToSelf(); +} + +DWORD +_RpcScheduleJob(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD JobId) +{ + UNIMPLEMENTED; + return ERROR_INVALID_FUNCTION; +} + +DWORD +_RpcSetJob(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD JobId, WINSPOOL_JOB_CONTAINER* pJobContainer, DWORD Command) +{ + UNIMPLEMENTED; + return ERROR_INVALID_FUNCTION; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printers.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printers.c [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -0,0 +1,59 @@ +/* + * PROJECT: ReactOS Print Spooler Service + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to Printers and printing + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +DWORD +_RpcEnumPrinters(DWORD Flags, WINSPOOL_HANDLE Name, DWORD Level, BYTE* pPrinterEnum, DWORD cbBuf, DWORD* pcbNeeded, DWORD* pcReturned) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + dwErrorCode = EnumPrintersW(Flags, Name, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("EnumPrintersW failed with error %lu!\n", dwErrorCode); + RpcRevertToSelf(); + return dwErrorCode; + } + + return RpcRevertToSelf(); +} + +DWORD +_RpcOpenPrinter(WINSPOOL_HANDLE pPrinterName, WINSPOOL_PRINTER_HANDLE* phPrinter, WCHAR* pDatatype, WINSPOOL_DEVMODE_CONTAINER* pDevModeContainer, DWORD AccessRequired) +{ + DWORD dwErrorCode; + PRINTER_DEFAULTSW Default; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + Default.DesiredAccess = AccessRequired; + Default.pDatatype = pDatatype; + Default.pDevMode = (PDEVMODEW)pDevModeContainer->pDevMode; + + dwErrorCode = OpenPrinterW(pPrinterName, phPrinter, &Default); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("OpenPrinterW failed with error %lu!\n", dwErrorCode); + RpcRevertToSelf(); + return dwErrorCode; + } + + return RpcRevertToSelf(); +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printers.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printprocessors.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printprocessors.c [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -0,0 +1,84 @@ +/* + * PROJECT: ReactOS Print Spooler Service + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to Print Processors + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +DWORD +_RpcAddPrintProcessor(WINSPOOL_HANDLE pName, WCHAR *pEnvironment, WCHAR *pPathName, WCHAR *pPrintProcessorName) +{ + UNIMPLEMENTED; + return ERROR_INVALID_FUNCTION; +} + +DWORD +_RpcEnumPrintProcessorDatatypes(WINSPOOL_HANDLE pName, WCHAR *pPrintProcessorName, DWORD Level, BYTE *pDatatypes, DWORD cbBuf, DWORD *pcbNeeded, DWORD *pcReturned) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + dwErrorCode = EnumPrintProcessorDatatypesW(pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("EnumPrintProcessorDatatypesW failed with error %lu!\n", dwErrorCode); + RpcRevertToSelf(); + return dwErrorCode; + } + + return RpcRevertToSelf(); +} + +DWORD +_RpcEnumPrintProcessors(WINSPOOL_HANDLE pName, WCHAR *pEnvironment, DWORD Level, BYTE *pPrintProcessorInfo, DWORD cbBuf, DWORD *pcbNeeded, DWORD *pcReturned) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + dwErrorCode = EnumPrintProcessorsW(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded, pcReturned); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("EnumPrintProcessorsW failed with error %lu!\n", dwErrorCode); + RpcRevertToSelf(); + return dwErrorCode; + } + + return RpcRevertToSelf(); +} + +DWORD +_RpcGetPrintProcessorDirectory(WINSPOOL_HANDLE pName, WCHAR *pEnvironment, DWORD Level, BYTE *pPrintProcessorDirectory, DWORD cbBuf, DWORD *pcbNeeded) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + dwErrorCode = GetPrintProcessorDirectoryW(pName, pEnvironment, Level, pPrintProcessorDirectory, cbBuf, pcbNeeded); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("EnumPrintProcessorsW failed with error %lu!\n", dwErrorCode); + RpcRevertToSelf(); + return dwErrorCode; + } + + return RpcRevertToSelf(); +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printprocessors.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -8,34 +8,6 @@ #include "precomp.h" DWORD -_RpcEnumPrinters(DWORD Flags, WINSPOOL_HANDLE Name, DWORD Level, BYTE* pPrinterEnum, DWORD cbBuf, DWORD* pcbNeeded, DWORD* pcReturned) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD -_RpcOpenPrinter(WINSPOOL_HANDLE pPrinterName, WINSPOOL_PRINTER_HANDLE* phPrinter, WCHAR* pDatatype, WINSPOOL_DEVMODE_CONTAINER* pDevModeContainer, DWORD AccessRequired) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD -_RpcSetJob(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD JobId, WINSPOOL_JOB_CONTAINER *pJobContainer, DWORD Command) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD -_RpcGetJob(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD JobId, DWORD Level, BYTE *pJob, DWORD cbBuf, DWORD *pcbNeeded) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD _RpcEnumJobs(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, BYTE *pJob, DWORD cbBuf, DWORD *pcbNeeded, DWORD *pcReturned) { UNIMPLEMENTED; @@ -106,27 +78,6 @@ } DWORD -_RpcAddPrintProcessor(WINSPOOL_HANDLE pName, WCHAR *pEnvironment, WCHAR *pPathName, WCHAR *pPrintProcessorName) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD -_RpcEnumPrintProcessors(WINSPOOL_HANDLE pName, WCHAR *pEnvironment, DWORD Level, BYTE *pPrintProcessorInfo, DWORD cbBuf, DWORD *pcbNeeded, DWORD *pcReturned) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD -_RpcGetPrintProcessorDirectory(WINSPOOL_HANDLE pName, WCHAR *pEnvironment, DWORD Level, BYTE *pPrintProcessorDirectory, DWORD cbBuf, DWORD *pcbNeeded) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD _RpcStartDocPrinter(WINSPOOL_PRINTER_HANDLE hPrinter, WINSPOOL_DOC_INFO_CONTAINER *pDocInfoContainer, DWORD *pJobId) { UNIMPLEMENTED; @@ -176,20 +127,6 @@ } DWORD -_RpcAddJob(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD Level, BYTE *pAddJob, DWORD cbBuf, DWORD *pcbNeeded) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD -_RpcScheduleJob(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD JobId) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD _RpcGetPrinterData(WINSPOOL_PRINTER_HANDLE hPrinter, WCHAR *pValueName, DWORD *pType, BYTE *pData, DWORD nSize, DWORD *pcbNeeded) { UNIMPLEMENTED; @@ -365,13 +302,6 @@ } DWORD -_RpcEnumPrintProcessorDatatypes(WINSPOOL_HANDLE pName, WCHAR *pPrintProcessorName, DWORD Level, BYTE *pDatatypes, DWORD cbBuf, DWORD *pcbNeeded, DWORD *pcReturned) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD _RpcResetPrinter(WINSPOOL_PRINTER_HANDLE hPrinter, WCHAR *pDatatype, WINSPOOL_DEVMODE_CONTAINER *pDevModeContainer) { UNIMPLEMENTED; Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -4,8 +4,11 @@ spec2def(winspool.drv winspool.spec ADD_IMPORTLIB) list(APPEND SOURCE + jobs.c main.c precomp.h + printers.c + printprocessors.c ${CMAKE_CURRENT_BINARY_DIR}/winspool_c.c) add_library(winspool SHARED Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -0,0 +1,60 @@ +/* + * PROJECT: ReactOS Spooler API + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions for managing print jobs + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +BOOL WINAPI +AddJob(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded) +{ + BOOL bReturnValue = FALSE; + DWORD dwErrorCode; + + // Do the RPC call + RpcTryExcept + { + dwErrorCode = _RpcAddJob(hPrinter, Level, pData, cbBuf, pcbNeeded); + if (dwErrorCode) + { + ERR("_RpcAddJob failed with error %lu!\n", dwErrorCode); + } + + bReturnValue = (dwErrorCode == ERROR_SUCCESS); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ERR("_RpcAddJob failed with exception code %lu!\n", RpcExceptionCode()); + } + RpcEndExcept; + + return bReturnValue; +} + +BOOL WINAPI +GetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, DWORD cbBuf, LPDWORD pcbNeeded) +{ + BOOL bReturnValue = FALSE; + DWORD dwErrorCode; + + // Do the RPC call + RpcTryExcept + { + dwErrorCode = _RpcGetJob(hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded); + if (dwErrorCode) + { + ERR("_RpcGetJob failed with error %lu!\n", dwErrorCode); + } + + bReturnValue = (dwErrorCode == ERROR_SUCCESS); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ERR("_RpcGetJob failed with exception code %lu!\n", RpcExceptionCode()); + } + RpcEndExcept; + + return bReturnValue; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -66,217 +66,6 @@ } BOOL WINAPI -ClosePrinter(HANDLE hPrinter) -{ - return FALSE; -} - -DWORD WINAPI -DeviceCapabilitiesA(LPCSTR pDevice, LPCSTR pPort, WORD fwCapability, LPSTR pOutput, const DEVMODEA* pDevMode) -{ - return 0; -} - -DWORD WINAPI -DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, WORD fwCapability, LPWSTR pOutput, const DEVMODEW* pDevMode) -{ - return 0; -} - -LONG WINAPI -DocumentPropertiesA(HWND hWnd, HANDLE hPrinter, LPSTR pDeviceName, PDEVMODEA pDevModeOutput, PDEVMODEA pDevModeInput, DWORD fMode) -{ - return 0; -} - -LONG WINAPI -DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, LPWSTR pDeviceName, PDEVMODEW pDevModeOutput, PDEVMODEW pDevModeInput, DWORD fMode) -{ - return 0; -} - -BOOL WINAPI -EndDocPrinter(HANDLE hPrinter) -{ - return FALSE; -} - -BOOL WINAPI -EndPagePrinter(HANDLE hPrinter) -{ - return FALSE; -} - -BOOL WINAPI -EnumPrintersA(DWORD Flags, LPSTR Name, DWORD Level, LPBYTE pPrinterEnum, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) -{ - return FALSE; -} - -BOOL WINAPI -EnumPrintersW(DWORD Flags, LPWSTR Name, DWORD Level, LPBYTE pPrinterEnum, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) -{ - return FALSE; -} - -BOOL WINAPI -EnumPrintProcessorDatatypesA(LPSTR pName, LPSTR pPrintProcessorName, DWORD Level, LPBYTE pDatatypes, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) -{ - return FALSE; -} - -BOOL WINAPI -EnumPrintProcessorDatatypesW(LPWSTR pName, LPWSTR pPrintProcessorName, DWORD Level, LPBYTE pDatatypes, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) -{ - return FALSE; -} - -BOOL WINAPI -GetDefaultPrinterA(LPSTR pszBuffer, LPDWORD pcchBuffer) -{ - return FALSE; -} - -BOOL WINAPI -GetDefaultPrinterW(LPWSTR pszBuffer, LPDWORD pcchBuffer) -{ - return FALSE; -} - -BOOL WINAPI -GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) -{ - return FALSE; -} - -BOOL WINAPI -GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) -{ - return FALSE; -} - -BOOL WINAPI -GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) -{ - return FALSE; -} - -BOOL WINAPI -GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) -{ - return FALSE; -} - -BOOL WINAPI -GetPrintProcessorDirectoryW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pPrintProcessorInfo, DWORD cbBuf, LPDWORD pcbNeeded) -{ - return FALSE; -} - -BOOL WINAPI -OpenPrinterA(LPSTR pPrinterName, LPHANDLE phPrinter, LPPRINTER_DEFAULTSA pDefault) -{ - BOOL ReturnValue = FALSE; - PWSTR pwszPrinterName = NULL; - PWSTR pwszDatatype = NULL; - PRINTER_DEFAULTSW wDefault = { 0 }; - size_t StringLength; - - if (pPrinterName) - { - // Convert pPrinterName to a Unicode string pwszPrinterName - StringLength = strlen(pPrinterName) + 1; - - pwszPrinterName = HeapAlloc(GetProcessHeap(), 0, StringLength * sizeof(WCHAR)); - if (!pwszPrinterName) - { - ERR("HeapAlloc failed for pwszPrinterName with last error %lu!\n", GetLastError()); - goto Cleanup; - } - - MultiByteToWideChar(CP_ACP, 0, pPrinterName, -1, pwszPrinterName, StringLength); - } - - if (pDefault) - { - wDefault.DesiredAccess = pDefault->DesiredAccess; - - if (pDefault->pDatatype) - { - // Convert pDefault->pDatatype to a Unicode string pwszDatatype that later becomes wDefault.pDatatype - StringLength = strlen(pDefault->pDatatype) + 1; - - pwszDatatype = HeapAlloc(GetProcessHeap(), 0, StringLength * sizeof(WCHAR)); - if (!pwszDatatype) - { - ERR("HeapAlloc failed for pwszDatatype with last error %lu!\n", GetLastError()); - goto Cleanup; - } - - MultiByteToWideChar(CP_ACP, 0, pDefault->pDatatype, -1, pwszDatatype, StringLength); - wDefault.pDatatype = pwszDatatype; - } - - if (pDefault->pDevMode) - wDefault.pDevMode = GdiConvertToDevmodeW(pDefault->pDevMode); - } - - ReturnValue = OpenPrinterW(pwszPrinterName, phPrinter, &wDefault); - -Cleanup: - if (wDefault.pDevMode) - HeapFree(GetProcessHeap(), 0, wDefault.pDevMode); - - if (pwszPrinterName) - HeapFree(GetProcessHeap(), 0, pwszPrinterName); - - if (pwszDatatype) - HeapFree(GetProcessHeap(), 0, pwszDatatype); - - return ReturnValue; -} - -BOOL WINAPI -OpenPrinterW(LPWSTR pPrinterName, LPHANDLE phPrinter, LPPRINTER_DEFAULTSW pDefault) -{ - BOOL ReturnValue = FALSE; - DWORD ErrorCode; - PWSTR pDatatype = NULL; - WINSPOOL_DEVMODE_CONTAINER DevModeContainer; - WINSPOOL_DEVMODE_CONTAINER* pDevModeContainer = NULL; - ACCESS_MASK AccessRequired = 0; - - // Prepare the additional parameters in the format required by _RpcOpenPrinter - if (pDefault) - { - pDatatype = pDefault->pDatatype; - DevModeContainer.cbBuf = sizeof(DEVMODEW); - DevModeContainer.pDevMode = (BYTE*)pDefault->pDevMode; - pDevModeContainer = &DevModeContainer; - AccessRequired = pDefault->DesiredAccess; - } - - // Do the RPC call - RpcTryExcept - { - ErrorCode = _RpcOpenPrinter(pPrinterName, phPrinter, pDatatype, pDevModeContainer, AccessRequired); - if (ErrorCode) - { - ERR("_RpcOpenPrinter failed with error %lu!\n", ErrorCode); - } - - ReturnValue = (ErrorCode == ERROR_SUCCESS); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - ERR("_RpcOpenPrinter failed with exception code %lu!\n", RpcExceptionCode()); - } - RpcEndExcept; - - return ReturnValue; -} - -BOOL WINAPI SpoolerInit() { BOOL ReturnValue = FALSE; @@ -301,27 +90,3 @@ return ReturnValue; } - -DWORD WINAPI -StartDocPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo) -{ - return 0; -} - -BOOL WINAPI -StartPagePrinter(HANDLE hPrinter) -{ - return FALSE; -} - -BOOL WINAPI -WritePrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, LPDWORD pcWritten) -{ - return FALSE; -} - -BOOL WINAPI -XcvDataW(HANDLE hXcv, PCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded, PDWORD pdwStatus) -{ - return FALSE; -} Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -0,0 +1,245 @@ +/* + * PROJECT: ReactOS Spooler API + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to Printers and printing + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +BOOL WINAPI +EnumPrintersA(DWORD Flags, LPSTR Name, DWORD Level, LPBYTE pPrinterEnum, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + return FALSE; +} + +BOOL WINAPI +EnumPrintersW(DWORD Flags, LPWSTR Name, DWORD Level, LPBYTE pPrinterEnum, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + BOOL bReturnValue = FALSE; + DWORD dwErrorCode; + + // Do the RPC call + RpcTryExcept + { + dwErrorCode = _RpcEnumPrinters(Flags, Name, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + if (dwErrorCode) + { + ERR("_RpcEnumPrinters failed with error %lu!\n", dwErrorCode); + } + + bReturnValue = (dwErrorCode == ERROR_SUCCESS); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ERR("_RpcEnumPrinters failed with exception code %lu!\n", RpcExceptionCode()); + } + RpcEndExcept; + + return bReturnValue; +} + +BOOL WINAPI +ClosePrinter(HANDLE hPrinter) +{ + return FALSE; +} + +DWORD WINAPI +DeviceCapabilitiesA(LPCSTR pDevice, LPCSTR pPort, WORD fwCapability, LPSTR pOutput, const DEVMODEA* pDevMode) +{ + return 0; +} + +DWORD WINAPI +DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, WORD fwCapability, LPWSTR pOutput, const DEVMODEW* pDevMode) +{ + return 0; +} + +LONG WINAPI +DocumentPropertiesA(HWND hWnd, HANDLE hPrinter, LPSTR pDeviceName, PDEVMODEA pDevModeOutput, PDEVMODEA pDevModeInput, DWORD fMode) +{ + return 0; +} + +LONG WINAPI +DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, LPWSTR pDeviceName, PDEVMODEW pDevModeOutput, PDEVMODEW pDevModeInput, DWORD fMode) +{ + return 0; +} + +BOOL WINAPI +EndDocPrinter(HANDLE hPrinter) +{ + return FALSE; +} + +BOOL WINAPI +EndPagePrinter(HANDLE hPrinter) +{ + return FALSE; +} + +BOOL WINAPI +GetDefaultPrinterA(LPSTR pszBuffer, LPDWORD pcchBuffer) +{ + return FALSE; +} + +BOOL WINAPI +GetDefaultPrinterW(LPWSTR pszBuffer, LPDWORD pcchBuffer) +{ + return FALSE; +} + +BOOL WINAPI +GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) +{ + return FALSE; +} + +BOOL WINAPI +GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) +{ + return FALSE; +} + +BOOL WINAPI +GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) +{ + return FALSE; +} + +BOOL WINAPI +GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) +{ + return FALSE; +} + +BOOL WINAPI +OpenPrinterA(LPSTR pPrinterName, LPHANDLE phPrinter, LPPRINTER_DEFAULTSA pDefault) +{ + BOOL bReturnValue = FALSE; + PWSTR pwszPrinterName = NULL; + PWSTR pwszDatatype = NULL; + PRINTER_DEFAULTSW wDefault = { 0 }; + size_t StringLength; + + if (pPrinterName) + { + // Convert pPrinterName to a Unicode string pwszPrinterName + StringLength = strlen(pPrinterName) + 1; + + pwszPrinterName = HeapAlloc(GetProcessHeap(), 0, StringLength * sizeof(WCHAR)); + if (!pwszPrinterName) + { + ERR("HeapAlloc failed for pwszPrinterName with last error %lu!\n", GetLastError()); + goto Cleanup; + } + + MultiByteToWideChar(CP_ACP, 0, pPrinterName, -1, pwszPrinterName, StringLength); + } + + if (pDefault) + { + wDefault.DesiredAccess = pDefault->DesiredAccess; + + if (pDefault->pDatatype) + { + // Convert pDefault->pDatatype to a Unicode string pwszDatatype that later becomes wDefault.pDatatype + StringLength = strlen(pDefault->pDatatype) + 1; + + pwszDatatype = HeapAlloc(GetProcessHeap(), 0, StringLength * sizeof(WCHAR)); + if (!pwszDatatype) + { + ERR("HeapAlloc failed for pwszDatatype with last error %lu!\n", GetLastError()); + goto Cleanup; + } + + MultiByteToWideChar(CP_ACP, 0, pDefault->pDatatype, -1, pwszDatatype, StringLength); + wDefault.pDatatype = pwszDatatype; + } + + if (pDefault->pDevMode) + wDefault.pDevMode = GdiConvertToDevmodeW(pDefault->pDevMode); + } + + bReturnValue = OpenPrinterW(pwszPrinterName, phPrinter, &wDefault); + +Cleanup: + if (wDefault.pDevMode) + HeapFree(GetProcessHeap(), 0, wDefault.pDevMode); + + if (pwszPrinterName) + HeapFree(GetProcessHeap(), 0, pwszPrinterName); + + if (pwszDatatype) + HeapFree(GetProcessHeap(), 0, pwszDatatype); + + return bReturnValue; +} + +BOOL WINAPI +OpenPrinterW(LPWSTR pPrinterName, LPHANDLE phPrinter, LPPRINTER_DEFAULTSW pDefault) +{ + BOOL bReturnValue = FALSE; + DWORD dwErrorCode; + PWSTR pDatatype = NULL; + WINSPOOL_DEVMODE_CONTAINER DevModeContainer; + WINSPOOL_DEVMODE_CONTAINER* pDevModeContainer = NULL; + ACCESS_MASK AccessRequired = 0; + + // Prepare the additional parameters in the format required by _RpcOpenPrinter + if (pDefault) + { + pDatatype = pDefault->pDatatype; + DevModeContainer.cbBuf = sizeof(DEVMODEW); + DevModeContainer.pDevMode = (BYTE*)pDefault->pDevMode; + pDevModeContainer = &DevModeContainer; + AccessRequired = pDefault->DesiredAccess; + } + + // Do the RPC call + RpcTryExcept + { + dwErrorCode = _RpcOpenPrinter(pPrinterName, phPrinter, pDatatype, pDevModeContainer, AccessRequired); + if (dwErrorCode) + { + ERR("_RpcOpenPrinter failed with error %lu!\n", dwErrorCode); + } + + bReturnValue = (dwErrorCode == ERROR_SUCCESS); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ERR("_RpcOpenPrinter failed with exception code %lu!\n", RpcExceptionCode()); + } + RpcEndExcept; + + return bReturnValue; +} + +DWORD WINAPI +StartDocPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo) +{ + return 0; +} + +BOOL WINAPI +StartPagePrinter(HANDLE hPrinter) +{ + return FALSE; +} + +BOOL WINAPI +WritePrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, LPDWORD pcWritten) +{ + return FALSE; +} + +BOOL WINAPI +XcvDataW(HANDLE hXcv, PCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded, PDWORD pdwStatus) +{ + return FALSE; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printprocessors.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printprocessors.c [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -0,0 +1,92 @@ +/* + * PROJECT: ReactOS Spooler API + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to Print Processors + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +BOOL WINAPI +EnumPrintProcessorDatatypesA(LPSTR pName, LPSTR pPrintProcessorName, DWORD Level, LPBYTE pDatatypes, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + return FALSE; +} + +BOOL WINAPI +EnumPrintProcessorDatatypesW(LPWSTR pName, LPWSTR pPrintProcessorName, DWORD Level, LPBYTE pDatatypes, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + BOOL bReturnValue = FALSE; + DWORD dwErrorCode; + + // Do the RPC call + RpcTryExcept + { + dwErrorCode = _RpcEnumPrintProcessorDatatypes(pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned); + if (dwErrorCode) + { + ERR("_RpcEnumPrintProcessorDatatypes failed with error %lu!\n", dwErrorCode); + } + + bReturnValue = (dwErrorCode == ERROR_SUCCESS); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ERR("_RpcEnumPrintProcessorDatatypes failed with exception code %lu!\n", RpcExceptionCode()); + } + RpcEndExcept; + + return bReturnValue; +} + +BOOL WINAPI +EnumPrintProcessorsW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pPrintProcessorInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + BOOL bReturnValue = FALSE; + DWORD dwErrorCode; + + // Do the RPC call + RpcTryExcept + { + dwErrorCode = _RpcEnumPrintProcessors(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded, pcReturned); + if (dwErrorCode) + { + ERR("_RpcEnumPrintProcessors failed with error %lu!\n", dwErrorCode); + } + + bReturnValue = (dwErrorCode == ERROR_SUCCESS); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ERR("_RpcEnumPrintProcessors failed with exception code %lu!\n", RpcExceptionCode()); + } + RpcEndExcept; + + return bReturnValue; +} + +BOOL WINAPI +GetPrintProcessorDirectoryW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pPrintProcessorInfo, DWORD cbBuf, LPDWORD pcbNeeded) +{ + BOOL bReturnValue = FALSE; + DWORD dwErrorCode; + + // Do the RPC call + RpcTryExcept + { + dwErrorCode = _RpcGetPrintProcessorDirectory(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded); + if (dwErrorCode) + { + ERR("_RpcGetPrintProcessorDirectory failed with error %lu!\n", dwErrorCode); + } + + bReturnValue = (dwErrorCode == ERROR_SUCCESS); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ERR("_RpcGetPrintProcessorDirectory failed with exception code %lu!\n", RpcExceptionCode()); + } + RpcEndExcept; + + return bReturnValue; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printprocessors.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] Mon Jun 22 14:31:47 2015 @@ -10,7 +10,7 @@ 109 stub AddFormA 110 stub AddFormW 111 stub AddJobA -112 stub AddJobW +112 stdcall AddJobW(long long ptr long ptr) 113 stub AddMonitorA 114 stub AddMonitorW 115 stub AddPortA @@ -92,7 +92,7 @@ 191 stdcall EnumPrintProcessorDatatypesA(ptr ptr long ptr long ptr ptr) 192 stdcall EnumPrintProcessorDatatypesW(ptr ptr long ptr long ptr ptr) 193 stub EnumPrintProcessorsA -194 stub EnumPrintProcessorsW +194 stdcall EnumPrintProcessorsW(ptr ptr long ptr long ptr ptr) 195 stub EnumPrinterDataA 196 stub EnumPrinterDataExA 197 stub EnumPrinterDataExW @@ -143,7 +143,7 @@ 242 stub GetFormA 243 stub GetFormW 244 stub GetJobA -245 stub GetJobW +245 stdcall GetJobW(long long long ptr long ptr) 246 stub GetPrintProcessorDirectoryA 247 stdcall GetPrintProcessorDirectoryW(wstr wstr long ptr long ptr) 248 stdcall GetPrinterA(long long ptr long ptr)

1 0

[cwittich] 68236: [USBEHCI] fix some typos
by cwittich＠svn.reactos.org 22 Jun '15

22 Jun '15

Author: cwittich Date: Mon Jun 22 10:00:00 2015 New Revision: 68236 URL: http://svn.reactos.org/svn/reactos?rev=68236&view=rev Log: [USBEHCI] fix some typos Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Mon Jun 22 10:00:00 2015 @@ -183,7 +183,7 @@ KeInitializeSpinLock(&m_Lock); // - // intialize status change work item + // initialize status change work item // ExInitializeWorkItem(&m_StatusChangeWorkItem, StatusChangeWorkItemRoutine, PVOID(this)); @@ -250,7 +250,7 @@ { if (m_Capabilities.HCSParams.PortPowerControl) { - DPRINT1("Controler EHCI has Port Power Control\n"); + DPRINT1("Controller EHCI has Port Power Control\n"); } DPRINT1("Controller Port Routing Rules %lu\n", m_Capabilities.HCSParams.PortRouteRules); @@ -578,7 +578,7 @@ // if ((Caps & EHCI_LEGSUP_BIOSOWNED)) { - DPRINT1("[EHCI] Controller is BIOS owned, acquring control\n"); + DPRINT1("[EHCI] Controller is BIOS owned, acquiring control\n"); // // acquire ownership @@ -614,7 +614,7 @@ if ((Caps & EHCI_LEGSUP_BIOSOWNED)) { // - // failed to aquire ownership + // failed to acquire ownership // DPRINT1("[EHCI] failed to acquire ownership\n"); } @@ -627,7 +627,7 @@ } #if 0 // - // explictly clear the bios owned flag 2.1.7 + // explicitly clear the bios owned flag 2.1.7 // Value = 0; m_BusInterface.SetBusData(m_BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Value, ExtendedCapsSupport+2, sizeof(UCHAR)); @@ -1397,7 +1397,7 @@ { if (PortStatus & EHCI_PRT_ENABLED) { - DPRINT1("Misbeaving controller. Port should be disabled at this point\n"); + DPRINT1("Misbehaving controller. Port should be disabled at this point\n"); } if (EHCI_IS_LOW_SPEED(PortStatus))

1 0

[ekohl] 68235: [USETUP] UpdateDiskLayout: - Resize the layout buffer if necessary. - Start writing logical partitions to the disk. - Disable the code that wipes unused table entries. May be enabled...
by ekohl＠svn.reactos.org 21 Jun '15

21 Jun '15

Author: ekohl Date: Sun Jun 21 20:18:23 2015 New Revision: 68235 URL: http://svn.reactos.org/svn/reactos?rev=68235&view=rev Log: [USETUP] UpdateDiskLayout: - Resize the layout buffer if necessary. - Start writing logical partitions to the disk. - Disable the code that wipes unused table entries. May be enabled later. Right now, you can only create one logical partition because the link entries are not created yet. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Jun 21 20:18:23 2015 @@ -2192,6 +2192,7 @@ } +#if 0 static BOOLEAN IsEmptyLayoutEntry( @@ -2204,6 +2205,7 @@ return FALSE; } +#endif static @@ -2224,6 +2226,94 @@ static +ULONG +GetPrimaryPartitionCount( + IN PDISKENTRY DiskEntry) +{ + PLIST_ENTRY Entry; + PPARTENTRY PartEntry; + ULONG Count = 0; + + Entry = DiskEntry->PrimaryPartListHead.Flink; + while (Entry != &DiskEntry->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned == TRUE) + Count++; + + Entry = Entry->Flink; + } + + return Count; +} + + +static +ULONG +GetLogicalPartitionCount( + PDISKENTRY DiskEntry) +{ + PLIST_ENTRY ListEntry; + PPARTENTRY PartEntry; + ULONG Count = 0; + + ListEntry = DiskEntry->LogicalPartListHead.Flink; + while (ListEntry != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned) + Count++; + + ListEntry = ListEntry->Flink; + } + + return Count; +} + + +static +BOOL +ReAllocateLayoutBuffer( + PDISKENTRY DiskEntry) +{ + PDRIVE_LAYOUT_INFORMATION NewLayoutBuffer; + ULONG NewPartitionCount; + ULONG CurrentPartitionCount = 0; + ULONG LayoutBufferSize; + + DPRINT1("ReAllocateLayoutBuffer()\n"); + + NewPartitionCount = 4 + GetLogicalPartitionCount(DiskEntry) * 4; + + if (DiskEntry->LayoutBuffer) + CurrentPartitionCount = DiskEntry->LayoutBuffer->PartitionCount; + + DPRINT1("CurrentPartitionCount: %lu NewPartitionCount: %lu\n", + CurrentPartitionCount, NewPartitionCount); + + if (CurrentPartitionCount == NewPartitionCount) + return TRUE; + + LayoutBufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + + ((NewPartitionCount - ANYSIZE_ARRAY) * sizeof(PARTITION_INFORMATION)); + NewLayoutBuffer = RtlReAllocateHeap(ProcessHeap, + HEAP_ZERO_MEMORY, + DiskEntry->LayoutBuffer, + LayoutBufferSize); + if (NewLayoutBuffer == NULL) + { + DPRINT1("Failed to allocate the new layout buffer (size: %lu)\n", LayoutBufferSize); + return FALSE; + } + + DiskEntry->LayoutBuffer = NewLayoutBuffer; + DiskEntry->LayoutBuffer->PartitionCount = NewPartitionCount; + + return TRUE; +} + + +static VOID UpdateDiskLayout( IN PDISKENTRY DiskEntry) @@ -2231,11 +2321,20 @@ PPARTITION_INFORMATION PartitionInfo; PLIST_ENTRY ListEntry; PPARTENTRY PartEntry; - ULONG Index = 0; + ULONG Index; ULONG PartitionNumber = 1; DPRINT1("UpdateDiskLayout()\n"); + /* Resize the layout buffer if necessary */ + if (ReAllocateLayoutBuffer(DiskEntry) == FALSE) + { + DPRINT("ReAllocateLayoutBuffer() failed.\n"); + return; + } + + /* Update the primary partition table */ + Index = 0; ListEntry = DiskEntry->PrimaryPartListHead.Flink; while (ListEntry != &DiskEntry->PrimaryPartListHead) { @@ -2247,7 +2346,7 @@ if (!IsSamePrimaryLayoutEntry(PartitionInfo, DiskEntry, PartEntry)) { - DPRINT1("Updating partition entry %lu\n", Index); + DPRINT1("Updating primary partition entry %lu\n", Index); PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; @@ -2257,10 +2356,10 @@ PartitionInfo->BootIndicator = PartEntry->BootIndicator; PartitionInfo->RecognizedPartition = FALSE; PartitionInfo->RewritePartition = TRUE; - - PartEntry->PartitionNumber = PartitionNumber; - PartEntry->PartitionIndex = Index; } + + PartEntry->PartitionNumber = (!IsContainerPartition(PartEntry->PartitionType)) ? PartitionNumber : 0; + PartEntry->PartitionIndex = Index; if (!IsContainerPartition(PartEntry->PartitionType)) PartitionNumber++; @@ -2271,6 +2370,39 @@ ListEntry = ListEntry->Flink; } + /* Update the logical partition tables */ + Index = 4; + ListEntry = DiskEntry->LogicalPartListHead.Flink; + while (ListEntry != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + + if (PartEntry->IsPartitioned) + { + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; + + DPRINT1("Updating logical partition entry %lu\n", Index); + + PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; + PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + PartitionInfo->HiddenSectors = DiskEntry->SectorAlignment; + PartitionInfo->PartitionNumber = PartitionNumber; + PartitionInfo->PartitionType = PartEntry->PartitionType; + PartitionInfo->BootIndicator = FALSE; + PartitionInfo->RecognizedPartition = FALSE; + PartitionInfo->RewritePartition = TRUE; + + PartEntry->PartitionNumber = PartitionNumber; + PartEntry->PartitionIndex = Index; + + PartitionNumber++; + Index += 4; + } + + ListEntry = ListEntry->Flink; + } + +#if 0 for (;Index < 4; Index++) { PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; @@ -2289,6 +2421,7 @@ PartitionInfo->RewritePartition = TRUE; } } +#endif #ifdef DUMP_PARTITION_TABLE DumpPartitionTable(DiskEntry); @@ -3005,29 +3138,6 @@ } -static -ULONG -GetPrimaryPartitionCount( - IN PDISKENTRY DiskEntry) -{ - PLIST_ENTRY Entry; - PPARTENTRY PartEntry; - UINT nCount = 0; - - Entry = DiskEntry->PrimaryPartListHead.Flink; - while (Entry != &DiskEntry->PrimaryPartListHead) - { - PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); - if (PartEntry->IsPartitioned == TRUE) - nCount++; - - Entry = Entry->Flink; - } - - return nCount; -} - - ULONG PrimaryPartitionCreationChecks( IN PPARTLIST List)

1 0

[tfaber] 68234: [RTL][NDK][NTDLL_APITEST] - Properly implement/declare/test RtlCopyMappedMemory... it's not that hard CORE-9857
by tfaber＠svn.reactos.org 21 Jun '15

21 Jun '15

Author: tfaber Date: Sun Jun 21 19:15:01 2015 New Revision: 68234 URL: http://svn.reactos.org/svn/reactos?rev=68234&view=rev Log: [RTL][NDK][NTDLL_APITEST] - Properly implement/declare/test RtlCopyMappedMemory... it's not that hard CORE-9857 Added: trunk/rostests/apitests/ntdll/RtlCopyMappedMemory.c (with props) Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/memstream.c trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Jun 21 19:15:01 2015 @@ -2046,6 +2046,14 @@ _In_ ULONGLONG Pattern ); +NTSYSAPI +NTSTATUS +NTAPI +RtlCopyMappedMemory( + _Out_writes_bytes_all_(Size) PVOID Destination, + _In_reads_bytes_(Size) const VOID *Source, + _In_ SIZE_T Size +); NTSYSAPI SIZE_T Modified: trunk/reactos/lib/rtl/memstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/memstream.c?rev=68… ============================================================================== --- trunk/reactos/lib/rtl/memstream.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/memstream.c [iso-8859-1] Sun Jun 21 19:15:01 2015 @@ -469,13 +469,24 @@ /* * @implemented */ -VOID +NTSTATUS NTAPI RtlCopyMappedMemory( - _Out_ PVOID Destination, - _In_ const VOID *Source, + _Out_writes_bytes_all_(Size) PVOID Destination, + _In_reads_bytes_(Size) const VOID *Source, _In_ SIZE_T Size) { - /* FIXME: This is supposed to handle STATUS_IN_PAGE_ERROR exceptions */ - RtlCopyMemory(Destination, Source, Size); -} + NTSTATUS Status = STATUS_SUCCESS; + _SEH2_TRY + { + RtlCopyMemory(Destination, Source, Size); + } + _SEH2_EXCEPT(_SEH2_GetExceptionCode() == STATUS_IN_PAGE_ERROR + ? EXCEPTION_EXECUTE_HANDLER + : EXCEPTION_CONTINUE_SEARCH) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + return Status; +} Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sun Jun 21 19:15:01 2015 @@ -15,6 +15,7 @@ NtQueryVolumeInformationFile.c NtSaveKey.c RtlBitmap.c + RtlCopyMappedMemory.c RtlDetermineDosPathNameType.c RtlDoesFileExists.c RtlDosPathNameToNtPathName_U.c Added: trunk/rostests/apitests/ntdll/RtlCopyMappedMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlCopyMap… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlCopyMappedMemory.c (added) +++ trunk/rostests/apitests/ntdll/RtlCopyMappedMemory.c [iso-8859-1] Sun Jun 21 19:15:01 2015 @@ -0,0 +1,35 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for RtlCopyMappedMemory + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <ndk/rtlfuncs.h> + +START_TEST(RtlCopyMappedMemory) +{ + NTSTATUS Status; + UCHAR Buffer1[32]; + UCHAR Buffer2[32]; + + StartSeh() RtlCopyMappedMemory(NULL, NULL, 1); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() RtlCopyMappedMemory(Buffer1, NULL, 1); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() RtlCopyMappedMemory(NULL, Buffer1, 1); EndSeh(STATUS_ACCESS_VIOLATION); + + StartSeh() + Status = RtlCopyMappedMemory(NULL, NULL, 0); + EndSeh(STATUS_SUCCESS); + ok(Status == STATUS_SUCCESS, "RtlCopyMappedMemory returned %lx\n", Status); + + RtlFillMemory(Buffer1, sizeof(Buffer1), 0x11); + RtlFillMemory(Buffer2, sizeof(Buffer2), 0x22); + StartSeh() + Status = RtlCopyMappedMemory(Buffer1, Buffer2, sizeof(Buffer1)); + EndSeh(STATUS_SUCCESS); + ok(Status == STATUS_SUCCESS, "RtlCopyMappedMemory returned %lx\n", Status); + ok(RtlCompareMemory(Buffer1, Buffer2, sizeof(Buffer1)) == sizeof(Buffer1), "Data not copied\n"); +} Propchange: trunk/rostests/apitests/ntdll/RtlCopyMappedMemory.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sun Jun 21 19:15:01 2015 @@ -19,6 +19,7 @@ extern void func_NtSaveKey(void); extern void func_NtSystemInformation(void); extern void func_RtlBitmap(void); +extern void func_RtlCopyMappedMemory(void); extern void func_RtlDetermineDosPathNameType(void); extern void func_RtlDoesFileExists(void); extern void func_RtlDosPathNameToNtPathName_U(void); @@ -53,6 +54,7 @@ { "NtSaveKey", func_NtSaveKey}, { "NtSystemInformation", func_NtSystemInformation }, { "RtlBitmapApi", func_RtlBitmap }, + { "RtlCopyMappedMemory", func_RtlCopyMappedMemory }, { "RtlDetermineDosPathNameType", func_RtlDetermineDosPathNameType }, { "RtlDoesFileExists", func_RtlDoesFileExists }, { "RtlDosPathNameToNtPathName_U", func_RtlDosPathNameToNtPathName_U },

1 0

[pschweitzer] 68233: [CDFS] Add a few sanity checks to our handling of ISO 9660 / Joliet: - Null name entries are forbidden - Degenerated entries (mistmaching sizes) reveal broken layout In both ca...
by pschweitzer＠svn.reactos.org 21 Jun '15

21 Jun '15

Author: pschweitzer Date: Sun Jun 21 16:47:23 2015 New Revision: 68233 URL: http://svn.reactos.org/svn/reactos?rev=68233&view=rev Log: [CDFS] Add a few sanity checks to our handling of ISO 9660 / Joliet: - Null name entries are forbidden - Degenerated entries (mistmaching sizes) reveal broken layout In both cases, the lookup for a file is aborted and the CD considered as corrupted by the FSD. explorer displays empty CDs then. CORE-9254 #resolve #comment Fixed with r68233 Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/fcb.c Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Sun Jun 21 16:47:23 2015 @@ -290,9 +290,26 @@ return Status; } + if (Record->RecordLength < Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)) + { + DPRINT1("Found corrupted entry! %u - %u\n", Record->RecordLength, Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)); + RtlFreeUnicodeString(&FileToFindUpcase); + CcUnpinData(Context); + return STATUS_DISK_CORRUPT_ERROR; + } + DPRINT("Name '%S'\n", name); RtlInitUnicodeString(&LongName, name); + /* Was the entry degenerated? */ + if (LongName.Length < sizeof(WCHAR)) + { + DPRINT1("Found entry with invalid name!\n"); + RtlFreeUnicodeString(&FileToFindUpcase); + CcUnpinData(Context); + return STATUS_DISK_CORRUPT_ERROR; + } + ShortName.Length = 0; ShortName.MaximumLength = 26; ShortName.Buffer = ShortNameBuffer; Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Sun Jun 21 16:47:23 2015 @@ -558,12 +558,29 @@ DPRINT("RecordLength %u ExtAttrRecordLength %u NameLength %u\n", Record->RecordLength, Record->ExtAttrRecordLength, Record->FileIdLength); + if (Record->RecordLength < Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)) + { + DPRINT1("Found corrupted entry! %u - %u\n", Record->RecordLength, Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)); + RtlFreeUnicodeString(&FileToFindUpcase); + CcUnpinData(Context); + return STATUS_DISK_CORRUPT_ERROR; + } + CdfsGetDirEntryName(DeviceExt, Record, Name); DPRINT ("Name '%S'\n", Name); DPRINT ("Sector %lu\n", DirectoryFcb->Entry.ExtentLocationL); DPRINT ("Offset %lu\n", Offset); RtlInitUnicodeString(&LongName, Name); + /* Was the entry degenerated? */ + if (LongName.Length < sizeof(WCHAR)) + { + DPRINT1("Found entry with invalid name!\n"); + RtlFreeUnicodeString(&FileToFindUpcase); + CcUnpinData(Context); + return STATUS_DISK_CORRUPT_ERROR; + } + RtlInitEmptyUnicodeString(&ShortName, ShortNameBuffer, sizeof(ShortNameBuffer)); RtlZeroMemory(ShortNameBuffer, sizeof(ShortNameBuffer));

1 0

[tfaber] 68232: [RTL][NTDLL] - Add basic implementations of RtlApplicationVerifierStop and RtlCopyMappedMemory for the benefit of some Windows dlls CORE-9857 CORE-9858 #resolve
by tfaber＠svn.reactos.org 21 Jun '15

21 Jun '15

Author: tfaber Date: Sun Jun 21 16:38:44 2015 New Revision: 68232 URL: http://svn.reactos.org/svn/reactos?rev=68232&view=rev Log: [RTL][NTDLL] - Add basic implementations of RtlApplicationVerifierStop and RtlCopyMappedMemory for the benefit of some Windows dlls CORE-9857 CORE-9858 #resolve Added: trunk/reactos/lib/rtl/appverifier.c (with props) Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/lib/rtl/CMakeLists.txt trunk/reactos/lib/rtl/memstream.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sun Jun 21 16:38:44 2015 @@ -467,7 +467,7 @@ @ stdcall RtlAppendStringToString(ptr ptr) @ stdcall RtlAppendUnicodeStringToString(ptr ptr) @ stdcall RtlAppendUnicodeToString(ptr wstr) -;@ stdcall RtlApplicationVerifierStop +@ stdcall RtlApplicationVerifierStop(ptr str ptr str ptr str ptr str ptr str) @ stdcall RtlApplyRXact(ptr) @ stdcall RtlApplyRXactNoFlush(ptr) @ stdcall RtlAreAllAccessesGranted(long long) @@ -506,7 +506,7 @@ @ stdcall -arch=win32 -ret64 RtlConvertUlongToLargeInteger(long) @ stdcall RtlCopyLuid(ptr ptr) @ stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) -;@ stdcall RtlCopyMappedMemory +@ stdcall RtlCopyMappedMemory(ptr ptr long) @ stdcall RtlCopyMemoryStreamTo(ptr ptr int64 ptr ptr) @ stdcall RtlCopyOutOfProcessMemoryStreamTo(ptr ptr int64 ptr ptr) RtlCopyMemoryStreamTo @ stdcall RtlCopySecurityDescriptor(ptr ptr) Modified: trunk/reactos/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] Sun Jun 21 16:38:44 2015 @@ -9,6 +9,7 @@ access.c acl.c actctx.c + appverifier.c assert.c atom.c avltable.c Added: trunk/reactos/lib/rtl/appverifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/appverifier.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/appverifier.c (added) +++ trunk/reactos/lib/rtl/appverifier.c [iso-8859-1] Sun Jun 21 16:38:44 2015 @@ -0,0 +1,46 @@ +/* + * PROJECT: ReactOS Runtime Library + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: lib/rtl/appverifier.c + * PURPOSE: RTL Application Verifier Routines + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +/* INCLUDES *****************************************************************/ + +#include <rtl.h> + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ***************************************************************/ + +/* + * @implemented + */ +VOID +NTAPI +RtlApplicationVerifierStop( + _In_ ULONG_PTR Code, + _In_ PCSTR Message, + _In_ PVOID Value1, + _In_ PCSTR Description1, + _In_ PVOID Value2, + _In_ PCSTR Description2, + _In_ PVOID Value3, + _In_ PCSTR Description3, + _In_ PVOID Value4, + _In_ PCSTR Description4) +{ + PTEB Teb = NtCurrentTeb(); + + DbgPrint("**************************************************\n"); + DbgPrint("VERIFIER STOP %08Ix: pid %04Ix: %s\n", + Code, (ULONG_PTR)Teb->ClientId.UniqueProcess, Message); + DbgPrint(" %p : %s\n", Value1, Description1); + DbgPrint(" %p : %s\n", Value2, Description2); + DbgPrint(" %p : %s\n", Value3, Description3); + DbgPrint(" %p : %s\n", Value4, Description4); + DbgPrint("**************************************************\n"); + DbgBreakPoint(); +} Propchange: trunk/reactos/lib/rtl/appverifier.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/rtl/memstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/memstream.c?rev=68… ============================================================================== --- trunk/reactos/lib/rtl/memstream.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/memstream.c [iso-8859-1] Sun Jun 21 16:38:44 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/rtl/mem.c + * FILE: lib/rtl/memstream.c * PURPOSE: MemoryStream functions * PROGRAMMER: David Quintana (gigaherz(a)gmail.com) */ @@ -465,3 +465,17 @@ return E_NOTIMPL; } + +/* + * @implemented + */ +VOID +NTAPI +RtlCopyMappedMemory( + _Out_ PVOID Destination, + _In_ const VOID *Source, + _In_ SIZE_T Size) +{ + /* FIXME: This is supposed to handle STATUS_IN_PAGE_ERROR exceptions */ + RtlCopyMemory(Destination, Source, Size); +}

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