Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [WINSPOOL] printers.c: Demote 3 ERR() to TRACE(), Fix 1 copypasta (#2311)
by Serge Gautherie 06 Feb '20

06 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06f8f8018191a15714d27… commit 06f8f8018191a15714d27b78f3d1e38eb1623e37 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Feb 6 19:10:21 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 6 19:10:21 2020 +0100 [WINSPOOL] printers.c: Demote 3 ERR() to TRACE(), Fix 1 copypasta (#2311) --- win32ss/printing/base/winspool/printers.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index de024cdbad8..e8a6da62db7 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -197,7 +197,7 @@ DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, WORD fwCapability, LPWSTR pO INT WINAPI DocumentEvent( HANDLE hPrinter, HDC hdc, int iEsc, ULONG cbIn, PVOID pvIn, ULONG cbOut, PVOID pvOut) { - ERR("DocumentEvent(%p, %p, %lu, %lu, %p, %lu, %p)\n", hPrinter, hdc, iEsc, cbIn, pvIn, cbOut, pvOut); + TRACE("DocumentEvent(%p, %p, %lu, %lu, %p, %lu, %p)\n", hPrinter, hdc, iEsc, cbIn, pvIn, cbOut, pvOut); UNIMPLEMENTED; return DOCUMENTEVENT_UNSUPPORTED; } @@ -1529,7 +1529,7 @@ GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Level, LPBYTE pDri RpcExcept(EXCEPTION_EXECUTE_HANDLER) { dwErrorCode = RpcExceptionCode(); - ERR("_RpcGetPrinter failed with exception code %lu!\n", dwErrorCode); + ERR("_RpcGetPrinterDriver failed with exception code %lu!\n", dwErrorCode); } RpcEndExcept; @@ -1935,7 +1935,7 @@ SetPrinterW(HANDLE hPrinter, DWORD Level, PBYTE pPrinter, DWORD Command) BOOL WINAPI SplDriverUnloadComplete(LPWSTR pDriverFile) { - ERR("DriverUnloadComplete(%S)\n", pDriverFile); + TRACE("DriverUnloadComplete(%S)\n", pDriverFile); UNIMPLEMENTED; return TRUE; // return true for now. }

1 0

[reactos] 01/01: [WINSPOOL] Implement GetPrinterA based on GetPrinterW (#2308)
by Doug Lyons 06 Feb '20

06 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ecde3768254664ca40a3f… commit ecde3768254664ca40a3f2fa49d1342d4bd92c02 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Feb 6 12:02:46 2020 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 6 19:02:46 2020 +0100 [WINSPOOL] Implement GetPrinterA based on GetPrinterW (#2308) --- win32ss/printing/base/winspool/printers.c | 462 +++++++++++++++++++++++++++++- 1 file changed, 457 insertions(+), 5 deletions(-) diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 0e7729408b6..de024cdbad8 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -1031,16 +1031,468 @@ Cleanup: BOOL WINAPI GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) { + PPRINTER_INFO_1A ppi1a = (PPRINTER_INFO_1A)pPrinter; + PPRINTER_INFO_1W ppi1w = (PPRINTER_INFO_1W)pPrinter; + PPRINTER_INFO_2A ppi2a = (PPRINTER_INFO_2A)pPrinter; + PPRINTER_INFO_2W ppi2w = (PPRINTER_INFO_2W)pPrinter; + PPRINTER_INFO_4A ppi4a = (PPRINTER_INFO_4A)pPrinter; + PPRINTER_INFO_4W ppi4w = (PPRINTER_INFO_4W)pPrinter; + PPRINTER_INFO_5A ppi5a = (PPRINTER_INFO_5A)pPrinter; + PPRINTER_INFO_5W ppi5w = (PPRINTER_INFO_5W)pPrinter; + PPRINTER_INFO_7A ppi7a = (PPRINTER_INFO_7A)pPrinter; + PPRINTER_INFO_7W ppi7w = (PPRINTER_INFO_7W)pPrinter; + DWORD cch; + BOOL bReturnValue = FALSE; + TRACE("GetPrinterA(%p, %lu, %p, %lu, %p)\n", hPrinter, Level, pPrinter, cbBuf, pcbNeeded); - if(pcbNeeded) *pcbNeeded = 0; - return FALSE; + + // Check for invalid levels here for early error return. Should be 1-9. + if (Level < 1 || Level > 9) + { + SetLastError(ERROR_INVALID_LEVEL); + ERR("Invalid Level!\n"); + goto Cleanup; + } + + bReturnValue = GetPrinterW(hPrinter, Level, pPrinter, cbBuf, pcbNeeded); + + if (!bReturnValue) + { + TRACE("GetPrinterW failed!\n"); + goto Cleanup; + } + + switch (Level) + { + case 1: + { + if (ppi1w->pDescription) + { + PSTR pszDescription; + + // Convert Unicode pDescription to a ANSI string pszDescription. + cch = wcslen(ppi1w->pDescription); + + pszDescription = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszDescription) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi1w->pDescription, -1, pszDescription, cch + 1, NULL, NULL); + StringCchCopyA(ppi1a->pDescription, cch + 1, pszDescription); + + HeapFree(hProcessHeap, 0, pszDescription); + } + + if (ppi1w->pName) + { + PSTR pszName; + + // Convert Unicode pName to a ANSI string pszName. + cch = wcslen(ppi1w->pName); + + pszName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi1w->pName, -1, pszName, cch + 1, NULL, NULL); + StringCchCopyA(ppi1a->pName, cch + 1, pszName); + + HeapFree(hProcessHeap, 0, pszName); + } + + if (ppi1w->pComment) + { + PSTR pszComment; + + // Convert Unicode pComment to a ANSI string pszComment. + cch = wcslen(ppi1w->pComment); + + pszComment = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszComment) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi1w->pComment, -1, pszComment, cch + 1, NULL, NULL); + StringCchCopyA(ppi1a->pComment, cch + 1, pszComment); + + HeapFree(hProcessHeap, 0, pszComment); + } + break; + } + + case 2: + { + if (ppi2w->pServerName) + { + PSTR pszServerName; + + // Convert Unicode pServerName to a ANSI string pszServerName. + cch = wcslen(ppi2w->pServerName); + + pszServerName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszServerName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi2w->pServerName, -1, pszServerName, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a->pServerName, cch + 1, pszServerName); + + HeapFree(hProcessHeap, 0, pszServerName); + } + + if (ppi2w->pPrinterName) + { + PSTR pszPrinterName; + + // Convert Unicode pPrinterName to a ANSI string pszPrinterName. + cch = wcslen(ppi2w->pPrinterName); + + pszPrinterName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszPrinterName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi2w->pPrinterName, -1, pszPrinterName, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a->pPrinterName, cch + 1, pszPrinterName); + + HeapFree(hProcessHeap, 0, pszPrinterName); + } + + if (ppi2w->pShareName) + { + PSTR pszShareName; + + // Convert Unicode pShareName to a ANSI string pszShareName. + cch = wcslen(ppi2w->pShareName); + + pszShareName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszShareName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi2w->pShareName, -1, pszShareName, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a->pShareName, cch + 1, pszShareName); + + HeapFree(hProcessHeap, 0, pszShareName); + } + + if (ppi2w->pPortName) + { + PSTR pszPortName; + + // Convert Unicode pPortName to a ANSI string pszPortName. + cch = wcslen(ppi2w->pPortName); + + pszPortName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszPortName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi2w->pPortName, -1, pszPortName, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a->pPortName, cch + 1, pszPortName); + + HeapFree(hProcessHeap, 0, pszPortName); + } + + if (ppi2w->pDriverName) + { + PSTR pszDriverName; + + // Convert Unicode pDriverName to a ANSI string pszDriverName. + cch = wcslen(ppi2w->pDriverName); + + pszDriverName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszDriverName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi2w->pDriverName, -1, pszDriverName, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a->pDriverName, cch + 1, pszDriverName); + + HeapFree(hProcessHeap, 0, pszDriverName); + } + + if (ppi2w->pComment) + { + PSTR pszComment; + + // Convert Unicode pComment to a ANSI string pszComment. + cch = wcslen(ppi2w->pComment); + + pszComment = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszComment) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi2w->pComment, -1, pszComment, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a->pComment, cch + 1, pszComment); + + HeapFree(hProcessHeap, 0, pszComment); + } + + if (ppi2w->pLocation) + { + PSTR pszLocation; + + // Convert Unicode pLocation to a ANSI string pszLocation. + cch = wcslen(ppi2w->pLocation); + + pszLocation = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszLocation) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi2w->pLocation, -1, pszLocation, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a->pLocation, cch + 1, pszLocation); + + HeapFree(hProcessHeap, 0, pszLocation); + } + + if (ppi2w->pSepFile) + { + PSTR pszSepFile; + + // Convert Unicode pSepFile to a ANSI string pszSepFile. + cch = wcslen(ppi2w->pSepFile); + + pszSepFile = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszSepFile) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi2w->pSepFile, -1, pszSepFile, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a->pSepFile, cch + 1, pszSepFile); + + HeapFree(hProcessHeap, 0, pszSepFile); + } + + if (ppi2w->pPrintProcessor) + { + PSTR pszPrintProcessor; + + // Convert Unicode pPrintProcessor to a ANSI string pszPrintProcessor. + cch = wcslen(ppi2w->pPrintProcessor); + + pszPrintProcessor = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszPrintProcessor) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi2w->pPrintProcessor, -1, pszPrintProcessor, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a->pPrintProcessor, cch + 1, pszPrintProcessor); + + HeapFree(hProcessHeap, 0, pszPrintProcessor); + } + + if (ppi2w->pDatatype) + { + PSTR pszDatatype; + + // Convert Unicode pDatatype to a ANSI string pszDatatype. + cch = wcslen(ppi2w->pDatatype); + + pszDatatype = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszDatatype) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi2w->pDatatype, -1, pszDatatype, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a->pDatatype, cch + 1, pszDatatype); + + HeapFree(hProcessHeap, 0, pszDatatype); + } + + if (ppi2w->pParameters) + { + PSTR pszParameters; + + // Convert Unicode pParameters to a ANSI string pszParameters. + cch = wcslen(ppi2w->pParameters); + + pszParameters = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszParameters) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi2w->pParameters, -1, pszParameters, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a->pParameters, cch + 1, pszParameters); + + HeapFree(hProcessHeap, 0, pszParameters); + } + break; + } + + case 4: + { + if (ppi4w->pPrinterName) + { + PSTR pszPrinterName; + + // Convert Unicode pPrinterName to a ANSI string pszPrinterName. + cch = wcslen(ppi4w->pPrinterName); + + pszPrinterName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszPrinterName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi4w->pPrinterName, -1, pszPrinterName, cch + 1, NULL, NULL); + StringCchCopyA(ppi4a->pPrinterName, cch + 1, pszPrinterName); + + HeapFree(hProcessHeap, 0, pszPrinterName); + } + + if (ppi4w->pServerName) + { + PSTR pszServerName; + + // Convert Unicode pServerName to a ANSI string pszServerName. + cch = wcslen(ppi4w->pServerName); + + pszServerName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszServerName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi4w->pServerName, -1, pszServerName, cch + 1, NULL, NULL); + StringCchCopyA(ppi4a->pServerName, cch + 1, pszServerName); + + HeapFree(hProcessHeap, 0, pszServerName); + } + break; + } + + case 5: + { + if (ppi5w->pPrinterName) + { + PSTR pszPrinterName; + + // Convert Unicode pPrinterName to a ANSI string pszPrinterName. + cch = wcslen(ppi5w->pPrinterName); + + pszPrinterName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszPrinterName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi5w->pPrinterName, -1, pszPrinterName, cch + 1, NULL, NULL); + StringCchCopyA(ppi5a->pPrinterName, cch + 1, pszPrinterName); + + HeapFree(hProcessHeap, 0, pszPrinterName); + } + + if (ppi5w->pPortName) + { + PSTR pszPortName; + + // Convert Unicode pPortName to a ANSI string pszPortName. + cch = wcslen(ppi5w->pPortName); + + pszPortName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszPortName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi5w->pPortName, -1, pszPortName, cch + 1, NULL, NULL); + StringCchCopyA(ppi5a->pPortName, cch + 1, pszPortName); + + HeapFree(hProcessHeap, 0, pszPortName); + } + break; + } + + case 7: + { + if (ppi7w->pszObjectGUID) + { + PSTR pszaObjectGUID; + + // Convert Unicode pszObjectGUID to a ANSI string pszaObjectGUID. + cch = wcslen(ppi7w->pszObjectGUID); + + pszaObjectGUID = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszaObjectGUID) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + WideCharToMultiByte(CP_ACP, 0, ppi7w->pszObjectGUID, -1, pszaObjectGUID, cch + 1, NULL, NULL); + StringCchCopyA(ppi7a->pszObjectGUID, cch + 1, pszaObjectGUID); + + HeapFree(hProcessHeap, 0, pszaObjectGUID); + } + break; + } + } // switch + +Cleanup: + return bReturnValue; } BOOL WINAPI GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) { - TRACE("GetPrinterDriverA(%p, %s, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); - if(pcbNeeded) *pcbNeeded = 0; + ERR("GetPrinterDriverA(%p, %s, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); + if (pcbNeeded) *pcbNeeded = 0; return FALSE; } @@ -1050,7 +1502,7 @@ GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Level, LPBYTE pDri DWORD dwErrorCode; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; - ERR("GetPrinterDriverW(%p, %S, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); + TRACE("GetPrinterDriverW(%p, %S, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); // Sanity checks. if (!pHandle)

1 0

[reactos] 01/01: [NTOS:MM] Stop using PD_COUNT, PDE_COUNT and PTE_COUNT (#2294)
by Serge Gautherie 05 Feb '20

05 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c6747aff0d3398746518… commit 2c6747aff0d33987465188f13e2ac0eb0549aedd Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Feb 5 23:48:26 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 5 23:48:26 2020 +0100 [NTOS:MM] Stop using PD_COUNT, PDE_COUNT and PTE_COUNT (#2294) Directly use PPE_PER_PAGE, PDE_PER_PAGE, PTE_PER_PAGE constants from hardware-specific MM headers instead --- ntoskrnl/mm/ARM3/arm/init.c | 2 +- ntoskrnl/mm/ARM3/miarm.h | 15 +++++---------- ntoskrnl/mm/ARM3/mminit.c | 16 ++++++++-------- ntoskrnl/mm/ARM3/pool.c | 10 +++++----- ntoskrnl/mm/ARM3/section.c | 2 +- ntoskrnl/mm/balance.c | 4 ++-- ntoskrnl/mm/i386/page.c | 9 +++++---- ntoskrnl/mm/marea.c | 4 ++-- 8 files changed, 29 insertions(+), 33 deletions(-) diff --git a/ntoskrnl/mm/ARM3/arm/init.c b/ntoskrnl/mm/ARM3/arm/init.c index 2a2c48cb2ee..cdc1d398276 100644 --- a/ntoskrnl/mm/ARM3/arm/init.c +++ b/ntoskrnl/mm/ARM3/arm/init.c @@ -37,7 +37,7 @@ ULONG MmSessionPoolSize; ULONG MmSessionImageSize; PVOID MiSystemViewStart; ULONG MmSystemViewSize; -PFN_NUMBER MmSystemPageDirectory[PD_COUNT]; +PFN_NUMBER MmSystemPageDirectory[PPE_PER_PAGE]; PMMPDE MmSystemPagePtes; ULONG MmNumberOfSystemPtes; ULONG MxPfnAllocation; diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index b0fa87c4dea..15c17ab462a 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -19,21 +19,16 @@ #define _64K (64 * _1KB) /* Area mapped by a PDE */ -#define PDE_MAPPED_VA (PTE_COUNT * PAGE_SIZE) +#define PDE_MAPPED_VA (PTE_PER_PAGE * PAGE_SIZE) /* Size of a page table */ -#define PT_SIZE (PTE_COUNT * sizeof(MMPTE)) +#define PT_SIZE (PTE_PER_PAGE * sizeof(MMPTE)) /* Size of a page directory */ -#define PD_SIZE (PDE_COUNT * sizeof(MMPDE)) - -/* Stop using these! */ -#define PD_COUNT PPE_PER_PAGE -#define PDE_COUNT PDE_PER_PAGE -#define PTE_COUNT PTE_PER_PAGE +#define PD_SIZE (PDE_PER_PAGE * sizeof(MMPDE)) /* Size of all page directories for a process */ -#define SYSTEM_PD_SIZE (PD_COUNT * PD_SIZE) +#define SYSTEM_PD_SIZE (PPE_PER_PAGE * PD_SIZE) #ifdef _M_IX86 C_ASSERT(SYSTEM_PD_SIZE == PAGE_SIZE); #endif @@ -644,7 +639,7 @@ extern PVOID MiSessionImageStart; extern PVOID MiSessionImageEnd; extern PMMPTE MiHighestUserPte; extern PMMPDE MiHighestUserPde; -extern PFN_NUMBER MmSystemPageDirectory[PD_COUNT]; +extern PFN_NUMBER MmSystemPageDirectory[PPE_PER_PAGE]; extern PMMPTE MmSharedUserDataPte; extern LIST_ENTRY MmProcessList; extern BOOLEAN MmZeroingPageThreadActive; diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index fcd1c7dae2f..7cd7af10838 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -161,7 +161,7 @@ SIZE_T MmSystemViewSize; // map paged pool PDEs into external processes when they fault on a paged pool // address. // -PFN_NUMBER MmSystemPageDirectory[PD_COUNT]; +PFN_NUMBER MmSystemPageDirectory[PPE_PER_PAGE]; PMMPDE MmSystemPagePtes; #endif @@ -779,7 +779,7 @@ MiBuildPfnDatabaseFromPages(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* Start with the first PDE and scan them all */ PointerPde = MiAddressToPde(NULL); - Count = PD_COUNT * PDE_COUNT; + Count = PPE_PER_PAGE * PDE_PER_PAGE; for (i = 0; i < Count; i++) { /* Check for valid PDE */ @@ -812,7 +812,7 @@ MiBuildPfnDatabaseFromPages(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* Now get the PTE and scan the pages */ PointerPte = MiAddressToPte(BaseAddress); - for (j = 0; j < PTE_COUNT; j++) + for (j = 0; j < PTE_PER_PAGE; j++) { /* Check for a valid PTE */ if (PointerPte->u.Hard.Valid == 1) @@ -1439,7 +1439,7 @@ MiAddHalIoMappings(VOID) { /* Get the PTE for it and scan each page */ PointerPte = MiAddressToPte(BaseAddress); - for (j = 0 ; j < PTE_COUNT; j++) + for (j = 0; j < PTE_PER_PAGE; j++) { /* Does the HAL own this page? */ if (PointerPte->u.Hard.Valid == 1) @@ -1767,7 +1767,7 @@ MiBuildPagedPool(VOID) // Get the page frame number for the system page directory // PointerPte = MiAddressToPte(PDE_BASE); - ASSERT(PD_COUNT == 1); + ASSERT(PPE_PER_PAGE == 1); MmSystemPageDirectory[0] = PFN_FROM_PTE(PointerPte); // @@ -1785,7 +1785,7 @@ MiBuildPagedPool(VOID) // way). // TempPte = ValidKernelPte; - ASSERT(PD_COUNT == 1); + ASSERT(PPE_PER_PAGE == 1); TempPte.u.Hard.PageFrameNumber = MmSystemPageDirectory[0]; MI_WRITE_VALID_PTE(PointerPte, TempPte); #endif @@ -1894,12 +1894,12 @@ MiBuildPagedPool(VOID) PFN_FROM_PTE(MiAddressToPpe(MmPagedPoolStart))); #else /* Do it this way */ -// Bla = MmSystemPageDirectory[(PointerPde - (PMMPTE)PDE_BASE) / PDE_COUNT] +// Bla = MmSystemPageDirectory[(PointerPde - (PMMPTE)PDE_BASE) / PDE_PER_PAGE] /* Initialize the PFN entry for it */ MiInitializePfnForOtherProcess(PageFrameIndex, (PMMPTE)PointerPde, - MmSystemPageDirectory[(PointerPde - (PMMPDE)PDE_BASE) / PDE_COUNT]); + MmSystemPageDirectory[(PointerPde - (PMMPDE)PDE_BASE) / PDE_PER_PAGE]); #endif // diff --git a/ntoskrnl/mm/ARM3/pool.c b/ntoskrnl/mm/ARM3/pool.c index 5d6554bad75..347aa6ba967 100644 --- a/ntoskrnl/mm/ARM3/pool.c +++ b/ntoskrnl/mm/ARM3/pool.c @@ -480,7 +480,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // // Get the page bit count // - i = ((SizeInPages - 1) / PTE_COUNT) + 1; + i = ((SizeInPages - 1) / PTE_PER_PAGE) + 1; DPRINT("Paged pool expansion: %lu %x\n", i, SizeInPages); // @@ -566,7 +566,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, /* Initialize the PFN */ MiInitializePfnForOtherProcess(PageFrameNumber, (PMMPTE)PointerPde, - MmSystemPageDirectory[(PointerPde - MiAddressToPde(NULL)) / PDE_COUNT]); + MmSystemPageDirectory[(PointerPde - MiAddressToPde(NULL)) / PDE_PER_PAGE]); #endif // @@ -586,11 +586,11 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // These pages are now available, clear their availablity bits // EndAllocation = (ULONG)(MmPagedPoolInfo.NextPdeForPagedPoolExpansion - - (PMMPDE)MiAddressToPte(MmPagedPoolInfo.FirstPteForPagedPool)) * - PTE_COUNT; + (PMMPDE)MiAddressToPte(MmPagedPoolInfo.FirstPteForPagedPool)) * + PTE_PER_PAGE; RtlClearBits(MmPagedPoolInfo.PagedPoolAllocationMap, EndAllocation, - PageTableCount * PTE_COUNT); + PageTableCount * PTE_PER_PAGE); // // Update the next expansion location diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index 6bc1a6ef8db..abac73207cd 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -512,7 +512,7 @@ MiFillSystemPageDirectory(IN PVOID Base, TempPde.u.Hard.PageFrameNumber = PageFrameIndex; #if (_MI_PAGING_LEVELS == 2) - ParentPage = MmSystemPageDirectory[(PointerPde - MiAddressToPde(NULL)) / PDE_COUNT]; + ParentPage = MmSystemPageDirectory[(PointerPde - MiAddressToPde(NULL)) / PDE_PER_PAGE]; #else ParentPage = MiPdeToPpe(PointerPde)->u.Hard.PageFrameNumber; #endif diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index 324f3d84f7d..062432e3ecd 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -360,8 +360,8 @@ MiBalancerThread(PVOID Unused) KIRQL OldIrql = MiAcquirePfnLock(); PMMPDE pointerPde; for (Address = (ULONG_PTR)MI_LOWEST_VAD_ADDRESS; - Address < (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; - Address += (PAGE_SIZE * PTE_COUNT)) + Address < (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; + Address += PTE_PER_PAGE * PAGE_SIZE) { if (MiQueryPageTableReferences((PVOID)Address) == 0) { diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index e09f1212780..78e17b45659 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -12,6 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + #include <mm/ARM3/miarm.h> #if defined (ALLOC_PRAGMA) @@ -389,7 +390,7 @@ MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, { /* Remove PDE reference */ Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_PER_PAGE); } Pfn = PTE_TO_PFN(Pte); @@ -453,7 +454,7 @@ MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, { /* Remove PDE reference */ Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_PER_PAGE); } /* We don't need to flush here because page file entries @@ -638,7 +639,7 @@ MmCreatePageFileMapping(PEPROCESS Process, { /* Add PDE reference */ Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_PER_PAGE); } /* We don't need to flush the TLB here because it @@ -755,7 +756,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, { /* Add PDE reference */ Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Addr)]++; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Addr)] <= PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Addr)] <= PTE_PER_PAGE); } } diff --git a/ntoskrnl/mm/marea.c b/ntoskrnl/mm/marea.c index 537c17b0dda..37584477090 100644 --- a/ntoskrnl/mm/marea.c +++ b/ntoskrnl/mm/marea.c @@ -599,8 +599,8 @@ MmDeleteProcessAddressSpace(PEPROCESS Process) OldIrql = MiAcquirePfnLock(); for (Address = MI_LOWEST_VAD_ADDRESS; - Address < MM_HIGHEST_VAD_ADDRESS; - Address =(PVOID)((ULONG_PTR)Address + (PAGE_SIZE * PTE_COUNT))) + Address < MM_HIGHEST_VAD_ADDRESS; + Address = (PVOID)((ULONG_PTR)Address + (PTE_PER_PAGE * PAGE_SIZE))) { /* At this point all references should be dead */ if (MiQueryPageTableReferences(Address) != 0)

1 0

[reactos] 01/01: [TIMEDATE] Do not display a message box when NTP sync fails (#2305)
by Bișoc George 05 Feb '20

05 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37349d7a0f065d141d8e7… commit 37349d7a0f065d141d8e730535060e77b5f59561 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Feb 5 19:54:33 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 6 03:54:33 2020 +0900 [TIMEDATE] Do not display a message box when NTP sync fails (#2305) This PR merely checks if the string is empty and displaying (only) a debug information to the debugger, at disposal of displaying a message box. I might implement such dynamic resource string to the CPL later in a next PR. CORE-16654 --- base/services/w32time/w32time.c | 7 +++++++ dll/cpl/timedate/CMakeLists.txt | 2 +- dll/cpl/timedate/internettime.c | 2 +- dll/cpl/timedate/timedate.h | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/base/services/w32time/w32time.c b/base/services/w32time/w32time.c index abc58a5e151..c2b2bfeeeae 100644 --- a/base/services/w32time/w32time.c +++ b/base/services/w32time/w32time.c @@ -191,6 +191,13 @@ SetTime(VOID) DPRINT("Time Server is '%S'.\n", szData); + /* Is the given string empty? */ + if (cbName == 0 || szData[0] == '\0') + { + DPRINT("The time NTP server couldn't be found, the string is empty!\n"); + return ERROR_INVALID_DATA; + } + ulTime = GetServerTime(szData); if (ulTime != 0) diff --git a/dll/cpl/timedate/CMakeLists.txt b/dll/cpl/timedate/CMakeLists.txt index d1b5275dd07..20f0d62d59c 100644 --- a/dll/cpl/timedate/CMakeLists.txt +++ b/dll/cpl/timedate/CMakeLists.txt @@ -19,6 +19,6 @@ add_library(timedate MODULE ${CMAKE_CURRENT_BINARY_DIR}/timedate.def) set_module_type(timedate cpl UNICODE) -add_importlibs(timedate w32time advapi32 user32 gdi32 comctl32 ws2_32 iphlpapi msvcrt kernel32) +add_importlibs(timedate w32time advapi32 user32 gdi32 comctl32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(timedate timedate.h SOURCE) add_cd_file(TARGET timedate DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/timedate/internettime.c b/dll/cpl/timedate/internettime.c index 808930e083e..88e95ae0f6e 100644 --- a/dll/cpl/timedate/internettime.c +++ b/dll/cpl/timedate/internettime.c @@ -278,7 +278,7 @@ InetTimePageProc(HWND hwndDlg, dwError = W32TimeSyncNow(L"localhost", 0, 0); if (dwError != ERROR_SUCCESS) { - DisplayWin32Error(dwError); + DPRINT("Failed to synchronize the time! Invalid NTP server name has been caught or no server name could be found (Error: %lu).\n", dwError); } } break; diff --git a/dll/cpl/timedate/timedate.h b/dll/cpl/timedate/timedate.h index 8cf7dbb74bd..500421758b7 100644 --- a/dll/cpl/timedate/timedate.h +++ b/dll/cpl/timedate/timedate.h @@ -16,6 +16,7 @@ #include <wchar.h> #include <commctrl.h> #include <cpl.h> +#include <debug.h> #include "resource.h"

1 0

[reactos] 01/01: [FORMATING] Fix indentation of startmnucust
by Jose Carlos Jesus 05 Feb '20

05 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb30239129153a08ed71a… commit fb30239129153a08ed71ae97d0b6bd8bab1f0b99 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Fri Jan 31 11:09:00 2020 +0000 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Wed Feb 5 19:27:10 2020 +0100 [FORMATING] Fix indentation of startmnucust On branch CodeFormat Changes to be committed: modified: base/shell/explorer/startmnucust.cpp For a better visualization and understanding of the code --- base/shell/explorer/startmnucust.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/base/shell/explorer/startmnucust.cpp b/base/shell/explorer/startmnucust.cpp index 3c0334357fe..0aa436f20cf 100644 --- a/base/shell/explorer/startmnucust.cpp +++ b/base/shell/explorer/startmnucust.cpp @@ -72,34 +72,34 @@ VOID OnClearRecentItems() INT_PTR CALLBACK CustomizeClassicProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { - switch(Message) + switch (Message) { case WM_INITDIALOG: /* FIXME: Properly initialize the dialog (check whether 'clear' button must be disabled, for example) */ - return TRUE; + return TRUE; case WM_COMMAND: - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDC_CLASSICSTART_ADD: OnAddStartMenuItems(hwnd); - break; + break; case IDC_CLASSICSTART_REMOVE: OnRemoveStartmenuItems(hwnd); - break; + break; case IDC_CLASSICSTART_ADVANCED: OnAdvancedStartMenuItems(); - break; + break; case IDC_CLASSICSTART_CLEAR: OnClearRecentItems(); - break; + break; case IDOK: EndDialog(hwnd, IDOK); - break; + break; case IDCANCEL: EndDialog(hwnd, IDCANCEL); - break; + break; } - break; + break; default: return FALSE; }

1 0

[reactos] 01/01: [SHELL32] Display the ReactOS version to the About dialog programmatically (#2276)
by Bișoc George 01 Feb '20

01 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a57f7b50c01efadc50336… commit a57f7b50c01efadc50336b5b6664edbf645aff72 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sat Feb 1 22:47:32 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 1 22:47:32 2020 +0100 [SHELL32] Display the ReactOS version to the About dialog programmatically (#2276) The current control parameters don't fit well with the version string since ReactOS migrated from SVN to Git. However, modifying the resource parameters doesn't fix the problem as well because the string itself is dynamic (as it can change in words specially the build architecture if the version build is AMD64 or x86 for example). CORE-16571 --- dll/win32/shell32/lang/bg-BG.rc | 5 +---- dll/win32/shell32/lang/ca-ES.rc | 5 +---- dll/win32/shell32/lang/cs-CZ.rc | 5 +---- dll/win32/shell32/lang/da-DK.rc | 5 +---- dll/win32/shell32/lang/de-DE.rc | 5 +---- dll/win32/shell32/lang/el-GR.rc | 5 +---- dll/win32/shell32/lang/en-GB.rc | 5 +---- dll/win32/shell32/lang/en-US.rc | 5 +---- dll/win32/shell32/lang/es-ES.rc | 5 +---- dll/win32/shell32/lang/et-EE.rc | 5 +---- dll/win32/shell32/lang/fi-FI.rc | 5 +---- dll/win32/shell32/lang/fr-FR.rc | 5 +---- dll/win32/shell32/lang/he-IL.rc | 5 +---- dll/win32/shell32/lang/hi-IN.rc | 5 +---- dll/win32/shell32/lang/hu-HU.rc | 5 +---- dll/win32/shell32/lang/id-ID.rc | 5 +---- dll/win32/shell32/lang/it-IT.rc | 5 +---- dll/win32/shell32/lang/ja-JP.rc | 5 +---- dll/win32/shell32/lang/ko-KR.rc | 5 +---- dll/win32/shell32/lang/nl-NL.rc | 5 +---- dll/win32/shell32/lang/no-NO.rc | 5 +---- dll/win32/shell32/lang/pl-PL.rc | 5 +---- dll/win32/shell32/lang/pt-BR.rc | 5 +---- dll/win32/shell32/lang/pt-PT.rc | 5 +---- dll/win32/shell32/lang/ro-RO.rc | 5 +---- dll/win32/shell32/lang/ru-RU.rc | 5 +---- dll/win32/shell32/lang/sk-SK.rc | 5 +---- dll/win32/shell32/lang/sl-SI.rc | 5 +---- dll/win32/shell32/lang/sq-AL.rc | 5 +---- dll/win32/shell32/lang/sv-SE.rc | 5 +---- dll/win32/shell32/lang/tr-TR.rc | 5 +---- dll/win32/shell32/lang/uk-UA.rc | 5 +---- dll/win32/shell32/lang/zh-CN.rc | 5 +---- dll/win32/shell32/lang/zh-TW.rc | 5 +---- dll/win32/shell32/shresdef.h | 1 + dll/win32/shell32/wine/shell32_main.c | 20 ++++++++++++++++++++ 36 files changed, 55 insertions(+), 136 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 985f2a224c7..8e1f2e298c7 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -137,10 +137,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Версия ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 39362f0ac23..8d66a2a7ea8 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 23309ae0886..909bf5988d6 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -142,10 +142,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Verze ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index f8e4e2cad18..ef0465e09da 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -142,10 +142,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index b3cd79284bb..80217e1f372 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Das ReactOS Team\0", IDC_STATIC, 105, 75, 70, 10 diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 6d5b6723089..9aa9c0c00f4 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Έκδοση ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 51fca668df6..cc866d38999 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index ed98c1b7aa8..663b55a533b 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 93e91a4e768..dc495722c51 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -144,10 +144,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versión ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " El equipo de ReactOS\0", IDC_STATIC, 105, 75, 100, 10 diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index a99537ad508..8e853b4828e 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -143,10 +143,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versioon ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Autoriõigus 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index da4aedfef72..77d68c20ad7 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 5f461fe0515..5a4bd2b1420 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 51e0d2e522d..0bf6fab9d42 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -138,10 +138,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "גירסה ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "זכויות יוצרים 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " צוות ReactOS\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 1af9c794021..cc570f42b71 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "वर्ज़न ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "कॉपीराइट 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " रिऐक्ट ओएस टीम\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 118b7a7119c..f74d10075e0 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 4c02d4f7992..f15dac10660 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versi ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Tim ReactOS\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 8f8a5770b09..59fa5b4bc58 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versione ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index d7636305da7..abbb82c5eab 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "バージョン ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index fcd392bda63..38cd18e92da 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index b58dc6b6718..78130c243ce 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 095b0f511c8..40aa382549e 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versjon ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 8070daa7591..dd92f3e1f15 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -141,10 +141,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Wersja ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 8163b706296..e2c2c5fba59 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versão ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 7be75d988b6..72d31e6f952 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versão ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 68da676c032..dc3d97a2f03 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -138,10 +138,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versiune", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 68, 65, 27, 10 - LTEXT " (", IDC_STATIC, 95, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 100, 65, 58, 10 - LTEXT ")", IDC_STATIC, 158, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Drept de autor 1998-", IDC_STATIC, 35, 75, 68, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 103, 75, 17, 10 LTEXT " Echipa ReactOS\0", IDC_STATIC, 120, 75, 53, 10 diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index d62530482e4..674ce5fd4ce 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -143,10 +143,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Версия ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Команда ReactOS\0", IDC_STATIC, 105, 75, 65, 10 diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index ea65f70c084..6c70fa24e58 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Verzia ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index dcde0fe407e..a4b2ac0bb85 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 36c13146a68..824e812e1f4 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -140,10 +140,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versioni ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Ekipi ReactOS\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 9cf56008ec0..51b330036ff 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS-gruppen\0", IDC_STATIC, 105, 75, 60, 10 diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 63d1e9b53a7..51820e05724 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -138,10 +138,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Sürüm ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Telif Hakkı 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Takımı\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index b4570c32c1e..c2eb5864333 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Версія ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index f70a424ed77..3630ec665fd 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -146,10 +146,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "版本 ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "版权所有 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 6cd59a7841d..020fc6ce8b4 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -145,10 +145,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "版本 ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 166068a756c..3984486ec60 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -312,6 +312,7 @@ #define IDD_ABOUT 2 #define IDC_ABOUT_ICON 0x3009 #define IDC_ABOUT_APPNAME 0x3500 +#define IDC_ABOUT_VERSION 0x3501 #define IDC_ABOUT_OTHERSTUFF 0x350D #define IDC_ABOUT_REG_USERNAME 0x3507 #define IDC_ABOUT_REG_ORGNAME 0x3508 diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c index 4ae3ea0d50b..e37d8a7e68f 100644 --- a/dll/win32/shell32/wine/shell32_main.c +++ b/dll/win32/shell32/wine/shell32_main.c @@ -31,6 +31,8 @@ #include <shellapi.h> #include <shlobj.h> #include <shlwapi.h> +#include <strsafe.h> +#include <winnls.h> #include "undocshell.h" #include "pidl.h" @@ -41,6 +43,7 @@ #include <wine/unicode.h> #include <reactos/version.h> +#include <reactos/buildno.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -961,6 +964,9 @@ VOID WINAPI Printers_UnregisterWindow(HANDLE hClassPidl, HWND hwnd) typedef struct { LPCWSTR szApp; +#ifdef __REACTOS__ + LPCWSTR szOSVersion; +#endif LPCWSTR szOtherStuff; HICON hIcon; } ABOUT_INFO; @@ -1176,6 +1182,9 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM SetWindowTextW( hWnd, szAppTitle ); SetDlgItemTextW( hWnd, IDC_ABOUT_APPNAME, info->szApp ); +#ifdef __REACTOS__ + SetDlgItemTextW( hWnd, IDC_ABOUT_VERSION, info->szOSVersion ); +#endif SetDlgItemTextW( hWnd, IDC_ABOUT_OTHERSTUFF, info->szOtherStuff ); // Set the registered user and organization name @@ -1369,6 +1378,9 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, HRSRC hRes; DLGTEMPLATE *DlgTemplate; BOOL bRet; +#ifdef __REACTOS__ + WCHAR szVersionString[256]; +#endif TRACE("\n"); @@ -1381,7 +1393,15 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, if(!DlgTemplate) return FALSE; +#ifdef __REACTOS__ + /* Output the version OS kernel strings */ + StringCchPrintfW(szVersionString, _countof(szVersionString), L"%S (%S)", KERNEL_VERSION_STR, KERNEL_VERSION_BUILD_STR); +#endif + info.szApp = szApp; +#ifdef __REACTOS__ + info.szOSVersion = szVersionString; +#endif info.szOtherStuff = szOtherStuff; info.hIcon = hIcon ? hIcon : LoadIconW( 0, (LPWSTR)IDI_WINLOGO );

1 0

[reactos] 01/01: [INCLUDE:HOST] Revert a bug that has been sneaked in by Arch Blackmann in 9e9ba41f (r36910) :P
by Hermès Bélusca-Maïto 01 Feb '20

01 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=18fe055275b903cff6ba2… commit 18fe055275b903cff6ba2bc9809d2aa213aac581 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Sep 23 01:53:25 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 1 18:35:40 2020 +0100 [INCLUDE:HOST] Revert a bug that has been sneaked in by Arch Blackmann in 9e9ba41f (r36910) :P The "TypeOffset" thing was just an informative comment to tell that the data that follows after the IMAGE_BASE_RELOCATION header is an arbitrary array of WORDs describing packed (Type + Offset)s. Having the header structure containing that spurious "TypeOffset" was breaking all the code that was basing on expected size of the IMAGE_BASE_RELOCATION structure in order to apply relocations (typically this would mean that the first 2 relocations described by it would not be applied). Hopefully this bug only hit the host-tools, and not the OS itself :) --- sdk/include/host/pecoff.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/host/pecoff.h b/sdk/include/host/pecoff.h index 42bc0bf4cfe..14e267c9662 100644 --- a/sdk/include/host/pecoff.h +++ b/sdk/include/host/pecoff.h @@ -202,7 +202,7 @@ typedef struct _IMAGE_SECTION_HEADER { typedef struct _IMAGE_BASE_RELOCATION { DWORD VirtualAddress; DWORD SizeOfBlock; - WORD TypeOffset[1]; + // Followed by: WORD TypeOffset[ANYSIZE_ARRAY]; } IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; #pragma pack(pop)

1 0

[reactos] 01/01: [CODEOWNERS] Add 'Printing' entry
by Serge Gautherie 01 Feb '20

01 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f4f29d2ca9cc24af7d75… commit 0f4f29d2ca9cc24af7d7520b41cb673f8f953f71 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Feb 1 02:47:18 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Feb 1 18:04:25 2020 +0100 [CODEOWNERS] Add 'Printing' entry --- CODEOWNERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CODEOWNERS b/CODEOWNERS index 04a24a76bc2..a5f59ca0b2c 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -215,6 +215,11 @@ # S: Maintained /dll/ntdll/ @HeisSpiter @learn-more @ThFabba @tkreuzer +# Printing +# M: ColinFinck, Colin Finck +# S: Maintained +/win32ss/printing/ @ColinFinck + # ReactOS API Tests # M: # R: learn-more, learn_more, Mark Jansen

1 0

[reactos] 01/01: [USBHUB] Only break into the debugger in the case that is actually unimplemented. CORE-16394
by Thomas Faber 01 Feb '20

01 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f32e1acd3c8b7130f2420… commit f32e1acd3c8b7130f242061162def37538b3d3fe Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Jan 31 00:25:53 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 1 13:17:30 2020 +0100 [USBHUB] Only break into the debugger in the case that is actually unimplemented. CORE-16394 --- drivers/usb/usbhub/ioctl.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/usb/usbhub/ioctl.c b/drivers/usb/usbhub/ioctl.c index 4f48c98e7d4..8cc42a88d67 100644 --- a/drivers/usb/usbhub/ioctl.c +++ b/drivers/usb/usbhub/ioctl.c @@ -25,6 +25,7 @@ USBH_SelectConfigOrInterfaceComplete(IN PDEVICE_OBJECT DeviceObject, PUSBHUB_PORT_DATA PortData = NULL; NTSTATUS Status; KIRQL OldIrql; + PURB Urb; DPRINT("USBH_SelectConfigOrInterfaceComplete ... \n"); @@ -69,8 +70,13 @@ USBH_SelectConfigOrInterfaceComplete(IN PDEVICE_OBJECT DeviceObject, } else { - DPRINT1("USBH_SelectConfigOrInterfaceComplete: Status != STATUS_SUCCESS. FIXME\n"); - DbgBreakPoint(); + Urb = URB_FROM_IRP(Irp); + DPRINT1("USBH_SelectConfigOrInterfaceComplete: Status = 0x%lx, UsbdStatus = 0x%lx\n", Status, Urb->UrbHeader.Status); + if (Urb->UrbHeader.Status == USBD_STATUS_NO_BANDWIDTH) + { + DPRINT1("USBH_SelectConfigOrInterfaceComplete: USBD_STATUS_NO_BANDWIDTH. FIXME\n"); + DbgBreakPoint(); + } } return Status;

1 0

[reactos] 01/01: [Printing] Part of GDI Support
by James Tabor 31 Jan '20

31 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=adffa8ea7591f4d2d6530… commit adffa8ea7591f4d2d6530a82361d419a9ffc8ad7 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Fri Jan 31 17:38:47 2020 -0600 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Fri Jan 31 17:38:47 2020 -0600 [Printing] Part of GDI Support Fix ups and added support to prevent GDI from crashing. These functions will be required for GDI. Part 1 of print support. --- win32ss/printing/base/spoolsv/printerdrivers.c | 4 +- win32ss/printing/base/winspool/precomp.h | 1 + win32ss/printing/base/winspool/printers.c | 20 +++- win32ss/printing/base/winspool/winspool.spec | 4 +- .../printing/include/marshalling/printerdrivers.h | 30 ++++++ .../printing/providers/localspl/printerdrivers.c | 119 ++++++++++++++++++++- 6 files changed, 169 insertions(+), 9 deletions(-) diff --git a/win32ss/printing/base/spoolsv/printerdrivers.c b/win32ss/printing/base/spoolsv/printerdrivers.c index a1f45865c15..ae85f84434d 100644 --- a/win32ss/printing/base/spoolsv/printerdrivers.c +++ b/win32ss/printing/base/spoolsv/printerdrivers.c @@ -49,6 +49,8 @@ _RpcGetPrinterDriver(WINSPOOL_PRINTER_HANDLE hPrinter, WCHAR* pEnvironment, DWOR DWORD dwErrorCode; PBYTE pDriverAligned; + ERR("_RpcGetPrinterDriver(%p, %lu, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriver, cbBuf, pcbNeeded); + dwErrorCode = RpcImpersonateClient(NULL); if (dwErrorCode != ERROR_SUCCESS) { @@ -61,7 +63,7 @@ _RpcGetPrinterDriver(WINSPOOL_PRINTER_HANDLE hPrinter, WCHAR* pEnvironment, DWOR if (GetPrinterDriverW(hPrinter, pEnvironment, Level, pDriverAligned, cbBuf, pcbNeeded)) { // Replace relative offset addresses in the output by absolute pointers. - ASSERT(Level >= 1 && Level <= 3); + ASSERT(Level >= 1 && Level <= 5); MarshallDownStructure(pDriverAligned, pPrinterDriverMarshalling[Level]->pInfo, pPrinterDriverMarshalling[Level]->cbStructureSize, TRUE); } else diff --git a/win32ss/printing/base/winspool/precomp.h b/win32ss/printing/base/winspool/precomp.h index cbfaac933ca..033b38d1b4c 100644 --- a/win32ss/printing/base/winspool/precomp.h +++ b/win32ss/printing/base/winspool/precomp.h @@ -15,6 +15,7 @@ #include <winreg.h> #include <winspool.h> #include <winspool_c.h> +#include <winddiui.h> #include <ndk/rtlfuncs.h> #include <spoolss.h> diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 7fd34a40866..0e7729408b6 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -194,6 +194,14 @@ DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, WORD fwCapability, LPWSTR pO return 0; } +INT WINAPI +DocumentEvent( HANDLE hPrinter, HDC hdc, int iEsc, ULONG cbIn, PVOID pvIn, ULONG cbOut, PVOID pvOut) +{ + ERR("DocumentEvent(%p, %p, %lu, %lu, %p, %lu, %p)\n", hPrinter, hdc, iEsc, cbIn, pvIn, cbOut, pvOut); + UNIMPLEMENTED; + return DOCUMENTEVENT_UNSUPPORTED; +} + LONG WINAPI DocumentPropertiesA(HWND hWnd, HANDLE hPrinter, LPSTR pDeviceName, PDEVMODEA pDevModeOutput, PDEVMODEA pDevModeInput, DWORD fMode) { @@ -1042,7 +1050,7 @@ GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Level, LPBYTE pDri DWORD dwErrorCode; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; - TRACE("GetPrinterDriverW(%p, %S, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); + ERR("GetPrinterDriverW(%p, %S, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); // Sanity checks. if (!pHandle) @@ -1076,7 +1084,7 @@ GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Level, LPBYTE pDri if (dwErrorCode == ERROR_SUCCESS) { // Replace relative offset addresses in the output by absolute pointers. - ASSERT(Level <= 3); + ASSERT(Level <= 5); MarshallUpStructure(cbBuf, pDriverInfo, pPrinterDriverMarshalling[Level]->pInfo, pPrinterDriverMarshalling[Level]->cbStructureSize, TRUE); } @@ -1472,6 +1480,14 @@ SetPrinterW(HANDLE hPrinter, DWORD Level, PBYTE pPrinter, DWORD Command) return FALSE; } +BOOL WINAPI +SplDriverUnloadComplete(LPWSTR pDriverFile) +{ + ERR("DriverUnloadComplete(%S)\n", pDriverFile); + UNIMPLEMENTED; + return TRUE; // return true for now. +} + DWORD WINAPI StartDocPrinterA(HANDLE hPrinter, DWORD Level, PBYTE pDocInfo) { diff --git a/win32ss/printing/base/winspool/winspool.spec b/win32ss/printing/base/winspool/winspool.spec index 7c2888b236b..318a2df8ca9 100644 --- a/win32ss/printing/base/winspool/winspool.spec +++ b/win32ss/printing/base/winspool/winspool.spec @@ -74,7 +74,7 @@ 173 stdcall DeviceCapabilitiesW(wstr wstr long ptr ptr) 174 stub DeviceMode 175 stub DevicePropertySheets -176 stub DocumentEvent +176 stdcall DocumentEvent(ptr ptr long long ptr long ptr) 177 stdcall DocumentPropertiesA(ptr ptr ptr ptr ptr long) 178 stdcall DocumentPropertiesW(ptr ptr ptr ptr ptr long) 179 stub DocumentPropertySheets @@ -186,7 +186,7 @@ 285 stdcall SetPrinterDataExW(ptr wstr wstr long ptr long) 286 stdcall SetPrinterDataW(ptr wstr long ptr long) 287 stdcall SetPrinterW(ptr long ptr long) -288 stub SplDriverUnloadComplete +288 stdcall SplDriverUnloadComplete(ptr) 289 stub SpoolerDevQueryPrintW 290 stdcall SpoolerInit() 291 stub SpoolerPrinterEvent diff --git a/win32ss/printing/include/marshalling/printerdrivers.h b/win32ss/printing/include/marshalling/printerdrivers.h index 49951bdca27..ffaf50fa21c 100644 --- a/win32ss/printing/include/marshalling/printerdrivers.h +++ b/win32ss/printing/include/marshalling/printerdrivers.h @@ -41,6 +41,34 @@ static const MARSHALLING PrinterDriver3Marshalling = { } }; +static const MARSHALLING PrinterDriver4Marshalling = { + sizeof(DRIVER_INFO_4W), + { + { FIELD_OFFSET(DRIVER_INFO_4W, pName), RTL_FIELD_SIZE(DRIVER_INFO_4W, pName), RTL_FIELD_SIZE(DRIVER_INFO_4W, pName), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_4W, pEnvironment), RTL_FIELD_SIZE(DRIVER_INFO_4W, pEnvironment), RTL_FIELD_SIZE(DRIVER_INFO_4W, pEnvironment), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_4W, pDriverPath), RTL_FIELD_SIZE(DRIVER_INFO_4W, pDriverPath), RTL_FIELD_SIZE(DRIVER_INFO_4W, pDriverPath), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_4W, pDataFile), RTL_FIELD_SIZE(DRIVER_INFO_4W, pDataFile), RTL_FIELD_SIZE(DRIVER_INFO_4W, pDataFile), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_4W, pConfigFile), RTL_FIELD_SIZE(DRIVER_INFO_4W, pConfigFile), RTL_FIELD_SIZE(DRIVER_INFO_4W, pConfigFile), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_4W, pHelpFile), RTL_FIELD_SIZE(DRIVER_INFO_4W, pHelpFile), RTL_FIELD_SIZE(DRIVER_INFO_4W, pHelpFile), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_4W, pDependentFiles), RTL_FIELD_SIZE(DRIVER_INFO_4W, pDependentFiles), RTL_FIELD_SIZE(DRIVER_INFO_4W, pDependentFiles), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_4W, pMonitorName), RTL_FIELD_SIZE(DRIVER_INFO_4W, pMonitorName), RTL_FIELD_SIZE(DRIVER_INFO_4W, pMonitorName), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_4W, pDefaultDataType), RTL_FIELD_SIZE(DRIVER_INFO_4W, pDefaultDataType), RTL_FIELD_SIZE(DRIVER_INFO_4W, pDefaultDataType), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_4W, pszzPreviousNames), RTL_FIELD_SIZE(DRIVER_INFO_4W, pszzPreviousNames), RTL_FIELD_SIZE(DRIVER_INFO_4W, pDefaultDataType), TRUE }, + { MAXDWORD, 0, 0, FALSE } + } +}; + +static const MARSHALLING PrinterDriver5Marshalling = { + sizeof(DRIVER_INFO_5W), + { + { FIELD_OFFSET(DRIVER_INFO_5W, pName), RTL_FIELD_SIZE(DRIVER_INFO_5W, pName), RTL_FIELD_SIZE(DRIVER_INFO_5W, pName), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_5W, pEnvironment), RTL_FIELD_SIZE(DRIVER_INFO_5W, pEnvironment), RTL_FIELD_SIZE(DRIVER_INFO_5W, pEnvironment), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_5W, pDriverPath), RTL_FIELD_SIZE(DRIVER_INFO_5W, pDriverPath), RTL_FIELD_SIZE(DRIVER_INFO_5W, pDriverPath), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_5W, pDataFile), RTL_FIELD_SIZE(DRIVER_INFO_5W, pDataFile), RTL_FIELD_SIZE(DRIVER_INFO_5W, pDataFile), TRUE }, + { FIELD_OFFSET(DRIVER_INFO_5W, pConfigFile), RTL_FIELD_SIZE(DRIVER_INFO_5W, pConfigFile), RTL_FIELD_SIZE(DRIVER_INFO_5W, pConfigFile), TRUE }, + { MAXDWORD, 0, 0, FALSE } + } +}; static const MARSHALLING* pPrinterDriverMarshalling[] = { @@ -48,4 +76,6 @@ static const MARSHALLING* pPrinterDriverMarshalling[] = { &PrinterDriver1Marshalling, &PrinterDriver2Marshalling, &PrinterDriver3Marshalling, + &PrinterDriver4Marshalling, + &PrinterDriver5Marshalling, }; diff --git a/win32ss/printing/providers/localspl/printerdrivers.c b/win32ss/printing/providers/localspl/printerdrivers.c index 5bb5b3db73a..351667cecc8 100644 --- a/win32ss/printing/providers/localspl/printerdrivers.c +++ b/win32ss/printing/providers/localspl/printerdrivers.c @@ -7,7 +7,6 @@ #include "precomp.h" - // Local Constants static DWORD dwDriverInfo1Offsets[] = { FIELD_OFFSET(DRIVER_INFO_1W, pName), @@ -36,6 +35,29 @@ static DWORD dwDriverInfo3Offsets[] = { MAXDWORD }; +static DWORD dwDriverInfo4Offsets[] = { + FIELD_OFFSET(DRIVER_INFO_4W, pName), + FIELD_OFFSET(DRIVER_INFO_4W, pEnvironment), + FIELD_OFFSET(DRIVER_INFO_4W, pDriverPath), + FIELD_OFFSET(DRIVER_INFO_4W, pDataFile), + FIELD_OFFSET(DRIVER_INFO_4W, pConfigFile), + FIELD_OFFSET(DRIVER_INFO_4W, pHelpFile), + FIELD_OFFSET(DRIVER_INFO_4W, pDependentFiles), + FIELD_OFFSET(DRIVER_INFO_4W, pMonitorName), + FIELD_OFFSET(DRIVER_INFO_4W, pDefaultDataType), + FIELD_OFFSET(DRIVER_INFO_4W, pszzPreviousNames), + MAXDWORD +}; + +static DWORD dwDriverInfo5Offsets[] = { + FIELD_OFFSET(DRIVER_INFO_5W, pName), + FIELD_OFFSET(DRIVER_INFO_5W, pEnvironment), + FIELD_OFFSET(DRIVER_INFO_5W, pDriverPath), + FIELD_OFFSET(DRIVER_INFO_5W, pDataFile), + FIELD_OFFSET(DRIVER_INFO_5W, pConfigFile), + MAXDWORD +}; + static void ToMultiSz(LPWSTR pString) { @@ -118,7 +140,7 @@ _LocalGetPrinterDriverLevel3(PLOCAL_PRINTER_HANDLE pHandle, PDRIVER_INFO_3W* ppD 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[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 @@ -148,6 +170,87 @@ _LocalGetPrinterDriverLevel3(PLOCAL_PRINTER_HANDLE pHandle, PDRIVER_INFO_3W* ppD (*ppDriverInfo)++; } +static void +_LocalGetPrinterDriverLevel4(PLOCAL_PRINTER_HANDLE pHandle, PDRIVER_INFO_4W* ppDriverInfo, PBYTE* ppDriverInfoEnd, PDWORD pcbNeeded) +{ + DWORD n; + PCWSTR pwszStrings[10]; + + /* 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 + pwszStrings[9] = NULL; // pszzPreviousNames + + // 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_4W); + return; + } + + (*ppDriverInfo)->cVersion = 3; + + // Finally copy the structure and advance to the next one in the output buffer. + *ppDriverInfoEnd = PackStrings(pwszStrings, (PBYTE)(*ppDriverInfo), dwDriverInfo4Offsets, *ppDriverInfoEnd); + ToMultiSz((*ppDriverInfo)->pDependentFiles); + (*ppDriverInfo)++; +} + +static void +_LocalGetPrinterDriverLevel5(PLOCAL_PRINTER_HANDLE pHandle, PDRIVER_INFO_5W* 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 UniDrv.dll + pwszStrings[3] = L"c:\\reactos\\system32\\localspl.dll"; // pDataFile.ppd + pwszStrings[4] = L"c:\\reactos\\system32\\printui.dll"; // pConfigFile UniDrvUI.dll + + // 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_5W); + return; + } + + (*ppDriverInfo)->cVersion = 3; + // Driver attributes, like UMPD/KMPD. + (*ppDriverInfo)->dwDriverAttributes = 0; // UMPD/KMPD, So where are they? + // Number of times the configuration file for this driver has been upgraded or downgraded since the last spooler restart. + (*ppDriverInfo)->dwConfigVersion = 1; + // Number of times the driver file for this driver has been upgraded or downgraded since the last spooler restart. + (*ppDriverInfo)->dwDriverVersion = 1; + + // Finally copy the structure and advance to the next one in the output buffer. + *ppDriverInfoEnd = PackStrings(pwszStrings, (PBYTE)(*ppDriverInfo), dwDriverInfo5Offsets, *ppDriverInfoEnd); + (*ppDriverInfo)++; +} BOOL WINAPI LocalGetPrinterDriver(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) { @@ -168,8 +271,8 @@ BOOL WINAPI LocalGetPrinterDriver(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Le pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->pSpecificHandle; - // Only support 3 levels for now - if (Level > 3) + // Only support 5 levels for now + if (Level > 5) { // The caller supplied an invalid level. dwErrorCode = ERROR_INVALID_LEVEL; @@ -185,6 +288,10 @@ BOOL WINAPI LocalGetPrinterDriver(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Le _LocalGetPrinterDriverLevel2(pPrinterHandle, NULL, NULL, pcbNeeded); else if (Level == 3) _LocalGetPrinterDriverLevel3(pPrinterHandle, NULL, NULL, pcbNeeded); + else if (Level == 4) + _LocalGetPrinterDriverLevel4(pPrinterHandle, NULL, NULL, pcbNeeded); + else if (Level == 5) + _LocalGetPrinterDriverLevel5(pPrinterHandle, NULL, NULL, pcbNeeded); // Check if the supplied buffer is large enough. if (cbBuf < *pcbNeeded) @@ -202,6 +309,10 @@ BOOL WINAPI LocalGetPrinterDriver(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Le _LocalGetPrinterDriverLevel2(pPrinterHandle, (PDRIVER_INFO_2W*)&pDriverInfo, &pEnd, NULL); else if (Level == 3) _LocalGetPrinterDriverLevel3(pPrinterHandle, (PDRIVER_INFO_3W*)&pDriverInfo, &pEnd, NULL); + else if (Level == 4) + _LocalGetPrinterDriverLevel4(pPrinterHandle, (PDRIVER_INFO_4W*)&pDriverInfo, &pEnd, NULL); + else if (Level == 5) + _LocalGetPrinterDriverLevel5(pPrinterHandle, (PDRIVER_INFO_5W*)&pDriverInfo, &pEnd, NULL); dwErrorCode = ERROR_SUCCESS;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs