Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [FORMATTING] Fix indentation of winspool/printers.c
by Colin Finck 31 Jan '20

31 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45f39ffc253012b2399dc… commit 45f39ffc253012b2399dc1105bcb797caec6ae36 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Fri Jan 31 18:47:53 2020 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Fri Jan 31 18:47:53 2020 +0100 [FORMATTING] Fix indentation of winspool/printers.c No code changes --- 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 a3ee6e69673..7fd34a40866 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -476,7 +476,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB { SetLastError(ERROR_NOT_ENOUGH_MEMORY); ERR("HeapAlloc failed!\n"); - goto Cleanup; + goto Cleanup; } WideCharToMultiByte(CP_ACP, 0, ppi1w[i].pDescription, -1, pszDescription, cch + 1, NULL, NULL); @@ -538,7 +538,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB { SetLastError(ERROR_NOT_ENOUGH_MEMORY); ERR("HeapAlloc failed!\n"); - goto Cleanup; + goto Cleanup; } WideCharToMultiByte(CP_ACP, 0, ppi2w[i].pServerName, -1, pszServerName, cch + 1, NULL, NULL); @@ -754,7 +754,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB { SetLastError(ERROR_NOT_ENOUGH_MEMORY); ERR("HeapAlloc failed!\n"); - goto Cleanup; + goto Cleanup; } WideCharToMultiByte(CP_ACP, 0, ppi4w[i].pPrinterName, -1, pszPrinterName, cch + 1, NULL, NULL);

1 0

[reactos] 01/01: [WINSPOOL] Add Implementation of EnumPrintersA (#2273)
by Doug Lyons 31 Jan '20

31 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8b177825b0f447842860… commit e8b177825b0f44784286032d6ec64606c7b0a718 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Fri Jan 31 11:42:55 2020 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 31 18:42:55 2020 +0100 [WINSPOOL] Add Implementation of EnumPrintersA (#2273) --- win32ss/printing/base/winspool/printers.c | 446 +++++++++++++++++++++++++++++- 1 file changed, 445 insertions(+), 1 deletion(-) diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 3d029144d51..a3ee6e69673 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -8,6 +8,7 @@ #include "precomp.h" #include <marshalling/printers.h> #include <marshalling/printerdrivers.h> +#include <strsafe.h> // Local Constants @@ -386,8 +387,451 @@ Cleanup: BOOL WINAPI EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { + BOOL bReturnValue = FALSE; + DWORD cch; + PWSTR pwszName = NULL; + PSTR pszPrinterName = NULL; + PSTR pszServerName = NULL; + PSTR pszDescription = NULL; + PSTR pszName = NULL; + PSTR pszComment = NULL; + PSTR pszShareName = NULL; + PSTR pszPortName = NULL; + PSTR pszDriverName = NULL; + PSTR pszLocation = NULL; + PSTR pszSepFile = NULL; + PSTR pszPrintProcessor = NULL; + PSTR pszDatatype = NULL; + PSTR pszParameters = NULL; + DWORD i; + PPRINTER_INFO_1W ppi1w = NULL; + PPRINTER_INFO_1A ppi1a = NULL; + PPRINTER_INFO_2W ppi2w = NULL; + PPRINTER_INFO_2A ppi2a = NULL; + PPRINTER_INFO_4W ppi4w = NULL; + PPRINTER_INFO_4A ppi4a = NULL; + PPRINTER_INFO_5W ppi5w = NULL; + PPRINTER_INFO_5A ppi5a = NULL; + TRACE("EnumPrintersA(%lu, %s, %lu, %p, %lu, %p, %p)\n", Flags, Name, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); - return FALSE; + + // Check for invalid levels here for early error return. MSDN says that only 1, 2, 4, and 5 are allowable. + if (Level != 1 && Level != 2 && Level != 4 && Level != 5) + { + SetLastError(ERROR_INVALID_LEVEL); + ERR("Invalid Level!\n"); + goto Cleanup; + } + + if (Name) + { + // Convert pName to a Unicode string pwszName. + cch = strlen(Name); + + pwszName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(WCHAR)); + if (!pwszName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Cleanup; + } + + MultiByteToWideChar(CP_ACP, 0, Name, -1, pwszName, cch + 1); + } + + /* Ref: https://stackoverflow.com/questions/41147180/why-enumprintersa-and-enumprin… */ + bReturnValue = EnumPrintersW(Flags, pwszName, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + HeapFree(hProcessHeap, 0, pwszName); + + TRACE("*pcReturned is '%d' and bReturnValue is '%d' and GetLastError is '%ld'.\n", *pcReturned, bReturnValue, GetLastError()); + + /* We are mapping multiple different pointers to the same pPrinterEnum pointer here so that */ + /* we can do in-place conversion. We read the Unicode response from the EnumPrintersW and */ + /* then we write back the ANSI conversion into the same buffer for our EnumPrintersA output */ + + /* mapping to pPrinterEnum for Unicode (w) characters for Levels 1, 2, 4, and 5 */ + ppi1w = (PPRINTER_INFO_1W)pPrinterEnum; + ppi2w = (PPRINTER_INFO_2W)pPrinterEnum; + ppi4w = (PPRINTER_INFO_4W)pPrinterEnum; + ppi5w = (PPRINTER_INFO_5W)pPrinterEnum; + /* mapping to pPrinterEnum for ANSI (a) characters for Levels 1, 2, 4, and 5 */ + ppi1a = (PPRINTER_INFO_1A)pPrinterEnum; + ppi2a = (PPRINTER_INFO_2A)pPrinterEnum; + ppi4a = (PPRINTER_INFO_4A)pPrinterEnum; + ppi5a = (PPRINTER_INFO_5A)pPrinterEnum; + + for (i = 0; i < *pcReturned; i++) + { + switch (Level) + { + case 1: + { + if (ppi1w[i].pDescription) + { + // Convert Unicode pDescription to a ANSI string pszDescription. + cch = wcslen(ppi1w[i].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[i].pDescription, -1, pszDescription, cch + 1, NULL, NULL); + StringCchCopyA(ppi1a[i].pDescription, cch + 1, pszDescription); + + HeapFree(hProcessHeap, 0, pszDescription); + } + + if (ppi1w[i].pName) + { + // Convert Unicode pName to a ANSI string pszName. + cch = wcslen(ppi1w[i].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[i].pName, -1, pszName, cch + 1, NULL, NULL); + StringCchCopyA(ppi1a[i].pName, cch + 1, pszName); + + HeapFree(hProcessHeap, 0, pszName); + } + + if (ppi1w[i].pComment) + { + // Convert Unicode pComment to a ANSI string pszComment. + cch = wcslen(ppi1w[i].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[i].pComment, -1, pszComment, cch + 1, NULL, NULL); + StringCchCopyA(ppi1a[i].pComment, cch + 1, pszComment); + + HeapFree(hProcessHeap, 0, pszComment); + } + break; + } + + + case 2: + { + if (ppi2w[i].pServerName) + { + // Convert Unicode pServerName to a ANSI string pszServerName. + cch = wcslen(ppi2w[i].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[i].pServerName, -1, pszServerName, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a[i].pServerName, cch + 1, pszServerName); + + HeapFree(hProcessHeap, 0, pszServerName); + } + + if (ppi2w[i].pPrinterName) + { + // Convert Unicode pPrinterName to a ANSI string pszPrinterName. + cch = wcslen(ppi2w[i].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[i].pPrinterName, -1, pszPrinterName, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a[i].pPrinterName, cch + 1, pszPrinterName); + + HeapFree(hProcessHeap, 0, pszPrinterName); + } + + if (ppi2w[i].pShareName) + { + // Convert Unicode pShareName to a ANSI string pszShareName. + cch = wcslen(ppi2w[i].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[i].pShareName, -1, pszShareName, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a[i].pShareName, cch + 1, pszShareName); + + HeapFree(hProcessHeap, 0, pszShareName); + } + + if (ppi2w[i].pPortName) + { + // Convert Unicode pPortName to a ANSI string pszPortName. + cch = wcslen(ppi2w[i].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[i].pPortName, -1, pszPortName, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a[i].pPortName, cch + 1, pszPortName); + + HeapFree(hProcessHeap, 0, pszPortName); + } + + if (ppi2w[i].pDriverName) + { + // Convert Unicode pDriverName to a ANSI string pszDriverName. + cch = wcslen(ppi2w[i].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[i].pDriverName, -1, pszDriverName, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a[i].pDriverName, cch + 1, pszDriverName); + + HeapFree(hProcessHeap, 0, pszDriverName); + } + + if (ppi2w[i].pComment) + { + // Convert Unicode pComment to a ANSI string pszComment. + cch = wcslen(ppi2w[i].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[i].pComment, -1, pszComment, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a[i].pComment, cch + 1, pszComment); + + HeapFree(hProcessHeap, 0, pszComment); + } + + if (ppi2w[i].pLocation) + { + // Convert Unicode pLocation to a ANSI string pszLocation. + cch = wcslen(ppi2w[i].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[i].pLocation, -1, pszLocation, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a[i].pLocation, cch + 1, pszLocation); + + HeapFree(hProcessHeap, 0, pszLocation); + } + + + if (ppi2w[i].pSepFile) + { + // Convert Unicode pSepFile to a ANSI string pszSepFile. + cch = wcslen(ppi2w[i].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[i].pSepFile, -1, pszSepFile, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a[i].pSepFile, cch + 1, pszSepFile); + + HeapFree(hProcessHeap, 0, pszSepFile); + } + + if (ppi2w[i].pPrintProcessor) + { + // Convert Unicode pPrintProcessor to a ANSI string pszPrintProcessor. + cch = wcslen(ppi2w[i].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[i].pPrintProcessor, -1, pszPrintProcessor, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a[i].pPrintProcessor, cch + 1, pszPrintProcessor); + + HeapFree(hProcessHeap, 0, pszPrintProcessor); + } + + + if (ppi2w[i].pDatatype) + { + // Convert Unicode pDatatype to a ANSI string pszDatatype. + cch = wcslen(ppi2w[i].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[i].pDatatype, -1, pszDatatype, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a[i].pDatatype, cch + 1, pszDatatype); + + HeapFree(hProcessHeap, 0, pszDatatype); + } + + if (ppi2w[i].pParameters) + { + // Convert Unicode pParameters to a ANSI string pszParameters. + cch = wcslen(ppi2w[i].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[i].pParameters, -1, pszParameters, cch + 1, NULL, NULL); + StringCchCopyA(ppi2a[i].pParameters, cch + 1, pszParameters); + + HeapFree(hProcessHeap, 0, pszParameters); + } + break; + + } + + case 4: + { + if (ppi4w[i].pPrinterName) + { + // Convert Unicode pPrinterName to a ANSI string pszPrinterName. + cch = wcslen(ppi4w[i].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[i].pPrinterName, -1, pszPrinterName, cch + 1, NULL, NULL); + StringCchCopyA(ppi4a[i].pPrinterName, cch + 1, pszPrinterName); + + HeapFree(hProcessHeap, 0, pszPrinterName); + } + + if (ppi4w[i].pServerName) + { + // Convert Unicode pServerName to a ANSI string pszServerName. + cch = wcslen(ppi4w[i].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[i].pServerName, -1, pszServerName, cch + 1, NULL, NULL); + StringCchCopyA(ppi4a[i].pServerName, cch + 1, pszServerName); + + HeapFree(hProcessHeap, 0, pszServerName); + } + break; + } + + case 5: + { + if (ppi5w[i].pPrinterName) + { + // Convert Unicode pPrinterName to a ANSI string pszPrinterName. + cch = wcslen(ppi5w[i].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[i].pPrinterName, -1, pszPrinterName, cch + 1, NULL, NULL); + StringCchCopyA(ppi5a[i].pPrinterName, cch + 1, pszPrinterName); + + HeapFree(hProcessHeap, 0, pszPrinterName); + } + + if (ppi5w[i].pPortName) + { + // Convert Unicode pPortName to a ANSI string pszPortName. + cch = wcslen(ppi5w[i].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[i].pPortName, -1, pszPortName, cch + 1, NULL, NULL); + StringCchCopyA(ppi5a[i].pPortName, cch + 1, pszPortName); + + HeapFree(hProcessHeap, 0, pszPortName); + } + break; + } + + } // switch + } // for + +Cleanup: + + return bReturnValue; } BOOL WINAPI

1 0

[reactos] 01/01: [SHELLEXT][ZIPFLDR] Be case sensitive (#2292)
by Katayama Hirofumi MZ 30 Jan '20

30 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcc4347898c72e7685698… commit fcc4347898c72e76856983573e61ab159a169189 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 30 15:05:50 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 30 15:05:50 2020 +0900 [SHELLEXT][ZIPFLDR] Be case sensitive (#2292) The filenames in a zip folder were all lowercase. Now the filenames are case sensitive. --- dll/shellext/zipfldr/CZipEnumerator.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/shellext/zipfldr/CZipEnumerator.hpp b/dll/shellext/zipfldr/CZipEnumerator.hpp index 2c36aac2ea9..9948413d908 100644 --- a/dll/shellext/zipfldr/CZipEnumerator.hpp +++ b/dll/shellext/zipfldr/CZipEnumerator.hpp @@ -52,7 +52,8 @@ public: name = tmp.Mid(len, pos - len); folder = true; } - tmp = name.MakeLower(); + tmp = name; + tmp.MakeLower(); POSITION it = m_Returned.Find(tmp); if (!name.IsEmpty() && !it)

1 0

[reactos] 01/01: [SHELLEXT][ZIPFLDR] Use CStringA::FormatMessage (#2287)
by Katayama Hirofumi MZ 29 Jan '20

29 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c5017808a5fe1f5ad7f3… commit 9c5017808a5fe1f5ad7f3df9812b9907c077adb5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 30 08:32:21 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 30 08:32:21 2020 +0900 [SHELLEXT][ZIPFLDR] Use CStringA::FormatMessage (#2287) Simplify our code. --- dll/shellext/zipfldr/CConfirmReplace.cpp | 18 ++++-------------- dll/shellext/zipfldr/CZipPassword.cpp | 17 +++-------------- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/dll/shellext/zipfldr/CConfirmReplace.cpp b/dll/shellext/zipfldr/CConfirmReplace.cpp index 4f51ee6bb69..8ee027a52ec 100644 --- a/dll/shellext/zipfldr/CConfirmReplace.cpp +++ b/dll/shellext/zipfldr/CConfirmReplace.cpp @@ -25,21 +25,11 @@ public: HICON hIcon = LoadIcon(NULL, IDI_EXCLAMATION); SendDlgItemMessage(IDC_EXCLAMATION_ICON, STM_SETICON, (WPARAM)hIcon); - /* Our CString does not support FormatMessage yet */ - CStringA message(MAKEINTRESOURCE(IDS_OVERWRITEFILE_TEXT)); - CHeapPtr<CHAR, CLocalAllocator> formatted; + CStringA message; + message.FormatMessage(IDS_OVERWRITEFILE_TEXT, m_Filename.GetString()); + ::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, message); - DWORD_PTR args[2] = - { - (DWORD_PTR)m_Filename.GetString(), - NULL - }; - - ::FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY, - message, 0, 0, (LPSTR)&formatted, 0, (va_list*)args); - - ::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, formatted); - return 0; + return TRUE; } LRESULT OnButton(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) diff --git a/dll/shellext/zipfldr/CZipPassword.cpp b/dll/shellext/zipfldr/CZipPassword.cpp index 99c896029d0..0a1964a23d1 100644 --- a/dll/shellext/zipfldr/CZipPassword.cpp +++ b/dll/shellext/zipfldr/CZipPassword.cpp @@ -33,20 +33,9 @@ public: } else { - /* Our CString does not support FormatMessage yet */ - CStringA message(MAKEINTRESOURCE(IDS_PASSWORD_FILE_TEXT)); - CHeapPtr<CHAR, CLocalAllocator> formatted; - - DWORD_PTR args[2] = - { - (DWORD_PTR)m_Filename.GetString(), - NULL - }; - - ::FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY, - message, 0, 0, (LPSTR)&formatted, 0, (va_list*)args); - - ::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, formatted); + CStringA message; + message.FormatMessage(IDS_PASSWORD_FILE_TEXT, m_Filename.GetString()); + ::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, message); } return TRUE; }

1 0

[reactos] 05/05: [SDK] Add some missing propsheet fields + validate struct sizes
by Mark Jansen 29 Jan '20

29 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd3c1e94ff4510ddfe27e… commit cd3c1e94ff4510ddfe27e67d75bf9039fd926db8 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Jan 24 20:43:06 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jan 29 22:58:43 2020 +0100 [SDK] Add some missing propsheet fields + validate struct sizes --- modules/rostests/apitests/comctl32/propsheet.c | 98 +++++++++++++++++++------- sdk/include/psdk/prsht.h | 18 +++++ 2 files changed, 92 insertions(+), 24 deletions(-) diff --git a/modules/rostests/apitests/comctl32/propsheet.c b/modules/rostests/apitests/comctl32/propsheet.c index 9daf5b0a401..e4d7be568b4 100644 --- a/modules/rostests/apitests/comctl32/propsheet.c +++ b/modules/rostests/apitests/comctl32/propsheet.c @@ -1,9 +1,10 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Test for property sheet + * PURPOSE: Test for v6 property sheet * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ + #include "wine/test.h" #include <windows.h> #include <windowsx.h> @@ -73,41 +74,68 @@ Page1DlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; } +#ifdef _MSC_VER +#define CHECK_STRUCT_SIZE(x, y) C_ASSERT((x) == (y)) +#else +// Can't do this compile time, thanks gcc +// 'error: non-nested function with variably modified type' +#define CHECK_STRUCT_SIZE(x, y) ok((x) == (y), "Wrong size for %s, got %u, expected %u\n", #x, y, x) +#endif + +// Validate struct sizes +static void test_StructSizes() +{ +#ifdef _M_X64 + CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V1_SIZE, 72); + CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V2_SIZE, 88); + CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V3_SIZE, 96); + CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V4_SIZE, 104); + CHECK_STRUCT_SIZE(PROPSHEETHEADERA_V1_SIZE, 72); + CHECK_STRUCT_SIZE(PROPSHEETHEADERA_V2_SIZE, 96); + + CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V1_SIZE, 72); + CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V2_SIZE, 88); + CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V3_SIZE, 96); + CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V4_SIZE, 104); + CHECK_STRUCT_SIZE(PROPSHEETHEADERW_V1_SIZE, 72); + CHECK_STRUCT_SIZE(PROPSHEETHEADERW_V2_SIZE, 96); +#else + CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V1_SIZE, 40); + CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V2_SIZE, 48); + CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V3_SIZE, 52); + CHECK_STRUCT_SIZE(PROPSHEETPAGEA_V4_SIZE, 56); + CHECK_STRUCT_SIZE(PROPSHEETHEADERA_V1_SIZE, 40); + CHECK_STRUCT_SIZE(PROPSHEETHEADERA_V2_SIZE, 52); + + CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V1_SIZE, 40); + CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V2_SIZE, 48); + CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V3_SIZE, 52); + CHECK_STRUCT_SIZE(PROPSHEETPAGEW_V4_SIZE, 56); + CHECK_STRUCT_SIZE(PROPSHEETHEADERW_V1_SIZE, 40); + CHECK_STRUCT_SIZE(PROPSHEETHEADERW_V2_SIZE, 52); +#endif +} + typedef HPROPSHEETPAGE (WINAPI *FN_CreatePropertySheetPageW)(LPCPROPSHEETPAGEW); typedef int (WINAPI *FN_PropertySheetW)(LPCPROPSHEETHEADERW); +static FN_CreatePropertySheetPageW pCreatePropertySheetPageW; +static FN_PropertySheetW pPropertySheetW; -START_TEST(propsheet) +// Show that the Apply button is not enabled by default +static void test_ApplyButtonDisabled() { - PROPSHEETPAGEW psp; - PROPSHEETHEADERW header; + PROPSHEETPAGEW psp = {0}; + PROPSHEETHEADERW header = {0}; HPROPSHEETPAGE hpsp[1]; - HMODULE hComCtl32; - FN_CreatePropertySheetPageW pCreatePropertySheetPageW; - FN_PropertySheetW pPropertySheetW; - - hComCtl32 = LoadLibraryW(L"comctl32.dll"); - pCreatePropertySheetPageW = (FN_CreatePropertySheetPageW)GetProcAddress(hComCtl32, "CreatePropertySheetPageW"); - pPropertySheetW = (FN_PropertySheetW)GetProcAddress(hComCtl32, "PropertySheetW"); - - ok(pCreatePropertySheetPageW != NULL, "pCreatePropertySheetPageW was NULL.\n"); - ok(pPropertySheetW != NULL, "pPropertySheetW was NULL.\n"); - - if (!pCreatePropertySheetPageW || !pPropertySheetW) - { - skip("!pCreatePropertySheetPageW || !pPropertySheetW\n"); - return; - } - ZeroMemory(&psp, sizeof(psp)); psp.dwSize = sizeof(psp); psp.dwFlags = PSP_DEFAULT; psp.hInstance = GetModuleHandleW(NULL); psp.pszTemplate = MAKEINTRESOURCEW(1); psp.pfnDlgProc = Page1DlgProc; - hpsp[0] = (*pCreatePropertySheetPageW)(&psp); + hpsp[0] = pCreatePropertySheetPageW(&psp); ok(hpsp[0] != NULL, "hpsp[0] was NULL.\n"); - ZeroMemory(&header, sizeof(header)); header.dwSize = sizeof(header); header.dwFlags = 0; header.hInstance = GetModuleHandleW(NULL); @@ -115,7 +143,29 @@ START_TEST(propsheet) header.nPages = ARRAYSIZE(hpsp); header.phpage = hpsp; header.pszCaption = L"propsheet"; - ok((*pPropertySheetW)(&header) > 0, "PropertySheet returned non-positive value.\n"); + ok(pPropertySheetW(&header) > 0, "PropertySheet returned non-positive value.\n"); +} + + +START_TEST(propsheet) +{ + HMODULE hComCtl32; + + hComCtl32 = LoadLibraryW(L"comctl32.dll"); + pCreatePropertySheetPageW = (FN_CreatePropertySheetPageW)GetProcAddress(hComCtl32, "CreatePropertySheetPageW"); + pPropertySheetW = (FN_PropertySheetW)GetProcAddress(hComCtl32, "PropertySheetW"); + + ok(pCreatePropertySheetPageW != NULL, "pCreatePropertySheetPageW was NULL.\n"); + ok(pPropertySheetW != NULL, "pPropertySheetW was NULL.\n"); + + if (!pCreatePropertySheetPageW || !pPropertySheetW) + { + skip("!pCreatePropertySheetPageW || !pPropertySheetW\n"); + return; + } + + test_StructSizes(); + test_ApplyButtonDisabled(); FreeLibrary(hComCtl32); } diff --git a/sdk/include/psdk/prsht.h b/sdk/include/psdk/prsht.h index 0356c7e247e..a35537ebe4c 100644 --- a/sdk/include/psdk/prsht.h +++ b/sdk/include/psdk/prsht.h @@ -194,6 +194,15 @@ typedef struct _PROPSHEETPAGEA { LPCSTR pszHeaderTitle; LPCSTR pszHeaderSubTitle; #endif +#if (_WIN32_IE >= 0x0501) + HANDLE hActCtx; +#endif +#if (_WIN32_IE >= 0x0600) + _ANONYMOUS_UNION union { + HBITMAP hbmHeader; + LPCSTR pszbmHeader; + } DUMMYUNIONNAME3; +#endif } PROPSHEETPAGEA,*LPPROPSHEETPAGEA, PROPSHEETPAGEA_LATEST, *LPPROPSHEETPAGEA_LATEST; typedef const PROPSHEETPAGEA *LPCPROPSHEETPAGEA, *LPCPROPSHEETPAGEA_LATEST; @@ -222,6 +231,15 @@ typedef struct _PROPSHEETPAGEW { LPCWSTR pszHeaderTitle; LPCWSTR pszHeaderSubTitle; #endif +#if (_WIN32_IE >= 0x0501) + HANDLE hActCtx; +#endif +#if (_WIN32_IE >= 0x0600) + _ANONYMOUS_UNION union { + HBITMAP hbmHeader; + LPCWSTR pszbmHeader; + } DUMMYUNIONNAME3; +#endif } PROPSHEETPAGEW,*LPPROPSHEETPAGEW, PROPSHEETPAGEW_LATEST, *LPPROPSHEETPAGEW_LATEST; typedef const PROPSHEETPAGEW *LPCPROPSHEETPAGEW, *LPCPROPSHEETPAGEW_LATEST;

1 0

[reactos] 04/05: [CMLIB] Use UNIMPLEMENTED_ONCE in HvHiveWillShrink
by Mark Jansen 29 Jan '20

29 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db55933b0ca1a095f8e31… commit db55933b0ca1a095f8e3136053ae8b514c3dc908 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Jan 24 20:09:07 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jan 29 22:58:43 2020 +0100 [CMLIB] Use UNIMPLEMENTED_ONCE in HvHiveWillShrink --- sdk/include/host/typedefs.h | 1 + sdk/lib/cmlib/hivewrt.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/include/host/typedefs.h b/sdk/include/host/typedefs.h index d3bea3bbcef..eaa2c9f5c06 100644 --- a/sdk/include/host/typedefs.h +++ b/sdk/include/host/typedefs.h @@ -27,6 +27,7 @@ /* Basic definitions */ #define UNIMPLEMENTED { printf("%s unimplemented\n", __FUNCTION__); exit(1); } +#define UNIMPLEMENTED_ONCE { printf("%s unimplemented\n", __FUNCTION__); exit(1); } #define ASSERT(x) assert(x) #define ASSERTMSG(m, x) assert(x) #define DPRINT if (0) printf diff --git a/sdk/lib/cmlib/hivewrt.c b/sdk/lib/cmlib/hivewrt.c index ef4ceb001b6..76bf72b1b45 100644 --- a/sdk/lib/cmlib/hivewrt.c +++ b/sdk/lib/cmlib/hivewrt.c @@ -277,7 +277,7 @@ CMAPI HvHiveWillShrink(IN PHHIVE RegistryHive) { /* No shrinking yet */ - UNIMPLEMENTED; + UNIMPLEMENTED_ONCE; return FALSE; }

1 0

[reactos] 03/05: [WIN32SS] Demote a trace message
by Mark Jansen 29 Jan '20

29 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbc97e964f12ebdfaf587… commit bbc97e964f12ebdfaf5874d66824aa7395e0b027 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Jan 24 20:08:20 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jan 29 22:58:43 2020 +0100 [WIN32SS] Demote a trace message --- win32ss/user/ntuser/msgqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c index 04d2e06ef94..2f5d324c1ce 100644 --- a/win32ss/user/ntuser/msgqueue.c +++ b/win32ss/user/ntuser/msgqueue.c @@ -2199,7 +2199,7 @@ MsqIsHung(PTHREADINFO pti, DWORD TimeOut) !PsGetThreadFreezeCount(pti->pEThread) && !(pti->ppi->W32PF_flags & W32PF_APPSTARTING)) { - ERR("\nMsqIsHung(pti %p, TimeOut %lu)\n" + TRACE("\nMsqIsHung(pti %p, TimeOut %lu)\n" "pEThread %p, ThreadsProcess %p, ImageFileName '%s'\n" "dwTimeStamp = %lu\n" "pti->pcti->timeLastRead = %lu\n"

1 0

[reactos] 02/05: [SYSSETUP] Zero out propsheet data fields This prevents +propsheet logging accessing uninitialized data
by Mark Jansen 29 Jan '20

29 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=09edc062baf04e382008a… commit 09edc062baf04e382008ae5a255812c98499eb52 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Jan 24 20:07:38 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jan 29 22:58:42 2020 +0100 [SYSSETUP] Zero out propsheet data fields This prevents +propsheet logging accessing uninitialized data --- dll/win32/syssetup/wizard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index bd5e6118301..d3aaf7c71f3 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -2661,7 +2661,7 @@ typedef DWORD(WINAPI *PFNREQUESTWIZARDPAGES)(PDWORD, HPROPSHEETPAGE *, PSETUPDAT VOID InstallWizard(VOID) { - PROPSHEETHEADER psh; + PROPSHEETHEADER psh = {0}; HPROPSHEETPAGE *phpage = NULL; PROPSHEETPAGE psp = {0}; UINT nPages = 0;

1 0

[reactos] 01/05: [NEWDEV] Zero out propsheet data fields This prevents +propsheet logging accessing uninitialized data
by Mark Jansen 29 Jan '20

29 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=097355db60f1e6543c9d0… commit 097355db60f1e6543c9d0f2eeab04e8f32c4e398 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Jan 24 20:07:24 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jan 29 22:58:42 2020 +0100 [NEWDEV] Zero out propsheet data fields This prevents +propsheet logging accessing uninitialized data --- dll/win32/newdev/wizard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/newdev/wizard.c b/dll/win32/newdev/wizard.c index a592456808e..ee24b059d8a 100644 --- a/dll/win32/newdev/wizard.c +++ b/dll/win32/newdev/wizard.c @@ -1300,9 +1300,9 @@ DisplayWizard( IN HWND hwndParent, IN UINT startPage) { - PROPSHEETHEADER psh; + PROPSHEETHEADER psh = {0}; HPROPSHEETPAGE ahpsp[IDD_MAXIMUMPAGE + 1]; - PROPSHEETPAGE psp; + PROPSHEETPAGE psp = {0}; /* zero based index */ startPage -= IDD_FIRSTPAGE;

1 0

[reactos] 01/01: [FONTEXT] Add detail view columns to font folder CORE-16476
by Mark Jansen 29 Jan '20

29 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c09636f9469465940b74b… commit c09636f9469465940b74b2597a4464412f35a28a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Jan 20 21:43:19 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jan 29 22:55:50 2020 +0100 [FONTEXT] Add detail view columns to font folder CORE-16476 --- dll/shellext/fontext/CDataObject.cpp | 15 +----- dll/shellext/fontext/CFontCache.cpp | 29 +++++++--- dll/shellext/fontext/CFontCache.hpp | 8 ++- dll/shellext/fontext/CFontExt.cpp | 102 ++++++++++++++++++++++++++++++----- dll/shellext/fontext/CFontExt.hpp | 4 +- dll/shellext/fontext/CFontMenu.cpp | 15 +----- dll/shellext/fontext/CMakeLists.txt | 3 +- dll/shellext/fontext/fontext.cpp | 6 +-- dll/shellext/fontext/fontpidl.cpp | 8 +-- dll/shellext/fontext/lang/en-US.rc | 9 ++++ dll/shellext/fontext/lang/it-IT.rc | 20 +++++++ dll/shellext/fontext/lang/pl-PL.rc | 20 +++++++ dll/shellext/fontext/lang/ro-RO.rc | 20 +++++++ dll/shellext/fontext/lang/tr-TR.rc | 20 +++++++ dll/shellext/fontext/resource.h | 6 +++ 15 files changed, 228 insertions(+), 57 deletions(-) diff --git a/dll/shellext/fontext/CDataObject.cpp b/dll/shellext/fontext/CDataObject.cpp index 252b125fc92..f6851f19985 100644 --- a/dll/shellext/fontext/CDataObject.cpp +++ b/dll/shellext/fontext/CDataObject.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: CFontMenu implementation - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -45,11 +45,6 @@ HRESULT _CDataObject_CreateInstance(PCIDLIST_ABSOLUTE folder, UINT cidl, PCUITEM // Now that we have an IDataObject with the shell itemid list (CFSTR_SHELLIDLIST, aka HIDA) format // we will augment this IDataObject with the CF_HDROP format. (Full filepaths) // This enabled the objects for the 'copy' and drag to copy actions - WCHAR FontsDir[MAX_PATH]; - hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, FontsDir); - if (FAILED_UNEXPECTEDLY(hr)) - return S_OK; - StringCchCatW(FontsDir, _countof(FontsDir), L"\\"); CComHeapPtr<BYTE> data; @@ -63,15 +58,9 @@ HRESULT _CDataObject_CreateInstance(PCIDLIST_ABSOLUTE folder, UINT cidl, PCUITEM const FontPidlEntry* fontEntry = _FontFromIL(apidl[n]); if (fontEntry) { - CStringW File = g_FontCache->Filename(fontEntry); + CStringW File = g_FontCache->Filename(fontEntry, true); if (!File.IsEmpty()) { - // Ensure this is a full path - if (PathIsRelativeW(File)) - { - File = FontsDir + File; - } - // Now append the path (+ nullterminator) to the buffer UINT len = offset + (File.GetLength() + 1) * sizeof(WCHAR); data.ReallocateBytes(len); diff --git a/dll/shellext/fontext/CFontCache.cpp b/dll/shellext/fontext/CFontCache.cpp index 8bccf346582..218be7bb638 100644 --- a/dll/shellext/fontext/CFontCache.cpp +++ b/dll/shellext/fontext/CFontCache.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: font list cache handling - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -68,6 +68,12 @@ CFontCache::CFontCache() { } +void CFontCache::SetFontDir(const LPCWSTR Path) +{ + if (m_FontFolderPath.IsEmpty()) + m_FontFolderPath = Path; +} + size_t CFontCache::Size() { if (m_Fonts.GetCount() == 0u) @@ -87,23 +93,34 @@ CStringW CFontCache::Name(size_t Index) return m_Fonts[Index].Name(); } -CStringW CFontCache::Filename(const FontPidlEntry* fontEntry) +CStringW CFontCache::Filename(const FontPidlEntry* fontEntry, bool alwaysFullPath) { + CStringW File; + if (fontEntry->Index < m_Fonts.GetCount()) { CFontInfo& info = m_Fonts[fontEntry->Index]; if (info.Name().CompareNoCase(fontEntry->Name) == 0) - return info.File(); + File = info.File(); } - for (UINT n = 0; n < Size(); ++n) + for (UINT n = 0; File.IsEmpty() && n < Size(); ++n) { if (m_Fonts[n].Name().CompareNoCase(fontEntry->Name) == 0) - return m_Fonts[n].File(); + File = m_Fonts[n].File(); + } + + if (!File.IsEmpty() && alwaysFullPath) + { + // Ensure this is a full path + if (PathIsRelativeW(File)) + { + File = m_FontFolderPath + File; + } } - return CStringW(); + return File; } void CFontCache::Insert(CAtlList<CFontInfo>& fonts, const CStringW& KeyName) diff --git a/dll/shellext/fontext/CFontCache.hpp b/dll/shellext/fontext/CFontCache.hpp index 226c061f685..9454660a653 100644 --- a/dll/shellext/fontext/CFontCache.hpp +++ b/dll/shellext/fontext/CFontCache.hpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: font list cache handling - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) */ #pragma once @@ -27,6 +27,7 @@ class CFontCache { private: CAtlArray<CFontInfo> m_Fonts; + CStringW m_FontFolderPath; protected: CFontCache(); @@ -35,9 +36,12 @@ protected: void Read(); public: + void SetFontDir(const LPCWSTR Path); + const CStringW& FontPath() const { return m_FontFolderPath; } + size_t Size(); CStringW Name(size_t Index); - CStringW Filename(const FontPidlEntry* fontEntry); + CStringW Filename(const FontPidlEntry* fontEntry, bool alwaysFullPath = false); friend class CFontExtModule; }; diff --git a/dll/shellext/fontext/CFontExt.cpp b/dll/shellext/fontext/CFontExt.cpp index 1ce5325500a..c157104c7e9 100644 --- a/dll/shellext/fontext/CFontExt.cpp +++ b/dll/shellext/fontext/CFontExt.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: CFontExt implementation - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) * Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ @@ -22,6 +22,10 @@ struct FolderViewColumns static FolderViewColumns g_ColumnDefs[] = { { IDS_COL_NAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, 25, LVCFMT_LEFT }, + { IDS_COL_FILENAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, 20, LVCFMT_LEFT }, + { IDS_COL_SIZE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, 10, LVCFMT_RIGHT }, + { IDS_COL_MODIFIED, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, 15, LVCFMT_LEFT }, + { IDS_COL_ATTR, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, 12, LVCFMT_RIGHT }, }; @@ -134,10 +138,83 @@ STDMETHODIMP CFontExt::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDET return E_FAIL; } + // Name, ReactOS specific? + if (iColumn == 0) + return GetDisplayNameOf(pidl, 0, &psd->str); + + const FontPidlEntry* fontEntry = _FontFromIL(pidl); + if (!fontEntry) + { + ERR("ERROR, not a font PIDL!\n"); + return E_FAIL; + } + + // If we got here, we are in details view! + // Let's see if we got info about this file that we can re-use + if (m_LastDetailsFontName != fontEntry->Name) + { + CStringW File = g_FontCache->Filename(fontEntry, true); + HANDLE hFile = FindFirstFileW(File, &m_LastDetailsFileData); + if (hFile == INVALID_HANDLE_VALUE) + { + m_LastDetailsFontName.Empty(); + ERR("Unable to query info about %S\n", File.GetString()); + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + FindClose(hFile); + m_LastDetailsFontName = fontEntry->Name; + } + + // Most code borrowed from CFSFolder::GetDetailsOf + FILETIME lft; + SYSTEMTIME time; + int ret; + LARGE_INTEGER FileSize; + CStringA AttrLetters; switch (iColumn) { - case 0: /* Name, ReactOS specific? */ - return GetDisplayNameOf(pidl, 0, &psd->str); + case 1: // Filename + return SHSetStrRet(&psd->str, m_LastDetailsFileData.cFileName); + case 2: // Size + psd->str.uType = STRRET_CSTR; + FileSize.HighPart = m_LastDetailsFileData.nFileSizeHigh; + FileSize.LowPart = m_LastDetailsFileData.nFileSizeLow; + StrFormatKBSizeA(FileSize.QuadPart, psd->str.cStr, MAX_PATH); + return S_OK; + case 3: // Modified + FileTimeToLocalFileTime(&m_LastDetailsFileData.ftLastWriteTime, &lft); + FileTimeToSystemTime (&lft, &time); + psd->str.uType = STRRET_CSTR; + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, psd->str.cStr, MAX_PATH); + if (ret < 1) + { + ERR("GetDateFormatA failed\n"); + return E_FAIL; + } + psd->str.cStr[ret-1] = ' '; + GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &time, NULL, &psd->str.cStr[ret], MAX_PATH - ret); + return S_OK; + case 4: // Attributes + AttrLetters.LoadString(IDS_COL_ATTR_LETTERS); + if (AttrLetters.GetLength() != 5) + { + ERR("IDS_COL_ATTR_LETTERS does not contain 5 letters!\n"); + return E_FAIL; + } + psd->str.uType = STRRET_CSTR; + ret = 0; + if (m_LastDetailsFileData.dwFileAttributes & FILE_ATTRIBUTE_READONLY) + psd->str.cStr[ret++] = AttrLetters[0]; + if (m_LastDetailsFileData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + psd->str.cStr[ret++] = AttrLetters[1]; + if (m_LastDetailsFileData.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) + psd->str.cStr[ret++] = AttrLetters[2]; + if (m_LastDetailsFileData.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE) + psd->str.cStr[ret++] = AttrLetters[3]; + if (m_LastDetailsFileData.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) + psd->str.cStr[ret++] = AttrLetters[4]; + psd->str.cStr[ret] = '\0'; + return S_OK; default: break; } @@ -332,27 +409,29 @@ STDMETHODIMP CFontExt::GetCurFolder(LPITEMIDLIST *ppidl) // *** IPersistFolder methods *** STDMETHODIMP CFontExt::Initialize(LPCITEMIDLIST pidl) { - WCHAR PidlPath[MAX_PATH + 1] = {0}, Expected[MAX_PATH + 1]; + WCHAR PidlPath[MAX_PATH + 1] = {0}, FontsDir[MAX_PATH + 1]; if (!SHGetPathFromIDListW(pidl, PidlPath)) { ERR("Unable to extract path from pidl\n"); return E_FAIL; } - HRESULT hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, Expected); - if (!SUCCEEDED(hr)) + HRESULT hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, FontsDir); + if (FAILED_UNEXPECTEDLY(hr)) { ERR("Unable to get fonts path (0x%x)\n", hr); return hr; } - if (_wcsicmp(PidlPath, Expected)) + if (_wcsicmp(PidlPath, FontsDir)) { ERR("CFontExt View initializing on unexpected folder: '%S'\n", PidlPath); return E_FAIL; } m_Folder.Attach(ILClone(pidl)); + StringCchCatW(FontsDir, _countof(FontsDir), L"\\"); + g_FontCache->SetFontDir(FontsDir); return S_OK; } @@ -397,13 +476,8 @@ STDMETHODIMP CFontExt::Drop(IDataObject* pDataObj, DWORD grfKeyState, POINTL pt, { *pdwEffect = DROPEFFECT_NONE; - WCHAR szFontsDir[MAX_PATH]; - HRESULT hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, szFontsDir); - if (FAILED_UNEXPECTEDLY(hr)) - return E_FAIL; - CComHeapPtr<CIDA> cida; - hr = _GetCidlFromDataObject(pDataObj, &cida); + HRESULT hr = _GetCidlFromDataObject(pDataObj, &cida); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -471,7 +545,7 @@ STDMETHODIMP CFontExt::Drop(IDataObject* pDataObj, DWORD grfKeyState, POINTL pt, for (size_t iItem = 0; iItem < FontPaths.GetCount(); ++iItem) { - HRESULT hr = DoInstallFontFile(FontPaths[iItem], szFontsDir, keyFonts.m_hKey); + HRESULT hr = DoInstallFontFile(FontPaths[iItem], g_FontCache->FontPath(), keyFonts.m_hKey); if (FAILED_UNEXPECTEDLY(hr)) { bOK = FALSE; diff --git a/dll/shellext/fontext/CFontExt.hpp b/dll/shellext/fontext/CFontExt.hpp index 19d94f6fa1c..6e3a178042d 100644 --- a/dll/shellext/fontext/CFontExt.hpp +++ b/dll/shellext/fontext/CFontExt.hpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: CFontExt definition - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) * Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ @@ -16,6 +16,8 @@ class CFontExt : public IDropTarget { CComHeapPtr<ITEMIDLIST> m_Folder; + CStringW m_LastDetailsFontName; + WIN32_FIND_DATAW m_LastDetailsFileData; public: diff --git a/dll/shellext/fontext/CFontMenu.cpp b/dll/shellext/fontext/CFontMenu.cpp index 0a2f0e55856..05b968e27d3 100644 --- a/dll/shellext/fontext/CFontMenu.cpp +++ b/dll/shellext/fontext/CFontMenu.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: CFontMenu implementation - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -69,20 +69,9 @@ static void RunFontViewer(HWND hwnd, const FontPidlEntry* fontEntry) WCHAR FontViewerPath[MAX_PATH] = L"%SystemRoot%\\System32\\fontview.exe"; WCHAR FontPathArg[MAX_PATH + 3]; - CStringW Path = g_FontCache->Filename(fontEntry); + CStringW Path = g_FontCache->Filename(fontEntry, true); if (!Path.IsEmpty()) { - if (PathIsRelativeW(Path)) - { - WCHAR FontsDir[MAX_PATH]; - HRESULT hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, FontsDir); - if (!FAILED_UNEXPECTEDLY(hr)) - { - StringCchCatW(FontsDir, _countof(FontsDir), L"\\"); - Path = FontsDir + Path; - } - } - // '/d' disables the install button StringCchPrintfW(FontPathArg, _countof(FontPathArg), L"/d %s", Path.GetString()); PathQuoteSpacesW(FontPathArg + 3); diff --git a/dll/shellext/fontext/CMakeLists.txt b/dll/shellext/fontext/CMakeLists.txt index 2f2586b2517..e50eebfa95b 100644 --- a/dll/shellext/fontext/CMakeLists.txt +++ b/dll/shellext/fontext/CMakeLists.txt @@ -22,7 +22,8 @@ list(APPEND SOURCE fontext.cpp fontpidl.cpp fontpidl.hpp - precomp.h) + precomp.h + resource.h) add_library(fontext MODULE ${SOURCE} diff --git a/dll/shellext/fontext/fontext.cpp b/dll/shellext/fontext/fontext.cpp index ab1ed51bbc7..d3659199e2d 100644 --- a/dll/shellext/fontext/fontext.cpp +++ b/dll/shellext/fontext/fontext.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Shell extension entry point - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -59,11 +59,11 @@ STDAPI DllRegisterServer() HRESULT hr; hr = gModule.DllRegisterServer(FALSE); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, Path); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; // Make this a system folder: diff --git a/dll/shellext/fontext/fontpidl.cpp b/dll/shellext/fontext/fontpidl.cpp index 021afe128a4..38bb7814c84 100644 --- a/dll/shellext/fontext/fontpidl.cpp +++ b/dll/shellext/fontext/fontpidl.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: pidl handling - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -31,8 +31,8 @@ LPITEMIDLIST _ILCreate(LPCWSTR lpString, ULONG Index) const FontPidlEntry* _FontFromIL(LPCITEMIDLIST pidl) { - const FontPidlEntry* zipPidl = (const FontPidlEntry*)pidl; - if (zipPidl->Magic == 'fp') - return zipPidl; + const FontPidlEntry* fontEntry = (const FontPidlEntry*)pidl; + if (fontEntry->Magic == 'fp') + return fontEntry; return NULL; } diff --git a/dll/shellext/fontext/lang/en-US.rc b/dll/shellext/fontext/lang/en-US.rc index d7fcae09bef..cdc94dbe07a 100644 --- a/dll/shellext/fontext/lang/en-US.rc +++ b/dll/shellext/fontext/lang/en-US.rc @@ -13,6 +13,15 @@ BEGIN IDS_COL_NAME "Name" END +STRINGTABLE +BEGIN + IDS_COL_FILENAME "Filename" + IDS_COL_SIZE "Size" + IDS_COL_MODIFIED "Modified" + IDS_COL_ATTR "Attributes" + IDS_COL_ATTR_LETTERS "RHSAC" +END + STRINGTABLE BEGIN diff --git a/dll/shellext/fontext/lang/it-IT.rc b/dll/shellext/fontext/lang/it-IT.rc index 5c067cdc5f2..8fb1566f13f 100644 --- a/dll/shellext/fontext/lang/it-IT.rc +++ b/dll/shellext/fontext/lang/it-IT.rc @@ -11,3 +11,23 @@ STRINGTABLE BEGIN IDS_REACTOS_FONTS_FOLDER "Cartella dei font di ReactOS" END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Name" +END + +STRINGTABLE +BEGIN + IDS_COL_FILENAME "Filename" + IDS_COL_SIZE "Size" + IDS_COL_MODIFIED "Modified" + IDS_COL_ATTR "Attributes" + IDS_COL_ATTR_LETTERS "RHSAC" +END + + +STRINGTABLE +BEGIN + IDS_FONT_PREVIEW "Preview" +END diff --git a/dll/shellext/fontext/lang/pl-PL.rc b/dll/shellext/fontext/lang/pl-PL.rc index 8a4c6cd170a..73fe7c170fc 100644 --- a/dll/shellext/fontext/lang/pl-PL.rc +++ b/dll/shellext/fontext/lang/pl-PL.rc @@ -6,3 +6,23 @@ STRINGTABLE BEGIN IDS_REACTOS_FONTS_FOLDER "Folder czcionek ReactOS" END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Name" +END + +STRINGTABLE +BEGIN + IDS_COL_FILENAME "Filename" + IDS_COL_SIZE "Size" + IDS_COL_MODIFIED "Modified" + IDS_COL_ATTR "Attributes" + IDS_COL_ATTR_LETTERS "RHSAC" +END + + +STRINGTABLE +BEGIN + IDS_FONT_PREVIEW "Preview" +END diff --git a/dll/shellext/fontext/lang/ro-RO.rc b/dll/shellext/fontext/lang/ro-RO.rc index af1d14c65c6..a6f2e6219cf 100644 --- a/dll/shellext/fontext/lang/ro-RO.rc +++ b/dll/shellext/fontext/lang/ro-RO.rc @@ -11,3 +11,23 @@ STRINGTABLE BEGIN IDS_REACTOS_FONTS_FOLDER "Folder-ul de fonturi de ReactOS" END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Name" +END + +STRINGTABLE +BEGIN + IDS_COL_FILENAME "Filename" + IDS_COL_SIZE "Size" + IDS_COL_MODIFIED "Modified" + IDS_COL_ATTR "Attributes" + IDS_COL_ATTR_LETTERS "RHSAC" +END + + +STRINGTABLE +BEGIN + IDS_FONT_PREVIEW "Preview" +END diff --git a/dll/shellext/fontext/lang/tr-TR.rc b/dll/shellext/fontext/lang/tr-TR.rc index 7f6ec6550d5..1c44a655a2e 100644 --- a/dll/shellext/fontext/lang/tr-TR.rc +++ b/dll/shellext/fontext/lang/tr-TR.rc @@ -6,3 +6,23 @@ STRINGTABLE BEGIN IDS_REACTOS_FONTS_FOLDER "ReactOS Yazı Tipi Klasörü" END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Name" +END + +STRINGTABLE +BEGIN + IDS_COL_FILENAME "Filename" + IDS_COL_SIZE "Size" + IDS_COL_MODIFIED "Modified" + IDS_COL_ATTR "Attributes" + IDS_COL_ATTR_LETTERS "RHSAC" +END + + +STRINGTABLE +BEGIN + IDS_FONT_PREVIEW "Preview" +END diff --git a/dll/shellext/fontext/resource.h b/dll/shellext/fontext/resource.h index 49246c33524..8ff4867ee4e 100644 --- a/dll/shellext/fontext/resource.h +++ b/dll/shellext/fontext/resource.h @@ -4,6 +4,12 @@ #define IDS_REACTOS_FONTS_FOLDER 151 #define IDS_COL_NAME 301 +#define IDS_COL_FILENAME 304 +#define IDS_COL_SIZE 305 +#define IDS_COL_MODIFIED 306 +#define IDS_COL_ATTR 307 +#define IDS_COL_ATTR_LETTERS 308 + #define IDS_FONT_PREVIEW 401 #define IDR_FONTEXT 8000

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