Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 67581: [ATL] Add support for assigning CAtlString to WCHAR
by gedmurphy＠svn.reactos.org 06 May '15

06 May '15

Author: gedmurphy Date: Wed May 6 21:56:24 2015 New Revision: 67581 URL: http://svn.reactos.org/svn/reactos?rev=67581&view=rev Log: [ATL] Add support for assigning CAtlString to WCHAR Modified: trunk/reactos/lib/atl/atlsimpstr.h Modified: trunk/reactos/lib/atl/atlsimpstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlsimpstr.h?rev=6… ============================================================================== --- trunk/reactos/lib/atl/atlsimpstr.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlsimpstr.h [iso-8859-1] Wed May 6 21:56:24 2015 @@ -120,6 +120,12 @@ Attach(pNewData); } + + operator PCXSTR() const throw() + { + return m_pszData; + } + }; }

1 0

[aandrejevic] 67580: [NTVDM] Try to find the shortened full path in DosLoadExecutable, and use that whenever possible.
by aandrejevic＠svn.reactos.org 06 May '15

06 May '15

Author: aandrejevic Date: Wed May 6 21:56:15 2015 New Revision: 67580 URL: http://svn.reactos.org/svn/reactos?rev=67580&view=rev Log: [NTVDM] Try to find the shortened full path in DosLoadExecutable, and use that whenever possible. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c 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] Wed May 6 21:56:15 2015 @@ -255,6 +255,8 @@ WORD LoadSegment; WORD MaxAllocSize; DWORD i, FileSize; + CHAR FullPath[MAX_PATH]; + CHAR ShortFullPath[MAX_PATH]; /* Buffer for command line conversion: 1 byte for size; 127 bytes for contents */ CHAR CmdLineBuffer[1 + DOS_CMDLINE_LENGTH]; @@ -264,6 +266,17 @@ ExecutablePath, Parameters, ReturnAddress); + + /* Try to get the full path to the executable */ + if (GetFullPathNameA(ExecutablePath, sizeof(FullPath), FullPath, NULL)) + { + /* Try to shorten the full path */ + if (GetShortPathNameA(FullPath, ShortFullPath, sizeof(ShortFullPath))) + { + /* Use the shortened full path from now on */ + ExecutablePath = ShortFullPath; + } + } /* Open a handle to the executable */ FileHandle = CreateFileA(ExecutablePath,

1 0

[gedmurphy] 67579: [ATL] Add skeleton support for CAtlStringW
by gedmurphy＠svn.reactos.org 06 May '15

06 May '15

Author: gedmurphy Date: Wed May 6 21:31:40 2015 New Revision: 67579 URL: http://svn.reactos.org/svn/reactos?rev=67579&view=rev Log: [ATL] Add skeleton support for CAtlStringW Added: trunk/reactos/lib/atl/atlsimpstr.h (with props) trunk/reactos/lib/atl/atlstr.h (with props) trunk/reactos/lib/atl/cstringt.h (with props) Added: trunk/reactos/lib/atl/atlsimpstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlsimpstr.h?rev=6… ============================================================================== --- trunk/reactos/lib/atl/atlsimpstr.h (added) +++ trunk/reactos/lib/atl/atlsimpstr.h [iso-8859-1] Wed May 6 21:31:40 2015 @@ -0,0 +1,126 @@ +#ifndef __ATLSIMPSTR_H__ +#define __ATLSIMPSTR_H__ + +#pragma once + +#include <atlcore.h> + + +namespace ATL +{ + struct CStringData; + + __interface IAtlStringMgr + { + public: + + _Ret_maybenull_ _Post_writable_byte_size_(sizeof(CStringData) + nAllocLength*nCharSize) + CStringData* Allocate( + _In_ int nAllocLength, + _In_ int nCharSize) throw(); + + void Free(_Inout_ CStringData* pData) throw(); + + virtual _Ret_maybenull_ _Post_writable_byte_size_(sizeof(CStringData) + nAllocLength*nCharSize) + CStringData* Reallocate( + _Inout_ CStringData* pData, + _In_ int nAllocLength, + _In_ int nCharSize) throw(); + + CStringData* GetNilString() throw(); + + IAtlStringMgr* Clone() throw(); + }; + + struct CStringData + { + IAtlStringMgr* pStringMgr; + int nDataLength; + int nAllocLength; + long nRefs; + + void* data() throw() + { + return (this + 1); + } + + void AddRef() throw() + { + ATLASSERT(nRefs > 0); + _InterlockedIncrement(&nRefs); + } + + void Release() throw() + { + ATLASSERT(nRefs != 0); + + if (_InterlockedDecrement(&nRefs) <= 0) + { + pStringMgr->Free(this); + } + } + }; + + template< typename BaseType = char > + class ChTraitsBase + { + public: + typedef char XCHAR; + typedef LPSTR PXSTR; + typedef LPCSTR PCXSTR; + typedef wchar_t YCHAR; + typedef LPWSTR PYSTR; + typedef LPCWSTR PCYSTR; + }; + + template<> + class ChTraitsBase< wchar_t > + { + public: + typedef wchar_t XCHAR; + typedef LPWSTR PXSTR; + typedef LPCWSTR PCXSTR; + typedef char YCHAR; + typedef LPSTR PYSTR; + typedef LPCSTR PCYSTR; + }; + + + + template< typename BaseType, bool t_bMFCDLL = false> + class CSimpleStringT + { + public: + typedef typename ChTraitsBase<BaseType>::XCHAR XCHAR; + typedef typename ChTraitsBase<BaseType>::PXSTR PXSTR; + typedef typename ChTraitsBase<BaseType>::PCXSTR PCXSTR; + typedef typename ChTraitsBase<BaseType>::YCHAR YCHAR; + typedef typename ChTraitsBase<BaseType>::PYSTR PYSTR; + typedef typename ChTraitsBase<BaseType>::PCYSTR PCYSTR; + + public: + explicit CSimpleStringT(_Inout_ IAtlStringMgr* pStringMgr) + { + ATLENSURE(pStringMgr != NULL); + CStringData* pData = pStringMgr->GetNilString(); + Attach(pData); + } + + CSimpleStringT(_In_ const CSimpleStringT& strSrc) + { + CStringData* pSrcData = strSrc.GetData(); + CStringData* pNewData = CloneData(pSrcData); + Attach(pNewData); + } + + CSimpleStringT(_In_ const CSimpleStringT<BaseType, !t_bMFCDLL>& strSrc) + { + CStringData* pSrcData = strSrc.GetData(); + CStringData* pNewData = CloneData(pSrcData); + Attach(pNewData); + } + + }; +} + +#endif Propchange: trunk/reactos/lib/atl/atlsimpstr.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/atl/atlstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlstr.h?rev=67579 ============================================================================== --- trunk/reactos/lib/atl/atlstr.h (added) +++ trunk/reactos/lib/atl/atlstr.h [iso-8859-1] Wed May 6 21:31:40 2015 @@ -0,0 +1,55 @@ +#ifndef __ATLSTR_H__ +#define __ATLSTR_H__ + +#pragma once + +#ifndef __cplusplus + #error ATL requires C++ compilation (use a .cpp suffix) +#endif + +#include <atlbase.h> +#include <cstringt.h> + +namespace ATL +{ + template< typename _BaseType = char, class StringIterator = ChTraitsOS<_BaseType>> + class StrTraitATL : + public StringIterator + { + public: + static HINSTANCE FindStringResourceInstance(_In_ UINT nID) throw() + { + return(AtlFindStringResourceInstance(nID)); + } + + static IAtlStringMgr* GetDefaultManager() throw() + { + return CAtlStringMgr::GetInstance(); + } + }; + + + template< typename _CharType = wchar_t> + class ChTraitsOS : + public ChTraitsBase<_CharType> + { + protected: + + public: + + }; + +#ifndef _ATL_CSTRING_NO_CRT + typedef CStringT<wchar_t, StrTraitATL<wchar_t, ChTraitsCRT<wchar_t>>> CAtlStringW; +#else + typedef CStringT<wchar_t, StrTraitATL<wchar_t>> CAtlStringW; +#endif + +#ifndef _AFX + typedef CAtlStringW CStringW; +#endif + + +} //namespace ATL + +#endif Propchange: trunk/reactos/lib/atl/atlstr.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/atl/cstringt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/cstringt.h?rev=675… ============================================================================== --- trunk/reactos/lib/atl/cstringt.h (added) +++ trunk/reactos/lib/atl/cstringt.h [iso-8859-1] Wed May 6 21:31:40 2015 @@ -0,0 +1,77 @@ +#ifndef __CSTRINGT_H__ +#define __CSTRINGT_H__ + +#pragma once + +#include <atlsimpstr.h> +#include <stddef.h> + +#include <stdio.h> +#include <wchar.h> + + +namespace ATL +{ + + template< typename _CharType = wchar_t> + class ChTraitsCRT : + public ChTraitsBase<_CharType> + { + public: + + }; + + + + namespace _CSTRING_IMPL_ + { + template <typename _CharType, class StringTraits> + struct _MFCDLLTraitsCheck + { + const static bool c_bIsMFCDLLTraits = false; + }; + } + + template< typename BaseType, class StringTraits> + class CStringT : + public CSimpleStringT <BaseType, _CSTRING_IMPL_::_MFCDLLTraitsCheck<BaseType, StringTraits>::c_bIsMFCDLLTraits> + { + public: + typedef CSimpleStringT<BaseType, _CSTRING_IMPL_::_MFCDLLTraitsCheck<BaseType, StringTraits>::c_bIsMFCDLLTraits> CThisSimpleString; + typedef StringTraits StrTraits; + typedef typename CThisSimpleString::XCHAR XCHAR; + typedef typename CThisSimpleString::PXSTR PXSTR; + typedef typename CThisSimpleString::PCXSTR PCXSTR; + typedef typename CThisSimpleString::YCHAR YCHAR; + typedef typename CThisSimpleString::PYSTR PYSTR; + typedef typename CThisSimpleString::PCYSTR PCYSTR; + + public: + CStringT() throw() : + CThisSimpleString(StringTraits::GetDefaultManager()) + { + } + explicit CStringT( _In_ IAtlStringMgr* pStringMgr) throw() : + CThisSimpleString(pStringMgr) + { + } + + CStringT(_In_ const VARIANT& varSrc); + CStringT( + _In_ const VARIANT& varSrc, + _In_ IAtlStringMgr* pStringMgr); + + static void __cdecl Construct(_In_ CStringT* pString) + { + new(pString)CStringT; + } + + CStringT(_In_ const CStringT& strSrc) : + CThisSimpleString(strSrc) + { + } + }; + +} //namespace ATL + +#endif Propchange: trunk/reactos/lib/atl/cstringt.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[aandrejevic] 67578: [NTVDM] The DOS CON driver shouldn't return DOS_DEVSTAT_BUSY while an extended character can be read.
by aandrejevic＠svn.reactos.org 06 May '15

06 May '15

Author: aandrejevic Date: Wed May 6 20:09:38 2015 New Revision: 67578 URL: http://svn.reactos.org/svn/reactos?rev=67578&view=rev Log: [NTVDM] The DOS CON driver shouldn't return DOS_DEVSTAT_BUSY while an extended character can be read. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] Wed May 6 20:09:38 2015 @@ -92,7 +92,7 @@ setAX(AX); /* If ZF is set, set the busy bit */ - if (getZF()) return DOS_DEVSTAT_BUSY; + if (getZF() && !ExtendedCode) return DOS_DEVSTAT_BUSY; else return DOS_DEVSTAT_DONE; }

1 0

[cfinck] 67577: Fix copying of structure values in OpenPrinterA
by cfinck＠svn.reactos.org 06 May '15

06 May '15

Author: cfinck Date: Wed May 6 13:00:08 2015 New Revision: 67577 URL: http://svn.reactos.org/svn/reactos?rev=67577&view=rev Log: Fix copying of structure values in OpenPrinterA Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c 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] Wed May 6 13:00:08 2015 @@ -213,8 +213,8 @@ MultiByteToWideChar(CP_ACP, 0, pDefault->pDevMode->dmFormName, -1, wDevMode.dmFormName, sizeof(wDevMode.dmFormName) / sizeof(WCHAR)); // Use CopyMemory to copy over several structure values in one step - CopyMemory(&wDevMode.dmSpecVersion, &pDefault->pDevMode->dmSpecVersion, (ULONG_PTR)&wDevMode.dmCollate - (ULONG_PTR)&wDevMode.dmSpecVersion); - CopyMemory(&wDevMode.dmLogPixels, &pDefault->pDevMode->dmLogPixels, (ULONG_PTR)&wDevMode.dmPanningHeight - (ULONG_PTR)&wDevMode.dmLogPixels); + CopyMemory(&wDevMode.dmSpecVersion, &pDefault->pDevMode->dmSpecVersion, (ULONG_PTR)&wDevMode.dmCollate - (ULONG_PTR)&wDevMode.dmSpecVersion + sizeof(wDevMode.dmCollate)); + CopyMemory(&wDevMode.dmLogPixels, &pDefault->pDevMode->dmLogPixels, (ULONG_PTR)&wDevMode.dmPanningHeight - (ULONG_PTR)&wDevMode.dmLogPixels + sizeof(wDevMode.dmPanningHeight)); wDefault.pDevMode = &wDevMode; }

1 0

[cfinck] 67576: - Add the first bits of the winspool/spoolsv/spoolss interface in a WIDL-compatible format. References: - https://git.samba.org/?p=samba.git; a=blob; f=librpc/idl/spoolss.idl; hb=618af...
by cfinck＠svn.reactos.org 06 May '15

06 May '15

Author: cfinck Date: Wed May 6 12:47:20 2015 New Revision: 67576 URL: http://svn.reactos.org/svn/reactos?rev=67576&view=rev Log: - Add the first bits of the winspool/spoolsv/spoolss interface in a WIDL-compatible format. References: - https://git.samba.org/?p=samba.git;a=blob;f=librpc/idl/spoolss.idl;hb=618af… - https://msdn.microsoft.com/en-us/library/cc244649.aspx - Replace our stubbed spoolsv by a new basic implementation that already creates a thread to serve RPC requests. - Add stubbed versions of localmon, localspl, spoolss, winprint, winspool matching the exports of the Windows Server 2003 DLLs. localmon and winprint are part of localspl in Windows Server 2003. I took the freedom of putting these distinct components into separate DLLs (as it's done for localmon in NT4 and for winprint in Win7). - Implement some stubs myself to fix the build (e.g. comdlg32 uses some functions). - Implement OpenPrinterA and OpenPrinterW in winspool. This is just ANSI-to-Unicode conversion and a RPC call. - Remove the Wine-imported ntprint, this one also needs a complete rewrite once we're at this point. Added: branches/colins-printing-for-freedom/reactos/include/reactos/idl/winspool.idl (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/main.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/precomp.h (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.rc (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/main.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcserver.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/precomp.h (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.rc (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/localmon.rc (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/localmon.spec (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/main.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/precomp.h (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/CMakeLists.txt (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/precomp.h (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/winprint.rc (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/winprint.spec (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/CMakeLists.txt (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/localspl.rc (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/localspl.spec (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h (with props) Removed: branches/colins-printing-for-freedom/reactos/dll/win32/ntprint/ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/spoolsv.c Modified: branches/colins-printing-for-freedom/reactos/dll/win32/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/spoolsv.rc branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/CMakeLists.txt Modified: branches/colins-printing-for-freedom/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Wed May 6 12:47:20 2015 @@ -135,7 +135,6 @@ add_subdirectory(ntdsapi) add_subdirectory(ntlanman) add_subdirectory(ntmarta) -add_subdirectory(ntprint) add_subdirectory(objsel) add_subdirectory(odbc32) add_subdirectory(odbccp32) Added: branches/colins-printing-for-freedom/reactos/include/reactos/idl/winspool.idl URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/include/reactos/idl/winspool.idl (added) +++ branches/colins-printing-for-freedom/reactos/include/reactos/idl/winspool.idl [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,48 @@ +/* + * PROJECT: ReactOS Spooler API + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: WIDL-compatible interface definition for the Spooler API + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include <ms-dtyp.idl> + +typedef [context_handle] void* WINSPOOL_PRINTER_HANDLE; +typedef [handle, string, unique] WCHAR* WINSPOOL_HANDLE; + +typedef struct _DEVMODE_CONTAINER +{ + DWORD cbBuf; + BYTE* pDevMode; +} +WINSPOOL_DEVMODE_CONTAINER; + + +[ + uuid(12345678-1234-ABCD-EF00-0123456789AB), + version(1.0), + endpoint("ncacn_np:[\\pipe\\spoolss]"), + pointer_default(unique) +] + +interface winspool { + /* Function 0 */ + DWORD _RpcEnumPrinters( + [in] DWORD Flags, + [in] WINSPOOL_HANDLE Name, + [in] DWORD Level, + [out] BYTE* pPrinterEnum, + [in] DWORD cbBuf, + [out] DWORD* pcbNeeded, + [out] DWORD* pcReturned + ); + + /* Function 1 */ + DWORD _RpcOpenPrinter( + [in] WINSPOOL_HANDLE pPrinterName, + [out] WINSPOOL_PRINTER_HANDLE* phPrinter, + [in, string, unique] WCHAR* pDatatype, + [in] WINSPOOL_DEVMODE_CONTAINER* pDevModeContainer, + [in] DWORD AccessRequired + ); +} Propchange: branches/colins-printing-for-freedom/reactos/include/reactos/idl/winspool.idl ------------------------------------------------------------------------------ svn:eol-style = native 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] Wed May 6 12:47:20 2015 @@ -1,5 +1,5 @@ add_subdirectory(base) #add_subdirectory(drivers) add_subdirectory(monitors) -#add_subdirectory(processors) -#add_subdirectory(providers) +add_subdirectory(processors) +add_subdirectory(providers) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/CMakeLists.txt [iso-8859-1] Wed May 6 12:47:20 2015 @@ -1,4 +1,4 @@ #add_subdirectory(printui) -#add_subdirectory(spoolss) +add_subdirectory(spoolss) add_subdirectory(spoolsv) -#add_subdirectory(winspool) +add_subdirectory(winspool) Added: 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 (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,18 @@ + +spec2def(spoolss spoolss.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + main.c + precomp.h) + +add_library(spoolss SHARED + ${SOURCE} + spoolss.rc + ${CMAKE_CURRENT_BINARY_DIR}/spoolss_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def) + +set_module_type(spoolss win32dll UNICODE) +target_link_libraries(spoolss wine) +add_importlibs(spoolss kernel32 msvcrt ntdll) +add_pch(spoolss precomp.h SOURCE) +add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all) Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/main.c [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,86 @@ +/* + * PROJECT: ReactOS Spooler Router + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Main functions + * 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 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 +InitializeRouter(HANDLE SpoolerStatusHandle) +{ + return FALSE; +} + +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 +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/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/precomp.h [iso-8859-1] Wed May 6 12:47:20 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: Precompiled Header for all source files + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#ifndef _PRECOMP_H +#define _PRECOMP_H + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winspool.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(spoolss); + +#endif Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.rc URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.rc (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.rc [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Spooler Router" +#define REACTOS_STR_INTERNAL_NAME "spoolss" +#define REACTOS_STR_ORIGINAL_FILENAME "spoolss.dll" +#include <reactos/version.rc> Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,178 @@ +@ stub AbortPrinter +@ stub AddDriverCatalog +@ stub AddFormW +@ stub AddJobW +@ stub AddMonitorW +@ stub AddPerMachineConnectionW +@ stub AddPortExW +@ stub AddPortW +@ stub AddPrinterConnectionW +@ stub AddPrinterDriverExW +@ stub AddPrinterDriverW +@ stub AddPrinterExW +@ stub AddPrinterW +@ stub AddPrintProcessorW +@ stub AddPrintProvidorW +@ stub AdjustPointers +@ stub AdjustPointersInStructuresArray +@ stub AlignKMPtr +@ stub AlignRpcPtr +@ stub AllocSplStr +@ stub AllowRemoteCalls +@ stub AppendPrinterNotifyInfoData +@ stub bGetDevModePerUser +@ stub bSetDevModePerUser +@ stub BuildOtherNamesFromMachineName +@ stub CacheAddName +@ stub CacheCreateAndAddNode +@ stub CacheCreateAndAddNodeWithIPAddresses +@ stub CacheDeleteNode +@ stub CacheIsNameCluster +@ stub CacheIsNameInNodeList +@ stub CallDrvDevModeConversion +@ stub CallRouterFindFirstPrinterChangeNotification +@ stub CheckLocalCall +@ stdcall ClosePrinter(long) +@ stub ClusterSplClose +@ stub ClusterSplIsAlive +@ stub ClusterSplOpen +@ stub ConfigurePortW +@ stub CreatePrinterIC +@ stub DbgGetPointers +@ stub DeleteFormW +@ stub DeleteMonitorW +@ stub DeletePerMachineConnectionW +@ stub DeletePortW +@ stub DeletePrinter +@ stub DeletePrinterConnectionW +@ stub DeletePrinterDataExW +@ stub DeletePrinterDataW +@ stub DeletePrinterDriverExW +@ stub DeletePrinterDriverW +@ stub DeletePrinterIC +@ stub DeletePrinterKeyW +@ stub DeletePrintProcessorW +@ stub DeletePrintProvidorW +@ stub DllAllocSplMem +@ stub DllFreeSplMem +@ stub DllFreeSplStr +@ stdcall EndDocPrinter(long) +@ stdcall EndPagePrinter(long) +@ stub EnumFormsW +@ stub EnumJobsW +@ stub EnumMonitorsW +@ stub EnumPerMachineConnectionsW +@ stub EnumPortsW +@ stub EnumPrinterDataExW +@ stub EnumPrinterDataW +@ stub EnumPrinterDriversW +@ stub EnumPrinterKeyW +@ stdcall EnumPrintersW(long ptr long ptr long ptr ptr) +@ stub EnumPrintProcessorDatatypesW +@ stub EnumPrintProcessorsW +@ stub FindClosePrinterChangeNotification +@ stub FlushPrinter +@ stub FormatPrinterForRegistryKey +@ stub FormatRegistryKeyForPrinter +@ stub FreeOtherNames +@ stub GetClientUserHandle +@ stub GetFormW +@ stub GetJobAttributes +@ stub GetJobW +@ stub GetNetworkId +@ stub GetPrinterDataExW +@ stub GetPrinterDataW +@ stub GetPrinterDriverDirectoryW +@ stub GetPrinterDriverExW +@ stdcall GetPrinterDriverW(long wstr long ptr long ptr) +@ stdcall GetPrinterW(long long ptr long ptr) +@ stdcall GetPrintProcessorDirectoryW(wstr wstr long ptr long ptr) +@ stub GetServerPolicy +@ stub GetShrinkedSize +@ stub ImpersonatePrinterClient +@ stdcall InitializeRouter(long) +@ stub IsNamedPipeRpcCall +@ stub LoadDriver +@ stub LoadDriverFiletoConvertDevmode +@ stub LoadDriverWithVersion +@ stub LogWmiTraceEvent +@ stub MarshallDownStructure +@ stub MarshallDownStructuresArray +@ stub MarshallUpStructure +@ stub MarshallUpStructuresArray +@ stub MIDL_user_allocate1 +@ stub MIDL_user_free1 +@ stub OldGetPrinterDriverW +@ stub OpenPrinterExW +@ stub OpenPrinterPortW +@ stdcall OpenPrinterW(wstr ptr ptr) +@ stub PackStrings +@ stub PartialReplyPrinterChangeNotification +@ stub PlayGdiScriptOnPrinterIC +@ stub PrinterHandleRundown +@ stub PrinterMessageBoxW +@ stub ProvidorFindClosePrinterChangeNotification +@ stub ProvidorFindFirstPrinterChangeNotification +@ stub pszDbgAllocMsgA +@ stub ReadPrinter +@ stub ReallocSplMem +@ stub ReallocSplStr +@ stub RemoteFindFirstPrinterChangeNotification +@ stub ReplyClosePrinter +@ stub ReplyOpenPrinter +@ stub ReplyPrinterChangeNotification +@ stub ResetPrinterW +@ stub RevertToPrinterSelf +@ stub RouterAllocBidiMem +@ stub RouterAllocBidiResponseContainer +@ stub RouterAllocPrinterNotifyInfo +@ stub RouterFindFirstPrinterChangeNotification +@ stub RouterFindNextPrinterChangeNotification +@ stub RouterFreeBidiMem +@ stub RouterFreePrinterNotifyInfo +@ stub RouterRefreshPrinterChangeNotification +@ stub RouterReplyPrinter +@ stub ScheduleJob +@ stub SeekPrinter +@ stub SendRecvBidiData +@ stub SetAllocFailCount +@ stub SetFormW +@ stub SetJobW +@ stub SetPortW +@ stub SetPrinterDataExW +@ stub SetPrinterDataW +@ stub SetPrinterW +@ stub SplCloseSpoolFileHandle +@ stub SplCommitSpoolData +@ stub SplDriverUnloadComplete +@ stub SplGetSpoolFileInfo +@ stub SplInitializeWinSpoolDrv +@ stub SplIsSessionZero +@ stub SplIsUpgrade +@ stub SplPowerEvent +@ stub SplProcessPnPEvent +@ stub SplPromptUIInUsersSession +@ stub SplReadPrinter +@ stub SplRegisterForDeviceEvents +@ stub SplShutDownRouter +@ stub SplUnregisterForDeviceEvents +@ stub SpoolerFindClosePrinterChangeNotification +@ stub SpoolerFindFirstPrinterChangeNotification +@ stub SpoolerFindNextPrinterChangeNotification +@ stub SpoolerFreePrinterNotifyInfo +@ stub SpoolerHasInitialized +@ stub SpoolerInit +@ stdcall StartDocPrinterW(long long ptr) +@ stdcall StartPagePrinter(long) +@ stub UndoAlignKMPtr +@ stub UndoAlignRpcPtr +@ stub UnloadDriver +@ stub UnloadDriverFile +@ stub UpdateBufferSize +@ stub UpdatePrinterRegAll +@ stub UpdatePrinterRegUser +@ stub vDbgLogError +@ stub WaitForPrinterChange +@ stub WaitForSpoolerInitialization +@ stdcall WritePrinter(long ptr long ptr) +@ stdcall XcvDataW(long wstr ptr long ptr long ptr ptr) Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec ------------------------------------------------------------------------------ svn:eol-style = native 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] Wed May 6 12:47:20 2015 @@ -1,6 +1,16 @@ -add_executable(spoolsv spoolsv.c spoolsv.rc) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl) +add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/winspool.idl) + +list(APPEND SOURCE + main.c + rpcserver.c + precomp.h + ${CMAKE_CURRENT_BINARY_DIR}/winspool_s.c) + +add_executable(spoolsv ${SOURCE} spoolsv.rc) +set_module_type(spoolsv win32cui UNICODE) target_link_libraries(spoolsv wine) -set_module_type(spoolsv win32cui UNICODE) -add_importlibs(spoolsv advapi32 msvcrt kernel32 ntdll) +add_importlibs(spoolsv advapi32 kernel32 msvcrt ntdll rpcrt4) +add_pch(spoolsv precomp.h SOURCE) add_cd_file(TARGET spoolsv DESTINATION reactos/system32 FOR all) Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/main.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/main.c [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,92 @@ +/* + * PROJECT: ReactOS Print Spooler Service + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Main functions + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +SERVICE_STATUS_HANDLE hServiceStatus; +SERVICE_STATUS ServiceStatus; +WCHAR wszServiceName[] = L"Spooler"; + +static void +_UpdateServiceStatus(DWORD dwNewStatus, DWORD dwCheckPoint) +{ + ServiceStatus.dwCheckPoint = dwCheckPoint; + ServiceStatus.dwCurrentState = dwNewStatus; + SetServiceStatus(hServiceStatus, &ServiceStatus); +} + +static DWORD WINAPI +_ServiceControlHandlerEx(DWORD dwControl, DWORD dwEventType, LPVOID lpEventData, LPVOID lpContext) +{ + switch (dwControl) + { + case SERVICE_CONTROL_SHUTDOWN: + case SERVICE_CONTROL_STOP: + _UpdateServiceStatus(SERVICE_STOP_PENDING, 1); + RpcMgmtStopServerListening(NULL); + _UpdateServiceStatus(SERVICE_STOPPED, 0); + return NO_ERROR; + + case SERVICE_CONTROL_INTERROGATE: + return NO_ERROR; + + default: + return ERROR_CALL_NOT_IMPLEMENTED; + } +} + +static VOID WINAPI +_ServiceMain(DWORD dwArgc, LPWSTR* lpszArgv) +{ + HANDLE hThread; + + UNREFERENCED_PARAMETER(dwArgc); + UNREFERENCED_PARAMETER(lpszArgv); + + // Register our service for control + hServiceStatus = RegisterServiceCtrlHandlerExW(wszServiceName, _ServiceControlHandlerEx, NULL); + + // Report initial SERVICE_START_PENDING status + ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + ServiceStatus.dwServiceSpecificExitCode = 0; + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwWaitHint = 4000; + ServiceStatus.dwWin32ExitCode = NO_ERROR; + _UpdateServiceStatus(SERVICE_START_PENDING, 0); + + // Create a thread for serving RPC requests + hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)RpcThreadProc, NULL, 0, NULL); + + if (hThread) + { + // We don't need the thread handle. Keeping it open blocks the thread from terminating. + CloseHandle(hThread); + _UpdateServiceStatus(SERVICE_RUNNING, 0); + } + else + { + ERR("CreateThread failed with error %u!\n", GetLastError()); + _UpdateServiceStatus(SERVICE_STOPPED, 0); + } +} + +int +wmain(int argc, WCHAR* argv[]) +{ + SERVICE_TABLE_ENTRYW ServiceTable[] = + { + {wszServiceName, _ServiceMain}, + {NULL, NULL} + }; + + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + StartServiceCtrlDispatcherW(ServiceTable); + + return 0; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,22 @@ +/* + * PROJECT: ReactOS Print Spooler Service + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Precompiled Header for all source files + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#ifndef _PRECOMP_H +#define _PRECOMP_H + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winsvc.h> +#include <winspool_s.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); + +// rpcserver.c +extern DWORD WINAPI RpcThreadProc(LPVOID lpParameter); + +#endif Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcserver.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcserver.c [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,65 @@ +/* + * PROJECT: ReactOS Print Spooler Service + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: RPC Server Thread + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +DWORD WINAPI +RpcThreadProc(LPVOID lpParameter) +{ + RPC_STATUS Status; + + Status = RpcServerUseProtseqEpW(L"ncacn_np", 20, L"\\pipe\\spoolss", NULL); + if (Status != RPC_S_OK) + { + ERR("RpcServerUseProtseqEpW failed with status %u!\n", Status); + return 0; + } + + Status = RpcServerRegisterIf(winspool_v1_0_s_ifspec, NULL, NULL); + if (Status != RPC_S_OK) + { + ERR("RpcServerRegisterIf failed with status %u!\n", Status); + return 0; + } + + Status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, 0); + if (Status != RPC_S_OK) + { + ERR("RpcServerListen() failed with status %u!\n", Status); + } + + return 0; +} + +DWORD +_RpcEnumPrinters(DWORD Flags, WINSPOOL_HANDLE Name, DWORD Level, BYTE* pPrinterEnum, DWORD cbBuf, DWORD* pcbNeeded, DWORD* pcReturned) +{ + return 0; +} + +DWORD +_RpcOpenPrinter(WINSPOOL_HANDLE pPrinterName, WINSPOOL_PRINTER_HANDLE* phPrinter, WCHAR* pDatatype, WINSPOOL_DEVMODE_CONTAINER* pDevModeContainer, DWORD AccessRequired) +{ + return 0; +} + +void __RPC_FAR* __RPC_USER +midl_user_allocate(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +void __RPC_USER +midl_user_free(void __RPC_FAR* ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + +void __RPC_USER +WINSPOOL_PRINTER_HANDLE_rundown(WINSPOOL_PRINTER_HANDLE hPrinter) +{ +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcserver.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/spoolsv.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/spoolsv.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/spoolsv.c (removed) @@ -1,129 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/spoolsv/spoolsv.c - * PURPOSE: Printer spooler - * PROGRAMMER: Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include <windef.h> -#include <winsvc.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); - - -/* GLOBALS ******************************************************************/ - -static VOID CALLBACK ServiceMain(DWORD argc, LPWSTR *argv); -static WCHAR ServiceName[] = L"Spooler"; -static SERVICE_TABLE_ENTRYW ServiceTable[] = -{ - {ServiceName, ServiceMain}, - {NULL, NULL} -}; - -SERVICE_STATUS_HANDLE ServiceStatusHandle; -SERVICE_STATUS ServiceStatus; - - -/* FUNCTIONS *****************************************************************/ - -static VOID -UpdateServiceStatus(DWORD dwState) -{ - ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; - ServiceStatus.dwCurrentState = dwState; - - if (dwState == SERVICE_RUNNING) - ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; - else - ServiceStatus.dwControlsAccepted = 0; - - ServiceStatus.dwWin32ExitCode = 0; - ServiceStatus.dwServiceSpecificExitCode = 0; - ServiceStatus.dwCheckPoint = 0; - - if (dwState == SERVICE_START_PENDING || - dwState == SERVICE_STOP_PENDING) - ServiceStatus.dwWaitHint = 10000; - else - ServiceStatus.dwWaitHint = 0; - - SetServiceStatus(ServiceStatusHandle, - &ServiceStatus); -} - - -static DWORD WINAPI -ServiceControlHandler(DWORD dwControl, - DWORD dwEventType, - LPVOID lpEventData, - LPVOID lpContext) -{ - TRACE("ServiceControlHandler() called\n"); - - switch (dwControl) - { - case SERVICE_CONTROL_STOP: - TRACE(" SERVICE_CONTROL_STOP received\n"); - UpdateServiceStatus(SERVICE_STOPPED); - return ERROR_SUCCESS; - - case SERVICE_CONTROL_INTERROGATE: - TRACE(" SERVICE_CONTROL_INTERROGATE received\n"); - SetServiceStatus(ServiceStatusHandle, - &ServiceStatus); - return ERROR_SUCCESS; - - case SERVICE_CONTROL_SHUTDOWN: - TRACE(" SERVICE_CONTROL_SHUTDOWN received\n"); - UpdateServiceStatus(SERVICE_STOPPED); - return ERROR_SUCCESS; - - default : - TRACE(" Control %lu received\n"); - return ERROR_CALL_NOT_IMPLEMENTED; - } -} - - -static VOID CALLBACK -ServiceMain(DWORD argc, LPWSTR *argv) -{ - UNREFERENCED_PARAMETER(argc); - UNREFERENCED_PARAMETER(argv); - - TRACE("ServiceMain() called\n"); - - ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, - ServiceControlHandler, - NULL); - - TRACE("Calling SetServiceStatus()\n"); - UpdateServiceStatus(SERVICE_RUNNING); - TRACE("SetServiceStatus() called\n"); - - - TRACE("ServiceMain() done\n"); -} - - -int -wmain(int argc, WCHAR *argv[]) -{ - UNREFERENCED_PARAMETER(argc); - UNREFERENCED_PARAMETER(argv); - - TRACE("Spoolsv: main() started\n"); - - StartServiceCtrlDispatcher(ServiceTable); - - TRACE("Spoolsv: main() done\n"); - - return 0; -} - -/* EOF */ Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/spoolsv.rc URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/spoolsv.rc [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/spoolsv.rc [iso-8859-1] Wed May 6 12:47:20 2015 @@ -1,4 +1,4 @@ -#define REACTOS_STR_FILE_DESCRIPTION "Spooler-Service" -#define REACTOS_STR_INTERNAL_NAME "Spoolsv" -#define REACTOS_STR_ORIGINAL_FILENAME "Spoolsv.exe" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Print Spooler Service" +#define REACTOS_STR_INTERNAL_NAME "spoolsv" +#define REACTOS_STR_ORIGINAL_FILENAME "spoolsv.exe" #include <reactos/version.rc> Added: 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 (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,22 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl) +add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/winspool.idl) +spec2def(winspool winspool.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + main.c + precomp.h + ${CMAKE_CURRENT_BINARY_DIR}/winspool_c.c) + +add_library(winspool SHARED + ${SOURCE} + winspool.rc + ${CMAKE_CURRENT_BINARY_DIR}/winspool_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/winspool.def) + +set_target_properties(winspool PROPERTIES SUFFIX ".drv") +set_module_type(winspool win32dll UNICODE) +target_link_libraries(winspool wine) +add_importlibs(winspool kernel32 msvcrt ntdll rpcrt4) +add_pch(winspool precomp.h SOURCE) +add_cd_file(TARGET winspool DESTINATION reactos/system32 FOR all) Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,297 @@ +/* + * PROJECT: ReactOS Spooler API + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Main functions + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +handle_t __RPC_USER +WINSPOOL_HANDLE_bind(WINSPOOL_HANDLE wszName) +{ + handle_t hBinding; + PWSTR wszStringBinding; + RPC_STATUS Status; + + // Get us a string binding handle from the supplied connection information + Status = RpcStringBindingComposeW(NULL, L"ncacn_np", wszStringBinding, L"\\pipe\\spoolss", NULL, &wszStringBinding); + if (Status != RPC_S_OK) + { + ERR("RpcStringBindingComposeW failed with status %u!\n", Status); + return NULL; + } + + // Get a handle_t binding handle from the string binding handle + Status = RpcBindingFromStringBindingW(wszStringBinding, &hBinding); + if (Status != RPC_S_OK) + { + ERR("RpcBindingFromStringBindingW failed with status %u!\n", Status); + return NULL; + } + + // Free the string binding handle + Status = RpcStringFreeW(&wszStringBinding); + if (Status != RPC_S_OK) + { + ERR("RpcStringFreeW failed with status %u!\n", Status); + return NULL; + } + + return hBinding; +} + +void __RPC_USER +WINSPOOL_HANDLE_unbind(WINSPOOL_HANDLE wszName, handle_t hBinding) +{ + RPC_STATUS Status; + + Status = RpcBindingFree(&hBinding); + if (Status != RPC_S_OK) + { + ERR("RpcBindingFree failed with status %u!\n", Status); + } +} + +void __RPC_FAR* __RPC_USER +midl_user_allocate(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +void __RPC_USER +midl_user_free(void __RPC_FAR* ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + +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 +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; + DEVMODEW wDevMode; + 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 %u!\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 %u!\n", GetLastError()); + goto Cleanup; + } + + MultiByteToWideChar(CP_ACP, 0, pDefault->pDatatype, -1, pwszDatatype, StringLength); + wDefault.pDatatype = pwszDatatype; + } + + if (pDefault->pDevMode) + { + // Fixed size strings, so no additional memory needs to be allocated + MultiByteToWideChar(CP_ACP, 0, pDefault->pDevMode->dmDeviceName, -1, wDevMode.dmDeviceName, sizeof(wDevMode.dmDeviceName) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pDefault->pDevMode->dmFormName, -1, wDevMode.dmFormName, sizeof(wDevMode.dmFormName) / sizeof(WCHAR)); + + // Use CopyMemory to copy over several structure values in one step + CopyMemory(&wDevMode.dmSpecVersion, &pDefault->pDevMode->dmSpecVersion, (ULONG_PTR)&wDevMode.dmCollate - (ULONG_PTR)&wDevMode.dmSpecVersion); + CopyMemory(&wDevMode.dmLogPixels, &pDefault->pDevMode->dmLogPixels, (ULONG_PTR)&wDevMode.dmPanningHeight - (ULONG_PTR)&wDevMode.dmLogPixels); + + wDefault.pDevMode = &wDevMode; + } + } + + ReturnValue = OpenPrinterW(pwszPrinterName, phPrinter, &wDefault); + +Cleanup: + 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 %u!\n", ErrorCode); + } + + ReturnValue = (ErrorCode == ERROR_SUCCESS); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ERR("_RpcOpenPrinter failed with exception code %u!\n", RpcExceptionCode()); + } + RpcEndExcept; + + 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; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/precomp.h (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/precomp.h [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,22 @@ +/* + * PROJECT: ReactOS Print Spooler API + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Precompiled Header for all source files + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#ifndef _PRECOMP_H +#define _PRECOMP_H + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winreg.h> +#include <winspool.h> +#include <winspool_c.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(winspool); + +#endif Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.rc URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.rc (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.rc [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Spooler API" +#define REACTOS_STR_INTERNAL_NAME "winspool" +#define REACTOS_STR_ORIGINAL_FILENAME "winspool.drv" +#include <reactos/version.rc> Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,169 @@ +@ stub AbortPrinter +@ stub AddFormA +@ stub AddFormW +@ stub AddJobA +@ stub AddJobW +@ stub AddMonitorA +@ stub AddMonitorW +@ stub AddPortA +@ stub AddPortExA +@ stub AddPortExW +@ stub AddPortW +@ stub AddPrinterA +@ stub AddPrinterConnectionA +@ stub AddPrinterConnectionW +@ stub AddPrinterDriverA +@ stub AddPrinterDriverExA +@ stub AddPrinterDriverExW +@ stub AddPrinterDriverW +@ stub AddPrinterW +@ stub AddPrintProcessorA +@ stub AddPrintProcessorW +@ stub AddPrintProvidorA +@ stub AddPrintProvidorW +@ stub AdvancedDocumentPropertiesA +@ stub AdvancedDocumentPropertiesW +@ stub ADVANCEDSETUPDIALOG +@ stub AdvancedSetupDialog +@ stdcall ClosePrinter(long) +@ stub CloseSpoolFileHandle +@ stub CommitSpoolData +@ stub ConfigurePortA +@ stub ConfigurePortW +@ stub ConnectToPrinterDlg +@ stub ConvertAnsiDevModeToUnicodeDevmode +@ stub ConvertUnicodeDevModeToAnsiDevmode +@ stub CreatePrinterIC +@ stub DeleteFormA +@ stub DeleteFormW +@ stub DeleteMonitorA +@ stub DeleteMonitorW +@ stub DeletePortA +@ stub DeletePortW +@ stub DeletePrinter +@ stub DeletePrinterConnectionA +@ stub DeletePrinterConnectionW +@ stub DeletePrinterDataA +@ stub DeletePrinterDataExA +@ stub DeletePrinterDataExW +@ stub DeletePrinterDataW +@ stub DeletePrinterDriverA +@ stub DeletePrinterDriverExA +@ stub DeletePrinterDriverExW +@ stub DeletePrinterDriverW +@ stub DeletePrinterIC +@ stub DeletePrinterKeyA +@ stub DeletePrinterKeyW +@ stub DeletePrintProcessorA +@ stub DeletePrintProcessorW +@ stub DeletePrintProvidorA +@ stub DeletePrintProvidorW +@ stub DEVICECAPABILITIES +@ stub DeviceCapabilities +@ stdcall DeviceCapabilitiesA(str str long ptr ptr) +@ stdcall DeviceCapabilitiesW(wstr wstr long ptr ptr) +@ stub DEVICEMODE +@ stub DeviceMode +@ stub DevicePropertySheets +@ stub DevQueryPrint +@ stub DevQueryPrintEx +@ stub DocumentEvent +@ stdcall DocumentPropertiesA(long long ptr ptr ptr long) +@ stdcall DocumentPropertiesW(long long ptr ptr ptr long) +@ stub DocumentPropertySheets +@ stdcall EndDocPrinter(long) +@ stdcall EndPagePrinter(long) +@ stub EnumFormsA +@ stub EnumFormsW +@ stub EnumJobsA +@ stub EnumJobsW +@ stub EnumMonitorsA +@ stub EnumMonitorsW +@ stub EnumPortsA +@ stub EnumPortsW +@ stub EnumPrinterDataA +@ stub EnumPrinterDataExA +@ stub EnumPrinterDataExW +@ stub EnumPrinterDataW +@ stub EnumPrinterDriversA +@ stub EnumPrinterDriversW +@ stub EnumPrinterKeyA +@ stub EnumPrinterKeyW +@ stdcall EnumPrintersA(long ptr long ptr long ptr ptr) +@ stdcall EnumPrintersW(long ptr long ptr long ptr ptr) +@ stub EnumPrintProcessorDatatypesA +@ stub EnumPrintProcessorDatatypesW +@ stub EnumPrintProcessorsA +@ stub EnumPrintProcessorsW +@ stub EXTDEVICEMODE +@ stub ExtDeviceMode +@ stub FindClosePrinterChangeNotification +@ stub FindFirstPrinterChangeNotification +@ stub FindNextPrinterChangeNotification +@ stub FlushPrinter +@ stub FreePrinterNotifyInfo +@ stdcall GetDefaultPrinterA(ptr ptr) +@ stdcall GetDefaultPrinterW(ptr ptr) +@ stub GetFormA +@ stub GetFormW +@ stub GetJobA +@ stub GetJobW +@ stdcall GetPrinterA(long long ptr long ptr) +@ stub GetPrinterDataA +@ stub GetPrinterDataExA +@ stub GetPrinterDataExW +@ stub GetPrinterDataW +@ stdcall GetPrinterDriverA(long str long ptr long ptr) +@ stub GetPrinterDriverDirectoryA +@ stub GetPrinterDriverDirectoryW +@ stdcall GetPrinterDriverW(long wstr long ptr long ptr) +@ stdcall GetPrinterW(long long ptr long ptr) +@ stub GetPrintProcessorDirectoryA +@ stdcall GetPrintProcessorDirectoryW(wstr wstr long ptr long ptr) +@ stub GetSpoolFileHandle +@ stub IsValidDevmodeA +@ stub IsValidDevmodeW +@ stdcall OpenPrinterA(str ptr ptr) +@ stdcall OpenPrinterW(wstr ptr ptr) +@ stub PerfClose +@ stub PerfCollect +@ stub PerfOpen +@ stub PlayGdiScriptOnPrinterIC +@ stub PrinterMessageBoxA +@ stub PrinterMessageBoxW +@ stub PrinterProperties +@ stub QueryColorProfile +@ stub QueryRemoteFonts +@ stub QuerySpoolMode +@ stub ReadPrinter +@ stub ResetPrinterA +@ stub ResetPrinterW +@ stub ScheduleJob +@ stub SeekPrinter +@ stub SetAllocFailCount +@ stub SetDefaultPrinterA +@ stub SetDefaultPrinterW +@ stub SetFormA +@ stub SetFormW +@ stub SetJobA +@ stub SetJobW +@ stub SetPortA +@ stub SetPortW +@ stub SetPrinterA +@ stub SetPrinterDataA +@ stub SetPrinterDataExA +@ stub SetPrinterDataExW +@ stub SetPrinterDataW +@ stub SetPrinterW +@ stub SplDriverUnloadComplete +@ stub SpoolerDevQueryPrintW +@ stub SpoolerInit +@ stub SpoolerPrinterEvent +@ stub StartDocDlgA +@ stub StartDocDlgW +@ stub StartDocPrinterA +@ stdcall StartDocPrinterW(long long ptr) +@ stdcall StartPagePrinter(long) +@ stub WaitForPrinterChange +@ stdcall WritePrinter(long ptr long ptr) +@ stdcall XcvDataW(long wstr ptr long ptr long ptr ptr) Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/CMakeLists.txt [iso-8859-1] Wed May 6 12:47:20 2015 @@ -1 +1,20 @@ + add_subdirectory(ui) + +spec2def(localmon localmon.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + main.c + precomp.h) + +add_library(localmon SHARED + ${SOURCE} + localmon.rc + ${CMAKE_CURRENT_BINARY_DIR}/localmon_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/localmon.def) + +set_module_type(localmon win32dll UNICODE) +target_link_libraries(localmon wine) +add_importlibs(localmon kernel32 msvcrt ntdll) +add_pch(localmon precomp.h SOURCE) +add_cd_file(TARGET localmon DESTINATION reactos/system32 FOR all) Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/localmon.rc URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/localmon.rc (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/localmon.rc [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Local Spooler Port Monitor" +#define REACTOS_STR_INTERNAL_NAME "localmon" +#define REACTOS_STR_ORIGINAL_FILENAME "localmon.dll" +#include <reactos/version.rc> Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/localmon.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/localmon.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/localmon.spec (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/localmon.spec [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1 @@ +@ stdcall InitializePrintMonitor2(ptr ptr) Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/localmon.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/main.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/main.c [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS Local Spooler Port Monitor + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Main functions + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +LPMONITOR2 WINAPI +InitializePrintMonitor2(PMONITORINIT pMonitorInit, PHANDLE phMonitor) +{ + return NULL; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/precomp.h (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/precomp.h [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,22 @@ +/* + * PROJECT: ReactOS Local Spooler Port Monitor + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Precompiled Header for all source files + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#ifndef _PRECOMP_H +#define _PRECOMP_H + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winreg.h> +#include <winspool.h> +#include <winsplp.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(localmon); + +#endif Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/CMakeLists.txt [iso-8859-1] Wed May 6 12:47:20 2015 @@ -1 +1 @@ -#add_subdirectory(winprint) +add_subdirectory(winprint) Added: 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 (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/CMakeLists.txt [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,18 @@ + +spec2def(winprint winprint.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + main.c + precomp.h) + +add_library(winprint SHARED + ${SOURCE} + winprint.rc + ${CMAKE_CURRENT_BINARY_DIR}/winprint_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/winprint.def) + +set_module_type(winprint win32dll UNICODE) +target_link_libraries(winprint wine) +add_importlibs(winprint kernel32 msvcrt ntdll) +add_pch(winprint precomp.h SOURCE) +add_cd_file(TARGET winprint DESTINATION reactos/system32/spool/prtprocs/w32x86 FOR all) Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,9 @@ +/* + * PROJECT: ReactOS Standard Print Processor + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Main functions + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/precomp.h [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,22 @@ +/* + * PROJECT: ReactOS Standard Print Processor + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Precompiled Header for all source files + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#ifndef _PRECOMP_H +#define _PRECOMP_H + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winreg.h> +#include <winspool.h> +#include <winsplp.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(winprint); + +#endif Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/winprint.rc URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/winprint.rc (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/winprint.rc [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Standard Print Processor" +#define REACTOS_STR_INTERNAL_NAME "winprint" +#define REACTOS_STR_ORIGINAL_FILENAME "winprint.dll" +#include <reactos/version.rc> Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/winprint.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/winprint.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/winprint.spec (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/winprint.spec [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,6 @@ +@ stub ClosePrintProcessor +@ stub ControlPrintProcessor +@ stub EnumPrintProcessorDatatypesW +@ stub GetPrintProcessorCapabilities +@ stub OpenPrintProcessor +@ stub PrintDocumentOnPrintProcessor Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/winprint.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/CMakeLists.txt [iso-8859-1] Wed May 6 12:47:20 2015 @@ -1,3 +1,3 @@ #add_subdirectory(inetpp) -#add_subdirectory(localspl) +add_subdirectory(localspl) #add_subdirectory(win32spl) Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/CMakeLists.txt (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/CMakeLists.txt [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,18 @@ + +spec2def(localspl localspl.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + main.c + precomp.h) + +add_library(localspl SHARED + ${SOURCE} + localspl.rc + ${CMAKE_CURRENT_BINARY_DIR}/localspl_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/localspl.def) + +set_module_type(localspl win32dll UNICODE) +target_link_libraries(localspl wine) +add_importlibs(localspl kernel32 msvcrt ntdll) +add_pch(localspl precomp.h SOURCE) +add_cd_file(TARGET localspl DESTINATION reactos/system32 FOR all) Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/localspl.rc URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/localspl.rc (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/localspl.rc [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Local Spooler" +#define REACTOS_STR_INTERNAL_NAME "localspl" +#define REACTOS_STR_ORIGINAL_FILENAME "localspl.dll" +#include <reactos/version.rc> Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/localspl.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/localspl.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/localspl.spec (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/localspl.spec [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1 @@ +@ stdcall InitializePrintProvidor(ptr long ptr) Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/localspl.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS Local Spooler + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Main functions + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +BOOL WINAPI +InitializePrintProvidor(LPPRINTPROVIDOR pPrintProvidor, DWORD cbPrintProvidor, LPWSTR pFullRegistryPath) +{ + return FALSE; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Wed May 6 12:47:20 2015 @@ -0,0 +1,22 @@ +/* + * PROJECT: ReactOS Local Spooler + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Precompiled Header for all source files + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#ifndef _PRECOMP_H +#define _PRECOMP_H + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winreg.h> +#include <winspool.h> +#include <winsplp.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(localspl); + +#endif Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 67575: Fix PRINTER_DEFAULTSA and PRINTER_DEFAULTSW structures
by cfinck＠svn.reactos.org 06 May '15

06 May '15

Author: cfinck Date: Wed May 6 12:17:39 2015 New Revision: 67575 URL: http://svn.reactos.org/svn/reactos?rev=67575&view=rev Log: Fix PRINTER_DEFAULTSA and PRINTER_DEFAULTSW structures Modified: branches/colins-printing-for-freedom/reactos/include/psdk/winspool.h Modified: branches/colins-printing-for-freedom/reactos/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/include/psdk/winspool.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/include/psdk/winspool.h [iso-8859-1] Wed May 6 12:17:39 2015 @@ -924,13 +924,13 @@ typedef struct _PRINTER_DEFAULTSA { LPSTR pDatatype; - LPDEVMODE pDevMode; + LPDEVMODEA pDevMode; ACCESS_MASK DesiredAccess; } PRINTER_DEFAULTSA, *PPRINTER_DEFAULTSA, *LPPRINTER_DEFAULTSA; typedef struct _PRINTER_DEFAULTSW { LPWSTR pDatatype; - LPDEVMODE pDevMode; + LPDEVMODEW pDevMode; ACCESS_MASK DesiredAccess; } PRINTER_DEFAULTSW, *PPRINTER_DEFAULTSW, *LPPRINTER_DEFAULTSW;

1 0

[aandrejevic] 67574: [NTVDM] Implement EMS functions AH = 47h and AH = 48h (Save/Restore Page Map).
by aandrejevic＠svn.reactos.org 06 May '15

06 May '15

Author: aandrejevic Date: Wed May 6 03:52:19 2015 New Revision: 67574 URL: http://svn.reactos.org/svn/reactos?rev=67574&view=rev Log: [NTVDM] Implement EMS functions AH = 47h and AH = 48h (Save/Restore Page Map). Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Wed May 6 03:52:19 2015 @@ -162,6 +162,8 @@ static VOID WINAPI EmsIntHandler(LPWORD Stack) { + static PVOID MappingBackup[EMS_PHYSICAL_PAGES] = { NULL }; + switch (getAH()) { /* Get Manager Status */ @@ -218,6 +220,20 @@ { setAH(EMS_STATUS_OK); setAL(EMS_VERSION_NUM); + break; + } + + /* Save Page Map */ + case 0x47: + { + RtlCopyMemory(MappingBackup, Mapping, sizeof(PVOID) * EMS_PHYSICAL_PAGES); + break; + } + + /* Restore Page Map */ + case 0x48: + { + RtlCopyMemory(Mapping, MappingBackup, sizeof(PVOID) * EMS_PHYSICAL_PAGES); break; }

1 0

[aandrejevic] 67573: [NTVDM] Implement EMS function AH = 53h (Get/Set Handle Name). Some programs expect to find the string "EMMXXXX0" at offset 0x0A in the segment where the EMS interrupt handler ...
by aandrejevic＠svn.reactos.org 06 May '15

06 May '15

Author: aandrejevic Date: Wed May 6 03:38:41 2015 New Revision: 67573 URL: http://svn.reactos.org/svn/reactos?rev=67573&view=rev Log: [NTVDM] Implement EMS function AH = 53h (Get/Set Handle Name). Some programs expect to find the string "EMMXXXX0" at offset 0x0A in the segment where the EMS interrupt handler is, so move the interrupt handler BOP to the private device area of the EMS driver. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Wed May 6 03:38:41 2015 @@ -221,6 +221,41 @@ break; } + /* Get/Set Handle Name */ + case 0x53: + { + PEMS_HANDLE HandleEntry = GetHandleRecord(getDX()); + if (HandleEntry == NULL || !HandleEntry->Allocated) + { + setAL(EMS_STATUS_INVALID_HANDLE); + break; + } + + if (getAL() == 0x00) + { + /* Retrieve the name */ + RtlCopyMemory(SEG_OFF_TO_PTR(getES(), getDI()), + HandleEntry->Name, + sizeof(HandleEntry->Name)); + setAH(EMS_STATUS_OK); + } + else if (getAL() == 0x01) + { + /* Store the name */ + RtlCopyMemory(HandleEntry->Name, + SEG_OFF_TO_PTR(getDS(), getSI()), + sizeof(HandleEntry->Name)); + setAH(EMS_STATUS_OK); + } + else + { + DPRINT1("Invalid subfunction %02X for EMS function AH = 53h\n", getAL()); + setAH(EMS_STATUS_UNKNOWN_FUNCTION); + } + + break; + } + /* Move/Exchange Memory */ case 0x57: { @@ -418,12 +453,17 @@ EmsReadMemory, EmsWriteMemory); - RegisterDosInt32(EMS_INTERRUPT_NUM, EmsIntHandler); /* Create the device */ - Node = DosCreateDevice(DOS_DEVATTR_IOCTL | DOS_DEVATTR_CHARACTER, - EMS_DEVICE_NAME); + Node = DosCreateDeviceEx(DOS_DEVATTR_IOCTL | DOS_DEVATTR_CHARACTER, + EMS_DEVICE_NAME, + 32); Node->IoctlReadRoutine = EmsDrvDispatchIoctlRead; + + RegisterInt32(MAKELONG(sizeof(DOS_DRIVER) + DEVICE_CODE_SIZE, HIWORD(Node->Driver)), + EMS_INTERRUPT_NUM, + EmsIntHandler, + NULL); return TRUE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] Wed May 6 03:38:41 2015 @@ -34,6 +34,7 @@ BOOLEAN Allocated; USHORT PageCount; LIST_ENTRY PageList; + UCHAR Name[8]; } EMS_HANDLE, *PEMS_HANDLE; typedef struct _EMS_PAGE

1 0

[aandrejevic] 67572: [NTVDM] Don't set all the bits in the bitmap in XmsAlloc.
by aandrejevic＠svn.reactos.org 06 May '15

06 May '15

Author: aandrejevic Date: Wed May 6 02:05:01 2015 New Revision: 67572 URL: http://svn.reactos.org/svn/reactos?rev=67572&view=rev Log: [NTVDM] Don't set all the bits in the bitmap in XmsAlloc. 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] Wed May 6 02:05:01 2015 @@ -242,7 +242,7 @@ HandleEntry->Address = XMS_ADDRESS + RunStart * XMS_BLOCK_SIZE; FreeBlocks -= Size; - RtlSetBits(&AllocBitmap, RunStart, RunSize); + RtlSetBits(&AllocBitmap, RunStart, HandleEntry->Size); return XMS_STATUS_SUCCESS; }

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