Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 68381: [ATL] - Add the IAtlMemMgr interface - Add a basic implementation of CWin32Heap which just implements the base IAtlMemMgr - Required for CAtlString / CAtlStringMgr (coming later)
by gedmurphy＠svn.reactos.org 09 Jul '15

09 Jul '15

Author: gedmurphy Date: Thu Jul 9 08:18:24 2015 New Revision: 68381 URL: http://svn.reactos.org/svn/reactos?rev=68381&view=rev Log: [ATL] - Add the IAtlMemMgr interface - Add a basic implementation of CWin32Heap which just implements the base IAtlMemMgr - Required for CAtlString / CAtlStringMgr (coming later) Added: trunk/reactos/lib/atl/atlmem.h (with props) Added: trunk/reactos/lib/atl/atlmem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlmem.h?rev=68381 ============================================================================== --- trunk/reactos/lib/atl/atlmem.h (added) +++ trunk/reactos/lib/atl/atlmem.h [iso-8859-1] Thu Jul 9 08:18:24 2015 @@ -0,0 +1,102 @@ +#ifndef __ATLMEM_H__ +#define __ATLMEM_H__ + +#pragma once +#include <atlcore.h> + +namespace ATL +{ + +__interface __declspec(uuid("654F7EF5-CFDF-4df9-A450-6C6A13C622C0")) IAtlMemMgr +{ +public: + _Ret_maybenull_ _Post_writable_byte_size_(SizeBytes) void* Allocate( + _In_ size_t SizeBytes + ); + + void Free( + _Inout_opt_ void* Buffer + ); + + _Ret_maybenull_ _Post_writable_byte_size_(SizeBytes) void* Reallocate( + _Inout_updates_bytes_opt_(SizeBytes) void* Buffer, + _In_ size_t SizeBytes + ); + + size_t GetSize( + _In_ void* Buffer + ); +}; + +class CWin32Heap : public IAtlMemMgr +{ +public: + HANDLE m_hHeap; + +public: + CWin32Heap() : + m_hHeap(NULL) + { + } + + CWin32Heap(_In_ HANDLE hHeap) : + m_hHeap(hHeap) + { + ATLASSERT(hHeap != NULL); + } + + virtual ~CWin32Heap() + { + } + + + // IAtlMemMgr + _Ret_maybenull_ _Post_writable_byte_size_(SizeBytes) virtual void* Allocate( + _In_ size_t SizeBytes + ) + { + return ::HeapAlloc(m_hHeap, 0, SizeBytes); + } + + virtual void Free( + _In_opt_ void* Buffer + ) + { + if (Buffer) + { + BOOL FreeOk; + FreeOk = ::HeapFree(m_hHeap, 0, Buffer); + ATLASSERT(FreeOk == TRUE); + } + } + + _Ret_maybenull_ _Post_writable_byte_size_(SizeBytes) virtual void* Reallocate( + _In_opt_ void* Buffer, + _In_ size_t SizeBytes + ) + { + if (SizeBytes == 0) + { + Free(Buffer); + return NULL; + } + + if (Buffer == NULL) + { + return Allocate(SizeBytes); + } + + return ::HeapReAlloc(m_hHeap, 0, Buffer, SizeBytes); + } + + virtual size_t GetSize( + _Inout_ void* Buffer + ) + { + return ::HeapSize(m_hHeap, 0, Buffer); + } +}; + +} + +#endif Propchange: trunk/reactos/lib/atl/atlmem.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 68380: [ATL] - Add basic support for CAtlList, CAtlPlex, CElementTraitsBase, CDefaultCompareTraits. - Implements CAtlList::IsEmpty, ::GetHeadPosition, ::GetNext, ::AddTail, ::RemoveTail...
by gedmurphy＠svn.reactos.org 09 Jul '15

09 Jul '15

Author: gedmurphy Date: Thu Jul 9 07:51:43 2015 New Revision: 68380 URL: http://svn.reactos.org/svn/reactos?rev=68380&view=rev Log: [ATL] - Add basic support for CAtlList, CAtlPlex, CElementTraitsBase, CDefaultCompareTraits. - Implements CAtlList::IsEmpty, ::GetHeadPosition, ::GetNext, ::AddTail, ::RemoveTail, ::RemoveAll - Required in the new devmgr code. Added: trunk/reactos/lib/atl/atlcoll.h (with props) Added: trunk/reactos/lib/atl/atlcoll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlcoll.h?rev=68380 ============================================================================== --- trunk/reactos/lib/atl/atlcoll.h (added) +++ trunk/reactos/lib/atl/atlcoll.h [iso-8859-1] Thu Jul 9 07:51:43 2015 @@ -0,0 +1,383 @@ +#ifndef __ATLCOLL_H__ +#define __ATLCOLL_H__ + +#pragma once +#include <atlbase.h> + + +struct __POSITION +{ +}; +typedef __POSITION* POSITION; + + +namespace ATL +{ + +class CAtlPlex +{ +public: + CAtlPlex* m_Next; + +#if (_AFX_PACKING >= 8) + DWORD dwReserved[1]; +#endif + + static inline CAtlPlex* Create( + _Inout_ CAtlPlex*& Entry, + _In_ size_t MaxElements, + _In_ size_t ElementSize + ) + { + CAtlPlex* Block; + + ATLASSERT(MaxElements > 0); + ATLASSERT(ElementSize > 0); + + size_t BufferSize = sizeof(CAtlPlex) + (MaxElements * ElementSize); + + void *Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize); + if (Buffer == NULL) return NULL; + + Block = static_cast< CAtlPlex* >(Buffer); + Block->m_Next = Entry; + Entry = Block; + + return Block; + } + + void* GetData() + { + return (this + 1); + } + + inline void Destroy() + { + CAtlPlex* Block; + + Block = this; + while (Block != NULL) + { + CAtlPlex* Next; + + Next = Block->m_Next; + HeapFree(GetProcessHeap(), 0, Block); + Block = Next; + } + } +}; + + +template<typename T> +class CElementTraitsBase +{ +public: + typedef const T& INARGTYPE; + typedef T& OUTARGTYPE; + + static void CopyElements( + _Out_writes_all_(NumElements) T* Dest, + _In_reads_(NumElements) const T* Source, + _In_ size_t NumElements) + { + for (size_t i = 0; i < NumElements; i++) + { + Dest[i] = Source[i]; + } + } + + static void RelocateElements( + _Out_writes_all_(NumElements) T* Dest, + _In_reads_(NumElements) T* Source, + _In_ size_t NumElements) + { + memmove_s(Dest, NumElements * sizeof(T), Source, NumElements * sizeof(T)); + } +}; + +template<typename T> +class CDefaultCompareTraits +{ +public: + static bool CompareElements( + _In_ const T& Val1, + _In_ const T& Val2) + { + return (Val1 == Val2); + } + + static int CompareElementsOrdered( + _In_ const T& Val1, + _In_ const T& Val2) + { + if (Val1 < Val2) + { + return -1; + } + else if (Val1 > Val2) + { + return 1; + } + + return 0; // equal + } +}; + +template<typename T> +class CDefaultElementTraits : + public CElementTraitsBase<T>, + public CDefaultCompareTraits<T> +{ +}; + + +template<typename T> +class CElementTraits : + public CDefaultElementTraits<T> +{ +}; + + +template<typename E, class ETraits = CElementTraits<E>> +class CAtlList +{ +private: + typedef typename ETraits::INARGTYPE INARGTYPE; + +private: + class CNode : public __POSITION + { + public: + CNode* m_Next; + CNode* m_Prev; + E m_Element; + + public: + CNode(INARGTYPE Element) : + m_Element(Element) + { + } + }; + +private: + CAtlPlex* m_Blocks; + UINT m_BlockSize; + CNode* m_HeadNode; + CNode* m_TailNode; + CNode* m_FreeNode; + size_t m_NumElements; + +public: + CAtlList(_In_ UINT nBlockSize = 10); + ~CAtlList(); + + bool IsEmpty() const; + + POSITION GetHeadPosition() const; + + E& GetNext( + _Inout_ POSITION &Position + ); + + POSITION AddTail( + INARGTYPE element + ); + + E RemoveTail(); + void RemoveAll(); + +private: + CNode* CreateNode( + INARGTYPE element, + _In_opt_ CNode* pPrev, + _In_opt_ CNode* pNext + ); + + void FreeNode( + _Inout_ CNode* pNode + ); + + CNode* GetFreeNode( + ); + +}; + + +// +// CAtlist public methods +// + +template<typename E, class ETraits> +CAtlList< E, ETraits >::CAtlList(_In_ UINT nBlockSize) : + m_NumElements(0), + m_HeadNode(NULL), + m_TailNode(NULL), + m_FreeNode(NULL), + m_Blocks(NULL), + + m_BlockSize(nBlockSize) +{ + ATLASSERT(nBlockSize > 0); +} + +template<typename E, class ETraits> +CAtlList<E, ETraits >::~CAtlList(void) +{ + RemoveAll(); +} + +template<typename E, class ETraits> +inline bool CAtlList< E, ETraits >::IsEmpty(void) const +{ + return (m_NumElements == 0); +} + +template<typename E, class ETraits> +inline POSITION CAtlList<E, ETraits>::GetHeadPosition(void) const +{ + return (POSITION)m_HeadNode; +} + +template<typename E, class ETraits> +inline E& CAtlList< E, ETraits >::GetNext( + _Inout_ POSITION& Position + ) +{ + CNode* Node = (CNode*)Position; + Position = (POSITION)Node->m_Next; + return Node->m_Element; +} + +template<typename E, class ETraits> +POSITION CAtlList<E, ETraits>::AddTail( + INARGTYPE element + ) +{ + CNode* Node = CreateNode(element, m_TailNode, NULL); + if (m_TailNode) + { + m_TailNode->m_Next = Node; + } + else + { + m_HeadNode = Node; + } + m_TailNode = Node; + + return (POSITION)Node; +} + +template<typename E, class ETraits> +E CAtlList<E, ETraits>::RemoveTail(void) +{ + CNode* Node = m_TailNode; + + E Element(Node->m_Element); + + m_TailNode = Node->m_Prev; + if (m_TailNode) + { + m_TailNode->m_Next = NULL; + } + else + { + m_HeadNode = NULL; + } + FreeNode(Node); + + return Element; +} + +template<typename E, class ETraits> +void CAtlList<E, ETraits >::RemoveAll(void) +{ + while (m_NumElements > 0) + { + CNode* Node = m_HeadNode; + m_HeadNode = m_HeadNode->m_Next; + FreeNode(Node); + } + + m_HeadNode = NULL; + m_TailNode = NULL; + m_FreeNode = NULL; + + if (m_Blocks) + { + m_Blocks->Destroy(); + m_Blocks = NULL; + } +} + + +// +// CAtlist private methods +// + +template<typename E, class ETraits> +typename CAtlList<E, ETraits>::CNode* CAtlList<E, ETraits>::CreateNode( + INARGTYPE element, + _In_opt_ CNode* Prev, + _In_opt_ CNode* Next + ) +{ + GetFreeNode(); + + CNode* NewNode = GetFreeNode(); + CNode* NextFree = m_FreeNode->m_Next; + + NewNode = new CNode(element); + + m_FreeNode = NextFree; + NewNode->m_Prev = Prev; + NewNode->m_Next = Next; + m_NumElements++; + + return NewNode; +} + +template<typename E, class ETraits> +void CAtlList<E, ETraits>::FreeNode( + _Inout_ CNode* pNode + ) +{ + pNode->~CNode(); + pNode->m_Next = m_FreeNode; + m_FreeNode = pNode; + + m_NumElements--; + if (m_NumElements == 0) + { + RemoveAll(); + } +} + +template<typename E, class ETraits> +typename CAtlList<E, ETraits>::CNode* CAtlList< E, ETraits>::GetFreeNode(void) +{ + if (m_FreeNode) + { + return m_FreeNode; + } + + CAtlPlex* Block = CAtlPlex::Create(m_Blocks, m_BlockSize, sizeof(CNode)); + if (Block == NULL) + { + throw(E_OUTOFMEMORY); + } + + CNode* Node = (CNode*)Block->GetData(); + Node += (m_BlockSize - 1); + for (int i = m_BlockSize - 1; i >= 0; i--) + { + Node->m_Next = m_FreeNode; + m_FreeNode = Node; + Node--; + } + + return m_FreeNode; +} + +} + +#endif Propchange: trunk/reactos/lib/atl/atlcoll.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 68379: [LOCALSPL] Bugfix: Copy the full DevMode including the extra data by the driver.
by cfinck＠svn.reactos.org 08 Jul '15

08 Jul '15

Author: cfinck Date: Wed Jul 8 12:35:35 2015 New Revision: 68379 URL: http://svn.reactos.org/svn/reactos?rev=68379&view=rev Log: [LOCALSPL] Bugfix: Copy the full DevMode including the extra data by the driver. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/tools.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] Wed Jul 8 12:35:35 2015 @@ -279,7 +279,7 @@ pJob->dwStatus = JOB_STATUS_SPOOLING; pJob->pwszDatatype = AllocSplStr(pPrinterHandle->pwszDatatype); pJob->pwszDocumentName = AllocSplStr(wszDefaultDocumentName); - CopyMemory(&pJob->DevMode, &pPrinterHandle->DevMode, sizeof(DEVMODEW)); + pJob->pDevMode = DuplicateDevMode(pPrinterHandle->pDevMode); GetSystemTime(&pJob->stSubmitted); // Get the user name for the Job. @@ -440,6 +440,7 @@ _LocalGetJobLevel2(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE* ppStart, PBYTE* ppEnd, DWORD cbBuf, PDWORD pcbNeeded) { DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); + DWORD cbDevMode = pJob->pDevMode->dmSize + pJob->pDevMode->dmDriverExtra; DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); DWORD cbDriverName = (wcslen(pJob->pPrinter->pwszPrinterDriver) + 1) * sizeof(WCHAR); DWORD cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); @@ -464,7 +465,7 @@ cbStatus = (wcslen(pJob->pwszStatus) + 1) * sizeof(WCHAR); // Check if the supplied buffer is large enough. - *pcbNeeded += sizeof(JOB_INFO_2W) + cbDatatype + sizeof(DEVMODEW) + cbDocumentName + cbDriverName + cbMachineName + cbNotifyName + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbStatus + cbUserName; + *pcbNeeded += sizeof(JOB_INFO_2W) + cbDatatype + cbDevMode + cbDocumentName + cbDriverName + cbMachineName + cbNotifyName + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbStatus + cbUserName; if (cbBuf < *pcbNeeded) { dwErrorCode = ERROR_INSUFFICIENT_BUFFER; @@ -476,9 +477,9 @@ JobInfo2.pDatatype = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pwszDatatype, cbDatatype); - *ppEnd -= sizeof(DEVMODEW); + *ppEnd -= cbDevMode; JobInfo2.pDevMode = (PDEVMODEW)*ppEnd; - CopyMemory(*ppEnd, &pJob->DevMode, sizeof(DEVMODEW)); + CopyMemory(*ppEnd, pJob->pDevMode, cbDevMode); *ppEnd -= cbDocumentName; JobInfo2.pDocument = (PWSTR)*ppEnd; @@ -1136,6 +1137,7 @@ pJob->dwUntilTime = pShadowFile->dwUntilTime; pJob->pPrinter = pPrinter; pJob->pPrintProcessor = pPrintProcessor; + pJob->pDevMode = DuplicateDevMode((PDEVMODEW)((ULONG_PTR)pShadowFile + pShadowFile->offDevMode)); pJob->pwszDatatype = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDatatype)); pJob->pwszDocumentName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDocumentName)); pJob->pwszMachineName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offMachineName)); @@ -1145,9 +1147,7 @@ pJob->pwszPrintProcessorParameters = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offPrintProcessorParameters)); pJob->pwszUserName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offUserName)); - CopyMemory(&pJob->stSubmitted, &pShadowFile->stSubmitted, sizeof(SYSTEMTIME)); - CopyMemory(&pJob->DevMode, (PDEVMODEW)((ULONG_PTR)pShadowFile + pShadowFile->offDevMode), sizeof(DEVMODEW)); pReturnValue = pJob; @@ -1166,6 +1166,7 @@ { BOOL bReturnValue = FALSE; DWORD cbDatatype; + DWORD cbDevMode; DWORD cbDocumentName; DWORD cbFileSize; DWORD cbMachineName; @@ -1191,6 +1192,7 @@ // Compute the total size of the shadow file. cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); + cbDevMode = pJob->pDevMode->dmSize + pJob->pDevMode->dmDriverExtra; cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); cbNotifyName = (wcslen(pJob->pwszNotifyName) + 1) * sizeof(WCHAR); @@ -1203,7 +1205,7 @@ if (pJob->pwszPrintProcessorParameters) cbPrintProcessorParameters = (wcslen(pJob->pwszPrintProcessorParameters) + 1) * sizeof(WCHAR); - cbFileSize = sizeof(SHD_HEADER) + cbDatatype + cbDocumentName + sizeof(DEVMODEW) + cbMachineName + cbNotifyName + cbPrinterDriver + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbUserName; + cbFileSize = sizeof(SHD_HEADER) + cbDatatype + cbDocumentName + cbDevMode + cbMachineName + cbNotifyName + cbPrinterDriver + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbUserName; // Allocate memory for it. pShadowFile = DllAllocSplMem(cbFileSize); @@ -1243,9 +1245,9 @@ pShadowFile->offDocumentName = dwCurrentOffset; dwCurrentOffset += cbDocumentName; - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, &pJob->DevMode, sizeof(DEVMODEW)); + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pDevMode, cbDevMode); pShadowFile->offDevMode = dwCurrentOffset; - dwCurrentOffset += sizeof(DEVMODEW); + dwCurrentOffset += cbDevMode; // offDriverName is only written, but automatically determined through offPrinterName when reading. CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pPrinter->pwszPrinterDriver, cbPrinterDriver); Modified: 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 [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Wed Jul 8 12:35:35 2015 @@ -81,7 +81,7 @@ PWSTR pwszPrinterDriver; PWSTR pwszDescription; PWSTR pwszDefaultDatatype; - DEVMODEW DefaultDevMode; + PDEVMODEW pDefaultDevMode; PLOCAL_PRINT_PROCESSOR pPrintProcessor; SKIPLIST JobList; } @@ -113,7 +113,7 @@ DWORD dwUntilTime; // Latest time in minutes since 12:00 AM UTC when this document can be printed DWORD dwStatus; // JOB_STATUS_* flags of the Job PWSTR pwszMachineName; // Name of the machine that submitted the Job (prepended with two backslashes) - DEVMODEW DevMode; // Associated Device Mode to this Job + PDEVMODEW pDevMode; // Associated Device Mode to this Job } LOCAL_JOB, *PLOCAL_JOB; @@ -129,7 +129,7 @@ PLOCAL_PRINTER pPrinter; PLOCAL_JOB pStartedJob; PWSTR pwszDatatype; - DEVMODEW DevMode; + PDEVMODEW pDevMode; } LOCAL_PRINTER_HANDLE, *PLOCAL_PRINTER_HANDLE; @@ -249,5 +249,6 @@ // tools.c PWSTR AllocAndRegQueryWSZ(HKEY hKey, PCWSTR pwszValueName); +PDEVMODEW DuplicateDevMode(PDEVMODEW pInput); #endif Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Wed Jul 8 12:35:35 2015 @@ -81,6 +81,9 @@ if (pPrinter) { + if (pPrinter->pDefaultDevMode) + DllFreeSplMem(pPrinter->pDefaultDevMode); + if (pPrinter->pwszDefaultDatatype) DllFreeSplStr(pPrinter->pwszDefaultDatatype); @@ -173,12 +176,28 @@ continue; } + // Determine the size of the DevMode. + dwErrorCode = (DWORD)RegQueryValueExW(hSubKey, L"Default DevMode", NULL, NULL, NULL, &cbData); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("Couldn't query the size of the DevMode for Printer \"%S\", status is %lu, cbData is %lu!\n", wszPrinterName, dwErrorCode, cbData); + continue; + } + + // Allocate enough memory for the DevMode. + pPrinter->pDefaultDevMode = DllAllocSplMem(cbData); + if (!pPrinter->pDefaultDevMode) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + // Get the default DevMode. - cbData = sizeof(DEVMODEW); - dwErrorCode = (DWORD)RegQueryValueExW(hSubKey, L"Default DevMode", NULL, NULL, (PBYTE)&pPrinter->DefaultDevMode, &cbData); - if (dwErrorCode != ERROR_SUCCESS || cbData != sizeof(DEVMODEW)) - { - ERR("Couldn't query a valid DevMode for Printer \"%S\", status is %lu, cbData is %lu!\n", wszPrinterName, dwErrorCode, cbData); + dwErrorCode = (DWORD)RegQueryValueExW(hSubKey, L"Default DevMode", NULL, NULL, (PBYTE)pPrinter->pDefaultDevMode, &cbData); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("Couldn't query a DevMode for Printer \"%S\", status is %lu, cbData is %lu!\n", wszPrinterName, dwErrorCode, cbData); continue; } @@ -220,6 +239,9 @@ if (pPrinter) { + if (pPrinter->pDefaultDevMode) + DllFreeSplMem(pPrinter->pDefaultDevMode); + if (pPrinter->pwszDefaultDatatype) DllFreeSplStr(pPrinter->pwszDefaultDatatype); @@ -567,9 +589,9 @@ // Check if a DevMode was given, otherwise use the default. if (pDefault && pDefault->pDevMode) - CopyMemory(&pPrinterHandle->DevMode, pDefault->pDevMode, sizeof(DEVMODEW)); + pPrinterHandle->pDevMode = DuplicateDevMode(pDefault->pDevMode); else - CopyMemory(&pPrinterHandle->DevMode, &pPrinter->DefaultDevMode, sizeof(DEVMODEW)); + pPrinterHandle->pDevMode = DuplicateDevMode(pPrinter->pDefaultDevMode); // Did we have a comma? Then the user may want a handle to an existing job instead of creating a new job. if (p) @@ -753,7 +775,7 @@ } // Copy over printer defaults. - CopyMemory(&pJob->DevMode, &pPrinterHandle->DevMode, sizeof(DEVMODEW)); + pJob->pDevMode = DuplicateDevMode(pPrinterHandle->pDevMode); // Copy over supplied information. if (pDocumentInfo1->pDocName) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/tools.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/tools.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/tools.c [iso-8859-1] Wed Jul 8 12:35:35 2015 @@ -56,3 +56,22 @@ return pwszValue; } + +PDEVMODEW +DuplicateDevMode(PDEVMODEW pInput) +{ + PDEVMODEW pOutput; + + // Allocate a buffer for this DevMode. + pOutput = DllAllocSplMem(pInput->dmSize + pInput->dmDriverExtra); + if (!pOutput) + { + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + return NULL; + } + + // Copy it. + CopyMemory(pOutput, pInput, pInput->dmSize + pInput->dmDriverExtra); + + return pOutput; +}

1 0

[gedmurphy] 68378: [DEV[DEVMGR] - Use the correct HINSTANCE in the dll. Fixes loading strings for tooltips, etc. - Rename CMainWindow to CDeviceManager - Fixup the decelerations and add missing SAL...
by gedmurphy＠svn.reactos.org 08 Jul '15

08 Jul '15

Author: gedmurphy Date: Wed Jul 8 06:43:16 2015 New Revision: 68378 URL: http://svn.reactos.org/svn/reactos?rev=68378&view=rev Log: [DEV[DEVMGR] - Use the correct HINSTANCE in the dll. Fixes loading strings for tooltips, etc. - Rename CMainWindow to CDeviceManager - Fixup the decelerations and add missing SAL decoration Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.h trunk/reactos/dll/win32/devmgr_new/devmgmt/RootNode.cpp trunk/reactos/dll/win32/devmgr_new/devmgmt/devmgmt.h Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp [iso-8859-1] Wed Jul 8 06:43:16 2015 @@ -78,7 +78,7 @@ 0, 0, 0, 0, m_hMainWnd, (HMENU)IDC_TREEVIEW, - g_hInstance, + g_hThisInstance, NULL); if (m_hTreeView) { @@ -719,7 +719,7 @@ if (Enable == false) { CAtlStringW str; - if (str.LoadStringW(g_hInstance, IDS_CONFIRM_DISABLE)) + if (str.LoadStringW(g_hThisInstance, IDS_CONFIRM_DISABLE)) { if (MessageBoxW(m_hMainWnd, str, @@ -840,7 +840,7 @@ if (DeviceNode->CanUpdate()) { - String.LoadStringW(g_hInstance, IDS_MENU_UPDATE); + String.LoadStringW(g_hThisInstance, IDS_MENU_UPDATE); MenuItemInfo.wID = IDC_UPDATE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); @@ -849,7 +849,7 @@ if (DeviceNode->IsDisabled()) { - String.LoadStringW(g_hInstance, IDS_MENU_ENABLE); + String.LoadStringW(g_hThisInstance, IDS_MENU_ENABLE); MenuItemInfo.wID = IDC_ENABLE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); @@ -858,7 +858,7 @@ if (DeviceNode->CanDisable() && !DeviceNode->IsDisabled()) { - String.LoadStringW(g_hInstance, IDS_MENU_DISABLE); + String.LoadStringW(g_hThisInstance, IDS_MENU_DISABLE); MenuItemInfo.wID = IDC_DISABLE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); @@ -867,7 +867,7 @@ if (DeviceNode->CanUninstall()) { - String.LoadStringW(g_hInstance, IDS_MENU_UNINSTALL); + String.LoadStringW(g_hThisInstance, IDS_MENU_UNINSTALL); MenuItemInfo.wID = IDC_UNINSTALL_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); @@ -879,7 +879,7 @@ } // All nodes have the scan option - String.LoadStringW(g_hInstance, IDS_MENU_SCAN); + String.LoadStringW(g_hThisInstance, IDS_MENU_SCAN); MenuItemInfo.wID = IDC_SCAN_HARDWARE; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); @@ -887,7 +887,7 @@ if ((Node->GetNodeType() == RootNode) || (MainMenu == true)) { - String.LoadStringW(g_hInstance, IDS_MENU_ADD); + String.LoadStringW(g_hThisInstance, IDS_MENU_ADD); MenuItemInfo.wID = IDC_ADD_HARDWARE; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); @@ -899,7 +899,7 @@ InsertMenuItemW(OwnerMenu, i, TRUE, &MenuSeperator); i++; - String.LoadStringW(g_hInstance, IDS_MENU_PROPERTIES); + String.LoadStringW(g_hThisInstance, IDS_MENU_PROPERTIES); MenuItemInfo.wID = IDC_PROPERTIES; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp [iso-8859-1] Wed Jul 8 06:43:16 2015 @@ -21,6 +21,8 @@ #define BTN_UPDATE_DRV 4 #define BTN_UNINSTALL_DRV 5 +HINSTANCE g_hThisInstance = NULL; +HINSTANCE g_hParentInstance = NULL; // menu hints static const MENU_HINT MainMenuHintTable[] = @@ -75,8 +77,7 @@ /* PUBLIC METHODS **********************************************/ -CMainWindow::CMainWindow(void) : - m_ToolbarhImageList(NULL), +CDeviceManager::CDeviceManager(void) : m_hMainWnd(NULL), m_hStatusBar(NULL), m_hToolBar(NULL), @@ -85,15 +86,55 @@ m_szMainWndClass = L"DevMgmtWndClass"; } -CMainWindow::~CMainWindow(void) -{ - // Destroy any previous list - if (m_ToolbarhImageList) ImageList_Destroy(m_ToolbarhImageList); -} +CDeviceManager::~CDeviceManager(void) +{ +} + bool -CMainWindow::Initialize(LPCTSTR lpCaption, - int nCmdShow) +CDeviceManager::Create(_In_ HWND /*hWndParent*/, + _In_ HINSTANCE hInst, + _In_opt_z_ LPCWSTR /*lpMachineName*/, + _In_ int nCmdShow) +{ + CDeviceManager MainWindow; + INITCOMMONCONTROLSEX icex; + CAtlStringW szAppName; + int Ret = 1; + + // Store the instances + g_hParentInstance = hInst; + g_hThisInstance = GetModuleHandleW(L"devmgr.dll"); + + // Initialize common controls + icex.dwSize = sizeof(INITCOMMONCONTROLSEX); + icex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES; + InitCommonControlsEx(&icex); + + // Load the application name + if (szAppName.LoadStringW(g_hThisInstance, IDS_APPNAME)) + { + // Initialize the main window + if (MainWindow.Initialize(szAppName, nCmdShow)) + { + // Run the application + Ret = MainWindow.Run(); + + // Uninitialize the main window + MainWindow.Uninitialize(); + } + } + + return (Ret == 0); +} + + + +/* PRIVATE METHODS **********************************************/ + +bool +CDeviceManager::Initialize(_In_z_ LPCTSTR lpCaption, + _In_ int nCmdShow) { CAtlStringW szCaption; WNDCLASSEXW wc = {0}; @@ -104,13 +145,13 @@ // Setup the window class struct wc.cbSize = sizeof(WNDCLASSEXW); wc.lpfnWndProc = MainWndProc; - wc.hInstance = g_hInstance; - wc.hIcon = LoadIcon(g_hInstance, MAKEINTRESOURCEW(IDI_MAIN_ICON)); + wc.hInstance = g_hThisInstance; + wc.hIcon = LoadIcon(g_hThisInstance, MAKEINTRESOURCEW(IDI_MAIN_ICON)); wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wc.lpszMenuName = MAKEINTRESOURCEW(IDR_MAINMENU); wc.lpszClassName = m_szMainWndClass; - wc.hIconSm = (HICON)LoadImage(g_hInstance, + wc.hIconSm = (HICON)LoadImage(g_hThisInstance, MAKEINTRESOURCE(IDI_MAIN_ICON), IMAGE_ICON, 16, @@ -131,7 +172,7 @@ 500, NULL, NULL, - g_hInstance, + g_hThisInstance, this); } @@ -140,14 +181,14 @@ } void -CMainWindow::Uninitialize() +CDeviceManager::Uninitialize(void) { // Unregister the window class - UnregisterClassW(m_szMainWndClass, g_hInstance); + UnregisterClassW(m_szMainWndClass, g_hThisInstance); } int -CMainWindow::Run() +CDeviceManager::Run(void) { MSG Msg; @@ -161,14 +202,11 @@ return 0; } - -/* PRIVATE METHODS **********************************************/ - bool -CMainWindow::MainWndMenuHint(WORD CmdId, - const MENU_HINT *HintArray, - DWORD HintsCount, - UINT DefHintId) +CDeviceManager::MainWndMenuHint(_In_ WORD CmdId, + _In_ const MENU_HINT *HintArray, + _In_ DWORD HintsCount, + _In_ UINT DefHintId) { bool Found = false; const MENU_HINT *LastHint; @@ -188,16 +226,14 @@ StatusBarLoadString(m_hStatusBar, SB_SIMPLEID, - g_hInstance, + g_hThisInstance, HintId); return Found; } void -CMainWindow::UpdateStatusBar( - _In_ bool InMenuLoop - ) +CDeviceManager::UpdateStatusBar(_In_ bool InMenuLoop) { SendMessageW(m_hStatusBar, SB_SIMPLE, @@ -206,7 +242,7 @@ } bool -CMainWindow::RefreshView(ViewType Type) +CDeviceManager::RefreshView(_In_ ViewType Type) { UINT CheckId = 0; BOOL bSuccess; @@ -235,7 +271,7 @@ } bool -CMainWindow::CreateToolBar() +CDeviceManager::CreateToolBar(void) { TBADDBITMAP TbAddBitmap; INT Index; @@ -251,7 +287,7 @@ 0, 0, 0, 0, m_hMainWnd, (HMENU)IDC_TOOLBAR, - g_hInstance, + g_hThisInstance, NULL); if (m_hToolBar == NULL) return FALSE; @@ -269,7 +305,7 @@ sizeof(TBBUTTON), 0); - TbAddBitmap.hInst = g_hInstance; + TbAddBitmap.hInst = g_hThisInstance; TbAddBitmap.nID = IDB_TOOLBAR; Index = SendMessageW(m_hToolBar, TB_ADDBITMAP, _countof(TbButtons), (LPARAM)&TbAddBitmap); @@ -285,7 +321,7 @@ } bool -CMainWindow::CreateStatusBar() +CDeviceManager::CreateStatusBar(void) { int StatWidths[] = {110, -1}; // widths of status bar bool bRet = FALSE; @@ -298,7 +334,7 @@ 0, 0, 0, 0, m_hMainWnd, (HMENU)IDC_STATUSBAR, - g_hInstance, + g_hThisInstance, NULL); if (m_hStatusBar) { @@ -312,7 +348,7 @@ return bRet; } -void CMainWindow::UpdateToolbar() +void CDeviceManager::UpdateToolbar() { WORD State; @@ -367,10 +403,10 @@ bool -CMainWindow::StatusBarLoadString(IN HWND hStatusBar, - IN INT PartId, - IN HINSTANCE hInstance, - IN UINT uID) +CDeviceManager::StatusBarLoadString(_In_ HWND hStatusBar, + _In_ INT PartId, + _In_ HINSTANCE hInstance, + _In_ UINT uID) { CAtlStringW szMessage; bool bRet = false; @@ -389,7 +425,7 @@ } LRESULT -CMainWindow::OnCreate(HWND hwnd) +CDeviceManager::OnCreate(_In_ HWND hwnd) { LRESULT RetCode; @@ -422,7 +458,7 @@ } LRESULT -CMainWindow::OnSize() +CDeviceManager::OnSize(void) { RECT rcClient, rcTool, rcStatus; INT lvHeight, iToolHeight, iStatusHeight; @@ -457,7 +493,7 @@ } LRESULT -CMainWindow::OnNotify(LPARAM lParam) +CDeviceManager::OnNotify(_In_ LPARAM lParam) { LPNMHDR NmHdr = (LPNMHDR)lParam; LRESULT Ret; @@ -491,6 +527,7 @@ case TTN_GETDISPINFO: { LPTOOLTIPTEXT lpttt = (LPTOOLTIPTEXT)lParam; + lpttt->hinst = g_hThisInstance; UINT_PTR idButton = lpttt->hdr.idFrom; switch (idButton) @@ -502,18 +539,19 @@ lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_SCAN); break; case IDC_ENABLE_DRV: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ENABLE); + lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_ENABLE); break; case IDC_DISABLE_DRV: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_DISABLE); + lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_DISABLE); break; case IDC_UPDATE_DRV: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_UPDATE); + lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_UPDATE); break; case IDC_UNINSTALL_DRV: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_UNINSTALL); + lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_UNINSTALL); break; } + idButton = idButton; break; } } @@ -522,14 +560,14 @@ } LRESULT -CMainWindow::OnContext(LPARAM lParam) +CDeviceManager::OnContext(_In_ LPARAM lParam) { return m_DeviceView->OnContextMenu(lParam); } LRESULT -CMainWindow::OnCommand(WPARAM wParam, - LPARAM /*lParam*/) +CDeviceManager::OnCommand(_In_ WPARAM wParam, + _In_ LPARAM /*lParam*/) { LRESULT RetCode = 0; WORD Msg; @@ -641,7 +679,7 @@ } LRESULT -CMainWindow::OnDestroy() +CDeviceManager::OnDestroy(void) { // Uninitialize the device view m_DeviceView->Uninitialize(); @@ -660,16 +698,16 @@ } LRESULT CALLBACK -CMainWindow::MainWndProc(HWND hwnd, - UINT msg, - WPARAM wParam, - LPARAM lParam) -{ - CMainWindow *This; +CDeviceManager::MainWndProc(_In_ HWND hwnd, + _In_ UINT msg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + CDeviceManager *This; LRESULT RetCode = 0; // Get the object pointer from window context - This = (CMainWindow *)GetWindowLongPtr(hwnd, GWLP_USERDATA); + This = (CDeviceManager *)GetWindowLongPtr(hwnd, GWLP_USERDATA); if (This == NULL) { // Check that this isn't a create message @@ -685,7 +723,7 @@ case WM_CREATE: { // Get the object pointer from the create param - This = (CMainWindow *)((LPCREATESTRUCT)lParam)->lpCreateParams; + This = (CDeviceManager *)((LPCREATESTRUCT)lParam)->lpCreateParams; // Store the pointer in the window's global user data SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)This); @@ -783,49 +821,15 @@ } -//////// MOVE ME //////////////// - -HINSTANCE g_hInstance = NULL; -HANDLE ProcessHeap = NULL; - - +#if 1 // test BOOL WINAPI -DeviceManager_ExecuteW(HWND /*hWndParent*/, +DeviceManager_ExecuteW(HWND hWndParent, HINSTANCE hInst, - LPCWSTR /*lpMachineName*/, + LPCWSTR lpMachineName, int nCmdShow) { - CMainWindow MainWindow; - INITCOMMONCONTROLSEX icex; - CAtlStringW szAppName; - int Ret = 1; - - // Store the global values - g_hInstance = hInst; - ProcessHeap = GetProcessHeap(); - - // Initialize common controls - icex.dwSize = sizeof(INITCOMMONCONTROLSEX); - icex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES; - InitCommonControlsEx(&icex); - - //__debugbreak(); - g_hInstance = GetModuleHandle(L"devmgr.dll"); - - // Load the application name - if (szAppName.LoadStringW(g_hInstance, IDS_APPNAME)) - { - // Initialize the main window - if (MainWindow.Initialize(szAppName, nCmdShow)) - { - // Run the application - Ret = MainWindow.Run(); - - // Uninitialize the main window - MainWindow.Uninitialize(); - } - } - - return Ret; -} + CDeviceManager DevMgr; + return DevMgr.Create(hWndParent, hInst, lpMachineName, nCmdShow); +} +#endif Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.h [iso-8859-1] Wed Jul 8 06:43:16 2015 @@ -7,25 +7,27 @@ UINT HintId; } MENU_HINT, *PMENU_HINT; -class CMainWindow +class CDeviceManager { CAtlStringW m_szMainWndClass; CDeviceView *m_DeviceView; HWND m_hMainWnd; HWND m_hStatusBar; HWND m_hToolBar; - HIMAGELIST m_ToolbarhImageList; HMENU m_hMenu; HMENU m_hActionMenu; int m_CmdShow; public: - CMainWindow(void); - ~CMainWindow(void); + CDeviceManager(void); + ~CDeviceManager(void); - bool Initialize(LPCTSTR lpCaption, int nCmdShow); - int Run(); - void Uninitialize(); + bool Create( + _In_ HWND hWndParent, + _In_ HINSTANCE hInst, + _In_opt_z_ LPCWSTR lpMachineName, + _In_ int nCmdShow + ); private: static LRESULT CALLBACK MainWndProc( @@ -35,24 +37,44 @@ LPARAM lParam ); - LRESULT OnCreate(HWND hwnd); - LRESULT OnDestroy(); - LRESULT OnSize(); - LRESULT OnNotify(LPARAM lParam); - LRESULT OnContext(LPARAM lParam); - LRESULT OnCommand(WPARAM wParam, LPARAM lParam); - - bool CreateToolBar(); - bool CreateStatusBar(); - - void UpdateToolbar( + bool Initialize( + _In_z_ LPCTSTR lpCaption, + _In_ int nCmdShow ); + int Run(); + void Uninitialize(void); + + LRESULT OnCreate( + _In_ HWND hwnd + ); + + LRESULT OnDestroy(void); + LRESULT OnSize(void); + + LRESULT OnNotify( + _In_ LPARAM lParam + ); + + LRESULT OnContext( + _In_ LPARAM lParam + ); + + LRESULT OnCommand( + _In_ WPARAM wParam, + LPARAM lParam + ); + + bool CreateToolBar(void); + bool CreateStatusBar(void); + + void UpdateToolbar(void); + bool StatusBarLoadString( - HWND hStatusBar, - INT PartId, - HINSTANCE hInstance, - UINT uID + _In_ HWND hStatusBar, + _In_ INT PartId, + _In_ HINSTANCE hInstance, + _In_ UINT uID ); void UpdateStatusBar( @@ -60,14 +82,14 @@ ); bool MainWndMenuHint( - WORD CmdId, - const MENU_HINT *HintArray, - DWORD HintsCount, - UINT DefHintId + _In_ WORD CmdId, + _In_ const MENU_HINT *HintArray, + _In_ DWORD HintsCount, + _In_ UINT DefHintId ); bool RefreshView( - ViewType Type + _In_ ViewType Type ); }; Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/RootNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/RootNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/RootNode.cpp [iso-8859-1] Wed Jul 8 06:43:16 2015 @@ -29,8 +29,8 @@ // Load the bitmap we'll be using as the root image HBITMAP hRootImage; - hRootImage = LoadBitmapW(g_hInstance, - MAKEINTRESOURCEW(IDB_ROOT_IMAGE)); + hRootImage = LoadBitmapW(g_hThisInstance, + MAKEINTRESOURCEW(IDB_ROOT_IMAGE)); if (hRootImage == NULL) return FALSE; // Add this bitmap to the device image list. This is a bit hacky, but it's safe Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/devmgmt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/devmgmt.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/devmgmt.h [iso-8859-1] Wed Jul 8 06:43:16 2015 @@ -4,6 +4,6 @@ #pragma once #include "..\resource.h" -extern HINSTANCE g_hInstance; -extern HANDLE ProcessHeap; +extern HINSTANCE g_hThisInstance; +extern HINSTANCE g_hParentInstance;

1 0

[hbelusca] 68377: [NTVDM] - Add few remaining members to the SYSVARS list. - Implement retrieving the (DOS) boot drive (by using the host boot drive letter from %SYSTEMDRIVE%). Should fix Win3.11 a...
by hbelusca＠svn.reactos.org 07 Jul '15

07 Jul '15

Author: hbelusca Date: Tue Jul 7 23:51:57 2015 New Revision: 68377 URL: http://svn.reactos.org/svn/reactos?rev=68377&view=rev Log: [NTVDM] - Add few remaining members to the SYSVARS list. - Implement retrieving the (DOS) boot drive (by using the host boot drive letter from %SYSTEMDRIVE%). Should fix Win3.11 and MSD 2.0+ boot drive retrieval. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Tue Jul 7 23:51:57 2015 @@ -333,7 +333,7 @@ break; } - /* Write string to STDOUT */ + /* Write String to STDOUT */ case 0x09: { String = (PCHAR)SEG_OFF_TO_PTR(getDS(), getDX()); @@ -756,8 +756,17 @@ /* Extended functionalities */ case 0x33: { - if (getAL() == 0x06) - { + switch (getAL()) + { + /* + * DOS 4+ - GET BOOT DRIVE + */ + case 0x05: + { + setDL(SysVars->BootDrive); + break; + } + /* * DOS 5+ - GET TRUE VERSION NUMBER * This function always returns the true version number, unlike @@ -765,24 +774,29 @@ * See Ralf Brown: http://www.ctyme.com/intr/rb-2730.htm * for more information. */ - - /* - * Return the true DOS version: Minor:Major in BH:BL - * The Windows NT DOS box returns BX=3205h (version 5.50). - */ - setBX(NTDOS_VERSION); - - /* DOS revision 0 */ - setDL(0x00); - - /* Unpatched DOS */ - setDH(0x00); - } - // else - // { - // /* Invalid subfunction */ - // setAL(0xFF); - // } + case 0x06: + { + /* + * Return the true DOS version: Minor:Major in BH:BL + * The Windows NT DOS box returns BX=3205h (version 5.50). + */ + setBX(NTDOS_VERSION); + + /* DOS revision 0 */ + setDL(0x00); + + /* Unpatched DOS */ + setDH(0x00); + + break; + } + + default: + { + DPRINT1("INT 21h, AH = 33h, subfunction AL = %Xh NOT IMPLEMENTED\n", + getAL()); + } + } break; } @@ -841,7 +855,7 @@ /* SWITCH character - AVAILDEV */ case 0x37: { - if (getAL() == 0x00) + switch (getAL()) { /* * DOS 2+ - "SWITCHAR" - GET SWITCH CHARACTER @@ -850,44 +864,46 @@ * See Ralf Brown: http://www.ctyme.com/intr/rb-2752.htm * for more information. */ - setDL('/'); - setAL(0x00); - } - else if (getAL() == 0x01) - { + case 0x00: + setDL('/'); + setAL(0x00); + break; + /* * DOS 2+ - "SWITCHAR" - SET SWITCH CHARACTER * This setting is ignored by MS-DOS 5+. * See Ralf Brown: http://www.ctyme.com/intr/rb-2753.htm * for more information. */ - // getDL(); - setAL(0xFF); - } - else if (getAL() == 0x02) - { + case 0x01: + // getDL(); + setAL(0xFF); + break; + /* * DOS 2.x and 3.3+ only - "AVAILDEV" - SPECIFY \DEV\ PREFIX USE * See Ralf Brown: http://www.ctyme.com/intr/rb-2754.htm * for more information. */ - // setDL(); - setAL(0xFF); - } - else if (getAL() == 0x03) - { + case 0x02: + // setDL(); + setAL(0xFF); + break; + /* * DOS 2.x and 3.3+ only - "AVAILDEV" - SPECIFY \DEV\ PREFIX USE * See Ralf Brown: http://www.ctyme.com/intr/rb-2754.htm * for more information. */ - // getDL(); - setAL(0xFF); - } - else - { + case 0x03: + // getDL(); + setAL(0xFF); + break; + /* Invalid subfunction */ - setAL(0xFF); + default: + setAL(0xFF); + break; } break; @@ -1379,7 +1395,7 @@ break; } - /* Terminate With Return Code */ + /* Terminate with Return Code */ case 0x4C: { DosTerminateProcess(Sda->CurrentPsp, getAL(), 0); @@ -2090,6 +2106,10 @@ /* The last drive can be redefined with the LASTDRIVE command. At the moment, set the real maximum possible, 'Z'. */ SysVars->NumLocalDrives = 'Z' - 'A' + 1; + /* The boot drive is initialized to the %SYSTEMDRIVE% value */ + // NOTE: Using the NtSystemRoot system variable might be OS-specific... + SysVars->BootDrive = SharedUserData->NtSystemRoot[0] - 'A' + 1; + /* Initialize the NUL device driver */ SysVars->NullDevice.Link = 0xFFFFFFFF; SysVars->NullDevice.DeviceAttributes = DOS_DEVATTR_NUL | DOS_DEVATTR_CHARACTER; Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Tue Jul 7 23:51:57 2015 @@ -91,6 +91,10 @@ BYTE NumLocalDrives; // Set by LASTDRIVE DOS_DRIVER NullDevice; BYTE NullDriverRoutine[7]; + BYTE Reserved2[8]; + BYTE BootDrive; + BYTE UseDwordMoves; + WORD ExtMemSize; } DOS_SYSVARS, *PDOS_SYSVARS; typedef struct _DOS_CLOCK_TRANSFER_RECORD

1 0

[gedmurphy] 68376: Minor code cleanup
by gedmurphy＠svn.reactos.org 07 Jul '15

07 Jul '15

Author: gedmurphy Date: Tue Jul 7 20:33:54 2015 New Revision: 68376 URL: http://svn.reactos.org/svn/reactos?rev=68376&view=rev Log: Minor code cleanup Removed: trunk/reactos/dll/win32/devmgr_new/devmgmt/Resource.h trunk/reactos/dll/win32/devmgr_new/devmgmt/lang/ trunk/reactos/dll/win32/devmgr_new/devmgmt/res/ trunk/reactos/dll/win32/devmgr_new/devmgmt/rsrc.rc Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr_new/devmgmt/devmgmt.h trunk/reactos/dll/win32/devmgr_new/devmgr.rc trunk/reactos/dll/win32/devmgr_new/lang/en-US.rc Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp [iso-8859-1] Tue Jul 7 20:33:54 2015 @@ -204,7 +204,7 @@ m_ViewType = Type; RefreshThreadData *ThreadData; - ThreadData = new RefreshThreadData(); + ThreadData = new RefreshThreadData; ThreadData->This = this; ThreadData->ScanForChanges = ScanForChanges; ThreadData->UpdateView = UpdateView; @@ -222,11 +222,10 @@ HANDLE hThread; hThread = (HANDLE)_beginthreadex(NULL, 0, - &RefreshThread, + RefreshThread, ThreadData, 0, NULL); - if (hThread) CloseHandle(hThread); } @@ -479,7 +478,7 @@ // Get the cached class node ClassNode = GetClassNode(&ClassGuid); - if (ClassNode == NULL) + if (ClassNode == nullptr) { ATLASSERT(FALSE); ClassIndex++; @@ -520,7 +519,7 @@ // Get the cached device node DeviceNode = GetDeviceNode(DeviceInfoData.DevInst); - if (DeviceNode == NULL) + if (DeviceNode == nullptr) { ATLASSERT(bClassUnknown == true); DeviceIndex++; @@ -1021,13 +1020,14 @@ CClassNode *Node; Pos = m_ClassNodeList.GetHeadPosition(); + if (Pos == NULL) return nullptr; do { Node = m_ClassNodeList.GetNext(Pos); if (IsEqualGUID(*Node->GetClassGuid(), *ClassGuid)) { - //ATLASSERT(Node->GetType() == NodeClass); + ATLASSERT(Node->GetNodeType() == ClassNode); break; } @@ -1047,13 +1047,14 @@ CDeviceNode *Node; Pos = m_DeviceNodeList.GetHeadPosition(); + if (Pos == NULL) return nullptr; do { Node = m_DeviceNodeList.GetNext(Pos); if (Node->GetDeviceInst() == Device) { - //ATLASSERT(Node->GetType() == NodeDevice); + ATLASSERT(Node->GetNodeType() == DeviceNode); break; } @@ -1112,6 +1113,7 @@ if (m_RootNode) delete m_RootNode; m_RootNode = new CRootNode(&m_ImageListData); m_RootNode->SetupNode(); + // Loop through all the classes do { @@ -1155,6 +1157,11 @@ { m_DeviceNodeList.AddTail(DeviceNode); } + else + { + ATLASSERT(FALSE); + } + } SetupDiDestroyDeviceInfoList(hDevInfo); Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp [iso-8859-1] Tue Jul 7 20:33:54 2015 @@ -788,6 +788,7 @@ HINSTANCE g_hInstance = NULL; HANDLE ProcessHeap = NULL; + BOOL WINAPI DeviceManager_ExecuteW(HWND /*hWndParent*/, @@ -809,6 +810,9 @@ icex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES; InitCommonControlsEx(&icex); + //__debugbreak(); + g_hInstance = GetModuleHandle(L"devmgr.dll"); + // Load the application name if (szAppName.LoadStringW(g_hInstance, IDS_APPNAME)) { Removed: trunk/reactos/dll/win32/devmgr_new/devmgmt/Resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/Resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/Resource.h (removed) @@ -1,84 +0,0 @@ -#define IDC_STATIC -1 - -#define IDS_APPNAME 10 - -#define IDI_MAIN_ICON 20 -#define IDB_ROOT_IMAGE 21 -#define IDB_TOOLBAR 22 - -/* windows */ -#define IDC_TREEVIEW 50 -#define IDC_TOOLBAR 51 -#define IDC_STATUSBAR 52 -#define IDR_MAINMENU 53 -#define IDR_POPUP 54 - -/* Actions */ -#define IDC_PROPERTIES 100 -#define IDC_SCAN_HARDWARE 101 -#define IDC_ENABLE_DRV 102 -#define IDC_DISABLE_DRV 103 -#define IDC_UPDATE_DRV 104 -#define IDC_UNINSTALL_DRV 105 -#define IDC_ADD_HARDWARE 106 - -/* Menu items */ -#define IDC_ACTIONMENU 150 -#define IDC_ABOUT 151 -#define IDC_EXIT 152 - - -/* view menu */ -#define IDC_DEVBYTYPE 200 -#define IDC_DEVBYCONN 201 -#define IDC_RESBYTYPE 202 -#define IDC_RESBYCONN 203 -#define IDC_SHOWHIDDEN 204 - - -/* tooltips */ -#define IDS_TOOLTIP_PROPERTIES 300 -#define IDS_TOOLTIP_SCAN 301 -#define IDS_TOOLTIP_ENABLE 302 -#define IDS_TOOLTIP_DISABLE 303 -#define IDS_TOOLTIP_UPDATE 304 -#define IDS_TOOLTIP_UNINSTALL 305 - -/* General strings */ -#define IDS_CONFIRM_DISABLE 400 - -/* Menu strings */ -#define IDS_MENU_UPDATE 500 -#define IDS_MENU_ENABLE 501 -#define IDS_MENU_DISABLE 502 -#define IDS_MENU_UNINSTALL 503 -#define IDS_MENU_SCAN 504 -#define IDS_MENU_ADD 505 -#define IDS_MENU_PROPERTIES 506 - - -/* menu hints */ -#define IDS_HINT_BLANK 1000 -#define IDS_HINT_PROPERTIES 1001 -#define IDS_HINT_SCAN 1002 -#define IDS_HINT_ENABLE 1003 -#define IDS_HINT_DISABLE 1004 -#define IDS_HINT_UPDATE 1005 -#define IDS_HINT_UNINSTALL 1006 -#define IDS_HINT_ADD 1007 -#define IDS_HINT_ABOUT 20008 -#define IDS_HINT_EXIT 20009 - -#define IDS_HINT_DEV_BY_TYPE 20020 -#define IDS_HINT_DEV_BY_CONN 20021 -#define IDS_HINT_RES_BY_TYPE 20022 -#define IDS_HINT_RES_BY_CONN 20023 -#define IDS_HINT_SHOW_HIDDEN 20024 - -/* system menu hints */ -#define IDS_HINT_SYS_RESTORE 21001 -#define IDS_HINT_SYS_MOVE 21002 -#define IDS_HINT_SYS_SIZE 21003 -#define IDS_HINT_SYS_MINIMIZE 21004 -#define IDS_HINT_SYS_MAXIMIZE 21005 -#define IDS_HINT_SYS_CLOSE 21006 Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/devmgmt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/devmgmt.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/devmgmt.h [iso-8859-1] Tue Jul 7 20:33:54 2015 @@ -2,7 +2,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #pragma once -#include "resource.h" +#include "..\resource.h" extern HINSTANCE g_hInstance; extern HANDLE ProcessHeap; Removed: trunk/reactos/dll/win32/devmgr_new/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/rsrc.rc (removed) @@ -1,80 +0,0 @@ -#include <windows.h> -#include "resource.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -IDI_MAIN_ICON ICON "res/computer.ico" -IDB_ROOT_IMAGE BITMAP "res/root.bmp" - -/* main toolbar icons */ -IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" - -// UTF-8 -#pragma code_page(65001) - -#ifdef LANGUAGE_BG_BG - #include "lang/bg-BG.rc" -#endif -#ifdef LANGUAGE_DE_DE - #include "lang/de-DE.rc" -#endif -#ifdef LANGUAGE_EL_GR - #include "lang/el-GR.rc" -#endif -#ifdef LANGUAGE_EN_US - #include "lang/en-US.rc" -#endif -#ifdef LANGUAGE_ES_ES - #include "lang/es-ES.rc" -#endif -#ifdef LANGUAGE_FR_FR - #include "lang/fr-FR.rc" -#endif -#ifdef LANGUAGE_HE_IL - #include "lang/he-IL.rc" -#endif -#ifdef LANGUAGE_ID_ID - #include "lang/id-ID.rc" -#endif -#ifdef LANGUAGE_IT_IT - #include "lang/it-IT.rc" -#endif -#ifdef LANGUAGE_JA_JP - #include "lang/ja-JP.rc" -#endif -#ifdef LANGUAGE_KO_KR - #include "lang/ko-KR.rc" -#endif -#ifdef LANGUAGE_NB_NO - #include "lang/no-NO.rc" -#endif -#ifdef LANGUAGE_PL_PL - #include "lang/pl-PL.rc" -#endif -#ifdef LANGUAGE_PT_BR - #include "lang/pt-BR.rc" -#endif -#ifdef LANGUAGE_RO_RO - #include "lang/ro-RO.rc" -#endif -#ifdef LANGUAGE_RU_RU - #include "lang/ru-RU.rc" -#endif -#ifdef LANGUAGE_SK_SK - #include "lang/sk-SK.rc" -#endif -#ifdef LANGUAGE_SV_SE - #include "lang/sv-SE.rc" -#endif -#ifdef LANGUAGE_TH_TH - #include "lang/th-TH.rc" -#endif -#ifdef LANGUAGE_TR_TR - #include "lang/tr-TR.rc" -#endif -#ifdef LANGUAGE_UK_UA - #include "lang/uk-UA.rc" -#endif -#ifdef LANGUAGE_ZH_CN - #include "lang/zh-CN.rc" -#endif Modified: trunk/reactos/dll/win32/devmgr_new/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgr.rc [iso-8859-1] Tue Jul 7 20:33:54 2015 @@ -4,13 +4,15 @@ #include "resource.h" -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Device Manager" #define REACTOS_STR_INTERNAL_NAME "devmgr" #define REACTOS_STR_ORIGINAL_FILENAME "devmgr.dll" + #include <reactos/version.rc> +#include <reactos/manifest_dll.rc> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_MAIN_ICON ICON "resources/computer.ico" IDB_ROOT_IMAGE BITMAP "resources/root.bmp" @@ -18,70 +20,7 @@ /* main toolbar icons */ IDB_TOOLBAR BITMAP DISCARDABLE "resources/toolbar.bmp" -#include <reactos/manifest_dll.rc> - -#define LANGUAGE_EN_US - /* UTF-8 */ #pragma code_page(65001) -#ifdef LANGUAGE_BG_BG - #include "lang/bg-BG.rc" -#endif -#ifdef LANGUAGE_CS_CZ - #include "lang/cs-CZ.rc" -#endif -#ifdef LANGUAGE_DE_DE - #include "lang/de-DE.rc" -#endif -#ifdef LANGUAGE_EL_GR - #include "lang/el-GR.rc" -#endif -#ifdef LANGUAGE_EN_US - #include "lang/en-US.rc" -#endif -#ifdef LANGUAGE_ES_ES - #include "lang/es-ES.rc" -#endif -#ifdef LANGUAGE_HE_IL - #include "lang/he-IL.rc" -#endif -#ifdef LANGUAGE_FR_FR - #include "lang/fr-FR.rc" -#endif -#ifdef LANGUAGE_HU_HU - #include "lang/hu-HU.rc" -#endif -#ifdef LANGUAGE_ID_ID - #include "lang/id-ID.rc" -#endif -#ifdef LANGUAGE_IT_IT - #include "lang/it-IT.rc" -#endif -#ifdef LANGUAGE_NB_NO - #include "lang/no-NO.rc" -#endif -#ifdef LANGUAGE_PL_PL - #include "lang/pl-PL.rc" -#endif -#ifdef LANGUAGE_PT_BR - #include "lang/pt-BR.rc" -#endif -#ifdef LANGUAGE_RO_RO - #include "lang/ro-RO.rc" -#endif -#ifdef LANGUAGE_RU_RU - #include "lang/ru-RU.rc" -#endif -#ifdef LANGUAGE_SK_SK - #include "lang/sk-SK.rc" -#endif -#ifdef LANGUAGE_SQ_AL - #include "lang/sq-AL.rc" -#endif -#ifdef LANGUAGE_TR_TR - #include "lang/tr-TR.rc" -#endif -#ifdef LANGUAGE_UK_UA - #include "lang/uk-UA.rc" -#endif +#include "lang/en-US.rc" Modified: trunk/reactos/dll/win32/devmgr_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/lang/… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/lang/en-US.rc [iso-8859-1] Tue Jul 7 20:33:54 2015 @@ -266,6 +266,7 @@ STRINGTABLE DISCARDABLE BEGIN + IDS_APPNAME "ReactOS Device Manager" IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" END STRINGTABLE DISCARDABLE @@ -292,7 +293,6 @@ /* Hints */ STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "ReactOS Device Manager" IDS_HINT_BLANK " " IDS_HINT_PROPERTIES " Open property dialog for the current selection." IDS_HINT_SCAN " Scan for changed or new plug and play devices."

1 0

[cfinck] 68375: [LOCALSPL] - Initialize all Print Monitors on startup and keep a list of them. - Implement LocalEnumMonitors and LocalEnumPorts. - Check the result of the initialization functions. ...
by cfinck＠svn.reactos.org 07 Jul '15

07 Jul '15

Author: cfinck Date: Tue Jul 7 17:06:48 2015 New Revision: 68375 URL: http://svn.reactos.org/svn/reactos?rev=68375&view=rev Log: [LOCALSPL] - Initialize all Print Monitors on startup and keep a list of them. - Implement LocalEnumMonitors and LocalEnumPorts. - Check the result of the initialization functions. [SPOOLSS] - Implement support for multiple Print Providers. Initialize them on startup and keep a list here as well. - Implement all functions that had simple stubs in the C code. This still needs to be done for the remaining functions stubbed in the .spec file. But generally spoken, this always boils down to 3 cases: * Forward the call to the Local Spooler (for general functions like GetPrintProcessorDirectory). * Forward the call to the Print Provider we used for OpenPrinter (for functions like SetJob). * Forward the call to all Print Providers and collect the results (for functions like EnumPrinters). Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/monitors.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/monitors.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.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/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/memory.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/ports.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/precomp.h branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printprocessors.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c 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] Tue Jul 7 17:06:48 2015 @@ -6,6 +6,7 @@ jobs.c main.c memory.c + monitors.c ports.c precomp.h printers.c Modified: 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 [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/jobs.c [iso-8859-1] Tue Jul 7 17:06:48 2015 @@ -8,31 +8,76 @@ #include "precomp.h" BOOL WINAPI -AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded) +AddJobW(HANDLE hPrinter, DWORD Level, PBYTE pData, DWORD cbBuf, PDWORD pcbNeeded) { - return LocalSplFuncs.fpAddJob(hPrinter, Level, pData, cbBuf, pcbNeeded); + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hPrinter; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return pHandle->pPrintProvider->PrintProvider.fpAddJob(pHandle->hPrinter, Level, pData, cbBuf, pcbNeeded); } BOOL WINAPI EnumJobsW(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pJob, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { - return LocalSplFuncs.fpEnumJobs(hPrinter, FirstJob, NoJobs, Level, pJob, cbBuf, pcbNeeded, pcReturned); + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hPrinter; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return pHandle->pPrintProvider->PrintProvider.fpEnumJobs(pHandle->hPrinter, FirstJob, NoJobs, Level, pJob, cbBuf, pcbNeeded, pcReturned); } BOOL WINAPI -GetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, DWORD cbBuf, LPDWORD pcbNeeded) +GetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJob, DWORD cbBuf, PDWORD pcbNeeded) { - return LocalSplFuncs.fpGetJob(hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded); + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hPrinter; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return pHandle->pPrintProvider->PrintProvider.fpGetJob(pHandle->hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded); } BOOL WINAPI ScheduleJob(HANDLE hPrinter, DWORD dwJobID) { - return LocalSplFuncs.fpScheduleJob(hPrinter, dwJobID); + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hPrinter; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return pHandle->pPrintProvider->PrintProvider.fpScheduleJob(pHandle->hPrinter, dwJobID); } BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command) { - return LocalSplFuncs.fpSetJob(hPrinter, JobId, Level, pJobInfo, Command); + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hPrinter; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return pHandle->pPrintProvider->PrintProvider.fpSetJob(pHandle->hPrinter, JobId, Level, pJobInfo, Command); } 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] Tue Jul 7 17:06:48 2015 @@ -7,9 +7,179 @@ #include "precomp.h" +// Global Variables HANDLE hProcessHeap; -PRINTPROVIDOR LocalSplFuncs; - +LIST_ENTRY PrintProviderList; + + +static DWORD +_AddPrintProviderToList(PCWSTR pwszFileName) +{ + DWORD dwErrorCode; + HINSTANCE hinstPrintProvider; + PInitializePrintProvidor pfnInitializePrintProvidor; + PSPOOLSS_PRINT_PROVIDER pPrintProvider = NULL; + + // Try to load it. + hinstPrintProvider = LoadLibraryW(pwszFileName); + if (!hinstPrintProvider) + { + dwErrorCode = GetLastError(); + ERR("LoadLibraryW failed for \"%S\" with error %lu!\n", pwszFileName, dwErrorCode); + goto Cleanup; + } + + // Get the initialization routine. + pfnInitializePrintProvidor = (PInitializePrintProvidor)GetProcAddress(hinstPrintProvider, "InitializePrintProvidor"); + if (!pfnInitializePrintProvidor) + { + dwErrorCode = GetLastError(); + ERR("GetProcAddress failed for \"%S\" with error %lu!\n", pwszFileName, dwErrorCode); + goto Cleanup; + } + + // Create a new SPOOLSS_PRINT_PROVIDER structure for it. + pPrintProvider = DllAllocSplMem(sizeof(SPOOLSS_PRINT_PROVIDER)); + if (!pPrintProvider) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + // Call the Print Provider initialization function. + if (!pfnInitializePrintProvidor(&pPrintProvider->PrintProvider, sizeof(PRINTPROVIDOR), NULL)) + { + dwErrorCode = GetLastError(); + ERR("InitializePrintProvidor failed for \"%S\" with error %lu!\n", pwszFileName, dwErrorCode); + goto Cleanup; + } + + // Add this Print Provider to the list. + InsertTailList(&PrintProviderList, &pPrintProvider->Entry); + + // Don't let the cleanup routine free this. + pPrintProvider = NULL; + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + if (pPrintProvider) + DllFreeSplMem(pPrintProvider); + + return dwErrorCode; +} + +static BOOL +_InitializePrintProviderList() +{ + DWORD cbFileName; + DWORD cchMaxSubKey; + DWORD cchPrintProviderName; + DWORD dwErrorCode; + DWORD dwSubKeys; + DWORD i; + HKEY hKey = NULL; + HKEY hSubKey = NULL; + PWSTR pwszPrintProviderName = NULL; + WCHAR wszFileName[MAX_PATH]; + + // Initialize an empty list for our Print Providers. + InitializeListHead(&PrintProviderList); + + // First add the Local Spooler. + // This one must exist and must be the first one in the list. + dwErrorCode = _AddPrintProviderToList(L"localspl"); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("The Local Spooler could not be loaded!\n"); + goto Cleanup; + } + + // Now add additional Print Providers from the registry. + // First of all, open the key containing print providers. + dwErrorCode = (DWORD)RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\Print\\Providers", 0, KEY_READ, &hKey); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Get the number of Print Providers and maximum sub key length. + dwErrorCode = (DWORD)RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &dwSubKeys, &cchMaxSubKey, NULL, NULL, NULL, NULL, NULL, NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegQueryInfoKeyW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Allocate a temporary buffer for the Print Provider names. + pwszPrintProviderName = DllAllocSplMem((cchMaxSubKey + 1) * sizeof(WCHAR)); + if (!pwszPrintProviderName) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + // Loop through all available Print Providers. + for (i = 0; i < dwSubKeys; i++) + { + // Cleanup tasks from the previous run + if (hSubKey) + { + RegCloseKey(hSubKey); + hSubKey = NULL; + } + + // Get the name of this Print Provider. + cchPrintProviderName = cchMaxSubKey + 1; + dwErrorCode = (DWORD)RegEnumKeyExW(hKey, i, pwszPrintProviderName, &cchPrintProviderName, NULL, NULL, NULL, NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegEnumKeyExW failed for iteration %lu with status %lu!\n", i, dwErrorCode); + continue; + } + + // Open this Print Provider's registry key. + dwErrorCode = (DWORD)RegOpenKeyExW(hKey, pwszPrintProviderName, 0, KEY_READ, &hSubKey); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed for Print Provider \"%S\" with status %lu!\n", pwszPrintProviderName, dwErrorCode); + continue; + } + + // Get the file name of the Print Provider. + cbFileName = MAX_PATH * sizeof(WCHAR); + dwErrorCode = (DWORD)RegQueryValueExW(hKey, L"Driver", NULL, NULL, (PBYTE)wszFileName, &cbFileName); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed with status %lu!\n", dwErrorCode); + continue; + } + + // Load and add it to the list. + dwErrorCode = _AddPrintProviderToList(wszFileName); + if (dwErrorCode != ERROR_SUCCESS) + continue; + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + // Inside the loop + if (hSubKey) + RegCloseKey(hSubKey); + + // Outside the loop + if (pwszPrintProviderName) + DllFreeSplMem(pwszPrintProviderName); + + if (hKey) + RegCloseKey(hKey); + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -18,7 +188,7 @@ { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); - hProcessHeap = GetProcessHeap(); + hProcessHeap = GetProcessHeap(); break; } @@ -28,32 +198,7 @@ BOOL WINAPI InitializeRouter(HANDLE SpoolerStatusHandle) { - HINSTANCE hinstLocalSpl; - PInitializePrintProvidor pfnInitializePrintProvidor; - - // Only initialize localspl.dll for now. - // This function should later look for all available print providers in the registry and initialize all of them. - hinstLocalSpl = LoadLibraryW(L"localspl"); - if (!hinstLocalSpl) - { - ERR("LoadLibraryW for localspl failed with error %lu!\n", GetLastError()); - return FALSE; - } - - pfnInitializePrintProvidor = (PInitializePrintProvidor)GetProcAddress(hinstLocalSpl, "InitializePrintProvidor"); - if (!pfnInitializePrintProvidor) - { - ERR("GetProcAddress failed with error %lu!\n", GetLastError()); - return FALSE; - } - - if (!pfnInitializePrintProvidor(&LocalSplFuncs, sizeof(PRINTPROVIDOR), NULL)) - { - ERR("InitializePrintProvidor failed for localspl with error %lu!\n", GetLastError()); - return FALSE; - } - - return TRUE; + return _InitializePrintProviderList(); } BOOL WINAPI Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/memory.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/memory.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/memory.c [iso-8859-1] Tue Jul 7 17:06:48 2015 @@ -9,17 +9,17 @@ /** -* @name AllocSplStr -* -* Allocates memory for a Unicode string and copies the input string into it. -* Equivalent of wcsdup, but the returned buffer is allocated from the spooler heap and must be freed with DllFreeSplStr. -* -* @param pwszInput -* The input string to copy -* -* @return -* Pointer to the copied string or NULL if no memory could be allocated. -*/ + * @name AllocSplStr + * + * Allocates memory for a Unicode string and copies the input string into it. + * Equivalent of wcsdup, but the returned buffer is allocated from the spooler heap and must be freed with DllFreeSplStr. + * + * @param pwszInput + * The input string to copy + * + * @return + * Pointer to the copied string or NULL if no memory could be allocated. + */ PWSTR WINAPI AllocSplStr(PCWSTR pwszInput) { Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/monitors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/monitors.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/monitors.c [iso-8859-1] Tue Jul 7 17:06:48 2015 @@ -0,0 +1,68 @@ +/* + * 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 Monitors + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +BOOL WINAPI +EnumMonitorsW(PWSTR pName, DWORD Level, PBYTE pMonitors, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + BOOL bReturnValue; + DWORD cbCallBuffer; + DWORD cbNeeded; + DWORD dwReturned; + PBYTE pCallBuffer; + PSPOOLSS_PRINT_PROVIDER pPrintProvider; + PLIST_ENTRY pEntry; + + // Sanity checks. + if ((cbBuf && !pMonitors) || !pcbNeeded || !pcReturned) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + // Begin counting. + *pcbNeeded = 0; + *pcReturned = 0; + + // At the beginning, we have the full buffer available. + cbCallBuffer = cbBuf; + pCallBuffer = pMonitors; + + // Loop through all Print Provider. + for (pEntry = PrintProviderList.Flink; pEntry != &PrintProviderList; pEntry = pEntry->Flink) + { + pPrintProvider = CONTAINING_RECORD(pEntry, SPOOLSS_PRINT_PROVIDER, Entry); + + // Check if this Print Provider provides an EnumMonitors function. + if (!pPrintProvider->PrintProvider.fpEnumMonitors) + continue; + + // Call the EnumMonitors function of this Print Provider. + bReturnValue = pPrintProvider->PrintProvider.fpEnumMonitors(pName, Level, pCallBuffer, cbCallBuffer, &cbNeeded, &dwReturned); + + // Add the returned counts to the total values. + *pcbNeeded += cbNeeded; + *pcReturned += dwReturned; + + // Reduce the available buffer size for the next call without risking an underflow. + if (cbNeeded < cbCallBuffer) + cbCallBuffer -= cbNeeded; + else + cbCallBuffer = 0; + + // Advance the buffer if the caller provided it. + if (pCallBuffer) + pCallBuffer += cbNeeded; + + // Check if we shall not ask other Print Providers. + if (bReturnValue == ROUTER_STOP_ROUTING) + break; + } + + return bReturnValue; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/monitors.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/ports.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/ports.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/ports.c [iso-8859-1] Tue Jul 7 17:06:48 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Spooler Router * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation - * PURPOSE: Functions related to ports + * PURPOSE: Functions related to Ports of the Print Monitors * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> */ @@ -10,5 +10,55 @@ BOOL WINAPI EnumPortsW(PWSTR pName, DWORD Level, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { - return FALSE; + BOOL bReturnValue; + DWORD cbCallBuffer; + DWORD cbNeeded; + DWORD dwReturned; + PBYTE pCallBuffer; + PSPOOLSS_PRINT_PROVIDER pPrintProvider; + PLIST_ENTRY pEntry; + + // Sanity checks. + if ((cbBuf && !pPorts) || !pcbNeeded || !pcReturned) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + // Begin counting. + *pcbNeeded = 0; + *pcReturned = 0; + + // At the beginning, we have the full buffer available. + cbCallBuffer = cbBuf; + pCallBuffer = pPorts; + + // Loop through all Print Provider. + for (pEntry = PrintProviderList.Flink; pEntry != &PrintProviderList; pEntry = pEntry->Flink) + { + pPrintProvider = CONTAINING_RECORD(pEntry, SPOOLSS_PRINT_PROVIDER, Entry); + + // Call the EnumPorts function of this Print Provider. + bReturnValue = pPrintProvider->PrintProvider.fpEnumPorts(pName, Level, pCallBuffer, cbCallBuffer, &cbNeeded, &dwReturned); + + // Add the returned counts to the total values. + *pcbNeeded += cbNeeded; + *pcReturned += dwReturned; + + // Reduce the available buffer size for the next call without risking an underflow. + if (cbNeeded < cbCallBuffer) + cbCallBuffer -= cbNeeded; + else + cbCallBuffer = 0; + + // Advance the buffer if the caller provided it. + if (pCallBuffer) + pCallBuffer += cbNeeded; + + // Check if we shall not ask other Print Providers. + if (bReturnValue == ROUTER_STOP_ROUTING) + break; + } + + return bReturnValue; } 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] Tue Jul 7 17:06:48 2015 @@ -15,17 +15,40 @@ #include <winreg.h> #include <winspool.h> #include <winsplp.h> +#include <ndk/rtlfuncs.h> #include <spoolss.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(spoolss); -// Function pointer to InitializePrintProvidor of a provider DLL +// Function pointers typedef BOOL (WINAPI *PInitializePrintProvidor)(LPPRINTPROVIDOR, DWORD, LPWSTR); + +// Structures +/** + * Describes a Print Provider. + */ +typedef struct _SPOOLSS_PRINT_PROVIDER +{ + LIST_ENTRY Entry; + PRINTPROVIDOR PrintProvider; +} +SPOOLSS_PRINT_PROVIDER, *PSPOOLSS_PRINT_PROVIDER; + +/* + * Describes a handle returned by OpenPrinterW. + * We can't just pass the handle returned by the Print Provider, because spoolss has to remember which Print Provider opened this handle. + */ +typedef struct _SPOOLSS_PRINTER_HANDLE +{ + PSPOOLSS_PRINT_PROVIDER pPrintProvider; /** Pointer to the Print Provider that opened this printer. */ + HANDLE hPrinter; /** The handle returned by fpOpenPrinter of the Print Provider and passed to subsequent Print Provider functions. */ +} +SPOOLSS_PRINTER_HANDLE, *PSPOOLSS_PRINTER_HANDLE; // main.c extern HANDLE hProcessHeap; -extern PRINTPROVIDOR LocalSplFuncs; +extern LIST_ENTRY PrintProviderList; #endif Modified: 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 [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printers.c [iso-8859-1] Tue Jul 7 17:06:48 2015 @@ -11,71 +11,262 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) { + BOOL bReturnValue; + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hPrinter; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + // FIXME: Call FindClosePrinterChangeNotification for all created change notifications (according to MSDN). + + // Call CloseHandle of the Print Provider. + bReturnValue = pHandle->pPrintProvider->PrintProvider.fpClosePrinter(pHandle->hPrinter); + + // Free our handle information. + DllFreeSplMem(pHandle); + + return bReturnValue; +} + +BOOL WINAPI +EndDocPrinter(HANDLE hPrinter) +{ + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hPrinter; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return pHandle->pPrintProvider->PrintProvider.fpEndDocPrinter(pHandle->hPrinter); +} + +BOOL WINAPI +EndPagePrinter(HANDLE hPrinter) +{ + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hPrinter; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return pHandle->pPrintProvider->PrintProvider.fpEndPagePrinter(pHandle->hPrinter); +} + +BOOL WINAPI +EnumPrintersW(DWORD Flags, PWSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + BOOL bReturnValue; + DWORD cbCallBuffer; + DWORD cbNeeded; + DWORD dwReturned; + PBYTE pCallBuffer; + PSPOOLSS_PRINT_PROVIDER pPrintProvider; + PLIST_ENTRY pEntry; + + // Sanity checks. + if ((cbBuf && !pPrinterEnum) || !pcbNeeded || !pcReturned) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + // Begin counting. + *pcbNeeded = 0; + *pcReturned = 0; + + // At the beginning, we have the full buffer available. + cbCallBuffer = cbBuf; + pCallBuffer = pPrinterEnum; + + // Loop through all Print Provider. + for (pEntry = PrintProviderList.Flink; pEntry != &PrintProviderList; pEntry = pEntry->Flink) + { + pPrintProvider = CONTAINING_RECORD(pEntry, SPOOLSS_PRINT_PROVIDER, Entry); + + // Call the EnumPrinters function of this Print Provider. + bReturnValue = pPrintProvider->PrintProvider.fpEnumPrinters(Flags, Name, Level, pCallBuffer, cbCallBuffer, &cbNeeded, &dwReturned); + + // Add the returned counts to the total values. + *pcbNeeded += cbNeeded; + *pcReturned += dwReturned; + + // Reduce the available buffer size for the next call without risking an underflow. + if (cbNeeded < cbCallBuffer) + cbCallBuffer -= cbNeeded; + else + cbCallBuffer = 0; + + // Advance the buffer if the caller provided it. + if (pCallBuffer) + pCallBuffer += cbNeeded; + } + + return bReturnValue; +} + +BOOL WINAPI +GetPrinterDriverW(HANDLE hPrinter, PWSTR pEnvironment, DWORD Level, PBYTE pDriverInfo, DWORD cbBuf, PDWORD pcbNeeded) +{ + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hPrinter; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return pHandle->pPrintProvider->PrintProvider.fpGetPrinterDriver(pHandle->hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); +} + +BOOL WINAPI +GetPrinterW(HANDLE hPrinter, DWORD Level, PBYTE pPrinter, DWORD cbBuf, PDWORD pcbNeeded) +{ + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hPrinter; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return pHandle->pPrintProvider->PrintProvider.fpGetPrinter(pHandle->hPrinter, Level, pPrinter, cbBuf, pcbNeeded); +} + +BOOL WINAPI +OpenPrinterW(PWSTR pPrinterName, PHANDLE phPrinter, PPRINTER_DEFAULTSW pDefault) +{ + BOOL bReturnValue; + HANDLE hPrinter; + PLIST_ENTRY pEntry; + PSPOOLSS_PRINTER_HANDLE pHandle; + PSPOOLSS_PRINT_PROVIDER pPrintProvider; + + // Sanity checks. + if (!pPrinterName || !phPrinter) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + // Loop through all Print Providers to find one able to open this Printer. + for (pEntry = PrintProviderList.Flink; pEntry != &PrintProviderList; pEntry = pEntry->Flink) + { + pPrintProvider = CONTAINING_RECORD(pEntry, SPOOLSS_PRINT_PROVIDER, Entry); + + bReturnValue = pPrintProvider->PrintProvider.fpOpenPrinter(pPrinterName, &hPrinter, pDefault); + if (bReturnValue == ROUTER_SUCCESS) + { + // This Print Provider has opened this Printer. + // Store this information and return a handle. + pHandle = DllAllocSplMem(sizeof(SPOOLSS_PRINTER_HANDLE)); + if (!pHandle) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + return FALSE; + } + + pHandle->pPrintProvider = pPrintProvider; + pHandle->hPrinter = hPrinter; + *phPrinter = (HANDLE)pHandle; + + SetLastError(ERROR_SUCCESS); + return TRUE; + } + else if (bReturnValue == ROUTER_STOP_ROUTING) + { + ERR("A Print Provider returned ROUTER_STOP_ROUTING for Printer \"%S\"!\n", pPrinterName); + return FALSE; + } + } + + // We found no Print Provider able to open this Printer. 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); -} - -BOOL WINAPI ReadPrinter(HANDLE hPrinter, PVOID pBuf, DWORD cbBuf, PDWORD pNoBytesRead) { - return FALSE; + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hPrinter; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return pHandle->pPrintProvider->PrintProvider.fpReadPrinter(pHandle->hPrinter, pBuf, cbBuf, pNoBytesRead); } DWORD WINAPI -StartDocPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo) -{ - return 0; +StartDocPrinterW(HANDLE hPrinter, DWORD Level, PBYTE pDocInfo) +{ + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hPrinter; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return pHandle->pPrintProvider->PrintProvider.fpStartDocPrinter(pHandle->hPrinter, Level, pDocInfo); } BOOL WINAPI StartPagePrinter(HANDLE hPrinter) { - return FALSE; -} - -BOOL WINAPI -WritePrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, LPDWORD pcWritten) -{ - return FALSE; + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hPrinter; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return pHandle->pPrintProvider->PrintProvider.fpStartPagePrinter(pHandle->hPrinter); +} + +BOOL WINAPI +WritePrinter(HANDLE hPrinter, PVOID pBuf, DWORD cbBuf, PDWORD pcWritten) +{ + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hPrinter; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return pHandle->pPrintProvider->PrintProvider.fpWritePrinter(pHandle->hPrinter, pBuf, cbBuf, pcWritten); } BOOL WINAPI XcvDataW(HANDLE hXcv, PCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded, PDWORD pdwStatus) { - return FALSE; -} + PSPOOLSS_PRINTER_HANDLE pHandle = (PSPOOLSS_PRINTER_HANDLE)hXcv; + + // Sanity checks. + if (!pHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return pHandle->pPrintProvider->PrintProvider.fpXcvData(pHandle->hPrinter, pszDataName, pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded, pdwStatus); +} Modified: 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 [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printprocessors.c [iso-8859-1] Tue Jul 7 17:06:48 2015 @@ -8,19 +8,25 @@ #include "precomp.h" BOOL WINAPI -EnumPrintProcessorDatatypesW(LPWSTR pName, LPWSTR pPrintProcessorName, DWORD Level, LPBYTE pDatatypes, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +EnumPrintProcessorDatatypesW(PWSTR pName, PWSTR pPrintProcessorName, DWORD Level, PBYTE pDatatypes, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { - return LocalSplFuncs.fpEnumPrintProcessorDatatypes(pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned); + // Always call this function on the Local Spooler. + PSPOOLSS_PRINT_PROVIDER pPrintProvider = CONTAINING_RECORD(&PrintProviderList.Flink, SPOOLSS_PRINT_PROVIDER, Entry); + return pPrintProvider->PrintProvider.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) +EnumPrintProcessorsW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE pPrintProcessorInfo, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { - return LocalSplFuncs.fpEnumPrintProcessors(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded, pcReturned); + // Always call this function on the Local Spooler. + PSPOOLSS_PRINT_PROVIDER pPrintProvider = CONTAINING_RECORD(&PrintProviderList.Flink, SPOOLSS_PRINT_PROVIDER, Entry); + return pPrintProvider->PrintProvider.fpEnumPrintProcessors(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded, pcReturned); } BOOL WINAPI -GetPrintProcessorDirectoryW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pPrintProcessorInfo, DWORD cbBuf, LPDWORD pcbNeeded) +GetPrintProcessorDirectoryW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE pPrintProcessorInfo, DWORD cbBuf, PDWORD pcbNeeded) { - return LocalSplFuncs.fpGetPrintProcessorDirectory(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded); + // Always call this function on the Local Spooler. + PSPOOLSS_PRINT_PROVIDER pPrintProvider = CONTAINING_RECORD(&PrintProviderList.Flink, SPOOLSS_PRINT_PROVIDER, Entry); + return pPrintProvider->PrintProvider.fpGetPrintProcessorDirectory(pName, pEnvironment, Level, pPrintProcessorInfo, cbBuf, pcbNeeded); } 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] Tue Jul 7 17:06:48 2015 @@ -60,16 +60,16 @@ @ stdcall EndPagePrinter(long) @ stub EnumFormsW @ stdcall EnumJobsW(long long long long ptr long ptr ptr) -@ stub EnumMonitorsW +@ stdcall EnumMonitorsW(wstr long ptr long ptr ptr) @ stub EnumPerMachineConnectionsW -@ stdcall EnumPortsW(ptr long ptr long ptr ptr) +@ stdcall EnumPortsW(wstr long ptr long ptr ptr) @ stub EnumPrinterDataExW @ stub EnumPrinterDataW @ stub EnumPrinterDriversW @ stub EnumPrinterKeyW -@ stdcall EnumPrintersW(long ptr long ptr long ptr ptr) -@ stdcall EnumPrintProcessorDatatypesW(ptr ptr long ptr long ptr ptr) -@ stdcall EnumPrintProcessorsW(ptr ptr long ptr long ptr ptr) +@ stdcall EnumPrintersW(long wstr long ptr long ptr ptr) +@ stdcall EnumPrintProcessorDatatypesW(wstr wstr long ptr long ptr ptr) +@ stdcall EnumPrintProcessorsW(wstr wstr long ptr long ptr ptr) @ stub FindClosePrinterChangeNotification @ stub FlushPrinter @ stub FormatPrinterForRegistryKey Modified: 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 [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/CMakeLists.txt [iso-8859-1] Tue Jul 7 17:06:48 2015 @@ -6,6 +6,8 @@ list(APPEND SOURCE jobs.c main.c + monitors.c + ports.c precomp.h printers.c printprocessors.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] Tue Jul 7 17:06:48 2015 @@ -102,7 +102,7 @@ return TRUE; } -void +BOOL InitializeGlobalJobList() { const WCHAR wszPath[] = L"\\PRINTERS\\?????.SHD"; @@ -110,6 +110,7 @@ const DWORD cchFolders = sizeof("\\PRINTERS\\") - 1; const DWORD cchPattern = sizeof("?????") - 1; + DWORD dwErrorCode; DWORD dwJobID; HANDLE hFind; PLOCAL_JOB pJob = NULL; @@ -133,6 +134,7 @@ if (hFind == INVALID_HANDLE_VALUE) { // No unfinished jobs found. + dwErrorCode = ERROR_SUCCESS; goto Cleanup; } @@ -159,6 +161,7 @@ // Add it to the Global Job List. if (!InsertElementSkiplist(&GlobalJobList, pJob)) { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("InsertElementSkiplist failed for job %lu for the GlobalJobList!\n", pJob->dwJobID); goto Cleanup; } @@ -166,16 +169,22 @@ // Add it to the Printer's Job List. if (!InsertElementSkiplist(&pJob->pPrinter->JobList, pJob)) { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("InsertElementSkiplist failed for job %lu for the Printer's Job List!\n", pJob->dwJobID); goto Cleanup; } } while (FindNextFileW(hFind, &FindData)); + + dwErrorCode = ERROR_SUCCESS; Cleanup: // Outside the loop if (hFind) FindClose(hFind); + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } void Modified: 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 [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] Tue Jul 7 17:06:48 2015 @@ -22,6 +22,8 @@ #else #error Unsupported architecture #endif + +const DWORD cbCurrentEnvironment = sizeof(wszCurrentEnvironment); const WCHAR wszDefaultDocumentName[] = L"Local Downlevel Document"; @@ -70,8 +72,8 @@ NULL, // fpGetForm NULL, // fpSetForm NULL, // fpEnumForms - NULL, // fpEnumMonitors - NULL, // fpEnumPorts + LocalEnumMonitors, // fpEnumMonitors + LocalEnumPorts, // fpEnumPorts NULL, // fpAddPort NULL, // fpConfigurePort NULL, // fpDeletePort @@ -142,13 +144,15 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); _GetSpoolDirectory(); - InitializePrintProcessorList(); - InitializePrinterList(); - InitializeGlobalJobList(); - break; + + return InitializePrintMonitorList() && + InitializePrintProcessorList() && + InitializePrinterList() && + InitializeGlobalJobList(); + + default: + return TRUE; } - - return TRUE; } BOOL WINAPI Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/monitors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/monitors.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/monitors.c [iso-8859-1] Tue Jul 7 17:06:48 2015 @@ -0,0 +1,314 @@ +/* + * PROJECT: ReactOS Local Spooler + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to Print Monitors + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +// Local Variables +LIST_ENTRY PrintMonitorList; + +BOOL +InitializePrintMonitorList() +{ + const WCHAR wszMonitorsPath[] = L"SYSTEM\\CurrentControlSet\\Control\\Print\\Monitors"; + const DWORD cchMonitorsPath = _countof(wszMonitorsPath) - 1; + + DWORD cchMaxSubKey; + DWORD cchPrintMonitorName; + DWORD dwErrorCode; + DWORD dwSubKeys; + DWORD i; + HINSTANCE hinstPrintMonitor = NULL; + HKEY hKey = NULL; + HKEY hSubKey = NULL; + MONITORINIT MonitorInit; + PInitializePrintMonitor pfnInitializePrintMonitor; + PInitializePrintMonitor2 pfnInitializePrintMonitor2; + PLOCAL_PRINT_MONITOR pPrintMonitor = NULL; + PWSTR pwszRegistryPath = NULL; + + // Initialize an empty list for our Print Monitors. + InitializeListHead(&PrintMonitorList); + + // Open the key containing Print Monitors. + dwErrorCode = (DWORD)RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszMonitorsPath, 0, KEY_READ, &hKey); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Get the number of Print Providers and maximum sub key length. + dwErrorCode = (DWORD)RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &dwSubKeys, &cchMaxSubKey, NULL, NULL, NULL, NULL, NULL, NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegQueryInfoKeyW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Loop through all available Print Providers. + for (i = 0; i < dwSubKeys; i++) + { + // Cleanup tasks from the previous run + if (hSubKey) + { + RegCloseKey(hSubKey); + hSubKey = NULL; + } + + if (pwszRegistryPath) + { + DllFreeSplMem(pwszRegistryPath); + pwszRegistryPath = NULL; + } + + if (pPrintMonitor) + { + if (pPrintMonitor->pwszFileName) + DllFreeSplMem(pPrintMonitor->pwszFileName); + + if (pPrintMonitor->pwszName) + DllFreeSplMem(pPrintMonitor->pwszName); + + DllFreeSplMem(pPrintMonitor); + pPrintMonitor = NULL; + } + + // Create a new LOCAL_PRINT_MONITOR structure for it. + pPrintMonitor = DllAllocSplMem(sizeof(LOCAL_PRINT_MONITOR)); + if (!pPrintMonitor) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + // Allocate memory for the Print Monitor Name. + pPrintMonitor->pwszName = DllAllocSplMem((cchMaxSubKey + 1) * sizeof(WCHAR)); + if (!pPrintMonitor->pwszName) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + // Get the name of this Print Monitor. + cchPrintMonitorName = cchMaxSubKey + 1; + dwErrorCode = (DWORD)RegEnumKeyExW(hKey, i, pPrintMonitor->pwszName, &cchPrintMonitorName, NULL, NULL, NULL, NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegEnumKeyExW failed for iteration %lu with status %lu!\n", i, dwErrorCode); + continue; + } + + // Open this Print Monitor's registry key. + dwErrorCode = (DWORD)RegOpenKeyExW(hKey, pPrintMonitor->pwszName, 0, KEY_READ, &hSubKey); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed for Print Provider \"%S\" with status %lu!\n", pPrintMonitor->pwszName, dwErrorCode); + continue; + } + + // Get the file name of the Print Monitor. + pPrintMonitor->pwszFileName = AllocAndRegQueryWSZ(hSubKey, L"Driver"); + if (!pPrintMonitor->pwszFileName) + continue; + + // Try to load it. + hinstPrintMonitor = LoadLibraryW(pPrintMonitor->pwszFileName); + if (!hinstPrintMonitor) + { + ERR("LoadLibraryW failed for \"%S\" with error %lu!\n", pPrintMonitor->pwszFileName, GetLastError()); + continue; + } + + // Try to find a Level 2 initialization routine first. + pfnInitializePrintMonitor2 = (PInitializePrintMonitor2)GetProcAddress(hinstPrintMonitor, "InitializePrintMonitor2"); + if (pfnInitializePrintMonitor2) + { + // Prepare a MONITORINIT structure. + MonitorInit.cbSize = sizeof(MONITORINIT); + MonitorInit.bLocal = TRUE; + + // TODO: Fill the other fields. + + // Call the Level 2 initialization routine. + pPrintMonitor->pMonitor = (PMONITOR2)pfnInitializePrintMonitor2(&MonitorInit, &pPrintMonitor->hMonitor); + if (!pPrintMonitor->pMonitor) + { + ERR("InitializePrintMonitor2 failed for \"%S\" with error %lu!\n", pPrintMonitor->pwszFileName, GetLastError()); + continue; + } + + pPrintMonitor->bIsLevel2 = TRUE; + } + else + { + // Try to find a Level 1 initialization routine then. + pfnInitializePrintMonitor = (PInitializePrintMonitor)GetProcAddress(hinstPrintMonitor, "InitializePrintMonitor"); + if (pfnInitializePrintMonitor) + { + // Construct the registry path. + pwszRegistryPath = DllAllocSplMem((cchMonitorsPath + 1 + cchPrintMonitorName + 1) * sizeof(WCHAR)); + if (!pwszRegistryPath) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + CopyMemory(pwszRegistryPath, wszMonitorsPath, cchMonitorsPath * sizeof(WCHAR)); + pwszRegistryPath[cchMonitorsPath] = L'\\'; + CopyMemory(&pwszRegistryPath[cchMonitorsPath + 1], pPrintMonitor->pwszName, (cchPrintMonitorName + 1) * sizeof(WCHAR)); + + // Call the Level 1 initialization routine. + pPrintMonitor->pMonitor = (LPMONITOREX)pfnInitializePrintMonitor(pwszRegistryPath); + if (!pPrintMonitor->pMonitor) + { + ERR("InitializePrintMonitor failed for \"%S\" with error %lu!\n", pPrintMonitor->pwszFileName, GetLastError()); + continue; + } + } + else + { + ERR("No initialization routine found for \"%S\"!\n", pPrintMonitor->pwszFileName); + continue; + } + } + + // Add this Print Monitor to the list. + InsertTailList(&PrintMonitorList, &pPrintMonitor->Entry); + + // Don't let the cleanup routine free this. + pPrintMonitor = NULL; + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + // Inside the loop + if (hSubKey) + RegCloseKey(hSubKey); + + if (pwszRegistryPath) + DllFreeSplMem(pwszRegistryPath); + + if (pPrintMonitor) + { + if (pPrintMonitor->pwszFileName) + DllFreeSplMem(pPrintMonitor->pwszFileName); + + if (pPrintMonitor->pwszName) + DllFreeSplMem(pPrintMonitor->pwszName); + + DllFreeSplMem(pPrintMonitor); + } + + // Outside the loop + if (hKey) + RegCloseKey(hKey); + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +BOOL WINAPI +LocalEnumMonitors(PWSTR pName, DWORD Level, PBYTE pMonitors, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + DWORD cbFileName; + DWORD cbMonitorName; + DWORD dwErrorCode; + PBYTE pStart; + PBYTE pEnd; + PLIST_ENTRY pEntry; + PLOCAL_PRINT_MONITOR pPrintMonitor; + MONITOR_INFO_2W MonitorInfo2; // MONITOR_INFO_1W is a subset of MONITOR_INFO_2W, so we can handle both in one function here. + + // Sanity checks. + if (Level > 2) + { + dwErrorCode = ERROR_INVALID_LEVEL; + goto Cleanup; + } + + if ((cbBuf && !pMonitors) || !pcbNeeded || !pcReturned) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + // Begin counting. + *pcbNeeded = 0; + *pcReturned = 0; + + // Count the required buffer size and the number of monitors. + for (pEntry = PrintMonitorList.Flink; pEntry != &PrintMonitorList; pEntry = pEntry->Flink) + { + pPrintMonitor = CONTAINING_RECORD(pEntry, LOCAL_PRINT_MONITOR, Entry); + + cbMonitorName = (wcslen(pPrintMonitor->pwszName) + 1) * sizeof(WCHAR); + cbFileName = (wcslen(pPrintMonitor->pwszFileName) + 1) * sizeof(WCHAR); + + if (Level == 1) + *pcbNeeded += sizeof(MONITOR_INFO_1W) + cbMonitorName; + else + *pcbNeeded += sizeof(MONITOR_INFO_2W) + cbMonitorName + cbCurrentEnvironment + cbFileName; + } + + // Check if the supplied buffer is large enough. + if (cbBuf < *pcbNeeded) + { + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; + goto Cleanup; + } + + // Put the strings at the end of the buffer. + pStart = pMonitors; + pEnd = &pMonitors[cbBuf]; + + for (pEntry = PrintMonitorList.Flink; pEntry != &PrintMonitorList; pEntry = pEntry->Flink) + { + pPrintMonitor = CONTAINING_RECORD(pEntry, LOCAL_PRINT_MONITOR, Entry); + + // Copy the monitor name. + cbMonitorName = (wcslen(pPrintMonitor->pwszName) + 1) * sizeof(WCHAR); + pEnd -= cbMonitorName; + MonitorInfo2.pName = (PWSTR)pEnd; + CopyMemory(pEnd, pPrintMonitor->pwszName, cbMonitorName); + + if (Level == 1) + { + // Finally copy the structure. + CopyMemory(pStart, &MonitorInfo2, sizeof(MONITOR_INFO_1W)); + pStart += sizeof(MONITOR_INFO_1W); + } + else + { + // Copy the environment. + pEnd -= cbCurrentEnvironment; + MonitorInfo2.pEnvironment = (PWSTR)pEnd; + CopyMemory(pEnd, wszCurrentEnvironment, cbCurrentEnvironment); + + // Copy the file name. + cbFileName = (wcslen(pPrintMonitor->pwszFileName) + 1) * sizeof(WCHAR); + pEnd -= cbFileName; + MonitorInfo2.pDLLName = (PWSTR)pEnd; + CopyMemory(pEnd, pPrintMonitor->pwszFileName, cbFileName); + + // Finally copy the structure. + CopyMemory(pStart, &MonitorInfo2, sizeof(MONITOR_INFO_2W)); + pStart += sizeof(MONITOR_INFO_2W); + } + + (*pcReturned)++; + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/monitors.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.c [iso-8859-1] Tue Jul 7 17:06:48 2015 @@ -0,0 +1,64 @@ +/* + * PROJECT: ReactOS Local Spooler + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to Ports of the Print Monitors + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + + +BOOL WINAPI +LocalEnumPorts(PWSTR pName, DWORD Level, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + BOOL bReturnValue; + DWORD cbCallBuffer; + DWORD cbNeeded; + DWORD dwReturned; + PBYTE pCallBuffer; + PLOCAL_PRINT_MONITOR pPrintMonitor; + PLIST_ENTRY pEntry; + + // Sanity checks. + if ((cbBuf && !pPorts) || !pcbNeeded || !pcReturned) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + // Begin counting. + *pcbNeeded = 0; + *pcReturned = 0; + + // At the beginning, we have the full buffer available. + cbCallBuffer = cbBuf; + pCallBuffer = pPorts; + + // Loop through all Print Monitors. + for (pEntry = PrintMonitorList.Flink; pEntry != &PrintMonitorList; pEntry = pEntry->Flink) + { + pPrintMonitor = CONTAINING_RECORD(pEntry, LOCAL_PRINT_MONITOR, Entry); + + // Call the EnumPorts function of this Print Monitor. + if (pPrintMonitor->bIsLevel2) + bReturnValue = ((PMONITOR2)pPrintMonitor->pMonitor)->pfnEnumPorts(pPrintMonitor->hMonitor, pName, Level, pCallBuffer, cbCallBuffer, &cbNeeded, &dwReturned); + else + bReturnValue = ((LPMONITOREX)pPrintMonitor->pMonitor)->Monitor.pfnEnumPorts(pName, Level, pCallBuffer, cbCallBuffer, &cbNeeded, &dwReturned); + + // Add the returned counts to the total values. + *pcbNeeded += cbNeeded; + *pcReturned += dwReturned; + + // Reduce the available buffer size for the next call without risking an underflow. + if (cbNeeded < cbCallBuffer) + cbCallBuffer -= cbNeeded; + else + cbCallBuffer = 0; + + // Advance the buffer if the caller provided it. + if (pCallBuffer) + pCallBuffer += cbNeeded; + } + + return bReturnValue; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Tue Jul 7 17:06:48 2015 @@ -45,6 +45,8 @@ typedef DWORD (WINAPI *PGetPrintProcessorCapabilities)(LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD); typedef HANDLE (WINAPI *POpenPrintProcessor)(LPWSTR, PPRINTPROCESSOROPENDATA); typedef BOOL (WINAPI *PPrintDocumentOnPrintProcessor)(HANDLE, LPWSTR); +typedef LPMONITOREX(WINAPI *PInitializePrintMonitor)(PWSTR); +typedef LPMONITOR2(WINAPI *PInitializePrintMonitor2)(PMONITORINIT, PHANDLE); // Structures /** @@ -141,6 +143,21 @@ PVOID pSpecificHandle; } LOCAL_HANDLE, *PLOCAL_HANDLE; + +/** + * Describes a Print Monitor. + */ +typedef struct _LOCAL_PRINT_MONITOR +{ + LIST_ENTRY Entry; + PWSTR pwszName; /** Name of the Print Monitor as read from the registry. */ + PWSTR pwszFileName; /** DLL File Name of the Print Monitor. */ + BOOL bIsLevel2; /** Whether this Print Monitor supplies an InitializePrintMonitor2 API (preferred) instead of InitializePrintMonitor. */ + PVOID pMonitor; /** For bIsLevel2 == TRUE: LPMONITOR2 pointer returned by InitializePrintMonitor2. + For bIsLevel2 == FALSE: LPMONITOREX pointer returned by InitializePrintMonitor. */ + HANDLE hMonitor; /** Only used when bIsLevel2 == TRUE: Handle returned by InitializePrintMonitor2. */ +} +LOCAL_PRINT_MONITOR, *PLOCAL_PRINT_MONITOR; /** * Describes the header of a print job serialized into a shadow file (.SHD) @@ -184,7 +201,7 @@ // jobs.c extern SKIPLIST GlobalJobList; BOOL GetNextJobID(PDWORD dwJobID); -void InitializeGlobalJobList(); +BOOL InitializeGlobalJobList(); void InitializePrinterJobList(PLOCAL_PRINTER pPrinter); BOOL WINAPI LocalAddJob(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded); BOOL WINAPI LocalEnumJobs(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); @@ -196,14 +213,23 @@ // main.c extern const WCHAR wszCurrentEnvironment[]; +extern const DWORD cbCurrentEnvironment; extern const WCHAR wszDefaultDocumentName[]; extern const WCHAR* wszPrintProviderInfo[3]; extern WCHAR wszSpoolDirectory[MAX_PATH]; extern DWORD cchSpoolDirectory; +// monitors.c +extern LIST_ENTRY PrintMonitorList; +BOOL InitializePrintMonitorList(); +BOOL WINAPI LocalEnumMonitors(PWSTR pName, DWORD Level, PBYTE pMonitors, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned); + +// ports.c +BOOL WINAPI LocalEnumPorts(PWSTR pName, DWORD Level, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned); + // printers.c extern SKIPLIST PrinterList; -void InitializePrinterList(); +BOOL InitializePrinterList(); BOOL WINAPI LocalEnumPrinters(DWORD Flags, LPWSTR Name, DWORD Level, LPBYTE pPrinterEnum, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); BOOL WINAPI LocalOpenPrinter(PWSTR lpPrinterName, HANDLE* phPrinter, PPRINTER_DEFAULTSW pDefault); DWORD WINAPI LocalStartDocPrinter(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo); @@ -216,7 +242,7 @@ // printprocessors.c BOOL FindDatatype(PLOCAL_PRINT_PROCESSOR pPrintProcessor, PWSTR pwszDatatype); PLOCAL_PRINT_PROCESSOR FindPrintProcessor(PWSTR pwszName); -void InitializePrintProcessorList(); +BOOL InitializePrintProcessorList(); BOOL WINAPI LocalEnumPrintProcessorDatatypes(LPWSTR pName, LPWSTR pPrintProcessorName, DWORD Level, LPBYTE pDatatypes, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); BOOL WINAPI LocalEnumPrintProcessors(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pPrintProcessorInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); BOOL WINAPI LocalGetPrintProcessorDirectory(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pPrintProcessorInfo, DWORD cbBuf, LPDWORD pcbNeeded); Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Tue Jul 7 17:06:48 2015 @@ -33,18 +33,18 @@ * The list is searchable by name and returns information about the printers, including their job queues. * During this process, the job queues are also initialized. */ -void +BOOL InitializePrinterList() { const WCHAR wszPrintersKey[] = L"SYSTEM\\CurrentControlSet\\Control\\Print\\Printers"; DWORD cbData; DWORD cchPrinterName; + DWORD dwErrorCode; DWORD dwSubKeys; DWORD i; HKEY hKey = NULL; HKEY hSubKey = NULL; - LONG lStatus; PLOCAL_PRINTER pPrinter = NULL; PLOCAL_PRINT_PROCESSOR pPrintProcessor; PWSTR pwszPrintProcessor = NULL; @@ -54,18 +54,18 @@ InitializeSkiplist(&PrinterList, DllAllocSplMem, _PrinterListCompareRoutine, (PSKIPLIST_FREE_ROUTINE)DllFreeSplMem); // Open our printers registry key. Each subkey is a local printer there. - lStatus = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszPrintersKey, 0, KEY_READ, &hKey); - if (lStatus != ERROR_SUCCESS) - { - ERR("RegOpenKeyExW failed with status %ld!\n", lStatus); + dwErrorCode = (DWORD)RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszPrintersKey, 0, KEY_READ, &hKey); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed with status %lu!\n", dwErrorCode); goto Cleanup; } // Get the number of subkeys. - lStatus = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &dwSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - if (lStatus != ERROR_SUCCESS) - { - ERR("RegQueryInfoKeyW failed with status %ld!\n", lStatus); + dwErrorCode = (DWORD)RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &dwSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegQueryInfoKeyW failed with status %lu!\n", dwErrorCode); goto Cleanup; } @@ -105,23 +105,23 @@ // Get the name of this printer. cchPrinterName = _countof(wszPrinterName); - lStatus = RegEnumKeyExW(hKey, i, wszPrinterName, &cchPrinterName, NULL, NULL, NULL, NULL); - if (lStatus == ERROR_MORE_DATA) + dwErrorCode = (DWORD)RegEnumKeyExW(hKey, i, wszPrinterName, &cchPrinterName, NULL, NULL, NULL, NULL); + if (dwErrorCode == ERROR_MORE_DATA) { // This printer name exceeds the maximum length and is invalid. continue; } - else if (lStatus != ERROR_SUCCESS) - { - ERR("RegEnumKeyExW failed for iteration %lu with status %ld!\n", i, lStatus); + else if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegEnumKeyExW failed for iteration %lu with status %lu!\n", i, dwErrorCode); continue; } // Open this Printer's registry key. - lStatus = RegOpenKeyExW(hKey, wszPrinterName, 0, KEY_READ, &hSubKey); - if (lStatus != ERROR_SUCCESS) - { - ERR("RegOpenKeyExW failed for Printer \"%S\" with status %ld!\n", wszPrinterName, lStatus); + dwErrorCode = (DWORD)RegOpenKeyExW(hKey, wszPrinterName, 0, KEY_READ, &hSubKey); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed for Printer \"%S\" with status %lu!\n", wszPrinterName, dwErrorCode); continue; } @@ -142,6 +142,7 @@ pPrinter = DllAllocSplMem(sizeof(LOCAL_PRINTER)); if (!pPrinter) { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); goto Cleanup; } @@ -174,28 +175,28 @@ // Get the default DevMode. cbData = sizeof(DEVMODEW); - lStatus = RegQueryValueExW(hSubKey, L"Default DevMode", NULL, NULL, (PBYTE)&pPrinter->DefaultDevMode, &cbData); - if (lStatus != ERROR_SUCCESS || cbData != sizeof(DEVMODEW)) - { - ERR("Couldn't query a valid DevMode for Printer \"%S\", status is %ld, cbData is %lu!\n", wszPrinterName, lStatus, cbData); + dwErrorCode = (DWORD)RegQueryValueExW(hSubKey, L"Default DevMode", NULL, NULL, (PBYTE)&pPrinter->DefaultDevMode, &cbData); + if (dwErrorCode != ERROR_SUCCESS || cbData != sizeof(DEVMODEW)) + { + ERR("Couldn't query a valid DevMode for Printer \"%S\", status is %lu, cbData is %lu!\n", wszPrinterName, dwErrorCode, cbData); continue; } // Get the Attributes. cbData = sizeof(DWORD); - lStatus = RegQueryValueExW(hSubKey, L"Attributes", NULL, NULL, (PBYTE)&pPrinter->dwAttributes, &cbData); - if (lStatus != ERROR_SUCCESS) - { - ERR("Couldn't query Attributes for Printer \"%S\", status is %ld!\n", wszPrinterName, lStatus); + dwErrorCode = (DWORD)RegQueryValueExW(hSubKey, L"Attributes", NULL, NULL, (PBYTE)&pPrinter->dwAttributes, &cbData); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("Couldn't query Attributes for Printer \"%S\", status is %lu!\n", wszPrinterName, dwErrorCode); continue; } // Get the Status. cbData = sizeof(DWORD); - lStatus = RegQueryValueExW(hSubKey, L"Status", NULL, NULL, (PBYTE)&pPrinter->dwStatus, &cbData); - if (lStatus != ERROR_SUCCESS) - { - ERR("Couldn't query Status for Printer \"%S\", status is %ld!\n", wszPrinterName, lStatus); + dwErrorCode = (DWORD)RegQueryValueExW(hSubKey, L"Status", NULL, NULL, (PBYTE)&pPrinter->dwStatus, &cbData); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("Couldn't query Status for Printer \"%S\", status is %lu!\n", wszPrinterName, dwErrorCode); continue; } @@ -209,6 +210,8 @@ // Don't let the cleanup routines free this. pPrinter = NULL; } + + dwErrorCode = ERROR_SUCCESS; Cleanup: // Inside the loop @@ -238,6 +241,9 @@ // Outside the loop if (hKey) RegCloseKey(hKey); + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] Tue Jul 7 17:06:48 2015 @@ -111,7 +111,7 @@ * * Initializes a singly linked list of locally available Print Processors. */ -void +BOOL InitializePrintProcessorList() { DWORD cbDatatypes; @@ -119,15 +119,14 @@ DWORD cchPrintProcessorPath; DWORD cchMaxSubKey; DWORD cchPrintProcessorName; + DWORD dwErrorCode; DWORD dwSubKeys; DWORD i; HINSTANCE hinstPrintProcessor; HKEY hKey = NULL; HKEY hSubKey = NULL; HKEY hSubSubKey = NULL; - LONG lStatus; PLOCAL_PRINT_PROCESSOR pPrintProcessor = NULL; - PWSTR pwszPrintProcessorName = NULL; WCHAR wszFileName[MAX_PATH]; WCHAR wszPrintProcessorPath[MAX_PATH]; @@ -136,36 +135,32 @@ // Prepare the path to the Print Processor directory. if (!LocalGetPrintProcessorDirectory(NULL, NULL, 1, (PBYTE)wszPrintProcessorPath, sizeof(wszPrintProcessorPath), &cchPrintProcessorPath)) - goto Cleanup; + { + dwErrorCode = GetLastError(); + goto Cleanup; + } cchPrintProcessorPath /= sizeof(WCHAR); wszPrintProcessorPath[cchPrintProcessorPath++] = L'\\'; // Open the environment registry key. - if (_OpenEnvironment(NULL, &hKey) != ERROR_SUCCESS) + dwErrorCode = _OpenEnvironment(NULL, &hKey); + if (dwErrorCode != ERROR_SUCCESS) goto Cleanup; // Open the "Print Processors" subkey. - lStatus = RegOpenKeyExW(hKey, L"Print Processors", 0, KEY_READ, &hSubKey); - if (lStatus != ERROR_SUCCESS) - { - ERR("RegOpenKeyExW failed with status %ld!\n", lStatus); + dwErrorCode = (DWORD)RegOpenKeyExW(hKey, L"Print Processors", 0, KEY_READ, &hSubKey); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed with status %lu!\n", dwErrorCode); goto Cleanup; } // Get the number of Print Processors and maximum sub key length. - lStatus = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, &dwSubKeys, &cchMaxSubKey, NULL, NULL, NULL, NULL, NULL, NULL); - if (lStatus != ERROR_SUCCESS) - { - ERR("RegQueryInfoKeyW failed with status %ld!\n", lStatus); - goto Cleanup; - } - - // Allocate a temporary buffer for the Print Processor names. - pwszPrintProcessorName = DllAllocSplMem((cchMaxSubKey + 1) * sizeof(WCHAR)); - if (!pwszPrintProcessorName) - { - ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + dwErrorCode = (DWORD)RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, &dwSubKeys, &cchMaxSubKey, NULL, NULL, NULL, NULL, NULL, NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegQueryInfoKeyW failed with status %lu!\n", dwErrorCode); goto Cleanup; } @@ -191,36 +186,54 @@ pPrintProcessor = NULL; } + // Create a new LOCAL_PRINT_PROCESSOR structure for it. + pPrintProcessor = DllAllocSplMem(sizeof(LOCAL_PRINT_PROCESSOR)); + if (!pPrintProcessor) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + // Allocate memory for the Print Monitor Name. + pPrintProcessor->pwszName = DllAllocSplMem((cchMaxSubKey + 1) * sizeof(WCHAR)); + if (!pPrintProcessor->pwszName) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + // Get the name of this Print Processor. cchPrintProcessorName = cchMaxSubKey + 1; - lStatus = RegEnumKeyExW(hSubKey, i, pwszPrintProcessorName, &cchPrintProcessorName, NULL, NULL, NULL, NULL); - if (lStatus != ERROR_SUCCESS) - { - ERR("RegEnumKeyExW failed with status %ld!\n", lStatus); + dwErrorCode = (DWORD)RegEnumKeyExW(hSubKey, i, pPrintProcessor->pwszName, &cchPrintProcessorName, NULL, NULL, NULL, NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegEnumKeyExW failed with status %ld!\n", dwErrorCode); continue; } // Open this Print Processor's registry key. - lStatus = RegOpenKeyExW(hSubKey, pwszPrintProcessorName, 0, KEY_READ, &hSubSubKey); - if (lStatus != ERROR_SUCCESS) - { - ERR("RegOpenKeyExW failed for Print Processor \"%S\" with status %ld!\n", pwszPrintProcessorName, lStatus); + dwErrorCode = (DWORD)RegOpenKeyExW(hSubKey, pPrintProcessor->pwszName, 0, KEY_READ, &hSubSubKey); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed for Print Processor \"%S\" with status %lu!\n", pPrintProcessor->pwszName, dwErrorCode); continue; } // Get the file name of the Print Processor. cbFileName = sizeof(wszFileName); - lStatus = RegQueryValueExW(hSubSubKey, L"Driver", NULL, NULL, (PBYTE)wszFileName, &cbFileName); - if (lStatus != ERROR_SUCCESS) - { - ERR("RegQueryValueExW failed for Print Processor \"%S\" with status %ld!\n", pwszPrintProcessorName, lStatus); + dwErrorCode = (DWORD)RegQueryValueExW(hSubSubKey, L"Driver", NULL, NULL, (PBYTE)wszFileName, &cbFileName); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed for Print Processor \"%S\" with status %lu!\n", pPrintProcessor->pwszName, dwErrorCode); continue; } // Verify that our buffer is large enough. if (cchPrintProcessorPath + cbFileName / sizeof(WCHAR) > MAX_PATH) { - ERR("Print Processor directory \"%S\" for Print Processor \"%S\" is too long!\n", wszFileName, pwszPrintProcessorName); + ERR("Print Processor directory \"%S\" for Print Processor \"%S\" is too long!\n", wszFileName, pPrintProcessor->pwszName); continue; } @@ -229,15 +242,11 @@ // Try to load it. hinstPrintProcessor = LoadLibraryW(wszPrintProcessorPath); - if (lStatus != ERROR_SUCCESS) + if (!hinstPrintProcessor) { ERR("LoadLibraryW failed for \"%S\" with error %lu!\n", wszPrintProcessorPath, GetLastError()); continue; } - - // Create a new LOCAL_PRINT_PROCESSOR structure for it. - pPrintProcessor = DllAllocSplMem(sizeof(LOCAL_PRINT_PROCESSOR)); - pPrintProcessor->pwszName = AllocSplStr(pwszPrintProcessorName); // Get and verify all its function pointers. pPrintProcessor->pfnClosePrintProcessor = (PClosePrintProcessor)GetProcAddress(hinstPrintProcessor, "ClosePrintProcessor"); @@ -287,6 +296,7 @@ pPrintProcessor->pDatatypesInfo1 = DllAllocSplMem(cbDatatypes); if (!pPrintProcessor->pDatatypesInfo1) { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); goto Cleanup; } @@ -303,6 +313,8 @@ // Don't let the cleanup routines free this. pPrintProcessor = NULL; } + + dwErrorCode = ERROR_SUCCESS; Cleanup: // Inside the loop @@ -321,14 +333,14 @@ } // Outside the loop - if (pwszPrintProcessorName) - DllFreeSplStr(pwszPrintProcessorName); - if (hSubKey) RegCloseKey(hSubKey); if (hKey) RegCloseKey(hKey); + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } /**

1 0

[tfaber] 68374: [SHELL32_WINETEST] - Sync shfldr_special.c and shlview.c with Wine. Fixes some shell folder reference leaks. CORE-9867
by tfaber＠svn.reactos.org 07 Jul '15

07 Jul '15

Author: tfaber Date: Tue Jul 7 13:44:32 2015 New Revision: 68374 URL: http://svn.reactos.org/svn/reactos?rev=68374&view=rev Log: [SHELL32_WINETEST] - Sync shfldr_special.c and shlview.c with Wine. Fixes some shell folder reference leaks. CORE-9867 Modified: trunk/rostests/winetests/shell32/shfldr_special.c trunk/rostests/winetests/shell32/shlview.c Modified: trunk/rostests/winetests/shell32/shfldr_special.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shfldr_… ============================================================================== --- trunk/rostests/winetests/shell32/shfldr_special.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shfldr_special.c [iso-8859-1] Tue Jul 7 13:44:32 2015 @@ -77,6 +77,7 @@ attr = ~0; hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, entire_network_path, &eaten, &pidl, &attr); + IShellFolder_Release(psfDesktop); if (hr == HRESULT_FROM_WIN32(ERROR_BAD_NET_NAME) || hr == HRESULT_FROM_WIN32(ERROR_NO_NET_OR_BAD_PATH) || hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER)) @@ -125,6 +126,7 @@ "Unexpected attributes : %08x\n", attr); ILFree(pidl); + IShellFolder_Release(psfDesktop); } static void test_printers_folder(void) @@ -222,9 +224,24 @@ CoUninitialize(); } +static void test_desktop_folder(void) +{ + IShellFolder *psf; + HRESULT hr; + + hr = SHGetDesktopFolder(&psf); + ok(hr == S_OK, "Got %x\n", hr); + + hr = IShellFolder_QueryInterface(psf, &IID_IShellFolder, NULL); + ok(hr == E_POINTER, "Got %x\n", hr); + + IShellFolder_Release(psf); +} + START_TEST(shfldr_special) { test_parse_for_entire_network(); test_parse_for_control_panel(); test_printers_folder(); -} + test_desktop_folder(); +} Modified: trunk/rostests/winetests/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlview… ============================================================================== --- trunk/rostests/winetests/shell32/shlview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlview.c [iso-8859-1] Tue Jul 7 13:44:32 2015 @@ -485,15 +485,156 @@ { 0 } }; -static void test_IShellView_CreateViewWindow(void) +static HRESULT WINAPI shellbrowser_QueryInterface(IShellBrowser *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if (IsEqualGUID(&IID_IShellBrowser, riid) || + IsEqualGUID(&IID_IOleWindow, riid) || + IsEqualGUID(&IID_IUnknown, riid)) + { + *ppv = iface; + } + + if (*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI shellbrowser_AddRef(IShellBrowser *iface) +{ + return 2; +} + +static ULONG WINAPI shellbrowser_Release(IShellBrowser *iface) +{ + return 1; +} + +static HRESULT WINAPI shellbrowser_GetWindow(IShellBrowser *iface, HWND *phwnd) +{ + *phwnd = GetDesktopWindow(); + return S_OK; +} + +static HRESULT WINAPI shellbrowser_ContextSensitiveHelp(IShellBrowser *iface, BOOL mode) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_InsertMenusSB(IShellBrowser *iface, HMENU hmenuShared, + OLEMENUGROUPWIDTHS *menuwidths) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetMenuSB(IShellBrowser *iface, HMENU hmenuShared, + HOLEMENU holemenuReserved, HWND hwndActiveObject) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_RemoveMenusSB(IShellBrowser *iface, HMENU hmenuShared) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetStatusTextSB(IShellBrowser *iface, LPCOLESTR text) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_EnableModelessSB(IShellBrowser *iface, BOOL enable) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_TranslateAcceleratorSB(IShellBrowser *iface, MSG *pmsg, WORD wID) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_BrowseObject(IShellBrowser *iface, LPCITEMIDLIST pidl, UINT flags) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_GetViewStateStream(IShellBrowser *iface, DWORD mode, IStream **stream) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_GetControlWindow(IShellBrowser *iface, UINT id, HWND *phwnd) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SendControlMsg(IShellBrowser *iface, UINT id, UINT uMsg, + WPARAM wParam, LPARAM lParam, LRESULT *pret) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_QueryActiveShellView(IShellBrowser *iface, IShellView **view) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_OnViewWindowActive(IShellBrowser *iface, IShellView *view) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetToolbarItems(IShellBrowser *iface, LPTBBUTTONSB buttons, + UINT count, UINT flags) +{ + return E_NOTIMPL; +} + +static const IShellBrowserVtbl shellbrowservtbl = { + shellbrowser_QueryInterface, + shellbrowser_AddRef, + shellbrowser_Release, + shellbrowser_GetWindow, + shellbrowser_ContextSensitiveHelp, + shellbrowser_InsertMenusSB, + shellbrowser_SetMenuSB, + shellbrowser_RemoveMenusSB, + shellbrowser_SetStatusTextSB, + shellbrowser_EnableModelessSB, + shellbrowser_TranslateAcceleratorSB, + shellbrowser_BrowseObject, + shellbrowser_GetViewStateStream, + shellbrowser_GetControlWindow, + shellbrowser_SendControlMsg, + shellbrowser_QueryActiveShellView, + shellbrowser_OnViewWindowActive, + shellbrowser_SetToolbarItems +}; + +static IShellBrowser test_shellbrowser = { &shellbrowservtbl }; + +static void test_CreateViewWindow(void) { IShellFolder *desktop; + HWND hwnd_view, hwnd2; FOLDERSETTINGS settings; IShellView *view; IDropTarget *dt; - HWND hwnd_view; HRESULT hr; RECT r = {0}; + ULONG ref1, ref2; hr = SHGetDesktopFolder(&desktop); ok(hr == S_OK, "got (0x%08x)\n", hr); @@ -519,6 +660,16 @@ ok(hr == E_UNEXPECTED, "got (0x%08x)\n", hr); ok(hwnd_view == 0, "got %p\n", hwnd_view); + hwnd_view = NULL; + hr = IShellView_CreateViewWindow(view, NULL, &settings, &test_shellbrowser, &r, &hwnd_view); + ok(hr == S_OK || broken(hr == S_FALSE), "got (0x%08x)\n", hr); + ok(hwnd_view != 0, "got %p\n", hwnd_view); + + hwnd2 = (HWND)0xdeadbeef; + hr = IShellView_CreateViewWindow(view, NULL, &settings, &test_shellbrowser, &r, &hwnd2); + ok(hr == E_UNEXPECTED, "got (0x%08x)\n", hr); + ok(hwnd2 == NULL, "got %p\n", hwnd2); + /* ::DragLeave without drag operation */ hr = IShellView_QueryInterface(view, &IID_IDropTarget, (void**)&dt); ok(hr == S_OK, "got (0x%08x)\n", hr); @@ -526,7 +677,29 @@ ok(hr == S_OK, "got (0x%08x)\n", hr); IDropTarget_Release(dt); - IShellView_Release(view); + IShellView_AddRef(view); + ref1 = IShellView_Release(view); + hr = IShellView_DestroyViewWindow(view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(!IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); + ref2 = IShellView_Release(view); + ok(ref1 > ref2, "expected %u > %u\n", ref1, ref2); + ref1 = ref2; + + /* Show that releasing the shell view does not destroy the window */ + hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + hwnd_view = NULL; + hr = IShellView_CreateViewWindow(view, NULL, &settings, &test_shellbrowser, &r, &hwnd_view); + ok(hr == S_OK || broken(hr == S_FALSE), "got (0x%08x)\n", hr); + ok(hwnd_view != NULL, "got %p\n", hwnd_view); + ok(IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); + ref2 = IShellView_Release(view); + ok(ref2 != 0, "ref2 = %u\n", ref2); + ok(ref2 > ref1, "expected %u > %u\n", ref2, ref1); + ok(IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); + DestroyWindow(hwnd_view); + IShellFolder_Release(desktop); } @@ -536,13 +709,14 @@ FOLDERSETTINGS settings; IShellView *view; IShellBrowser *browser; + IFolderView2 *fv2; IFolderView *fv; + IUnknown *unk; HWND hwnd_view, hwnd_list; PITEMID_CHILD pidl; HRESULT hr; INT ret, count; POINT pt; - LONG ref1, ref2; RECT r; hr = SHGetDesktopFolder(&desktop); @@ -670,15 +844,23 @@ hr = IFolderView_GetFolder(fv, &IID_IShellFolder, NULL); ok(hr == E_POINTER, "got (0x%08x)\n", hr); - ref1 = IShellFolder_AddRef(desktop); - IShellFolder_Release(desktop); hr = IFolderView_GetFolder(fv, &IID_IShellFolder, (void**)&folder); ok(hr == S_OK, "got (0x%08x)\n", hr); - ref2 = IShellFolder_AddRef(desktop); - IShellFolder_Release(desktop); - ok(ref1 == ref2 || ref1 + 1 == ref2, /* >= vista */ - "expected same refcount, got %d\n", ref2); ok(desktop == folder, "\n"); + if (folder) IShellFolder_Release(folder); + + hr = IFolderView_GetFolder(fv, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got (0x%08x)\n", hr); + if (unk) IUnknown_Release(unk); + + hr = IFolderView_QueryInterface(fv, &IID_IFolderView2, (void**)&fv2); + if (hr != S_OK) + win_skip("IFolderView2 is not supported.\n"); + if (fv2) IFolderView2_Release(fv2); + + hr = IShellView_DestroyViewWindow(view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(!IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); IShellBrowser_Release(browser); IFolderView_Release(fv); @@ -707,7 +889,7 @@ unk = NULL; hr = IShellView_GetItemObject(view, SVGIO_BACKGROUND, &IID_IDispatch, (void**)&unk); - todo_wine ok(hr == S_OK || broken(hr == E_NOTIMPL) /* NT4 */, "got (0x%08x)\n", hr); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* NT4 */, "got (0x%08x)\n", hr); if (unk) IUnknown_Release(unk); unk = NULL; @@ -782,6 +964,7 @@ { IShellFolder *desktop; IShellView *view; + IOleWindow *wnd; HRESULT hr; hr = SHGetDesktopFolder(&desktop); @@ -789,6 +972,9 @@ hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellView_QueryInterface(view, &IID_IOleWindow, (void**)&wnd); + ok(hr == E_NOINTERFACE, "got (0x%08x)\n", hr); /* IShellView::ContextSensitiveHelp */ hr = IShellView_ContextSensitiveHelp(view, TRUE); @@ -1152,7 +1338,7 @@ init_msg_sequences(sequences, NUM_MSG_SEQUENCES); - test_IShellView_CreateViewWindow(); + test_CreateViewWindow(); test_IFolderView(); test_GetItemObject(); test_IShellFolderView();

1 0

[gedmurphy] 68373: [DEVMGR] Start to fixup and merge the resources. English only at the moment
by gedmurphy＠svn.reactos.org 07 Jul '15

07 Jul '15

Author: gedmurphy Date: Tue Jul 7 12:51:45 2015 New Revision: 68373 URL: http://svn.reactos.org/svn/reactos?rev=68373&view=rev Log: [DEVMGR] Start to fixup and merge the resources. English only at the moment Added: trunk/reactos/dll/win32/devmgr_new/api.c (with props) trunk/reactos/dll/win32/devmgr_new/resources/computer.ico - copied unchanged from r68369, trunk/reactos/dll/win32/devmgr_new/devmgmt/res/computer.ico trunk/reactos/dll/win32/devmgr_new/resources/root.bmp - copied unchanged from r68369, trunk/reactos/dll/win32/devmgr_new/devmgmt/res/root.bmp trunk/reactos/dll/win32/devmgr_new/resources/toolbar.bmp - copied unchanged from r68369, trunk/reactos/dll/win32/devmgr_new/devmgmt/res/toolbar.bmp Removed: trunk/reactos/dll/win32/devmgr_new/devmgmt/lang/tr-TR.rc trunk/reactos/dll/win32/devmgr_new/devmgmt/res/computer.ico trunk/reactos/dll/win32/devmgr_new/devmgmt/res/root.bmp trunk/reactos/dll/win32/devmgr_new/devmgmt/res/toolbar.bmp trunk/reactos/dll/win32/devmgr_new/resources/devmgr.ico Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt trunk/reactos/dll/win32/devmgr_new/devmgr.rc trunk/reactos/dll/win32/devmgr_new/lang/en-US.rc trunk/reactos/dll/win32/devmgr_new/properties/stubs.c trunk/reactos/dll/win32/devmgr_new/resource.h Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/CMake… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [iso-8859-1] Tue Jul 7 12:51:45 2015 @@ -1,18 +1,18 @@ spec2def(devmgr.dll devmgr.spec ADD_IMPORTLIB) -set_cpp(WITH_RTTI WITH_STL) +set_cpp(WITH_RTTI WITH_RUNTIME) include_directories(${REACTOS_SOURCE_DIR}/lib/atl) list(APPEND SOURCE precomp.h - Properties/advprop.c - Properties/devprblm.c - Properties/hwpage.c - Properties/hwresource.c - Properties/misc.c - Properties/stubs.c + properties/advprop.c + properties/devprblm.c + properties/hwpage.c + properties/hwresource.c + properties/misc.c + properties/stubs.c devmgmt/ClassNode.cpp devmgmt/DeviceNode.cpp devmgmt/DeviceView.cpp Added: trunk/reactos/dll/win32/devmgr_new/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/api.c… ============================================================================== (empty) Propchange: trunk/reactos/dll/win32/devmgr_new/api.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/win32/devmgr_new/devmgmt/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/lang/tr-TR.rc (removed) @@ -1,98 +0,0 @@ -/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ - -LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT - -IDR_MAINMENU MENU -BEGIN - POPUP "&KÃ¼tÃ¼k" - BEGIN - MENUITEM "&ÃÄ±kÄ±Å", IDC_EXIT - END - POPUP "&Eylem" - BEGIN - MENUITEM "&SÃ¼rÃ¼cÃ¼ YazÄ±lmÄ±nÄ± ÅimdikileÅtir..." IDC_UPDATE_DRV - MENUITEM "&EtkinleÅtir" IDC_ENABLE_DRV - MENUITEM "E&dilginleÅtir" IDC_DISABLE_DRV - MENUITEM "&KaldÄ±r" IDC_UNINSTALL_DRV - MENUITEM SEPARATOR - MENUITEM "D&onanÄ±m DeÄiÅiklikleri Ä°Ã§in Tara" IDC_SCAN_HARDWARE - MENUITEM "Do&nanÄ±m Ekle" IDC_ADD_HARDWARE, GRAYED - MENUITEM SEPARATOR - MENUITEM "&HusÃ»siyetler", IDC_PROPERTIES - END - POPUP "&GÃ¶rÃ¼nÃ¼m" - BEGIN - MENUITEM "&TÃ¼re GÃ¶re AygÄ±tlar", IDC_DEVBYTYPE - MENUITEM "&BaÄlantÄ±ya GÃ¶re AygÄ±tlar", IDC_DEVBYCONN - MENUITEM "T&Ã¼re GÃ¶re Kaynaklar", IDC_RESBYTYPE, GRAYED - MENUITEM "B&aÄlantÄ±ya GÃ¶re Kaynaklar", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Gizli AygÄ±tlarÄ± GÃ¶ster", IDC_SHOWHIDDEN - END - POPUP "&YardÄ±m" - BEGIN - MENUITEM "&Ãzerine", IDC_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM "&SÃ¼rÃ¼cÃ¼ YazÄ±lmÄ±nÄ± ÅimdikileÅtir..." IDC_UPDATE_DRV - MENUITEM "&EtkinleÅtir" IDC_ENABLE_DRV - MENUITEM "E&dilginleÅtir" IDC_DISABLE_DRV - MENUITEM "&KaldÄ±r" IDC_UNINSTALL_DRV - MENUITEM SEPARATOR - MENUITEM "D&onanÄ±m DeÄiÅiklikleri Ä°Ã§in Tara" IDC_SCAN_HARDWARE - MENUITEM "Do&nanÄ±m Ekle" IDC_ADD_HARDWARE, GRAYED - MENUITEM SEPARATOR - MENUITEM "&HusÃ»siyetler", IDC_PROPERTIES - END -END - -#define IDS_HINT_PROPERTIES 20001 -#define IDS_HINT_SCAN 20002 -#define IDS_HINT_ENABLE 20003 -#define IDS_HINT_DISABLE 20004 -#define IDS_HINT_UPDATE 20005 -#define IDS_HINT_UNINSTALL 20006 - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_PROPERTIES "HusÃ»siyetler" - IDS_TOOLTIP_SCAN "DonanÄ±m DeÄiÅiklikleri Ä°Ã§in Tara" - IDS_TOOLTIP_ENABLE "EtkinleÅtir" - IDS_TOOLTIP_DISABLE "EdilginleÅtir" - IDS_TOOLTIP_UPDATE "SÃ¼rÃ¼cÃ¼ YazÄ±lmÄ±nÄ± ÅimdikileÅtir" - IDS_TOOLTIP_UNINSTALL "KaldÄ±r" -END - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "AygÄ±t YÃ¶neticisi" - IDS_HINT_BLANK " " - IDS_HINT_PROPERTIES " Åimdiki seÃ§ilen iÃ§in husÃ»siyet penceresini aÃ§ar." - IDS_HINT_SCAN " Yeni ya da deÄiÅtirilmiÅ tak ve Ã§alÄ±ÅtÄ±r aygÄ±tlarÄ± iÃ§in tarar." - IDS_HINT_ENABLE " SeÃ§ili aygÄ±tÄ± etkinleÅtirir." - IDS_HINT_DISABLE " SeÃ§ili aygÄ±tÄ± edilginleÅtirir." - IDS_HINT_UPDATE " SeÃ§ili aygÄ±t iÃ§in SÃ¼rÃ¼cÃ¼ YazÄ±lÄ±mÄ±nÄ± ÅimdikileÅtir yardÄ±mcÄ±sÄ±nÄ± baÅlatÄ±r." - IDS_HINT_UNINSTALL " SeÃ§ili aygÄ±t iÃ§in sÃ¼rÃ¼cÃ¼yÃ¼ kaldÄ±rÄ±r." - IDS_HINT_ADD " Bilgisayara eski (Tak ve ÃalÄ±ÅtÄ±r olmayan) bir aygÄ±t ekler." - IDS_HINT_ABOUT " AygÄ±t YÃ¶neticisi Ã¼zerine." - IDS_HINT_EXIT " Ä°zlenceden Ã§Ä±kar." - - IDS_HINT_DEV_BY_TYPE " DonanÄ±m tÃ¼rÃ¼ne gÃ¶re aygÄ±tlarÄ± gÃ¶rÃ¼ntÃ¼ler." - IDS_HINT_DEV_BY_CONN " BaÄlantÄ±ya gÃ¶re aygÄ±tlarÄ± gÃ¶rÃ¼ntÃ¼ler." - IDS_HINT_RES_BY_TYPE " TÃ¼re gÃ¶re kaynaklarÄ± gÃ¶rÃ¼ntÃ¼ler." - IDS_HINT_RES_BY_CONN " BaÄlantÄ± tÃ¼rÃ¼ne gÃ¶re kaynaklarÄ± gÃ¶rÃ¼ntÃ¼ler." - IDS_HINT_SHOW_HIDDEN " Eski aygÄ±tlarÄ± ve artÄ±k kurulu olmayacak aygÄ±tlarÄ± gÃ¶rÃ¼ntÃ¼ler." - - IDS_HINT_SYS_RESTORE " Bu pencereyi dÃ¼zgÃ¼lÃ¼k boyutlarÄ±na dÃ¶ndÃ¼rÃ¼r." - IDS_HINT_SYS_MOVE " Bu pencereyi devindirir." - IDS_HINT_SYS_SIZE " Bu pencereyi yeniden boyutlandÄ±rÄ±r." - IDS_HINT_SYS_MINIMIZE " Bu pencereyi bir simgeye kÃ¼Ã§Ã¼ltÃ¼r." - IDS_HINT_SYS_MAXIMIZE " Bu pencereyi, bu gÃ¶rÃ¼ntÃ¼lÃ¼ÄÃ¼ kaplatana dek geniÅletir." - IDS_HINT_SYS_CLOSE " Bu pencereyi kapatÄ±r." -END Removed: trunk/reactos/dll/win32/devmgr_new/devmgmt/res/computer.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/devmgr_new/devmgmt/res/root.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/devmgr_new/devmgmt/res/toolbar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== Binary file - no diff available. Modified: trunk/reactos/dll/win32/devmgr_new/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgr.rc [iso-8859-1] Tue Jul 7 12:51:45 2015 @@ -12,9 +12,15 @@ #define REACTOS_STR_ORIGINAL_FILENAME "devmgr.dll" #include <reactos/version.rc> -IDI_DEVMGR ICON "resources/devmgr.ico" +IDI_MAIN_ICON ICON "resources/computer.ico" +IDB_ROOT_IMAGE BITMAP "resources/root.bmp" + +/* main toolbar icons */ +IDB_TOOLBAR BITMAP DISCARDABLE "resources/toolbar.bmp" #include <reactos/manifest_dll.rc> + +#define LANGUAGE_EN_US /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/devmgr_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/lang/… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/lang/en-US.rc [iso-8859-1] Tue Jul 7 12:51:45 2015 @@ -235,3 +235,85 @@ ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END + + +/* + This code relates to the device manager GUI + */ + +IDR_MAINMENU MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDC_EXIT + END + MENUITEM "Action" IDC_ACTIONMENU + POPUP "View" + BEGIN + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + END + POPUP "Help" + BEGIN + MENUITEM "About", IDC_ABOUT + END +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" +END +STRINGTABLE DISCARDABLE +BEGIN + IDS_MENU_UPDATE "Update driver software..." + IDS_MENU_ENABLE "Enable" + IDS_MENU_DISABLE "Disable" + IDS_MENU_UNINSTALL "Uninstall" + IDS_MENU_SCAN "Scan for hardware changes" + IDS_MENU_ADD "Add hardware" + IDS_MENU_PROPERTIES "Properties" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROPERTIES "Properties" + IDS_TOOLTIP_SCAN "Scan for hardware changes" + IDS_TOOLTIP_ENABLE "Enable" + IDS_TOOLTIP_DISABLE "Disable" + IDS_TOOLTIP_UPDATE "Update Driver Software" + IDS_TOOLTIP_UNINSTALL "Uninstall" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS Device Manager" + IDS_HINT_BLANK " " + IDS_HINT_PROPERTIES " Open property dialog for the current selection." + IDS_HINT_SCAN " Scan for changed or new plug and play devices." + IDS_HINT_ENABLE " Enables the selected device." + IDS_HINT_DISABLE " Disables the selected device." + IDS_HINT_UPDATE " Launches the Update Driver Software wizard for the selected device." + IDS_HINT_UNINSTALL " Uninstalls the driver for the selected device." + IDS_HINT_ADD " Adds a legacy (non-Plug and Play) device to the computer." + IDS_HINT_ABOUT " About ReactOS Device Manager." + IDS_HINT_EXIT " Exits the program." + + IDS_HINT_DEV_BY_TYPE " Displays devices by hardware type." + IDS_HINT_DEV_BY_CONN " Displays devices by connection." + IDS_HINT_RES_BY_TYPE " Displays resources by type." + IDS_HINT_RES_BY_CONN " Displays resources by connection type." + IDS_HINT_SHOW_HIDDEN " Displays legacy devices and devices that are no longer installed." + + IDS_HINT_SYS_RESTORE " Restores this window to normal size." + IDS_HINT_SYS_MOVE " Moves this window." + IDS_HINT_SYS_SIZE " Resizes this window." + IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." + IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." + IDS_HINT_SYS_CLOSE " Closes this window." +END Modified: trunk/reactos/dll/win32/devmgr_new/properties/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/stubs.c [iso-8859-1] Tue Jul 7 12:51:45 2015 @@ -81,16 +81,16 @@ * * @unimplemented */ -BOOL -WINAPI -DeviceManager_ExecuteW(HWND hWndParent, - HINSTANCE hInst, - LPCWSTR lpMachineName, - int nCmdShow) -{ - UNIMPLEMENTED; - return FALSE; -} +//BOOL +//WINAPI +//DeviceManager_ExecuteW(HWND hWndParent, +// HINSTANCE hInst, +// LPCWSTR lpMachineName, +// int nCmdShow) +//{ +// UNIMPLEMENTED; +// return FALSE; +//} /*************************************************************************** Modified: trunk/reactos/dll/win32/devmgr_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/resou… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/resource.h [iso-8859-1] Tue Jul 7 12:51:45 2015 @@ -1,46 +1,98 @@ #pragma once -#define IDI_DEVMGR 100 - -#define IDD_HARDWARE 100 -#define IDD_DEVICEGENERAL 101 -#define IDD_DEVICEDRIVER 102 -#define IDD_DEVICERESOURCES 103 -#define IDD_DRIVERDETAILS 104 -#define IDD_DEVICEDETAILS 105 -#define IDD_DEVICEPOWER 106 - -#define IDC_DEVICON 0x57B -#define IDC_DEVNAME 0x57C -#define IDC_DEVTYPE 0x57D -#define IDC_DEVMANUFACTURER 0x57E -#define IDC_DEVLOCATION 0x57F -#define IDC_DEVSTATUSGROUP 0x580 -#define IDC_DEVSTATUS 0x581 -#define IDC_DEVUSAGE 0x582 -#define IDC_DEVICES 0x583 -#define IDC_LV_DEVICES 0x584 -#define IDC_PROPERTIESGROUP 0x585 -#define IDC_MANUFACTURER 0x587 -#define IDC_LOCATION 0x588 -#define IDC_STATUS 0x586 -#define IDC_TROUBLESHOOT 0x589 -#define IDC_PROPERTIES 0x58A -#define IDC_DEVUSAGELABEL 0x58B -#define IDC_DEVPROBLEM 0x58C -#define IDC_DRVPROVIDER 0x58D -#define IDC_DRVDATE 0x58E -#define IDC_DRVVERSION 0x58F -#define IDC_DIGITALSIGNER 0x590 -#define IDC_DRIVERDETAILS 0x591 -#define IDC_DRIVERFILES 0x592 -#define IDC_FILEPROVIDER 0x593 -#define IDC_FILEVERSION 0x594 -#define IDC_FILECOPYRIGHT 0x595 -#define IDC_DETAILSPROPNAME 0x596 -#define IDC_DETAILSPROPVALUE 0x597 -#define IDC_UPDATEDRIVER 0x598 -#define IDC_DRIVERRESOURCES 0x599 +#define IDC_STATIC -1 + +#define IDS_APPNAME 10 + +#define IDI_MAIN_ICON 20 +#define IDB_ROOT_IMAGE 21 +#define IDB_TOOLBAR 22 + +/* windows */ +#define IDC_TREEVIEW 30 +#define IDC_TOOLBAR 31 +#define IDC_STATUSBAR 32 +#define IDR_MAINMENU 33 +#define IDR_POPUP 34 + +/* Actions */ +#define IDC_PROPERTIES 40 +#define IDC_SCAN_HARDWARE 41 +#define IDC_ENABLE_DRV 42 +#define IDC_DISABLE_DRV 43 +#define IDC_UPDATE_DRV 44 +#define IDC_UNINSTALL_DRV 45 +#define IDC_ADD_HARDWARE 46 + +/* Menu items */ +#define IDC_ACTIONMENU 50 +#define IDC_ABOUT 51 +#define IDC_EXIT 52 + + +/* view menu */ +#define IDC_DEVBYTYPE 60 +#define IDC_DEVBYCONN 61 +#define IDC_RESBYTYPE 62 +#define IDC_RESBYCONN 63 +#define IDC_SHOWHIDDEN 64 + + +/* tooltips */ +#define IDS_TOOLTIP_PROPERTIES 70 +#define IDS_TOOLTIP_SCAN 71 +#define IDS_TOOLTIP_ENABLE 72 +#define IDS_TOOLTIP_DISABLE 73 +#define IDS_TOOLTIP_UPDATE 74 +#define IDS_TOOLTIP_UNINSTALL 75 + +/* General strings */ +#define IDS_CONFIRM_DISABLE 80 + +/* Menu strings */ +#define IDS_MENU_UPDATE 90 +#define IDS_MENU_ENABLE 91 +#define IDS_MENU_DISABLE 92 +#define IDS_MENU_UNINSTALL 93 +#define IDS_MENU_SCAN 94 +#define IDS_MENU_ADD 95 +#define IDS_MENU_PROPERTIES 96 + + +/* menu hints */ +#define IDS_HINT_BLANK 100 +#define IDS_HINT_PROPERTIES 101 +#define IDS_HINT_SCAN 102 +#define IDS_HINT_ENABLE 103 +#define IDS_HINT_DISABLE 104 +#define IDS_HINT_UPDATE 105 +#define IDS_HINT_UNINSTALL 106 +#define IDS_HINT_ADD 107 +#define IDS_HINT_ABOUT 108 +#define IDS_HINT_EXIT 109 + +#define IDS_HINT_DEV_BY_TYPE 120 +#define IDS_HINT_DEV_BY_CONN 121 +#define IDS_HINT_RES_BY_TYPE 123 +#define IDS_HINT_RES_BY_CONN 124 +#define IDS_HINT_SHOW_HIDDEN 125 + +/* system menu hints */ +#define IDS_HINT_SYS_RESTORE 130 +#define IDS_HINT_SYS_MOVE 131 +#define IDS_HINT_SYS_SIZE 132 +#define IDS_HINT_SYS_MINIMIZE 133 +#define IDS_HINT_SYS_MAXIMIZE 134 +#define IDS_HINT_SYS_CLOSE 135 + + + + + + + + +#define IDI_DEVMGR 255 #define IDS_NAME 0x100 #define IDS_TYPE 0x101 @@ -154,3 +206,43 @@ #define IDS_PROP_CURRENTPOWERSTATE 0x315 #define IDS_PROP_POWERCAPABILITIES 0x316 #define IDS_PROP_POWERSTATEMAPPINGS 0x317 + +#define IDD_HARDWARE 0x400 +#define IDD_DEVICEGENERAL 0x401 +#define IDD_DEVICEDRIVER 0x402 +#define IDD_DEVICERESOURCES 0x403 +#define IDD_DRIVERDETAILS 0x404 +#define IDD_DEVICEDETAILS 0x405 +#define IDD_DEVICEPOWER 0x406 + +#define IDC_DEVICON 0x57B +#define IDC_DEVNAME 0x57C +#define IDC_DEVTYPE 0x57D +#define IDC_DEVMANUFACTURER 0x57E +#define IDC_DEVLOCATION 0x57F +#define IDC_DEVSTATUSGROUP 0x580 +#define IDC_DEVSTATUS 0x581 +#define IDC_DEVUSAGE 0x582 +#define IDC_DEVICES 0x583 +#define IDC_LV_DEVICES 0x584 +#define IDC_PROPERTIESGROUP 0x585 +#define IDC_MANUFACTURER 0x587 +#define IDC_LOCATION 0x588 +#define IDC_STATUS 0x586 +#define IDC_TROUBLESHOOT 0x589 +#define IDC_PROPERTIES2 0x58A +#define IDC_DEVUSAGELABEL 0x58B +#define IDC_DEVPROBLEM 0x58C +#define IDC_DRVPROVIDER 0x58D +#define IDC_DRVDATE 0x58E +#define IDC_DRVVERSION 0x58F +#define IDC_DIGITALSIGNER 0x590 +#define IDC_DRIVERDETAILS 0x591 +#define IDC_DRIVERFILES 0x592 +#define IDC_FILEPROVIDER 0x593 +#define IDC_FILEVERSION 0x594 +#define IDC_FILECOPYRIGHT 0x595 +#define IDC_DETAILSPROPNAME 0x596 +#define IDC_DETAILSPROPVALUE 0x597 +#define IDC_UPDATEDRIVER 0x598 +#define IDC_DRIVERRESOURCES 0x599 Removed: trunk/reactos/dll/win32/devmgr_new/resources/devmgr.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/resou… ============================================================================== Binary file - no diff available.

1 0

[bfreisen] 68372: [MSPAINT_NEW] turn the history into an ImageModel
by bfreisen＠svn.reactos.org 07 Jul '15

07 Jul '15

Author: bfreisen Date: Tue Jul 7 11:56:37 2015 New Revision: 68372 URL: http://svn.reactos.org/svn/reactos?rev=68372&view=rev Log: [MSPAINT_NEW] turn the history into an ImageModel Modified: trunk/reactos/base/applications/mspaint_new/definitions.h trunk/reactos/base/applications/mspaint_new/dialogs.cpp trunk/reactos/base/applications/mspaint_new/globalvar.h trunk/reactos/base/applications/mspaint_new/history.cpp trunk/reactos/base/applications/mspaint_new/history.h trunk/reactos/base/applications/mspaint_new/imgarea.cpp trunk/reactos/base/applications/mspaint_new/imgarea.h trunk/reactos/base/applications/mspaint_new/main.cpp trunk/reactos/base/applications/mspaint_new/miniature.cpp trunk/reactos/base/applications/mspaint_new/mouse.cpp trunk/reactos/base/applications/mspaint_new/scrollbox.cpp trunk/reactos/base/applications/mspaint_new/selection.cpp trunk/reactos/base/applications/mspaint_new/sizebox.cpp trunk/reactos/base/applications/mspaint_new/winproc.cpp Modified: trunk/reactos/base/applications/mspaint_new/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/definitions.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/definitions.h [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -226,3 +226,5 @@ #define WM_TOOLSMODELZOOMCHANGED (WM_APP + 2) #define WM_PALETTEMODELCOLORCHANGED (WM_APP + 3) #define WM_PALETTEMODELPALETTECHANGED (WM_APP + 4) +#define WM_IMAGEMODELDIMENSIONSCHANGED (WM_APP + 5) +#define WM_IMAGEMODELIMAGECHANGED (WM_APP + 6) Modified: trunk/reactos/base/applications/mspaint_new/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/dialogs.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -79,8 +79,8 @@ TCHAR strrc[100]; TCHAR res[100]; - widthSetInDlg = imgXRes; - heightSetInDlg = imgYRes; + widthSetInDlg = imageModel.GetWidth(); + heightSetInDlg = imageModel.GetHeight(); CheckDlgButton(hwnd, IDD_ATTRIBUTESRB3, BST_CHECKED); CheckDlgButton(hwnd, IDD_ATTRIBUTESRB5, BST_CHECKED); @@ -119,8 +119,8 @@ EndDialog(hwnd, 0); break; case IDD_ATTRIBUTESSTANDARD: - widthSetInDlg = imgXRes; - heightSetInDlg = imgYRes; + widthSetInDlg = imageModel.GetWidth(); + heightSetInDlg = imageModel.GetHeight(); CheckDlgButton(hwnd, IDD_ATTRIBUTESRB3, BST_CHECKED); CheckDlgButton(hwnd, IDD_ATTRIBUTESRB5, BST_CHECKED); SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT1, widthSetInDlg, FALSE); Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -24,19 +24,14 @@ extern HDC hSelDC; extern int *bmAddress; extern BITMAPINFO bitmapinfo; -extern int imgXRes; -extern int imgYRes; extern int widthSetInDlg; extern int heightSetInDlg; extern STRETCHSKEW stretchSkew; -extern HBITMAP hBms[HISTORYSIZE]; -extern int currInd; -extern int undoSteps; -extern int redoSteps; -extern BOOL imageSaved; +class ImageModel; +extern ImageModel imageModel; extern POINT start; extern POINT last; Modified: trunk/reactos/base/applications/mspaint_new/history.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -12,21 +12,17 @@ /* FUNCTIONS ********************************************************/ -extern void updateCanvasAndScrollbars(void); - -void -setImgXYRes(int x, int y) +void ImageModel::NotifyDimensionsChanged() { - if ((imgXRes != x) || (imgYRes != y)) - { - imgXRes = x; - imgYRes = y; - updateCanvasAndScrollbars(); - } + imageArea.SendMessage(WM_IMAGEMODELDIMENSIONSCHANGED); } -void -newReversible() +void ImageModel::NotifyImageChanged() +{ + imageArea.SendMessage(WM_IMAGEMODELIMAGECHANGED); +} + +void ImageModel::CopyPrevious() { DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); hBms[(currInd + 1) % HISTORYSIZE] = (HBITMAP) CopyImage(hBms[currInd], IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG); @@ -35,62 +31,64 @@ undoSteps++; redoSteps = 0; SelectObject(hDrawingDC, hBms[currInd]); - imgXRes = GetDIBWidth(hBms[currInd]); - imgYRes = GetDIBHeight(hBms[currInd]); imageSaved = FALSE; } -void -undo() +void ImageModel::Undo() { if (undoSteps > 0) { + int oldWidth = GetWidth(); + int oldHeight = GetHeight(); selectionWindow.ShowWindow(SW_HIDE); currInd = (currInd + HISTORYSIZE - 1) % HISTORYSIZE; SelectObject(hDrawingDC, hBms[currInd]); undoSteps--; if (redoSteps < HISTORYSIZE - 1) redoSteps++; - setImgXYRes(GetDIBWidth(hBms[currInd]), GetDIBHeight(hBms[currInd])); + if (GetWidth() != oldWidth || GetHeight() != oldHeight) + NotifyDimensionsChanged(); + NotifyImageChanged(); } } -void -redo() +void ImageModel::Redo() { if (redoSteps > 0) { + int oldWidth = GetWidth(); + int oldHeight = GetHeight(); selectionWindow.ShowWindow(SW_HIDE); currInd = (currInd + 1) % HISTORYSIZE; SelectObject(hDrawingDC, hBms[currInd]); redoSteps--; if (undoSteps < HISTORYSIZE - 1) undoSteps++; - setImgXYRes(GetDIBWidth(hBms[currInd]), GetDIBHeight(hBms[currInd])); + if (GetWidth() != oldWidth || GetHeight() != oldHeight) + NotifyDimensionsChanged(); + NotifyImageChanged(); } } -void -resetToU1() +void ImageModel::ResetToPrevious() { DeleteObject(hBms[currInd]); hBms[currInd] = (HBITMAP) CopyImage(hBms[(currInd + HISTORYSIZE - 1) % HISTORYSIZE], IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG); SelectObject(hDrawingDC, hBms[currInd]); - imgXRes = GetDIBWidth(hBms[currInd]); - imgYRes = GetDIBHeight(hBms[currInd]); + NotifyImageChanged(); } -void -clearHistory() +void ImageModel::ClearHistory() { undoSteps = 0; redoSteps = 0; } -void -insertReversible(HBITMAP hbm) +void ImageModel::Insert(HBITMAP hbm) { + int oldWidth = GetWidth(); + int oldHeight = GetHeight(); DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); hBms[(currInd + 1) % HISTORYSIZE] = hbm; currInd = (currInd + 1) % HISTORYSIZE; @@ -98,19 +96,22 @@ undoSteps++; redoSteps = 0; SelectObject(hDrawingDC, hBms[currInd]); - setImgXYRes(GetDIBWidth(hBms[currInd]), GetDIBHeight(hBms[currInd])); + if (GetWidth() != oldWidth || GetHeight() != oldHeight) + NotifyDimensionsChanged(); + NotifyImageChanged(); } -void -cropReversible(int width, int height, int xOffset, int yOffset) +void ImageModel::Crop(int nWidth, int nHeight, int nOffsetX, int nOffsetY) { HDC hdc; HPEN oldPen; HBRUSH oldBrush; + int oldWidth = GetWidth(); + int oldHeight = GetHeight(); SelectObject(hDrawingDC, hBms[currInd]); DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); - hBms[(currInd + 1) % HISTORYSIZE] = CreateDIBWithProperties(width, height); + hBms[(currInd + 1) % HISTORYSIZE] = CreateDIBWithProperties(nWidth, nHeight); currInd = (currInd + 1) % HISTORYSIZE; if (undoSteps < HISTORYSIZE - 1) undoSteps++; @@ -121,12 +122,71 @@ oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, paletteModel.GetBgColor())); oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(paletteModel.GetBgColor())); - Rectangle(hdc, 0, 0, width, height); - BitBlt(hdc, -xOffset, -yOffset, imgXRes, imgYRes, hDrawingDC, 0, 0, SRCCOPY); + Rectangle(hdc, 0, 0, nWidth, nHeight); + BitBlt(hdc, -nOffsetX, -nOffsetY, GetWidth(), GetHeight(), hDrawingDC, 0, 0, SRCCOPY); DeleteObject(SelectObject(hdc, oldBrush)); DeleteObject(SelectObject(hdc, oldPen)); DeleteDC(hdc); SelectObject(hDrawingDC, hBms[currInd]); - setImgXYRes(width, height); + if (GetWidth() != oldWidth || GetHeight() != oldHeight) + NotifyDimensionsChanged(); + NotifyImageChanged(); } + +void ImageModel::SaveImage(LPTSTR lpFileName) +{ + SaveDIBToFile(hBms[currInd], lpFileName, hDrawingDC, &fileTime, &fileSize, fileHPPM, fileVPPM); + imageSaved = TRUE; +} + +BOOL ImageModel::IsImageSaved() +{ + return imageSaved; +} + +BOOL ImageModel::HasUndoSteps() +{ + return undoSteps > 0; +} + +BOOL ImageModel::HasRedoSteps() +{ + return redoSteps > 0; +} + +void ImageModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX, int nSkewDegY) +{ + int oldWidth = GetWidth(); + int oldHeight = GetHeight(); + Insert((HBITMAP) CopyImage(hBms[currInd], IMAGE_BITMAP, + GetWidth() * nStretchPercentX / 100, + GetHeight() * nStretchPercentY / 100, 0)); + if (GetWidth() != oldWidth || GetHeight() != oldHeight) + NotifyDimensionsChanged(); + NotifyImageChanged(); +} + +int ImageModel::GetWidth() +{ + return GetDIBWidth(hBms[currInd]); +} + +int ImageModel::GetHeight() +{ + return GetDIBHeight(hBms[currInd]); +} + +void ImageModel::InvertColors() +{ + RECT rect = {0, 0, GetWidth(), GetHeight()}; + CopyPrevious(); + InvertRect(hDrawingDC, &rect); + NotifyImageChanged(); +} + +void ImageModel::Clear(COLORREF color) +{ + Rectangle(hDrawingDC, 0 - 1, 0 - 1, GetWidth() + 1, GetHeight() + 1); + NotifyImageChanged(); +} Modified: trunk/reactos/base/applications/mspaint_new/history.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.h [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -6,16 +6,32 @@ * PROGRAMMERS: Benedikt Freisen */ -void newReversible(void); +class ImageModel +{ +private: + void NotifyDimensionsChanged(); + void NotifyImageChanged(); +public: + HBITMAP hBms[HISTORYSIZE]; + int currInd; + int undoSteps; + int redoSteps; + BOOL imageSaved; -void undo(void); - -void redo(void); - -void resetToU1(void); - -void clearHistory(void); - -void insertReversible(HBITMAP hbm); - -void cropReversible(int width, int height, int xOffset, int yOffset); + void CopyPrevious(void); + void Undo(void); + void Redo(void); + void ResetToPrevious(void); + void ClearHistory(void); + void Insert(HBITMAP hbm); + void Crop(int nWidth, int nHeight, int nOffsetX = 0, int nOffsetY = 0); + void SaveImage(LPTSTR lpFileName); + BOOL IsImageSaved(); + BOOL HasUndoSteps(); + BOOL HasRedoSteps(); + void StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX = 0, int nSkewDegY = 0); + int GetWidth(); + int GetHeight(); + void InvertColors(); + void Clear(COLORREF color = 0x00ffffff); +}; Modified: trunk/reactos/base/applications/mspaint_new/imgarea.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -18,6 +18,18 @@ extern void zoomTo(int newZoom, int mouseX, int mouseY); + +void +updateCanvasAndScrollbars() +{ + selectionWindow.ShowWindow(SW_HIDE); + imageArea.MoveWindow(3, 3, imageModel.GetWidth() * toolsModel.GetZoom() / 1000, imageModel.GetHeight() * toolsModel.GetZoom() / 1000, FALSE); + scrollboxWindow.Invalidate(TRUE); + imageArea.Invalidate(FALSE); + + scrollboxWindow.SetScrollPos(SB_HORZ, 0, TRUE); + scrollboxWindow.SetScrollPos(SB_VERT, 0, TRUE); +} void CImgAreaWindow::drawZoomFrame(int mouseX, int mouseY) { @@ -51,6 +63,8 @@ LRESULT CImgAreaWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + int imgXRes = imageModel.GetWidth(); + int imgYRes = imageModel.GetHeight(); sizeboxLeftTop.MoveWindow( 0, 0, 3, 3, TRUE); @@ -82,7 +96,9 @@ LRESULT CImgAreaWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { DefWindowProc(WM_PAINT, wParam, lParam); - HDC hdc = imageArea.GetDC(); + HDC hdc = GetDC(); + int imgXRes = imageModel.GetWidth(); + int imgYRes = imageModel.GetHeight(); StretchBlt(hdc, 0, 0, imgXRes * toolsModel.GetZoom() / 1000, imgYRes * toolsModel.GetZoom() / 1000, hDrawingDC, 0, 0, imgXRes, imgYRes, SRCCOPY); if (showGrid && (toolsModel.GetZoom() >= 4000)) @@ -101,7 +117,7 @@ } DeleteObject(SelectObject(hdc, oldPen)); } - imageArea.ReleaseDC(hdc); + ReleaseDC(hdc); selectionWindow.Invalidate(FALSE); miniature.Invalidate(FALSE); return 0; @@ -144,7 +160,7 @@ else { SendMessage(WM_LBUTTONUP, wParam, lParam); - undo(); + imageModel.Undo(); } Invalidate(FALSE); if ((toolsModel.GetActiveTool() == TOOL_ZOOM) && (toolsModel.GetZoom() < 8000)) @@ -164,7 +180,7 @@ else { SendMessage(WM_RBUTTONUP, wParam, lParam); - undo(); + imageModel.Undo(); } Invalidate(FALSE); if ((toolsModel.GetActiveTool() == TOOL_ZOOM) && (toolsModel.GetZoom() > 125)) @@ -231,7 +247,7 @@ tme.cbSize = sizeof(TRACKMOUSEEVENT); tme.dwFlags = TME_LEAVE; - tme.hwndTrack = imageArea.m_hWnd; + tme.hwndTrack = m_hWnd; tme.dwHoverTime = 0; TrackMouseEvent(&tme); @@ -252,12 +268,12 @@ { if (xRel < 0) xRel = (xNow < 0) ? -start.x : xRel; - else if (xNow > imgXRes) - xRel = imgXRes-start.x; + else if (xNow > imageModel.GetWidth()) + xRel = imageModel.GetWidth() - start.x; if (yRel < 0) yRel = (yNow < 0) ? -start.y : yRel; - else if (yNow > imgYRes) - yRel = imgYRes-start.y; + else if (yNow > imageModel.GetHeight()) + yRel = imageModel.GetHeight() - start.y; } /* rectsel and shape tools always show non-negative numbers when drawing */ if ((toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_SHAPE)) @@ -316,6 +332,18 @@ { SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) _T("")); if (toolsModel.GetActiveTool() == TOOL_ZOOM) - imageArea.Invalidate(FALSE); - return 0; -} + Invalidate(FALSE); + return 0; +} + +LRESULT CImgAreaWindow::OnImageModelDimensionsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + updateCanvasAndScrollbars(); + return 0; +} + +LRESULT CImgAreaWindow::OnImageModelImageChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + Invalidate(FALSE); + return 0; +} Modified: trunk/reactos/base/applications/mspaint_new/imgarea.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/imgarea.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/imgarea.h [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -22,6 +22,8 @@ MESSAGE_HANDLER(WM_RBUTTONUP, OnRButtonUp) MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_MOUSELEAVE, OnMouseLeave) + MESSAGE_HANDLER(WM_IMAGEMODELDIMENSIONSCHANGED, OnImageModelDimensionsChanged) + MESSAGE_HANDLER(WM_IMAGEMODELIMAGECHANGED, OnImageModelImageChanged) END_MSG_MAP() BOOL drawing; @@ -36,6 +38,8 @@ LRESULT OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseLeave(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnImageModelDimensionsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnImageModelImageChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); void drawZoomFrame(int mouseX, int mouseY); }; Modified: trunk/reactos/base/applications/mspaint_new/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -24,11 +24,7 @@ STRETCHSKEW stretchSkew; -HBITMAP hBms[HISTORYSIZE]; -int currInd = 0; -int undoSteps = 0; -int redoSteps = 0; -BOOL imageSaved = TRUE; +ImageModel imageModel; POINT start; POINT last; @@ -214,8 +210,9 @@ SelectObject(hDrawingDC, CreatePen(PS_SOLID, 0, paletteModel.GetFgColor())); SelectObject(hDrawingDC, CreateSolidBrush(paletteModel.GetBgColor())); - hBms[0] = CreateDIBWithProperties(imgXRes, imgYRes); - SelectObject(hDrawingDC, hBms[0]); + //TODO: move to ImageModel + imageModel.hBms[0] = CreateDIBWithProperties(imgXRes, imgYRes); + SelectObject(hDrawingDC, imageModel.hBms[0]); Rectangle(hDrawingDC, 0 - 1, 0 - 1, imgXRes + 1, imgYRes + 1); if (lpszArgument[0] != 0) @@ -227,13 +224,13 @@ TCHAR tempstr[1000]; TCHAR resstr[100]; TCHAR *temp; - insertReversible(bmNew); + imageModel.Insert(bmNew); GetFullPathName(lpszArgument, SIZEOF(filepathname), filepathname, &temp); _tcscpy(filename, temp); LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(tempstr, resstr, filename); mainWindow.SetWindowText(tempstr); - clearHistory(); + imageModel.ClearHistory(); isAFile = TRUE; } else Modified: trunk/reactos/base/applications/mspaint_new/miniature.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/miniature.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/miniature.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -27,7 +27,7 @@ HDC hdc; miniature.GetClientRect(&mclient); hdc = miniature.GetDC(); - StretchBlt(hdc, 0, 0, mclient.right, mclient.bottom, hDrawingDC, 0, 0, imgXRes, imgYRes, SRCCOPY); + StretchBlt(hdc, 0, 0, mclient.right, mclient.bottom, hDrawingDC, 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), SRCCOPY); miniature.ReleaseDC(hdc); return 0; } Modified: trunk/reactos/base/applications/mspaint_new/mouse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/mouse.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/mouse.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -76,33 +76,33 @@ case TOOL_RECT: case TOOL_ELLIPSE: case TOOL_RRECT: - newReversible(); + imageModel.CopyPrevious(); break; case TOOL_RECTSEL: case TOOL_TEXT: - newReversible(); + imageModel.CopyPrevious(); selectionWindow.ShowWindow(SW_HIDE); rectSel_src.right = rectSel_src.left; rectSel_src.bottom = rectSel_src.top; break; case TOOL_RUBBER: - newReversible(); + imageModel.CopyPrevious(); Erase(hdc, x, y, x, y, bg, toolsModel.GetRubberRadius()); break; case TOOL_FILL: - newReversible(); + imageModel.CopyPrevious(); Fill(hdc, x, y, fg); break; case TOOL_PEN: - newReversible(); + imageModel.CopyPrevious(); SetPixel(hdc, x, y, fg); break; case TOOL_BRUSH: - newReversible(); + imageModel.CopyPrevious(); Brush(hdc, x, y, x, y, fg, toolsModel.GetBrushStyle()); break; case TOOL_AIRBRUSH: - newReversible(); + imageModel.CopyPrevious(); Airbrush(hdc, x, y, fg, toolsModel.GetAirBrushWidth()); break; case TOOL_BEZIER: @@ -110,7 +110,7 @@ pointStack[pointSP].y = y; if (pointSP == 0) { - newReversible(); + imageModel.CopyPrevious(); pointSP++; } break; @@ -121,7 +121,7 @@ Poly(hdc, pointStack, pointSP + 1, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), FALSE, FALSE); if (pointSP == 0) { - newReversible(); + imageModel.CopyPrevious(); pointSP++; } break; @@ -135,22 +135,22 @@ { case TOOL_FREESEL: if (ptSP == 0) - newReversible(); + imageModel.CopyPrevious(); ptSP++; if (ptSP % 1024 == 0) ptStack = (POINT*) HeapReAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, ptStack, sizeof(POINT) * (ptSP + 1024)); - ptStack[ptSP].x = max(0, min(x, imgXRes)); - ptStack[ptSP].y = max(0, min(y, imgYRes)); - resetToU1(); + ptStack[ptSP].x = max(0, min(x, imageModel.GetWidth())); + ptStack[ptSP].y = max(0, min(y, imageModel.GetHeight())); + imageModel.ResetToPrevious(); Poly(hdc, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE, TRUE); /* draw the freehand selection inverted/xored */ break; case TOOL_RECTSEL: case TOOL_TEXT: { POINT temp; - resetToU1(); - temp.x = max(0, min(x, imgXRes)); - temp.y = max(0, min(y, imgYRes)); + imageModel.ResetToPrevious(); + temp.x = max(0, min(x, imageModel.GetWidth())); + temp.y = max(0, min(y, imageModel.GetHeight())); rectSel_dest.left = rectSel_src.left = min(start.x, temp.x); rectSel_dest.top = rectSel_src.top = min(start.y, temp.y); rectSel_dest.right = rectSel_src.right = max(start.x, temp.x); @@ -171,13 +171,13 @@ Airbrush(hdc, x, y, fg, toolsModel.GetAirBrushWidth()); break; case TOOL_LINE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(start.x, start.y, &x, &y); Line(hdc, start.x, start.y, x, y, fg, toolsModel.GetLineWidth()); break; case TOOL_BEZIER: - resetToU1(); + imageModel.ResetToPrevious(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; switch (pointSP) @@ -195,13 +195,13 @@ } break; case TOOL_RECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Rect(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_SHAPE: - resetToU1(); + imageModel.ResetToPrevious(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) @@ -211,13 +211,13 @@ Poly(hdc, pointStack, pointSP + 1, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), FALSE, FALSE); break; case TOOL_ELLIPSE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Ellp(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_RRECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); RRect(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); @@ -270,11 +270,11 @@ Poly(hSelDC, ptStackCopy, ptSP + 1, 0x00ffffff, 0x00ffffff, 1, 2, TRUE, FALSE); HeapFree(GetProcessHeap(), 0, ptStackCopy); SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src))); - resetToU1(); + imageModel.ResetToPrevious(); MaskBlt(hSelDC, 0, 0, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hDrawingDC, rectSel_src.left, rectSel_src.top, hSelMask, 0, 0, MAKEROP4(SRCCOPY, WHITENESS)); Poly(hdc, ptStack, ptSP + 1, bg, bg, 1, 2, TRUE, FALSE); - newReversible(); + imageModel.CopyPrevious(); MaskBlt(hDrawingDC, rectSel_src.left, rectSel_src.top, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hSelDC, 0, 0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND)); @@ -291,7 +291,7 @@ break; } case TOOL_RECTSEL: - resetToU1(); + imageModel.ResetToPrevious(); if ((RECT_WIDTH(rectSel_src) != 0) && (RECT_HEIGHT(rectSel_src) != 0)) { DeleteObject(hSelMask); @@ -299,12 +299,12 @@ DeleteObject(SelectObject(hSelDC, hSelMask)); Rect(hSelDC, 0, 0, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), 0x00ffffff, 0x00ffffff, 1, 2); SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src))); - resetToU1(); + imageModel.ResetToPrevious(); BitBlt(hSelDC, 0, 0, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hDrawingDC, rectSel_src.left, rectSel_src.top, SRCCOPY); Rect(hdc, rectSel_src.left, rectSel_src.top, rectSel_src.right, rectSel_src.bottom, bg, bg, 0, TRUE); - newReversible(); + imageModel.CopyPrevious(); BitBlt(hDrawingDC, rectSel_src.left, rectSel_src.top, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hSelDC, 0, 0, SRCCOPY); @@ -315,10 +315,10 @@ } break; case TOOL_TEXT: - resetToU1(); + imageModel.ResetToPrevious(); if ((RECT_WIDTH(rectSel_src) != 0) && (RECT_HEIGHT(rectSel_src) != 0)) { - newReversible(); + imageModel.CopyPrevious(); placeSelWin(); selectionWindow.ShowWindow(SW_SHOW); @@ -333,7 +333,7 @@ SetPixel(hdc, x, y, fg); break; case TOOL_LINE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(start.x, start.y, &x, &y); Line(hdc, start.x, start.y, x, y, fg, toolsModel.GetLineWidth()); @@ -344,13 +344,13 @@ pointSP = 0; break; case TOOL_RECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Rect(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_SHAPE: - resetToU1(); + imageModel.ResetToPrevious(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) @@ -374,13 +374,13 @@ pointSP--; break; case TOOL_ELLIPSE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Ellp(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_RRECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); RRect(hdc, start.x, start.y, x, y, fg, bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); @@ -403,26 +403,26 @@ case TOOL_RECT: case TOOL_ELLIPSE: case TOOL_RRECT: - newReversible(); + imageModel.CopyPrevious(); break; case TOOL_RUBBER: - newReversible(); + imageModel.CopyPrevious(); Replace(hdc, x, y, x, y, fg, bg, toolsModel.GetRubberRadius()); break; case TOOL_FILL: - newReversible(); + imageModel.CopyPrevious(); Fill(hdc, x, y, bg); break; case TOOL_PEN: - newReversible(); + imageModel.CopyPrevious(); SetPixel(hdc, x, y, bg); break; case TOOL_BRUSH: - newReversible(); + imageModel.CopyPrevious(); Brush(hdc, x, y, x, y, bg, toolsModel.GetBrushStyle()); break; case TOOL_AIRBRUSH: - newReversible(); + imageModel.CopyPrevious(); Airbrush(hdc, x, y, bg, toolsModel.GetAirBrushWidth()); break; case TOOL_BEZIER: @@ -430,7 +430,7 @@ pointStack[pointSP].y = y; if (pointSP == 0) { - newReversible(); + imageModel.CopyPrevious(); pointSP++; } break; @@ -441,7 +441,7 @@ Poly(hdc, pointStack, pointSP + 1, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), FALSE, FALSE); if (pointSP == 0) { - newReversible(); + imageModel.CopyPrevious(); pointSP++; } break; @@ -466,13 +466,13 @@ Airbrush(hdc, x, y, bg, toolsModel.GetAirBrushWidth()); break; case TOOL_LINE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(start.x, start.y, &x, &y); Line(hdc, start.x, start.y, x, y, bg, toolsModel.GetLineWidth()); break; case TOOL_BEZIER: - resetToU1(); + imageModel.ResetToPrevious(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; switch (pointSP) @@ -490,13 +490,13 @@ } break; case TOOL_RECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Rect(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_SHAPE: - resetToU1(); + imageModel.ResetToPrevious(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) @@ -506,13 +506,13 @@ Poly(hdc, pointStack, pointSP + 1, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), FALSE, FALSE); break; case TOOL_ELLIPSE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Ellp(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_RRECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); RRect(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); @@ -536,7 +536,7 @@ SetPixel(hdc, x, y, bg); break; case TOOL_LINE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) roundTo8Directions(start.x, start.y, &x, &y); Line(hdc, start.x, start.y, x, y, bg, toolsModel.GetLineWidth()); @@ -547,13 +547,13 @@ pointSP = 0; break; case TOOL_RECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Rect(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_SHAPE: - resetToU1(); + imageModel.ResetToPrevious(); pointStack[pointSP].x = x; pointStack[pointSP].y = y; if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) @@ -577,13 +577,13 @@ pointSP--; break; case TOOL_ELLIPSE: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); Ellp(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); break; case TOOL_RRECT: - resetToU1(); + imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) regularize(start.x, start.y, &x, &y); RRect(hdc, start.x, start.y, x, y, bg, fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle()); Modified: trunk/reactos/base/applications/mspaint_new/scrollbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/scrollbox.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/scrollbox.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -74,8 +74,8 @@ } scrollboxWindow.SetScrollInfo(SB_HORZ, &si); scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), - -scrollboxWindow.GetScrollPos(SB_VERT), imgXRes * toolsModel.GetZoom() / 1000 + 6, - imgYRes * toolsModel.GetZoom() / 1000 + 6, TRUE); + -scrollboxWindow.GetScrollPos(SB_VERT), imageModel.GetWidth() * toolsModel.GetZoom() / 1000 + 6, + imageModel.GetHeight() * toolsModel.GetZoom() / 1000 + 6, TRUE); } return 0; } @@ -109,8 +109,8 @@ } scrollboxWindow.SetScrollInfo(SB_VERT, &si); scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), - -scrollboxWindow.GetScrollPos(SB_VERT), imgXRes * toolsModel.GetZoom() / 1000 + 6, - imgYRes * toolsModel.GetZoom() / 1000 + 6, TRUE); + -scrollboxWindow.GetScrollPos(SB_VERT), imageModel.GetWidth() * toolsModel.GetZoom() / 1000 + 6, + imageModel.GetHeight() * toolsModel.GetZoom() / 1000 + 6, TRUE); } return 0; } Modified: trunk/reactos/base/applications/mspaint_new/selection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/selection.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/selection.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -175,7 +175,7 @@ { TCHAR sizeStr[100]; POINT deltaUsed; - resetToU1(); + imageModel.ResetToPrevious(); frac.x += GET_X_LPARAM(lParam) - pos.x; frac.y += GET_Y_LPARAM(lParam) - pos.y; delta.x += frac.x * 1000 / toolsModel.GetZoom(); Modified: trunk/reactos/base/applications/mspaint_new/sizebox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/sizebox.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/sizebox.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -45,6 +45,8 @@ TCHAR sizeStr[100]; short xRel; short yRel; + int imgXRes = imageModel.GetWidth(); + int imgYRes = imageModel.GetHeight(); xRel = (GET_X_LPARAM(lParam) - xOrig) * 1000 / toolsModel.GetZoom(); yRel = (GET_Y_LPARAM(lParam) - yOrig) * 1000 / toolsModel.GetZoom(); if (m_hWnd == sizeboxLeftTop.m_hWnd) @@ -76,24 +78,26 @@ short yRel; ReleaseCapture(); resizing = FALSE; + int imgXRes = imageModel.GetWidth(); + int imgYRes = imageModel.GetHeight(); xRel = (GET_X_LPARAM(lParam) - xOrig) * 1000 / toolsModel.GetZoom(); yRel = (GET_Y_LPARAM(lParam) - yOrig) * 1000 / toolsModel.GetZoom(); if (m_hWnd == sizeboxLeftTop) - cropReversible(imgXRes - xRel, imgYRes - yRel, xRel, yRel); + imageModel.Crop(imgXRes - xRel, imgYRes - yRel, xRel, yRel); if (m_hWnd == sizeboxCenterTop.m_hWnd) - cropReversible(imgXRes, imgYRes - yRel, 0, yRel); + imageModel.Crop(imgXRes, imgYRes - yRel, 0, yRel); if (m_hWnd == sizeboxRightTop.m_hWnd) - cropReversible(imgXRes + xRel, imgYRes - yRel, 0, yRel); + imageModel.Crop(imgXRes + xRel, imgYRes - yRel, 0, yRel); if (m_hWnd == sizeboxLeftCenter.m_hWnd) - cropReversible(imgXRes - xRel, imgYRes, xRel, 0); + imageModel.Crop(imgXRes - xRel, imgYRes, xRel, 0); if (m_hWnd == sizeboxRightCenter.m_hWnd) - cropReversible(imgXRes + xRel, imgYRes, 0, 0); + imageModel.Crop(imgXRes + xRel, imgYRes, 0, 0); if (m_hWnd == sizeboxLeftBottom.m_hWnd) - cropReversible(imgXRes - xRel, imgYRes + yRel, xRel, 0); + imageModel.Crop(imgXRes - xRel, imgYRes + yRel, xRel, 0); if (m_hWnd == sizeboxCenterBottom.m_hWnd) - cropReversible(imgXRes, imgYRes + yRel, 0, 0); + imageModel.Crop(imgXRes, imgYRes + yRel, 0, 0); if (m_hWnd == sizeboxRightBottom.m_hWnd) - cropReversible(imgXRes + xRel, imgYRes + yRel, 0, 0); + imageModel.Crop(imgXRes + xRel, imgYRes + yRel, 0, 0); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) _T("")); } return 0; Modified: trunk/reactos/base/applications/mspaint_new/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] Tue Jul 7 11:56:37 2015 @@ -15,18 +15,6 @@ #include "registry.h" /* FUNCTIONS ********************************************************/ - -void -updateCanvasAndScrollbars() -{ - selectionWindow.ShowWindow(SW_HIDE); - imageArea.MoveWindow(3, 3, imgXRes * toolsModel.GetZoom() / 1000, imgYRes * toolsModel.GetZoom() / 1000, FALSE); - scrollboxWindow.Invalidate(TRUE); - imageArea.Invalidate(FALSE); - - scrollboxWindow.SetScrollPos(SB_HORZ, 0, TRUE); - scrollboxWindow.SetScrollPos(SB_VERT, 0, TRUE); -} void zoomTo(int newZoom, int mouseX, int mouseY) @@ -44,7 +32,7 @@ toolsModel.SetZoom(newZoom); selectionWindow.ShowWindow(SW_HIDE); - imageArea.MoveWindow(3, 3, imgXRes * toolsModel.GetZoom() / 1000, imgYRes * toolsModel.GetZoom() / 1000, FALSE); + imageArea.MoveWindow(3, 3, imageModel.GetWidth() * toolsModel.GetZoom() / 1000, imageModel.GetHeight() * toolsModel.GetZoom() / 1000, FALSE); scrollboxWindow.Invalidate(TRUE); imageArea.Invalidate(FALSE); @@ -87,23 +75,19 @@ { if (isAFile && overwrite) { - SaveDIBToFile(hBms[currInd], filepathname, hDrawingDC, &fileTime, &fileSize, fileHPPM, - fileVPPM); - imageSaved = TRUE; + imageModel.SaveImage(filepathname); } else if (GetSaveFileName(&sfn) != 0) { TCHAR tempstr[1000]; TCHAR resstr[100]; - SaveDIBToFile(hBms[currInd], sfn.lpstrFile, hDrawingDC, &fileTime, &fileSize, - fileHPPM, fileVPPM); + imageModel.SaveImage(sfn.lpstrFile); CopyMemory(filename, sfn.lpstrFileTitle, sizeof(filename)); CopyMemory(filepathname, sfn.lpstrFile, sizeof(filepathname)); LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(tempstr, resstr, filename); SetWindowText(tempstr); isAFile = TRUE; - imageSaved = TRUE; } } @@ -111,14 +95,13 @@ { TCHAR tempstr[1000]; TCHAR resstr[100]; - insertReversible(bitmap); - updateCanvasAndScrollbars(); + imageModel.Insert(bitmap); CopyMemory(filename, newfilename, sizeof(filename)); CopyMemory(filepathname, newfilepathname, sizeof(filepathname)); LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(tempstr, resstr, filename); SetWindowText(tempstr); - clearHistory(); + imageModel.ClearHistory(); isAFile = TRUE; } @@ -134,7 +117,7 @@ DeleteObject(SelectObject(hSelDC, hSelBm = (HBITMAP) CopyImage(bitmap, IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG))); - newReversible(); + imageModel.CopyPrevious(); SetRectEmpty(&rectSel_src); rectSel_dest.left = rectSel_dest.top = 0; rectSel_dest.right = rectSel_dest.left + GetDIBWidth(hSelBm); @@ -189,7 +172,7 @@ LRESULT CMainWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (!imageSaved) + if (!imageModel.IsImageSaved()) { TCHAR programname[20]; TCHAR saveprompttext[100]; @@ -204,7 +187,7 @@ break; case IDYES: saveImage(FALSE); - if (imageSaved) + if (imageModel.IsImageSaved()) DestroyWindow(); break; } @@ -228,8 +211,8 @@ EnableMenuItem(menu, IDM_FILEASWALLPAPERSTRETCHED, ENABLED_IF(isAFile)); break; case 1: /* Edit menu */ - EnableMenuItem(menu, IDM_EDITUNDO, ENABLED_IF(undoSteps > 0)); - EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(redoSteps > 0)); + EnableMenuItem(menu, IDM_EDITUNDO, ENABLED_IF(imageModel.HasUndoSteps())); + EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(imageModel.HasRedoSteps())); EnableMenuItem(menu, IDM_EDITCUT, ENABLED_IF(trueSelection)); EnableMenuItem(menu, IDM_EDITCOPY, ENABLED_IF(trueSelection)); EnableMenuItem(menu, IDM_EDITDELETESELECTION, ENABLED_IF(trueSelection)); @@ -344,7 +327,7 @@ case IDM_FILENEW: { BOOL reset = TRUE; - if (!imageSaved) + if (!imageModel.IsImageSaved()) { TCHAR programname[20]; TCHAR saveprompttext[100]; @@ -355,7 +338,7 @@ switch (MessageBox(temptext, programname, MB_YESNOCANCEL | MB_ICONQUESTION)) { case IDNO: - imageSaved = TRUE; + imageModel.imageSaved = TRUE; //TODO: move to ImageModel break; case IDYES: saveImage(FALSE); @@ -365,12 +348,10 @@ break; } } - if (reset && imageSaved) - { - Rectangle(hDrawingDC, 0 - 1, 0 - 1, imgXRes + 1, imgYRes + 1); - imageArea.Invalidate(FALSE); - updateCanvasAndScrollbars(); - clearHistory(); + if (reset && imageModel.IsImageSaved()) //TODO: move to ImageModel + { + imageModel.Clear(); + imageModel.ClearHistory(); } break; } @@ -401,11 +382,11 @@ SetWallpaper(filepathname, 2, 0); break; case IDM_EDITUNDO: - undo(); + imageModel.Undo(); imageArea.Invalidate(FALSE); break; case IDM_EDITREDO: - redo(); + imageModel.Redo(); imageArea.Invalidate(FALSE); break; case IDM_EDITCOPY: @@ -432,16 +413,16 @@ { /* remove selection window and already painted content using undo(), paint Rect for rectangular selections and Poly for freeform selections */ - undo(); + imageModel.Undo(); if (toolsModel.GetActiveTool() == TOOL_RECTSEL) { - newReversible(); + imageModel.CopyPrevious(); Rect(hDrawingDC, rectSel_dest.left, rectSel_dest.top, rectSel_dest.right, rectSel_dest.bottom, paletteModel.GetBgColor(), paletteModel.GetBgColor(), 0, TRUE); } if (toolsModel.GetActiveTool() == TOOL_FREESEL) { - newReversible(); + imageModel.CopyPrevious(); Poly(hDrawingDC, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE, TRUE); } break; @@ -451,9 +432,10 @@ HWND hToolbar = FindWindowEx(toolBoxContainer.m_hWnd, NULL, TOOLBARCLASSNAME, NULL); SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELPARAM(TRUE, 0)); toolBoxContainer.SendMessage(WM_COMMAND, ID_RECTSEL); + //TODO: do this properly startPaintingL(hDrawingDC, 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); - whilePaintingL(hDrawingDC, imgXRes, imgYRes, paletteModel.GetFgColor(), paletteModel.GetBgColor()); - endPaintingL(hDrawingDC, imgXRes, imgYRes, paletteModel.GetFgColor(), paletteModel.GetBgColor()); + whilePaintingL(hDrawingDC, imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetFgColor(), paletteModel.GetBgColor()); + endPaintingL(hDrawingDC, imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetFgColor(), paletteModel.GetBgColor()); break; } case IDM_EDITCOPYTO: @@ -474,31 +456,22 @@ break; case IDM_COLORSEDITPALETTE: if (ChooseColor(&choosecolor)) - { paletteModel.SetFgColor(choosecolor.rgbResult); - paletteWindow.Invalidate(FALSE); - } break; case IDM_COLORSMODERNPALETTE: paletteModel.SelectPalette(1); - paletteWindow.Invalidate(FALSE); break; case IDM_COLORSOLDPALETTE: paletteModel.SelectPalette(2); - paletteWindow.Invalidate(FALSE); break; case IDM_IMAGEINVERTCOLORS: { - RECT tempRect; - newReversible(); - SetRect(&tempRect, 0, 0, imgXRes, imgYRes); - InvertRect(hDrawingDC, &tempRect); - imageArea.Invalidate(FALSE); + imageModel.InvertColors(); break; } case IDM_IMAGEDELETEIMAGE: - newReversible(); - Rect(hDrawingDC, 0, 0, imgXRes, imgYRes, paletteModel.GetBgColor(), paletteModel.GetBgColor(), 0, TRUE); + imageModel.CopyPrevious(); + Rect(hDrawingDC, 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetBgColor(), paletteModel.GetBgColor(), 0, TRUE); imageArea.Invalidate(FALSE); break; case IDM_IMAGEROTATEMIRROR: @@ -517,9 +490,9 @@ } else { - newReversible(); - StretchBlt(hDrawingDC, imgXRes - 1, 0, -imgXRes, imgYRes, hDrawingDC, 0, 0, - imgXRes, imgYRes, SRCCOPY); + imageModel.CopyPrevious(); + StretchBlt(hDrawingDC, imageModel.GetWidth() - 1, 0, -imageModel.GetWidth(), imageModel.GetHeight(), hDrawingDC, 0, 0, + imageModel.GetWidth(), imageModel.GetHeight(), SRCCOPY); imageArea.Invalidate(FALSE); } break; @@ -536,9 +509,9 @@ } else { - newReversible(); - StretchBlt(hDrawingDC, 0, imgYRes - 1, imgXRes, -imgYRes, hDrawingDC, 0, 0, - imgXRes, imgYRes, SRCCOPY); + imageModel.CopyPrevious(); + StretchBlt(hDrawingDC, 0, imageModel.GetHeight() - 1, imageModel.GetWidth(), -imageModel.GetHeight(), hDrawingDC, 0, 0, + imageModel.GetWidth(), imageModel.GetHeight(), SRCCOPY); imageArea.Invalidate(FALSE); } break; @@ -557,9 +530,9 @@ } else { - newReversible(); - StretchBlt(hDrawingDC, imgXRes - 1, imgYRes - 1, -imgXRes, -imgYRes, hDrawingDC, - 0, 0, imgXRes, imgYRes, SRCCOPY); + imageModel.CopyPrevious(); + StretchBlt(hDrawingDC, imageModel.GetWidth() - 1, imageModel.GetHeight() - 1, -imageModel.GetWidth(), -imageModel.GetHeight(), hDrawingDC, + 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), SRCCOPY); imageArea.Invalidate(FALSE); } break; @@ -571,8 +544,7 @@ { if (attributesDlg()) { - cropReversible(widthSetInDlg, heightSetInDlg, 0, 0); - updateCanvasAndScrollbars(); + imageModel.Crop(widthSetInDlg, heightSetInDlg, 0, 0); } break; } @@ -580,10 +552,8 @@ { if (changeSizeDlg()) { - insertReversible((HBITMAP) CopyImage(hBms[currInd], IMAGE_BITMAP, - imgXRes * stretchSkew.percentage.x / 100, - imgYRes * stretchSkew.percentage.y / 100, 0)); - updateCanvasAndScrollbars(); + imageModel.StretchSkew(stretchSkew.percentage.x, stretchSkew.percentage.y, + stretchSkew.angle.x, stretchSkew.angle.y); } break; } @@ -591,8 +561,7 @@ toolsModel.SetBackgroundTransparent(!toolsModel.IsBackgroundTransparent()); break; case IDM_IMAGECROP: - insertReversible((HBITMAP) CopyImage(hSelBm, IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG)); - updateCanvasAndScrollbars(); + imageModel.Insert((HBITMAP) CopyImage(hSelBm, IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG)); break; case IDM_VIEWTOOLBOX:

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