Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[cfinck] 68404: [SPOOLSV] Implement the RPC calls for EnumMonitors, EnumPorts, ClosePrinter, EndDocPrinter, EndPagePrinter, ReadPrinter, StartDocPrinter, StartPagePrinter and WritePrinter.

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Jul 16 13:59:20 2015 New Revision: 68404 URL: http://svn.reactos.org/svn/reactos?rev=68404&view=rev Log: [SPOOLSV] Implement the RPC calls for EnumMonitors, EnumPorts, ClosePrinter, EndDocPrinter, EndPagePrinter, ReadPrinter, StartDocPrinter, StartPagePrinter and WritePrinter. Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/monitors.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/ports.c (with props) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt [iso-8859-1] Thu Jul 16 13:59:20 2015 @@ -6,6 +6,8 @@ init.c jobs.c main.c + monitors.c + ports.c printers.c printprocessors.c precomp.h Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/monitors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/monitors.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/monitors.c [iso-8859-1] Thu Jul 16 13:59:20 2015 @@ -0,0 +1,27 @@ +/* + * PROJECT: ReactOS Print Spooler Service + * LICENSE: GNU GPLv2 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" + +DWORD +_RpcEnumMonitors(WINSPOOL_HANDLE pName, DWORD Level, BYTE* pMonitor, DWORD cbBuf, DWORD* pcbNeeded, DWORD* pcReturned) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + EnumMonitorsW(pName, Level, pMonitor, cbBuf, pcbNeeded, pcReturned); + dwErrorCode = GetLastError(); + + RpcRevertToSelf(); + return dwErrorCode; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/monitors.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/ports.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/ports.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/ports.c [iso-8859-1] Thu Jul 16 13:59:20 2015 @@ -0,0 +1,27 @@ +/* + * PROJECT: ReactOS Print Spooler Service + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to Ports + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +DWORD +_RpcEnumPorts(WINSPOOL_HANDLE pName, DWORD Level, BYTE* pPort, DWORD cbBuf, DWORD* pcbNeeded, DWORD* pcReturned) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + EnumPortsW(pName, Level, pPort, cbBuf, pcbNeeded, pcReturned); + dwErrorCode = GetLastError(); + + RpcRevertToSelf(); + return dwErrorCode; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/ports.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/printers.c [iso-8859-1] Thu Jul 16 13:59:20 2015 @@ -6,6 +6,65 @@ */ #include "precomp.h" + +DWORD +_RpcClosePrinter(WINSPOOL_PRINTER_HANDLE *phPrinter) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + if (ClosePrinter(*phPrinter)) + *phPrinter = NULL; + + dwErrorCode = GetLastError(); + + RpcRevertToSelf(); + return dwErrorCode; +} + +DWORD +_RpcEndDocPrinter(WINSPOOL_PRINTER_HANDLE hPrinter) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + EndDocPrinter(hPrinter); + dwErrorCode = GetLastError(); + + RpcRevertToSelf(); + return dwErrorCode; +} + +DWORD +_RpcEndPagePrinter(WINSPOOL_PRINTER_HANDLE hPrinter) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + EndPagePrinter(hPrinter); + dwErrorCode = GetLastError(); + + RpcRevertToSelf(); + return dwErrorCode; +} DWORD _RpcEnumPrinters(DWORD Flags, WINSPOOL_HANDLE Name, DWORD Level, BYTE* pPrinterEnum, DWORD cbBuf, DWORD* pcbNeeded, DWORD* pcReturned) @@ -49,3 +108,79 @@ RpcRevertToSelf(); return dwErrorCode; } + +DWORD +_RpcReadPrinter(WINSPOOL_PRINTER_HANDLE hPrinter, BYTE *pBuf, DWORD cbBuf, DWORD *pcNoBytesRead) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + ReadPrinter(hPrinter, pBuf, cbBuf, pcNoBytesRead); + dwErrorCode = GetLastError(); + + RpcRevertToSelf(); + return dwErrorCode; +} + +DWORD +_RpcStartDocPrinter(WINSPOOL_PRINTER_HANDLE hPrinter, WINSPOOL_DOC_INFO_CONTAINER* pDocInfoContainer, DWORD* pJobId) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + *pJobId = StartDocPrinterW(hPrinter, pDocInfoContainer->Level, (PBYTE)pDocInfoContainer->DocInfo.pDocInfo1); + dwErrorCode = GetLastError(); + + RpcRevertToSelf(); + return dwErrorCode; +} + +DWORD +_RpcStartPagePrinter(WINSPOOL_PRINTER_HANDLE hPrinter) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + StartPagePrinter(hPrinter); + dwErrorCode = GetLastError(); + + RpcRevertToSelf(); + return dwErrorCode; +} + +DWORD +_RpcWritePrinter(WINSPOOL_PRINTER_HANDLE hPrinter, BYTE *pBuf, DWORD cbBuf, DWORD *pcWritten) +{ + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + WritePrinter(hPrinter, pBuf, cbBuf, pcWritten); + dwErrorCode = GetLastError(); + + RpcRevertToSelf(); + return dwErrorCode; +} Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c [iso-8859-1] Thu Jul 16 13:59:20 2015 @@ -71,34 +71,6 @@ } DWORD -_RpcStartDocPrinter(WINSPOOL_PRINTER_HANDLE hPrinter, WINSPOOL_DOC_INFO_CONTAINER *pDocInfoContainer, DWORD *pJobId) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD -_RpcStartPagePrinter(WINSPOOL_PRINTER_HANDLE hPrinter) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD -_RpcWritePrinter(WINSPOOL_PRINTER_HANDLE hPrinter, BYTE *pBuf, DWORD cbBuf, DWORD *pcWritten) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD -_RpcEndPagePrinter(WINSPOOL_PRINTER_HANDLE hPrinter) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD _RpcAbortPrinter(WINSPOOL_PRINTER_HANDLE hPrinter) { UNIMPLEMENTED; @@ -106,20 +78,6 @@ } DWORD -_RpcReadPrinter(WINSPOOL_PRINTER_HANDLE hPrinter, BYTE *pBuf, DWORD cbBuf, DWORD *pcNoBytesRead) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD -_RpcEndDocPrinter(WINSPOOL_PRINTER_HANDLE hPrinter) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD _RpcGetPrinterData(WINSPOOL_PRINTER_HANDLE hPrinter, WCHAR *pValueName, DWORD *pType, BYTE *pData, DWORD nSize, DWORD *pcbNeeded) { UNIMPLEMENTED; @@ -141,13 +99,6 @@ } DWORD -_RpcClosePrinter(WINSPOOL_PRINTER_HANDLE *phPrinter) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD _RpcAddForm(WINSPOOL_PRINTER_HANDLE hPrinter, WINSPOOL_FORM_CONTAINER *pFormInfoContainer) { UNIMPLEMENTED; @@ -183,20 +134,6 @@ } DWORD -_RpcEnumPorts(WINSPOOL_HANDLE pName, DWORD Level, BYTE *pPort, DWORD cbBuf, DWORD *pcbNeeded, DWORD *pcReturned) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD -_RpcEnumMonitors(WINSPOOL_HANDLE pName, DWORD Level, BYTE *pMonitor, DWORD cbBuf, DWORD *pcbNeeded, DWORD *pcReturned) -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD _RpcAddPort(WINSPOOL_HANDLE pName, ULONG_PTR hWnd, WCHAR *pMonitorName) { UNIMPLEMENTED;

9 years, 5 months

[cfinck] 68403: [LOCALMON] - Bugfix: Unset bStartedDoc in LocalmonEndDocPort so that new documents can be started again. - Bugfix: Use CREATE_ALWAYS instead of OPEN_ALWAYS for CreateFileW to trunca...

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jul 15 18:45:37 2015 New Revision: 68403 URL: http://svn.reactos.org/svn/reactos?rev=68403&view=rev Log: [LOCALMON] - Bugfix: Unset bStartedDoc in LocalmonEndDocPort so that new documents can be started again. - Bugfix: Use CREATE_ALWAYS instead of OPEN_ALWAYS for CreateFileW to truncate any existing output file before writing a new document into it. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/ports.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/ports.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/ports.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/ports.c [iso-8859-1] Wed Jul 15 18:45:37 2015 @@ -300,7 +300,7 @@ CopyMemory(&pwszNonspooledFileName[cchLocalSlashes + cchNonspooledPrefix], pwszPortNameWithoutColon, (cchPortNameWithoutColon + 1) * sizeof(WCHAR)); // Finally open it for reading and writing. - pPort->hFile = CreateFileW(pwszNonspooledFileName, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, NULL); + pPort->hFile = CreateFileW(pwszNonspooledFileName, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); if (pPort->hFile == INVALID_HANDLE_VALUE) { dwErrorCode = GetLastError(); @@ -577,6 +577,9 @@ // We're done with the printer. ClosePrinter(pPort->hPrinter); pPort->hPrinter = NULL; + + // A new document can now be started again. + pPort->bStartedDoc = FALSE; } SetLastError(ERROR_SUCCESS); @@ -979,7 +982,7 @@ else if(pPort->PortType == PortType_FILE) { // This is a FILE: port. Open the output file given in the Document Info. - pPort->hFile = CreateFileW(pDocInfo1->pOutputFile, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, 0, NULL); + pPort->hFile = CreateFileW(pDocInfo1->pOutputFile, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); if (pPort->hFile == INVALID_HANDLE_VALUE) { dwErrorCode = GetLastError(); @@ -999,7 +1002,7 @@ { if (GetLastError() == ERROR_SUCCESS) { - pPort->hFile = CreateFileW(pPort->pwszPortName, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, NULL); + pPort->hFile = CreateFileW(pPort->pwszPortName, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); if (pPort->hFile == INVALID_HANDLE_VALUE) { dwErrorCode = GetLastError();

9 years, 5 months

[cfinck] 68402: [LOCALMON] My idea to just care about COM, FILE: and LPT ports was too short-sighted. Apart from selecting a FILE: port that prompts for the output filename at printing, you can als...

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jul 15 18:15:33 2015 New Revision: 68402 URL: http://svn.reactos.org/svn/reactos?rev=68402&view=rev Log: [LOCALMON] My idea to just care about COM, FILE: and LPT ports was too short-sighted. Apart from selecting a FILE: port that prompts for the output filename at printing, you can also add a port "C:\bla.txt" to always output into that particular file. Even shared network printers can be added as a local port "\\COMPUTERNAME\PrinterName" (and Windows even does that when auto-adding printers found on the network). Note that this is the exception though, shared network printers are normally handled by a different component. Our localmon now handles all valid ports found in the registry. Port name checks were modified to be extra-picky and not let any false positives happen (e.g. trying to print into a file starting with "LPT" shouldn't be treated as printing to an LPT port) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/ports.c branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/precomp.h branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/tools.c branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/xcv.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/main.c [iso-8859-1] Wed Jul 15 18:15:33 2015 @@ -38,6 +38,52 @@ }; +/** + * @name _IsNEPort + * + * Checks if the given port name is a virtual Ne port. + * A virtual Ne port may appear in HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Ports and can have the formats + * Ne00:, Ne01:, Ne-02:, Ne456: + * This check is extra picky to not cause false positives (like file name ports starting with "Ne"). + * + * @param pwszPortName + * The port name to check. + * + * @return + * TRUE if this is definitely a virtual Ne port, FALSE if not. + */ +static __inline BOOL +_IsNEPort(PCWSTR pwszPortName) +{ + PCWSTR p = pwszPortName; + + // First character needs to be 'N' (uppercase or lowercase) + if (*p != L'N' && *p != L'n') + return FALSE; + + // Next character needs to be 'E' (uppercase or lowercase) + p++; + if (*p != L'E' && *p != L'e') + return FALSE; + + // An optional hyphen may follow now. + p++; + if (*p == L'-') + p++; + + // Now an arbitrary number of digits may follow. + while (*p >= L'0' && *p <= L'9') + p++; + + // Finally, the virtual Ne port must be terminated by a colon. + if (*p != ':') + return FALSE; + + // If this is the end of the string, we have a virtual Ne port. + p++; + return (*p == L'\0'); +} + static void _LoadResources(HINSTANCE hinstDLL) { @@ -165,8 +211,16 @@ goto Cleanup; } - // This Port Monitor supports COM, FILE and LPT ports. Skip all others. - if (_wcsnicmp(pPort->pwszPortName, L"COM", 3) != 0 && _wcsicmp(pPort->pwszPortName, L"FILE:") != 0 && _wcsnicmp(pPort->pwszPortName, L"LPT", 3) != 0) + // pwszPortName can be one of the following to be valid for this Port Monitor: + // COMx: - Physical COM port + // LPTx: - Physical LPT port (or redirected one using "net use LPT1 ...") + // FILE: - Opens a prompt that asks for an output filename + // C:\bla.txt - Redirection into the file "C:\bla.txt" + // \\COMPUTERNAME\PrinterName - Redirection to a shared network printer installed as a local port + // + // We can't detect valid and invalid ones by the name, so we can only exclude empty ports and the virtual "Ne00:", "Ne01:", ... ports. + // Skip the invalid ones here. + if (!cchPortName || _IsNEPort(pPort->pwszPortName)) { DllFreeSplMem(pPort); continue; Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/ports.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/ports.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/ports.c [iso-8859-1] Wed Jul 15 18:15:33 2015 @@ -17,33 +17,76 @@ * @name _GetNonspooledPortName * * Prepends "NONSPOOLED_" to a port name without colon. - * You have to free the returned buffer using DllFreeSplMem. * * @param pwszPortNameWithoutColon * Result of a previous GetPortNameWithoutColon call. * + * @param ppwszNonspooledPortName + * Pointer to a buffer that will contain the NONSPOOLED port name. + * You have to free this buffer using DllFreeSplMem. + * * @return - * Buffer containing the NONSPOOLED port name or NULL in case of failure. + * ERROR_SUCCESS if the NONSPOOLED port name was successfully copied into the buffer. + * ERROR_NOT_ENOUGH_MEMORY if memory allocation failed. */ -static __inline PWSTR -_GetNonspooledPortName(PCWSTR pwszPortNameWithoutColon) +static __inline DWORD +_GetNonspooledPortName(PCWSTR pwszPortNameWithoutColon, PWSTR* ppwszNonspooledPortName) { DWORD cchPortNameWithoutColon; - PWSTR pwszNonspooledPortName; cchPortNameWithoutColon = wcslen(pwszPortNameWithoutColon); - pwszNonspooledPortName = DllAllocSplMem((cchNonspooledPrefix + cchPortNameWithoutColon + 1) * sizeof(WCHAR)); - if (!pwszNonspooledPortName) + *ppwszNonspooledPortName = DllAllocSplMem((cchNonspooledPrefix + cchPortNameWithoutColon + 1) * sizeof(WCHAR)); + if (!*ppwszNonspooledPortName) { ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); - return NULL; - } - - CopyMemory(pwszNonspooledPortName, wszNonspooledPrefix, cchNonspooledPrefix * sizeof(WCHAR)); - CopyMemory(&pwszNonspooledPortName[cchNonspooledPrefix], pwszPortNameWithoutColon, (cchPortNameWithoutColon + 1) * sizeof(WCHAR)); - - return pwszNonspooledPortName; + return ERROR_NOT_ENOUGH_MEMORY; + } + + CopyMemory(*ppwszNonspooledPortName, wszNonspooledPrefix, cchNonspooledPrefix * sizeof(WCHAR)); + CopyMemory(&(*ppwszNonspooledPortName)[cchNonspooledPrefix], pwszPortNameWithoutColon, (cchPortNameWithoutColon + 1) * sizeof(WCHAR)); + + return ERROR_SUCCESS; +} + +/** + * @name _IsLegacyPort + * + * Checks if the given port name is a legacy port (COM or LPT). + * This check is extra picky to not cause false positives (like file name ports starting with "COM" or "LPT"). + * + * @param pwszPortName + * The port name to check. + * + * @param pwszPortType + * L"COM" or L"LPT" + * + * @return + * TRUE if this is definitely the asked legacy port, FALSE if not. + */ +static __inline BOOL +_IsLegacyPort(PCWSTR pwszPortName, PCWSTR pwszPortType) +{ + const DWORD cchPortType = 3; + PCWSTR p = pwszPortName; + + // The port name must begin with pwszPortType. + if (_wcsnicmp(p, pwszPortType, cchPortType) != 0) + return FALSE; + + p += cchPortType; + + // Now an arbitrary number of digits may follow. + while (*p >= L'0' && *p <= L'9') + p++; + + // Finally, the legacy port must be terminated by a colon. + if (*p != ':') + return FALSE; + + // If this is the end of the string, we have a legacy port. + p++; + return (*p == L'\0'); } /** @@ -78,11 +121,9 @@ pPort->pwszMapping = NULL; // Finally get the required strings and remove the DOS device definition for the NONSPOOLED port. - pwszPortNameWithoutColon = GetPortNameWithoutColon(pPort->pwszPortName); - if (pwszPortNameWithoutColon) - { - pwszNonspooledPortName = _GetNonspooledPortName(pwszPortNameWithoutColon); - if (pwszNonspooledPortName) + if (GetPortNameWithoutColon(pPort->pwszPortName, &pwszPortNameWithoutColon) == ERROR_SUCCESS) + { + if (_GetNonspooledPortName(pwszPortNameWithoutColon, &pwszNonspooledPortName) == ERROR_SUCCESS) { DefineDosDeviceW(DDD_REMOVE_DEFINITION, pwszNonspooledPortName, NULL); DllFreeSplMem(pwszNonspooledPortName); @@ -105,8 +146,7 @@ * @return * TRUE if a NONSPOOLED port was successfully created, FALSE otherwise. * A more specific error code can be obtained through GetLastError. - * In particular, if the return value is FALSE and GetLastError returns ERROR_SUCCESS, no NONSPOOLED port is needed, - * because no system-wide device definition is available. + * In particular, if the return value is FALSE and GetLastError returns ERROR_SUCCESS, no NONSPOOLED port is needed for this port. */ static BOOL _CreateNonspooledPort(PLOCALMON_PORT pPort) @@ -129,10 +169,16 @@ PWSTR pwszPortNameWithoutColon = NULL; // We need the port name without the trailing colon. - pwszPortNameWithoutColon = GetPortNameWithoutColon(pPort->pwszPortName); - if (!pwszPortNameWithoutColon) - { - dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + dwErrorCode = GetPortNameWithoutColon(pPort->pwszPortName, &pwszPortNameWithoutColon); + if (dwErrorCode == ERROR_INVALID_PARAMETER) + { + // This port has no trailing colon, so we also need no NONSPOOLED mapping for it. + dwErrorCode = ERROR_SUCCESS; + goto Cleanup; + } + else if (dwErrorCode != ERROR_SUCCESS) + { + // Another unexpected failure. goto Cleanup; } @@ -222,12 +268,9 @@ } // We now want to create a DOS device "NONSPOOLED_<PortName>" to this mapping, so that we're able to open it through CreateFileW. - pwszNonspooledPortName = _GetNonspooledPortName(pwszPortNameWithoutColon); - if (!pwszNonspooledPortName) - { - dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; - goto Cleanup; - } + dwErrorCode = _GetNonspooledPortName(pwszPortNameWithoutColon, &pwszNonspooledPortName); + if (dwErrorCode != ERROR_SUCCESS) + goto Cleanup; // Delete a possibly existing NONSPOOLED device before creating the new one, so we don't stack up device definitions. DefineDosDeviceW(DDD_REMOVE_DEFINITION, pwszNonspooledPortName, NULL); @@ -493,7 +536,7 @@ pPort->hPrinter = NULL; } - // Free virtual FILE ports which were created in LocalmonOpenPort. + // Free virtual FILE: ports which were created in LocalmonOpenPort. if (pPort->PortType == PortType_FILE) { EnterCriticalSection(&pPort->pLocalmon->Section); @@ -712,11 +755,8 @@ // Even if this API is called OpenPort, port file handles aren't always opened here :-P // Windows only does this for physical LPT ports here to enable bidirectional communication with the printer outside of jobs (using ReadPort and WritePort). // The others are only opened per job in StartDocPort. - if (_wcsnicmp(pName, L"LPT", 3) == 0) - { - // Treat all ports as other LPT ports until we can definitely say that it's a physical one. - pPort->PortType = PortType_OtherLPT; - + if (_IsLegacyPort(pName, L"LPT")) + { // Try to create a NONSPOOLED port and open it. if (_CreateNonspooledPort(pPort)) { @@ -740,9 +780,9 @@ goto Cleanup; } } - else - { - // This can only be a COM port. + else if (_IsLegacyPort(pName, L"COM")) + { + // COM ports can't be redirected over the network, so this is a physical one. pPort->PortType = PortType_PhysicalCOM; } } @@ -948,13 +988,17 @@ } else { - // This is a COM port or a non-physical LPT port. We open NONSPOOLED ports for these per job. + // This can be: + // - a physical COM port + // - a non-physical LPT port (e.g. with "net use LPT1 ...") + // - any other port (e.g. a file or a shared printer installed as a local port) + // + // For all these cases, we try to create a NONSPOOLED port per job. + // If _CreateNonspooledPort reports that no NONSPOOLED port is necessary, we can just open the port name. if (!_CreateNonspooledPort(pPort)) { if (GetLastError() == ERROR_SUCCESS) { - // This is a user-local instead of a system-wide port. - // Such local ports haven't been remapped by the spooler, so we can just open them. pPort->hFile = CreateFileW(pPort->pwszPortName, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, NULL); if (pPort->hFile == INVALID_HANDLE_VALUE) { Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/precomp.h [iso-8859-1] Wed Jul 15 18:15:33 2015 @@ -35,8 +35,8 @@ typedef struct _LOCALMON_HANDLE { CRITICAL_SECTION Section; /** Critical Section for modifying or reading the ports. */ - LIST_ENTRY FilePorts; /** Virtual ports created for every document that's redirected to an output file. */ - LIST_ENTRY RegistryPorts; /** COM, FILE: and LPT ports loaded from the local registry. */ + LIST_ENTRY FilePorts; /** Ports created when a document is printed on FILE: and the user entered a file name. */ + LIST_ENTRY RegistryPorts; /** Valid ports loaded from the local registry. */ LIST_ENTRY XcvHandles; /** Xcv handles created with LocalmonXcvOpenPort. */ } LOCALMON_HANDLE, *PLOCALMON_HANDLE; @@ -49,10 +49,10 @@ { LIST_ENTRY Entry; enum { - PortType_FILE, /** A virtual port for redirecting the document into a file. */ + PortType_Other = 0, /** Any port that doesn't belong into the other categories (default). */ + PortType_FILE, /** A port created when a document is printed on FILE: and the user entered a file name. */ PortType_PhysicalCOM, /** A physical serial port (COM) */ - PortType_PhysicalLPT, /** A physical parallel port (LPT) */ - PortType_OtherLPT /** A non-physical parallel port (e.g. a redirected one over network using "net use LPT1 ...") */ + PortType_PhysicalLPT /** A physical parallel port (LPT) */ } PortType; BOOL bStartedDoc; /** Whether a document has been started with StartDocPort. */ @@ -99,7 +99,7 @@ // tools.c BOOL DoesPortExist(PCWSTR pwszPortName); DWORD GetLPTTransmissionRetryTimeout(); -PWSTR GetPortNameWithoutColon(PCWSTR pwszPortName); +DWORD GetPortNameWithoutColon(PCWSTR pwszPortName, PWSTR* ppwszPortNameWithoutColon); // xcv.c BOOL WINAPI LocalmonXcvClosePort(HANDLE hXcv); Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/tools.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/tools.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/tools.c [iso-8859-1] Wed Jul 15 18:15:33 2015 @@ -124,32 +124,42 @@ * @name GetPortNameWithoutColon * * Most of the time, we operate on port names with a trailing colon. But some functions require the name without the trailing colon. - * This function returns the port name without the colon. You have to free the returned buffer using DllFreeSplMem. + * This function checks if the port has a trailing colon and if so, it returns the port name without the colon. * * @param pwszPortName * The port name with colon * + * @param ppwszPortNameWithoutColon + * Pointer to a PWSTR that will contain the port name without colon. + * You have to free this buffer using DllFreeSplMem. + * * @return - * Buffer containing the port name without a colon or NULL in case of failure. + * ERROR_SUCCESS if the port name without colon was successfully copied into the buffer. + * ERROR_INVALID_PARAMETER if this port name has no trailing colon. + * ERROR_NOT_ENOUGH_MEMORY if memory allocation failed. */ -PWSTR -GetPortNameWithoutColon(PCWSTR pwszPortName) +DWORD +GetPortNameWithoutColon(PCWSTR pwszPortName, PWSTR* ppwszPortNameWithoutColon) { DWORD cchPortName; - PWSTR pwszPortNameWithoutColon; - // Every port in our port list has a trailing colon, so we just need to remove the last character of the string. + // Compute the string length of pwszPortNameWithoutColon. cchPortName = wcslen(pwszPortName) - 1; - pwszPortNameWithoutColon = DllAllocSplMem((cchPortName + 1) * sizeof(WCHAR)); - if (!pwszPortNameWithoutColon) + // Check if pwszPortName really has a colon as the last character. + if (pwszPortName[cchPortName] != L':') + return ERROR_INVALID_PARAMETER; + + // It has, so allocate a buffer and copy the port name without colon into it. + *ppwszPortNameWithoutColon = DllAllocSplMem((cchPortName + 1) * sizeof(WCHAR)); + if (!*ppwszPortNameWithoutColon) { ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); - return NULL; + return ERROR_NOT_ENOUGH_MEMORY; } - CopyMemory(pwszPortNameWithoutColon, pwszPortName, cchPortName * sizeof(WCHAR)); - pwszPortNameWithoutColon[cchPortName] = 0; + CopyMemory(*ppwszPortNameWithoutColon, pwszPortName, cchPortName * sizeof(WCHAR)); + *ppwszPortNameWithoutColon[cchPortName] = 0; - return pwszPortNameWithoutColon; + return ERROR_SUCCESS; } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/xcv.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/xcv.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/xcv.c [iso-8859-1] Wed Jul 15 18:15:33 2015 @@ -305,12 +305,9 @@ } // SetDefaultCommConfigW needs the port name without colon. - pwszPortNameWithoutColon = GetPortNameWithoutColon(pXcv->pwszObject); - if (!pwszPortNameWithoutColon) - { - dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; - goto Cleanup; - } + dwErrorCode = GetPortNameWithoutColon(pXcv->pwszObject, &pwszPortNameWithoutColon); + if (dwErrorCode != ERROR_SUCCESS) + goto Cleanup; // Switch to the SYSTEM context for setting the port configuration. hToken = RevertToPrinterSelf();

9 years, 5 months

[cfinck] 68401: [WINPRINT] Bugfix: The Printer Name with Port is given through the parameter pPrinterName, not the pPrinterName field of the pPrintProcessorOpenData structure.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jul 15 15:53:04 2015 New Revision: 68401 URL: http://svn.reactos.org/svn/reactos?rev=68401&view=rev Log: [WINPRINT] Bugfix: The Printer Name with Port is given through the parameter pPrinterName, not the pPrinterName field of the pPrintProcessorOpenData structure. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] Wed Jul 15 15:53:04 2015 @@ -219,7 +219,7 @@ pHandle->pwszDatatype = AllocSplStr(pPrintProcessorOpenData->pDatatype); pHandle->pwszDocumentName = AllocSplStr(pPrintProcessorOpenData->pDocumentName); pHandle->pwszOutputFile = AllocSplStr(pPrintProcessorOpenData->pOutputFile); - pHandle->pwszPrinterPort = AllocSplStr(pPrintProcessorOpenData->pPrinterName); + pHandle->pwszPrinterPort = AllocSplStr(pPrinterName); // We were successful! Return the handle and don't let the cleanup routine free it. dwErrorCode = ERROR_SUCCESS;

9 years, 5 months

[aandrejevic] 68400: [FAST486] Combine FPREM and FPREM1 into one case.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Jul 14 23:29:23 2015 New Revision: 68400 URL: http://svn.reactos.org/svn/reactos?rev=68400&view=rev Log: [FAST486] Combine FPREM and FPREM1 into one case. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6840… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Tue Jul 14 23:29:23 2015 @@ -2418,6 +2418,8 @@ /* FPREM1 */ case 0x35: + /* FPREM */ + case 0x38: { LONGLONG Quotient; @@ -2430,7 +2432,12 @@ break; } - if (Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), TRUE, &FPU_ST(0), &Quotient)) + if (Fast486FpuRemainder(State, + &FPU_ST(0), + &FPU_ST(1), + ModRegRm.Register == 6, /* TRUE if it's FPREM1 */ + &FPU_ST(0), + &Quotient)) { FPU_UPDATE_TAG(0); @@ -2454,33 +2461,6 @@ case 0x37: { State->FpuStatus.Top++; - break; - } - - /* FPREM */ - case 0x38: - { - LONGLONG Quotient; - - Fast486FpuExceptionCheck(State); - FPU_SAVE_LAST_INST(); - - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY || FPU_GET_TAG(1) == FPU_TAG_EMPTY) - { - State->FpuStatus.Ie = TRUE; - break; - } - - if (Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), FALSE, &FPU_ST(0), &Quotient)) - { - FPU_UPDATE_TAG(0); - - /* Return the lowest 3 bits of the quotient in C1, C3, C0 */ - State->FpuStatus.Code1 = Quotient & 1; - State->FpuStatus.Code3 = (Quotient >> 1) & 1; - State->FpuStatus.Code0 = (Quotient >> 2) & 1; - } - break; }

9 years, 5 months

[aandrejevic] 68399: [FAST486] In FPREM and FPREM1, copy the lowest 3 bits of the quotient into C1, C3 and C0 (in that order!).

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Jul 14 23:15:46 2015 New Revision: 68399 URL: http://svn.reactos.org/svn/reactos?rev=68399&view=rev Log: [FAST486] In FPREM and FPREM1, copy the lowest 3 bits of the quotient into C1, C3 and C0 (in that order!). Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6839… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Tue Jul 14 23:15:46 2015 @@ -2419,6 +2419,8 @@ /* FPREM1 */ case 0x35: { + LONGLONG Quotient; + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); @@ -2428,8 +2430,15 @@ break; } - Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), TRUE, &FPU_ST(0), NULL); - FPU_UPDATE_TAG(0); + if (Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), TRUE, &FPU_ST(0), &Quotient)) + { + FPU_UPDATE_TAG(0); + + /* Return the lowest 3 bits of the quotient in C1, C3, C0 */ + State->FpuStatus.Code1 = Quotient & 1; + State->FpuStatus.Code3 = (Quotient >> 1) & 1; + State->FpuStatus.Code0 = (Quotient >> 2) & 1; + } break; } @@ -2451,6 +2460,8 @@ /* FPREM */ case 0x38: { + LONGLONG Quotient; + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); @@ -2460,8 +2471,15 @@ break; } - Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), FALSE, &FPU_ST(0), NULL); - FPU_UPDATE_TAG(0); + if (Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), FALSE, &FPU_ST(0), &Quotient)) + { + FPU_UPDATE_TAG(0); + + /* Return the lowest 3 bits of the quotient in C1, C3, C0 */ + State->FpuStatus.Code1 = Quotient & 1; + State->FpuStatus.Code3 = (Quotient >> 1) & 1; + State->FpuStatus.Code0 = (Quotient >> 2) & 1; + } break; }

9 years, 5 months

[bfreisen] 68398: [MSPAINT_NEW] Pasting a larger-than-current-canvas image now DOES resize the canvas. (adapted from a patch by Gian Sass) CORE-9674 #resolve #comment Fixed in r68398

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Mon Jul 13 14:46:41 2015 New Revision: 68398 URL: http://svn.reactos.org/svn/reactos?rev=68398&view=rev Log: [MSPAINT_NEW] Pasting a larger-than-current-canvas image now DOES resize the canvas. (adapted from a patch by Gian Sass) CORE-9674 #resolve #comment Fixed in r68398 Modified: trunk/reactos/base/applications/mspaint_new/definitions.h trunk/reactos/base/applications/mspaint_new/globalvar.h trunk/reactos/base/applications/mspaint_new/lang/de-DE.rc trunk/reactos/base/applications/mspaint_new/lang/en-GB.rc trunk/reactos/base/applications/mspaint_new/lang/en-US.rc trunk/reactos/base/applications/mspaint_new/main.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] Mon Jul 13 14:46:41 2015 @@ -220,6 +220,7 @@ #define IDS_ANGLE 932 #define IDS_LOADERRORTEXT 933 +#define IDS_ENLARGEPROMPTTEXT 934 #define WM_TOOLSMODELTOOLCHANGED WM_APP #define WM_TOOLSMODELSETTINGSCHANGED (WM_APP + 1) 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] Mon Jul 13 14:46:41 2015 @@ -31,6 +31,7 @@ class ImageModel; extern ImageModel imageModel; +extern BOOL askBeforeEnlarging; extern POINT start; extern POINT last; Modified: trunk/reactos/base/applications/mspaint_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/de-DE.rc [iso-8859-1] Mon Jul 13 14:46:41 2015 @@ -214,4 +214,5 @@ IDS_PERCENTAGE "Der Prozentsatz muss zwischen 1 und 500 liegen." IDS_ANGLE "Der Winkel muss zwischen -89 und 89 liegen." IDS_LOADERRORTEXT "Die Datei %s konnte nicht geladen werden." -END + IDS_ENLARGEPROMPTTEXT "Das Bild in der Zwischenablage ist grÃ¶Ãer als die Bitmap.\nSoll die Bitmap vergrÃ¶Ãert werden?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/en-GB.rc [iso-8859-1] Mon Jul 13 14:46:41 2015 @@ -214,4 +214,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/en-US.rc [iso-8859-1] Mon Jul 13 14:46:41 2015 @@ -214,4 +214,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END 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] Mon Jul 13 14:46:41 2015 @@ -24,6 +24,7 @@ STRETCHSKEW stretchSkew; ImageModel imageModel; +BOOL askBeforeEnlarging = FALSE; // TODO: initialize from registry POINT start; POINT last; 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] Mon Jul 13 14:46:41 2015 @@ -107,6 +107,47 @@ void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) { + int width = GetDIBWidth(bitmap); + int height = GetDIBHeight(bitmap); + int curWidth = imageModel.GetWidth(); + int curHeight = imageModel.GetHeight(); + + if (width > curWidth || height > curHeight) + { + BOOL shouldEnlarge = TRUE; + + if (askBeforeEnlarging) + { + TCHAR programname[20]; + TCHAR shouldEnlargePromptText[100]; + + LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname)); + LoadString(hProgInstance, IDS_ENLARGEPROMPTTEXT, shouldEnlargePromptText, SIZEOF(shouldEnlargePromptText)); + + switch (MessageBox(shouldEnlargePromptText, programname, MB_YESNOCANCEL | MB_ICONQUESTION)) + { + case IDYES: + break; + case IDNO: + shouldEnlarge = FALSE; + break; + case IDCANCEL: + return; + } + } + + if (shouldEnlarge) + { + if (width > curWidth) + curWidth = width; + + if (height > curHeight) + curHeight = height; + + imageModel.Crop(curWidth, curHeight, 0, 0); + } + } + HWND hToolbar = FindWindowEx(toolBoxContainer.m_hWnd, NULL, TOOLBARCLASSNAME, NULL); SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELPARAM(TRUE, 0)); toolBoxContainer.SendMessage(WM_COMMAND, ID_RECTSEL);

9 years, 5 months

[cfinck] 68397: [LOCALSPL] - Rewrite LocalOpenPrinter to also properly support opening Port and Xcv handles. - Manage a list of Ports and their associated Print Monitors. - const-ify some parameters.

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Jul 13 10:18:07 2015 New Revision: 68397 URL: http://svn.reactos.org/svn/reactos?rev=68397&view=rev Log: [LOCALSPL] - Rewrite LocalOpenPrinter to also properly support opening Port and Xcv handles. - Manage a list of Ports and their associated Print Monitors. - const-ify some parameters. Modified: 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/monitors.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.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/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] Mon Jul 13 10:18:07 2015 @@ -218,7 +218,7 @@ // Check if this is a printer handle. pHandle = (PLOCAL_HANDLE)hPrinter; - if (pHandle->HandleType != Printer) + if (pHandle->HandleType != HandleType_Printer) { dwErrorCode = ERROR_INVALID_HANDLE; goto Cleanup; @@ -579,7 +579,7 @@ // Check if this is a printer handle. pHandle = (PLOCAL_HANDLE)hPrinter; - if (pHandle->HandleType != Printer) + if (pHandle->HandleType != HandleType_Printer) { dwErrorCode = ERROR_INVALID_HANDLE; goto Cleanup; @@ -853,7 +853,7 @@ // Check if this is a printer handle. pHandle = (PLOCAL_HANDLE)hPrinter; - if (pHandle->HandleType != Printer) + if (pHandle->HandleType != HandleType_Printer) { dwErrorCode = ERROR_INVALID_HANDLE; goto Cleanup; @@ -918,7 +918,7 @@ // Check if this is a printer handle. pHandle = (PLOCAL_HANDLE)hPrinter; - if (pHandle->HandleType != Printer) + if (pHandle->HandleType != HandleType_Printer) { dwErrorCode = ERROR_INVALID_HANDLE; goto Cleanup; @@ -1015,7 +1015,7 @@ // Check if this is a printer handle. pHandle = (PLOCAL_HANDLE)hPrinter; - if (pHandle->HandleType != Printer) + if (pHandle->HandleType != HandleType_Printer) { dwErrorCode = ERROR_INVALID_HANDLE; goto Cleanup; 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] Mon Jul 13 10:18:07 2015 @@ -146,6 +146,7 @@ _GetSpoolDirectory(); return InitializePrintMonitorList() && + InitializePortList() && InitializePrintProcessorList() && InitializePrinterList() && InitializeGlobalJobList(); Modified: 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 [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/monitors.c [iso-8859-1] Mon Jul 13 10:18:07 2015 @@ -7,8 +7,26 @@ #include "precomp.h" -// Local Variables +// Global Variables LIST_ENTRY PrintMonitorList; + + +PLOCAL_PRINT_MONITOR +FindPrintMonitor(PCWSTR pwszName) +{ + PLIST_ENTRY pEntry; + PLOCAL_PRINT_MONITOR pPrintMonitor; + + for (pEntry = PrintMonitorList.Flink; pEntry != &PrintMonitorList; pEntry = pEntry->Flink) + { + pPrintMonitor = CONTAINING_RECORD(pEntry, LOCAL_PRINT_MONITOR, Entry); + + if (_wcsicmp(pPrintMonitor->pwszName, pwszName) == 0) + return pPrintMonitor; + } + + return NULL; +} BOOL InitializePrintMonitorList() Modified: 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 [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.c [iso-8859-1] Mon Jul 13 10:18:07 2015 @@ -7,6 +7,128 @@ #include "precomp.h" +// Local Variables +static LIST_ENTRY _PortList; + + +PLOCAL_PRINT_MONITOR +FindPrintMonitorByPort(PCWSTR pwszName) +{ + PLIST_ENTRY pEntry; + PLOCAL_PORT pPort; + + for (pEntry = _PortList.Flink; pEntry != &_PortList; pEntry = pEntry->Flink) + { + pPort = CONTAINING_RECORD(pEntry, LOCAL_PORT, Entry); + + if (_wcsicmp(pPort->pwszName, pwszName) == 0) + return pPort->pPrintMonitor; + } + + return NULL; +} + +BOOL +InitializePortList() +{ + BOOL bReturnValue; + DWORD cbNeeded; + DWORD cbPortName; + DWORD dwErrorCode; + DWORD dwReturned; + DWORD i; + PLOCAL_PORT pPort; + PLOCAL_PRINT_MONITOR pPrintMonitor; + PLIST_ENTRY pEntry; + PPORT_INFO_1W p; + PPORT_INFO_1W pPortInfo1 = NULL; + + // Initialize an empty list for our Ports. + InitializeListHead(&_PortList); + + // Loop through all Print Monitors. + for (pEntry = PrintMonitorList.Flink; pEntry != &PrintMonitorList; pEntry = pEntry->Flink) + { + // Cleanup from the previous run. + if (pPortInfo1) + { + DllFreeSplMem(pPortInfo1); + pPortInfo1 = NULL; + } + + pPrintMonitor = CONTAINING_RECORD(pEntry, LOCAL_PRINT_MONITOR, Entry); + + // Determine the required buffer size for EnumPorts. + if (pPrintMonitor->bIsLevel2) + bReturnValue = ((PMONITOR2)pPrintMonitor->pMonitor)->pfnEnumPorts(pPrintMonitor->hMonitor, NULL, 1, NULL, 0, &cbNeeded, &dwReturned); + else + bReturnValue = ((LPMONITOREX)pPrintMonitor->pMonitor)->Monitor.pfnEnumPorts(NULL, 1, NULL, 0, &cbNeeded, &dwReturned); + + // Check the returned error code. + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + ERR("Print Monitor \"%S\" failed with error %lu on EnumPorts!\n", pPrintMonitor->pwszName, GetLastError()); + continue; + } + + // Allocate a buffer large enough. + pPortInfo1 = DllAllocSplMem(cbNeeded); + if (!pPortInfo1) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + // Get the ports handled by this monitor. + if (pPrintMonitor->bIsLevel2) + bReturnValue = ((PMONITOR2)pPrintMonitor->pMonitor)->pfnEnumPorts(pPrintMonitor->hMonitor, NULL, 1, (PBYTE)pPortInfo1, cbNeeded, &cbNeeded, &dwReturned); + else + bReturnValue = ((LPMONITOREX)pPrintMonitor->pMonitor)->Monitor.pfnEnumPorts(NULL, 1, (PBYTE)pPortInfo1, cbNeeded, &cbNeeded, &dwReturned); + + // Check the return value. + if (!bReturnValue) + { + ERR("Print Monitor \"%S\" failed with error %lu on EnumPorts!\n", pPrintMonitor->pwszName, GetLastError()); + continue; + } + + // Loop through all returned ports. + p = pPortInfo1; + + for (i = 0; i < dwReturned; i++) + { + cbPortName = (wcslen(p->pName) + 1) * sizeof(WCHAR); + + // Create a new LOCAL_PORT structure for it. + pPort = DllAllocSplMem(sizeof(LOCAL_PORT) + cbPortName); + if (!pPort) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + pPort->pPrintMonitor = pPrintMonitor; + pPort->pwszName = (PWSTR)((PBYTE)pPort + sizeof(LOCAL_PORT)); + CopyMemory(pPort->pwszName, p->pName, cbPortName); + + // Insert it into the list and advance to the next port. + InsertTailList(&_PortList, &pPort->Entry); + p++; + } + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + // Inside the loop + if (pPortInfo1) + DllFreeSplMem(pPortInfo1); + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} BOOL WINAPI LocalEnumPorts(PWSTR pName, DWORD Level, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) 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] Mon Jul 13 10:18:07 2015 @@ -139,7 +139,12 @@ */ typedef struct _LOCAL_HANDLE { - enum { Printer, Monitor, Port } HandleType; + enum { + HandleType_Port, + HandleType_Printer, + HandleType_Xcv + } + HandleType; PVOID pSpecificHandle; } LOCAL_HANDLE, *PLOCAL_HANDLE; @@ -158,6 +163,17 @@ HANDLE hMonitor; /** Only used when bIsLevel2 == TRUE: Handle returned by InitializePrintMonitor2. */ } LOCAL_PRINT_MONITOR, *PLOCAL_PRINT_MONITOR; + +/** + * Describes a Port handled by a Print Monitor. + */ +typedef struct _LOCAL_PORT +{ + LIST_ENTRY Entry; + PWSTR pwszName; /** The name of the port (including the trailing colon). */ + PLOCAL_PRINT_MONITOR pPrintMonitor; /** The Print Monitor handling this port. */ +} +LOCAL_PORT, *PLOCAL_PORT; /** * Describes the header of a print job serialized into a shadow file (.SHD) @@ -221,10 +237,13 @@ // monitors.c extern LIST_ENTRY PrintMonitorList; +PLOCAL_PRINT_MONITOR FindPrintMonitor(PCWSTR pwszName); BOOL InitializePrintMonitorList(); BOOL WINAPI LocalEnumMonitors(PWSTR pName, DWORD Level, PBYTE pMonitors, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned); // ports.c +PLOCAL_PRINT_MONITOR FindPrintMonitorByPort(PCWSTR pwszName); +BOOL InitializePortList(); BOOL WINAPI LocalEnumPorts(PWSTR pName, DWORD Level, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned); // printers.c @@ -240,8 +259,8 @@ BOOL WINAPI LocalClosePrinter(HANDLE hPrinter); // printprocessors.c -BOOL FindDatatype(PLOCAL_PRINT_PROCESSOR pPrintProcessor, PWSTR pwszDatatype); -PLOCAL_PRINT_PROCESSOR FindPrintProcessor(PWSTR pwszName); +BOOL FindDatatype(const PLOCAL_PRINT_PROCESSOR pPrintProcessor, PCWSTR pwszDatatype); +PLOCAL_PRINT_PROCESSOR FindPrintProcessor(PCWSTR pwszName); 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); 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] Mon Jul 13 10:18:07 2015 @@ -477,18 +477,25 @@ BOOL WINAPI LocalOpenPrinter(PWSTR lpPrinterName, HANDLE* phPrinter, PPRINTER_DEFAULTSW pDefault) { + BOOL bReturnValue; DWORD cchComputerName; - DWORD cchPrinterName; + DWORD cchFirstParameter; DWORD dwErrorCode; DWORD dwJobID; + HANDLE hExternalHandle; PWSTR p = lpPrinterName; - PWSTR pwszPrinterName = NULL; + PWSTR pwszFirstParameter = NULL; + PWSTR pwszSecondParameter = NULL; PLOCAL_JOB pJob; - PLOCAL_HANDLE pHandle; + PLOCAL_HANDLE pHandle = NULL; + PLOCAL_PRINT_MONITOR pPrintMonitor; PLOCAL_PRINTER pPrinter; PLOCAL_PRINTER_HANDLE pPrinterHandle = NULL; WCHAR wszComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + // TODO: lpPrinterName == NULL is supported and means access to the local printer server. + // Not sure yet if that is passed down to localspl.dll or processed in advance. + // Sanity checks if (!lpPrinterName || !phPrinter) { @@ -496,6 +503,7 @@ goto Cleanup; } + // Skip any server name in the first parameter. // Does lpPrinterName begin with two backslashes to indicate a server name? if (lpPrinterName[0] == L'\\' && lpPrinterName[1] == L'\\') { @@ -511,9 +519,6 @@ goto Cleanup; } - // Null-terminate the string here to enable comparison. - *p = 0; - // Get the local computer name for comparison. cchComputerName = _countof(wszComputerName); if (!GetComputerNameW(wszComputerName, &cchComputerName)) @@ -523,8 +528,10 @@ goto Cleanup; } - // Now compare this with the local computer name and reject if it doesn't match, because this print provider only supports local printers. - if (wcsicmp(lpPrinterName, wszComputerName) != 0) + // Now compare this string excerpt with the local computer name. + // The input parameter may not be writable, so we can't null-terminate the input string at this point. + // This print provider only supports local printers, so both strings have to match. + if (p - lpPrinterName != cchComputerName || _wcsnicmp(lpPrinterName, wszComputerName, cchComputerName) != 0) { dwErrorCode = ERROR_INVALID_PRINTER_NAME; goto Cleanup; @@ -534,30 +541,155 @@ lpPrinterName = p + 1; } - // Look for a comma. If it exists, it indicates the end of the printer name. - p = wcschr(lpPrinterName, L','); - if (p) - cchPrinterName = p - lpPrinterName; + // Look for a comma. If it exists, it indicates the end of the first parameter. + pwszSecondParameter = wcschr(lpPrinterName, L','); + if (pwszSecondParameter) + cchFirstParameter = pwszSecondParameter - p; else - cchPrinterName = wcslen(lpPrinterName); - - // No printer name and no comma? This is invalid! - if (!cchPrinterName && !p) + cchFirstParameter = wcslen(lpPrinterName); + + // We must have at least one parameter. + if (!cchFirstParameter && !pwszSecondParameter) { dwErrorCode = ERROR_INVALID_PRINTER_NAME; goto Cleanup; } - // Do we have a printer name? - if (cchPrinterName) + // Do we have a first parameter? + if (cchFirstParameter) { // Yes, extract it. - pwszPrinterName = DllAllocSplMem((cchPrinterName + 1) * sizeof(WCHAR)); - CopyMemory(pwszPrinterName, lpPrinterName, cchPrinterName * sizeof(WCHAR)); - pwszPrinterName[cchPrinterName] = 0; - - // Retrieve the associated printer from the list. - pPrinter = LookupElementSkiplist(&PrinterList, &pwszPrinterName, NULL); + pwszFirstParameter = DllAllocSplMem((cchFirstParameter + 1) * sizeof(WCHAR)); + CopyMemory(pwszFirstParameter, lpPrinterName, cchFirstParameter * sizeof(WCHAR)); + pwszFirstParameter[cchFirstParameter] = 0; + } + + // Do we have a second parameter? + if (pwszSecondParameter) + { + // Yes, skip the comma at the beginning. + ++pwszSecondParameter; + + // Skip whitespace as well. + while (*pwszSecondParameter == L' ') + ++pwszSecondParameter; + } + + // Create a new handle. + pHandle = DllAllocSplMem(sizeof(LOCAL_HANDLE)); + if (!pHandle) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + // Now we can finally check the type of handle actually requested. + if (pwszFirstParameter && pwszSecondParameter && wcsncmp(pwszSecondParameter, L"Port", 4) == 0) + { + // The caller wants a port handle and provided a string like: + // "LPT1:, Port" + // "\\COMPUTERNAME\LPT1:, Port" + + // Look for this port in our Print Monitor Port list. + pPrintMonitor = FindPrintMonitorByPort(pwszFirstParameter); + if (!pPrintMonitor) + { + // The supplied port is unknown to all our Print Monitors. + dwErrorCode = ERROR_INVALID_PRINTER_NAME; + goto Cleanup; + } + + // Call the monitor's OpenPort function. + if (pPrintMonitor->bIsLevel2) + bReturnValue = ((PMONITOR2)pPrintMonitor->pMonitor)->pfnOpenPort(pPrintMonitor->hMonitor, pwszFirstParameter, &hExternalHandle); + else + bReturnValue = ((LPMONITOREX)pPrintMonitor->pMonitor)->Monitor.pfnOpenPort(pwszFirstParameter, &hExternalHandle); + + if (!bReturnValue) + { + // The OpenPort function failed. Return its last error. + dwErrorCode = GetLastError(); + goto Cleanup; + } + + // Return the Port handle through our general handle. + pHandle->HandleType = HandleType_Port; + pHandle->pSpecificHandle = hExternalHandle; + } + else if (!pwszFirstParameter && pwszSecondParameter && wcsncmp(pwszSecondParameter, L"Xcv", 3) == 0) + { + // The caller wants an Xcv handle and provided a string like: + // ", XcvMonitor Local Port" + // "\\COMPUTERNAME\, XcvMonitor Local Port" + // ", XcvPort LPT1:" + // "\\COMPUTERNAME\, XcvPort LPT1:" + + // Skip the "Xcv" string. + pwszSecondParameter += 3; + + // Is XcvMonitor or XcvPort requested? + if (wcsncmp(pwszSecondParameter, L"Monitor ", 8) == 0) + { + // Skip the "Monitor " string. + pwszSecondParameter += 8; + + // Look for this monitor in our Print Monitor list. + pPrintMonitor = FindPrintMonitor(pwszSecondParameter); + if (!pPrintMonitor) + { + // The caller supplied a non-existing Monitor name. + dwErrorCode = ERROR_INVALID_PRINTER_NAME; + goto Cleanup; + } + } + else if (wcsncmp(pwszSecondParameter, L"Port ", 5) == 0) + { + // Skip the "Port " string. + pwszSecondParameter += 5; + + // Look for this port in our Print Monitor Port list. + pPrintMonitor = FindPrintMonitorByPort(pwszSecondParameter); + if (!pPrintMonitor) + { + // The supplied port is unknown to all our Print Monitors. + dwErrorCode = ERROR_INVALID_PRINTER_NAME; + goto Cleanup; + } + } + else + { + dwErrorCode = ERROR_INVALID_PRINTER_NAME; + goto Cleanup; + } + + // Call the monitor's XcvOpenPort function. + if (pPrintMonitor->bIsLevel2) + bReturnValue = ((PMONITOR2)pPrintMonitor->pMonitor)->pfnXcvOpenPort(pPrintMonitor->hMonitor, pwszSecondParameter, SERVER_EXECUTE, &hExternalHandle); + else + bReturnValue = ((LPMONITOREX)pPrintMonitor->pMonitor)->Monitor.pfnXcvOpenPort(pwszSecondParameter, SERVER_EXECUTE, &hExternalHandle); + + if (!bReturnValue) + { + // The XcvOpenPort function failed. Return its last error. + dwErrorCode = GetLastError(); + goto Cleanup; + } + + // Return the Xcv handle through our general handle. + pHandle->HandleType = HandleType_Xcv; + pHandle->pSpecificHandle = hExternalHandle; + } + else + { + // The caller wants a Printer or Printer Job handle and provided a string like: + // "HP DeskJet" + // "\\COMPUTERNAME\HP DeskJet" + // "HP DeskJet, Job 5" + // "\\COMPUTERNAME\HP DeskJet, Job 5" + + // Retrieve the printer from the list. + pPrinter = LookupElementSkiplist(&PrinterList, &pwszFirstParameter, NULL); if (!pPrinter) { // The printer does not exist. @@ -567,6 +699,13 @@ // Create a new printer handle. pPrinterHandle = DllAllocSplMem(sizeof(LOCAL_PRINTER_HANDLE)); + if (!pPrinterHandle) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + pPrinterHandle->pPrinter = pPrinter; // Check if a datatype was given. @@ -593,34 +732,25 @@ else 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) - { - ++p; - - // Skip whitespace. - do - { - ++p; - } - while (*p == ' '); - + // Check if the caller wants a handle to an existing job. + if (pwszSecondParameter) + { // The "Job " string has to follow now. - if (wcscmp(p, L"Job ") != 0) + if (wcsncmp(pwszSecondParameter, L"Job ", 4) != 0) { dwErrorCode = ERROR_INVALID_PRINTER_NAME; goto Cleanup; } // Skip the "Job " string. - p += sizeof("Job ") - 1; + pwszSecondParameter += 4; // Skip even more whitespace. - while (*p == ' ') - ++p; + while (*pwszSecondParameter == ' ') + ++pwszSecondParameter; // Finally extract the desired Job ID. - dwJobID = wcstoul(p, NULL, 10); + dwJobID = wcstoul(pwszSecondParameter, NULL, 10); if (!IS_VALID_JOB_ID(dwJobID)) { // The user supplied an invalid Job ID. @@ -640,70 +770,36 @@ pPrinterHandle->pStartedJob = pJob; } - // Create a new handle that references a printer. - pHandle = DllAllocSplMem(sizeof(LOCAL_HANDLE)); - pHandle->HandleType = Printer; + // Return the Printer handle through our general handle. + pHandle->HandleType = HandleType_Printer; pHandle->pSpecificHandle = pPrinterHandle; } - else - { - // No printer name, but we have a comma! - // This may be a request to a XcvMonitor or XcvPort handle. - ++p; - - // Skip whitespace. - do - { - ++p; - } - while (*p == ' '); - - // Check if this is a request to a XcvMonitor. - if (wcscmp(p, L"XcvMonitor ") == 0) - { - // Skip the "XcvMonitor " string. - p += sizeof("XcvMonitor ") - 1; - - ///////////// TODO ///////////////////// - pHandle = DllAllocSplMem(sizeof(LOCAL_HANDLE)); - pHandle->HandleType = Monitor; - //pHandle->pSpecificHandle = pMonitorHandle; - } - else if (wcscmp(p, L"XcvPort ") == 0) - { - // Skip the "XcvPort " string. - p += sizeof("XcvPort ") - 1; - - //////////// TODO ////////////////////// - pHandle = DllAllocSplMem(sizeof(LOCAL_HANDLE)); - pHandle->HandleType = Port; - //pHandle->pSpecificHandle = pPortHandle; - } - else - { - dwErrorCode = ERROR_INVALID_PRINTER_NAME; - goto Cleanup; - } - } - + + // We were successful! Return the handle. *phPrinter = (HANDLE)pHandle; dwErrorCode = ERROR_SUCCESS; // Don't let the cleanup routines free this. + pHandle = NULL; pPrinterHandle = NULL; - pwszPrinterName = NULL; Cleanup: + if (pHandle) + DllFreeSplMem(pHandle); + if (pPrinterHandle) { if (pPrinterHandle->pwszDatatype) DllFreeSplStr(pPrinterHandle->pwszDatatype); + if (pPrinterHandle->pDevMode) + DllFreeSplMem(pPrinterHandle->pDevMode); + DllFreeSplMem(pPrinterHandle); } - if (pwszPrinterName) - DllFreeSplMem(pwszPrinterName); + if (pwszFirstParameter) + DllFreeSplMem(pwszFirstParameter); SetLastError(dwErrorCode); return (dwErrorCode == ERROR_SUCCESS); @@ -734,7 +830,7 @@ // Check if this is a printer handle. pHandle = (PLOCAL_HANDLE)hPrinter; - if (pHandle->HandleType != Printer) + if (pHandle->HandleType != HandleType_Printer) { dwErrorCode = ERROR_INVALID_HANDLE; goto Cleanup; 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] Mon Jul 13 10:18:07 2015 @@ -73,7 +73,7 @@ } BOOL -FindDatatype(PLOCAL_PRINT_PROCESSOR pPrintProcessor, PWSTR pwszDatatype) +FindDatatype(const PLOCAL_PRINT_PROCESSOR pPrintProcessor, PCWSTR pwszDatatype) { DWORD i; PDATATYPES_INFO_1W pCurrentDatatype = pPrintProcessor->pDatatypesInfo1; @@ -90,7 +90,7 @@ } PLOCAL_PRINT_PROCESSOR -FindPrintProcessor(PWSTR pwszName) +FindPrintProcessor(PCWSTR pwszName) { PLIST_ENTRY pEntry; PLOCAL_PRINT_PROCESSOR pPrintProcessor;

9 years, 5 months

[hbelusca] 68396: [NTVDM]: Fix compilation in STANDALONE mode. CORE-9823 #resolve #comment Fixed in r68396!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jul 13 01:22:34 2015 New Revision: 68396 URL: http://svn.reactos.org/svn/reactos?rev=68396&view=rev Log: [NTVDM]: Fix compilation in STANDALONE mode. CORE-9823 #resolve #comment Fixed in r68396! Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Mon Jul 13 01:22:34 2015 @@ -66,7 +66,7 @@ ulDosKernelSize, &ulDosKernelSize); - DPRINT1("Windows NT DOS file '%s' loading %s at %04X:%04X, size 0x%X ; GetLastError() = %u\n", + DPRINT1("Windows NT DOS file '%s' loading %s at %04X:%04X, size 0x%X (Error: %u).\n", DosKernelFileName, (Success ? "succeeded" : "failed"), getDI(), 0x0000, @@ -271,7 +271,7 @@ } /* Start the process from the command line */ - Result = DosStartProcess(AppName, CmdLine, Env, 0); + Result = DosStartProcess(AppName, CmdLine, Env, MAKELONG(getIP(), getCS())); if (Result != ERROR_SUCCESS) { DisplayMessage(L"Could not start '%S'. Error: %u", AppName, Result); @@ -389,7 +389,7 @@ ulDosBiosSize, &ulDosBiosSize); - DPRINT1("DOS BIOS file '%s' loading %s at %04X:%04X, size 0x%X ; GetLastError() = %u\n", + DPRINT1("DOS BIOS file '%s' loading %s at %04X:%04X, size 0x%X (Error: %u).\n", DosBiosFileName, (Success ? "succeeded" : "failed"), 0x0070, 0x0000, @@ -501,7 +501,8 @@ /* Start the process from the command line */ Result = DosStartProcess(ApplicationName, CommandLine, - SEG_OFF_TO_PTR(SYSTEM_ENV_BLOCK, 0)); + SEG_OFF_TO_PTR(SYSTEM_ENV_BLOCK, 0), + MAKELONG(getIP(), getCS())); if (Result != ERROR_SUCCESS) { DisplayMessage(L"Could not start '%S'. Error: %u", ApplicationName, Result);

9 years, 5 months

[hbelusca] 68395: [NTVDM]: Commit some local changes that can be committed now: - Whitespace fixes. - Improve some DPRINTs. - hardcoded_values--; - Fix DisplayMessage() for NULL-terminated strings....

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jul 13 01:21:46 2015 New Revision: 68395 URL: http://svn.reactos.org/svn/reactos?rev=68395&view=rev Log: [NTVDM]: Commit some local changes that can be committed now: - Whitespace fixes. - Improve some DPRINTs. - hardcoded_values--; - Fix DisplayMessage() for NULL-terminated strings. - Free the allocated block of memory in the mouse driver cleanup procedure. - Properly inherit the parent process environment block if needed. - Return the correct last error if DosCopyEnvironmentBlock fails. - Big ifs turned into switch. - Implement some INT 2Fh DOS multiplex functions (AX=1200h "Installation check", AX=1203h "Get DOS data segment", AX=1214h "Compare FAR pointers", AX=122Fh "Set DOS version to return"); remove the DPRINT for AX=1680h "Release Current Virtual Machine Time-slice". - Stubplement INT 2Ah "DOS critical sections / network" (it just monitors calls to itself at the moment). - Use the boot drive root path as the current directory if we failed retrieving a valid one. - Offsetize the DOS_SYSVARS members (so that I don't have to compute by head the offsets, especially when some of the members is a structure from which I don't know in advance its size); add some C_ASSERTs on the size of DOS standard structures. - Move the NullDriverRoutine buffer outside the sysvars buffer (because it has nothing to do inside it). - In ConDrvReadInput: do not echo the first part of an extended character. - Add basic support for changing the reported DosVersion. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] Mon Jul 13 01:21:46 2015 @@ -32,9 +32,6 @@ /* PRIVATE VARIABLES **********************************************************/ -// static BYTE CurrentDrive; -// static CHAR CurrentDirectories[NUM_DRIVES][DOS_DIR_LENGTH]; - /* PRIVATE FUNCTIONS **********************************************************/ /* PUBLIC FUNCTIONS ***********************************************************/ @@ -105,7 +102,13 @@ LPSTR SourcePtr, Environment; LPSTR DestPtr = (LPSTR)SEG_OFF_TO_PTR(SYSTEM_ENV_BLOCK, 0); - /* Get the environment strings */ + /* + * Get the environment strings + * + * NOTE: On non-STANDALONE builds, this corresponds to the VDM environment + * as created by BaseVDM for NTVDM. On STANDALONE builds this is the Win32 + * environment. In this last case we need to convert it to a proper VDM env. + */ SourcePtr = Environment = GetEnvironmentStrings(); if (Environment == NULL) return FALSE; @@ -231,10 +234,6 @@ #endif - - /* Register the DOS 32-bit Interrupts */ - // RegisterDosInt32(0x20, DosInt20h); - /* Initialize the DOS kernel */ return DosKRNLInitialize(); } Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] Mon Jul 13 01:21:46 2015 @@ -61,8 +61,10 @@ /* Check if this is a special character */ if (Character == 0) ExtendedCode = getAH(); - if (DoEcho) DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); Pointer[BytesRead++] = Character; + + if (Character != 0 && DoEcho) + DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); /* Stop on first carriage return */ if (Character == '\r') Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c [iso-8859-1] Mon Jul 13 01:21:46 2015 @@ -98,30 +98,30 @@ (LPSTR)&CountryInfo->DecimalSep, sizeof(CountryInfo->DecimalSep)); if (Return == 0) return LOWORD(GetLastError()); - + Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDATE, (LPSTR)&CountryInfo->DateSep, sizeof(CountryInfo->DateSep)); if (Return == 0) return LOWORD(GetLastError()); - + Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STIME, (LPSTR)&CountryInfo->TimeSep, sizeof(CountryInfo->TimeSep)); if (Return == 0) return LOWORD(GetLastError()); - + // NOTE: '4: Symbol replace decimal separator' is unsupported. Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_ICURRENCY | LOCALE_RETURN_NUMBER, (LPSTR)&NumVal, sizeof(NumVal)); if (Return == 0) return LOWORD(GetLastError()); CountryInfo->CurrencyFormat = (BYTE)NumVal; - + Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_ICURRDIGITS | LOCALE_RETURN_NUMBER, // LOCALE_IDIGITS | LOCALE_RETURN_NUMBER (LPSTR)&NumVal, sizeof(NumVal)); if (Return == 0) return LOWORD(GetLastError()); CountryInfo->CurrencyDigitsNum = (BYTE)NumVal; - + Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_ITIME | LOCALE_RETURN_NUMBER, (LPSTR)&NumVal, sizeof(NumVal)); @@ -129,7 +129,7 @@ CountryInfo->TimeFormat = (BYTE)NumVal; CountryInfo->CaseMapPtr = MAKELONG(FIELD_OFFSET(COUNTRY_DATA, CaseMapRoutine), CountryDataSegment); - + // CountryInfo->DataListSep; return ERROR_SUCCESS; @@ -240,7 +240,7 @@ CountryDataSegment = DosAllocateMemory(sizeof(COUNTRY_DATA), NULL); if (CountryDataSegment == 0) return FALSE; CountryData = (PCOUNTRY_DATA)SEG_OFF_TO_PTR(CountryDataSegment, 0x0000); - + RtlMoveMemory(CountryData->CaseMapRoutine, CaseMapRoutine, sizeof(CaseMapRoutine)); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h [iso-8859-1] Mon Jul 13 01:21:46 2015 @@ -123,6 +123,7 @@ }; }; } DOS_DRIVER, *PDOS_DRIVER; +C_ASSERT(sizeof(DOS_DRIVER) == 0x12); typedef struct _DOS_REQUEST_HEADER { 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] Mon Jul 13 01:21:46 2015 @@ -91,7 +91,7 @@ return FALSE; } - /* Check whether the directory string is of format "?:..." */ + /* Check whether the directory string is of format "X:..." */ if (strlen(Directory) >= 2 && Directory[1] == ':') { /* Get the drive number */ @@ -114,8 +114,8 @@ Attributes = GetFileAttributesA(Directory); /* Make sure the path exists and is a directory */ - if ((Attributes == INVALID_FILE_ATTRIBUTES) - || !(Attributes & FILE_ATTRIBUTE_DIRECTORY)) + if ((Attributes == INVALID_FILE_ATTRIBUTES) || + !(Attributes & FILE_ATTRIBUTE_DIRECTORY)) { Sda->LastErrorCode = ERROR_PATH_NOT_FOUND; return FALSE; @@ -146,17 +146,11 @@ return FALSE; } - /* Get the directory part of the path */ + /* Get the directory part of the path and set the current directory for the drive */ Path = strchr(DosDirectory, '\\'); if (Path != NULL) { - /* Skip the backslash */ - Path++; - } - - /* Set the directory for the drive */ - if (Path != NULL) - { + Path++; // Skip the backslash strncpy(DosData->CurrentDirectories[DriveNumber], Path, DOS_DIR_LENGTH); } else @@ -829,8 +823,10 @@ DWORD NumberOfFreeClusters; DWORD TotalNumberOfClusters; - if (getDL() == 0x00) RootPath[0] = 'A' + Sda->CurrentDrive; - else RootPath[0] = 'A' + getDL() - 1; + if (getDL() == 0x00) + RootPath[0] = 'A' + Sda->CurrentDrive; + else + RootPath[0] = 'A' + getDL() - 1; if (GetDiskFreeSpaceA(RootPath, &SectorsPerCluster, @@ -914,7 +910,7 @@ { WORD CountryId = getAL() < 0xFF ? getAL() : getBX(); WORD ErrorCode; - + ErrorCode = DosGetCountryInfo(&CountryId, (PDOS_COUNTRY_INFO)SEG_OFF_TO_PTR(getDS(), getDX())); @@ -1110,7 +1106,7 @@ * See Ralf Brown: http://www.ctyme.com/intr/rb-2797.htm * "AX destroyed (DOS 3.3) AL seems to be drive of deleted file." */ - setAL(FileName[0] - 'A'); + setAL(RtlUpperChar(FileName[0]) - 'A'); } else { @@ -1519,54 +1515,68 @@ /* Get/Set Memory Management Options */ case 0x58: { - if (getAL() == 0x00) + switch (getAL()) { /* Get allocation strategy */ - Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; - setAX(Sda->AllocStrategy); - } - else if (getAL() == 0x01) - { + case 0x00: + { + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + setAX(Sda->AllocStrategy); + break; + } + /* Set allocation strategy */ - - if ((getBL() & (DOS_ALLOC_HIGH | DOS_ALLOC_HIGH_LOW)) - == (DOS_ALLOC_HIGH | DOS_ALLOC_HIGH_LOW)) - { - /* Can't set both */ + case 0x01: + { + if ((getBL() & (DOS_ALLOC_HIGH | DOS_ALLOC_HIGH_LOW)) + == (DOS_ALLOC_HIGH | DOS_ALLOC_HIGH_LOW)) + { + /* Can't set both */ + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(ERROR_INVALID_PARAMETER); + break; + } + + if ((getBL() & ~(DOS_ALLOC_HIGH | DOS_ALLOC_HIGH_LOW)) + > DOS_ALLOC_LAST_FIT) + { + /* Invalid allocation strategy */ + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(ERROR_INVALID_PARAMETER); + break; + } + + Sda->AllocStrategy = getBL(); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + break; + } + + /* Get UMB link state */ + case 0x02: + { + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + setAL(DosUmbLinked ? 0x01 : 0x00); + break; + } + + /* Set UMB link state */ + case 0x03: + { + if (getBX()) + DosLinkUmb(); + else + DosUnlinkUmb(); + + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + break; + } + + /* Invalid or unsupported function */ + default: + { Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; - setAX(ERROR_INVALID_PARAMETER); - break; - } - - if ((getBL() & 0x3F) > DOS_ALLOC_LAST_FIT) - { - /* Invalid allocation strategy */ - Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; - setAX(ERROR_INVALID_PARAMETER); - break; - } - - Sda->AllocStrategy = getBL(); - Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; - } - else if (getAL() == 0x02) - { - /* Get UMB link state */ - Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; - setAL(DosUmbLinked ? 0x01 : 0x00); - } - else if (getAL() == 0x03) - { - /* Set UMB link state */ - if (getBX()) DosLinkUmb(); - else DosUnlinkUmb(); - Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; - } - else - { - /* Invalid or unsupported function */ - Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; - setAX(ERROR_INVALID_FUNCTION); + setAX(ERROR_INVALID_FUNCTION); + } } break; @@ -2021,10 +2031,77 @@ setAX(AX); } +VOID WINAPI DosInt2Ah(LPWORD Stack) +{ + DPRINT1("INT 2Ah, AX=%4xh called\n", getAX()); +} + VOID WINAPI DosInt2Fh(LPWORD Stack) { switch (getAH()) { + /* DOS 3+ Internal Utility Functions */ + case 0x12: + { + DPRINT1("INT 2Fh, AX=%4xh DOS Internal Utility Function called\n", getAX()); + + switch (getAL()) + { + /* Installation Check */ + case 0x00: + { + setAL(0xFF); + break; + } + + /* Get DOS Data Segment */ + case 0x03: + { + setDS(DOS_DATA_SEGMENT); + break; + } + + /* Compare FAR Pointers */ + case 0x14: + { + PVOID PointerFromFarPointer1 = SEG_OFF_TO_PTR(getDS(), getSI()); + PVOID PointerFromFarPointer2 = SEG_OFF_TO_PTR(getES(), getDI()); + BOOLEAN AreEqual = (PointerFromFarPointer1 == PointerFromFarPointer2); + + setZF(AreEqual); + setCF(!AreEqual); + break; + } + + /* Set DOS Version Number to return */ + case 0x2F: + { + WORD DosVersion = getDX(); + + // Special case: return the true DOS version when DX=00h + if (DosVersion == 0x0000) + DosData->DosVersion = DOS_VERSION; + else + DosData->DosVersion = DosVersion; + + break; + } + } + + break; + } + + /* Mostly Windows 2.x/3.x/9x support */ + case 0x16: + { + /* + * AL=80h is DOS/Windows/DPMI "Release Current Virtual Machine Time-slice" + * Just do nothing in this case. + */ + if (getAL() != 0x80) goto Default; + break; + } + /* Extended Memory Specification */ case 0x43: { @@ -2057,7 +2134,7 @@ break; } - default: + default: Default: { DPRINT1("DOS Internal System Function INT 0x2F, AH = %xh, AL = %xh NOT IMPLEMENTED!\n", getAH(), getAL()); @@ -2073,6 +2150,8 @@ UCHAR i; PDOS_SFT Sft; LPSTR Path; + BOOLEAN Success = TRUE; + DWORD dwRet; CHAR CurrentDirectory[MAX_PATH]; CHAR DosDirectory[DOS_DIR_LENGTH]; @@ -2103,59 +2182,88 @@ SysVars->FirstSft = MAKELONG(DOS_DATA_OFFSET(Sft), DOS_DATA_SEGMENT); SysVars->CurrentDirs = MAKELONG(DOS_DATA_OFFSET(CurrentDirectories), DOS_DATA_SEGMENT); - /* 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 last drive can be redefined with the LASTDRIVE command. + * At the moment, set the real maximum possible, 'Z'. + */ + SysVars->NumLocalDrives = 'Z' - 'A' + 1; // See #define NUM_DRIVES in dos.h /* 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; + SysVars->BootDrive = RtlUpcaseUnicodeChar(SharedUserData->NtSystemRoot[0]) - 'A' + 1; /* Initialize the NUL device driver */ SysVars->NullDevice.Link = 0xFFFFFFFF; SysVars->NullDevice.DeviceAttributes = DOS_DEVATTR_NUL | DOS_DEVATTR_CHARACTER; - SysVars->NullDevice.StrategyRoutine = FIELD_OFFSET(DOS_SYSVARS, NullDriverRoutine); + // Offset from within the DOS data segment + SysVars->NullDevice.StrategyRoutine = DOS_DATA_OFFSET(NullDriverRoutine); + // Hardcoded to the RETF inside StrategyRoutine SysVars->NullDevice.InterruptRoutine = SysVars->NullDevice.StrategyRoutine + 6; RtlFillMemory(SysVars->NullDevice.DeviceName, sizeof(SysVars->NullDevice.DeviceName), ' '); RtlCopyMemory(SysVars->NullDevice.DeviceName, "NUL", strlen("NUL")); - RtlCopyMemory(SysVars->NullDriverRoutine, + RtlCopyMemory(DosData->NullDriverRoutine, NullDriverRoutine, sizeof(NullDriverRoutine)); + + /* Default DOS version to report */ + DosData->DosVersion = DOS_VERSION; /* Initialize the swappable data area */ Sda = &DosData->Sda; RtlZeroMemory(Sda, sizeof(*Sda)); - /* Get the current directory */ - if (!GetCurrentDirectoryA(sizeof(CurrentDirectory), CurrentDirectory)) + /* Get the current directory and convert it to a DOS path */ + dwRet = GetCurrentDirectoryA(sizeof(CurrentDirectory), CurrentDirectory); + if (dwRet == 0) { - // TODO: Use some kind of default path? - return FALSE; + Success = FALSE; + DPRINT1("GetCurrentDirectoryA failed (Error: %u)\n", GetLastError()); } - - /* Convert it to a DOS path */ - if (!GetShortPathNameA(CurrentDirectory, DosDirectory, sizeof(DosDirectory))) + else if (dwRet > sizeof(CurrentDirectory)) { - // TODO: Use some kind of default path? - return FALSE; + Success = FALSE; + DPRINT1("Current directory too long (%d > MAX_PATH) for GetCurrentDirectoryA\n", dwRet); } - /* Set the drive */ + if (Success) + { + dwRet = GetShortPathNameA(CurrentDirectory, DosDirectory, sizeof(DosDirectory)); + if (dwRet == 0) + { + Success = FALSE; + DPRINT1("GetShortPathNameA failed (Error: %u)\n", GetLastError()); + } + else if (dwRet > sizeof(DosDirectory)) + { + Success = FALSE; + DPRINT1("Short path too long (%d > DOS_DIR_LENGTH) for GetShortPathNameA\n", dwRet); + } + } + + if (!Success) + { + /* We failed, use the boot drive instead */ + DosDirectory[0] = SysVars->BootDrive + 'A' - 1; + DosDirectory[1] = ':'; + DosDirectory[2] = '\\'; + DosDirectory[3] = '\0'; + } + + /* Set the current drive */ Sda->CurrentDrive = RtlUpperChar(DosDirectory[0]) - 'A'; - /* Get the directory part of the path */ + /* Get the directory part of the path and set the current directory */ Path = strchr(DosDirectory, '\\'); if (Path != NULL) { - /* Skip the backslash */ - Path++; + Path++; // Skip the backslash + strncpy(DosData->CurrentDirectories[Sda->CurrentDrive], Path, DOS_DIR_LENGTH); } - - /* Set the directory */ - if (Path != NULL) + else { - strncpy(DosData->CurrentDirectories[Sda->CurrentDrive], Path, DOS_DIR_LENGTH); + DosData->CurrentDirectories[Sda->CurrentDrive][0] = '\0'; } /* Set the current PSP to the system PSP */ @@ -2205,7 +2313,13 @@ RegisterDosInt32(0x2F, DosInt2Fh ); // Multiplex Interrupt /* Unimplemented DOS interrupts */ - RegisterDosInt32(0x2A, NULL); // Network - Installation Check + RegisterDosInt32(0x2A, DosInt2Ah); // DOS Critical Sections / Network +// RegisterDosInt32(0x2E, NULL); // COMMAND.COM "Reload Transient" + + /* Reserved DOS interrupts */ + RegisterDosInt32(0x2B, NULL); + RegisterDosInt32(0x2C, NULL); + RegisterDosInt32(0x2D, NULL); /* Initialize country data */ DosCountryInitialize(); 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] Mon Jul 13 01:21:46 2015 @@ -80,21 +80,25 @@ WORD FirstMcb; /* This is where the SYSVARS really start */ - DWORD FirstDpb; - DWORD FirstSft; - DWORD ActiveClock; - DWORD ActiveCon; - BYTE Reserved0[6]; - DWORD CurrentDirs; - BYTE Reserved1[6]; - BYTE NumBlockDevices; - BYTE NumLocalDrives; // Set by LASTDRIVE - DOS_DRIVER NullDevice; - BYTE NullDriverRoutine[7]; - BYTE Reserved2[8]; - BYTE BootDrive; - BYTE UseDwordMoves; - WORD ExtMemSize; + DWORD FirstDpb; // 0x00 + DWORD FirstSft; // 0x04 + DWORD ActiveClock; // 0x08 + DWORD ActiveCon; // 0x0c + BYTE Reserved0[6]; // 0x10 + DWORD CurrentDirs; // 0x16 + BYTE Reserved1[6]; // 0x1a + BYTE NumBlockDevices; // 0x20 + BYTE NumLocalDrives; // 0x21 - Set by LASTDRIVE + DOS_DRIVER NullDevice; // 0x22 + BYTE Reserved2; // 0x34 + WORD ProgramVersionTable; // 0x35 + DWORD SetVerTable; // 0x37 + WORD Reserved3[2]; // 0x3b + WORD BuffersNumber; // 0x3f - 'x' parameter in "BUFFERS=x,y" command + WORD BuffersLookaheadNumber; // 0x41 - 'y' parameter in "BUFFERS=x,y" command + BYTE BootDrive; // 0x43 + BYTE UseDwordMoves; // 0x44 + WORD ExtMemSize; // 0x45 } DOS_SYSVARS, *PDOS_SYSVARS; typedef struct _DOS_CLOCK_TRANSFER_RECORD @@ -232,6 +236,8 @@ typedef struct _DOS_DATA { DOS_SYSVARS SysVars; + BYTE NullDriverRoutine[7]; + WORD DosVersion; // DOS version to report to programs (can be different from the true one) DOS_SDA Sda; CHAR CurrentDirectories[NUM_DRIVES][DOS_DIR_LENGTH]; BYTE Sft[ANYSIZE_ARRAY]; @@ -242,8 +248,7 @@ /* VARIABLES ******************************************************************/ extern BOOLEAN DoEcho; -extern WORD DosErrorLevel; -extern WORD DosLastError; +extern PDOS_DATA DosData; extern PDOS_SYSVARS SysVars; extern PDOS_SDA Sda; Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Mon Jul 13 01:21:46 2015 @@ -77,7 +77,7 @@ /* Make sure it's valid */ if (CurrentMcb->BlockType != 'M' && CurrentMcb->BlockType != 'Z') { - DPRINT("The DOS memory arena is corrupted!\n"); + DPRINT1("The DOS memory arena is corrupted!\n"); Sda->LastErrorCode = ERROR_ARENA_TRASHED; return 0; } @@ -94,7 +94,7 @@ /* Check if this block is big enough */ if (CurrentMcb->Size < Size) goto Next; - switch (Sda->AllocStrategy & 0x3F) + switch (Sda->AllocStrategy & ~(DOS_ALLOC_HIGH | DOS_ALLOC_HIGH_LOW)) { case DOS_ALLOC_FIRST_FIT: { @@ -159,7 +159,7 @@ if (CurrentMcb->Size > Size) { /* It is, split it into two blocks */ - if ((Sda->AllocStrategy & 0x3F) != DOS_ALLOC_LAST_FIT) + if ((Sda->AllocStrategy & ~(DOS_ALLOC_HIGH | DOS_ALLOC_HIGH_LOW)) != DOS_ALLOC_LAST_FIT) { PDOS_MCB NextMcb = SEGMENT_TO_MCB(Result + Size + 1); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] Mon Jul 13 01:21:46 2015 @@ -29,6 +29,7 @@ BYTE Unused[3]; CHAR Name[8]; } DOS_MCB, *PDOS_MCB; +C_ASSERT(sizeof(DOS_MCB) == 0x10); #pragma pack(pop) /* VARIABLES ******************************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Mon Jul 13 01:21:46 2015 @@ -166,7 +166,7 @@ LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); /* Literally copy the PSP first */ - RtlCopyMemory(DestPsp, SourcePsp, sizeof(DOS_PSP)); + RtlCopyMemory(DestPsp, SourcePsp, sizeof(*DestPsp)); /* Save the interrupt vectors */ DestPsp->TerminateAddress = IntVecTable[0x22]; @@ -222,7 +222,8 @@ PspBlock->HandleTablePtr = MAKELONG(0x18, Segment); /* Set the DOS version */ - PspBlock->DosVersion = DOS_VERSION; + // FIXME: This is here that SETVER stuff enters into action! + PspBlock->DosVersion = DosData->DosVersion; /* Set the far call opcodes */ PspBlock->FarCall[0] = 0xCD; // int 0x21 @@ -377,16 +378,20 @@ /* If no optional environment is given... */ if (Environment == NULL) { - /* ... get the one from the parameter block */ ASSERT(Parameters); - Environment = (LPCSTR)SEG_OFF_TO_PTR(Parameters->Environment, 0); + /* ... get the one from the parameter block (if not NULL)... */ + if (Parameters->Environment) + Environment = (LPCSTR)SEG_OFF_TO_PTR(Parameters->Environment, 0); + /* ... or the one from the parent (otherwise) */ + else + Environment = (LPCSTR)SEG_OFF_TO_PTR(SEGMENT_TO_PSP(Sda->CurrentPsp)->EnvBlock, 0); } /* Copy the environment block to DOS memory */ EnvBlock = DosCopyEnvironmentBlock(Environment, ExecutablePath); if (EnvBlock == 0) { - Result = ERROR_NOT_ENOUGH_MEMORY; + Result = Sda->LastErrorCode; goto Cleanup; } } @@ -431,7 +436,6 @@ /* Try to allocate that much memory */ Segment = DosAllocateMemory((WORD)TotalSize, &MaxAllocSize); - if (Segment == 0) { /* Check if there's at least enough memory for the minimum size */ @@ -460,8 +464,10 @@ SEGMENT_TO_PSP(Segment)->EnvBlock = EnvBlock; /* Calculate the segment where the program should be loaded */ - if (!LoadHigh) LoadSegment = Segment + (sizeof(DOS_PSP) >> 4); - else LoadSegment = Segment + TotalSize - BaseSize; + if (!LoadHigh) + LoadSegment = Segment + (sizeof(DOS_PSP) >> 4); + else + LoadSegment = Segment + TotalSize - BaseSize; RelocFactor = LoadSegment; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Mon Jul 13 01:21:46 2015 @@ -1025,11 +1025,15 @@ VOID DosMouseCleanup(VOID) { + if (DriverState.ShowCount > 0) EraseMouseCursor(); + DosMouseDisable(); + /* Restore the old mouse service interrupt handler */ ((PDWORD)BaseAddress)[DOS_MOUSE_INTERRUPT] = OldIntHandler; - if (DriverState.ShowCount > 0) EraseMouseCursor(); - DosMouseDisable(); + DosFreeMemory(MouseDataSegment); + MouseDataSegment = 0; + MouseData = 0; } /* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] Mon Jul 13 01:21:46 2015 @@ -454,7 +454,7 @@ OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - DPRINT1("CMOS opening %s ; GetLastError() = %u\n", hCmosRam != INVALID_HANDLE_VALUE ? "succeeded" : "failed", GetLastError()); + DPRINT1("CMOS opening %s (Error: %u)\n", hCmosRam != INVALID_HANDLE_VALUE ? "succeeded" : "failed", GetLastError()); if (hCmosRam != INVALID_HANDLE_VALUE) { @@ -469,7 +469,7 @@ DPRINT1("Invalid CMOS file, read bytes %u, expected bytes %u\n", CmosSize, sizeof(CmosMemory)); RtlZeroMemory(&CmosMemory, sizeof(CmosMemory)); } - DPRINT1("CMOS loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); + DPRINT1("CMOS loading %s (Error: %u)\n", Success ? "succeeded" : "failed", GetLastError()); SetFilePointer(hCmosRam, 0, NULL, FILE_BEGIN); } Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Mon Jul 13 01:21:46 2015 @@ -127,7 +127,7 @@ { if (GetMenuItemID(hConsoleMenu, i) == ID_SHOWHIDE_MOUSE) { - /* set VdmMenuPos to the position of the existing menu */ + /* Set VdmMenuPos to the position of the existing menu */ VdmMenuPos = i - 1; return TRUE; } @@ -225,7 +225,7 @@ /* PUBLIC FUNCTIONS ***********************************************************/ VOID -DisplayMessage(LPCWSTR Format, ...) +DisplayMessage(IN LPCWSTR Format, ...) { #ifndef WIN2K_COMPLIANT WCHAR StaticBuffer[256]; @@ -242,11 +242,12 @@ /* * Retrieve the message length and if it is too long, allocate * an auxiliary buffer; otherwise use the static buffer. + * The string is built to be NULL-terminated. */ - MsgLen = _vscwprintf(Format, Parameters) + 1; // NULL-terminated - if (MsgLen > ARRAYSIZE(StaticBuffer)) - { - Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, MsgLen * sizeof(WCHAR)); + MsgLen = _vscwprintf(Format, Parameters); + if (MsgLen >= ARRAYSIZE(StaticBuffer)) + { + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, (MsgLen + 1) * sizeof(WCHAR)); if (Buffer == NULL) { /* Allocation failed, use the static buffer and display a suitable error message */ @@ -256,11 +257,15 @@ } } #else - MsgLen = ARRAYSIZE(Buffer); -#endif + MsgLen = ARRAYSIZE(Buffer) - 1; +#endif + + RtlZeroMemory(Buffer, (MsgLen + 1) * sizeof(WCHAR)); + _vsnwprintf(Buffer, MsgLen, Format, Parameters); + + va_end(Parameters); /* Display the message */ - _vsnwprintf(Buffer, MsgLen, Format, Parameters); DPRINT1("\n\nNTVDM Subsystem\n%S\n\n", Buffer); MessageBoxW(NULL, Buffer, L"NTVDM Subsystem", MB_OK); @@ -268,8 +273,6 @@ /* Free the buffer if needed */ if (Buffer != StaticBuffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); #endif - - va_end(Parameters); } static BOOL Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Mon Jul 13 01:21:46 2015 @@ -75,7 +75,7 @@ /* * Interface functions */ -VOID DisplayMessage(LPCWSTR Format, ...); +VOID DisplayMessage(IN LPCWSTR Format, ...); /*static*/ VOID CreateVdmMenu(HANDLE ConOutHandle);

9 years, 5 months

← Newer
1
...
16
17
18
19
20
21
22
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2015