Ros-diffs January 2019

ros-diffs@reactos.org

31 participants
300 discussions

[reactos] 03/04: [WINSPOOL] Semi implement DocumentPropertiesW CORE-15522

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ad75174465ff45af8f9b… commit 8ad75174465ff45af8f9bac12ed412df10643f62 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jan 6 02:24:42 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jan 6 21:07:27 2019 +0100 [WINSPOOL] Semi implement DocumentPropertiesW CORE-15522 --- win32ss/printing/base/winspool/printers.c | 83 ++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 2 deletions(-) diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 5f130a3d15..28bce50202 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -201,12 +201,91 @@ DocumentPropertiesA(HWND hWnd, HANDLE hPrinter, LPSTR pDeviceName, PDEVMODEA pDe return -1; } +static PRINTER_INFO_9W * get_devmodeW(HANDLE hprn) +{ + PRINTER_INFO_9W *pi9 = NULL; + DWORD needed = 0; + BOOL res; + + res = GetPrinterW(hprn, 9, NULL, 0, &needed); + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) + { + pi9 = HeapAlloc(hProcessHeap, 0, needed); + res = GetPrinterW(hprn, 9, (LPBYTE)pi9, needed, &needed); + } + + if (res) + return pi9; + + ERR("GetPrinterW failed with %u\n", GetLastError()); + HeapFree(hProcessHeap, 0, pi9); + return NULL; +} + LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, LPWSTR pDeviceName, PDEVMODEW pDevModeOutput, PDEVMODEW pDevModeInput, DWORD fMode) { + HANDLE hUseHandle = NULL; + PRINTER_INFO_9W *pi9 = NULL; + LONG Result = -1, Length; + TRACE("DocumentPropertiesW(%p, %p, %S, %p, %p, %lu)\n", hWnd, hPrinter, pDeviceName, pDevModeOutput, pDevModeInput, fMode); - UNIMPLEMENTED; - return -1; + if (hPrinter) + { + hUseHandle = hPrinter; + } + else if (!OpenPrinterW(pDeviceName, &hUseHandle, NULL)) + { + ERR("No handle, and no usable printer name passed in\n"); + return -1; + } + + pi9 = get_devmodeW(hUseHandle); + + if (pi9) + { + Length = pi9->pDevMode->dmSize + pi9->pDevMode->dmDriverExtra; + // See wineps.drv PSDRV_ExtDeviceMode + if (fMode) + { + Result = 1; /* IDOK */ + + if (fMode & DM_IN_BUFFER) + { + FIXME("Merge pDevModeInput with pi9, write back to driver!\n"); + // See wineps.drv PSDRV_MergeDevmodes + } + + if (fMode & DM_IN_PROMPT) + { + FIXME("Show property sheet!\n"); + Result = 2; /* IDCANCEL */ + } + + if (fMode & (DM_OUT_BUFFER | DM_OUT_DEFAULT)) + { + if (pDevModeOutput) + { + memcpy(pDevModeOutput, pi9->pDevMode, pi9->pDevMode->dmSize + pi9->pDevMode->dmDriverExtra); + } + else + { + ERR("No pDevModeOutput\n"); + Result = -1; + } + } + } + else + { + Result = Length; + } + + HeapFree(hProcessHeap, 0, pi9); + } + + if (hUseHandle && !hPrinter) + ClosePrinter(hUseHandle); + return Result; } BOOL WINAPI

5 years, 8 months

[reactos] 02/04: [PRINTING] Semi-implement GetPrinterDriverW CORE-15522

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=796dd5f53c50f8bdb85a2… commit 796dd5f53c50f8bdb85a20d44cee83bb8603a594 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Dec 29 23:51:32 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jan 6 21:07:27 2019 +0100 [PRINTING] Semi-implement GetPrinterDriverW CORE-15522 --- win32ss/printing/base/spoolsv/printerdrivers.c | 30 ++- win32ss/printing/base/winspool/printers.c | 45 ++++- .../printing/include/marshalling/printerdrivers.h | 51 +++++ win32ss/printing/providers/localspl/CMakeLists.txt | 1 + win32ss/printing/providers/localspl/main.c | 2 +- win32ss/printing/providers/localspl/precomp.h | 4 + .../printing/providers/localspl/printerdrivers.c | 211 +++++++++++++++++++++ 7 files changed, 340 insertions(+), 4 deletions(-) diff --git a/win32ss/printing/base/spoolsv/printerdrivers.c b/win32ss/printing/base/spoolsv/printerdrivers.c index ac9ac5801b..a1f45865c1 100644 --- a/win32ss/printing/base/spoolsv/printerdrivers.c +++ b/win32ss/printing/base/spoolsv/printerdrivers.c @@ -6,6 +6,7 @@ */ #include "precomp.h" +#include "marshalling/printerdrivers.h" DWORD _RpcAddPrinterDriver(WINSPOOL_HANDLE pName, WINSPOOL_DRIVER_CONTAINER* pDriverContainer) @@ -45,8 +46,33 @@ _RpcEnumPrinterDrivers(WINSPOOL_HANDLE pName, WCHAR* pEnvironment, DWORD Level, DWORD _RpcGetPrinterDriver(WINSPOOL_PRINTER_HANDLE hPrinter, WCHAR* pEnvironment, DWORD Level, BYTE* pDriver, DWORD cbBuf, DWORD* pcbNeeded) { - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; + DWORD dwErrorCode; + PBYTE pDriverAligned; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + pDriverAligned = AlignRpcPtr(pDriver, &cbBuf); + + if (GetPrinterDriverW(hPrinter, pEnvironment, Level, pDriverAligned, cbBuf, pcbNeeded)) + { + // Replace relative offset addresses in the output by absolute pointers. + ASSERT(Level >= 1 && Level <= 3); + MarshallDownStructure(pDriverAligned, pPrinterDriverMarshalling[Level]->pInfo, pPrinterDriverMarshalling[Level]->cbStructureSize, TRUE); + } + else + { + dwErrorCode = GetLastError(); + } + + RpcRevertToSelf(); + UndoAlignRpcPtr(pDriver, pDriverAligned, cbBuf, pcbNeeded); + + return dwErrorCode; } DWORD diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 9c2d12b31f..5f130a3d15 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -7,6 +7,7 @@ #include "precomp.h" #include <marshalling/printers.h> +#include <marshalling/printerdrivers.h> // Local Constants @@ -513,8 +514,50 @@ GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, DWORD Level, LPBYTE pDriv BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) { + DWORD dwErrorCode; + PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; + TRACE("GetPrinterDriverW(%p, %S, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); - return FALSE; + + // Sanity checks. + if (!pHandle) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + + // Dismiss invalid levels already at this point. + if (Level > 8 || Level < 1) + { + dwErrorCode = ERROR_INVALID_LEVEL; + goto Cleanup; + } + + if (cbBuf && pDriverInfo) + ZeroMemory(pDriverInfo, cbBuf); + + // Do the RPC call + RpcTryExcept + { + dwErrorCode = _RpcGetPrinterDriver(pHandle->hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwErrorCode = RpcExceptionCode(); + ERR("_RpcGetPrinter failed with exception code %lu!\n", dwErrorCode); + } + RpcEndExcept; + + if (dwErrorCode == ERROR_SUCCESS) + { + // Replace relative offset addresses in the output by absolute pointers. + ASSERT(Level <= 3); + MarshallUpStructure(cbBuf, pDriverInfo, pPrinterDriverMarshalling[Level]->pInfo, pPrinterDriverMarshalling[Level]->cbStructureSize, TRUE); + } + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } BOOL WINAPI diff --git a/win32ss/printing/include/marshalling/printerdrivers.h b/win32ss/printing/include/marshalling/printerdrivers.h new file mode 100644 index 0000000000..49951bdca2 --- /dev/null +++ b/win32ss/printing/include/marshalling/printerdrivers.h @@ -0,0 +1,51 @@ +/* + * PROJECT: ReactOS Printing Stack Marshalling Functions + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Marshalling definitions for DRIVER_INFO_* + * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + */ + +static const MARSHALLING PrinterDriver1Marshalling = { + sizeof(DRIVER_INFO_1W), + { + { FIELD_OFFSET(DRIVER_INFO_1W, pName), RTL_FIELD_SIZE(DRIVER_INFO_1W, pName), RTL_FIELD_SIZE(DRIVER_INFO_1W, pName), TRUE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING PrinterDriver2Marshalling = { + sizeof(DRIVER_INFO_2W), + { + { FIELD_OFFSET(DRIVER_INFO_2W, pName), RTL_FIELD_SIZE(DRIVER_INFO_2W, pName), RTL_FIELD_SIZE(DRIVER_INFO_2W, pName), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_2W, pEnvironment), RTL_FIELD_SIZE(DRIVER_INFO_2W, pEnvironment), RTL_FIELD_SIZE(DRIVER_INFO_2W, pEnvironment), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_2W, pDriverPath), RTL_FIELD_SIZE(DRIVER_INFO_2W, pDriverPath), RTL_FIELD_SIZE(DRIVER_INFO_2W, pDriverPath), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_2W, pDataFile), RTL_FIELD_SIZE(DRIVER_INFO_2W, pDataFile), RTL_FIELD_SIZE(DRIVER_INFO_2W, pDataFile), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_2W, pConfigFile), RTL_FIELD_SIZE(DRIVER_INFO_2W, pConfigFile), RTL_FIELD_SIZE(DRIVER_INFO_2W, pConfigFile), TRUE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING PrinterDriver3Marshalling = { + sizeof(DRIVER_INFO_3W), + { + { FIELD_OFFSET(DRIVER_INFO_3W, pName), RTL_FIELD_SIZE(DRIVER_INFO_3W, pName), RTL_FIELD_SIZE(DRIVER_INFO_3W, pName), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_3W, pEnvironment), RTL_FIELD_SIZE(DRIVER_INFO_3W, pEnvironment), RTL_FIELD_SIZE(DRIVER_INFO_3W, pEnvironment), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_3W, pDriverPath), RTL_FIELD_SIZE(DRIVER_INFO_3W, pDriverPath), RTL_FIELD_SIZE(DRIVER_INFO_3W, pDriverPath), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_3W, pDataFile), RTL_FIELD_SIZE(DRIVER_INFO_3W, pDataFile), RTL_FIELD_SIZE(DRIVER_INFO_3W, pDataFile), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_3W, pConfigFile), RTL_FIELD_SIZE(DRIVER_INFO_3W, pConfigFile), RTL_FIELD_SIZE(DRIVER_INFO_3W, pConfigFile), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_3W, pHelpFile), RTL_FIELD_SIZE(DRIVER_INFO_3W, pHelpFile), RTL_FIELD_SIZE(DRIVER_INFO_3W, pHelpFile), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_3W, pDependentFiles), RTL_FIELD_SIZE(DRIVER_INFO_3W, pDependentFiles), RTL_FIELD_SIZE(DRIVER_INFO_3W, pDependentFiles), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_3W, pMonitorName), RTL_FIELD_SIZE(DRIVER_INFO_3W, pMonitorName), RTL_FIELD_SIZE(DRIVER_INFO_3W, pMonitorName), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_3W, pDefaultDataType), RTL_FIELD_SIZE(DRIVER_INFO_3W, pDefaultDataType), RTL_FIELD_SIZE(DRIVER_INFO_3W, pDefaultDataType), TRUE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + + + +static const MARSHALLING* pPrinterDriverMarshalling[] = { + NULL, + &PrinterDriver1Marshalling, + &PrinterDriver2Marshalling, + &PrinterDriver3Marshalling, +}; diff --git a/win32ss/printing/providers/localspl/CMakeLists.txt b/win32ss/printing/providers/localspl/CMakeLists.txt index fb6e988ab9..a5608db406 100644 --- a/win32ss/printing/providers/localspl/CMakeLists.txt +++ b/win32ss/printing/providers/localspl/CMakeLists.txt @@ -10,6 +10,7 @@ list(APPEND SOURCE ports.c precomp.h printerdata.c + printerdrivers.c printers.c printingthread.c printprocessors.c diff --git a/win32ss/printing/providers/localspl/main.c b/win32ss/printing/providers/localspl/main.c index 7666050446..7c39ec2cf0 100644 --- a/win32ss/printing/providers/localspl/main.c +++ b/win32ss/printing/providers/localspl/main.c @@ -43,7 +43,7 @@ static const PRINTPROVIDOR _PrintProviderFunctions = { LocalEnumPrinters, // fpEnumPrinters NULL, // fpAddPrinterDriver NULL, // fpEnumPrinterDrivers - NULL, // fpGetPrinterDriver + LocalGetPrinterDriver, // fpGetPrinterDriver NULL, // fpGetPrinterDriverDirectory NULL, // fpDeletePrinterDriver NULL, // fpAddPrintProcessor diff --git a/win32ss/printing/providers/localspl/precomp.h b/win32ss/printing/providers/localspl/precomp.h index 83061a8a8b..1b9a2d5540 100644 --- a/win32ss/printing/providers/localspl/precomp.h +++ b/win32ss/printing/providers/localspl/precomp.h @@ -287,6 +287,10 @@ DWORD WINAPI LocalGetPrinterDataEx(HANDLE hPrinter, PCWSTR pKeyName, PCWSTR pVal DWORD WINAPI LocalSetPrinterData(HANDLE hPrinter, PWSTR pValueName, DWORD Type, PBYTE pData, DWORD cbData); DWORD WINAPI LocalSetPrinterDataEx(HANDLE hPrinter, LPCWSTR pKeyName, LPCWSTR pValueName, DWORD Type, LPBYTE pData, DWORD cbData); +// printerdriver.c +BOOL WINAPI LocalGetPrinterDriver(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded); + + // printers.c extern SKIPLIST PrinterList; BOOL InitializePrinterList(void); diff --git a/win32ss/printing/providers/localspl/printerdrivers.c b/win32ss/printing/providers/localspl/printerdrivers.c new file mode 100644 index 0000000000..5bb5b3db73 --- /dev/null +++ b/win32ss/printing/providers/localspl/printerdrivers.c @@ -0,0 +1,211 @@ +/* + * PROJECT: ReactOS Local Spooler + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Functions for printer driver information + * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" + + +// Local Constants +static DWORD dwDriverInfo1Offsets[] = { + FIELD_OFFSET(DRIVER_INFO_1W, pName), + MAXDWORD +}; + +static DWORD dwDriverInfo2Offsets[] = { + FIELD_OFFSET(DRIVER_INFO_2W, pName), + FIELD_OFFSET(DRIVER_INFO_2W, pEnvironment), + FIELD_OFFSET(DRIVER_INFO_2W, pDriverPath), + FIELD_OFFSET(DRIVER_INFO_2W, pDataFile), + FIELD_OFFSET(DRIVER_INFO_2W, pConfigFile), + MAXDWORD +}; + +static DWORD dwDriverInfo3Offsets[] = { + FIELD_OFFSET(DRIVER_INFO_3W, pName), + FIELD_OFFSET(DRIVER_INFO_3W, pEnvironment), + FIELD_OFFSET(DRIVER_INFO_3W, pDriverPath), + FIELD_OFFSET(DRIVER_INFO_3W, pDataFile), + FIELD_OFFSET(DRIVER_INFO_3W, pConfigFile), + FIELD_OFFSET(DRIVER_INFO_3W, pHelpFile), + FIELD_OFFSET(DRIVER_INFO_3W, pDependentFiles), + FIELD_OFFSET(DRIVER_INFO_3W, pMonitorName), + FIELD_OFFSET(DRIVER_INFO_3W, pDefaultDataType), + MAXDWORD +}; + +static void +ToMultiSz(LPWSTR pString) +{ + while (*pString) + { + if (*pString == '|') + *pString = '\0'; + pString++; + } +} + + +static void +_LocalGetPrinterDriverLevel1(PLOCAL_PRINTER_HANDLE pHandle, PDRIVER_INFO_1W* ppDriverInfo, PBYTE* ppDriverInfoEnd, PDWORD pcbNeeded) +{ + DWORD n; + PCWSTR pwszStrings[1]; + + /* This value is only here to send something, I have not verified if it is actually correct */ + pwszStrings[0] = pHandle->pPrinter->pwszPrinterDriver; + + // Calculate the string lengths. + if (!ppDriverInfo) + { + for (n = 0; n < _countof(pwszStrings); ++n) + { + *pcbNeeded += (wcslen(pwszStrings[n]) + 1) * sizeof(WCHAR); + } + + *pcbNeeded += sizeof(DRIVER_INFO_1W); + return; + } + + + // Finally copy the structure and advance to the next one in the output buffer. + *ppDriverInfoEnd = PackStrings(pwszStrings, (PBYTE)(*ppDriverInfo), dwDriverInfo1Offsets, *ppDriverInfoEnd); + (*ppDriverInfo)++; +} + +static void +_LocalGetPrinterDriverLevel2(PLOCAL_PRINTER_HANDLE pHandle, PDRIVER_INFO_2W* ppDriverInfo, PBYTE* ppDriverInfoEnd, PDWORD pcbNeeded) +{ + DWORD n; + PCWSTR pwszStrings[5]; + + /* Clearly these things should not be hardcoded, so when it is needed, someone can add meaningfull values here */ + pwszStrings[0] = pHandle->pPrinter->pwszPrinterDriver; // pName + pwszStrings[1] = wszCurrentEnvironment; // pEnvironment + pwszStrings[2] = L"c:\\reactos\\system32\\localspl.dll"; // pDriverPath + pwszStrings[3] = L"c:\\reactos\\system32\\localspl.dll"; // pDataFile + pwszStrings[4] = L"c:\\reactos\\system32\\localspl.dll"; // pConfigFile + + // Calculate the string lengths. + if (!ppDriverInfo) + { + for (n = 0; n < _countof(pwszStrings); ++n) + { + *pcbNeeded += (wcslen(pwszStrings[n]) + 1) * sizeof(WCHAR); + } + + *pcbNeeded += sizeof(DRIVER_INFO_2W); + return; + } + + (*ppDriverInfo)->cVersion = 3; + + // Finally copy the structure and advance to the next one in the output buffer. + *ppDriverInfoEnd = PackStrings(pwszStrings, (PBYTE)(*ppDriverInfo), dwDriverInfo2Offsets, *ppDriverInfoEnd); + (*ppDriverInfo)++; +} + +static void +_LocalGetPrinterDriverLevel3(PLOCAL_PRINTER_HANDLE pHandle, PDRIVER_INFO_3W* ppDriverInfo, PBYTE* ppDriverInfoEnd, PDWORD pcbNeeded) +{ + DWORD n; + PCWSTR pwszStrings[9]; + + /* Clearly these things should not be hardcoded, so when it is needed, someone can add meaningfull values here */ + pwszStrings[0] = pHandle->pPrinter->pwszPrinterDriver; // pName + pwszStrings[1] = wszCurrentEnvironment; // pEnvironment + pwszStrings[2] = L"c:\\reactos\\system32\\localspl.dll"; // pDriverPath + pwszStrings[3] = L"c:\\reactos\\system32\\localspl.dll"; // pDataFile + pwszStrings[4] = L"c:\\reactos\\system32\\printui.dll"; // pConfigFile + pwszStrings[5] = L""; // pHelpFile + pwszStrings[6] = L"localspl.dll|printui.dll|"; // pDependentFiles, | is separator and terminator! + pwszStrings[7] = NULL; // pMonitorName + pwszStrings[8] = NULL; // pDefaultDataType + + + // Calculate the string lengths. + if (!ppDriverInfo) + { + for (n = 0; n < _countof(pwszStrings); ++n) + { + if (pwszStrings[n]) + { + *pcbNeeded += (wcslen(pwszStrings[n]) + 1) * sizeof(WCHAR); + } + } + + *pcbNeeded += sizeof(DRIVER_INFO_3W); + return; + } + + (*ppDriverInfo)->cVersion = 3; + + // Finally copy the structure and advance to the next one in the output buffer. + *ppDriverInfoEnd = PackStrings(pwszStrings, (PBYTE)(*ppDriverInfo), dwDriverInfo3Offsets, *ppDriverInfoEnd); + ToMultiSz((*ppDriverInfo)->pDependentFiles); + (*ppDriverInfo)++; +} + + +BOOL WINAPI LocalGetPrinterDriver(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) +{ + DWORD dwErrorCode; + PBYTE pEnd = &pDriverInfo[cbBuf]; + PLOCAL_HANDLE pHandle; + PLOCAL_PRINTER_HANDLE pPrinterHandle; + + TRACE("LocalGetPrinterDriver(%p, %lu, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); + + // Check if this is a printer handle. + pHandle = (PLOCAL_HANDLE)hPrinter; + if (pHandle->HandleType != HandleType_Printer) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + + pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->pSpecificHandle; + + // Only support 3 levels for now + if (Level > 3) + { + // The caller supplied an invalid level. + dwErrorCode = ERROR_INVALID_LEVEL; + goto Cleanup; + } + + // Count the required buffer size. + *pcbNeeded = 0; + + if (Level == 1) + _LocalGetPrinterDriverLevel1(pPrinterHandle, NULL, NULL, pcbNeeded); + else if (Level == 2) + _LocalGetPrinterDriverLevel2(pPrinterHandle, NULL, NULL, pcbNeeded); + else if (Level == 3) + _LocalGetPrinterDriverLevel3(pPrinterHandle, NULL, NULL, pcbNeeded); + + // Check if the supplied buffer is large enough. + if (cbBuf < *pcbNeeded) + { + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; + goto Cleanup; + } + + // Copy over the information. + pEnd = &pDriverInfo[*pcbNeeded]; + + if (Level == 1) + _LocalGetPrinterDriverLevel1(pPrinterHandle, (PDRIVER_INFO_1W*)&pDriverInfo, &pEnd, NULL); + else if (Level == 2) + _LocalGetPrinterDriverLevel2(pPrinterHandle, (PDRIVER_INFO_2W*)&pDriverInfo, &pEnd, NULL); + else if (Level == 3) + _LocalGetPrinterDriverLevel3(pPrinterHandle, (PDRIVER_INFO_3W*)&pDriverInfo, &pEnd, NULL); + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +}

5 years, 8 months

[reactos] 01/04: [PRINTING] The first argument to PackStrings can be const.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e4457f22307063457ec3… commit 2e4457f22307063457ec3016ae431e50429819ef Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jan 6 12:18:40 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jan 6 21:07:09 2019 +0100 [PRINTING] The first argument to PackStrings can be const. --- .../apitests/spoolss/MarshallDownStructuresArray.c | 2 +- modules/rostests/apitests/spoolss/PackStrings.c | 4 +- win32ss/printing/base/spoolss/tools.c | 2 +- win32ss/printing/include/spoolss.h | 2 +- win32ss/printing/monitors/localmon/ports.c | 4 +- win32ss/printing/processors/winprint/main.c | 4 +- win32ss/printing/providers/localspl/jobs.c | 4 +- win32ss/printing/providers/localspl/main.c | 2 +- win32ss/printing/providers/localspl/monitors.c | 4 +- win32ss/printing/providers/localspl/precomp.h | 2 +- win32ss/printing/providers/localspl/printers.c | 56 +++++++++++----------- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c b/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c index 7b7deba6f4..e4033b0ac4 100644 --- a/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c +++ b/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c @@ -32,7 +32,7 @@ START_TEST(MarshallDownStructuresArray) PPORT_INFO_2W pPortInfo2Copy; PPORT_INFO_2W pPortInfo2Test; PBYTE pPortInfoEnd; - PWSTR pwszStrings[] = { L"PortName", L"MonitorName", L"Description" }; + PCWSTR pwszStrings[] = { L"PortName", L"MonitorName", L"Description" }; DWORD cbPortInfo2Size = cElements * (sizeof(PORT_INFO_2W) + (wcslen(pwszStrings[0]) + 1 + wcslen(pwszStrings[1]) + 1 + wcslen(pwszStrings[2]) + 1) * sizeof(WCHAR)); DWORD fPortType = 1337; DWORD Reserved = 42; diff --git a/modules/rostests/apitests/spoolss/PackStrings.c b/modules/rostests/apitests/spoolss/PackStrings.c index d0285f432d..d572b5f5e1 100644 --- a/modules/rostests/apitests/spoolss/PackStrings.c +++ b/modules/rostests/apitests/spoolss/PackStrings.c @@ -21,8 +21,8 @@ EXAMPLE_STRUCT, *PEXAMPLE_STRUCT; START_TEST(PackStrings) { - PWSTR Source1[] = { L"Test", L"String" }; - PWSTR Source2[] = { L"Test", NULL }; + PCWSTR Source1[] = { L"Test", L"String" }; + PCWSTR Source2[] = { L"Test", NULL }; BYTE Buffer[50]; PBYTE pEnd; diff --git a/win32ss/printing/base/spoolss/tools.c b/win32ss/printing/base/spoolss/tools.c index 7b8410a41a..97d781c66a 100644 --- a/win32ss/printing/base/spoolss/tools.c +++ b/win32ss/printing/base/spoolss/tools.c @@ -36,7 +36,7 @@ * The strings are copied in reverse order, so this pointer will point to the last copied string of pSource. */ PBYTE WINAPI -PackStrings(PWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd) +PackStrings(PCWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd) { DWORD cbString; ULONG_PTR StringAddress; diff --git a/win32ss/printing/include/spoolss.h b/win32ss/printing/include/spoolss.h index 7e1c132dcf..a16cca49ae 100644 --- a/win32ss/printing/include/spoolss.h +++ b/win32ss/printing/include/spoolss.h @@ -63,7 +63,7 @@ PVOID WINAPI DllAllocSplMem(DWORD dwBytes); BOOL WINAPI DllFreeSplMem(PVOID pMem); BOOL WINAPI DllFreeSplStr(PWSTR pwszString); BOOL WINAPI InitializeRouter(HANDLE SpoolerStatusHandle); -PBYTE WINAPI PackStrings(PWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd); +PBYTE WINAPI PackStrings(PCWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd); PVOID WINAPI ReallocSplMem(PVOID pOldMem, DWORD cbOld, DWORD cbNew); BOOL WINAPI ReallocSplStr(PWSTR* ppwszString, PCWSTR pwszInput); BOOL WINAPI SplInitializeWinSpoolDrv(PVOID* pTable); diff --git a/win32ss/printing/monitors/localmon/ports.c b/win32ss/printing/monitors/localmon/ports.c index ab4b7bff49..bee1a22fb2 100644 --- a/win32ss/printing/monitors/localmon/ports.c +++ b/win32ss/printing/monitors/localmon/ports.c @@ -374,7 +374,7 @@ static void _LocalmonGetPortLevel1(PLOCALMON_PORT pPort, PPORT_INFO_1W* ppPortInfo, PBYTE* ppPortInfoEnd, PDWORD pcbNeeded) { DWORD cbPortName; - PWSTR pwszStrings[1]; + PCWSTR pwszStrings[1]; // Calculate the string lengths. if (!ppPortInfo) @@ -397,7 +397,7 @@ static void _LocalmonGetPortLevel2(PLOCALMON_PORT pPort, PPORT_INFO_2W* ppPortInfo, PBYTE* ppPortInfoEnd, PDWORD pcbNeeded) { DWORD cbPortName; - PWSTR pwszStrings[3]; + PCWSTR pwszStrings[3]; // Calculate the string lengths. if (!ppPortInfo) diff --git a/win32ss/printing/processors/winprint/main.c b/win32ss/printing/processors/winprint/main.c index 6d0f07313e..4bbe3d6cc5 100644 --- a/win32ss/printing/processors/winprint/main.c +++ b/win32ss/printing/processors/winprint/main.c @@ -8,7 +8,7 @@ #include "precomp.h" // Local Constants -static PWSTR _pwszDatatypes[] = { +static PCWSTR _pwszDatatypes[] = { L"RAW", 0 }; @@ -113,7 +113,7 @@ EnumPrintProcessorDatatypesW(PWSTR pName, PWSTR pPrintProcessorName, DWORD Level DWORD cbDatatype; DWORD dwDatatypeCount = 0; DWORD dwOffsets[_countof(_pwszDatatypes)]; - PWSTR* pCurrentDatatype; + PCWSTR* pCurrentDatatype; PDWORD pCurrentOffset = dwOffsets; TRACE("EnumPrintProcessorDatatypesW(%S, %S, %lu, %p, %lu, %p, %p)\n", pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned); diff --git a/win32ss/printing/providers/localspl/jobs.c b/win32ss/printing/providers/localspl/jobs.c index ea6e219a22..44d11b69f0 100644 --- a/win32ss/printing/providers/localspl/jobs.c +++ b/win32ss/printing/providers/localspl/jobs.c @@ -455,7 +455,7 @@ _LocalGetJobLevel1(PLOCAL_JOB pJob, PJOB_INFO_1W* ppJobInfo, PBYTE* ppJobInfoEnd DWORD cbPrinterName; DWORD cbStatus = 0; DWORD cbUserName = 0; - PWSTR pwszStrings[6]; + PCWSTR pwszStrings[6]; // Calculate the string lengths. if (!ppJobInfo) @@ -536,7 +536,7 @@ _LocalGetJobLevel2(PLOCAL_JOB pJob, PJOB_INFO_2W* ppJobInfo, PBYTE* ppJobInfoEnd DWORD cbUserName = 0; FILETIME ftNow; FILETIME ftSubmitted; - PWSTR pwszStrings[10]; + PCWSTR pwszStrings[10]; ULARGE_INTEGER uliNow; ULARGE_INTEGER uliSubmitted; diff --git a/win32ss/printing/providers/localspl/main.c b/win32ss/printing/providers/localspl/main.c index 95105f2a27..7666050446 100644 --- a/win32ss/printing/providers/localspl/main.c +++ b/win32ss/printing/providers/localspl/main.c @@ -24,7 +24,7 @@ const DWORD dwSpoolerMinorVersion = 0; const WCHAR wszDefaultDocumentName[] = L"Local Downlevel Document"; -PWSTR wszPrintProviderInfo[3] = { +PCWSTR wszPrintProviderInfo[3] = { L"Windows NT Local Print Providor", // Name L"Locally connected Printers", // Comment L"Windows NT Local Printers" // Description diff --git a/win32ss/printing/providers/localspl/monitors.c b/win32ss/printing/providers/localspl/monitors.c index da47850c71..9a04ca7268 100644 --- a/win32ss/printing/providers/localspl/monitors.c +++ b/win32ss/printing/providers/localspl/monitors.c @@ -257,7 +257,7 @@ static void _LocalGetMonitorLevel1(PLOCAL_PRINT_MONITOR pPrintMonitor, PMONITOR_INFO_1W* ppMonitorInfo, PBYTE* ppMonitorInfoEnd, PDWORD pcbNeeded) { DWORD cbMonitorName; - PWSTR pwszStrings[1]; + PCWSTR pwszStrings[1]; // Calculate the string lengths. if (!ppMonitorInfo) @@ -281,7 +281,7 @@ _LocalGetMonitorLevel2(PLOCAL_PRINT_MONITOR pPrintMonitor, PMONITOR_INFO_2W* ppM { DWORD cbFileName; DWORD cbMonitorName; - PWSTR pwszStrings[3]; + PCWSTR pwszStrings[3]; // Calculate the string lengths. if (!ppMonitorInfo) diff --git a/win32ss/printing/providers/localspl/precomp.h b/win32ss/printing/providers/localspl/precomp.h index 0c97f22c85..83061a8a8b 100644 --- a/win32ss/printing/providers/localspl/precomp.h +++ b/win32ss/printing/providers/localspl/precomp.h @@ -264,7 +264,7 @@ extern const DWORD dwSpoolerMinorVersion; extern const WCHAR wszDefaultDocumentName[]; extern HKEY hPrintKey; extern HKEY hPrintersKey; -extern PWSTR wszPrintProviderInfo[3]; +extern PCWSTR wszPrintProviderInfo[3]; extern WCHAR wszJobDirectory[MAX_PATH]; extern DWORD cchJobDirectory; extern WCHAR wszSpoolDirectory[MAX_PATH]; diff --git a/win32ss/printing/providers/localspl/printers.c b/win32ss/printing/providers/localspl/printers.c index 7c9c2dd3b5..c0140142c6 100644 --- a/win32ss/printing/providers/localspl/printers.c +++ b/win32ss/printing/providers/localspl/printers.c @@ -491,8 +491,8 @@ static void _LocalGetPrinterLevel0(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_STRESS* ppPrinterInfo, PBYTE* ppPrinterInfoEnd, PDWORD pcbNeeded, DWORD cchComputerName, PCWSTR wszComputerName) { size_t cbName; - PWSTR p; - PWSTR pwszStrings[1]; + PWSTR p, Allocation; + PCWSTR pwszStrings[1]; SYSTEM_INFO SystemInfo; // Calculate the string lengths. @@ -521,8 +521,8 @@ _LocalGetPrinterLevel0(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_STRESS* ppPrinterI (*ppPrinterInfo)->wProcessorLevel = SystemInfo.wProcessorLevel; // Copy the Printer Name. - pwszStrings[0] = DllAllocSplMem(cbName); - p = pwszStrings[0]; + p = Allocation = DllAllocSplMem(cbName); + pwszStrings[0] = Allocation; StringCbCopyExW(p, cbName, wszComputerName, &p, &cbName, 0); StringCbCopyExW(p, cbName, pPrinter->pwszPrinterName, &p, &cbName, 0); @@ -531,7 +531,7 @@ _LocalGetPrinterLevel0(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_STRESS* ppPrinterI (*ppPrinterInfo)++; // Free the memory for temporary strings. - DllFreeSplMem(pwszStrings[0]); + DllFreeSplMem(Allocation); } static void @@ -542,8 +542,8 @@ _LocalGetPrinterLevel1(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_1W* ppPrinterInfo, size_t cbName; size_t cbComment; size_t cbDescription; - PWSTR p; - PWSTR pwszStrings[3]; + PWSTR p, Allocation1, Allocation2; + PCWSTR pwszStrings[3]; // Calculate the string lengths. // Attention: pComment equals the "Description" registry value while pDescription is concatenated out of several strings. @@ -562,8 +562,8 @@ _LocalGetPrinterLevel1(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_1W* ppPrinterInfo, (*ppPrinterInfo)->Flags = PRINTER_ENUM_ICON8; // Copy the Printer Name. - pwszStrings[0] = DllAllocSplMem(cbName); - p = pwszStrings[0]; + p = Allocation1 = DllAllocSplMem(cbName); + pwszStrings[0] = Allocation1; StringCbCopyExW(p, cbName, wszComputerName, &p, &cbName, 0); StringCbCopyExW(p, cbName, pPrinter->pwszPrinterName, &p, &cbName, 0); @@ -571,8 +571,8 @@ _LocalGetPrinterLevel1(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_1W* ppPrinterInfo, pwszStrings[1] = pPrinter->pwszDescription; // Copy the description, which for PRINTER_INFO_1W has the form "Name,Printer Driver,Location" - pwszStrings[2] = DllAllocSplMem(cbDescription); - p = pwszStrings[2]; + p = Allocation2 = DllAllocSplMem(cbDescription); + pwszStrings[2] = Allocation2; StringCbCopyExW(p, cbDescription, wszComputerName, &p, &cbDescription, 0); StringCbCopyExW(p, cbDescription, pPrinter->pwszPrinterName, &p, &cbDescription, 0); StringCbCopyExW(p, cbDescription, wszComma, &p, &cbDescription, 0); @@ -585,8 +585,8 @@ _LocalGetPrinterLevel1(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_1W* ppPrinterInfo, (*ppPrinterInfo)++; // Free the memory for temporary strings. - DllFreeSplMem(pwszStrings[0]); - DllFreeSplMem(pwszStrings[2]); + DllFreeSplMem(Allocation1); + DllFreeSplMem(Allocation2); } static void @@ -605,8 +605,8 @@ _LocalGetPrinterLevel2(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_2W* ppPrinterInfo, size_t cbPrintProcessor; size_t cbDatatype; size_t cbParameters; - PWSTR p; - PWSTR pwszStrings[10]; + PWSTR p, Allocation; + PCWSTR pwszStrings[10]; // Calculate the string lengths. cbDevMode = pPrinter->pDefaultDevMode->dmSize + pPrinter->pDefaultDevMode->dmDriverExtra; @@ -641,8 +641,8 @@ _LocalGetPrinterLevel2(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_2W* ppPrinterInfo, (*ppPrinterInfo)->pDevMode = (PDEVMODEW)(*ppPrinterInfoEnd); // Set the pPrinterName field. - pwszStrings[0] = DllAllocSplMem(cbPrinterName); - p = pwszStrings[0]; + p = Allocation = DllAllocSplMem(cbPrinterName); + pwszStrings[0] = Allocation; StringCbCopyExW(p, cbPrinterName, wszComputerName, &p, &cbPrinterName, 0); StringCbCopyExW(p, cbPrinterName, pPrinter->pwszPrinterName, &p, &cbPrinterName, 0); @@ -678,7 +678,7 @@ _LocalGetPrinterLevel2(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_2W* ppPrinterInfo, (*ppPrinterInfo)++; // Free the memory for temporary strings. - DllFreeSplMem(pwszStrings[0]); + DllFreeSplMem(Allocation); } static void @@ -707,8 +707,8 @@ static void _LocalGetPrinterLevel4(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_4W* ppPrinterInfo, PBYTE* ppPrinterInfoEnd, PDWORD pcbNeeded, DWORD cchComputerName, PCWSTR wszComputerName) { size_t cbPrinterName; - PWSTR p; - PWSTR pwszStrings[1]; + PWSTR p, Allocation; + PCWSTR pwszStrings[1]; // Calculate the string lengths. cbPrinterName = (cchComputerName + wcslen(pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); @@ -724,8 +724,8 @@ _LocalGetPrinterLevel4(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_4W* ppPrinterInfo, (*ppPrinterInfo)->Attributes = pPrinter->dwAttributes; // Set the pPrinterName field. - pwszStrings[0] = DllAllocSplMem(cbPrinterName); - p = pwszStrings[0]; + p = Allocation = DllAllocSplMem(cbPrinterName); + pwszStrings[0] = Allocation; StringCbCopyExW(p, cbPrinterName, wszComputerName, &p, &cbPrinterName, 0); StringCbCopyExW(p, cbPrinterName, pPrinter->pwszPrinterName, &p, &cbPrinterName, 0); @@ -734,7 +734,7 @@ _LocalGetPrinterLevel4(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_4W* ppPrinterInfo, (*ppPrinterInfo)++; // Free the memory for temporary strings. - DllFreeSplMem(pwszStrings[0]); + DllFreeSplMem(Allocation); } static void @@ -742,8 +742,8 @@ _LocalGetPrinterLevel5(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_5W* ppPrinterInfo, { size_t cbPrinterName; size_t cbPortName; - PWSTR p; - PWSTR pwszStrings[2]; + PWSTR p, Allocation; + PCWSTR pwszStrings[2]; // Calculate the string lengths. cbPrinterName = (cchComputerName + wcslen(pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); @@ -762,8 +762,8 @@ _LocalGetPrinterLevel5(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_5W* ppPrinterInfo, (*ppPrinterInfo)->TransmissionRetryTimeout = dwTransmissionRetryTimeout; // Set the pPrinterName field. - pwszStrings[0] = DllAllocSplMem(cbPrinterName); - p = pwszStrings[0]; + p = Allocation = DllAllocSplMem(cbPrinterName); + pwszStrings[0] = Allocation; StringCbCopyExW(p, cbPrinterName, wszComputerName, &p, &cbPrinterName, 0); StringCbCopyExW(p, cbPrinterName, pPrinter->pwszPrinterName, &p, &cbPrinterName, 0); @@ -775,7 +775,7 @@ _LocalGetPrinterLevel5(PLOCAL_PRINTER pPrinter, PPRINTER_INFO_5W* ppPrinterInfo, (*ppPrinterInfo)++; // Free the memory for temporary strings. - DllFreeSplMem(pwszStrings[0]); + DllFreeSplMem(Allocation); } static void

5 years, 8 months

[reactos] 01/01: [FREELDR] Minor code formatting; constify some non-mutable data.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d27286655018c15688afe… commit d27286655018c15688afe2dd88f1ac79dbc72aa9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 6 18:34:49 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 6 18:42:01 2019 +0100 [FREELDR] Minor code formatting; constify some non-mutable data. --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 2 +- boot/freeldr/freeldr/arch/i386/i386bug.c | 2 +- boot/freeldr/freeldr/arch/powerpc/mach.c | 2 +- boot/freeldr/freeldr/arch/realmode/amd64.S | 3 +-- boot/freeldr/freeldr/arch/realmode/i386.S | 4 ++-- boot/freeldr/freeldr/bootmgr.c | 4 ++-- boot/freeldr/freeldr/custom.c | 3 +-- boot/freeldr/freeldr/include/ver.h | 2 +- boot/freeldr/freeldr/ntldr/wlmemory.c | 2 +- boot/freeldr/freeldr/options.c | 5 ++--- boot/freeldr/freeldr/version.c | 12 +++++++----- 11 files changed, 20 insertions(+), 21 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index 6123fc1d13a..a254aeeaa70 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -38,7 +38,7 @@ typedef struct tagDISKCONTEXT ULONGLONG SectorNumber; } DISKCONTEXT; -static CHAR Hex[] = "0123456789abcdef"; +static const CHAR Hex[] = "0123456789abcdef"; /* Data cache for BIOS disks pre-enumeration */ UCHAR PcBiosDiskCount = 0; diff --git a/boot/freeldr/freeldr/arch/i386/i386bug.c b/boot/freeldr/freeldr/arch/i386/i386bug.c index c5c82af6886..6d42279d1ab 100644 --- a/boot/freeldr/freeldr/arch/i386/i386bug.c +++ b/boot/freeldr/freeldr/arch/i386/i386bug.c @@ -9,7 +9,7 @@ typedef struct _FRAME void *Address; } FRAME; -char *i386ExceptionDescriptionText[] = +static const char *i386ExceptionDescriptionText[] = { "Exception 00: DIVIDE BY ZERO\n\n", "Exception 01: DEBUG EXCEPTION\n\n", diff --git a/boot/freeldr/freeldr/arch/powerpc/mach.c b/boot/freeldr/freeldr/arch/powerpc/mach.c index 552b75fd056..c00604ee923 100644 --- a/boot/freeldr/freeldr/arch/powerpc/mach.c +++ b/boot/freeldr/freeldr/arch/powerpc/mach.c @@ -24,7 +24,7 @@ #include "compat.h" extern void BootMain( LPSTR CmdLine ); -extern PCHAR GetFreeLoaderVersionString(); +extern const PCSTR GetFreeLoaderVersionString(VOID); extern ULONG CacheSizeLimit; of_proxy ofproxy; void *PageDirectoryStart, *PageDirectoryEnd; diff --git a/boot/freeldr/freeldr/arch/realmode/amd64.S b/boot/freeldr/freeldr/arch/realmode/amd64.S index 0de7bf40417..528fd4b9e85 100644 --- a/boot/freeldr/freeldr/arch/realmode/amd64.S +++ b/boot/freeldr/freeldr/arch/realmode/amd64.S @@ -6,7 +6,6 @@ #define IMAGE_FILE_HEADER_SIZE 20 #define IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint 16 - .code16 /* fat helper code */ @@ -292,7 +291,7 @@ ExitToLongMode: mov gs,ax mov ss,ax - /* Safe current stack pointer */ + /* Save current stack pointer */ mov word ptr ds:[stack16], sp /* Set PAE and PGE: 10100000b */ diff --git a/boot/freeldr/freeldr/arch/realmode/i386.S b/boot/freeldr/freeldr/arch/realmode/i386.S index 0c79ae1667d..4f47f4bc8fa 100644 --- a/boot/freeldr/freeldr/arch/realmode/i386.S +++ b/boot/freeldr/freeldr/arch/realmode/i386.S @@ -30,7 +30,7 @@ RealModeEntryPoint: /* Enable A20 address line */ call EnableA20 - /* Safe real mode entry point in shared memory */ + /* Save real mode entry point in shared memory */ mov dword ptr ds:[BSS_RealModeEntry], offset switch_to_real16 /* Address the image with es segment */ @@ -116,7 +116,7 @@ exit_to_protected: cli - /* Safe current stack pointer */ + /* Save current stack pointer */ mov word ptr ds:[stack16], sp /* Load the GDT */ diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c index e370c28752d..ed506aedd73 100644 --- a/boot/freeldr/freeldr/bootmgr.c +++ b/boot/freeldr/freeldr/bootmgr.c @@ -29,9 +29,9 @@ VOID (*OS_LOADING_METHOD)(IN OperatingSystemItem* OperatingSystem, IN USHORT OperatingSystemVersion); -struct +static const struct { - CHAR BootType[80]; + PCHAR BootType; USHORT OperatingSystemVersion; OS_LOADING_METHOD Load; } OSLoadingMethods[] = diff --git a/boot/freeldr/freeldr/custom.c b/boot/freeldr/freeldr/custom.c index 802d2953644..02e55b62fde 100644 --- a/boot/freeldr/freeldr/custom.c +++ b/boot/freeldr/freeldr/custom.c @@ -51,13 +51,12 @@ VOID OptionMenuCustomBoot(VOID) #endif "ReactOS" }; - ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); ULONG SelectedMenuItem; if (!UiDisplayMenu("Please choose a boot method:", "", FALSE, CustomBootMenuList, - CustomBootMenuCount, + sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]), 0, -1, &SelectedMenuItem, TRUE, diff --git a/boot/freeldr/freeldr/include/ver.h b/boot/freeldr/freeldr/include/ver.h index ad5c02a65f8..d796f7a6489 100644 --- a/boot/freeldr/freeldr/include/ver.h +++ b/boot/freeldr/freeldr/include/ver.h @@ -36,4 +36,4 @@ #define FREELOADER_MINOR_VERSION 0 #define FREELOADER_PATCH_VERSION 0 -PCHAR GetFreeLoaderVersionString(VOID); +const PCSTR GetFreeLoaderVersionString(VOID); diff --git a/boot/freeldr/freeldr/ntldr/wlmemory.c b/boot/freeldr/freeldr/ntldr/wlmemory.c index 99a1c9d9db8..8259c383863 100644 --- a/boot/freeldr/freeldr/ntldr/wlmemory.c +++ b/boot/freeldr/freeldr/ntldr/wlmemory.c @@ -17,7 +17,7 @@ DBG_DEFAULT_CHANNEL(WINDOWS); extern ULONG LoaderPagesSpanned; -PCHAR MemTypeDesc[] = { +static const PCSTR MemTypeDesc[] = { "ExceptionBlock ", // ? "SystemBlock ", // ? "Free ", diff --git a/boot/freeldr/freeldr/options.c b/boot/freeldr/freeldr/options.c index ebb7709823e..0300b025af4 100644 --- a/boot/freeldr/freeldr/options.c +++ b/boot/freeldr/freeldr/options.c @@ -50,6 +50,7 @@ PCSTR OptionsMenuList[] = #endif }; +const PCSTR FrldrDbgMsg = "Enable FreeLdr debug channels\n" "Acceptable syntax: [level1]#channel1[,[level2]#channel2]\n" "level can be one of: trace,warn,fixme,err\n" @@ -78,8 +79,6 @@ enum BootOption DIRECTORY_SERVICES_RESTORE_MODE, }; -ULONG OptionsMenuItemCount = sizeof(OptionsMenuList) / sizeof(OptionsMenuList[0]); - static enum BootOption BootOptionChoice = NO_OPTION; static BOOLEAN BootLogging = FALSE; static BOOLEAN VgaMode = FALSE; @@ -95,7 +94,7 @@ VOID DoOptionsMenu(VOID) if (!UiDisplayMenu("Select an option:", "", TRUE, OptionsMenuList, - OptionsMenuItemCount, + sizeof(OptionsMenuList) / sizeof(OptionsMenuList[0]), 11, // Use "Start ReactOS normally" as default; see the switch below. -1, &SelectedMenuItem, diff --git a/boot/freeldr/freeldr/version.c b/boot/freeldr/freeldr/version.c index e64864d5342..fcd25213bca 100644 --- a/boot/freeldr/freeldr/version.c +++ b/boot/freeldr/freeldr/version.c @@ -19,15 +19,17 @@ #include <freeldr.h> -CHAR FreeLoaderVersionString[80]; +#define TOSTRING_(X) #X +#define TOSTRING(X) TOSTRING_(X) -PCHAR GetFreeLoaderVersionString(VOID) -{ +static const PCSTR FreeLoaderVersionString = #if (FREELOADER_PATCH_VERSION == 0) - sprintf(FreeLoaderVersionString, "FreeLoader v%d.%d", FREELOADER_MAJOR_VERSION, FREELOADER_MINOR_VERSION); + "FreeLoader v" TOSTRING(FREELOADER_MAJOR_VERSION) "." TOSTRING(FREELOADER_MINOR_VERSION); #else - sprintf(FreeLoaderVersionString, "FreeLoader v%d.%d.%d", FREELOADER_MAJOR_VERSION, FREELOADER_MINOR_VERSION, FREELOADER_PATCH_VERSION); + "FreeLoader v" TOSTRING(FREELOADER_MAJOR_VERSION) "." TOSTRING(FREELOADER_MINOR_VERSION) "." TOSTRING(FREELOADER_PATCH_VERSION); #endif +const PCSTR GetFreeLoaderVersionString(VOID) +{ return FreeLoaderVersionString; }

5 years, 8 months

[reactos] 01/01: [TRANSLATION] Update Chinese translation. (#1223)

by Luo Yufan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95564d5e30f34ba312eba… commit 95564d5e30f34ba312ebab52f42f216b12f24ed7 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Sun Jan 6 23:35:11 2019 +0800 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jan 7 00:35:11 2019 +0900 [TRANSLATION] Update Chinese translation. (#1223) [CLIPBRD][SOLITAIRE][RAPPS][REGEDIT][WINHLP32][WORDPAD][FDEBUG][SYSDM][BROWSEUI][DEVMGR][IEFRAME][OLEDLG][SHELL32][SYSSETUP][INF][WINFILE][NTVDM][USER32] --- base/applications/clipbrd/lang/zh-TW.rc | 4 +- base/applications/games/solitaire/lang/zh-TW.rc | 2 +- base/applications/rapps/lang/zh-TW.rc | 58 +++++++++++----------- base/applications/regedit/lang/zh-TW.rc | 4 +- base/applications/winhlp32/lang/Zh.rc | 4 +- base/applications/wordpad/lang/zh-TW.rc | 2 +- boot/freeldr/fdebug/lang/zh-CN.rc | 2 +- boot/freeldr/fdebug/lang/zh-TW.rc | 6 +-- dll/cpl/sysdm/lang/zh-TW.rc | 6 +-- dll/win32/browseui/lang/zh-TW.rc | 2 +- dll/win32/devmgr/lang/zh-TW.rc | 2 +- dll/win32/ieframe/lang/zh-TW.rc | 6 +-- dll/win32/oledlg/lang/oledlg_Zh.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- dll/win32/syssetup/lang/zh-TW.rc | 6 +-- media/inf/shortcuts.inf | 6 +-- modules/rosapps/applications/winfile/lang/zh-CN.rc | 6 +-- subsystems/mvdm/ntvdm/lang/zh-CN.rc | 7 +-- subsystems/mvdm/ntvdm/lang/zh-TW.rc | 22 ++++++++ subsystems/mvdm/ntvdm/ntvdm.rc | 5 +- win32ss/user/user32/lang/zh-CN.rc | 6 +-- win32ss/user/user32/lang/{zh-CN.rc => zh-TW.rc} | 56 +++++++++++---------- win32ss/user/user32/user32.rc | 3 ++ 23 files changed, 125 insertions(+), 94 deletions(-) diff --git a/base/applications/clipbrd/lang/zh-TW.rc b/base/applications/clipbrd/lang/zh-TW.rc index 3e99560fed..5606f036ae 100644 --- a/base/applications/clipbrd/lang/zh-TW.rc +++ b/base/applications/clipbrd/lang/zh-TW.rc @@ -24,9 +24,9 @@ BEGIN BEGIN MENUITEM "自動(&A)", CMD_AUTOMATIC END - POPUP "幫助(&H)" + POPUP "說明(&H)" BEGIN - MENUITEM "幫助主題(&H)", CMD_HELP + MENUITEM "說明主題(&H)", CMD_HELP MENUITEM SEPARATOR MENUITEM "關於(&A)", CMD_ABOUT END diff --git a/base/applications/games/solitaire/lang/zh-TW.rc b/base/applications/games/solitaire/lang/zh-TW.rc index 3d95cce322..bf9bd7ae37 100644 --- a/base/applications/games/solitaire/lang/zh-TW.rc +++ b/base/applications/games/solitaire/lang/zh-TW.rc @@ -76,7 +76,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "結束(&X)", IDM_GAME_EXIT END - POPUP "幫助(&H)" + POPUP "說明(&H)" BEGIN MENUITEM "目錄(&C)\tF1", IDM_HELP_CONTENTS MENUITEM "關於接龍(&A)", IDM_HELP_ABOUT diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 9f086b0f37..3aeeb8ceff 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -64,7 +64,7 @@ BEGIN AUTOCHECKBOX "啟動時更新可獲得的程式列表(&U)", IDC_UPDATE_AVLIST, 15, 29, 222, 12 AUTOCHECKBOX "將程式的安裝和解除安裝記錄到日誌(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12 GROUPBOX "正在下載", -1, 4, 65, 240, 51 - LTEXT "下載資料夾：", -1, 16, 75, 100, 9 + LTEXT "下載資料夾:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "選擇(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "在安裝完程式後刪除安裝程式(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 @@ -132,35 +132,35 @@ END STRINGTABLE BEGIN - IDS_INFO_VERSION "版本：" - IDS_INFO_DESCRIPTION "描述：" - IDS_INFO_PUBLISHER "\n釋出者：" - IDS_INFO_HELPLINK "\n幫助連結：" - IDS_INFO_HELPPHONE "\n幫助電話：" - IDS_INFO_README "\n必讀：" - IDS_INFO_REGOWNER "\n註冊所有者：" - IDS_INFO_PRODUCTID "\n產品 ID：" - IDS_INFO_CONTACT "\n聯繫方式：" - IDS_INFO_UPDATEINFO "\n更新資訊：" - IDS_INFO_INFOABOUT "\n關於資訊：" - IDS_INFO_COMMENTS "\n註釋：" - IDS_INFO_INSTLOCATION "\n安裝位置：" - IDS_INFO_INSTALLSRC "\n安裝源：" - IDS_INFO_UNINSTALLSTR "\n解除安裝字元串：" - IDS_INFO_MODIFYPATH "\n修改路徑：" - IDS_INFO_INSTALLDATE "\n安裝日期：" + IDS_INFO_VERSION "版本:" + IDS_INFO_DESCRIPTION "描述:" + IDS_INFO_PUBLISHER "\n釋出者:" + IDS_INFO_HELPLINK "\n幫助連結:" + IDS_INFO_HELPPHONE "\n幫助電話:" + IDS_INFO_README "\n必讀:" + IDS_INFO_REGOWNER "\n註冊所有者:" + IDS_INFO_PRODUCTID "\n產品 ID:" + IDS_INFO_CONTACT "\n聯繫方式:" + IDS_INFO_UPDATEINFO "\n更新資訊:" + IDS_INFO_INFOABOUT "\n關於資訊:" + IDS_INFO_COMMENTS "\n註釋:" + IDS_INFO_INSTLOCATION "\n安裝位置:" + IDS_INFO_INSTALLSRC "\n安裝源:" + IDS_INFO_UNINSTALLSTR "\n解除安裝字元串:" + IDS_INFO_MODIFYPATH "\n修改路徑:" + IDS_INFO_INSTALLDATE "\n安裝日期:" END STRINGTABLE BEGIN - IDS_AINFO_VERSION "\n版本：" + IDS_AINFO_VERSION "\n版本:" IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: " - IDS_AINFO_DESCRIPTION "\n描述：" - IDS_AINFO_SIZE "\n大小：" - IDS_AINFO_URLSITE "\n主頁：" - IDS_AINFO_LICENSE "\n協議：" + IDS_AINFO_DESCRIPTION "\n描述:" + IDS_AINFO_SIZE "\n大小:" + IDS_AINFO_URLSITE "\n主頁:" + IDS_AINFO_LICENSE "\n協議:" IDS_AINFO_URLDOWNLOAD "\n下載:" - IDS_AINFO_LANGUAGES "\nLanguages: " + IDS_AINFO_LANGUAGES "\n語言: " END STRINGTABLE @@ -189,15 +189,15 @@ BEGIN IDS_INSTALL "安裝" IDS_UNINSTALL "解除安裝" IDS_MODIFY "修改" - IDS_APPS_COUNT "程式個數：%d; Selected: %d" + IDS_APPS_COUNT "程式個數:%d; Selected: %d" IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！\n\n" - IDS_WELCOME_TEXT "從左欄選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站：" + IDS_WELCOME_TEXT "從左欄選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站:" IDS_WELCOME_URL "http://www.reactos.org" IDS_INSTALLED "已安裝" IDS_AVAILABLEFORINST "可安裝" IDS_UPDATES "更新" IDS_APPLICATIONS "應用程式" - IDS_CHOOSE_FOLDER_TEXT "請選擇用來儲存下載檔案的資料夾：" + IDS_CHOOSE_FOLDER_TEXT "請選擇用來儲存下載檔案的資料夾:" IDS_CHOOSE_FOLDER_ERROR "您選擇的資料夾不存在。創建嗎？" IDS_APP_REG_REMOVE "您確定要從登錄檔刪除該程式的資料嗎？" IDS_INFORMATION "資訊" @@ -247,6 +247,6 @@ END STRINGTABLE BEGIN - IDS_DL_DIALOG_DB_DISP "Applications Database" - IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" + IDS_DL_DIALOG_DB_DISP "應用程式資料庫" + IDS_DL_DIALOG_DB_DOWNLOAD_DISP "更新資料庫…" END diff --git a/base/applications/regedit/lang/zh-TW.rc b/base/applications/regedit/lang/zh-TW.rc index 2a8dc503fb..0e52abca86 100644 --- a/base/applications/regedit/lang/zh-TW.rc +++ b/base/applications/regedit/lang/zh-TW.rc @@ -82,9 +82,9 @@ BEGIN MENUITEM "添加到我的最愛(&A)", ID_FAVOURITES_ADDTOFAVOURITES, GRAYED MENUITEM "刪除我的最愛(&R)", ID_FAVOURITES_REMOVEFAVOURITE, GRAYED END - POPUP "幫助(&H)" + POPUP "說明(&H)" BEGIN - MENUITEM "幫助主題(&H)\tF1", ID_HELP_HELPTOPICS + MENUITEM "說明主題(&H)\tF1", ID_HELP_HELPTOPICS MENUITEM SEPARATOR MENUITEM "關於登錄編輯程式(&A)", ID_HELP_ABOUT END diff --git a/base/applications/winhlp32/lang/Zh.rc b/base/applications/winhlp32/lang/Zh.rc index 128b2cd0ac..0cf8eb3f24 100644 --- a/base/applications/winhlp32/lang/Zh.rc +++ b/base/applications/winhlp32/lang/Zh.rc @@ -141,8 +141,8 @@ MAIN_MENU MENU MENUITEM "大號", MNID_OPTS_FONTS_LARGE END } - POPUP "幫助(&H)" { - MENUITEM "如何使用幫助(&O)", MNID_HELP_HELPON + POPUP "說明(&H)" { + MENUITEM "如何使用說明(&O)", MNID_HELP_HELPON MENUITEM "資訊(&I)...", MNID_HELP_ABOUT } } diff --git a/base/applications/wordpad/lang/zh-TW.rc b/base/applications/wordpad/lang/zh-TW.rc index 4218fe8b02..459259c963 100644 --- a/base/applications/wordpad/lang/zh-TW.rc +++ b/base/applications/wordpad/lang/zh-TW.rc @@ -91,7 +91,7 @@ BEGIN MENUITEM "淡黃色(&P)\tCtrl+2", ID_BACK_2 END END - POPUP "幫助(&H)" + POPUP "說明(&H)" BEGIN MENUITEM "關於 &Wine 寫字板", ID_ABOUT END diff --git a/boot/freeldr/fdebug/lang/zh-CN.rc b/boot/freeldr/fdebug/lang/zh-CN.rc index 96a2f9cff8..ea5794f8e9 100644 --- a/boot/freeldr/fdebug/lang/zh-CN.rc +++ b/boot/freeldr/fdebug/lang/zh-CN.rc @@ -82,5 +82,5 @@ END STRINGTABLE BEGIN - IDS_LICENSE "本程序为自由软件; 您可以根据自由软件基金会发布的 GNU 通用公共许可证许可证的第 2 版，或（根据您的选择）任何更高版本的条款进行重新分发和修改它。\r\n\r\n本程序的发布是希望它有用，但没有任何担保; 甚至没有适销性或特定用途适用性的暗示保证。有关详细信息，请参阅 GNU 通用公共许可证。\r\n\r\n您应该已收到 GNU 通用公共许可证的副本以及本程序; 如果没有，请写信给 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA。" + IDS_LICENSE "本程序为自由软件; 您可以根据自由软件基金会发布的 GNU 通用公共许可证的第 2 版，或（根据您的选择）任何更高版本的条款进行重新分发和修改它。\r\n\r\n本程序的发布是希望它有用，但没有任何担保; 甚至没有适销性或特定用途适用性的暗示保证。有关详细信息，请参阅 GNU 通用公共许可证。\r\n\r\n您应该已收到 GNU 通用公共许可证的副本以及本程序; 如果没有，请写信给 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA。" END diff --git a/boot/freeldr/fdebug/lang/zh-TW.rc b/boot/freeldr/fdebug/lang/zh-TW.rc index 9311691853..41603ca945 100644 --- a/boot/freeldr/fdebug/lang/zh-TW.rc +++ b/boot/freeldr/fdebug/lang/zh-TW.rc @@ -19,7 +19,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "關閉(&X)", IDM_EXIT END - POPUP "幫助(&H)" + POPUP "說明(&H)" BEGIN MENUITEM "關於 ...(&A)", IDM_ABOUT END @@ -74,12 +74,12 @@ END STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader 偵錯程式" IDS_HELLO "世界您好！" IDC_FDEBUG "FDEBUG" END STRINGTABLE BEGIN - IDS_LICENSE "此程式是免費軟體; 你可以將它重新分發和/或修改根據 GNU 通用公共許可的條款，如由自由軟體基金會出版; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, wr [...] + IDS_LICENSE "本程式為自由軟體; 您可以根據自由軟體基金會發佈的 GNU 通用公共授權條款的第 2 版，或（根據您的選擇）任何更高版本的條款進行重新分發和修改它。\r\n\r\n本程式的發佈是希望它有用，但沒有任何擔保; 甚至沒有適銷性或特定用途適用性的暗示保證。有關詳細信息，請參閱 GNU 通用公共許可證。\r\n\r\n您應該已收到GNU通用公共授權條款的副本以及本程式; 如果沒有，請寫信給 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA。" END diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index 94995aaf58..1e60657a97 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -35,10 +35,10 @@ BEGIN ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON LTEXT "裝置管理員列出所有安裝在電腦上的硬體裝置。請使用設備管理器來變更設備的屬性。", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "裝置管理員(&D)...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 - GROUPBOX "添加硬體嚮導", IDC_STATIC, 6, 79, 244, 61 + GROUPBOX "新增硬體精靈", IDC_STATIC, 6, 79, 244, 61 ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON - LTEXT "“添加硬體嚮導”幫助您安裝新的硬件。", IDC_STATIC, 42, 90, 204, 24 - PUSHBUTTON "添加硬體件嚮導(&H)", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 + LTEXT "“新增硬體精靈”幫助您安裝新的硬件。", IDC_STATIC, 42, 90, 204, 24 + PUSHBUTTON "新增硬體精靈(&H)", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "硬體設定檔", IDC_STATIC, 6, 149, 244, 61 ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON LTEXT "硬體設定檔向您提供建立和保存不同硬件配置的方法。", IDC_STATIC, 42, 160, 204, 24 diff --git a/dll/win32/browseui/lang/zh-TW.rc b/dll/win32/browseui/lang/zh-TW.rc index 871ebe705e..aaced17366 100644 --- a/dll/win32/browseui/lang/zh-TW.rc +++ b/dll/win32/browseui/lang/zh-TW.rc @@ -91,7 +91,7 @@ BEGIN MENUITEM "", -1, MFT_SEPARATOR MENUITEM "資料夾選項(&O)...", IDM_TOOLS_FOLDEROPTIONS END - POPUP "幫助(&H)", FCIDM_MENU_HELP + POPUP "說明(&H)", FCIDM_MENU_HELP BEGIN MENUITEM "關於 ReactOS(&A)", IDM_HELP_ABOUT END diff --git a/dll/win32/devmgr/lang/zh-TW.rc b/dll/win32/devmgr/lang/zh-TW.rc index 4f10efaa6f..f131af426f 100644 --- a/dll/win32/devmgr/lang/zh-TW.rc +++ b/dll/win32/devmgr/lang/zh-TW.rc @@ -263,7 +263,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "顯示隱藏的裝置", IDC_SHOWHIDDEN END - POPUP "幫助" + POPUP "說明" BEGIN MENUITEM "關於", IDC_ABOUT END diff --git a/dll/win32/ieframe/lang/zh-TW.rc b/dll/win32/ieframe/lang/zh-TW.rc index 8222379393..026f8cb0e8 100644 --- a/dll/win32/ieframe/lang/zh-TW.rc +++ b/dll/win32/ieframe/lang/zh-TW.rc @@ -29,12 +29,12 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "位址列(&A)", ID_BROWSE_BAR_ADDR } } - POPUP "收藏夾(&F)" + POPUP "我的最愛(&F)" { - MENUITEM "添加到收藏夾...(&A)", ID_BROWSE_ADDFAV + MENUITEM "添加到我的最愛(&A)...", ID_BROWSE_ADDFAV MENUITEM SEPARATOR } - POPUP "幫助(&H)" + POPUP "說明(&H)" { MENUITEM "關於網際網路瀏覽器(&A)", ID_BROWSE_ABOUT } diff --git a/dll/win32/oledlg/lang/oledlg_Zh.rc b/dll/win32/oledlg/lang/oledlg_Zh.rc index 3dfd4cf5f1..3e2eec6a11 100644 --- a/dll/win32/oledlg/lang/oledlg_Zh.rc +++ b/dll/win32/oledlg/lang/oledlg_Zh.rc @@ -175,7 +175,7 @@ BEGIN LISTBOX IDC_PS_DISPLAYLIST, 80, 36, 148, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE CONTROL "確定", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 234, 6, 66, 14 CONTROL "取消", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 234, 23, 66, 14 - CONTROL "幫助(&H)", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 234, 42, 66, 14 + CONTROL "說明(&H)", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 234, 42, 66, 14 CONTROL "顯示為圖標(&D)", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 80, 94, 150, 14 CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 234, 75, 66, 44 CONTROL "改變圖標(&I)...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 234, 143, 66, 14 diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 1369c53a22..916a6b247e 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -585,7 +585,7 @@ BEGIN LTEXT "維持工作階段，电脑數據仍然保持在 RAM 中。當你按下一個鍵或移動鼠標將喚醒這台電腦。", 8225, 39, 40, 167, 37 DEFPUSHBUTTON "確定", 1, 7, 82, 60, 14, WS_GROUP PUSHBUTTON "取消", IDCANCEL, 75, 82, 60, 14 - PUSHBUTTON "幫助(&H)", IDHELP, 144, 82, 60, 14 + PUSHBUTTON "說明(&H)", IDHELP, 144, 82, 60, 14 END IDD_FORMAT_DRIVE DIALOGEX 50, 50, 184, 218 diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index cae401bc62..cc6b118859 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -81,7 +81,7 @@ CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 - LTEXT "系統區域設置應與您要使用的應用程式的語言相匹配。使用者區域設置控制數字，貨幣和日期的顯示方式。", IDC_STATIC, 53, 7, 253, 20 + LTEXT "系統區域設定應與您要使用的應用程式的語言相匹配。使用者區域設置控制數字，貨幣和日期的顯示方式。", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "若要變更系統和使用者的地區設定, 點選自訂。", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "自訂(&C)...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 @@ -183,7 +183,7 @@ BEGIN IDS_LOCALESUBTITLE "您可以爲不同的地區和語言自訂 ReactOS。" IDS_DATETIMETITLE "日期和時間" IDS_DATETIMESUBTITLE "爲您的電腦配置正確的日期和時間。" - IDS_PROCESSTITLE "正在註冊元件" + IDS_PROCESSTITLE "正在登錄元件" IDS_PROCESSSUBTITLE "請稍後..." IDS_THEMESELECTIONTITLE "外觀" IDS_THEMESELECTIONSUBTITLE "選擇您的主題。" @@ -194,7 +194,7 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS 安裝程式" IDS_UNKNOWN_ERROR "未知的錯誤" - IDS_REGISTERING_COMPONENTS "正在註冊元件..." + IDS_REGISTERING_COMPONENTS "正在登錄元件..." IDS_LOADLIBRARY_FAILED "LoadLibrary 失敗: " IDS_GETPROCADDR_FAILED "GetProcAddr 失敗: " IDS_REGSVR_FAILED "DllRegisterServer 失敗: " diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index ffc4dba145..c7adfa2bd9 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -1470,7 +1470,7 @@ ENTERTAINMENT=娱乐 COMMUNICATIONS=通讯 GAMES=游戏 -README_TITLE=说明 +README_TITLE=说明文件 README_DESC=ReactOS 说明文件 CMD_TITLE=命令提示符 @@ -1536,8 +1536,8 @@ ENTERTAINMENT=娛樂 COMMUNICATIONS=通訊 GAMES=遊樂場 -README_TITLE=說明 -README_DESC=ReactOS 說明文件 +README_TITLE=讀我檔案 +README_DESC=ReactOS 讀我檔案 CMD_TITLE=命令提示字元 CMD_DESC=命令提示字元 diff --git a/modules/rosapps/applications/winfile/lang/zh-CN.rc b/modules/rosapps/applications/winfile/lang/zh-CN.rc index 2ebd6c8fff..c8e6c77a5b 100644 --- a/modules/rosapps/applications/winfile/lang/zh-CN.rc +++ b/modules/rosapps/applications/winfile/lang/zh-CN.rc @@ -264,9 +264,9 @@ IDM_WINEFILE MENU } POPUP "&?" { - MENUITEM "幫助主題(&H)\tF1", ID_HELP - MENUITEM "搜索幫助(&S)...\tF1", ID_HELP - MENUITEM "使用幫助(&U)\tF1", ID_HELP_USING + MENUITEM "說明主題(&H)\tF1", ID_HELP + MENUITEM "搜索說明(&S)...\tF1", ID_HELP + MENUITEM "使用說明(&U)\tF1", ID_HELP_USING MENUITEM SEPARATOR MENUITEM "&關於 Winefile...", ID_ABOUT } diff --git a/subsystems/mvdm/ntvdm/lang/zh-CN.rc b/subsystems/mvdm/ntvdm/lang/zh-CN.rc index e6703bb4a2..1c2db7c77d 100644 --- a/subsystems/mvdm/ntvdm/lang/zh-CN.rc +++ b/subsystems/mvdm/ntvdm/lang/zh-CN.rc @@ -1,4 +1,5 @@ /* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ +/* Translation has been changed by Luo Yufan 2019 <njlyf2011(a)hotmail.com> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -13,12 +14,12 @@ STRINGTABLE BEGIN IDS_VDM_DUMPMEM_TXT, "内存转储 (文本) (&T)" IDS_VDM_DUMPMEM_BIN, "内存转储 (二进制) (&B)" - IDS_VDM_MOUNT_FLOPPY, "Insert a floppy in drive %d <%s>..." - IDS_VDM_EJECT_FLOPPY, "Eject floppy from drive %d" + IDS_VDM_MOUNT_FLOPPY, "在驱动器 %d 中插入软盘 <%s>..." + IDS_VDM_EJECT_FLOPPY, "弹出驱动器 %d 中的软盘" IDS_VDM_QUIT , "退出 ReactOS DOS 虚拟机 (&Q)" END STRINGTABLE BEGIN - IDS_NO_MEDIA, "No media" + IDS_NO_MEDIA, "没有媒体" END diff --git a/subsystems/mvdm/ntvdm/lang/zh-TW.rc b/subsystems/mvdm/ntvdm/lang/zh-TW.rc new file mode 100644 index 0000000000..ddbbcc7abb --- /dev/null +++ b/subsystems/mvdm/ntvdm/lang/zh-TW.rc @@ -0,0 +1,22 @@ +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +STRINGTABLE +BEGIN + IDS_CAPTURE_MOUSE, "擷取滑鼠指標(&C)" + IDS_RELEASE_MOUSE, "釋放滑鼠指標(&R)" + IDS_VDM_MENU , "ReactOS DOS 虛擬機 (&V)" +END + +STRINGTABLE +BEGIN + IDS_VDM_DUMPMEM_TXT , "傾印記憶體 (文字)(&T)" + IDS_VDM_DUMPMEM_BIN , "傾印記憶體 (二進位) (&B)" + IDS_VDM_MOUNT_FLOPPY, "在磁碟機 %d 中插入磁片 <%s>..." + IDS_VDM_EJECT_FLOPPY, "退出磁碟機 %d 中的磁片" + IDS_VDM_QUIT , "結束 ReactOS DOS 虛擬機 (&Q)" +END + +STRINGTABLE +BEGIN + IDS_NO_MEDIA, "沒有媒體" +END diff --git a/subsystems/mvdm/ntvdm/ntvdm.rc b/subsystems/mvdm/ntvdm/ntvdm.rc index 12dcfd0fbd..431641d88e 100644 --- a/subsystems/mvdm/ntvdm/ntvdm.rc +++ b/subsystems/mvdm/ntvdm/ntvdm.rc @@ -65,4 +65,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #endif #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" -#endif \ No newline at end of file +#endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif diff --git a/win32ss/user/user32/lang/zh-CN.rc b/win32ss/user/user32/lang/zh-CN.rc index 2992309b3e..feda7f8e2b 100644 --- a/win32ss/user/user32/lang/zh-CN.rc +++ b/win32ss/user/user32/lang/zh-CN.rc @@ -58,9 +58,9 @@ END STRINGTABLE BEGIN IDS_ERROR "错误" - IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" - IDS_HUNG_UP_TITLE "Hung up!" + IDS_NOT_RESPONDING " (无响应)" + IDS_ASK_TERMINATE "这个应用程序没有响应，是否需要结束此程序?" + IDS_HUNG_UP_TITLE "无响应。" IDS_OK "确定" IDS_CANCEL "取消" IDS_ABORT "中止(&A)" diff --git a/win32ss/user/user32/lang/zh-CN.rc b/win32ss/user/user32/lang/zh-TW.rc similarity index 50% copy from win32ss/user/user32/lang/zh-CN.rc copy to win32ss/user/user32/lang/zh-TW.rc index 2992309b3e..3643c7869f 100644 --- a/win32ss/user/user32/lang/zh-CN.rc +++ b/win32ss/user/user32/lang/zh-TW.rc @@ -1,14 +1,16 @@ -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +/* Translation has been created by Luo Yufan 2019 <njlyf2011(a)hotmail.com> */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL /* Dialogs */ SELWINDOW DIALOGEX 20, 20, 220, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 9, "宋体" -CAPTION "选择窗口" +FONT 9, "新細明體" +CAPTION "選取視窗" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL - PUSHBUTTON "确定(&O)", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "確定(&O)", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "取消(&C)", 2, 120, 120, 40, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -18,37 +20,37 @@ EDITMENU MENU BEGIN POPUP "DUMMY" BEGIN - MENUITEM "撤销(&U)", EM_UNDO + MENUITEM "復原(&U)", EM_UNDO MENUITEM SEPARATOR - MENUITEM "剪切(&T)", WM_CUT - MENUITEM "复制(&C)", WM_COPY - MENUITEM "粘贴(&P)", WM_PASTE - MENUITEM "删除(&D)", WM_CLEAR + MENUITEM "剪下(&T)", WM_CUT + MENUITEM "複製(&C)", WM_COPY + MENUITEM "粘貼(&P)", WM_PASTE + MENUITEM "刪除(&D)", WM_CLEAR MENUITEM SEPARATOR - MENUITEM "全选(&A)", EM_SETSEL + MENUITEM "全選(&A)", EM_SETSEL END END SYSMENU MENU BEGIN - MENUITEM "还原(&R)", SC_RESTORE - MENUITEM "移动(&M)", SC_MOVE + MENUITEM "還原(&R)", SC_RESTORE + MENUITEM "移動(&M)", SC_MOVE MENUITEM "大小(&S)", SC_SIZE MENUITEM "最小化(&N)", SC_MINIMIZE MENUITEM "最大化(&X)", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "关闭(&C)\tAlt+F4", SC_CLOSE + MENUITEM "關閉(&C)\tAlt+F4", SC_CLOSE END SYSMENUMDI MENU BEGIN - MENUITEM "还原(&R)", SC_RESTORE - MENUITEM "移动(&M)", SC_MOVE + MENUITEM "還原(&R)", SC_RESTORE + MENUITEM "移動(&M)", SC_MOVE MENUITEM "大小(&S)", SC_SIZE MENUITEM "最小化(&N)", SC_MINIMIZE MENUITEM "最大化(&X)", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "关闭(&C)\tCtrl+F4", SC_CLOSE + MENUITEM "關閉(&C)\tCtrl+F4", SC_CLOSE MENUITEM SEPARATOR MENUITEM "下一步(&T)\tCtrl+F6", SC_NEXTWINDOW END @@ -57,24 +59,24 @@ END STRINGTABLE BEGIN - IDS_ERROR "错误" - IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" - IDS_HUNG_UP_TITLE "Hung up!" - IDS_OK "确定" + IDS_ERROR "錯誤" + IDS_NOT_RESPONDING " (沒有回應)" + IDS_ASK_TERMINATE "這個應用程式沒有回應，是否需要結束此程式？" + IDS_HUNG_UP_TITLE "沒有回應。" + IDS_OK "確定" IDS_CANCEL "取消" IDS_ABORT "中止(&A)" - IDS_RETRY "重试(&R)" + IDS_RETRY "重試(&R)" IDS_IGNORE "忽略(&I)" IDS_YES "是(&Y)" IDS_NO "否(&N)" - IDS_CLOSE "关闭(&C)" - IDS_HELP "帮助" - IDS_TRYAGAIN "重试(&T)" - IDS_CONTINUE "继续(&C)" + IDS_CLOSE "關閉(&C)" + IDS_HELP "說明" + IDS_TRYAGAIN "再試一次(&T)" + IDS_CONTINUE "繼續(&C)" END STRINGTABLE BEGIN - IDS_MDI_MOREWINDOWS "更多窗口(&M)..." + IDS_MDI_MOREWINDOWS "更多視窗(&M)..." END diff --git a/win32ss/user/user32/user32.rc b/win32ss/user/user32/user32.rc index 9594353acc..fbe656b96f 100644 --- a/win32ss/user/user32/user32.rc +++ b/win32ss/user/user32/user32.rc @@ -179,3 +179,6 @@ OBM_OLD_CLOSE BITMAP "resources/obm_old_close.bmp" #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif

5 years, 8 months

[reactos] 01/01: [NTOSKRNL] Fix !irpfind usage message

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25e14ae2a877e6667c153… commit 25e14ae2a877e6667c153d9fd71eff576601cb9a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jan 6 13:00:43 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jan 6 13:00:43 2019 +0100 [NTOSKRNL] Fix !irpfind usage message --- ntoskrnl/kdbg/kdb_cli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 6b7ee2752b..ed40fe3661 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -193,7 +193,7 @@ static const struct { "!poolfind", "!poolfind Tag [Pool]", "Search for pool tag allocations.", ExpKdbgExtPoolFind }, { "!filecache", "!filecache", "Display cache usage.", ExpKdbgExtFileCache }, { "!defwrites", "!defwrites", "Display cache write values.", ExpKdbgExtDefWrites }, - { "!irpfind", "!irpfind [Pool [Restart Address [criteria data]]]", "Lists IRPs potentially matching criteria", ExpKdbgExtIrpFind }, + { "!irpfind", "!irpfind [Pool [startaddress [criteria data]]]", "Lists IRPs potentially matching criteria", ExpKdbgExtIrpFind }, }; /* FUNCTIONS *****************************************************************/

5 years, 8 months

[reactos] 02/02: [NTOSKRNL] Properly check for address validity in !poolfind

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28193399ee039b62a03f8… commit 28193399ee039b62a03f8ad8c6b23d6bb04facfe Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jan 6 12:58:14 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jan 6 12:58:14 2019 +0100 [NTOSKRNL] Properly check for address validity in !poolfind --- ntoskrnl/mm/ARM3/expool.c | 54 ++++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 33 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index e03645387a..e69be03cbf 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -3163,7 +3163,6 @@ ExpKdbgExtPoolFindPagedPool( ULONG i = 0; PPOOL_HEADER Entry; PVOID BaseVa; - PMMPTE PointerPte; PMMPDE PointerPde; KdbpPrint("Searching Paged pool (%p : %p) for Tag: %.4s\n", MmPagedPoolStart, MmPagedPoolEnd, (PCHAR)&Tag); @@ -3192,13 +3191,7 @@ ExpKdbgExtPoolFindPagedPool( } /* Check if allocation is valid */ - PointerPte = MiAddressToPte(BaseVa); - if ((ULONG_PTR)PointerPte > PTE_TOP) - { - break; - } - - if (PointerPte->u.Hard.Valid) + if (MmIsAddressValid(BaseVa)) { for (Entry = BaseVa; (ULONG_PTR)Entry + sizeof(POOL_HEADER) < (ULONG_PTR)BaseVa + PAGE_SIZE; @@ -3243,7 +3236,6 @@ ExpKdbgExtPoolFindNonPagedPool( { PPOOL_HEADER Entry; PVOID BaseVa; - PMMPTE PointerPte; KdbpPrint("Searching NonPaged pool (%p : %p) for Tag: %.4s\n", MmNonPagedPoolStart, MmNonPagedPoolEnd0, (PCHAR)&Tag); @@ -3261,38 +3253,34 @@ ExpKdbgExtPoolFindNonPagedPool( } /* Check if allocation is valid */ - PointerPte = MiAddressToPte(BaseVa); - if ((ULONG_PTR)PointerPte > PTE_TOP) + if (!MmIsAddressValid(BaseVa)) { - break; + continue; } - if (PointerPte->u.Hard.Valid) + for (Entry = BaseVa; + (ULONG_PTR)Entry + sizeof(POOL_HEADER) < (ULONG_PTR)BaseVa + PAGE_SIZE; + Entry = (PVOID)((ULONG_PTR)Entry + 8)) { - for (Entry = BaseVa; - (ULONG_PTR)Entry + sizeof(POOL_HEADER) < (ULONG_PTR)BaseVa + PAGE_SIZE; - Entry = (PVOID)((ULONG_PTR)Entry + 8)) + /* Try to find whether we have a pool entry */ + if (!ExpKdbgExtValidatePoolHeader(BaseVa, Entry, NonPagedPool)) { - /* Try to find whether we have a pool entry */ - if (!ExpKdbgExtValidatePoolHeader(BaseVa, Entry, NonPagedPool)) + continue; + } + + if ((Entry->PoolTag & Mask) == (Tag & Mask)) + { + if (FoundCallback != NULL) { - continue; + FoundCallback(Entry, CallbackContext); } - - if ((Entry->PoolTag & Mask) == (Tag & Mask)) + else { - if (FoundCallback != NULL) - { - FoundCallback(Entry, CallbackContext); - } - else - { - /* Print the line */ - KdbpPrint("%p size: %4d previous size: %4d %s %.4s\n", - Entry, Entry->BlockSize, Entry->PreviousSize, - Entry->PoolType ? "(Allocated)" : "(Free) ", - (PCHAR)&Entry->PoolTag); - } + /* Print the line */ + KdbpPrint("%p size: %4d previous size: %4d %s %.4s\n", + Entry, Entry->BlockSize, Entry->PreviousSize, + Entry->PoolType ? "(Allocated)" : "(Free) ", + (PCHAR)&Entry->PoolTag); } } }

5 years, 8 months

[reactos] 01/02: [NTOSKRNL] Reimplement !irpfind using !poolfind helpers

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47b48520b511842e9e9b7… commit 47b48520b511842e9e9b74f9e59277ae4710c92f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jan 6 12:49:57 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jan 6 12:49:57 2019 +0100 [NTOSKRNL] Reimplement !irpfind using !poolfind helpers This allows avoiding one of the previous implementation limits: leaked IRP not queued to a thread are now totally visible since we look directly in the memory pool. --- ntoskrnl/kdbg/kdb_cli.c | 5 +- ntoskrnl/mm/ARM3/expool.c | 184 ++++++++++++++++++++++++++++++++++++++++++---- ntoskrnl/ps/process.c | 114 ---------------------------- 3 files changed, 172 insertions(+), 131 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index ef97693414..6b7ee2752b 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -96,8 +96,7 @@ BOOLEAN ExpKdbgExtPoolUsed(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtPoolFind(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtDefWrites(ULONG Argc, PCHAR Argv[]); - -BOOLEAN PspKdbgIrpFind(ULONG Argc, PCHAR Argv[]); +BOOLEAN ExpKdbgExtIrpFind(ULONG Argc, PCHAR Argv[]); #ifdef __ROS_DWARF__ static BOOLEAN KdbpCmdPrintStruct(ULONG Argc, PCHAR Argv[]); @@ -194,7 +193,7 @@ static const struct { "!poolfind", "!poolfind Tag [Pool]", "Search for pool tag allocations.", ExpKdbgExtPoolFind }, { "!filecache", "!filecache", "Display cache usage.", ExpKdbgExtFileCache }, { "!defwrites", "!defwrites", "Display cache write values.", ExpKdbgExtDefWrites }, - { "!irpfind", "!irpfind [criteria data]", "Lists IRPs potentially matching criteria", PspKdbgIrpFind }, + { "!irpfind", "!irpfind [Pool [Restart Address [criteria data]]]", "Lists IRPs potentially matching criteria", ExpKdbgExtIrpFind }, }; /* FUNCTIONS *****************************************************************/ diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index b321b52044..e03645387a 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -3156,7 +3156,9 @@ static VOID ExpKdbgExtPoolFindPagedPool( ULONG Tag, - ULONG Mask) + ULONG Mask, + VOID (NTAPI* FoundCallback)(PPOOL_HEADER, PVOID), + PVOID CallbackContext) { ULONG i = 0; PPOOL_HEADER Entry; @@ -3210,11 +3212,18 @@ ExpKdbgExtPoolFindPagedPool( if ((Entry->PoolTag & Mask) == (Tag & Mask)) { - /* Print the line */ - KdbpPrint("%p size: %4d previous size: %4d %s %.4s\n", - Entry, Entry->BlockSize, Entry->PreviousSize, - Entry->PoolType ? "(Allocated)" : "(Free) ", - (PCHAR)&Entry->PoolTag); + if (FoundCallback != NULL) + { + FoundCallback(Entry, CallbackContext); + } + else + { + /* Print the line */ + KdbpPrint("%p size: %4d previous size: %4d %s %.4s\n", + Entry, Entry->BlockSize, Entry->PreviousSize, + Entry->PoolType ? "(Allocated)" : "(Free) ", + (PCHAR)&Entry->PoolTag); + } } } } @@ -3228,7 +3237,9 @@ static VOID ExpKdbgExtPoolFindNonPagedPool( ULONG Tag, - ULONG Mask) + ULONG Mask, + VOID (NTAPI* FoundCallback)(PPOOL_HEADER, PVOID), + PVOID CallbackContext) { PPOOL_HEADER Entry; PVOID BaseVa; @@ -3270,11 +3281,18 @@ ExpKdbgExtPoolFindNonPagedPool( if ((Entry->PoolTag & Mask) == (Tag & Mask)) { - /* Print the line */ - KdbpPrint("%p size: %4d previous size: %4d %s %.4s\n", - Entry, Entry->BlockSize, Entry->PreviousSize, - Entry->PoolType ? "(Allocated)" : "(Free) ", - (PCHAR)&Entry->PoolTag); + if (FoundCallback != NULL) + { + FoundCallback(Entry, CallbackContext); + } + else + { + /* Print the line */ + KdbpPrint("%p size: %4d previous size: %4d %s %.4s\n", + Entry, Entry->BlockSize, Entry->PreviousSize, + Entry->PoolType ? "(Allocated)" : "(Free) ", + (PCHAR)&Entry->PoolTag); + } } } } @@ -3318,11 +3336,149 @@ ExpKdbgExtPoolFind( if (PoolType == NonPagedPool) { - ExpKdbgExtPoolFindNonPagedPool(Tag, Mask); + ExpKdbgExtPoolFindNonPagedPool(Tag, Mask, NULL, NULL); + } + else if (PoolType == PagedPool) + { + ExpKdbgExtPoolFindPagedPool(Tag, Mask, NULL, NULL); + } + + return TRUE; +} + +typedef struct _IRP_FIND_CTXT +{ + ULONG_PTR RestartAddress; + ULONG_PTR SData; + ULONG Criteria; +} IRP_FIND_CTXT, *PIRP_FIND_CTXT; + +VOID +NTAPI +ExpKdbgExtIrpFindPrint( + PPOOL_HEADER Entry, + PVOID Context) +{ + PIRP Irp; + PIRP_FIND_CTXT FindCtxt = Context; + PIO_STACK_LOCATION IoStack = NULL; + PUNICODE_STRING DriverName; + ULONG_PTR SData = FindCtxt->SData; + ULONG Criteria = FindCtxt->Criteria; + + /* Free entry, ignore */ + if (Entry->PoolType == 0) + { + return; + } + + /* Get the IRP */ + Irp = (PIRP)POOL_FREE_BLOCK(Entry); + + /* Bail out if not matching restart address */ + if ((ULONG_PTR)Irp < FindCtxt->RestartAddress) + { + return; + } + + /* Avoid bogus IRP stack locations */ + if (Irp->CurrentLocation <= Irp->StackCount + 1) + { + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* Get associated driver */ + if (IoStack->DeviceObject && IoStack->DeviceObject->DriverObject) + DriverName = &IoStack->DeviceObject->DriverObject->DriverName; + else + DriverName = NULL; + } + + /* Display if: no data, no criteria or if criteria matches data */ + if (SData == 0 || Criteria == 0 || + (Criteria & 0x1 && IoStack && SData == (ULONG_PTR)IoStack->DeviceObject) || + (Criteria & 0x2 && SData == (ULONG_PTR)Irp->Tail.Overlay.OriginalFileObject) || + (Criteria & 0x4 && Irp->MdlAddress && SData == (ULONG_PTR)Irp->MdlAddress->Process) || + (Criteria & 0x8 && SData == (ULONG_PTR)Irp->Tail.Overlay.Thread) || + (Criteria & 0x10 && SData == (ULONG_PTR)Irp->UserEvent)) + { + KdbpPrint("%p Thread %p current stack belongs to %wZ\n", Irp, Irp->Tail.Overlay.Thread, DriverName); + } +} + +BOOLEAN +ExpKdbgExtIrpFind( + ULONG Argc, + PCHAR Argv[]) +{ + ULONG PoolType = NonPagedPool; + IRP_FIND_CTXT FindCtxt; + + /* Pool type */ + if (Argc > 1) + { + PoolType = strtoul(Argv[1], NULL, 0); + + if (PoolType > 1) + { + KdbpPrint("Only (non) paged pool are supported\n"); + return TRUE; + } + } + + RtlZeroMemory(&FindCtxt, sizeof(IRP_FIND_CTXT)); + + /* Restart address */ + if (Argc > 2) + { + if (!KdbpGetHexNumber(Argv[2], &FindCtxt.RestartAddress)) + { + KdbpPrint("Invalid parameter: %s\n", Argv[0]); + FindCtxt.RestartAddress = 0; + } + } + + if (Argc > 4) + { + if (!KdbpGetHexNumber(Argv[4], &FindCtxt.SData)) + { + FindCtxt.SData = 0; + } + else + { + if (strcmp(Argv[3], "device") == 0) + { + FindCtxt.Criteria = 0x1; + } + else if (strcmp(Argv[3], "fileobject") == 0) + { + FindCtxt.Criteria = 0x2; + } + else if (strcmp(Argv[3], "mdlprocess") == 0) + { + FindCtxt.Criteria = 0x4; + } + else if (strcmp(Argv[3], "thread") == 0) + { + FindCtxt.Criteria = 0x8; + } + else if (strcmp(Argv[3], "userevent") == 0) + { + FindCtxt.Criteria = 0x10; + } + else if (strcmp(Argv[3], "arg") == 0) + { + FindCtxt.Criteria = 0x1f; + } + } + } + + if (PoolType == NonPagedPool) + { + ExpKdbgExtPoolFindNonPagedPool(TAG_IRP, 0xFFFFFFFF, ExpKdbgExtIrpFindPrint, &FindCtxt); } else if (PoolType == PagedPool) { - ExpKdbgExtPoolFindPagedPool(Tag, Mask); + ExpKdbgExtPoolFindPagedPool(TAG_IRP, 0xFFFFFFFF, ExpKdbgExtIrpFindPrint, &FindCtxt); } return TRUE; diff --git a/ntoskrnl/ps/process.c b/ntoskrnl/ps/process.c index 3554d601c1..179fd1d8fa 100644 --- a/ntoskrnl/ps/process.c +++ b/ntoskrnl/ps/process.c @@ -1615,118 +1615,4 @@ NtOpenProcess(OUT PHANDLE ProcessHandle, return Status; } -#if DBG && defined(KDBG) -BOOLEAN -PspKdbgIrpFind( - ULONG Argc, - PCHAR Argv[]) -{ - PLIST_ENTRY PsEntry, TdEntry, IrpEntry; - PEPROCESS Process = NULL; - PETHREAD Thread = NULL; - PIRP Irp = NULL; - PIO_STACK_LOCATION IoStack = NULL; - PUNICODE_STRING DriverName; - ULONG_PTR SData = 0; - ULONG Criteria = 0; - - /* - * FIXME: To improve, badly - * This should just be a wrapper over !poolfind - * As a hack, here we just browse all the queued IRPs - * and return them - * If that's not *that* wrong, it makes sure that leaked - * IRPs are invisible! - * We also don't care about pool type, nor address start - */ - - /* Gets the criteria and its data */ - if (Argc > 2) - { - if (!KdbpGetHexNumber(Argv[2], &SData)) - { - SData = 0; - } - else - { - if (strcmp(Argv[1], "device") == 0) - { - Criteria = 0x1; - } - else if (strcmp(Argv[1], "fileobject") == 0) - { - Criteria = 0x2; - } - else if (strcmp(Argv[1], "mdlprocess") == 0) - { - Criteria = 0x4; - } - else if (strcmp(Argv[1], "thread") == 0) - { - Criteria = 0x8; - } - else if (strcmp(Argv[1], "userevent") == 0) - { - Criteria = 0x10; - } - else if (strcmp(Argv[1], "arg") == 0) - { - Criteria = 0x1f; - } - } - } - - PsEntry = PsActiveProcessHead.Flink; - /* Loop the process list */ - while (PsEntry != &PsActiveProcessHead) - { - /* Get the process */ - Process = CONTAINING_RECORD(PsEntry, EPROCESS, ActiveProcessLinks); - - /* Loop the thread list */ - TdEntry = Process->ThreadListHead.Flink; - while (TdEntry != &Process->ThreadListHead) - { - /* Get the thread */ - Thread = CONTAINING_RECORD(TdEntry, ETHREAD, ThreadListEntry); - - /* Loop the IRP list */ - IrpEntry = Thread->IrpList.Flink; - while (IrpEntry != &Thread->IrpList) - { - /* Get the IRP and its current stack */ - Irp = CONTAINING_RECORD(IrpEntry, IRP, ThreadListEntry); - IoStack = IoGetCurrentIrpStackLocation(Irp); - - /* Get associated driver */ - if (IoStack->DeviceObject && IoStack->DeviceObject->DriverObject) - DriverName = &IoStack->DeviceObject->DriverObject->DriverName; - else - DriverName = NULL; - - /* Display if: no data, no criteria or if criteria matches data */ - if (SData == 0 || Criteria == 0 || - (Criteria & 0x1 && SData == (ULONG_PTR)IoStack->DeviceObject) || - (Criteria & 0x2 && SData == (ULONG_PTR)Irp->Tail.Overlay.OriginalFileObject) || - (Criteria & 0x4 && Irp->MdlAddress && SData == (ULONG_PTR)Irp->MdlAddress->Process) || - (Criteria & 0x8 && SData == (ULONG_PTR)Irp->Tail.Overlay.Thread) || - (Criteria & 0x10 && SData == (ULONG_PTR)Irp->UserEvent)) - { - KdbpPrint("%p Thread %p current stack belongs to %wZ\n", Irp, Thread, DriverName); - } - - IrpEntry = IrpEntry->Flink; - } - - TdEntry = TdEntry->Flink; - } - - PsEntry = PsEntry->Flink; - } - - return TRUE; -} - -#endif // DBG && KDBG - /* EOF */

5 years, 8 months

[reactos] 01/01: [NTOSKRNL] Implement !poolfind command in KDBG

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12e579567c0df0008bd1e… commit 12e579567c0df0008bd1eb02dcdb92bcb31eb8e3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jan 6 11:54:05 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jan 6 11:56:38 2019 +0100 [NTOSKRNL] Implement !poolfind command in KDBG For now, it allows searching for pool allocations in both paged and non paged pool. It is based on Andreas Schuster work to identify POOL_HEADER structures. --- ntoskrnl/kdbg/kdb_cli.c | 2 + ntoskrnl/mm/ARM3/expool.c | 222 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 224 insertions(+) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 37ad987b79..ef97693414 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -93,6 +93,7 @@ static BOOLEAN KdbpCmdDmesg(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtPool(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtPoolUsed(ULONG Argc, PCHAR Argv[]); +BOOLEAN ExpKdbgExtPoolFind(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtDefWrites(ULONG Argc, PCHAR Argv[]); @@ -190,6 +191,7 @@ static const struct { "help", "help", "Display help screen.", KdbpCmdHelp }, { "!pool", "!pool [Address [Flags]]", "Display information about pool allocations.", ExpKdbgExtPool }, { "!poolused", "!poolused [Flags [Tag]]", "Display pool usage.", ExpKdbgExtPoolUsed }, + { "!poolfind", "!poolfind Tag [Pool]", "Search for pool tag allocations.", ExpKdbgExtPoolFind }, { "!filecache", "!filecache", "Display cache usage.", ExpKdbgExtFileCache }, { "!defwrites", "!defwrites", "Display cache write values.", ExpKdbgExtDefWrites }, { "!irpfind", "!irpfind [criteria data]", "Lists IRPs potentially matching criteria", PspKdbgIrpFind }, diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index af83d88f05..b321b52044 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -3106,6 +3106,228 @@ ExpKdbgExtPoolUsed( return TRUE; } +static +BOOLEAN +ExpKdbgExtValidatePoolHeader( + PVOID BaseVa, + PPOOL_HEADER Entry, + POOL_TYPE BasePoolTye) +{ + /* Block size cannot be NULL or negative and it must cover the page */ + if (Entry->BlockSize <= 0) + { + return FALSE; + } + if (Entry->BlockSize * 8 + (ULONG_PTR)Entry - (ULONG_PTR)BaseVa > PAGE_SIZE) + { + return FALSE; + } + + /* + * PreviousSize cannot be 0 unless on page begin + * And it cannot be bigger that our current + * position in page + */ + if (Entry->PreviousSize == 0 && BaseVa != Entry) + { + return FALSE; + } + if (Entry->PreviousSize * 8 > (ULONG_PTR)Entry - (ULONG_PTR)BaseVa) + { + return FALSE; + } + + /* Must be paged pool */ + if (((Entry->PoolType - 1) & BASE_POOL_TYPE_MASK) != BasePoolTye) + { + return FALSE; + } + + /* Match tag mask */ + if ((Entry->PoolTag & 0x00808080) != 0) + { + return FALSE; + } + + return TRUE; +} + +static +VOID +ExpKdbgExtPoolFindPagedPool( + ULONG Tag, + ULONG Mask) +{ + ULONG i = 0; + PPOOL_HEADER Entry; + PVOID BaseVa; + PMMPTE PointerPte; + PMMPDE PointerPde; + + KdbpPrint("Searching Paged pool (%p : %p) for Tag: %.4s\n", MmPagedPoolStart, MmPagedPoolEnd, (PCHAR)&Tag); + + /* + * To speed up paged pool search, we will use the allocation bipmap. + * This is possible because we live directly in the kernel :-) + */ + i = RtlFindSetBits(MmPagedPoolInfo.PagedPoolAllocationMap, 1, 0); + while (i != 0xFFFFFFFF) + { + BaseVa = (PVOID)((ULONG_PTR)MmPagedPoolStart + (i << PAGE_SHIFT)); + Entry = BaseVa; + + /* Validate our address */ + if ((ULONG_PTR)BaseVa > (ULONG_PTR)MmPagedPoolEnd || (ULONG_PTR)BaseVa + PAGE_SIZE > (ULONG_PTR)MmPagedPoolEnd) + { + break; + } + + /* Check whether we are beyond expansion */ + PointerPde = MiAddressToPde(BaseVa); + if (PointerPde >= MmPagedPoolInfo.NextPdeForPagedPoolExpansion) + { + break; + } + + /* Check if allocation is valid */ + PointerPte = MiAddressToPte(BaseVa); + if ((ULONG_PTR)PointerPte > PTE_TOP) + { + break; + } + + if (PointerPte->u.Hard.Valid) + { + for (Entry = BaseVa; + (ULONG_PTR)Entry + sizeof(POOL_HEADER) < (ULONG_PTR)BaseVa + PAGE_SIZE; + Entry = (PVOID)((ULONG_PTR)Entry + 8)) + { + /* Try to find whether we have a pool entry */ + if (!ExpKdbgExtValidatePoolHeader(BaseVa, Entry, PagedPool)) + { + continue; + } + + if ((Entry->PoolTag & Mask) == (Tag & Mask)) + { + /* Print the line */ + KdbpPrint("%p size: %4d previous size: %4d %s %.4s\n", + Entry, Entry->BlockSize, Entry->PreviousSize, + Entry->PoolType ? "(Allocated)" : "(Free) ", + (PCHAR)&Entry->PoolTag); + } + } + } + + i = RtlFindSetBits(MmPagedPoolInfo.PagedPoolAllocationMap, 1, i + 1); + } +} + +extern PVOID MmNonPagedPoolEnd0; +static +VOID +ExpKdbgExtPoolFindNonPagedPool( + ULONG Tag, + ULONG Mask) +{ + PPOOL_HEADER Entry; + PVOID BaseVa; + PMMPTE PointerPte; + + KdbpPrint("Searching NonPaged pool (%p : %p) for Tag: %.4s\n", MmNonPagedPoolStart, MmNonPagedPoolEnd0, (PCHAR)&Tag); + + /* Brute force search: start browsing the whole non paged pool */ + for (BaseVa = MmNonPagedPoolStart; + (ULONG_PTR)BaseVa + PAGE_SIZE <= (ULONG_PTR)MmNonPagedPoolEnd0; + BaseVa = (PVOID)((ULONG_PTR)BaseVa + PAGE_SIZE)) + { + Entry = BaseVa; + + /* Check whether we are beyond expansion */ + if (BaseVa >= MmNonPagedPoolExpansionStart) + { + break; + } + + /* Check if allocation is valid */ + PointerPte = MiAddressToPte(BaseVa); + if ((ULONG_PTR)PointerPte > PTE_TOP) + { + break; + } + + if (PointerPte->u.Hard.Valid) + { + for (Entry = BaseVa; + (ULONG_PTR)Entry + sizeof(POOL_HEADER) < (ULONG_PTR)BaseVa + PAGE_SIZE; + Entry = (PVOID)((ULONG_PTR)Entry + 8)) + { + /* Try to find whether we have a pool entry */ + if (!ExpKdbgExtValidatePoolHeader(BaseVa, Entry, NonPagedPool)) + { + continue; + } + + if ((Entry->PoolTag & Mask) == (Tag & Mask)) + { + /* Print the line */ + KdbpPrint("%p size: %4d previous size: %4d %s %.4s\n", + Entry, Entry->BlockSize, Entry->PreviousSize, + Entry->PoolType ? "(Allocated)" : "(Free) ", + (PCHAR)&Entry->PoolTag); + } + } + } + } +} + +BOOLEAN +ExpKdbgExtPoolFind( + ULONG Argc, + PCHAR Argv[]) +{ + ULONG Tag = 0; + ULONG Mask = 0; + ULONG PoolType = NonPagedPool; + + if (Argc == 1) + { + KdbpPrint("Specify a tag string\n"); + return TRUE; + } + + /* First arg is tag */ + if (strlen(Argv[1]) != 1 || Argv[1][0] != '*') + { + ExpKdbgExtPoolUsedGetTag(Argv[1], &Tag, &Mask); + } + + /* Second arg might be pool to search */ + if (Argc > 2) + { + PoolType = strtoul(Argv[2], NULL, 0); + + if (PoolType > 1) + { + KdbpPrint("Only (non) paged pool are supported\n"); + return TRUE; + } + } + + /* FIXME: What about large pool? */ + + if (PoolType == NonPagedPool) + { + ExpKdbgExtPoolFindNonPagedPool(Tag, Mask); + } + else if (PoolType == PagedPool) + { + ExpKdbgExtPoolFindPagedPool(Tag, Mask); + } + + return TRUE; +} + #endif // DBG && KDBG /* EOF */

5 years, 8 months

[reactos] 01/01: [NTUSER] Fix SetProcessDefaultLayout() (#1013)

by Baruch Rutman

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=123a7c80e0cc5f0d5736a… commit 123a7c80e0cc5f0d5736ab39464823473aa8a6a6 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Sat Oct 20 11:53:14 2018 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 6 04:35:51 2019 +0100 [NTUSER] Fix SetProcessDefaultLayout() (#1013) - Add a check in co_UserCreateWindowEx() for parentless windows, that checks the default layout direction; if it's LAYOUT_RTL add the WS_EX_LAYOUTRTL flag to the extended window styles. - Make the internal routine accepting also LAYOUT_LTR as a value for SetProcessDefaultLayout(). Limit receiving value to LAYOUT_ORIENTATIONMASK (and not just LAYOUT_RTL) or LAYOUT_LTR, as per written in: https://docs.microsoft.com/en-us/windows/desktop/api/winuser/nf-winuser-set… Now all the applications that call SetProcessDefaultLayout() to mirror the layout get mirrored. This is based on Wine. --- win32ss/user/ntuser/simplecall.c | 2 +- win32ss/user/ntuser/window.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index 179d58bcde..67377de4a8 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -342,7 +342,7 @@ NtUserCallOneParam( case ONEPARAM_ROUTINE_SETPROCDEFLAYOUT: { PPROCESSINFO ppi; - if (Param & LAYOUT_ORIENTATIONMASK) + if (Param & LAYOUT_ORIENTATIONMASK || Param == LAYOUT_LTR) { ppi = PsGetCurrentProcessWin32Process(); ppi->dwLayout = Param; diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 7d6ac87155..a557c4d338 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2017,6 +2017,16 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, EngSetLastError(ERROR_TLW_WITH_WSCHILD); goto cleanup; /* WS_CHILD needs a parent, but WS_POPUP doesn't */ } + else if (Cs->lpszClass != (LPCWSTR)MAKEINTATOM(gpsi->atomSysClass[ICLS_DESKTOP]) && + (IS_INTRESOURCE(Cs->lpszClass) || + Cs->lpszClass != (LPCWSTR)MAKEINTATOM(gpsi->atomSysClass[ICLS_HWNDMESSAGE]) || + _wcsicmp(Cs->lpszClass, L"Message") != 0)) + { + if (pti->ppi->dwLayout & LAYOUT_RTL) + { + Cs->dwExStyle |= WS_EX_LAYOUTRTL; + } + } ParentWindow = hWndParent ? UserGetWindowObject(hWndParent): NULL; OwnerWindow = hWndOwner ? UserGetWindowObject(hWndOwner): NULL;

5 years, 8 months

← Newer
1
...
21
22
23
24
25
26
27
...
30
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 January 2019